From 5ea4a58fa13d33b4133a6fda5a83abf083002ebf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 16 Aug 2010 01:35:26 +0000 Subject: [PATCH] More usage of EL, homeADS added - Advertising network 'homeADS' added - More usage of EL in ext-network - TODOs.txt updated --- DOCS/TODOs.txt | 31 ++- inc/extensions/ext-network.php | 212 +++++++++++++++++- inc/language/network_de.php | 4 +- inc/language/payout_de.php | 2 +- .../admin/admin_list_network_types_row.tpl | 2 +- 5 files changed, 228 insertions(+), 23 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 26eec1fed5..42bf640d8c 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -20,17 +20,16 @@ ./inc/extensions/ext-network.php:26: * @TODO AllAds4You: Traffic from abroad, High-Forced banner * ./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: HTML text is send encoded with BASE64 * -./inc/extensions/ext-network.php:32: * @TODO Der Werbepartner.cc: Banner click/view is JavaScript! * -./inc/extensions/ext-network.php:33: * @TODO Der Werbepartner.cc: Forced textlink not correct * -./inc/extensions/ext-network.php:34: * @TODO Der Werbepartner.cc: Layer not correct * -./inc/extensions/ext-network.php:35: * @TODO Der Werbepartner.cc: Sky banner is JavaScript! * -./inc/extensions/ext-network.php:36: * @TODO Der Werbepartner.cc: Surfbar click not correct * -./inc/extensions/ext-network.php:37: * @TODO Der Werbepartner.cc: Textlink not not correct * -./inc/extensions/ext-network.php:38: * @TODO Yoo!Media: What is LayerAd compared to Layer click? * -./inc/extensions/ext-network.php:92: // @TODO network_type_handle is an internal name and needs documentation +./inc/extensions/ext-network.php:29: * @TODO paid4ad: Which URLs for click and banner? * +./inc/extensions/ext-network.php:30: * @TODO VIPads: HTML text is send encoded with BASE64 * +./inc/extensions/ext-network.php:31: * @TODO Der Werbepartner.cc: Banner click/view is JavaScript! * +./inc/extensions/ext-network.php:32: * @TODO Der Werbepartner.cc: Forced textlink not correct * +./inc/extensions/ext-network.php:33: * @TODO Der Werbepartner.cc: Layer not correct * +./inc/extensions/ext-network.php:34: * @TODO Der Werbepartner.cc: Sky banner is JavaScript! * +./inc/extensions/ext-network.php:35: * @TODO Der Werbepartner.cc: Surfbar click not correct * +./inc/extensions/ext-network.php:36: * @TODO Der Werbepartner.cc: Textlink not not correct * +./inc/extensions/ext-network.php:37: * @TODO Yoo!Media: What is LayerAd compared to Layer click? * +./inc/extensions/ext-network.php:91: // @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 @@ -41,12 +40,12 @@ ./inc/extensions-functions.php:434:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) ) ./inc/extensions-functions.php:564: // @TODO Extension is loaded, what next? ./inc/functions.php:112: // @TODO Extension 'msg' does not exist -./inc/functions.php:1490: // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ? -./inc/functions.php:1513: // @TODO Rewrite this old lost code to a template -./inc/functions.php:1581: // @TODO Are these convertions still required? -./inc/functions.php:1599:// @TODO Rewrite this function to use readFromFile() and writeToFile() +./inc/functions.php:1493: // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ? +./inc/functions.php:1516: // @TODO Rewrite this old lost code to a template +./inc/functions.php:1584: // @TODO Are these convertions still required? +./inc/functions.php:1602:// @TODO Rewrite this function to use readFromFile() and writeToFile() ./inc/functions.php:175:// @TODO Rewrite this to an extension 'smtp' -./inc/functions.php:2255: // @TODO This is still very static, rewrite it somehow +./inc/functions.php:2258: // @TODO This is still very static, rewrite it somehow ./inc/gen_sql_patches.php:96:// @TODO Rewrite this to a filter ./inc/install-functions.php:59: // @TODO DEACTIVATED: changeDataInFile(getCachePath() . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0); ./inc/language/de.php:1116:// @TODO Rewrite these two constants diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php index 077aea8329..af03d7ed07 100644 --- a/inc/extensions/ext-network.php +++ b/inc/extensions/ext-network.php @@ -26,7 +26,6 @@ * @TODO AllAds4You: Traffic from abroad, High-Forced banner * * @TODO Fusion-Ads: Has click/banner URL in API response, really UTF-8 * * @TODO GolloX: Which charset? * - * @TODO homeADS: Which charset? * * @TODO paid4ad: Which URLs for click and banner? * * @TODO VIPads: HTML text is send encoded with BASE64 * * @TODO Der Werbepartner.cc: Banner click/view is JavaScript! * @@ -257,7 +256,6 @@ PRIMARY KEY (`network_reload_id`) (39, 'media_url')"); // Insert error code types - // - Affiliate id or interface password wrong addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_error_types` (`network_code_id`, `network_code`) VALUES (1, 'AFF_ID_PASS_WRONG'), (2, 'SITE_ID_NOT_ASSIGNED'), @@ -297,7 +295,8 @@ PRIMARY KEY (`network_reload_id`) ('cityads', 'City-Ads', 'http://www.city-ads.de?ref=221', '|', '|', 'GET', 'WINDOWS-1252'), ('goldsponsor', 'Gold-Sponsor', 'http://www.gold-sponsor.de?ref=42', '|', '|', 'GET', 'WINDOWS-1252'), ('doubleads', 'doubleads.de', 'http://www.doubleads.de?ref=1063', '|', '|', 'GET', 'ISO-8859-1'), -('vipads', 'VIPads.de', 'http://vipads.de/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1')"); +('vipads', 'VIPads.de', 'http://vipads.de/index.php?seite=anmeldung&ref=Quix0r', '|', '|', 'GET', 'ISO-8859-1'), +('homeads', 'homeADS', 'http://www.homeads.de/?ref=1540', '|', '|', 'GET', 'WINDOWS-1252')"); // Network type handlers - A3H 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 @@ -490,6 +489,22 @@ PRIMARY KEY (`network_reload_id`) (231, 25, 'textmail', 'http://www.gold-sponsor.de/interface/', 'http://www.gold-sponsor.de/codes/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%', NULL), (229, 25, 'traffic', 'http://www.gold-sponsor.de/interface/', 'http://www.gold-sponsor.de/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%', NULL)"); + // Network type handlers - homeADS + 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 +(260, 28, 'banner_click', 'http://www.homeads.de/interface/out_banner.php', 'http://www.homeads.de/bannerklf.php?id=%CID%', 'http://www.homeads.de/banner.php?id=%CID%'), +(261, 28, 'banner_view', 'http://www.homeads.de/interface/out_banner.php', 'http://www.homeads.de/bannerklf.php?id=%CID%', 'http://www.homeads.de/banner.php?id=%CID%'), +(264, 28, 'forcedbanner', 'http://www.homeads.de/interface/out_fbanner.php', 'http://www.homeads.de/bannerklf.php?id=%CID%', 'http://www.homeads.de/banner.php?id=%CID%'), +(266, 28, 'htmlmail', 'http://www.homeads.de/interface/out_paidmail.php', 'http://www.homeads.de/emailf.php?id=%CID%', NULL), +(267, 28, 'layer_click', 'http://www.homeads.de/interface/out_layer.php', 'http://www.homeads.de/layer.php?id=%CID%', NULL), +(268, 28, 'layer_view', 'http://www.homeads.de/interface/out_layer.php', 'http://www.homeads.de/layer.php?id=%CID%', NULL), +(271, 28, 'lead', 'http://www.homeads.de/interface/out_lead.php', 'http://www.homeads.de/lead.php?id=%CID%', NULL), +(270, 28, 'popdown', 'http://www.homeads.de/interface/out_popdown.php', 'http://www.homeads.de/popdown.php?id=%CID%', NULL), +(269, 28, 'popup', 'http://www.homeads.de/interface/out_popup.php', 'http://www.homeads.de/popup.php?id=%CID%', NULL), +(272, 28, 'sale', 'http://www.homeads.de/interface/out_sale.php', 'http://www.homeads.de/sale.php?id=%CID%', NULL), +(262, 28, 'textlink_click', 'http://www.homeads.de/interface/out_textlink.php', 'http://www.homeads.de/textlinkklick.php?id=%CID%', NULL), +(263, 28, 'textlink_view', 'http://www.homeads.de/interface/out_textlink.php', 'http://www.homeads.de/textlinkklick.php?id=%CID%', NULL), +(265, 28, 'textmail', 'http://www.homeads.de/interface/out_paidmail.php', 'http://www.homeads.de/emailf.php?id=%CID%', NULL)"); + // Network type handlers - HPSponsor 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 (135, 15, 'banner_click', 'http://hpsponsor.at/interface/api_2.php', 'http://hpsponsor.at/codes/klickbanner.php?id=%UID%&bid=%CID%&aid=%SID%&trackid=%TID%', 'http://hpsponsor.at/codes/viewbanner.php?id=%UID%&bid=%CID%&aid=%SID%'), @@ -1660,6 +1675,101 @@ PRIMARY KEY (`network_reload_id`) (25, 231, 'remain', 'uebrig', NULL), (25, 231, 'reward', 'verguetung', NULL)"); + // Request parameters per type handler - homeADS + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES +(28, 260, 'id', 'id', NULL), +(28, 260, 'password', 'pw', NULL), +(28, 260, 'reload', 'reload', NULL), +(28, 260, 'remain', 'uebrig', NULL), +(28, 260, 'reward', 'verguetung', NULL), +(28, 260, 'sid', 'sid', NULL), +(28, 260, 'size', 'size', NULL), +(28, 260, 'type', 'typ', 'klick'), +(28, 261, 'id', 'id', NULL), +(28, 261, 'password', 'pw', NULL), +(28, 261, 'reload', 'reload', NULL), +(28, 261, 'remain', 'uebrig', NULL), +(28, 261, 'reward', 'verguetung', NULL), +(28, 261, 'sid', 'sid', NULL), +(28, 261, 'size', 'size', NULL), +(28, 261, 'type', 'typ', 'view'), +(28, 262, 'id', 'id', NULL), +(28, 262, 'password', 'pw', NULL), +(28, 262, 'reload', 'reload', NULL), +(28, 262, 'remain', 'uebrig', NULL), +(28, 262, 'reward', 'verguetung', NULL), +(28, 262, 'sid', 'sid', NULL), +(28, 262, 'type', 'typ', 'klick'), +(28, 263, 'id', 'id', NULL), +(28, 263, 'password', 'pw', NULL), +(28, 263, 'reload', 'reload', NULL), +(28, 263, 'remain', 'uebrig', NULL), +(28, 263, 'reward', 'verguetung', NULL), +(28, 263, 'sid', 'sid', NULL), +(28, 263, 'type', 'typ', 'view'), +(28, 264, 'id', 'id', NULL), +(28, 264, 'minimum_stay', 'ma', NULL), +(28, 264, 'password', 'pw', NULL), +(28, 264, 'reload', 'reload', NULL), +(28, 264, 'remain', 'uebrig', NULL), +(28, 264, 'reward', 'verguetung', NULL), +(28, 264, 'sid', 'sid', NULL), +(28, 264, 'size', 'size', NULL), +(28, 265, 'id', 'id', NULL), +(28, 265, 'minimum_stay', 'ma', NULL), +(28, 265, 'password', 'pw', NULL), +(28, 265, 'reload', 'reload', NULL), +(28, 265, 'remain', 'uebrig', NULL), +(28, 265, 'reward', 'verguetung', NULL), +(28, 265, 'sid', 'sid', NULL), +(28, 265, 'type', 'typ', 'text'), +(28, 266, 'id', 'id', NULL), +(28, 266, 'minimum_stay', 'ma', NULL), +(28, 266, 'password', 'pw', NULL), +(28, 266, 'reload', 'reload', NULL), +(28, 266, 'remain', 'uebrig', NULL), +(28, 266, 'reward', 'verguetung', NULL), +(28, 266, 'sid', 'sid', NULL), +(28, 266, 'type', 'typ', 'html'), +(28, 267, 'id', 'id', NULL), +(28, 267, 'password', 'pw', NULL), +(28, 267, 'reload', 'reload', NULL), +(28, 267, 'remain', 'uebrig', NULL), +(28, 267, 'reward', 'verguetung', NULL), +(28, 267, 'sid', 'sid', NULL), +(28, 267, 'type', 'typ', 'klick'), +(28, 268, 'id', 'id', NULL), +(28, 268, 'password', 'pw', NULL), +(28, 268, 'reload', 'reload', NULL), +(28, 268, 'remain', 'uebrig', NULL), +(28, 268, 'reward', 'verguetung', NULL), +(28, 268, 'sid', 'sid', NULL), +(28, 268, 'type', 'typ', 'view'), +(28, 269, 'id', 'id', NULL), +(28, 269, 'minimum_stay', 'ma', NULL), +(28, 269, 'password', 'pw', NULL), +(28, 269, 'reload', 'reload', NULL), +(28, 269, 'remain', 'uebrig', NULL), +(28, 269, 'reward', 'verguetung', NULL), +(28, 269, 'sid', 'sid', NULL), +(28, 270, 'id', 'id', NULL), +(28, 270, 'minimum_stay', 'ma', NULL), +(28, 270, 'password', 'pw', NULL), +(28, 270, 'reload', 'reload', NULL), +(28, 270, 'remain', 'uebrig', NULL), +(28, 270, 'reward', 'verguetung', NULL), +(28, 270, 'sid', 'sid', NULL), +(28, 271, 'id', 'id', NULL), +(28, 271, 'password', 'pw', NULL), +(28, 271, 'remain', 'uebrig', NULL), +(28, 271, 'reward', 'verguetung', NULL), +(28, 271, 'sid', 'sid', NULL), +(28, 272, 'id', 'id', NULL), +(28, 272, 'password', 'pw', NULL), +(28, 272, 'remain', 'uebrig', NULL), +(28, 272, 'reward', 'verguetung', NULL), +(28, 272, 'sid', 'sid', NULL)"); + // Request parameters per type handler - HPSponsor addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES (15, 135, 'extra', 'typ', 'forcedbanner'), @@ -3414,6 +3524,102 @@ PRIMARY KEY (`network_reload_id`) (25, 231, 10, 6), (25, 231, 9, 7)"); + // API array elements - homeADS + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES +(28, 260, 1, 1), +(28, 260, 2, 2), +(28, 260, 3, 3), +(28, 260, 4, 4), +(28, 260, 5, 5), +(28, 260, 6, 6), +(28, 260, 8, 7), +(28, 260, 10, 8), +(28, 261, 1, 1), +(28, 261, 2, 2), +(28, 261, 3, 3), +(28, 261, 4, 4), +(28, 261, 5, 5), +(28, 261, 6, 6), +(28, 261, 8, 7), +(28, 261, 10, 8), +(28, 262, 1, 1), +(28, 262, 2, 2), +(28, 262, 9, 3), +(28, 262, 4, 4), +(28, 262, 5, 5), +(28, 262, 6, 6), +(28, 263, 1, 1), +(28, 263, 2, 2), +(28, 263, 9, 3), +(28, 263, 4, 4), +(28, 263, 5, 5), +(28, 263, 6, 6), +(28, 264, 1, 1), +(28, 264, 2, 2), +(28, 264, 3, 3), +(28, 264, 4, 4), +(28, 264, 5, 5), +(28, 264, 6, 6), +(28, 264, 10, 7), +(28, 264, 8, 8), +(28, 265, 1, 1), +(28, 265, 2, 2), +(28, 265, 4, 3), +(28, 265, 5, 4), +(28, 265, 6, 5), +(28, 265, 10, 6), +(28, 265, 9, 7), +(28, 266, 1, 1), +(28, 266, 2, 2), +(28, 266, 4, 3), +(28, 266, 5, 4), +(28, 266, 6, 5), +(28, 266, 10, 6), +(28, 266, 9, 7), +(28, 267, 1, 1), +(28, 267, 2, 2), +(28, 267, 4, 3), +(28, 267, 5, 4), +(28, 267, 6, 5), +(28, 268, 1, 1), +(28, 268, 2, 2), +(28, 268, 4, 3), +(28, 268, 5, 4), +(28, 268, 6, 5), +(28, 269, 1, 1), +(28, 269, 2, 2), +(28, 269, 4, 3), +(28, 269, 5, 4), +(28, 269, 6, 5), +(28, 269, 10, 6), +(28, 270, 1, 1), +(28, 270, 2, 2), +(28, 270, 4, 3), +(28, 270, 5, 4), +(28, 270, 6, 5), +(28, 270, 10, 6), +(28, 271, 1, 1), +(28, 271, 2, 2), +(28, 271, 6, 3), +(28, 271, 19, 4), +(28, 271, 20, 5), +(28, 271, 21, 6), +(28, 271, 22, 7), +(28, 271, 23, 8), +(28, 271, 9, 9), +(28, 271, 25, 10), +(28, 271, 5, 11), +(28, 272, 1, 1), +(28, 272, 2, 2), +(28, 272, 19, 3), +(28, 272, 20, 4), +(28, 272, 21, 5), +(28, 272, 22, 6), +(28, 272, 23, 7), +(28, 272, 9, 8), +(28, 272, 25, 9), +(28, 272, 5, 10)"); + // API array elements - HPSponsor addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES (15, 135, 1, 1), diff --git a/inc/language/network_de.php b/inc/language/network_de.php index 155626e635..48be3314da 100644 --- a/inc/language/network_de.php +++ b/inc/language/network_de.php @@ -195,7 +195,7 @@ addMessages(array( 'ADMIN_NETWORK_REQUEST_PARAMETER_MINIMUM_STAY' => "Mindestauffenthalt", 'ADMIN_NETWORK_REQUEST_PARAMETER_MAXIMUM_STAY' => "Maximaler Auffenthalt", 'ADMIN_NETWORK_REQUEST_PARAMETER_CURRENCY' => "Währung", - 'ADMIN_NETWORK_REQUEST_PARAMETER_TYPE' => "Typ (z.B. klick/view)", + 'ADMIN_NETWORK_REQUEST_PARAMETER_TYPE' => "Typ (z.B. klick/view/html/text)", 'ADMIN_NETWORK_REQUEST_PARAMETER_REMAIN' => "Mindestanzahl der restlichen Klicks", 'ADMIN_NETWORK_REQUEST_PARAMETER_REWARD' => "Mindestvergütung", 'ADMIN_NETWORK_REQUEST_PARAMETER_SIZE' => "Werbemittelgrösse", @@ -235,7 +235,7 @@ addMessages(array( 'ADMIN_NETWORK_TRANSLATE_RELOAD_NAME' => "Reloadzeit", 'ADMIN_NETWORK_TRANSLATE_REMAIN_NAME' => "Mindestanzahl restlicher Klicks", 'ADMIN_NETWORK_TRANSLATE_REWARD_NAME' => "Mindestvergütung", - 'ADMIN_NETWORK_TRANSLATE_SIZE_NAME' => "Bannerformat", + 'ADMIN_NETWORK_TRANSLATE_SIZE_NAME' => "Werbemittelformat", 'ADMIN_NETWORK_TRANSLATE_TEXT_NAME' => "Werbetext", 'ADMIN_NETWORK_TRANSLATE_BANNER_URL1_NAME' => "Werbebanner 1", 'ADMIN_NETWORK_TRANSLATE_BANNER_URL2_NAME' => "Werbebanner 2", diff --git a/inc/language/payout_de.php b/inc/language/payout_de.php index 45a5b2bae3..58a6f2b4b8 100644 --- a/inc/language/payout_de.php +++ b/inc/language/payout_de.php @@ -140,7 +140,7 @@ addMessages(array( 'PAYOUT_TARGET_URL' => "Beworbene URL", 'PAYOUT_LINK_TEXT' => "Kurzer Text (30 Zeichen)", 'PAYOUT_OPTIONAL_BANNER' => "Optionaler Banner", - 'PAYOUT_BANNER_NOTE' => "Erlaube Bannerformate: 468x60, 88x31 usw.", + 'PAYOUT_BANNER_NOTE' => "Erlaube Werbemittelgrössen: 468x60, 88x31 usw.", )); // [EOF] diff --git a/templates/de/html/admin/admin_list_network_types_row.tpl b/templates/de/html/admin/admin_list_network_types_row.tpl index 67d22a00f5..26c9fe3286 100644 --- a/templates/de/html/admin/admin_list_network_types_row.tpl +++ b/templates/de/html/admin/admin_list_network_types_row.tpl @@ -3,7 +3,7 @@ - $content[network_type_handle] + {%pipe,translateNetworkTypeHandler=$content[network_type_handle]%} $content[network_type_api_url] -- 2.39.5