Fixed a lot ext-network forms, {%get=foo%} introduced, a lot array elements added

- Fixed all form for ext-network to handle dynamic parameters correctly
- Introduced new EL: {%get=foo%} is now a helper EL to insert parameters from
  GET request, still this doesn't support extra functions but will be added soon
- Added a lot array element translations for many networks
- TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 96028c04fb760701ee1b387896ccb71aac4c9593..143960976095fe762ec8df4c59bc6cadd59b134b 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -15,22 +15,23 @@
 ./inc/extensions/ext-network.php:21: * @TODO Ad-Magnet: Layer(klick?). Layerviews.Skybannerklick/-view,     *
 ./inc/extensions/ext-network.php:22: * @TODO Ad-Magnet: Banner-View, Textlink-Klick/-View. Page-Peel        *
 ./inc/extensions/ext-network.php:23: * @TODO ADCocktail: All request parameters, BIDausKAS, WIDausKAS???    *
-./inc/extensions/ext-network.php:24: * @TODO Affiliblatt: All except banner, do they really have UTF-8?     *
-./inc/extensions/ext-network.php:25: * @TODO AllAds4You: Traffic from abroad                                *
-./inc/extensions/ext-network.php:26: * @TODO doubleads: Which charset?                                      *
-./inc/extensions/ext-network.php:27: * @TODO Fusion-Ads: Has click/banner URL in API response, really UTF-8 *
-./inc/extensions/ext-network.php:28: * @TODO GolloX: Which charset?                                         *
-./inc/extensions/ext-network.php:29: * @TODO homeADS: Which charset?                                        *
-./inc/extensions/ext-network.php:30: * @TODO paid4ad: Which URLs for click and banner?                      *
-./inc/extensions/ext-network.php:31: * @TODO VIPads: Which charset?                                         *
-./inc/extensions/ext-network.php:32: * @TODO Der Werbepartner.cc: Banner click/view is JavaScript!          *
-./inc/extensions/ext-network.php:33: * @TODO Der Werbepartner.cc: Forced textlink not correct               *
-./inc/extensions/ext-network.php:34: * @TODO Der Werbepartner.cc: Layer not correct                         *
-./inc/extensions/ext-network.php:35: * @TODO Der Werbepartner.cc: Sky banner is JavaScript!                 *
-./inc/extensions/ext-network.php:36: * @TODO Der Werbepartner.cc: Surfbar click not correct                 *
-./inc/extensions/ext-network.php:37: * @TODO Der Werbepartner.cc: Textlink not not correct                  *
-./inc/extensions/ext-network.php:38: * @TODO Yoo!Media: What is LayerAd compared to Layer click?            *
-./inc/extensions/ext-network.php:92:           // @TODO network_type_handle is an internal name and needs documentation
+./inc/extensions/ext-network.php:24: * @TODO ADCocktail: Zero array element is return code!                 *
+./inc/extensions/ext-network.php:25: * @TODO Affiliblatt: All except banner, do they really have UTF-8?     *
+./inc/extensions/ext-network.php:26: * @TODO AllAds4You: Traffic from abroad                                *
+./inc/extensions/ext-network.php:27: * @TODO doubleads: Which charset?                                      *
+./inc/extensions/ext-network.php:28: * @TODO Fusion-Ads: Has click/banner URL in API response, really UTF-8 *
+./inc/extensions/ext-network.php:29: * @TODO GolloX: Which charset?                                         *
+./inc/extensions/ext-network.php:30: * @TODO homeADS: Which charset?                                        *
+./inc/extensions/ext-network.php:31: * @TODO paid4ad: Which URLs for click and banner?                      *
+./inc/extensions/ext-network.php:32: * @TODO VIPads: Which charset?                                         *
+./inc/extensions/ext-network.php:33: * @TODO Der Werbepartner.cc: Banner click/view is JavaScript!          *
+./inc/extensions/ext-network.php:34: * @TODO Der Werbepartner.cc: Forced textlink not correct               *
+./inc/extensions/ext-network.php:35: * @TODO Der Werbepartner.cc: Layer not correct                         *
+./inc/extensions/ext-network.php:36: * @TODO Der Werbepartner.cc: Sky banner is JavaScript!                 *
+./inc/extensions/ext-network.php:37: * @TODO Der Werbepartner.cc: Surfbar click not correct                 *
+./inc/extensions/ext-network.php:38: * @TODO Der Werbepartner.cc: Textlink not not correct                  *
+./inc/extensions/ext-network.php:39: * @TODO Yoo!Media: What is LayerAd compared to Layer click?            *
+./inc/extensions/ext-network.php:93:           // @TODO network_type_handle is an internal name and needs documentation
 ./inc/extensions/ext-newsletter.php:220:               // @TODO Move these into configuration
 ./inc/extensions/ext-order.php:344:            // @TODO This should be moved out to inc/reset/
 ./inc/extensions/ext-rallye.php:331:           // @TODO Move this code into rallye_functions.php

diff --git a/DOCS/de/network/README.txt b/DOCS/de/network/README.txt
index 7cc4b7628fd13e66d483c36c5f7239c5ca1a6144..2b8c5c6743d8376fb5814444bcd2b90e6b1f70b0 100644 (file)
--- a/DOCS/de/network/README.txt
+++ b/DOCS/de/network/README.txt
@@ -5,11 +5,12 @@ UID = Ihre Werbenetz-Id (meistens die Sie zum Einloggen verwenden, UserID)
 SID = Die Seiten-Id Ihrer Eingetragen Webseite (SiteID)
 BID = Banner-Id (z.B. Forcedbanner oder Bannerklick/-view, BannerID)
 CID = Kampagnen-Id (z.B. Textmail-Id aus Textmails, CampaignID)
+TID = Track-Id (z.B. lokale User-Id von dem klickenden Mitglied)
 
 Diese Platzhalter muessen in Prozenten eingeschlossen in die URL eingebunden sein.
 
 Beispiel:
-http://www.anbieter-name.invalid/code/t-mail.php?id=%UID%&sid=%SID%
+http://www.anbieter-name.invalid/code/t-mail.php?id=%UID%&sid=%SID%&trackid=%TID%
 
 -------------------------------------------------------------------------------
 

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index 3d713acd449b006fc836781d176d82dd5f4e07da..9e4602fbfbe1ffbedd15df5c2fad706d31eebf86 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -301,5 +301,17 @@ function doExpressionMath ($data) {
        return $code;
 }
 
+// Expression call-back for GET request
+function doExpressionGet ($data) {
+       // Construct the replacer
+       $replacer = '{%pipe,getRequestParameter=' . $data['value'] . '%}';
+
+       // Replace the code
+       $code = replaceExpressionCode($data, $replacer);
+
+       // Return the (maybe) replaced code
+       return $code;
+}
+
 // [EOF]
 ?>

diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php
index 2985dff02c4b16f6f85391c3ab616d8a2448c358..26c7801119ef01d9577eb7a2a73d4d0476bd6220 100644 (file)
--- a/inc/extensions/ext-network.php
+++ b/inc/extensions/ext-network.php
@@ -21,6 +21,7 @@
  * @TODO Ad-Magnet: Layer(klick?). Layerviews.Skybannerklick/-view,     *
  * @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 Affiliblatt: All except banner, do they really have UTF-8?     *
  * @TODO AllAds4You: Traffic from abroad                                *
  * @TODO doubleads: Which charset?                                      *
@@ -240,27 +241,22 @@ PRIMARY KEY (`network_reload_id`)
 (22, 'textlink1'),
 (23, 'textlink2'),
 (24, 'textlink3'),
-(25, 'description')");
+(25, 'description'),
+(26, 'traffic_id'),
+(27, 'country_code')");
 
                // Insert error code types
                // - Affiliate id or interface password wrong
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_error_types` (`network_code`) VALUES ('AFF_ID_PASS_WRONG')");
-               // - Webmaster's site id is not assigned (invalid, different affiliate id)
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_error_types` (`network_code`) VALUES ('SITE_ID_NOT_ASSIGNED')");
-               // - Webmaster's site id is locked
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_error_types` (`network_code`) VALUES ('SITE_ID_LOCKED')");
-               // - General error in interface data
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_error_types` (`network_code`) VALUES ('INTERFACE_DATA_ERROR')");
-               // - Request amount depleted
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_error_types` (`network_code`) VALUES ('REQUESTS_DEPLETED')");
-               // - No campaigns found for given criteria (but maybe there are with more widen criteria)
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_error_types` (`network_code`) VALUES ('NO_CAMPAIGNS_FOUND')");
-               // - No campaigns found with allowed interface output (but there are maybe non-interface campaigns)
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_error_types` (`network_code`) VALUES ('NO_CAMPAIGNS_FOUND_INTERFACE')");
-               // - Webmaster's site id is not unlocked for choosen type
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_error_types` (`network_code`) VALUES ('SITE_ID_NOT_ALLOWED_TYPE')");
-               // - Request parameters incomplete
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_error_types` (`network_code`) VALUES ('REQUEST_PARAMETER_INCOMPLETE')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_error_types` (`network_code_id`, `network_code`) VALUES
+(1, 'AFF_ID_PASS_WRONG'),
+(2, 'SITE_ID_NOT_ASSIGNED'),
+(3, 'SITE_ID_LOCKED'),
+(4, 'INTERFACE_DATA_ERROR'),
+(5, 'REQUESTS_DEPLETED'),
+(6, 'NO_CAMPAIGNS_FOUND'),
+(7, 'NO_CAMPAIGNS_FOUND_INTERFACE'),
+(8, 'SITE_ID_NOT_ALLOWED_TYPE'),
+(9, 'REQUEST_PARAMETER_INCOMPLETE')");
 
                // Sponsor networks
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_data` (`network_short_name`, `network_title`, `network_reflink`, `network_data_seperator`, `network_row_seperator`, `network_request_type`, `network_charset`) VALUES
@@ -349,16 +345,16 @@ PRIMARY KEY (`network_reload_id`)
 
                // Network type handlers - Ads4Webbis
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`, `network_id`, `network_type_handle`, `network_type_api_url`, `network_type_click_url`, `network_type_banner_url`) VALUES
-(20, 7, 'banner_click', 'http://www.ads4webbis.de/interface/', 'http://www.ads4webbis.de/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.ads4webbis.de/codes/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%'),
+(20, 7, 'banner_click', 'http://www.ads4webbis.de/interface/', 'http://www.ads4webbis.de/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%tid%', 'http://www.ads4webbis.de/codes/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%'),
 (19, 7, 'banner_view', 'http://www.ads4webbis.de/interface/', 'http://www.ads4webbis.de/codes/bannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.ads4webbis.de/codes/bannerview.php?id=%UID%&bid=%CID%&aid=%SID%'),
-(22, 7, 'button_view', 'http://www.ads4webbis.de/interface/', 'http://www.ads4webbis.de/codes/buttonklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.ads4webbis.de/codes/buttonview.php?id=%UID%&bid=%CID%&aid=%SID%'),
-(17, 7, 'forcedbanner', 'http://www.ads4webbis.de/interface/', 'http://www.ads4webbis.de/codes/forcedbannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.ads4webbis.de/codes/forcedbannerview.php?id=%UID%&bid=%CID%&aid=%SID%'),
-(18, 7, 'forcedtextlink', 'http://www.ads4webbis.de/interface/', 'http://www.ads4webbis.de/codes/forcedtextlinkklick.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
-(24, 7, 'popup', 'http://www.ads4webbis.de/interface/', 'http://www.ads4webbis.de/codes/popup.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
-(21, 7, 'skybanner_view', 'http://www.ads4webbis.de/interface/', 'http://www.ads4webbis.de/codes/skybannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.ads4webbis.de/codes/skybannerview.php?id=%UID%&bid=%CID%&aid=%SID%'),
-(23, 7, 'textlink_view', 'http://www.ads4webbis.de/interface/', 'http://www.ads4webbis.de/codes/textlinkview.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
-(25, 7, 'textmail', 'http://www.ads4webbis.de/interface/', 'http://www.ads4webbis.de/codes/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
-(120, 7, 'traffic', 'http://www.ads4webbis.de/interface/', 'http://www.ads4webbis.de/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%', NULL)");
+(22, 7, 'button_view', 'http://www.ads4webbis.de/interface/', 'http://www.ads4webbis.de/codes/buttonklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%tid%', 'http://www.ads4webbis.de/codes/buttonview.php?id=%UID%&bid=%CID%&aid=%SID%'),
+(17, 7, 'forcedbanner', 'http://www.ads4webbis.de/interface/', 'http://www.ads4webbis.de/codes/forcedbannerklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%tid%', 'http://www.ads4webbis.de/codes/forcedbannerview.php?id=%UID%&bid=%CID%&aid=%SID%'),
+(18, 7, 'forcedtextlink', 'http://www.ads4webbis.de/interface/', 'http://www.ads4webbis.de/codes/forcedtextlinkklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%tid%', NULL),
+(24, 7, 'popup', 'http://www.ads4webbis.de/interface/', 'http://www.ads4webbis.de/codes/popup.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%tid%', NULL),
+(21, 7, 'skybanner_view', 'http://www.ads4webbis.de/interface/', 'http://www.ads4webbis.de/codes/skybannerklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%tid%', 'http://www.ads4webbis.de/codes/skybannerview.php?id=%UID%&bid=%CID%&aid=%SID%'),
+(23, 7, 'textlink_view', 'http://www.ads4webbis.de/interface/', 'http://www.ads4webbis.de/codes/textlinkview.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%tid%', NULL),
+(25, 7, 'textmail', 'http://www.ads4webbis.de/interface/', 'http://www.ads4webbis.de/codes/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%tid%', NULL),
+(120, 7, 'traffic', 'http://www.ads4webbis.de/interface/', 'http://www.ads4webbis.de/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%tid%', NULL)");
 
                // Network type handlers - Ads4World
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`, `network_id`, `network_type_handle`, `network_type_api_url`, `network_type_click_url`, `network_type_banner_url`) VALUES
@@ -2244,10 +2240,173 @@ PRIMARY KEY (`network_reload_id`)
                // API array elements - ADCocktail
 
                // API array elements - AdPaid
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_api_id`, `network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES
+(182, 5, 177, 7, 1),
+(183, 5, 177, 2, 2),
+(184, 5, 177, 3, 3),
+(185, 5, 177, 4, 4),
+(186, 5, 177, 5, 5),
+(187, 5, 177, 6, 6),
+(188, 5, 177, 8, 7),
+(189, 5, 177, 10, 8),
+(190, 5, 178, 11, 1),
+(191, 5, 178, 2, 2),
+(192, 5, 178, 9, 3),
+(193, 5, 178, 4, 4),
+(194, 5, 178, 5, 5),
+(195, 5, 178, 6, 6),
+(196, 5, 179, 12, 1),
+(197, 5, 179, 2, 2),
+(198, 5, 179, 3, 3),
+(199, 5, 179, 4, 4),
+(200, 5, 179, 5, 5),
+(201, 5, 179, 6, 6),
+(202, 5, 179, 8, 7),
+(203, 5, 180, 7, 1),
+(204, 5, 180, 2, 2),
+(205, 5, 180, 3, 3),
+(206, 5, 180, 4, 4),
+(207, 5, 180, 5, 5),
+(208, 5, 180, 6, 6),
+(209, 5, 180, 10, 7),
+(210, 5, 180, 8, 8),
+(211, 5, 181, 13, 1),
+(212, 5, 181, 2, 2),
+(213, 5, 181, 4, 3),
+(214, 5, 181, 5, 4),
+(215, 5, 181, 6, 5),
+(216, 5, 181, 10, 6),
+(217, 5, 181, 9, 7),
+(218, 5, 182, 14, 1),
+(219, 5, 182, 2, 2),
+(220, 5, 182, 4, 3),
+(221, 5, 182, 5, 4),
+(222, 5, 182, 6, 5),
+(223, 5, 183, 15, 1),
+(224, 5, 183, 2, 2),
+(225, 5, 183, 4, 3),
+(226, 5, 183, 5, 4),
+(227, 5, 183, 6, 5),
+(228, 5, 183, 10, 6),
+(229, 5, 185, 17, 1),
+(230, 5, 185, 2, 2),
+(231, 5, 185, 6, 3),
+(232, 5, 185, 19, 4),
+(233, 5, 185, 20, 5),
+(234, 5, 185, 21, 6),
+(235, 5, 185, 22, 7),
+(236, 5, 185, 23, 8),
+(237, 5, 185, 9, 9)");
 
                // API array elements - Ads4.de
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_api_id`, `network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES
+(239, 6, 14, 7, 1),
+(240, 6, 14, 2, 2),
+(241, 6, 14, 6, 3),
+(242, 6, 14, 4, 4),
+(243, 6, 14, 5, 5),
+(244, 6, 14, 10, 6),
+(245, 6, 15, 13, 1),
+(246, 6, 15, 2, 2),
+(247, 6, 15, 6, 3),
+(248, 6, 15, 4, 4),
+(249, 6, 15, 5, 5),
+(250, 6, 15, 10, 6),
+(251, 6, 16, 13, 1),
+(252, 6, 16, 2, 2),
+(253, 6, 16, 6, 3),
+(254, 6, 16, 4, 4),
+(255, 6, 16, 5, 5),
+(256, 6, 16, 10, 6),
+(257, 6, 119, 26, 1),
+(258, 6, 119, 2, 2),
+(259, 6, 119, 6, 3),
+(260, 6, 119, 4, 4),
+(261, 6, 119, 5, 5),
+(262, 6, 119, 10, 6)");
 
                // API array elements - Ads4Webbis
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_api_id`, `network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES
+(263, 7, 20, 1, 1),
+(264, 7, 20, 2, 2),
+(265, 7, 20, 4, 3),
+(266, 7, 20, 5, 4),
+(267, 7, 20, 6, 5),
+(268, 7, 20, 10, 6),
+(269, 7, 20, 9, 7),
+(270, 7, 20, 27, 8),
+(271, 7, 19, 1, 1),
+(272, 7, 19, 2, 2),
+(273, 7, 19, 4, 3),
+(274, 7, 19, 5, 4),
+(275, 7, 19, 6, 5),
+(276, 7, 19, 10, 6),
+(277, 7, 19, 9, 7),
+(278, 7, 19, 27, 8),
+(279, 7, 22, 1, 1),
+(280, 7, 22, 2, 2),
+(281, 7, 22, 4, 3),
+(282, 7, 22, 5, 4),
+(283, 7, 22, 6, 5),
+(284, 7, 22, 10, 6),
+(285, 7, 22, 9, 7),
+(286, 7, 22, 27, 8),
+(287, 7, 17, 1, 1),
+(288, 7, 17, 2, 2),
+(289, 7, 17, 4, 3),
+(290, 7, 17, 5, 4),
+(291, 7, 17, 6, 5),
+(292, 7, 17, 10, 6),
+(293, 7, 17, 9, 7),
+(294, 7, 17, 27, 8),
+(295, 7, 18, 1, 1),
+(296, 7, 18, 2, 2),
+(297, 7, 18, 4, 3),
+(298, 7, 18, 5, 4),
+(299, 7, 18, 6, 5),
+(300, 7, 18, 10, 6),
+(301, 7, 18, 9, 7),
+(302, 7, 18, 27, 8),
+(303, 7, 24, 1, 1),
+(304, 7, 24, 2, 2),
+(305, 7, 24, 4, 3),
+(306, 7, 24, 5, 4),
+(307, 7, 24, 6, 5),
+(308, 7, 24, 10, 6),
+(309, 7, 24, 9, 7),
+(310, 7, 24, 27, 8),
+(311, 7, 21, 1, 1),
+(312, 7, 21, 2, 2),
+(313, 7, 21, 4, 3),
+(314, 7, 21, 5, 4),
+(315, 7, 21, 6, 5),
+(316, 7, 21, 10, 6),
+(317, 7, 21, 9, 7),
+(318, 7, 21, 27, 8),
+(319, 7, 23, 1, 1),
+(320, 7, 23, 2, 2),
+(321, 7, 23, 4, 3),
+(322, 7, 23, 5, 4),
+(323, 7, 23, 6, 5),
+(324, 7, 23, 10, 6),
+(325, 7, 23, 9, 7),
+(326, 7, 23, 27, 8),
+(327, 7, 25, 1, 1),
+(328, 7, 25, 2, 2),
+(329, 7, 25, 4, 3),
+(330, 7, 25, 5, 4),
+(331, 7, 25, 6, 5),
+(332, 7, 25, 10, 6),
+(333, 7, 25, 9, 7),
+(334, 7, 25, 27, 8),
+(365, 7, 120, 1, 1),
+(336, 7, 120, 2, 2),
+(337, 7, 120, 4, 3),
+(338, 7, 120, 5, 4),
+(339, 7, 120, 6, 5),
+(340, 7, 120, 10, 6),
+(341, 7, 120, 9, 7),
+(342, 7, 120, 27, 8)");
 
                // API array elements - Ads4World
 
@@ -2281,10 +2440,6 @@ PRIMARY KEY (`network_reload_id`)
 
                // API array elements - Yoo!Media
 
-               // Fix empty defaults to NULL
-               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_network_types` SET `network_type_banner_url`=NULL WHERE `network_type_banner_url`=''");
-               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_network_request_params` SET `request_param_default`=NULL WHERE `request_param_default`=''");
-
                // Admin menu entries
                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_networks','API-Daten','Stellen Sie Ihre Affiliate- Webseiten-Id und API-Passwort ein. Diese erhalten Sie zu &uuml;ber 99% aus dem jeweiligen Zugangsbereich des Anbieters. Sollten Sie bei einem Netzwerk noch nicht angemeldet sein, verwenden Sie bitte meinen Referal-Link.',1);

diff --git a/inc/language/network_de.php b/inc/language/network_de.php
index ce3345cd27de0cd48a028b9e670907752d3a87a8..9cdceb27a6f53a781951de05bab364f78a15b089 100644 (file)
--- a/inc/language/network_de.php
+++ b/inc/language/network_de.php
@@ -201,6 +201,7 @@ addMessages(array(
        'ADMIN_NETWORK_REQUEST_PARAMETER_SIZE' => "Werbemittelgrösse",
        'ADMIN_NETWORK_REQUEST_PARAMETER_EROTIC' => "Erotik erlaubt",
        'ADMIN_NETWORK_REQUEST_PARAMETER_EXTRA' => "Extra-Parameter",
+       'ADMIN_NETWORK_REQUEST_PARAMETER_COUNTRY' => "Ländercode",
        // - API array index translation
        'ADMIN_NETWORK_API_TRANSLATION_INDEX' => "Neuen Array-Index eintragen",
        'ADMIN_NETWORK_API_TRANSLATION_INDEX_TRANSLATION' => "Index-Übersetzung auswählen",
@@ -226,6 +227,7 @@ addMessages(array(
        'ADMIN_NETWORK_TRANSLATE_POPDOWN_ID_NAME' => "PopDown-Id",
        'ADMIN_NETWORK_TRANSLATE_LEAD_ID_NAME' => "Lead-Id",
        'ADMIN_NETWORK_TRANSLATE_SALE_ID_NAME' => "Sale-Id",
+       'ADMIN_NETWORK_TRANSLATE_TRAFFIC_ID_NAME' => "Traffic-Id",
        'ADMIN_NETWORK_TRANSLATE_ID_NAME' => "Kampagnen-Id",
        'ADMIN_NETWORK_TRANSLATE_MINIMUM_STAY_NAME' => "Mindestauffenthalt",
        'ADMIN_NETWORK_TRANSLATE_NAME_NAME' => "Kampagnen-Name",
@@ -241,6 +243,7 @@ addMessages(array(
        'ADMIN_NETWORK_TRANSLATE_TEXTLINK2_NAME' => "Textlink 2",
        'ADMIN_NETWORK_TRANSLATE_TEXTLINK3_NAME' => "Textlink 3",
        'ADMIN_NETWORK_TRANSLATE_DESCRIPTION_NAME' => "Beschreibung",
+       'ADMIN_NETWORK_TRANSLATE_COUNTRY_CODE_NAME' => "Ländercode",
 ));
 
 // [EOF]

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index f0ccb45981a82c9ffd4b93dd8559082729d0b478..95bba01b5cc79440cd29f03b3d75fc5b2bcd3650 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -544,7 +544,8 @@ function generateNetworkRequestKeyOptions ($key) {
                                'reward',
                                'size',
                                'erotic',
-                               'extra'
+                               'extra',
+                               'country'
                        ),
                        array(
                                '{--ADMIN_NETWORK_REQUEST_PARAMETER_ID--}',
@@ -560,7 +561,8 @@ function generateNetworkRequestKeyOptions ($key) {
                                '{--ADMIN_NETWORK_REQUEST_PARAMETER_REWARD--}',
                                '{--ADMIN_NETWORK_REQUEST_PARAMETER_SIZE--}',
                                '{--ADMIN_NETWORK_REQUEST_PARAMETER_EROTIC--}',
-                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_EXTRA--}'
+                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_EXTRA--}',
+                               '{--ADMIN_NETWORK_REQUEST_PARAMETER_COUNTRY--}'
                        ),
                        $key,
                        '', '',

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 c1a66085a50674c61802f6d2d317b9f34d2055e2..bd0dc49c77777e000104ddd7a0f616f41adb66de 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={%pipe,getRequestParameter=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={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title 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 3e498d987a5b3f4a26f1f37b1038fcf0234bf695..2d82a246c4e466134863163a2871d88c6610adc3 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={%pipe,getRequestParameter=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={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title 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 d3803a78185ff88099a3f6c1eca949b1102e7026..7a0526c47ff421d125b05f55c3a4246ebf376d54 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={%pipe,getRequestParameter=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={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td class="admin_title bottom" colspan="2" align="center">
@@ -13,7 +13,7 @@
                <td align="right" width="250">{--ADMIN_NETWORK_TYPES_HANDLE--}:</td>
                <td>
                        <select name="network_type_handle" class="admin_select" size="1">
-                               {%pipe,generateNetworkTypeOptions={%pipe,getRequestParameter=network_type_id%}%}
+                               {%pipe,generateNetworkTypeOptions={%get=network_type_id%}%}
                        </select>
                </td>
        </tr>

diff --git a/templates/de/html/admin/admin_del_network_params.tpl b/templates/de/html/admin/admin_del_network_params.tpl
index daaf3cede4f51f445625684ac34d6700c85954fa..b0cc4c844142e43e134131ebe31ef0d4317b1c8a 100644 (file)
--- a/templates/de/html/admin/admin_del_network_params.tpl
+++ b/templates/de/html/admin/admin_del_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;network={%pipe,getRequestParameter=network%}&amp;do=remove_network_param%}" 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={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td align="center" class="admin_title bottom" height="25" colspan="2">

diff --git a/templates/de/html/admin/admin_del_network_types.tpl b/templates/de/html/admin/admin_del_network_types.tpl
index a56047065110a37c393d7ae142ebdeeb9fa968cc..51380332b23a3c9ed2d37759f2d7c1b44175f185 100644 (file)
--- a/templates/de/html/admin/admin_del_network_types.tpl
+++ b/templates/de/html/admin/admin_del_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;network={%pipe,getRequestParameter=network%}&amp;do=remove_network_type%}" 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={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td align="center" class="admin_title 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 b9075d47550b12a37e28df6b4f86bae8508312ab..a66236fdc30a21d2688bc818bd8bce6faa8fe70c 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;network={%pipe,getRequestParameter=network%}&amp;do=change_network_param%}" 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={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td align="center" class="admin_title bottom" height="25" colspan="2">

diff --git a/templates/de/html/admin/admin_edit_network_types.tpl b/templates/de/html/admin/admin_edit_network_types.tpl
index 8dc65f5bd60eda371b2890705b44d794b34afd15..5cffb182fb0d79971da21bb4a0784ced4cf862a8 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;network={%pipe,getRequestParameter=network%}&amp;do=change_network_type%}" 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={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td align="center" class="admin_title 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 527f771a14d96a2d55c27743af34c84f93848010..66087bc5874440739584c27d3dec1e03725d58dc 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;network={%pipe,getRequestParameter=network%}&amp;do=handle_api_translation%}" 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={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="5" align="center" class="admin_title bottom">

diff --git a/templates/de/html/admin/admin_list_network_params.tpl b/templates/de/html/admin/admin_list_network_params.tpl
index 151cecc2ccd97de918b5a5c96d4994b768abc0b4..9f8faac97c63a3267a77d7d77f40a57601f793e4 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;network={%pipe,getRequestParameter=network%}&amp;do=handle_request_params%}" 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={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="5" align="center" class="admin_title bottom">

diff --git a/templates/de/html/admin/admin_list_network_types.tpl b/templates/de/html/admin/admin_list_network_types.tpl
index ad54ee93a945897a91852e9b43b60646267631b9..4b0f4291f2b698f1096eefbf68f65e6a33e2b274 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;network={%pipe,getRequestParameter=network%}&amp;do=handle_network_type%}" 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={%get=network%}%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="admin_table dashed">
        <tr>
                <td colspan="5" align="center" class="admin_title bottom">

diff --git a/templates/de/html/js/js_surfbar_stopped.tpl b/templates/de/html/js/js_surfbar_stopped.tpl
index 800e246c1ba66c09dd52cfa6eda8ec1c2cc70b60..2ca1f606185da78a09c4d722052bf2911f2a99a0 100644 (file)
--- a/templates/de/html/js/js_surfbar_stopped.tpl
+++ b/templates/de/html/js/js_surfbar_stopped.tpl
@@ -13,7 +13,7 @@ function showButton () {
 
 function counter () {
        if (countDown == 0) {
-               if ({%pipe,getRequestParameter=autostart%} == true) {
+               if ({%get=autostart%} == true) {
                        restart();
                } else {
                        showButton();