From e51f09bb54eaaf565ac1bae162bf363fc9553ff7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 19 Jul 2011 17:33:18 +0000 Subject: [PATCH] Extension ext-funcoins continued, template helper function added: - Extension ext-funcoins: Configuration basicly finished (but not yet used) - Template helper doTemplateConfigurationYesNoSelectionBox() introduced which will unify yes/no configuration selections. - TODOs.txt updated --- .gitattributes | 3 + DOCS/TODOs.txt | 20 +-- inc/extensions/ext-funcoins.php | 1 + inc/language/funcoins_de.php | 63 +++++++++ inc/language/wernis_de.php | 2 +- inc/modules/admin/what-config_beg.php | 9 +- inc/modules/admin/what-config_birthday.php | 12 +- inc/modules/admin/what-config_bonus.php | 7 - inc/modules/admin/what-config_doubler.php | 7 - inc/modules/admin/what-config_extensions.php | 15 +- inc/modules/admin/what-config_funcoins.php | 55 ++++++++ inc/modules/admin/what-config_order.php | 4 +- inc/modules/admin/what-config_refback.php | 17 +-- inc/modules/admin/what-config_removeip.php | 7 - inc/modules/admin/what-config_transfer.php | 7 - inc/modules/admin/what-config_validator.php | 13 +- inc/modules/admin/what-config_wernis.php | 15 +- inc/template-functions.php | 11 ++ inc/wrapper-functions.php | 4 +- .../de/html/admin/admin_config_autopurge.tpl | 4 +- templates/de/html/admin/admin_config_beg.tpl | 18 +-- .../de/html/admin/admin_config_birthday.tpl | 3 +- .../de/html/admin/admin_config_bonus.tpl | 30 ++-- .../de/html/admin/admin_config_doubler.tpl | 9 +- .../de/html/admin/admin_config_extensions.tpl | 3 +- .../de/html/admin/admin_config_funcoins.tpl | 128 ++++++++++++++++++ templates/de/html/admin/admin_config_menu.tpl | 8 +- .../de/html/admin/admin_config_order.tpl | 9 +- .../de/html/admin/admin_config_other.tpl | 44 ++---- .../de/html/admin/admin_config_refback.tpl | 3 +- .../de/html/admin/admin_config_removeip.tpl | 24 ++-- .../de/html/admin/admin_config_surfbar.tpl | 20 +-- .../de/html/admin/admin_config_transfer.tpl | 5 +- .../de/html/admin/admin_config_validator.tpl | 3 +- .../de/html/admin/admin_config_wernis.tpl | 8 +- 35 files changed, 339 insertions(+), 252 deletions(-) create mode 100644 inc/language/funcoins_de.php create mode 100644 inc/modules/admin/what-config_funcoins.php create mode 100644 templates/de/html/admin/admin_config_funcoins.tpl diff --git a/.gitattributes b/.gitattributes index 75638885ec..5fde6f1c5d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -272,6 +272,7 @@ inc/language/de.php svneol=native#text/plain inc/language/debug_de.php svneol=native#text/plain inc/language/doubler_de.php svneol=native#text/plain inc/language/en.php svneol=native#text/plain +inc/language/funcoins_de.php svneol=native#text/plain inc/language/holiday_de.php svneol=native#text/plain inc/language/html_mail_de.php svneol=native#text/plain inc/language/imprint_de.php svneol=native#text/plain @@ -458,6 +459,7 @@ inc/modules/admin/what-config_coupon.php svneol=native#text/plain inc/modules/admin/what-config_doubler.php svneol=native#text/plain inc/modules/admin/what-config_email.php svneol=native#text/plain inc/modules/admin/what-config_extensions.php svneol=native#text/plain +inc/modules/admin/what-config_funcoins.php svneol=native#text/plain inc/modules/admin/what-config_holiday.php svneol=native#text/plain inc/modules/admin/what-config_home.php svneol=native#text/plain inc/modules/admin/what-config_imprint.php svneol=native#text/plain @@ -1059,6 +1061,7 @@ templates/de/html/admin/admin_config_email_edit.tpl svneol=native#text/plain templates/de/html/admin/admin_config_email_edit_row.tpl svneol=native#text/plain templates/de/html/admin/admin_config_email_row.tpl svneol=native#text/plain templates/de/html/admin/admin_config_extensions.tpl svneol=native#text/plain +templates/de/html/admin/admin_config_funcoins.tpl svneol=native#text/plain templates/de/html/admin/admin_config_holiday.tpl svneol=native#text/plain templates/de/html/admin/admin_config_home.tpl svneol=native#text/plain templates/de/html/admin/admin_config_home_main.tpl svneol=native#text/plain diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index e8a948b47d..bec09bfb35 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -69,10 +69,10 @@ ./inc/libs/doubler_functions.php:93: // @TODO Can't this be moved into EL? ./inc/libs/mailid_functions.php:47: // @TODO Rewrite this to a dynamic include or so ./inc/libs/rallye_functions.php:439: // @TODO Deprecated variable and global statement, please try to rewrite this -./inc/libs/rallye_functions.php:704:// @TODO This function does not load min_users, min_prices, please encapsulate loading rallye data with e.g. getRallyeDataFromId() -./inc/libs/rallye_functions.php:769: $EXPIRE = 3; // @TODO The hard-coded value... -./inc/libs/rallye_functions.php:855:// @TODO Please document this function -./inc/libs/rallye_functions.php:911: // Load count @TODO Can't we rewrite this to our API? +./inc/libs/rallye_functions.php:705:// @TODO This function does not load min_users, min_prices, please encapsulate loading rallye data with e.g. getRallyeDataFromId() +./inc/libs/rallye_functions.php:770: $EXPIRE = 3; // @TODO The hard-coded value... +./inc/libs/rallye_functions.php:856:// @TODO Please document this function +./inc/libs/rallye_functions.php:912: // Load count @TODO Can't we rewrite this to our API? ./inc/libs/register_functions.php:290: // @TODO Rewrite these all to a single filter ./inc/libs/sponsor_functions.php:159: // @TODO Rewrite this to API function ./inc/libs/sponsor_functions.php:430: // @TODO Rewrite this to API function @@ -169,12 +169,12 @@ ./inc/modules/member/what-unconfirmed.php:227: // @TODO This 'userid' cannot be saved because of encapsulated EL code ./inc/modules/order.php:74: // @TODO Unused: 2,4 ./inc/monthly/monthly_bonus.php:64: // @TODO Rewrite this to a filter -./inc/mysql-manager.php:1251: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY() -./inc/mysql-manager.php:1315: // @TODO Rewrite these lines to a filter -./inc/mysql-manager.php:1339: // @TODO Rewrite this to a filter -./inc/mysql-manager.php:1598: // @TODO Rewrite this to a filter -./inc/mysql-manager.php:1642:// @TODO Fix inconsistency between last_module and getWhat() -./inc/mysql-manager.php:371: // @TODO Try to rewrite this to one or more functions +./inc/mysql-manager.php:1252: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY() +./inc/mysql-manager.php:1316: // @TODO Rewrite these lines to a filter +./inc/mysql-manager.php:1340: // @TODO Rewrite this to a filter +./inc/mysql-manager.php:1599: // @TODO Rewrite this to a filter +./inc/mysql-manager.php:1645:// @TODO Fix inconsistency between last_module and getWhat() +./inc/mysql-manager.php:372: // @TODO Try to rewrite this to one or more functions ./inc/mysql-manager.php:44:// @TODO Can we cache this? ./inc/purge/purge-inact.php:55: // @TODO Rewrite these if() blocks to a filter ./inc/revision-functions.php:169:// @TODO This function does also set and get in 'cache_array' diff --git a/inc/extensions/ext-funcoins.php b/inc/extensions/ext-funcoins.php index e60faae3a8..14c54e5636 100644 --- a/inc/extensions/ext-funcoins.php +++ b/inc/extensions/ext-funcoins.php @@ -77,6 +77,7 @@ INDEX (`userid`)", addConfigAddSql('funcoins_min_withdraw', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT 5000'); addConfigAddSql('funcoins_api_id', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT 0'); addConfigAddSql('funcoins_api_password', "VARCHAR(255) NOT NULL DEFAULT ''"); + addConfigAddSql('funcoins_refid', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT 0'); addConfigAddSql('funcoins_payout_active', "ENUM ('Y','N') NOT NULL DEFAULT 'Y'"); addConfigAddSql('funcoins_withdraw_active', "ENUM ('Y','N') NOT NULL DEFAULT 'Y'"); addConfigAddSql('funcoins_payout_factor', 'FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 1.00000'); diff --git a/inc/language/funcoins_de.php b/inc/language/funcoins_de.php new file mode 100644 index 0000000000..87b9d12b93 --- /dev/null +++ b/inc/language/funcoins_de.php @@ -0,0 +1,63 @@ + "Konfiguration der FuCo-Ex² API", + 'ADMIN_CONFIG_FUNCOINS_API_ID' => "Betreiberkonto (Nummer)", + 'ADMIN_CONFIG_FUNCOINS_API_PASSWORD' => "Kennwort Ihres Betreiberkontos", + 'ADMIN_CONFIG_FUNCOINS_REFID' => "Referal-Id (gleich die Nummer Ihres FC-Kontos)", + 'ADMIN_CONFIG_FUNCOINS_MIN_PAYOUT' => "Minimale Auszahlungssumme auf ein FunCoins-Konto", + 'ADMIN_CONFIG_FUNCOINS_MIN_WITHDRAW' => "Minimale Einzahlungssumme von einem FunCoins-Konto", + 'ADMIN_CONFIG_FUNCOINS_PAYOUT_FACTOR' => "Umrechnusfaktor von {?POINTS?} in FunCoins für Auszahlungen", + 'ADMIN_CONFIG_FUNCOINS_WITHDRAW_FACTOR' => "Umrechnusfaktor von FunCoins in {?POINTS?} für Einzahlungen", + 'ADMIN_CONFIG_FUNCOINS_PAYOUT_FEE_PERCENT' => "Prozentuale Betreibergebühr für Auszahlungen", + 'ADMIN_CONFIG_FUNCOINS_WITHDRAW_FEE_PERCENT' => "Prozentuale Betreibergebühr für Einzahlungen", + 'ADMIN_CONFIG_FUNCOINS_PAYOUT_FEE_FIX' => "Fixe Betreibergebühr für Auszahlungen", + 'ADMIN_CONFIG_FUNCOINS_WITHDRAW_FEE_FIX' => "Fixe Betreibergebühr für Einzahlungen", + 'ADMIN_CONFIG_FUNCOINS_PAYOUT_ACTIVE' => "Auszahlungen zum FunCoins-Portal aktiv?", + 'ADMIN_CONFIG_FUNCOINS_WITHDRAW_ACTIVE' => "Auszahlungen vom FunCoins-Portal aktiv?", + 'ADMIN_CONFIG_FUNCOINS_NOTE' => "Falls Sie noch kein FunCoins-Account haben, oder sich über die Internet-Währung nur informieren wollen, verwenden Sie bitte meinen Referal-Link. Ihre Mitglieder sehen im Mitgliedsbereich dann natürlich Ihren Werbelink. Sollten Sie sowohl einen feste als auch eine prozentuale Betreibergebühr eingestellt haben, gilt die prozentuale.", +)); + +// [EOF] +?> diff --git a/inc/language/wernis_de.php b/inc/language/wernis_de.php index f48aa00677..57a2b2e49b 100644 --- a/inc/language/wernis_de.php +++ b/inc/language/wernis_de.php @@ -59,7 +59,7 @@ addMessages(array( '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' => "[Hier] können Sie schon für einmalig kostenlos 25.000 Abfragen ein API-Account beantragen (dazu ist ein kostenloses Wernis-Account dennoch nötig!) Geben Sie immer Ihren Usernamen von WDS66-Hauptaccount ein und überprüfen Sie diesen mehrmals! Er wird zum Überweisen von und nach WDS66-Wernis-Portal benötigt. Die Betreibergebühren und Umrechnungsfaktoren sind für den Betrieb Ihres {?mt_word2?} komplett in Wernis ausgelegt, diese müssen Sie also noch anpassen, wenn Sie z.B. Punkte haben und in Wernis auszahlen lassen wollen.", + 'ADMIN_CONFIG_WERNIS_NOTE' => "[Hier] können Sie schon für einmalig kostenlos 25.000 Abfragen ein API-Account beantragen (dazu ist ein kostenloses Wernis-Account dennoch nötig!) Geben Sie immer Ihren Usernamen von WDS66-Hauptaccount ein und überprüfen Sie diesen mehrmals! Er wird zum Überweisen von und nach WDS66-Wernis-Portal benötigt. Die Betreibergebühren und Umrechnungsfaktoren sind für den Betrieb Ihres {?mt_word2?} komplett in Wernis ausgelegt, diese müssen Sie also noch anpassen, wenn Sie z.B. Punkte haben und in Wernis auszahlen lassen wollen. Sollten Sie sowohl einen feste als auch eine prozentuale Betreibergebühr eingestellt haben, gilt die prozentuale.", 'ADMIN_WERNIS_NO_TRANSFERS' => "Derzeit keine Wernis transferiert.", 'ADMIN_WERNIS_WDS66_ACCOUNT' => "Account bei WDS66-Portal", 'ADMIN_WERNIS_TRANSFERED' => "Wernis transferiert", diff --git a/inc/modules/admin/what-config_beg.php b/inc/modules/admin/what-config_beg.php index 5377816005..a2a6bb93a2 100644 --- a/inc/modules/admin/what-config_beg.php +++ b/inc/modules/admin/what-config_beg.php @@ -61,15 +61,8 @@ if (isFormSent()) { $content['beg_ip_timeout'] = createConfigurationTimeSelections('beg_ip_timeout' , 'Dhm'); $content['wait_selection'] = createConfigurationTimeSelections('beg_notify_wait' , 'ms' ); - // Init all Y/N selections - foreach (array('rallye', 'active', 'rallye_enable_notify', 'rallye_disable_notify', 'new_member_notify', 'include_own') as $entry) { - $content[$entry . '_y'] = ''; - $content[$entry . '_n'] = ''; - $content[$entry . '_' . strtolower(getConfig('beg_' . $entry))] = ' checked="checked"'; - } // END - foreach - // Init elements for faker-mode - foreach (array('pay_mode_img','pay_mode_js','pay_mode_both','pay_mode_none') as $entry) { + foreach (array('pay_mode_img', 'pay_mode_js', 'pay_mode_both', 'pay_mode_none') as $entry) { $content[$entry] = ''; } // END - foreach diff --git a/inc/modules/admin/what-config_birthday.php b/inc/modules/admin/what-config_birthday.php index 83c2c54b49..f0f3725542 100644 --- a/inc/modules/admin/what-config_birthday.php +++ b/inc/modules/admin/what-config_birthday.php @@ -47,18 +47,8 @@ if (isFormSent()) { // Save configuration adminSaveSettingsFromPostData(); } else { - // Init all other template entries - foreach (array('active_y','active_n') as $entry) { - $content[$entry] = ''; - } // END - foreach - - // Set current selections - foreach (array('active') as $entry) { - $content['birthday_' . $entry . '_' . strtolower(getConfig('birthday_' . $entry))] = ' checked="checked"'; - } // END - foreach - // Display form - loadTemplate('admin_config_birthday', false, $content); + loadTemplate('admin_config_birthday'); } // [EOF] diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php index 5f2a8d9e46..fe4e8b8138 100644 --- a/inc/modules/admin/what-config_bonus.php +++ b/inc/modules/admin/what-config_bonus.php @@ -106,13 +106,6 @@ if (isFormSent()) { $content['bonus_timeout_selection'] = createConfigurationTimeSelections('bonus_timeout' , 'WDh'); $content['wait_selection'] = createConfigurationTimeSelections('bonus_notify_wait', 'ms' ); - // Init Y/N selections - foreach (array('active','login_yn','stats_yn','order_yn','ref_yn','click_yn','enable_notify','disable_notify','new_member_notify','include_own') as $entry) { - $content[$entry . '_y'] = ''; - $content[$entry . '_n'] = ''; - $content[$entry . '_' . strtolower(getConfig('bonus_' . $entry))] = ' checked="checked"'; - } // END - foreach - // Load final template loadTemplate('admin_config_bonus', false, $content); } diff --git a/inc/modules/admin/what-config_doubler.php b/inc/modules/admin/what-config_doubler.php index e52215da30..83714c3f78 100644 --- a/inc/modules/admin/what-config_doubler.php +++ b/inc/modules/admin/what-config_doubler.php @@ -50,13 +50,6 @@ if (isFormSent()) { // Save settings adminSaveSettingsFromPostData(); } else { - // Init all Y/N selections - foreach (array('jackpot', 'own', 'sent_all') as $entry) { - $content[$entry . '_y'] = ''; - $content[$entry . '_n'] = ''; - $content[$entry . '_' . strtolower(getConfig('doubler_' . $entry))] = ' checked="checked"'; - } // END - foreach - // Init other selections foreach (array('send_mode_direct','send_mode_reset') as $entry) { $content[$entry] = ''; diff --git a/inc/modules/admin/what-config_extensions.php b/inc/modules/admin/what-config_extensions.php index 4b3ee8db6c..01ce26c1ed 100644 --- a/inc/modules/admin/what-config_extensions.php +++ b/inc/modules/admin/what-config_extensions.php @@ -47,21 +47,8 @@ if (isFormSent()) { // Save configuration adminSaveSettingsFromPostData(); } else { - // Prepare content - $content['verbose_y'] = ''; - $content['verbose_n'] = ''; - - // Prepare data - if (isVerboseSqlEnabled()) { - // Is enabled - $content['verbose_y'] = ' checked="checked"'; - } else { - // Is disabled - $content['verbose_n'] = ' checked="checked"'; - } - // Load template - loadTemplate('admin_config_extensions', false, $content); + loadTemplate('admin_config_extensions'); } // [EOF] diff --git a/inc/modules/admin/what-config_funcoins.php b/inc/modules/admin/what-config_funcoins.php new file mode 100644 index 0000000000..5dd7a6fde0 --- /dev/null +++ b/inc/modules/admin/what-config_funcoins.php @@ -0,0 +1,55 @@ + diff --git a/inc/modules/admin/what-config_order.php b/inc/modules/admin/what-config_order.php index 6763a1b322..43f7f8fb3b 100644 --- a/inc/modules/admin/what-config_order.php +++ b/inc/modules/admin/what-config_order.php @@ -48,12 +48,12 @@ if (isFormSent()) { adminSaveSettingsFromPostData(); } else { // Init all selection entries - foreach (array('order_max_full_order', 'order_max_full_max', 'order_mode_asc', 'order_mode_desc', 'allow_url_in_text_y', 'allow_url_in_text_n', 'allow_url_in_subject_y', 'allow_url_in_subject_n', 'url_blacklist_y', 'url_blacklist_n', 'repay_deleted_mails_repay', 'repay_deleted_mails_jackpot', 'repay_deleted_mails_shred') as $entry) { + foreach (array('order_max_full_order', 'order_max_full_max', 'order_mode_asc', 'order_mode_desc', 'repay_deleted_mails_repay', 'repay_deleted_mails_jackpot', 'repay_deleted_mails_shred') as $entry) { $content[$entry] = ''; } // END - foreach // Set all default checks - foreach (array('order_max_full', 'order_mode', 'allow_url_in_text', 'allow_url_in_subject', 'url_blacklist') as $entry) { + foreach (array('order_max_full', 'order_mode') as $entry) { $content[$entry . '_' . strtolower(getConfig($entry))] = ' checked="checked"'; } // END - foreach diff --git a/inc/modules/admin/what-config_refback.php b/inc/modules/admin/what-config_refback.php index a8a381d166..b78c944f09 100644 --- a/inc/modules/admin/what-config_refback.php +++ b/inc/modules/admin/what-config_refback.php @@ -50,23 +50,8 @@ if (isFormSent()) { // Save configuration adminSaveSettingsFromPostData(); } else { - // Prepare content - $content = array( - 'refback_enabled_n' => '', - 'refback_enabled_y' => '' - ); - - // Translate Y/N switches - if (isRefbackEnabled()) { - // Enabled - $content['refback_enabled_y'] = ' checked="checked"'; - } else { - // Disabled - $content['refback_enabled_n'] = ' checked="checked"'; - } - // Load template - loadTemplate('admin_config_refback', false, $content); + loadTemplate('admin_config_refback'); } // [EOF] diff --git a/inc/modules/admin/what-config_removeip.php b/inc/modules/admin/what-config_removeip.php index faf1a07a77..a83a3467f8 100644 --- a/inc/modules/admin/what-config_removeip.php +++ b/inc/modules/admin/what-config_removeip.php @@ -47,13 +47,6 @@ if (isFormSent()) { // Save configuration adminSaveSettingsFromPostData(); } else { - // Prepare data - foreach (array('removeip_anon_ip','removeip_anon_host','removeip_anon_ua','removeip_anon_ref','removeip_admin_show','removeip_guest_show','removeip_member_show','removeip_sponsor_show') as $entry) { - $content[$entry . '_y'] = ''; - $content[$entry . '_n'] = ''; - $content[$entry . '_' . strtolower(getConfig($entry))] = ' selected="selected"'; - } // END - if - // Prepare more entries foreach (array('anonymous_ip_local','anonymous_ip_zero','anonymous_ip_random') as $entry) { $content[$entry] = ''; diff --git a/inc/modules/admin/what-config_transfer.php b/inc/modules/admin/what-config_transfer.php index e2c85113b8..ae209d3873 100644 --- a/inc/modules/admin/what-config_transfer.php +++ b/inc/modules/admin/what-config_transfer.php @@ -47,13 +47,6 @@ if (isFormSent()) { // Save settings... adminSaveSettingsFromPostData(); } else { - // Init all Y/N elements - foreach (array('ap_transfer') as $entry) { - $content[$entry . '_y'] = ''; - $content[$entry . '_n'] = ''; - $content[$entry . '_' . strtolower(getConfig($entry))] = ' selected="selected"'; - } // END - if - // Time selection box $content['age_selection'] = createConfigurationTimeSelections('transfer_age' , 'MWDh'); $content['timeout_selection'] = createConfigurationTimeSelections('transfer_timeout', 'MWDh'); diff --git a/inc/modules/admin/what-config_validator.php b/inc/modules/admin/what-config_validator.php index c41b819ee3..f27ed44898 100644 --- a/inc/modules/admin/what-config_validator.php +++ b/inc/modules/admin/what-config_validator.php @@ -47,19 +47,8 @@ if (isFormSent()) { // Save data adminSaveSettingsFromPostData(); } else { - // Prepare content (default) - $content['enable_validator_yes'] = ' checked="checked"'; - $content['enable_validator_no'] = ''; - - // Is the configuration is "N"? - if (getConfig('enable_validator') == 'N') { - // Set them again - $content['enable_validator_yes'] = ''; - $content['enable_validator_no'] = ' checked="checked"'; - } // END - if - // Load template - loadTemplate('admin_config_validator', false, $content); + loadTemplate('admin_config_validator'); } // [EOF] diff --git a/inc/modules/admin/what-config_wernis.php b/inc/modules/admin/what-config_wernis.php index 7d5a3ece21..437d1b2319 100644 --- a/inc/modules/admin/what-config_wernis.php +++ b/inc/modules/admin/what-config_wernis.php @@ -65,21 +65,8 @@ if (isFormSent()) { displayMessage(GET_WERNIS_ERROR_MESSAGE()); } } else { - // Prepare data for template output - $content = array( - 'wernis_payout_active_y' => '', - 'wernis_payout_active_n' => '', - 'wernis_withdraw_active_y' => '', - 'wernis_withdraw_active_n' => '', - ); - - // Prepare payout Y/N selection - foreach (array('wernis_payout_active', 'wernis_withdraw_active') as $entry) { - $content[$entry . '_' . strtolower(getConfig($entry))] = ' checked="checked"'; - } // END - foreach - // Load template - loadTemplate('admin_config_wernis', false, $content); + loadTemplate('admin_config_wernis'); } // [EOF] diff --git a/inc/template-functions.php b/inc/template-functions.php index 6e2e473066..16cc8cbf6f 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -1821,5 +1821,16 @@ function doTemplateAdminMemberMailLinks ($template, $dummy, $mailId) { return generateAdminMailLinks('mid', $mailId); } +// Helper function to create a selection box for YES/NO configuration entries +function doTemplateConfigurationYesNoSelectionBox ($template, $dummy, $configEntry) { + // Generate the HTML code + $OUT = ''; + + // Return it + return $OUT; +} + // [EOF] ?> diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index 2eecd1a2ef..0b2cf28d20 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -2582,9 +2582,9 @@ function parseFloat ($floatString){ } // Generates a YES/NO option list from given default -function generateYesNoOptionList ($default = '') { +function generateYesNoOptionList ($configEntry = '') { // Generate it - return generateOptionList('/ARRAY/', array('Y', 'N'), array('{--YES--}', '{--NO--}'), $default); + return generateOptionList('/ARRAY/', array('Y', 'N'), array('{--YES--}', '{--NO--}'), $configEntry); } // "Getter" for total available receivers diff --git a/templates/de/html/admin/admin_config_autopurge.tpl b/templates/de/html/admin/admin_config_autopurge.tpl index e36092421c..3d037fcd31 100644 --- a/templates/de/html/admin/admin_config_autopurge.tpl +++ b/templates/de/html/admin/admin_config_autopurge.tpl @@ -59,9 +59,7 @@ {--ADMIN_CONFIG_AUTOPURGE_ACTIVE--}: - + {%template,ConfigurationYesNoSelectionBox=autopurge_active%} diff --git a/templates/de/html/admin/admin_config_beg.tpl b/templates/de/html/admin/admin_config_beg.tpl index 914b4665ff..0e8a428b6d 100644 --- a/templates/de/html/admin/admin_config_beg.tpl +++ b/templates/de/html/admin/admin_config_beg.tpl @@ -62,8 +62,7 @@ {--ADMIN_CONFIG_BEG_RALLYE_ACTIVE--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=beg_rallye%} @@ -71,8 +70,7 @@ {--ADMIN_CONFIG_BEG_INCLUDE_OWN--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=beg_include_own%} @@ -88,8 +86,7 @@ {--ADMIN_CONFIG_BEG_RALLYE_ONLY_ACTIVE--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=beg_active%} @@ -115,8 +112,7 @@ {--ADMIN_CONFIG_BEG_RALLYE_ENABLE_NOTIFY--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=beg_rallye_enable_notify%} @@ -124,8 +120,7 @@ {--ADMIN_CONFIG_BEG_RALLYE_DISABLE_NOTIFY--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=beg_rallye_disable_notify%} @@ -133,8 +128,7 @@ {--ADMIN_CONFIG_BEG_NEW_MEMBER_NOTIFY--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=beg_new_member_notify%} diff --git a/templates/de/html/admin/admin_config_birthday.tpl b/templates/de/html/admin/admin_config_birthday.tpl index 669221ea14..f7602c7ab2 100644 --- a/templates/de/html/admin/admin_config_birthday.tpl +++ b/templates/de/html/admin/admin_config_birthday.tpl @@ -19,8 +19,7 @@ {--ADMIN_CONFIG_BIRTHDAY_ONLY_ACTIVE--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=birthday_active%} diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl index cb6f6a51fd..dab831ea97 100644 --- a/templates/de/html/admin/admin_config_bonus.tpl +++ b/templates/de/html/admin/admin_config_bonus.tpl @@ -11,8 +11,7 @@ {--ADMIN_CONFIG_BONUS_RALLYE_IS_ACTIVE--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=bonus_active%} @@ -20,8 +19,7 @@ {--ADMIN_CONFIG_BONUS_RALLYE_INCLUDE_ONW--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=bonus_include_own%} @@ -29,8 +27,7 @@ {--ADMIN_CONFIG_BONUS_RALLYE_CLICK_INCLUDE--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=bonus_click%} @@ -38,8 +35,7 @@ {--ADMIN_CONFIG_BONUS_RALLYE_LOGIN_INCLUDE--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=bonus_login%} @@ -47,8 +43,7 @@ {--ADMIN_CONFIG_BONUS_RALLYE_ORDER_INCLUDE--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=bonus_order%} @@ -56,8 +51,7 @@ {--ADMIN_CONFIG_BONUS_RALLYE_STATS_INCLUDE--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=bonus_stats%} @@ -65,8 +59,7 @@ {--ADMIN_CONFIG_BONUS_RALLYE_REFERAL_INCLUDE--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=bonus_ref%} @@ -183,8 +176,7 @@ {--ADMIN_CONFIG_BONUS_RALLYE_ENABLE_NOTIFY--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=bonus_enable_notify%} @@ -192,8 +184,7 @@ {--ADMIN_CONFIG_BONUS_RALLYE_DISABLE_NOTIFY--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=bonus_disable_notify%} @@ -201,8 +192,7 @@ {--ADMIN_CONFIG_BONUS_RALLYE_NEW_MEMBER_NOTIFY--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=bonus_new_member_notify%} diff --git a/templates/de/html/admin/admin_config_doubler.tpl b/templates/de/html/admin/admin_config_doubler.tpl index eeeb252b36..08df672c50 100644 --- a/templates/de/html/admin/admin_config_doubler.tpl +++ b/templates/de/html/admin/admin_config_doubler.tpl @@ -65,8 +65,7 @@ {--ADMIN_CONFIG_DOUBLER_SENT_ALL--}: - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=doubler_sent_all%} @@ -74,8 +73,7 @@ {--ADMIN_CONFIG_DOUBLER_JACKPOT--}: - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=doubler_jackpot%} @@ -83,8 +81,7 @@ {--ADMIN_CONFIG_DOUBLER_OWN--}: - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=doubler_own%} diff --git a/templates/de/html/admin/admin_config_extensions.tpl b/templates/de/html/admin/admin_config_extensions.tpl index ed24a2d4e4..8f41726960 100644 --- a/templates/de/html/admin/admin_config_extensions.tpl +++ b/templates/de/html/admin/admin_config_extensions.tpl @@ -11,8 +11,7 @@ {--ADMIN_CONFIG_EXTENSIONS_VERBOSE_SQL--}: - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=verbose_sql%} diff --git a/templates/de/html/admin/admin_config_funcoins.tpl b/templates/de/html/admin/admin_config_funcoins.tpl new file mode 100644 index 0000000000..cab7410200 --- /dev/null +++ b/templates/de/html/admin/admin_config_funcoins.tpl @@ -0,0 +1,128 @@ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {--ADMIN_CONFIG_FUNCOINS_TITLE--} +
+ {--ADMIN_CONFIG_FUNCOINS_API_ID--}: + + +
+ {--ADMIN_CONFIG_FUNCOINS_API_PASSWORD--}: + + +
+ {--ADMIN_CONFIG_FUNCOINS_REFID--}: + + +
+ {--ADMIN_CONFIG_FUNCOINS_MIN_PAYOUT--}: + + Wernis +
+ {--ADMIN_CONFIG_FUNCOINS_MIN_WITHDRAW--}: + + Wernis +
+ {--ADMIN_CONFIG_FUNCOINS_PAYOUT_FACTOR--}: + + +
+ {--ADMIN_CONFIG_FUNCOINS_WITHDRAW_FACTOR--}: + + +
+ {--ADMIN_CONFIG_FUNCOINS_PAYOUT_FEE_PERCENT--}: + + % +
+ {--ADMIN_CONFIG_FUNCOINS_WITHDRAW_FEE_PERCENT--}: + + % +
+ {--ADMIN_CONFIG_FUNCOINS_PAYOUT_FEE_FIX--}: + + + ({?POINTS?}) +
+ {--ADMIN_CONFIG_FUNCOINS_WITHDRAW_FEE_FIX--}: + + + ({?POINTS?}) +
+ {--ADMIN_CONFIG_FUNCOINS_PAYOUT_ACTIVE--}: + + {%template,ConfigurationYesNoSelectionBox=funcoins_payout_active%} +
+ {--ADMIN_CONFIG_FUNCOINS_WITHDRAW_ACTIVE--}: + + {%template,ConfigurationYesNoSelectionBox=funcoins_withdraw_active%} +
+ + +
+
+ +
+ {--ADMIN_CONFIG_FUNCOINS_NOTE--} +
+ +
diff --git a/templates/de/html/admin/admin_config_menu.tpl b/templates/de/html/admin/admin_config_menu.tpl index a0d82e0bcd..c7bca54030 100644 --- a/templates/de/html/admin/admin_config_menu.tpl +++ b/templates/de/html/admin/admin_config_menu.tpl @@ -11,9 +11,7 @@ {--ADMIN_CONFIG_GUEST_MENU_ADVERT_ENABLED--} - + {%template,ConfigurationYesNoSelectionBox=guest_menu_advert_enabled%} @@ -21,9 +19,7 @@ {--ADMIN_CONFIG_MEMBER_MENU_ADVERT_ENABLED--} - + {%template,ConfigurationYesNoSelectionBox=member_menu_advert_enabled%} diff --git a/templates/de/html/admin/admin_config_order.tpl b/templates/de/html/admin/admin_config_order.tpl index e07ebdff3e..bbc4d82c9a 100644 --- a/templates/de/html/admin/admin_config_order.tpl +++ b/templates/de/html/admin/admin_config_order.tpl @@ -47,8 +47,7 @@ {--ADMIN_CONFIG_CHECK_EMAIL_TEXT--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=allow_url_in_text%} @@ -57,8 +56,7 @@ {--ADMIN_CONFIG_CHECK_EMAIL_SUBJECT--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=allow_url_in_subject%} @@ -67,8 +65,7 @@ {--ADMIN_CONFIG_URL_BLACKLIST--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=url_blacklist%} diff --git a/templates/de/html/admin/admin_config_other.tpl b/templates/de/html/admin/admin_config_other.tpl index b1c9ff7738..66d4e1c206 100644 --- a/templates/de/html/admin/admin_config_other.tpl +++ b/templates/de/html/admin/admin_config_other.tpl @@ -113,9 +113,7 @@ {--ADMIN_CONFIG_GUEST_MENU--}: - + {%template,ConfigurationYesNoSelectionBox=guest_menu%} @@ -124,9 +122,7 @@ {--ADMIN_CONFIG_MEMBER_MENU--}: - + {%template,ConfigurationYesNoSelectionBox=member_menu%} @@ -135,9 +131,7 @@ {--ADMIN_CONFIG_YOURE_HERE--}: - + {%template,ConfigurationYesNoSelectionBox=youre_here%} @@ -146,9 +140,7 @@ {--ADMIN_CONFIG_SHOW_TIMINGS--}: - + {%template,ConfigurationYesNoSelectionBox=show_timings%} @@ -157,9 +149,7 @@ {--ADMIN_CONFIG_SHOW_POINTS_UNCONFIRMED--}: - + {%template,ConfigurationYesNoSelectionBox=show_points_unconfirmed%} @@ -193,9 +183,7 @@ {--ADMIN_CONFIG_ZIPCODE_ACTIVE--}: - + {%template,ConfigurationYesNoSelectionBox=order_multi_page%} @@ -204,9 +192,7 @@ {--ADMIN_CONFIG_AUTOSEND_ACTIVE--}: - + {%template,ConfigurationYesNoSelectionBox=autosend_active%} @@ -221,9 +207,7 @@ {--ADMIN_CONFIG_SEND_UPDATE--}: - + {%template,ConfigurationYesNoSelectionBox=send_prof_update%} @@ -232,9 +216,7 @@ {--ADMIN_CONFIG_NOTIFY_ADMIN--}: - + {%template,ConfigurationYesNoSelectionBox=admin_notify%} @@ -286,9 +268,7 @@ {--ADMIN_CONFIG_DISPLAY_DEBUG_SQLS--} - + {%template,ConfigurationYesNoSelectionBox=display_debug_sqls%} @@ -303,9 +283,7 @@ {--ADMIN_CONFIG_STATS_ENABLED--} - + {%template,ConfigurationYesNoSelectionBox=stats_enabled%} diff --git a/templates/de/html/admin/admin_config_refback.tpl b/templates/de/html/admin/admin_config_refback.tpl index fe8d251e9f..93e1cc4921 100644 --- a/templates/de/html/admin/admin_config_refback.tpl +++ b/templates/de/html/admin/admin_config_refback.tpl @@ -11,8 +11,7 @@ {--ADMIN_CONFIG_REFBACK_ENABLED--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=refback_enabled%} diff --git a/templates/de/html/admin/admin_config_removeip.tpl b/templates/de/html/admin/admin_config_removeip.tpl index de77d1f288..0916ddb8c7 100644 --- a/templates/de/html/admin/admin_config_removeip.tpl +++ b/templates/de/html/admin/admin_config_removeip.tpl @@ -11,8 +11,7 @@ {--ADMIN_CONFIG_REMOVEIP_ANON_IP--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=removeip_anon_ip%} @@ -20,8 +19,7 @@ {--ADMIN_CONFIG_REMOVEIP_ANON_HOST--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=removeip_anon_host%} @@ -29,8 +27,7 @@ {--ADMIN_CONFIG_REMOVEIP_ANON_UA--} - {--YES--} - {--NO--} + {%template,ConfigurationYesNoSelectionBox=removeip_anon_ua%} @@ -38,8 +35,7 @@ {--ADMIN_CONFIG_REMOVEIP_ANON_REF--} - {--YES--} - {--NO--} + {%template,ConfigurationYesNoSelectionBox=removeip_anon_ref%} @@ -59,8 +55,7 @@ {--ADMIN_CONFIG_REMOVEIP_ADMIN_SHOW--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=removeip_admin_show%} @@ -68,8 +63,7 @@ {--ADMIN_CONFIG_REMOVEIP_GUEST_SHOW--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=removeip_guest_show%} @@ -77,8 +71,7 @@ {--ADMIN_CONFIG_REMOVEIP_MEMBER_SHOW--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=removeip_member_show%} @@ -86,8 +79,7 @@ {--ADMIN_CONFIG_REMOVEIP_SPONSOR_SHOW--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=removeip_sponsor_show%} diff --git a/templates/de/html/admin/admin_config_surfbar.tpl b/templates/de/html/admin/admin_config_surfbar.tpl index 56b617651d..e5c484a66e 100644 --- a/templates/de/html/admin/admin_config_surfbar.tpl +++ b/templates/de/html/admin/admin_config_surfbar.tpl @@ -143,9 +143,7 @@ {--ADMIN_CONFIG_SURFBAR_AUTOSTART--} - + {%template,ConfigurationYesNoSelectionBox=surfbar_autostart%} @@ -153,9 +151,7 @@ {--ADMIN_CONFIG_SURFBAR_NOTIFY_LIMITS--} - + {%template,ConfigurationYesNoSelectionBox=surfbar_notify_limits%} @@ -163,9 +159,7 @@ {--ADMIN_CONFIG_SURFBAR_NOTIFY_ADMIN_UNLOCK--} - + {%template,ConfigurationYesNoSelectionBox=surfbar_notify_admin_unlock%} @@ -201,9 +195,7 @@ {--ADMIN_CONFIG_SURFBAR_MIGRATE_ORDER--} - + {%template,ConfigurationYesNoSelectionBox=surfbar_migrate_order%} @@ -211,9 +203,7 @@ {--ADMIN_CONFIG_SURFBAR_GUEST_LOGIN_FORM--} - + {%template,ConfigurationYesNoSelectionBox=surfbar_guest_login_form%} diff --git a/templates/de/html/admin/admin_config_transfer.tpl b/templates/de/html/admin/admin_config_transfer.tpl index 64bf91236e..ebd3fedcce 100644 --- a/templates/de/html/admin/admin_config_transfer.tpl +++ b/templates/de/html/admin/admin_config_transfer.tpl @@ -39,10 +39,7 @@ {--ADMIN_CONFIG_AUTOPURGE_TRANSFER--} - + {%template,ConfigurationYesNoSelectionBox=ap_transfer%} diff --git a/templates/de/html/admin/admin_config_validator.tpl b/templates/de/html/admin/admin_config_validator.tpl index 5f16f4e7aa..84aca3ac14 100644 --- a/templates/de/html/admin/admin_config_validator.tpl +++ b/templates/de/html/admin/admin_config_validator.tpl @@ -11,8 +11,7 @@ {--ADMIN_CONFIG_VALIDATOR_ENABLED--} - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=enable_validator%} diff --git a/templates/de/html/admin/admin_config_wernis.tpl b/templates/de/html/admin/admin_config_wernis.tpl index b3516efc28..d4288bf9a2 100644 --- a/templates/de/html/admin/admin_config_wernis.tpl +++ b/templates/de/html/admin/admin_config_wernis.tpl @@ -117,8 +117,7 @@ {--ADMIN_CONFIG_WERNIS_PAYOUT_ACTIVE--}: - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=wernis_payout_active%} @@ -126,8 +125,7 @@ {--ADMIN_CONFIG_WERNIS_WITHDRAW_ACTIVE--}: - {--YES--}
- {--NO--} + {%template,ConfigurationYesNoSelectionBox=wernis_withdraw_active%} @@ -140,7 +138,7 @@
- {--ADMIN_WERNIS_CONFIG_NOTE--} + {--ADMIN_CONFIG_WERNIS_NOTE--}
-- 2.39.2