From: Roland Häder Date: Sat, 13 Oct 2012 18:53:18 +0000 (+0000) Subject: Extension ext-network continued: X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=579747bc21e7026a4dd39f58cb2f34453c521eec Extension ext-network continued: - Inconsistencies in naming of language ids vs. database columns fixed - Templates for editing/deleting of array index translatons added - Required call-back functions for above also added - Other things I cannot remember fixed/improved - Fixed minor HTML error in member_order_thanks.tpl - TODOs.txt updated --- diff --git a/.gitattributes b/.gitattributes index a5120f37b6..e36d721622 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1313,6 +1313,8 @@ templates/de/html/admin/admin_delete_guest_menu.tpl svneol=native#text/plain templates/de/html/admin/admin_delete_guest_menu_row.tpl svneol=native#text/plain templates/de/html/admin/admin_delete_member_menu.tpl svneol=native#text/plain templates/de/html/admin/admin_delete_member_menu_row.tpl svneol=native#text/plain +templates/de/html/admin/admin_delete_network_array_translation.tpl svneol=native#text/plain +templates/de/html/admin/admin_delete_network_array_translation_row.tpl svneol=native#text/plain templates/de/html/admin/admin_delete_network_params.tpl svneol=native#text/plain templates/de/html/admin/admin_delete_network_params_row.tpl svneol=native#text/plain templates/de/html/admin/admin_delete_network_request_params.tpl svneol=native#text/plain @@ -1370,6 +1372,8 @@ templates/de/html/admin/admin_edit_member_menu.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_member_menu_row.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_mods.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_mods_row.tpl svneol=native#text/plain +templates/de/html/admin/admin_edit_network_array_translation.tpl svneol=native#text/plain +templates/de/html/admin/admin_edit_network_array_translation_row.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_network_params.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_network_params_row.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_network_request_params.tpl svneol=native#text/plain diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index d4095179a3..c355950cde 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -79,7 +79,7 @@ ./inc/libs/doubler_functions.php:96: // @TODO Can't this be moved into EL? ./inc/libs/forced_functions.php:457:// @TODO Can't we use our new expression language instead of this ugly code? ./inc/libs/mailid_functions.php:47: // @TODO Rewrite this to a dynamic include or so -./inc/libs/network_functions.php:1017: // @TODO Implement this function, don't forget to set HTTP status back to '200 OK' if everything went fine +./inc/libs/network_functions.php:1067: // @TODO Implement this function, don't forget to set HTTP status back to '200 OK' if everything went fine ./inc/libs/order_functions.php:46: // @TODO Move this array into a filter ./inc/libs/rallye_functions.php:771:// @TODO This function does not load min_users, min_prices, please encapsulate loading rallye data with e.g. getRallyeDataFromId() ./inc/libs/rallye_functions.php:838: $EXPIRE = 3; // @TODO The hard-coded value... @@ -531,19 +531,20 @@ ### ### template-warnings.log follows: ### ### PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/menu/menu_what_end.tpl, line: 1 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/menu/menu_what_end.tpl, line: 2 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_order_thanks.tpl, line: 12 in -PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : form in templates/de/html/member/member_order_thanks.tpl, line: 14 in -PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_order_thanks.tpl, line: 15 in +PHP Warning: DOMDocument::loadHTMLFile(): ID subid already defined in templates/de/html/member/member_add_subid.tpl, line: 13 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/member/member_content_right.tpl, line: 1 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/member/member_content_right.tpl, line: 5 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_welcome_footer.tpl, line: 1 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_reflink.tpl, line: 29 in +PHP Warning: DOMDocument::loadHTMLFile(): End tag : expected '>' in templates/de/html/member/member_list_subid_stats.tpl, line: 28 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_footer.tpl, line: 6 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/page_footer.tpl, line: 1 in /home +PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : strong in templates/de/html/admin/admin_list_user_subid_row.tpl, line: 3 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/admin/admin_main_footer.tpl, line: 1 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/admin/admin_main_footer.tpl, line: 2 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_main_footer.tpl, line: 8 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/admin/admin_main_footer.tpl, line: 9 in +PHP Warning: DOMDocument::loadHTMLFile(): End tag : expected '>' in templates/de/html/admin/admin_list_user_subid_stats.tpl, line: 32 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_footer.tpl, line: 6 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_content_footer.tpl, line: 1 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/guest/guest_content_footer.tpl, line: 5 in diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php index 55b86ebee5..e8fc986eec 100644 --- a/inc/extensions/ext-network.php +++ b/inc/extensions/ext-network.php @@ -180,10 +180,10 @@ UNIQUE INDEX (`network_translation_name`)", `network_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `network_type_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `network_array_index` SMALLINT(5) UNSIGNED NOT NULL DEFAULT 0, -`sort` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, +`network_array_sort` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`network_array_id`), UNIQUE INDEX `provider_type_key` (`network_id`, `network_type_id`, `network_array_index`), -INDEX (`sort`)", +INDEX (`network_array_sort`)", 'Translation of API responses, generic data, DO NOT ALTER!'); // Data from the webmaster (you!) @@ -4017,7 +4017,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (23, 166, 'sid', 'sid', NULL)"); // API array elements - A3H - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (1, 1, 7, 1), (1, 1, 2, 2), (1, 1, 3, 3), @@ -4120,7 +4120,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (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 + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (2, 187, 7, 1), (2, 187, 2, 2), (2, 187, 3, 3), @@ -4230,7 +4230,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (2, 201, 25, 10)"); // API array elements - Ad-Hit.de - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (31, 302, 1, 1), (31, 302, 2, 2), (31, 302, 4, 3), @@ -4315,7 +4315,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", // API array elements - AD-Magnet // API array elements - AD-Promotion - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (37, 367, 1, 1), (37, 367, 2, 2), (37, 367, 4, 3), @@ -4398,7 +4398,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (37, 376, 40, 8)"); // API array elements - AdCity.eu - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (32, 312, 1, 1), (32, 312, 2, 2), (32, 312, 4, 3), @@ -4456,7 +4456,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", // API array elements - ADCocktail // API array elements - AdConvention - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (30, 292, 1, 1), (30, 292, 2, 2), (30, 292, 4, 3), @@ -4515,7 +4515,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (30, 301, 9, 7)"); // API array elements - adgain.de - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (33, 322, 1, 1), (33, 322, 2, 2), (33, 322, 5, 3), @@ -4600,7 +4600,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (33, 335, 9, 6)"); // API array elements - ADkracher - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (34, 336, 1, 1), (34, 336, 2, 2), (34, 336, 5, 3), @@ -4680,7 +4680,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (34, 348, 10, 6)"); // API array elements - Adminlose.de - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (35, 349, 1, 1), (35, 349, 2, 2), (35, 349, 4, 3), @@ -4841,7 +4841,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (27, 'extra_value2', 'v2', NULL)"); // API array elements - Admono.de - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (36, 357, 1, 1), (36, 357, 2, 2), (36, 357, 4, 3), @@ -4897,7 +4897,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (36, 366, 9, 7)"); // API array elements - AdPaid - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (5, 177, 7, 1), (5, 177, 2, 2), (5, 177, 3, 3), @@ -4956,7 +4956,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (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 + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (38, 377, 1, 1), (38, 377, 2, 2), (38, 377, 4, 3), @@ -5039,7 +5039,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (38, 386, 40, 8)"); // API array elements - Ads2Earn - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (39, 395, 1, 1), (39, 395, 2, 2), (39, 395, 3, 3), @@ -5124,7 +5124,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (39, 405, 10, 8)"); // API array elements - Ads2Webbi - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (40, 406, 1, 1), (40, 406, 2, 2), (40, 406, 4, 3), @@ -5180,7 +5180,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (40, 415, 9, 7)"); // API array elements - Ads4.de - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (6, 14, 7, 1), (6, 14, 2, 2), (6, 14, 6, 3), @@ -5207,7 +5207,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (6, 119, 10, 6)"); // API array elements - Ads4Webbis - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (7, 17, 1, 1), (7, 17, 2, 2), (7, 17, 4, 3), @@ -5290,7 +5290,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (7, 120, 27, 8)"); // API array elements - Ads4World - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (8, 26, 1, 1), (8, 26, 2, 2), (8, 26, 4, 3), @@ -5348,7 +5348,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", // API array elements - Affiliblatt // API array elements - AllAds4You - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (10, 167, 1, 1), (10, 167, 2, 2), (10, 167, 4, 3), @@ -5422,7 +5422,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (10, 176, 40, 8)"); // API array elements - Alster-Marketing - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (11, 35, 7, 1), (11, 35, 2, 2), (11, 35, 3, 3), @@ -5532,7 +5532,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (11, 49, 6, 5)"); // API array elements - BonusSponsor - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (12, 50, 7, 1), (12, 50, 2, 2), (12, 50, 3, 3), @@ -5590,7 +5590,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (12, 62, 9, 19)"); // API array elements - City-Ads - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (24, 212, 1, 1), (24, 212, 2, 2), (24, 212, 4, 3), @@ -5673,7 +5673,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (24, 221, 27, 8)"); // API array elements - doubleads - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (26, 232, 1, 1), (26, 232, 2, 2), (26, 232, 3, 3), @@ -5783,7 +5783,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (26, 246, 25, 10)"); // API array elements - FuCoExSponsor.net - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (29, 273, 7, 1), (29, 273, 2, 2), (29, 273, 5, 3), @@ -5884,7 +5884,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (29, 289, 10, 6)"); // API array elements - Fusion-Ads - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (13, 290, 1, 1), (13, 290, 2, 2), (13, 290, 6, 3), @@ -5903,7 +5903,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (13, 291, 10, 8)"); // API array elements - GigaPromo - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (14, 102, 7, 1), (14, 102, 2, 2), (14, 102, 4, 3), @@ -5953,7 +5953,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (14, 122, 6, 5)"); // API array elements - Gold-Sponsor - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (25, 222, 1, 1), (25, 222, 2, 2), (25, 222, 4, 3), @@ -6009,7 +6009,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (25, 231, 9, 7)"); // API array elements - homeADS - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (28, 260, 1, 1), (28, 260, 2, 2), (28, 260, 3, 3), @@ -6105,7 +6105,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (28, 272, 5, 10)"); // API array elements - HPSponsor - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (15, 135, 1, 1), (15, 135, 2, 2), (15, 135, 4, 3), @@ -6188,7 +6188,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (15, 144, 27, 8)"); // API array elements - Make-Euros.de - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (16, 63, 7, 1), (16, 63, 2, 2), (16, 63, 3, 3), @@ -6286,7 +6286,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (16, 76, 9, 9)"); // API array elements - Mega-Ad - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (17, 109, 1, 1), (17, 109, 2, 2), (17, 109, 4, 3), @@ -6342,7 +6342,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (17, 123, 6, 5)"); // API array elements - Power-Promo - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (18, 78, 7, 1), (18, 78, 2, 2), (18, 78, 3, 3), @@ -6452,7 +6452,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (18, 92, 25, 10)"); // API array elements - SeCash - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (19, 93, 1, 1), (19, 93, 2, 2), (19, 93, 4, 3), @@ -6507,8 +6507,98 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (19, 124, 5, 4), (19, 124, 6, 5)"); + // API array elements - SuperPromo24 + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES +(41, 416, 1, 1), +(41, 416, 2, 2), +(41, 416, 5, 3), +(41, 416, 4, 4), +(41, 416, 6, 5), +(41, 417, 1, 1), +(41, 417, 2, 2), +(41, 417, 5, 3), +(41, 417, 4, 4), +(41, 417, 6, 5), +(41, 418, 1, 1), +(41, 418, 2, 2), +(41, 418, 5, 3), +(41, 418, 4, 4), +(41, 418, 6, 5), +(41, 419, 1, 1), +(41, 419, 2, 2), +(41, 419, 5, 3), +(41, 419, 4, 4), +(41, 419, 6, 5), +(41, 420, 1, 1), +(41, 420, 2, 2), +(41, 420, 5, 3), +(41, 420, 4, 4), +(41, 420, 6, 5), +(41, 420, 10, 6), +(41, 421, 1, 1), +(41, 421, 2, 2), +(41, 421, 5, 3), +(41, 421, 4, 4), +(41, 421, 6, 5), +(41, 421, 10, 6), +(41, 421, 9, 7), +(41, 422, 1, 1), +(41, 422, 2, 2), +(41, 422, 5, 3), +(41, 422, 4, 4), +(41, 422, 6, 5), +(41, 422, 10, 6), +(41, 422, 37, 7), +(41, 422, 9, 8), +(41, 423, 1, 1), +(41, 423, 2, 2), +(41, 423, 5, 3), +(41, 423, 4, 4), +(41, 423, 6, 5), +(41, 424, 1, 1), +(41, 424, 2, 2), +(41, 424, 5, 3), +(41, 424, 4, 4), +(41, 424, 6, 5), +(41, 425, 1, 1), +(41, 425, 2, 2), +(41, 425, 5, 3), +(41, 425, 4, 4), +(41, 425, 6, 5), +(41, 425, 10, 6), +(41, 425, 37, 7), +(41, 425, 9, 8), +(41, 426, 1, 1), +(41, 426, 2, 2), +(41, 426, 5, 3), +(41, 426, 4, 4), +(41, 426, 6, 5), +(41, 426, 10, 6), +(41, 427, 1, 1), +(41, 427, 2, 2), +(41, 427, 5, 3), +(41, 427, 4, 4), +(41, 427, 6, 5), +(41, 428, 1, 1), +(41, 428, 2, 2), +(41, 428, 5, 3), +(41, 428, 4, 4), +(41, 428, 6, 5), +(41, 429, 1, 1), +(41, 429, 2, 2), +(41, 429, 5, 3), +(41, 429, 4, 4), +(41, 429, 6, 5), +(41, 429, 9, 6), +(41, 430, 1, 1), +(41, 430, 2, 2), +(41, 430, 5, 3), +(41, 430, 4, 4), +(41, 430, 6, 5), +(41, 430, 10, 6)"); + // API array elements - WeltPromotion - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (20, 200, 6, 5), (20, 202, 1, 1), (20, 202, 2, 2), @@ -6591,7 +6681,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (20, 211, 27, 8)"); // API array elements - UltraPOMO - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (21, 125, 1, 1), (21, 125, 2, 2), (21, 125, 4, 3), @@ -6647,7 +6737,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (21, 134, 6, 5)"); // API array elements - VIPads - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (27, 247, 7, 1), (27, 247, 2, 2), (27, 247, 5, 3), @@ -6725,7 +6815,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (27, 259, 10, 6)"); // API array elements - Der Werbepartner.cc - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (22, 145, 1, 1), (22, 145, 2, 2), (22, 145, 6, 3), @@ -6805,7 +6895,7 @@ UNIQUE INDEX `provider_type` (`network_id`, `network_type_id`)", (22, 155, 10, 7)"); // API array elements - Yoo!Media - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES (23, 156, 1, 1), (23, 156, 2, 2), (23, 156, 3, 3), diff --git a/inc/language/network_de.php b/inc/language/network_de.php index d01229b6d6..ca0f1ca7e4 100644 --- a/inc/language/network_de.php +++ b/inc/language/network_de.php @@ -64,12 +64,14 @@ addMessages(array( 'ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED' => "Der Abfrageparameter %s wurde nicht hinzugefügt.", 'ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED' => "Es wurden keine Änderungen an den Abfrageparametern ausgeführt.", 'ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED' => "Es wurden keine Abfrageparameter gelöscht.", + 'ADMIN_NETWORK_VCHECK_PARAMETER_404' => "Es wurden keine VCheck-Abfrageparameter für das Werbenetzwerk %s gefunden.", 'ADMIN_NETWORK_VCHECK_PARAMETER_ALREADY_ADDED' => "Ein VCheck-Abfrageparameter %s existiert bereits.", 'ADMIN_NETWORK_ARRAY_TRANSLATION_404' => "Es wurden keine Übersetzungen zum Antwort-Array zum Werbenetzwerk %s gefunden.", 'ADMIN_NETWORK_ARRAY_TRANSLATION_NOT_ADDED' => "Die Array-Element-Übersetzung %s wurde nicht hinzugefügt.", 'ADMIN_NETWORK_ARRAY_TRANSLATION_ALREADY_ADDED' => "Eine Array-Element-Übersetzung %s existiert bereits.", + 'ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_CHANGED' => "Es wurden keine Änderungen an den Array-Element-Übersetzungen vorgenommen.", + 'ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_REMOVED' => "Es wurden keine Array-Element-Übersetzungen gelöscht.", 'ADMIN_NETWORK_HANDLER_TYPE_HANDLER_ALREADY_CONFIGURED' => "Kann Daten des ausgewählten Werbeart-Handlers nicht hinzufügen, da bereits Daten vorhanden sind. Haben Sie das Formular ein zweites Mal versendet?", - 'ADMIN_NETWORK_VCHECK_PARAMETER_404' => "Es wurden keine VCheck-Abfrageparameter für das Werbenetzwerk %s gefunden.", // - Form titles 'ADMIN_ADD_NETWORK_TITLE' => "Neues Werbenetzwerk hinzufügen - Allgemeine Daten", 'ADMIN_EDIT_NETWORK_DATA_TITLE' => "Werbenetzwerk editieren - Allgemeine Daten", @@ -77,16 +79,18 @@ addMessages(array( 'ADMIN_SELECT_NETWORK_TITLE' => "Bitte wählen Sie ein Werbenetzwerk aus", 'ADMIN_SELECT_NETWORK_HANDLER_TYPE_TITLE' => "Bitte wählen Sie einen Werbeart-Handler aus", 'ADMIN_ADD_NETWORK_HANDLER_TYPE_TITLE' => "Werbenetzwerk verwalten - Neue Werbeart hinzufügen", - 'ADMIN_NETWORK_TYPE_HANDLER_LIST_TITLE' => "Werbeart-Handler auflisten und verwalten", + 'ADMIN_LIST_NETWORK_TYPE_HANDLER_TITLE' => "Werbeart-Handler auflisten und verwalten", 'ADMIN_EDIT_NETWORK_HANDLER_TYPES_TITLE' => "Werbeart-Handler editieren", - 'ADMIN_NETWORK_TYPE_HANDLER_DELETE_TITLE' => "Werbeart-Handle löschen", + 'ADMIN_DELETE_NETWORK_TYPE_HANDLER_TITLE' => "Werbeart-Handle löschen", 'ADMIN_ADD_NETWORK_REQUEST_PARAMETER_TITLE' => "Werbenetzwerk verwalten - Neuen Abfrageparameter hinzufügen", - 'ADMIN_NETWORK_REQUEST_PARAMETER_LIST_TITLE' => "Abfrageparameter auflisten und verwalten", - 'ADMIN_NETWORK_REQUEST_PARAMETER_EDIT_TITLE' => "Abfrageparameter editieren", - 'ADMIN_NETWORK_REQUEST_PARAMETER_DELETE_TITLE' => "Abfrageparameter löschen", - 'ADMIN_NETWORK_VCHECK_PARAMETER_LIST_TITLE' => "VCheck-Abfrageparameter auflisten und verwalten", - 'ADMIN_ADD_NETWORK_ARRAY_TRANSLATION_TITLE' => "Werbenetzwerk verwalten - Neues API-Arrayelement hinzufügen", - 'ADMIN_LIST_NETWORK_ARRAY_TRANSLATION_TITLE' => "API-Arrayelemente auflisten und verwalten", + 'ADMIN_LIST_NETWORK_REQUEST_PARAMETER_TITLE' => "Abfrageparameter auflisten und verwalten", + 'ADMIN_EDIT_NETWORK_REQUEST_PARAMETER_TITLE' => "Abfrageparameter editieren", + 'ADMIN_DELETE_NETWORK_REQUEST_PARAMETER_TITLE' => "Abfrageparameter löschen", + 'ADMIN_LIST_NETWORK_VCHECK_PARAMETER_TITLE' => "VCheck-Abfrageparameter auflisten und verwalten", + 'ADMIN_ADD_NETWORK_ARRAY_TRANSLATION_TITLE' => "Werbenetzwerk verwalten - Neue Array-Element-Übersetzung hinzufügen", + 'ADMIN_LIST_NETWORK_ARRAY_TRANSLATION_TITLE' => "Array-Element-Übersetzungen auflisten und verwalten", + 'ADMIN_EDIT_NETWORK_ARRAY_TRANSLATION_TITLE' => "Array-Element-Übersetzungen editeren", + 'ADMIN_DELETE_NETWORK_ARRAY_TRANSLATION_TITLE' => "Array-Element-Übersetzungen löschen", 'ADMIN_ADD_CONFIG_NETWORK_HANDLER_TYPE_TITLE' => "Werbeart-Handler einrichten - {%%pipe,translateNetworkTypeHandler=%s%%}", 'ADMIN_SHOW_CONFIG_NETWORK_HANDLER_TYPE_TITLE' => "Eingerichteter Werbeart-Handler - {%%pipe,translateNetworkTypeHandler=%s%%}", 'ADMIN_CONFIG_NETWORK_HANDLER_TYPES_TITLE' => "Werbeart-Handler einrichten", @@ -111,7 +115,9 @@ addMessages(array( 'ADMIN_ADD_NETWORK_REQUEST_PARAMETER_SUBMIT' => "Abfrageparameter hinzufügen", 'ADMIN_CHANGE_NETWORK_REQUEST_PARAMETER_SUBMIT' => "Abfrageparameter ändern", 'ADMIN_REMOVE_NETWORK_REQUEST_PARAMETER_SUBMIT' => "Abfrageparameter entfernen", - 'ADMIN_ADD_NETWORK_ARRAY_TRANSLATION_SUBMIT' => "API-Arrayelement hinzufügen", + 'ADMIN_ADD_NETWORK_ARRAY_TRANSLATION_SUBMIT' => "Array-Element-Übersetzung hinzufügen", + 'ADMIN_CHANGE_NETWORK_ARRAY_TRANSLATION_SUBMIT' => "Array-Element-Übersetzung(en) ändern", + 'ADMIN_REMOVE_NETWORK_ARRAY_TRANSLATION_SUBMIT' => "Array-Element-Übersetzung(en) entfernen", 'ADMIN_ADD_CONFIG_NETWORK_HANDLER_TYPE_SUBMIT' => "Jetzt den Werbeart-Handler einrichten", 'ADMIN_ADD_CONFIG_NETWORK_HANDLER_TYPE_FORM_SUBMIT' => "Werbeart-Handlerdaten hinzufügen", 'ADMIN_EDIT_CONFIG_NETWORK_HANDLER_TYPE_SUBMIT' => "Konfiguration ändern", @@ -128,17 +134,19 @@ addMessages(array( 'ADMIN_NETWORK_REMOVED' => "Es wurden %s Einträge aus den allgemeinen Daten gelöscht.", 'ADMIN_NETWORK_TYPE_HANDLER_UPDATED' => "Es wurden %s Werbeart-Handler aktualisiert.", 'ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED' => "Es wurden %s Abfrageparameter aktualisiert.", + 'ADMIN_NETWORK_ARRAY_TRANSLATION_UPDATED' => "Es wurden %s Array-Element-Übersetzung(en) aktualisiert.", 'ADMIN_NETWORK_TYPE_HANDLER_REMOVED' => "Es wurden %s Werbeart-Handler gelöscht.", 'ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED' => "Es wurden %s Abfrageparameter gelöscht.", + 'ADMIN_NETWORK_ARRAY_TRANSLATION_REMOVED' => "Es wurden %s Array-Element-Übersetzung(en) gelöscht.", // - Form notes 'ADMIN_ADD_NETWORK_NOTICE' => "Besserer Datenschutz bei POST-Abfragen bedeutet, dass die von den Internetanbietern betriebenen Caches (Proxy) die POST-Daten nicht mitloggen (so eine Art Kodex). Der Zeichensatz ist meistens ISO-8859-1 oder WINDOWS-1252.", 'ADMIN_LIST_NETWORK_NOTICE' => "Seien Sie mit dem Löschen und Editieren vonallgemeinen Daten der Werbenetzwerke sehr vorsichtig. Sie sollten hierzu Rücksprache im Forum halten.", 'ADMIN_LIST_NETWORK_REFERRAL_LINK_NOTICE' => "Wenn Sie Ihren Referral-Link eingeben, verwenden Sie bitte nicht dieses Formular, sondern das unter [API-Zugangsdaten]. Sollten Sie hier Ihren Referral-Link eingetragen haben, ist dies nicht weiter schlimm, er wird jedoch nicht veröffentlicht.", 'ADMIN_ADD_NETWORK_HANDLER_TYPE_NOTICE' => "Fügen Sie hier weitere Werbearten-Handler dem ausgwählten Werbenetzwerk hinzu. Die Klick- und Banner-URL müssen dabei Platzhalter enthalten, die Sie der Dokumentation und dem Forum entnehmen können. Die API-URL muss nur bis zum Fragezeichen eingegeben werden. Richtig: http://www.some-sponsor.example/inteface/script.php, falsch: http://www.some-sponsor.example/inteface/script.php?uid=123&pw=xyzxyzxyz", - 'ADMIN_NETWORK_TYPE_HANDLER_LIST_NOTICE' => "Seien Sie mit dem Löschen und Editieren von Werbeart-Handlern sehr vorsichtig. Sie sollten hierzu Rücksprache im Forum halten. Dokumentation zu den Platzhaltern (%FOO%, %BAR% usw.) finden Sie in der Dokumentation DOCs/de/network/README.txt.", + 'ADMIN_LIST_NETWORK_TYPE_HANDLER_NOTICE' => "Seien Sie mit dem Löschen und Editieren von Werbeart-Handlern sehr vorsichtig. Sie sollten hierzu Rücksprache im Forum halten. Dokumentation zu den Platzhaltern (%FOO%, %BAR% usw.) finden Sie in der Dokumentation DOCs/de/network/README.txt.", 'ADMIN_ADD_NETWORK_REQUEST_PARAMETER_NOTICE' => "Fügen Sie hier weitere Abfrageparameter dem ausgwählten Werbenetzwerk hinzu. Geben Sie keine Werte an, wie z.B. 5 Sekunden oder 30 Mails, geben Sie bei Abfrageparameter den GET- bzw. POST-Parameternamen an.", - 'ADMIN_NETWORK_REQUEST_PARAMETER_LIST_NOTICE' => "Seien Sie mit dem Löschen und Editieren von Abfrageparameter sehr vorsichtig. Sie sollten hierzu Rücksprache im Forum halten. Dokumentation zu den Abfragenamen (%FOO%, %BAR% usw.) finden Sie in der Dokumentation DOCs/de/network/README.txt.", - 'ADMIN_NETWORK_VCHECK_PARAMETER_LIST_NOTICE' => "Seien Sie mit dem Löschen und Editieren von VCheck-Abfrageparameter sehr vorsichtig. Sie sollten hierzu Rücksprache im Forum halten.", + 'ADMIN_LIST_NETWORK_REQUEST_PARAMETER_NOTICE' => "Seien Sie mit dem Löschen und Editieren von Abfrageparameter sehr vorsichtig. Sie sollten hierzu Rücksprache im Forum halten. Dokumentation zu den Abfragenamen (%FOO%, %BAR% usw.) finden Sie in der Dokumentation DOCs/de/network/README.txt.", + 'ADMIN_LIST_NETWORK_VCHECK_PARAMETER_NOTICE' => "Seien Sie mit dem Löschen und Editieren von VCheck-Abfrageparameter sehr vorsichtig. Sie sollten hierzu Rücksprache im Forum halten.", 'ADMIN_ADD_NETWORK_ARRAY_TRANSLATION_NOTICE' => "Fügen Sie hier weitere Array-Element-Übersetzungen zu dem ausgewählten Netzwerk und Werbeart-Handler ein.", 'ADMIN_LIST_NETWORK_ARRAY_TRANSLATION_NOTICE' => "Seien Sie mit dem Editieren bzw. Löschen von Array-Elementen sehr vorsichtig, die API-Abfrage köntte unerwartete Ergebnisse bzw. Fehler zurückliefern.", 'ADMIN_NETWORK_REQUIRE_ID_CARD_NOTICE' => "Unter {--ADMIN_NETWORK_REQUIRE_ID_CARD--} ist das durch den Webnetzwerkbetreiber Verlangen einer Kopie des Personalausweises bzw. Gewerbescheins zu verstehen. Mehr dazu erfahen Sie im Forum.", @@ -248,10 +256,10 @@ addMessages(array( 'ADMIN_NETWORK_VCHECK_PARAMETER_STATUS' => "Status der Vergütung", 'ADMIN_NETWORK_VCHECK_PARAMETER_REASON' => "Grund des Fehlers", // - API array index translation - 'ADMIN_NETWORK_ARRAY_TRANSLATION_INDEX' => "Neuen Array-Index eintragen", - 'ADMIN_NETWORK_ARRAY_TRANSLATION_INDEX_TRANSLATION' => "Index-Übersetzung auswählen", - 'ADMIN_NETWORK_ARRAY_INDEX_TRANSLATION' => "Index-Übersetzung", - 'ADMIN_NETWORK_ARRAY_INDEX_SORTING' => "Index-Reihenfolge", + 'ADMIN_NETWORK_ARRAY_TRANSLATION_INDEX' => "Array-Index:", + 'ADMIN_SELECT_NETWORK_ARRAY_INDEX_TRANSLATION' => "Index-Übersetzung auswählen:", + 'ADMIN_NETWORK_ARRAY_INDEX_TRANSLATION' => "Index-Übersetzung:", + 'ADMIN_NETWORK_ARRAY_INDEX_SORTING' => "Index-Reihenfolge:", // Network API configuration 'ADMIN_CONFIG_NETWORK_API_ENTER_AFFILIATE_ID' => "Ihre Affiliate oder User-Id:", 'ADMIN_CONFIG_NETWORK_API_ENTER_API_PASSWORD' => "Ihr Interface-Kennwort:", diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php index 8312c16ea9..e90aa3b06a 100644 --- a/inc/libs/network_functions.php +++ b/inc/libs/network_functions.php @@ -224,7 +224,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`, @@ -239,7 +239,7 @@ FROM `{?_MYSQL_PREFIX?}_network_data` WHERE `network_id`=%s -LIMIT 1", +LIMIT 1', array(bigintval($networkId)), __FUNCTION__, __LINE__); // Is there an entry? @@ -327,15 +327,15 @@ LIMIT 1", } // "Getter" for a network type data by provided id number -function getNetworkTypeDataById ($networkId) { +function getNetworkTypeDataById ($networkTypeId) { // Ids lower one are not accepted - if ($networkId < 1) { + if ($networkTypeId < 1) { // Not good, should be fixed - reportBug(__FUNCTION__, __LINE__, 'Network type id ' . $networkId . ' is smaller than 1.'); + reportBug(__FUNCTION__, __LINE__, 'Network type id ' . $networkTypeId . ' is smaller than 1.'); } // END - if // By default we have no data - $GLOBALS['network_type_data'][$networkId] = array(); + $GLOBALS['network_type_data'][$networkTypeId] = array(); // Query for the network data $result = SQL_QUERY_ESC('SELECT @@ -350,27 +350,27 @@ FROM WHERE `network_type_id`=%s LIMIT 1', - array(bigintval($networkId)), __FUNCTION__, __LINE__); + array(bigintval($networkTypeId)), __FUNCTION__, __LINE__); // Is there an entry? if (SQL_NUMROWS($result) == 1) { // Then get it - $GLOBALS['network_type_data'][$networkId] = SQL_FETCHARRAY($result); + $GLOBALS['network_type_data'][$networkTypeId] = SQL_FETCHARRAY($result); } // END - if // Free result SQL_FREERESULT($result); // Return result - return $GLOBALS['network_type_data'][$networkId]; + return $GLOBALS['network_type_data'][$networkTypeId]; } // "Getter" for a network request parameter data by provided id number -function getNetworkRequestParamsDataById ($networkId) { +function getNetworkRequestParamsDataById ($networkRequestId) { // Ids lower one are not accepted - if ($networkId < 1) { + if ($networkRequestId < 1) { // Not good, should be fixed - reportBug(__FUNCTION__, __LINE__, 'Network request parameter id ' . $networkId . ' is smaller than 1.'); + reportBug(__FUNCTION__, __LINE__, 'Network request parameter id ' . $networkRequestId . ' is smaller than 1.'); } // END - if // By default we have no data @@ -389,7 +389,7 @@ FROM WHERE `network_request_param_id`=%s LIMIT 1', - array(bigintval($networkId)), __FUNCTION__, __LINE__); + array(bigintval($networkRequestId)), __FUNCTION__, __LINE__); // Is there an entry? if (SQL_NUMROWS($result) == 1) { @@ -404,6 +404,44 @@ LIMIT 1', return $networkRequestData; } +// "Getter" for a network array translation data by provided id number +function getNetworkArrayTranslationsDataById ($networkTranslationId) { + // Ids lower one are not accepted + if ($networkTranslationId < 1) { + // Not good, should be fixed + reportBug(__FUNCTION__, __LINE__, 'Network array translation id ' . $networkTranslationId . ' is smaller than 1.'); + } // END - if + + // By default we have no data + $networkTranslationData = array(); + + // Query for the network data + $result = SQL_QUERY_ESC('SELECT + `network_array_id`, + `network_id`, + `network_type_id`, + `network_array_index`, + `network_array_sort` +FROM + `{?_MYSQL_PREFIX?}_network_array_translation` +WHERE + `network_array_id`=%s +LIMIT 1', + array(bigintval($networkTranslationId)), __FUNCTION__, __LINE__); + + // Is there an entry? + if (SQL_NUMROWS($result) == 1) { + // Then get it + $networkTranslationData = SQL_FETCHARRAY($result); + } // END - if + + // Free result + SQL_FREERESULT($result); + + // Return result + return $networkTranslationData; +} + // Updates given network (id) with data from array function doNetworkUpdateDataByArray ($networkId, $networkData) { // Ids lower one are not accepted @@ -417,37 +455,49 @@ function doNetworkUpdateDataByArray ($networkId, $networkData) { } // Updates given network type handler (id) with data from array -function doNetworkUpdateTypeByArray ($networkId, $networkTypeData) { +function doNetworkUpdateTypeByArray ($networkTypeId, $networkTypeData) { // Ids lower one are not accepted - if ($networkId < 1) { + if ($networkTypeId < 1) { // Not good, should be fixed - reportBug(__FUNCTION__, __LINE__, 'Network type handler id ' . $networkId . ' is smaller than 1.'); + reportBug(__FUNCTION__, __LINE__, 'Network type handler id ' . $networkTypeId . ' is smaller than 1.'); } // END - if // Just call our inner method - return adminSaveSettings($networkTypeData, '_network_types', sprintf("`network_type_id`=%s", bigintval($networkId)), array(), false, false); + return adminSaveSettings($networkTypeData, '_network_types', sprintf("`network_type_id`=%s", bigintval($networkTypeId)), array(), false, false); } // Updates given network request parameters (id) with data from array -function doNetworkUpdateParamsByArray ($networkId, $networkParamData) { +function doNetworkUpdateParamsByArray ($networkParamsId, $networkParamsData) { // Ids lower one are not accepted - if ($networkId < 1) { + if ($networkParamsId < 1) { // Not good, should be fixed - reportBug(__FUNCTION__, __LINE__, 'Network request parameter id ' . $networkId . ' is smaller than 1.'); + reportBug(__FUNCTION__, __LINE__, 'Network request parameter id ' . $networkParamsId . ' is smaller than 1.'); } // END - if // Just call our inner method - return adminSaveSettings($networkParamData, '_network_request_params', sprintf("`network_request_param_id`=%s", bigintval($networkId)), array(), false, false); + return adminSaveSettings($networkParamsData, '_network_request_params', sprintf("`network_request_param_id`=%s", bigintval($networkParamsId)), array(), false, false); +} + +// Updates given network array translations (id) with data from array +function doNetworkUpdateArrayTranslationsByArray ($networkTranslationsId, $networkTranslationsData) { + // Ids lower one are not accepted + if ($networkTranslationsId < 1) { + // Not good, should be fixed + reportBug(__FUNCTION__, __LINE__, 'Network request parameter id ' . $networkTranslationsId . ' is smaller than 1.'); + } // END - if + + // Just call our inner method + return adminSaveSettings($networkTranslationsData, '_network_array_translation', sprintf("`network_array_id`=%s", bigintval($networkTranslationsId)), array(), false, false); } // Removes given network entry -function doAdminRemoveNetworkEntry ($table, $column, $networkId, $limit = 1) { +function doAdminRemoveNetworkEntry ($table, $column, $id, $limit = 1) { // Remove the entry SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_network_%s` WHERE `%s`=%s LIMIT %s", array( $table, $column, - $networkId, + $id, $limit ), __FUNCTION__, __LINE__); @@ -776,7 +826,7 @@ function generateNetworkTranslationOptions ($default = '') { $default, '', '', - $GLOBALS['network_translation_disabled'], + $GLOBALS['network_array_translation_disabled'], 'translateNetworkTranslationName' ); } // END - if @@ -929,7 +979,7 @@ INNER JOIN ON `network_array_index`=`network_translation_id` ORDER BY - `sort` ASC', __FUNCTION__, __LINE__); + `network_array_sort` ASC', __FUNCTION__, __LINE__); // Are there entries? if (!SQL_HASZERONUMS($result)) { @@ -1109,7 +1159,7 @@ function doAdminNetworkProcessHandleNetworkTypes () { $OUT .= loadTemplate('admin_delete_network_types_row', true, $networkTypeData); } else { // Problem! - reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.'); + reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.'); } } // END - if } // END - if @@ -1124,7 +1174,7 @@ function doAdminNetworkProcessHandleNetworkTypes () { loadTemplate('admin_delete_network_types', false, $OUT); } else { // Problem! - reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.'); + reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.'); } // Don't display the list/add new form @@ -1167,7 +1217,7 @@ function doAdminNetworkProcessHandleRequestParams () { $OUT .= loadTemplate('admin_delete_network_request_params_row', true, $networkRequestData); } else { // Problem! - reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.'); + reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.'); } } // END - if } // END - if @@ -1182,7 +1232,7 @@ function doAdminNetworkProcessHandleRequestParams () { loadTemplate('admin_delete_network_request_params', false, $OUT); } else { // Problem! - reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.'); + reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.'); } // Don't display the list/add new form @@ -1410,6 +1460,59 @@ function doAdminNetworkProcessChangeRequestParams () { } // END - if } +// Changes given network array translations +function doAdminNetworkProcessChangeArrayTranslations () { + // Is there selections? + if (ifPostContainsSelections()) { + // By default nothing is updated + $updated = 0; + + // Something has been selected, so start updating them + foreach (postRequestElement('sel') as $networkId => $sel) { + // Update this entry? + if ($sel == 1) { + // Init data array + $networkTranslationsData = array(); + + // Transfer whole array, except 'sel' + foreach (postRequestArray() as $key => $entry) { + // Skip 'sel' and submit button + if (in_array($key, array('sel', 'do_edit'))) { + continue; + } // END - if + + // Is there this enty? + if (!isset($entry[$networkId])) { + // Not found, needs fixing + reportBug(__FUNCTION__, __LINE__, 'No entry in key=' . $key . ', id=' . $networkId . ' found.'); + } // END - if + + // Fix empty network_request_param_default to NULL + if (($key == 'network_request_param_default') && (trim($entry[$networkId]) == '')) { + // Set it to NULL + $entry[$networkId] = NULL; + } // END - if + + // Add this entry + $networkTranslationsData[$key] = $entry[$networkId]; + } // END - foreach + + // Update the network data + $updated += doNetworkUpdateArrayTranslationsByArray($networkId, $networkTranslationsData); + } // END - if + } // END - foreach + + // Is there updates? + if ($updated > 0) { + // Updates done + displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_UPDATED=' . $updated . '%}'); + } else { + // Nothing changed + loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_CHANGED--}'); + } + } // END - if +} + // Removes given network type handlers function doAdminNetworkProcessRemoveNetworkTypes () { // Is there selections? @@ -1464,6 +1567,33 @@ function doAdminNetworkProcessRemoveNetworkRequestParams () { } // END - if } +// Removes given network array translations +function doAdminNetworkProcessRemoveNetworkArrayTranslation () { + // Is there selections? + if (ifPostContainsSelections()) { + // By default nothing is removed + $removed = 0; + + // Something has been selected, so start updating them + foreach (postRequestElement('sel') as $networkId => $sel) { + // Update this entry? + if ($sel == 1) { + // Remove this entry + $removed += doAdminRemoveNetworkEntry('array_translation', 'network_array_id', $networkId); + } // END - if + } // END - foreach + + // Is there removes? + if ($removed > 0) { + // Removals done + displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_REMOVED=' . $removed . '%}'); + } else { + // Nothing removed + loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_REMOVED--}'); + } + } // END - if +} + // Adds a request parameter to given network and type function doAdminNetworkProcessAddRequestParam () { // Is the request parameter already used with given network? @@ -1554,7 +1684,7 @@ function doAdminNetworkProcessAddNetworkArrayTranslation () { setPostRequestElement('network_id', bigintval(getRequestElement('network_id'))); // Add sorting - setPostRequestElement('sort', (countSumTotalData( + setPostRequestElement('network_array_sort', (countSumTotalData( bigintval(postRequestElement('network_id')), 'network_array_translation', 'network_array_id', @@ -1576,6 +1706,64 @@ function doAdminNetworkProcessAddNetworkArrayTranslation () { } } +// Handle network array translation form +function doAdminNetworkProcessHandleArrayTranslations () { + // Is there selections? + if (ifPostContainsSelections()) { + // Init cache array + $GLOBALS['network_array_translation_disabled'] = array(); + + // Load network data + $networkData = getNetworkDataById(getRequestElement('network_id')); + + // Something has been selected, so start displaying one by one + $OUT = ''; + foreach (postRequestElement('sel') as $networkId => $sel) { + // Is this selected? + if ($sel == 1) { + // Load this network's data + $networkTranslationsData = getNetworkArrayTranslationsDataById($networkId); + + // Is there found the network? + if (count($networkTranslationsData) > 0) { + if (isFormSent('edit')) { + // Add row template for deleting + $OUT .= loadTemplate('admin_edit_network_array_translation_row', true, $networkTranslationsData); + } elseif (isFormSent('delete')) { + // Get type data + $networkTranslationsData['network_type_data'] = getNetworkTypeDataById($networkTranslationsData['network_type_id']); + + // Add row template for deleting + $OUT .= loadTemplate('admin_delete_network_array_translation_row', true, $networkTranslationsData); + } else { + // Problem! + reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.'); + } + } // END - if + } // END - if + } // END - foreach + + // If we have no rows, we don't need to display the edit form + if (!empty($OUT)) { + // Output main template + if (isFormSent('edit')) { + loadTemplate('admin_edit_network_array_translation', false, $OUT); + } elseif (isFormSent('delete')) { + loadTemplate('admin_delete_network_array_translation', false, $OUT); + } else { + // Problem! + reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.'); + } + + // Don't display the list/add new form + $GLOBALS['network_display'] = false; + } else { + // Nothing selected/found + loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}'); + } + } // END - if +} + // Adds/update network API configuration function doAdminNetworkProcessNetworkApiConfig () { // Remove the 'ok' part @@ -2105,20 +2293,20 @@ function doAdminNetworkExportArrayTranslation () { `network_id`, `network_type_id`, `network_array_index`, - `sort` + `network_array_sort` FROM `{?_MYSQL_PREFIX?}_network_array_translation` WHERE `network_id`=%s ORDER BY `network_type_id` ASC, - `sort` ASC', + `network_array_sort` ASC', array( bigintval(getRequestElement('network_id')) ), __FUNCTION__, __LINE__); // Start an empty SQL query - $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `sort`) VALUES\n"; + $SQL = "INSERT INTO `{?_MYSQL_PREFIX?}_network_array_translation` (`network_id`, `network_type_id`, `network_array_index`, `network_array_sort`) VALUES\n"; // Load all entries while ($content = SQL_FETCHARRAY($result)) { @@ -2127,7 +2315,7 @@ ORDER BY $content['network_id'] . ', ' . $content['network_type_id'] . ', ' . $content['network_array_index'] . ', ' . - $content['sort'] . "),\n"; + $content['network_array_sort'] . "),\n"; } // END - while // Remove last commata and close braces diff --git a/inc/modules/admin/what-list_network_array_translation.php b/inc/modules/admin/what-list_network_array_translation.php index 1857f48a2e..40f63f3cd0 100644 --- a/inc/modules/admin/what-list_network_array_translation.php +++ b/inc/modules/admin/what-list_network_array_translation.php @@ -70,7 +70,7 @@ if (isGetRequestElementSet('network_id')) { $networkData['network_type_id'] = 0; // Init disabled list - $GLOBALS['network_translation_disabled'] = array(); + $GLOBALS['network_array_translation_disabled'] = array(); // Only show params from given type handler if choosen $ADD = ''; @@ -91,7 +91,7 @@ if (isGetRequestElementSet('network_id')) { t.`network_type_id`, t.`network_type_handler`, p.`network_array_index`, - p.`sort` + p.`network_array_sort` FROM `{?_MYSQL_PREFIX?}_network_array_translation` AS p INNER JOIN @@ -116,7 +116,7 @@ ORDER BY // Add it to network if the type matches selected if ($row['network_type_id'] == postRequestElement('network_type_id')) { // Matches, then add it for disabling this entry - $GLOBALS['network_translation_disabled'][$row['network_array_index']] = true; + $GLOBALS['network_array_translation_disabled'][$row['network_array_index']] = true; } // END - if // Add row template and switch color diff --git a/templates/de/html/admin/admin_add_network_array_translation.tpl b/templates/de/html/admin/admin_add_network_array_translation.tpl index 54b152cfd3..9bc4887ce2 100644 --- a/templates/de/html/admin/admin_add_network_array_translation.tpl +++ b/templates/de/html/admin/admin_add_network_array_translation.tpl @@ -1,5 +1,5 @@
-
+ - + - +
@@ -10,7 +10,7 @@
{--ADMIN_SELECT_NETWORK_HANDLER_TYPE--}:{--ADMIN_SELECT_NETWORK_HANDLER_TYPE--}
{--ADMIN_NETWORK_ARRAY_TRANSLATION_INDEX_TRANSLATION--}:{--ADMIN_SELECT_NETWORK_ARRAY_INDEX_TRANSLATION--}
diff --git a/templates/de/html/admin/admin_add_network_type.tpl b/templates/de/html/admin/admin_add_network_type.tpl index 79b2d0f331..e4bda05bdd 100644 --- a/templates/de/html/admin/admin_add_network_type.tpl +++ b/templates/de/html/admin/admin_add_network_type.tpl @@ -1,5 +1,5 @@
- +
diff --git a/templates/de/html/admin/admin_add_network_vcheck_param.tpl b/templates/de/html/admin/admin_add_network_vcheck_param.tpl index c5799a103e..6f0d4891d7 100644 --- a/templates/de/html/admin/admin_add_network_vcheck_param.tpl +++ b/templates/de/html/admin/admin_add_network_vcheck_param.tpl @@ -1,5 +1,5 @@
- + + + + + + + + + + + + + + diff --git a/templates/de/html/admin/admin_delete_network_request_params.tpl b/templates/de/html/admin/admin_delete_network_request_params.tpl index 7ed895cac1..a61240a7cb 100644 --- a/templates/de/html/admin/admin_delete_network_request_params.tpl +++ b/templates/de/html/admin/admin_delete_network_request_params.tpl @@ -1,10 +1,10 @@
-
+
diff --git a/templates/de/html/admin/admin_delete_network_array_translation.tpl b/templates/de/html/admin/admin_delete_network_array_translation.tpl new file mode 100644 index 0000000000..cee78fda6c --- /dev/null +++ b/templates/de/html/admin/admin_delete_network_array_translation.tpl @@ -0,0 +1,26 @@ +
+ + + + + + $content + + + +
+
+ {--ADMIN_DELETE_NETWORK_ARRAY_TRANSLATION_TITLE--} +
+
+ ({%network,getNetworkDataById,network_title=%network_id%%}) +
+
+ +
+ +
+ +
+ {--ADMIN_LIST_NETWORK_ARRAY_TRANSLATION_NOTICE--} +
diff --git a/templates/de/html/admin/admin_delete_network_array_translation_row.tpl b/templates/de/html/admin/admin_delete_network_array_translation_row.tpl new file mode 100644 index 0000000000..e8e8cd1c1e --- /dev/null +++ b/templates/de/html/admin/admin_delete_network_array_translation_row.tpl @@ -0,0 +1,21 @@ +
{--ADMIN_NETWORK_TYPE_HANDLER--} + + {%pipe,translateNetworkTypeHandler=$content[network_type_data][network_type_handler]%} +
{--ADMIN_NETWORK_ARRAY_TRANSLATION_INDEX--} + {%pipe,translateNetworkApiIndex=$content[network_array_index]%} +
{--ADMIN_NETWORK_ARRAY_INDEX_SORTING--} + $content[network_array_sort] +
- + + - + + - + + - + diff --git a/templates/de/html/admin/admin_delete_network_types.tpl b/templates/de/html/admin/admin_delete_network_types.tpl index 21131af6ed..a90556315b 100644 --- a/templates/de/html/admin/admin_delete_network_types.tpl +++ b/templates/de/html/admin/admin_delete_network_types.tpl @@ -1,10 +1,10 @@
- +
- {--ADMIN_NETWORK_REQUEST_PARAMETER_DELETE_TITLE--} + {--ADMIN_DELETE_NETWORK_REQUEST_PARAMETER_TITLE--}
({%network,getNetworkDataById,network_title=%network_id%%}) @@ -22,5 +22,5 @@
- {--ADMIN_NETWORK_REQUEST_PARAMETER_LIST_NOTICE--} + {--ADMIN_LIST_NETWORK_REQUEST_PARAMETER_NOTICE--}
diff --git a/templates/de/html/admin/admin_delete_network_request_params_row.tpl b/templates/de/html/admin/admin_delete_network_request_params_row.tpl index 4174743a2b..a828a5b909 100644 --- a/templates/de/html/admin/admin_delete_network_request_params_row.tpl +++ b/templates/de/html/admin/admin_delete_network_request_params_row.tpl @@ -1,24 +1,27 @@
{--ADMIN_NETWORK_TYPE_HANDLER--}:{--ADMIN_NETWORK_TYPE_HANDLER--} {%pipe,translateNetworkTypeHandler=$content[network_type_data][network_type_handler]%}
{--ADMIN_NETWORK_REQUEST_PARAMETER_KEY--}:{--ADMIN_NETWORK_REQUEST_PARAMETER_KEY--} {%pipe,translateNetworkRequestParameterKey=$content[network_request_param_key]%}
{--ADMIN_NETWORK_REQUEST_PARAMETER_VALUE--}:{--ADMIN_NETWORK_REQUEST_PARAMETER_VALUE--} $content[network_request_param_value]
{--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--}:{--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--} {%pipe,fixEmptyContentToDashes=$content[network_request_param_default]%}
- + + - + + - + + - + diff --git a/templates/de/html/admin/admin_delete_networks_row.tpl b/templates/de/html/admin/admin_delete_networks_row.tpl index 36fa3181f8..ad8efbf0a2 100644 --- a/templates/de/html/admin/admin_delete_networks_row.tpl +++ b/templates/de/html/admin/admin_delete_networks_row.tpl @@ -1,36 +1,39 @@ - + - + + - + - + + - + - + + - + diff --git a/templates/de/html/admin/admin_delete_payments_row.tpl b/templates/de/html/admin/admin_delete_payments_row.tpl index c84c60a93e..2553b64cca 100644 --- a/templates/de/html/admin/admin_delete_payments_row.tpl +++ b/templates/de/html/admin/admin_delete_payments_row.tpl @@ -3,6 +3,7 @@ {--ADMIN_PAYMENT_ID--} $content[id]: + + + + + + + + + + + + + + diff --git a/templates/de/html/admin/admin_edit_network_request_params.tpl b/templates/de/html/admin/admin_edit_network_request_params.tpl index 3f65222b02..9642947dd7 100644 --- a/templates/de/html/admin/admin_edit_network_request_params.tpl +++ b/templates/de/html/admin/admin_edit_network_request_params.tpl @@ -1,10 +1,10 @@
-
+
- {--ADMIN_NETWORK_TYPE_HANDLER_DELETE_TITLE--} + {--ADMIN_DELETE_NETWORK_TYPE_HANDLER_TITLE--}
({%network,getNetworkDataById,network_title=%network_id%%}) @@ -22,5 +22,5 @@
- {--ADMIN_NETWORK_TYPE_HANDLER_LIST_NOTICE--} + {--ADMIN_LIST_NETWORK_TYPE_HANDLER_NOTICE--}
diff --git a/templates/de/html/admin/admin_delete_network_types_row.tpl b/templates/de/html/admin/admin_delete_network_types_row.tpl index 00611f510a..e29b6d16c1 100644 --- a/templates/de/html/admin/admin_delete_network_types_row.tpl +++ b/templates/de/html/admin/admin_delete_network_types_row.tpl @@ -1,24 +1,27 @@
{--ADMIN_NETWORK_TYPE_HANDLER--}:{--ADMIN_NETWORK_TYPE_HANDLER--} {%pipe,translateNetworkTypeHandler=$content[network_type_handler]%}
{--ADMIN_NETWORK_TYPE_HANDLER_API_URL--}:{--ADMIN_NETWORK_TYPE_HANDLER_API_URL--} $content[network_type_api_url]
{--ADMIN_NETWORK_TYPE_HANDLER_CLICK_URL--}:{--ADMIN_NETWORK_TYPE_HANDLER_CLICK_URL--} $content[network_type_click_url]
{--ADMIN_NETWORK_TYPE_HANDLER_BANNER_URL--}:{--ADMIN_NETWORK_TYPE_HANDLER_BANNER_URL--} {%pipe,fixEmptyContentToDashes=$content[network_type_banner_url]%}
{--ADMIN_NETWORK_TITLE--}:{--ADMIN_NETWORK_TITLE--} $content[network_title] {--ADMIN_NETWORK_SHORT_NAME--}:{--ADMIN_NETWORK_SHORT_NAME--} $content[network_short_name]
{--ADMIN_NETWORK_REFERRAL_LINK--}:{--ADMIN_NETWORK_REFERRAL_LINK--} $content[network_reflink] {--ADMIN_NETWORK_DATA_SEPARATOR--}:{--ADMIN_NETWORK_DATA_SEPARATOR--} $content[network_data_separator]
{--ADMIN_NETWORK_REQUEST_TYPE--}:{--ADMIN_NETWORK_REQUEST_TYPE--} {%pipe,translateNetworkRequestType=$content[network_request_type]%} {--ADMIN_NETWORK_ROW_SEPARATOR--}:{--ADMIN_NETWORK_ROW_SEPARATOR--} $content[network_row_separator]
{--ADMIN_NETWORK_CHARSET--}:{--ADMIN_NETWORK_CHARSET--} $content[network_charset]
$content[time] {--TIME_UNIT_SECOND--} ($content[mail_title]) diff --git a/templates/de/html/admin/admin_edit_network_array_translation.tpl b/templates/de/html/admin/admin_edit_network_array_translation.tpl new file mode 100644 index 0000000000..2638b6f28b --- /dev/null +++ b/templates/de/html/admin/admin_edit_network_array_translation.tpl @@ -0,0 +1,27 @@ +
+ + + + + + $content + + + +
+
+ {--ADMIN_EDIT_NETWORK_ARRAY_TRANSLATION_TITLE--} +
+
+ ({%network,getNetworkDataById,network_title=%network_id%%}) +
+
+ + +
+ +
+ +
+ {--ADMIN_LIST_NETWORK_ARRAY_TRANSLATION_NOTICE--} +
diff --git a/templates/de/html/admin/admin_edit_network_array_translation_row.tpl b/templates/de/html/admin/admin_edit_network_array_translation_row.tpl new file mode 100644 index 0000000000..a49605e82c --- /dev/null +++ b/templates/de/html/admin/admin_edit_network_array_translation_row.tpl @@ -0,0 +1,25 @@ +
{--ADMIN_NETWORK_TYPE_HANDLER--} + + +
{--ADMIN_CHANGE_NETWORK_ARRAY_TRANSLATION_INDEX_TRANSLATION--} + +
{--ADMIN_NETWORK_ARRAY_INDEX_SORTING--} + +
- + + - + + - + + - + diff --git a/templates/de/html/admin/admin_edit_network_types.tpl b/templates/de/html/admin/admin_edit_network_types.tpl index b9f3375ec1..465c88df19 100644 --- a/templates/de/html/admin/admin_edit_network_types.tpl +++ b/templates/de/html/admin/admin_edit_network_types.tpl @@ -1,5 +1,5 @@
- +
- {--ADMIN_NETWORK_REQUEST_PARAMETER_EDIT_TITLE--} + {--ADMIN_EDIT_NETWORK_REQUEST_PARAMETER_TITLE--}
({%network,getNetworkDataById,network_title=%network_id%%}) @@ -23,5 +23,5 @@
- {--ADMIN_NETWORK_REQUEST_PARAMETER_LIST_NOTICE--} + {--ADMIN_LIST_NETWORK_REQUEST_PARAMETER_NOTICE--}
diff --git a/templates/de/html/admin/admin_edit_network_request_params_row.tpl b/templates/de/html/admin/admin_edit_network_request_params_row.tpl index c95c9cd6dc..306497fc15 100644 --- a/templates/de/html/admin/admin_edit_network_request_params_row.tpl +++ b/templates/de/html/admin/admin_edit_network_request_params_row.tpl @@ -1,5 +1,5 @@
{--ADMIN_NETWORK_TYPE_HANDLER--}:{--ADMIN_NETWORK_TYPE_HANDLER--}
{--ADMIN_NETWORK_REQUEST_PARAMETER_KEY--}:{--ADMIN_NETWORK_REQUEST_PARAMETER_KEY--}
{--ADMIN_NETWORK_REQUEST_PARAMETER_VALUE--}:{--ADMIN_NETWORK_REQUEST_PARAMETER_VALUE--}
{--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--}:{--ADMIN_NETWORK_REQUEST_PARAMETER_DEFAULT--}
- + + - + + - + + - + diff --git a/templates/de/html/admin/admin_edit_networks_row.tpl b/templates/de/html/admin/admin_edit_networks_row.tpl index 308e8b10c3..b18bfdb841 100644 --- a/templates/de/html/admin/admin_edit_networks_row.tpl +++ b/templates/de/html/admin/admin_edit_networks_row.tpl @@ -1,38 +1,41 @@ - + - + + - + - + + - + - + + - + @@ -43,8 +46,9 @@ + - + diff --git a/templates/de/html/admin/admin_edit_payments_row.tpl b/templates/de/html/admin/admin_edit_payments_row.tpl index ed2180cecd..f066293d51 100644 --- a/templates/de/html/admin/admin_edit_payments_row.tpl +++ b/templates/de/html/admin/admin_edit_payments_row.tpl @@ -3,18 +3,21 @@ {--ADMIN_PAYMENT_ID--} $content[id]: + + + + + + + + + + + + + + + + + + + + +
@@ -23,5 +23,5 @@
- {--ADMIN_NETWORK_TYPE_HANDLER_LIST_NOTICE--} + {--ADMIN_LIST_NETWORK_TYPE_HANDLER_NOTICE--}
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 6a2fc5eccf..3a6ee3e0b9 100644 --- a/templates/de/html/admin/admin_edit_network_types_row.tpl +++ b/templates/de/html/admin/admin_edit_network_types_row.tpl @@ -1,5 +1,5 @@
{--ADMIN_NETWORK_TYPE_HANDLER--}:{--ADMIN_NETWORK_TYPE_HANDLER--}
{--ADMIN_NETWORK_TYPE_HANDLER_API_URL--}:{--ADMIN_NETWORK_TYPE_HANDLER_API_URL--}
{--ADMIN_NETWORK_TYPE_HANDLER_CLICK_URL--}:{--ADMIN_NETWORK_TYPE_HANDLER_CLICK_URL--}
{--ADMIN_NETWORK_TYPE_HANDLER_BANNER_URL--}:{--ADMIN_NETWORK_TYPE_HANDLER_BANNER_URL--}
{--ADMIN_NETWORK_TITLE--}:{--ADMIN_NETWORK_TITLE--} {--ADMIN_NETWORK_SHORT_NAME--}:{--ADMIN_NETWORK_SHORT_NAME--}
{--ADMIN_NETWORK_REFERRAL_LINK--}:{--ADMIN_NETWORK_REFERRAL_LINK--} {--ADMIN_NETWORK_DATA_SEPARATOR--}:{--ADMIN_NETWORK_DATA_SEPARATOR--}
{--ADMIN_NETWORK_REQUEST_TYPE--}:{--ADMIN_NETWORK_REQUEST_TYPE--} {--ADMIN_NETWORK_ROW_SEPARATOR--}:{--ADMIN_NETWORK_ROW_SEPARATOR--}
{--ADMIN_NETWORK_CHARSET--}:{--ADMIN_NETWORK_CHARSET--}
{--ADMIN_NETWORK_QUERY_AMOUNT--}:{--ADMIN_NETWORK_QUERY_AMOUNT--}
{--ADMIN_PAYMENT_TIME--}: {--TIME_UNIT_SECOND--}
{--ADMIN_PAYMENT_PAYMENT--}: {?POINTS?}
{--ADMIN_PAYMENT_PRICE--}: @@ -22,6 +25,7 @@ ({?POINTS?})
{--ADMIN_PAYMENT_TITLE--}: diff --git a/templates/de/html/admin/admin_edit_points_data_row.tpl b/templates/de/html/admin/admin_edit_points_data_row.tpl index 96c47fdbc4..c357f479f4 100644 --- a/templates/de/html/admin/admin_edit_points_data_row.tpl +++ b/templates/de/html/admin/admin_edit_points_data_row.tpl @@ -9,6 +9,7 @@ {%pipe,translatePointsAccountType=$content[column_name]%}
{--ADMIN_CHANGE_POINTS_LOCKED_MODE--}
@@ -23,6 +24,7 @@
{--ADMIN_CHANGE_POINTS_NOTIFY_RECIPIENT--}
diff --git a/templates/de/html/admin/admin_edit_rallyes_row.tpl b/templates/de/html/admin/admin_edit_rallyes_row.tpl index e75bd8d514..99464dc94e 100644 --- a/templates/de/html/admin/admin_edit_rallyes_row.tpl +++ b/templates/de/html/admin/admin_edit_rallyes_row.tpl @@ -5,18 +5,21 @@
{--ADMIN_ENTER_RALLYE_DESCRIPTION--}:
{--ADMIN_SELECT_RALLYE_TEMPLATE--}: $content[templ]
{--ADMIN_RALLYE_START_DAY--}: @@ -24,6 +27,7 @@
$content[s_hour] : $content[s_min] : 00
{--ADMIN_RALLYE_END_DAY--}: @@ -31,12 +35,14 @@
$content[e_hour] : $content[e_min] : 00
{--ADMIN_RALLYE_MIN_USERS_MINI--}:
{--ADMIN_RALLYE_MIN_PRICES_MINI--}: diff --git a/templates/de/html/admin/admin_edit_refbanner_row.tpl b/templates/de/html/admin/admin_edit_refbanner_row.tpl index 9bb0516c88..dde7e52622 100644 --- a/templates/de/html/admin/admin_edit_refbanner_row.tpl +++ b/templates/de/html/admin/admin_edit_refbanner_row.tpl @@ -5,12 +5,14 @@
{--ADMIN_EDIT_REFERRAL_BANNER_ALTERNATIVE_TEXT--}:
{--ADMIN_SELECT_REFERRAL_BANNER_ACTIVE--}: diff --git a/templates/de/html/admin/admin_edit_reflevel_row.tpl b/templates/de/html/admin/admin_edit_reflevel_row.tpl index 0b57261191..bf1d6885e2 100644 --- a/templates/de/html/admin/admin_edit_reflevel_row.tpl +++ b/templates/de/html/admin/admin_edit_reflevel_row.tpl @@ -3,12 +3,14 @@ {--ADMIN_REFERRAL_DEPTHS_ID--} $content[id]:
{--REFERRAL_LEVEL--}: 
{--REFERRAL_PERCENT--}:  diff --git a/templates/de/html/admin/admin_email_archiv_row.tpl b/templates/de/html/admin/admin_email_archiv_row.tpl index d27f4368aa..c1e1837570 100644 --- a/templates/de/html/admin/admin_email_archiv_row.tpl +++ b/templates/de/html/admin/admin_email_archiv_row.tpl @@ -12,6 +12,7 @@ 
$content[text]
{--EMAIL_PAYMENT--}:
@@ -22,6 +23,7 @@ {%pipe,getCategory=$content[cat_id]%}
{--EMAIL_RECEIVERS--}:
@@ -37,6 +39,7 @@ {%pipe,translatePoolType=$content[data_type]%}
{--EMAIL_TSEND--}:
@@ -52,6 +55,7 @@ $content[timestamp]
{--EMAIL_URL--}:
@@ -62,6 +66,7 @@ ---
{%template,AdminMemberMailLinks=$content[id]%} diff --git a/templates/de/html/admin/admin_list_network_array_translation.tpl b/templates/de/html/admin/admin_list_network_array_translation.tpl index 04af22b6c1..051faef6ff 100644 --- a/templates/de/html/admin/admin_list_network_array_translation.tpl +++ b/templates/de/html/admin/admin_list_network_array_translation.tpl @@ -1,5 +1,5 @@
- + diff --git a/templates/de/html/admin/admin_list_network_request_params.tpl b/templates/de/html/admin/admin_list_network_request_params.tpl index 79e3eaf154..f568b334a9 100644 --- a/templates/de/html/admin/admin_list_network_request_params.tpl +++ b/templates/de/html/admin/admin_list_network_request_params.tpl @@ -1,10 +1,10 @@
-
+
@@ -29,7 +29,7 @@
- {--ADMIN_EXPORT_NETWORK_ARRAY_TRANSLATION_LINK--} + {--ADMIN_EXPORT_NETWORK_ARRAY_TRANSLATION_LINK--}
diff --git a/templates/de/html/admin/admin_list_network_array_translation_row.tpl b/templates/de/html/admin/admin_list_network_array_translation_row.tpl index 591c4417de..fef5be149d 100644 --- a/templates/de/html/admin/admin_list_network_array_translation_row.tpl +++ b/templates/de/html/admin/admin_list_network_array_translation_row.tpl @@ -9,6 +9,6 @@ {%pipe,translateNetworkApiIndex=$content[network_array_index]%} 		- $content[sort] + $content[network_array_sort]
- {--ADMIN_NETWORK_REQUEST_PARAMETER_LIST_TITLE--} + {--ADMIN_LIST_NETWORK_REQUEST_PARAMETER_TITLE--}
({%network,getNetworkDataById,network_title=%network_id%%}) @@ -30,10 +30,10 @@
- {--ADMIN_EXPORT_NETWORK_REQUEST_PARAMS_LINK--} + {--ADMIN_EXPORT_NETWORK_REQUEST_PARAMS_LINK--}
- {--ADMIN_NETWORK_REQUEST_PARAMETER_LIST_NOTICE--} + {--ADMIN_LIST_NETWORK_REQUEST_PARAMETER_NOTICE--}
diff --git a/templates/de/html/admin/admin_list_network_types.tpl b/templates/de/html/admin/admin_list_network_types.tpl index 405d29b7c0..9e2f7eb811 100644 --- a/templates/de/html/admin/admin_list_network_types.tpl +++ b/templates/de/html/admin/admin_list_network_types.tpl @@ -1,10 +1,10 @@
-
+
- {--ADMIN_NETWORK_TYPE_HANDLER_LIST_TITLE--} + {--ADMIN_LIST_NETWORK_TYPE_HANDLER_LIST_TITLE--}
({%network,getNetworkDataById,network_title=%network_id%%}) @@ -32,10 +32,10 @@
- {--ADMIN_EXPORT_NETWORK_HANDLER_TYPES_LINK--} + {--ADMIN_EXPORT_NETWORK_HANDLER_TYPES_LINK--}
- {--ADMIN_NETWORK_TYPE_HANDLER_LIST_NOTICE--} + {--ADMIN_LIST_NETWORK_TYPE_HANDLER_NOTICE--}
diff --git a/templates/de/html/admin/admin_list_network_vcheck_params.tpl b/templates/de/html/admin/admin_list_network_vcheck_params.tpl index 5eb0e9162a..347a018603 100644 --- a/templates/de/html/admin/admin_list_network_vcheck_params.tpl +++ b/templates/de/html/admin/admin_list_network_vcheck_params.tpl @@ -1,10 +1,10 @@
-
+
- {--ADMIN_NETWORK_VCHECK_PARAMETER_LIST_TITLE--} + {--ADMIN_LIST_NETWORK_VCHECK_PARAMETER_LIST_TITLE--}
({%network,getNetworkDataById,network_title=%network_id%%}) @@ -29,10 +29,10 @@
- {--ADMIN_EXPORT_NETWORK_VCHECK_PARAMS_LINK--} + {--ADMIN_EXPORT_NETWORK_VCHECK_PARAMS_LINK--}
- {--ADMIN_NETWORK_VCHECK_PARAMETER_LIST_NOTICE--} + {--ADMIN_LIST_NETWORK_VCHECK_PARAMETER_NOTICE--}
diff --git a/templates/de/html/member/member_order_thanks.tpl b/templates/de/html/member/member_order_thanks.tpl index 19785b6dd3..95fb7ae853 100644 --- a/templates/de/html/member/member_order_thanks.tpl +++ b/templates/de/html/member/member_order_thanks.tpl @@ -8,7 +8,7 @@ {--MEMBER_THANX_ORDER--} -