From: quix0r Date: Fri, 13 Aug 2010 18:12:27 +0000 (+0000) Subject: New network added, more usage of EL: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f76aad785861a6e68cc9b1a56c4e4466417bfad0;p=mailer.git New network added, more usage of EL: - New network 'VIPads' added - More usage of EL code in network templates - TODOs.txt updated --- diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 7a086b3768..24f95d08bb 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -22,7 +22,7 @@ ./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: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 * @@ -184,14 +184,14 @@ ./inc/reset/reset_beg.php:51:// @TODO This should be converted in a daily beg rallye ./inc/reset/reset_birthday.php:91: // @TODO 4 is hard-coded here, should we move it out in config? ./inc/revision-functions.php:153:// @TODO Please describe this function -./inc/template-functions.php:1135: // @TODO This can be easily moved out after the merge from EL branch to this is complete -./inc/template-functions.php:1168: // @TODO Add a little more infos here -./inc/template-functions.php:1456:// @TODO Lame description for this function -./inc/template-functions.php:1475: // @TODO Move this in a filter +./inc/template-functions.php:1136: // @TODO This can be easily moved out after the merge from EL branch to this is complete +./inc/template-functions.php:1169: // @TODO Add a little more infos here +./inc/template-functions.php:1457:// @TODO Lame description for this function +./inc/template-functions.php:1476: // @TODO Move this in a filter ./inc/template-functions.php:189: * @TODO On some pages this is buggy -./inc/template-functions.php:264: // @TODO Remove this sanity-check if all is fine -./inc/template-functions.php:575:// @TODO $simple/$constants are deprecated -./inc/template-functions.php:602: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates +./inc/template-functions.php:265: // @TODO Remove this sanity-check if all is fine +./inc/template-functions.php:576:// @TODO $simple/$constants are deprecated +./inc/template-functions.php:603: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates ./inc/wrapper-functions.php:132:// @TODO Implement $compress ./inc/wrapper-functions.php:139:// @TODO Implement $decompress ./inc/wrapper-functions.php:454:// @TODO Do some more sanity check here diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php index 19df19ef0f..077aea8329 100644 --- a/inc/extensions/ext-network.php +++ b/inc/extensions/ext-network.php @@ -28,7 +28,7 @@ * @TODO GolloX: Which charset? * * @TODO homeADS: Which charset? * * @TODO paid4ad: Which URLs for click and banner? * - * @TODO VIPads: Which charset? * + * @TODO VIPads: HTML text is send encoded with BASE64 * * @TODO Der Werbepartner.cc: Banner click/view is JavaScript! * * @TODO Der Werbepartner.cc: Forced textlink not correct * * @TODO Der Werbepartner.cc: Layer not correct * @@ -296,7 +296,8 @@ PRIMARY KEY (`network_reload_id`) ('yoomedia', 'Yoo!Media Solutions', 'http://www.yoomedia.de?ref=1715', '|', '|', 'GET', 'WINDOWS-1252'), ('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')"); +('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')"); // 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 @@ -590,6 +591,22 @@ PRIMARY KEY (`network_reload_id`) (133, 21, 'textmail', 'http://www.ultrapromo.eu/interface/', 'http://www.ultrapromo.eu/codes/paidmail.php?id=%UID%&bid=%CID%&aid=%SID%', NULL), (134, 21, 'traffic', 'http://www.ultrapromo.eu/interface/', 'http://www.ultrapromo.eu/codes/traffic.php?id=%UID%&bid=%CID%&aid=%SID%', NULL)"); + // Network type handlers - VIPads.de + 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 +(247, 27, 'banner_click', 'http://vipads.de/int/get.php', 'http://vipads.de/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', 'http://vipads.de/kamp/b_view.php?uid=%UID%&bid=%BID%&sid=%SID%'), +(248, 27, 'banner_view', 'http://vipads.de/int/get.php', 'http://vipads.de/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', 'http://vipads.de/kamp/b_view.php?uid=%UID%&bid=%BID%&sid=%SID%'), +(249, 27, 'button_click', 'http://vipads.de/int/get.php', 'http://vipads.de/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', 'http://vipads.de/kamp/b_view.php?uid=%UID%&bid=%BID%&sid=%SID%'), +(250, 27, 'button_view', 'http://vipads.de/int/get.php', 'http://vipads.de/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', 'http://vipads.de/kamp/b_view.php?uid=%UID%&bid=%BID%&sid=%SID%'), +(251, 27, 'forcedbanner', 'http://vipads.de/int/get.php', 'http://vipads.de/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', 'http://vipads.de/kamp/b_view.php?uid=%UID%&bid=%BID%&sid=%SID%'), +(252, 27, 'htmlmail', 'http://vipads.de/int/get.php', 'http://vipads.de/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', NULL), +(253, 27, 'layer', 'http://vipads.de/int/get.php', 'http://vipads.de/kamp/sc_layer.php?uid=%UID%&bid=%BID%&sid=%SID%', NULL), +(255, 27, 'popup', 'http://vipads.de/int/get.php', 'http://vipads.de/kamp/sc_popup.php?uid=%UID%&bid=%BID%&sid=%SID%', NULL), +(256, 27, 'skybanner_click', 'http://vipads.de/int/get.php', 'http://vipads.de/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', 'http://vipads.de/kamp/b_view.php?uid=%UID%&bid=%BID%&sid=%SID%'), +(257, 27, 'skybanner_view', 'http://vipads.de/int/get.php', 'http://vipads.de/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', 'http://vipads.de/kamp/b_view.php?uid=%UID%&bid=%BID%&sid=%SID%'), +(258, 27, 'textlink_click', 'http://vipads.de/int/get.php', 'http://vipads.de/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', NULL), +(254, 27, 'textmail', 'http://vipads.de/int/get.php', 'http://vipads.de/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', NULL), +(259, 27, 'traffic', 'http://vipads.de/int/get.php', 'http://vipads.de/kamp/ziel.php?uid=%UID%&bid=%BID%&sid=%SID%', NULL)"); + // Network type handlers - Der Werbepartner.cc 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 (145, 22, 'textlink_click', 'http://www.werbepartner.cc/sponsor/data/get.php', 'http://www.werbepartner.cc/sponsor/data/werbung.php', NULL), @@ -2188,6 +2205,105 @@ PRIMARY KEY (`network_reload_id`) (21, 134, 'remain', 'uebrig', NULL), (21, 134, 'reward', 'verguetung', NULL)"); + // Request parameters per type handler - VIPads.de + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES +(27, 247, 'extra', 'art', 'bannerklick'), +(27, 247, 'id', 'uid', NULL), +(27, 247, 'password', 'pw', NULL), +(27, 247, 'reload', 'reload', NULL), +(27, 247, 'remain', 'uebrig', NULL), +(27, 247, 'reward', 'verguetung', NULL), +(27, 247, 'sid', 'sid', NULL), +(27, 248, 'extra', 'art', 'bannerview'), +(27, 248, 'id', 'uid', NULL), +(27, 248, 'password', 'pw', NULL), +(27, 248, 'reload', 'reload', NULL), +(27, 248, 'remain', 'uebrig', NULL), +(27, 248, 'reward', 'verguetung', NULL), +(27, 248, 'sid', 'sid', NULL), +(27, 249, 'extra', 'art', 'buttonklick'), +(27, 249, 'id', 'uid', NULL), +(27, 249, 'password', 'pw', NULL), +(27, 249, 'reload', 'reload', NULL), +(27, 249, 'remain', 'uebrig', NULL), +(27, 249, 'reward', 'verguetung', NULL), +(27, 249, 'sid', 'sid', NULL), +(27, 250, 'extra', 'art', 'buttonview'), +(27, 250, 'id', 'uid', NULL), +(27, 250, 'password', 'pw', NULL), +(27, 250, 'reload', 'reload', NULL), +(27, 250, 'remain', 'uebrig', NULL), +(27, 250, 'reward', 'verguetung', NULL), +(27, 250, 'sid', 'sid', NULL), +(27, 251, 'extra', 'art', 'forcedbanner'), +(27, 251, 'id', 'uid', NULL), +(27, 251, 'minimum_stay', 'ma', NULL), +(27, 251, 'password', 'pw', NULL), +(27, 251, 'reload', 'reload', NULL), +(27, 251, 'remain', 'uebrig', NULL), +(27, 251, 'reward', 'verguetung', NULL), +(27, 251, 'sid', 'sid', NULL), +(27, 252, 'extra', 'art', 'htmlmail'), +(27, 252, 'id', 'id', NULL), +(27, 252, 'minimum_stay', 'ma', NULL), +(27, 252, 'password', 'pw', NULL), +(27, 252, 'reload', 'reload', NULL), +(27, 252, 'remain', 'uebrig', NULL), +(27, 252, 'reward', 'verguetung', NULL), +(27, 252, 'sid', 'sid', NULL), +(27, 253, 'extra', 'art', 'layer'), +(27, 253, 'id', 'uid', NULL), +(27, 253, 'password', 'pw', NULL), +(27, 253, 'reload', 'reload', NULL), +(27, 253, 'remain', 'uebrig', NULL), +(27, 253, 'reward', 'verguetung', NULL), +(27, 253, 'sid', 'sid', NULL), +(27, 254, 'extra', 'art', 'paidmail'), +(27, 254, 'id', 'uid', NULL), +(27, 254, 'minimum_stay', 'ma', NULL), +(27, 254, 'password', 'pw', NULL), +(27, 254, 'reload', 'reload', NULL), +(27, 254, 'remain', 'uebrig', NULL), +(27, 254, 'reward', 'verguetung', NULL), +(27, 254, 'sid', 'sid', NULL), +(27, 255, 'extra', 'art', 'popup'), +(27, 255, 'id', 'uid', NULL), +(27, 255, 'minimum_stay', 'ma', NULL), +(27, 255, 'password', 'pw', NULL), +(27, 255, 'reload', 'reload', NULL), +(27, 255, 'remain', 'uebrig', NULL), +(27, 255, 'reward', 'verguetung', NULL), +(27, 255, 'sid', 'sid', NULL), +(27, 256, 'extra', 'art', 'skybannerklick'), +(27, 256, 'id', 'uid', NULL), +(27, 256, 'password', 'pw', NULL), +(27, 256, 'reload', 'reload', NULL), +(27, 256, 'remain', 'uebrig', NULL), +(27, 256, 'reward', 'verguetung', NULL), +(27, 256, 'sid', 'sid', NULL), +(27, 257, 'extra', 'art', 'skybannerview'), +(27, 257, 'id', 'uid', NULL), +(27, 257, 'password', 'pw', NULL), +(27, 257, 'reload', 'reload', NULL), +(27, 257, 'remain', 'uebrig', NULL), +(27, 257, 'reward', 'verguetung', NULL), +(27, 257, 'sid', 'sid', NULL), +(27, 258, 'extra', 'art', 'textlinkklick'), +(27, 258, 'id', 'uid', NULL), +(27, 258, 'password', 'pw', NULL), +(27, 258, 'reload', 'reload', NULL), +(27, 258, 'remain', 'uebrig', NULL), +(27, 258, 'reward', 'verguetung', NULL), +(27, 258, 'sid', 'sid', NULL), +(27, 259, 'extra', 'art', 'traffic'), +(27, 259, 'id', 'uid', NULL), +(27, 259, 'minimum_stay', 'ma', NULL), +(27, 259, 'password', 'pw', NULL), +(27, 259, 'reload', 'reload', NULL), +(27, 259, 'remain', 'uebrig', NULL), +(27, 259, 'reward', 'verguetung', NULL), +(27, 259, 'sid', 'sid', NULL)"); + // Request parameters per type handler - Der Werbepartner.cc addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_request_params` (`network_id`, `network_type_id`, `request_param_key`, `request_param_value`, `request_param_default`) VALUES (22, 145, 'extra', 'art', 'Textlinkklick'), @@ -3840,6 +3956,84 @@ PRIMARY KEY (`network_reload_id`) (21, 134, 5, 4), (21, 134, 6, 5)"); + // API array elements - VIPads + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES +(27, 247, 7, 1), +(27, 247, 2, 2), +(27, 247, 5, 3), +(27, 247, 4, 4), +(27, 247, 6, 5), +(27, 248, 7, 1), +(27, 248, 2, 2), +(27, 248, 5, 3), +(27, 248, 4, 4), +(27, 248, 6, 5), +(27, 249, 7, 1), +(27, 249, 2, 2), +(27, 249, 5, 3), +(27, 249, 4, 4), +(27, 249, 6, 5), +(27, 250, 7, 1), +(27, 250, 2, 2), +(27, 250, 5, 3), +(27, 250, 4, 4), +(27, 250, 6, 5), +(27, 251, 7, 1), +(27, 251, 2, 2), +(27, 251, 5, 3), +(27, 251, 4, 4), +(27, 251, 6, 5), +(27, 251, 10, 6), +(27, 252, 13, 1), +(27, 252, 2, 2), +(27, 252, 5, 3), +(27, 252, 4, 4), +(27, 252, 6, 5), +(27, 252, 10, 6), +(27, 252, 37, 7), +(27, 252, 9, 8), +(27, 253, 14, 1), +(27, 253, 2, 2), +(27, 253, 5, 3), +(27, 253, 4, 4), +(27, 253, 6, 5), +(27, 254, 13, 1), +(27, 254, 2, 2), +(27, 254, 5, 3), +(27, 254, 4, 4), +(27, 254, 6, 5), +(27, 254, 10, 6), +(27, 254, 37, 7), +(27, 254, 9, 8), +(27, 255, 15, 1), +(27, 255, 2, 2), +(27, 255, 5, 3), +(27, 255, 4, 4), +(27, 255, 6, 5), +(27, 255, 10, 6), +(27, 256, 7, 1), +(27, 256, 2, 2), +(27, 256, 5, 3), +(27, 256, 4, 4), +(27, 256, 6, 5), +(27, 257, 7, 1), +(27, 257, 2, 2), +(27, 257, 5, 3), +(27, 257, 4, 4), +(27, 257, 6, 5), +(27, 258, 11, 1), +(27, 258, 2, 2), +(27, 258, 5, 3), +(27, 258, 4, 4), +(27, 258, 6, 5), +(27, 258, 9, 6), +(27, 259, 26, 1), +(27, 259, 2, 2), +(27, 259, 5, 3), +(27, 259, 4, 4), +(27, 259, 6, 5), +(27, 259, 10, 6)"); + // API array elements - Der Werbepartner.cc addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_api_translation` (`network_id`, `network_type_id`, `network_api_index`, `sort`) VALUES (22, 145, 1, 1), diff --git a/inc/language/network_de.php b/inc/language/network_de.php index 76fb3f0803..155626e635 100644 --- a/inc/language/network_de.php +++ b/inc/language/network_de.php @@ -81,8 +81,8 @@ addMessages(array( 'ADMIN_NETWORK_REQUEST_PARAMETER_LIST_TITLE' => "API-Parameter auflisten und verwalten", 'ADMIN_NETWORK_REQUEST_PARAMETER_EDIT_TITLE' => "API-Parameter editieren", 'ADMIN_NETWORK_REQUEST_PARAMETER_DELETE_TITLE' => "API-Parameter löschen", - 'ADMIN_NETWORK_API_TRANSLATION_ADD_TITLE' => "Werbenetzwerk verwalten - Neues API-Array-Element hinzufügen", - 'ADMIN_NETWORK_API_TRANSLATION_LIST_TITLE' => "API-Array-Elemente auflisten und verwalten", + 'ADMIN_NETWORK_API_TRANSLATION_ADD_TITLE' => "Werbenetzwerk verwalten - Neues API-Arrayelement hinzufügen", + 'ADMIN_NETWORK_API_TRANSLATION_LIST_TITLE' => "API-Arrayelemente auflisten und verwalten", // - Link titles 'ADMIN_NETWORK_LIST_TYPES_LINK_TITLE' => "Weiter zu den Werbearten", 'ADMIN_NETWORK_LIST_PARAMS_LINK_TITLE' => "Weiter zu den API-Parametern", @@ -106,7 +106,7 @@ addMessages(array( 'ADMIN_NETWORK_REQUEST_PARAMETER_DELETE' => "Löschen", 'ADMIN_NETWORK_REQUEST_PARAMETER_CHANGE' => "API-Parameter ändern", 'ADMIN_NETWORK_REQUEST_PARAMETER_REMOVE' => "API-Parameter entfernen", - 'ADMIN_NETWORK_API_TRANSLATION_ADD' => "API-Array-Element hinzufügen", + 'ADMIN_NETWORK_API_TRANSLATION_ADD' => "API-Arrayelement hinzufügen", 'ADMIN_NETWORK_API_TRANSLATION_EDIT' => "Editieren", 'ADMIN_NETWORK_API_TRANSLATION_DELETE' => "Löschen", // - Success titles diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php index b27d4ab20c..ae47871fa8 100644 --- a/inc/libs/network_functions.php +++ b/inc/libs/network_functions.php @@ -562,7 +562,8 @@ function generateNetworkTypesAvailableOptions () { 'traffic' ), array(), - '', '', '', + '', + '', '', $GLOBALS['network_types_disabled'], 'translateNetworkTypeHandler' ); @@ -596,26 +597,11 @@ function generateNetworkRequestKeyOptions () { 'extra', 'country' ), - array( - '{--ADMIN_NETWORK_REQUEST_PARAMETER_ID--}', - '{--ADMIN_NETWORK_REQUEST_PARAMETER_SID--}', - '{--ADMIN_NETWORK_REQUEST_PARAMETER_HASH--}', - '{--ADMIN_NETWORK_REQUEST_PARAMETER_PASSWORD--}', - '{--ADMIN_NETWORK_REQUEST_PARAMETER_RELOAD--}', - '{--ADMIN_NETWORK_REQUEST_PARAMETER_MAXIMUM_STAY--}', - '{--ADMIN_NETWORK_REQUEST_PARAMETER_MINIMUM_STAY--}', - '{--ADMIN_NETWORK_REQUEST_PARAMETER_CURRENCY--}', - '{--ADMIN_NETWORK_REQUEST_PARAMETER_TYPE--}', - '{--ADMIN_NETWORK_REQUEST_PARAMETER_REMAIN--}', - '{--ADMIN_NETWORK_REQUEST_PARAMETER_REWARD--}', - '{--ADMIN_NETWORK_REQUEST_PARAMETER_SIZE--}', - '{--ADMIN_NETWORK_REQUEST_PARAMETER_EROTIC--}', - '{--ADMIN_NETWORK_REQUEST_PARAMETER_EXTRA--}', - '{--ADMIN_NETWORK_REQUEST_PARAMETER_COUNTRY--}' - ), + array(), '', '', '', - $GLOBALS['network_params_disabled'] + $GLOBALS['network_params_disabled'], + 'translateNetworkRequestParameter' ); } // END - if @@ -680,9 +666,15 @@ function translateNetworkTypeHandler ($type) { } // Translates request type -function translateNetworkRequestType ($name) { +function translateNetworkRequestType ($type) { + // Get the message id + return getMessage('ADMIN_NETWORK_REQUEST_TYPE_' . strtoupper($type) . ''); +} + +// Translates request parameter +function translateNetworkRequestParameter ($param) { // Get the message id - return getMessage('ADMIN_NETWORK_REQUEST_TYPE_' . strtoupper($name) . ''); + return getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_' . strtoupper($param) . ''); } // Translates API index diff --git a/templates/de/html/admin/admin_list_network_params_row.tpl b/templates/de/html/admin/admin_list_network_params_row.tpl index a75bcd7c4b..11d261cec0 100644 --- a/templates/de/html/admin/admin_list_network_params_row.tpl +++ b/templates/de/html/admin/admin_list_network_params_row.tpl @@ -3,10 +3,10 @@ - $content[network_type_handle] + {%pipe,translateNetworkTypeHandler=$content[network_type_handle]%} - $content[request_param_key] + {%pipe,translateNetworkRequestParameter=$content[request_param_key]%} $content[request_param_value] diff --git a/templates/de/html/admin/admin_network_request_param_added.tpl b/templates/de/html/admin/admin_network_request_param_added.tpl index 2436b2f2fc..abd814f191 100644 --- a/templates/de/html/admin/admin_network_request_param_added.tpl +++ b/templates/de/html/admin/admin_network_request_param_added.tpl @@ -5,8 +5,9 @@ {--ADMIN_NETWORK_REQUEST_PARAM_ADDED_TITLE--}
- Der API-Abfrageparameter $content[request_param_key]/$content[request_param_value] wurde soeben hinzugefügt. - Sie sollten nun als nächstes die Rückgabewerte hinzufügen. + Der API-Abfrageparameter $content[request_param_key]/$content[request_param_value] + wurde soeben hinzugefügt. Sie sollten nun als nächstes die + API-Arrayelemente hinzufügen.