From 066dc2fe27293ce9dc2740fb58caa064bd506bd5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 9 Aug 2010 00:15:53 +0000 Subject: [PATCH] New network added, sorting now showed: - New adverstising network 'doubleads' added - Sorting of API array elements is now showed (yet not functional for sorting) - TODOs.txt updated --- DOCS/TODOs.txt | 27 +- inc/extensions/ext-network.php | 237 ++++++++++++++++++ inc/language/network_de.php | 1 + .../what-list_network_api_translation.php | 2 +- .../admin_list_network_api_translation.tpl | 5 +- ...admin_list_network_api_translation_row.tpl | 5 +- 6 files changed, 259 insertions(+), 18 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 72eec24186..7a086b3768 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -18,20 +18,19 @@ ./inc/extensions/ext-network.php:24: * @TODO ADCocktail: Zero array element is return code! * ./inc/extensions/ext-network.php:25: * @TODO Affiliblatt: All except banner, do they really have UTF-8? * ./inc/extensions/ext-network.php:26: * @TODO AllAds4You: Traffic from abroad, High-Forced banner * -./inc/extensions/ext-network.php:27: * @TODO doubleads: Which charset? * -./inc/extensions/ext-network.php:28: * @TODO Fusion-Ads: Has click/banner URL in API response, really UTF-8 * -./inc/extensions/ext-network.php:29: * @TODO GolloX: Which charset? * -./inc/extensions/ext-network.php:30: * @TODO homeADS: Which charset? * -./inc/extensions/ext-network.php:31: * @TODO paid4ad: Which URLs for click and banner? * -./inc/extensions/ext-network.php:32: * @TODO VIPads: Which charset? * -./inc/extensions/ext-network.php:33: * @TODO Der Werbepartner.cc: Banner click/view is JavaScript! * -./inc/extensions/ext-network.php:34: * @TODO Der Werbepartner.cc: Forced textlink not correct * -./inc/extensions/ext-network.php:35: * @TODO Der Werbepartner.cc: Layer not correct * -./inc/extensions/ext-network.php:36: * @TODO Der Werbepartner.cc: Sky banner is JavaScript! * -./inc/extensions/ext-network.php:37: * @TODO Der Werbepartner.cc: Surfbar click not correct * -./inc/extensions/ext-network.php:38: * @TODO Der Werbepartner.cc: Textlink not not correct * -./inc/extensions/ext-network.php:39: * @TODO Yoo!Media: What is LayerAd compared to Layer click? * -./inc/extensions/ext-network.php:93: // @TODO network_type_handle is an internal name and needs documentation +./inc/extensions/ext-network.php:27: * @TODO Fusion-Ads: Has click/banner URL in API response, really UTF-8 * +./inc/extensions/ext-network.php:28: * @TODO GolloX: Which charset? * +./inc/extensions/ext-network.php:29: * @TODO homeADS: Which charset? * +./inc/extensions/ext-network.php:30: * @TODO paid4ad: Which URLs for click and banner? * +./inc/extensions/ext-network.php:31: * @TODO VIPads: Which charset? * +./inc/extensions/ext-network.php:32: * @TODO Der Werbepartner.cc: Banner click/view is JavaScript! * +./inc/extensions/ext-network.php:33: * @TODO Der Werbepartner.cc: Forced textlink not correct * +./inc/extensions/ext-network.php:34: * @TODO Der Werbepartner.cc: Layer not correct * +./inc/extensions/ext-network.php:35: * @TODO Der Werbepartner.cc: Sky banner is JavaScript! * +./inc/extensions/ext-network.php:36: * @TODO Der Werbepartner.cc: Surfbar click not correct * +./inc/extensions/ext-network.php:37: * @TODO Der Werbepartner.cc: Textlink not not correct * +./inc/extensions/ext-network.php:38: * @TODO Yoo!Media: What is LayerAd compared to Layer click? * +./inc/extensions/ext-network.php:92: // @TODO network_type_handle is an internal name and needs documentation ./inc/extensions/ext-newsletter.php:220: // @TODO Move these into configuration ./inc/extensions/ext-order.php:344: // @TODO This should be moved out to inc/reset/ ./inc/extensions/ext-rallye.php:331: // @TODO Move this code into rallye_functions.php diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php index e91a4d8180..19df19ef0f 100644 --- a/inc/extensions/ext-network.php +++ b/inc/extensions/ext-network.php @@ -446,6 +446,22 @@ PRIMARY KEY (`network_reload_id`) (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%', NULL)"); // Network type handlers - doubleads + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_types` (`network_type_id`, `network_id`, `network_type_handle`, `network_type_api_url`, `network_type_click_url`, `network_type_banner_url`) VALUES +(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%'), +(233, 26, 'banner_view', 'http://www.doubleads.de/interface/out_banner.php', 'http://www.doubleads.de/bannerklf.php?id=%CID%', 'http://www.doubleads.de/banner.php?id=%CID%'), +(234, 26, 'textlink_click', 'http://www.doubleads.de/interface/out_textlink.php', 'http://www.doubleads.de/textlinkklick.php?id=%CID%', NULL), +(235, 26, 'textlink_view', 'http://www.doubleads.de/interface/out_textlink.php', 'http://www.doubleads.de/textlinkklick.php?id=%CID%', NULL), +(236, 26, 'surfbar_click', 'http://www.doubleads.de/interface/out_sbanner.php', 'http://www.doubleads.de/bannerklf.php?id=%CID%', 'http://www.doubleads.de/banner.php?id=%CID%'), +(237, 26, 'surfbar_view', 'http://www.doubleads.de/interface/out_sbanner.php', 'http://www.doubleads.de/bannerklf.php?id=%CID%', 'http://www.doubleads.de/banner.php?id=%CID%'), +(238, 26, 'forcedbanner', 'http://www.doubleads.de/interface/out_fbanner.php', 'http://www.doubleads.de/bannerklf.php?id=%CID%', 'http://www.doubleads.de/banner.php?id=%CID%'), +(239, 26, 'textmail', 'http://www.doubleads.de/interface/out_paidmail.php', 'http://www.doubleads.de/emailf.php?id=%CID%', NULL), +(240, 26, 'htmlmail', 'http://www.doubleads.de/interface/out_paidmail.php', 'http://www.doubleads.de/emailf.php?id=%CID%', NULL), +(241, 26, 'layer_click', 'http://www.doubleads.de/interface/out_layer.php', 'http://www.doubleads.de/layer.php?id=%CID%', NULL), +(242, 26, 'layer_view', 'http://www.doubleads.de/interface/out_layer.php', 'http://www.doubleads.de/layer.php?id=%CID%', NULL), +(243, 26, 'popup', 'http://www.doubleads.de/interface/out_popup.php', 'http://www.doubleads.de/popup.php?id=%CID%', NULL), +(244, 26, 'popdown', 'http://www.doubleads.de/interface/out_popdown.php', 'http://www.doubleads.de/popdown.php?id=%CID%', NULL), +(245, 26, 'lead', 'http://www.doubleads.de/interface/out_lead.php', 'http://www.doubleads.de/lead.php?id=%CID%', NULL), +(246, 26, 'sale', 'http://www.doubleads.de/interface/out_sale.php', 'http://www.doubleads.de/sale.php?id=%CID%', NULL)"); // Network type handlers - Fusion-Ads @@ -1390,6 +1406,117 @@ PRIMARY KEY (`network_reload_id`) (24, 221, 'reward', 'verguetung', NULL), (24, 221, 'minimum_stay', 'ma', NULL)"); + // Request parameters per type handler - doubleads + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES +(26, 232, 'id', 'id', NULL), +(26, 232, 'password', 'pw', NULL), +(26, 232, 'reload', 'reload', NULL), +(26, 232, 'remain', 'uebrig', NULL), +(26, 232, 'reward', 'verguetung', NULL), +(26, 232, 'sid', 'sid', NULL), +(26, 232, 'size', 'size', NULL), +(26, 232, 'type', 'typ', 'klick'), +(26, 233, 'id', 'id', NULL), +(26, 233, 'password', 'pw', NULL), +(26, 233, 'reload', 'reload', NULL), +(26, 233, 'remain', 'uebrig', NULL), +(26, 233, 'reward', 'verguetung', NULL), +(26, 233, 'sid', 'sid', NULL), +(26, 233, 'size', 'size', NULL), +(26, 233, 'type', 'typ', 'view'), +(26, 234, 'id', 'id', NULL), +(26, 234, 'password', 'pw', NULL), +(26, 234, 'reload', 'reload', NULL), +(26, 234, 'remain', 'uebrig', NULL), +(26, 234, 'reward', 'verguetung', NULL), +(26, 234, 'sid', 'sid', NULL), +(26, 234, 'type', 'typ', 'klick'), +(26, 235, 'id', 'id', NULL), +(26, 235, 'password', 'pw', NULL), +(26, 235, 'reload', 'reload', NULL), +(26, 235, 'remain', 'uebrig', NULL), +(26, 235, 'reward', 'verguetung', NULL), +(26, 235, 'sid', 'sid', NULL), +(26, 235, 'type', 'typ', 'view'), +(26, 236, 'id', 'id', NULL), +(26, 236, 'password', 'pw', NULL), +(26, 236, 'reload', 'reload', NULL), +(26, 236, 'remain', 'uebrig', NULL), +(26, 236, 'reward', 'verguetung', NULL), +(26, 236, 'sid', 'sid', NULL), +(26, 236, 'size', 'size', NULL), +(26, 236, 'type', 'typ', 'klick'), +(26, 237, 'id', 'id', NULL), +(26, 237, 'password', 'pw', NULL), +(26, 237, 'reload', 'reload', NULL), +(26, 237, 'remain', 'uebrig', NULL), +(26, 237, 'reward', 'verguetung', NULL), +(26, 237, 'sid', 'sid', NULL), +(26, 237, 'size', 'size', NULL), +(26, 237, 'type', 'typ', 'view'), +(26, 238, 'id', 'id', NULL), +(26, 238, 'minimum_stay', 'ma', NULL), +(26, 238, 'password', 'pw', NULL), +(26, 238, 'reload', 'reload', NULL), +(26, 238, 'remain', 'uebrig', NULL), +(26, 238, 'reward', 'verguetung', NULL), +(26, 238, 'sid', 'sid', NULL), +(26, 238, 'size', 'size', NULL), +(26, 239, 'id', 'id', NULL), +(26, 239, 'minimum_stay', 'ma', NULL), +(26, 239, 'password', 'pw', NULL), +(26, 239, 'reload', 'reload', NULL), +(26, 239, 'remain', 'uebrig', NULL), +(26, 239, 'reward', 'verguetung', NULL), +(26, 239, 'sid', 'sid', NULL), +(26, 239, 'type', 'typ', 'text'), +(26, 240, 'id', 'id', NULL), +(26, 240, 'minimum_stay', 'ma', NULL), +(26, 240, 'password', 'pw', NULL), +(26, 240, 'reload', 'reload', NULL), +(26, 240, 'remain', 'uebrig', NULL), +(26, 240, 'reward', 'verguetung', NULL), +(26, 240, 'sid', 'sid', NULL), +(26, 240, 'type', 'typ', 'html'), +(26, 241, 'id', 'id', NULL), +(26, 241, 'password', 'pw', NULL), +(26, 241, 'reload', 'reload', NULL), +(26, 241, 'remain', 'uebrig', NULL), +(26, 241, 'reward', 'verguetung', NULL), +(26, 241, 'sid', 'sid', NULL), +(26, 241, 'type', 'typ', 'klick'), +(26, 242, 'id', 'id', NULL), +(26, 242, 'password', 'pw', NULL), +(26, 242, 'reload', 'reload', NULL), +(26, 242, 'remain', 'uebrig', NULL), +(26, 242, 'reward', 'verguetung', NULL), +(26, 242, 'sid', 'sid', NULL), +(26, 242, 'type', 'typ', 'view'), +(26, 243, 'id', 'id', NULL), +(26, 243, 'minimum_stay', 'ma', NULL), +(26, 243, 'password', 'pw', NULL), +(26, 243, 'reload', 'reload', NULL), +(26, 243, 'remain', 'uebrig', NULL), +(26, 243, 'reward', 'verguetung', NULL), +(26, 243, 'sid', 'sid', NULL), +(26, 244, 'id', 'id', NULL), +(26, 244, 'minimum_stay', 'ma', NULL), +(26, 244, 'password', 'pw', NULL), +(26, 244, 'reload', 'reload', NULL), +(26, 244, 'remain', 'uebrig', NULL), +(26, 244, 'reward', 'verguetung', NULL), +(26, 244, 'sid', 'sid', NULL), +(26, 245, 'id', 'id', NULL), +(26, 245, 'password', 'pw', NULL), +(26, 245, 'remain', 'uebrig', NULL), +(26, 245, 'reward', 'verguetung', NULL), +(26, 245, 'sid', 'sid', NULL), +(26, 246, 'id', 'id', NULL), +(26, 246, 'password', 'pw', NULL), +(26, 246, 'remain', 'uebrig', NULL), +(26, 246, 'reward', 'verguetung', NULL), +(26, 246, 'sid', 'sid', NULL)"); + // Request parameters per type handler - Fusion-Ads // Request parameters per type handler - GigapPromo @@ -2953,6 +3080,116 @@ PRIMARY KEY (`network_reload_id`) (24, 221, 9, 7), (24, 221, 27, 8)"); + // API array elements - doubleads + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES +(26, 232, 1, 1), +(26, 232, 2, 2), +(26, 232, 3, 3), +(26, 232, 4, 4), +(26, 232, 5, 5), +(26, 232, 6, 6), +(26, 232, 8, 7), +(26, 232, 10, 8), +(26, 233, 1, 1), +(26, 233, 2, 2), +(26, 233, 3, 3), +(26, 233, 4, 4), +(26, 233, 5, 5), +(26, 233, 6, 6), +(26, 233, 8, 7), +(26, 233, 10, 8), +(26, 234, 1, 1), +(26, 234, 2, 2), +(26, 234, 9, 3), +(26, 234, 4, 4), +(26, 234, 5, 5), +(26, 234, 6, 6), +(26, 235, 1, 1), +(26, 235, 2, 2), +(26, 235, 9, 3), +(26, 235, 4, 4), +(26, 235, 5, 5), +(26, 235, 6, 6), +(26, 236, 1, 1), +(26, 236, 2, 2), +(26, 236, 3, 3), +(26, 236, 4, 4), +(26, 236, 5, 5), +(26, 236, 6, 6), +(26, 236, 8, 7), +(26, 237, 1, 1), +(26, 237, 2, 2), +(26, 237, 3, 3), +(26, 237, 4, 4), +(26, 237, 5, 5), +(26, 237, 6, 6), +(26, 237, 8, 7), +(26, 238, 1, 1), +(26, 238, 2, 2), +(26, 238, 3, 3), +(26, 238, 4, 4), +(26, 238, 5, 5), +(26, 238, 6, 6), +(26, 238, 10, 7), +(26, 238, 8, 8), +(26, 239, 1, 1), +(26, 239, 2, 2), +(26, 239, 4, 3), +(26, 239, 5, 4), +(26, 239, 6, 5), +(26, 239, 10, 6), +(26, 239, 9, 7), +(26, 240, 1, 1), +(26, 240, 2, 2), +(26, 240, 4, 3), +(26, 240, 5, 4), +(26, 240, 6, 5), +(26, 240, 10, 6), +(26, 240, 9, 7), +(26, 241, 1, 1), +(26, 241, 2, 2), +(26, 241, 4, 3), +(26, 241, 5, 4), +(26, 241, 6, 5), +(26, 242, 1, 1), +(26, 242, 2, 2), +(26, 242, 4, 3), +(26, 242, 5, 4), +(26, 242, 6, 5), +(26, 243, 1, 1), +(26, 243, 2, 2), +(26, 243, 4, 3), +(26, 243, 5, 4), +(26, 243, 6, 5), +(26, 243, 10, 6), +(26, 244, 1, 1), +(26, 244, 2, 2), +(26, 244, 4, 3), +(26, 244, 5, 4), +(26, 244, 6, 5), +(26, 244, 10, 6), +(26, 245, 1, 1), +(26, 245, 2, 2), +(26, 245, 6, 3), +(26, 245, 19, 4), +(26, 245, 20, 5), +(26, 245, 21, 6), +(26, 245, 22, 7), +(26, 245, 23, 8), +(26, 245, 9, 9), +(26, 245, 25, 10), +(26, 245, 5, 11), +(26, 246, 1, 1), +(26, 246, 2, 2), +(26, 246, 6, 3), +(26, 246, 19, 4), +(26, 246, 20, 5), +(26, 246, 21, 6), +(26, 246, 22, 7), +(26, 246, 23, 8), +(26, 246, 9, 9), +(26, 246, 25, 10)"); + // API array elements - Fusion-Ads // API array elements - GigaPromo diff --git a/inc/language/network_de.php b/inc/language/network_de.php index 6ba1e5dc7c..76fb3f0803 100644 --- a/inc/language/network_de.php +++ b/inc/language/network_de.php @@ -206,6 +206,7 @@ addMessages(array( 'ADMIN_NETWORK_API_TRANSLATION_INDEX' => "Neuen Array-Index eintragen", 'ADMIN_NETWORK_API_TRANSLATION_INDEX_TRANSLATION' => "Index-Übersetzung auswählen", 'ADMIN_NETWORK_API_INDEX_TRANSLATION' => "Index-Übersetzung", + 'ADMIN_NETWORK_API_INDEX_SORTING' => "Index-Reihenfolge", // Error codes 'ADMIN_NETWORK_AFF_ID_PASS_WRONG_ERROR_CODE' => "Affiliate-Id oder -Passwort falsch", 'ADMIN_NETWORK_SITE_ID_NOT_ASSIGNED_ERROR_CODE' => "Seiten-Id nicht zugewiesen/ungültig", diff --git a/inc/modules/admin/what-list_network_api_translation.php b/inc/modules/admin/what-list_network_api_translation.php index baadb48c0b..97894cda8b 100644 --- a/inc/modules/admin/what-list_network_api_translation.php +++ b/inc/modules/admin/what-list_network_api_translation.php @@ -89,7 +89,7 @@ if (isGetRequestParameterSet('network')) { // Load all advert codes for given network $result = SQL_QUERY_ESC("SELECT - p.`network_api_id`, t.`network_type_id`, t.`network_type_handle`, p.`network_api_index` + p.`network_api_id`, t.`network_type_id`, t.`network_type_handle`, p.`network_api_index`, p.`sort` FROM `{?_MYSQL_PREFIX?}_network_api_translation` AS p INNER JOIN diff --git a/templates/de/html/admin/admin_list_network_api_translation.tpl b/templates/de/html/admin/admin_list_network_api_translation.tpl index 66087bc587..686cb06da3 100644 --- a/templates/de/html/admin/admin_list_network_api_translation.tpl +++ b/templates/de/html/admin/admin_list_network_api_translation.tpl @@ -14,11 +14,12 @@ {--ID_SELECT--} {--ADMIN_NETWORK_TYPES_HANDLE--} - {--ADMIN_NETWORK_API_INDEX_TRANSLATION--} + {--ADMIN_NETWORK_API_INDEX_TRANSLATION--} + {--ADMIN_NETWORK_API_INDEX_SORTING--} $content - + diff --git a/templates/de/html/admin/admin_list_network_api_translation_row.tpl b/templates/de/html/admin/admin_list_network_api_translation_row.tpl index eea03c7b9d..37643bddbe 100644 --- a/templates/de/html/admin/admin_list_network_api_translation_row.tpl +++ b/templates/de/html/admin/admin_list_network_api_translation_row.tpl @@ -5,7 +5,10 @@ {%pipe,translateNetworkTypeHandler=$content[network_type_handle]%} - + {%pipe,translateNetworkApiIndex=$content[network_api_index]%} + + $content[sort] + -- 2.39.5