Extension ext-network continued:

- All max/min_foo renamed to maximum/minimum_foo (no shortcutting things)
- Advertising network AdProvi added
- Added the ability to deactivate networks (see code for possible reasons)
- Updated daily free requests for all setup networks
- TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 06ac478e67247fa25b5902a04d96c341937e170c..d7336d67211aea54dc9aabe8696af0705f30f618 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -36,7 +36,7 @@
 ./inc/extensions/ext-network.php:40: * @TODO Der Werbepartner.cc: Surfbar click not correct                 *
 ./inc/extensions/ext-network.php:41: * @TODO Der Werbepartner.cc: Textlink not not correct                  *
 ./inc/extensions/ext-network.php:42: * @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:99:           // @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-order.php:358:            // @TODO This should be moved out to inc/daily/
 ./inc/extensions/ext-rallye.php:341:           // @TODO Move this code into a hook

diff --git a/DOCS/de/network/README.txt b/DOCS/de/network/README.txt
index a78e850a94da588320677e9d8c7c9fca5b20d40a..35beb826f83f66bece7ac31e833a7b524fd2f5ca 100644 (file)
--- a/DOCS/de/network/README.txt
+++ b/DOCS/de/network/README.txt
@@ -25,19 +25,19 @@ http://www.anbieter-name.invalid/code/t-mail.php?id=%UID%&sid=%SID%&trackid=%TID
 
 Verwendete Abfrageparameter:
 ----------------------------
-currency = Waehrung
-erotic   = Ob Erotik-Kampagnen erlaubt oder nicht, oder exklusiv Erotik-Kampagnen holen
-extra    = Extra-Parameter, der sonst oben nicht passt
-id       = Kundennummer (Merchant-Id oder Account-Id)
-max_stay = Maximale Auffenthaltszeit
-min_stay = Minimale Auffenthaltszeit
-password = Interface-Passwort (nicht Account-Passwort)
-reload   = Maximale Reloadsperre in Sekunden (!) nach der gesucht werden soll
-remain   = Mindestanzahl an Klicks nach der gesucht werden soll
-reward   = Mindestverguetung nach der gesucht werden soll
-sid      = Webseiten-Id (Ihrer angemeldeten Webseite zugeordnete Id-Nummer)
-size     = Groesse des Werbemittels (bei Bannern, Buttons, evtl. Popup/-down)
-type     = Typ (z.B. text,html,view,klick)
+currency     = Waehrung
+erotic       = Ob Erotik-Kampagnen erlaubt oder nicht, oder exklusiv Erotik-Kampagnen holen
+extra        = Extra-Parameter, der sonst oben nicht passt
+id           = Kundennummer (Merchant-Id oder Account-Id)
+maximum_stay = Maximale Auffenthaltszeit
+minimum_stay = Minimale Auffenthaltszeit
+password     = Interface-Passwort (nicht Account-Passwort)
+reload       = Maximale Reloadsperre in Sekunden (!) nach der gesucht werden soll
+remain       = Mindestanzahl an Klicks nach der gesucht werden soll
+reward       = Mindestverguetung nach der gesucht werden soll
+sid          = Webseiten-Id (Ihrer angemeldeten Webseite zugeordnete Id-Nummer)
+size         = Groesse des Werbemittels (bei Bannern, Buttons, evtl. Popup/-down)
+type         = Typ (z.B. text,html,view,klick); darf nicht NULL sein
 
 -------------------------------------------------------------------------------
 

diff --git a/inc/extensions/ext-forced.php b/inc/extensions/ext-forced.php
index 9f4d27adfcfd47aeb1f7ec764f3713d7351484e4..8b0c25c241f1ddcae7531ca79626eb42b433f16a 100644 (file)
--- a/inc/extensions/ext-forced.php
+++ b/inc/extensions/ext-forced.php
@@ -86,7 +86,7 @@ INDEX (`forced_ads_userid`)",
 `forced_campaign_ordered_clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `forced_campaign_payment_api` FLOAT(20,5) UNSIGNED NULL DEFAULT NULL,
 `forced_campaign_reload_lock` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-`forced_campaign_min_stay` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`forced_campaign_minimum_stay` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `forced_ads_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `forced_campaign_userid` BIGINT(20) UNSIGNED NULL DEFAULT NULL,
 `forced_costs_id` BIGINT(20) UNSIGNED NULL DEFAULT NULL,

diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php
index a0ad2070a3fc94211702f030cd30b3a44c4cd071..9c2015be3e9bb41f06b62014b74b386109fd369f 100644 (file)
--- a/inc/extensions/ext-network.php
+++ b/inc/extensions/ext-network.php
@@ -90,6 +90,7 @@ switch (getExtensionMode()) {
 `network_charset` VARCHAR(20) NOT NULL DEFAULT 'UTF-8',
 `network_require_id_card` ENUM('Y','N') NOT NULL DEFAULT 'N',
 `network_query_amount` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`network_active` ENUM('Y','N') NOT NULL DEFAULT 'Y',
 PRIMARY KEY (`network_id`),
 UNIQUE (`network_short_name`)",
                        'Network data');
@@ -257,53 +258,58 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 ('allowed_countries')");
 
                // Sponsor networks
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_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
-('a3h', 'A3H', 'http://www.a3h.de?ref=1447', '|', '|', 'GET', 'WINDOWS-1252', 'N', 100),
-('abiszed','AbisZED-Netz','http://abiszed-netz.de/index.php?ref=557', '|', '|', 'GET', 'ISO-8859-1', 'Y', 0),
-('admagnet', 'AD-Magnet', 'http://www.ad-magnet.de/index.php?ref=495', '|', '|', 'GET', 'ISO-8859-1', 'N', 0),
-('adcocktail', 'ADCocktail', 'http://www.adcocktail.com/?rid=2596', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('adpaid', 'AdPaid', 'http://www.adpaid.de?ref=1464', '|', '|', 'GET', 'ISO-8859-1', 'N', 0),
-('ads4', 'Ads4.de', 'http://www.ads4.de/?werber=Quix0r', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('ads4webbis', 'Ads4Webbis', 'http://www.ads4webbis.de?ref=835', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('ads4world', 'Ads4World', 'http://www.ads4world.de?ref=252', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('affiliblatt', 'Affiliblatt', 'http://www.affiliblatt.de/?sid=MTAzNQ==&site=home', '|', '|', 'GET', 'UTF-8', 'N', 0),
-('allads4you', 'AllAds4You', 'http://www.allads4you.de?ref=1146', '|', '|', 'GET', 'ISO-8859-1', 'N', 0),
-('alstermarketing', 'Alster-Marketing', 'http://www.alstermarketing.de?ref=1851', '|', '|', 'GET', 'ISO-8859-16', 'N', 0),
-('bonus', 'BonusSponsor', 'http://www.bonussponsor.de?ref=1286', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('fusion', 'Fusion-Ads', 'http://www.fusion-ads.de/?ref=84', '|', '|', 'GET', 'ISO-8859-1', 'N', 0),
-('gigapromo', 'GigaPromo', 'http://www.gigapromo.de/index.php?ref=953', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('hpsponsor', 'HPSponsor', 'http://hpsponsor.at?ref=29', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('make-euros', 'Make-Euros.de', 'http://www.make-euros.de?ref=1184', '|', '|', 'GET', 'ISO-8859-1', 'N', 0),
-('megad', 'Mega-Ad', 'http://www.mega-ad.de/?ref=303', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('power-promo', 'Power-Promo', 'http://www.power-promo.de?ref=1231', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('secash', 'SeCash', 'http://www.secash.de?ref=758', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('weltpromotion', 'WeltPromotion', 'http://www.weltpromotion.de?ref=3', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('ultrapromo', 'UltraPROMO', 'http://www.ultrapromo.eu?ref=485', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('werbepartnercc', 'DerWerbepartner.cc', 'http://www.werbepartner.cc/sponsor/?ref=696', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('yoomedia', 'Yoo!Media', 'http://www.yoomedia.de?ref=1715', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('cityads', 'City-Ads', 'http://www.city-ads.de?ref=221', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('goldsponsor', 'Gold-Sponsor', 'http://www.gold-sponsor.de?ref=42', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('doubleads', 'doubleads.de', 'http://www.doubleads.de?ref=1063', '|', '|', 'GET', 'ISO-8859-1','Y', 0),
-('vipads', 'VIPads.de', 'http://vipads.de/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1', 'N', 0),
-('homeads', 'homeADS', 'http://www.homeads.de/?ref=1540', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('fucoexsponsor', 'FuCoExSponsor.net', 'http://fucoexsponsor.net/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1', 'N', 0),
-('adconvention', 'AdConvention', 'http://www.adconvention.de?ref=233', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('ad-hit', 'Ad-Hit.de', 'http://www.ad-hit.de?ref=41', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0),
-('adcity', 'AdCity.eu', 'http://www.adcity.eu?ref=38', '|', '|', 'GET', 'WINDOWS-1252', 'N', 200),
-('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),
-('ad-promotion-net', 'Ad-Promotion.net', 'http://ad-promotion.net?ref=10194', '|', '|', 'GET', 'WINDOWS-1252', 'N', 150)");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_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`,`network_active`) VALUES
+('a3h', 'A3H', 'http://www.a3h.de?ref=1447', '|', '|', 'GET', 'WINDOWS-1252', 'N', 100, 'Y'),
+('abiszed', 'AbisZED-Netz', 'http://abiszed-netz.de/index.php?ref=557', '|', '|', 'GET', 'ISO-8859-1', 'Y', 150, 'Y'),
+('admagnet', 'AD-Magnet', 'http://www.ad-magnet.de/index.php?ref=495', '|', '|', 'GET', 'ISO-8859-1', 'N', 300, 'Y'),
+('adcocktail', 'ADCocktail', 'http://www.adcocktail.com/?rid=2596', '|', '|', 'GET', 'WINDOWS-1252', 'N', 500, 'Y'),
+('adpaid', 'AdPaid', 'http://www.adpaid.de?ref=1464', '|', '|', 'GET', 'ISO-8859-1', 'N', 0, 'N'),
+('ads4', 'Ads4.de', 'http://www.ads4.de/?werber=Quix0r', '|', '|', 'GET', 'WINDOWS-1252', 'N', 96, 'Y'),
+('ads4webbis', 'Ads4Webbis', 'http://www.ads4webbis.de?ref=835', '|', '|', 'GET', 'WINDOWS-1252', 'N', 200, 'Y'),
+('ads4world', 'Ads4World', 'http://www.ads4world.de?ref=252', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0, 'N'),
+('affiliblatt', 'Affiliblatt', 'http://www.affiliblatt.de/?sid=MTAzNQ==&site=home', '|', '|', 'GET', 'UTF-8', 'N', 0, 'Y'),
+('allads4you', 'AllAds4You', 'http://www.allads4you.de?ref=1146', '|', '|', 'GET', 'ISO-8859-1', 'N', 150, 'Y'),
+('alstermarketing', 'Alster-Marketing', 'http://www.alstermarketing.de?ref=1851', '|', '|', 'GET', 'ISO-8859-16', 'N', 350, 'Y'),
+('bonus', 'BonusSponsor', 'http://www.bonussponsor.de?ref=1286', '|', '|', 'GET', 'WINDOWS-1252', 'N', 150, 'Y'),
+('fusion', 'Fusion-Ads', 'http://www.fusion-ads.de/?ref=84', '|', '|', 'GET', 'ISO-8859-1', 'N', 150, 'Y'),
+('gigapromo', 'GigaPromo', 'http://www.gigapromo.de/index.php?ref=953', '|', '|', 'GET', 'WINDOWS-1252', 'N', 100, 'Y'),
+('hpsponsor', 'HPSponsor', 'http://hpsponsor.at?ref=29', '|', '|', 'GET', 'WINDOWS-1252', 'N', 100, 'Y'),
+('make-euros', 'Make-Euros.de', 'http://www.make-euros.de?ref=1184', '|', '|', 'GET', 'ISO-8859-1', 'N', 150, 'Y'),
+('megad', 'Mega-Ad', 'http://www.mega-ad.de/?ref=303', '|', '|', 'GET', 'WINDOWS-1252', 'N', 200, 'Y'),
+('power-promo', 'Power-Promo', 'http://www.power-promo.de?ref=1231', '|', '|', 'GET', 'WINDOWS-1252', 'N', 100, 'Y'),
+('secash', 'SeCash', 'http://www.secash.de?ref=758', '|', '|', 'GET', 'WINDOWS-1252', 'N', 200, 'Y'),
+('weltpromotion', 'WeltPromotion', 'http://www.weltpromotion.de?ref=3', '|', '|', 'GET', 'WINDOWS-1252', 'N', 200, 'Y'),
+('ultrapromo', 'UltraPROMO', 'http://www.ultrapromo.eu?ref=485', '|', '|', 'GET', 'WINDOWS-1252', 'N', 100, 'Y'),
+('werbepartnercc', 'DerWerbepartner.cc', 'http://www.werbepartner.cc/sponsor/?ref=696', '|', '|', 'GET', 'WINDOWS-1252', 'N', 100, 'Y'),
+('yoomedia', 'Yoo!Media', 'http://www.yoomedia.de?ref=1715', '|', '|', 'GET', 'WINDOWS-1252', 'N', 200, 'Y'),
+('cityads', 'City-Ads', 'http://www.city-ads.de?ref=221', '|', '|', 'GET', 'WINDOWS-1252', 'N', 200, 'Y'),
+('goldsponsor', 'Gold-Sponsor', 'http://www.gold-sponsor.de?ref=42', '|', '|', 'GET', 'WINDOWS-1252', 'N', 200, 'Y'),
+('doubleads', 'doubleads.de', 'http://www.doubleads.de?ref=1063', '|', '|', 'GET', 'ISO-8859-1','Y', 150, 'Y'),
+('vipads', 'VIPads.de', 'http://vipads.de/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1', 'N', 100, 'Y'),
+('homeads', 'homeADS', 'http://www.homeads.de/?ref=1540', '|', '|', 'GET', 'WINDOWS-1252', 'N', 0, 'N'),
+('fucoexsponsor', 'FuCoExSponsor.net', 'http://fucoexsponsor.net/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1', 'N', 100, 'Y'),
+('adconvention', 'AdConvention', 'http://www.adconvention.de?ref=233', '|', '|', 'GET', 'WINDOWS-1252', 'N', 300, 'Y'),
+('ad-hit', 'Ad-Hit.de', 'http://www.ad-hit.de?ref=41', '|', '|', 'GET', 'WINDOWS-1252', 'N', 200, 'Y'),
+('adcity', 'AdCity.eu', 'http://www.adcity.eu?ref=38', '|', '|', 'GET', 'WINDOWS-1252', 'N', 200, 'Y'),
+('adgain', 'adgain.de', 'http://www.adgain.de/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1', 'N', 150, 'Y'),
+('adkracher', 'ADkracher', 'http://www.adkracher.de/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1', 'N', 350, 'Y'),
+('adminlose', 'Adminlose.de', 'http://www.adminlose.de/index.php?ref=2148', '|', '|', 'GET', 'WINDOWS-1252', 'N', 200, 'Y'),
+('admono', 'Admono.de', 'http://www.admono.de/?ref=92', '|', '|', 'GET', 'ISO-8859-1', 'N', 150, 'Y'),
+('ad-promotion-net', 'Ad-Promotion.net', 'http://ad-promotion.net?ref=10194', '|', '|', 'GET', 'WINDOWS-1252', 'N', 150, 'Y'),
+('adprovi', 'Adprovi.de', 'http://www.adprovi.de?ref=439', '|', '|', '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`) VALUES
-(1, 1, 'banner', 'http://www.a3h.de/interface/out_banner.php', 'http://www.a3h.de/bannerklf.php?id=%CID%', 'http://www.a3h.de/banner.php?id=%CID%', 'h'),
-(2, 1, 'textlink', 'http://www.a3h.de/interface/out_textlink.php', 'http://www.a3h.de/textlinkklick.php?id=%CID%', NULL, 'h'),
-(3, 1, 'surfbar', 'http://www.a3h.de/interface/out_sbanner.php', 'http://www.a3h.de/bannerklf.php?id=%CID%', 'http://www.a3h.de/banner.php?id=%CID%', 'h'),
+(1, 1, 'banner_click', 'http://www.a3h.de/interface/out_banner.php', 'http://www.a3h.de/bannerklf.php?id=%CID%', 'http://www.a3h.de/banner.php?id=%CID%', 'h'),
+(387, 1, 'banner_view', 'http://www.a3h.de/interface/out_banner.php', 'http://www.a3h.de/bannerklf.php?id=%CID%', 'http://www.a3h.de/banner.php?id=%CID%', 'h'),
+(2, 1, 'textlink_click', 'http://www.a3h.de/interface/out_textlink.php', 'http://www.a3h.de/textlinkklick.php?id=%CID%', NULL, 'h'),
+(390, 1, 'textlink_view', 'http://www.a3h.de/interface/out_textlink.php', 'http://www.a3h.de/textlinkklick.php?id=%CID%', NULL, 'h'),
+(3, 1, 'surfbar_click', 'http://www.a3h.de/interface/out_sbanner.php', 'http://www.a3h.de/bannerklf.php?id=%CID%', 'http://www.a3h.de/banner.php?id=%CID%', 'h'),
+(389, 1, 'surfbar_view', 'http://www.a3h.de/interface/out_sbanner.php', 'http://www.a3h.de/bannerklf.php?id=%CID%', 'http://www.a3h.de/banner.php?id=%CID%', 'h'),
 (4, 1, 'forcedbanner', 'http://www.a3h.de/interface/out_fbanner.php', 'http://www.a3h.de/bannerklf.php?id=%CID%', 'http://www.a3h.de/banner.php?id=%CID%', 'h'),
 (5, 1, 'textmail', 'http://www.a3h.de/interface/out_paidmail.php', 'http://www.a3h.de/emailf.php?id=%CID%', NULL, 'h'),
-(6, 1, 'layer', 'http://www.a3h.de/interface/out_layer.php', 'http://www.a3h.de/layer.php?id=%CID%', NULL, 'h'),
+(6, 1, 'layer_click', 'http://www.a3h.de/interface/out_layer.php', 'http://www.a3h.de/layer.php?id=%CID%', NULL, 'h'),
+(388, 1, 'layer_view', 'http://www.a3h.de/interface/out_layer.php', 'http://www.a3h.de/layer.php?id=%CID%', NULL, 'h'),
 (7, 1, 'popup', 'http://www.a3h.de/interface/out_popup.php', 'http://www.a3h.de/popup.php?id=%CID%', NULL, 'h'),
 (8, 1, 'popdown', 'http://www.a3h.de/interface/out_popdown.php', 'http://www.a3h.de/popdown.php?id=%CID%', NULL, 'h'),
 (9, 1, 'lead', 'http://www.a3h.de/interface/out_lead.php', 'http://www.a3h.de/lead.php?id=%CID%', NULL, 'h'),
@@ -344,17 +350,17 @@ 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)");
+               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
+(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%', 'h'),
+(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, 'h'),
+(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%', 'h'),
+(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%', 'h'),
+(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%', 'h'),
+(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%', 'h'),
+(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, 'h'),
+(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, 'h'),
+(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, 'h'),
+(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, 'h')");
 
                // 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
@@ -387,7 +393,7 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (301, 30, 'textmail', 'http://www.adconvention.de/interface/', 'http://www.adconvention.de/codes/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%', NULL, 'h'),
 (299, 30, 'traffic', 'http://www.adconvention.de/interface/', 'http://www.adconvention.de/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%', NULL, 'h')");
 
-               // Network type handlers - AdGain
+               // Network type handlers - adgain.de
                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
 (322, 33, 'banner_click', 'http://www.adgain.de/int/get.php', 'http://www.adgain.de/kamp/ziel.php?uid=%UID%&bid=%CID%&sid=%SID%', 'http://www.adgain.de/kamp/b_view.php?uid=%UID%&bid=%CID%&sid=%SID%', 'h'),
 (323, 33, 'banner_view', 'http://www.adgain.de/int/get.php', 'http://www.adgain.de/kamp/ziel.php?uid=%UID%&bid=%CID%&sid=%SID%', 'http://www.adgain.de/kamp/b_view.php?uid=%UID%&bid=%CID%&sid=%SID%', 'h'),
@@ -433,12 +439,12 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 
                // Network type handlers - Admono.de
                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
-(357, 36, 'forcedbanner', 'http://www.admono.de/interface/', 'http://www.admono.de/codes/forcedbannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', http://www.admono.de/codes/forcedbannerview.php?id=%UID%&bid=%CID%&aid=%SID%'),
+(357, 36, 'forcedbanner', 'http://www.admono.de/interface/', 'http://www.admono.de/codes/forcedbannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.admono.de/codes/forcedbannerview.php?id=%UID%&bid=%CID%&aid=%SID%'),
 (358, 36, 'forcedtextlink', 'http://www.admono.de/interface/', 'http://www.admono.de/codes/forcedtextlinkklick.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
-(359, 36, 'banner_view', 'http://www.admono.de/interface/', 'http://www.admono.de/codes/bannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', http://www.admono.de/codes/bannerview.php?id=%UID%&bid=%CID%&aid=%SID%'),
-(360, 36, 'banner_click', 'http://www.admono.de/interface/', 'http://www.admono.de/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', http://www.admono.de/codes/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%'),
-(361, 36, 'skybanner_view', 'http://www.admono.de/interface/', 'http://www.admono.de/codes/skybannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', http://www.admono.de/codes/skybannerview.php?id=%UID%&bid=%CID%&aid=%SID%'),
-(362, 36, 'button_view', 'http://www.admono.de/interface/', 'http://www.admono.de/codes/buttonklick.php?id=%UID%&bid=%CID%&aid=%SID%', http://www.admono.de/codes/buttonview.php?id=%UID%&bid=%CID%&aid=%SID%'),
+(359, 36, 'banner_view', 'http://www.admono.de/interface/', 'http://www.admono.de/codes/bannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.admono.de/codes/bannerview.php?id=%UID%&bid=%CID%&aid=%SID%'),
+(360, 36, 'banner_click', 'http://www.admono.de/interface/', 'http://www.admono.de/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.admono.de/codes/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%'),
+(361, 36, 'skybanner_view', 'http://www.admono.de/interface/', 'http://www.admono.de/codes/skybannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.admono.de/codes/skybannerview.php?id=%UID%&bid=%CID%&aid=%SID%'),
+(362, 36, 'button_view', 'http://www.admono.de/interface/', 'http://www.admono.de/codes/buttonklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.admono.de/codes/buttonview.php?id=%UID%&bid=%CID%&aid=%SID%'),
 (363, 36, 'textlink_view', 'http://www.admono.de/interface/', 'http://www.admono.de/codes/textlinkview.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
 (364, 36, 'traffic', 'http://www.admono.de/interface/', 'http://www.admono.de/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
 (365, 36, 'popup', 'http://www.admono.de/interface/', 'http://www.admono.de/codes/popup.php?id=%UID%&bid=%CID%&aid=%SID%', NULL),
@@ -446,17 +452,34 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 
                // Network type handlers - AdPaid
                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
-(177, 5, 'banner', 'http://www.adpaid.de/interface/out_banner.php', 'http://www.adpaid.de/bannerklf.php?id=%CID%', 'http://www.adpaid.de/banner.php?id=%CID%', 'h'),
-(178, 5, 'textlink', 'http://www.adpaid.de/interface/out_textlink.php', 'http://www.adpaid.de/textlinkklick.php?id=%CID%', NULL, 'h'),
-(179, 5, 'surfbar', 'http://www.adpaid.de/interface/out_sbanner.php', 'http://www.adpaid.de/bannerklf.php?id=%CID%', 'http://www.adpaid.de/banner.php?id=%CID%', 'h'),
+(177, 5, 'banner_click', 'http://www.adpaid.de/interface/out_banner.php', 'http://www.adpaid.de/bannerklf.php?id=%CID%', 'http://www.adpaid.de/banner.php?id=%CID%', 'h'),
+(391, 5, 'banner_view', 'http://www.adpaid.de/interface/out_banner.php', 'http://www.adpaid.de/bannerklf.php?id=%CID%', 'http://www.adpaid.de/banner.php?id=%CID%', 'h'),
+(178, 5, 'textlink_click', 'http://www.adpaid.de/interface/out_textlink.php', 'http://www.adpaid.de/textlinkklick.php?id=%CID%', NULL, 'h'),
+(394, 5, 'textlink_view', 'http://www.adpaid.de/interface/out_textlink.php', 'http://www.adpaid.de/textlinkklick.php?id=%CID%', NULL, 'h'),
+(393, 5, 'surfbar_view', 'http://www.adpaid.de/interface/out_sbanner.php', 'http://www.adpaid.de/bannerklf.php?id=%CID%', 'http://www.adpaid.de/banner.php?id=%CID%', 'h'),
+(179, 5, 'surfbar_click', 'http://www.adpaid.de/interface/out_sbanner.php', 'http://www.adpaid.de/bannerklf.php?id=%CID%', 'http://www.adpaid.de/banner.php?id=%CID%', 'h'),
 (180, 5, 'forcedbanner', 'http://www.adpaid.de/interface/out_fbanner.php', 'http://www.adpaid.de/bannerklf.php?id=%CID%', 'http://www.adpaid.de/banner.php?id=%CID%', 'h'),
 (181, 5, 'textmail', 'http://www.adpaid.de/interface/out_paidmail.php', 'http://www.adpaid.de/emailf.php?id=%CID%', NULL, 'h'),
-(182, 5, 'layer', 'http://www.adpaid.de/interface/out_layer.php', 'http://www.adpaid.de/layer.php?id=%CID%', NULL, 'h'),
+(182, 5, 'layer_click', 'http://www.adpaid.de/interface/out_layer.php', 'http://www.adpaid.de/layer.php?id=%CID%', NULL, 'h'),
+(392, 5, 'layer_view', 'http://www.adpaid.de/interface/out_layer.php', 'http://www.adpaid.de/layer.php?id=%CID%', NULL, 'h'),
 (183, 5, 'popup', 'http://www.adpaid.de/interface/out_popup.php', 'http://www.adpaid.de/popup.php?id=%CID%', NULL, 'h'),
 (184, 5, 'popdown', 'http://www.adpaid.de/interface/out_popdown.php', 'http://www.adpaid.de/popdown.php?id=%CID%', NULL, 'h'),
 (185, 5, 'lead', 'http://www.adpaid.de/interface/out_lead.php', 'http://www.adpaid.de/lead.php?id=%CID%', NULL, 'h'),
 (186, 5, 'sale', 'http://www.adpaid.de/interface/out_sale.php', 'http://www.adpaid.de/sale.php?id=%CID%', NULL, 'h')");
 
+               // Network type handlers - AdProvi
+               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
+(377, 38, 'forcedbanner', 'http://www.adprovi.de/interface/api_2.php', 'http://www.adprovi.de/codes/forcedbannerklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', 'http://www.adprovi.de/codes/forcedbannerview.php?id=%UID%&bid=%CID%&aid=%SID%', 'h'),
+(378, 38, 'forcedtextlink', 'http://www.adprovi.de/interface/api_2.php', 'http://www.adprovi.de/codes/forcedtextlinkklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL, 'h'),
+(379, 38, 'banner_view', 'http://www.adprovi.de/interface/api_2.php', 'http://www.adprovi.de/codes/bannerklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', 'http://www.adprovi.de/codes/bannerview.php?id=%UID%&bid=%CID%&aid=%SID%', 'h'),
+(380, 38, 'banner_click', 'http://www.adprovi.de/interface/api_2.php', 'http://www.adprovi.de/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', 'http://www.adprovi.de/codes/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'h'),
+(381, 38, 'skybanner_view', 'http://www.adprovi.de/interface/api_2.php', 'http://www.adprovi.de/codes/skybannerklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', 'http://www.adprovi.de/codes/skybannerview.php?id=%UID%&bid=%CID%&aid=%SID%', 'h'),
+(382, 38, 'button_view', 'http://www.adprovi.de/interface/api_2.php', 'http://www.adprovi.de/codes/buttonklick.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', 'http://www.adprovi.de/codes/buttonview.php?id=%UID%&bid=%CID%&aid=%SID%', 'h'),
+(383, 38, 'textlink_view', 'http://www.adprovi.de/interface/api_2.php', 'http://www.adprovi.de/codes/textlinkview.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL, 'h'),
+(384, 38, 'traffic', 'http://www.adprovi.de/interface/api_2.php', 'http://www.adprovi.de/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL, 'h'),
+(385, 38, 'popup', 'http://www.adprovi.de/interface/api_2.php', 'http://www.adprovi.de/codes/popup.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL, 'h'),
+(386, 38, 'textmail', 'http://www.adprovi.de/interface/api_2.php', 'http://www.adprovi.de/codes/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL, 'h')");
+
                // Network type handlers - Ads4
                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
 (14, 6, 'forcedbanner', 'http://www.ads4.de/interface/interface.php', 'http://www.ads4.de/forced_click.php?fb_id=%CID%&sid=%SID%', 'http://www.ads4.de/forced_view.php?fb_id=%CID%&sid=%SID%', 'h'),
@@ -710,7 +733,7 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (101, 19, 'textmail', 'http://www.secash.de/interface/api_2.php', 'http://www.secash.de/codes/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL, 'h'),
 (124, 19, 'traffic', 'http://www.secash.de/interface/api_2.php', 'http://www.secash.de/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', NULL, 'h')");
 
-               // Network type handlers - Swizerland
+               // Network type handlers - WeltPromotion
                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
 (205, 20, 'banner_click', 'http://www.weltpromotion.de/interface/api_2.php', 'http://www.weltpromotion.de/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', 'http://www.weltpromotion.de/codes/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%', 'h'),
 (204, 20, 'banner_view', 'http://www.weltpromotion.de/interface/api_2.php', 'http://www.weltpromotion.de/codes/bannerklick.php?id=%UID%&bid=%CID%&aid=%SID%', 'http://www.weltpromotion.de/codes/bannerview.php?id=%UID%&bid=%CID%&aid=%SID%', 'h'),
@@ -790,13 +813,14 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (1, 1, 'reward', 'verguetung', NULL),
 (1, 1, 'sid', 'sid', NULL),
 (1, 1, 'size', 'size', NULL),
-(1, 1, 'type', 'typ', NULL),
+(1, 1, 'type', 'typ', 'klick'),
 (1, 2, 'id', 'id', NULL),
 (1, 2, 'password', 'pw', NULL),
 (1, 2, 'reload', 'reload', NULL),
 (1, 2, 'remain', 'uebrig', NULL),
 (1, 2, 'reward', 'verguetung', NULL),
 (1, 2, 'sid', 'sid', NULL),
+(1, 2, 'type', 'typ', 'klick'),
 (1, 3, 'id', 'id', NULL),
 (1, 3, 'password', 'pw', NULL),
 (1, 3, 'reload', 'reload', NULL),
@@ -804,7 +828,7 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (1, 3, 'reward', 'verguetung', NULL),
 (1, 3, 'sid', 'sid', NULL),
 (1, 3, 'size', 'size', NULL),
-(1, 3, 'type', 'typ', NULL),
+(1, 3, 'type', 'typ', 'klick'),
 (1, 4, 'id', 'id', NULL),
 (1, 4, 'minimum_stay', 'ma', NULL),
 (1, 4, 'password', 'pw', NULL),
@@ -827,7 +851,7 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (1, 6, 'remain', 'uebrig', NULL),
 (1, 6, 'reward', 'verguetung', NULL),
 (1, 6, 'sid', 'sid', NULL),
-(1, 6, 'type', 'typ', NULL),
+(1, 6, 'type', 'typ', 'klick'),
 (1, 7, 'id', 'id', NULL),
 (1, 7, 'minimum_stay', 'ma', NULL),
 (1, 7, 'password', 'pw', NULL),
@@ -859,7 +883,38 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (1, 11, 'remain', 'uebrig', NULL),
 (1, 11, 'reward', 'verguetung', NULL),
 (1, 11, 'sid', 'sid', NULL),
-(1, 11, 'type', 'typ', 'html')");
+(1, 11, 'type', 'typ', 'html'),
+(1, 387, 'id', 'id', NULL),
+(1, 387, 'minimum_stay', 'ma', NULL),
+(1, 387, 'password', 'pw', NULL),
+(1, 387, 'reload', 'reload', NULL),
+(1, 387, 'remain', 'uebrig', NULL),
+(1, 387, 'reward', 'verguetung', NULL),
+(1, 387, 'sid', 'sid', NULL),
+(1, 387, 'size', 'size', NULL),
+(1, 387, 'type', 'typ', 'view'),
+(1, 388, 'id', 'id', NULL),
+(1, 388, 'password', 'pw', NULL),
+(1, 388, 'reload', 'reload', NULL),
+(1, 388, 'remain', 'uebrig', NULL),
+(1, 388, 'reward', 'verguetung', NULL),
+(1, 388, 'sid', 'sid', NULL),
+(1, 388, 'type', 'typ', 'view'),
+(1, 389, 'id', 'id', NULL),
+(1, 389, 'password', 'pw', NULL),
+(1, 389, 'reload', 'reload', NULL),
+(1, 389, 'remain', 'uebrig', NULL),
+(1, 389, 'reward', 'verguetung', NULL),
+(1, 389, 'sid', 'sid', NULL),
+(1, 389, 'size', 'size', NULL),
+(1, 389, 'type', 'typ', 'view'),
+(1, 390, 'id', 'id', NULL),
+(1, 390, 'password', 'pw', NULL),
+(1, 390, 'reload', 'reload', NULL),
+(1, 390, 'remain', 'uebrig', NULL),
+(1, 390, 'reward', 'verguetung', NULL),
+(1, 390, 'sid', 'sid', NULL),
+(1, 390, 'type', 'typ', 'view')");
 
                // Request parameters per type handler - AbisZED-Netz
                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
@@ -955,7 +1010,7 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (2, 198, 'reward', 'verguetung', NULL),
 (2, 198, 'sid', 'sid', NULL),
 (2, 199, 'id', 'id', NULL),
-(2, 199, 'max_stay', 'ma', NULL),
+(2, 199, 'maximum_stay', 'ma', NULL),
 (2, 199, 'password', 'pw', NULL),
 (2, 199, 'reload', 'reload', NULL),
 (2, 199, 'remain', 'uebrig', NULL),
@@ -1060,75 +1115,75 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
                // 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, 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, 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, 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, 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, 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, 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, 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, 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, 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)");
+(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
@@ -1485,125 +1540,125 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 
                // Request parameters per type handler - Adminlose.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
-(35, 349, 'id', 'id', 'NULL),
-(35, 349, 'password', 'pw', 'NULL),
-(35, 349, 'reload', 'reload', 'NULL),
-(35, 349, 'reward', 'verguetung', 'NULL),
-(35, 349, 'remain', 'uebrig', 'NULL),
+(35, 349, 'id', 'id', NULL),
+(35, 349, 'password', 'pw', NULL),
+(35, 349, 'reload', 'reload', NULL),
+(35, 349, 'reward', 'verguetung', NULL),
+(35, 349, 'remain', 'uebrig', NULL),
 (35, 349, 'type', 'typ', 'view'),
-(35, 350, 'id', 'id', 'NULL),
-(35, 350, 'password', 'pw', 'NULL),
-(35, 350, 'reload', 'reload', 'NULL),
-(35, 350, 'reward', 'verguetung', 'NULL),
-(35, 350, 'remain', 'uebrig', 'NULL),
+(35, 350, 'id', 'id', NULL),
+(35, 350, 'password', 'pw', NULL),
+(35, 350, 'reload', 'reload', NULL),
+(35, 350, 'reward', 'verguetung', NULL),
+(35, 350, 'remain', 'uebrig', NULL),
 (35, 350, 'type', 'typ', 'view'),
-(35, 351, 'id', 'id', 'NULL),
-(35, 351, 'password', 'pw', 'NULL),
-(35, 351, 'reload', 'reload', 'NULL),
-(35, 351, 'reward', 'verguetung', 'NULL),
-(35, 351, 'remain', 'uebrig', 'NULL),
-(35, 352, 'id', 'id', 'NULL),
-(35, 352, 'password', 'pw', 'NULL),
-(35, 352, 'reload', 'reload', 'NULL),
-(35, 352, 'reward', 'verguetung', 'NULL),
-(35, 352, 'type', 'uebrig', 'NULL),
-(35, 353, 'id', 'id', 'NULL),
-(35, 353, 'password', 'pw', 'NULL),
-(35, 353, 'reward', 'verguetung', 'NULL),
-(35, 353, 'remain', 'uebrig', 'NULL),
-(35, 353, 'minimum_stay', 'ma', 'NULL),
-(35, 354, 'id', 'id', 'NULL),
-(35, 354, 'password', 'pw', 'NULL),
-(35, 354, 'reload', 'reload', 'NULL),
-(35, 354, 'reward', 'verguetung', 'NULL),
-(35, 354, 'remain', 'uebrig', 'NULL),
-(35, 355, 'id', 'id', 'NULL),
-(35, 355, 'password', 'pw', 'NULL),
-(35, 355, 'reload', 'reload', 'NULL),
-(35, 355, 'reward', 'verguetung', 'NULL),
-(35, 355, 'remain', 'uebrig', 'NULL),
-(35, 355, 'minimum_stay', 'ma', 'NULL),
+(35, 351, 'id', 'id', NULL),
+(35, 351, 'password', 'pw', NULL),
+(35, 351, 'reload', 'reload', NULL),
+(35, 351, 'reward', 'verguetung', NULL),
+(35, 351, 'remain', 'uebrig', NULL),
+(35, 352, 'id', 'id', NULL),
+(35, 352, 'password', 'pw', NULL),
+(35, 352, 'reload', 'reload', NULL),
+(35, 352, 'reward', 'verguetung', NULL),
+(35, 352, 'type', 'uebrig', NULL),
+(35, 353, 'id', 'id', NULL),
+(35, 353, 'password', 'pw', NULL),
+(35, 353, 'reward', 'verguetung', NULL),
+(35, 353, 'remain', 'uebrig', NULL),
+(35, 353, 'minimum_stay', 'ma', NULL),
+(35, 354, 'id', 'id', NULL),
+(35, 354, 'password', 'pw', NULL),
+(35, 354, 'reload', 'reload', NULL),
+(35, 354, 'reward', 'verguetung', NULL),
+(35, 354, 'remain', 'uebrig', NULL),
+(35, 355, 'id', 'id', NULL),
+(35, 355, 'password', 'pw', NULL),
+(35, 355, 'reload', 'reload', NULL),
+(35, 355, 'reward', 'verguetung', NULL),
+(35, 355, 'remain', 'uebrig', NULL),
+(35, 355, 'minimum_stay', 'ma', NULL),
 (35, 355, 'type', 'typ', 'popup'),
-(35, 356, 'id', 'id', 'NULL),
-(35, 356, 'password', 'pw', 'NULL),
-(35, 356, 'reload', 'reload', 'NULL),
-(35, 356, 'reward', 'verguetung', 'NULL),
-(35, 356, 'remain', 'uebrig', 'NULL),
-(35, 356, 'minimum_stay', 'ma', 'NULL),
+(35, 356, 'id', 'id', NULL),
+(35, 356, 'password', 'pw', NULL),
+(35, 356, 'reload', 'reload', NULL),
+(35, 356, 'reward', 'verguetung', NULL),
+(35, 356, 'remain', 'uebrig', NULL),
+(35, 356, 'minimum_stay', 'ma', NULL),
 (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, 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, 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, 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, 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, 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, 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, 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, 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, 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)");
+(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
@@ -1614,14 +1669,14 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (5, 177, 'reward', 'verguetung', NULL),
 (5, 177, 'sid', 'sid', NULL),
 (5, 177, 'size', 'size', '468x60'),
-(5, 177, 'type', 'typ', NULL),
+(5, 177, 'type', 'typ', 'klick'),
 (5, 178, 'id', 'id', NULL),
 (5, 178, 'password', 'pw', NULL),
 (5, 178, 'reload', 'reload', NULL),
 (5, 178, 'remain', 'uebrig', NULL),
 (5, 178, 'reward', 'verguetung', NULL),
 (5, 178, 'sid', 'sid', NULL),
-(5, 178, 'type', 'typ', NULL),
+(5, 178, 'type', 'typ', 'klick'),
 (5, 179, 'id', 'id', NULL),
 (5, 179, 'password', 'pw', NULL),
 (5, 179, 'reload', 'reload', NULL),
@@ -1629,7 +1684,7 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (5, 179, 'reward', 'verguetung', NULL),
 (5, 179, 'sid', 'sid', NULL),
 (5, 179, 'size', 'size', NULL),
-(5, 179, 'type', 'typ', NULL),
+(5, 179, 'type', 'typ', 'klick'),
 (5, 180, 'id', 'id', NULL),
 (5, 180, 'minimum_stay', 'ma', NULL),
 (5, 180, 'password', 'pw', NULL),
@@ -1652,7 +1707,7 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (5, 182, 'remain', 'uebrig', NULL),
 (5, 182, 'reward', 'verguetung', NULL),
 (5, 182, 'sid', 'sid', NULL),
-(5, 182, 'type', 'typ', NULL),
+(5, 182, 'type', 'typ', 'klick'),
 (5, 183, 'id', 'id', NULL),
 (5, 183, 'minimum_stay', 'ma', NULL),
 (5, 183, 'password', 'pw', NULL),
@@ -1676,7 +1731,110 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (5, 186, 'password', 'pw', NULL),
 (5, 186, 'remain', 'uebrig', NULL),
 (5, 186, 'reward', 'verguetung', NULL),
-(5, 186, 'sid', 'sid', NULL)");
+(5, 186, 'sid', 'sid', NULL),
+(5, 391, 'id', 'id', NULL),
+(5, 391, 'password', 'pw', NULL),
+(5, 391, 'reload', 'reload', NULL),
+(5, 391, 'remain', 'uebrig', NULL),
+(5, 391, 'reward', 'verguetung', NULL),
+(5, 391, 'sid', 'sid', NULL),
+(5, 391, 'size', 'size', '468x60'),
+(5, 391, 'type', 'typ', 'view'),
+(5, 392, 'id', 'id', NULL),
+(5, 392, 'password', 'pw', NULL),
+(5, 392, 'reload', 'reload', NULL),
+(5, 392, 'remain', 'uebrig', NULL),
+(5, 392, 'reward', 'verguetung', NULL),
+(5, 392, 'sid', 'sid', NULL),
+(5, 392, 'type', 'typ', 'view'),
+(5, 393, 'id', 'id', NULL),
+(5, 393, 'password', 'pw', NULL),
+(5, 393, 'reload', 'reload', NULL),
+(5, 393, 'remain', 'uebrig', NULL),
+(5, 393, 'reward', 'verguetung', NULL),
+(5, 393, 'sid', 'sid', NULL),
+(5, 393, 'size', 'size', NULL),
+(5, 393, 'type', 'typ', 'view'),
+(5, 394, 'id', 'id', NULL),
+(5, 394, 'password', 'pw', NULL),
+(5, 394, 'reload', 'reload', NULL),
+(5, 394, 'remain', 'uebrig', NULL),
+(5, 394, 'reward', 'verguetung', NULL),
+(5, 394, 'sid', 'sid', NULL),
+(5, 394, 'type', 'typ', 'view')");
+
+               // Request parameters per type handler - AdProvi
+               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
+(38, 377, 'extra', 'typ', 'forcedbanner'),
+(38, 377, 'id', 'id', NULL),
+(38, 377, 'password', 'pw', NULL),
+(38, 377, 'remain', 'uebrig', NULL),
+(38, 377, 'reload', 'reload', NULL),
+(38, 377, 'reward', 'verguetung', NULL),
+(38, 377, 'sid', 'siteid', NULL),
+(38, 378, 'extra', 'typ', 'forcedtextlink'),
+(38, 378, 'id', 'id', NULL),
+(38, 378, 'password', 'pw', NULL),
+(38, 378, 'remain', 'uebrig', NULL),
+(38, 378, 'reload', 'reload', NULL),
+(38, 378, 'reward', 'verguetung', NULL),
+(38, 378, 'sid', 'siteid', NULL),
+(38, 379, 'extra', 'typ', 'bannerview'),
+(38, 379, 'id', 'id', NULL),
+(38, 379, 'password', 'pw', NULL),
+(38, 379, 'remain', 'uebrig', NULL),
+(38, 379, 'reload', 'reload', NULL),
+(38, 379, 'reward', 'verguetung', NULL),
+(38, 379, 'sid', 'siteid', NULL),
+(38, 380, 'extra', 'typ', 'bannerklick'),
+(38, 380, 'id', 'id', NULL),
+(38, 380, 'password', 'pw', NULL),
+(38, 380, 'remain', 'uebrig', NULL),
+(38, 380, 'reload', 'reload', NULL),
+(38, 380, 'reward', 'verguetung', NULL),
+(38, 380, 'sid', 'siteid', NULL),
+(38, 381, 'extra', 'typ', 'skybannerview'),
+(38, 381, 'id', 'id', NULL),
+(38, 381, 'password', 'pw', NULL),
+(38, 381, 'remain', 'uebrig', NULL),
+(38, 381, 'reload', 'reload', NULL),
+(38, 381, 'reward', 'verguetung', NULL),
+(38, 381, 'sid', 'siteid', NULL),
+(38, 382, 'extra', 'typ', 'buttonview'),
+(38, 382, 'id', 'id', NULL),
+(38, 382, 'password', 'pw', NULL),
+(38, 382, 'remain', 'uebrig', NULL),
+(38, 382, 'reload', 'reload', NULL),
+(38, 382, 'reward', 'verguetung', NULL),
+(38, 382, 'sid', 'siteid', NULL),
+(38, 383, 'extra', 'typ', 'textview'),
+(38, 383, 'id', 'id', NULL),
+(38, 383, 'password', 'pw', NULL),
+(38, 383, 'remain', 'uebrig', NULL),
+(38, 383, 'reload', 'reload', NULL),
+(38, 383, 'reward', 'verguetung', NULL),
+(38, 383, 'sid', 'siteid', NULL),
+(38, 384, 'extra', 'typ', 'traffic'),
+(38, 384, 'id', 'id', NULL),
+(38, 384, 'password', 'pw', NULL),
+(38, 384, 'remain', 'uebrig', NULL),
+(38, 384, 'reload', 'reload', NULL),
+(38, 384, 'reward', 'verguetung', NULL),
+(38, 384, 'sid', 'siteid', NULL),
+(38, 385, 'extra', 'typ', 'popup'),
+(38, 385, 'id', 'id', NULL),
+(38, 385, 'password', 'pw', NULL),
+(38, 385, 'remain', 'uebrig', NULL),
+(38, 385, 'reload', 'reload', NULL),
+(38, 385, 'reward', 'verguetung', NULL),
+(38, 385, 'sid', 'siteid', NULL),
+(38, 386, 'extra', 'typ', 'paidmail'),
+(38, 386, 'id', 'id', NULL),
+(38, 386, 'password', 'pw', NULL),
+(38, 386, 'remain', 'uebrig', NULL),
+(38, 386, 'reload', 'reload', NULL),
+(38, 386, 'reward', 'verguetung', NULL),
+(38, 386, 'sid', 'siteid', NULL)");
 
                // Request parameters per type handler - Ads4
                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
@@ -2453,7 +2611,7 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (13, 291, 'reward', 'verguetung', NULL),
 (13, 291, 'sid', 'sid', NULL)");
 
-               // Request parameters per type handler - GigapPromo
+               // Request parameters per type handler - GigaPromo
                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
 (14, 102, 'id', 'id', NULL),
 (14, 102, 'password', 'pw', NULL),
@@ -2469,35 +2627,35 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (14, 103, 'reward', 'verguetung', NULL),
 (14, 103, 'sid', 'aid', NULL),
 (14, 104, 'id', 'id', NULL),
-(14, 104, 'max_stay', 'ma', NULL),
+(14, 104, 'maximum_stay', 'ma', NULL),
 (14, 104, 'password', 'pw', NULL),
 (14, 104, 'reload', 'reload', NULL),
 (14, 104, 'remain', 'uebrig', NULL),
 (14, 104, 'reward', 'verguetung', NULL),
 (14, 104, 'sid', 'aid', NULL),
 (14, 105, 'id', 'id', NULL),
-(14, 105, 'max_stay', 'ma', NULL),
+(14, 105, 'maximum_stay', 'ma', NULL),
 (14, 105, 'password', 'pw', NULL),
 (14, 105, 'reload', 'reload', NULL),
 (14, 105, 'remain', 'uebrig', NULL),
 (14, 105, 'reward', 'verguetung', NULL),
 (14, 105, 'sid', 'aid', NULL),
 (14, 106, 'id', 'id', NULL),
-(14, 106, 'max_stay', 'ma', NULL),
+(14, 106, 'maximum_stay', 'ma', NULL),
 (14, 106, 'password', 'pw', NULL),
 (14, 106, 'reload', 'reload', NULL),
 (14, 106, 'remain', 'uebrig', NULL),
 (14, 106, 'reward', 'verguetung', NULL),
 (14, 106, 'sid', 'aid', NULL),
 (14, 107, 'id', 'id', NULL),
-(14, 107, 'max_stay', 'ma', NULL),
+(14, 107, 'maximum_stay', 'ma', NULL),
 (14, 107, 'password', 'pw', NULL),
 (14, 107, 'reload', 'reload', NULL),
 (14, 107, 'remain', 'uebrig', NULL),
 (14, 107, 'reward', 'verguetung', NULL),
 (14, 107, 'sid', 'aid', NULL),
 (14, 108, 'id', 'id', NULL),
-(14, 108, 'max_stay', 'ma', NULL),
+(14, 108, 'maximum_stay', 'ma', NULL),
 (14, 108, 'password', 'pw', NULL),
 (14, 108, 'reload', 'reload', NULL),
 (14, 108, 'remain', 'uebrig', NULL),
@@ -3087,7 +3245,7 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (19, 124, 'remain', 'uebrig', NULL),
 (19, 124, 'reward', 'verguetung', NULL)");
 
-               // Request parameters per type handler - Swizerland
+               // Request parameters per type handler - WeltPromotion
                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
 (20, 202, 'extra', 'typ', 'forcedbanner'),
 (20, 202, 'id', 'id', NULL),
@@ -3558,7 +3716,33 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (1, 10, 22, 7),
 (1, 10, 23, 8),
 (1, 10, 9, 9),
-(1, 10, 25, 10)");
+(1, 10, 25, 10),
+(1, 387, 7, 1),
+(1, 387, 2, 2),
+(1, 387, 3, 3),
+(1, 387, 4, 4),
+(1, 387, 5, 5),
+(1, 387, 6, 6),
+(1, 387, 8, 7),
+(1, 387, 10, 8),
+(1, 388, 14, 1),
+(1, 388, 2, 2),
+(1, 388, 4, 3),
+(1, 388, 5, 4),
+(1, 388, 6, 5),
+(1, 389, 12, 1),
+(1, 389, 2, 2),
+(1, 389, 3, 3),
+(1, 389, 4, 4),
+(1, 389, 5, 5),
+(1, 389, 6, 6),
+(1, 389, 8, 7),
+(1, 390, 11, 1),
+(1, 390, 2, 2),
+(1, 390, 9, 3),
+(1, 390, 4, 4),
+(1, 390, 5, 5),
+(1, 390, 6, 6)");
 
                // API array elements - AbisZED-Netz
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`,`network_type_id`,`network_array_index`,`sort`) VALUES
@@ -4040,7 +4224,7 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (33, 335, 6, 5),
 (33, 335, 9, 6)");
 
-               // API array elements - adgain.de
+               // API array elements - ADkracher
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`,`network_type_id`,`network_array_index`,`sort`) VALUES
 (34, 336, 1, 1),
 (34, 336, 2, 2),
@@ -4285,6 +4469,89 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (5, 185, 23, 8),
 (5, 185, 9, 9)");
 
+               // API array elements - AdProvi
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`,`network_type_id`,`network_array_index`,`sort`) VALUES
+(38, 377, 1, 1),
+(38, 377, 2, 2),
+(38, 377, 4, 3),
+(38, 377, 5, 4),
+(38, 377, 6, 5),
+(38, 377, 10, 6),
+(38, 377, 9, 7),
+(38, 377, 40, 8),
+(38, 378, 1, 1),
+(38, 378, 2, 2),
+(38, 378, 4, 3),
+(38, 378, 5, 4),
+(38, 378, 6, 5),
+(38, 378, 10, 6),
+(38, 378, 9, 7),
+(38, 378, 40, 8),
+(38, 379, 1, 1),
+(38, 379, 2, 2),
+(38, 379, 4, 3),
+(38, 379, 5, 4),
+(38, 379, 6, 5),
+(38, 379, 10, 6),
+(38, 379, 9, 7),
+(38, 379, 40, 8),
+(38, 380, 1, 1),
+(38, 380, 2, 2),
+(38, 380, 4, 3),
+(38, 380, 5, 4),
+(38, 380, 6, 5),
+(38, 380, 10, 6),
+(38, 380, 9, 7),
+(38, 380, 40, 8),
+(38, 381, 1, 1),
+(38, 381, 2, 2),
+(38, 381, 4, 3),
+(38, 381, 5, 4),
+(38, 381, 6, 5),
+(38, 381, 10, 6),
+(38, 381, 9, 7),
+(38, 381, 40, 8),
+(38, 382, 1, 1),
+(38, 382, 2, 2),
+(38, 382, 4, 3),
+(38, 382, 5, 4),
+(38, 382, 6, 5),
+(38, 382, 10, 6),
+(38, 382, 9, 7),
+(38, 382, 40, 8),
+(38, 383, 1, 1),
+(38, 383, 2, 2),
+(38, 383, 4, 3),
+(38, 383, 5, 4),
+(38, 383, 6, 5),
+(38, 383, 10, 6),
+(38, 383, 9, 7),
+(38, 383, 40, 8),
+(38, 384, 1, 1),
+(38, 384, 2, 2),
+(38, 384, 4, 3),
+(38, 384, 5, 4),
+(38, 384, 6, 5),
+(38, 384, 10, 6),
+(38, 384, 9, 7),
+(38, 384, 40, 8),
+(38, 385, 1, 1),
+(38, 385, 2, 2),
+(38, 385, 4, 3),
+(38, 385, 5, 4),
+(38, 385, 6, 5),
+(38, 385, 10, 6),
+(38, 385, 9, 7),
+(38, 385, 40, 8),
+(38, 386, 1, 1),
+(38, 386, 2, 2),
+(38, 386, 4, 3),
+(38, 386, 5, 4),
+(38, 386, 6, 5),
+(38, 386, 10, 6),
+(38, 386, 9, 7),
+(38, 386, 40, 8)");
+
                // API array elements - Ads4.de
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`,`network_type_id`,`network_array_index`,`sort`) VALUES
 (6, 14, 7, 1),
@@ -5613,7 +5880,7 @@ UNIQUE INDEX `provider_type` (`network_id`,`network_type_id`)",
 (19, 124, 5, 4),
 (19, 124, 6, 5)");
 
-               // API array elements - The Swizerland Ad Network
+               // API array elements - WeltPromotion
                addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`,`network_type_id`,`network_array_index`,`sort`) VALUES
 (20, 200, 6, 5),
 (20, 202, 1, 1),

diff --git a/inc/language/network_de.php b/inc/language/network_de.php
index 124473819033f1928e60a1e14fe8af932173de3d..534fa0dfbb4efffe5007a778adbae8eaf4859b63 100644 (file)
--- a/inc/language/network_de.php
+++ b/inc/language/network_de.php
@@ -45,6 +45,7 @@ addMessages(array(
        // Admin messages (should be all...)
        'ADMIN_NETWORK_DATA_MISSING' => "Sie haben noch keine Werbenetzwerke eingerichtet. Bitte richten Sie erst welche ein und fahren Sie dann hier fort. Sie sollten dies im Allgemeinen nicht selber machen.",
        // - Error messages
+       'ADMIN_NETWORK_NOT_ACTIVE' => "Das ausgewählte Netzwerk ist nicht aktiviert. Dies kann z.B. den Grund haben, dass die Webeseite nicht reagiert oder ein anderer Inhalt (Blog, geparkte Domain usw.) dort zu finden ist.",
        'ADMIN_NETWORK_DO_404' => "Es wurde der Parameter 'do' nicht übermittelt.",
        'ADMIN_NETWORK_FORM_NOT_SENT' => "Es wurde kein bekanntes Formular versendet.",
        'ADMIN_NETWORK_NOTHING_FOUND' => "Es wurden keine Daten zum Editieren oder Löschen gefunden.",

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index b0c9552f8672a227ca20e74e19dc681ed09a9eb5..90ad1a0efd843cd81169cf92f7402c6de65bd588 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -106,6 +106,9 @@ function doAdminNetworkProcessForm () {
                debug_report_bug(__FUNCTION__, __LINE__, 'Invalid do ' . getRequestElement('do') . ', function ' . $functionName .' does not exist.', false);
        } // END - if
 
+       // Init global arrays
+       $GLOBALS['network_types_disabled'] = array();
+
        // Call-back the method handling our request
        call_user_func($functionName);
 }
@@ -202,7 +205,7 @@ function getNetworkDataById ($networkId, $column = '') {
                $GLOBALS['network_data'][$networkId] = array();
 
                // Query for the network data
-               $result = SQL_QUERY_ESC('SELECT
+               $result = SQL_QUERY_ESC("SELECT
        `network_id`,
        `network_short_name`,
        `network_title`,
@@ -217,7 +220,7 @@ FROM
        `{?_MYSQL_PREFIX?}_network_data`
 WHERE
        `network_id`=%s
-LIMIT 1',
+LIMIT 1",
                        array(bigintval($networkId)), __FUNCTION__, __LINE__);
 
                // Do we have an entry?
@@ -257,7 +260,7 @@ function getNetworkDataByTypeId ($networkId, $column = '') {
                $GLOBALS['network_data'][$networkId] = array();
 
                // Query for the network data
-               $result = SQL_QUERY_ESC('SELECT
+               $result = SQL_QUERY_ESC("SELECT
        d.`network_id`,
        d.`network_short_name`,
        d.`network_title`,
@@ -280,7 +283,7 @@ ON
        d.`network_id`=t.`network_id`
 WHERE
        t.`network_type_id`=%s
-LIMIT 1',
+LIMIT 1",
                        array(bigintval($networkId)), __FUNCTION__, __LINE__);
 
                // Do we have an entry?
@@ -438,14 +441,16 @@ function generateAdminNetworkList () {
        $content = '';
 
        // Query for all networks
-       $result = SQL_QUERY('SELECT
+       $result = SQL_QUERY("SELECT
        `network_id`,
        `network_short_name`,
        `network_title`
 FROM
        `{?_MYSQL_PREFIX?}_network_data`
+WHERE
+       `network_active`='Y'
 ORDER BY
-       `network_short_name` ASC', __FUNCTION__, __LINE__);
+       `network_short_name` ASC", __FUNCTION__, __LINE__);
 
        // Do we have entries?
        if (!SQL_HASZERONUMS($result)) {
@@ -524,17 +529,21 @@ function generateAdminDistinctNetworkTypeList () {
        $content = '';
 
        // Query all types of this network
-       $result = SQL_QUERY('SELECT
-       t.`network_type_id`, t.`network_type_handler`, d.`network_title`
+       $result = SQL_QUERY("SELECT
+       t.`network_type_id`,
+       t.`network_type_handler`,
+       d.`network_title`
 FROM
        `{?_MYSQL_PREFIX?}_network_types` AS t
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_network_data` AS d
 ON
        t.`network_id`=d.`network_id`
+WHERE
+       d.`network_active`='Y'
 ORDER BY
        d.`network_short_name` ASC,
-       t.`network_type_handler` ASC', __FUNCTION__, __LINE__);
+       t.`network_type_handler` ASC", __FUNCTION__, __LINE__);
 
        // Do we have entries?
        if (!SQL_HASZERONUMS($result)) {
@@ -593,11 +602,11 @@ function generateNetworkTypeOptions ($networkId) {
 }
 
 // Generates an options list of all available (hard-coded) handlers
-function generateNetworkTypesAvailableOptions () {
+function generateNetworkTypesAvailableOptions ($defaultType = NULL) {
        // Is it cached?
-       if (!isset($GLOBALS[__FUNCTION__])) {
+       if (!isset($GLOBALS[__FUNCTION__][$defaultType])) {
                // Generate list
-               $GLOBALS[__FUNCTION__] = generateOptionList(
+               $GLOBALS[__FUNCTION__][$defaultType] = generateOptionList(
                        '/ARRAY/',
                        array(
                                'banner',
@@ -631,7 +640,7 @@ function generateNetworkTypesAvailableOptions () {
                                'traffic'
                        ),
                        array(),
-                       '',
+                       $defaultType,
                        '', '',
                        $GLOBALS['network_types_disabled'],
                        'translateNetworkTypeHandler'
@@ -639,7 +648,7 @@ function generateNetworkTypesAvailableOptions () {
        } // END - if
 
        // Return content
-       return $GLOBALS[__FUNCTION__];
+       return $GLOBALS[__FUNCTION__][$defaultType];
 }
 
 // Generates an options list (somewhat getter) ofr request keys
@@ -736,26 +745,62 @@ function generateNetworkApiActiveOptions ($default = '') {
 
 // Translates 'translate_name' for e.g. templates
 function translateNetworkTranslationName ($name) {
-       // Get the message id
-       return '{--ADMIN_NETWORK_TRANSLATE_' . strtoupper($name) . '_NAME--}';
+       // Generate id
+       $messageId = 'ADMIN_NETWORK_TRANSLATE_' . strtoupper($name) . '_NAME';
+
+       // Is the message id there?
+       if (!isMessageIdValid($messageId)) {
+               // Not valid type
+               debug_report_bug(__FUNCTION__, __LINE__, 'type=' . $type . ' is invalid.');
+       } // END - if
+
+       // Return message id
+       return '{--' . $messageId . '--}';
 }
 
 // Translates the network type handler (e.g. banner, paidmail) for templates
 function translateNetworkTypeHandler ($type) {
-       // Get the message id
-       return '{--ADMIN_NETWORK_TYPE_HANDLER_' . strtoupper($type) . '--}';
+       // Generate id
+       $messageId = 'ADMIN_NETWORK_TYPE_HANDLER_' . strtoupper($type);
+
+       // Is the message id there?
+       if (!isMessageIdValid($messageId)) {
+               // Not valid type
+               debug_report_bug(__FUNCTION__, __LINE__, 'type=' . $type . ' is invalid.');
+       } // END - if
+
+       // Return message id
+       return '{--' . $messageId . '--}';
 }
 
 // Translates request type
 function translateNetworkRequestType ($type) {
-       // Get the message id
-       return '{--ADMIN_NETWORK_REQUEST_TYPE_' . strtoupper($type) . '--}';
+       // Generate id
+       $messageId = 'ADMIN_NETWORK_REQUEST_TYPE_' . strtoupper($type) . '';
+
+       // Is the message id there?
+       if (!isMessageIdValid($messageId)) {
+               // Not valid type
+               debug_report_bug(__FUNCTION__, __LINE__, 'type=' . $type . ' is invalid.');
+       } // END - if
+
+       // Return message id
+       return '{--' . $messageId . '--}';
 }
 
 // Translates request parameter
 function translateNetworkRequestParamKey ($param) {
-       // Get the message id
-       return '{--ADMIN_NETWORK_REQUEST_PARAMETER_' . strtoupper($param) . '--}';
+       // Generate id
+       $messageId = 'ADMIN_NETWORK_REQUEST_PARAMETER_' . strtoupper($param) . '';
+
+       // Is the message id there?
+       if (!isMessageIdValid($messageId)) {
+               // Not valid param
+               debug_report_bug(__FUNCTION__, __LINE__, 'param=' . $param . ' is invalid.');
+       } // END - if
+
+       // Return message id
+       return '{--' . $messageId . '--}';
 }
 
 // Translates API index
@@ -1658,7 +1703,8 @@ function doAdminNetworkExportNetworkTypes () {
        `network_type_handler`,
        `network_type_api_url`,
        `network_type_click_url`,
-       `network_type_banner_url`
+       `network_type_banner_url`,
+       `network_type_reload_time_unit`
 FROM
        `{?_MYSQL_PREFIX?}_network_types`
 WHERE
@@ -1685,11 +1731,14 @@ ORDER BY
                // Is the column NULL?
                if (is_null($content['network_type_banner_url'])) {
                        // Column is NULL
-                       $SQL .= "NULL),\n";
+                       $SQL .= 'NULL';
                } else {
                        // Column is set
-                       $SQL .= $content['network_type_banner_url'] . "'),\n";
+                       $SQL .= "'" . $content['network_type_banner_url'] . "'";
                }
+
+               // Add more
+               $SQL .= $content['network_type_reload_time_unit'] . "')\n";
        } // END - while
 
        // Remove last commata and close braces
@@ -1738,7 +1787,7 @@ ORDER BY
                        $content['network_id'] . ', ' .
                        $content['network_type_id'] . ", '" .
                        $content['network_request_param_key'] . "', '" .
-                       $content['network_request_param_value'] . "', '";
+                       $content['network_request_param_value'] . "', ";
                
                // Is the column NULL?
                if (is_null($content['network_request_param_default'])) {
@@ -1746,7 +1795,7 @@ ORDER BY
                        $SQL .= "NULL),\n";
                } else {
                        // Column is set
-                       $SQL .= $content['network_request_param_default'] . "'),\n";
+                       $SQL .= "'" . $content['network_request_param_default'] . "'),\n";
                }
        } // END - while
 

diff --git a/inc/modules/admin/what-config_network_api.php b/inc/modules/admin/what-config_network_api.php
index 2a5ffb83503626999b55125c2c703fdda5932687..8ab691266e97d6043cea594c7b22ee89cc76a85c 100644 (file)
--- a/inc/modules/admin/what-config_network_api.php
+++ b/inc/modules/admin/what-config_network_api.php
@@ -58,12 +58,13 @@ if ($GLOBALS['network_display'] === false) {
 // Do we have a network selected?
 if (isGetRequestElementSet('network_id')) {
        // Check all networks that doesn't have a configuration entry
-       $result = SQL_QUERY_ESC('SELECT
+       $result = SQL_QUERY_ESC("SELECT
        `network_id`,
        `network_short_name`,
        `network_title`,
        `network_reflink`,
        `network_query_amount`,
+       `network_active`,
        NULL AS `network_api_affiliate_id`,
        NULL AS `network_api_password`,
        NULL AS `network_api_site_id`,
@@ -74,7 +75,7 @@ FROM
        `{?_MYSQL_PREFIX?}_network_data`
 WHERE
        `network_id`=%s
-LIMIT 1',
+LIMIT 1",
                array(
                        bigintval(getRequestElement('network_id'))
                ), __FILE__, __LINE__);
@@ -84,6 +85,13 @@ LIMIT 1',
                // Load data
                $content = SQL_FETCHARRAY($result);
 
+               // Is the network active?
+               if ($content['network_active'] == 'N') {
+                       // Not active
+                       displayMessage('{--ADMIN_NETWORK_NOT_ACTIVE--}');
+                       return;
+               } // END - if
+
                // Query for config table
                $result_config = SQL_QUERY_ESC('SELECT
        `network_api_affiliate_id`,

diff --git a/inc/modules/admin/what-config_network_types.php b/inc/modules/admin/what-config_network_types.php
index 012a08ce6d19d68b080ee4c733376288a92348f5..a18ae387c745456a99a51515b0c19067eedf0e04 100644 (file)
--- a/inc/modules/admin/what-config_network_types.php
+++ b/inc/modules/admin/what-config_network_types.php
@@ -68,6 +68,7 @@ if (isGetRequestElementSet('network_id')) {
        `network_type_id`,
        `network_type_handler`,
        `network_type_reload_time_unit`,
+       `network_active`,
        NULL AS `network_data_id`,
        NULL AS `network_max_reload_time`,
        NULL AS `network_min_waiting_time`,
@@ -90,6 +91,13 @@ LIMIT 1',
                        // Load it
                        $content = SQL_FETCHARRAY($result);
 
+                       // Is the network active?
+                       if ($content['network_active'] == 'N') {
+                               // Not active
+                               displayMessage('{--ADMIN_NETWORK_NOT_ACTIVE--}');
+                               return;
+                       } // END - if
+
                        // Check for network type configuration
                        $result_config = SQL_QUERY_ESC('SELECT
        `network_data_id`,

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 3f1540dcdb569c9e947e8d825d70806390e6cb36..6a2fc5eccf97dfd653622a13ba3aea6bdf9074fb 100644 (file)
--- a/templates/de/html/admin/admin_edit_network_types_row.tpl
+++ b/templates/de/html/admin/admin_edit_network_types_row.tpl
@@ -2,7 +2,9 @@
        <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]" />
+               <select name="network_type_handler[$content[network_type_id]]" class="form_select" size="1">
+                       {%pipe,generateNetworkTypesAvailableOptions=$content[network_type_handler]%}
+               </select>
        </td>
 </tr>
 <tr>

diff --git a/templates/xml/admin/admin_list_forced_campaigns.xml b/templates/xml/admin/admin_list_forced_campaigns.xml
index f6828883158bf239c798a3af193a4a0a823f7cc4..bc53245a6285d7c531b5d449a86931460c6f7f54 100644 (file)
--- a/templates/xml/admin/admin_list_forced_campaigns.xml
+++ b/templates/xml/admin/admin_list_forced_campaigns.xml
@@ -73,7 +73,7 @@ MA  02110-1301  USA
                        <select-data-from-list-entry type="string" table="" value="forced_campaign_ordered_clicks" alias="" function="" />
                        <select-data-from-list-entry type="string" table="" value="forced_campaign_payment_api" alias="" function="" />
                        <select-data-from-list-entry type="string" table="" value="forced_campaign_reload_lock" alias="" function="" />
-                       <select-data-from-list-entry type="string" table="" value="forced_campaign_min_stay" alias="" function="" />
+                       <select-data-from-list-entry type="string" table="" value="forced_campaign_minimum_stay" alias="" function="" />
                        <select-data-from-list-entry type="string" table="" value="forced_ads_id" alias="" function="" />
                        <select-data-from-list-entry type="string" table="" value="forced_campaign_userid" alias="" function="" />
                        <select-data-from-list-entry type="string" table="" value="forced_costs_id" alias="" function="" />