Extension ext-network continued:

- Fixed a lot array indexes (27->41)
- Added advertising network 'Crystall' (only Klammlose)
- Internal TODO closed: All api_2.php scripts with parameter "&vc=" are sending
  8 array elements, but 7th is empty if not used
- TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index ce8826bfa3c2b49ac3f45dec8ec4d695f534fd27..911faf5076abe1c78100521757b2c1907d8a995a 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -24,23 +24,22 @@
 ./inc/extensions/ext-network.php:23: * @TODO Affiliblatt: Layer requires script in head                     *
 ./inc/extensions/ext-network.php:24: * @TODO Affiliblatt: Textlinks, popup, popunder, HTML mail, lead       *
 ./inc/extensions/ext-network.php:25: * @TODO AllAds4You: Traffic from abroad, High-Forced banner            *
-./inc/extensions/ext-network.php:26: * @TODO eu-ADS/WeltPromotion: Text for banner/buttons?                 *
-./inc/extensions/ext-network.php:27: * @TODO FuCoExSponsor: Textlink-View is JavaScript!                    *
-./inc/extensions/ext-network.php:28: * @TODO Fusion-Ads: Has click/banner URL in API response               *
-./inc/extensions/ext-network.php:29: * @TODO GeldSponsor.de Requires ID card copy/business reg.             *
-./inc/extensions/ext-network.php:30: * @TODO GolloX: Which charset?                                         *
-./inc/extensions/ext-network.php:31: * @TODO paid4ad: Which URLs for click and banner?                      *
-./inc/extensions/ext-network.php:32: * @TODO SuperPromo24: HighForced banner, leader board, mini/page layer *
-./inc/extensions/ext-network.php:33: * @TODO SuperPromo24: Textlink view is a JavaScript                    *
-./inc/extensions/ext-network.php:34: * @TODO Der Werbepartner.cc: Banner click/view is JavaScript!          *
-./inc/extensions/ext-network.php:35: * @TODO Der Werbepartner.cc: Forced textlink not correct               *
-./inc/extensions/ext-network.php:36: * @TODO Der Werbepartner.cc: Layer not correct                         *
-./inc/extensions/ext-network.php:37: * @TODO Der Werbepartner.cc: Sky banner is JavaScript!                 *
-./inc/extensions/ext-network.php:38: * @TODO Der Werbepartner.cc: Surfbar click not correct                 *
-./inc/extensions/ext-network.php:39: * @TODO Der Werbepartner.cc: Textlink not not correct                  *
-./inc/extensions/ext-network.php:40: * @TODO Xijide: Lead/Sale (together) unsupported (no target URL)       *
-./inc/extensions/ext-network.php:41: * @TODO Yoo!Media: What is LayerAd compared to Layer click?            *
-./inc/extensions/ext-network.php:98:           // @TODO network_type_handler is an internal name and needs documentation
+./inc/extensions/ext-network.php:26: * @TODO FuCoExSponsor: Textlink-View is JavaScript!                    *
+./inc/extensions/ext-network.php:27: * @TODO Fusion-Ads: Has click/banner URL in API response               *
+./inc/extensions/ext-network.php:28: * @TODO GeldSponsor.de Requires ID card copy/business reg.             *
+./inc/extensions/ext-network.php:29: * @TODO GolloX: Which charset?                                         *
+./inc/extensions/ext-network.php:30: * @TODO paid4ad: Which URLs for click and banner?                      *
+./inc/extensions/ext-network.php:31: * @TODO SuperPromo24: HighForced banner, leader board, mini/page layer *
+./inc/extensions/ext-network.php:32: * @TODO SuperPromo24: Textlink view is a JavaScript                    *
+./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 Xijide: Lead/Sale (together) unsupported (no target URL)       *
+./inc/extensions/ext-network.php:40: * @TODO Yoo!Media: What is LayerAd compared to Layer click?            *
+./inc/extensions/ext-network.php:97:           // @TODO network_type_handler is an internal name and needs documentation
 ./inc/extensions/ext-newsletter.php:218:               // @TODO Move these into configuration
 ./inc/extensions/ext-nickname.php:52:          // @TODO NOT NULL DEFAULT '' is bad practice, use NULL
 ./inc/extensions/ext-yoomedia.php:121:         // @TODO Can this be moved into a database table?

diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php
index 19403377ba1c2c147aff82d680a15c69cde935df..5a0ddb8c942ca1021e963b9ea2b54b3ce609884b 100644 (file)
--- a/inc/extensions/ext-network.php
+++ b/inc/extensions/ext-network.php
@@ -23,7 +23,6 @@
  * @TODO Affiliblatt: Layer requires script in head                     *
  * @TODO Affiliblatt: Textlinks, popup, popunder, HTML mail, lead       *
  * @TODO AllAds4You: Traffic from abroad, High-Forced banner            *
- * @TODO eu-ADS/WeltPromotion: Text for banner/buttons?                 *
  * @TODO FuCoExSponsor: Textlink-View is JavaScript!                    *
  * @TODO Fusion-Ads: Has click/banner URL in API response               *
  * @TODO GeldSponsor.de Requires ID card copy/business reg.             *
@@ -373,7 +372,8 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 ('ads2webbi', 'Ads2Webbi', 'http://www.ads2webbi.de?ref=79', '|', '|', 'GET', 'WINDOWS-1252', 'N', 200, 'Y'),
 ('super_promo24', 'SuperPromo24', 'http://www.superpromo24.de/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1', 'N', 300, 'Y'),
 ('eu_ads', 'eu-ADS.de', 'http://www.eu-ads.de?ref=411', '|', '|', 'GET', 'ISO-8859-1', 'N', 200, 'Y'),
-('xiji', 'Xiji.de', 'http://www.xiji.de/index.php?ref=7715', '|', '|', 'GET', 'ISO-8859-1', 'N', 100, 'Y')");
+('xiji', 'Xiji.de', 'http://www.xiji.de/index.php?ref=7715', '|', '|', 'GET', 'ISO-8859-1', 'N', 100, 'Y'),
+('crystall', 'Crystall Werbenetzwerk', 'http://www.crystall.de?ref=1575', '|', '|', 'GET', 'ISO-8859-1', 'N', 200, 'Y')");
 
                // 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`, `network_text_encoding`) VALUES
@@ -727,6 +727,19 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (221, 24, 'textmail', 'http://www.city-ads.de/interface/api_2.php', 'http://www.city-ads.de/codes/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%&vc=%VPC%', NULL, 'h', 'NONE'),
 (219, 24, 'traffic', 'http://www.city-ads.de/interface/api_2.php', 'http://www.city-ads.de/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%&vc=%VPC%', NULL, 'h', 'NONE')");
 
+               // Network type handlers - Crystall
+               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`, `network_text_encoding`) VALUES
+(538, 44, 'forced_banner', 'http://www.crystall.de/interface/api_2.php', 'http://www.crystall.de/codes/forcedbannerklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%&vc=%VPC%', 'http://www.crystall.de/codes/forcedbannerview.php?id=%UID%&bid=%CID%&aid=%SID%', 'h','NONE'),
+(539, 44, 'forced_textlink', 'http://www.crystall.de/interface/api_2.php', 'http://www.crystall.de/codes/forcedtextlinkklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%&vc=%VPC%', NULL, 'h','NONE'),
+(540, 44, 'banner_view', 'http://www.crystall.de/interface/api_2.php', 'http://www.crystall.de/codes/bannerklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%&vc=%VPC%', 'http://www.crystall.de/codes/bannerview.php?id=%UID%&bid=%CID%&aid=%SID%', 'h','NONE'),
+(541, 44, 'banner_click', 'http://www.crystall.de/interface/api_2.php', 'http://www.crystall.de/codes/klickbanner.php?id=%CID%&bid=%CID%&aid=%SID%&trackid=%TID%&vc=%VPC%', 'http://www.crystall.de/codes/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'h','NONE'),
+(542, 44, 'skyscraper_view', 'http://www.crystall.de/interface/api_2.php', 'http://www.crystall.de/codes/skybannerklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%&vc=%VPC%', 'http://www.crystall.de/codes/skybannerview.php?id=%UID%&bid=%CID%&aid=%SID%', 'h','NONE'),
+(543, 44, 'button_view', 'http://www.crystall.de/interface/api_2.php', 'http://www.crystall.de/codes/buttonklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%&vc=%VPC%', 'http://www.crystall.de/codes/buttonview.php?id=%UID%&bid=%CID%&aid=%SID%', 'h','NONE'),
+(544, 44, 'textlink_view', 'http://www.crystall.de/interface/api_2.php', 'http://www.crystall.de/codes/textlinkview.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%&vc=%VPC%', NULL, 'h','NONE'),
+(545, 44, 'traffic', 'http://www.crystall.de/interface/api_2.php', 'http://www.crystall.de/codes/textlinkview.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%&vc=%VPC%', NULL, 'h','NONE'),
+(546, 44, 'popup', 'http://www.crystall.de/interface/api_2.php', 'http://www.crystall.de/codes/popup.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%&vc=%VPC%', NULL, 'h','NONE'),
+(547, 44, 'textmail', 'http://www.crystall.de/interface/api_2.php', 'http://www.crystall.de/codes/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%&vc=%VPC%', NULL, 'h','NONE')");
+
                // Network type handlers - doubleads
                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`, `network_text_encoding`) VALUES
 (232, 26, 'banner_click', 'http://www.doubleads.de/interface/out_banner.php', 'http://www.doubleads.de/bannerklf.php?id=%CID%', 'http://www.doubleads.de/banner.php?id=%CID%', 'h', 'NONE'),
@@ -3086,6 +3099,89 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (24, 221, 'reward', 'verguetung', NULL),
 (24, 221, 'minimum_stay', 'ma', NULL)");
 
+               // Request parameters per type handler - Crystall
+               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
+(44, 538, 'extra', 'art', 'forcedbanner'),
+(44, 538, 'affiliate_id', 'id', NULL),
+(44, 538, 'password', 'pw', NULL),
+(44, 538, 'remain_clicks', 'uebrig', NULL),
+(44, 538, 'reload', 'reload', NULL),
+(44, 538, 'reward', 'verguetung', NULL),
+(44, 538, 'minimum_stay', 'ma', NULL),
+(44, 538, 'site_id', 'siteid', NULL),
+(44, 539, 'extra', 'art', 'forcedbanner'),
+(44, 539, 'affiliate_id', 'id', NULL),
+(44, 539, 'password', 'pw', NULL),
+(44, 539, 'remain_clicks', 'uebrig', NULL),
+(44, 539, 'reload', 'reload', NULL),
+(44, 539, 'reward', 'verguetung', NULL),
+(44, 539, 'minimum_stay', 'ma', NULL),
+(44, 539, 'site_id', 'siteid', NULL),
+(44, 540, 'extra', 'art', 'forcedbanner'),
+(44, 540, 'affiliate_id', 'id', NULL),
+(44, 540, 'password', 'pw', NULL),
+(44, 540, 'remain_clicks', 'uebrig', NULL),
+(44, 540, 'reload', 'reload', NULL),
+(44, 540, 'reward', 'verguetung', NULL),
+(44, 540, 'minimum_stay', 'ma', NULL),
+(44, 540, 'site_id', 'siteid', NULL),
+(44, 541, 'extra', 'art', 'forcedbanner'),
+(44, 541, 'affiliate_id', 'id', NULL),
+(44, 541, 'password', 'pw', NULL),
+(44, 541, 'remain_clicks', 'uebrig', NULL),
+(44, 541, 'reload', 'reload', NULL),
+(44, 541, 'reward', 'verguetung', NULL),
+(44, 541, 'minimum_stay', 'ma', NULL),
+(44, 541, 'site_id', 'siteid', NULL),
+(44, 542, 'extra', 'art', 'forcedbanner'),
+(44, 542, 'affiliate_id', 'id', NULL),
+(44, 542, 'password', 'pw', NULL),
+(44, 542, 'remain_clicks', 'uebrig', NULL),
+(44, 542, 'reload', 'reload', NULL),
+(44, 542, 'reward', 'verguetung', NULL),
+(44, 542, 'minimum_stay', 'ma', NULL),
+(44, 542, 'site_id', 'siteid', NULL),
+(44, 543, 'extra', 'art', 'forcedbanner'),
+(44, 543, 'affiliate_id', 'id', NULL),
+(44, 543, 'password', 'pw', NULL),
+(44, 543, 'remain_clicks', 'uebrig', NULL),
+(44, 543, 'reload', 'reload', NULL),
+(44, 543, 'reward', 'verguetung', NULL),
+(44, 543, 'minimum_stay', 'ma', NULL),
+(44, 543, 'site_id', 'siteid', NULL),
+(44, 544, 'extra', 'art', 'forcedbanner'),
+(44, 544, 'affiliate_id', 'id', NULL),
+(44, 544, 'password', 'pw', NULL),
+(44, 544, 'remain_clicks', 'uebrig', NULL),
+(44, 544, 'reload', 'reload', NULL),
+(44, 544, 'reward', 'verguetung', NULL),
+(44, 544, 'minimum_stay', 'ma', NULL),
+(44, 544, 'site_id', 'siteid', NULL),
+(44, 545, 'extra', 'art', 'forcedbanner'),
+(44, 545, 'affiliate_id', 'id', NULL),
+(44, 545, 'password', 'pw', NULL),
+(44, 545, 'remain_clicks', 'uebrig', NULL),
+(44, 545, 'reload', 'reload', NULL),
+(44, 545, 'reward', 'verguetung', NULL),
+(44, 545, 'minimum_stay', 'ma', NULL),
+(44, 545, 'site_id', 'siteid', NULL),
+(44, 546, 'extra', 'art', 'forcedbanner'),
+(44, 546, 'affiliate_id', 'id', NULL),
+(44, 546, 'password', 'pw', NULL),
+(44, 546, 'remain_clicks', 'uebrig', NULL),
+(44, 546, 'reload', 'reload', NULL),
+(44, 546, 'reward', 'verguetung', NULL),
+(44, 546, 'minimum_stay', 'ma', NULL),
+(44, 546, 'site_id', 'siteid', NULL),
+(44, 547, 'extra', 'art', 'forcedbanner'),
+(44, 547, 'affiliate_id', 'id', NULL),
+(44, 547, 'password', 'pw', NULL),
+(44, 547, 'remain_clicks', 'uebrig', NULL),
+(44, 547, 'reload', 'reload', NULL),
+(44, 547, 'reward', 'verguetung', NULL),
+(44, 547, 'minimum_stay', 'ma', NULL),
+(44, 547, 'site_id', 'siteid', NULL)");
+
                // Request parameters per type handler - doubleads
                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
 (26, 232, 'affiliate_id', 'id', NULL),
@@ -5126,9 +5222,9 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (31, 311, 9, 7),
 (31, 311, 40, 8)");
 
-               // API array elements - AD-Magnet
+               // API array elements - Ad-Magnet
 
-               // API array elements - AD-Promotion
+               // API array elements - Ad-Promotion.net
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES
 (37, 367, 1, 1),
 (37, 367, 2, 2),
@@ -6112,7 +6208,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (7, 17, 6, 5),
 (7, 17, 10, 6),
 (7, 17, 9, 7),
-(7, 17, 27, 8),
+(7, 17, 41, 8),
 (7, 18, 1, 1),
 (7, 18, 2, 2),
 (7, 18, 4, 3),
@@ -6120,7 +6216,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (7, 18, 6, 5),
 (7, 18, 10, 6),
 (7, 18, 9, 7),
-(7, 18, 27, 8),
+(7, 18, 41, 8),
 (7, 19, 1, 1),
 (7, 19, 2, 2),
 (7, 19, 4, 3),
@@ -6128,7 +6224,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (7, 19, 6, 5),
 (7, 19, 10, 6),
 (7, 19, 9, 7),
-(7, 19, 27, 8),
+(7, 19, 41, 8),
 (7, 20, 1, 1),
 (7, 20, 2, 2),
 (7, 20, 4, 3),
@@ -6136,7 +6232,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (7, 20, 6, 5),
 (7, 20, 10, 6),
 (7, 20, 9, 7),
-(7, 20, 27, 8),
+(7, 20, 41, 8),
 (7, 21, 1, 1),
 (7, 21, 2, 2),
 (7, 21, 4, 3),
@@ -6144,7 +6240,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (7, 21, 6, 5),
 (7, 21, 10, 6),
 (7, 21, 9, 7),
-(7, 21, 27, 8),
+(7, 21, 41, 8),
 (7, 22, 1, 1),
 (7, 22, 2, 2),
 (7, 22, 4, 3),
@@ -6152,7 +6248,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (7, 22, 6, 5),
 (7, 22, 10, 6),
 (7, 22, 9, 7),
-(7, 22, 27, 8),
+(7, 22, 41, 8),
 (7, 23, 1, 1),
 (7, 23, 2, 2),
 (7, 23, 4, 3),
@@ -6160,7 +6256,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (7, 23, 6, 5),
 (7, 23, 10, 6),
 (7, 23, 9, 7),
-(7, 23, 27, 8),
+(7, 23, 41, 8),
 (7, 24, 1, 1),
 (7, 24, 2, 2),
 (7, 24, 4, 3),
@@ -6168,7 +6264,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (7, 24, 6, 5),
 (7, 24, 10, 6),
 (7, 24, 9, 7),
-(7, 24, 27, 8),
+(7, 24, 41, 8),
 (7, 25, 1, 1),
 (7, 25, 2, 2),
 (7, 25, 4, 3),
@@ -6176,7 +6272,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (7, 25, 6, 5),
 (7, 25, 10, 6),
 (7, 25, 9, 7),
-(7, 25, 27, 8),
+(7, 25, 41, 8),
 (7, 120, 1, 1),
 (7, 120, 2, 2),
 (7, 120, 4, 3),
@@ -6184,7 +6280,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (7, 120, 6, 5),
 (7, 120, 10, 6),
 (7, 120, 9, 7),
-(7, 120, 27, 8)");
+(7, 120, 41, 8)");
 
                // API array elements - Ads4World
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES
@@ -6560,6 +6656,81 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (12, 62, 36, 18),
 (12, 62, 9, 19)");
 
+               // API array elements - Crystall
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES
+(44, 538, 1, 1),
+(44, 538, 2, 2),
+(44, 538, 4, 3),
+(44, 538, 5, 4),
+(44, 538, 6, 5),
+(44, 538, 10, 6),
+(44, 538, 9, 7),
+(44, 539, 41, 8),
+(44, 540, 1, 1),
+(44, 540, 2, 2),
+(44, 540, 4, 3),
+(44, 540, 5, 4),
+(44, 540, 6, 5),
+(44, 540, 10, 6),
+(44, 540, 9, 7),
+(44, 540, 41, 8),
+(44, 541, 1, 1),
+(44, 541, 2, 2),
+(44, 541, 4, 3),
+(44, 541, 5, 4),
+(44, 541, 6, 5),
+(44, 541, 10, 6),
+(44, 541, 9, 7),
+(44, 541, 41, 8),
+(44, 542, 1, 1),
+(44, 542, 2, 2),
+(44, 542, 4, 3),
+(44, 542, 5, 4),
+(44, 542, 6, 5),
+(44, 542, 10, 6),
+(44, 542, 9, 7),
+(44, 542, 41, 8),
+(44, 543, 1, 1),
+(44, 543, 2, 2),
+(44, 543, 4, 3),
+(44, 543, 5, 4),
+(44, 543, 6, 5),
+(44, 543, 10, 6),
+(44, 543, 9, 7),
+(44, 543, 41, 8),
+(44, 544, 1, 1),
+(44, 544, 2, 2),
+(44, 544, 4, 3),
+(44, 544, 5, 4),
+(44, 544, 6, 5),
+(44, 544, 10, 6),
+(44, 544, 9, 7),
+(44, 544, 41, 8),
+(44, 545, 1, 1),
+(44, 545, 2, 2),
+(44, 545, 4, 3),
+(44, 545, 5, 4),
+(44, 545, 6, 5),
+(44, 545, 10, 6),
+(44, 545, 9, 7),
+(44, 545, 41, 8),
+(44, 546, 1, 1),
+(44, 546, 2, 2),
+(44, 546, 4, 3),
+(44, 546, 5, 4),
+(44, 546, 6, 5),
+(44, 546, 10, 6),
+(44, 546, 9, 7),
+(44, 546, 41, 8),
+(44, 547, 1, 1),
+(44, 547, 2, 2),
+(44, 547, 4, 3),
+(44, 547, 5, 4),
+(44, 547, 6, 5),
+(44, 547, 10, 6),
+(44, 547, 9, 7),
+(44, 547, 41, 8)");
+
                // API array elements - City-Ads
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES
 (24, 212, 1, 1),
@@ -6569,7 +6740,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (24, 212, 6, 5),
 (24, 212, 10, 6),
 (24, 212, 9, 7),
-(24, 212, 27, 8),
+(24, 212, 41, 8),
 (24, 213, 1, 1),
 (24, 213, 2, 2),
 (24, 213, 4, 3),
@@ -6577,7 +6748,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (24, 213, 6, 5),
 (24, 213, 10, 6),
 (24, 213, 9, 7),
-(24, 213, 27, 8),
+(24, 213, 41, 8),
 (24, 214, 1, 1),
 (24, 214, 2, 2),
 (24, 214, 4, 3),
@@ -6585,7 +6756,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (24, 214, 6, 5),
 (24, 214, 10, 6),
 (24, 214, 9, 7),
-(24, 214, 27, 8),
+(24, 214, 41, 8),
 (24, 215, 1, 1),
 (24, 215, 2, 2),
 (24, 215, 4, 3),
@@ -6593,7 +6764,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (24, 215, 6, 5),
 (24, 215, 10, 6),
 (24, 215, 9, 7),
-(24, 215, 27, 8),
+(24, 215, 41, 8),
 (24, 216, 1, 1),
 (24, 216, 2, 2),
 (24, 216, 4, 3),
@@ -6601,7 +6772,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (24, 216, 6, 5),
 (24, 216, 10, 6),
 (24, 216, 9, 7),
-(24, 216, 27, 8),
+(24, 216, 41, 8),
 (24, 217, 1, 1),
 (24, 217, 2, 2),
 (24, 217, 4, 3),
@@ -6609,7 +6780,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (24, 217, 6, 5),
 (24, 217, 10, 6),
 (24, 217, 9, 7),
-(24, 217, 27, 8),
+(24, 217, 41, 8),
 (24, 218, 1, 1),
 (24, 218, 2, 2),
 (24, 218, 4, 3),
@@ -6617,7 +6788,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (24, 218, 6, 5),
 (24, 218, 10, 6),
 (24, 218, 9, 7),
-(24, 218, 27, 8),
+(24, 218, 41, 8),
 (24, 219, 1, 1),
 (24, 219, 2, 2),
 (24, 219, 4, 3),
@@ -6625,7 +6796,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (24, 219, 6, 5),
 (24, 219, 10, 6),
 (24, 219, 9, 7),
-(24, 219, 27, 8),
+(24, 219, 41, 8),
 (24, 220, 1, 1),
 (24, 220, 2, 2),
 (24, 220, 4, 3),
@@ -6633,7 +6804,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (24, 220, 6, 5),
 (24, 220, 10, 6),
 (24, 220, 9, 7),
-(24, 220, 27, 8),
+(24, 220, 41, 8),
 (24, 221, 1, 1),
 (24, 221, 2, 2),
 (24, 221, 4, 3),
@@ -6641,7 +6812,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (24, 221, 6, 5),
 (24, 221, 10, 6),
 (24, 221, 9, 7),
-(24, 221, 27, 8)");
+(24, 221, 41, 8)");
 
                // API array elements - doubleads
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES
@@ -7084,7 +7255,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (15, 135, 6, 5),
 (15, 135, 10, 6),
 (15, 135, 9, 7),
-(15, 135, 27, 8),
+(15, 135, 41, 8),
 (15, 136, 1, 1),
 (15, 136, 2, 2),
 (15, 136, 4, 3),
@@ -7092,7 +7263,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (15, 136, 6, 5),
 (15, 136, 10, 6),
 (15, 136, 9, 7),
-(15, 136, 27, 8),
+(15, 136, 41, 8),
 (15, 137, 1, 1),
 (15, 137, 2, 2),
 (15, 137, 4, 3),
@@ -7100,7 +7271,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (15, 137, 6, 5),
 (15, 137, 10, 6),
 (15, 137, 9, 7),
-(15, 137, 27, 8),
+(15, 137, 41, 8),
 (15, 138, 1, 1),
 (15, 138, 2, 2),
 (15, 138, 4, 3),
@@ -7108,7 +7279,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (15, 138, 6, 5),
 (15, 138, 10, 6),
 (15, 138, 9, 7),
-(15, 138, 27, 8),
+(15, 138, 41, 8),
 (15, 139, 1, 1),
 (15, 139, 2, 2),
 (15, 139, 4, 3),
@@ -7116,7 +7287,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (15, 139, 6, 5),
 (15, 139, 10, 6),
 (15, 139, 9, 7),
-(15, 139, 27, 8),
+(15, 139, 41, 8),
 (15, 140, 1, 1),
 (15, 140, 2, 2),
 (15, 140, 4, 3),
@@ -7124,7 +7295,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (15, 140, 6, 5),
 (15, 140, 10, 6),
 (15, 140, 9, 7),
-(15, 140, 27, 8),
+(15, 140, 41, 8),
 (15, 141, 1, 1),
 (15, 141, 2, 2),
 (15, 141, 4, 3),
@@ -7132,7 +7303,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (15, 141, 6, 5),
 (15, 141, 10, 6),
 (15, 141, 9, 7),
-(15, 141, 27, 8),
+(15, 141, 41, 8),
 (15, 142, 1, 1),
 (15, 142, 2, 2),
 (15, 142, 4, 3),
@@ -7140,7 +7311,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (15, 142, 6, 5),
 (15, 142, 10, 6),
 (15, 142, 9, 7),
-(15, 142, 27, 8),
+(15, 142, 41, 8),
 (15, 143, 1, 1),
 (15, 143, 2, 2),
 (15, 143, 4, 3),
@@ -7148,7 +7319,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (15, 143, 6, 5),
 (15, 143, 10, 6),
 (15, 143, 9, 7),
-(15, 143, 27, 8),
+(15, 143, 41, 8),
 (15, 144, 1, 1),
 (15, 144, 2, 2),
 (15, 144, 4, 3),
@@ -7156,7 +7327,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (15, 144, 6, 5),
 (15, 144, 10, 6),
 (15, 144, 9, 7),
-(15, 144, 27, 8)");
+(15, 144, 41, 8)");
 
                // API array elements - Make-Euros.de
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES
@@ -7429,42 +7600,65 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (19, 93, 4, 3),
 (19, 93, 5, 4),
 (19, 93, 6, 5),
+(19, 93, 10, 6),
+(19, 93, 9, 7),
+(19, 93, 41, 8),
 (19, 94, 1, 1),
 (19, 94, 2, 2),
 (19, 94, 4, 3),
 (19, 94, 5, 4),
 (19, 94, 6, 5),
+(19, 94, 10, 6),
+(19, 94, 9, 7),
+(19, 94, 41, 8),
 (19, 95, 1, 1),
 (19, 95, 2, 2),
 (19, 95, 4, 3),
 (19, 95, 5, 4),
 (19, 95, 6, 5),
+(19, 95, 10, 6),
+(19, 95, 9, 7),
+(19, 95, 41, 8),
 (19, 96, 1, 1),
 (19, 96, 2, 2),
 (19, 96, 4, 3),
 (19, 96, 5, 4),
 (19, 96, 6, 5),
+(19, 96, 10, 6),
+(19, 96, 9, 7),
+(19, 96, 41, 8),
 (19, 97, 1, 1),
 (19, 97, 2, 2),
 (19, 97, 4, 3),
 (19, 97, 5, 4),
 (19, 97, 6, 5),
+(19, 97, 10, 6),
+(19, 97, 9, 7),
+(19, 97, 41, 8),
 (19, 98, 1, 1),
 (19, 98, 2, 2),
 (19, 98, 4, 3),
 (19, 98, 5, 4),
 (19, 98, 6, 5),
+(19, 98, 10, 6),
+(19, 98, 9, 7),
+(19, 98, 41, 8),
 (19, 99, 1, 1),
 (19, 99, 2, 2),
 (19, 99, 4, 3),
 (19, 99, 5, 4),
 (19, 99, 6, 5),
+(19, 99, 10, 6),
+(19, 99, 9, 7),
+(19, 99, 41, 8),
 (19, 100, 1, 1),
 (19, 100, 2, 2),
 (19, 100, 4, 3),
 (19, 100, 5, 4),
 (19, 100, 6, 5),
 (19, 100, 10, 6),
+(19, 100, 9, 7),
+(19, 100, 41, 8),
 (19, 101, 1, 1),
 (19, 101, 2, 2),
 (19, 101, 4, 3),
@@ -7472,11 +7666,15 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (19, 101, 6, 5),
 (19, 101, 10, 6),
 (19, 101, 9, 7),
+(19, 101, 41, 8),
 (19, 124, 1, 1),
 (19, 124, 2, 2),
 (19, 124, 4, 3),
 (19, 124, 5, 4),
-(19, 124, 6, 5)");
+(19, 124, 6, 5),
+(19, 124, 10, 6),
+(19, 124, 9, 7),
+(19, 124, 41, 8)");
 
                // API array elements - SuperPromo24
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES
@@ -7568,56 +7766,71 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (41, 430, 6, 5),
 (41, 430, 10, 6)");
 
-               // API array elements - UltraPOMO
+               // API array elements - UltraPROMO
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES
 (21, 125, 1, 1),
 (21, 125, 2, 2),
 (21, 125, 4, 3),
 (21, 125, 5, 4),
 (21, 125, 6, 5),
+(21, 125, 10, 6),
+(21, 125, 9, 7),
 (21, 125, 41, 6),
 (21, 126, 1, 1),
 (21, 126, 2, 2),
 (21, 126, 4, 3),
 (21, 126, 5, 4),
 (21, 126, 6, 5),
+(21, 126, 10, 6),
+(21, 126, 9, 7),
 (21, 126, 41, 6),
 (21, 127, 1, 1),
 (21, 127, 2, 2),
 (21, 127, 4, 3),
 (21, 127, 5, 4),
 (21, 127, 6, 5),
+(21, 127, 10, 6),
+(21, 127, 9, 7),
 (21, 127, 41, 6),
 (21, 128, 1, 1),
 (21, 128, 2, 2),
 (21, 128, 4, 3),
 (21, 128, 5, 4),
 (21, 128, 6, 5),
+(21, 128, 10, 6),
+(21, 128, 9, 7),
 (21, 128, 41, 6),
 (21, 129, 1, 1),
 (21, 129, 2, 2),
 (21, 129, 4, 3),
 (21, 129, 5, 4),
 (21, 129, 6, 5),
+(21, 129, 10, 6),
+(21, 129, 9, 7),
 (21, 129, 41, 6),
 (21, 130, 1, 1),
 (21, 130, 2, 2),
 (21, 130, 4, 3),
 (21, 130, 5, 4),
 (21, 130, 6, 5),
-(21, 130, 10, 7),
+(21, 130, 10, 6),
+(21, 130, 9, 7),
 (21, 130, 41, 6),
 (21, 131, 1, 1),
 (21, 131, 2, 2),
 (21, 131, 4, 3),
 (21, 131, 5, 4),
 (21, 131, 6, 5),
+(21, 131, 10, 6),
+(21, 131, 9, 7),
 (21, 131, 41, 6),
 (21, 132, 1, 1),
 (21, 132, 2, 2),
 (21, 132, 4, 3),
 (21, 132, 5, 4),
 (21, 132, 6, 5),
+(21, 132, 10, 6),
+(21, 132, 9, 7),
 (21, 132, 41, 6),
 (21, 133, 1, 1),
 (21, 133, 2, 2),
@@ -7625,13 +7838,15 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (21, 133, 5, 4),
 (21, 133, 6, 5),
 (21, 133, 10, 6),
-(21, 133, 41, 7),
 (21, 133, 9, 7),
+(21, 133, 41, 8),
 (21, 134, 1, 1),
 (21, 134, 2, 2),
 (21, 134, 4, 3),
 (21, 134, 5, 4),
 (21, 134, 6, 5),
+(21, 134, 10, 6),
+(21, 134, 9, 7),
 (21, 134, 41, 6)");
 
                // API array elements - VIPads
@@ -7722,7 +7937,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (20, 202, 6, 5),
 (20, 202, 10, 6),
 (20, 202, 9, 7),
-(20, 202, 27, 8),
+(20, 202, 41, 8),
 (20, 203, 1, 1),
 (20, 203, 2, 2),
 (20, 203, 4, 3),
@@ -7730,7 +7945,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (20, 203, 6, 5),
 (20, 203, 10, 6),
 (20, 203, 9, 7),
-(20, 203, 27, 8),
+(20, 203, 41, 8),
 (20, 204, 1, 1),
 (20, 204, 2, 2),
 (20, 204, 4, 3),
@@ -7738,7 +7953,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (20, 204, 6, 5),
 (20, 204, 10, 6),
 (20, 204, 9, 7),
-(20, 204, 27, 8),
+(20, 204, 41, 8),
 (20, 205, 1, 1),
 (20, 205, 2, 2),
 (20, 205, 4, 3),
@@ -7746,14 +7961,14 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (20, 205, 6, 5),
 (20, 205, 10, 6),
 (20, 205, 9, 7),
-(20, 205, 27, 8),
+(20, 205, 41, 8),
 (20, 206, 1, 1),
 (20, 206, 2, 2),
 (20, 206, 4, 3),
 (20, 206, 5, 4),
 (20, 206, 10, 6),
 (20, 206, 9, 7),
-(20, 206, 27, 8),
+(20, 206, 41, 8),
 (20, 207, 1, 1),
 (20, 207, 2, 2),
 (20, 207, 4, 3),
@@ -7761,7 +7976,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (20, 207, 6, 5),
 (20, 207, 10, 6),
 (20, 207, 9, 7),
-(20, 207, 27, 8),
+(20, 207, 41, 8),
 (20, 208, 1, 1),
 (20, 208, 2, 2),
 (20, 208, 4, 3),
@@ -7769,7 +7984,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (20, 208, 6, 5),
 (20, 208, 10, 6),
 (20, 208, 9, 7),
-(20, 208, 27, 8),
+(20, 208, 41, 8),
 (20, 209, 1, 1),
 (20, 209, 2, 2),
 (20, 209, 4, 3),
@@ -7777,7 +7992,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (20, 209, 6, 5),
 (20, 209, 10, 6),
 (20, 209, 9, 7),
-(20, 209, 27, 8),
+(20, 209, 41, 8),
 (20, 210, 1, 1),
 (20, 210, 2, 2),
 (20, 210, 4, 3),
@@ -7785,7 +8000,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (20, 210, 6, 5),
 (20, 210, 10, 6),
 (20, 210, 9, 7),
-(20, 210, 27, 8),
+(20, 210, 41, 8),
 (20, 211, 1, 1),
 (20, 211, 2, 2),
 (20, 211, 4, 3),
@@ -7793,7 +8008,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
 (20, 211, 6, 5),
 (20, 211, 10, 6),
 (20, 211, 9, 7),
-(20, 211, 27, 8)");
+(20, 211, 41, 8)");
 
                // API array elements - Der Werbepartner.cc
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES
@@ -8055,7 +8270,7 @@ INDEX `provider_type` (`network_id`, `network_type_id`)",
                // 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_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', 'config_network_types', 'Werbearten', 'Stellen Sie hier Reload-Zeiten, Mindestauffenthalt und so weiter pro Werbeart und Werbenetzwerk ein. Sie m&uuml;ssen dies pro Werbeart-Handler f&uuml;r jedes Werbenetzwerk einstellen, das Sie abfragen m&ouml;chten.',2);
                addAdminMenuSql('network', 'config_network_vcheck', 'Verg&uuml;tungscheck', 'Aktivieren Sie hier den Verg&uuml;tungscheck (V-Check) oder richten Sie einen neuen Zugangsschl&uuml;ssel (&quot;Passwort&quot;) f&uuml;r das Werbenetzwerk ein. Nicht jedes Werbenetzwerk unterst&uuml;tzt dies! Am besten schauen Sie in Ihrem Affiliate-Bereich des jeweiligen Werbenetzwerkes nach, ob dort der Verg&uuml;tungscheck angeboten wird.',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.',4);
                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.',5);

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 05c7927de4707b35932ecacd154a8426eee25bba..0926ad274854a94b5505a1ab560df51681a5b6f2 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -2300,7 +2300,7 @@ function doAdminNetworkProcessChangeRequestParams () {
 }
 
 // Changes given network array translations
-function doAdminNetworkProcessChangeArrayTranslations () {
+function doAdminNetworkProcessChangeArrayTranslation () {
        // Is there selections?
        if (ifPostContainsSelections()) {
                // By default nothing is updated

diff --git a/inc/modules/admin/what-list_network_array_translation.php b/inc/modules/admin/what-list_network_array_translation.php
index 2c0d3a910ed19632f9e09db71b417a2b346d770b..071009f697f43097ac8f9474706bcb44ce36f406 100644 (file)
--- a/inc/modules/admin/what-list_network_array_translation.php
+++ b/inc/modules/admin/what-list_network_array_translation.php
@@ -103,7 +103,7 @@ WHERE
        ".$ADD."
 ORDER BY
        `t`.`network_type_handler` ASC,
-       `p`.`network_array_id` ASC",
+       `p`.`network_array_sort` ASC",
                array(
                        bigintval(getRequestElement('network_id'))
                ), __FILE__, __LINE__);

diff --git a/templates/de/html/admin/admin_edit_network_array_translation_row.tpl b/templates/de/html/admin/admin_edit_network_array_translation_row.tpl
index a49605e82c316147f982555901128bf2971e2acd..d833aea17c092f8b8c0a53bcf0dbd140acc95988 100644 (file)
--- a/templates/de/html/admin/admin_edit_network_array_translation_row.tpl
+++ b/templates/de/html/admin/admin_edit_network_array_translation_row.tpl
@@ -9,7 +9,7 @@
 </tr>
 
 <tr>
-       <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_CHANGE_NETWORK_ARRAY_TRANSLATION_INDEX_TRANSLATION--}</td>
+       <td class="{%template,ColorSwitch%}" style="padding-left:5px">{--ADMIN_NETWORK_ARRAY_INDEX_TRANSLATION--}</td>
        <td class="{%template,ColorSwitch%}">
                <select name="network_array_index[$content[network_array_id]]" class="form_select" size="1">
                        {%pipe,generateNetworkTranslationOptions=$content[network_array_index]%}