Naming convention on language strings applied, ACL handling fixed:
authorRoland Häder <roland@mxchange.org>
Thu, 30 Jun 2011 01:43:23 +0000 (01:43 +0000)
committerRoland Häder <roland@mxchange.org>
Thu, 30 Jun 2011 01:43:23 +0000 (01:43 +0000)
- A lot more (or all?) configuration-related language ids prefixed with 'admin_config_'
- Fixed saving, loading and handling of ACLs
- Renamed 'config_admins' to 'list_admins_acls' to make it more clear
- TODOs.txt updated

107 files changed:
.gitattributes
DOCS/TODOs.txt
inc/classes/cachesystem.class.php
inc/extensions/ext-admins.php
inc/extensions/ext-payout.php
inc/extensions/ext-sql_patches.php
inc/language/active_de.php
inc/language/admins_de.php
inc/language/autopurge_de.php
inc/language/beg_de.php
inc/language/birthday_de.php
inc/language/bonus_de.php
inc/language/coupon_de.php
inc/language/de.php
inc/language/doubler_de.php
inc/language/holiday_de.php
inc/language/mediadata_de.php
inc/language/newsletter_de.php
inc/language/nickname_de.php
inc/language/order_de.php
inc/language/primera_de.php
inc/language/register_de.php
inc/language/sponsor_de.php
inc/language/timezone_de.php
inc/language/top10_de.php
inc/language/transfer_de.php
inc/language/user_de.php
inc/language/wernis_de.php
inc/libs/admins_functions.php
inc/loader/load-admins.php
inc/modules/admin/admin-inc.php
inc/modules/admin/what-config_admins.php
inc/modules/admin/what-config_email.php
inc/modules/admin/what-config_payouts.php
inc/modules/admin/what-list_admins_acls.php [new file with mode: 0644]
inc/modules/admin/what-list_email_max_rec.php [new file with mode: 0644]
inc/modules/admin/what-list_user.php
inc/modules/member/what-points.php
inc/wrapper-functions.php
templates/de/html/admin/admin_add_admins_acl.tpl
templates/de/html/admin/admin_add_max.tpl
templates/de/html/admin/admin_config_active.tpl
templates/de/html/admin/admin_config_admins.tpl
templates/de/html/admin/admin_config_admins_del.tpl
templates/de/html/admin/admin_config_admins_del_row.tpl
templates/de/html/admin/admin_config_admins_edit.tpl
templates/de/html/admin/admin_config_admins_edit_row.tpl
templates/de/html/admin/admin_config_admins_row.tpl
templates/de/html/admin/admin_config_autopurge.tpl
templates/de/html/admin/admin_config_beg.tpl
templates/de/html/admin/admin_config_birthday.tpl
templates/de/html/admin/admin_config_bonus.tpl
templates/de/html/admin/admin_config_coupon.tpl
templates/de/html/admin/admin_config_doubler.tpl
templates/de/html/admin/admin_config_email.tpl
templates/de/html/admin/admin_config_email_del.tpl
templates/de/html/admin/admin_config_email_del_row.tpl
templates/de/html/admin/admin_config_email_edit.tpl
templates/de/html/admin/admin_config_email_edit_row.tpl
templates/de/html/admin/admin_config_email_row.tpl
templates/de/html/admin/admin_config_extensions.tpl
templates/de/html/admin/admin_config_holiday.tpl
templates/de/html/admin/admin_config_home.tpl
templates/de/html/admin/admin_config_home_main.tpl
templates/de/html/admin/admin_config_mediadata.tpl
templates/de/html/admin/admin_config_newsletter.tpl
templates/de/html/admin/admin_config_nickname.tpl
templates/de/html/admin/admin_config_order.tpl
templates/de/html/admin/admin_config_order_form.tpl
templates/de/html/admin/admin_config_payouts_del.tpl
templates/de/html/admin/admin_config_payouts_del_row.tpl
templates/de/html/admin/admin_config_payouts_edit.tpl
templates/de/html/admin/admin_config_payouts_edit_row.tpl
templates/de/html/admin/admin_config_primera.tpl
templates/de/html/admin/admin_config_refid.tpl
templates/de/html/admin/admin_config_register.tpl
templates/de/html/admin/admin_config_register2.tpl
templates/de/html/admin/admin_config_rewrite.tpl
templates/de/html/admin/admin_config_secure.tpl
templates/de/html/admin/admin_config_session.tpl
templates/de/html/admin/admin_config_sponsor.tpl
templates/de/html/admin/admin_config_stats.tpl
templates/de/html/admin/admin_config_sub_points.tpl
templates/de/html/admin/admin_config_timezone.tpl
templates/de/html/admin/admin_config_top10.tpl
templates/de/html/admin/admin_config_transfer.tpl
templates/de/html/admin/admin_config_user.tpl
templates/de/html/admin/admin_config_wernis.tpl
templates/de/html/admin/admin_delete_admins_acls.tpl [new file with mode: 0644]
templates/de/html/admin/admin_delete_admins_acls_row.tpl [new file with mode: 0644]
templates/de/html/admin/admin_delete_email_max_rec.tpl [new file with mode: 0644]
templates/de/html/admin/admin_delete_email_max_rec_row.tpl [new file with mode: 0644]
templates/de/html/admin/admin_delete_payouts.tpl [new file with mode: 0644]
templates/de/html/admin/admin_delete_payouts_row.tpl [new file with mode: 0644]
templates/de/html/admin/admin_edit_admins_acls.tpl [new file with mode: 0644]
templates/de/html/admin/admin_edit_admins_acls_row.tpl [new file with mode: 0644]
templates/de/html/admin/admin_edit_email_max_rec.tpl [new file with mode: 0644]
templates/de/html/admin/admin_edit_email_max_rec_row.tpl [new file with mode: 0644]
templates/de/html/admin/admin_edit_payouts.tpl [new file with mode: 0644]
templates/de/html/admin/admin_edit_payouts_row.tpl [new file with mode: 0644]
templates/de/html/admin/admin_list_admins_acls.tpl [new file with mode: 0644]
templates/de/html/admin/admin_list_admins_acls_row.tpl [new file with mode: 0644]
templates/de/html/admin/admin_list_email_max_rec.tpl [new file with mode: 0644]
templates/de/html/admin/admin_list_email_max_rec_row.tpl [new file with mode: 0644]
templates/de/html/admin/admin_list_user_row.tpl
templates/de/html/admin/admin_user_details.tpl
templates/de/html/member/member_points.tpl

index 5819300..842c06b 100644 (file)
@@ -500,6 +500,7 @@ inc/modules/admin/what-guest_add.php svneol=native#text/plain
 inc/modules/admin/what-guestedit.php svneol=native#text/plain
 inc/modules/admin/what-holiday_list.php svneol=native#text/plain
 inc/modules/admin/what-holiday_remove.php svneol=native#text/plain
+inc/modules/admin/what-list_admins_acls.php svneol=native#text/plain
 inc/modules/admin/what-list_autopurge.php svneol=native#text/plain
 inc/modules/admin/what-list_bank_package.php svneol=native#text/plain
 inc/modules/admin/what-list_beg.php svneol=native#text/plain
@@ -508,6 +509,7 @@ inc/modules/admin/what-list_cats.php svneol=native#text/plain
 inc/modules/admin/what-list_country.php svneol=native#text/plain
 inc/modules/admin/what-list_coupon.php svneol=native#text/plain
 inc/modules/admin/what-list_doubler.php svneol=native#text/plain
+inc/modules/admin/what-list_email_max_rec.php svneol=native#text/plain
 inc/modules/admin/what-list_holiday.php svneol=native#text/plain
 inc/modules/admin/what-list_links.php svneol=native#text/plain
 inc/modules/admin/what-list_network_api_translation.php svneol=native#text/plain
@@ -1069,10 +1071,14 @@ templates/de/html/admin/admin_del_surfbar_urls_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_admin_menu.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_admin_menu_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_admins.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_admins_acls.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_admins_acls_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_admins_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_cats.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_cats_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_email_bonus.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_email_max_rec.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_email_max_rec_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_email_normal.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_email_notify.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_guest_menu.tpl svneol=native#text/plain
@@ -1087,6 +1093,8 @@ templates/de/html/admin/admin_delete_networks.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_networks_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_payments.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_payments_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_payouts.tpl svneol=native#text/plain
+templates/de/html/admin/admin_delete_payouts_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_reflevel.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_reflevel_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_delete_sponsor.tpl svneol=native#text/plain
@@ -1096,12 +1104,16 @@ templates/de/html/admin/admin_edit_admin_menu.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_admin_menu_form.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_admin_menu_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_admins.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_admins_acls.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_admins_acls_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_admins_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_bank_packages.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_bank_packages_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_cats.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_cats_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_email.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_email_max_rec.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_email_max_rec_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_email_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_email_select.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_guest_menu.tpl svneol=native#text/plain
@@ -1119,6 +1131,8 @@ templates/de/html/admin/admin_edit_networks.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_networks_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_payments.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_payments_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_payouts.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_payouts_row.tpl svneol=native#text/plain
 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
@@ -1158,6 +1172,8 @@ templates/de/html/admin/admin_import_theme_form.tpl svneol=native#text/plain
 templates/de/html/admin/admin_import_theme_none.tpl svneol=native#text/plain
 templates/de/html/admin/admin_import_theme_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_admins.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_admins_acls.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_admins_acls_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_admins_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_autopurge.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_autopurge_row.tpl svneol=native#text/plain
@@ -1187,6 +1203,8 @@ templates/de/html/admin/admin_list_coupon_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_doubler_already.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_doubler_overview.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_doubler_waiting.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_email_max_rec.tpl svneol=native#text/plain
+templates/de/html/admin/admin_list_email_max_rec_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_emails.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_emails_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_list_holiday.tpl svneol=native#text/plain
index dc27b17..3fa86c5 100644 (file)
@@ -4,7 +4,7 @@
 ./beg.php:171:                 // @TODO Opps, what is missing here???
 ./birthday_confirm.php:93:             // @TODO Try to rewrite the following unset()
 ./inc/cache/config-local.php:124:// @TODO Rewrite the following three constants, somehow...
-./inc/classes/cachesystem.class.php:501:       // @TODO Add support for more types which break in last else-block
+./inc/classes/cachesystem.class.php:504:       // @TODO Add support for more types which break in last else-block
 ./inc/config-functions.php:136:        // @TODO Make this all better... :-/
 ./inc/daily/daily_beg.php:52:// @TODO This should be converted in a daily beg rallye
 ./inc/daily/daily_birthday.php:95:                     // @TODO 4 is hard-coded here, should we move it out in config?
 ./inc/functions.php:92:                // @TODO Extension 'msg' does not exist
 ./inc/gen_sql_patches.php:95:// @TODO Rewrite this to a filter
 ./inc/install-functions.php:57:        // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
-./inc/language/de.php:1085:    // @TODO Rewrite these two constants
-./inc/language/de.php:1106:    // @TODO Rewrite these three constants
-./inc/language/de.php:778:// @TODO Are these constants longer used?
+./inc/language/de.php:1079:    // @TODO Rewrite these two constants
+./inc/language/de.php:1100:    // @TODO Rewrite these three constants
+./inc/language/de.php:772:// @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/newsletter_de.php:13: * @TODO This language file is completely out-dated, please do no       *
 ./inc/language/rallye_de.php:13: * @TODO Naming convention not applied for language strings             *
 ./inc/language/refback_de.php:44:// @TODO Rewrite these constants to one
 ./inc/language/sponsor_de.php:117:// @TODO Rewrite these four constants to one and use sprintf()
-./inc/libs/admins_functions.php:435:           // @TODO This can be, somehow, rewritten
+./inc/libs/admins_functions.php:449:           // @TODO This can be, somehow, rewritten
 ./inc/libs/beg_functions.php:55:               // @TODO Try to rewrite the following unset()
 ./inc/libs/bonus_functions.php:203:            // @TODO Move this HTML to a template
 ./inc/libs/doubler_functions.php:44:// @TODO Lame description
 ./inc/modules/admin/admin-inc.php:171:         // @TODO This and the next getCurrentAdminId() call might be moved into the templates?
 ./inc/modules/admin/admin-inc.php:242:         // @TODO This can be rewritten into a filter
 ./inc/modules/admin/admin-inc.php:274:         // @TODO Rewrite this to $content = SQL_FETCHARRAY()
-./inc/modules/admin/admin-inc.php:339:                                 // @TODO Rewrite this to $content = SQL_FETCHARRAY()
-./inc/modules/admin/admin-inc.php:437:// @TODO Try to rewrite this to adminAddMenuSelectionBox()
+./inc/modules/admin/admin-inc.php:340:                                 // @TODO Rewrite this to $content = SQL_FETCHARRAY()
+./inc/modules/admin/admin-inc.php:438:// @TODO Try to rewrite this to adminAddMenuSelectionBox()
 ./inc/modules/admin/overview-inc.php:162:                              // @TODO Rewrite this to a filter
 ./inc/modules/admin/overview-inc.php:275:                              // @TODO Rewrite this to something with include files and/or filter
 ./inc/modules/admin/overview-inc.php:309:                                              // @TODO This may also be rewritten to include files
 ./inc/modules/admin/what-adminedit.php:56:     // @TODO Kill all constants in this file
 ./inc/modules/admin/what-admins_mails.php:59:                          // @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_admins.php:108:        // @TODO Rewrite this to a filter
-./inc/modules/admin/what-config_admins.php:136:        // @TODO Rewrite this to filter 'run_sqls'
 ./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:110:                        // @TODO Rewrite this to a filter
 ./inc/modules/admin/what-config_rallye_prices.php:195:                 // @TODO Rewrite these two constants
 ./inc/modules/admin/what-guest_add.php:67:             // @TODO Cant this be rewritten?
 ./inc/modules/admin/what-guest_add.php:80:             // @TODO This can be somehow rewritten to a function
 ./inc/modules/admin/what-holiday_list.php:46:// @TODO Unused at the moment
+./inc/modules/admin/what-list_admins_acls.php:108:     // @TODO Rewrite this to a filter
+./inc/modules/admin/what-list_admins_acls.php:136:     // @TODO Rewrite this to filter 'run_sqls'
 ./inc/modules/admin/what-list_autopurge.php:47:// @TODO Rewrite those lines to filter
 ./inc/modules/admin/what-list_bonus.php:133:           // @TODO Can't this be moved into our expression language?
 ./inc/modules/admin/what-list_cats.php:54:             // @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
 ./inc/modules/admin/what-list_refs.php:107:                                                            // @TODO Try to rewrite some to EL
 ./inc/modules/admin/what-list_unconfirmed.php:107:     // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
 ./inc/modules/admin/what-list_unconfirmed.php:84:      // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--ADMIN_LIST_UNCONFIRMED_BONUS_LINKS--}');
-./inc/modules/admin/what-list_user.php:153:            // @TODO Rewrite these to filters
-./inc/modules/admin/what-list_user.php:261:            // @TODO Rewrite this into a filter
-./inc/modules/admin/what-list_user.php:309:                    // @TODO Rewrite this into a filter
+./inc/modules/admin/what-list_user.php:154:            // @TODO Rewrite these to filters
+./inc/modules/admin/what-list_user.php:262:            // @TODO Rewrite this into a filter
+./inc/modules/admin/what-list_user.php:311:                    // @TODO Rewrite this into a filter
 ./inc/modules/admin/what-list_user.php:57:// @TODO Rewrite these if-blocks in a filter
 ./inc/modules/admin/what-logs.php:64:                  // @TODO Fix content-type here
 ./inc/modules/admin/what-logs.php:70:                  // @TODO Fix content-type here
 ./templates/de/html/admin/admin_add_country.tpl:23:                    <!-- @TODO Rewrite this selection box to our generic functions //-->
 ./templates/de/html/admin/admin_admins_contct_form.tpl:4:      <!-- @TODO Shouldn't we add a title here? //-->
 ./templates/de/html/admin/admin_config_other.tpl:79:                   <!-- @TODO Rewrite this selection to one of our functions //-->
+./templates/de/html/admin/admin_config_rewrite.tpl:4:  <!-- @TODO No title here? //-->
 ./templates/de/html/admin/admin_edit_admin_menu.tpl:4:<!-- @TODO Shouldn't we add a title here? //-->
 ./templates/de/html/admin/admin_list_refs_level.tpl:21:                <!-- @TODO Nothing to say here? //-->
 ./templates/de/html/admin/admin_list_unconfirmed_list.tpl:3:<!-- @TODO Shouldn't we add a title here? //-->
 ./inc/loader/load_cache-revision.php:2:// @DEPRECATED
 ./inc/loader/load_cache-them.php:2:// @DEPRECATED
 ./inc/loader/load-extensions.php:2:// @DEPRECATED
-./inc/modules/admin/admin-inc.php:438:// @DEPRECATED
+./inc/modules/admin/admin-inc.php:439:// @DEPRECATED
+./inc/modules/admin/what-config_admins.php:2:// @DEPRECATED
+./inc/modules/admin/what-config_email.php:2:// @DEPRECATED
 ./inc/reset/reset_100_bonus.php:2:// @DEPRECATED
 ./inc/reset/reset_autopurge.php:2:// @DEPRECATED
 ./inc/reset/reset_beg.php:2:// @DEPRECATED
 ./inc/reset/reset_profile.php:2:// @DEPRECATED
 ./inc/reset/reset_surfbar.php:2:// @DEPRECATED
 ./inc/reset/reset_yoomedia.php:2:// @DEPRECATED
+./templates/de/html/admin/admin_config_admins_del_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_admins_del.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_admins_edit_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_admins_edit.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_admins_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_admins.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_config_cats_row.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_config_cats.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_email_del_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_email_del.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_email_edit_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_email_edit.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_email_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_email.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_order_form.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_payouts_del_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_payouts_del.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_payouts_edit_row.tpl:1:<!-- @DEPRECATED //-->
+./templates/de/html/admin/admin_config_payouts_edit.tpl:1:<!--@DEPRECATED //-->
 ./templates/de/html/admin/admin_list_cats_404.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_reset_pass_done.tpl:1:<!-- @DEPRECATED //-->
 ./templates/de/html/admin/admin_send_reset_link.tpl:1:<!-- @DEPRECATED //-->
index bee8076..8f0b7e7 100644 (file)
@@ -185,6 +185,9 @@ class CacheSystem {
                                        } else {
                                                $GLOBALS['cache_array']['admin'][$k][$data['admin_id']] = $v;
                                        }
+                               } elseif ($this->name == 'admin_acls') {
+                                       // Access control lines
+                                       $GLOBALS['cache_array']['admin_acls'][$k][$data['admin_id']][] = $v;
                                } elseif ($this->name == 'refdepths') {
                                        // Referal levels
                                        $GLOBALS['cache_array']['refdepths'][$k][$data['id']] = $v;
index 63e0085..19bb0d5 100644 (file)
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version of this extension
-setThisExtensionVersion('0.7.6');
+setThisExtensionVersion('0.7.7');
 
 // Version history array (add more with , '0.1.0' and so on)
-setExtensionVersionHistory(array('0.0', '0.1.0', '0.2.0', '0.3.0', '0.3.1', '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'));
+setExtensionVersionHistory(array('0.0', '0.1.0', '0.2.0', '0.3.0', '0.3.1', '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'));
 
 // Keep this extension always active!
 setExtensionAlwaysActive('Y');
@@ -98,7 +98,7 @@ switch (getExtensionMode()) {
                                addConfigAddSql('admins_default_acl', "ENUM('deny','allow') NOT NULL DEFAULT 'deny'");
 
                                // Default is deny everything
-                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` ADD default_acl ENUM('deny','allow') NOT NULL DEFAULT 'deny'");
+                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` ADD `default_acl` ENUM('deny','allow') NOT NULL DEFAULT 'deny'");
 
                                // But allow current admin everything (THIS SHALL BE YOU!)
                                addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admins` SET `default_acl`='allow' WHERE `id`=".bigintval(getCurrentAdminId())." LIMIT 1");
@@ -342,6 +342,13 @@ PRIMARY KEY (`id`)
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Ausgangswert ist nicht mehr 0000-00-00 00:00:00, sondern NULL.");
                                break;
+
+                       case '0.7.7': // SQL queries for v0.7.7
+                               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `what`='list_admins_acls' WHERE `what`='config_admins' LIMIT 1");
+
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Ausgangswert ist nicht mehr 0000-00-00 00:00:00, sondern NULL.");
+                               break;
                } // END - switch
                break;
 
index dae6531..1395e1c 100644 (file)
@@ -95,8 +95,7 @@ PRIMARY KEY (`id`)
                break;
 
        case 'update': // Update an extension
-               switch (getCurrentExtensionVersion())
-               {
+               switch (getCurrentExtensionVersion()) {
                        case '0.1.2': // SQL queries for v0.1.2
                                addAdminMenuSql('payouts', NULL, 'Auszahlungsmanagement','Management der Auszahlungsarten.',8);
                                addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `action`='payouts', `title`='Einstellungen' WHERE `action`='setup' AND `what`='config_payouts' LIMIT 1");
@@ -234,7 +233,7 @@ PRIMARY KEY (`id`)
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Fehlerhinweis bei deaktivierter Erweiterung verbessert.");
                                break;
-               }
+               } // END - switch
                break;
 
        case 'modify': // When the extension got modified
index 2a59247..8b3231c 100644 (file)
@@ -795,6 +795,13 @@ INDEX (`ip`)
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Konfigurationseintr&auml;ge mit Spaltentyp <strong>ENUM</strong> werden nun immer komplett gross geschrieben.");
                                break;
+
+                       case '0.7.9': // SQL queries for v0.7.9
+                               addExtensionSQL("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `what`=`list_email_max_rec` WHERE `what`='config_email` LIMIT 1");
+
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Adminscript <strong>what-config_email.php</strong> nach <strong>what-list_email_max_rec.php</strong> umbenannt.");
+                               break;
                } // END - switch
                break;
 
index 91be17b..1ce5e2b 100644 (file)
@@ -46,7 +46,7 @@ addMessages(array(
        'GUEST_ACTIVE_NO_MEMER_ONLINE_TODAY' => "Heute war noch kein einziges Mitglied online.",
        'GUEST_ACTIVE_HEADER' => "Wir waren heute online.",
        'GUEST_ACTIVE_FOOTER' => "Diese Mitglieder waren heute bei <strong>{?MAIN_TITLE?}</strong> eingeloggt.",
-       'ADMIN_CONFIG_ACTIVE_SETTINGS_TITLE' => "Einstellungen an Aktiv-Liste",
+       'ADMIN_CONFIG_ACTIVE_TITLE' => "Einstellungen an Aktiv-Liste",
        'ADMIN_CONFIG_ACTIVE_LIMIT' => "Anzahl Eintr&auml;ge in Liste",
 ));
 
index a2a3a97..d6b0feb 100644 (file)
@@ -73,10 +73,10 @@ addMessages(array(
        'ADMIN_ADMINS_SELECT_ACTION' => "Hauptmen&uuml;",
        'ADMIN_ADMINS_SELECT_WHAT' => "Untermen&uuml;",
        'ADMIN_ADMINS_SELECT_MODE' => "Zugriffsmodus ausw&auml;hlen",
-       'ADMIN_ADMINS_MODE_ALLOW' => "Erlauben",
-       'ADMIN_ADMINS_MODE_DENY' => "Ablehnen",
+       'ADMIN_ADMINS_ACCESS_MODE_ALLOW' => "Erlauben",
+       'ADMIN_ADMINS_ACCESS_MODE_DENY' => "Ablehnen",
        'ADMIN_ADMINS_ACCESS_MODE' => "Zugriffsmodus",
-       'ADMIN_ADMINS_ACL_NOTE' => "Sperren Sie nicht sich selber aus, indem Sie den Zugriffsmodus Ihres eigenen Accountes auf <strong>Ablehnen</strong> stellen! Dann k&ouml;nnen Sie zwar einloggen, aber nichts mehr machen.",
+       'ADMIN_ADMINS_ACL_NOTE' => "Sperren Sie nicht sich selber aus, indem Sie den Zugriffsmodus Ihres eigenen Accountes auf <strong>{--ADMIN_ADMINS_ACCESS_MODE_DENY--}</strong> stellen! Dann k&ouml;nnen Sie zwar einloggen, aber nichts mehr machen.",
        'ADMIN_ADMINS_SAME_MODE_SELECTED' => "Bitte w&auml;hlen Sie den anderen Zugriffsmodus aus.",
        'ADMIN_ADMINS_SELECT_ACTION_WHAT' => "Bitte w&auml;hlen Sie ein Haupt- oder Untermen&uuml; aus.",
        'ADMIN_ADMINS_ACL_ALREADY_ADDED' => "Zugriffskontrollzeile bereits hinzugef&uuml;gt.",
index d862d1d..9f0f5f8 100644 (file)
@@ -42,6 +42,32 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 addMessages(array(
+       // Admin lines
+       'ADMIN_CONFIG_AUTOPURGE_TITLE' => "Konfiguration der automatischen L&ouml;schungen",
+       'ADMIN_CONFIG_AUTOPURGE_INACTIVE' => "Sollten inaktive Accounts erkannt und gel&ouml;scht werden?",
+       'ADMIN_CONFIG_AUTOPURGE_INACTIVE_SINCE' => "Dauer bis best&auml;tigtes Account als inaktiv markiert wird",
+       'ADMIN_CONFIG_AUTOPURGE_INACTIVE_TIME' => "Dauer bis inaktives Account gel&ouml;scht wird",
+       'ADMIN_CONFIG_AUTOPURGE_UNCONFIRMED' => "Sollen unbest&auml;tigte Accounts gel&ouml;scht werden?",
+       'ADMIN_CONFIG_AUTOPURGE_UNCONFIRMED_TIME' => "Dauer bis unbest&auml;tigte Accounts gel&ouml;scht werden",
+       'ADMIN_AUTOPURGE_ALL_ACTIVE' => "Alle Ihre Mitlieder sind aktiv.",
+       'ADMIN_CONFIG_AUTOPURGE_TASKS' => "L&ouml;schen von veralteten zu L&ouml;schen markierten Aufgaben?",
+       'ADMIN_CONFIG_AUTOPURGE_TASKS_TIME' => "Dauer bis zu l&ouml;schen marktierte Aufgaben gel&ouml;scht werden",
+       'ADMIN_CONFIG_AUTOPURGE_INACTIVE_TITLE' => "Inaktive Accounts l&ouml;schen",
+       'ADMIN_CONFIG_AUTOPURGE_UNCONFIRMED_TITLE' => "Unbest&auml;tigte Accounts l&ouml;schen",
+       'ADMIN_CONFIG_AUTOPURGE_TASKS_TITLE' => "Veraltete Aufgaben l&ouml;schen",
+       'ADMIN_CONFIG_AUTOPURGE_NOTIFICATION_TITLE' => "Benachtigung an Admin bei Auto-L&ouml;schung",
+       'ADMIN_CONFIG_AUTOPURGE_NOTIFY_INACTIVE' => "Benachrichtigung bei inaktive Accounts l&ouml;schen",
+       'ADMIN_CONFIG_AUTOPURGE_NOTIFY_UNCONFIRMED' => "Benachrichtigung bei unbest&auml;tigte Accounts l&ouml;schen",
+       'ADMIN_CONFIG_AUTOPURGE_NOTIFY_TASKS' => "Benachrichtigung bei veraltete Aufgaben l&ouml;schen",
+       'ADMIN_LIST_AUTOPURGE_TITLE' => "Automatisch zu l&ouml;schende Mitglieder",
+       'ADMIN_LIST_AUTOPURGE_FOOTER' => "Hier sollte ein Hinweis kommen.",
+       'ADMIN_AUTOPURGE_NOTIFIED' => "Benachrichtigt",
+       'ADMIN_CONFIG_AUTOPURGE_DELETE_MAILS_TITLE' => "Mails von gel&ouml;schten Mitgliedern l&ouml;schen",
+       'ADMIN_CONFIG_AUTOPURGE_DELETE_MAILS' => "Sollen die Mailbuchungen von bereits gel&ouml;schten Mitgliedern gel&ouml;scht werden?",
+       'ADMIN_CONFIG_AUTOPURGE_DELETE_MAILS_TIME' => "Dauer bis Mails gel&ouml;scht werden",
+       'ADMIN_CONFIG_AUTOPURGE_NOTIFY_DELETE_MAILS' => "Benachrichtigen bei L&ouml;schung von Mails",
+
+       // Subject lines
        'MEMBER_AUTOPURGE_SUBJECT' => "{?POINTS?}-Gutschrift bei Auto-L&ouml;schung",
        'MEMBER_AUTOPURGE_INACTIVE_SUBJECT' => "Inaktivit&auml;t --> Account wird bald gel&ouml;scht.",
        'MEMBER_AUTOPURGE_UNCONFIRMED_SUBJECT' => "L&ouml;schung --> EMail-Adresse nicht best&auml;tigt.",
@@ -52,32 +78,8 @@ addMessages(array(
        'ADMIN_AUTOPURGE_TASKS_SUBJECT' => "[Auto-Purge:] Zu l&ouml;schen marktierte Aufgaben",
        'ADMIN_AUTOPURGE_TURBO_SUBJECT' => "[Auto-Purge:] Veraltete Bonus-Eintr&auml;ge",
        'ADMIN_AUTOPURGE_DELETE_MAILS_SUBJECT' => "[Auto-Purge:] Mailbuchungen bereits gel. Mitglieder",
-       'ADMIN_CONFIG_AUTOPURGE_TITLE' => "Konfiguration der automatischen L&ouml;schungen",
-       'ADMIN_AUTOPURGE_INACTIVE' => "Sollten inaktive Accounts erkannt und gel&ouml;scht werden?",
-       'ADMIN_AUTOPURGE_INACTIVE_SINCE' => "Dauer bis best&auml;tigtes Account als inaktiv markiert wird",
-       'ADMIN_AUTOPURGE_INACTIVE_TIME' => "Dauer bis inaktives Account gel&ouml;scht wird",
-       'ADMIN_AUTOPURGE_UNCONFIRMED' => "Sollen unbest&auml;tigte Accounts gel&ouml;scht werden?",
-       'ADMIN_AUTOPURGE_UNCONFIRMED_TIME' => "Dauer bis unbest&auml;tigte Accounts gel&ouml;scht werden",
-       'ADMIN_AUTOPURGE_ALL_ACTIVE' => "Alle Ihre Mitlieder sind aktiv.",
-       'ADMIN_AUTOPURGE_TASKS' => "L&ouml;schen von veralteten zu L&ouml;schen markierten Aufgaben?",
-       'ADMIN_AUTOPURGE_TASKS_TIME' => "Dauer bis zu l&ouml;schen marktierte Aufgaben gel&ouml;scht werden",
-       'ADMIN_CONFIG_AUTOPURGE_INACTIVE_TITLE' => "Inaktive Accounts l&ouml;schen",
-       'ADMIN_CONFIG_AUTOPURGE_UNCONFIRMED_TITLE' => "Unbest&auml;tigte Accounts l&ouml;schen",
-       'ADMIN_AUTOPURGE_TASKS_TITLE' => "Veraltete Aufgaben l&ouml;schen",
-       'ADMIN_AUTOPURGE_NOTIFICATION_TITLE' => "Benachtigung an Admin bei Auto-L&ouml;schung",
-       'ADMIN_AUTOPURGE_NOTIFY_INACTIVE' => "Benachrichtigung bei inaktive Accounts l&ouml;schen",
-       'ADMIN_AUTOPURGE_NOTIFY_UNCONFIRMED' => "Benachrichtigung bei unbest&auml;tigte Accounts l&ouml;schen",
-       'ADMIN_AUTOPURGE_NOTIFY_TASKS' => "Benachrichtigung bei veraltete Aufgaben l&ouml;schen",
-       'ADMIN_LIST_AUTOPURGE_TITLE' => "Automatisch zu l&ouml;schende Mitglieder",
-       'ADMIN_LIST_AUTOPURGE_FOOTER' => "Hier sollte ein Hinweis kommen.",
-       'ADMIN_AUTOPURGE_NOTIFIED' => "Benachrichtigt",
-
-       'ADMIN_AUTOPURGE_DELETE_MAILS_TITLE' => "Mails von gel&ouml;schten Mitgliedern l&ouml;schen",
-       'ADMIN_AUTOPURGE_DELETE_MAILS' => "Sollen die Mailbuchungen von bereits gel&ouml;schten Mitgliedern gel&ouml;scht werden?",
-       'ADMIN_AUTOPURGE_DELETE_MAILS_TIME' => "Dauer bis Mails gel&ouml;scht werden",
-       'ADMIN_AUTOPURGE_NOTIFY_DELETE_MAILS' => "Benachrichtigen bei L&ouml;schung von Mails",
 
-// Moved from other extensions
+       // Moved from other extensions
        'ADMIN_CONFIG_AUTOPURGE_ACTIVE' => "Auto-L&ouml;schung von Best&auml;tigungslink ist aktiviert?",
        'ADMIN_CONFIG_MAIL_LIFETIME' => "G&uuml;tigkeitsdauer der Best&auml;tigungslinks (0 = Best&auml;tigungslinks laufen nie ab)",
        'ADMIN_CONFIG_AUTOPURGE_MAILID_TITLE' => "Mailbest&auml;tigungslinks l&ouml;schen",
index 94293e5..700eeca 100644 (file)
@@ -42,8 +42,8 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 addMessages(array(
-       'ADMIN_EDIT_BEG_SETTINGS' => "Einstellungen am Bettel-Link",
-       'ADMIN_BEG_POINTS' => "{?POINTS?}-Gutschrift bei Klick auf Bettel-Link",
+       'ADMIN_CONFIG_BEG_TITLE' => "Einstellungen am Bettel-Link",
+       'ADMIN_CONFIG_BEG_POINTS' => "{?POINTS?}-Gutschrift bei Klick auf Bettel-Link",
        'ADMIN_CONFIG_BEG_TIMEOUT' => "Zeitsperre global",
        'ADMIN_CONFIG_BEG_USERID_TIMEOUT' => "Zeitsperre gegen eine Mitglieder-Id",
        'ADMIN_CONFIG_BEG_REMOTE_IP_TIMEOUT' => "Zeitsperre gegen eine IP-Nummer",
@@ -72,20 +72,20 @@ addMessages(array(
        'GUEST_BEG_EARN_3' => "auf Ihr Mitgliedskonto direkt gutgeschrieben. Zuddem verdienen Sie an den erbettelteten {?POINTS?} Ihrer Refferal mit.",
        'GUEST_BEG_TIMEOUT' => "Sie k&ouml;nnen derzeit alle <span class=\"data\">{%config,createFancyTime=beg_timeout%}</span> {?POINTS?} betteln.",
        'GUEST_BEG_HAVE_FUN' => "Heute noch anmelden und Spass haben.",
-       'ADMIN_BEG_POINTS_MAX' => "Maximale erbettelbare {?POINTS?} bei Klick auf Bettellink",
-       'ADMIN_BEG_USERID' => "Mitglied-Account zum Abbuchen der erbettelten {?POINTS?}",
-       'ADMIN_SELECT_BEG_MODE' => "Verg&uuml;tungsmodus der erbettelten {?POINTS?}",
+       'ADMIN_CONFIG_BEG_POINTS_MAX' => "Maximale erbettelbare {?POINTS?} bei Klick auf Bettellink",
+       'ADMIN_CONFIG_BEG_USERID' => "Mitglied-Account zum Abbuchen der erbettelten {?POINTS?}",
+       'ADMIN_CONFIG_SELECT_BEG_MODE' => "Verg&uuml;tungsmodus der erbettelten {?POINTS?}",
        'BEG_SORRY_YOURE_LOGGED_IN_1' => "Oh, schade! Sie haben vermutlich auf Ihren eigenen Bettel-Link mit der Mitglieder-Id ",
        'BEG_SORRY_YOURE_LOGGED_IN_2' => " geklickt. Sie haben somit auch keine ",
        'BEG_SORRY_YOURE_LOGGED_IN_3' => " {?POINTS?} erhalten.",
        'BEG_SAME_USERID_AS_OWN' => "Mitglieder-Id des Webmasters benutzt.",
 
 // Pay modes
-       'ADMIN_BEG_PAY_MODE' => "Wie sollen {?POINTS?} verg&uuml;tet werden?",
-       'ADMIN_BEG_PAY_MODE_IMG' => "Abgesichert durch ein 1x1-Pixel",
-       'ADMIN_BEG_PAY_MODE_JS' => "Abgesichert durch ein Fake-JavaScript",
-       'ADMIN_BEG_PAY_MODE_BOTH' => "Durch beides obriges absichern",
-       'ADMIN_BEG_PAY_MODE_NONE' => "Keine Absicherung (unsicher)",
+       'ADMIN_CONFIG_BEG_PAY_MODE' => "Wie sollen {?POINTS?} verg&uuml;tet werden?",
+       'ADMIN_CONFIG_BEG_PAY_MODE_IMG' => "Abgesichert durch ein 1x1-Pixel",
+       'ADMIN_CONFIG_BEG_PAY_MODE_JS' => "Abgesichert durch ein Fake-JavaScript",
+       'ADMIN_CONFIG_BEG_PAY_MODE_BOTH' => "Durch beides obriges absichern",
+       'ADMIN_CONFIG_BEG_PAY_MODE_NONE' => "Keine Absicherung (unsicher)",
 
 // More strings for beg link
        'BEG_LINK_PAY_BOTH_1' => "Das Mitglied <strong>",
@@ -99,9 +99,9 @@ addMessages(array(
        'BEG_POINTS' => "Erbettelt",
        'MEMBER_BEG_TOTAL' => "Erbettelte {?POINTS?} aller Mitglieder",
        'ADMIN_BEG_TIMEOUT' => "Es werden nur Mitglieder ausgewertet und hier aufgelistet, die sp&auml;testens am <span class=\"data\">%s</span> noch aktiv waren. Alle anderen Mitglieder erhalten die Verg&uuml;tung nicht.",
-       'ADMIN_EDIT_BEG_RALLYE_SETTINGS' => "Einstellungen an der Bettel-Rallye",
-       'ADMIN_BEG_RALLYE_ACTIVE' => "Ist die Bettel-Rallye aktiv? (Mails k&ouml;nnen optional versendet werden!)",
-       'ADMIN_BEG_RALLYE_ONLY_ACTIVE' => "Nur aktive Mitglieder nehmen dran?<br /><div class=\"notice\">(Nur in Verbindung mit der Erweiterung <strong>autopurge</strong>!)</div>",
+       'ADMIN_CONFIG_BEG_RALLYE_TITLE' => "Einstellungen an der Bettel-Rallye",
+       'ADMIN_CONFIG_BEG_RALLYE_ACTIVE' => "Ist die Bettel-Rallye aktiv? (Mails k&ouml;nnen optional versendet werden!)",
+       'ADMIN_CONFIG_BEG_RALLYE_ONLY_ACTIVE' => "Nur aktive Mitglieder nehmen dran?<br /><div class=\"notice\">(Nur in Verbindung mit der Erweiterung <strong>autopurge</strong>!)</div>",
        'ADMIN_BEG_NO_RALLYE' => "Niemand nimmt an der Bettel-Rallye dran teil.",
        'ADMIN_BEG_WITHDRAW_NOW' => "Jetzt Verg&uuml;tung Bettel-Rallye verg&uuml;ten",
        'ADMIN_BEG_WITHDRAW_NOTE' => "Es wird nur die Verg&uuml;tung vorbereitet. Die eigentliche Verg&uuml;tung erfolgt beim T&auml;glichen Reset um 00:00 Uhr.",
@@ -116,18 +116,18 @@ addMessages(array(
        'BEG_RALLYE_CONDITION_4' => "Der Rechtsweg ist ausgeschlossen.",
        'MEMBER_LIST_BEG_RALLYE_TITLE' => "Hier finden Sie die aktuelle Liste mit den m&ouml;glichen Gewinnern.",
        'BEG_LINK_HERE' => "Betteln Sie am Besten gleich los! Hier ist der Link dazu.",
-       'ADMIN_BEG_RANKS' => "Anzahl Gewinner der Bettel-Rallye",
+       'ADMIN_CONFIG_BEG_RANKS' => "Anzahl Gewinner der Bettel-Rallye",
        'BEG_MONTHLY_RALLYE' => "GEWONNEN: Monatliche Bettel-Rallye",
        'BEG_RALLYE_NO_ONE_JOINED' => "Niemand nimmt an der Bettel-Rallye dran teil, oder sie ist administrativ deaktiviert worden.",
        'ADMIN_BEG_RALLYE_DEACTIVATED' => "Bettel-Rallye nicht aktiviert.",
-       'ADMIN_EDIT_BEG_RALLYE_NOTIFICATIONS' => "Benachrichtungen per Mail zur Bettel-Rallye",
-       'ADMIN_BEG_RALLYE_ENABLE_NOTIFY' => "Benachtigen, wenn Bettel-Rallye aktiviert wurde?",
-       'ADMIN_BEG_RALLYE_DISABLE_NOTIFY' => "Benachtigen, wenn Bettel-Rallye deaktiviert wurde?",
-       'ADMIN_BEG_NOTIFY_BONUS' => "Bonus-Mail mit Anzahl {?POINTS?} aussenden, wenn Bettel-Rallye aktiviert wurde. <div class=\"notice\">(0 = Unverg&uuml;tete Benachrichtigung aussenden; nur in Verbindung mit der Erweiterung <strong>bonus!</strong>)</div>",
-       'ADMIN_BEG_NEW_MEMBER_NOTIFY' => "Sollen neue Mitglieder mit selber Mail &uuml;ber eine laufende Bettel-Rallye benachrichtigt werden?",
-       'ADMIN_BEG_NOTIFY_WAIT' => "Wie lange soll die Wartezeit der Bonus-Mail sein?",
+       'ADMIN_CONFIG_BEG_RALLYE_NOTIFICATIONS_TITLE' => "Benachrichtungen per Mail zur Bettel-Rallye",
+       'ADMIN_CONFIG_BEG_RALLYE_ENABLE_NOTIFY' => "Benachtigen, wenn Bettel-Rallye aktiviert wurde?",
+       'ADMIN_CONFIG_BEG_RALLYE_DISABLE_NOTIFY' => "Benachtigen, wenn Bettel-Rallye deaktiviert wurde?",
+       'ADMIN_CONFIG_BEG_NOTIFY_BONUS' => "Bonus-Mail mit Anzahl {?POINTS?} aussenden, wenn Bettel-Rallye aktiviert wurde. <div class=\"notice\">(0 = Unverg&uuml;tete Benachrichtigung aussenden; nur in Verbindung mit der Erweiterung <strong>bonus!</strong>)</div>",
+       'ADMIN_CONFIG_BEG_NEW_MEMBER_NOTIFY' => "Sollen neue Mitglieder mit selber Mail &uuml;ber eine laufende Bettel-Rallye benachrichtigt werden?",
+       'ADMIN_CONFIG_BEG_NOTIFY_WAIT' => "Wie lange soll die Wartezeit der Bonus-Mail sein?",
        'BEG_NO_LIMITATION' => "Keine IP-Sperre eingerichtet!!.",
-       'ADMIN_BEG_INCLUDE_OWN' => "Soll Ihre Mitglieder-Id an der Bettel-Rallye dran teilnehmen?",
+       'ADMIN_CONFIG_BEG_INCLUDE_OWN' => "Soll Ihre Mitglieder-Id an der Bettel-Rallye dran teilnehmen?",
        'ADMIN_LIST_BEG_TITLE' => "Alle Teilnehmer der Bettel-Rallye auflisten",
 
 // Task overview
index 2276598..47d5d6d 100644 (file)
@@ -44,12 +44,12 @@ if (!defined('__SECURITY')) {
 addMessages(array(
        'MEMBER_HAPPY_BIRTHDAY_SUBJECT' => "Herzlichen Gl&uuml;ckwunsch zum Geburtstag.",
        'ADMIN_CONFIG_BIRTHDAY_TITLE' => "Einstellungen zu Geburtstagsmails",
-       'ADMIN_BIRTHDAY_POINTS' => "{?POINTS?} als &quot;Geburtstagsgeschenk&quot;",
-       'ADMIN_BIRTHDAY_POINTS_NOTE' => "Wert <strong>0</strong> deaktiviert die Extragutschrift.",
+       'ADMIN_CONFIG_BIRTHDAY_POINTS' => "{?POINTS?} als &quot;Geburtstagsgeschenk&quot;",
+       'ADMIN_CONFIG_BIRTHDAY_POINTS_NOTE' => "Wert <strong>0</strong> deaktiviert die Extragutschrift.",
        'MEMBER_BIRTHDAY_CANNOT_STATUS' => "Kann keine {?POINTS?} gutschreiben! Status Ihres Accounts: <span class=\"data\">%s</span>",
        'MEMBER_BIRTHDAY_CANNOT_LOAD_DATA' => "Entweder haben Sie bereits Ihr Geburtsgeschenk erhalten oder Sie haben heute keinen Geburtstag.",
-       'ADMIN_SELECT_BIRTHDAY_MODE' => "Verg&uuml;tungsmodus der {?POINTS?}",
-       'ADMIN_BIRTHDAY_ONLY_ACTIVE' => "Nur aktive Mitglieder erhalten die Geburtstagsgutschrift?<br /><div class=\"notice\">(Nur in Verbindung mit der Erweiterung <strong>autopurge</strong>!)</div>",
+       'ADMIN_CONFIG_SELECT_BIRTHDAY_MODE' => "Verg&uuml;tungsmodus der {?POINTS?}",
+       'ADMIN_CONFIG_BIRTHDAY_ONLY_ACTIVE' => "Nur aktive Mitglieder erhalten die Geburtstagsgutschrift?<br /><div class=\"notice\">(Nur in Verbindung mit der Erweiterung <strong>autopurge</strong>!)</div>",
 ));
 
 // [EOF]
index e796cd4..d6e58bb 100644 (file)
@@ -44,16 +44,16 @@ if (!defined('__SECURITY')) {
 addMessages(array(
        'MEMBER_BONUS_LOGIN_TOTAL' => "Login-Bonus",
        'MEMBER_BONUS_TURBO_TOTAL' => "Aktiv-Bonus beim Best.",
-       'ADMIN_EDIT_BONUS_SETTINGS' => "Einstellungen an Verg&uuml;tungen",
-       'ADMIN_BONUS_LOGIN_BONUS' => "Bonus f&uuml;r Login",
-       'ADMIN_BONUS_TURBO_BONUS' => "Rang-Bonus f&uuml;r Erst-Klicker",
-       'ADMIN_BONUS_TURBO_RATES' => "Bonus f&uuml;r Klicker 2 bis x",
-       'ADMIN_BONUS_TURBO_RATES_NOTE1' => "Hinweise",
-       'ADMIN_BONUS_TURBO_RATES_NOTE2' => "Stellen Sie zuerst unter <strong>{--ADMIN_BONUS_TURBO_RANKS--}</strong> die Anzahl der Gewinner ein. Lassen Sie dabei den letzten Platz frei.",
-       'ADMIN_BONUS_TURBO_RATES_NOTE3' => "Eintr&auml;ge l&ouml;schen, um Bonus zu entfernen (alle unteren r&uuml;cken beim Speichern nach!)",
-       'ADMIN_BONUS_TURBO_RATES_NOTE4' => "Wenn Sie alle Eintr&auml;ge gel&ouml;scht haben, werden Platz 2 und 3 automatisch neu berechnet.",
-       'ADMIN_CONFIG_LOGIN_TIMEOUT' => "Zeitspanne zwischen zwei Logins",
-       'ADMIN_BONUS_TURBO_RANKS' => "Wie viele Mitglieder sollen die monatliche Auszahlung der Aktiv-Verg&uuml;tung gewinnen k&ouml;nnen?",
+       'ADMIN_CONFIG_BONUS_TITLE' => "Einstellungen an Verg&uuml;tungen",
+       'ADMIN_CONFIG_BONUS_LOGIN' => "Bonus f&uuml;r Login",
+       'ADMIN_CONFIG_BONUS_TURBO' => "Rang-Bonus f&uuml;r Erst-Klicker",
+       'ADMIN_CONFIG_TURBO_RATES' => "Bonus f&uuml;r Klicker 2 bis x",
+       'ADMIN_CONFIG_TURBO_RATES_NOTE1' => "Hinweise",
+       'ADMIN_CONFIG_TURBO_RATES_NOTE2' => "Stellen Sie zuerst unter <strong>{--ADMIN_CONFIG_BONUS_TURBO_RANKS--}</strong> die Anzahl der Gewinner ein. Lassen Sie dabei den letzten Platz frei.",
+       'ADMIN_CONFIG_TURBO_RATES_NOTE3' => "Eintr&auml;ge l&ouml;schen, um Bonus zu entfernen (alle unteren r&uuml;cken beim Speichern nach!)",
+       'ADMIN_CONFIG_TURBO_RATES_NOTE4' => "Wenn Sie alle Eintr&auml;ge gel&ouml;scht haben, werden Platz 2 und 3 automatisch neu berechnet.",
+       'ADMIN_CONFIG_BONUS_LOGIN_TIMEOUT' => "Zeitspanne zwischen zwei Logins",
+       'ADMIN_CONFIG_BONUS_TURBO_RANKS' => "Wie viele Mitglieder sollen die monatliche Auszahlung der Aktiv-Verg&uuml;tung gewinnen k&ouml;nnen?",
        'ADMIN_BONUS_NO_ACTIVE_RALLYE' => "Niemand nimmt an der Aktiv-Rallye dran teil.",
        'MEMBER_SHOW_TURBO_BONUS_LINK' => "Sehen Sie hier nach, wer alles schon best&auml;tigt hat...",
        'BONUS_SHOW_WRONG_CALL' => "Falscher Aufruf des Scriptes, bitte nur aus dem Best&auml;tigungsframe aufrufen.",
@@ -84,18 +84,18 @@ addMessages(array(
        'ADMIN_CONFIG_BONUS_USERID' => "Mitgliedskonto zum Abbuchen der {?POINTS?}",
        'ADMIN_CONFIG_BONUS_TIMEOUT' => "Verweildauer von Aktiv-Bonus-Eintr&auml;gen",
        'ADMIN_LIST_BONUS_RALLYE_TITLE' => "Alle an der Aktiv-Rallye teilnehmenden Mitglieder:",
-       'ADMIN_BONUS_TURBO_LINES' => "Anzahl angezeigter Aktiv-Bonus-Empf&auml;nger in <strong>show_bonus.php</strong>",
+       'ADMIN_CONFIG_BONUS_TURBO_LINES' => "Anzahl angezeigter Aktiv-Bonus-Empf&auml;nger in <strong>show_bonus.php</strong>",
        'ADMIN_SEND_BONUS_MAILS' => "Versenden von Bonus-Mails",
        'ADMIN_SEND_BONUS_NORMAL' => "Text-Mail versenden",
        'ADMIN_SEND_BONUS_HTML' => "HTML-Mail versenden",
        'ADMIN_SEND_BONUS_NORMAL_NOTES' => "Standard Text-Mail an Ihre Mitglieder aussenden.",
        'ADMIN_SEND_BONUS_HTML_NOTES' => "HTML-Mail an Ihre Mitglieder versenden. Dazu muss die Erweiterung <span class=\"data\">html_mail</span> jedoch installiert sein.",
-       'ADMIN_BONUS_ORDER_BONUS' => "Bonus f&uuml;r eine Mailbuchung",
-       'ADMIN_BONUS_REFERAL_BONUS' => "Bonus f&uuml;r das Werben eines weiteren Mitgliedes",
-       'ADMIN_BONUS_STATS_BONUS' => "Einmalige Bonus bei Erreichen von 100% Klickrate auf eine Mailbuchung (=<span class=\"tiny\">Statistik-Bonus</span>)",
-       'ADMIN_BONUS_TURBO_BONUS_TITLE' => "Bonus-{?POINTS?} f&uuml;r best&auml;tigte Mails",
-       'ADMIN_BONUS_TURBO_TIMEOUT_TITLE' => "Zeitabst&auml;nde und Aufbewahrungszeiten",
-       'ADMIN_BONUS_TURBO_MISC_TITLE' => "Sonstige Einstellungen zur Bonus-Erweiterung",
+       'ADMIN_CONFIG_BONUS_ORDER' => "Bonus f&uuml;r eine Mailbuchung",
+       'ADMIN_CONFIG_BONUS_REFERAL' => "Bonus f&uuml;r das Werben eines weiteren Mitgliedes",
+       'ADMIN_CONFIG_BONUS_STATS' => "Einmalige Bonus bei Erreichen von 100% Klickrate auf eine Mailbuchung (=<span class=\"tiny\">Statistik-Bonus</span>)",
+       'ADMIN_CONFIG_BONUS_TURBO_TITLE' => "Bonus-{?POINTS?} f&uuml;r best&auml;tigte Mails",
+       'ADMIN_CONFIG_BONUS_TURBO_TIMEOUT_TITLE' => "Zeitabst&auml;nde und Aufbewahrungszeiten",
+       'ADMIN_CONFIG_BONUS_TURBO_MISC_TITLE' => "Sonstige Einstellungen zur Bonus-Erweiterung",
        'MEMBER_BONUS_REFERAL_TOTAL' => "Referal-Bonus",
        'MEMBER_BONUS_ORDER_TOTAL' => "Mailbestellungsbonus",
        'MEMBER_BONUS_STATS_TOTAL' => "100%-Klickratebonus",
@@ -105,16 +105,16 @@ addMessages(array(
        'MEMBER_BONUS_LOGIN_BONUS_NOT_ADDED' => "Login-Bonus nicht verg&uuml;tet.",
        'ADMIN_LIST_UNCONFIRMED_BONUS_LINKS' => "Unbest. Bonus-Mail",
        'ADMIN_BONUS_MAIL_ALREADY_DELETED' => "Bonus-Mail bereits gel&ouml;scht.",
-       'ADMIN_ACTIVATE_BONUS_SETTINGS' => "Einstellungen an der Aktiv-Rallye",
+       'ADMIN_CONFIG_BONUS_RALLYE_TITLE' => "Einstellungen an der Aktiv-Rallye",
        'ADMIN_TOTAL_MEMBER_BONUS' => "Gesamtbonus aller teilnehmenden Mitglieder",
        'ADMIN_BONUS_RALLYE_DEACTIVATED' => "Aktiv-Rallye deaktiviert.",
-       'ADMIN_BONUS_RALLYE_NOTIFTICATIONS' => "Benachrichtigungen per Mail &uuml;ber Bonus-Rallye",
-       'ADMIN_BONUS_RALLYE_ENABLE_NOTIFY' => "Sollen die Mitglieder bei Aktivierung benachtichtigt werden?",
-       'ADMIN_BONUS_RALLYE_DISABLE_NOTIFY' => "Sollen die Mitglieder bei Deaktivierung benachtichtigt werden?",
-       'ADMIN_BONUS_RALLYE_NOTIFY_POINTS' => "Bonus-Mail mit Anzahl {?POINTS?} aussenden, wenn Bonus-Rallye aktiviert wurde. <div class=\"tiny\">(0 = Unverg&uuml;tete Benachrichtigung aussenden)</div>",
-       'ADMIN_BONUS_RALLYE_NEW_MEMBER_NOTIFY' => "Sollen neue Mitglieder mit selber Mail &uuml;ber eine laufende Bonus-Rallye benachrichtigt werden?",
-       'ADMIN_BONUS_RALLYE_NOTIFY_WAIT' => "Wie lange soll die Wartezeit der Bonus-Mail sein?",
-       'ADMIN_BONUS_INCLUDE_OWN' => "Soll Ihre Mitglieder-Id an der Aktiv-Rallye dran teilnehmen?",
+       'ADMIN_CONFIG_BONUS_RALLYE_NOTIFTICATIONS' => "Benachrichtigungen per Mail &uuml;ber Bonus-Rallye",
+       'ADMIN_CONFIG_BONUS_RALLYE_ENABLE_NOTIFY' => "Sollen die Mitglieder bei Aktivierung benachtichtigt werden?",
+       'ADMIN_CONFIG_BONUS_RALLYE_DISABLE_NOTIFY' => "Sollen die Mitglieder bei Deaktivierung benachtichtigt werden?",
+       'ADMIN_CONFIG_BONUS_RALLYE_NOTIFY_POINTS' => "Bonus-Mail mit Anzahl {?POINTS?} aussenden, wenn Bonus-Rallye aktiviert wurde. <div class=\"tiny\">(0 = Unverg&uuml;tete Benachrichtigung aussenden)</div>",
+       'ADMIN_CONFIG_BONUS_RALLYE_NEW_MEMBER_NOTIFY' => "Sollen neue Mitglieder mit selber Mail &uuml;ber eine laufende Bonus-Rallye benachrichtigt werden?",
+       'ADMIN_CONFIG_BONUS_RALLYE_NOTIFY_WAIT' => "Wie lange soll die Wartezeit der Bonus-Mail sein?",
+       'ADMIN_CONFIG_BONUS_RALLYE_INCLUDE_ONW' => "Soll Ihre Mitglieder-Id an der Aktiv-Rallye dran teilnehmen?",
        'ADMIN_NOTIFCATION_TITLE' => "Ausgesendete Benachrichtigungen",
        'ADMIN_DELETE_NOTIFY_MAIL' => "Obrige Benachrichtigung entfernen",
        'ADMIN_NOTIFY_MAIL_ALREADY_DELETED' => "Benachrichtigung bereits entfernt.",
@@ -122,12 +122,12 @@ addMessages(array(
        'ADMIN_NO_NOTIFICATIONS' => "Keine Benachrichtigungen gefunden.",
 
 // Switches
-       'ADMIN_BONUS_RALLYE_IS_ACTIVE'     => "Ist die Aktiv-Rallye aktiv?",
-       'ADMIN_BONUS_RALLYE_LOGIN_INCLUDE' => "Login-Bonus in monatlicher Auswertung mit einschliessen?",
-       'ADMIN_BONUS_RALLYE_ORDER_INCLUDE' => "Mailbuchungsbonus in monatlicher Auswertung mit einschliessen?",
-       'ADMIN_BONUS_RALLYE_STATS_INCLUDE' => "Statistik-Bonus in monatlicher Auswertung mit einschliessen?",
-       'ADMIN_BONUS_RALLYE_CLICK_INCLUDE' => "Mailbest&auml;tigungsbonus in monatlicher Auswertung mit einschliessen?",
-       'ADMIN_BONUS_RALLYE_REFERAL_INCLUDE'   => "Referal-Bonus in monatlicher Auswertung mit einschliessen?",
+       'ADMIN_CONFIG_BONUS_RALLYE_IS_ACTIVE'     => "Ist die Aktiv-Rallye aktiv?",
+       'ADMIN_CONFIG_BONUS_RALLYE_LOGIN_INCLUDE' => "Login-Bonus in monatlicher Auswertung mit einschliessen?",
+       'ADMIN_CONFIG_BONUS_RALLYE_ORDER_INCLUDE' => "Mailbuchungsbonus in monatlicher Auswertung mit einschliessen?",
+       'ADMIN_CONFIG_BONUS_RALLYE_STATS_INCLUDE' => "Statistik-Bonus in monatlicher Auswertung mit einschliessen?",
+       'ADMIN_CONFIG_BONUS_RALLYE_CLICK_INCLUDE' => "Mailbest&auml;tigungsbonus in monatlicher Auswertung mit einschliessen?",
+       'ADMIN_CONFIG_BONUS_RALLYE_REFERAL_INCLUDE'   => "Referal-Bonus in monatlicher Auswertung mit einschliessen?",
 
 // Header
        'MEMBER_MAIL_BONUS_DETAILS_TITLE' => "Details zur Bonusmail <span class=\"data\">%s</span>:",
index 8b1546a..7c1a6d3 100644 (file)
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Language definitions
 addMessages(array(
        // Admin - Configuration
-       'ADMIN_CONFIG_COUPON_SETTINGS_TITLE' => "Allgemeine Einstellungen zu den Gutscheinen",
+       'ADMIN_CONFIG_COUPON_TITLE' => "Allgemeine Einstellungen zu den Gutscheinen",
        'ADMIN_CONFIG_COUPON_DEFAULT_TIME' => "Zeit, bis Gutscheine ablaufen sollen. Sie k&ouml;nnen diesen Ausgangswert beim Erstellen von neuen Gutscheinen nachtr&auml;glich anpassen.",
        'ADMIN_CONFIG_COUPON_DEFAULT_POINTS' => "Ausgangsverg&uuml;tung in {?POINTS?}. Sie k&ouml;nnen diesen Ausgangswert beim Erstellen von neuen Gutscheinen nachtr&auml;glich anpassen.",
        'ADMIN_CONFIG_COUPON_AUTOPURGE_TIME' => "Dauer bis abgelaufene Gutscheine aus der Datenbank entfernt werden",
index c9ac224..8df092c 100644 (file)
@@ -201,7 +201,7 @@ addMessages(array(
        'ENTER_EMAIL' => "Bitte geben Sie Ihre Email-Adresse ein! Diese muss auch erreichbar sein.",
        'ENTER_SURNAME' => "Bitte geben Sie Ihren Vornamen ein.",
        'ENTER_FAMILY' => "Bitte geben Sie Ihren Nachnamen ein.",
-       'ADMIN_CONFIG_SECURITY_SETTINGS_TITLE' => "&Auml;ndern von sicherheits-relevanten Einstellungen",
+       'ADMIN_CONFIG_SECURITY_TITLE' => "&Auml;ndern von sicherheits-relevanten Einstellungen",
        'ADMIN_CONFIG_MIN_PASS_LENGTH' => "Minimale Passwortl&auml;nge",
        'SETTINGS_NOT_SAVED' => "Einstellungen NICHT gespeichert / ge&auml;ndert.",
        'SETTINGS_SAVED' => "Einstellungen gespeichert.",
@@ -209,7 +209,7 @@ addMessages(array(
        'ADMIN_ACTION_INVALID' => "Die action/what-Kombination <span class=\"data\">%s</span> ist ung&uuml;ltig.",
        'GUEST_SHORT_PASS' => "Das eingegebene Passwort ist nach unseren Sicherheitseinstellungen zu kurz. Mindestl&auml;nge ist",
        'GUEST_EMPTY_PASSWORD_HINT' => "Lassen Sie beide Passw&ouml;rter leer, so wird Ihnen eines per Zufall generiert.",
-       'ADMIN_EDIT_POINTS_SETTINGS_TITLE' => "&Auml;ndern der Willkommensgutschrift und anderer {?POINTS?}",
+       'ADMIN_CONFIG_POINTS_SETTINGS_TITLE' => "&Auml;ndern der Willkommensgutschrift und anderer {?POINTS?}",
        'ADMIN_ENTER_POINTS_REGISTER' => "Willkommensgutschrift",
        'ADMIN_ENTER_POINTS_REFERAL' => "Einmalige Referal-Gutschrift",
        'CHOOSE_MORE_CATEGORIES' => "Bitte w&auml;hlen Sie mehr Kategorien aus! Minimum ist: <span class=\"data\">{?least_cats?}</span>",
@@ -695,13 +695,6 @@ addMessages(array(
        'GUEST_REQUEST_CONFIRM_LINK_SUBJECT' => "Anforderung Ihres Best&auml;tigunglinkes",
        'EMAIL_404' => "Unter der angegebenen E-Mail Adresse konnten wir keinen Account finden! Bitte versuchen Sie es erneut.",
        'SELECT_NONE' => "Keine/s/r",
-       'ADMIN_CONFIG_STATS_TITLE' => "Einstellungen an den Gast-Statistiken",
-       'ADMIN_GSTATS_MEMBERS' => "Mitglieder-Statistik zuerst",
-       'ADMIN_GSTATS_MODULES' => "TOP10-Modul-Statistik zuerst",
-       'ADMIN_GSTATS_INACTIVE' => "Gast-Statistik deaktivieren",
-       'ADMIN_GSTATS_MEMBERS_NOTE' => "Die Mitglieder-Statistik zeigt an, wie viele Mitglieder Ihr {?mt_word?} hat und wie viele Mitglieder welche Kategorien ausgew&auml;hlt haben.",
-       'ADMIN_GSTATS_MODULES_NOTE' => "Zeigt Klicks in den 10 am h&auml;ufigsten angeklickten Gast- und Mitgliedsmodulen an.",
-       'ADMIN_GSTATS_INACTIVE_NOTE' => "Deaktiviert die Gast-Statistiken komplett.",
        'ADMIN_DELETE_PAYMENT_TITLE' => "Mailverg&uuml;tungen l&ouml;schen",
        'ADMIN_CONFIG_REFERAL_PAYOUT' => "Wie viele Mails m&uuml;ssen die Mitglieder mindestens best&auml;tigen, um den Willkommensbonus, einmaliger Referal-Bonus usw. gutgeschrieben zu bekommen?",
        'ADMIN_EXTENSION_UPDATED' => "Erweiterung aktualisiert.",
@@ -743,7 +736,8 @@ addMessages(array(
        'ADMIN_PASS2' => "Passwortbest&auml;tigung",
        'ADMIN_EDIT_USER_PROFILE' => "Editieren eines Mitgliederaccountes",
        'ADMIN_EDIT_USER_PASSWORD_NOTE' => "Geben Sie nur zweimal das Passwort ein, wenn Sie es &auml;ndern wollen. Wollen Sie nur Daten &auml;ndern, geben Sie bitte keines ein.",
-       'POINTS_LOCKED' => "Noch wartende {?POINTS?}",
+       'LOCKED_POINTS' => "Noch wartende {?POINTS?}",
+       'OWN_POINTS' => "Eigenes Guthaben",
        'ADMIN_TASK_INFOS' => "Infos",
        'NICKNAME' => "Nickname",
        'EXT_NICKNAME_404' => "Erweiterung <span class=\"data\">nickname</span> fehlt.",
@@ -761,14 +755,14 @@ addMessages(array(
        'EMAILS_PAGENAV' => "Seite",
        '_IS_CURRENT_HOME' => "Liegt in Home",
        '_IS_NEW_HOME' => "In Home setzen",
-       'ADMIN_CONFIG_SET_HOME' => "Legen Sie hier die neue Home-Seite fest",
+       'ADMIN_CONFIG_HOME_TITLE' => "Legen Sie hier die neue Home-Seite fest",
        'ADMIN_HOME_ACTION' => "Funktion",
-       'ADMIN_CONFIG_SET_HOME_NOTE' => "Es werden nur aktive Men&uuml;punkte aus dem Gasthauptmen&uuml; (main) angezeigt.",
+       'ADMIN_CONFIG_HOME_NOTE' => "Es werden nur aktive Men&uuml;punkte aus dem Gasthauptmen&uuml; (main) angezeigt.",
        'ADMIN_EDIT' => "&Auml;ndern",
        'ADMIN_EDIT_EXTENSIONS' => "&Auml;ndern von Erweiterungen",
        'ONLINE_TIMEOUT_IS' => "Die Liste zeigt die Besucher der letzten <span class=\"data\">{%config,createFancyTime=online_timeout%}</span> an.",
-       'ADMIN_CONFIG_EXTENSIONS_SETTINGS' => "Erweiterungs-Management konfigurieren",
-       'ADMIN_VERBOSE_SQL' => "SQL-Anweisungen beim Registrieren/Updates/Entfernen ausgeben",
+       'ADMIN_CONFIG_EXTENSIONS_TITLE' => "Erweiterungs-Management konfigurieren",
+       'ADMIN_CONFIG_EXTENSIONS_VERBOSE_SQL' => "SQL-Anweisungen beim Registrieren/Updates/Entfernen ausgeben",
        'ADMIN_REMOVING_THESE_EXTENSIONS' => "Diese Erweiterungen werden deinstalliert",
        'ADMIN_REMOVE_EXTENSIONS' => "Erweiterungen jetzt entfernen",
        'ADMIN_SQLS_EXECUTED_ON_REMOVAL' => "Beim Entfernen ausgef&uuml;hrte SQL-Anweisungen",
@@ -793,10 +787,10 @@ addMessages(array(
        'ADMIN_TEXT_LOCK_ACCOUNT' => "M&ouml;chten Sie das Mitglied <span class=\"data\">%s</span> nun sperren? Bitte geben Sie einen Grund der Sperrung mit an.",
        'ADMIN_TEXT_UNLOCK_ACCOUNT' => "M&ouml;chten Sie das Mitglied <span class=\"data\">%s</span> nun freischalten? Sie k&ouml;nnen auch optional einen Text mit angeben.",
        'ADMIN_TEXT_DELETE_ACCOUNT' => "M&ouml;chten Sie das Mitglied <span class=\"data\">%s</span> nun <strong>unwiederruflich</strong> l&ouml;schen? Bitte geben Sie einen Grund der L&ouml;schung mit an.",
-       'ADMIN_EDIT_HOME_TARGET' => "Home-Seite festlegen",
+       'ADMIN_CONFIG_HOME_TARGET' => "Home-Seite festlegen",
        'ADMIN_CONFIG_HOME_SETTINGS_TITLE' => "Einstellungen an Eingangsseite",
-       'ADMIN_EDIT_HOME_SETTINGS' => "Einstellungen an der Eingangsseite",
-       'ADMIN_CONFIG_HOME_TITLE' => "Einstellungen an der Home-Seite",
+       'ADMIN_CONFIG_HOME_SETTINGS' => "Einstellungen an der Eingangsseite",
+       'ADMIN_CONFIG_HOME_MAIN_TITLE' => "Einstellungen an der Home-Seite",
        'ADMIN_CONFIG_INDEX_DELAY' => "Verz&ouml;gerung bevor weitergeleitet wird",
        'ADMIN_INDEX_MANUAL_FORWARD' => "Klicken leitet weiter (kein JavaScript)",
        'ADMIN_INDEX_NO_DELAY' => "Sofort weiterleiten (302 Server-Redirect)",
@@ -805,10 +799,10 @@ addMessages(array(
        'BONUS_EXTENSION_UPGRADE' => "Bitte aktualisieren Sie Ihre Bonus-Erweiterung auf Version <span class=\"data\">v0.2.2</span> oder neuer.",
        '_ON' => "an",
        'MEMBER_CLICK_STATISTICS' => "Mail-Statistik",
-       'ADMIN_SELECT_DEFAULT_REFID' => "Standard Referal-Id bei Anmeldung &uuml;ber <strong>keinen</strong> Ref-Link",
-       'ADMIN_SELECT_REFID_TARGRT' => "Ziel-Seite des Referal-Linkes",
-       'ADMIN_REFERAL_TARGET_REGISTER' => "Zur Anmeldeseite",
-       'ADMIN_REFERAL_TARGET_INDEX' => "Zur Eingangsseite",
+       'ADMIN_CONFIG_SELECT_DEFAULT_REFID' => "Standard Referal-Id bei Anmeldung &uuml;ber <strong>keinen</strong> Ref-Link",
+       'ADMIN_CONFIG_SELECT_REFID_TARGRT' => "Ziel-Seite des Referal-Linkes",
+       'ADMIN_CONFIG_REFERAL_TARGET_REGISTER' => "Zur Anmeldeseite",
+       'ADMIN_CONFIG_REFERAL_TARGET_INDEX' => "Zur Eingangsseite",
        'ADMIN_INSTALL_THEME' => "Theme importieren",
        'ADMIN_NO_THEMES_FOUND' => "Keine Themes gefunden.",
        'THEME_UNIX' => "Uni*-Name",
@@ -918,11 +912,11 @@ addMessages(array(
        'ADMIN_LOGOUT_QUESTION' => "Wollen Sie sich jetzt ausloggen?",
        'ADMIN_LA_MODE' => "Men&uuml;typ",
        'ADMIN_ACCOUNT_NOREFS_404' => "Es wurden keine Mitgliederaccounts ohne Werber gefunden, oder ver&auml;ndern Sie die Aussortierung.",
-       'ADMIN_SALT_LENGTH' => "L&auml;nge des Zufallshashes f&uuml;r alle Passw&ouml;rter",
+       'ADMIN_CONFIG_SALT_LENGTH' => "L&auml;nge des Zufallshashes f&uuml;r alle Passw&ouml;rter",
        'MEMBER_PASS_SALTED' => "Passwort wegen Update ge&auml;ndert",
        'MEMBER_PASSWORD_ERROR' => "Fehler beim Abgleichen der Passw&ouml;rter.",
        'ADMIN_PASS_SALTED' => "Admin-Password wegen Update ge&auml;ndert",
-       'ADMIN_SALT_LENGTH_NOTE' => "Um f&uuml;r alle Accounts (Mitglieder/Admins derzeit) neue Passw&ouml;rter zu generieren, lassen Sie das Eingabefeld <strong>{--ADMIN_SALT_LENGTH--}</strong> leer oder geben Sie eine <strong>0</strong> ein! <strong>Vorsicht!</strong> Sie m&uuml;ssen sich dann anschliessend erneut einloggen.",
+       'ADMIN_CONFIG_SALT_LENGTH_NOTE' => "Um f&uuml;r alle Accounts (Mitglieder/Admins derzeit) neue Passw&ouml;rter zu generieren, lassen Sie das Eingabefeld <strong>{--ADMIN_CONFIG_SALT_LENGTH--}</strong> leer oder geben Sie eine <strong>0</strong> ein! <strong>Vorsicht!</strong> Sie m&uuml;ssen sich dann anschliessend erneut einloggen.",
        'GUEST_LOGIN_FAILED_GENERAL' => "Genereller Loginfehler! Bitte kontaktieren Sie den Webmaster.",
        'DEFAULT_MT_WORD' => "Mailtausch",
        'DEFAULT_MT_WORD2' => "Mailtausches",
@@ -1034,7 +1028,7 @@ addMessages(array(
        'ADMIN_LIST_NOREFS_ACCOUNTS' => "Auflistung aller Accounts ohne Werber",
        'ADMIN_NO_REFERAL_LEVELS' => "In Ihrem {?mt_word?} sind keine Referal-Ebenen eingerichtet! Ihre Mitglieder erhalten <u>keine</u> {?POINTS?} gutgeschrieben. Richten Sie mindestens Referal-Ebene 0 mit 100% Verg&uuml;tung ein.",
        'ADMIN_SESSION_SAVE_PATH_INVALID' => "Pfad f&uuml;r Sitzungsdateien ung&uuml;tig.",
-       'ADMIN_CONFIG_SESSION_SETTINGS_TITLE' => "Einstellungen zum Sitzungsmanagement",
+       'ADMIN_CONFIG_SESSION_TITLE' => "Einstellungen zum Sitzungsmanagement",
        'ADMIN_CONFIG_SESSION_SAVE_PATH' => "Speicherpfad f. Sitzungsdateien",
        'ADMIN_BASE_PATH' => "Absoluter Server-Pfad",
        'ADMIN_SESSION_SAVE_PATH_NOTE' => "Sie sollten f&uuml;r Sitzungsdateien einen Pfad w&auml;hlen der ausserhalb des Server-Pfades liegt, da sonst eventuell die Sitzungsdateien vom Web erreichbar sind, was ein hohes Sicherheitsrisiko darstellt.",
@@ -1043,11 +1037,11 @@ addMessages(array(
        'EMAIL_DETAILS' => "Email-Details",
        'EMAIL_DETAILS_LINK' => "Details anzeigen",
        'ADMIN_CONFIG_REFID_TITLE' => "Einstellungen zum Referal-Link",
-       'ADMIN_RANDOM_ZERO_REFID' => "Soll per Zufall ein Mitglied ausgw&auml;hlt werden oder soll die oben eingestellte Standard-Refid verwendet werden?",
-       'ADMIN_RANDOM_REFID_ENABLED' => "Mitglieder per Zufall w&auml;hlen",
-       'ADMIN_RANDOM_REFID_DISABLED' => "Voreingestellte Referal-Id setzen",
+       'ADMIN_CONFIG_RANDOM_ZERO_REFID' => "Soll per Zufall ein Mitglied ausgw&auml;hlt werden oder soll die oben eingestellte Standard-Refid verwendet werden?",
+       'ADMIN_CONFIG_RANDOM_REFID_ENABLED' => "Mitglieder per Zufall w&auml;hlen",
+       'ADMIN_CONFIG_RANDOM_REFID_DISABLED' => "Voreingestellte Referal-Id setzen",
        'ADMIN_CONFIG_RANDOM_REFID_TITLE' => "Kriterien wonach ein Mitglied als Zufallsreferal ausgew&auml;hlt wird:",
-       'ADMIN_RANDOM_MIN_CONFIRMED' => "Wie viele Mails muss ein Mitglied mindestens best&auml;tigt haben, um per Zufall ausgew&auml;hlt zu werden?",
+       'ADMIN_CONFIG_RANDOM_MIN_CONFIRMED' => "Wie viele Mails muss ein Mitglied mindestens best&auml;tigt haben, um per Zufall ausgew&auml;hlt zu werden?",
        'ADMIN_CONFIG_REFID_NOTICE' => "Sobald ein Mitglied ausgew&auml;hlt wurde, werden die Z&auml;hler aller Mitglieder auf Null gesetzt. Dies soll Chancengleichheit bringen und dass die Mitglieder mehr Mails abklicken.",
        'EMAILS_RECEIVED' => "Emails empfangen",
        'MAILS_CONFIRMED' => "Emails best&auml;tigt",
@@ -1165,6 +1159,15 @@ addMessages(array(
        // Points account
        'ADMIN_CONFIG_POINTS_ACCOUNT_ORDER' => "Dem Werbekonto gutschreiben.",
        'ADMIN_CONFIG_POINTS_ACCOUNT_GENERAL' => "Dem allgemeinen Konto gutschreiben.",
+
+       // Admin - Guest statistics
+       'ADMIN_CONFIG_GUEST_STATS_TITLE' => "Einstellungen an den Gast-Statistiken",
+       'ADMIN_CONFIG_GUEST_STATS_MEMBERS' => "Mitglieder-Statistik zuerst",
+       'ADMIN_CONFIG_GUEST_STATS_MEMBERS_NOTE' => "Die Mitglieder-Statistik zeigt an, wie viele Mitglieder Ihr {?mt_word?} hat und wie viele Mitglieder welche Kategorien ausgew&auml;hlt haben.",
+       'ADMIN_CONFIG_GUEST_STATS_MODULES' => "TOP10-Modul-Statistik zuerst",
+       'ADMIN_CONFIG_GUEST_STATS_MODULES_NOTE' => "Zeigt Klicks in den 10 am h&auml;ufigsten angeklickten Gast- und Mitgliedsmodulen an.",
+       'ADMIN_CONFIG_GUEST_STATS_INACTIVE' => "Gast-Statistik deaktivieren",
+       'ADMIN_CONFIG_GUEST_STATS_INACTIVE_NOTE' => "Deaktiviert die Gast-Statistiken komplett.",
 ));
 
 // Description of all months
index 802ec4c..23668dd 100644 (file)
@@ -42,26 +42,26 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 addMessages(array(
-       'ADMIN_EDIT_DOUBLER_SETTINGS' => "Einstellungen am {?POINTS?}-Verdoppler",
-       'ADMIN_DOUBLER_CHARGE' => "Prozentuale Geb&uuml;hr zum Verdoppeln",
-       'ADMIN_DOUBLER_JACKPOT' => "Soll der Jackpot zum Verdoppeln verwendet werden?",
-       'ADMIN_DOUBLER_SEND_MODE' => "Aussendemodus der Benachrichtigungsmails",
-       'ADMIN_DOUBLER_SEND_DIRECT' => "Aussenden, sobald gen&uuml;gend {?POINTS?} zur Auszahlung der Verdoppelung bereit stehen.",
-       'ADMIN_DOUBLER_SEND_RESET' => "Erst beim t&auml;glichen Reset pr&uuml;fen, ob Verdoppelungen ausgezahlt werden k&ouml;nnen.",
-       'ADMIN_DOUBLER_TIMEOUT' => "Verweildauer ausgezahlter Verdoppelungen in der Datenbank",
-       'ADMIN_DOUBLER_USERID' => "Mitglieder-Account zur Verdoppelung verwenden",
-       'ADMIN_DOUBLER_DISPLAY_SETTINGS' => "Anzeige-Einstellungen f&uuml;r Anzahl Eintr&auml;ge",
-       'ADMIN_DOUBLER_DISPLAY_NEW' => "Anzahl ersten X neuen Eintr&auml;ge",
-       'ADMIN_DOUBLER_DISPLAY_PAY' => "Anzahl ersten X vor Auszahlung stehender Verdoppelungen",
-       'ADMIN_DOUBLER_DISPLAY_OLD' => "Anzahl ersten X bereits ausgezahlter Verdoppelungen",
-       'ADMIN_DOUBLER_REFERAL' => "Prozentuale Referal-Verg&uuml;tung",
-       'ADMIN_DOUBLER_MINIMUM' => "Minimum {?POINTS?} die verdoppelt werden sollen",
-       'ADMIN_DOUBLER_MAXIMUM' => "Maximum {?POINTS?} die verdoppelt werden sollen",
-       'ADMIN_DOUBLER_LEFT' => "Auf dem Mitgliedsaccount nach Verdoppelung Minimum-{?POINTS?}-Guthaben",
-       'ADMIN_DOUBLER_OWN' => "{?POINTS?}-Guthaben des Verdopplers zur Auszahlung verwenden",
-       'ADMIN_DOUBLER_GROUP_SENT' => "Auf Anzahl durchf&uuml;hrbare Auszahlungen warten, damit an diese ausgezahlt werden kann. (Gruppenauszahlung!)",
-       'ADMIN_DOUBLER_MAX_SENT' => "Pro Klick/Reset auf Auszahlungsf&auml;higkeit hin zu testende Verdopplungen",
-       'ADMIN_DOUBLER_SENT_ALL' => "Soll anstelle der Gruppenauszahlung alle m&ouml;glichen Auszahlungen durchgef&uuml;hrt werden?",
+       'ADMIN_CONFIG_DOUBLER_TITLE' => "Einstellungen am {?POINTS?}-Verdoppler",
+       'ADMIN_CONFIG_DOUBLER_CHARGE' => "Prozentuale Geb&uuml;hr zum Verdoppeln",
+       'ADMIN_CONFIG_DOUBLER_JACKPOT' => "Soll der Jackpot zum Verdoppeln verwendet werden?",
+       'ADMIN_CONFIG_DOUBLER_SEND_MODE' => "Aussendemodus der Benachrichtigungsmails",
+       'ADMIN_CONFIG_DOUBLER_SEND_DIRECT' => "Aussenden, sobald gen&uuml;gend {?POINTS?} zur Auszahlung der Verdoppelung bereit stehen.",
+       'ADMIN_CONFIG_DOUBLER_SEND_RESET' => "Erst beim t&auml;glichen Reset pr&uuml;fen, ob Verdoppelungen ausgezahlt werden k&ouml;nnen.",
+       'ADMIN_CONFIG_DOUBLER_TIMEOUT' => "Verweildauer ausgezahlter Verdoppelungen in der Datenbank",
+       'ADMIN_CONFIG_DOUBLER_USERID' => "Mitglieder-Account zur Verdoppelung verwenden",
+       'ADMIN_CONFIG_DOUBLER_DISPLAY_TITLE' => "Anzeige-Einstellungen f&uuml;r Anzahl Eintr&auml;ge",
+       'ADMIN_CONFIG_DOUBLER_DISPLAY_NEW' => "Anzahl ersten X neuen Eintr&auml;ge",
+       'ADMIN_CONFIG_DOUBLER_DISPLAY_PAY' => "Anzahl ersten X vor Auszahlung stehender Verdoppelungen",
+       'ADMIN_CONFIG_DOUBLER_DISPLAY_OLD' => "Anzahl ersten X bereits ausgezahlter Verdoppelungen",
+       'ADMIN_CONFIG_DOUBLER_REFERAL' => "Prozentuale Referal-Verg&uuml;tung",
+       'ADMIN_CONFIG_DOUBLER_MINIMUM' => "Minimum {?POINTS?} die verdoppelt werden sollen",
+       'ADMIN_CONFIG_DOUBLER_MAXIMUM' => "Maximum {?POINTS?} die verdoppelt werden sollen",
+       'ADMIN_CONFIG_DOUBLER_LEFT' => "Auf dem Mitgliedsaccount nach Verdoppelung Minimum-{?POINTS?}-Guthaben",
+       'ADMIN_CONFIG_DOUBLER_OWN' => "{?POINTS?}-Guthaben des Verdopplers zur Auszahlung verwenden",
+       'ADMIN_CONFIG_DOUBLER_GROUP_SENT' => "Auf Anzahl durchf&uuml;hrbare Auszahlungen warten, damit an diese ausgezahlt werden kann. (Gruppenauszahlung!)",
+       'ADMIN_CONFIG_DOUBLER_MAX_SENT' => "Pro Klick/Reset auf Auszahlungsf&auml;higkeit hin zu testende Verdopplungen",
+       'ADMIN_CONFIG_DOUBLER_SENT_ALL' => "Soll anstelle der Gruppenauszahlung alle m&ouml;glichen Auszahlungen durchgef&uuml;hrt werden?",
        'ADMIN_DOUBLER_LIST_OVERVIEW' => "Auflistung der Verdoppelungen - &Uuml;bersichtsseite",
        'ADMIN_DOUBLER_LIST_ALREADY' => "Bereits get&auml;tigte Auszahlungen",
        'ADMIN_DOUBLER_LIST_WAITING' => "Wartene Auszahlungen",
index 205aec3..84eaab4 100644 (file)
@@ -53,13 +53,13 @@ addMessages(array(
        'ADMIN_HOLIDAY_DELETE_LINK' => "Urlaub beenden",
        'ADMIN_HOLIDAY_SINGLE_DELETED' => "Urlaub eines Mitgliedes beendet.",
        'ADMIN_HOLIDAY_MULTI_DELETE' => "Urlaub von <span class=\"data\">%s</span> Mitglied(-ern) beendet.",
-       'ADMIN_HOLIDAY_CONFIG_HEADER' => "Einstellungen an der Urlaubsschaltung",
-       'ADMIN_HOLIDAY_MAX_HOLIDAY' => "Maximale beantragbare Urlaubszeit",
+       'ADMIN_CONFIG_HOLIDAY_TITLE' => "Einstellungen an der Urlaubsschaltung",
+       'ADMIN_CONFIG_HOLIDAY_MAX_TIME' => "Maximale beantragbare Urlaubszeit",
        'ADMIN_HOLIDAY_SINGLE_404' => "Urlaubsschaltung nicht mehr vorhanden, oder veralteter Link.",
-       'ADMIN_HOLIDAY_LOCKED' => "Dauer bis Urlaubsschaltung aufgehoben werden kann",
-       'ADMIN_HOLIDAY_MODE' => "Zeitpunkt der Abarbeitung der Urlaubsschaltungen",
-       'ADMIN_HOLIDAY_MODE_RESET' => "Am t&auml;glichen Reset um 00:00 Uhr",
-       'ADMIN_HOLIDAY_MODE_DIRECT' => "Sofort nach Beantragung pr&uuml;fen",
+       'ADMIN_CONFIG_HOLIDAY_LOCKED' => "Dauer bis Urlaubsschaltung aufgehoben werden kann",
+       'ADMIN_CONFIG_HOLIDAY_MODE' => "Zeitpunkt der Abarbeitung der Urlaubsschaltungen",
+       'ADMIN_CONFIG_HOLIDAY_MODE_RESET' => "Am t&auml;glichen Reset um 00:00 Uhr",
+       'ADMIN_CONFIG_HOLIDAY_MODE_DIRECT' => "Sofort nach Beantragung pr&uuml;fen",
        // Member strings
        'MEMBER_HOLIDAY_COMMENTS' => "Sonstige Hinweise an uns",
        'MEMBER_HOLIDAY_ORDER_NOT_POSSIBLE' => "Sie k&ouml;nnen keine Mails versenden, da Ihre Urlaubsschaltung aktiviert ist.",
index 7f57dd2..97741a8 100644 (file)
@@ -75,11 +75,11 @@ addMessages(array(
        'ENGINE_PATCH_CTIME' => "Letzte Aktualisierung",
 
 // Admin area
-       'ADMIN_MEDIADATA_SETTINGS' => "Einstellungen zu den Mediendaten",
-       'ADMIN_MEDIADATA_MT_START' => "Startdatum Ihres {?mt_word2?}",
-       'ADMIN_MEDIADATA_MT_START_NOTE' => "Bitte beachten Sie, dass das Startdatum Ihres {?mt_word2?} nicht in der Zukunft liegen darf.",
-       'ADMIN_MEDIADATA_MT_STAGE' => "Anzahl zu vorausberechnende Mitgliederanzahl",
-       'ADMIN_MEDIADATA_MT_STAGE_NOTE' => "Geben Sie hier an, wie viele Mitglieder Ihr {?mt_word?} erreichen soll. Es wird dann vom Script gesch&auml;tzt, an welchem Tag dies sein wird.",
+       'ADMIN_CONFIG_MEDIADATA_TITLE' => "Einstellungen zu den Mediendaten",
+       'ADMIN_CONFIG_MEDIADATA_MT_START' => "Startdatum Ihres {?mt_word2?}",
+       'ADMIN_CONFIG_MEDIADATA_MT_START_NOTE' => "Bitte beachten Sie, dass das Startdatum Ihres {?mt_word2?} nicht in der Zukunft liegen darf.",
+       'ADMIN_CONFIG_MEDIADATA_MT_STAGE' => "Anzahl zu vorausberechnende Mitgliederanzahl",
+       'ADMIN_CONFIG_MEDIADATA_MT_STAGE_NOTE' => "Geben Sie hier an, wie viele Mitglieder Ihr {?mt_word?} erreichen soll. Es wird dann vom Script gesch&auml;tzt, an welchem Tag dies sein wird.",
 
 // New guest data
        'MEDIA_DATA_MEMBERS' => "Mitglieder-Statistik",
index cd6c7e4..ac0811e 100644 (file)
@@ -54,7 +54,7 @@ addMessages(array(
        'NL_MODE_TEXT' => "Text-Mail",
        'NL_MODE_HTML' => "HTML-Mail",
        'ADMIN_NL_SEND_DONE' => "Newsletter wurde versendet.",
-       'ADMIN_CONFIG_NEWSLETTER_SETTINGS' => "Einstellungen am Newsletter",
+       'ADMIN_CONFIG_NEWSLETTER_TITLE' => "Einstellungen am Newsletter",
        'ADMIN_NL_CHARGE' => "Monatliche Geb&uuml;hr zur Abschaltung des Newsletters",
        'ADMIN_NL_AUTO_ADD' => "URLs automatisch umwandeln",
        'NL_MEMBER_RECEIVE_STATUS' => "Newsletterempfang ist derzeit...",
index 0ec3bb3..f26aee2 100644 (file)
@@ -54,10 +54,10 @@ addMessages(array(
        'MEMBER_NICKNAME_YOUR_REFERAL_LINK' => "Ihr Nickname-Reflink",
        'MEMBER_NO_NICKNAME_SET' => "Sie haben noch keinen Nickname eingerichtet! Damit k&ouml;nnen Sie sich alternativ zur Mitglieder-Id einloggen.",
        'MEMBER_PLEASE_CLICK_NICKNAME_FORM' => "Hier k&ouml;nnen Sie sich nun einen einrichten...",
-       'ADMIN_NICKNAME_CONFIG_HEADER' => "Einstellungen am Nicknamen",
-       'ADMIN_NICKNAME_MIN_LENGTH' => "Minimale L&auml;nge",
-       'ADMIN_NICKNAME_PATTERN' => "Pattern f&uuml;r isInString()-Befehl",
-       'ADMIN_NICKNAME_CHARACTERS' => "Zeichenfolge f&uuml;r Sprachdatei",
+       'ADMIN_CONFIG_NICKNAME_TITLE' => "Einstellungen am Nicknamen",
+       'ADMIN_CONFIG_NICKNAME_MIN_LENGTH' => "Minimale L&auml;nge",
+       'ADMIN_CONFIG_NICKNAME_PATTERN' => "Pattern f&uuml;r isInString()-Befehl",
+       'ADMIN_CONFIG_NICKNAME_CHARACTERS' => "Zeichenfolge f&uuml;r Sprachdatei",
 ));
 
 // [EOF]
index af6981b..e070c50 100644 (file)
@@ -42,12 +42,12 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 addMessages(array(
-       'ADMIN_ORDER_SETTINGS' => "Einstellungen - Mailbuchung",
-       'ADMIN_ORDER_MISC_SETTINGS' => "Weitere Einstellungen",
-       'ADMIN_ORDER_MAX_ORDER_SELECT' => "Wie viele Mailbuchungen k&ouml;nnen die Mitglieder maximal pro Tag versenden?",
-       'ADMIN_ORDER_MAX' => "Die Mitglieder k&ouml;nnen so viele Mailbuchungen wie m&ouml;glich t&auml;tigen.",
-       'ADMIN_ORDER_ORDER' => "Die Mitglieder k&ouml;nen nur so viele Mailbuchungen t&auml;tigen, wie sie den Mailempfang eingestellt haben.",
-       'ADMIN_ORDER_MIN_RECEIVER_PER_ORDER' => "Minimale Anzahl Empf&auml;nger pro Mailbuchung",
+       'ADMIN_CONFIG_ORDER_TITLE' => "Einstellungen - Mailbuchung",
+       'ADMIN_CONFIG_ORDER_MISC_TITLE' => "Weitere Einstellungen",
+       'ADMIN_CONFIG_ORDER_SELECT_MAX' => "Wie viele Mailbuchungen k&ouml;nnen die Mitglieder maximal pro Tag versenden?",
+       'ADMIN_CONFIG_ORDER_OPTION_MAX' => "Die Mitglieder k&ouml;nnen so viele Mailbuchungen wie m&ouml;glich t&auml;tigen.",
+       'ADMIN_CONFIG_ORDER_OPTION_ORDER' => "Die Mitglieder k&ouml;nen nur so viele Mailbuchungen t&auml;tigen, wie sie den Mailempfang eingestellt haben.",
+       'ADMIN_CONFIG_ORDER_MIN_RECEIVER_PER_ORDER' => "Minimale Anzahl Empf&auml;nger pro Mailbuchung",
        'ADMIN_ORDER_SELECTION_COLUMN' => "Tabellenspalte, nach der umsortiert werden soll",
        'ADMIN_ORDER_SELECTION_MODE' => "Sortierreihenfolge",
        'ADMIN_ORDER_SELECTION_SETTINGS' => "Auswahlverfahren der Empf&auml;nger",
index dc910ed..1972060 100644 (file)
@@ -44,13 +44,13 @@ if (!defined('__SECURITY')) {
 addMessages(array(
        'ADMIN_TASK_LIST_PRIMERA_ALL' => "Alle Primera-Ein-/Auszahlungen",
        'ADMIN_TASK_LIST_PRIMERA_ALL_TITLE' => "Listet alle Primera-Ein- und Auszahlungen auf.",
-       'ADMIN_PRIMERA_CONFIG_TITLE' => "Einstellungen zum Primus-Portal:",
-       'ADMIN_PRIMERA_MIN_PAYOUT' => "Minimumguthaben f&uuml;r Auszahlungen.",
-       'ADMIN_PRIMERA_MIN_WITHDRAW' => "Minimumguthaben f&uuml;r Einzahlungen.",
-       'ADMIN_PRIMERA_API_NAME' => "Primus-Nickname",
-       'ADMIN_PRIMERA_API_MD5' => "Primera-Passwort (Wird als MD5-Hash gespeichert)",
-       'ADMIN_PRIMERA_API_REFID' => "Primus-Referal-Id (???)",
-       'ADMIN_PRIMERA_CONFIG_NOTE' => "<a href=\"http://www.primusportal.de/r/Quix0r\" target=\"_blank\">Hier</a> k&ouml;nnen Sie sich ein Primus-Portal-Account holen. <strong>Geben Sie immer Ihren Usernamen von Primus-Portal ein und &uuml;berpr&uuml;fen Sie diesen mehrmals! Er wird zum &Uuml;berweisen von Primera ben&ouml;tigt.",
+       'ADMIN_CONFIG_PRIMERA_TITLE' => "Einstellungen zum Primus-Portal:",
+       'ADMIN_CONFIG_PRIMERA_MIN_PAYOUT' => "Minimumguthaben f&uuml;r Auszahlungen.",
+       'ADMIN_CONFIG_PRIMERA_MIN_WITHDRAW' => "Minimumguthaben f&uuml;r Einzahlungen.",
+       'ADMIN_CONFIG_PRIMERA_API_NAME' => "Primus-Nickname",
+       'ADMIN_CONFIG_PRIMERA_API_MD5' => "Primera-Passwort (Wird als MD5-Hash gespeichert)",
+       'ADMIN_CONFIG_PRIMERA_REFID' => "Primus-Referal-Id (???)",
+       'ADMIN_CONFIG_PRIMERA_NOTE' => "<a href=\"http://www.primusportal.de/r/Quix0r\" target=\"_blank\">Hier</a> k&ouml;nnen Sie sich ein Primus-Portal-Account holen. <strong>Geben Sie immer Ihren Usernamen von Primus-Portal ein und &uuml;berpr&uuml;fen Sie diesen mehrmals! Er wird zum &Uuml;berweisen von Primera ben&ouml;tigt.",
        'ADMIN_PRIMERA_NO_TRANSFERS' => "Derzeit keine Primera transferiert.",
        'ADMIN_PRIMERA_ACCOUNT' => "Account bei Primus-Portal",
        'ADMIN_PRIMERA_TRANSFERED' => "Primera transferiert",
index da209b4..67d5ff0 100644 (file)
@@ -44,15 +44,15 @@ if (!defined('__SECURITY')) {
 addMessages(array(
        'GUEST_REGISTER_MUST_SET_NOTE' => "Sind Pflichtangaben, ansonsten erfolgt keine Anmeldung.",
        'ADMIN_CONFIG_REGISTER_MUST_TITLE' => "Pflichtfelder einstellen",
-       'ADMIN_REGISTER_CHANGE_MUST' => "Einstellungen &auml;ndern",
-       'ADMIN_REGISTER_FIELD_NAME' => "Eingabefeld",
-       'ADMIN_REGISTER_FIELD_REQUIRED' => "Pflichtfeld?",
+       'ADMIN_SAVE_REGISTER_MUST' => "Einstellungen &auml;ndern",
+       'ADMIN_CONFIG_REGISTER_FIELD_NAME' => "Eingabefeld",
+       'ADMIN_CONFIG_REGISTER_FIELD_REQUIRED' => "Pflichtfeld?",
        'ADMIN_REGISTER_CHANGES_SAVED' => "Es wurden <span class=\"data\">%s</span> Pflichtfelder aktualisiert.",
        'CNTRY' => "L&auml;ndercode",
        'ADMIN_CONFIG_REGISTER_DEFAULT' => "Standard-Vorauswahl in der Kategorienliste einstellen auf Ja/Nein",
        'ADMIN_CONFIG_REGISTER_DISPLAY_REFID' => "Soll die Ref-Id angezeigt werden? <div class=\"notice\">(Nein = id wird editierbar!)</div>",
        'ADMIN_CONFIG_REGISTER_IP_TIMEOUT' => "IP-Zeitsperre",
-       'ADMIN_CONFIG_REGFORM_SETTINGS_TITLE' => "Einstellungen am Anmeldeformular",
+       'ADMIN_CONFIG_REGISTER_TITLE' => "Einstellungen am Anmeldeformular",
        'ADMIN_CONFIG_LEAST_CATEGORIES' => "Mindestens auszuw&auml;hlende Kategorieanzahl",
        'ADMIN_CONFIG_REGISTER_GENERATE_PASSWORD_EMPTY' => "Soll bei leergelassenem Passwort in der Anmeldung eines per Zufall generiert werden?",
        'ADMIN_CONFIG_REJECT_DOUBLE_EMAIL' => "Doppelt angemeldete Email-Adressen ablehnen?",
index a0a4b84..a7adaee 100644 (file)
@@ -44,8 +44,8 @@ if (!defined('__SECURITY')) {
 addMessages(array(
        'SPONSOR_NOT_INITIALIZED' => "Sponsorenbereich noch nicht eingerichtet.",
        'ADMIN_CONFIG_SPONSOR_TITLE' => "Allgemeine Einstellungen",
-       'ADMIN_SPONSOR_MIN_POINTS' => "Minimum buchbare {?POINTS?}",
-       'ADMIN_SPONSOR_REFERAL_POINTS' => "Einmalige Referal-Gutschrift bei Vermittlung eines neuen Sponsors",
+       'ADMIN_CONFIG_SPONSOR_MIN_POINTS' => "Minimum buchbare {?POINTS?}",
+       'ADMIN_CONFIG_SPONSOR_REFERAL_POINTS' => "Einmalige Referal-Gutschrift bei Vermittlung eines neuen Sponsors",
        'ADMIN_SPONSOR_ENTER_COMPANY_DATA' => "Daten zur anzumeldenen Unternehmen eingeben",
        'SPONSOR_ENTER_COMPANY_TITLE' => "Firmenname",
        'SPONSOR_ENTER_COMPANY_POSITION' => "Position",
index ab36787..45c34b6 100644 (file)
@@ -42,8 +42,8 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 addMessages(array(
-       'ADMIN_EDIT_TIMEZONE_SETTINGS' => "Konfiguration der Zeitzone",
-       'ADMIN_CONFIG_TIMEZONE' => "Zeitzone einstellen (z.B. Europe/Berlin):",
+       'ADMIN_CONFIG_TIMEZONE_TITLE' => "Konfiguration der Zeitzone",
+       'ADMIN_CONFIG_ENTER_TIMEZONE' => "Zeitzone einstellen (z.B. Europe/Berlin):",
 ));
 
 // [EOF]
index c105b25..4040f27 100644 (file)
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Language definitions
 addMessages(array(
        'ADMIN_CONFIG_TOP10_TITLE' => "Einstellungen an TOP-Listen",
-       'ADMIN_TOP10_MAX_TOP10' => "Maximale Pl&auml;tze pro Liste",
+       'ADMIN_CONFIG_TOP10_MAX_TOP10' => "Maximale Pl&auml;tze pro Liste",
 ));
 
 // [EOF]
index 89c2bc5..5adaf84 100644 (file)
@@ -42,14 +42,14 @@ if (!defined('__SECURITY')) {
 
 // Language definitions
 addMessages(array(
-       'ADMIN_CONFIG_TRANSFER_HEADER' => "Einstellungen zu {?POINTS?}-&Uuml;berweisungen",
-       'ADMIN_TRANSFER_MAX' => "Maximal angezeigte Eintr&auml;ge",
-       'ADMIN_TRANSFER_AGE' => "Maximales Alter von Eintr&auml;gen",
-       'ADMIN_TRANSFER_TIMEOUT' => "Sperrung der Einstellungen nach {?POINTS?}-&Uuml;berweisung",
-       'ADMIN_TRANSFER_BALANCE' => "Restbetrag nach &Uuml;berweisung auf Account",
-       'ADMIN_TRANSFER_CODE' => "L&auml;nge des Touring-Codes",
-       'ADMIN_TRANSFER_CODE_NOTE' => "<strong>0</strong> deaktiviert den Touring-Code.",
-       'ADMIN_AUTOPURGE_TRANSFER' => "Veraltete Eintr&auml;ge automatisch l&ouml;schen? (purge)",
+       'ADMIN_CONFIG_TRANSFER_TITLE' => "Einstellungen zu {?POINTS?}-&Uuml;berweisungen",
+       'ADMIN_CONFIG_TRANSFER_MAX' => "Maximal angezeigte Eintr&auml;ge",
+       'ADMIN_CONFIG_TRANSFER_AGE' => "Maximales Alter von Eintr&auml;gen",
+       'ADMIN_CONFIG_TRANSFER_TIMEOUT' => "Sperrung der Einstellungen nach {?POINTS?}-&Uuml;berweisung",
+       'ADMIN_CONFIG_TRANSFER_BALANCE' => "Restbetrag nach &Uuml;berweisung auf Account",
+       'ADMIN_CONFIG_TRANSFER_CODE' => "L&auml;nge des Touring-Codes",
+       'ADMIN_CONFIG_TRANSFER_CODE_NOTE' => "<strong>0</strong> deaktiviert den Touring-Code.",
+       'ADMIN_CONFIG_AUTOPURGE_TRANSFER' => "Veraltete Eintr&auml;ge automatisch l&ouml;schen? (purge)",
        'ADMIN_TRANSFER_POINTS_TOTAL' => "Gesamttransfersumme",
        'TRANSFER_LIST_INCOMING' => "Eingehende &Uuml;berweisungen",
        'TRANSFER_LIST_OUTGOING' => "Ausgehende &Uuml;berweisungen",
index c1ebe5e..edd876d 100644 (file)
@@ -44,8 +44,8 @@ if (!defined('__SECURITY')) {
 addMessages(array(
        'ADMIN_USER_PAGENAV' => "Seiten",
        'ADMIN_CONFIG_USER_TITLE' => "Konfiguration - Mitgliederliste",
-       'ADMIN_USER_LIMIT_USER' => "Anzahl Mitglieder pro Seite",
-       'ADMIN_USER_ALPHA_USER' => "Azanhl Buchstaben pro Zeile",
+       'ADMIN_CONFIG_USER_LIMIT' => "Anzahl Mitglieder pro Seite",
+       'ADMIN_CONFIG_USER_ALPHA' => "Azanhl Buchstaben pro Zeile",
        'ADMIN_USER_ACCOUNT_SAVED' => "Mitgliedsaccount gespeichert.",
        'ADMIN_USER_ACCOUNT_NOT_SAVED' => "Mitgliedsaccount <u>nicht</u> gespeichert.",
        'ADMIN_USER_ACCOUNT_LOCKED' => "Mitgliedsaccount <span class=\"data\">%s</span> wurde gesperrt.",
index e51f1cd..7b1acf2 100644 (file)
@@ -51,14 +51,14 @@ addMessages(array(
        'WERNIS_TOTAL_WERNIS' => "Gesamt &uuml;berwiesen",
 
        // Admin messages
-       'ADMIN_WERNIS_CONFIG_TITLE' => "Einstellungen zum WDS66-Hauptaccount:",
-       'ADMIN_WERNIS_MIN_PAYOUT' => "Minimumguthaben f&uuml;r Auszahlungen.",
-       'ADMIN_WERNIS_MIN_WITHDRAW' => "Minimumguthaben f&uuml;r Einzahlungen.",
-       'ADMIN_WERNIS_API_ID' => "WDS66-API-Id (api_id=x)",
-       'ADMIN_WERNIS_API_MD5' => "WDS66-API-Key (api_md5=xxxxx; 32-stellig)",
-       'ADMIN_WERNIS_API_URL' => "Basis-URL der API-Skripte",
-       'ADMIN_WERNIS_REFID' => "Ihre Referal-Id bei WDS66-Portal (= Ihr Username!)",
-       'ADMIN_WERNIS_WPASS' => "Wernis-Passwort (nicht Account-Passwort!)",
+       'ADMIN_CONFIG_WERNIS_TITLE' => "Einstellungen zum WDS66-Hauptaccount:",
+       'ADMIN_CONFIG_WERNIS_MIN_PAYOUT' => "Minimumguthaben f&uuml;r Auszahlungen.",
+       'ADMIN_CONFIG_WERNIS_MIN_WITHDRAW' => "Minimumguthaben f&uuml;r Einzahlungen.",
+       'ADMIN_CONFIG_WERNIS_API_ID' => "WDS66-API-Id (api_id=x)",
+       'ADMIN_CONFIG_WERNIS_API_MD5' => "WDS66-API-Key (api_md5=xxxxx; 32-stellig)",
+       'ADMIN_CONFIG_WERNIS_API_URL' => "Basis-URL der API-Skripte",
+       'ADMIN_CONFIG_WERNIS_REFID' => "Ihre Referal-Id bei WDS66-Portal (= Ihr Username!)",
+       'ADMIN_CONFIG_WERNIS_WPASS' => "Wernis-Passwort (nicht Account-Passwort!)",
        'ADMIN_WERNIS_CONFIG_NOTE' => "[<a href=\"http://www.wds66.com/ref.php?refid=10437\" target=\"_blank\">Hier</a>] k&ouml;nnen Sie schon f&uuml;r <strong>einmalig kostenlos</strong> <strong>25.000 Abfragen</strong> ein API-Account beantragen (dazu ist ein <strong>kostenloses</strong> Wernis-Account dennoch n&ouml;tig!) Geben Sie immer Ihren Usernamen von WDS66-Hauptaccount ein und &uuml;berpr&uuml;fen Sie diesen mehrmals! Er wird zum &Uuml;berweisen von und nach WDS66-Wernis-Portal ben&ouml;tigt. Die Betreibergeb&uuml;hren und Umrechnungsfaktoren sind f&uuml;r den Betrieb Ihres {?mt_word2?} komplett in Wernis ausgelegt, diese m&uuml;ssen Sie also noch anpassen, wenn Sie z.B. Punkte haben und in Wernis auszahlen lassen wollen.",
        'ADMIN_WERNIS_NO_TRANSFERS' => "Derzeit keine Wernis transferiert.",
        'ADMIN_WERNIS_WDS66_ACCOUNT' => "Account bei WDS66-Portal",
@@ -67,14 +67,14 @@ addMessages(array(
        'ADMIN_WERNIS_TYPE' => "&Uuml;berweisungsrichtung",
        'ADMIN_WERNIS_API_MESSAGE' => "Nachricht von WDS66-API",
        'ADMIN_WERNIS_API_STATUS' => "Status von WDS66-API",
-       'ADMIN_WERNIS_PAYOUT_ACTIVE' => "Auszahlungen zum WDS66-Portal aktiviert?",
-       'ADMIN_WERNIS_WITHDRAW_ACTIVE' => "Einzahlungen vom WDS66-Portal aktiviert?",
-       'ADMIN_WERNIS_PAYOUT_FACTOR' => "Umrechnungsfaktor von {?POINTS?} in Wernis f&uuml;r Auszahlungen",
-       'ADMIN_WERNIS_WITHDRAW_FACTOR' => "Umrechnungsfaktor von Wernis in {?POINTS?} f&uuml;r Einzahlungen",
-       'ADMIN_WERNIS_PAYOUT_FEE_PERCENT' => "Prozentuale Betreibergeb&uuml;hr f&uuml;r Auszahlungen",
-       'ADMIN_WERNIS_WITHDRAW_FEE_PERCENT' => "Prozentuale Betreibergeb&uuml;hr f&uuml;r Einzahlungen",
-       'ADMIN_WERNIS_PAYOUT_FEE_FIX' => "Fixe Betreibergeb&uuml;hr f&uuml;r Auszahlungen",
-       'ADMIN_WERNIS_WITHDRAW_FEE_FIX' => "Fixe Betreibergeb&uuml;hr f&uuml;r Einzahlungen",
+       'ADMIN_CONFIG_WERNIS_PAYOUT_ACTIVE' => "Auszahlungen zum WDS66-Portal aktiviert?",
+       'ADMIN_CONFIG_WERNIS_WITHDRAW_ACTIVE' => "Einzahlungen vom WDS66-Portal aktiviert?",
+       'ADMIN_CONFIG_WERNIS_PAYOUT_FACTOR' => "Umrechnungsfaktor von {?POINTS?} in Wernis f&uuml;r Auszahlungen",
+       'ADMIN_CONFIG_WERNIS_WITHDRAW_FACTOR' => "Umrechnungsfaktor von Wernis in {?POINTS?} f&uuml;r Einzahlungen",
+       'ADMIN_CONFIG_WERNIS_PAYOUT_FEE_PERCENT' => "Prozentuale Betreibergeb&uuml;hr f&uuml;r Auszahlungen",
+       'ADMIN_CONFIG_WERNIS_WITHDRAW_FEE_PERCENT' => "Prozentuale Betreibergeb&uuml;hr f&uuml;r Einzahlungen",
+       'ADMIN_CONFIG_WERNIS_PAYOUT_FEE_FIX' => "Fixe Betreibergeb&uuml;hr f&uuml;r Auszahlungen",
+       'ADMIN_CONFIG_WERNIS_WITHDRAW_FEE_FIX' => "Fixe Betreibergeb&uuml;hr f&uuml;r Einzahlungen",
        'ADMIN_LIST_WERNIS_TITLE' => "Alle Transaktionen von und zum Wernis-Portal auflisten:",
        'ADMIN_LIST_WERNIS_FOOTER' => "Hier soll ein Hinweis hinkommen.",
        'ADMIN_TASK_LIST_WERNIS_ALL' => "Alle Wernis-Ein-/Auszahlungen",
index 7c6b730..9739305 100644 (file)
@@ -44,7 +44,9 @@ if (!defined('__SECURITY')) {
 function adminsCheckAdminAcl ($action, $what) {
        // If action is login or logout allow allways!
        $default = 'allow';
-       if (($action == 'login') || ($action == 'logout')) return true;
+       if (($action == 'login') || ($action == 'logout')) {
+               return true;
+       } // END - if
 
        // Default is deny
        $ret = false;
@@ -68,18 +70,30 @@ function adminsCheckAdminAcl ($action, $what) {
        }
 
        // Shall I test for a main or sub menu? (action or what?)
-       $acl_mode = 'failed';
+       $aclMode = 'failed';
        if ((isExtensionInstalledAndNewer('cache', '0.1.2')) && (isset($GLOBALS['cache_array']['admin_acls'])) && (count($GLOBALS['cache_array']['admin_acls']) > 0)) {
                // Lookup in cache
-               if ((!empty($action)) && (isset($GLOBALS['cache_array']['admin_acls']['action_menu'][$adminId])) & ($GLOBALS['cache_array']['admin_acls']['action_menu'][$adminId] == $action)) {
+               if ((!empty($action)) && (isset($GLOBALS['cache_array']['admin_acls']['action_menu'][$adminId])) & (in_array($action, $GLOBALS['cache_array']['admin_acls']['action_menu'][$adminId]))) {
+                       // Search for it
+                       $key = array_search($action, $GLOBALS['cache_array']['admin_acls']['action_menu'][$adminId]);
+
                        // Main menu line found
-                       $acl_mode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$adminId];
+                       $aclMode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$adminId][$key];
+
+                       // Log debug message
+                       logDebugMessage(__FUNCTION__, __LINE__, 'action=' . $action . ',key=' . $key . ',acl_mode=' . $aclMode);
 
                        // Count cache hits
                        incrementStatsEntry('cache_hits');
-               } elseif ((!empty($what)) && (isset($GLOBALS['cache_array']['admin_acls']['what_menu'][$adminId])) && ($GLOBALS['cache_array']['admin_acls']['what_menu'][$adminId] == $what)) {
+               } elseif ((!empty($what)) && (isset($GLOBALS['cache_array']['admin_acls']['what_menu'][$adminId])) && (in_array($what, $GLOBALS['cache_array']['admin_acls']['what_menu'][$adminId]))) {
+                       // Search for it
+                       $key = array_search($action, $GLOBALS['cache_array']['admin_acls']['what_menu'][$adminId]);
+
                        // Check sub menu
-                       $acl_mode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$adminId];
+                       $aclMode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$adminId][$key];
+
+                       // Log debug message
+                       logDebugMessage(__FUNCTION__, __LINE__, 'what=' . $what . ',key=' . $key . ',acl_mode=' . $aclMode);
 
                        // Count cache hits
                        incrementStatsEntry('cache_hits');
@@ -100,7 +114,7 @@ function adminsCheckAdminAcl ($action, $what) {
                // Is an entry found?
                if (SQL_NUMROWS($result) == 1) {
                        // Load ACL
-                       list($acl_mode) = SQL_FETCHROW($result);
+                       list($aclMode) = SQL_FETCHROW($result);
                } // END - if
 
                // Free memory
@@ -108,14 +122,14 @@ function adminsCheckAdminAcl ($action, $what) {
        }
 
        // Check ACL and (maybe) allow
-       //* DEBUG: */ debugOutput('default='.$default.',acl_mode='.$acl_mode.',parent='.intval($parent));
-       if (($default == 'allow') || (($default == 'deny') && ($acl_mode == 'allow')) || ($parent === true) || (($default == '***') && ($acl_mode == 'failed') && ($parent === false))) {
+       //* DEBUG: */ debugOutput('default='.$default.',acl_mode='.$aclMode.',parent='.intval($parent));
+       if ((($default == 'allow') && ($aclMode != 'deny')) || (($default == 'deny') && ($aclMode == 'allow')) || ($parent === true) || (($default == '***') && ($aclMode == 'failed') && ($parent === false))) {
                // Access is granted
                $ret = true;
        } // END - if
 
        // Return value
-       //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:act='.$action.',wht='.$what.',default='.$default.',acl_mode='.$acl_mode);
+       //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:act='.$action.',wht='.$what.',default='.$default.',aclMode='.$aclMode);
        return $ret;
 }
 
@@ -313,12 +327,12 @@ function adminsEditAdminAccount ($postData) {
                        // Shall we allow changing default ACL?
                        if ($currMode == 'allow') {
                                // Allow chaning it
-                               $content['mode']    = generateOptionList('/ARRAY/', array('allow', 'deny'), array('{--ADMIN_ADMINS_MODE_ALLOW--}', '{--ADMIN_ADMINS_MODE_DENY--}'), $content['mode']);
+                               $content['mode']    = generateOptionList('/ARRAY/', array('allow', 'deny'), array('{--ADMIN_ADMINS_ACCESS_MODE_ALLOW--}', '{--ADMIN_ADMINS_ACCESS_MODE_DENY--}'), $content['mode']);
                        } else {
                                // Don't allow it
                                $content['mode'] = '&nbsp;';
                        }
-                       $content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array('{--ADMIN_ADMINS_LA_MODE_GLOBAL--}', '{--ADMIN_ADMINS_LA_MODE_OLD--}', '{--ADMINS_NEW_LA_SETTING--}'), $content['la_mode']);
+                       $content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array('{--ADMIN_ADMINS_LA_MODE_GLOBAL--}', '{--ADMIN_ADMINS_LA_MODE_OLD--}', '{--ADMIN_ADMINS_LA_MODE_NEW--}'), $content['la_mode']);
 
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_edit_admins_row', true, $content);
@@ -347,7 +361,7 @@ function adminsDeleteAdminAccount ($postData) {
                        if (SQL_NUMROWS($result) == 1) {
                                // Entry found, so load data
                                $content = SQL_FETCHARRAY($result);
-                               $content['mode']    = '{--ADMIN_ADMINS_MODE_' . strtoupper($content['mode'])    . '--}';
+                               $content['mode']    = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['mode'])    . '--}';
                                $content['la_mode'] = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
 
                                // Prepare some more data
@@ -400,8 +414,8 @@ function adminsListAdminAccounts() {
        $OUT = '';
        while ($content = SQL_FETCHARRAY($result)) {
                // Compile some variables
-               $content['mode']    = '{--ADMINS_' . strtoupper($content['mode'])    . '_MODE--}';
-               $content['la_mode'] = '{--ADMINS_' . strtoupper($content['la_mode']) . '_LA_SETTING--}';
+               $content['mode']    = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['mode'])    . '--}';
+               $content['la_mode'] = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
 
                // Load row template and switch color
                $OUT .= loadTemplate('admin_list_admins_row', true, $content);
index eb3d516..f769d6b 100644 (file)
@@ -89,19 +89,19 @@ if (($GLOBALS['cache_instance']->loadCacheFile('admin')) && ($GLOBALS['cache_ins
        $add = runFilterChain('sql_admin_extra_data');
 
        // Query the database about this
-       $result_admins = SQL_QUERY('SELECT
+       $result = SQL_QUERY('SELECT
        `id` AS admin_id, `login`, `password`, `email`' . $add . '
 FROM
        `{?_MYSQL_PREFIX?}_admins`
 ORDER BY
        `login` ASC', __FILE__, __LINE__);
-       while ($dummy = SQL_FETCHARRAY($result_admins)) {
+       while ($dummy = SQL_FETCHARRAY($result)) {
                // Save row
                $GLOBALS['cache_instance']->addRow($dummy);
        } // END - while
 
        // Free memory
-       SQL_FREERESULT($result_admins);
+       SQL_FREERESULT($result);
 
        // Close cache
        $GLOBALS['cache_instance']->storeExtensionVersion('admins');
@@ -114,6 +114,37 @@ if (isExtensionInstalledAndNewer('admins', '0.3')) {
        if (($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) && ($GLOBALS['cache_instance']->extensionVersionMatches('admins'))) {
                // Load referal system from cache
                $GLOBALS['cache_array']['admin_acls'] = $GLOBALS['cache_instance']->getArrayFromCache();
+
+               // Check if valid
+               if ((isset($GLOBALS['cache_array']['admin_acls']['admin_id'])) && (is_array($GLOBALS['cache_array']['admin_acls']['admin_id'])) && (isset($GLOBALS['cache_array']['admin_acls']['access_mode'])) && (is_array($GLOBALS['cache_array']['admin_acls']['access_mode']))) {
+                       // Check count
+                       if (count($GLOBALS['cache_array']['admin_acls']['admin_id']) == count($GLOBALS['cache_array']['admin_acls']['access_mode'])) {
+                               // Rewrite the cache
+                               $admins = array();
+                               foreach ($GLOBALS['cache_array']['admin_acls']['admin_id'] as $idx => $admin) {
+                                       // Rewrite all entries
+                                       foreach ($GLOBALS['cache_array']['admin_acls'] as $key => $entry) {
+                                               // Do we have 'admin_id' or regular entries?
+                                               if ($key != 'admin_id') {
+                                                       // Regular entry so use id
+                                                       $admins[$key][$GLOBALS['cache_array']['admin_acls']['admin_id'][$idx]][] = $entry[$idx];
+                                               } // END - if
+                                       } // END - foreach
+                               } // END - foreach
+
+                               // Transfer back to cache array and remove dummy
+                               $GLOBALS['cache_array']['admin_acls'] = $admins;
+                               unset($admins);
+                       } else {
+                               // Nope, cache file is corrupted!
+                               $GLOBALS['cache_instance']->removeCacheFile();
+                               unset($GLOBALS['cache_array']['admin_acls']);
+                       }
+               } else {
+                       // Nope, cache file is corrupted!
+                       $GLOBALS['cache_instance']->removeCacheFile();
+                       unset($GLOBALS['cache_array']['admin_acls']);
+               }
        } elseif (isHtmlOutputMode()) {
                // Create cache file here
                $GLOBALS['cache_instance']->init();
index df9eeac..e34b0cf 100644 (file)
@@ -334,7 +334,8 @@ ORDER BY
                                // Do we have entries?
                                if ((ifAdminMenuHasEntries($menu)) && (!SQL_HASZERONUMS($result_what))) {
                                        $GLOBALS['menu']['description'] = array();
-                                       $GLOBALS['menu']['title'] = array(); $SUB = true;
+                                       $GLOBALS['menu']['title'] = array();
+                                       $SUB = true;
                                        $OUT .= '<li class="admin_menu_sub"><ul class="admin_menu_sub">';
                                        // @TODO Rewrite this to $content = SQL_FETCHARRAY()
                                        while (list($what_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) {
index f98b503..f551ef4 100644 (file)
@@ -1,246 +1,3 @@
 <?php
-/************************************************************************
- * Mailer v0.2.1-FINAL                                Start: 06/30/2004 *
- * ===================                          Last change: 07/02/2004 *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * File: what-config_admins.php                                         *
- * -------------------------------------------------------------------- *
- * Short description : Configure admin ACLs                             *
- * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Admin-ACLs einstellen                            *
- * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
- *                                                                      *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or    *
- * (at your option) any later version.                                  *
- *                                                                      *
- * This program is distributed in the hope that it will be useful,      *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
- * GNU General Public License for more details.                         *
- *                                                                      *
- * You should have received a copy of the GNU General Public License    *
- * along with this program; if not, write to the Free Software          *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
- * MA  02110-1301  USA                                                  *
- ************************************************************************/
-
-// Some security stuff...
-if ((!defined('__SECURITY')) || (!isAdmin())) {
-       die();
-} // END - if
-
-// Add description as navigation point
-addYouAreHereLink('admin', __FILE__);
-
-if ((isFormSent('edit')) && (ifPostContainsSelections())) {
-       // Edit ACLs
-       $OUT = '';
-       foreach (postRequestParameter('sel') as $id => $selected) {
-               // Load data for the id
-               $result = SQL_QUERY_ESC("SELECT `id`, `admin_id`, `action_menu, `what_menu`, `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `id`=%s LIMIT 1",
-                       array(bigintval($id)), __FILE__, __LINE__);
-               $content = SQL_FETCHARRAY($result);
-
-               // Free result
-               SQL_FREERESULT($result);
-
-               // Prepare data for the row template
-               $content = array(
-                       'id'               => $content['id'],
-                       'admins_selection' => generateOptionList('admins', 'id', 'login', $content['admin_id'], 'default_acl'),
-                       'action_selection' => adminMenuSelectionBox_DEPRECATED('action', $content['action_menu'], $content['id']),
-                       'what_selection'   => adminMenuSelectionBox_DEPRECATED('what', $content['what_menu'], $content['id']),
-                       'mode_options'     => generateOptionList(
-                               '/ARRAY/',
-                               array('allow', 'deny'),
-                               array(
-                                       '{--ADMIN_ADMINS_MODE_ALLOW--}',
-                                       '{--ADMIN_ADMINS_MODE_DENY--}'
-                               ),
-                               $content['access_mode']
-                       ),
-               );
-
-               // Load row template
-               $OUT .= loadTemplate('admin_config_admins_edit_row', true, $content);
-       } // END - foreach
-
-       // Load main template
-       loadTemplate('admin_config_admins_edit', false, $OUT);
-} elseif ((isFormSent('change')) && (ifPostContainsSelections())) {
-       // Change entries
-       foreach (postRequestParameter('sel') as $id => $selected) {
-               // Secure id
-               $id = bigintval($id);
-
-               // Update entries
-               SQL_QUERY_ESC("UPDATE
-       `{?_MYSQL_PREFIX?}_admins_acls`
-SET
-       `admin_id`=%s,
-       `action_menu`='%s',
-       `what_menu`='%s',
-       `access_mode`='%s'
-WHERE
-       `id`=%s
-LIMIT 1",
-                       array(
-                               postRequestParameter('admin', $id),
-                               postRequestParameter('action_menu', $id),
-                               postRequestParameter('what_menu', $id),
-                               postRequestParameter('mode', $id),
-                               $id
-                       ),__FILE__, __LINE__);
-       } // END - foreach
-
-       // Update cache when installed
-       // @TODO Rewrite this to a filter
-       if (isExtensionActive('cache')) {
-               if ($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) $GLOBALS['cache_instance']->removeCacheFile();
-       } // END - if
-
-       // Entries changed
-       displayMessage('{--ADMIN_ADMINS_ENTRIES_CHANGED--}');
-} elseif ((isFormSent('delete')) && (ifPostContainsSelections())) {
-       // Delete ACLs
-       $OUT = '';
-       foreach (postRequestParameter('sel') as $id => $selected) {
-               // Load data for the id
-               $result = SQL_QUERY_ESC("SELECT `id`, `admin_id`, `action_menu`, `what_menu`, `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `id`=%s LIMIT 1",
-                       array(bigintval($id)), __FILE__, __LINE__);
-               $content = SQL_FETCHARRAY($result);
-               SQL_FREERESULT($result);
-
-               // Get admin mode
-               $content['access_mode'] = '{--ADMIN_ADMINS_MODE_' . strtoupper($content['access_mode']) . '--}';
-
-               // Load row template and switch colors
-               $OUT .= loadTemplate('admin_config_admins_del_row', true, $content);
-       } // END - foreach
-
-       // Load main template
-       loadTemplate('admin_config_admins_del', false, $OUT);
-} elseif ((isFormSent('remove')) && (ifPostContainsSelections())) {
-       // Remove entries
-       // @TODO Rewrite this to filter 'run_sqls'
-       foreach (postRequestParameter('sel') as $id => $selected) {
-               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `id`=%s LIMIT 1",
-                       array(bigintval($id)),__FILE__, __LINE__);
-       } // END - foreach
-
-       // Update cache when installed
-       if (isExtensionActive('cache')) {
-               if ($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) $GLOBALS['cache_instance']->removeCacheFile();
-       } // END - if
-
-       // Entries deleted
-       displayMessage('{--ADMIN_ADMINS_ENTRIES_DELETED--}');
-} elseif (isFormSent('add')) {
-       // Check if everything is fine...
-       $mode = getAdminDefaultAcl(bigintval(postRequestParameter('admin_id')));
-
-       // Default ACL is false
-       $ACL = false;
-       if (isPostRequestParameterSet('what_menu')) {
-               // Check parent ACL
-               $ACL = adminsCheckAdminAcl(getActionFromModuleWhat('admin', postRequestParameter('what_menu')), '');
-       } // END - if
-
-       if (($mode != postRequestParameter('mode')) || ($ACL)) {
-               // Mode is fine
-               $BOTH = ((isPostRequestParameterSet('action_menu')) && (isPostRequestParameterSet('what_menu')));
-               if (((isPostRequestParameterSet('action_menu')) || (isPostRequestParameterSet('what_menu'))) && ($BOTH === false)) {
-                       // Main or sub menu selected
-                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `admin_id`=%s AND `action_menu`='%s' AND `what_menu`='%s' LIMIT 1",
-                               array(
-                                       bigintval(postRequestParameter('admin_id')),
-                                       postRequestParameter('action_menu'),
-                                       postRequestParameter('what_menu')
-                               ), __FILE__, __LINE__);
-                       if (SQL_HASZERONUMS($result)) {
-                               // Finally add the new ACL
-                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_acls` (`admin_id`, `action_menu`, `what_menu`, `access_mode`)
-VALUES ('%s','%s','%s','%s')",
-                               array(
-                                       bigintval(postRequestParameter('admin_id')),
-                                       postRequestParameter('action_menu'),
-                                       postRequestParameter('what_menu'),
-                                       postRequestParameter('mode')
-                               ), __FILE__, __LINE__);
-                               $content = '{--ADMIN_ADMINS_ACL_SAVED--}';
-
-                               // Update cache when installed
-                               if (isExtensionActive('cache')) {
-                                       if ($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) $GLOBALS['cache_instance']->removeCacheFile();
-                               } // END - if
-                       } else {
-                               // ACL does already exist!
-                               $content = '{--ADMIN_ADMINS_ACL_ALREADY_ADDED--}';
-                       }
-
-                       // Free memory
-                       SQL_FREERESULT($result);
-               } else {
-                       // No menu selected makes also no sence...
-                       $content = '{--ADMIN_ADMINS_SELECT_ACTION_WHAT--}';
-               }
-       } else {
-               // Same mode makes no sence...
-               $content = '{--ADMIN_ADMINS_SAME_MODE_SELECTED--}';
-       }
-
-       // Display message
-       displayMessage($content);
-} else {
-       // List all ACLs
-       $result_acls = SQL_QUERY('SELECT `id`, `admin_id`, `action_menu`, `what_menu`, `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` ORDER BY `admin_id` ASC, `id` ASC', __FILE__, __LINE__);
-
-       // Entries found?
-       if (!SQL_HASZERONUMS($result_acls)) {
-               // List ACLs
-               $OUT = '';
-               while ($content = SQL_FETCHARRAY($result_acls)) {
-                       // Generate mode string
-                       $content['access_mode'] = '{--ADMINS_' . strtoupper($content['access_mode']) . '_MODE--}';
-
-                       // Load row template and switch colors
-                       $OUT .= loadTemplate('admin_config_admins_row', true, $content);
-               } // END - while
-
-               // Free memory
-               SQL_FREERESULT($result);
-
-               // Load main template
-               loadTemplate('admin_config_admins', false, $OUT);
-       } // END - if
-
-       // Prepare some constants for the template
-       $content['admins_selection'] = generateOptionList('admins', 'id', 'login', '', 'default_acl');
-       $content['action_selection'] = adminMenuSelectionBox_DEPRECATED('action');
-       $content['what_selection']   = adminMenuSelectionBox_DEPRECATED('what');
-       $content['mode_options']     = generateOptionList(
-               '/ARRAY/',
-               array('allow', 'deny'),
-               array(
-                       '{--ADMIN_ADMINS_MODE_ALLOW--}',
-                       '{--ADMIN_ADMINS_MODE_DENY--}'
-               )
-       );
-
-       // Load template for adding new ACL
-       loadTemplate('admin_add_admins_acl', false, $content);
-}
-
-// [EOF]
+// @DEPRECATED
 ?>
index ce00076..f551ef4 100644 (file)
@@ -1,157 +1,3 @@
 <?php
-/************************************************************************
- * Mailer v0.2.1-FINAL                                Start: 10/11/2003 *
- * ===================                          Last change: 07/04/2004 *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * File              : what-config_emails.php                           *
- * -------------------------------------------------------------------- *
- * Short description : Edit all things around email and sending         *
- * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Aendern aller Email-Einstellungen                *
- * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
- *                                                                      *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or    *
- * (at your option) any later version.                                  *
- *                                                                      *
- * This program is distributed in the hope that it will be useful,      *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
- * GNU General Public License for more details.                         *
- *                                                                      *
- * You should have received a copy of the GNU General Public License    *
- * along with this program; if not, write to the Free Software          *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
- * MA  02110-1301  USA                                                  *
- ************************************************************************/
-
-// Some security stuff...
-if ((!defined('__SECURITY')) || (!isAdmin())) {
-       die();
-} // END - if
-
-// Add description as navigation point
-addYouAreHereLink('admin', __FILE__);
-
-// Remove empty array index
-if (!isPostRequestParameterSet('max')) unsetPostRequestParameter('add_max');
-
-if (isPostRequestParameterSet('add_max')) {
-       // Save all settings
-       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE value='%s' LIMIT 1",
-       array(bigintval(postRequestParameter('max'))), __FILE__, __LINE__);
-       if (SQL_HASZERONUMS($result)) {
-               // Add this value (including comment)
-               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES ('%s','%s')",
-               array(bigintval(postRequestParameter('max')), postRequestParameter('comment')),__FILE__, __LINE__);
-               $content = '{--ADMIN_MAX_VALUE_SAVED--}';
-       } else {
-               // Value does alread exists!
-               $content = '<span class="notice">{--ADMIN_MAX_VALUE_ALREADY--}</span>';
-       }
-
-       // Free memory
-       SQL_FREERESULT($result);
-
-       // Display message
-       displayMessage($content);
-} elseif ((isFormSent()) && (isGetRequestParameterSet('do'))) {
-       // Change or delete entries...
-       $TEXT = '';
-       foreach (postRequestParameter('id') as $id => $value) {
-               // Secure id
-               $id = bigintval($id);
-
-               switch (getRequestParameter('do'))
-               {
-                       case 'edit': // Change entries
-                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_max_receive` SET value='%s', comment='%s' WHERE `id`=%s LIMIT 1",
-                               array(
-                                       bigintval(postRequestParameter('val', $id)),
-                                       postRequestParameter('comm', $id),
-                                       $id
-                               ),__FILE__, __LINE__);
-                               $TEXT = '{--ADMIN_MAX_RECEIVE_SAVED--}';
-                               break;
-
-                       case 'delete':
-                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1",
-                                       array($id), __FILE__, __LINE__);
-                               $TEXT = '{--ADMIN_MAX_RECEIVE_DELETED--}';
-                               break;
-               }
-       }
-
-       if (isset($TEXT)) {
-               // Display message
-               displayMessage($TEXT);
-       } // END - if
-} elseif ((isFormSent('delete')) && (ifPostContainsSelections())) {
-       // Delete entries
-       $OUT = '';
-       foreach (postRequestParameter('sel') as $id => $value) {
-               // Load data
-               $result = SQL_QUERY_ESC("SELECT `id`, `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` 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_config_email_del_row', true, $content);
-       } // END - foreach
-       $content['rows'] = $OUT;
-
-       // Load main template
-       loadTemplate('admin_config_email_del', false, $content);
-} elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
-       // Edit entries
-       $OUT = '';
-       foreach (postRequestParameter('sel') as $id => $value) {
-               // Load data
-               $result = SQL_QUERY_ESC("SELECT `id`, `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` 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_config_email_edit_row', true, $content);
-       } // END - foreach
-       $content['rows'] = $OUT;
-
-       // Load main template
-       loadTemplate('admin_config_email_edit', false, $content);
-} else {
-       $result = SQL_QUERY("SELECT `id`, `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` ORDER BY `value` ASC",
-       __FILE__, __LINE__);
-       if (!SQL_HASZERONUMS($result)) {
-               // List already existing entries for editing
-               $OUT = '';
-               while ($content = SQL_FETCHARRAY($result)) {
-                       // Load row template and switch color
-                       $OUT .= loadTemplate('admin_config_email_row', true, $content);
-               } // END - while
-
-               // Free memory
-               SQL_FREERESULT($result);
-               $content['rows'] = $OUT;
-
-               // Load main template
-               loadTemplate('admin_config_email', false, $content);
-       } // END - if
-
-       // Display form
-       loadTemplate('admin_add_max');
-}
-
-// [EOF]
+// @DEPRECATED
 ?>
index 8a5e102..077bcb0 100644 (file)
@@ -51,12 +51,16 @@ if (isPostRequestParameterSet('rate')) {
 if ((isFormSent('add')) && (isPostRequestParameterSet('title')) && (postRequestParameter('rate') > 0)) {
        // Add new payout type
        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE type='%s' LIMIT 1",
-       array(postRequestParameter('title')), __FILE__, __LINE__);
+               array(postRequestParameter('title')), __FILE__, __LINE__);
        if (SQL_HASZERONUMS($result)) {
                // Add now
-               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_payout_types`
-(`type`, `rate`, `min_points`, `from_account`, `from_pass`, `engine_url`, `engine_ret_ok`, `engine_ret_failed`, `pass_enc`, `allow_url`)
-VALUES ('%s', %s, %s,'%s','%s','%s','%s','%s','%s','%s')",
+               SQL_QUERY_ESC("INSERT INTO
+       `{?_MYSQL_PREFIX?}_payout_types`
+(
+       `type`, `rate`, `min_points`, `from_account`, `from_pass`, `engine_url`, `engine_ret_ok`, `engine_ret_failed`, `pass_enc`, `allow_url`
+) VALUES (
+       '%s', %s, %s,'%s','%s','%s','%s','%s','%s','%s'
+)",
                array(
                        postRequestParameter('title'),
                        bigintval(postRequestParameter('rate')),
@@ -86,99 +90,95 @@ $result_mem = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE
 
 $display = true;
 if ((isFormSent('edit')) && (ifPostContainsSelections())) {
-       // Edit payout types
-       if ((isGetRequestParameterSet('ok')) && (getRequestParameter('ok') == 'ok')) {
-               // Init SQLs
-               initSqls();
-
-               // Edit entries
-               foreach (postRequestParameter('sel') as $id => $sel) {
-                       // Secure id
-                       $id = bigintval($id);
-
-                       // Edit only if something is entered
-                       if ((isPostRequestParameterSet('title', $id)) && (postRequestParameter('rate', $id) > 0)) {
-                               // Update entry
-                               addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_payout_types` SET
-       type='%s',
-       rate=%s,
-       min_points=%s,
-       allow_url='%s'
+       // Make payouts configurable
+       $display = false; //Suppress any other outputs
+       $OUT = '';
+       foreach (postRequestParameter('sel') as $id => $sel) {
+               // Load data
+               $result = SQL_QUERY_ESC("SELECT `id`, `type`, `rate`, `min_points`, `allow_url` FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
+                       array(bigintval($id)), __FILE__, __LINE__);
+               $content = SQL_FETCHARRAY($result);
+               SQL_FREERESULT($result);
+
+               // Prepare data for the row template
+               $content['allow_url'] = addSelectionBox('yn', $content['allow_url'], 'allow_url[' . $content['id'] . ']');
+
+               // Load row template and switch color
+               $OUT .= loadTemplate('admin_edit_payouts_row', true, $content);
+       } // END - foreach
+
+       // Load main template
+       loadTemplate('admin_edit_payouts', false, $OUT);
+} elseif ((isFormSent('change')) && (ifPostContainsSelections())) {
+       // Change them now
+       // Init SQLs
+       initSqls();
+
+       // Edit entries
+       foreach (postRequestParameter('sel') as $id => $sel) {
+               // Secure id
+               $id = bigintval($id);
+
+               // Edit only if something is entered
+               if ((isPostRequestParameterSet('title', $id)) && (postRequestParameter('rate', $id) > 0)) {
+                       // Update entry
+                       addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_payout_types` SET
+       `type`='%s',
+       `rate`=%s,
+       `min_points`=%s,
+       `allow_url`='%s'
 WHERE
        `id`=%s
 LIMIT 1",
-                               array(
-                                       postRequestParameter('type', $id),
-                                       convertCommaToDot(postRequestParameter('rate', $id)),
-                                       convertCommaToDot(postRequestParameter('min_points' , $id)),
-                                       postRequestParameter('allow_url', $id),
-                                       bigintval($id)
-                               ),__FILE__, __LINE__, false));
-                       }
+                       array(
+                               postRequestParameter('type', $id),
+                               convertCommaToDot(postRequestParameter('rate', $id)),
+                               convertCommaToDot(postRequestParameter('min_points' , $id)),
+                               postRequestParameter('allow_url', $id),
+                               bigintval($id)
+                       ),__FILE__, __LINE__, false));
                }
+       }
 
-               // Run all SQLs
-               runFilterChain('run_sqls');
+       // Run all SQLs
+       runFilterChain('run_sqls');
 
-               // Get message
-               $message = '{--ADMIN_PAYOUT_ENTRIES_CHANGED--}';
-       } else {
-               $display = false; //Suppress any other outputs
-               $OUT = '';
-               foreach (postRequestParameter('sel') as $id => $sel) {
-                       // Load data
-                       $result = SQL_QUERY_ESC("SELECT `id`, `type`, `rate`, `min_points`, `allow_url` FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
-                               array(bigintval($id)), __FILE__, __LINE__);
-                       $content = SQL_FETCHARRAY($result);
-                       SQL_FREERESULT($result);
-
-                       // Prepare data for the row template
-                       $content['allow_url'] = addSelectionBox('yn', $content['allow_url'], 'allow_url[' . $content['id'] . ']');
-
-                       // Load row template and switch color
-                       $OUT .= loadTemplate('admin_config_payouts_edit_row', true, $content);
-               } // END - foreach
-
-               // Load main template
-               loadTemplate('admin_config_payouts_edit', false, $OUT);
-       }
+       // Get message
+       $message = '{--ADMIN_PAYOUT_ENTRIES_CHANGED--}';
 } elseif ((isFormSent('delete')) && (ifPostContainsSelections())) {
-       // Delete payout types
-       if ((isGetRequestParameterSet('ok')) && (getRequestParameter('ok') == 'ok')) {
-               // Init SQLs
-               initSqls();
-
-               // Delete entries
-               foreach (postRequestParameter('sel') as $id => $sel) {
-                       addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
-                               array(bigintval($id)), __FILE__, __LINE__, false));
-               } // END - foreach
+       $display = false; //Suppress any other outputs
+       $OUT = '';
+       foreach (postRequestParameter('sel') as $id => $sel) {
+               // Secure id number
+               $id = bigintval($id);
+
+               // Load data
+               $result = SQL_QUERY_ESC("SELECT `id`, `type`, `rate`, `min_points` FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
+                       array($id), __FILE__, __LINE__);
+               $content = SQL_FETCHARRAY($result);
+               SQL_FREERESULT($result);
 
-               // Run all SQLs
-               runFilterChain('run_sqls');
+               // Load row template and switch color
+               $OUT .= loadTemplate('admin_delete_payouts_row', true, $content);
+       } // END - foreach
 
-               // Get message
-               $message = '{--ADMIN_PAYOUT_ENTRIES_DELETED--}';
-       } else {
-               $display = false; //Suppress any other outputs
-               $OUT = '';
-               foreach (postRequestParameter('sel') as $id => $sel) {
-                       // Secure id number
-                       $id = bigintval($id);
-
-                       // Load data
-                       $result = SQL_QUERY_ESC("SELECT `id`, `type`, `rate`, `min_points` FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
-                               array($id), __FILE__, __LINE__);
-                       $content = SQL_FETCHARRAY($result);
-                       SQL_FREERESULT($result);
-
-                       // Load row template and switch color
-                       $OUT .= loadTemplate('admin_config_payouts_del_row', true, $content);
-               } // END - foreach
-
-               // Load main template
-               loadTemplate('admin_config_payouts_del', false, $OUT);
-       }
+       // Load main template
+       loadTemplate('admin_delete_payouts', false, $OUT);
+} elseif ((isFormSent('remove')) && (ifPostContainsSelections())) {
+       // Init SQLs
+       initSqls();
+
+       // Delete entries
+       foreach (postRequestParameter('sel') as $id => $sel) {
+               addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_payout_types` WHERE `id`=%s LIMIT 1",
+                       array(bigintval($id)), __FILE__, __LINE__, false));
+       } // END - foreach
+
+       // Run all SQLs
+       runFilterChain('run_sqls');
+
+       // Get message
+       $message = '{--ADMIN_PAYOUT_ENTRIES_DELETED--}';
 }
 
 if (!empty($message)) {
@@ -210,10 +210,10 @@ if ((!SQL_HASZERONUMS($result_type)) && ($display)) {
 } // END - if
 
 // Does your members request payouts?
-if ((!SQL_HASZERONUMS($result_mem)) && ($display)) {
+if ((!SQL_HASZERONUMS($result_mem)) && ($display === true)) {
        // Members has requested payouts
        displayMessage('<a href="{%url=modules.php?module=admin&amp;what=list_payouts%}">{--ADMIN_PAYOUT_LIST_REQUESTS--}</a>');
-} elseif ($display) {
+} elseif ($display === true) {
        // No member requests so far
        displayMessage('{--ADMIN_PAYOUT_NO_MEMBER_REQUESTS--}');
 }
@@ -222,7 +222,9 @@ if ((!SQL_HASZERONUMS($result_mem)) && ($display)) {
 SQL_FREERESULT($result_mem);
 
 // Add new payout type
-if ($display === true) loadTemplate('admin_payout_add_new');
+if ($display === true) {
+       loadTemplate('admin_payout_add_new');
+} // END - if
 
 // [EOF]
 ?>
diff --git a/inc/modules/admin/what-list_admins_acls.php b/inc/modules/admin/what-list_admins_acls.php
new file mode 100644 (file)
index 0000000..e8159b0
--- /dev/null
@@ -0,0 +1,248 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 06/30/2011 *
+ * ===================                          Last change: 06/30/2011 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : what-list_admins_acls.php                        *
+ * -------------------------------------------------------------------- *
+ * Short description : List admin access control lines (ACLs)           *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Auflisten von Zugriffskontrollzeilen (ACLs)      *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
+} // END - if
+
+// Add description as navigation point
+addYouAreHereLink('admin', __FILE__);
+
+if ((isFormSent('edit')) && (ifPostContainsSelections())) {
+       // Edit ACLs
+       $OUT = '';
+       foreach (postRequestParameter('sel') as $id => $selected) {
+               // Load data for the id
+               $result = SQL_QUERY_ESC("SELECT `id`, `admin_id`, `action_menu`, `what_menu`, `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `id`=%s LIMIT 1",
+                       array(bigintval($id)), __FILE__, __LINE__);
+               $content = SQL_FETCHARRAY($result);
+
+               // Free result
+               SQL_FREERESULT($result);
+
+               // Prepare data for the row template
+               $content = array(
+                       'id'               => $content['id'],
+                       'admins_selection' => generateOptionList('admins', 'id', 'login', $content['admin_id'], 'default_acl'),
+                       'action_selection' => adminMenuSelectionBox_DEPRECATED('action', $content['action_menu'], $content['id']),
+                       'what_selection'   => adminMenuSelectionBox_DEPRECATED('what', $content['what_menu'], $content['id']),
+                       'mode_options'     => generateOptionList(
+                               '/ARRAY/',
+                               array('allow', 'deny'),
+                               array(
+                                       '{--ADMIN_ADMINS_ACCESS_MODE_ALLOW--}',
+                                       '{--ADMIN_ADMINS_ACCESS_MODE_DENY--}'
+                               ),
+                               $content['access_mode']
+                       ),
+               );
+
+               // Load row template
+               $OUT .= loadTemplate('admin_edit_admins_acls_row', true, $content);
+       } // END - foreach
+
+       // Load main template
+       loadTemplate('admin_edit_admins_acls', false, $OUT);
+} elseif ((isFormSent('change')) && (ifPostContainsSelections())) {
+       // Change entries
+       foreach (postRequestParameter('sel') as $id => $selected) {
+               // Secure id
+               $id = bigintval($id);
+
+               // Update entries
+               SQL_QUERY_ESC("UPDATE
+       `{?_MYSQL_PREFIX?}_admins_acls`
+SET
+       `admin_id`=%s,
+       `action_menu`='%s',
+       `what_menu`='%s',
+       `access_mode`='%s'
+WHERE
+       `id`=%s
+LIMIT 1",
+                       array(
+                               postRequestParameter('admin', $id),
+                               postRequestParameter('action_menu', $id),
+                               postRequestParameter('what_menu', $id),
+                               postRequestParameter('mode', $id),
+                               $id
+                       ),__FILE__, __LINE__);
+       } // END - foreach
+
+       // Update cache when installed
+       // @TODO Rewrite this to a filter
+       if (isExtensionActive('cache')) {
+               if ($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) $GLOBALS['cache_instance']->removeCacheFile();
+       } // END - if
+
+       // Entries changed
+       displayMessage('{--ADMIN_ADMINS_ENTRIES_CHANGED--}');
+} elseif ((isFormSent('delete')) && (ifPostContainsSelections())) {
+       // Delete ACLs
+       $OUT = '';
+       foreach (postRequestParameter('sel') as $id => $selected) {
+               // Load data for the id
+               $result = SQL_QUERY_ESC("SELECT `id`, `admin_id`, `action_menu`, `what_menu`, `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `id`=%s LIMIT 1",
+                       array(bigintval($id)), __FILE__, __LINE__);
+               $content = SQL_FETCHARRAY($result);
+               SQL_FREERESULT($result);
+
+               // Get admin mode
+               $content['access_mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['access_mode']) . '--}';
+
+               // Load row template and switch colors
+               $OUT .= loadTemplate('admin_delete_admins_acls_row', true, $content);
+       } // END - foreach
+
+       // Load main template
+       loadTemplate('admin_delete_admins_acls', false, $OUT);
+} elseif ((isFormSent('remove')) && (ifPostContainsSelections())) {
+       // Remove entries
+       // @TODO Rewrite this to filter 'run_sqls'
+       foreach (postRequestParameter('sel') as $id => $selected) {
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `id`=%s LIMIT 1",
+                       array(bigintval($id)),__FILE__, __LINE__);
+       } // END - foreach
+
+       // Update cache when installed
+       if (isExtensionActive('cache')) {
+               if ($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) $GLOBALS['cache_instance']->removeCacheFile();
+       } // END - if
+
+       // Entries deleted
+       displayMessage('{--ADMIN_ADMINS_ENTRIES_DELETED--}');
+} elseif (isFormSent('add')) {
+       // Check if everything is fine...
+       $mode = getAdminDefaultAcl(bigintval(postRequestParameter('admin_id')));
+
+       // Default ACL is false
+       $ACL = false;
+       if (isPostRequestParameterSet('what_menu')) {
+               // Check parent ACL
+               $ACL = adminsCheckAdminAcl(getActionFromModuleWhat('admin', postRequestParameter('what_menu')), '');
+       } // END - if
+
+       if (($mode != postRequestParameter('mode')) || (($ACL === true) && (postRequestParameter('mode') == 'deny'))) {
+               // Mode is fine
+               $BOTH = ((isPostRequestParameterSet('action_menu')) && (isPostRequestParameterSet('what_menu')) && (postRequestParameter('action_menu') != '') && (postRequestParameter('what_menu') != ''));
+
+               // Check if one has been selected
+               if ((((isPostRequestParameterSet('action_menu')) && (postRequestParameter('action_menu') != '')) || ((isPostRequestParameterSet('what_menu')) && (postRequestParameter('what_menu') != ''))) && ($BOTH === false)) {
+                       // Main or sub menu selected
+                       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `admin_id`=%s AND `action_menu`='%s' AND `what_menu`='%s' LIMIT 1",
+                               array(
+                                       bigintval(postRequestParameter('admin_id')),
+                                       postRequestParameter('action_menu'),
+                                       postRequestParameter('what_menu')
+                               ), __FILE__, __LINE__);
+                       if (SQL_HASZERONUMS($result)) {
+                               // Finally add the new ACL
+                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_acls` (`admin_id`, `action_menu`, `what_menu`, `access_mode`)
+VALUES ('%s','%s','%s','%s')",
+                               array(
+                                       bigintval(postRequestParameter('admin_id')),
+                                       postRequestParameter('action_menu'),
+                                       postRequestParameter('what_menu'),
+                                       postRequestParameter('mode')
+                               ), __FILE__, __LINE__);
+                               $content = '{--ADMIN_ADMINS_ACL_SAVED--}';
+
+                               // Update cache when installed
+                               if (isExtensionActive('cache')) {
+                                       if ($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) $GLOBALS['cache_instance']->removeCacheFile();
+                               } // END - if
+                       } else {
+                               // ACL does already exist!
+                               $content = '{--ADMIN_ADMINS_ACL_ALREADY_ADDED--}';
+                       }
+
+                       // Free memory
+                       SQL_FREERESULT($result);
+               } else {
+                       // No menu selected makes also no sence...
+                       $content = '{--ADMIN_ADMINS_SELECT_ACTION_WHAT--}';
+               }
+       } else {
+               // Same mode makes no sence...
+               $content = '{--ADMIN_ADMINS_SAME_MODE_SELECTED--}';
+       }
+
+       // Display message
+       displayMessage($content);
+} else {
+       // List all ACLs
+       $result = SQL_QUERY('SELECT `id`, `admin_id`, `action_menu`, `what_menu`, `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` ORDER BY `admin_id` ASC, `id` ASC', __FILE__, __LINE__);
+
+       // Entries found?
+       if (!SQL_HASZERONUMS($result)) {
+               // List ACLs
+               $OUT = '';
+               while ($content = SQL_FETCHARRAY($result)) {
+                       // Generate mode string
+                       $content['access_mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['access_mode']) . '--}';
+
+                       // Load row template and switch colors
+                       $OUT .= loadTemplate('admin_list_admins_acls_row', true, $content);
+               } // END - while
+
+               // Free memory
+               SQL_FREERESULT($result);
+
+               // Load main template
+               loadTemplate('admin_list_admins_acls', false, $OUT);
+       } // END - if
+
+       // Prepare some constants for the template
+       $content['admins_selection'] = generateOptionList('admins', 'id', 'login', '', 'default_acl');
+       $content['action_selection'] = adminMenuSelectionBox_DEPRECATED('action');
+       $content['what_selection']   = adminMenuSelectionBox_DEPRECATED('what');
+       $content['mode_options']     = generateOptionList(
+               '/ARRAY/',
+               array('allow', 'deny'),
+               array(
+                       '{--ADMIN_ADMINS_ACCESS_MODE_ALLOW--}',
+                       '{--ADMIN_ADMINS_ACCESS_MODE_DENY--}'
+               )
+       );
+
+       // Load template for adding new ACL
+       loadTemplate('admin_add_admins_acl', false, $content);
+}
+
+// [EOF]
+?>
diff --git a/inc/modules/admin/what-list_email_max_rec.php b/inc/modules/admin/what-list_email_max_rec.php
new file mode 100644 (file)
index 0000000..c5c2c0b
--- /dev/null
@@ -0,0 +1,158 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 06/30/2011 *
+ * ===================                          Last change: 06/30/2011 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : what-list_email_max_rec.php                      *
+ * -------------------------------------------------------------------- *
+ * Short description : Edit all things around email and sending         *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Aendern aller Email-Einstellungen                *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
+} // END - if
+
+// Add description as navigation point
+addYouAreHereLink('admin', __FILE__);
+
+// Remove empty array index
+if (!isPostRequestParameterSet('max')) {
+       unsetPostRequestParameter('add_max');
+} // END - if
+
+if (isPostRequestParameterSet('add_max')) {
+       // Save all settings
+       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE value='%s' LIMIT 1",
+       array(bigintval(postRequestParameter('max'))), __FILE__, __LINE__);
+       if (SQL_HASZERONUMS($result)) {
+               // Add this value (including comment)
+               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES ('%s','%s')",
+               array(bigintval(postRequestParameter('max')), postRequestParameter('comment')),__FILE__, __LINE__);
+               $content = '{--ADMIN_MAX_VALUE_SAVED--}';
+       } else {
+               // Value does alread exists!
+               $content = '<span class="notice">{--ADMIN_MAX_VALUE_ALREADY--}</span>';
+       }
+
+       // Free memory
+       SQL_FREERESULT($result);
+
+       // Display message
+       displayMessage($content);
+} elseif ((isFormSent()) && (isGetRequestParameterSet('do'))) {
+       // Change or delete entries...
+       $TEXT = '';
+       foreach (postRequestParameter('id') as $id => $value) {
+               // Secure id
+               $id = bigintval($id);
+
+               switch (postRequestParameter('do')) {
+                       case 'edit': // Change entries
+                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_max_receive` SET value='%s', comment='%s' WHERE `id`=%s LIMIT 1",
+                               array(
+                                       bigintval(postRequestParameter('val', $id)),
+                                       postRequestParameter('comm', $id),
+                                       $id
+                               ),__FILE__, __LINE__);
+                               $TEXT = '{--ADMIN_MAX_RECEIVE_SAVED--}';
+                               break;
+
+                       case 'delete':
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1",
+                                       array($id), __FILE__, __LINE__);
+                               $TEXT = '{--ADMIN_MAX_RECEIVE_DELETED--}';
+                               break;
+               }
+       }
+
+       if (isset($TEXT)) {
+               // Display message
+               displayMessage($TEXT);
+       } // END - if
+} elseif ((isFormSent('delete')) && (ifPostContainsSelections())) {
+       // Delete entries
+       $OUT = '';
+       foreach (postRequestParameter('sel') as $id => $value) {
+               // Load data
+               $result = SQL_QUERY_ESC("SELECT `id`, `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` 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_email_max_rec_row', true, $content);
+       } // END - foreach
+       $content['rows'] = $OUT;
+
+       // Load main template
+       loadTemplate('admin_delete_email_max_rec', false, $content);
+} elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
+       // Edit entries
+       $OUT = '';
+       foreach (postRequestParameter('sel') as $id => $value) {
+               // Load data
+               $result = SQL_QUERY_ESC("SELECT `id`, `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` 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_email_max_rec_row', true, $content);
+       } // END - foreach
+       $content['rows'] = $OUT;
+
+       // Load main template
+       loadTemplate('admin_edit_email_max_rec', false, $content);
+} else {
+       $result = SQL_QUERY("SELECT `id`, `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` ORDER BY `value` ASC",
+       __FILE__, __LINE__);
+       if (!SQL_HASZERONUMS($result)) {
+               // List already existing entries for editing
+               $OUT = '';
+               while ($content = SQL_FETCHARRAY($result)) {
+                       // Load row template and switch color
+                       $OUT .= loadTemplate('admin_list_email_max_rec_row', true, $content);
+               } // END - while
+
+               // Free memory
+               SQL_FREERESULT($result);
+               $content['rows'] = $OUT;
+
+               // Load main template
+               loadTemplate('admin_list_email_max_rec', false, $content);
+       } // END - if
+
+       // Display form
+       loadTemplate('admin_add_max');
+}
+
+// [EOF]
+?>
index 4d0fda7..c7a5470 100644 (file)
@@ -139,8 +139,9 @@ LIMIT 1",
                $content['joined']            = generateDateTime($content['joined'], 0);
                $content['last_update']       = generateDateTime($content['last_update'], 0);
                $content['last_profile_sent'] = generateDateTime($content['last_profile_sent'], 0);
-               $content['total_points']      = countSumTotalData($userid, 'user_points', 'points');
-               $content['locked']            = countSumTotalData($userid, 'user_points', 'locked_points');
+               $content['total_points']      = getTotalPoints($content['userid']);
+               $content['locked_points']     = countSumTotalData($userid, 'user_points', 'locked_points') + countSumTotalData($userid, 'user_points', 'locked_order_points');
+               $content['own_points']        = countSumTotalData($userid, 'user_points', 'points') + countSumTotalData($userid, 'user_points', 'order_points');
                $content['lock_timestamp']    = generateDateTime($content['lock_timestamp'], 2);
                $content['nickname']          = '{--EXT_NICKNAME_404--}';
 
@@ -298,7 +299,8 @@ LIMIT 1",
                        $content['email']          = '[<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['email'] . '</a>]';
                        $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2);
                        $content['refs']           = countSumTotalData($content['userid'], 'user_refs', 'id', 'userid', true);
-                       $content['locked']         = countSumTotalData($content['userid'], 'user_points', 'locked_points');
+                       $content['own_points']     = countSumTotalData($content['userid'], 'user_points', 'points') + countSumTotalData($content['userid'], 'user_points', 'order_points');
+                       $content['locked_points']  = countSumTotalData($content['userid'], 'user_points', 'locked_points') + countSumTotalData($content['userid'], 'user_points', 'locked_order_points');
 
                        // If we have at least one referal, make it clickable to referal list
                        if ($content['refs'] > 0) {
index fb050d6..08e9b39 100644 (file)
@@ -126,12 +126,12 @@ LIMIT 1",
 // Free memory
 SQL_FREERESULT($result_depths);
 
+// Add userid
+$content['userid'] = getMemberId();
+
 // Put rows to constant for the main template
 $content['rows'] = $OUT;
 
-// Remember several values in constants
-$content['total_points'] = $content['part_points'] - getUserData('used_points') + $content['part_order'];
-
 // Fixes a bug when there is no bonus extension installed
 if (isExtensionInstalledAndOlder('bonus', '0.4.4')) {
        setConfigEntry('bonus_active', 'X');
index f311eb7..ce97e2f 100644 (file)
@@ -2336,7 +2336,7 @@ function getTotalPoints ($userid) {
        // Do we have cache?
        if (!isset($GLOBALS[__FUNCTION__][$userid])) {
                // Determine it
-               $GLOBALS[__FUNCTION__][$userid] = countSumTotalData($userid, 'user_points', 'points') - countSumTotalData($userid, 'order_points', 'points') - countSumTotalData($userid, 'user_data', 'used_points');
+               $GLOBALS[__FUNCTION__][$userid] = countSumTotalData($userid, 'user_points', 'points') - countSumTotalData($userid, 'user_points', 'order_points') - countSumTotalData($userid, 'user_data', 'used_points');
        } // END - if
 
        // Return cache
index d1a673b..6b388f1 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_admins%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_admins_acls%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
index 4da4087..9984cad 100644 (file)
@@ -1,5 +1,5 @@
 <div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_email%}" method="post">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_email_max_rec%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" class="table_header bottom" align="center">
index 36edf17..646b1fd 100644 (file)
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
-                       <strong>{--ADMIN_CONFIG_ACTIVE_SETTINGS_TITLE--}:</strong>
+                       <strong>{--ADMIN_CONFIG_ACTIVE_TITLE--}:</strong>
                </td>
        </tr>
        <tr>
index e595e55..11f5d85 100644 (file)
@@ -1,26 +1 @@
-<div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_admins%}" method="post">
-<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-       <tr>
-               <td colspan="5" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_ADMINS_LIST_ACLS--}:</strong>
-               </td>
-       </tr>
-       <tr>
-               <td align="center" class="header_column bottom right" width="30"><strong>{--ID_SELECT--}</strong></td>
-               <td align="center" class="header_column bottom right" width="120"><strong>{--ADMIN_ADMINS_LOGIN_ID--}:</strong></td>
-               <td align="center" class="header_column bottom right" width="204"><strong>{--ADMIN_MENU_ACTION--}:</strong></td>
-               <td align="center" class="header_column bottom right" width="204"><strong>{--ADMIN_MENU_WHAT--}:</strong></td>
-               <td align="center" class="header_column bottom" width="120"><strong>{--ADMIN_ADMINS_ACCESS_MODE--}:</strong></td>
-       </tr>
-       $content
-       <tr>
-               <td colspan="5" class="table_footer">
-                       <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_ADMINS_EDIT_ACLS_SUBMIT--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ADMINS_DELETE_ACLS_SUBMIT--}" />
-               </td>
-       </tr>
-</table>
-</form>
-</div>
+<!-- @DEPRECATED //-->
index ee99acc..11f5d85 100644 (file)
@@ -1,25 +1 @@
-<div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_admins%}" method="post">
-<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-       <tr>
-               <td colspan="5" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_ADMINS_DELETE_ACLS--}:</strong>
-               </td>
-       </tr>
-       <tr>
-               <td align="center" class="header_column bottom right" width="30"><strong>{--ID_SELECT--}</strong></td>
-               <td align="center" class="header_column bottom right" width="120"><strong>{--ADMIN_ADMINS_LOGIN_ID--}:</strong></td>
-               <td align="center" class="header_column bottom right" width="204"><strong>{--ADMIN_MENU_ACTION--}:</strong></td>
-               <td align="center" class="header_column bottom right" width="204"><strong>{--ADMIN_MENU_WHAT--}:</strong></td>
-               <td align="center" class="header_column bottom" width="120"><strong>{--ADMIN_ADMINS_ACCESS_MODE--}:</strong></td>
-       </tr>
-       $content
-       <tr>
-               <td colspan="5" class="table_footer">
-                       <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="remove" class="form_delete" value="{--ADMIN_ADMINS_REMOVE_ACLS_SUBMIT--}" />
-               </td>
-       </tr>
-</table>
-</form>
-</div>
+<!-- @DEPRECATED //-->
index d522782..11f5d85 100644 (file)
@@ -1,17 +1 @@
-<tr>
-       <td class="{%template,ColorSwitch%} bottom right" align="center"><strong>$content[id]</strong>
-               <input type="hidden" name="sel[$content[id]]" value="1" />
-       </td>
-       <td class="{%template,ColorSwitch%} bottom right" align="center">
-               {%pipe,generateAdminLink=$content[admin_id]%}
-       </td>
-       <td class="{%template,ColorSwitch%} bottom right" align="center">
-               {%pipe,fixEmptyContentToDashes=$content[action_menu]%}
-       </td>
-       <td class="{%template,ColorSwitch%} bottom right" align="center">
-               {%pipe,fixEmptyContentToDashes=$content[what_menu]%}
-       </td>
-       <td class="{%template,ColorSwitch%} bottom" align="center">
-               $content[access_mode]
-       </td>
-</tr>
+<!-- @DEPRECATED //-->
index e458d17..11f5d85 100644 (file)
@@ -1,25 +1 @@
-<div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_admins%}" method="post">
-<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-       <tr>
-               <td colspan="5" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_ADMINS_EDIT_ACLS--}:</strong>
-               </td>
-       </tr>
-       <tr>
-               <td align="center" class="header_column bottom right" width="30"><strong>{--ID_SELECT--}</strong></td>
-               <td align="center" class="header_column bottom right" width="120"><strong>{--ADMIN_ADMINS_LOGIN_ID--}:</strong></td>
-               <td align="center" class="header_column bottom right" width="204"><strong>{--ADMIN_MENU_ACTION--}:</strong></td>
-               <td align="center" class="header_column bottom right" width="204"><strong>{--ADMIN_MENU_WHAT--}:</strong></td>
-               <td align="center" class="header_column bottom" width="120"><strong>{--ADMIN_ADMINS_ACCESS_MODE--}:</strong></td>
-       </tr>
-       $content
-       <tr>
-               <td colspan="5" class="table_footer">
-                       <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="change" value="{--ADMIN_ADMINS_CHANGE_ACLS_SUBMIT--}" />
-               </td>
-       </tr>
-</table>
-</form>
-</div>
+<!-- @DEPRECATED //-->
index 59f18b7..11f5d85 100644 (file)
@@ -1,22 +1 @@
-<tr>
-       <td class="{%template,ColorSwitch%} bottom right" align="center">
-               <strong>$content[id]</strong>
-               <input type="hidden" name="sel[$content[id]]" value="1" />
-       </td>
-       <td class="{%template,ColorSwitch%} bottom right" align="center">
-               <select name="admin[$content[id]]" size="1" class="form_select">
-                       $content[admins_selection]
-               </select>
-       </td>
-       <td class="{%template,ColorSwitch%} bottom right" align="center">
-               $content[action_selection]
-       </td>
-       <td class="{%template,ColorSwitch%} bottom right" align="center">
-               $content[what_selection]
-       </td>
-       <td class="{%template,ColorSwitch%} bottom" align="center">
-               <select name="mode[$content[id]]" size="1" class="form_select">
-                       $content[mode_options]
-               </select>
-       </td>
-</tr>
+<!-- @DEPRECATED //-->
index 7a00f35..11f5d85 100644 (file)
@@ -1,17 +1 @@
-<tr>
-       <td class="{%template,ColorSwitch%} bottom right" align="center">
-               <input type="checkbox" title="{--ID_SELECT--} $content[id]" class="form_field" name="sel[$content[id]]" value="1" />
-       </td>
-       <td class="{%template,ColorSwitch%} bottom right" align="center">
-               {%pipe,generateAdminLink=$content[admin_id]%}
-       </td>
-       <td class="{%template,ColorSwitch%} bottom right" align="center">
-               {%pipe,fixEmptyContentToDashes=$content[action_menu]%}
-       </td>
-       <td class="{%template,ColorSwitch%} bottom right" align="center">
-               {%pipe,fixEmptyContentToDashes=$content[what_menu]%}
-       </td>
-       <td class="{%template,ColorSwitch%} bottom" align="center">
-               $content[access_mode]
-       </td>
-</tr>
+<!-- @DEPRECATED //-->
index 37fc291..9d907ba 100644 (file)
                </td>
        </tr>
        <tr>
-               <td align="right" width="250">{--ADMIN_AUTOPURGE_INACTIVE--}</td>
+               <td align="right" width="250">{--ADMIN_CONFIG_AUTOPURGE_INACTIVE--}</td>
                <td>$content[ap_inactive_selection]</td>
        </tr>
        <tr>
-               <td align="right" width="250">{--ADMIN_AUTOPURGE_INACTIVE_SINCE--}:</td>
+               <td align="right" width="250">{--ADMIN_CONFIG_AUTOPURGE_INACTIVE_SINCE--}:</td>
                <td>$content[ap_in_since]</td>
        </tr>
        <tr>
-               <td class="bottom" align="right" width="250">{--ADMIN_AUTOPURGE_INACTIVE_TIME--}:</td>
+               <td class="bottom" align="right" width="250">{--ADMIN_CONFIG_AUTOPURGE_INACTIVE_TIME--}:</td>
                <td class="bottom">$content[ap_in_time]</td>
        </tr>
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       {--ADMIN_AUTOPURGE_UNCONFIRMED_TITLE--}
+                       {--ADMIN_CONFIG_AUTOPURGE_UNCONFIRMED_TITLE--}
                </td>
        </tr>
        <tr>
-               <td align="right" width="250">{--ADMIN_AUTOPURGE_UNCONFIRMED--}</td>
+               <td align="right" width="250">{--ADMIN_CONFIG_AUTOPURGE_UNCONFIRMED--}</td>
                <td>$content[ap_unconfirmed_selection]</td>
        </tr>
        <tr>
-               <td class="bottom" align="right" width="250">{--ADMIN_AUTOPURGE_UNCONFIRMED_TIME--}:</td>
+               <td class="bottom" align="right" width="250">{--ADMIN_CONFIG_AUTOPURGE_UNCONFIRMED_TIME--}:</td>
                <td class="bottom">$content[ap_un_time]</td>
        </tr>
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       {--ADMIN_AUTOPURGE_TASKS_TITLE--}
+                       {--ADMIN_CONFIG_AUTOPURGE_TASKS_TITLE--}
                </td>
        </tr>
        <tr>
-               <td align="right" width="250">{--ADMIN_AUTOPURGE_TASKS--}</td>
+               <td align="right" width="250">{--ADMIN_CONFIG_AUTOPURGE_TASKS--}</td>
                <td>$content[ap_tasks_selection]</td>
        </tr>
        <tr>
-               <td class="bottom" align="right" width="250">{--ADMIN_AUTOPURGE_TASKS_TIME--}:</td>
+               <td class="bottom" align="right" width="250">{--ADMIN_CONFIG_AUTOPURGE_TASKS_TIME--}:</td>
                <td class="bottom">$content[ap_task_time]</td>
        </tr>
        <tr>
@@ -73,7 +73,7 @@
        </tr>
        <tr>
                <td class="bottom" align="right" width="250">
-                       {--ADMIN_AUTOPURGE_NOTIFY_DELETE_MAILS--}:
+                       {--ADMIN_CONFIG_AUTOPURGE_NOTIFY_DELETE_MAILS--}:
                </td>
                <td class="bottom">
                        $content[ap_notify_del_mails]
        </tr>
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       {--ADMIN_AUTOPURGE_DELETE_MAILS_TITLE--}
+                       {--ADMIN_CONFIG_AUTOPURGE_DELETE_MAILS_TITLE--}
                </td>
        </tr>
        <tr>
                <td align="right" width="250">
-                       {--ADMIN_AUTOPURGE_DELETE_MAILS--}
+                       {--ADMIN_CONFIG_AUTOPURGE_DELETE_MAILS--}
                </td>
                <td>
                        $content[ap_del_mails_selection]
@@ -94,7 +94,7 @@
        </tr>
        <tr>
                <td class="bottom" align="right" width="250">
-                       {--ADMIN_AUTOPURGE_DELETE_MAILS_TIME--}:
+                       {--ADMIN_CONFIG_AUTOPURGE_DELETE_MAILS_TIME--}:
                </td>
                <td class="bottom">
                        $content[ap_del_mails_time]
        </tr>
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       {--ADMIN_AUTOPURGE_NOTIFICATION_TITLE--}
+                       {--ADMIN_CONFIG_AUTOPURGE_NOTIFICATION_TITLE--}
                </td>
        </tr>
        <tr>
                <td align="right" width="250">
-                       {--ADMIN_AUTOPURGE_NOTIFY_INACTIVE--}:
+                       {--ADMIN_CONFIG_AUTOPURGE_NOTIFY_INACTIVE--}:
                </td>
                <td>
                        $content[ap_notify_inactive]
        </tr>
        <tr>
                <td align="right" width="250">
-                       {--ADMIN_AUTOPURGE_NOTIFY_UNCONFIRMED--}:
+                       {--ADMIN_CONFIG_AUTOPURGE_NOTIFY_UNCONFIRMED--}:
                </td>
                <td>
                        $content[ap_notify_unconfirmed]
        </tr>
        <tr>
                <td class="bottom" align="right" width="250">
-                       {--ADMIN_AUTOPURGE_NOTIFY_TASKS--}:
+                       {--ADMIN_CONFIG_AUTOPURGE_NOTIFY_TASKS--}:
                </td>
                <td class="bottom">
                        $content[ap_notify_tasks]
index 49e80b8..9f3fb00 100644 (file)
@@ -3,12 +3,12 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_EDIT_BEG_SETTINGS--}</strong>
+                       <strong>{--ADMIN_CONFIG_BEG_TITLE--}</strong>
                </td>
        </tr>
        <tr>
                <td align="right" width="200" height="20">
-                       {--ADMIN_BEG_POINTS--}:
+                       {--ADMIN_CONFIG_BEG_POINTS--}:
                </td>
                <td width="295" align="center">
                        <input type="text" class="form_field" name="beg_points" size="7" maxlength="10" value="{%config,translateComma=beg_points%}" />
@@ -16,7 +16,7 @@
        </tr>
        <tr>
                <td align="right" width="300" height="20">
-                       {--ADMIN_BEG_POINTS_MAX--}:
+                       {--ADMIN_CONFIG_BEG_POINTS_MAX--}:
                </td>
                <td width="195" align="center">
                        <input type="text" class="form_field" name="beg_points_max" size="7" maxlength="10" value="{%config,translateComma=beg_points_max%}" />
@@ -47,7 +47,7 @@
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right" height="20">{--ADMIN_BEG_USERID--}:</td>
+               <td class="bottom" align="right" height="20">{--ADMIN_CONFIG_BEG_USERID--}:</td>
                <td class="bottom" align="center">
                        $content[beg_userid]
                </td>
        </tr>
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_EDIT_BEG_RALLYE_SETTINGS--}</strong>
+                       <strong>{--ADMIN_CONFIG_BEG_RALLYE_TITLE--}</strong>
                </td>
        </tr>
        <tr>
                <td align="right" height="20">
-                       {--ADMIN_BEG_RALLYE_ACTIVE--}
+                       {--ADMIN_CONFIG_BEG_RALLYE_ACTIVE--}
                </td>
                <td align="center">
                        <input type="radio" class="form_field" name="beg_rallye" value="Y"$content[rallye_y] /> {--YES--}<br />
@@ -83,7 +83,7 @@
        </tr>
        <tr>
                <td align="right" height="20">
-                       {--ADMIN_BEG_INCLUDE_OWN--}
+                       {--ADMIN_CONFIG_BEG_INCLUDE_OWN--}
                </td>
                <td align="center">
                        <input type="radio" class="form_field" name="beg_include_own" value="Y"$content[include_own_y] /> {--YES--}<br />
@@ -92,7 +92,7 @@
        </tr>
        <tr>
                <td align="right" height="20">
-                       {--ADMIN_BEG_RANKS--}
+                       {--ADMIN_CONFIG_BEG_RANKS--}
                </td>
                <td align="center">
                        <input type="text" class="form_field" name="beg_ranks" size="3" maxlength="7" value="{?beg_ranks?}" />
        </tr>
        <tr>
                <td align="right" height="20">
-                       {--ADMIN_BEG_RALLYE_ONLY_ACTIVE--}
+                       {--ADMIN_CONFIG_BEG_RALLYE_ONLY_ACTIVE--}
                </td>
                <td align="center">
                        <input type="radio" class="form_field" name="beg_active" value="Y"$content[active_y] /> {--YES--}<br />
        </tr>
        <tr>
                <td class="bottom" align="right" height="20">
-                       {--ADMIN_BEG_PAY_MODE--}
+                       {--ADMIN_CONFIG_BEG_PAY_MODE--}
                </td>
                <td class="bottom" align="center">
                        <select class="form_select" name="beg_pay_mode" size="1">
-                               <option value="IMG"$content[pay_mode_img]>{--ADMIN_BEG_PAY_MODE_IMG--}</option>
-                               <option value="JS"$content[pay_mode_js]>{--ADMIN_BEG_PAY_MODE_JS--}</option>
-                               <option value="BOTH"$content[pay_mode_both]>{--ADMIN_BEG_PAY_MODE_BOTH--}</option>
-                               <option value="NONE"$content[pay_mode_none]>{--ADMIN_BEG_PAY_MODE_NONE--}</option>
+                               <option value="IMG"$content[pay_mode_img]>{--ADMIN_CONFIG_BEG_PAY_MODE_IMG--}</option>
+                               <option value="JS"$content[pay_mode_js]>{--ADMIN_CONFIG_BEG_PAY_MODE_JS--}</option>
+                               <option value="BOTH"$content[pay_mode_both]>{--ADMIN_CONFIG_BEG_PAY_MODE_BOTH--}</option>
+                               <option value="NONE"$content[pay_mode_none]>{--ADMIN_CONFIG_BEG_PAY_MODE_NONE--}</option>
                        </select>
                </td>
        </tr>
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_EDIT_BEG_RALLYE_NOTIFICATIONS--}</strong>
+                       <strong>{--ADMIN_CONFIG_BEG_RALLYE_NOTIFICATIONS_TITLE--}</strong>
                </td>
        </tr>
        <tr>
                <td align="right" height="20">
-                       {--ADMIN_BEG_RALLYE_ENABLE_NOTIFY--}
+                       {--ADMIN_CONFIG_BEG_RALLYE_ENABLE_NOTIFY--}
                </td>
                <td align="center">
                        <input type="radio" class="form_field" name="beg_rallye_enable_notify" value="Y"$content[rallye_enable_notify_y] /> {--YES--}<br />
        </tr>
        <tr>
                <td align="right" height="20">
-                       {--ADMIN_BEG_RALLYE_DISABLE_NOTIFY--}
+                       {--ADMIN_CONFIG_BEG_RALLYE_DISABLE_NOTIFY--}
                </td>
                <td align="center">
                        <input type="radio" class="form_field" name="beg_rallye_disable_notify" value="Y"$content[rallye_disable_notify_y] /> {--YES--}<br />
        </tr>
        <tr>
                <td align="right" height="20">
-                       {--ADMIN_BEG_NEW_MEMBER_NOTIFY--}
+                       {--ADMIN_CONFIG_BEG_NEW_MEMBER_NOTIFY--}
                </td>
                <td align="center">
                        <input type="radio" class="form_field" name="beg_new_member_notify" value="Y"$content[new_member_notify_y] /> {--YES--}<br />
        </tr>
        <tr>
                <td align="right" height="20">
-                       {--ADMIN_BEG_NOTIFY_BONUS--}
+                       {--ADMIN_CONFIG_BEG_NOTIFY_BONUS--}
                </td>
                <td align="center">
                        <input type="text" class="form_field" name="beg_notify_bonus" size="3" maxlength="7" value="{%config,translateComma=beg_notify_bonus%}" />
        </tr>
        <tr>
                <td class="bottom" align="right" height="20">
-                       {--ADMIN_BEG_NOTIFY_WAIT--}
+                       {--ADMIN_CONFIG_BEG_NOTIFY_WAIT--}
                </td>
                <td class="bottom" align="center">
                        $content[wait_selection]
index 8ab0832..0514279 100644 (file)
@@ -8,8 +8,8 @@
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_BIRTHDAY_POINTS--}:
-                       <span class="notice">({--ADMIN_BIRTHDAY_POINTS_NOTE--})</span>
+                       {--ADMIN_CONFIG_BIRTHDAY_POINTS--}:
+                       <span class="notice">({--ADMIN_CONFIG_BIRTHDAY_POINTS_NOTE--})</span>
                </td>
                <td>
                        <input type="text" class="form_field" name="birthday_points" value="{?birthday_points?}" size="4" maxlength="6" />
@@ -17,7 +17,7 @@
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right">{--ADMIN_BIRTHDAY_ONLY_ACTIVE--}</td>
+               <td class="bottom" align="right">{--ADMIN_CONFIG_BIRTHDAY_ONLY_ACTIVE--}</td>
                <td class="bottom" align="center">
                        <input type="radio" class="form_field" name="birthday_active" value="Y"$content[active_y] /> {--YES--}<br />
                        <input type="radio" class="form_field" name="birthday_active" value="N"$content[active_n] /> {--NO--}
@@ -25,7 +25,7 @@
        </tr>
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_SELECT_BIRTHDAY_MODE--}:</strong>
+                       <strong>{--ADMIN_CONFIG_SELECT_BIRTHDAY_MODE--}:</strong>
                </td>
        </tr>
        <tr>
index 9315f07..cb6f6a5 100644 (file)
@@ -3,12 +3,12 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_ACTIVATE_BONUS_SETTINGS--}</strong>
+                       <strong>{--ADMIN_CONFIG_BONUS_RALLYE_TITLE--}</strong>
                </td>
        </tr>
        <tr>
                <td class="bottom" align="right">
-                       {--ADMIN_BONUS_RALLYE_IS_ACTIVE--}
+                       {--ADMIN_CONFIG_BONUS_RALLYE_IS_ACTIVE--}
                </td>
                <td class="bottom" align="center">
                        <input type="radio" class="form_field" name="bonus_active" value="Y"$content[active_y] /> {--YES--}<br />
@@ -17,7 +17,7 @@
        </tr>
        <tr>
                <td class="bottom" align="right">
-                       {--ADMIN_BONUS_INCLUDE_OWN--}
+                       {--ADMIN_CONFIG_BONUS_RALLYE_INCLUDE_ONW--}
                </td>
                <td class="bottom" align="center">
                        <input type="radio" class="form_field" name="bonus_include_own" value="Y"$content[include_own_y] /> {--YES--}<br />
@@ -26,7 +26,7 @@
        </tr>
        <tr>
                <td class="bottom" align="right">
-                       {--ADMIN_BONUS_RALLYE_CLICK_INCLUDE--}
+                       {--ADMIN_CONFIG_BONUS_RALLYE_CLICK_INCLUDE--}
                </td>
                <td class="bottom" align="center">
                        <input type="radio" class="form_field" name="bonus_click_yn" value="Y"$content[click_yn_y] /> {--YES--}<br />
@@ -35,7 +35,7 @@
        </tr>
        <tr>
                <td class="bottom" align="right">
-                       {--ADMIN_BONUS_RALLYE_LOGIN_INCLUDE--}
+                       {--ADMIN_CONFIG_BONUS_RALLYE_LOGIN_INCLUDE--}
                </td>
                <td class="bottom" align="center">
                        <input type="radio" class="form_field" name="bonus_login_yn" value="Y"$content[login_yn_y] /> {--YES--}<br />
@@ -44,7 +44,7 @@
        </tr>
        <tr>
                <td class="bottom" align="right">
-                       {--ADMIN_BONUS_RALLYE_ORDER_INCLUDE--}
+                       {--ADMIN_CONFIG_BONUS_RALLYE_ORDER_INCLUDE--}
                </td>
                <td class="bottom" align="center">
                        <input type="radio" class="form_field" name="bonus_order_yn" value="Y"$content[order_yn_y] /> {--YES--}<br />
@@ -53,7 +53,7 @@
        </tr>
        <tr>
                <td class="bottom" align="right">
-                       {--ADMIN_BONUS_RALLYE_STATS_INCLUDE--}
+                       {--ADMIN_CONFIG_BONUS_RALLYE_STATS_INCLUDE--}
                </td>
                <td class="bottom" align="center">
                        <input type="radio" class="form_field" name="bonus_stats_yn" value="Y"$content[stats_yn_y] /> {--YES--}<br />
@@ -62,7 +62,7 @@
        </tr>
        <tr>
                <td class="bottom" align="right">
-                       {--ADMIN_BONUS_RALLYE_REFERAL_INCLUDE--}
+                       {--ADMIN_CONFIG_BONUS_RALLYE_REFERAL_INCLUDE--}
                </td>
                <td class="bottom" align="center">
                        <input type="radio" class="form_field" name="bonus_ref_yn" value="Y"$content[ref_yn_y] /> {--YES--}<br />
        </tr>
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_EDIT_BONUS_SETTINGS--}</strong>
+                       <strong>{--ADMIN_CONFIG_BONUS_TITLE--}</strong>
                </td>
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_BONUS_ORDER_BONUS--}:
+                       {--ADMIN_CONFIG_BONUS_ORDER--}:
                </td>
                <td align="center">
                        <input type="text" class="form_field" name="bonus_order" size="8" maxlength="20" value="{%config,translateComma=bonus_order%}" />
@@ -85,7 +85,7 @@
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_BONUS_REFERAL_BONUS--}:
+                       {--ADMIN_CONFIG_BONUS_REFERAL--}:
                </td>
                <td align="center">
                        <input type="text" class="form_field" name="bonus_ref" size="8" maxlength="20" value="{%config,translateComma=bonus_ref%}" />
@@ -94,7 +94,7 @@
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_BONUS_STATS_BONUS--}:
+                       {--ADMIN_CONFIG_BONUS_STATS--}:
                </td>
                <td align="center">
                        <input type="text" class="form_field" name="bonus_stats" size="8" maxlength="20" value="{%config,translateComma=bonus_stats%}" />
        </tr>
        <tr>
                <td class="bottom" align="right">
-                       {--ADMIN_BONUS_LOGIN_BONUS--}:
+                       {--ADMIN_CONFIG_BONUS_LOGIN--}:
                </td>
                <td class="bottom" align="center">
                        <input type="text" class="form_field" name="login_bonus" size="8" maxlength="20" value="{%config,translateComma=login_bonus%}" />
        </tr>
        <tr>
                <td colspan="2" class="table_header bottom" align="center">
-                       <strong>{--ADMIN_BONUS_TURBO_BONUS_TITLE--}:</strong>
+                       <strong>{--ADMIN_CONFIG_BONUS_TURBO_TITLE--}:</strong>
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_BONUS_TURBO_BONUS--}:</td>
+               <td align="right">{--ADMIN_CONFIG_BONUS_TURBO--}:</td>
                <td align="center">
                        <input type="text" class="form_field" name="turbo_bonus" size="10" maxlength="20" value="{%config,translateComma=turbo_bonus%}" />
                        <span class="notice">({?POINTS?})</span>
        </tr>
        <tr>
                <td class="bottom" align="right" valign="top">
-                       {--ADMIN_BONUS_TURBO_RATES--}:<br />
+                       {--ADMIN_CONFIG_TURBO_RATES--}:<br />
                        <br />
                        <div align="left">
                                <ol>
-                                       <li><strong>{--ADMIN_BONUS_TURBO_RATES_NOTE1--}:</strong></li>
-                                       <li>{--ADMIN_BONUS_TURBO_RATES_NOTE2--}</li>
-                                       <li>{--ADMIN_BONUS_TURBO_RATES_NOTE3--}</li>
-                                       <li>{--ADMIN_BONUS_TURBO_RATES_NOTE4--}</li>
+                                       <li><strong>{--ADMIN_CONFIG_TURBO_RATES_NOTE1--}:</strong></li>
+                                       <li>{--ADMIN_CONFIG_TURBO_RATES_NOTE2--}</li>
+                                       <li>{--ADMIN_CONFIG_TURBO_RATES_NOTE3--}</li>
+                                       <li>{--ADMIN_CONFIG_TURBO_RATES_NOTE4--}</li>
                                </ol>
                        </div>
                </td>
        </tr>
        <tr>
                <td colspan="2" class="table_header bottom" align="center">
-                       <strong>{--ADMIN_BONUS_TURBO_TIMEOUT_TITLE--}:</strong>
+                       <strong>{--ADMIN_CONFIG_BONUS_TURBO_TIMEOUT_TITLE--}:</strong>
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_CONFIG_LOGIN_TIMEOUT--}:</td>
+               <td align="right">{--ADMIN_CONFIG_BONUS_LOGIN_TIMEOUT--}:</td>
                <td align="center">$content[login_timeout_selection]</td>
        </tr>
        <tr>
        </tr>
        <tr>
                <td colspan="2" class="table_header bottom" align="center">
-                       <strong>{--ADMIN_BONUS_TURBO_MISC_TITLE--}:</strong>
+                       <strong>{--ADMIN_CONFIG_BONUS_TURBO_MISC_TITLE--}:</strong>
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_BONUS_TURBO_RANKS--}:</td>
+               <td align="right">{--ADMIN_CONFIG_BONUS_TURBO_RANKS--}:</td>
                <td align="center">
                        <input type="text" class="form_field" name="bonus_ranks" size="3" maxlength="5" value="{?bonus_ranks?}" />
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_BONUS_TURBO_LINES--}:</td>
+               <td align="right">{--ADMIN_CONFIG_BONUS_TURBO_LINES--}:</td>
                <td align="center">
                        <input type="text" class="form_field" name="bonus_lines" size="3" maxlength="5" value="{?bonus_lines?}" />
                </td>
        </tr>
        <tr>
                <td colspan="2" class="table_header bottom" align="center">
-                       <strong>{--ADMIN_BONUS_RALLYE_NOTIFTICATIONS--}:</strong>
+                       <strong>{--ADMIN_CONFIG_BONUS_RALLYE_NOTIFTICATIONS--}:</strong>
                </td>
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_BONUS_RALLYE_ENABLE_NOTIFY--}
+                       {--ADMIN_CONFIG_BONUS_RALLYE_ENABLE_NOTIFY--}
                </td>
                <td align="center">
                        <input type="radio" class="form_field" name="bonus_enable_notify" value="Y"$content[enable_notify_y] /> {--YES--}<br />
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_BONUS_RALLYE_DISABLE_NOTIFY--}
+                       {--ADMIN_CONFIG_BONUS_RALLYE_DISABLE_NOTIFY--}
                </td>
                <td align="center">
                        <input type="radio" class="form_field" name="bonus_disable_notify" value="Y"$content[disable_notify_y] /> {--YES--}<br />
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_BONUS_RALLYE_NEW_MEMBER_NOTIFY--}
+                       {--ADMIN_CONFIG_BONUS_RALLYE_NEW_MEMBER_NOTIFY--}
                </td>
                <td align="center">
                        <input type="radio" class="form_field" name="bonus_new_member_notify" value="Y"$content[new_member_notify_y] /> {--YES--}<br />
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_BONUS_RALLYE_NOTIFY_POINTS--}
+                       {--ADMIN_CONFIG_BONUS_RALLYE_NOTIFY_POINTS--}
                </td>
                <td align="center">
                        <input type="text" class="form_field" name="bonus_notify_points" size="8" maxlength="20" value="{%config,translateComma=bonus_notify_points%}" />
        </tr>
        <tr>
                <td class="bottom" align="right">
-                       {--ADMIN_BONUS_RALLYE_NOTIFY_WAIT--}
+                       {--ADMIN_CONFIG_BONUS_RALLYE_NOTIFY_WAIT--}
                </td>
                <td class="bottom" align="center">
                        $content[wait_selection]
index fe53ad2..6d380bc 100644 (file)
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
-                       <strong>{--ADMIN_CONFIG_COUPON_SETTINGS_TITLE--}:</strong>
+                       <strong>{--ADMIN_CONFIG_COUPON_TITLE--}:</strong>
                </td>
        </tr>
        <tr>
index 65ab9e5..eeeb252 100644 (file)
@@ -3,12 +3,12 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_EDIT_DOUBLER_SETTINGS--}</strong>
+                       <strong>{--ADMIN_CONFIG_DOUBLER_TITLE--}</strong>
                </td>
        </tr>
        <tr>
                <td align="right" width="300" height="20">
-                       {--ADMIN_DOUBLER_CHARGE--}:
+                       {--ADMIN_CONFIG_DOUBLER_CHARGE--}:
                </td>
                <td width="195" style="padding-left: 5px">
                        <input type="text" class="form_field" name="doubler_charge" size="5" maxlength="10" value="{%config,translateComma=doubler_charge%}" /> (%)
@@ -16,7 +16,7 @@
        </tr>
        <tr>
                <td align="right" width="300" height="20">
-                       {--ADMIN_DOUBLER_REFERAL--}:
+                       {--ADMIN_CONFIG_DOUBLER_REFERAL--}:
                </td>
                <td width="195" style="padding-left: 5px">
                        <input type="text" class="form_field" name="doubler_ref" size="5" maxlength="10" value="{%config,translateComma=doubler_ref%}" /> (%)
@@ -24,7 +24,7 @@
        </tr>
        <tr>
                <td align="right" width="300" height="20">
-                       {--ADMIN_DOUBLER_MINIMUM--}:
+                       {--ADMIN_CONFIG_DOUBLER_MINIMUM--}:
                </td>
                <td width="195" style="padding-left: 5px">
                        <input type="text" class="form_field" name="doubler_min" size="9" maxlength="20" value="{%config,translateComma=doubler_min%}" /> ({?POINTS?})
@@ -32,7 +32,7 @@
        </tr>
        <tr>
                <td align="right" width="300" height="20">
-                       {--ADMIN_DOUBLER_MAXIMUM--}:
+                       {--ADMIN_CONFIG_DOUBLER_MAXIMUM--}:
                </td>
                <td width="195" style="padding-left: 5px">
                        <input type="text" class="form_field" name="doubler_max" size="9" maxlength="20" value="{%config,translateComma=doubler_max%}" /> ({?POINTS?})
@@ -40,7 +40,7 @@
        </tr>
        <tr>
                <td align="right" width="300" height="20">
-                       {--ADMIN_DOUBLER_LEFT--}:
+                       {--ADMIN_CONFIG_DOUBLER_LEFT--}:
                </td>
                <td width="195" style="padding-left: 5px">
                        <input type="text" class="form_field" name="doubler_left" size="9" maxlength="20" value="{%config,translateComma=doubler_left%}"> ({?POINTS?})
@@ -48,7 +48,7 @@
        </tr>
        <tr>
                <td align="right" width="300" height="20">
-                       {--ADMIN_DOUBLER_GROUP_SENT--}:
+                       {--ADMIN_CONFIG_DOUBLER_GROUP_SENT--}:
                </td>
                <td width="195" style="padding-left: 5px">
                        <input type="text" class="form_field" name="doubler_group_sent" size="2" maxlength="4" value="{?doubler_group_sent?}" />
        </tr>
        <tr>
                <td align="right" width="300" height="20">
-                       {--ADMIN_DOUBLER_MAX_SENT--}:
+                       {--ADMIN_CONFIG_DOUBLER_MAX_SENT--}:
                </td>
                <td width="195" style="padding-left: 5px">
                        <input type="text" class="form_field" name="doubler_max_sent" size="2" maxlength="4" value="{?doubler_max_sent?}" />
                </td>
        </tr>
        <tr>
-               <td align="right" height="20">{--ADMIN_DOUBLER_SENT_ALL--}:</td>
+               <td align="right" height="20">{--ADMIN_CONFIG_DOUBLER_SENT_ALL--}:</td>
                <td style="padding-left: 5px">
                        <input type="radio" class="form_field" name="doubler_sent_all" value="Y"$content[sent_all_y] /> {--YES--}<br />
                        <input type="radio" class="form_field" name="doubler_sent_all" value="N"$content[sent_all_n] /> {--NO--}
@@ -71,7 +71,7 @@
        </tr>
        <tr>
                <td align="right" height="20">
-                       {--ADMIN_DOUBLER_JACKPOT--}:
+                       {--ADMIN_CONFIG_DOUBLER_JACKPOT--}:
                </td>
                <td style="padding-left: 5px">
                        <input type="radio" class="form_field" name="doubler_jackpot" value="Y"$content[jackpot_y] /> {--YES--}<br />
@@ -80,7 +80,7 @@
        </tr>
        <tr>
                <td align="right" height="20">
-                       {--ADMIN_DOUBLER_OWN--}:
+                       {--ADMIN_CONFIG_DOUBLER_OWN--}:
                </td>
                <td style="padding-left: 5px">
                        <input type="radio" class="form_field" name="doubler_own" value="Y"$content[own_y] /> {--YES--}<br />
@@ -89,7 +89,7 @@
        </tr>
        <tr>
                <td align="right" height="20">
-                       {--ADMIN_DOUBLER_TIMEOUT--}:
+                       {--ADMIN_CONFIG_DOUBLER_TIMEOUT--}:
                </td>
                <td style="padding-left: 5px" align="left">
                        $content[timeout_selection]
@@ -97,7 +97,7 @@
        </tr>
        <tr>
                <td class="bottom" align="right" height="20">
-                       {--ADMIN_DOUBLER_USERID--}:
+                       {--ADMIN_CONFIG_DOUBLER_USERID--}:
                </td>
                <td class="bottom" style="padding-left: 5px">
                        $content[doubler_userid]
        </tr>
        <tr>
                <td align="center" colspan="2" class="table_header bottom">
-                       <strong>{--ADMIN_DOUBLER_SEND_MODE--}:</strong>
+                       <strong>{--ADMIN_CONFIG_DOUBLER_SEND_MODE--}:</strong>
                </td>
        </tr>
        <tr>
                <td align="center" height="20" valign="top">
-                       {--ADMIN_DOUBLER_SEND_DIRECT--}
+                       {--ADMIN_CONFIG_DOUBLER_SEND_DIRECT--}
                </td>
                <td align="center" valign="top">
-                       {--ADMIN_DOUBLER_SEND_RESET--}
+                       {--ADMIN_CONFIG_DOUBLER_SEND_RESET--}
                </td>
        </tr>
        <tr>
        </tr>
        <tr>
                <td align="center" colspan="2" class="table_header bottom">
-                       <strong>{--ADMIN_DOUBLER_DISPLAY_SETTINGS--}:</strong>
+                       <strong>{--ADMIN_CONFIG_DOUBLER_DISPLAY_TITLE--}:</strong>
                </td>
        </tr>
        <tr>
-               <td align="right" height="20">{--ADMIN_DOUBLER_DISPLAY_NEW--}:</td>
+               <td align="right" height="20">{--ADMIN_CONFIG_DOUBLER_DISPLAY_NEW--}:</td>
                <td style="padding-left: 5px">
                        <select name="doubler_display_new" size="1" class="form_select">
                                $content[display_new]
                </td>
        </tr>
        <tr>
-               <td align="right" height="20">{--ADMIN_DOUBLER_DISPLAY_PAY--}:</td>
+               <td align="right" height="20">{--ADMIN_CONFIG_DOUBLER_DISPLAY_PAY--}:</td>
                <td style="padding-left: 5px">
                        <select name="doubler_display_pay" size="1" class="form_select">
                                $content[display_pay]
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right" height="20">{--ADMIN_DOUBLER_DISPLAY_OLD--}:</td>
+               <td class="bottom" align="right" height="20">{--ADMIN_CONFIG_DOUBLER_DISPLAY_OLD--}:</td>
                <td class="bottom" style="padding-left: 5px">
                        <select name="doubler_display_old" size="1" class="form_select">
                                $content[display_old]
index 086fce7..11f5d85 100644 (file)
@@ -1,24 +1 @@
-<div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_email%}" method="post">
-<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-       <tr>
-               <td align="center" colspan="3" class="table_header">
-                       <strong>{--ADMIN_EDIT_DELETE_MAX_VALUES_TITLE--}</strong>
-               </td>
-       </tr>
-       <tr>
-               <td class="header_column bottom right" width="30" align="center"><strong>{--ID_SELECT--}</strong></td>
-               <td class="header_column bottom right" align="center"><strong>{--ADMIN_MAX_VALUE--}</strong></td>
-               <td class="header_column bottom" align="center"><strong>{--ADMIN_MAX_COMMENT--}</strong></td>
-       </tr>
-       $content[rows]
-       <tr>
-               <td align="center" colspan="3" class="table_footer">
-                       <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_EDIT_MAX_VALUE--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_DELETE_MAX_VALUE--}" />
-               </td>
-       </tr>
-</table>
-</form>
-</div>
+<!-- @DEPRECATED //-->
index a991be4..11f5d85 100644 (file)
@@ -1,18 +1 @@
-<div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_email&amp;do=del%}" method="post">
-<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-       <tr>
-               <td align="center" class="table_header bottom">
-                       <strong>{--ADMIN_DELETE_MAX_RECEIVE_TITLE--}:</strong>
-               </td>
-       </tr>
-       $content[rows]
-       <tr>
-               <td class="table_footer" align="center">
-                       <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="ok" class="form_delete" value="{--ADMIN_REMOVE_MAX_RECEIVE--}" />
-               </td>
-       </tr>
-</table>
-</form>
-</div>
+<!-- @DEPRECATED //-->
index 975e297..11f5d85 100644 (file)
@@ -1,11 +1 @@
-<tr>
-       <td class="{%template,ColorSwitch%}" align="center">
-               <strong>{--ADMIN_MAX_RECEIVE_ID--} $content[id]:</strong>
-       </td>
-</tr>
-<tr>
-       <td class="{%template,ColorSwitch%} bottom" align="center">
-               $content[value] ({%pipe,fixEmptyContentToDashes=$content[comment]%})
-               <input type="hidden" name="id[$content[id]]" value="1" />
-       </td>
-</tr>
+<!-- @DEPRECATED //-->
index 9e8406b..11f5d85 100644 (file)
@@ -1,18 +1 @@
-<div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_email&amp;do=edit%}" method="post">
-<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-       <tr>
-               <td align="center" colspan="2" class="table_header bottom">
-                       <strong>{--ADMIN_EDIT_MAX_RECEIVE_TITLE--}:</strong>
-               </td>
-       </tr>
-       $content[rows]
-       <tr>
-               <td class="table_footer" align="center" colspan="2">
-                       <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--ADMIN_CHANGE_MAX_RECEIVE--}" />
-               </td>
-       </tr>
-</table>
-</form>
-</div>
+<!-- @DEPRECATED //-->
index b6b205f..11f5d85 100644 (file)
@@ -1,18 +1 @@
-<tr>
-       <td class="{%template,ColorSwitch%}" colspan="2" align="center">
-               <strong>{--ADMIN_MAX_RECEIVE_ID--} $content[id]:</strong>
-               <input type="hidden" name="id[$content[id]]" value="1" />
-       </td>
-</tr>
-<tr>
-       <td class="{%template,ColorSwitch%}" align="right">{--ADMIN_MAX_RECEIVE_VALUE--}:&nbsp;</td>
-       <td class="{%template,ColorSwitch%}">
-               <input type="text" class="form_field" name="val[$content[id]]" value="$content[value]" size="3" maxlength="5" />
-       </td>
-</tr>
-<tr>
-       <td class="{%template,ColorSwitch%} bottom" align="right">{--ADMIN_MAX_RECEIVE_COMMENT--}:&nbsp;</td>
-       <td class="{%template,ColorSwitch%} bottom">
-               <input type="text" class="form_field" name="comm[$content[id]]" value="$content[comment]" size="25" maxlength="255" />
-       </td>
-</tr>
+<!-- @DEPRECATED //-->
index acae20d..11f5d85 100644 (file)
@@ -1,11 +1 @@
-<tr>
-       <td align="center" class="bottom right {%template,ColorSwitch%}">
-               <input type="checkbox" class="form_field" title="{--ID_SELECT--} $content[id]" name="sel[$content[id]]" value="1" />
-       </td>
-       <td class="bottom right {%template,ColorSwitch%}">
-               $content[value]
-       </td>
-       <td class="bottom {%template,ColorSwitch%}">
-               {%pipe,fixEmptyContentToDashes=$content[comment]%}
-       </td>
-</tr>
+<!-- @DEPRECATED //-->
index 317aab5..ed24a2d 100644 (file)
@@ -3,12 +3,12 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_CONFIG_EXTENSIONS_SETTINGS--}</strong>
+                       <strong>{--ADMIN_CONFIG_EXTENSIONS_TITLE--}</strong>
                </td>
        </tr>
        <tr>
                <td class="bottom" align="right" width="350">
-                       {--ADMIN_VERBOSE_SQL--}:
+                       {--ADMIN_CONFIG_EXTENSIONS_VERBOSE_SQL--}:
                </td>
                <td class="bottom" width="150" align="right">
                        <input type="radio" class="form_field" name="verbose_sql" value="Y"[verbose_y] /> {--YES--}<br />
index fd249fd..1d3e893 100644 (file)
@@ -3,27 +3,27 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_HOLIDAY_CONFIG_HEADER--}</strong>
+                       <strong>{--ADMIN_CONFIG_HOLIDAY_TITLE--}</strong>
                </td>
        </tr>
        <tr>
-               <td width="300" style="padding-left: 5px">{--ADMIN_HOLIDAY_MAX_HOLIDAY--}:</td>
+               <td width="300" style="padding-left: 5px">{--ADMIN_CONFIG_HOLIDAY_MAX_TIME--}:</td>
                <td width="270">
                        <input type="text" class="form_field" name="holiday_max" value="{?holiday_max?}" size="4" maxlength="6" />
                        <div class="tiny">({--DAYS--})</div>
                </td>
        </tr>
        <tr>
-               <td width="300" style="padding-left: 5px">{--ADMIN_HOLIDAY_LOCKED--}:</td>
+               <td width="300" style="padding-left: 5px">{--ADMIN_CONFIG_HOLIDAY_LOCKED--}:</td>
                <td width="270">$content[holiday_lock]</td>
        </tr>
        <tr>
-               <td class="bottom" width="300" style="padding-left: 5px">{--ADMIN_HOLIDAY_MODE--}:</td>
+               <td class="bottom" width="300" style="padding-left: 5px">{--ADMIN_CONFIG_HOLIDAY_MODE--}:</td>
                <td class="bottom" width="270">
                        <input type="radio" class="form_field" name="holiday_mode" value="RESET"$content[holiday_mode_reset] />
-                       {--ADMIN_HOLIDAY_MODE_RESET--}<br />
+                       {--ADMIN_CONFIG_HOLIDAY_MODE_RESET--}<br />
                        <input type="radio" class="form_field" name="holiday_mode" value="DIRECT"$content[holiday_mode_direct] />
-                       {--ADMIN_HOLIDAY_MODE_DIRECT--}
+                       {--ADMIN_CONFIG_HOLIDAY_MODE_DIRECT--}
                </td>
        </tr>
        <tr>
index 66021b6..6115145 100644 (file)
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="3" align="center" class="table_header">
-                       <strong>{--ADMIN_CONFIG_SET_HOME--}</strong>
+                       <strong>{--ADMIN_CONFIG_HOME_TITLE--}</strong>
                </td>
        </tr>
        <tr>
@@ -13,7 +13,7 @@
        $content
        <tr>
                <td colspan="3" class="table_footer">
-                       <div class="notice">{--ADMIN_CONFIG_SET_HOME_NOTE--}</div>
+                       <div class="notice">{--ADMIN_CONFIG_HOME_NOTE--}</div>
                </td>
        </tr>
 </table>
index d86bb77..e5bf270 100644 (file)
@@ -1,17 +1,17 @@
 <div align="center" class="table dashed">
        <div class="table_header bottom top left right">
-               <strong>{--ADMIN_CONFIG_HOME_TITLE--}</strong>
+               <strong>{--ADMIN_CONFIG_HOME_MAIN_TITLE--}</strong>
        </div>
        <div class="guest_menu_row">
                <a class="menu_blur" href="{%url=modules.php?module=admin&amp;what=config_home&amp;sub=target%}">
                        <strong><big>&middot;</big></strong>
-                       {--ADMIN_EDIT_HOME_TARGET--}
+                       {--ADMIN_CONFIG_HOME_TARGET--}
                </a>
        </div>
        <div class="guest_menu_bottom">
                <a class="menu_blur" href="{%url=modules.php?module=admin&amp;what=config_home&amp;sub=settings%}">
                        <strong><big>&middot;</big></strong>
-                       {--ADMIN_EDIT_HOME_SETTINGS--}
+                       {--ADMIN_CONFIG_HOME_SETTINGS--}
                </a>
        </div>
 </div>
index 12deb4b..58a5572 100644 (file)
@@ -3,15 +3,15 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="3" align="center">
-                       <strong>{--ADMIN_MEDIADATA_SETTINGS--}:</strong>
+                       <strong>{--ADMIN_CONFIG_MEDIADATA_TITLE--}:</strong>
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_MEDIADATA_MT_START--}:</td>
+               <td align="right">{--ADMIN_CONFIG_MEDIADATA_MT_START--}:</td>
                <td align="center">$content[mt_start]</td>
        </tr>
        <tr>
-               <td class="bottom" align="right">{--ADMIN_MEDIADATA_MT_STAGE--}:</td>
+               <td class="bottom" align="right">{--ADMIN_CONFIG_MEDIADATA_MT_STAGE--}:</td>
                <td class="bottom" align="center">
                        <input type="text" class="form_field" name="mt_stage" value="{?mt_stage?}" size="6" maxlength="20" />
                </td>
@@ -26,7 +26,7 @@
 </form>
 
 <div class="notice">
-       <strong><big>&middot;</big></strong>&nbsp;{--ADMIN_MEDIADATA_MT_START_NOTE--}<br />
-       <strong><big>&middot;</big></strong>&nbsp;{--ADMIN_MEDIADATA_MT_STAGE_NOTE--}<br />
+       <strong><big>&middot;</big></strong>&nbsp;{--ADMIN_CONFIG_MEDIADATA_MT_START_NOTE--}<br />
+       <strong><big>&middot;</big></strong>&nbsp;{--ADMIN_CONFIG_MEDIADATA_MT_STAGE_NOTE--}<br />
 </div>
 </div>
index 366bb28..f5d82e9 100644 (file)
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
-                       <strong>{--ADMIN_CONFIG_NEWSLETTER_SETTINGS--}</strong>
+                       <strong>{--ADMIN_CONFIG_NEWSLETTER_TITLE--}</strong>
                </td>
        </tr>
        <tr>
index 56f2413..1c3d904 100644 (file)
@@ -3,23 +3,23 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_NICKNAME_CONFIG_HEADER--}</strong>
+                       <strong>{--ADMIN_CONFIG_NICKNAME_TITLE--}</strong>
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_NICKNAME_MIN_LENGTH--}:</td>
+               <td align="right">{--ADMIN_CONFIG_NICKNAME_MIN_LENGTH--}:</td>
                <td>
                        <input type="text" class="form_field" name="nickname_len" value="{?nickname_len?}" size="2" maxlength="4" />
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_NICKNAME_PATTERN--}:</td>
+               <td align="right">{--ADMIN_CONFIG_NICKNAME_PATTERN--}:</td>
                <td>
                        <input type="text" class="form_field" name="nickname_pattern" value="{?nickname_pattern?}" size="10" maxlength="255" />
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right">{--ADMIN_NICKNAME_CHARACTERS--}:</td>
+               <td class="bottom" align="right">{--ADMIN_CONFIG_NICKNAME_CHARACTERS--}:</td>
                <td class="bottom">
                        <input type="text" class="form_field" name="nickname_chars" value="{?nickname_chars?}" size="15" maxlength="255" />
                </td>
index 23fe64f..290d541 100644 (file)
@@ -9,18 +9,18 @@
 
        <tr>
                <td class="bottom" rowspan="2" align="center">
-                       {--ADMIN_ORDER_MAX_ORDER_SELECT--}
+                       {--ADMIN_CONFIG_ORDER_SELECT_MAX--}
                </td>
                <td class="bottom">
                        <input type="radio" class="form_field" name="order_max_full" value="MAX"$content[order_max_full_max] />
-                       {--ADMIN_ORDER_MAX--}
+                       {--ADMIN_CONFIG_ORDER_OPTION_MAX--}
                </td>
        </tr>
 
        <tr>
                <td class="bottom">
                        <input type="radio" class="form_field" name="order_max_full" value="ORDER"$content[order_max_full_order] />
-                       {--ADMIN_ORDER_ORDER--}
+                       {--ADMIN_CONFIG_ORDER_OPTION_ORDER--}
                </td>
        </tr>
 
 
        <tr>
                <td colspan="2" class="table_header bottom" align="center">
-                       <strong>{--ADMIN_ORDER_MISC_SETTINGS--}:</strong>
+                       <strong>{--ADMIN_CONFIG_ORDER_MISC_TITLE--}:</strong>
                </td>
        </tr>
 
        <tr>
                <td class="bottom" align="right">
-                       {--ADMIN_ORDER_MIN_RECEIVER_PER_ORDER--}:
+                       {--ADMIN_CONFIG_ORDER_MIN_RECEIVER_PER_ORDER--}:
                </td>
                <td class="bottom" align="center">
                        <input type="input" class="form_field" name="order_min" value="{?order_min?}" size="5" maxlength="20" />
index 29579f8..11f5d85 100644 (file)
@@ -1,43 +1 @@
-<div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_order%}" method="post">
-<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-       <tr>
-               <td class="table_header bottom" colspan="2" align="center">
-                       <strong>{--ADMIN_ORDER_SETTINGS--}:</strong>
-               </td>
-       </tr>
-       <tr>
-               <td align="center" colspan="2">
-                       {--ADMIN_ORDER_MAX_ORDER_SELECT--}
-               </td>
-       </tr>
-       <tr>
-               <td class="bottom" align="center">{--ADMIN_ORDER_MAX--}:&nbsp;<input
-                       type="radio" name="order_max_full" class="form_field" value="MAX"$content[order_max_full_max] />
-               </td>
-               <td class="bottom" align="center">{--ADMIN_ORDER_ORDER--}:&nbsp;<input
-                       type="radio" name="order_max_full" class="form_field" value="ORDER"$content[order_max_full_order] />
-               </td>
-       </tr>
-       <tr>
-               <td colspan="2" class="table_header bottom" align="center">
-                       <strong>{--ADMIN_ORDER_MISC_SETTINGS--}:</strong>
-               </td>
-       </tr>
-       <tr>
-               <td class="bottom" align="right">
-                       {--ADMIN_ORDER_MIN_RECEIVER_PER_ORDER--}:
-               </td>
-               <td class="bottom" align="center">
-                       <input type="input" name="order_min" class="form_field" value="{?order_min?}" size="2" maxlength="20" />
-               </td>
-       </tr>
-       <tr>
-               <td class="table_footer" colspan="2" align="center">
-                       <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--SAVE_SETTINGS--}" />
-               </td>
-       </tr>
-</table>
-</form>
-</div>
+<!-- @DEPRECATED //-->
index df99242..11f5d85 100644 (file)
@@ -1,22 +1 @@
-<div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_payouts&amp;ok=ok%}" method="post">
-<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-       <tr>
-               <td colspan="4" align="center" class="table_header bottom">
-               <strong>{--ADMIN_PAYOUT_DELETE_TITLE--}</strong></td>
-       </tr>
-       <tr>
-               <td width="30" class="header_column bottom right" align="center"><strong>{--ID_SELECT--}</strong></td>
-               <td width="250" class="header_column bottom right" align="center"><strong>{--ADMIN_PAYOUT_TITLE--}</strong></td>
-               <td width="150" class="header_column bottom right" align="center"><strong>{--ADMIN_PAYOUT_RATE2--}</strong></td>
-               <td width="100" class="header_column bottom" align="center"><strong>{--ADMIN_PAYOUT_MIN_POINTS2--}</strong></td>
-       </tr>
-       $content
-       <tr>
-               <td colspan="4" class="table_footer">
-                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_PAYOUT_DELETE--}" />
-               </td>
-       </tr>
-</table>
-</form>
-</div>
+<!-- @DEPRECATED //-->
index e4d72ce..11f5d85 100644 (file)
@@ -1,15 +1 @@
-<tr>
-       <td align="center" class="{%template,ColorSwitch%} bottom right" height="25">
-               $content[id]
-               <input type="hidden" name="sel[$content[id]]" value="1" />
-       </td>
-       <td align="center" class="{%template,ColorSwitch%} bottom right">
-               $content[type]
-       </td>
-       <td align="center" class="{%template,ColorSwitch%} bottom right">
-               {%pipe,translateComma=$content[rate]%}
-       </td>
-       <td align="center" class="{%template,ColorSwitch%} bottom right">
-               {%pipe,translateComma=$content[min_points]%}
-       </td>
-</tr>
+<!-- @DEPRECATED //-->
index 8cc7bf9..02b6f5a 100644 (file)
@@ -1,25 +1 @@
-<div align="center">
-<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_payouts&amp;ok=ok%}" method="post">
-<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
-       <tr>
-               <td colspan="5" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_PAYOUT_EDIT_TITLE--}</strong>
-               </td>
-       </tr>
-       <tr>
-               <td width="20" class="header_column bottom right" align="center"><strong>{--ID_SELECT--}</strong></td>
-               <td width="200" class="header_column bottom right" align="center"><strong>{--ADMIN_PAYOUT_TITLE--}</strong></td>
-               <td width="150" class="header_column bottom right" align="center"><strong>{--ADMIN_PAYOUT_RATE2--}</strong></td>
-               <td width="100" class="header_column bottom right" align="center"><strong>{--ADMIN_PAYOUT_MIN_POINTS2--}</strong></td>
-               <td width="180" class="header_column bottom" align="center"><strong>{--ADMIN_PAYOUT_ALLOW_URLS--}</strong></td>
-       </tr>
-       $content
-       <tr>
-               <td colspan="5" class="table_footer">
-                       <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_PAYOUT_EDIT--}" />
-               </td>
-       </tr>
-</table>
-</form>
-</div>
+<!--@DEPRECATED //-->
index c620699..11f5d85 100644 (file)
@@ -1,18 +1 @@
-<tr>
-       <td align="center" class="{%template,ColorSwitch%} bottom right" height="25">
-               $content[id]
-               <input type="hidden" name="sel[$content[id]]" value="1" />
-       </td>
-       <td align="center" class="{%template,ColorSwitch%} bottom right">
-               <input type="text" class="form_field" name="type[$content[id]]" value="$content[type]" size="20" maxlength="255" />
-       </td>
-       <td align="center" class="{%template,ColorSwitch%} bottom right">
-               <input type="text" class="form_field" name="rate[$content[id]]" value="{%pipe,translateComma=$content[rate]%}" size="5" maxlength="10" />
-       </td>
-       <td align="center" class="{%template,ColorSwitch%} bottom right">
-               <input type="text" class="form_field" name="min_points[$content[id]]" value="{%pipe,translateComma=$content[min_points]%}" size="5" maxlength="10" />
-       </td>
-       <td align="center" class="{%template,ColorSwitch%} bottom">
-               $content[allow_url]
-       </td>
-</tr>
+<!-- @DEPRECATED //-->
index a726b53..0ee5ecf 100644 (file)
@@ -3,42 +3,36 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_PRIMERA_CONFIG_TITLE--}</strong>
+                       <strong>{--ADMIN_CONFIG_PRIMERA_TITLE--}</strong>
                </td>
        </tr>
        <tr>
-               <td width="300" align="right">{--ADMIN_PRIMERA_API_NAME--}:</td>
+               <td width="300" align="right">{--ADMIN_CONFIG_PRIMERA_API_NAME--}:</td>
                <td width="270">
                        <input type="text" class="form_field" name="primera_api_name" value="{?primera_api_name?}" size="10" maxlength="255" />
                </td>
        </tr>
        <tr>
-               <td class="bottom" width="300" align="right">{--ADMIN_PRIMERA_API_MD5--}:</td>
-               <td class="bottom" width="270">
+               <td width="300" align="right">{--ADMIN_CONFIG_PRIMERA_API_MD5--}:</td>
+               <td width="270">
                        <input type="password" class="form_field" name="password" size="20" maxlength="255" />
                </td>
        </tr>
        <tr>
-               <td colspan="2" class="table_header bottom" align="center">
-                       Gespeicherter Hash:<br />
-                       &raquo;<em>{?primera_api_md5]</em>&laquo;
-               </td>
-       </tr>
-       <tr>
-               <td width="300" align="right">{--ADMIN_PRIMERA_REFID--}:</td>
+               <td width="300" align="right">{--ADMIN_CONFIG_PRIMERA_REFID--}:</td>
                <td width="270">
                        <input type="text" class="form_field" name="primera_refid" value="{?primera_refid?}" size="10" maxlength="255" />
                </td>
        </tr>
        <tr>
-               <td width="300" align="right">{--ADMIN_PRIMERA_MIN_PAYOUT--}:</td>
+               <td width="300" align="right">{--ADMIN_CONFIG_PRIMERA_MIN_PAYOUT--}:</td>
                <td width="270">
                        <input type="text" class="form_field" name="primera_min_payout" value="{?primera_min_payout?}" size="5" maxlength="20" />
                        Wernis
                </td>
        </tr>
        <tr>
-               <td class="bottom" width="300" align="right">{--ADMIN_PRIMERA_MIN_WITHDRAW--}:</td>
+               <td class="bottom" width="300" align="right">{--ADMIN_CONFIG_PRIMERA_MIN_WITHDRAW--}:</td>
                <td class="bottom" width="270">
                        <input type="text" class="form_field" name="primera_min_withdraw" value="{?primera_min_withdraw?}" size="5" maxlength="20" />
                        Wernis
@@ -54,6 +48,6 @@
 </form>
 
 <div class="notice">
-       {--ADMIN_PRIMERA_CONFIG_NOTE--}
+       {--ADMIN_CONFIG_PRIMERA_NOTE--}
 </div>
 </div>
index 341e7ec..45411ad 100644 (file)
@@ -8,35 +8,35 @@
        </tr>
 
        <tr>
-               <td align="right" width="200" style="padding-right:5px">{--ADMIN_SELECT_DEFAULT_REFID--}:</td>
+               <td align="right" width="200" style="padding-right:5px">{--ADMIN_CONFIG_SELECT_DEFAULT_REFID--}:</td>
                <td align="center">
                        $content[def_refid]
                </td>
        </tr>
 
        <tr>
-               <td align="right" width="200" style="padding-right:5px">{--ADMIN_SELECT_REFID_TARGRT--}:</td>
-               <td align="center">
+               <td class="bottom" align="right" width="200" style="padding-right:5px">{--ADMIN_CONFIG_SELECT_REFID_TARGRT--}:</td>
+               <td class="bottom" align="center">
                        <select name="refid_target" size="1" class="form_select">
-                               <option value="register"$content[refid_target_register]>{--ADMIN_REFERAL_TARGET_REGISTER--}</option>
-                               <option value="index"$content[refid_target_index]>{--ADMIN_REFERAL_TARGET_INDEX--}</option>
+                               <option value="register"$content[refid_target_register]>{--ADMIN_CONFIG_REFERAL_TARGET_REGISTER--}</option>
+                               <option value="index"$content[refid_target_index]>{--ADMIN_CONFIG_REFERAL_TARGET_INDEX--}</option>
                        </select>
                </td>
        </tr>
 
        <tr>
-               <td class="bottom" align="right" width="200" style="padding-right:5px">{--ADMIN_RANDOM_ZERO_REFID--}</td>
-               <td class="bottom" align="center">
-                       <select name="select_user_zero_refid" size="1" class="form_select">
-                               <option value="Y"$content[select_user_zero_refid_y]>{--ADMIN_RANDOM_REFID_ENABLED--}</option>
-                               <option value="N"$content[select_user_zero_refid_n]>{--ADMIN_RANDOM_REFID_DISABLED--}</option>
-                       </select>
+               <td class="table_header bottom" colspan="2" align="center">
+                       <strong>{--ADMIN_CONFIG_RANDOM_REFID_TITLE--}</strong>
                </td>
        </tr>
 
        <tr>
-               <td class="table_header bottom" colspan="2" align="center">
-                       <strong>{--ADMIN_CONFIG_RANDOM_REFID_TITLE--}</strong>
+               <td align="right" width="200" style="padding-right:5px">{--ADMIN_CONFIG_RANDOM_ZERO_REFID--}</td>
+               <td align="center">
+                       <select name="select_user_zero_refid" size="1" class="form_select">
+                               <option value="Y"$content[select_user_zero_refid_y]>{--ADMIN_CONFIG_RANDOM_REFID_ENABLED--}</option>
+                               <option value="N"$content[select_user_zero_refid_n]>{--ADMIN_CONFIG_RANDOM_REFID_DISABLED--}</option>
+                       </select>
                </td>
        </tr>
 
index 2c3b975..6e41d14 100644 (file)
@@ -8,14 +8,14 @@
        </tr>
        <tr>
                <td width="20" class="header_column bottom right" align="center">{--ID_SELECT--}</td>
-               <td width="325" class="header_column bottom right" align="center">{--ADMIN_REGISTER_FIELD_NAME--}:</td>
-               <td width="105" class="header_column bottom" align="center">{--ADMIN_REGISTER_FIELD_REQUIRED--}</td>
+               <td width="325" class="header_column bottom right" align="center">{--ADMIN_CONFIG_REGISTER_FIELD_NAME--}:</td>
+               <td width="105" class="header_column bottom" align="center">{--ADMIN_CONFIG_REGISTER_FIELD_REQUIRED--}</td>
        </tr>
        $content
        <tr>
                <td colspan="3" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" name="ok" value="{--ADMIN_REGISTER_CHANGE_MUST--}" />
+                       <input type="submit" name="ok" value="{--ADMIN_SAVE_REGISTER_MUST--}" />
                </td>
        </tr>
 </table>
index 7a5ba4f..fbb6aa7 100644 (file)
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
-                       <strong>{--ADMIN_CONFIG_REGFORM_SETTINGS_TITLE--}</strong>
+                       <strong>{--ADMIN_CONFIG_REGISTER_TITLE--}</strong>
                </td>
        </tr>
        <tr>
index bb2549f..6d24bfe 100644 (file)
@@ -1,6 +1,7 @@
 <div align="center">
 <form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_rewrite%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
+       <!-- @TODO No title here? //-->
        <tr>
                <td class="table_header bottom right" align="center">
                        <strong>{--ADMIN_MODULE_NAME--}</strong>
index 220302a..ca7f8c8 100644 (file)
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="3" align="center">
-                       <strong>{--ADMIN_CONFIG_SECURITY_SETTINGS_TITLE--}</strong>
+                       <strong>{--ADMIN_CONFIG_SECURITY_TITLE--}</strong>
                </td>
        </tr>
        <tr>
@@ -16,7 +16,7 @@
        </tr>
        <tr>
                <td class="bottom" align="right" width="380">
-                       {--ADMIN_SALT_LENGTH--}:
+                       {--ADMIN_CONFIG_SALT_LENGTH--}:
                </td>
                <td class="bottom">
                        <input type="text" class="form_field" name="salt_length" size="3" maxlength="3" value="{?salt_length?}" />
@@ -32,6 +32,6 @@
 </form>
 
 <div class="notice">
-       {--ADMIN_SALT_LENGTH_NOTE--}
+       {--ADMIN_CONFIG_SALT_LENGTH_NOTE--}
 </div>
 </div>
index 81f33a6..fd9937d 100644 (file)
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_CONFIG_SESSION_SETTINGS_TITLE--}</strong>
+                       <strong>{--ADMIN_CONFIG_SESSION_TITLE--}</strong>
                </td>
        </tr>
        <tr>
index 83da548..c537e72 100644 (file)
@@ -8,7 +8,7 @@
 </tr>
 <tr>
        <td align="right" width="350">
-               {--ADMIN_SPONSOR_MIN_POINTS--}:
+               {--ADMIN_CONFIG_SPONSOR_MIN_POINTS--}:
        </td>
        <td width="150" align="center">
                <input type="text" class="form_field" name="sponsor_min_points" size="12" maxlength="20" value="{?sponsor_min_points?}" />
@@ -16,7 +16,7 @@
 </tr>
 <tr>
        <td class="bottom" align="right" width="350">
-               {--ADMIN_SPONSOR_REFERAL_POINTS--}:
+               {--ADMIN_CONFIG_SPONSOR_REFERAL_POINTS--}:
        </td>
        <td class="bottom" width="150" align="center">
                <input type="text" class="form_field" name="sponsor_ref_points" size="12" maxlength="20" value="{?sponsor_ref_points?}" />
index 79d22a2..9163a02 100644 (file)
@@ -3,28 +3,28 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_CONFIG_STATS_TITLE--}</strong>
+                       <strong>{--ADMIN_CONFIG_GUEST_STATS_TITLE--}</strong>
                </td>
        </tr>
        <tr>
-               <td align="right"><strong>{--ADMIN_GSTATS_MEMBERS--}:</strong><br />
-                       <div class="tiny">({--ADMIN_GSTATS_MEMBERS_NOTE--})</div>
+               <td align="right"><strong>{--ADMIN_CONFIG_GUEST_STATS_MEMBERS--}:</strong><br />
+                       <div class="tiny">({--ADMIN_CONFIG_GUEST_STATS_MEMBERS_NOTE--})</div>
                </td>
                <td>
                        <input type="radio" class="form_field" name="guest_stats" value="members"$content[guest_stats_members] />
                </td>
        </tr>
        <tr>
-               <td align="right"><strong>{--ADMIN_GSTATS_MODULES--}:</strong><br />
-                       <div class="tiny">({--ADMIN_GSTATS_MODULES_NOTE--})</div>
+               <td align="right"><strong>{--ADMIN_CONFIG_GUEST_STATS_MODULES--}:</strong><br />
+                       <div class="tiny">({--ADMIN_CONFIG_GUEST_STATS_MODULES_NOTE--})</div>
                </td>
                <td>
                        <input type="radio" class="form_field" name="guest_stats" value="modules"$content[guest_stats_modules] />
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right"><strong>{--ADMIN_GSTATS_INACTIVE--}:</strong><br />
-                       <div class="tiny">({--ADMIN_GSTATS_INACTIVE_NOTE--})</div>
+               <td class="bottom" align="right"><strong>{--ADMIN_CONFIG_GUEST_STATS_INACTIVE--}:</strong><br />
+                       <div class="tiny">({--ADMIN_CONFIG_GUEST_STATS_INACTIVE_NOTE--})</div>
                </td>
                <td class="bottom">
                        <input type="radio" class="form_field" name="guest_stats" value="inactive"$content[guest_stats_inactive] />
index efcca77..12cc117 100644 (file)
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
-                       <strong>{--ADMIN_EDIT_POINTS_SETTINGS_TITLE--}</strong>
+                       <strong>{--ADMIN_CONFIG_POINTS_SETTINGS_TITLE--}</strong>
                </td>
        </tr>
        <tr>
index d51d37d..c33fdad 100644 (file)
@@ -3,12 +3,12 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_EDIT_TIMEZONE_SETTINGS--}</strong>
+                       <strong>{--ADMIN_CONFIG_TIMEZONE_TITLE--}</strong>
                </td>
        </tr>
        <tr>
                <td class="bottom" align="right" style="padding-right:10px">
-                       {--ADMIN_CONFIG_TIMEZONE--}
+                       {--ADMIN_CONFIG_ENTER_TIMEZONE--}
                </td>
                <td class="bottom">
                        <input type="text" class="form_field" name="timezone" value="{?timezone?}" />
index 15126ae..0d02b24 100644 (file)
@@ -7,7 +7,7 @@
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right">{--ADMIN_TOP10_MAX_TOP10--}:</td>
+               <td class="bottom" align="right">{--ADMIN_CONFIG_TOP10_MAX_TOP10--}:</td>
                <td class="bottom">
                        <input type="text" class="form_field" name="top10_max" value="{?top10_max?}" size="4" maxlength="6" />
                </td>
index 9fa9fe3..64bf912 100644 (file)
@@ -3,25 +3,25 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_CONFIG_TRANSFER_HEADER--}</strong>
+                       <strong>{--ADMIN_CONFIG_TRANSFER_TITLE--}</strong>
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_TRANSFER_MAX--}:</td>
+               <td align="right">{--ADMIN_CONFIG_TRANSFER_MAX--}:</td>
                <td>
                        <input type="text" class="form_field" name="transfer_max" value="{?transfer_max?}" size="4" maxlength="6" />
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_TRANSFER_AGE--}:</td>
+               <td align="right">{--ADMIN_CONFIG_TRANSFER_AGE--}:</td>
                <td>$content[age_selection]</td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_TRANSFER_TIMEOUT--}:</td>
+               <td align="right">{--ADMIN_CONFIG_TRANSFER_TIMEOUT--}:</td>
                <td>$content[timeout_selection]</td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_TRANSFER_BALANCE--}:</td>
+               <td align="right">{--ADMIN_CONFIG_TRANSFER_BALANCE--}:</td>
                <td>
                        <input type="text" class="form_field" name="transfer_balance" value="{?transfer_balance?}" size="4" maxlength="6" />
                        <span class="tiny">({?POINTS?})</span>
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_TRANSFER_CODE--}:<br />
-                       <div class="notice">({--ADMIN_TRANSFER_CODE_NOTE--})</div>
+                       {--ADMIN_CONFIG_TRANSFER_CODE--}:<br />
+                       <div class="notice">({--ADMIN_CONFIG_TRANSFER_CODE_NOTE--})</div>
                </td>
                <td>
                        <input type="text" class="form_field" name="transfer_code" value="{?transfer_code?}" size="4" maxlength="6" />
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right" width="250">{--ADMIN_AUTOPURGE_TRANSFER--}</td>
+               <td class="bottom" align="right" width="250">{--ADMIN_CONFIG_AUTOPURGE_TRANSFER--}</td>
                <td class="bottom">
                        <select name="ap_transfer" size="1" class="form_select">
                                <option value="Y"$content[ap_transfer_y]>{--YES--}</option>
index ad0be0b..4e69c02 100644 (file)
@@ -7,13 +7,13 @@
                </td>
        </tr>
        <tr>
-               <td align="right">{--ADMIN_USER_LIMIT_USER--}:</td>
+               <td align="right">{--ADMIN_CONFIG_USER_LIMIT--}:</td>
                <td>
                        <input type="text" class="form_field" name="user_limit" value="{?user_limit?}" size="4" maxlength="6" />
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right">{--ADMIN_USER_ALPHA_USER--}:</td>
+               <td class="bottom" align="right">{--ADMIN_CONFIG_USER_ALPHA--}:</td>
                <td class="bottom">
                        <input type="text" class="form_field" name="user_alpha" value="{?user_alpha?}" size="4" maxlength="6" />
                </td>
index 3a3747c..b3516ef 100644 (file)
@@ -3,12 +3,12 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header bottom">
-                       <strong>{--ADMIN_WERNIS_CONFIG_TITLE--}</strong>
+                       <strong>{--ADMIN_CONFIG_WERNIS_TITLE--}</strong>
                </td>
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_WERNIS_API_ID--}:
+                       {--ADMIN_CONFIG_WERNIS_API_ID--}:
                </td>
                <td>
                        <input type="text" class="form_field" name="wernis_api_id" value="{?wernis_api_id?}" size="2" maxlength="20" />
@@ -16,7 +16,7 @@
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_WERNIS_API_MD5--}:
+                       {--ADMIN_CONFIG_WERNIS_API_MD5--}:
                </td>
                <td>
                        <input type="text" class="form_field" name="wernis_api_md5" value="{?wernis_api_md5?}" size="32" maxlength="32" />
@@ -32,7 +32,7 @@
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_WERNIS_REFID--}:
+                       {--ADMIN_CONFIG_WERNIS_REFID--}:
                </td>
                <td>
                        <input type="text" class="form_field" name="wernis_refid" value="{?wernis_refid?}" size="5" maxlength="20" />
@@ -40,7 +40,7 @@
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_WERNIS_WPASS--}:
+                       {--ADMIN_CONFIG_WERNIS_WPASS--}:
                </td>
                <td>
                        <input type="password" class="form_field" name="wernis_pass" size="5" maxlength="20" />
@@ -48,7 +48,7 @@
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_WERNIS_MIN_PAYOUT--}:
+                       {--ADMIN_CONFIG_WERNIS_MIN_PAYOUT--}:
                </td>
                <td>
                        <input type="text" class="form_field" name="wernis_min_payout" value="{?wernis_min_payout?}" size="5" maxlength="20" /> Wernis
@@ -56,7 +56,7 @@
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_WERNIS_MIN_WITHDRAW--}:
+                       {--ADMIN_CONFIG_WERNIS_MIN_WITHDRAW--}:
                </td>
                <td>
                        <input type="text" class="form_field" name="wernis_min_withdraw" value="{?wernis_min_withdraw?}" size="5" maxlength="20" /> Wernis
@@ -64,7 +64,7 @@
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_WERNIS_PAYOUT_FACTOR--}:
+                       {--ADMIN_CONFIG_WERNIS_PAYOUT_FACTOR--}:
                </td>
                <td>
                        <input type="text" class="form_field" name="wernis_payout_factor" value="{?wernis_payout_factor?}" size="5" maxlength="20" />
@@ -72,7 +72,7 @@
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_WERNIS_WITHDRAW_FACTOR--}:
+                       {--ADMIN_CONFIG_WERNIS_WITHDRAW_FACTOR--}:
                </td>
                <td>
                        <input type="text" class="form_field" name="wernis_withdraw_factor" value="{?wernis_withdraw_factor?}" size="5" maxlength="20" />
@@ -80,7 +80,7 @@
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_WERNIS_PAYOUT_FEE_PERCENT--}:
+                       {--ADMIN_CONFIG_WERNIS_PAYOUT_FEE_PERCENT--}:
                </td>
                <td>
                        <input type="text" class="form_field" name="wernis_payout_fee_percent" value="{?wernis_payout_fee_percent?}" size="5" maxlength="20" />&#37;
@@ -88,7 +88,7 @@
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_WERNIS_WITHDRAW_FEE_PERCENT--}:
+                       {--ADMIN_CONFIG_WERNIS_WITHDRAW_FEE_PERCENT--}:
                </td>
                <td>
                        <input type="text" class="form_field" name="wernis_withdraw_fee_percent" value="{?wernis_withdraw_fee_percent?}" size="5" maxlength="20" />&#37;
@@ -96,7 +96,7 @@
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_WERNIS_PAYOUT_FEE_FIX--}:
+                       {--ADMIN_CONFIG_WERNIS_PAYOUT_FEE_FIX--}:
                </td>
                <td>
                        <input type="text" class="form_field" name="wernis_payout_fee_fix" value="{?wernis_payout_fee_fix?}" size="5" maxlength="20" />
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_WERNIS_WITHDRAW_FEE_FIX--}:
+                       {--ADMIN_CONFIG_WERNIS_WITHDRAW_FEE_FIX--}:
                </td>
                <td>
                        <input type="text" class="form_field" name="wernis_withdraw_fee_fix" value="{?wernis_withdraw_fee_fix?}" size="5" maxlength="20" />
        </tr>
        <tr>
                <td align="right">
-                       {--ADMIN_WERNIS_PAYOUT_ACTIVE--}:
+                       {--ADMIN_CONFIG_WERNIS_PAYOUT_ACTIVE--}:
                </td>
                <td>
                        <input type="radio" class="form_field" name="wernis_payout_active" value="Y"$content[wernis_payout_active_y] /> {--YES--}<br />
        </tr>
        <tr>
                <td class="bottom" align="right">
-                       {--ADMIN_WERNIS_WITHDRAW_ACTIVE--}:
+                       {--ADMIN_CONFIG_WERNIS_WITHDRAW_ACTIVE--}:
                </td>
                <td class="bottom">
                        <input type="radio" class="form_field" name="wernis_withdraw_active" value="Y"$content[wernis_withdraw_active_y] /> {--YES--}<br />
diff --git a/templates/de/html/admin/admin_delete_admins_acls.tpl b/templates/de/html/admin/admin_delete_admins_acls.tpl
new file mode 100644 (file)
index 0000000..8cc74b2
--- /dev/null
@@ -0,0 +1,25 @@
+<div align="center">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_admins_acls%}" method="post">
+<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
+       <tr>
+               <td colspan="5" align="center" class="table_header bottom">
+                       <strong>{--ADMIN_ADMINS_DELETE_ACLS--}:</strong>
+               </td>
+       </tr>
+       <tr>
+               <td align="center" class="header_column bottom right" width="30"><strong>{--ID_SELECT--}</strong></td>
+               <td align="center" class="header_column bottom right" width="120"><strong>{--ADMIN_ADMINS_LOGIN_ID--}:</strong></td>
+               <td align="center" class="header_column bottom right" width="204"><strong>{--ADMIN_MENU_ACTION--}:</strong></td>
+               <td align="center" class="header_column bottom right" width="204"><strong>{--ADMIN_MENU_WHAT--}:</strong></td>
+               <td align="center" class="header_column bottom" width="120"><strong>{--ADMIN_ADMINS_ACCESS_MODE--}:</strong></td>
+       </tr>
+       $content
+       <tr>
+               <td colspan="5" class="table_footer">
+                       <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
+                       <input type="submit" name="remove" class="form_delete" value="{--ADMIN_ADMINS_REMOVE_ACLS_SUBMIT--}" />
+               </td>
+       </tr>
+</table>
+</form>
+</div>
diff --git a/templates/de/html/admin/admin_delete_admins_acls_row.tpl b/templates/de/html/admin/admin_delete_admins_acls_row.tpl
new file mode 100644 (file)
index 0000000..d522782
--- /dev/null
@@ -0,0 +1,17 @@
+<tr>
+       <td class="{%template,ColorSwitch%} bottom right" align="center"><strong>$content[id]</strong>
+               <input type="hidden" name="sel[$content[id]]" value="1" />
+       </td>
+       <td class="{%template,ColorSwitch%} bottom right" align="center">
+               {%pipe,generateAdminLink=$content[admin_id]%}
+       </td>
+       <td class="{%template,ColorSwitch%} bottom right" align="center">
+               {%pipe,fixEmptyContentToDashes=$content[action_menu]%}
+       </td>
+       <td class="{%template,ColorSwitch%} bottom right" align="center">
+               {%pipe,fixEmptyContentToDashes=$content[what_menu]%}
+       </td>
+       <td class="{%template,ColorSwitch%} bottom" align="center">
+               $content[access_mode]
+       </td>
+</tr>
diff --git a/templates/de/html/admin/admin_delete_email_max_rec.tpl b/templates/de/html/admin/admin_delete_email_max_rec.tpl
new file mode 100644 (file)
index 0000000..b9b0909
--- /dev/null
@@ -0,0 +1,19 @@
+<div align="center">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_email_max_rec%}" method="post">
+<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
+       <tr>
+               <td align="center" class="table_header bottom">
+                       <strong>{--ADMIN_DELETE_MAX_RECEIVE_TITLE--}:</strong>
+               </td>
+       </tr>
+       $content[rows]
+       <tr>
+               <td class="table_footer" align="center">
+                       <input type="hidden" name="do" value="delete" />
+                       <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
+                       <input type="submit" name="ok" class="form_delete" value="{--ADMIN_REMOVE_MAX_RECEIVE--}" />
+               </td>
+       </tr>
+</table>
+</form>
+</div>
diff --git a/templates/de/html/admin/admin_delete_email_max_rec_row.tpl b/templates/de/html/admin/admin_delete_email_max_rec_row.tpl
new file mode 100644 (file)
index 0000000..975e297
--- /dev/null
@@ -0,0 +1,11 @@
+<tr>
+       <td class="{%template,ColorSwitch%}" align="center">
+               <strong>{--ADMIN_MAX_RECEIVE_ID--} $content[id]:</strong>
+       </td>
+</tr>
+<tr>
+       <td class="{%template,ColorSwitch%} bottom" align="center">
+               $content[value] ({%pipe,fixEmptyContentToDashes=$content[comment]%})
+               <input type="hidden" name="id[$content[id]]" value="1" />
+       </td>
+</tr>
diff --git a/templates/de/html/admin/admin_delete_payouts.tpl b/templates/de/html/admin/admin_delete_payouts.tpl
new file mode 100644 (file)
index 0000000..9e62cd5
--- /dev/null
@@ -0,0 +1,22 @@
+<div align="center">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_payouts%}" method="post">
+<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
+       <tr>
+               <td colspan="4" align="center" class="table_header bottom">
+               <strong>{--ADMIN_PAYOUT_DELETE_TITLE--}</strong></td>
+       </tr>
+       <tr>
+               <td width="30" class="header_column bottom right" align="center"><strong>{--ID_SELECT--}</strong></td>
+               <td width="250" class="header_column bottom right" align="center"><strong>{--ADMIN_PAYOUT_TITLE--}</strong></td>
+               <td width="150" class="header_column bottom right" align="center"><strong>{--ADMIN_PAYOUT_RATE2--}</strong></td>
+               <td width="100" class="header_column bottom" align="center"><strong>{--ADMIN_PAYOUT_MIN_POINTS2--}</strong></td>
+       </tr>
+       $content
+       <tr>
+               <td colspan="4" class="table_footer">
+                       <input type="submit" class="form_delete" name="remove" value="{--ADMIN_PAYOUT_DELETE--}" />
+               </td>
+       </tr>
+</table>
+</form>
+</div>
diff --git a/templates/de/html/admin/admin_delete_payouts_row.tpl b/templates/de/html/admin/admin_delete_payouts_row.tpl
new file mode 100644 (file)
index 0000000..e4d72ce
--- /dev/null
@@ -0,0 +1,15 @@
+<tr>
+       <td align="center" class="{%template,ColorSwitch%} bottom right" height="25">
+               $content[id]
+               <input type="hidden" name="sel[$content[id]]" value="1" />
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               $content[type]
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               {%pipe,translateComma=$content[rate]%}
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               {%pipe,translateComma=$content[min_points]%}
+       </td>
+</tr>
diff --git a/templates/de/html/admin/admin_edit_admins_acls.tpl b/templates/de/html/admin/admin_edit_admins_acls.tpl
new file mode 100644 (file)
index 0000000..dce8929
--- /dev/null
@@ -0,0 +1,25 @@
+<div align="center">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_admins_acls%}" method="post">
+<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
+       <tr>
+               <td colspan="5" align="center" class="table_header bottom">
+                       <strong>{--ADMIN_ADMINS_EDIT_ACLS--}:</strong>
+               </td>
+       </tr>
+       <tr>
+               <td align="center" class="header_column bottom right" width="30"><strong>{--ID_SELECT--}</strong></td>
+               <td align="center" class="header_column bottom right" width="120"><strong>{--ADMIN_ADMINS_LOGIN_ID--}:</strong></td>
+               <td align="center" class="header_column bottom right" width="204"><strong>{--ADMIN_MENU_ACTION--}:</strong></td>
+               <td align="center" class="header_column bottom right" width="204"><strong>{--ADMIN_MENU_WHAT--}:</strong></td>
+               <td align="center" class="header_column bottom" width="120"><strong>{--ADMIN_ADMINS_ACCESS_MODE--}:</strong></td>
+       </tr>
+       $content
+       <tr>
+               <td colspan="5" class="table_footer">
+                       <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
+                       <input type="submit" class="form_submit" name="change" value="{--ADMIN_ADMINS_CHANGE_ACLS_SUBMIT--}" />
+               </td>
+       </tr>
+</table>
+</form>
+</div>
diff --git a/templates/de/html/admin/admin_edit_admins_acls_row.tpl b/templates/de/html/admin/admin_edit_admins_acls_row.tpl
new file mode 100644 (file)
index 0000000..59f18b7
--- /dev/null
@@ -0,0 +1,22 @@
+<tr>
+       <td class="{%template,ColorSwitch%} bottom right" align="center">
+               <strong>$content[id]</strong>
+               <input type="hidden" name="sel[$content[id]]" value="1" />
+       </td>
+       <td class="{%template,ColorSwitch%} bottom right" align="center">
+               <select name="admin[$content[id]]" size="1" class="form_select">
+                       $content[admins_selection]
+               </select>
+       </td>
+       <td class="{%template,ColorSwitch%} bottom right" align="center">
+               $content[action_selection]
+       </td>
+       <td class="{%template,ColorSwitch%} bottom right" align="center">
+               $content[what_selection]
+       </td>
+       <td class="{%template,ColorSwitch%} bottom" align="center">
+               <select name="mode[$content[id]]" size="1" class="form_select">
+                       $content[mode_options]
+               </select>
+       </td>
+</tr>
diff --git a/templates/de/html/admin/admin_edit_email_max_rec.tpl b/templates/de/html/admin/admin_edit_email_max_rec.tpl
new file mode 100644 (file)
index 0000000..d430f65
--- /dev/null
@@ -0,0 +1,19 @@
+<div align="center">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_email_max_rec%}" method="post">
+<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
+       <tr>
+               <td align="center" colspan="2" class="table_header bottom">
+                       <strong>{--ADMIN_EDIT_MAX_RECEIVE_TITLE--}:</strong>
+               </td>
+       </tr>
+       $content[rows]
+       <tr>
+               <td class="table_footer" align="center" colspan="2">
+                       <input type="hidden" name="do" value="delete" />
+                       <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
+                       <input type="submit" class="form_submit" name="ok" value="{--ADMIN_CHANGE_MAX_RECEIVE--}" />
+               </td>
+       </tr>
+</table>
+</form>
+</div>
diff --git a/templates/de/html/admin/admin_edit_email_max_rec_row.tpl b/templates/de/html/admin/admin_edit_email_max_rec_row.tpl
new file mode 100644 (file)
index 0000000..b6b205f
--- /dev/null
@@ -0,0 +1,18 @@
+<tr>
+       <td class="{%template,ColorSwitch%}" colspan="2" align="center">
+               <strong>{--ADMIN_MAX_RECEIVE_ID--} $content[id]:</strong>
+               <input type="hidden" name="id[$content[id]]" value="1" />
+       </td>
+</tr>
+<tr>
+       <td class="{%template,ColorSwitch%}" align="right">{--ADMIN_MAX_RECEIVE_VALUE--}:&nbsp;</td>
+       <td class="{%template,ColorSwitch%}">
+               <input type="text" class="form_field" name="val[$content[id]]" value="$content[value]" size="3" maxlength="5" />
+       </td>
+</tr>
+<tr>
+       <td class="{%template,ColorSwitch%} bottom" align="right">{--ADMIN_MAX_RECEIVE_COMMENT--}:&nbsp;</td>
+       <td class="{%template,ColorSwitch%} bottom">
+               <input type="text" class="form_field" name="comm[$content[id]]" value="$content[comment]" size="25" maxlength="255" />
+       </td>
+</tr>
diff --git a/templates/de/html/admin/admin_edit_payouts.tpl b/templates/de/html/admin/admin_edit_payouts.tpl
new file mode 100644 (file)
index 0000000..efb883b
--- /dev/null
@@ -0,0 +1,25 @@
+<div align="center">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=config_payouts%}" method="post">
+<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
+       <tr>
+               <td colspan="5" align="center" class="table_header bottom">
+                       <strong>{--ADMIN_PAYOUT_EDIT_TITLE--}</strong>
+               </td>
+       </tr>
+       <tr>
+               <td width="20" class="header_column bottom right" align="center"><strong>{--ID_SELECT--}</strong></td>
+               <td width="200" class="header_column bottom right" align="center"><strong>{--ADMIN_PAYOUT_TITLE--}</strong></td>
+               <td width="150" class="header_column bottom right" align="center"><strong>{--ADMIN_PAYOUT_RATE2--}</strong></td>
+               <td width="100" class="header_column bottom right" align="center"><strong>{--ADMIN_PAYOUT_MIN_POINTS2--}</strong></td>
+               <td width="180" class="header_column bottom" align="center"><strong>{--ADMIN_PAYOUT_ALLOW_URLS--}</strong></td>
+       </tr>
+       $content
+       <tr>
+               <td colspan="5" class="table_footer">
+                       <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
+                       <input type="submit" class="form_submit" name="change" value="{--ADMIN_PAYOUT_EDIT--}" />
+               </td>
+       </tr>
+</table>
+</form>
+</div>
diff --git a/templates/de/html/admin/admin_edit_payouts_row.tpl b/templates/de/html/admin/admin_edit_payouts_row.tpl
new file mode 100644 (file)
index 0000000..c620699
--- /dev/null
@@ -0,0 +1,18 @@
+<tr>
+       <td align="center" class="{%template,ColorSwitch%} bottom right" height="25">
+               $content[id]
+               <input type="hidden" name="sel[$content[id]]" value="1" />
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               <input type="text" class="form_field" name="type[$content[id]]" value="$content[type]" size="20" maxlength="255" />
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               <input type="text" class="form_field" name="rate[$content[id]]" value="{%pipe,translateComma=$content[rate]%}" size="5" maxlength="10" />
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom right">
+               <input type="text" class="form_field" name="min_points[$content[id]]" value="{%pipe,translateComma=$content[min_points]%}" size="5" maxlength="10" />
+       </td>
+       <td align="center" class="{%template,ColorSwitch%} bottom">
+               $content[allow_url]
+       </td>
+</tr>
diff --git a/templates/de/html/admin/admin_list_admins_acls.tpl b/templates/de/html/admin/admin_list_admins_acls.tpl
new file mode 100644 (file)
index 0000000..a753369
--- /dev/null
@@ -0,0 +1,26 @@
+<div align="center">
+<form accept-charset="UTF-8" action="{%url=modules.php?module=admin&amp;what=list_admins_acls%}" method="post">
+<table border="0" cellspacing="0" cellpadding="0" class="table dashed">
+       <tr>
+               <td colspan="5" align="center" class="table_header bottom">
+                       <strong>{--ADMIN_ADMINS_LIST_ACLS--}:</strong>
+               </td>
+       </tr>
+       <tr>
+               <td align="center" class="header_column bottom right" width="30"><strong>{--ID_SELECT--}</strong></td>
+               <td align="center" class="header_column bottom right" width="120"><strong>{--ADMIN_ADMINS_LOGIN_ID--}:</strong></td>
+               <td align="center" class="header_column bottom right" width="204"><strong>{--ADMIN_MENU_ACTION--}:</strong></td>
+               <td align="center" class="header_column bottom right" width="204"><strong>{--ADMIN_MENU_WHAT--}:</strong></td>
+               <td align="center" class="header_column bottom" width="120"><strong>{--ADMIN_ADMINS_ACCESS_MODE--}:</strong></td>
+       </tr>
+       $content
+       <tr>
+               <td colspan="5" class="table_footer">
+                       <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
+                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_ADMINS_EDIT_ACLS_SUBMIT--}" />
+                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ADMINS_DELETE_ACLS_SUBMIT--}" />
+               </td>
+       </tr>
+</table>
+</form>
+</div>
diff --git a/templates/de/html/admin/admin_list_admins_acls_row.tpl b/templates/de/html/admin/admin_list_admins_acls_row.tpl
new file mode 100644 (file)
index 0000000..7a00f35
--- /dev/null
@@ -0,0 +1,17 @@
+<tr>
+       <td class="{%template,ColorSwitch%} bottom right" align="center">
+               <input type="checkbox" title="{--ID_SELECT--} $content[id]" class="form_field" name="sel[$content[id]]" value="1" />
+       </td>
+       <td class="{%template,ColorSwitch%} bottom right" align="center">
+               {%pipe,generateAdminLink=$content[admin_id]%}
+       </td>
+       <td class="{%template,ColorSwitch%} bottom right" align="center">
+               {%pipe,fixEmptyContentToDashes=$content[action_menu]%}
+       </td>
+       <td class="{%template,ColorSwitch%} bottom right" align="center">
+               {%pipe,fixEmptyContentToDashes=$content[what_menu]%}
+       </td>
+       <td class="{%template,ColorSwitch%} bottom" align="center">
+               $content[access_mode]