From 48b01b793f8953018586b10eeb3d7b0a762af765 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 14 Feb 2010 02:18:06 +0000 Subject: [PATCH] ext-validator introduces, several HTML cleanups, fixes for e.g. user email link, etc. --- .gitattributes | 7 ++ DOCS/TODOs.txt | 22 ++--- inc/expression-functions.php | 21 ++++ inc/extensions/ext-validator.php | 97 +++++++++++++++++++ inc/language/bonus_de.php | 2 +- inc/language/order_de.php | 4 +- inc/language/validator_de.php | 52 ++++++++++ inc/modules/admin/what-config_bonus.php | 4 +- inc/modules/admin/what-config_validator.php | 68 +++++++++++++ inc/modules/admin/what-del_email.php | 52 +++++----- inc/modules/admin/what-list_user.php | 2 +- .../de/html/admin/admin_add_bank_package.tpl | 4 +- templates/de/html/admin/admin_add_cat.tpl | 4 +- .../de/html/admin/admin_config_admin.tpl | 4 +- .../de/html/admin/admin_config_autopurge.tpl | 4 +- templates/de/html/admin/admin_config_beg.tpl | 60 ++++++++---- .../de/html/admin/admin_config_birthday.tpl | 4 +- .../de/html/admin/admin_config_bonus.tpl | 48 ++++----- .../de/html/admin/admin_config_doubler.tpl | 32 +++--- .../de/html/admin/admin_config_extensions.tpl | 4 +- templates/de/html/admin/admin_config_menu.tpl | 8 +- .../de/html/admin/admin_config_order.tpl | 38 +++++--- .../de/html/admin/admin_config_other.tpl | 28 +++--- .../de/html/admin/admin_config_refback.tpl | 4 +- .../de/html/admin/admin_config_removeip.tpl | 32 +++--- .../de/html/admin/admin_config_secure.tpl | 8 +- .../de/html/admin/admin_config_surfbar.tpl | 16 +-- .../de/html/admin/admin_config_validator.tpl | 26 +++++ .../de/html/admin/admin_config_wernis.tpl | 68 +++++++++---- .../de/html/admin/admin_list_networks_row.tpl | 2 +- .../de/html/admin/admin_list_sponsor.tpl | 2 +- templates/de/html/ext/ext_validator.tpl | 14 +++ templates/de/html/guest/guest_register.tpl | 4 +- templates/de/html/index.tpl | 28 +++--- .../html/member/member_html_mail_settings.tpl | 8 +- .../html/member/member_transfer_settings.tpl | 4 +- templates/de/html/page_footer.tpl | 1 + templates/de/html/validator/.htaccess | 1 + .../de/html/validator/validator_links.tpl | 11 +++ 39 files changed, 585 insertions(+), 213 deletions(-) create mode 100644 inc/extensions/ext-validator.php create mode 100644 inc/language/validator_de.php create mode 100644 inc/modules/admin/what-config_validator.php create mode 100644 templates/de/html/admin/admin_config_validator.tpl create mode 100644 templates/de/html/ext/ext_validator.tpl create mode 100644 templates/de/html/validator/.htaccess create mode 100644 templates/de/html/validator/validator_links.tpl diff --git a/.gitattributes b/.gitattributes index 8befaa27d5..d88c5eebc2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -183,6 +183,7 @@ inc/extensions/ext-uberwach.php -text inc/extensions/ext-update.php -text inc/extensions/ext-usage.php -text inc/extensions/ext-user.php -text +inc/extensions/ext-validator.php -text inc/extensions/ext-wernis.php -text inc/extensions/ext-yoomedia.php -text inc/filter-functions.php -text @@ -259,6 +260,7 @@ inc/language/top10_de.php -text inc/language/transfer_de.php -text inc/language/usage_de.php -text inc/language/user_de.php -text +inc/language/validator_de.php -text inc/language/wernis_de.php -text inc/language/yoomedia_de.php -text inc/libs/.htaccess -text @@ -411,6 +413,7 @@ inc/modules/admin/what-config_title.php -text inc/modules/admin/what-config_top10.php -text inc/modules/admin/what-config_transfer.php -text inc/modules/admin/what-config_user.php -text +inc/modules/admin/what-config_validator.php -text inc/modules/admin/what-config_wernis.php -text inc/modules/admin/what-config_yoomedia.php -text inc/modules/admin/what-del_email.php -text @@ -977,6 +980,7 @@ templates/de/html/admin/admin_config_title.tpl -text templates/de/html/admin/admin_config_top10.tpl -text templates/de/html/admin/admin_config_transfer.tpl -text templates/de/html/admin/admin_config_user.tpl -text +templates/de/html/admin/admin_config_validator.tpl -text templates/de/html/admin/admin_config_wernis.tpl -text templates/de/html/admin/admin_config_yoomedia.tpl -text templates/de/html/admin/admin_contct_user_form.tpl -text @@ -1361,6 +1365,7 @@ templates/de/html/ext/ext_uberwach.tpl -text templates/de/html/ext/ext_update.tpl -text templates/de/html/ext/ext_usage.tpl -text templates/de/html/ext/ext_user.tpl -text +templates/de/html/ext/ext_validator.tpl -text templates/de/html/ext/ext_wernis.tpl -text templates/de/html/ext/ext_yoomedia.tpl -text templates/de/html/fatal_errors.tpl -text @@ -1657,6 +1662,8 @@ templates/de/html/theme/theme_select_box.tpl -text templates/de/html/theme/theme_select_form.tpl -text templates/de/html/uberwach/.htaccess -text templates/de/html/uberwach/uberwach_snippet.tpl -text +templates/de/html/validator/.htaccess -text +templates/de/html/validator/validator_links.tpl -text templates/de/html/welcome.tpl -text templates/en/.htaccess -text templates/en/emails/.htaccess -text diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 74d16df68c..e2b612f461 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -35,14 +35,14 @@ ./inc/functions.php:1046: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates ./inc/functions.php:2489: // @TODO Add a little more infos here ./inc/functions.php:256: // @TODO Remove this sanity-check if all is fine -./inc/functions.php:2571: // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ? -./inc/functions.php:2594: // @TODO Rewrite this old lost code to a template +./inc/functions.php:2572: // @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ? +./inc/functions.php:2595: // @TODO Rewrite this old lost code to a template ./inc/functions.php:259: // @TODO Try to rewrite all $DATA to $content -./inc/functions.php:2683: // @TODO Are these convertions still required? -./inc/functions.php:2701:// @TODO Rewrite this function to use readFromFile() and writeToFile() -./inc/functions.php:3580:// @TODO Lame description for this function -./inc/functions.php:3602: // @TODO Move this in a filter -./inc/functions.php:3726: // @TODO This is still very static, rewrite it somehow +./inc/functions.php:2684: // @TODO Are these convertions still required? +./inc/functions.php:2702:// @TODO Rewrite this function to use readFromFile() and writeToFile() +./inc/functions.php:3581:// @TODO Lame description for this function +./inc/functions.php:3603: // @TODO Move this in a filter +./inc/functions.php:3727: // @TODO This is still very static, rewrite it somehow ./inc/functions.php:474: // @TODO Do only use $content, not $DATA or raw variables ./inc/functions.php:544: // @TODO Extension 'msg' does not exist ./inc/functions.php:613:// @TODO Rewrite this to an extension 'smtp' @@ -75,9 +75,9 @@ ./inc/libs/task_functions.php:53:// @TODO Move all extension-dependent queries into filters ./inc/libs/user_functions.php:138: // @TODO These two constants are no longer used, maybe we reactivate this code? ./inc/libs/user_functions.php:225:// @TODO Double-check configuration entry here -./inc/libs/user_functions.php:314: // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content); -./inc/libs/user_functions.php:334: // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON)); -./inc/libs/user_functions.php:410: // @TODO We should try to rewrite this to fetchUserData() somehow +./inc/libs/user_functions.php:317: // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content); +./inc/libs/user_functions.php:337: // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON)); +./inc/libs/user_functions.php:413: // @TODO We should try to rewrite this to fetchUserData() somehow ./inc/libs/yoomedia_functions.php:116: $response = YOOMEDIA_QUERY_API('out_textmail.php', true); // @TODO Ask Yoo!Media for test script ./inc/load_config.php:77: // @TODO Rewrite them to avoid this else block ./inc/loader/load_cache-extension.php:13: * @TODO Rewrite this whole file to load_cache-extensions.php * @@ -161,7 +161,7 @@ ./inc/modules/member/what-bonus.php:57: // @TODO Rewrite this to a filter ./inc/modules/member/what-categories.php:129: // @TODO Rewrite this to use $OUT .= ... ./inc/modules/member/what-doubler.php:56:// @TODO The '*100' is in the way to get moved into the template -./inc/modules/member/what-order.php:450: // @TODO Rewrite this to a filter +./inc/modules/member/what-order.php:453: // @TODO Rewrite this to a filter ./inc/modules/member/what-order.php:65:// @TODO Rewrite this to a filter ./inc/modules/member/what-payout.php:221: // @TODO Rewrite this to a filter ./inc/modules/member/what-points.php:55:// @TODO Should we rewrite this to a filter? diff --git a/inc/expression-functions.php b/inc/expression-functions.php index 65b6984005..b1e95c2ef6 100644 --- a/inc/expression-functions.php +++ b/inc/expression-functions.php @@ -163,5 +163,26 @@ function doExpressionFilter ($data) { return $code; } +// Expression call-back function for validator links +function doExpressionValidatorLinks ($data) { + // Default is nothing + $replacer = ''; + + // Get the code from data array for replacement/pipe-through + $code = $data['code']; + + // Should we generally include validator links? + if ((isExtensionInstalled('validator')) && (getConfig('enable_validator') == 'Y') && (!in_array(getModule(), array('admin', 'login')))) { + // Load the validator template + $replacer = escapeQuotes(loadTemplate('validator_links', true)); + } // END - if + + // Replace the code + $code = str_replace($data['matches'][0][$data['key']], $replacer, $code); + + // Return the (maybe) replaced code + return $code; +} + // [EOF] ?> diff --git a/inc/extensions/ext-validator.php b/inc/extensions/ext-validator.php new file mode 100644 index 0000000000..14de8356c1 --- /dev/null +++ b/inc/extensions/ext-validator.php @@ -0,0 +1,97 @@ + diff --git a/inc/language/bonus_de.php b/inc/language/bonus_de.php index 9033f26cb5..8b45c1b7f3 100644 --- a/inc/language/bonus_de.php +++ b/inc/language/bonus_de.php @@ -115,7 +115,7 @@ addMessages(array( 'ADMIN_BONUS_RALLYE_NOTIFTICATIONS' => "Benachrichtigungen per Mail über Bonus-Rallye", 'ADMIN_BONUS_RALLYE_EN_NOTIFY' => "Sollen die Mitglieder bei Aktivierung benachtichtigt werden?", 'ADMIN_BONUS_RALLYE_DI_NOTIFY' => "Sollen die Mitglieder bei Deaktivierung benachtichtigt werden?", - 'ADMIN_BONUS_RALLYE_NOTIFY_POINTS' => "Bonus-Mail mit Anzahl {?POINTS?} aussenden, wenn Bonus-Rallye aktiviert wurde.
(0 = Unvergütete Benachrichtigung aussenden)
", + 'ADMIN_BONUS_RALLYE_NOTIFY_POINTS' => "Bonus-Mail mit Anzahl {?POINTS?} aussenden, wenn Bonus-Rallye aktiviert wurde.
(0 = Unvergütete Benachrichtigung aussenden)
", 'ADMIN_BONUS_RALLYE_NEW_MEMBER_NOTIFY' => "Sollen neue Mitglieder mit selber Mail ü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?", diff --git a/inc/language/order_de.php b/inc/language/order_de.php index a257194b90..bb7eb09185 100644 --- a/inc/language/order_de.php +++ b/inc/language/order_de.php @@ -85,10 +85,10 @@ addMessages(array( 'MEMBER_AUTOSEND_ACTIVE' => "Der Auto-Versand ist in unserem {?mt_word?} derzeit aktiviert. Ihr Mailbuchung wurde aktiviert und wird bald automatisch versant.", // Repay deleted mails constants - 'ADMIN_CFG_REPAY_POINTS_REPAY' => "Dem Mitglied gutschreiben", + 'ADMIN_CFG_REPAY_POINTS_REPAY' => "Dem Mitglied wieder gutschreiben", 'ADMIN_CFG_REPAY_POINTS_JACKPOT' => "In den Jackpot legen", 'ADMIN_CFG_REPAY_POINTS_SHRED' => "Nicht gutschreiben (verfällt dann)", - 'ADMIN_REPAY_ON_DELETE_MODE' => "Wie sollen {?POINTS?} von gelöschten Mails verbucht werden?", + 'ADMIN_REPAY_ON_DELETE_MODE' => "Wenn Sie eine Mailbuchung löschen, wie sollen die ausgegebenen {?POINTS?} gehandhabt werden?", 'ADMIN_TASK_IS_MEMBER_ORDER' => "Mailbuchung vom Mitglied", 'ADMIN_UNLOCK_EMAIL_LINK' => "Mailbuchung ansehen", diff --git a/inc/language/validator_de.php b/inc/language/validator_de.php new file mode 100644 index 0000000000..0705b4775c --- /dev/null +++ b/inc/language/validator_de.php @@ -0,0 +1,52 @@ + "Validierer-Einstellungen", + 'ADMIN_CONFIG_VALIDATOR_ENABLED' => "Sind unten im Footer die Validierer-Buttons zum direkten Validieren der Seiten eingeblendet?" +)); + +// +?> diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php index b57ebfaccf..c05283cd95 100644 --- a/inc/modules/admin/what-config_bonus.php +++ b/inc/modules/admin/what-config_bonus.php @@ -98,7 +98,7 @@ if (isFormSent()) { foreach ($RANKS as $k => $rate) { if (!empty($rate)) { // Print only when something is in - $OUT .= "
  • ({?POINTS?})\n"; + $OUT .= "
  • ({?POINTS?})
    • \n"; } // END - if $cnt++; } // END - foreach @@ -109,7 +109,7 @@ if (isFormSent()) { // Add more empty fields for ($i = $cnt; $i < $max; $i++) { - $OUT .= "
  • ({?POINTS?})
    • \n"; + $OUT .= "
  • ({?POINTS?})
    • \n"; } // END - for $OUT .= "\n"; $content['trates_list'] = $OUT; diff --git a/inc/modules/admin/what-config_validator.php b/inc/modules/admin/what-config_validator.php new file mode 100644 index 0000000000..19c59dc909 --- /dev/null +++ b/inc/modules/admin/what-config_validator.php @@ -0,0 +1,68 @@ + diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php index 6015adb307..e3e3146bce 100644 --- a/inc/modules/admin/what-del_email.php +++ b/inc/modules/admin/what-del_email.php @@ -102,34 +102,32 @@ LIMIT 1", $totalPoints = $links * $price; // Shall we pay the points back to the user? - if (getConfig('repay_deleted_mails') != 'SHRED') { + if ($totalPoints == 0) { + // No points repayed! + loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_POINTS_REPAYED')); + } elseif (getConfig('repay_deleted_mails') != 'SHRED') { //* DEBUG: */ outputHtml($stats_id.':'.$totalPoints.'/'.$links.'/'.$price."
    "); - if ($totalPoints > 0) { - // Shall we payback to user or jackpot? - if (getConfig('repay_deleted_mails') == 'JACKPOT') { - // Set jackpot - $sender = '0'; - } // END - if - - // Pay back points - //* DEBUG: */ outputHtml("PAYBACK:".$sender."
    "); - addPointsThroughReferalSystem('mail_deleted', $sender, $totalPoints, true, 0, false,'direct'); - - // Output message - if (getConfig('repay_deleted_mails') == 'REPAY') { - // Repayed - loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_REPAYED', - translateComma($totalPoints) - )); - } else { - // To jackpot - loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_TO_JACKPOT', - translateComma($totalPoints) - )); - } + // Shall we payback to user or jackpot? + if (getConfig('repay_deleted_mails') == 'JACKPOT') { + // Set jackpot + $sender = '0'; + } // END - if + + // Pay back points + //* DEBUG: */ outputHtml("PAYBACK:".$sender."
    "); + addPointsThroughReferalSystem('mail_deleted', $sender, $totalPoints, true, 0, false,'direct'); + + // Output message + if (getConfig('repay_deleted_mails') == 'REPAY') { + // Repayed + loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_REPAYED', + translateComma($totalPoints) + )); } else { - // No points repayed! - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_POINTS_REPAYED')); + // To jackpot + loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_TO_JACKPOT', + translateComma($totalPoints) + )); } } else { // Points shredded! @@ -138,7 +136,7 @@ LIMIT 1", // Remove links from DB SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s", - array(bigintval($stats_id)), __FILE__, __LINE__); + array(bigintval($stats_id)), __FILE__, __LINE__); $cnt += SQL_AFFECTEDROWS(); // Load template for link diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index 80b92fa21b..4fa37486d9 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -322,7 +322,7 @@ LIMIT 1", $content['sw'] = $SW; $content['userid_link'] = generateUserProfileLink($content['userid']); $content['gender'] = translateGender($content['gender']); - $content['email'] = '[' . $content['email'] . ']'; + $content['email'] = '[' . $content['email'] . ']'; $content['alinks'] = generateMemberAdminActionLinks($content['userid'], $content['status']); $content['points'] = translateComma($content['points']); $content['rate'] = translateComma($content['rate']); diff --git a/templates/de/html/admin/admin_add_bank_package.tpl b/templates/de/html/admin/admin_add_bank_package.tpl index 07bb7183c6..0324f8fd54 100644 --- a/templates/de/html/admin/admin_add_bank_package.tpl +++ b/templates/de/html/admin/admin_add_bank_package.tpl @@ -97,8 +97,8 @@ {--ADMIN_BANK_PACKAGE_ACTIVE--} - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: diff --git a/templates/de/html/admin/admin_add_cat.tpl b/templates/de/html/admin/admin_add_cat.tpl index 4281b2c63d..269476aed6 100644 --- a/templates/de/html/admin/admin_add_cat.tpl +++ b/templates/de/html/admin/admin_add_cat.tpl @@ -33,8 +33,8 @@ {--CAT_IS_VISIBLE--} - {--YES--}: - {--NO--}: + {--YES--}: + {--NO--}: diff --git a/templates/de/html/admin/admin_config_admin.tpl b/templates/de/html/admin/admin_config_admin.tpl index cf91ae5ec7..7ede8d93bb 100644 --- a/templates/de/html/admin/admin_config_admin.tpl +++ b/templates/de/html/admin/admin_config_admin.tpl @@ -10,13 +10,13 @@ {--ADMIN_SELECT_MENU_TYPE--}: - + {--ADMIN_MENU_NEW--} - + {--ADMIN_MENU_OLD--} diff --git a/templates/de/html/admin/admin_config_autopurge.tpl b/templates/de/html/admin/admin_config_autopurge.tpl index 1f2d2cc97c..c6ea0c53a9 100644 --- a/templates/de/html/admin/admin_config_autopurge.tpl +++ b/templates/de/html/admin/admin_config_autopurge.tpl @@ -57,8 +57,8 @@ {--ADMIN_OPTION_AUTOPURGE_ACTIVE--}: - {--YES--}:  - {--NO--}:  + {--YES--}: + {--NO--}: diff --git a/templates/de/html/admin/admin_config_beg.tpl b/templates/de/html/admin/admin_config_beg.tpl index 2693a343b0..eba059e86a 100644 --- a/templates/de/html/admin/admin_config_beg.tpl +++ b/templates/de/html/admin/admin_config_beg.tpl @@ -71,21 +71,27 @@ - {--ADMIN_BEG_RALLYE_ACTIVE--} + + {--ADMIN_BEG_RALLYE_ACTIVE--} + - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: - {--ADMIN_BEG_INCLUDE_OWN--} + + {--ADMIN_BEG_INCLUDE_OWN--} + - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: - {--ADMIN_BEG_RANKS--} + + {--ADMIN_BEG_RANKS--} + @@ -95,8 +101,8 @@ {--ADMIN_BEG_RALLYE_ONLY_ACTIVE--} - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: @@ -118,35 +124,47 @@ - {--ADMIN_BEG_RAL_EN_NOTIFY--} + + {--ADMIN_BEG_RAL_EN_NOTIFY--} + - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: - {--ADMIN_BEG_RAL_DI_NOTIFY--} + + {--ADMIN_BEG_RAL_DI_NOTIFY--} + - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: - {--ADMIN_BEG_NEW_MEMBER_NOTIFY--} + + {--ADMIN_BEG_NEW_MEMBER_NOTIFY--} + - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: - {--ADMIN_BEG_NOTIFY_BONUS--} + + {--ADMIN_BEG_NOTIFY_BONUS--} + - {--ADMIN_BEG_NOTIFY_WAIT--} - $content[wait_selection] + + {--ADMIN_BEG_NOTIFY_WAIT--} + + + $content[wait_selection] + diff --git a/templates/de/html/admin/admin_config_birthday.tpl b/templates/de/html/admin/admin_config_birthday.tpl index ab849346b4..03d08c2730 100644 --- a/templates/de/html/admin/admin_config_birthday.tpl +++ b/templates/de/html/admin/admin_config_birthday.tpl @@ -19,8 +19,8 @@ {--ADMIN_BIRTHDAY_ONLY_ACTIVE--} - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl index b8943540f6..a47ad92cbf 100644 --- a/templates/de/html/admin/admin_config_bonus.tpl +++ b/templates/de/html/admin/admin_config_bonus.tpl @@ -7,12 +7,12 @@ - + {--ADMIN_BONUS_RALLYE_IS_ACTIVE--} - - {--YES--}
    - {--NO--} + + {--YES--}:
    + {--NO--}: @@ -20,8 +20,8 @@ {--ADMIN_BONUS_INCLUDE_OWN--} - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: @@ -29,8 +29,8 @@ {--ADMIN_BONUS_RALLYE_CLICK_INCLUDE--} - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: @@ -38,8 +38,8 @@ {--ADMIN_BONUS_RALLYE_LOGIN_INCLUDE--} - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: @@ -47,8 +47,8 @@ {--ADMIN_BONUS_RALLYE_ORDER_INCLUDE--} - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: @@ -56,8 +56,8 @@ {--ADMIN_BONUS_RALLYE_STATS_INCLUDE--} - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: @@ -65,8 +65,8 @@ {--ADMIN_BONUS_RALLYE_REF_INCLUDE--} - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: @@ -183,8 +183,8 @@ {--ADMIN_BONUS_RALLYE_EN_NOTIFY--} - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: @@ -192,8 +192,8 @@ {--ADMIN_BONUS_RALLYE_DI_NOTIFY--} - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: @@ -201,13 +201,13 @@ {--ADMIN_BONUS_RALLYE_NEW_MEMBER_NOTIFY--} - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: - {--ADMIN_BONUS_RALLYE_NOTIFY_POINTS--}: + {--ADMIN_BONUS_RALLYE_NOTIFY_POINTS--} @@ -216,7 +216,7 @@ - {--ADMIN_BONUS_RALLYE_NOTIFY_WAIT--}: + {--ADMIN_BONUS_RALLYE_NOTIFY_WAIT--} $content[wait_selection] diff --git a/templates/de/html/admin/admin_config_doubler.tpl b/templates/de/html/admin/admin_config_doubler.tpl index 476736ee68..b202720c98 100644 --- a/templates/de/html/admin/admin_config_doubler.tpl +++ b/templates/de/html/admin/admin_config_doubler.tpl @@ -65,32 +65,40 @@ {--ADMIN_DOUBLER_SENT_ALL--}: - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: - {--ADMIN_DOUBLER_JACKPOT--}: + + {--ADMIN_DOUBLER_JACKPOT--}: + - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: - {--ADMIN_DOUBLER_OWN--}: + + {--ADMIN_DOUBLER_OWN--}: + - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: - {--ADMIN_DOUBLER_TIMEOUT--}: + + {--ADMIN_DOUBLER_TIMEOUT--}: + $content[timeout_selection] - {--ADMIN_DOUBLER_USERID--}: + + {--ADMIN_DOUBLER_USERID--}: + $content[member_selection] @@ -104,7 +112,9 @@ {--ADMIN_DOUBLER_SEND_DIRECT--} - {--ADMIN_DOUBLER_SEND_RESET--} + + {--ADMIN_DOUBLER_SEND_RESET--} + diff --git a/templates/de/html/admin/admin_config_extensions.tpl b/templates/de/html/admin/admin_config_extensions.tpl index e340434ff9..7f4bbb0e54 100644 --- a/templates/de/html/admin/admin_config_extensions.tpl +++ b/templates/de/html/admin/admin_config_extensions.tpl @@ -11,8 +11,8 @@ {--ADMIN_VERBOSE_SQL--}: - {--YES--} - {--NO--} + {--YES--}:
    + {--NO--}: diff --git a/templates/de/html/admin/admin_config_menu.tpl b/templates/de/html/admin/admin_config_menu.tpl index 76f8212626..5efd8c9614 100644 --- a/templates/de/html/admin/admin_config_menu.tpl +++ b/templates/de/html/admin/admin_config_menu.tpl @@ -11,8 +11,8 @@ {--ADMIN_CONFIG_GUEST_MENU_ADVERT_ENABLED--} - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: @@ -20,8 +20,8 @@ {--ADMIN_CONFIG_MEMBER_MENU_ADVERT_ENABLED--} - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: diff --git a/templates/de/html/admin/admin_config_order.tpl b/templates/de/html/admin/admin_config_order.tpl index 5875a02bd9..368c3093aa 100644 --- a/templates/de/html/admin/admin_config_order.tpl +++ b/templates/de/html/admin/admin_config_order.tpl @@ -15,48 +15,60 @@ - {--ADMIN_ORDER_MAX--}: + {--ADMIN_ORDER_MAX--}
    + - {--ADMIN_ORDER_ORDER--}: + {--ADMIN_ORDER_ORDER--}
    + - {--ADMIN_OPTION_MAX_UNCONFIRMED_MAILS--}: + + {--ADMIN_OPTION_MAX_UNCONFIRMED_MAILS--}: + - {--ADMIN_OPTION_MAX_TEXT_LENGTH--}: + + {--ADMIN_OPTION_MAX_TEXT_LENGTH--}: + - {--ADMIN_OPTION_CHECK_EMAIL_TEXT--}: + + {--ADMIN_OPTION_CHECK_EMAIL_TEXT--} + - {--YES--}: - {--NO--}: + {--YES--}: + {--NO--}: - {--ADMIN_OPTION_CHECK_EMAIL_SUBJ--}: + + {--ADMIN_OPTION_CHECK_EMAIL_SUBJ--} + - {--YES--}: - {--NO--}: + {--YES--}: + {--NO--}: - {--ADMIN_OPTION_URL_BLACKLIST--}: + + {--ADMIN_OPTION_URL_BLACKLIST--} + - {--YES--}: - {--NO--}: + {--YES--}: + {--NO--}: diff --git a/templates/de/html/admin/admin_config_other.tpl b/templates/de/html/admin/admin_config_other.tpl index 18d76a7199..3901907384 100644 --- a/templates/de/html/admin/admin_config_other.tpl +++ b/templates/de/html/admin/admin_config_other.tpl @@ -119,16 +119,16 @@ {--ADMIN_OPTION_SHOW_TIMINGS--}: - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: {--ADMIN_OPTION_SHOW_POINTS_UNCONFIRMED--}: - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: @@ -156,16 +156,16 @@ {--ADMIN_OPTION_ZIPCODE_ACTIVE--}: - {--YES--}:  - {--NO--}:  + {--YES--}: + {--NO--}: {--ADMIN_OPTION_AUTOSEND_ACTIVE--}: - {--YES--}: - {--NO--}: + {--YES--}: + {--NO--}: @@ -178,16 +178,16 @@ {--ADMIN_OPTION_SEND_UPDATE--}: - {--YES--}: - {--NO--}: + {--YES--}: + {--NO--}: {--ADMIN_OPTION_NOTIFY_ADMIN--}: - {--YES--}: - {--NO--}: + {--YES--}: + {--NO--}: @@ -237,8 +237,8 @@ {--ADMIN_DISPLAY_DEBUG_SQLS--}: - {--YES--}:  - {--NO--}:  + {--YES--}: + {--NO--}: diff --git a/templates/de/html/admin/admin_config_refback.tpl b/templates/de/html/admin/admin_config_refback.tpl index a2babb9131..ad30e49323 100644 --- a/templates/de/html/admin/admin_config_refback.tpl +++ b/templates/de/html/admin/admin_config_refback.tpl @@ -11,8 +11,8 @@ {--ADMIN_CONFIG_REFBACK_ENABLED--} - {--YES--}
    - {--NO--} + {--YES--}:
    + {--NO--}: diff --git a/templates/de/html/admin/admin_config_removeip.tpl b/templates/de/html/admin/admin_config_removeip.tpl index 833b260c6b..937a5bb77c 100644 --- a/templates/de/html/admin/admin_config_removeip.tpl +++ b/templates/de/html/admin/admin_config_removeip.tpl @@ -11,8 +11,8 @@ {--ADMIN_CONFIG_REMOVEIP_ANON_IP--} - {--YES--}  - {--NO--} + {--YES--}:
    + {--NO--}: @@ -20,8 +20,8 @@ {--ADMIN_CONFIG_REMOVEIP_ANON_HOST--} - {--YES--}  - {--NO--} + {--YES--}: + {--NO--}: @@ -29,8 +29,8 @@ {--ADMIN_CONFIG_REMOVEIP_ANON_UA--} - {--YES--}  - {--NO--} + {--YES--}: + {--NO--}: @@ -38,8 +38,8 @@ {--ADMIN_CONFIG_REMOVEIP_ANON_REF--} - {--YES--}  - {--NO--} + {--YES--}: + {--NO--}: @@ -59,8 +59,8 @@ {--ADMIN_CONFIG_REMOVEIP_ADMIN_SHOW--} - {--YES--}  - {--NO--} + {--YES--}:
    + {--NO--}: @@ -68,8 +68,8 @@ {--ADMIN_CONFIG_REMOVEIP_GUEST_SHOW--} - {--YES--}  - {--NO--} + {--YES--}:
    + {--NO--}: @@ -77,8 +77,8 @@ {--ADMIN_CONFIG_REMOVEIP_MEMBER_SHOW--} - {--YES--}  - {--NO--} + {--YES--}:
    + {--NO--}: @@ -86,8 +86,8 @@ {--ADMIN_CONFIG_REMOVEIP_SPONSOR_SHOW--} - {--YES--}  - {--NO--} + {--YES--}:
    + {--NO--}: diff --git a/templates/de/html/admin/admin_config_secure.tpl b/templates/de/html/admin/admin_config_secure.tpl index 93a6f0d5f7..b65d25def1 100644 --- a/templates/de/html/admin/admin_config_secure.tpl +++ b/templates/de/html/admin/admin_config_secure.tpl @@ -7,13 +7,17 @@ - {--MIN_PASS_LENGTH--}: + + {--MIN_PASS_LENGTH--}: + - {--ADMIN_SALT_LENGTH--}: + + {--ADMIN_SALT_LENGTH--}: + diff --git a/templates/de/html/admin/admin_config_surfbar.tpl b/templates/de/html/admin/admin_config_surfbar.tpl index d36fffb098..bf115b12b0 100644 --- a/templates/de/html/admin/admin_config_surfbar.tpl +++ b/templates/de/html/admin/admin_config_surfbar.tpl @@ -143,8 +143,8 @@ {--ADMIN_CONFIG_SURFBAR_AUTOSTART--} - {--YES--} - {--NO--} + {--YES--}:
    + {--NO--}: @@ -152,8 +152,8 @@ {--ADMIN_CONFIG_SURFBAR_NOTIFY_LIMITS--} - {--YES--} - {--NO--} + {--YES--}:
    + {--NO--}: @@ -161,8 +161,8 @@ {--ADMIN_CONFIG_SURFBAR_NOTIFY_ADMIN_UNLOCK--} - {--YES--} - {--NO--} + {--YES--}:
    + {--NO--}: @@ -198,8 +198,8 @@ {--ADMIN_CONFIG_SURFBAR_MIGRATE_ORDER--} - {--YES--} - {--NO--} + {--YES--}:
    + {--NO--}: diff --git a/templates/de/html/admin/admin_config_validator.tpl b/templates/de/html/admin/admin_config_validator.tpl new file mode 100644 index 0000000000..4b546e7814 --- /dev/null +++ b/templates/de/html/admin/admin_config_validator.tpl @@ -0,0 +1,26 @@ +
    +
    + + + + + + + + + + + +
    + {--ADMIN_CONFIG_VALIDATOR_TITLE--} +
    + {--ADMIN_CONFIG_VALIDATOR_ENABLED--} + + {--YES--}:
    + {--NO--}: +
    + + +
    +
    +
    diff --git a/templates/de/html/admin/admin_config_wernis.tpl b/templates/de/html/admin/admin_config_wernis.tpl index 478986c11a..d9a61ff603 100644 --- a/templates/de/html/admin/admin_config_wernis.tpl +++ b/templates/de/html/admin/admin_config_wernis.tpl @@ -7,97 +7,127 @@ - {--ADMIN_WERNIS_API_ID--}: + + {--ADMIN_WERNIS_API_ID--}: + - {--ADMIN_WERNIS_API_MD5--}: + + {--ADMIN_WERNIS_API_MD5--}: + - {--ADMIN_WERNIS_API_URL--}: + + {--ADMIN_WERNIS_API_URL--}: + - {--ADMIN_WERNIS_REFID--}: + + {--ADMIN_WERNIS_REFID--}: + - {--ADMIN_WERNIS_WPASS--}: + + {--ADMIN_WERNIS_WPASS--}: + - {--ADMIN_WERNIS_MIN_PAYOUT--}: + + {--ADMIN_WERNIS_MIN_PAYOUT--}: + Wernis - {--ADMIN_WERNIS_MIN_WITHDRAW--}: + + {--ADMIN_WERNIS_MIN_WITHDRAW--}: + Wernis - {--ADMIN_WERNIS_PAYOUT_FACTOR--}: + + {--ADMIN_WERNIS_PAYOUT_FACTOR--}: + - {--ADMIN_WERNIS_WITHDRAW_FACTOR--}: + + {--ADMIN_WERNIS_WITHDRAW_FACTOR--}: + - {--ADMIN_WERNIS_PAYOUT_FEE_PERCENT--}: + + {--ADMIN_WERNIS_PAYOUT_FEE_PERCENT--}: + - {--ADMIN_WERNIS_WITHDRAW_FEE_PERCENT--}: + + {--ADMIN_WERNIS_WITHDRAW_FEE_PERCENT--}: + % - {--ADMIN_WERNIS_PAYOUT_FEE_FIX--}: + + {--ADMIN_WERNIS_PAYOUT_FEE_FIX--}: + ({?POINTS?}) - {--ADMIN_WERNIS_WITHDRAW_FEE_FIX--}: + + {--ADMIN_WERNIS_WITHDRAW_FEE_FIX--}: + ({?POINTS?}) - {--ADMIN_WERNIS_PAYOUT_ACTIVE--}: + + {--ADMIN_WERNIS_PAYOUT_ACTIVE--}: + - {--YES--} - {--NO--} + {--YES--}:
    + {--NO--}: - {--ADMIN_WERNIS_WITHDRAW_ACTIVE--}: + + {--ADMIN_WERNIS_WITHDRAW_ACTIVE--}: + - {--YES--} - {--NO--} + {--YES--}:
    + {--NO--}: diff --git a/templates/de/html/admin/admin_list_networks_row.tpl b/templates/de/html/admin/admin_list_networks_row.tpl index 7774502f3c..00c6041b4d 100644 --- a/templates/de/html/admin/admin_list_networks_row.tpl +++ b/templates/de/html/admin/admin_list_networks_row.tpl @@ -3,7 +3,7 @@ - $content[network_short_name]: + $content[network_short_name]:
    [T|P| - {--ADMIN_LIST_SPONSOR_NOTES--} + {--ADMIN_LIST_SPONSOR_NOTES--} diff --git a/templates/de/html/ext/ext_validator.tpl b/templates/de/html/ext/ext_validator.tpl new file mode 100644 index 0000000000..4574676ff8 --- /dev/null +++ b/templates/de/html/ext/ext_validator.tpl @@ -0,0 +1,14 @@ +
    + Binden Sie z.B. den Validator zum Validieren von XHTML-Seiten oder + CSS-Angaben Ihres {?mt_word2} ein, oder zeigen Sie Ihren Mitgliedern, dass + Ihr Webdesign den Table-less + Vorgaben des W3-Konsortiums entspricht. +
    + +
    + Wichtig: Die Validierung erfolgt über die direkte URL + Ihres Angebots. Sollte dies lokal installiert sein, so kann der von w3.org + betriebene Validator Ihre Seite nicht validieren, da private IP-Adressen im + Internet nicht geroutet werden. +
    diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl index 6606f3598e..9c9a00d5ae 100644 --- a/templates/de/html/guest/guest_register.tpl +++ b/templates/de/html/guest/guest_register.tpl @@ -119,8 +119,8 @@ {--AGREE_TO_THIS--}: - {--YES--}: - {--NO--}: + {--YES--}: + {--NO--}: diff --git a/templates/de/html/index.tpl b/templates/de/html/index.tpl index d675c33356..d4952059c4 100644 --- a/templates/de/html/index.tpl +++ b/templates/de/html/index.tpl @@ -1,12 +1,12 @@
    - +
    - - - diff --git a/templates/de/html/member/member_transfer_settings.tpl b/templates/de/html/member/member_transfer_settings.tpl index dd1df96549..3fc62b7e73 100644 --- a/templates/de/html/member/member_transfer_settings.tpl +++ b/templates/de/html/member/member_transfer_settings.tpl @@ -5,8 +5,8 @@ {--TRANSFER_ALLOW_OPT_IN--} diff --git a/templates/de/html/page_footer.tpl b/templates/de/html/page_footer.tpl index 9943ff0f85..73407336aa 100644 --- a/templates/de/html/page_footer.tpl +++ b/templates/de/html/page_footer.tpl @@ -1,3 +1,4 @@ +{%validatorLinks%} diff --git a/templates/de/html/validator/.htaccess b/templates/de/html/validator/.htaccess new file mode 100644 index 0000000000..3a42882788 --- /dev/null +++ b/templates/de/html/validator/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/templates/de/html/validator/validator_links.tpl b/templates/de/html/validator/validator_links.tpl new file mode 100644 index 0000000000..f4cc410757 --- /dev/null +++ b/templates/de/html/validator/validator_links.tpl @@ -0,0 +1,11 @@ +
    + Valid XHTML 1.0 Transitional + Valid CSS! + tableless +
    -- 2.30.2
    @@ -18,21 +18,25 @@
    -
    {?MAIN_TITLE?}
     +
    {?MAIN_TITLE?}
    - [ Weiter... ] + [ Weiter... ]
    - Impressum:
    -
    Ihr Name hier, Ihre Straße, X-12345 Demo-Stadt
    - Tel.: 01234-56789-0, Email: Webmaster
    -
    Weitere Angaben? ...
    -
    Gelinkte Seiten, die sich ausserhalb von {?URL?} befinden, - mache ich mich nicht mit verantwortlich und distanziere mich hiermit - ausdrücklich von diesen und deren Inhalten! Bitte beachte den Disclaimer!
    + Impressum:
    +
    + Ihr Name hier, Ihre Straße, X-12345 Demo-Stadt
    + Tel.: 01234-56789-0, Email: Webmaster +
    +
    Weitere Angaben? ...
    +
    + Gelinkte Seiten, die sich ausserhalb von {?URL?} befinden, + mache ich mich nicht mit verantwortlich und distanziere mich hiermit + ausdrücklich von diesen und deren Inhalten! Bitte beachte den Disclaimer! +
    diff --git a/templates/de/html/member/member_html_mail_settings.tpl b/templates/de/html/member/member_html_mail_settings.tpl index b65a6ebc0f..627a9f4318 100644 --- a/templates/de/html/member/member_html_mail_settings.tpl +++ b/templates/de/html/member/member_html_mail_settings.tpl @@ -6,15 +6,13 @@ {--MEMBER_HTML_INTRO--}
    {--MEMBER_HTML_TEXT--}
    - {--YES--}:  + {--MEMBER_HTML_TEXT--} - {--NO--}:  + {--YES--}:
    + {--NO--}:
    - {--YES--}:  - {--NO--}:  + {--YES--}: + {--NO--}: