From 5d89789720c77e954b2eba28c00ec710dd28900d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 7 Dec 2010 01:31:16 +0000 Subject: [PATCH] Deprecated 'replacer' removed. Now we use EL code instead (there are a lot example templates available) --- .gitattributes | 1 + DOCS/TODOs.txt | 161 +----------------- DOCS/de/forced/Tabellenlayout.txt | 45 +++++ inc/config-functions.php | 4 +- inc/config-global.php | 2 +- inc/databases.php | 8 - inc/db/lib-mysql3.php | 6 +- inc/extensions/ext-admins.php | 31 ++-- inc/extensions/ext-bank.php | 8 +- inc/extensions/ext-beg.php | 4 +- inc/extensions/ext-birthday.php | 14 +- inc/extensions/ext-bonus.php | 4 +- inc/extensions/ext-booking.php | 2 +- inc/extensions/ext-country.php | 14 +- inc/extensions/ext-debug.php | 8 +- inc/extensions/ext-doubler.php | 2 +- inc/extensions/ext-forced.php | 62 ++++++- inc/extensions/ext-holiday.php | 16 +- inc/extensions/ext-imprint.php | 2 +- inc/extensions/ext-mediadata.php | 4 +- inc/extensions/ext-network.php | 24 +-- inc/extensions/ext-newsletter.php | 6 +- inc/extensions/ext-nickname.php | 17 +- inc/extensions/ext-online.php | 2 +- inc/extensions/ext-optimize.php | 2 +- inc/extensions/ext-order.php | 2 +- inc/extensions/ext-payout.php | 36 ++-- inc/extensions/ext-primera.php | 2 +- inc/extensions/ext-rallye.php | 64 +++---- inc/extensions/ext-refback.php | 2 +- inc/extensions/ext-register.php | 10 +- inc/extensions/ext-sponsor.php | 24 +-- inc/extensions/ext-sql_patches.php | 8 +- inc/extensions/ext-surfbar.php | 10 +- inc/extensions/ext-theme.php | 2 +- inc/extensions/ext-transfer.php | 4 +- inc/extensions/ext-user.php | 29 ++-- inc/extensions/ext-wernis.php | 22 +-- inc/extensions/ext-yoomedia.php | 2 +- inc/filters.php | 6 +- inc/functions.php | 4 +- inc/install-inc.php | 8 +- inc/language/de.php | 6 +- inc/language/install_de.php | 10 +- inc/libs/admins_functions.php | 17 +- inc/libs/sponsor_functions.php | 4 +- inc/load_config.php | 2 +- inc/module-functions.php | 4 +- inc/modules/admin/what-lock_user.php | 2 +- inc/modules/member/what-transfer.php | 2 +- inc/mysql-connect.php | 2 +- inc/mysql-manager.php | 12 +- inc/pool/pool-bonus.php | 5 - inc/pool/pool-user.php | 5 - inc/sql-functions.php | 4 +- inc/stats-functions.php | 2 +- install/tables.sql | 32 ++-- modules.php | 2 +- .../de/html/admin/admin_add_points_all.tpl | 2 +- .../html/admin/admin_add_sponsor_paytype.tpl | 6 +- .../html/admin/admin_admins_contct_select.tpl | 4 +- .../de/html/admin/admin_config_admin.tpl | 4 +- templates/de/html/admin/admin_config_beg.tpl | 28 +-- .../de/html/admin/admin_config_birthday.tpl | 10 +- .../de/html/admin/admin_config_bonus.tpl | 40 ++--- .../de/html/admin/admin_config_doubler.tpl | 16 +- .../admin/admin_config_email_edit_row.tpl | 4 +- .../de/html/admin/admin_config_extensions.tpl | 4 +- .../de/html/admin/admin_config_holiday.tpl | 6 +- .../de/html/admin/admin_config_nickname.tpl | 6 +- .../de/html/admin/admin_config_order.tpl | 6 +- .../admin/admin_config_point_settings.tpl | 8 +- .../de/html/admin/admin_config_primera.tpl | 2 +- .../de/html/admin/admin_config_removeip.tpl | 32 ++-- .../html/admin/admin_config_rewrite_rows.tpl | 4 +- .../de/html/admin/admin_config_stats.tpl | 8 +- .../de/html/admin/admin_config_transfer.tpl | 6 +- templates/de/html/admin/admin_config_user.tpl | 4 +- .../de/html/admin/admin_config_validator.tpl | 4 +- .../de/html/admin/admin_config_wernis.tpl | 4 +- .../de/html/admin/admin_edit_admins_row.tpl | 4 +- .../de/html/admin/admin_edit_cats_row.tpl | 4 +- .../de/html/admin/admin_edit_email_row.tpl | 7 +- .../de/html/admin/admin_edit_payments_row.tpl | 8 +- .../html/admin/admin_edit_refbanner_row.tpl | 4 +- templates/de/html/admin/admin_login_form.tpl | 2 +- templates/de/html/admin/admin_newsletter.tpl | 8 +- .../de/html/admin/admin_newsletter_nohtml.tpl | 6 +- .../de/html/admin/admin_sub_points_all.tpl | 2 +- templates/de/html/guest/guest_doubler.tpl | 13 +- templates/de/html/guest/guest_register.tpl | 4 +- .../html/guest/guest_sponsor_payment_row.tpl | 2 +- templates/de/html/install/install_page1.tpl | 10 +- templates/de/html/install/install_page2.tpl | 12 +- templates/de/html/install/install_page3.tpl | 10 +- templates/de/html/mailid/mailid_timer.tpl | 2 +- templates/de/html/member/member_bonus.tpl | 1 - templates/de/html/member/member_cat_row.tpl | 4 +- .../html/member/member_html_mail_settings.tpl | 4 +- .../html/member/member_order-html_intro.tpl | 4 +- .../de/html/member/member_payout_form.tpl | 6 +- .../de/html/member/member_themes_row.tpl | 2 +- .../html/member/member_transfer_settings.tpl | 4 +- .../de/html/sponsor/sponsor_settings_form.tpl | 4 +- 104 files changed, 552 insertions(+), 578 deletions(-) create mode 100644 DOCS/de/forced/Tabellenlayout.txt diff --git a/.gitattributes b/.gitattributes index 9b1ed309e0..83b912b6c6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -30,6 +30,7 @@ DOCS/de/country/countries-full.sql -text DOCS/de/country/countries-sorted.sql -text DOCS/de/doubler/README.txt -text svneol=unset#text/plain DOCS/de/engine/README.txt -text svneol=unset#text/plain +DOCS/de/forced/Tabellenlayout.txt svneol=native#text/plain DOCS/de/network/README.txt -text svneol=unset#text/plain DOCS/de/promoter.txt -text svneol=unset#text/plain DOCS/de/rallye/README.txt -text svneol=unset#text/plain diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index fac1dfb627..f8136df2f6 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -59,7 +59,7 @@ ./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:430: // @TODO This can be, somehow, rewritten +./inc/libs/admins_functions.php:433: // @TODO This can be, somehow, rewritten ./inc/libs/beg_functions.php:55: // @TODO Try to rewrite the following unset() ./inc/libs/bonus_functions.php:199: // @TODO Move this HTML to a template ./inc/libs/bonus_functions.php:287: // @TODO This query isn't right, it will only update if the user was for a longer time away! @@ -234,8 +234,6 @@ ### ### DEPRECATION FOLLOWS: ### ### ./inc/modules/admin/admin-inc.php:440:// @DEPRECATED ### ### template-warnings.log follows: ### ### -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/sponsor/sponsor_settings_form.tpl, line: 14 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/sponsor/sponsor_settings_form.tpl, line: 16 in Warning: Not parsing JavaScript templates/de/html/js/js_order_send.tpl. Warning: Not parsing JavaScript templates/de/html/js/js_cookies_disabled.tpl. Warning: Not parsing JavaScript templates/de/html/js/js_uberwach.tpl. @@ -244,178 +242,29 @@ Warning: Not parsing JavaScript templates/de/html/js/js_jquery.tpl. Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_member_book.tpl. Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_stopped.tpl. Warning: Not parsing JavaScript templates/de/html/js/js_surfbar_member_edit.tpl. -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/mailid/mailid_timer.tpl, line: 31 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/guest/guest_footer.tpl, line: 6 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/guest/guest_register.tpl, line: 122 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/guest/guest_register.tpl, line: 123 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_menu_content.tpl, line: 2 in -PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/guest/guest_doubler.tpl, line: 52 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/guest/guest_sponsor_payment_row.tpl, line: 3 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/guest/guest_content_footer.tpl, line: 1 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/guest/guest_content_footer.tpl, line: 5 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_transfer_settings.tpl, line: 8 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_transfer_settings.tpl, line: 9 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_cats_footer.tpl, line: 7 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : form in templates/de/html/member/member_cats_footer.tpl, line: 8 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_cats_footer.tpl, line: 9 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/member/member_content_right.tpl, line: 1 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/member/member_content_right.tpl, line: 5 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_html_mail_settings.tpl, line: 14 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_html_mail_settings.tpl, line: 15 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_themes_row.tpl, line: 3 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_cat_row.tpl, line: 4 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_cat_row.tpl, line: 6 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_order-html_intro.tpl, line: 9 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_order-html_intro.tpl, line: 13 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/member/member_welcome_footer.tpl, line: 1 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/member/member_footer.tpl, line: 6 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_payout_form.tpl, line: 31 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/member/member_payout_form.tpl, line: 37 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page3.tpl, line: 16 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page3.tpl, line: 22 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page3.tpl, line: 28 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page3.tpl, line: 34 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page1.tpl, line: 16 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page1.tpl, line: 20 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page1.tpl, line: 24 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page1.tpl, line: 28 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page1.tpl, line: 32 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page2.tpl, line: 17 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page2.tpl, line: 23 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page2.tpl, line: 29 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page2.tpl, line: 44 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page2.tpl, line: 50 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page2.tpl, line: 56 in +PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page3.tpl, line: 21 in +PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page3.tpl, line: 27 in +PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page3.tpl, line: 33 in +PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/install/install_page3.tpl, line: 39 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/page_footer.tpl, line: 1 in /home PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/menu/menu_what_end.tpl, line: 1 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/menu/menu_what_end.tpl, line: 2 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_email_row.tpl, line: 4 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_point_settings.tpl, line: 15 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_point_settings.tpl, line: 18 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_point_settings.tpl, line: 25 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_point_settings.tpl, line: 28 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_primera.tpl, line: 12 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_wernis.tpl, line: 54 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_wernis.tpl, line: 62 in PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_list_beg.tpl, line: 23 in PHP Warning: DOMDocument::loadHTMLFile(): Attribute align redefined in templates/de/html/admin/admin_list_beg.tpl, line: 23 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_logout_sql_patches_remove.tpl, line: 10 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_rewrite_rows.tpl, line: 5 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_rewrite_rows.tpl, line: 6 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 62 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 65 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 78 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 79 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 87 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 88 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 104 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 105 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 131 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 132 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 140 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 141 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 149 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_beg.tpl, line: 150 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_order.tpl, line: 15 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_order.tpl, line: 22 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 14 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 15 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 23 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 24 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 32 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 33 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 41 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 42 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 62 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 63 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 71 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 72 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 80 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 81 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 89 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_removeip.tpl, line: 90 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_extensions.tpl, line: 14 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_extensions.tpl, line: 15 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_admins_contct_select.tpl, line: 8 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_admins_contct_select.tpl, line: 11 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_sub_points_all.tpl, line: 14 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_login_form.tpl, line: 17 in PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_login_form.tpl, line: 29 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_add_points_all.tpl, line: 12 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_nickname.tpl, line: 12 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_nickname.tpl, line: 18 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_nickname.tpl, line: 24 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_refbanner_row.tpl, line: 5 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_refbanner_row.tpl, line: 11 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_transfer.tpl, line: 12 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_transfer.tpl, line: 26 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_transfer.tpl, line: 36 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_doubler.tpl, line: 68 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_doubler.tpl, line: 69 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_doubler.tpl, line: 77 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_doubler.tpl, line: 78 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_doubler.tpl, line: 86 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_doubler.tpl, line: 87 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_doubler.tpl, line: 121 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_doubler.tpl, line: 124 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_validator.tpl, line: 14 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_validator.tpl, line: 15 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 14 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 15 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 23 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 24 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 32 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 33 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 41 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 42 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 50 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 51 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 59 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 60 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 68 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 69 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 186 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 187 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 195 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 196 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 204 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_bonus.tpl, line: 205 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_admins_row.tpl, line: 4 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_admins_row.tpl, line: 7 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_add_sponsor_paytype.tpl, line: 15 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_add_sponsor_paytype.tpl, line: 19 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_add_sponsor_paytype.tpl, line: 23 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_email_edit_row.tpl, line: 10 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_email_edit_row.tpl, line: 16 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_newsletter_nohtml.tpl, line: 22 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_newsletter_nohtml.tpl, line: 26 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_stats.tpl, line: 14 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_stats.tpl, line: 22 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_stats.tpl, line: 30 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_stats.tpl, line: 41 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_payments_row.tpl, line: 9 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_payments_row.tpl, line: 15 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_payments_row.tpl, line: 21 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_payments_row.tpl, line: 28 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_cats_row.tpl, line: 9 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_edit_cats_row.tpl, line: 19 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_newsletter.tpl, line: 22 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_newsletter.tpl, line: 28 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_newsletter.tpl, line: 41 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_newsletter.tpl, line: 45 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_admin.tpl, line: 14 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_admin.tpl, line: 20 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_user.tpl, line: 12 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_user.tpl, line: 18 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : td in templates/de/html/admin/admin_main_footer.tpl, line: 1 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : tr in templates/de/html/admin/admin_main_footer.tpl, line: 2 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : table in templates/de/html/admin/admin_main_footer.tpl, line: 12 in PHP Warning: DOMDocument::loadHTMLFile(): Unexpected end tag : div in templates/de/html/admin/admin_main_footer.tpl, line: 13 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_birthday.tpl, line: 15 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_birthday.tpl, line: 22 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_birthday.tpl, line: 23 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_birthday.tpl, line: 33 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_birthday.tpl, line: 37 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_holiday.tpl, line: 12 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_holiday.tpl, line: 23 in -PHP Warning: DOMDocument::loadHTMLFile(): Attribute class redefined in templates/de/html/admin/admin_config_holiday.tpl, line: 25 in diff --git a/DOCS/de/forced/Tabellenlayout.txt b/DOCS/de/forced/Tabellenlayout.txt new file mode 100644 index 0000000000..6f7a8153ff --- /dev/null +++ b/DOCS/de/forced/Tabellenlayout.txt @@ -0,0 +1,45 @@ +Forced-Banner/-Textlink (Ads): +- Id-Nummer +- Banner-URL +- Klick-URL +- Hoehe +- Breite +- Alternativer Text +- Framebrecher Y/N +- Zaehler Anzahl Klicks +- Zaehler Anzahl Views +- Reloadzeit/-sperre +- Mindestauffenthalt + +Forced-Kampagnen: +- Id-Nummer +- Banner-Id +- Buchungszeitmarke +- Status (ACTIVE,PENDING,EXPIRED,LOCKED) +- Sperrgrund +- Sperrzeitmarke +- Ablaufzeitmarke +- Preis pro Klick +- Verguetung pro Klick +- Anzahl gebuchter Klicks +- Veguetung-Id (wenn nicht Preis/Verguetung gesetzt sind) + +Forced-Kampagne<>User: +- Id-Nummer +- Kampagnen-Id +- Bucher-Id (vom Mitglied/Sponsor/Admin) +- Bucher-Typ (USER,SPONSOR,ADMIN,API) + +Forced-Verguetungen f. Mitglieder/Sponsoren +- Id-Nummer +- Preis pro Klick +- Verguetung pro Klick +- Sichtbarkeit (MEMBER,SPONSOR,ALL,NONE) + +Forced-Kampagnenstatistik +- Id-Nummer +- Kampagnen-Id +- User-Id (der geklickt hat) +- Klickzeitpunkt +- Verguetung + diff --git a/inc/config-functions.php b/inc/config-functions.php index a7f4ac9794..576c37d3e8 100644 --- a/inc/config-functions.php +++ b/inc/config-functions.php @@ -6,9 +6,9 @@ * -------------------------------------------------------------------- * * File : config-functions.php * * -------------------------------------------------------------------- * - * Short description : Many non-MySQL functions (also file access) * + * Short description : Configuration functions * * -------------------------------------------------------------------- * - * Kurzbeschreibung : Viele Nicht-MySQL-Funktionen (auch Dateizugriff) * + * Kurzbeschreibung : Konfigurationsfunktionen * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * diff --git a/inc/config-global.php b/inc/config-global.php index 08efc24050..44311b7dbf 100644 --- a/inc/config-global.php +++ b/inc/config-global.php @@ -101,7 +101,7 @@ setConfigEntry('stats_enabled', 'N'); // GLOBAL: DEBUG-TEMPLATE-CACHE setConfigEntry('DEBUG_TEMPLATE_CACHE', 'N'); -// Connect to the MySQL database... +// Connect to the database... loadIncludeOnce('inc/mysql-connect.php'); // Init stats system diff --git a/inc/databases.php b/inc/databases.php index 03d84c84f7..901f6ff147 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -84,14 +84,6 @@ setConfigEntry('FULL_VERSION', '0.2.1-FINAL'); // Server-URL (DO NOT CHANGE THIS OR YOU CANNOT CHECK FOR UPDATES/EXTENSIONS!) setConfigEntry('SERVER_URL', 'http://www.mxchange.org'); -// Replacement strings -$GLOBALS['replacer'] = array( - 'userid' => '%userid%', // Member id - 'surname' => '%vorname%', // Surname - 'family' => '%nachname%', // Family name - 'gender' => '%anrede%', // Gender -); - // One day setConfigEntry('ONE_DAY', (60*60*24)); diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php index 9d74092906..7f1d99dc8a 100644 --- a/inc/db/lib-mysql3.php +++ b/inc/db/lib-mysql3.php @@ -6,9 +6,9 @@ * -------------------------------------------------------------------- * * File : lib-mysql3.php * * -------------------------------------------------------------------- * - * Short description : Database layer for MySQL +3.x server * + * Short description : Database layer for MySQL 3/4/5 server * * -------------------------------------------------------------------- * - * Kurzbeschreibung : Datenbankschicht fuer MySQL +3.x Server * + * Kurzbeschreibung : Datenbankschicht fuer MySQL 3/4/5 Server * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * @@ -67,7 +67,7 @@ function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) { return false; } - // Remove \t, \n and \r from queries they may confuse some MySQL version I have heard + // Remove \t, \n and \r from queries they may confuse some MySQL versions $sqlString = str_replace("\t", ' ', str_replace("\n", ' ', str_replace("\r", ' ', $sqlString))); // Compile config entries out diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php index 5904dd61a9..dc8c2a62e9 100644 --- a/inc/extensions/ext-admins.php +++ b/inc/extensions/ext-admins.php @@ -41,10 +41,10 @@ if (!defined('__SECURITY')) { } // END - if // Version of this extension -setThisExtensionVersion('0.7.5'); +setThisExtensionVersion('0.7.6'); // 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')); +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')); // Keep this extension always active! setExtensionAlwaysActive('Y'); @@ -111,7 +111,7 @@ switch (getExtensionMode()) { `access_mode` ENUM('deny','allow') NOT NULL DEFAULT 'deny', KEY (`admin_id`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Sogn. ACLs werden hinzugefügt: Access Control Lines sind zu deutsch Zugriffkontrollzeilen, mit denen Sie einstellen können, was welcher Admin machen darf oder nicht. Nur Sie haben momentan Vollzugriff auf den Adminbereich."); @@ -124,12 +124,12 @@ PRIMARY KEY (`id`) case '0.4.0': // SQL queries for v0.4.0 addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_admins_mails`'); addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_admins_mails` ( -id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, -admin_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, -mail_template VARCHAR(255) NOT NULL, -KEY (admin_id), -PRIMARY KEY (id) -) TYPE={?_TABLE_TYPE?}"); +`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, +`admin_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, +`mail_template` VARCHAR(255) NOT NULL, +KEY (`admin_id`), +PRIMARY KEY (`id`) +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins','admins_mails','Admin-Mails','Stellen Sie hier ein, welcher Admin welche Mail erhalten soll. Sie können dies (derzeit) jedoch erst, wenn einmal die Mail versendet wurde!',5)"); // Update notes (these will be set as task text!) @@ -284,7 +284,7 @@ PRIMARY KEY (id) case '0.7.0': // SQL queries for v0.7.0 addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` ADD `login_failtures` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0"); - addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` ADD `last_failture` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00'"); + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` ADD `last_failture` TIMESTAMP NULL DEFAULT NULL"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Veraltetes Update."); @@ -329,10 +329,19 @@ PRIMARY KEY (id) break; case '0.7.5': // SQL queries for v0.7.5 + // Add filter registerFilter('do_admin_login_done', 'REHASH_ADMINS_PASSWORD', false, true, isExtensionDryRun()); + + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("Filter hinzugefuegt."); break; - // Add filter + case '0.7.6': // SQL queries for v0.7.6 + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_admins` CHANGE `last_failure` `last_failure` TIMESTAMP NULL DEFAULT NULL"); + + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("Standartwert ist nicht mehr 0000-00-00 00:00:00, sondern NULL."); + break; } // END - switch break; diff --git a/inc/extensions/ext-bank.php b/inc/extensions/ext-bank.php index d61297a76f..0a979c9c58 100644 --- a/inc/extensions/ext-bank.php +++ b/inc/extensions/ext-bank.php @@ -78,7 +78,7 @@ INDEX `userid_type` (userid, account_type), INDEX (account_created), INDEX (account_locked), INDEX (last_tan_stamp) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_bank_transfers`'); addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_bank_transfers` ( id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, @@ -91,7 +91,7 @@ transfer_purpose TINYTEXT, PRIMARY KEY (id), INDEX (to_account_id, from_account_id), INDEX (day_bookkeeping, day_available) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_bank_packages`'); addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_bank_packages` ( `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, @@ -111,7 +111,7 @@ INDEX (day_bookkeeping, day_available) `free_account_stuff` TINYTEXT null, `tan_lock` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // free_account_stuff will be a list of columns of the table _bank_packages // what the member shall get for the specified income. output_system_mode // must be extended with the mode you get for free: output_system_mode:LOGIN @@ -125,7 +125,7 @@ PRIMARY KEY (`id`) `used` ENUM('Y','N') NOT NULL DEFAULT 'N', PRIMARY KEY (`id`), UNIQUE (`account_id`, `tan`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // Admin menu queries addAdminMenuSql('bank', NULL, 'Bank-Accounts','Verwalten Sie hier alle Bank-Accounts Ihrer Mitglieder, sowie Angebotspakete und Überweisungen.', 6); diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php index 0cdad229a6..4596e1d210 100644 --- a/inc/extensions/ext-beg.php +++ b/inc/extensions/ext-beg.php @@ -65,7 +65,7 @@ switch (getExtensionMode()) { `sid` VARCHAR(255) NOT NULL DEFAULT '', KEY (`userid`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); break; case 'remove': // Do stuff when removing extension @@ -289,7 +289,7 @@ PRIMARY KEY (`id`) `timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , `referal_url` TINYTEXT NOT NULL , INDEX ( `userid` ) -) ENGINE = {?_TABLE_TYPE?} COMMENT = 'Recorded Referal URLs'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Recorded Referal URLs'"); // Add admin menu addAdminMenuSql('user','list_beg_referal_urls','Bettel-Referals auflisten','Listet alle Bettellink-Aufrufe inklusive Referal-URL auf.','13'); diff --git a/inc/extensions/ext-birthday.php b/inc/extensions/ext-birthday.php index cac929e7f3..0f0f576bda 100644 --- a/inc/extensions/ext-birthday.php +++ b/inc/extensions/ext-birthday.php @@ -80,13 +80,13 @@ switch (getExtensionMode()) { addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `birthday_points` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0"); addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_user_birthday`'); addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_user_birthday` ( -id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, -userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, -points BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, -chk_value VARCHAR(255) NOT NULL DEFAULT '', -KEY (userid), -PRIMARY KEY (id) -) Type={?_TABLE_TYPE?}"); +`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, +`userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, +`points` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, +`chk_value` VARCHAR(255) NOT NULL DEFAULT '', +KEY (`userid`), +PRIMARY KEY (`id`) +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); addAdminMenuSql('setup','config_birthday','Geburtstagsmails','Stellen Sie hier ein, ob die Mitglieder {OPEN_CONFIG}POINTS{CLOSE_CONFIG} (nicht automatisch) gutgeschrieben kommen sollen oder nicht.', 9); // Update notes (these will be set as task text!) diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php index cf61519ac6..c1e40a09aa 100644 --- a/inc/extensions/ext-bonus.php +++ b/inc/extensions/ext-bonus.php @@ -71,7 +71,7 @@ switch (getExtensionMode()) { `mails_sent` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, KEY (`cat_id`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Bonus mails'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Bonus mails'"); addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_links` MODIFY `link_type` ENUM('NORMAL','BONUS') NOT NULL DEFAULT 'NORMAL'"); addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_links` ADD `bonus_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0"); addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_links` ADD INDEX (`bonus_id`)"); @@ -151,7 +151,7 @@ PRIMARY KEY (`id`), INDEX `mail_id` (`mail_id`), INDEX `bonus_id` (`bonus_id`), INDEX `userid` (`userid`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Turbo-Bonus wird in Tabelle gezählt für Anzeige, wer alles bereits geklickt hat und welchen Platz er gemacht hat."); diff --git a/inc/extensions/ext-booking.php b/inc/extensions/ext-booking.php index ea0d1b45b6..87c305cc86 100644 --- a/inc/extensions/ext-booking.php +++ b/inc/extensions/ext-booking.php @@ -67,7 +67,7 @@ switch (getExtensionMode()) { `recorded` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, INDEX (`userid`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Member points booking table'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Member points booking table'"); // Admin menu addAdminMenuSql('setup','config_booking','Kontoauszug','Einstellungen am Kontoauszug für Mitglieder vornehmen.', 14); diff --git a/inc/extensions/ext-country.php b/inc/extensions/ext-country.php index a7dc55aeb3..c19e879b59 100644 --- a/inc/extensions/ext-country.php +++ b/inc/extensions/ext-country.php @@ -54,13 +54,13 @@ switch (getExtensionMode()) { // SQL commands to run addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_countries`'); addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_countries` ( -id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, -code CHAR(2) NOT NULL DEFAULT 'DE', -descr VARCHAR(255) NOT NULL DEFAULT 'Deutschland', -is_active ENUM('Y','N') NOT NULL DEFAULT 'N', -KEY (code), -PRIMARY KEY (id) -) TYPE={?_TABLE_TYPE?}"); +`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, +`code` CHAR(2) NOT NULL DEFAULT 'DE', +`descr` VARCHAR(255) NOT NULL DEFAULT 'Deutschland', +`is_active` ENUM('Y','N') NOT NULL DEFAULT 'N', +KEY (`code`), +PRIMARY KEY (`id`) +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_countries` (code, descr, is_active) VALUES ('DE','Deutschland','Y')"); // Admin menu diff --git a/inc/extensions/ext-debug.php b/inc/extensions/ext-debug.php index e2e7f350af..a34086e341 100644 --- a/inc/extensions/ext-debug.php +++ b/inc/extensions/ext-debug.php @@ -68,7 +68,7 @@ switch (getExtensionMode()) { `inserted` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, INDEX (`sender_id`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Debug log data'"); +) TYPE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Debug log data'"); // Table against debug log abuse addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_debug_log_abuse`'); @@ -80,7 +80,7 @@ PRIMARY KEY (`id`) `inserted` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, INDEX (`client_id`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Debug log abuse'"); +) TYPE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Debug log abuse'"); // Table on relay/server for client exchanges addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_debug_client`'); @@ -97,7 +97,7 @@ PRIMARY KEY (`id`) UNIQUE (`key`), UNIQUE (`url`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Debug clients'"); +) TYPE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Debug clients'"); // Add this exchange as first client addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_debug_client` (`url`,`title`,`webmaster`,`status`) VALUES ('{?URL?}','{?MAIN_TITLE?}','{?WEBMASTER?}','ACTIVE')"); @@ -111,7 +111,7 @@ PRIMARY KEY (`id`) INDEX `client_log` (`client_id`,`log_id`), UNIQUE (`log_id`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Debug client <-> log connection'"); +) TYPE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Debug client <-> log connection'"); // Guest menus addGuestMenuSql('debug',NULL,'Debug-System','Y','Y',2); diff --git a/inc/extensions/ext-doubler.php b/inc/extensions/ext-doubler.php index 687eb03739..31577057b4 100644 --- a/inc/extensions/ext-doubler.php +++ b/inc/extensions/ext-doubler.php @@ -62,7 +62,7 @@ switch (getExtensionMode()) { KEY (`refid`), KEY (`userid`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // // --- SETTINGS --- diff --git a/inc/extensions/ext-forced.php b/inc/extensions/ext-forced.php index 58b505eb28..0047f8a533 100644 --- a/inc/extensions/ext-forced.php +++ b/inc/extensions/ext-forced.php @@ -54,11 +54,71 @@ switch (getExtensionMode()) { // This depends on 'sponsor' now addExtensionDependency('sponsor'); - // SQL commands to run + // - Ads + addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_forced_ads`'); + addExtensionSql("CREATE TABLE IF NOT EXIST `{?_MYSQL_PREFIX?}_forced_ads` ( +`forced_ads_id` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT , +`forced_ads_ad_url` VARCHAR( 255 ) NULL DEFAULT NULL , +`forced_ads_click_url` VARCHAR( 255 ) NOT NULL , +`forced_ads_width` SMALLINT( 3 ) NULL DEFAULT NULL , +`forced_ads_height` SMALLINT( 3 ) NULL DEFAULT NULL , +`forced_ads_alt_text` VARCHAR( 255 ) NULL DEFAULT NULL , +`forced_ads_framebreaker` ENUM( 'Y', 'N' ) NOT NULL DEFAULT 'Y', +`forced_ads_counter_views` BIGINT( 20 ) NOT NULL DEFAULT 0, +`forced_ads_counter_clicks` BIGINT( 20 ) NOT NULL DEFAULT 0, +`forced_ads_reload_lock` BIGINT( 20 ) NOT NULL DEFAULT 0, +`forced_ads_min_stay` BIGINT( 20 ) NOT NULL DEFAULT 0, +PRIMARY KEY ( `forced_ads_id` ) +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Forced Ads Data'"); + + // - Campaigns + addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_forced_campaigns`'); + addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_forced_campaigns` ( +`forced_campaign_id` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT , +`forced_ads_id` BIGINT( 20 ) UNSIGNED NOT NULL , +`forced_campaign_created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , +`forced_campaign_status` ENUM( 'ACTIVE', 'PENDING', 'EXPIRED', 'LOCKED' ) NOT NULL DEFAULT 'PENDING', +`forced_campaign_lock_reason` VARCHAR( 255 ) NULL DEFAULT NULL , +`forced_campaign_lock_timetstamp` TIMESTAMP NULL DEFAULT NULL , +`forced_campaign_expired` TIMESTAMP NULL DEFAULT NULL , +`forced_campaign_ordered_clicks` BIGINT( 20 ) NOT NULL DEFAULT 0, +`forced_campaign_costs_api` FLOAT( 20 , 5 ) UNSIGNED NULL DEFAULT NULL, +`forced_campaign_price_api` FLOAT( 20 , 5 ) UNSIGNED NULL DEFAULT NULL, +`forced_costs_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL, +INDEX ( `forced_ads_id` ), +INDEX ( `forced_costs_id` ), +PRIMARY KEY ( `forced_campaign_id` ) +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Forced Campaign Data'"); + + // - Campaigns<->User + addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_forced_campaigns_user`'); + addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_forced_campaigns_user` ( +`forced_id` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT , +`forced_campaign_id` BIGINT( 20 ) UNSIGNED NOT NULL , +`forced_user_id` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL , +`forced_user_type` ENUM( 'MEMBER', 'SPONSOR', 'ADMIN', 'API' ) NULL DEFAULT NULL , +UNIQUE `forced_campaign_user` ( `forced_campaign_id` , `forced_user_id` , `forced_user_type` ), +INDEX ( `forced_user_id` ), +PRIMARY KEY ( `forced_id` ) +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Forced Campaigns<->User'"); + + // - Campaign costs + addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_forced_costs`'); + addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_forced_costs` ( +`forced_costs_id` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT , +`forced_costs_price_click` FLOAT( 20, 5 ) UNSIGNED NULL DEFAULT NULL , +`forced_costs_payment_click` FLOAT( 20, 5 ) UNSIGNED NULL DEFAULT NULL , +`forced_costs_visibility` ENUM( 'MEMBER', 'SPONSOR', 'ALL', 'NONE' ) NOT NULL DEFAULT 'NONE', +PRIMARY KEY ( `forced_costs_id` ) +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Forced Campaign Costs'"); break; case 'remove': // Do stuff when removing extension // SQL commands to run + addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_forced_ads`'); + addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_forced_campaigns`'); + addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_forced_campaigns_user`'); + addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_forced_costs`'); break; case 'activate': // Do stuff when admin activates this extension diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php index d901b24de1..1c241ec335 100644 --- a/inc/extensions/ext-holiday.php +++ b/inc/extensions/ext-holiday.php @@ -51,14 +51,14 @@ switch (getExtensionMode()) { // Create database addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_user_holidays`'); addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_user_holidays` ( -id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, -userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, -holiday_start VARCHAR(10) NOT NULL DEFAULT 0, -holiday_end VARCHAR(10) NOT NULL DEFAULT 0, -comments LONGTEXT NOT NULL, -KEY (userid), -PRIMARY KEY (id) -) TYPE={?_TABLE_TYPE?}"); +`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, +`userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, +`holiday_start` VARCHAR(10) NOT NULL DEFAULT 0, +`holiday_end` VARCHAR(10) NOT NULL DEFAULT 0, +`comments` LONGTEXT NOT NULL, +INDEX (`userid`), +PRIMARY KEY (`id`) +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // Add default values to config addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD holiday_max BIGINT(20) UNSIGNED NOT NULL DEFAULT '30'"); diff --git a/inc/extensions/ext-imprint.php b/inc/extensions/ext-imprint.php index 4155fdf492..78fb3d595a 100644 --- a/inc/extensions/ext-imprint.php +++ b/inc/extensions/ext-imprint.php @@ -72,7 +72,7 @@ switch (getExtensionMode()) { `imprint_value` VARCHAR(255) NOT NULL DEFAULT '', UNIQUE (`imprint_key`), PRIMARY KEY (`imprint_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Imprint data'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Imprint data'"); // Init imprint data addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_imprint_data` (`imprint_key`) VALUES ('company'),('surname'),('family'),('street_nr1'),('street_nr2'),('zip'),('city'),('state'),('country'),('phone'),('fax'),('email'),('footer')"); diff --git a/inc/extensions/ext-mediadata.php b/inc/extensions/ext-mediadata.php index d89f25bfa7..56e9519e4f 100644 --- a/inc/extensions/ext-mediadata.php +++ b/inc/extensions/ext-mediadata.php @@ -103,8 +103,8 @@ switch (getExtensionMode()) { addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_mediadata` ( `media_key` VARCHAR(255) NOT NULL DEFAULT '', `media_value` VARCHAR(255) NOT NULL DEFAULT '', -PRIMARY KEY (media_key) -) TYPE={?_TABLE_TYPE?}"); +PRIMARY KEY (`media_key`) +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // Add auto-check file addIncludeToPool('extension', 'inc/gen_mediadata.php'); diff --git a/inc/extensions/ext-network.php b/inc/extensions/ext-network.php index 515a053c25..8c94e00c8d 100644 --- a/inc/extensions/ext-network.php +++ b/inc/extensions/ext-network.php @@ -85,7 +85,7 @@ switch (getExtensionMode()) { `network_charset` VARCHAR(20) NOT NULL DEFAULT 'UTF-8', UNIQUE (`network_short_name`), PRIMARY KEY (`network_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Network data'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Network data'"); // Types the network provider is supporting (e.g. Forced-Banner and so on) // @TODO network_type_handle is an internal name and needs documentation @@ -99,7 +99,7 @@ PRIMARY KEY (`network_id`) `network_type_banner_url` VARCHAR(255) NULL DEFAULT NULL, UNIQUE `provider_type` (`network_id`,`network_type_handle`), PRIMARY KEY (`network_type_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Types provideable by networks'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Types provideable by networks'"); // HTTP parameters (names) for URLs addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_request_params`'); @@ -113,7 +113,7 @@ PRIMARY KEY (`network_type_id`) UNIQUE `provider_type_key` (`network_id`,`network_type_id`,`request_param_key`), UNIQUE `provider_type_value` (`network_id`,`network_type_id`,`request_param_value`), PRIMARY KEY (`network_param_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Request parameters for GET/POST request'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Request parameters for GET/POST request'"); // Error status codes addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_error_codes`'); @@ -125,7 +125,7 @@ PRIMARY KEY (`network_param_id`) UNIQUE `code_type` (`network_type_code_value`,`network_type_id`), INDEX (`network_type_id`), PRIMARY KEY (`network_type_code_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Error codes for all types'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Error codes for all types'"); // Code types (internal table) addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_error_types`'); @@ -134,7 +134,7 @@ PRIMARY KEY (`network_type_code_id`) `network_code` VARCHAR(100) NOT NULL DEFAULT 'INVALID_CODE', UNIQUE (`network_code`), PRIMARY KEY (`network_code_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Error types, generic data, DO NOT ALTER!'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Error types, generic data, DO NOT ALTER!'"); // Valid translation keys (we hate hard-coded arrays, you see?) addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_translations`'); @@ -143,7 +143,7 @@ PRIMARY KEY (`network_code_id`) `network_translation_name` VARCHAR(100) NOT NULL DEFAULT '', UNIQUE (`network_translation_name`), PRIMARY KEY (`network_translation_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Translations for array keys, generic data, DO NOT ALTER!'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Translations for array keys, generic data, DO NOT ALTER!'"); // Array-Element translation tables per type/provider addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_api_translation`'); @@ -156,7 +156,7 @@ PRIMARY KEY (`network_translation_id`) UNIQUE `provider_type_key` (`network_id`,`network_type_id`,`network_api_index`), INDEX (`sort`), PRIMARY KEY (`network_api_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Translation of API responses, generic data, DO NOT ALTER!'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Translation of API responses, generic data, DO NOT ALTER!'"); // Data from the webmaster (you!) addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_config`'); @@ -170,7 +170,7 @@ PRIMARY KEY (`network_api_id`) UNIQUE `network_affiliate` (`network_id`,`network_affiliate_id`), UNIQUE `affiliate_site` (`network_affiliate_id`,`network_site_id`), PRIMARY KEY (`network_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Configuration data from the webmaster (you!)'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Configuration data from the webmaster (you!)'"); // Configuration data for e.g. reload-time addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_types_config`'); @@ -185,7 +185,7 @@ PRIMARY KEY (`network_id`) `allow_erotic` VARCHAR(10) NOT NULL DEFAULT '', UNIQUE `provider_type` (`network_id`,`network_type_id`), PRIMARY KEY (`network_data_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Configuration data for every type (e.g. reload-time)'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Configuration data for every type (e.g. reload-time)'"); // Cache for queried APIs. Re-check depends on config // `network_cache_refresh` in seconds or if set to zero, full day @@ -196,10 +196,10 @@ PRIMARY KEY (`network_data_id`) `network_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `network_type_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `network_cache_data` MEDIUMBLOB, -`network_cache_timestamp` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00', +`network_cache_timestamp` TIMESTAMP NULL DEFAULT NULL, UNIQUE `provider_type` (`network_id`,`network_type_id`), PRIMARY KEY (`network_cache_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Cache for all queried APIs'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Cache for all queried APIs'"); // Reload locks for several types addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_network_reloads`'); @@ -211,7 +211,7 @@ PRIMARY KEY (`network_cache_id`) `network_inserted` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, UNIQUE `provider_type` (`network_id`,`network_type_id`), PRIMARY KEY (`network_reload_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Reload locks'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Reload locks'"); // Insert API response array translations, these will be used for calling the right filter function addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_network_translations` (`network_translation_name`) VALUES diff --git a/inc/extensions/ext-newsletter.php b/inc/extensions/ext-newsletter.php index 2f880ca872..66210e5ab3 100644 --- a/inc/extensions/ext-newsletter.php +++ b/inc/extensions/ext-newsletter.php @@ -155,7 +155,7 @@ switch (getExtensionMode()) { `nl_received` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `nl_total_clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`nl_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='General newsletter data'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'General newsletter data'"); // - Topics data table addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_newsletter_topics`'); @@ -167,7 +167,7 @@ PRIMARY KEY (`nl_id`) `nl_topic_clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, INDEX `newsletter_id` (`nl_id`), PRIMARY KEY (`nl_topic_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Newsletter topics'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Newsletter topics'"); // - Sponsor orders data table addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_newsletter_orders`'); @@ -181,7 +181,7 @@ PRIMARY KEY (`nl_topic_id`) UNIQUE KEY `sponsor_nl_topic` (`nl_sponsor_id`,`nl_id`,`nl_topic_id`), INDEX `topic` (`nl_topic_id`), PRIMARY KEY (`nl_order_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Newsletter orders'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Newsletter orders'"); // Configuration addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `nl_expire` BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getOneDay() * 7).""); diff --git a/inc/extensions/ext-nickname.php b/inc/extensions/ext-nickname.php index 5ce17e5fcb..5e90d71e3c 100644 --- a/inc/extensions/ext-nickname.php +++ b/inc/extensions/ext-nickname.php @@ -41,10 +41,10 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.1.9'); +setThisExtensionVersion('0.2.0'); // Version history array (add more with , '0.1.0' and so on) -setExtensionVersionHistory(array('0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9')); +setExtensionVersionHistory(array('0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5', '0.0.6', '0.0.7', '0.0.8', '0.0.9', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0')); switch (getExtensionMode()) { case 'register': // Do stuff when installation is running (modules.php?module=admin is called) @@ -180,16 +180,23 @@ switch (getExtensionMode()) { `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `nickname` VARCHAR(255) NOT NULL DEFAULT '', `added` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, -`last_used` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00', +`last_used` TIMESTAMP NULL DEFAULT NULL, INDEX `userid` (`userid`), INDEX (`last_used` DESC), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?} COMMENT='History of used nicknames'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'History of used nicknames'"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Historie eingegebener Nicknames hinzugefügt. Mitglied kann auf bereits verwendeter zurückgreifen und Liste selbst löschen."); break; - } + + case '0.2.0': // SQL queries for v0.2.0 + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_nickname_history` CHANGE `last_used` `last_used` TIMESTAMP NULL DEFAULT NULL"); + + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("Standartwert ist nicht mehr 0000-00-00 00:00:00, sondern NULL."); + break; + } // END - switch break; case 'modify': // When the extension got modified diff --git a/inc/extensions/ext-online.php b/inc/extensions/ext-online.php index 05badce02c..9baf07006e 100644 --- a/inc/extensions/ext-online.php +++ b/inc/extensions/ext-online.php @@ -66,7 +66,7 @@ PRIMARY KEY (`id`), INDEX (`userid`), INDEX (`refid`), INDEX `admin_member` (`is_admin`, `is_member`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); addAdminMenuSql('misc','usr_online','Online-Statistik','Eine Liste von derzeit "Online" Usern. Doppelte Einträge könnte auf mangelnden Cookie-Support des Browsers oder auf einen Spider hindeuten.', 1); break; diff --git a/inc/extensions/ext-optimize.php b/inc/extensions/ext-optimize.php index 308d17403e..fb6d852564 100644 --- a/inc/extensions/ext-optimize.php +++ b/inc/extensions/ext-optimize.php @@ -57,7 +57,7 @@ switch (getExtensionMode()) { `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, `gain` decimal(10,3) NOT NULL DEFAULT '0.000', PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); addAdminMenuSql('misc', 'optimize', 'DB optimieren', 'Führen Sie dies ab und an aus, damit überflüssige Binärdaten aus der Datenbank entfernt werden.', 5); break; diff --git a/inc/extensions/ext-order.php b/inc/extensions/ext-order.php index b54b5dead6..dbc2f8d556 100644 --- a/inc/extensions/ext-order.php +++ b/inc/extensions/ext-order.php @@ -306,7 +306,7 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us `timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`id`), INDEX (`pool_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='URL blacklist'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'URL blacklist'"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Tabelle für URL-Sperrliste angelegt."); diff --git a/inc/extensions/ext-payout.php b/inc/extensions/ext-payout.php index c625724d43..72812257a2 100644 --- a/inc/extensions/ext-payout.php +++ b/inc/extensions/ext-payout.php @@ -51,26 +51,26 @@ switch (getExtensionMode()) { // SQL commands to run addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_user_payouts`'); addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_user_payouts` ( -id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, -userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, -payout_total FLOAT(22,3) UNSIGNED NOT NULL DEFAULT '0.000', -target_account VARCHAR(255) NOT NULL DEFAULT '', -target_bank VARCHAR(255) NOT NULL DEFAULT '', -payout_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, -payout_timestamp VARCHAR(10) NOT NULL DEFAULT 0, -status ENUM('NEW','ACCEPTED','REJECTED') NOT NULL DEFAULT 'NEW', -KEY (userid), -KEY (payout_id), -PRIMARY KEY (id) -) TYPE={?_TABLE_TYPE?}"); +`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, +`userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, +`payout_total` FLOAT(22,3) UNSIGNED NOT NULL DEFAULT '0.000', +`target_account` VARCHAR(255) NOT NULL DEFAULT '', +`target_bank` VARCHAR(255) NOT NULL DEFAULT '', +`payout_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, +`payout_timestamp` VARCHAR(10) NOT NULL DEFAULT 0, +`status` ENUM('NEW','ACCEPTED','REJECTED') NOT NULL DEFAULT 'NEW', +INDEX (`userid`), +INDEX (`payout_id`), +PRIMARY KEY (`id`) +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_payout_types`'); addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_payout_types` ( -id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, -type VARCHAR(255) NOT NULL DEFAULT '', -rate FLOAT(22,3) UNSIGNED NOT NULL DEFAULT '0.000', -min_points BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, -PRIMARY KEY (id) -) TYPE={?_TABLE_TYPE?}"); +`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, +`type` VARCHAR(255) NOT NULL DEFAULT '', +`rate` FLOAT(22,3) UNSIGNED NOT NULL DEFAULT '0.000', +`min_points` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, +PRIMARY KEY (`id`) +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); addAdminMenuSql('setup','config_payouts','Auszahlungen','Auszahlungsarten einstellen, neu anlegen oder löschen.',15); addAdminMenuSql('payouts','list_payouts','Anfragen auflisten','Listet alle Auszahlungsanfragen Ihrer Mitglieder auf.',16); addMemberMenuSql('main','payout','Auszahlungen','N','N',11); diff --git a/inc/extensions/ext-primera.php b/inc/extensions/ext-primera.php index 286c3cde29..e8c8e88e1d 100644 --- a/inc/extensions/ext-primera.php +++ b/inc/extensions/ext-primera.php @@ -66,7 +66,7 @@ switch (getExtensionMode()) { `primera_api_status` VARCHAR(255) NULL DEFAULT NULL, KEY (`userid`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Transfers in Primera'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Transfers in Primera'"); // Confiuration addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `primera_min_payout` BIGINT(20) UNSIGNED NOT NULL DEFAULT 40000"); diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php index 18282c368c..29b5030f05 100644 --- a/inc/extensions/ext-rallye.php +++ b/inc/extensions/ext-rallye.php @@ -50,41 +50,41 @@ switch (getExtensionMode()) { case 'register': // Do stuff when installation is running (modules.php?module=admin is called) // SQL commands to run addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_data`'); - addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_prices`'); - addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_users`'); addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_rallye_data` ( -id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, -admin_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, -title VARCHAR(255) NOT NULL DEFAULT '', -descr LONGTEXT NOT NULL, -template VARCHAR(255) NOT NULL DEFAULT '', -start_time VARCHAR(10) NOT NULL DEFAULT 0, -end_time VARCHAR(10) NOT NULL DEFAULT 0, -auto_add_new_user ENUM('Y','N') NOT NULL DEFAULT 'Y', -is_active ENUM('Y','N') NOT NULL DEFAULT 'N', -send_notify ENUM('Y','N') NOT NULL DEFAULT 'Y', -notified ENUM('Y','N') NOT NULL DEFAULT 'N', -KEY (admin_id), -PRIMARY KEY (id) -) TYPE={?_TABLE_TYPE?}"); +`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, +`admin_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, +`title` VARCHAR(255) NOT NULL DEFAULT '', +`descr` LONGTEXT NOT NULL, +`template` VARCHAR(255) NOT NULL DEFAULT '', +`start_time` VARCHAR(10) NOT NULL DEFAULT 0, +`end_time` VARCHAR(10) NOT NULL DEFAULT 0, +`auto_add_new_user` ENUM('Y','N') NOT NULL DEFAULT 'Y', +`is_active` ENUM('Y','N') NOT NULL DEFAULT 'N', +`send_notify` ENUM('Y','N') NOT NULL DEFAULT 'Y', +`notified` ENUM('Y','N') NOT NULL DEFAULT 'N', +KEY (`admin_id`), +PRIMARY KEY (`id`) +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); + addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_prices`'); addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_rallye_prices` ( -id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, -rallye_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, -price_level BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, -points BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, -info LONGTEXT NOT NULL, -KEY (rallye_id), -PRIMARY KEY (id) -) TYPE={?_TABLE_TYPE?}"); +`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, +`rallye_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, +`price_level` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, +`points` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, +`info` LONGTEXT NOT NULL, +INDEX (`rallye_id`), +PRIMARY KEY (`id`) +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); + addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_users`'); addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_rallye_users` ( -id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, -rallye_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, -userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, -refs BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, -KEY (rallye_id), -KEY (userid), -PRIMARY KEY (id) -) TYPE={?_TABLE_TYPE?}"); +`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, +`rallye_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, +`userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, +`refs` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, +INDEX (`rallye_id`), +INDEX (`userid`), +PRIMARY KEY (`id`) +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // Admin menu addAdminMenuSql('rallye', NULL, 'Rallye-Management','Richten Sie neue Ref-Rallyes ein, die zeitgesteuert anfangen und aufhöhren. Dabei wird alles weitere automatisch geregelt.',9); diff --git a/inc/extensions/ext-refback.php b/inc/extensions/ext-refback.php index 940a2cff79..4153d7c487 100644 --- a/inc/extensions/ext-refback.php +++ b/inc/extensions/ext-refback.php @@ -61,7 +61,7 @@ PRIMARY KEY (`id`), UNIQUE `user_refid` (`userid`,`level`,`refid`), KEY (`level`), KEY (`refid`) -) ENGINE = {?_TABLE_TYPE?} COMMENT='User Referals With Refback'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'User Referals With Refback'"); addMemberMenuSql('main','refback','Ref-Back einstellen','N','Y',4); // Execute this special file on registration diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php index cf5fff692a..893cd00720 100644 --- a/inc/extensions/ext-register.php +++ b/inc/extensions/ext-register.php @@ -76,11 +76,11 @@ switch (getExtensionMode()) { case '0.1.0': // SQL queries for v0.1 addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_must_register`'); addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_must_register` ( -id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, -field_name VARCHAR(255) NOT NULL DEFAULT '', -field_required ENUM('Y','N') NOT NULL DEFAULT 'Y', -PRIMARY KEY (id) -) TYPE={?_TABLE_TYPE?}"); +`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, +`field_name` VARCHAR(255) NOT NULL DEFAULT '', +`field_required` ENUM('Y','N') NOT NULL DEFAULT 'Y', +PRIMARY KEY (`id`) +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // Add all entries as required (DO NOT DELETE THEM FROM DATABASE!) addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`, `field_required`) VALUES ('surname','Y')"); diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php index f70114da9c..9213085cd7 100644 --- a/inc/extensions/ext-sponsor.php +++ b/inc/extensions/ext-sponsor.php @@ -98,7 +98,7 @@ INDEX (`refid`), INDEX (`email`), UNIQUE KEY (`hash`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // // Sponsor orders // @@ -118,7 +118,7 @@ INDEX (`regid`), INDEX (`admin_id`), INDEX (`sponsor_id`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // // Pay-types // @@ -130,7 +130,7 @@ PRIMARY KEY (`id`) `pay_min_count` BIGINT(20) UNSIGNED NOT NULL DEFAULT 1, `pay_currency` VARCHAR(255) NOT NULL DEFAULT '€', PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // // Points-to-action converting // @@ -142,7 +142,7 @@ PRIMARY KEY (`id`) `conv_name` VARCHAR(255) NOT NULL DEFAULT 'Mails', INDEX (`ext_name`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // // Sponsor menu system (default) // @@ -158,7 +158,7 @@ INDEX (`action`), UNIQUE KEY `action_what` (`action`,`what`), UNIQUE KEY (`what`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // // Registry for performable actions by your sponsors // @@ -172,7 +172,7 @@ PRIMARY KEY (`id`) INDEX (`ext_name`), INDEX (`admin_id`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // // URLs from the sponsors // @@ -186,7 +186,7 @@ PRIMARY KEY (`id`) `status` ENUM('PENDING','ACTIVE','LOCKED') NOT NULL DEFAULT 'PENDING', INDEX (`sponsor_id`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // // Banners of any size from the sponsors // @@ -202,7 +202,7 @@ PRIMARY KEY (`id`) `status` ENUM('PENDING','ACTIVE','LOCKED') NOT NULL DEFAULT 'PENDING', INDEX (`sponsor_id`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // // Campaigns // @@ -225,7 +225,7 @@ PRIMARY KEY (`id`) INDEX (`admin_id`), INDEX (`sponsor_id`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // // Campaigns + URLs + Banner // @@ -241,7 +241,7 @@ INDEX (`bannerid`), INDEX (`urlid`), INDEX (`campaignid`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // // Allowed data to display (administrative) // @@ -251,7 +251,7 @@ PRIMARY KEY (`id`) `data_row` VARCHAR(255) NOT NULL DEFAULT '', `display` ENUM('Y','N') NOT NULL DEFAULT 'N', PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // // Allowed data to display (sponsor-side) // @@ -263,7 +263,7 @@ PRIMARY KEY (`id`) `display` ENUM('Y','N') NOT NULL DEFAULT 'N', INDEX (`sponsor_id`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // // Default allowed data to display // diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index d8d0b4addd..dd6cc18d77 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -377,7 +377,7 @@ INDEX (`la_id`), INDEX (`la_action`), INDEX (`la_what`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // All "logical areas" together addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_admin_menu_las_data`'); addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_admin_menu_las_data` ( @@ -390,7 +390,7 @@ UNIQUE KEY (`la_id`), INDEX (`la_posx`), INDEX (`la_posy`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // Which menu do you like? addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `admin_menu` ENUM('NEW','OLD') NOT NULL DEFAULT 'OLD'"); @@ -414,7 +414,7 @@ PRIMARY KEY (`id`) `clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, INDEX (`admin_id`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Admin-abhängig werden nun Klicks im Admin-Menü gezählt, die zur automatischen Anpassung des Menüs in den logischen Bereichen diennen. Dieses "intelligente Unbauen" können Sie auch ganz abschalten."); @@ -623,7 +623,7 @@ PRIMARY KEY (`id`) `filter_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, UNIQUE `name_function` (`filter_name` , `filter_function`), PRIMARY KEY (`filter_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Filter system'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Filter system'"); addAdminMenuSql('setup','list_filter','Filter-Management', 'Zeigt alle im System registrierten Filter an und lässt diese de- bzw. wieder aktivieren.', 17); // Update notes (these will be set as task text!) diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php index e82a6c6da3..cf4e7037bb 100644 --- a/inc/extensions/ext-surfbar.php +++ b/inc/extensions/ext-surfbar.php @@ -70,7 +70,7 @@ switch (getExtensionMode()) { PRIMARY KEY (`url_id`), UNIQUE KEY `userid_url` (`url_userid`,`url`), INDEX `status_userid` (`url_status`,`url_userid`) -) TYPE={?_TABLE_TYPE?} COMMENT='Surfbar URLs'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Surfbar URLs'"); // Reload locks addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_surfbar_locks`'); @@ -82,7 +82,7 @@ INDEX `status_userid` (`url_status`,`url_userid`) PRIMARY KEY (`locks_id`), UNIQUE KEY `userid_url` (`locks_userid`,`locks_url_id`), INDEX (`locks_url_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Surfbar reload locks'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Surfbar reload locks'"); // Surfbar salts addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_surfbar_salts`'); @@ -94,7 +94,7 @@ INDEX (`locks_url_id`) PRIMARY KEY (`salts_id`), UNIQUE KEY `salts_userid_url` (`salts_userid`,`salts_url_id`), INDEX (`salts_url_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Surfbar last used salts'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Surfbar last used salts'"); // Statistics addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_surfbar_stats`'); @@ -107,7 +107,7 @@ INDEX (`salts_url_id`) PRIMARY KEY (`stats_id`), UNIQUE KEY `userid_url` (`stats_userid`,`stats_url_id`), INDEX (`stats_url_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Surfbar Statistics'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Surfbar Statistics'"); // Member actions pending on status addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_surfbar_actions`'); @@ -118,7 +118,7 @@ INDEX (`stats_url_id`) `actions_new_status` ENUM('PENDING','ACTIVE','LOCKED','STOPPED','REJECTED','DELETED','MIGRATED','DEPLETED') NULL DEFAULT NULL, PRIMARY KEY (`actions_id`), UNIQUE KEY `status_action` (`actions_status`,`actions_action`) -) TYPE={?_TABLE_TYPE?} COMMENT='Surfbar Member Actions'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Surfbar Member Actions'"); // Member actions addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_actions` (`actions_status`,`actions_action`,`actions_new_status`) VALUES ('PENDING','RETREAT','DELETED')"); diff --git a/inc/extensions/ext-theme.php b/inc/extensions/ext-theme.php index 070f7f7d8e..d7b8b5fdcf 100644 --- a/inc/extensions/ext-theme.php +++ b/inc/extensions/ext-theme.php @@ -130,7 +130,7 @@ switch (getExtensionMode()) { PRIMARY KEY (`id`), UNIQUE KEY (`theme_path`), INDEX (`theme_active`) -) TYPE={?_TABLE_TYPE?} COMMENT='Themes'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Themes'"); // Admin menu addAdminMenuSql('theme', NULL, 'Themes','Verwalten Sie hier alle Designs (Themes) Ihres {OPEN_CONFIG}mt_word2{CLOSE_CONFIG}.', 8); diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php index d1db416e82..d0da66a69e 100644 --- a/inc/extensions/ext-transfer.php +++ b/inc/extensions/ext-transfer.php @@ -64,7 +64,7 @@ switch (getExtensionMode()) { KEY (`userid`), KEY (`from_userid`), PRIMARY KEY (`id`) -) Type={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // Transfers to a member addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_user_transfers_out` ( @@ -78,7 +78,7 @@ PRIMARY KEY (`id`) KEY (`userid`), KEY (`to_userid`), PRIMARY KEY (`id`) -) Type={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // Admin menu addAdminMenuSql('transfer', NULL, '{OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Transfer','Verwalten Sie hier die {OPEN_CONFIG}POINTS{CLOSE_CONFIG}-Transaktionen zwischen Ihren Mitgliedern.', 7); diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php index 708f2fe1be..f997f3b2bf 100644 --- a/inc/extensions/ext-user.php +++ b/inc/extensions/ext-user.php @@ -41,10 +41,10 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.3.6'); +setThisExtensionVersion('0.3.7'); // Version history array (add more with , '0.1.0' and so on) -setExtensionVersionHistory(array('0.0', '0.1.0', '0.1.1', '0.1.2', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6')); +setExtensionVersionHistory(array('0.0', '0.1.0', '0.1.1', '0.1.2', '0.1.2', '0.1.3', '0.1.4', '0.1.5', '0.1.6', '0.1.7', '0.1.8', '0.1.9', '0.2.0', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7')); // Keep this extension always active! setExtensionAlwaysActive('Y'); @@ -59,7 +59,7 @@ switch (getExtensionMode()) { PRIMARY KEY (`id`), INDEX (`userid`), INDEX (`cat_id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_user_data`'); addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_user_data` ( @@ -95,12 +95,12 @@ INDEX (`cat_id`) `ref_payout` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0, `last_login` VARCHAR(10) NOT NULL DEFAULT 0, `login_failures` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, - `last_failure` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00', + `last_failure` TIMESTAMP NULL DEFAULT NULL, PRIMARY KEY (`userid`), UNIQUE (`user_hash`), INDEX (`refid`), INDEX `status_mails` (`status`,`max_mails`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_user_points`'); addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_user_points` ( @@ -111,7 +111,7 @@ INDEX `status_mails` (`status`,`max_mails`) `locked_points` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000, PRIMARY KEY (`id`), INDEX (`userid`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_user_links`'); addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_user_links` ( @@ -122,7 +122,7 @@ INDEX (`userid`) PRIMARY KEY (`id`), INDEX (`userid`), INDEX (`stats_id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_user_stats`'); addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_user_stats` ( @@ -144,7 +144,7 @@ INDEX (`userid`), INDEX (`cat_id`), INDEX (`payment_id`), INDEX (`pool_id`) -) TYPE={?_TABLE_TYPE?}"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_user_stats_data`'); addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_user_stats_data` ( @@ -156,7 +156,7 @@ INDEX (`pool_id`) PRIMARY KEY (`id`), INDEX (`userid`), INDEX (`stats_type`) -) TYPE={?_TABLE_TYPE?} COMMENT='Member statistics data'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Member statistics data'"); // Admin menu addAdminMenuSql('user',NULL,'Mitglieder-Management','Mitglieder freischalten, sperren, Accounts editieren, Neuanmeldungen verwalten, {OPEN_CONFIG}POINTS{CLOSE_CONFIG} gutschreiben und abziehen und und und...',3); @@ -360,7 +360,7 @@ INDEX (`stats_type`) `del_reason` TINYTEXT, INDEX (`userid`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?} COMMENT='List of deleted users'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'List of deleted users'"); // Update notes (these will be set as task text!) setExtensionUpdateNotes("Der Sperrgrund wird nun mit abgespeichert und beim Löschen des Users mit ausgesendet."); @@ -376,7 +376,7 @@ PRIMARY KEY (`id`) case '0.3.7': // SQL queries for v0.3.7 addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_cats` CHANGE `id` `id` BIGINT( 22 ) UNSIGNED NOT NULL AUTO_INCREMENT"); - addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_cats` CHANGE `userid` `userid` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL,"); + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_cats` CHANGE `userid` `userid` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL"); addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_cats` CHANGE `cat_id` `cat_id` TINYINT( 3 ) UNSIGNED NULL DEFAULT NULL"); addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` CHANGE `userid` `userid` BIGINT( 20 ) UNSIGNED NOT NULL AUTO_INCREMENT"); addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_del` CHANGE `userid` `userid` BIGINT( 20 ) UNSIGNED NULL DEFAULT NULL"); @@ -414,6 +414,13 @@ PRIMARY KEY (`id`) // Update notes (these will be set as task text!) setExtensionUpdateNotes("NULL ist wichtiger als 0 und UNSIGNED auch."); break; + + case '0.3.7': // SQL queries for v0.3.7 + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` CHANGE `last_failure` `last_failure` TIMESTAMP NULL DEFAULT NULL"); + + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("Standartwert 0000-00-00 00:00:00 ist nun einfach NULL."); + break; } // END - switch break; diff --git a/inc/extensions/ext-wernis.php b/inc/extensions/ext-wernis.php index 477af1c65c..8157ccac46 100644 --- a/inc/extensions/ext-wernis.php +++ b/inc/extensions/ext-wernis.php @@ -51,17 +51,17 @@ switch (getExtensionMode()) { // SQL commands to run addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_user_wernis`'); addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_user_wernis` ( -id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, -userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, -wernis_account VARCHAR(255) NOT NULL DEFAULT '', -wernis_amount FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000, -wernis_timestamp VARCHAR(10) NOT NULL DEFAULT 0, -wernis_type ENUM('IN','OUT','FAILED') NOT NULL DEFAULT 'FAILED', -wernis_api_message TINYTEXT, -wernis_api_status VARCHAR(255) NULL DEFAULT NULL, -KEY (userid), -PRIMARY KEY (id) -) TYPE={?_TABLE_TYPE?}"); +`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, +`userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, +`wernis_account` VARCHAR(255) NOT NULL DEFAULT '', +`wernis_amount` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000, +`wernis_timestamp` VARCHAR(10) NOT NULL DEFAULT 0, +`wernis_type` ENUM('IN','OUT','FAILED') NOT NULL DEFAULT 'FAILED', +`wernis_api_message` TINYTEXT, +`wernis_api_status` VARCHAR(255) NULL DEFAULT NULL, +INDEX (`userid`), +PRIMARY KEY (`id`) +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci"); // Confiuration addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD wernis_min_payout BIGINT(20) UNSIGNED NOT NULL DEFAULT '40000'"); diff --git a/inc/extensions/ext-yoomedia.php b/inc/extensions/ext-yoomedia.php index 9d98c482d2..d2a3217457 100644 --- a/inc/extensions/ext-yoomedia.php +++ b/inc/extensions/ext-yoomedia.php @@ -81,7 +81,7 @@ switch (getExtensionMode()) { `inserted` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE `y_type` (`type`,`y_id`) -) TYPE={?_TABLE_TYPE?} COMMENT='Reload lock reminder for Yoo!Media campaigns'"); +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Reload lock reminder for Yoo!Media campaigns'"); break; case 'remove': // Do stuff when removing extension diff --git a/inc/filters.php b/inc/filters.php index 0b07e67b7e..1bbede3a98 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -137,7 +137,7 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($data) { // Handle failed logins here if not in guest //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "type=".$data['type'].",action=".getAction().",what=".getWhat().",level=".$data['access_level']."
"); - if ((($data['type'] == 'what') || ($data['type'] == 'action') && ((!isWhatSet()) || (getWhat() == 'overview') || (getWhat() == getIndexHome()))) && ($data['access_level'] != 'guest') && ((isExtensionInstalledAndNewer('sql_patches', '0.4.7')) || (isExtensionInstalledAndNewer('admins', '0.7.0')))) { + if ((($data['type'] == 'what') || ($data['type'] == 'action') && ((!isWhatSet()) || (getWhat() == 'overview') || (getWhat() == getIndexHome()))) && ($data['access_level'] != 'guest') && ((isExtensionInstalledAndNewer('sql_patches', '0.4.7')) || (isExtensionInstalledAndNewer('admins', '0.7.6')))) { // Handle failure $content['content'] .= handleLoginFailures($data['access_level']); } // END - if @@ -937,13 +937,13 @@ function FILTER_RESET_USER_LOGIN_FAILURE () { } // END - if // Remmeber login failures if available - if (isExtensionInstalledAndNewer('sql_patches', '0.6.1')) { + if (isExtensionInstalledAndNewer('user', '0.3.7')) { // Reset login failures SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `login_failures`=0, - `last_failure`='0000-00-00 00:00:00' + `last_failure`=NULL WHERE `userid`=%s LIMIT 1", diff --git a/inc/functions.php b/inc/functions.php index 9681a3020a..ada3d77a07 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -6,9 +6,9 @@ * -------------------------------------------------------------------- * * File : functions.php * * -------------------------------------------------------------------- * - * Short description : Many non-MySQL functions (also file access) * + * Short description : Many non-database functions (also file access) * * -------------------------------------------------------------------- * - * Kurzbeschreibung : Viele Nicht-MySQL-Funktionen (auch Dateizugriff) * + * Kurzbeschreibung : Viele Nicht-Datenbank-Funktionen * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * diff --git a/inc/install-inc.php b/inc/install-inc.php index 9c0a5cf484..062ed05871 100644 --- a/inc/install-inc.php +++ b/inc/install-inc.php @@ -101,7 +101,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) { addTemplateToInstallContent('install_page1'); break; - case '2': // MySQL data (alone!) + case '2': // Database login data if (empty($GLOBALS['install_mysql']['dbase'])) $GLOBALS['install_mysql']['dbase'] = 'your_database'; if (empty($GLOBALS['install_mysql']['login'])) $GLOBALS['install_mysql']['login'] = 'your_login'; if (empty($GLOBALS['install_mysql']['host'])) $GLOBALS['install_mysql']['host'] = 'localhost'; @@ -152,7 +152,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) { $smtpPass2 = postRequestParameter('smtp_pass'); } // END - if - // MySQL settings + // Database login data $content['mysql_host'] = $GLOBALS['install_mysql']['host']; $content['mysql_dbase'] = $GLOBALS['install_mysql']['dbase']; $content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix']; @@ -184,7 +184,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) { $content['smtp_user'] = postRequestParameter('smtp_user'); $content['smtp_pass'] = postRequestParameter('smtp_pass1'); - // MySQL data + // Database login data $OUT = ''; foreach ($GLOBALS['install_mysql'] as $key => $value) { $OUT .= ' '; @@ -205,7 +205,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) { // our own. restore_error_handler(); - // Connect to MySQL server + // Connect to database server SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['pass1'], __FILE__, __LINE__); // Is the link up? diff --git a/inc/language/de.php b/inc/language/de.php index fb0d2fc895..69a19905a7 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -48,7 +48,7 @@ addMessages(array( 'UNKNOWN_MODULE_DETECTED' => "Unbekanntes Modul %s", 'MAILER_WARNING' => "Warnung", 'DIE_CONFIG_CHANGED_YOU' => "Sie haben Ihre Config-Datei editiert! Auf Wiedersehen...", - 'DIE_RUN_INSTALL_MYSQL' => "Bitte rufen Sie http://your-domain.com/install.php auf, um Ihre MySQL-Daten einzurichten.", + 'DIE_RUN_INSTALL_MYSQL' => "Bitte rufen Sie http://your-domain.com/install.php auf, damit die Konfigurationsdaten zur Datenbank eingerichtet werden können.", 'WARN_NULL_PASSWORD' => "Sie haben kein Passwort eingegeben! Bitte lesen Sie in der {?CACHE_PATH?}/config-local.php nach, wie Sie diese Warnung abschalten können.", 'FATAL_CONFIG_WRITABLE' => "Ihre Datei {?CACHE_PATH?}/config-local.php ist beschreibbar! Dies ist ein mögliches Sicherheitsrisiko.", 'FATAL_CANNOT_WRITE_CONFIG' => "Kann Konfigurationsdaten nicht speichern, da ich keinen Schreibzugriff auf {?CACHE_PATH?}/config-local.php habe.", @@ -61,7 +61,7 @@ addMessages(array( 'NO' => "Nein", 'RUNTIME_PROBLEMS_DETECTED' => "Laufzeit-Problem erkannt.", 'FATAL_INC_WRITABLE' => "Das Verzeichnis inc ist beschreibbar! Bitte setzen Sie die Zugriffsrechte auf 755 oder 555.", - 'MYSQL_ERRORS' => "Es sind MySQL-Fehler aufgetreten! Bitte korregieren Sie diese.", + 'MYSQL_ERRORS' => "Es sind SQL-Fehler aufgetreten! Bitte korregieren Sie diese.", 'UNKNOWN_MODULE_STATUS' => "Der Return-Code %s ist unbekannt.", 'MODULE_IS_LOCKED' => "Das Modul %s wurde gesperrt.", 'ADMIN_ACCOUNT_NOT_REGISTERED_YET' => "Es ist noch kein Administrator-Account angelegt worden.", @@ -911,7 +911,7 @@ addMessages(array( 'ADMIN_NORMAL_MAIL_ALREADY_DELETED' => "Mitglieder-Mail bereits gelöscht.", 'INITIAL_RELEASE' => "Erste Alpha-Version", 'NO_UPDATE_NOTES' => "Keine Update-Hinweise gefunden.", - 'MYSQL_QUERY_STRING' => "MySQL-Abfragebefehl war:", + 'MYSQL_QUERY_STRING' => "SQL-Abfragebefehl war:", 'MEMBER_NO_MAILS_IN_POOL' => "Sie haben noch keine Mailbuchungen aufgegeben! Es können somit Ihnen auch keine angezeigt werden.", 'ADMIN_CONFIG_ADMIN_MENU_TITLE' => "Einstellungen am Adminmenü", 'ADMIN_SELECT_MENU_TYPE' => "Menütyp auswählen", diff --git a/inc/language/install_de.php b/inc/language/install_de.php index 3d2dc4d52b..c0ed53ec50 100644 --- a/inc/language/install_de.php +++ b/inc/language/install_de.php @@ -50,13 +50,13 @@ addMessages(array( 'INSTALLER_WRONG_PAGE' => "Sie oder dieses Script haben eine falsche Seite ausgewählt.", 'INSTALLER_NEXT_PAGE' => "Weiter zur nächsten Seite...", 'INSTALLER_HEADER_TEXT_PAGE1' => "Server-Pfad, Basis-URL und Webseitentitel", - 'INSTALLER_HEADER_TEXT_PAGE2' => "MySQL-Daten: Hostname, Login und Passwort", + 'INSTALLER_HEADER_TEXT_PAGE2' => "Datenbankzugangsdaten: Hostname, Login, Passwort, Tabellentyp usw.", 'INSTALLER_HEADER_TEXT_PAGE3' => "SMTP-Server Einstellungen", 'INSTALLER_HEADER_TEXT_PAGE4' => "Cascading Stylesheet-Datei", 'INSTALLER_HEADER_TEXT_PAGE5' => "Verschiedene Einstellungen", - 'INSTALLER_HEADER_MYSQL_ERRORS' => "Fehler beim Verbinden zur MySQL-Datenbank.", + 'INSTALLER_HEADER_MYSQL_ERRORS' => "Fehler beim Verbinden zur Datenbank.", 'INSTALLER_TEXT_PAGE_1' => "Geben Sie hier den absoluten Server-Pfad (/ihr/server/pfad/) mit abschliessendem Slash (/), die Basis-URL (vorgegebene Werte stimmen meistens) und den Titel Ihres {?mt_word2?} ein.", - 'INSTALLER_TEXT_PAGE_2' => "Geben Sie hier die Daten vom MySQL-Server ein, die Ihnen vom Hoster mitgeteilt wurden. Es wird dann anschliessend versucht, eine Testverbindung aufzubauen.", + 'INSTALLER_TEXT_PAGE_2' => "Geben Sie hier die Daten vom Datenbankserver ein, die Ihnen vom Hoster mitgeteilt wurden. Es wird dann anschliessend versucht, eine Testverbindung aufzubauen.", 'INSTALLER_TEXT_PAGE_3' => "Geben Sie hier die Ihre Zugangsdaten zum SMTP-Server (ausgehender Mailserver) ein, wenn der mail()-Befehl auf Ihrem Server deaktiviert sein sollte. Oder lassen Sie alle Felder leer für Standart-Einstellungen.", 'INSTALLER_TEXT_PAGE_4' => "Geben Sie hier die URL Ihrer hochgeladenen CSS-Datei an. Wenn Sie die bestehende Standart-Datei verwenden möchten, so klicken Sie einfach auf Weiter.", 'INSTALLER_TEXT_PAGE_5' => "Hier können Sie weitere Einstellungen vornehmen, wie zum Beispiel den Ausgabe-Modus festlegen, in der der HTML-Code ausgegeben werden soll, usw.", @@ -79,7 +79,7 @@ addMessages(array( 'INSTALLER_FATAL_NO' => "Fataler Fehler im Installer Nr. #", 'INSTALLER_FATAL_NO_MHOST' => "Sie haben keinen Hostnamen eingeben.", 'INSTALLER_FATAL_NO_MDBASE' => "Bitte geben Sie einen Datenbankname ein.", - 'INSTALLER_FATAL_NO_MLOGIN' => "Bitte geben Sie Ihr Loginname zum MySQL-Server ein.", + 'INSTALLER_FATAL_NO_MLOGIN' => "Bitte geben Sie Ihr Loginname zum Datenbank-Server ein.", 'INSTALLER_FATAL_NO_MPASS1' => "Sie haben kein Passwort eingegeben! Dies ist sehr unsicher und wird daher als Fehler gewertet.", 'INSTALLER_FATAL_NO_MPASS2' => "Bitte geben Sie noch die Passwortbestätigung ein.", 'INSTALLER_FATAL_MPASS1_MPASS2' => "Ihre beiden Passwörter sind nicht identisch.", @@ -91,7 +91,7 @@ addMessages(array( 'INSTALLER_CONFIG_WRITE_FOOTER' => "Scriptname, -version und -author anzeigen?", 'INSTALLER_PROBLEMS_DETECTED' => "Es wurden bei der Initialisierung des Installationsvorganges Probleme festgestellt.", 'INSTALLER_MAIN_HEADER' => "Installation des Scriptes {?TITLE?}", - 'INSTALLER_RETURN_MYSQL_PAGE' => "Zurück zu den MySQL-Einstellungen", + 'INSTALLER_RETURN_MYSQL_PAGE' => "Zurück zu den Datenbank-Einstellungen", 'INSTALLER_FINALIZER_FAILED' => "Während der Installation ist ein unerwarteter Fehler aufgetreten! Der Finalizer konnte die Installation nicht abschliessen.", 'INSTALLER_MAYBE_DONE' => "Die Installation ist möglicherweise abgeschlossen oder es ist ein unerwarteter Fehler aufgetreten.", 'INSTALLER_FINISHED' => "Die Installation ist abgeschlossen! :-)", diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php index cb0afb11f6..2f084b8d37 100644 --- a/inc/libs/admins_functions.php +++ b/inc/libs/admins_functions.php @@ -256,18 +256,21 @@ LIMIT 1", // Skip login/id entry if (in_array($entry, array('login', 'id'))) continue; - // Do we have a non-string (e.g. number, NOW() or back-tick at the beginning? - if ((bigintval($value[$id], true, false) === $value[$id]) || ($value[$id] == 'NOW()') || (substr($value[$id], 0, 1) == '`')) { + // Do we have a non-string (e.g. number, NULL, NOW() or back-tick at the beginning? + if (is_null($value[$id])) { + // NULL detected + $SQL .= '`' . $entry . '`=NULL, '; + } elseif ((bigintval($value[$id], true, false) === $value[$id]) || ($value[$id] == 'NOW()') || (substr($value[$id], 0, 1) == '`')) { // No need for ticks (') - $SQL .= '`' . $entry . '`=' . $value[$id] . ','; + $SQL .= '`' . $entry . '`=' . $value[$id] . ', '; } else { // Strings need ticks (') around them - $SQL .= '`' . $entry . "`='" . SQL_ESCAPE($value[$id]) . "',"; + $SQL .= '`' . $entry . "`='" . SQL_ESCAPE($value[$id]) . "', "; } } // END - foreach - // Remove last tick and finish query - $SQL = substr($SQL, 0, -1) . ' WHERE `id`=%s LIMIT 1'; + // Remove last 2 chars and finish query + $SQL = substr($SQL, 0, -2) . ' WHERE `id`=%s LIMIT 1'; // Run it SQL_QUERY_ESC($SQL, array(bigintval($id)), __FUNCTION__, __LINE__); @@ -644,7 +647,7 @@ function FILTER_RESET_ADMINS_LOGIN_FAILURES ($data) { // Prepare update data $postData['login'][getCurrentAdminId()] = $data['login']; $postData['login_failures'][getCurrentAdminId()] = '0'; - $postData['last_failure'][getCurrentAdminId()] = '0000-00-00 00:00:00'; + $postData['last_failure'][getCurrentAdminId()] = null; // Change it in the admin adminsChangeAdminAccount($postData); diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php index ea4a23b039..011fdb8736 100644 --- a/inc/libs/sponsor_functions.php +++ b/inc/libs/sponsor_functions.php @@ -696,10 +696,10 @@ function fetchSponsorData ($sponsor_id, $column = 'id') { if (isset($GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure'])) { // Backup the raw one and zero it $GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure_raw'] = $GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure']; - $GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure'] = '0'; + $GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure'] = null; // Is it not zero? - if ($GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure_raw'] != '0000-00-00 00:00:00') { + if (!is_null($GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure_raw'])) { // Seperate data/time $array = explode(' ', $GLOBALS['sponsor_data'][getCurrentSponsorId()]['last_failure_raw']); diff --git a/inc/load_config.php b/inc/load_config.php index f3454862f6..e0c3ad0ee5 100644 --- a/inc/load_config.php +++ b/inc/load_config.php @@ -81,7 +81,7 @@ if ((isIncludeReadable(getCachePath() . 'config-local.php')) && (isIncludeReadab setConfigEntry('OUTPUT_MODE', 'render'); } -// Check if the user setups his MySQL stuff... +// Check if the user setups his database login stuff... if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestParameterSet('installing')) && (isInstalled())) { // No login entered and outside installation mode outputHtml('{--MAILER_WARNING--}:'); diff --git a/inc/module-functions.php b/inc/module-functions.php index 5b520465b1..4eb3eee68a 100644 --- a/inc/module-functions.php +++ b/inc/module-functions.php @@ -6,9 +6,9 @@ * -------------------------------------------------------------------- * * File : module-functions.php * * -------------------------------------------------------------------- * - * Short description : All MySQL-related functions * + * Short description : Module functions * * -------------------------------------------------------------------- * - * Kurzbeschreibung : Alle MySQL-Relevanten Funktionen * + * Kurzbeschreibung : Modulfunktionen * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php index c219ff7896..e572e69b3e 100644 --- a/inc/modules/admin/what-lock_user.php +++ b/inc/modules/admin/what-lock_user.php @@ -84,7 +84,7 @@ if (isGetRequestParameterSet('userid')) { SET `status`='CONFIRMED', `lock_reason`='', - `lock_timestamp`='0000-00-00 00:00' + `lock_timestamp`=NULL WHERE `userid`=%s LIMIT 1", diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index cf59a6ec08..9e80a7084a 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -363,7 +363,7 @@ switch ($mode) { `time_trans` VARCHAR(10) NOT NULL DEFAULT 0, `trans_type` ENUM('IN','OUT') NOT NULL DEFAULT 'IN', KEY (`party_userid`) -) TYPE=HEAP", array(getMemberId()), __FILE__, __LINE__); +) TYPE = HEAP COMMENT = 'Temporary transfer table'", array(getMemberId()), __FILE__, __LINE__); // Let's begin with the incoming list $result = SQL_QUERY_ESC("SELECT `trans_id`, `from_userid`, `points`, `reason`, `time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `userid`=%s ORDER BY `id` ASC LIMIT {?transfer_max?}", diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index 6124c29e4d..750bfb333c 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -129,7 +129,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) { addFatalMessage(__FILE__, __LINE__, '{--NO_DB_LINK--}'); } } else { - // Maybe you forgot to enter your MySQL data? + // Maybe you forgot to enter your database login? addFatalMessage(__FILE__, __LINE__, '{--MYSQL_DATA_MISSING--}'); } } else { diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index f7238a64a8..6a20170870 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -6,9 +6,9 @@ * -------------------------------------------------------------------- * * File : mysql-manager.php * * -------------------------------------------------------------------- * - * Short description : All MySQL-related functions * + * Short description : All database-related functions * * -------------------------------------------------------------------- * - * Kurzbeschreibung : Alle MySQL-Relevanten Funktionen * + * Kurzbeschreibung : Alle datenbank-relevanten Funktionen * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * @@ -467,14 +467,14 @@ function fetchUserData ($userid, $column = 'userid') { setCurrentUserId($data['userid']); $GLOBALS['user_data'][getCurrentUserId()] = $data; - // Rewrite 'last_failure' if found - if (isset($GLOBALS['user_data'][getCurrentUserId()]['last_failure'])) { + // Rewrite 'last_failure' if found and ext-user has version >= 0.3.7 + if ((isExtensionInstalledAndNewer('user', '0.3.7')) && (isset($GLOBALS['user_data'][getCurrentUserId()]['last_failure']))) { // Backup the raw one and zero it $GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw'] = $GLOBALS['user_data'][getCurrentUserId()]['last_failure']; - $GLOBALS['user_data'][getCurrentUserId()]['last_failure'] = '0'; + $GLOBALS['user_data'][getCurrentUserId()]['last_failure'] = null; // Is it not zero? - if ($GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw'] != '0000-00-00 00:00:00') { + if (!is_null($GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw'])) { // Seperate data/time $array = explode(' ', $GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw']); diff --git a/inc/pool/pool-bonus.php b/inc/pool/pool-bonus.php index ef5fb8e696..5d3678158e 100644 --- a/inc/pool/pool-bonus.php +++ b/inc/pool/pool-bonus.php @@ -92,11 +92,6 @@ if ($GLOBALS['pool_cnt'] < getConfig('max_send')) { // Mark this user as "spammed" ;-) And place a line for him... if (removeReceiver($dummy, $key, $userid, $DATA['id'], $DATA['id'], true) == 'done') { - // Replace text variables - foreach ($GLOBALS['replacer'] as $key => $value) { - if (isset($DATA[$key])) $DATA['text'] = str_replace($value, $DATA[$key], $DATA['text']); - } // END - foreach - // Prepare the mail $mailText = loadEmailTemplate('bonus-mail', $DATA, $userid); diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php index 953e9733f9..5293a5b28a 100644 --- a/inc/pool/pool-user.php +++ b/inc/pool/pool-user.php @@ -121,11 +121,6 @@ if (!SQL_HASZERONUMS($result_main)) { // Prepare the mail $DATA['stats_id'] = bigintval($stats_id); - // Replace text variables - foreach ($GLOBALS['replacer'] as $key => $value) { - if (isset($DATA[$key])) $DATA['text'] = str_replace($value, $DATA[$key], $DATA['text']); - } // END - if - // Prepare content $DATA['time'] = getPaymentPoints($DATA['payment_id'], 'time'); $DATA['points'] = getPaymentPoints($DATA['payment_id'], 'payment'); diff --git a/inc/sql-functions.php b/inc/sql-functions.php index 488cc86dc2..6a2b21e006 100644 --- a/inc/sql-functions.php +++ b/inc/sql-functions.php @@ -6,9 +6,9 @@ * -------------------------------------------------------------------- * * File : sql-functions.php * * -------------------------------------------------------------------- * - * Short description : All MySQL-related functions * + * Short description : SQL functions to handle queries * * -------------------------------------------------------------------- * - * Kurzbeschreibung : Alle MySQL-Relevanten Funktionen * + * Kurzbeschreibung : SQL-Funktionen fuer Queries * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * diff --git a/inc/stats-functions.php b/inc/stats-functions.php index d863ccd068..d29d9b6312 100644 --- a/inc/stats-functions.php +++ b/inc/stats-functions.php @@ -145,7 +145,7 @@ function createStatsTable () { `stats_entry` VARCHAR(100) NOT NULL DEFAULT '', `stats_value` BIGINT(20) NOT NULL DEFAULT 0, PRIMARY KEY (`stats_entry`) -) TYPE=HEAP COMMENT='Temporary statistics table'", +) TYPE = HEAP COMMENT = 'Temporary statistics table'", array(generateDateTime(time(), '6')), __FUNCTION__, __LINE__); } diff --git a/install/tables.sql b/install/tables.sql index cefe0af5cf..ac64e2ff2b 100644 --- a/install/tables.sql +++ b/install/tables.sql @@ -7,7 +7,7 @@ CREATE TABLE `{?_MYSQL_PREFIX?}_admin_menu` ( `sort` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `descr` TEXT NOT NULL, PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}; +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci; DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_admins`; CREATE TABLE `{?_MYSQL_PREFIX?}_admins` ( @@ -17,7 +17,7 @@ CREATE TABLE `{?_MYSQL_PREFIX?}_admins` ( `email` VARCHAR(255) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY (`login`) -) TYPE={?_TABLE_TYPE?}; +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci; DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_cats`; CREATE TABLE `{?_MYSQL_PREFIX?}_cats` ( @@ -26,7 +26,7 @@ CREATE TABLE `{?_MYSQL_PREFIX?}_cats` ( `visible` ENUM('Y','N') NOT NULL DEFAULT 'Y', `sort` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}; +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci; DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_config`; CREATE TABLE `{?_MYSQL_PREFIX?}_config` ( @@ -63,7 +63,7 @@ CREATE TABLE `{?_MYSQL_PREFIX?}_config` ( `ip_timeout` BIGINT(20) UNSIGNED NOT NULL DEFAULT 86400, `allow_direct_pay` ENUM('Y','N') NOT NULL DEFAULT 'N', PRIMARY KEY (`config`) -) TYPE={?_TABLE_TYPE?}; +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci; DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_guest_menu`; CREATE TABLE `{?_MYSQL_PREFIX?}_guest_menu` ( @@ -76,7 +76,7 @@ CREATE TABLE `{?_MYSQL_PREFIX?}_guest_menu` ( `locked` ENUM('Y','N') NOT NULL DEFAULT 'Y', `counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}; +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci; DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_max_receive`; CREATE TABLE `{?_MYSQL_PREFIX?}_max_receive` ( @@ -84,7 +84,7 @@ CREATE TABLE `{?_MYSQL_PREFIX?}_max_receive` ( `value` MEDIUMINT(9) NOT NULL DEFAULT 0, `comment` VARCHAR(255) NOT NULL DEFAULT '', PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}; +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci; DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_member_menu`; CREATE TABLE `{?_MYSQL_PREFIX?}_member_menu` ( @@ -97,7 +97,7 @@ CREATE TABLE `{?_MYSQL_PREFIX?}_member_menu` ( `locked` ENUM('Y','N') NOT NULL DEFAULT 'Y', `counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}; +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci; DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_mod_reg`; CREATE TABLE `{?_MYSQL_PREFIX?}_mod_reg` ( @@ -110,7 +110,7 @@ CREATE TABLE `{?_MYSQL_PREFIX?}_mod_reg` ( `mem_only` ENUM('Y','N') NOT NULL DEFAULT 'N', `clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}; +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci; DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_payments`; CREATE TABLE `{?_MYSQL_PREFIX?}_payments` ( @@ -120,7 +120,7 @@ CREATE TABLE `{?_MYSQL_PREFIX?}_payments` ( `mail_title` VARCHAR(255) NOT NULL DEFAULT '', `price` FLOAT(5,5) UNSIGNED NOT NULL DEFAULT '0.00000', PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}; +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci; DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_pool`; CREATE TABLE `{?_MYSQL_PREFIX?}_pool` ( @@ -140,7 +140,7 @@ CREATE TABLE `{?_MYSQL_PREFIX?}_pool` ( INDEX (`sender`), INDEX (`payment_id`), INDEX (`cat_id`) -) TYPE={?_TABLE_TYPE?}; +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci; DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_refbanner`; CREATE TABLE `{?_MYSQL_PREFIX?}_refbanner` ( @@ -151,7 +151,7 @@ CREATE TABLE `{?_MYSQL_PREFIX?}_refbanner` ( `counter` BIGINT(22) NOT NULL DEFAULT 0, `clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}; +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci; DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_refdepths`; CREATE TABLE `{?_MYSQL_PREFIX?}_refdepths` ( @@ -159,7 +159,7 @@ CREATE TABLE `{?_MYSQL_PREFIX?}_refdepths` ( `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0, `percents` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}; +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci; DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_refsystem`; CREATE TABLE `{?_MYSQL_PREFIX?}_refsystem` ( @@ -169,7 +169,7 @@ CREATE TABLE `{?_MYSQL_PREFIX?}_refsystem` ( `counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, INDEX (`userid`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}; +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci; DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_task_system`; CREATE TABLE `{?_MYSQL_PREFIX?}_task_system` ( @@ -185,7 +185,7 @@ CREATE TABLE `{?_MYSQL_PREFIX?}_task_system` ( INDEX (`userid`), INDEX (`assigned_admin`), PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}; +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci; DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_extensions`; CREATE TABLE `{?_MYSQL_PREFIX?}_extensions` ( @@ -194,14 +194,14 @@ CREATE TABLE `{?_MYSQL_PREFIX?}_extensions` ( `ext_active` ENUM('Y','N') NOT NULL DEFAULT 'N', `ext_version` VARCHAR(255) NOT NULL DEFAULT 'INVALID', PRIMARY KEY (`id`) -) TYPE={?_TABLE_TYPE?}; +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci; DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_jackpot`; CREATE TABLE `{?_MYSQL_PREFIX?}_jackpot` ( `ok` CHAR(2) NOT NULL DEFAULT 'ok', `points` FLOAT(20,3) NOT NULL DEFAULT '0.000', PRIMARY KEY (`ok`) -) TYPE={?_TABLE_TYPE?}; +) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci; INSERT INTO `{?_MYSQL_PREFIX?}_config` (`config`) VALUES (0); diff --git a/modules.php b/modules.php index fbcc2ff8bc..826deb7789 100644 --- a/modules.php +++ b/modules.php @@ -128,7 +128,7 @@ if ((isExtensionActive('maintenance')) && (isMaintenanceEnabled()) && (!isAdmin( break; } // END - switch } elseif (!ifFatalErrorsDetected()) { - // MySQL problems detected + // SQL problems detected addFatalMessage(__FILE__, __LINE__, '{--MYSQL_ERRORS--}'); } diff --git a/templates/de/html/admin/admin_add_points_all.tpl b/templates/de/html/admin/admin_add_points_all.tpl index e01adc1ddf..8447658cd2 100644 --- a/templates/de/html/admin/admin_add_points_all.tpl +++ b/templates/de/html/admin/admin_add_points_all.tpl @@ -9,7 +9,7 @@ {--ADMIN_ENTER_POINTS_ADD--}: - + diff --git a/templates/de/html/admin/admin_add_sponsor_paytype.tpl b/templates/de/html/admin/admin_add_sponsor_paytype.tpl index 9044a07e7b..b067d646c0 100644 --- a/templates/de/html/admin/admin_add_sponsor_paytype.tpl +++ b/templates/de/html/admin/admin_add_sponsor_paytype.tpl @@ -12,15 +12,15 @@ {--SPONSOR_PAYTYPE_RATE--}:
{--SPONSOR_PAYTYPE_RATE_HINT--}
- + {--SPONSOR_PAYTYPE_MIN_COUNT--}: - + {--SPONSOR_PAYTYPE_CURRENCY--}: - + diff --git a/templates/de/html/admin/admin_admins_contct_select.tpl b/templates/de/html/admin/admin_admins_contct_select.tpl index 4180faa929..7bae21f7cd 100644 --- a/templates/de/html/admin/admin_admins_contct_select.tpl +++ b/templates/de/html/admin/admin_admins_contct_select.tpl @@ -5,9 +5,9 @@ - {--ADMINS_CONTACT_TYPE_MAIL--} + {--ADMINS_CONTACT_TYPE_MAIL--} - {--ADMINS_CONTACT_TYPE_MSG--} + {--ADMINS_CONTACT_TYPE_MSG--} diff --git a/templates/de/html/admin/admin_config_admin.tpl b/templates/de/html/admin/admin_config_admin.tpl index df3b5b45b5..0813a18a33 100644 --- a/templates/de/html/admin/admin_config_admin.tpl +++ b/templates/de/html/admin/admin_config_admin.tpl @@ -11,13 +11,13 @@ {--ADMIN_SELECT_MENU_TYPE--}: - + {--ADMIN_MENU_NEW--} - + {--ADMIN_MENU_OLD--} diff --git a/templates/de/html/admin/admin_config_beg.tpl b/templates/de/html/admin/admin_config_beg.tpl index fb45974df0..335ccfd849 100644 --- a/templates/de/html/admin/admin_config_beg.tpl +++ b/templates/de/html/admin/admin_config_beg.tpl @@ -59,10 +59,10 @@ - {--BEG_MODE_DIRECT--} + {--BEG_MODE_DIRECT--} - {--BEG_MODE_REF--} + {--BEG_MODE_REF--} @@ -75,8 +75,8 @@ {--ADMIN_BEG_RALLYE_ACTIVE--} - {--YES--}
- {--NO--} + {--YES--}
+ {--NO--} @@ -84,8 +84,8 @@ {--ADMIN_BEG_INCLUDE_OWN--} - {--YES--}
- {--NO--} + {--YES--}
+ {--NO--} @@ -101,8 +101,8 @@ {--ADMIN_BEG_RALLYE_ONLY_ACTIVE--} - {--YES--}
- {--NO--} + {--YES--}
+ {--NO--} @@ -128,8 +128,8 @@ {--ADMIN_BEG_RALLYE_ENABLE_NOTIFY--} - {--YES--}
- {--NO--} + {--YES--}
+ {--NO--} @@ -137,8 +137,8 @@ {--ADMIN_BEG_RALLYE_DISABLE_NOTIFY--} - {--YES--}
- {--NO--} + {--YES--}
+ {--NO--} @@ -146,8 +146,8 @@ {--ADMIN_BEG_NEW_MEMBER_NOTIFY--} - {--YES--}
- {--NO--} + {--YES--}
+ {--NO--} diff --git a/templates/de/html/admin/admin_config_birthday.tpl b/templates/de/html/admin/admin_config_birthday.tpl index bc848ffd83..115466c30b 100644 --- a/templates/de/html/admin/admin_config_birthday.tpl +++ b/templates/de/html/admin/admin_config_birthday.tpl @@ -12,15 +12,15 @@ ({--ADMIN_BIRTHDAY_POINTS_NOTE--}) - +
({?POINTS?})
{--ADMIN_BIRTHDAY_ONLY_ACTIVE--} - {--YES--}
- {--NO--} + {--YES--}
+ {--NO--} @@ -30,11 +30,11 @@ - + {--ADMIN_BIRTHDAY_MODE_DIRECT--} - + {--ADMIN_BIRTHDAY_MODE_REF--} diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl index a94eff1c89..ffaf648b2d 100644 --- a/templates/de/html/admin/admin_config_bonus.tpl +++ b/templates/de/html/admin/admin_config_bonus.tpl @@ -11,8 +11,8 @@ {--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_REFERAL_INCLUDE--} - {--YES--}
- {--NO--} + {--YES--}
+ {--NO--} @@ -183,8 +183,8 @@ {--ADMIN_BONUS_RALLYE_ENABLE_NOTIFY--} - {--YES--}
- {--NO--} + {--YES--}
+ {--NO--} @@ -192,8 +192,8 @@ {--ADMIN_BONUS_RALLYE_DISABLE_NOTIFY--} - {--YES--}
- {--NO--} + {--YES--}
+ {--NO--} @@ -201,8 +201,8 @@ {--ADMIN_BONUS_RALLYE_NEW_MEMBER_NOTIFY--} - {--YES--}
- {--NO--} + {--YES--}
+ {--NO--} diff --git a/templates/de/html/admin/admin_config_doubler.tpl b/templates/de/html/admin/admin_config_doubler.tpl index b8100a76f3..0d1a724931 100644 --- a/templates/de/html/admin/admin_config_doubler.tpl +++ b/templates/de/html/admin/admin_config_doubler.tpl @@ -65,8 +65,8 @@ {--ADMIN_DOUBLER_SENT_ALL--}: - {--YES--}
- {--NO--} + {--YES--}
+ {--NO--} @@ -74,8 +74,8 @@ {--ADMIN_DOUBLER_JACKPOT--}: - {--YES--}
- {--NO--} + {--YES--}
+ {--NO--} @@ -83,8 +83,8 @@ {--ADMIN_DOUBLER_OWN--}: - {--YES--}
- {--NO--} + {--YES--}
+ {--NO--} @@ -118,10 +118,10 @@ - + - + diff --git a/templates/de/html/admin/admin_config_email_edit_row.tpl b/templates/de/html/admin/admin_config_email_edit_row.tpl index b7a659c904..b6b205ffa7 100644 --- a/templates/de/html/admin/admin_config_email_edit_row.tpl +++ b/templates/de/html/admin/admin_config_email_edit_row.tpl @@ -7,12 +7,12 @@ {--ADMIN_MAX_RECEIVE_VALUE--}:  - + {--ADMIN_MAX_RECEIVE_COMMENT--}:  - + diff --git a/templates/de/html/admin/admin_config_extensions.tpl b/templates/de/html/admin/admin_config_extensions.tpl index def016eb7a..bd26917229 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_holiday.tpl b/templates/de/html/admin/admin_config_holiday.tpl index 88dac2b832..ff1b26d1b7 100644 --- a/templates/de/html/admin/admin_config_holiday.tpl +++ b/templates/de/html/admin/admin_config_holiday.tpl @@ -9,7 +9,7 @@ {--ADMIN_HOLIDAY_MAX_HOLIDAY--}: - +
({--DAYS--})
@@ -20,9 +20,9 @@ {--ADMIN_HOLIDAY_MODE--}: - + {--ADMIN_HOLIDAY_MODE_RESET--}
- + {--ADMIN_HOLIDAY_MODE_DIRECT--} diff --git a/templates/de/html/admin/admin_config_nickname.tpl b/templates/de/html/admin/admin_config_nickname.tpl index 201707ce6d..e7feb6a74e 100644 --- a/templates/de/html/admin/admin_config_nickname.tpl +++ b/templates/de/html/admin/admin_config_nickname.tpl @@ -9,19 +9,19 @@ {--ADMIN_NICKNAME_MIN_LENGTH--}: - + {--ADMIN_NICKNAME_PATTERN--}: - + {--ADMIN_NICKNAME_CHARACTERS--}: - + diff --git a/templates/de/html/admin/admin_config_order.tpl b/templates/de/html/admin/admin_config_order.tpl index 3d6c42476b..09816d985e 100644 --- a/templates/de/html/admin/admin_config_order.tpl +++ b/templates/de/html/admin/admin_config_order.tpl @@ -12,14 +12,14 @@ {--ADMIN_ORDER_MAX_ORDER_SELECT--} - + {--ADMIN_ORDER_MAX--} - + {--ADMIN_ORDER_ORDER--} @@ -121,7 +121,7 @@ {--ADMIN_ORDER_MIN_RECEIVER_PER_ORDER--}: - + diff --git a/templates/de/html/admin/admin_config_point_settings.tpl b/templates/de/html/admin/admin_config_point_settings.tpl index f2b33a04b0..00d70e80b7 100644 --- a/templates/de/html/admin/admin_config_point_settings.tpl +++ b/templates/de/html/admin/admin_config_point_settings.tpl @@ -12,20 +12,20 @@ {--ADMIN_CONFIG_POINTS_DIRECT--} -
+
{--ADMIN_CONFIG_POINTS_MAILS--} - + {--ADMIN_CONFIG_REFMODE--} {--ADMIN_CONFIG_REFMODE_REF--} - +
{--ADMIN_CONFIG_REFMODE_DIRECT--} - + diff --git a/templates/de/html/admin/admin_config_primera.tpl b/templates/de/html/admin/admin_config_primera.tpl index a0f3a94864..04f04a0aba 100644 --- a/templates/de/html/admin/admin_config_primera.tpl +++ b/templates/de/html/admin/admin_config_primera.tpl @@ -9,7 +9,7 @@ {--ADMIN_PRIMERA_API_NAME--}: - + diff --git a/templates/de/html/admin/admin_config_removeip.tpl b/templates/de/html/admin/admin_config_removeip.tpl index fe4bbb7253..754eda3a94 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_rewrite_rows.tpl b/templates/de/html/admin/admin_config_rewrite_rows.tpl index ddf645d334..01d5188d25 100644 --- a/templates/de/html/admin/admin_config_rewrite_rows.tpl +++ b/templates/de/html/admin/admin_config_rewrite_rows.tpl @@ -2,7 +2,7 @@ $content[module] {%pipe,fixEmptyContentToDashes=$content[title]%} - {--YES--}
- {--NO--} + {--YES--}
+ {--NO--} diff --git a/templates/de/html/admin/admin_config_stats.tpl b/templates/de/html/admin/admin_config_stats.tpl index d62e18dece..b070135e05 100644 --- a/templates/de/html/admin/admin_config_stats.tpl +++ b/templates/de/html/admin/admin_config_stats.tpl @@ -11,7 +11,7 @@
({--ADMIN_GSTATS_MEMBERS_NOTE--})
- + @@ -19,7 +19,7 @@
({--ADMIN_GSTATS_MODULES_NOTE--})
- + @@ -27,7 +27,7 @@
({--ADMIN_GSTATS_INACTIVE_NOTE--})
- + @@ -38,7 +38,7 @@ {--ADMIN_MEMBER_STATS_LIMIT--}: - + diff --git a/templates/de/html/admin/admin_config_transfer.tpl b/templates/de/html/admin/admin_config_transfer.tpl index c70b7e0c63..7c978745aa 100644 --- a/templates/de/html/admin/admin_config_transfer.tpl +++ b/templates/de/html/admin/admin_config_transfer.tpl @@ -9,7 +9,7 @@ {--ADMIN_TRANSFER_MAX--}: - + @@ -23,7 +23,7 @@ {--ADMIN_TRANSFER_BALANCE--}: - + ({?POINTS?}) @@ -33,7 +33,7 @@
({--ADMIN_TRANSFER_CODE_NOTE--})
- + diff --git a/templates/de/html/admin/admin_config_user.tpl b/templates/de/html/admin/admin_config_user.tpl index 01d6d35e92..84d0fde7d9 100644 --- a/templates/de/html/admin/admin_config_user.tpl +++ b/templates/de/html/admin/admin_config_user.tpl @@ -9,13 +9,13 @@ {--ADMIN_USER_LIMIT_USER--}: - + {--ADMIN_USER_ALPHA_USER--}: - + diff --git a/templates/de/html/admin/admin_config_validator.tpl b/templates/de/html/admin/admin_config_validator.tpl index 12a9e08339..a56df15835 100644 --- a/templates/de/html/admin/admin_config_validator.tpl +++ b/templates/de/html/admin/admin_config_validator.tpl @@ -11,8 +11,8 @@ {--ADMIN_CONFIG_VALIDATOR_ENABLED--} - {--YES--}
- {--NO--} + {--YES--}
+ {--NO--} diff --git a/templates/de/html/admin/admin_config_wernis.tpl b/templates/de/html/admin/admin_config_wernis.tpl index c505836eef..d64f6e8f22 100644 --- a/templates/de/html/admin/admin_config_wernis.tpl +++ b/templates/de/html/admin/admin_config_wernis.tpl @@ -51,7 +51,7 @@ {--ADMIN_WERNIS_MIN_PAYOUT--}: - Wernis + Wernis @@ -59,7 +59,7 @@ {--ADMIN_WERNIS_MIN_WITHDRAW--}: - Wernis + Wernis diff --git a/templates/de/html/admin/admin_edit_admins_row.tpl b/templates/de/html/admin/admin_edit_admins_row.tpl index 18b6480b4e..c53a5e65e5 100644 --- a/templates/de/html/admin/admin_edit_admins_row.tpl +++ b/templates/de/html/admin/admin_edit_admins_row.tpl @@ -1,10 +1,10 @@ $content[id] - + - + diff --git a/templates/de/html/admin/admin_edit_cats_row.tpl b/templates/de/html/admin/admin_edit_cats_row.tpl index 754e733518..0e351a03d0 100644 --- a/templates/de/html/admin/admin_edit_cats_row.tpl +++ b/templates/de/html/admin/admin_edit_cats_row.tpl @@ -6,7 +6,7 @@ {--ADMIN_CATEGORY_DESCRIPTION--}:  - + @@ -16,6 +16,6 @@ {--ADMIN_ENTER_SORT_KEY--}:  - + diff --git a/templates/de/html/admin/admin_edit_email_row.tpl b/templates/de/html/admin/admin_edit_email_row.tpl index 569f26ea20..75754f5c37 100644 --- a/templates/de/html/admin/admin_edit_email_row.tpl +++ b/templates/de/html/admin/admin_edit_email_row.tpl @@ -1,10 +1,13 @@ $content[id] - + $content[subject] - ({--EMAIL_SENDER--}: {%pipe,generateUserProfileLink=$content[userid]%}; {%pipe,getPaymentTitlePrice=$content[payment_id]%}; {%pipe,getCategory=$content[cat_id]%}) + ({--EMAIL_SENDER--}: + {%pipe,generateUserProfileLink=$content[userid]%}; + {%pipe,getPaymentTitlePrice=$content[payment_id]%}; + {%pipe,getCategory=$content[cat_id]%}) diff --git a/templates/de/html/admin/admin_edit_payments_row.tpl b/templates/de/html/admin/admin_edit_payments_row.tpl index c62f68c843..b02ea92df8 100644 --- a/templates/de/html/admin/admin_edit_payments_row.tpl +++ b/templates/de/html/admin/admin_edit_payments_row.tpl @@ -6,25 +6,25 @@ {--ADMIN_PAYMENT_TIME--}: - {--_SECONDS--} + {--_SECONDS--} {--ADMIN_PAYMENT_PAYMENT--}: - {?POINTS?} + {?POINTS?} {--ADMIN_PAYMENT_PRICE--}: - + ({?POINTS?}) {--ADMIN_PAYMENT_TITLE--}: - + diff --git a/templates/de/html/admin/admin_edit_refbanner_row.tpl b/templates/de/html/admin/admin_edit_refbanner_row.tpl index 75b7eb41a3..80015df6c5 100644 --- a/templates/de/html/admin/admin_edit_refbanner_row.tpl +++ b/templates/de/html/admin/admin_edit_refbanner_row.tpl @@ -2,13 +2,13 @@ {--ADMIN_EDIT_REFERAL_BANNER_URL--}: - + {--ADMIN_EDIT_REFERAL_BANNER_ALTERNATIVE_TEXT--}: - + diff --git a/templates/de/html/admin/admin_login_form.tpl b/templates/de/html/admin/admin_login_form.tpl index 45087777be..1d97c9a577 100644 --- a/templates/de/html/admin/admin_login_form.tpl +++ b/templates/de/html/admin/admin_login_form.tpl @@ -14,7 +14,7 @@ {--ENTER_ADMIN_LOGIN--}: - + $content[login_message] diff --git a/templates/de/html/admin/admin_newsletter.tpl b/templates/de/html/admin/admin_newsletter.tpl index bd574e1e26..6703be59f7 100644 --- a/templates/de/html/admin/admin_newsletter.tpl +++ b/templates/de/html/admin/admin_newsletter.tpl @@ -19,13 +19,13 @@ {--NL_MODE_TEXT--} - + {--NL_MODE_HTML--} - + @@ -38,11 +38,11 @@ {--YES--} - + {--NO--} - + diff --git a/templates/de/html/admin/admin_newsletter_nohtml.tpl b/templates/de/html/admin/admin_newsletter_nohtml.tpl index 36936d8afb..d0eff24bd3 100644 --- a/templates/de/html/admin/admin_newsletter_nohtml.tpl +++ b/templates/de/html/admin/admin_newsletter_nohtml.tpl @@ -19,11 +19,11 @@ {--YES--} - + {--NO--} - + @@ -37,7 +37,7 @@ - + diff --git a/templates/de/html/admin/admin_sub_points_all.tpl b/templates/de/html/admin/admin_sub_points_all.tpl index 4a5f8cbbfb..600771b35b 100644 --- a/templates/de/html/admin/admin_sub_points_all.tpl +++ b/templates/de/html/admin/admin_sub_points_all.tpl @@ -11,7 +11,7 @@ {--ADMIN_ENTER_POINTS_SUB--}: - + diff --git a/templates/de/html/guest/guest_doubler.tpl b/templates/de/html/guest/guest_doubler.tpl index d6f9f371db..3af3ba8e05 100644 --- a/templates/de/html/guest/guest_doubler.tpl +++ b/templates/de/html/guest/guest_doubler.tpl @@ -40,13 +40,18 @@
- {--DOUBLER_ALREADY_PAYOUT--}:
-
+ {--DOUBLER_ALREADY_PAYOUT--}: + + +
$content[payout_history]
- {--DOUBLER_NEXT_PAYOUT--}:
-
+ {--DOUBLER_NEXT_PAYOUT--}: + + +
{%pipe,generateDoublerTable%}
+ diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl index fa1bbea2bc..0dd68cb919 100644 --- a/templates/de/html/guest/guest_register.tpl +++ b/templates/de/html/guest/guest_register.tpl @@ -130,8 +130,8 @@ {--AGREE_TO_THIS--} - {--YES--}
- {--NO--} + {--YES--}
+ {--NO--} diff --git a/templates/de/html/guest/guest_sponsor_payment_row.tpl b/templates/de/html/guest/guest_sponsor_payment_row.tpl index 99739c10b3..ec4a793658 100644 --- a/templates/de/html/guest/guest_sponsor_payment_row.tpl +++ b/templates/de/html/guest/guest_sponsor_payment_row.tpl @@ -1,6 +1,6 @@ - + $content[pay_name]
($content[pay_min_count] $content[pay_currency] = $content[res] {?POINTS?}) diff --git a/templates/de/html/install/install_page1.tpl b/templates/de/html/install/install_page1.tpl index b39683df1a..d08e2ca2dc 100644 --- a/templates/de/html/install/install_page1.tpl +++ b/templates/de/html/install/install_page1.tpl @@ -13,23 +13,23 @@ {--INSTALLER_SERVER_PATH--}: - + {--INSTALLER_BASE_URL--} ({--BASE_URL_NOTE--}): - + {--INSTALLER_HP_TITLE--}: - + {--INSTALLER_HP_SLOGAN--}: - + {--INSTALLER_HP_EMAIL--}: - + diff --git a/templates/de/html/install/install_page2.tpl b/templates/de/html/install/install_page2.tpl index 7d47db9f84..606ecded58 100644 --- a/templates/de/html/install/install_page2.tpl +++ b/templates/de/html/install/install_page2.tpl @@ -14,19 +14,19 @@ {--INSTALLER_MYSQL_HOST--}: - + {--INSTALLER_MYSQL_DBASE--}: - + {--INSTALLER_MYSQL_PREFIX--}: - + @@ -41,19 +41,19 @@ {--INSTALLER_MYSQL_LOGIN--}: - + {--INSTALLER_MYSQL_PASS1--}: - + {--INSTALLER_MYSQL_PASS2--}: - + diff --git a/templates/de/html/install/install_page3.tpl b/templates/de/html/install/install_page3.tpl index 014f06a4f3..b0c4affbc6 100644 --- a/templates/de/html/install/install_page3.tpl +++ b/templates/de/html/install/install_page3.tpl @@ -1,3 +1,4 @@ +
@@ -13,25 +14,25 @@ diff --git a/templates/de/html/member/member_bonus.tpl b/templates/de/html/member/member_bonus.tpl index d0dff414f0..bef0baafef 100644 --- a/templates/de/html/member/member_bonus.tpl +++ b/templates/de/html/member/member_bonus.tpl @@ -47,4 +47,3 @@
{--INSTALLER_TEXT_SMTP_HOST--}: - + {--INSTALLER_TEXT_SMTP_USER--}: - + {--INSTALLER_TEXT_SMTP_PASS1--}: - + {--INSTALLER_TEXT_SMTP_PASS2--}: - + {--MEMBER_TIME_COUNTER_1--} - + {--MEMBER_TIME_COUNTER_2--}
-
diff --git a/templates/de/html/member/member_cat_row.tpl b/templates/de/html/member/member_cat_row.tpl index 4917c3f3e4..90574573ad 100644 --- a/templates/de/html/member/member_cat_row.tpl +++ b/templates/de/html/member/member_cat_row.tpl @@ -1,9 +1,9 @@ $content[cat] - + {--YES--} - + {--NO--} diff --git a/templates/de/html/member/member_html_mail_settings.tpl b/templates/de/html/member/member_html_mail_settings.tpl index d52d12b8cd..c913c0a07c 100644 --- a/templates/de/html/member/member_html_mail_settings.tpl +++ b/templates/de/html/member/member_html_mail_settings.tpl @@ -11,8 +11,8 @@ {--MEMBER_HTML_TEXT--} - {--YES--}
- {--NO--} + {--YES--}
+ {--NO--} diff --git a/templates/de/html/member/member_order-html_intro.tpl b/templates/de/html/member/member_order-html_intro.tpl index de00576bbb..6d1a04201a 100644 --- a/templates/de/html/member/member_order-html_intro.tpl +++ b/templates/de/html/member/member_order-html_intro.tpl @@ -6,10 +6,10 @@ {--MEMBER_HTML_MSG--}: - + {--MEMBER_NORMAL_MSG--}: - + diff --git a/templates/de/html/member/member_payout_form.tpl b/templates/de/html/member/member_payout_form.tpl index e59d4c1a50..5db1660765 100644 --- a/templates/de/html/member/member_payout_form.tpl +++ b/templates/de/html/member/member_payout_form.tpl @@ -1,3 +1,4 @@ +
@@ -28,13 +29,13 @@ @@ -45,6 +46,7 @@
{--MEMBER_PAYOUT_TARGET_BANK--}: - +
{--MEMBER_PAYOUT_OPTIONAL_PASSWORD--}: - +
+
diff --git a/templates/de/html/member/member_themes_row.tpl b/templates/de/html/member/member_themes_row.tpl index 288e0bc61f..4dbd46079f 100644 --- a/templates/de/html/member/member_themes_row.tpl +++ b/templates/de/html/member/member_themes_row.tpl @@ -1,6 +1,6 @@ - + $content[theme_name] diff --git a/templates/de/html/member/member_transfer_settings.tpl b/templates/de/html/member/member_transfer_settings.tpl index 09dd3f16b5..d22d82fd66 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--} - {--YES--}
- {--NO--} + {--YES--}
+ {--NO--} diff --git a/templates/de/html/sponsor/sponsor_settings_form.tpl b/templates/de/html/sponsor/sponsor_settings_form.tpl index a7a5ba6452..07cf72616d 100644 --- a/templates/de/html/sponsor/sponsor_settings_form.tpl +++ b/templates/de/html/sponsor/sponsor_settings_form.tpl @@ -11,9 +11,9 @@ {--GUEST_SPONSOR_RECEIVE_WARNINGS--} - + {--YES--} - + {--NO--} -- 2.39.5