From: Roland Häder Date: Sat, 24 Nov 2012 22:40:38 +0000 (+0000) Subject: Admin area 'Referral levels' refactured: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2cf4fdd43142b6ed33e4fa3a22539a415333a643;p=mailer.git Admin area 'Referral levels' refactured: - Listing/adding,editing/deleting of referral levels is now fully rewritten to use XML templates, also "build mails" are being sent - Almost all admin templates with an id number are now expanded with 'width="30"' to make it look the same (not all pages) - TODOs.txt updated --- diff --git a/.gitattributes b/.gitattributes index 862be93aef..a431b8c82b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -581,6 +581,7 @@ inc/modules/admin/what-list_notifications.php svneol=native#text/plain inc/modules/admin/what-list_payouts.php svneol=native#text/plain inc/modules/admin/what-list_point_accounts.php svneol=native#text/plain inc/modules/admin/what-list_rallyes.php svneol=native#text/plain +inc/modules/admin/what-list_referral_levels.php svneol=native#text/plain inc/modules/admin/what-list_refs.php svneol=native#text/plain inc/modules/admin/what-list_server_name.php svneol=native#text/plain inc/modules/admin/what-list_sponsor.php svneol=native#text/plain @@ -870,6 +871,7 @@ templates/de/emails/admin/admin_add_forced_ads.tpl svneol=native#text/plain templates/de/emails/admin/admin_add_forced_campaigns.tpl svneol=native#text/plain templates/de/emails/admin/admin_add_forced_costs.tpl svneol=native#text/plain templates/de/emails/admin/admin_add_grade_data.tpl svneol=native#text/plain +templates/de/emails/admin/admin_add_refdepths.tpl svneol=native#text/plain templates/de/emails/admin/admin_add_user_subids.tpl svneol=native#text/plain templates/de/emails/admin/admin_admin_add_all_direct.tpl svneol=native#text/plain templates/de/emails/admin/admin_admin_add_all_ref_referral.tpl svneol=native#text/plain @@ -900,6 +902,7 @@ templates/de/emails/admin/admin_edit_forced_campaigns.tpl svneol=native#text/pla templates/de/emails/admin/admin_edit_forced_costs.tpl svneol=native#text/plain templates/de/emails/admin/admin_edit_mem_edit_user_subids.tpl svneol=native#text/plain templates/de/emails/admin/admin_edit_points_data.tpl svneol=native#text/plain +templates/de/emails/admin/admin_edit_refdepths.tpl svneol=native#text/plain templates/de/emails/admin/admin_edit_surfbar_actions.tpl svneol=native#text/plain templates/de/emails/admin/admin_edit_surfbar_urls.tpl svneol=native#text/plain templates/de/emails/admin/admin_edit_user_subids.tpl svneol=native#text/plain @@ -1157,6 +1160,7 @@ templates/de/html/admin/admin_add_points_all.tpl svneol=native#text/plain templates/de/html/admin/admin_add_rallye.tpl svneol=native#text/plain templates/de/html/admin/admin_add_rallye_prices.tpl svneol=native#text/plain templates/de/html/admin/admin_add_refbanner.tpl svneol=native#text/plain +templates/de/html/admin/admin_add_referral_level.tpl svneol=native#text/plain templates/de/html/admin/admin_add_reflevel.tpl svneol=native#text/plain templates/de/html/admin/admin_add_reflvl.tpl -text templates/de/html/admin/admin_add_shop_cat.tpl -text @@ -1341,6 +1345,8 @@ templates/de/html/admin/admin_edit_rallyes.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_rallyes_row.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_refbanner.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_refbanner_row.tpl svneol=native#text/plain +templates/de/html/admin/admin_edit_refdepths.tpl svneol=native#text/plain +templates/de/html/admin/admin_edit_refdepths_row.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_reflevel.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_reflevel_row.tpl svneol=native#text/plain templates/de/html/admin/admin_edit_sponsor_add_points.tpl svneol=native#text/plain @@ -1483,6 +1489,8 @@ templates/de/html/admin/admin_list_rallyes_row.tpl svneol=native#text/plain templates/de/html/admin/admin_list_rallyes_row2.tpl svneol=native#text/plain templates/de/html/admin/admin_list_refbanner.tpl svneol=native#text/plain templates/de/html/admin/admin_list_refbanner_row.tpl svneol=native#text/plain +templates/de/html/admin/admin_list_refdepths.tpl svneol=native#text/plain +templates/de/html/admin/admin_list_refdepths_row.tpl svneol=native#text/plain templates/de/html/admin/admin_list_reflevel.tpl svneol=native#text/plain templates/de/html/admin/admin_list_reflevel_row.tpl svneol=native#text/plain templates/de/html/admin/admin_list_refs.tpl svneol=native#text/plain diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 668d40949c..4b57be8a7c 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -46,29 +46,29 @@ ./inc/extensions/ext-rallye.php:94: // @TODO Fix config_rallye_prices to list_rallye_prices ./inc/extensions/ext-yoomedia.php:121: // @TODO Can this be moved into a database table? ./inc/extensions/ext-yoomedia.php:54:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y'); -./inc/extensions-functions.php:2119:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable' +./inc/extensions-functions.php:2172:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable' ./inc/extensions-functions.php:424: // @TODO This redirect is still needed to register sql_patches! Please try to avoid it ./inc/extensions-functions.php:440:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) ) ./inc/extensions-functions.php:580: // @TODO Extension is loaded, what next? ./inc/filter/bonus_filter.php:56: // @TODO This query isn't right, it will only update if the user was for a longer time away! ./inc/filter/cache_filter.php:94: // @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal. ./inc/filter/forced_filter.php:73: // @TODO This part is unfinished -./inc/filters.php:1314: // @TODO No banner found, output some default banner +./inc/filters.php:1320: // @TODO No banner found, output some default banner ./inc/functions.php:1102: // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ? ./inc/functions.php:1188: // @TODO Are these convertions still required? ./inc/functions.php:1209:// @TODO Rewrite this function to use readFromFile() and writeToFile() -./inc/functions.php:1814: // @TODO Find a way to cache this -./inc/functions.php:1919: // @TODO This is still very static, rewrite it somehow -./inc/functions.php:2123: // @TODO Rename column data_type to e.g. mail_status -./inc/functions.php:2473:// @TODO cacheFiles is not yet supported +./inc/functions.php:1817: // @TODO Find a way to cache this +./inc/functions.php:1922: // @TODO This is still very static, rewrite it somehow +./inc/functions.php:2126: // @TODO Rename column data_type to e.g. mail_status +./inc/functions.php:2476:// @TODO cacheFiles is not yet supported ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter ./inc/header.php:66:// @TODO Find a way to not use direct module comparison ./inc/install-functions.php:402: // @TODO Comparing with DEFAULT_MAIN_TITLE doesn't work ./inc/install-functions.php:97: // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0); -./inc/language/de.php:1141: // @TODO Rewrite these two constants -./inc/language/de.php:1157: // @TODO Rewrite these three constants +./inc/language/de.php:1147: // @TODO Rewrite these two constants +./inc/language/de.php:1163: // @TODO Rewrite these three constants ./inc/language/de.php:46: // @TODO Please sort these language elements -./inc/language/de.php:735:// @TODO Are these constants longer used? +./inc/language/de.php:741:// @TODO Are these constants longer used? ./inc/language-functions.php:255: // @TODO These are all valid languages, again hard-coded ./inc/language-functions.php:44:// @TODO Rewrite all language constants to this function. ./inc/language/install_de.php:140: // @TODO Move this to e.g. ext-smtp @@ -124,7 +124,7 @@ ./inc/modules/admin/what-admins_mails.php:58: // @TODO Can this be rewritten to an API function? ./inc/modules/admin/what-bonus.php:46:// @TODO Unused at the moment ./inc/modules/admin/what-config_mods.php:55: // @TODO This can be moved into mysql-function.php, see checkModulePermissions() function -./inc/modules/admin/what-config_points.php:130: // @TODO Rewrite these two lines for new user_points columns (e.g. locked_order_points) with a filter +./inc/modules/admin/what-config_points.php:90: // @TODO Rewrite these two lines for new user_points columns (e.g. locked_order_points) with a filter ./inc/modules/admin/what-config_rallye_prices.php:222: // @TODO Rewrite these two constants ./inc/modules/admin/what-config_register.php:75: // @TODO Move this HTML code into a template ./inc/modules/admin/what-del_email.php:61: // @TODO Unused: cat_id, payment_id @@ -185,8 +185,8 @@ ./inc/mysql-manager.php:1464: // @TODO Rewrite this to a filter ./inc/mysql-manager.php:1770: // @TODO Rewrite this to a filter ./inc/mysql-manager.php:1967: // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided -./inc/mysql-manager.php:2079: // @TODO Used generic 'userid' here -./inc/mysql-manager.php:2300:// @TODO cacheFiles is not yet supported +./inc/mysql-manager.php:2090: // @TODO Used generic 'userid' here +./inc/mysql-manager.php:2311:// @TODO cacheFiles is not yet supported ./inc/mysql-manager.php:398: // @TODO Try to rewrite this to one or more functions ./inc/mysql-manager.php:44:// @TODO Can we cache this? ./inc/purge/purge-inact.php:55: // @TODO Rewrite these if() blocks to a filter @@ -202,7 +202,7 @@ ./inc/template-functions.php:288: // @TODO Remove these sanity checks if all is fine ./inc/template-functions.php:625:// @TODO $simple/$constants are deprecated ./inc/template-functions.php:723: // @TODO $userid is deprecated and should be removed from loadEmailTemplate() and replaced with $content[userid] in all templates -./inc/wrapper-functions.php:3006: // @TODO Find a way to not use direct module comparison +./inc/wrapper-functions.php:3008: // @TODO Find a way to not use direct module comparison ./inc/wrapper-functions.php:512:// @TODO Do some more sanity check here ./inc/xml-functions.php:240: // @TODO Handle characters ./mailid.php:102: // @TODO Rewrite this to a filter @@ -269,6 +269,7 @@ ./inc/sql_error.php:2:// @DEPRECATED ./inc/stats_bonus.php:2:// @DEPRECATED ./inc/template.php:2:// @DEPRECATED +./templates/de/html/admin/admin_add_reflevel.tpl:1: ./templates/de/html/admin/admin_add_reflvl.tpl:1: ./templates/de/html/admin/admin_add_shop_cat.tpl:1: ./templates/de/html/admin/admin_admins_contact_form.tpl:1: @@ -281,6 +282,8 @@ ./templates/de/html/admin/admin_config_reg_pro.tpl:1: ./templates/de/html/admin/admin_config_shop.tpl:1: ./templates/de/html/admin/admin_config_transfer_pro.tpl:1: +./templates/de/html/admin/admin_edit_reflevel_row.tpl:1: +./templates/de/html/admin/admin_edit_reflevel.tpl:1: ./templates/de/html/admin/admin_extensions_installed.tpl:1: ./templates/de/html/admin/admin_extensions_list.tpl:1: ./templates/de/html/admin/admin_extensions_search.tpl:1: @@ -290,6 +293,8 @@ ./templates/de/html/admin/admin_forum_edit_del.tpl:1: ./templates/de/html/admin/admin_forum_edit_forum.tpl:1: ./templates/de/html/admin/admin_holiday_task.tpl:1: +./templates/de/html/admin/admin_list_reflevel_row.tpl:1: +./templates/de/html/admin/admin_list_reflevel.tpl:1: ./templates/de/html/admin/admin_list_unconfirmed_header.tpl:1: ./templates/de/html/admin/admin_logout_sql_patches.tpl:1: ./templates/de/html/admin/admin_mods_footer_list.tpl:1: diff --git a/inc/callback-functions.php b/inc/callback-functions.php index ba91f20d62..d22e6ee36b 100644 --- a/inc/callback-functions.php +++ b/inc/callback-functions.php @@ -1362,5 +1362,12 @@ function doXmlCallbackFunctionExecute ($callbackName, $args, $columnIndex, $cont call_user_func_array($callbackName, $args); } +// For 'doing' add referral level, the column-index is required +function addXmlSpecialAdminAddDoReferralLevels () { + // So set it all here + $GLOBALS['__COLUMN_INDEX']['doXmlCallbackFunction'] = 'column'; + $GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction']['column_index'] = 'column'; +} + // [EOF] ?> diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index 20c046c163..c548359f71 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -41,10 +41,10 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.9.3'); +setThisExtensionVersion('0.9.5'); // Version history array (add more with , '0.0.1' and so on) -setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6', '0.8.7', '0.8.8', '0.8.9', '0.9.0', '0.9.1', '0.9.2', '0.9.3')); +setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4', '0.7.5', '0.7.6', '0.7.7', '0.7.8', '0.7.9', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6', '0.8.7', '0.8.8', '0.8.9', '0.9.0', '0.9.1', '0.9.2', '0.9.3', '0.9.4', '0.9.5')); // Keep this extension always active! setExtensionAlwaysActive('Y'); @@ -975,6 +975,20 @@ PRIMARY KEY (`server_name_id`) // Update notes (these will be set as task text!) setExtensionUpdateNotes("Bereinigung von verkehrten SERVER_NAME Einträgen hinzugefügt."); break; + + case '0.9.4': // SQL queries for v0.9.4 + addAdminMenuSql('setup', 'list_referral_levels', 'Referral-Ebenen', 'Erlaubt das Auflisten, hinzufügen, ändern und löschen von Referral-Ebenen. Seien Sie beim Löschen vorsichtig, da deren Id-Nummern zum Verknüpfen verwendet werden. Sollten Sie also eine Ebene löschen, in der Mitglieder {OPEN_CONFIG}POINTS{CLOSE_CONFIG} haben sollten, sind diese verloren.', 15); + + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("Auflisten (usw.) von Referral-Ebenen ausgelagert in eigenen Menüpunkt."); + break; + + case '0.9.5': // SQL queries for v0.9.5 + addExtensionChangeTableColumnSql('refdepths', 'percents', 'percents', 'FLOAT(8,5) UNSIGNED NOT NULL DEFAULT 0.00000'); + + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("Referral-Prozente dürfen nun auch 5 Stellen hinter dem Komma haben."); + break; } // END - switch break; diff --git a/inc/functions.php b/inc/functions.php index 91ef066820..5d255e12bf 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1344,6 +1344,9 @@ function handleExtraValues ($filterFunction, $value, $extraValue) { // Tries to determine if call-back functions and/or extra values shall be parsed function doHandleExtraValues ($filterFunctions, $extraValues, $key, $entries, $userIdColumn, $search, $id = NULL) { + // $search shall not be NULL + assert(!is_null($search)); + // Debug mode enabled? if (isDebugModeEnabled()) { // Debug message @@ -1351,7 +1354,7 @@ function doHandleExtraValues ($filterFunctions, $extraValues, $key, $entries, $u } // END - if // Send data through the filter function if found - if ($key == $userIdColumn[0]) { + if ($key === $userIdColumn[0]) { // Is the userid, we have to process it with convertZeroToNull() $entries = convertZeroToNull($entries); } elseif ((!empty($filterFunctions[$key])) && (isset($extraValues[$key]))) { diff --git a/inc/language/de.php b/inc/language/de.php index 60f0403bbd..6052f574a0 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -211,17 +211,27 @@ addMessages(array( 'CHOOSE_MORE_CATEGORIES' => "Bitte wählen Sie mehr Kategorien aus! Minimum ist: {?least_cats?}", 'ADMIN_CONFIG_REJECT_DOUBLE_EMAIL' => "Doppelt angemeldete Email-Adressen ablehnen?", 'ADMIN_EDIT_POINTS' => "Willkommensgutschrift und andere Festbeträge editieren", - 'ADMIN_EDIT_REFERRAL_DEPTHS' => "Referral-Ebenen editieren / löschen / hinzufügen", + + // Referral levels (admin/generic) 'ADMIN_ADD_NEW_REFERRAL_DEPTH_TITLE' => "Neue Referral-Ebene hinzufügen", + 'ADMIN_LIST_REFERRAL_LEVELS_TITLE' => "Auflisten von Referral-Ebenen", + 'ADMIN_EDIT_REFERRAL_DEPTHS_TITLE' => "Referral-Ebenen editieren", + 'ADMIN_DELETE_REFERRAL_DEPTHS_TITLE' => "Referral-Ebenen löschen", + 'ADMIN_REFERRA_LEVELS_NO_SELECTIONS' => "Sie haben keine Referral-Ebenen zum Editieren/Löschen ausgewählt.", 'ADMIN_ADD_DEPTH' => "Referral-Ebene hinzufügen", - 'ADMIN_ENTER_REFERRAL_LEVEL' => "Referral-Ebene eingeben", - 'ADMIN_ENTER_REFERRAL_PERCENTS' => "Prozentuale Vergütung", - 'ADMIN_EDIT_DELETE_REFERRAL_DEPTH_TITLE' => "Referral-Ebenen editieren / löschen", - 'REFERRAL_LEVEL' => "Referral-Ebene", - 'REFERRAL_LEVEL_PERCENTS' => "Referral-Ebene (%)", - 'REFERRAL_PERCENT' => "Prozentuale Vergütung", - 'ADMIN_EDIT_LEVEL' => "Ref-Ebene editieren", - 'ADMIN_DELETE_LEVEL' => "Ref-Ebene löschen", + 'ADMIN_EDIT_REFERRAL_DEPTHS' => "Referral-Ebenen editieren / löschen / hinzufügen", + 'ADMIN_REFERRAL_DEPTHS_ID' => "Ref-Level id", + 'ADMIN_ENTER_REFERRAL_LEVEL' => "Referral-Ebene eingeben:", + 'ADMIN_ENTER_REFERRAL_PERCENTS' => "Prozentuale Vergütung:", + 'REFERRAL_LEVEL' => "Referral-Ebene:", + 'REFERRAL_PERCENTS' => "Prozentuale Vergütung:", + 'MEMBER_REFERRAL_LEVEL_PERCENTS' => "Referral-Ebene (%):", + 'ADMIN_EDIT_REFDEPTHS_SUBJECT' => "Referral-Ebene geändert", + 'ADMIN_ADD_REFDEPTHS_SUBJECT' => "Referral-Ebene hinzugefügt", + 'ADMIN_EDIT_LEVEL_SUBMIT' => "Ref-Ebene editieren", + 'ADMIN_DELETE_LEVEL_SUBMIT' => "Ref-Ebene löschen", + 'ADMIN_CHANGE_REFERRAL_DEPTHS_SUBMIT' => "Referral-Ebenen ändern", + 'GUEST_SURNAME' => "Vorname", 'GUEST_FAMILY' => "Nachname", 'GUEST_STREET_NR' => "Straße und Hausnummer", @@ -529,10 +539,6 @@ addMessages(array( 'ADMIN_REMOVE_MAX_RECEIVE' => "Maximal-Werte löschen", 'ADMIN_MAX_RECEIVE_SAVED' => "Maximal-Werte gespeichert...", 'ADMIN_MAX_RECEIVE_DELETED' => "Maximal-Werte gelöscht...", - 'ADMIN_EDIT_REFERRAL_DEPTHS_TITLE' => "Referral-Ebenen editieren", - 'ADMIN_DELETE_REFERRAL_DEPTHS_TITLE' => "Referral-Ebenen löschen", - 'ADMIN_CHANGE_REFERRAL_DEPTHS' => "Referral-Ebenen ändern", - 'ADMIN_REFERRAL_DEPTHS_ID' => "Ref-Level id", 'ADMIN_CHANGE_REF' => "Ändern", 'ADMIN_REFERRAL_DEPTHS_SAVED' => "Referral-Ebenen gespeichert...", 'ADMIN_REFERRAL_DEPTHS_DELETED' => "Referral-Ebenen gelöscht...", @@ -1265,7 +1271,7 @@ addMessages(array( // Admin - List referrals 'ADMIN_LIST_USER_NO_REFERRALS' => "Das Mitglied %s hat in dieser Referral-Ebene keine Mitglieder geworben.", - 'ADMIN_NO_REFERRAL_LEVELS' => "In Ihrem {?mt_word?} sind keine Referral-Ebenen eingerichtet! Ihre Mitglieder erhalten keine {?POINTS?} gutgeschrieben. Richten Sie mindestens Referral-Ebene 0 mit 100% Vergütung ein.", + 'ADMIN_REFERRAL_LEVELS_404' => "In Ihrem {?mt_word?} sind keine Referral-Ebenen eingerichtet! Ihre Mitglieder erhalten keine {?POINTS?} gutgeschrieben. Richten Sie mindestens Referral-Ebene 0 mit 100% Vergütung ein.", 'ADMIN_LIST_USER_NODATA' => "Das Mitglied %s wurde bereits gelöscht.", // Footer navigation (e.g. installer) diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php index b50f23eb2c..036d3e9c4a 100644 --- a/inc/modules/admin/what-config_points.php +++ b/inc/modules/admin/what-config_points.php @@ -55,61 +55,21 @@ if (isGetRequestElementSet('sub')) { unsetPostRequestElement('ok'); } // END - if break; - - case 'ref': - if (isGetRequestElementSet('do')) { - if (((!isPostRequestElementSet('level')) || (!isPostRequestElementSet('percents'))) && (getRequestElement('do') == 'add')) { - unsetPostRequestElement('ok'); - } - } - break; } // END - switch } else { // Display overview setGetRequestElement('sub', 'overview'); } -if (isFormSent()) { +// Is a form sent? +if ((isFormSent('do_delete')) || (isFormSent('do_edit')) || (isFormSent('do_add'))) { + // Init SQLs initSqls(); switch (getRequestElement('sub')) { case 'points': adminSaveSettingsFromPostData(); break; - case 'ref': - switch (getRequestElement('do')) { - case 'add': - addSql("INSERT INTO `{?_MYSQL_PREFIX?}_refdepths` (`level`, `percents`) VALUES ('".bigintval(postRequestElement('level'))."','".bigintval(postRequestElement('percents'))."')"); - break; - - case 'edit': // Change entries - foreach (postRequestElement('level') as $id => $value) { - // Secure id - $id = bigintval($id); - - // Revert german commata - setPostRequestElement('percents', array($id => convertCommaToDot(postRequestElement('percents', $id)))); - - // Update entry - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refdepths` SET `level`=%s,`percents`=%s WHERE `id`=%s LIMIT 1", - array(bigintval($value), convertCommaToDot(postRequestElement('percents', $id)), $id), __FILE__, __LINE__); - } // END - foreach - $message = '{--ADMIN_REFERRAL_DEPTHS_SAVED--}'; - break; - - case 'delete': - foreach (postRequestElement('id') as $id => $value) { - SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1", - array(bigintval($id)), __FILE__, __LINE__); - } // END - foreach - $message = '{--ADMIN_REFERRAL_DEPTHS_DELETED--}'; - break; - } // END - switch - - // Update cache file - rebuildCache('refdepths', 'refdepths'); - break; - case 'settings': $REF = bigintval(postRequestElement('ref_payout')); updateConfiguration( @@ -170,61 +130,6 @@ WHERE // Load template loadTemplate('admin_config_point_settings', FALSE, $content); -} elseif (getRequestElement('sub') == 'ref') { - // 12 3 32 2 3321 - if ((isFormSent('delete')) && (ifPostContainsSelections())) { - // Delete entries - $OUT = ''; - foreach (postRequestElement('sel') as $id => $value) { - $result = SQL_QUERY_ESC("SELECT `id`, `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1", - array(bigintval($id)), __FILE__, __LINE__); - $content = SQL_FETCHARRAY($result); - SQL_FREERESULT($result); - - // Load row template and switch color - $OUT .= loadTemplate('admin_delete_reflevel_row', TRUE, $content); - } // END - foreach - - // Load main template - loadTemplate('admin_delete_reflevel', FALSE, $OUT); - } elseif ((isFormSent('edit')) && (ifPostContainsSelections())) { - // Edit entries - $OUT = ''; - foreach (postRequestElement('sel') as $id => $value) { - $result = SQL_QUERY_ESC("SELECT `id`, `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1", - array(bigintval($id)), __FILE__, __LINE__); - $content = SQL_FETCHARRAY($result); - SQL_FREERESULT($result); - - // Load row template and switch color - $OUT .= loadTemplate('admin_edit_reflevel_row', TRUE, $content); - } // END - foreach - - // Load main template - loadTemplate('admin_edit_reflevel', FALSE, $OUT); - } else { - // Referral levels - $result = SQL_QUERY("SELECT `id`, `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY `level` ASC", __FILE__, __LINE__); - if (!SQL_HASZERONUMS($result)) { - // Make referral levels editable and deletable - $OUT = ''; - - // List already existing categories for editing - while ($content = SQL_FETCHARRAY($result)) { - // Load row template and switch color - $OUT .= loadTemplate('admin_list_reflevel_row', TRUE, $content); - } // END - while - - // Free memory - SQL_FREERESULT($result); - - // Load main template - loadTemplate('admin_list_reflevel', FALSE, $OUT); - } - - // Form for adding new referral levels - loadTemplate('admin_add_reflevel'); - } } elseif (getRequestElement('sub') == 'points') { // Load template loadTemplate('admin_config_sub_points'); diff --git a/inc/modules/admin/what-list_referral_levels.php b/inc/modules/admin/what-list_referral_levels.php new file mode 100644 index 0000000000..8f0f9e0968 --- /dev/null +++ b/inc/modules/admin/what-list_referral_levels.php @@ -0,0 +1,95 @@ + 0) && (!ifPostContainsSelections('id'))) { + // Not found so output message + displayMessage('{--ADMIN_REFERRA_LEVELS_NO_SELECTIONS--}'); + + // Abort here + return; +} // END - if + +// Add/edit or delete button hit? +if (isFormSent('add')) { + // Add it + doGenericXmlTemplateCallback('admin_add_do_referral_levels'); +} elseif (isFormSent('edit')) { + // Show entries for editing + doGenericXmlTemplateCallback('admin_edit_show_referral_levels'); + + // Do not show the list of URLs after this template + $show = FALSE; +} elseif (isFormSent('do_edit')) { + // Change data of entries + doGenericXmlTemplateCallback('admin_edit_do_referral_levels'); +} elseif (isFormSent('delete')) { + // Show entries for deletion + doGenericXmlTemplateCallback('admin_delete_show_referral_levels'); + + // Do not show the list of URLs after this template + $show = FALSE; +} elseif (isFormSent('do_delete')) { + // Remove entries from database + doGenericXmlTemplateCallback('admin_delete_do_referral_levels'); +} + +// Show entries? +if ($show === FALSE) { + // No, a form has already been show + return FALSE; +} // END - if + +// List all referral_levels +doGenericXmlTemplateCallback('admin_list_referral_levels'); + +// Form for adding new referral levels +loadTemplate('admin_add_referral_level'); + +// [EOF] +?> diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index ace74be26f..679d415d40 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -2026,7 +2026,7 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions = // Is columnIndex set? if (!is_null($columnIndex)) { // Check conditions - //* DEBUG: */ die('columnIndex=
'.print_r($columnIndex,TRUE).'
'.debug_get_printable_backtrace()); + //* DEBUG: */ die('columnName=
'.print_r($columnName,TRUE).'
columnIndex=
'.print_r($columnIndex,TRUE).'
'.debug_get_printable_backtrace()); assert((is_array($columnName)) && (is_string($columnIndex)) && (isset($columnName[$columnIndex]))); // Then use that index "blindly" @@ -2040,11 +2040,22 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions = $sqlColumns[$key] = SQL_ESCAPE($columnName); $sqlValues[$key] = SQL_ESCAPE(postRequestElement($columnName)); + // Search for it + $search = key(search_array($columns, 'column', $columnName)); + // Try to handle call-back functions and/or extra values on the list - $sqlValues[$key] = doHandleExtraValues($filterFunctions, $extraValues, $key . '_list', $sqlValues[$key], $userIdColumn, key(search_array($columns, 'column', $key))); + //* DEBUG: */ outputHtml($key . '/' . $columnName . '=
'.print_r($columns,true).'
search_array()=
'.print_r(search_array($columns, 'column', $columnName), true).'
'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '(' . gettype($key) . ')][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - BEFORE!'); + if (is_string($key)) { + // Key is a string + $sqlValues[$key] = doHandleExtraValues($filterFunctions, $extraValues, $key . '_list', $sqlValues[$key], array(''), $search); + } else { + // Is a number + $sqlValues[$key] = doHandleExtraValues($filterFunctions, $extraValues, $key, $sqlValues[$key], array(''), $search); + } // Is the value not a number? - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key]); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlValues[' . $key . '(' . gettype($key) . ')][' . gettype($sqlValues[$key]) . ']=' . $sqlValues[$key] . ' - AFTER!'); if (($sqlValues[$key] != 'NULL') && (is_string($sqlValues[$key]))) { // Add quotes around it $sqlValues[$key] = chr(39) . $sqlValues[$key] . chr(39); diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index 2e401e4bc5..2e500b1617 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -2865,18 +2865,20 @@ function search_array ($array, $key, $value, $parentIndex = NULL) { if (is_array($array)) { // Search for whole array foreach ($array as $idx => $dummy) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',value=' . $value . ',idx=' . $idx); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',value=' . $value . ',idx=' . $idx . ',parentIndex[' . gettype($parentIndex) . ']=' . $parentIndex); + //* DEBUG: */ print 'idx=' . $idx . ',parentIndex[' . gettype($parentIndex) . ']=' . $parentIndex . ',key=' . $key . ',value=' . $value . ',array=
'.print_r($array, TRUE).'
'; // Is dummy an array? - if (is_array($dummy)) { + if ((is_array($dummy)) && ((is_null($parentIndex)) || ($parentIndex === $value))) { // Then search again $subResult = search_array($dummy, $key, $value, $idx); //* DEBUG: */ print 'subResult=
' . print_r($subResult, TRUE).'
'; // And merge both $results = merge_array($results, $subResult, TRUE); - } elseif ((isset($array[$key])) && ($array[$key] == $value)) { + } elseif (($key == $idx) && (isset($array[$key])) && ($array[$key] === $value)) { // Is found, so add it $results[$parentIndex] = $array; + //* DEBUG: */ print 'ARRAY: key=' . $key . ',idx=' . $idx . ',value=' . $value . ',parentIndex[' . gettype($parentIndex) . ']=' . $parentIndex . ',array=
' . print_r($array, TRUE).'
'; } } // END - foreach } // END - if diff --git a/templates/de/emails/admin/admin_add_refdepths.tpl b/templates/de/emails/admin/admin_add_refdepths.tpl new file mode 100644 index 0000000000..408547a357 --- /dev/null +++ b/templates/de/emails/admin/admin_add_refdepths.tpl @@ -0,0 +1,17 @@ +Hallo Administrator, + +es wurde soeben eine neue Referral-Ebene hinzugefügt. + +Hier sind alle Daten dazu: +------------------------------------------ +{--ID_SELECT--} $content[id] +------------------------------------------ +{--REFERRAL_LEVEL--} {%pipe,translateComma=$content[level]%} +------------------------------------------ +{--REFERRAL_PERCENTS--} {%pipe,translateComma=$content[percents]%}% +------------------------------------------ + +Mit freundlichen Grüßen, + Ihr {?MAIN_TITLE?} Script + +{?URL?}/admin.php diff --git a/templates/de/emails/admin/admin_edit_refdepths.tpl b/templates/de/emails/admin/admin_edit_refdepths.tpl new file mode 100644 index 0000000000..231851cdbf --- /dev/null +++ b/templates/de/emails/admin/admin_edit_refdepths.tpl @@ -0,0 +1,17 @@ +Hallo Administrator, + +es wurde soeben eine Referral-Ebene geändert. + +Hier sind alle Daten dazu: +------------------------------------------ +{--ID_SELECT--} $content[id] +------------------------------------------ +{--REFERRAL_LEVEL--} {%pipe,translateComma=$content[level]%} +------------------------------------------ +{--REFERRAL_PERCENTS--} {%pipe,translateComma=$content[percents]%}% +------------------------------------------ + +Mit freundlichen Grüßen, + Ihr {?MAIN_TITLE?} Script + +{?URL?}/admin.php diff --git a/templates/de/html/admin/admin_add_referral_level.tpl b/templates/de/html/admin/admin_add_referral_level.tpl new file mode 100644 index 0000000000..b1eff25589 --- /dev/null +++ b/templates/de/html/admin/admin_add_referral_level.tpl @@ -0,0 +1,32 @@ +
+{%form,formMethodPost=modules.php?module=admin&what=list_referral_levels&do=do_add%} + + + + + + + + + + + + + + + + + + +
+ {--ADMIN_ADD_NEW_REFERRAL_DEPTH_TITLE--} +
{--ADMIN_ENTER_REFERRAL_LEVEL--} + +
{--ADMIN_ENTER_REFERRAL_PERCENTS--} + % +
+ + +
+{%form_close%} +
diff --git a/templates/de/html/admin/admin_add_reflevel.tpl b/templates/de/html/admin/admin_add_reflevel.tpl index 4d3fcceb6a..11f5d85d80 100644 --- a/templates/de/html/admin/admin_add_reflevel.tpl +++ b/templates/de/html/admin/admin_add_reflevel.tpl @@ -1,29 +1 @@ -
-{%form,formMethodPost=modules.php?module=admin&what=config_points&sub=ref&do=add%} - - - - - - - - - - - - - - - -
- {--ADMIN_ADD_NEW_REFERRAL_DEPTH_TITLE--} -
{--ADMIN_ENTER_REFERRAL_LEVEL--}: - -
{--ADMIN_ENTER_REFERRAL_PERCENTS--}: - % -
- - -
-{%form_close%} -
+ diff --git a/templates/de/html/admin/admin_admins_mails_list.tpl b/templates/de/html/admin/admin_admins_mails_list.tpl index 1bd75e7724..f533137a67 100644 --- a/templates/de/html/admin/admin_admins_mails_list.tpl +++ b/templates/de/html/admin/admin_admins_mails_list.tpl @@ -7,7 +7,7 @@ - + {--ID_SELECT--} diff --git a/templates/de/html/admin/admin_config_payouts.tpl b/templates/de/html/admin/admin_config_payouts.tpl index 7a5512a831..0dc3cbbe42 100644 --- a/templates/de/html/admin/admin_config_payouts.tpl +++ b/templates/de/html/admin/admin_config_payouts.tpl @@ -1,25 +1,28 @@
{%form,formMethodPost=modules.php?module=admin&what=config_payouts%} - - - - - - - - - - - $content - - - + + + + + + + + + + + + +$content + + + +
- {--ADMIN_PAYOUT_EDIT_DELETE_TITLE--}
{--ID_SELECT--}{--ADMIN_PAYOUT_FROM--}{--ADMIN_PAYOUT_TITLE--}{--ADMIN_PAYOUT_RATE2--}{--ADMIN_PAYOUT_MIN_POINTS2--}
- - - -
+ {--ADMIN_PAYOUT_EDIT_DELETE_TITLE--}
{--ID_SELECT--}{--ADMIN_PAYOUT_FROM--}{--ADMIN_PAYOUT_TITLE--}{--ADMIN_PAYOUT_RATE2--}{--ADMIN_PAYOUT_MIN_POINTS2--}
+ + + +
{%form_close%}
diff --git a/templates/de/html/admin/admin_config_points.tpl b/templates/de/html/admin/admin_config_points.tpl index a113f04b70..90654df357 100644 --- a/templates/de/html/admin/admin_config_points.tpl +++ b/templates/de/html/admin/admin_config_points.tpl @@ -9,10 +9,6 @@ · {--ADMIN_EDIT_POINTS--} -
- · {--ADMIN_EDIT_REFERRAL_DEPTHS--} -
-
· {--ADMIN_EDIT_POINT_SETTINGS--}
diff --git a/templates/de/html/admin/admin_del_bank_packages.tpl b/templates/de/html/admin/admin_del_bank_packages.tpl index c1b3ab5324..6555fa184c 100644 --- a/templates/de/html/admin/admin_del_bank_packages.tpl +++ b/templates/de/html/admin/admin_del_bank_packages.tpl @@ -7,10 +7,10 @@ - {--ID_SELECT--} - {--ADMIN_LIST_BANK_PACKAGES_TITLE--}: + {--ID_SELECT--} + {--ADMIN_LIST_BANK_PACKAGES_TITLE--}: {--ADMIN_LIST_BANK_PACKAGES_DESCR--}: - {--ADMIN_LIST_BANK_PACKAGES_ACCOUNT_FEE--} + {--ADMIN_LIST_BANK_PACKAGES_ACCOUNT_FEE--} $content diff --git a/templates/de/html/admin/admin_delete_admins.tpl b/templates/de/html/admin/admin_delete_admins.tpl index 3162be774e..9dc905af50 100644 --- a/templates/de/html/admin/admin_delete_admins.tpl +++ b/templates/de/html/admin/admin_delete_admins.tpl @@ -7,9 +7,9 @@ - {--ID_SELECT--} - {--ADMIN_ADMINS_CONTACT--}: - {--ADMIN_ADMINS_EMAIL--}: + {--ID_SELECT--} + {--ADMIN_ADMINS_CONTACT--}: + {--ADMIN_ADMINS_EMAIL--}: {--ADMIN_ADMINS_ACCESS_MODE--}: {--ADMIN_LA_MODE--}: diff --git a/templates/de/html/admin/admin_delete_email_bonus.tpl b/templates/de/html/admin/admin_delete_email_bonus.tpl index 10944f4822..5a3b95c798 100644 --- a/templates/de/html/admin/admin_delete_email_bonus.tpl +++ b/templates/de/html/admin/admin_delete_email_bonus.tpl @@ -1,25 +1,27 @@
- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + +
- {--ADMIN_EMAIL_DELETED--} -
{--ID_SELECT--}{--EMAIL_SUBJECT--}{--EMAIL_URL--}{--EMAIL_TIMESTAMP--}{--EMAIL_DELETE_COUNT--}
$content[id]$content[subject] - {%template,DereferrerUrl=$content[url]%} - $content[timestamp]$content[count]
+ {--ADMIN_EMAIL_DELETED--} +
{--ID_SELECT--}{--EMAIL_SUBJECT--}{--EMAIL_URL--}{--EMAIL_TIMESTAMP--}{--EMAIL_DELETE_COUNT--}
$content[id]$content[subject] + {%template,DereferrerUrl=$content[url]%} + $content[timestamp]$content[count]
diff --git a/templates/de/html/admin/admin_delete_email_normal.tpl b/templates/de/html/admin/admin_delete_email_normal.tpl index dc3cad1cd5..fa23961030 100644 --- a/templates/de/html/admin/admin_delete_email_normal.tpl +++ b/templates/de/html/admin/admin_delete_email_normal.tpl @@ -1,25 +1,27 @@
- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + +
- {--ADMIN_EMAIL_DELETED--} -
{--ID_SELECT--}{--EMAIL_SENDER--}{--EMAIL_SUBJECT--}{--EMAIL_URL--}{--EMAIL_TIMESTAMP--}
$content[id]{%pipe,generateUserProfileLink=$content[sender]%}$content[subject] - {%template,DereferrerUrl=$content[url]%} - $content[timestamp]
+ {--ADMIN_EMAIL_DELETED--} +
{--ID_SELECT--}{--EMAIL_SENDER--}{--EMAIL_SUBJECT--}{--EMAIL_URL--}{--EMAIL_TIMESTAMP--}
$content[id]{%pipe,generateUserProfileLink=$content[sender]%}$content[subject] + {%template,DereferrerUrl=$content[url]%} + $content[timestamp]
diff --git a/templates/de/html/admin/admin_delete_email_notify.tpl b/templates/de/html/admin/admin_delete_email_notify.tpl index bb3ba3be0a..259ea54959 100644 --- a/templates/de/html/admin/admin_delete_email_notify.tpl +++ b/templates/de/html/admin/admin_delete_email_notify.tpl @@ -1,23 +1,25 @@
- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + +
- {--ADMIN_NOTIFICATION_DELETED_TITLE--} -
{--ID_SELECT--}{--EMAIL_SUBJECT--}{--EMAIL_URL--}{--EMAIL_TIMESTAMP--}{--EMAIL_DELETE_COUNT--}
$content[id]$content[subject]{%template,DereferrerUrl=$content[url]%}$content[timestamp]$content[count]
+ {--ADMIN_NOTIFICATION_DELETED_TITLE--} +
{--ID_SELECT--}{--EMAIL_SUBJECT--}{--EMAIL_URL--}{--EMAIL_TIMESTAMP--}{--EMAIL_DELETE_COUNT--}
$content[id]$content[subject]{%template,DereferrerUrl=$content[url]%}$content[timestamp]$content[count]
diff --git a/templates/de/html/admin/admin_delete_extensions.tpl b/templates/de/html/admin/admin_delete_extensions.tpl index 3516081211..999f881b6b 100644 --- a/templates/de/html/admin/admin_delete_extensions.tpl +++ b/templates/de/html/admin/admin_delete_extensions.tpl @@ -1,22 +1,25 @@
{%form,formMethodPost=modules.php?module=admin&what=extensions%} - - - - - - - - - $content - - - + + + + + + + + + + +$content + + + +
- {--ADMIN_REMOVING_THESE_EXTENSIONS--} -
{--ID_SELECT--}{--ADMIN_EXTENSION_NAME--}{--ADMIN_EXTENSION_VERSION--}
- -
+ {--ADMIN_REMOVING_THESE_EXTENSIONS--} +
{--ID_SELECT--}{--ADMIN_EXTENSION_NAME--}{--ADMIN_EXTENSION_VERSION--}
+ +
{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_rallye_prices.tpl b/templates/de/html/admin/admin_delete_rallye_prices.tpl index 500951103e..65f75f09b9 100644 --- a/templates/de/html/admin/admin_delete_rallye_prices.tpl +++ b/templates/de/html/admin/admin_delete_rallye_prices.tpl @@ -1,31 +1,34 @@
{%form,formMethodPost=modules.php?module=admin&what=config_rallye_prices&rallye_id=$content[rallye_id]%} - - - - - - - - - - $content[rows] - - - + + + + + + + + + + + +$content[rows] + + + +
- {--ADMIN_DELETE_RALLYE_PRICES_TITLE--} -
- {--ID_SELECT--} - - {--RALLYE_LEVEL--}: - - {--ADMIN_RALLYE_PRICE_POINTS--}: - - {--ADMIN_RALLYE_PRICE_INFO--}: -
- -
+ {--ADMIN_DELETE_RALLYE_PRICES_TITLE--} +
+ {--ID_SELECT--} + + {--RALLYE_LEVEL--}: + + {--ADMIN_RALLYE_PRICE_POINTS--}: + + {--ADMIN_RALLYE_PRICE_INFO--}: +
+ +
{%form_close%}
diff --git a/templates/de/html/admin/admin_delete_reflevel.tpl b/templates/de/html/admin/admin_delete_reflevel.tpl index 237f3e7fc6..79b4aa2d64 100644 --- a/templates/de/html/admin/admin_delete_reflevel.tpl +++ b/templates/de/html/admin/admin_delete_reflevel.tpl @@ -1,5 +1,5 @@
-{%form,formMethodPost=modules.php?module=admin&what=config_points&sub=ref&do=del%} +{%form,formMethodPost=modules.php?module=admin&what=list_referral_level&do=del%}
@@ -9,7 +9,7 @@ $content
- +
diff --git a/templates/de/html/admin/admin_delete_user_subids.tpl b/templates/de/html/admin/admin_delete_user_subids.tpl index 85426228cb..c5dab349cb 100644 --- a/templates/de/html/admin/admin_delete_user_subids.tpl +++ b/templates/de/html/admin/admin_delete_user_subids.tpl @@ -6,12 +6,15 @@ {--ADMIN_DELETE_USER_SUBID_TITLE--} + - {--ID_SELECT--} + {--ID_SELECT--} {--SUBID_VALUE--} {--SUBID_ADDED--} + $content[rows] + diff --git a/templates/de/html/admin/admin_edit_admins.tpl b/templates/de/html/admin/admin_edit_admins.tpl index 6e6a943e6b..396c9e8736 100644 --- a/templates/de/html/admin/admin_edit_admins.tpl +++ b/templates/de/html/admin/admin_edit_admins.tpl @@ -7,9 +7,9 @@ - {--ID_SELECT--} - {--ADMIN_ADMINS_CONTACT--}: - {--ADMIN_ADMINS_EMAIL--}: + {--ID_SELECT--} + {--ADMIN_ADMINS_CONTACT--}: + {--ADMIN_ADMINS_EMAIL--}: {--ADMIN_ADMINS_PASSWORD--}: {--ADMIN_ADMINS_ACCESS_MODE--}: {--ADMIN_LA_MODE--}: diff --git a/templates/de/html/admin/admin_edit_admins_acls.tpl b/templates/de/html/admin/admin_edit_admins_acls.tpl index 497e0f4423..142f84abc1 100644 --- a/templates/de/html/admin/admin_edit_admins_acls.tpl +++ b/templates/de/html/admin/admin_edit_admins_acls.tpl @@ -1,25 +1,28 @@
{%form,formMethodPost=modules.php?module=admin&what=list_admins_acls%} - - - - - - - - - - - $content - - - + + + + + + + + + + + + +$content + + + +
- {--ADMIN_ADMINS_EDIT_ACLS_TITLE--}: -
{--ID_SELECT--}{--ADMIN_ADMINS_LOGIN_ID--}:{--ADMIN_MENU_ACTION--}:{--ADMIN_MENU_WHAT--}:{--ADMIN_ADMINS_ACCESS_MODE--}:
- - -
+ {--ADMIN_ADMINS_EDIT_ACLS_TITLE--}: +
{--ID_SELECT--}{--ADMIN_ADMINS_LOGIN_ID--}:{--ADMIN_MENU_ACTION--}:{--ADMIN_MENU_WHAT--}:{--ADMIN_ADMINS_ACCESS_MODE--}:
+ + +
{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_payouts.tpl b/templates/de/html/admin/admin_edit_payouts.tpl index 7e51ccb915..255cb5baa9 100644 --- a/templates/de/html/admin/admin_edit_payouts.tpl +++ b/templates/de/html/admin/admin_edit_payouts.tpl @@ -1,25 +1,28 @@
{%form,formMethodPost=modules.php?module=admin&what=config_payouts%} - - - - - - - - - - - $content - - - + + + + + + + + + + + + +$content + + + +
- {--ADMIN_PAYOUT_EDIT_TITLE--} -
{--ID_SELECT--}{--ADMIN_PAYOUT_TITLE--}{--ADMIN_PAYOUT_RATE2--}{--ADMIN_PAYOUT_MIN_POINTS2--}{--ADMIN_PAYOUT_ALLOW_URLS--}
- - -
+ {--ADMIN_PAYOUT_EDIT_TITLE--} +
{--ID_SELECT--}{--ADMIN_PAYOUT_TITLE--}{--ADMIN_PAYOUT_RATE2--}{--ADMIN_PAYOUT_MIN_POINTS2--}{--ADMIN_PAYOUT_ALLOW_URLS--}
+ + +
{%form_close%}
diff --git a/templates/de/html/admin/admin_edit_refdepths.tpl b/templates/de/html/admin/admin_edit_refdepths.tpl new file mode 100644 index 0000000000..e8e856549b --- /dev/null +++ b/templates/de/html/admin/admin_edit_refdepths.tpl @@ -0,0 +1,18 @@ +
+{%form,formMethodPost=modules.php?module=admin&what=list_referral_levels&do=edit%} + + + + + $content + + + +
+ {--ADMIN_EDIT_REFERRAL_DEPTHS_TITLE--}: +
+ + +
+{%form_close%} +
diff --git a/templates/de/html/admin/admin_edit_refdepths_row.tpl b/templates/de/html/admin/admin_edit_refdepths_row.tpl new file mode 100644 index 0000000000..0b5c98cfe5 --- /dev/null +++ b/templates/de/html/admin/admin_edit_refdepths_row.tpl @@ -0,0 +1,20 @@ + + + {--ADMIN_REFERRAL_DEPTHS_ID--} $content[id]: + + + + + + {--REFERRAL_LEVEL--} + + + + + + + {--REFERRAL_PERCENTS--} + + % + + diff --git a/templates/de/html/admin/admin_edit_reflevel.tpl b/templates/de/html/admin/admin_edit_reflevel.tpl index 21384def7b..11f5d85d80 100644 --- a/templates/de/html/admin/admin_edit_reflevel.tpl +++ b/templates/de/html/admin/admin_edit_reflevel.tpl @@ -1,18 +1 @@ -
-{%form,formMethodPost=modules.php?module=admin&what=config_points&sub=ref&do=edit%} - - - - - $content - - - -
- {--ADMIN_EDIT_REFERRAL_DEPTHS_TITLE--}: -
- - -
-{%form_close%} -
+ diff --git a/templates/de/html/admin/admin_edit_reflevel_row.tpl b/templates/de/html/admin/admin_edit_reflevel_row.tpl index bf1d6885e2..11f5d85d80 100644 --- a/templates/de/html/admin/admin_edit_reflevel_row.tpl +++ b/templates/de/html/admin/admin_edit_reflevel_row.tpl @@ -1,19 +1 @@ - - - {--ADMIN_REFERRAL_DEPTHS_ID--} $content[id]: - - - - - {--REFERRAL_LEVEL--}:  - - - - - - - {--REFERRAL_PERCENT--}:  - - % - - + diff --git a/templates/de/html/admin/admin_edit_user_subids.tpl b/templates/de/html/admin/admin_edit_user_subids.tpl index 43c4e57f96..e52195c4f2 100644 --- a/templates/de/html/admin/admin_edit_user_subids.tpl +++ b/templates/de/html/admin/admin_edit_user_subids.tpl @@ -7,7 +7,7 @@ - {--ID_SELECT--} + {--ID_SELECT--} {--SUBID_VALUE--} {--SUBID_ADDED--} diff --git a/templates/de/html/admin/admin_list_admins.tpl b/templates/de/html/admin/admin_list_admins.tpl index 4c59a95481..87fa8b51b2 100644 --- a/templates/de/html/admin/admin_list_admins.tpl +++ b/templates/de/html/admin/admin_list_admins.tpl @@ -7,10 +7,10 @@ - {--ID_SELECT--} - {--ADMIN_ADMINS_CONTACT--}: + {--ID_SELECT--} + {--ADMIN_ADMINS_CONTACT--}: {--ADMIN_ADMINS_EMAIL--}: - {--ADMIN_ADMINS_ACCESS_MODE--}: + {--ADMIN_ADMINS_ACCESS_MODE--}: {--ADMIN_LA_MODE--}: $content diff --git a/templates/de/html/admin/admin_list_admins_acls.tpl b/templates/de/html/admin/admin_list_admins_acls.tpl index 4c7007ff99..a0e179dbc5 100644 --- a/templates/de/html/admin/admin_list_admins_acls.tpl +++ b/templates/de/html/admin/admin_list_admins_acls.tpl @@ -1,26 +1,29 @@
{%form,formMethodPost=modules.php?module=admin&what=list_admins_acls%} - - - - - - - - - - - $content - - - + + + + + + + + + + + + +$content + + + +
- {--ADMIN_ADMINS_LIST_ACLS--}: -
{--ID_SELECT--}{--ADMIN_ADMINS_LOGIN_ID--}:{--ADMIN_MENU_ACTION--}:{--ADMIN_MENU_WHAT--}:{--ADMIN_ADMINS_ACCESS_MODE--}:
- - - -
+ {--ADMIN_ADMINS_LIST_ACLS--}: +
{--ID_SELECT--}{--ADMIN_ADMINS_LOGIN_ID--}:{--ADMIN_MENU_ACTION--}:{--ADMIN_MENU_WHAT--}:{--ADMIN_ADMINS_ACCESS_MODE--}:
+ + + +
{%form_close%}
diff --git a/templates/de/html/admin/admin_list_bank_package.tpl b/templates/de/html/admin/admin_list_bank_package.tpl index e32822e7b7..147cfb78c8 100644 --- a/templates/de/html/admin/admin_list_bank_package.tpl +++ b/templates/de/html/admin/admin_list_bank_package.tpl @@ -7,10 +7,10 @@ - {--ID_SELECT--} + {--ID_SELECT--} {--ADMIN_LIST_BANK_PACKAGES_TITLE--}: - {--ADMIN_LIST_BANK_PACKAGES_DESCR--}: - {--ADMIN_LIST_BANK_PACKAGES_ACCOUNT_FEE--} + {--ADMIN_LIST_BANK_PACKAGES_DESCR--}: + {--ADMIN_LIST_BANK_PACKAGES_ACCOUNT_FEE--} {--ADMIN_LIST_BANK_PACKAGES_ACCOUNT_INTEREST_PLUS--} {--ADMIN_LIST_BANK_PACKAGES_ACCOUNT_INTEREST_MINUS--} {--ADMIN_LIST_BANK_PACKAGES_STATUS--} diff --git a/templates/de/html/admin/admin_list_booking.tpl b/templates/de/html/admin/admin_list_booking.tpl index ff38ce325f..05f0fce922 100644 --- a/templates/de/html/admin/admin_list_booking.tpl +++ b/templates/de/html/admin/admin_list_booking.tpl @@ -7,7 +7,7 @@ - + {--ID_SELECT--} diff --git a/templates/de/html/admin/admin_list_cats.tpl b/templates/de/html/admin/admin_list_cats.tpl index 674a0be70e..a8f9cfdae2 100644 --- a/templates/de/html/admin/admin_list_cats.tpl +++ b/templates/de/html/admin/admin_list_cats.tpl @@ -1,25 +1,28 @@
{%form,formMethodPost=modules.php?module=admin&what=config_cats%} - - - - - - - - - - $content - - - + + + + + + + + + + + +$content + + + +
- {--ADMIN_CONFIG_CATEGORIES_TITLE--} -
{--ID_SELECT--}{--CATEGORY_NAME--}{--ADMIN_IS_VISIBLE--}{--SORTING_KEY--}
- - - -
+ {--ADMIN_CONFIG_CATEGORIES_TITLE--} +
{--ID_SELECT--}{--CATEGORY_NAME--}{--ADMIN_IS_VISIBLE--}{--SORTING_KEY--}
+ + + +
{%form_close%}
diff --git a/templates/de/html/admin/admin_list_country.tpl b/templates/de/html/admin/admin_list_country.tpl index 49ebc49f34..06bfca9803 100644 --- a/templates/de/html/admin/admin_list_country.tpl +++ b/templates/de/html/admin/admin_list_country.tpl @@ -1,26 +1,29 @@
{%form,formMethodPost=modules.php?module=admin&what=list_country%} - - - - - - - - - - $content[rows] - - - + + + + + + + + + + + +$content[rows] + + + +
- {--ADMIN_LIST_COUNTRIES_TITLE--}: -
{--ID_SELECT--}{--ADMIN_COUNTRY_CODE--}:{--ADMIN_COUNTRY_NAME--}:{--ADMIN_COUNTRY_STATUS--}
- - - - -
+ {--ADMIN_LIST_COUNTRIES_TITLE--}: +
{--ID_SELECT--}{--ADMIN_COUNTRY_CODE--}:{--ADMIN_COUNTRY_NAME--}:{--ADMIN_COUNTRY_STATUS--}
+ + + + +
{%form_close%}
diff --git a/templates/de/html/admin/admin_list_country_form.tpl b/templates/de/html/admin/admin_list_country_form.tpl index ec460aa1a0..24a5213c65 100644 --- a/templates/de/html/admin/admin_list_country_form.tpl +++ b/templates/de/html/admin/admin_list_country_form.tpl @@ -1,22 +1,25 @@ {%form,formMethodPost=modules.php?module=admin&what=list_country%} - - - - - - - - - - $content[rows] - - - + + + + + + + + + + + +$content[rows] + + + +
- $content[title]: -
{--ID_SELECT--}{--ADMIN_COUNTRY_CODE--}:{--ADMIN_COUNTRY_NAME--}:{--ADMIN_COUNTRY_STATUS--}
- $content[reset] - -
+ $content[title]: +
{--ID_SELECT--}{--ADMIN_COUNTRY_CODE--}:{--ADMIN_COUNTRY_NAME--}:{--ADMIN_COUNTRY_STATUS--}
+ $content[reset] + +
{%form_close%} diff --git a/templates/de/html/admin/admin_list_extensions.tpl b/templates/de/html/admin/admin_list_extensions.tpl index d7c4a98f21..8130516aa0 100644 --- a/templates/de/html/admin/admin_list_extensions.tpl +++ b/templates/de/html/admin/admin_list_extensions.tpl @@ -1,27 +1,27 @@
{%form,formMethodPost=modules.php?module=admin&what=extensions%} - - - - - - - - - - - $content - - - + + + + + + + + + + +$content + + +
- {--ADMIN_REGISTERED_EXTENSIONS--} -
{--ID_SELECT--}{--ADMIN_EXTENSION_NAME--}{--ADMIN_EXTENSION_CSSFILE--}{--ADMIN_EXTENSION_ACTIVE--}{--ADMIN_EXTENSION_VERSION--}
- - - - -
+ {--ADMIN_REGISTERED_EXTENSIONS--} +
{--ID_SELECT--}{--ADMIN_EXTENSION_NAME--}{--ADMIN_EXTENSION_CSSFILE--}{--ADMIN_EXTENSION_ACTIVE--}{--ADMIN_EXTENSION_VERSION--}
+ + + + +
{%form_close%}
diff --git a/templates/de/html/admin/admin_list_forced_ads.tpl b/templates/de/html/admin/admin_list_forced_ads.tpl index 14fe499fbd..cab22eacd3 100644 --- a/templates/de/html/admin/admin_list_forced_ads.tpl +++ b/templates/de/html/admin/admin_list_forced_ads.tpl @@ -6,15 +6,18 @@ {--ADMIN_LIST_FORCED_ADS_TITLE--} + - {--ID_SELECT--} + {--ID_SELECT--} {--_USERID--} {--ADMIN_TEST_URL--} {--ADMIN_FORCED_ADS_TYPE--} {--ADMIN_FORCED_ADS_HAS_FRAMEBREAKER--} {--ADMIN_FORCED_ADS_ADDED--} + $content + diff --git a/templates/de/html/admin/admin_list_forced_campaigns.tpl b/templates/de/html/admin/admin_list_forced_campaigns.tpl index b329f3ec19..f7042fa0d7 100644 --- a/templates/de/html/admin/admin_list_forced_campaigns.tpl +++ b/templates/de/html/admin/admin_list_forced_campaigns.tpl @@ -6,8 +6,9 @@ {--ADMIN_LIST_FORCED_CAMPAIGNS_TITLE--} + - {--ID_SELECT--} + {--ID_SELECT--} {--_USERID--} {--ADMIN_FORCED_CAMPAIGN_STATUS--} {--ADMIN_FORCED_CAMPAIGN_ORDERED_CLICKS--} @@ -19,7 +20,9 @@ {--ADMIN_FORCED_CAMPAIGN_EXPIRED--} {--ADMIN_FORCED_CAMPAIGN_CREATED--} + $content + diff --git a/templates/de/html/admin/admin_list_forced_costs.tpl b/templates/de/html/admin/admin_list_forced_costs.tpl index ef0bca650e..19b448321a 100644 --- a/templates/de/html/admin/admin_list_forced_costs.tpl +++ b/templates/de/html/admin/admin_list_forced_costs.tpl @@ -6,13 +6,16 @@ {--ADMIN_LIST_FORCED_COSTS_TITLE--} + - {--ID_SELECT--} + {--ID_SELECT--} {--ADMIN_FORCED_COSTS_PRICE_CLICK--} {--ADMIN_FORCED_COSTS_PAYMENT_CLICK--} {--ADMIN_FORCED_COSTS_VISIBILITY--} + $content + diff --git a/templates/de/html/admin/admin_list_holiday.tpl b/templates/de/html/admin/admin_list_holiday.tpl index d43a527ff7..c13d34ca2b 100644 --- a/templates/de/html/admin/admin_list_holiday.tpl +++ b/templates/de/html/admin/admin_list_holiday.tpl @@ -1,22 +1,22 @@
{%form,formMethodPost=modules.php?module=admin&what=del_holiday%} - - - - - - - - - - $content - - - + + + + + + + + + +$content + + +
{--ID_SELECT--}{--_USERID--}:{--ADMIN_HOLIDAY_TSTART--}:{--ADMIN_HOLIDAY_TEND--}:{--ADMIN_HOLIDAY_COMMENTS--}:{--ACCOUNT_STATUS--}:{--LAST_ONLINE_SHORT--}:
-
{--ID_SELECT--}{--_USERID--}:{--ADMIN_HOLIDAY_TSTART--}:{--ADMIN_HOLIDAY_TEND--}:{--ADMIN_HOLIDAY_COMMENTS--}:{--ACCOUNT_STATUS--}:{--LAST_ONLINE_SHORT--}:
+ + +
{%form_close%}
diff --git a/templates/de/html/admin/admin_list_home.tpl b/templates/de/html/admin/admin_list_home.tpl index 37b8c24d93..1a33a60648 100644 --- a/templates/de/html/admin/admin_list_home.tpl +++ b/templates/de/html/admin/admin_list_home.tpl @@ -1,20 +1,23 @@
- - - - - - - - - $content - - - + + + + + + + + + + +$content + + + +
- {--ADMIN_CONFIG_HOME_TITLE--} -
{--ID_SELECT--}{--ADMIN_MENU_WHAT--}{--ADMIN_HOME_ACTION--}
-
{--ADMIN_CONFIG_HOME_NOTICE--}
-
+ {--ADMIN_CONFIG_HOME_TITLE--} +
{--ID_SELECT--}{--ADMIN_MENU_WHAT--}{--ADMIN_HOME_ACTION--}
+
{--ADMIN_CONFIG_HOME_NOTICE--}
+
diff --git a/templates/de/html/admin/admin_list_mods.tpl b/templates/de/html/admin/admin_list_mods.tpl index f615632472..50e0815d30 100644 --- a/templates/de/html/admin/admin_list_mods.tpl +++ b/templates/de/html/admin/admin_list_mods.tpl @@ -7,7 +7,7 @@ - {--ID_SELECT--} + {--ID_SELECT--} {--ADMIN_MODS_NAME--} {--ADMIN_MODS_TITLE--} {--ADMIN_MODS_IS_LOCKED--} 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 26cd4246a8..270dcb8908 100644 --- a/templates/de/html/admin/admin_list_network_array_translation.tpl +++ b/templates/de/html/admin/admin_list_network_array_translation.tpl @@ -1,30 +1,33 @@
{%form,formMethodPost=modules.php?module=admin&what=list_network_array_translation&do=handle_array_translations&network_id=$content[network_id]%} - - - - - - - - - - $content[rows] - - - + + + + + + + + + + + +$content[rows] + + + +
-
- {--ADMIN_LIST_NETWORK_ARRAY_TRANSLATION_TITLE--} -
-
- ({%network,getNetworkDataById,network_title=%network_id%%}) -
-
{--ID_SELECT--}{--ADMIN_NETWORK_TYPE_HANDLER--}{--ADMIN_NETWORK_ARRAY_INDEX_TRANSLATION--}{--ADMIN_NETWORK_ARRAY_INDEX_SORTING--}
- - - -
+
+ {--ADMIN_LIST_NETWORK_ARRAY_TRANSLATION_TITLE--} +
+
+ ({%network,getNetworkDataById,network_title=%network_id%%}) +
+
{--ID_SELECT--}{--ADMIN_NETWORK_TYPE_HANDLER--}{--ADMIN_NETWORK_ARRAY_INDEX_TRANSLATION--}{--ADMIN_NETWORK_ARRAY_INDEX_SORTING--}
+ + + +
{%form_close%} diff --git a/templates/de/html/admin/admin_list_network_data.tpl b/templates/de/html/admin/admin_list_network_data.tpl index e7ae683a07..41a3847c61 100644 --- a/templates/de/html/admin/admin_list_network_data.tpl +++ b/templates/de/html/admin/admin_list_network_data.tpl @@ -14,7 +14,7 @@   - {--ID_SELECT--} + {--ID_SELECT--} {--ADMIN_NETWORK_SHORT_NAME--} {--ADMIN_NETWORK_REFERRAL_LINK--} {--ADMIN_NETWORK_DATA_SEPARATOR2--} 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 50fcc5a10e..624982fa9f 100644 --- a/templates/de/html/admin/admin_list_network_request_params.tpl +++ b/templates/de/html/admin/admin_list_network_request_params.tpl @@ -12,7 +12,7 @@ - {--ID_SELECT--} + {--ID_SELECT--} {--ADMIN_NETWORK_TYPE_HANDLER--} {--ADMIN_NETWORK_REQUEST_PARAMETER_KEY_SHORT--} {--ADMIN_NETWORK_REQUEST_PARAMETER_VALUE--} diff --git a/templates/de/html/admin/admin_list_network_types.tpl b/templates/de/html/admin/admin_list_network_types.tpl index 68687cc0f8..8670f3fae7 100644 --- a/templates/de/html/admin/admin_list_network_types.tpl +++ b/templates/de/html/admin/admin_list_network_types.tpl @@ -1,33 +1,36 @@
{%form,formMethodPost=modules.php?module=admin&what=list_network_types&do=handle_network_types&network_id=$content[network_id]%} - - - - - - - - - - - - - $content[rows] - - - + + + + + + + + + + + + + + +$content[rows] + + + +
-
- {--ADMIN_LIST_NETWORK_TYPE_HANDLER_TITLE--} -
-
- ({%network,getNetworkDataById,network_title=%network_id%%}) -
-
{--ID_SELECT--}{--ADMIN_NETWORK_TYPE_HANDLER--}{--ADMIN_NETWORK_TYPE_HANDLER_API_URL--}{--ADMIN_NETWORK_TYPE_HANDLER_CLICK_URL--}{--ADMIN_NETWORK_TYPE_HANDLER_BANNER_URL--}{--TIME_UNIT--}{--ADMIN_NETWORK_TYPE_HANDLER_TEXT_ENCODING--}
- - - -
+
+ {--ADMIN_LIST_NETWORK_TYPE_HANDLER_TITLE--} +
+
+ ({%network,getNetworkDataById,network_title=%network_id%%}) +
+
{--ID_SELECT--}{--ADMIN_NETWORK_TYPE_HANDLER--}{--ADMIN_NETWORK_TYPE_HANDLER_API_URL--}{--ADMIN_NETWORK_TYPE_HANDLER_CLICK_URL--}{--ADMIN_NETWORK_TYPE_HANDLER_BANNER_URL--}{--TIME_UNIT--}{--ADMIN_NETWORK_TYPE_HANDLER_TEXT_ENCODING--}
+ + + +
{%form_close%} 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 d81d211bfb..9fe0a9cde4 100644 --- a/templates/de/html/admin/admin_list_network_vcheck_params.tpl +++ b/templates/de/html/admin/admin_list_network_vcheck_params.tpl @@ -1,30 +1,32 @@
{%form,formMethodPost=modules.php?module=admin&what=list_network_vcheck_params&do=handle_vcheck_params&network_id=$content[network_id]%} - - - - - - - - - - $content[rows] - - - + + + + + + + + + + + +$content[rows] + + +
-
- {--ADMIN_LIST_NETWORK_VCHECK_PARAMETER_TITLE--} -
-
- ({%network,getNetworkDataById,network_title=%network_id%%}) -
-
{--ID_SELECT--}{--ADMIN_NETWORK_VCHECK_PARAMETER_KEY--}{--ADMIN_NETWORK_VCHECK_PARAMETER_VALUE--}{--ADMIN_NETWORK_VCHECK_PARAMETER_DEFAULT--}
- - - -
+
+ {--ADMIN_LIST_NETWORK_VCHECK_PARAMETER_TITLE--} +
+
+ ({%network,getNetworkDataById,network_title=%network_id%%}) +
+
{--ID_SELECT--}{--ADMIN_NETWORK_VCHECK_PARAMETER_KEY--}{--ADMIN_NETWORK_VCHECK_PARAMETER_VALUE--}{--ADMIN_NETWORK_VCHECK_PARAMETER_DEFAULT--}
+ + + +
{%form_close%} diff --git a/templates/de/html/admin/admin_list_nickname_history.tpl b/templates/de/html/admin/admin_list_nickname_history.tpl index 0240f22e6d..460f4e91b4 100644 --- a/templates/de/html/admin/admin_list_nickname_history.tpl +++ b/templates/de/html/admin/admin_list_nickname_history.tpl @@ -6,14 +6,17 @@ {--ADMIN_LIST_NICKNAME_HISTORY_TITLE--} + - {--ID_SELECT--} + {--ID_SELECT--} {--_USERID--} {--ADMIN_HISTORY_VALUE--} {--ENTRY_ADDED--} {--ADMIN_HISTORY_ENTRY_LAST_USED--} + $content[rows] + diff --git a/templates/de/html/admin/admin_list_online.tpl b/templates/de/html/admin/admin_list_online.tpl index b4c08edf04..876cfc7132 100644 --- a/templates/de/html/admin/admin_list_online.tpl +++ b/templates/de/html/admin/admin_list_online.tpl @@ -5,6 +5,7 @@ {--ADMIN_ONLINE_DETAILS--} + {--ID_SELECT--} {--_USERID--}: @@ -15,7 +16,9 @@ {--ADMIN_MENU_WHAT--}: {--LAST_SEEN--}: + $content[rows] + {--ONLINE_TIMEOUT_IS--} diff --git a/templates/de/html/admin/admin_list_payments.tpl b/templates/de/html/admin/admin_list_payments.tpl index 23afb8f965..b39fa7b534 100644 --- a/templates/de/html/admin/admin_list_payments.tpl +++ b/templates/de/html/admin/admin_list_payments.tpl @@ -7,7 +7,7 @@ - {--ID_SELECT--} + {--ID_SELECT--} {--ADMIN_PAYMENT_TIME--}: {--ADMIN_PAYMENT_PAYMENT--}: {--ADMIN_PAYMENT_PRICE--}: diff --git a/templates/de/html/admin/admin_list_points_accounts.tpl b/templates/de/html/admin/admin_list_points_accounts.tpl index 3095ea22b2..794da222ee 100644 --- a/templates/de/html/admin/admin_list_points_accounts.tpl +++ b/templates/de/html/admin/admin_list_points_accounts.tpl @@ -7,7 +7,7 @@ - {--ID_SELECT--} + {--ID_SELECT--} {--ADMIN_POINTS_ACCOUNT_SUBJECT--} {--ADMIN_POINTS_ACCOUNT_COLUMN_NAME--} {--ADMIN_POINTS_ACCOUNT_LOCKED_MODE--} diff --git a/templates/de/html/admin/admin_list_rallye_prices_simple.tpl b/templates/de/html/admin/admin_list_rallye_prices_simple.tpl index 8701caf40d..2a76082e84 100644 --- a/templates/de/html/admin/admin_list_rallye_prices_simple.tpl +++ b/templates/de/html/admin/admin_list_rallye_prices_simple.tpl @@ -7,7 +7,7 @@ - + {--ID_SELECT--} @@ -16,7 +16,7 @@ {--ADMIN_RALLYE_PRICE_POINTS--}: - + {--ADMIN_RALLYE_PRICE_INFO--}: diff --git a/templates/de/html/admin/admin_list_rallyes.tpl b/templates/de/html/admin/admin_list_rallyes.tpl index 7873f7668c..4046b7bce1 100644 --- a/templates/de/html/admin/admin_list_rallyes.tpl +++ b/templates/de/html/admin/admin_list_rallyes.tpl @@ -1,23 +1,26 @@
{%form,formMethodPost=modules.php?module=admin&what=list_rallyes%} - - - - - - - - $content[rows] - - - + + + + + + + + + +$content[rows] + + + +
- {--ADMIN_LIST_RALLYES_TITLE--}: -
{--ID_SELECT--}{--ADMIN_LIST_RALLYE_DATA_OVERVIEW_TITLE--}:
- - - -
+ {--ADMIN_LIST_RALLYES_TITLE--}: +
{--ID_SELECT--}{--ADMIN_LIST_RALLYE_DATA_OVERVIEW_TITLE--}:
+ + + +
{%form_close%}
diff --git a/templates/de/html/admin/admin_list_refbanner.tpl b/templates/de/html/admin/admin_list_refbanner.tpl index 781d46d53f..3419f47467 100644 --- a/templates/de/html/admin/admin_list_refbanner.tpl +++ b/templates/de/html/admin/admin_list_refbanner.tpl @@ -7,7 +7,7 @@ - {--ID_SELECT--} + {--ID_SELECT--} {--REFERRAL_URL--}: {--REFERRAL_TITLE--}: {--REFERRAL_VIEWS--}: diff --git a/templates/de/html/admin/admin_list_refdepths.tpl b/templates/de/html/admin/admin_list_refdepths.tpl new file mode 100644 index 0000000000..cb3e835386 --- /dev/null +++ b/templates/de/html/admin/admin_list_refdepths.tpl @@ -0,0 +1,28 @@ +
+{%form,formMethodPost=modules.php?module=admin&what=list_referral_levels%} + + + + + + + + + +$content + + + +
+ {--ADMIN_LIST_REFERRAL_LEVELS_TITLE--} +
{--ID_SELECT--}{--REFERRAL_LEVEL--}{--REFERRAL_PERCENTS--}
+ + + +
+{%form_close%} +
+ +
+ {--ADMIN_REFERRAL_LEVEL_ZERO_NOTICE--} +
diff --git a/templates/de/html/admin/admin_list_refdepths_row.tpl b/templates/de/html/admin/admin_list_refdepths_row.tpl new file mode 100644 index 0000000000..8f30e9a517 --- /dev/null +++ b/templates/de/html/admin/admin_list_refdepths_row.tpl @@ -0,0 +1,11 @@ + + + + + + $content[level] + + + {%pipe,translateComma=$content[percents]%}% + + diff --git a/templates/de/html/admin/admin_list_reflevel.tpl b/templates/de/html/admin/admin_list_reflevel.tpl index 7f9f5da6aa..11f5d85d80 100644 --- a/templates/de/html/admin/admin_list_reflevel.tpl +++ b/templates/de/html/admin/admin_list_reflevel.tpl @@ -1,28 +1 @@ -
-{%form,formMethodPost=modules.php?module=admin&what=config_points&sub=ref%} - - - - - - - - - - $content - - - -
- {--ADMIN_EDIT_DELETE_REFERRAL_DEPTH_TITLE--} -
{--ID_SELECT--}{--REFERRAL_LEVEL--}:{--REFERRAL_PERCENT--}:
- - - -
-{%form_close%} -
- -
- {--ADMIN_REFERRAL_LEVEL_ZERO_NOTICE--} -
+ diff --git a/templates/de/html/admin/admin_list_reflevel_row.tpl b/templates/de/html/admin/admin_list_reflevel_row.tpl index 1f24f6103b..11f5d85d80 100644 --- a/templates/de/html/admin/admin_list_reflevel_row.tpl +++ b/templates/de/html/admin/admin_list_reflevel_row.tpl @@ -1,11 +1 @@ - - - - - - $content[level] - - - {%pipe,translateComma=$content[percents]%}% - - + diff --git a/templates/de/html/admin/admin_list_server_name_log.tpl b/templates/de/html/admin/admin_list_server_name_log.tpl index 03cb6e1a25..445dfa3546 100644 --- a/templates/de/html/admin/admin_list_server_name_log.tpl +++ b/templates/de/html/admin/admin_list_server_name_log.tpl @@ -7,7 +7,7 @@ - {--ID_SELECT--} + {--ID_SELECT--} {--ADMIN_SERVER_NAME--} {--REMOTE_IP--} {--USER_AGENT--} diff --git a/templates/de/html/admin/admin_list_sponsor_pay.tpl b/templates/de/html/admin/admin_list_sponsor_pay.tpl index 6d06c00b2d..d196fd18e8 100644 --- a/templates/de/html/admin/admin_list_sponsor_pay.tpl +++ b/templates/de/html/admin/admin_list_sponsor_pay.tpl @@ -7,9 +7,9 @@ - {--ID_SELECT--} - {--SPONSOR_PAYTYPE_NAME--}: - {--SPONSOR_PAYTYPE_RATE--}: + {--ID_SELECT--} + {--SPONSOR_PAYTYPE_NAME--}: + {--SPONSOR_PAYTYPE_RATE--}: {--SPONSOR_PAYTYPE_MIN_COUNT2--}: {--SPONSOR_PAYTYPE_CURRENCY--}: diff --git a/templates/de/html/admin/admin_list_sponsor_pay_del.tpl b/templates/de/html/admin/admin_list_sponsor_pay_del.tpl index 5bac03e90f..6349408e6c 100644 --- a/templates/de/html/admin/admin_list_sponsor_pay_del.tpl +++ b/templates/de/html/admin/admin_list_sponsor_pay_del.tpl @@ -6,14 +6,17 @@ {--SPONSOR_DELETE_PAY_ENTRIES--} + - {--ID_SELECT--} + {--ID_SELECT--} {--SPONSOR_PAYTYPE_NAME--}: - {--SPONSOR_PAYTYPE_RATE--}: - {--SPONSOR_PAYTYPE_MIN_COUNT2--}: + {--SPONSOR_PAYTYPE_RATE--}: + {--SPONSOR_PAYTYPE_MIN_COUNT2--}: {--SPONSOR_PAYTYPE_CURRENCY--}: + $content + diff --git a/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl b/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl index 853d1e6a4a..4123cf4181 100644 --- a/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl +++ b/templates/de/html/admin/admin_list_sponsor_pay_edit.tpl @@ -6,14 +6,17 @@ {--SPONSOR_EDIT_PAY_ENTRIES--} + - {--ID_SELECT--} + {--ID_SELECT--} {--SPONSOR_PAYTYPE_NAME--}: - {--SPONSOR_PAYTYPE_RATE--}: - {--SPONSOR_PAYTYPE_MIN_COUNT2--}: + {--SPONSOR_PAYTYPE_RATE--}: + {--SPONSOR_PAYTYPE_MIN_COUNT2--}: {--SPONSOR_PAYTYPE_CURRENCY--}: + $content + diff --git a/templates/de/html/admin/admin_list_surfbar_actions.tpl b/templates/de/html/admin/admin_list_surfbar_actions.tpl index 98985d31ee..43b0daf96c 100644 --- a/templates/de/html/admin/admin_list_surfbar_actions.tpl +++ b/templates/de/html/admin/admin_list_surfbar_actions.tpl @@ -7,7 +7,7 @@ - + {--ID_SELECT--} diff --git a/templates/de/html/admin/admin_list_surfbar_urls_row.tpl b/templates/de/html/admin/admin_list_surfbar_urls_row.tpl index e30e9d99bf..c2eef7295f 100644 --- a/templates/de/html/admin/admin_list_surfbar_urls_row.tpl +++ b/templates/de/html/admin/admin_list_surfbar_urls_row.tpl @@ -1,11 +1,12 @@ - {--ID_SELECT--} + {--ID_SELECT--} {--_USERID--} {--ADMIN_BOOKING_PACKAGE_ID--} {--ADMIN_TEST_URL--} {--ADMIN_SURFBAR_VIEWS_TOTAL--} {--ADMIN_SURFBAR_STATUS--} + @@ -26,6 +27,7 @@ {%pipe,translateSurfbarUrlStatus=$content[url_status]%} + {--ADMIN_SURFBAR_REGISTERED--} {--ADMIN_SURFBAR_FIXED_RELOAD--} @@ -34,6 +36,7 @@ {--ADMIN_SURFBAR_LOCK_REASON--} {--_UNUSED--} + $content[url_registered] diff --git a/templates/de/html/admin/admin_list_task.tpl b/templates/de/html/admin/admin_list_task.tpl index 15ec420d5d..d07a075aa3 100644 --- a/templates/de/html/admin/admin_list_task.tpl +++ b/templates/de/html/admin/admin_list_task.tpl @@ -7,7 +7,7 @@ - {--ID_SELECT--} + {--ID_SELECT--} {--ADMIN_ASSIGNED_ADMIN--} {--ADMIN_REGISTER_EXTENSION--} {--ADMIN_TASK_INFOS--} diff --git a/templates/de/html/admin/admin_list_task_delete.tpl b/templates/de/html/admin/admin_list_task_delete.tpl index eca5de334e..bc31e699f8 100644 --- a/templates/de/html/admin/admin_list_task_delete.tpl +++ b/templates/de/html/admin/admin_list_task_delete.tpl @@ -7,7 +7,7 @@ - {--ID_SELECT--} + {--ID_SELECT--} {--ADMIN_ASSIGNED_ADMIN--} {--ADMIN_REGISTER_EXTENSION--} {--ADMIN_TASK_INFOS--} diff --git a/templates/de/html/admin/admin_list_user_subid.tpl b/templates/de/html/admin/admin_list_user_subid.tpl index 557ad3709a..e10a272ab1 100644 --- a/templates/de/html/admin/admin_list_user_subid.tpl +++ b/templates/de/html/admin/admin_list_user_subid.tpl @@ -6,13 +6,16 @@ {--ADMIN_LIST_USER_SUBID_TITLE--} + - {--ID_SELECT--} + {--ID_SELECT--} {--_USERID--} {--SUBID_VALUE--} {--SUBID_ADDED--} + $content[rows] + diff --git a/templates/de/html/admin/admin_list_user_subid_stats.tpl b/templates/de/html/admin/admin_list_user_subid_stats.tpl index 3ef4db18ba..975f86e853 100644 --- a/templates/de/html/admin/admin_list_user_subid_stats.tpl +++ b/templates/de/html/admin/admin_list_user_subid_stats.tpl @@ -7,7 +7,7 @@ - {--ID_SELECT--} + {--ID_SELECT--} {--SUBID_VALUE--} {--REFERRER_URL--} {--REMOTE_IP--} diff --git a/templates/de/html/admin/admin_list_wernis_main.tpl b/templates/de/html/admin/admin_list_wernis_main.tpl index d71db91579..8d9e8a88d4 100644 --- a/templates/de/html/admin/admin_list_wernis_main.tpl +++ b/templates/de/html/admin/admin_list_wernis_main.tpl @@ -6,7 +6,7 @@ - {--ID_SELECT--} + {--ID_SELECT--} {--_USERID--} {--ADMIN_WERNIS_WDS66_ACCOUNT--} {--ADMIN_WERNIS_TRANSFERED--} diff --git a/templates/de/html/admin/admin_overview_table.tpl b/templates/de/html/admin/admin_overview_table.tpl index 2f3eb97980..4822414794 100644 --- a/templates/de/html/admin/admin_overview_table.tpl +++ b/templates/de/html/admin/admin_overview_table.tpl @@ -6,8 +6,9 @@ {--ADMIN_TASK_SYSTEM_WELCOME--} + - {--ID_SELECT--} + {--ID_SELECT--} {--ADMIN_ASSIGNED_ADMIN--} {--ADMIN_REGISTER_EXTENSION--} {--ADMIN_TASK_INFOS--} @@ -15,7 +16,9 @@ {--ADMIN_TASK_TYPE--} {--ADMIN_TASK_CREATED--} + $content + diff --git a/templates/de/html/admin/admin_unlock_emails.tpl b/templates/de/html/admin/admin_unlock_emails.tpl index f23ff2cab2..28d8a03a0c 100644 --- a/templates/de/html/admin/admin_unlock_emails.tpl +++ b/templates/de/html/admin/admin_unlock_emails.tpl @@ -1,35 +1,39 @@
{%form,formMethodPost=modules.php?module=admin&what=unlock_emails%} - - - - - - - - - - - - - - $content[rows] - - - - - - + + + + + + + + + + + + + + + +$content[rows] + + + + + + + +
- {--ADMIN_UNLOCK_EMAILS--} -
{--ID_SELECT--}{--EMAIL_SENDER--}{--EMAIL_SUBJECT--}{--EMAIL_URL--}{--EMAIL_CATEGORY--}{--EMAIL_PAYMENT--}{--EMAIL_TIMESTAMP--}{--EMAIL_TSEND--}
- {--ADMIN_ENTER_REDIRECT_URL--}: - -
- - - -
+ {--ADMIN_UNLOCK_EMAILS--} +
{--ID_SELECT--}{--EMAIL_SENDER--}{--EMAIL_SUBJECT--}{--EMAIL_URL--}{--EMAIL_CATEGORY--}{--EMAIL_PAYMENT--}{--EMAIL_TIMESTAMP--}{--EMAIL_TSEND--}
+ {--ADMIN_ENTER_REDIRECT_URL--}: + +
+ + + +
{%form_close%}
diff --git a/templates/de/html/admin/admin_unlock_sponsor.tpl b/templates/de/html/admin/admin_unlock_sponsor.tpl index f38d83fea8..8ba5571933 100644 --- a/templates/de/html/admin/admin_unlock_sponsor.tpl +++ b/templates/de/html/admin/admin_unlock_sponsor.tpl @@ -6,13 +6,16 @@ {--ADMIN_SPONSOR_UNLOCK_TITLE--} + - {--ID_SELECT--} + {--ID_SELECT--} {--SURNAME_FAMILY--}: {--REMOTE_IP--}: {--SPONSOR_CREATED--}: + $content + diff --git a/templates/de/html/admin/admin_unlock_surfbar_urls.tpl b/templates/de/html/admin/admin_unlock_surfbar_urls.tpl index 5514e3104c..62d56a8389 100644 --- a/templates/de/html/admin/admin_unlock_surfbar_urls.tpl +++ b/templates/de/html/admin/admin_unlock_surfbar_urls.tpl @@ -7,7 +7,7 @@ - {--ID_SELECT--} + {--ID_SELECT--} {--_USERID--} {--ADMIN_SURFBAR_URL--} {--ADMIN_TEST_URL--} diff --git a/templates/de/html/member/member_points.tpl b/templates/de/html/member/member_points.tpl index 1fa7849437..731dd29263 100644 --- a/templates/de/html/member/member_points.tpl +++ b/templates/de/html/member/member_points.tpl @@ -1,7 +1,7 @@
- + diff --git a/templates/xml/admin/admin_add_do_referral_levels.xml b/templates/xml/admin/admin_add_do_referral_levels.xml new file mode 100644 index 0000000000..f3f1cfe16b --- /dev/null +++ b/templates/xml/admin/admin_add_do_referral_levels.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/xml/admin/admin_edit_do_referral_levels.xml b/templates/xml/admin/admin_edit_do_referral_levels.xml new file mode 100644 index 0000000000..c14d5c3635 --- /dev/null +++ b/templates/xml/admin/admin_edit_do_referral_levels.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/xml/admin/admin_edit_show_referral_levels.xml b/templates/xml/admin/admin_edit_show_referral_levels.xml new file mode 100644 index 0000000000..e63add725c --- /dev/null +++ b/templates/xml/admin/admin_edit_show_referral_levels.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/xml/admin/admin_list_referral_levels.xml b/templates/xml/admin/admin_list_referral_levels.xml new file mode 100644 index 0000000000..3cdf9c993e --- /dev/null +++ b/templates/xml/admin/admin_list_referral_levels.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{--REFERRAL_LEVEL_PERCENTS--}{--MEMBER_REFERRAL_LEVEL_PERCENTS--}: {?POINTS?} {--POINTS_ORDER--} {--REFERRALS--}