Deprecated 'replacer' removed. Now we use EL code instead (there are a lot example...
authorRoland Häder <roland@mxchange.org>
Tue, 7 Dec 2010 01:31:16 +0000 (01:31 +0000)
committerRoland Häder <roland@mxchange.org>
Tue, 7 Dec 2010 01:31:16 +0000 (01:31 +0000)
104 files changed:
.gitattributes
DOCS/TODOs.txt
DOCS/de/forced/Tabellenlayout.txt [new file with mode: 0644]
inc/config-functions.php
inc/config-global.php
inc/databases.php
inc/db/lib-mysql3.php
inc/extensions/ext-admins.php
inc/extensions/ext-bank.php
inc/extensions/ext-beg.php
inc/extensions/ext-birthday.php
inc/extensions/ext-bonus.php
inc/extensions/ext-booking.php
inc/extensions/ext-country.php
inc/extensions/ext-debug.php
inc/extensions/ext-doubler.php
inc/extensions/ext-forced.php
inc/extensions/ext-holiday.php
inc/extensions/ext-imprint.php
inc/extensions/ext-mediadata.php
inc/extensions/ext-network.php
inc/extensions/ext-newsletter.php
inc/extensions/ext-nickname.php
inc/extensions/ext-online.php
inc/extensions/ext-optimize.php
inc/extensions/ext-order.php
inc/extensions/ext-payout.php
inc/extensions/ext-primera.php
inc/extensions/ext-rallye.php
inc/extensions/ext-refback.php
inc/extensions/ext-register.php
inc/extensions/ext-sponsor.php
inc/extensions/ext-sql_patches.php
inc/extensions/ext-surfbar.php
inc/extensions/ext-theme.php
inc/extensions/ext-transfer.php
inc/extensions/ext-user.php
inc/extensions/ext-wernis.php
inc/extensions/ext-yoomedia.php
inc/filters.php
inc/functions.php
inc/install-inc.php
inc/language/de.php
inc/language/install_de.php
inc/libs/admins_functions.php
inc/libs/sponsor_functions.php
inc/load_config.php
inc/module-functions.php
inc/modules/admin/what-lock_user.php
inc/modules/member/what-transfer.php
inc/mysql-connect.php
inc/mysql-manager.php
inc/pool/pool-bonus.php
inc/pool/pool-user.php
inc/sql-functions.php
inc/stats-functions.php
install/tables.sql
modules.php
templates/de/html/admin/admin_add_points_all.tpl
templates/de/html/admin/admin_add_sponsor_paytype.tpl
templates/de/html/admin/admin_admins_contct_select.tpl
templates/de/html/admin/admin_config_admin.tpl
templates/de/html/admin/admin_config_beg.tpl
templates/de/html/admin/admin_config_birthday.tpl
templates/de/html/admin/admin_config_bonus.tpl
templates/de/html/admin/admin_config_doubler.tpl
templates/de/html/admin/admin_config_email_edit_row.tpl
templates/de/html/admin/admin_config_extensions.tpl
templates/de/html/admin/admin_config_holiday.tpl
templates/de/html/admin/admin_config_nickname.tpl
templates/de/html/admin/admin_config_order.tpl
templates/de/html/admin/admin_config_point_settings.tpl
templates/de/html/admin/admin_config_primera.tpl
templates/de/html/admin/admin_config_removeip.tpl
templates/de/html/admin/admin_config_rewrite_rows.tpl
templates/de/html/admin/admin_config_stats.tpl
templates/de/html/admin/admin_config_transfer.tpl
templates/de/html/admin/admin_config_user.tpl
templates/de/html/admin/admin_config_validator.tpl
templates/de/html/admin/admin_config_wernis.tpl
templates/de/html/admin/admin_edit_admins_row.tpl
templates/de/html/admin/admin_edit_cats_row.tpl
templates/de/html/admin/admin_edit_email_row.tpl
templates/de/html/admin/admin_edit_payments_row.tpl
templates/de/html/admin/admin_edit_refbanner_row.tpl
templates/de/html/admin/admin_login_form.tpl
templates/de/html/admin/admin_newsletter.tpl
templates/de/html/admin/admin_newsletter_nohtml.tpl
templates/de/html/admin/admin_sub_points_all.tpl
templates/de/html/guest/guest_doubler.tpl
templates/de/html/guest/guest_register.tpl
templates/de/html/guest/guest_sponsor_payment_row.tpl
templates/de/html/install/install_page1.tpl
templates/de/html/install/install_page2.tpl
templates/de/html/install/install_page3.tpl
templates/de/html/mailid/mailid_timer.tpl
templates/de/html/member/member_bonus.tpl
templates/de/html/member/member_cat_row.tpl
templates/de/html/member/member_html_mail_settings.tpl
templates/de/html/member/member_order-html_intro.tpl
templates/de/html/member/member_payout_form.tpl
templates/de/html/member/member_themes_row.tpl
templates/de/html/member/member_transfer_settings.tpl
templates/de/html/sponsor/sponsor_settings_form.tpl

index 9b1ed30..83b912b 100644 (file)
@@ -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
index fac1dfb..f8136df 100644 (file)
@@ -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!
 ### ### 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 (file)
index 0000000..6f7a815
--- /dev/null
@@ -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
+
index a7f4ac9..576c37d 100644 (file)
@@ -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::                                                            $ *
index 08efc24..44311b7 100644 (file)
@@ -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
index 03d84c8..901f6ff 100644 (file)
@@ -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));
 
index 9d74092..7f1d99d 100644 (file)
@@ -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
index 5904dd6..dc8c2a6 100644 (file)
@@ -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&uuml;gt: <strong>A</strong>ccess <strong>C</strong>ontrol <strong>L</strong>ines sind zu deutsch Zugriffkontrollzeilen, mit denen Sie einstellen k&ouml;nnen, was welcher Admin machen darf oder nicht. <strong>Nur Sie haben momentan Vollzugriff auf den Adminbereich.</strong>");
@@ -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&ouml;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;
 
index d61297a..0a979c9 100644 (file)
@@ -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 &Uuml;berweisungen.', 6);
index 0cdad22..4596e1d 100644 (file)
@@ -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');
index cac929e..0f0f576 100644 (file)
@@ -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!)
index cf61519..c1e40a0 100644 (file)
@@ -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&auml;hlt f&uuml;r Anzeige, wer alles bereits geklickt hat und welchen Platz er gemacht hat.");
index ea0d1b4..87c305c 100644 (file)
@@ -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&uuml;r Mitglieder vornehmen.', 14);
index a7dc55a..c19e879 100644 (file)
@@ -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
index e2e7f35..a34086e 100644 (file)
@@ -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);
index 687eb03..3157705 100644 (file)
@@ -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 ---
index 58b505e..0047f8a 100644 (file)
@@ -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
index d901b24..1c241ec 100644 (file)
@@ -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'");
index 4155fdf..78fb3d5 100644 (file)
@@ -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')");
index d89f25b..56e9519 100644 (file)
@@ -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');
index 515a053..8c94e00 100644 (file)
@@ -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
index 2f880ca..66210e5 100644 (file)
@@ -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)."");
index 5ce17e5..5e90d71 100644 (file)
@@ -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&uuml;gt. Mitglied kann auf bereits verwendeter zur&uuml;ckgreifen und Liste selbst l&ouml;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
index 05badce..9baf070 100644 (file)
@@ -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 &quot;Online&quot; Usern. Doppelte Eintr&auml;ge k&ouml;nnte auf mangelnden Cookie-Support des Browsers oder auf einen Spider hindeuten.', 1);
                break;
 
index 308d174..fb6d852 100644 (file)
@@ -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&uuml;hren Sie dies ab und an aus, damit &uuml;berfl&uuml;ssige Bin&auml;rdaten aus der Datenbank entfernt werden.', 5);
                break;
 
index b54b5de..dbc2f8d 100644 (file)
@@ -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&uuml;r URL-Sperrliste angelegt.");
index c625724..7281225 100644 (file)
@@ -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&ouml;schen.',15);
                addAdminMenuSql('payouts','list_payouts','Anfragen auflisten','Listet alle Auszahlungsanfragen Ihrer Mitglieder auf.',16);
                addMemberMenuSql('main','payout','Auszahlungen','N','N',11);
index 286c3cd..e8c8e88 100644 (file)
@@ -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");
index 18282c3..29b5030 100644 (file)
@@ -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&ouml;hren. Dabei wird alles weitere automatisch geregelt.',9);
index 940a2cf..4153d7c 100644 (file)
@@ -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
index cf5fff6..893cd00 100644 (file)
@@ -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')");
index f70114d..9213085 100644 (file)
@@ -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 '&euro;',
 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
                //
index d8d0b4a..dd6cc18 100644 (file)
@@ -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&auml;ngig werden nun Klicks im Admin-Men&uuml; gez&auml;hlt, die zur automatischen Anpassung des Men&uuml;s in den logischen Bereichen diennen. Dieses &quot;intelligente Unbauen&quot; k&ouml;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&auml;sst diese de- bzw. wieder aktivieren.', 17);
 
                                // Update notes (these will be set as task text!)
index e82a6c6..cf4e703 100644 (file)
@@ -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')");
index 070f7f7..d7b8b5f 100644 (file)
@@ -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);
index d1db416..d0da66a 100644 (file)
@@ -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);
index 708f2fe..f997f3b 100644 (file)
@@ -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&ouml;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;
 
index 477af1c..8157cca 100644 (file)
@@ -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'");
index 9d98c48..d2a3217 100644 (file)
@@ -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
index 0b07e67..1bbede3 100644 (file)
@@ -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']."<br />");
-       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",
index 9681a30..ada3d77 100644 (file)
@@ -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::                                                            $ *
index 9c0a5cf..062ed05 100644 (file)
@@ -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 .= '    <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
@@ -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?
index fb0d2fc..69a1990 100644 (file)
@@ -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&ouml;nnen.",
        'WARN_NULL_PASSWORD' => "Sie haben kein Passwort eingegeben! Bitte lesen Sie in der <strong>{?CACHE_PATH?}/config-local.php</strong> nach, wie Sie diese Warnung abschalten k&ouml;nnen.",
        'FATAL_CONFIG_WRITABLE' => "Ihre Datei {?CACHE_PATH?}/config-local.php ist beschreibbar! Dies ist ein m&ouml;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 <strong>inc</strong> 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 <span class=\"data\">%s</span> ist unbekannt.",
        'MODULE_IS_LOCKED' => "Das Modul <span class=\"data\">%s</span> 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&ouml;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&ouml;nnen somit Ihnen auch keine angezeigt werden.",
        'ADMIN_CONFIG_ADMIN_MENU_TITLE' => "Einstellungen am Adminmen&uuml;",
        'ADMIN_SELECT_MENU_TYPE' => "Men&uuml;typ ausw&auml;hlen",
index 3d2dc4d..c0ed53e 100644 (file)
@@ -50,13 +50,13 @@ addMessages(array(
        'INSTALLER_WRONG_PAGE' => "Sie oder dieses Script haben eine falsche Seite ausgew&auml;hlt.",
        'INSTALLER_NEXT_PAGE' => "Weiter zur n&auml;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/) <strong>mit</strong> 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&uuml;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&ouml;chten, so klicken Sie einfach auf Weiter.",
        'INSTALLER_TEXT_PAGE_5' => "Hier k&ouml;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&auml;tigung ein.",
        'INSTALLER_FATAL_MPASS1_MPASS2' => "Ihre beiden Passw&ouml;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&uuml;ck zu den MySQL-Einstellungen",
+       'INSTALLER_RETURN_MYSQL_PAGE' => "Zur&uuml;ck zu den Datenbank-Einstellungen",
        'INSTALLER_FINALIZER_FAILED' => "W&auml;hrend der Installation ist ein unerwarteter Fehler aufgetreten! Der Finalizer konnte die Installation nicht abschliessen.",
        'INSTALLER_MAYBE_DONE' => "Die Installation ist m&ouml;glicherweise abgeschlossen oder es ist ein unerwarteter Fehler aufgetreten.",
        'INSTALLER_FINISHED' => "Die Installation ist abgeschlossen! :-)",
index cb0afb1..2f084b8 100644 (file)
@@ -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);
index ea4a23b..011fdb8 100644 (file)
@@ -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']);
 
index f345486..e0c3ad0 100644 (file)
@@ -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('<strong>{--MAILER_WARNING--}:</strong>');
index 5b52046..4eb3eee 100644 (file)
@@ -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::                                                            $ *
index c219ff7..e572e69 100644 (file)
@@ -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",
index cf59a6e..9e80a70 100644 (file)
@@ -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?}",
index 6124c29..750bfb3 100644 (file)
@@ -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 {
index f7238a6..6a20170 100644 (file)
@@ -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']);
 
index ef5fb8e..5d36781 100644 (file)
@@ -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);
 
index 953e973..5293a5b 100644 (file)
@@ -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');
index 488cc86..6a2b21e 100644 (file)
@@ -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::                                                            $ *
index d863ccd..d29d9b6 100644 (file)
@@ -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__);
 }
 
index cefe0af..ac64e2f 100644 (file)
@@ -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);
 
index fbcc2ff..826deb7 100644 (file)
@@ -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--}');
 }
 
index e01adc1..8447658 100644 (file)
@@ -9,7 +9,7 @@
        <tr>
                <td align="right">{--ADMIN_ENTER_POINTS_ADD--}:</td>
                <td>
-                       <input type="text" class="form_field" name="points" size="6" maxlength="7" class="form_field" />
+                       <input type="text" class="form_field" name="points" size="6" maxlength="7" />
                </td>
        </tr>
        <tr>
index 9044a07..b067d64 100644 (file)
 </tr>
 <tr>
        <td align="right">{--SPONSOR_PAYTYPE_RATE--}:<br /><div class="tiny">{--SPONSOR_PAYTYPE_RATE_HINT--}</div></td>
-       <td><input type="text" class="form_field" name="pay_rate" size="7" maxlength="25" class="form_field" value="0.00000" /></td>
+       <td><input type="text" class="form_field" name="pay_rate" size="7" maxlength="25" value="0.00000" /></td>
 </tr>
 <tr>
        <td align="right">{--SPONSOR_PAYTYPE_MIN_COUNT--}:</td>
-       <td><input type="text" class="form_field" name="pay_min_count" size="2" maxlength="20" class="form_field" value="1" /></td>
+       <td><input type="text" class="form_field" name="pay_min_count" size="2" maxlength="20" value="1" /></td>
 </tr>
 <tr>
        <td class="bottom" align="right">{--SPONSOR_PAYTYPE_CURRENCY--}:</td>
-       <td class="bottom"><input type="text" class="form_field" name="pay_currency" size="2" maxlength="255" class="form_field" value="&euro;" /></td>
+       <td class="bottom"><input type="text" class="form_field" name="pay_currency" size="2" maxlength="255" value="&euro;" /></td>
 </tr>
 <tr>
        <td colspan="2" class="table_footer" align="center">
index 4180faa..7bae21f 100644 (file)
@@ -5,9 +5,9 @@
 </tr>
 <tr>
        <td align="right">
-               <input type="radio" class="form_field" name="type" class="form_field" value="mail" checked="checked" /> {--ADMINS_CONTACT_TYPE_MAIL--}
+               <input type="radio" class="form_field" name="type" value="mail" checked="checked" /> {--ADMINS_CONTACT_TYPE_MAIL--}
        </td>
        <td>
-               <input type="radio" class="form_field" name="type" class="form_field" value="message" /> {--ADMINS_CONTACT_TYPE_MSG--}
+               <input type="radio" class="form_field" name="type" value="message" /> {--ADMINS_CONTACT_TYPE_MSG--}
        </td>
 </tr>
index df3b5b4..0813a18 100644 (file)
                        {--ADMIN_SELECT_MENU_TYPE--}:
                </td>
                <td align="right" valign="top" style="padding-top: 3px">
-                       <input type="radio" class="form_field" name="admin_menu" class="form_field" value="NEW"$content[admin_menu_new] />
+                       <input type="radio" class="form_field" name="admin_menu" value="NEW"$content[admin_menu_new] />
                </td>
                <td>{--ADMIN_MENU_NEW--}</td>
        </tr>
        <tr>
                <td class="bottom" colspan="2" align="right" valign="top" style="padding-top: 3px">
-                       <input type="radio" class="form_field" name="admin_menu" class="form_field" value="OLD"$content[admin_menu_old] />
+                       <input type="radio" class="form_field" name="admin_menu" value="OLD"$content[admin_menu_old] />
                </td>
                <td class="bottom">{--ADMIN_MENU_OLD--}</td>
        </tr>
index fb45974..335ccfd 100644 (file)
        </tr>
        <tr>
                <td class="bottom" align="right" height="20">
-                       <input type="radio" class="form_field" name="beg_mode" class="form_field" value="DIRECT"$content[beg_mode_direct] /> {--BEG_MODE_DIRECT--}
+                       <input type="radio" class="form_field" name="beg_mode" value="DIRECT"$content[beg_mode_direct] /> {--BEG_MODE_DIRECT--}
                </td>
                <td class="bottom" align="center">
-                       <input type="radio" class="form_field" name="beg_mode" class="form_field" value="REF"$content[beg_mode_ref] /> {--BEG_MODE_REF--}
+                       <input type="radio" class="form_field" name="beg_mode" value="REF"$content[beg_mode_ref] /> {--BEG_MODE_REF--}
                </td>
        </tr>
        <tr>
@@ -75,8 +75,8 @@
                        {--ADMIN_BEG_RALLYE_ACTIVE--}
                </td>
                <td align="center">
-                       <input type="radio" class="form_field" name="beg_rallye" class="form_field" value="Y"$content[rallye_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="beg_rallye" class="form_field" value="N"$content[rallye_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="beg_rallye" value="Y"$content[rallye_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="beg_rallye" value="N"$content[rallye_n] /> {--NO--}
                </td>
        </tr>
        <tr>
@@ -84,8 +84,8 @@
                        {--ADMIN_BEG_INCLUDE_OWN--}
                </td>
                <td align="center">
-                       <input type="radio" class="form_field" name="beg_include_own" class="form_field" value="Y"$content[include_own_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="beg_include_own" class="form_field" value="N"$content[include_own_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="beg_include_own" value="Y"$content[include_own_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="beg_include_own" value="N"$content[include_own_n] /> {--NO--}
                </td>
        </tr>
        <tr>
                        {--ADMIN_BEG_RALLYE_ONLY_ACTIVE--}
                </td>
                <td align="center">
-                       <input type="radio" class="form_field" name="beg_active" class="form_field" value="Y"$content[active_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="beg_active" class="form_field" value="N"$content[active_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="beg_active" value="Y"$content[active_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="beg_active" value="N"$content[active_n] /> {--NO--}
                </td>
        </tr>
        <tr>
                        {--ADMIN_BEG_RALLYE_ENABLE_NOTIFY--}
                </td>
                <td align="center">
-                       <input type="radio" class="form_field" name="beg_rallye_enable_notify" class="form_field" value="Y"$content[rallye_enable_notify_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="beg_rallye_enable_notify" class="form_field" value="N"$content[rallye_enable_notify_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="beg_rallye_enable_notify" value="Y"$content[rallye_enable_notify_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="beg_rallye_enable_notify" value="N"$content[rallye_enable_notify_n] /> {--NO--}
                </td>
        </tr>
        <tr>
                        {--ADMIN_BEG_RALLYE_DISABLE_NOTIFY--}
                </td>
                <td align="center">
-                       <input type="radio" class="form_field" name="beg_rallye_disable_notify" class="form_field" value="Y"$content[rallye_disable_notify_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="beg_rallye_disable_notify" class="form_field" value="N"$content[rallye_disable_notify_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="beg_rallye_disable_notify" value="Y"$content[rallye_disable_notify_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="beg_rallye_disable_notify" value="N"$content[rallye_disable_notify_n] /> {--NO--}
                </td>
        </tr>
        <tr>
                        {--ADMIN_BEG_NEW_MEMBER_NOTIFY--}
                </td>
                <td align="center">
-                       <input type="radio" class="form_field" name="beg_new_member_notify" class="form_field" value="Y"$content[new_member_notify_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="beg_new_member_notify" class="form_field" value="N"$content[new_member_notify_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="beg_new_member_notify" value="Y"$content[new_member_notify_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="beg_new_member_notify" value="N"$content[new_member_notify_n] /> {--NO--}
                </td>
        </tr>
        <tr>
index bc848ff..115466c 100644 (file)
                        <span class="notice">({--ADMIN_BIRTHDAY_POINTS_NOTE--})</span>
                </td>
                <td>
-                       <input type="text" class="form_field" name="birthday_points" class="form_field" value="{?birthday_points?}" size="4" maxlength="6" />
+                       <input type="text" class="form_field" name="birthday_points" value="{?birthday_points?}" size="4" maxlength="6" />
                        <div class="tiny">({?POINTS?})</div>
                </td>
        </tr>
        <tr>
                <td class="bottom" align="right">{--ADMIN_BIRTHDAY_ONLY_ACTIVE--}</td>
                <td class="bottom" align="center">
-                       <input type="radio" class="form_field" name="birthday_active" class="form_field" value="Y"$content[active_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="birthday_active" class="form_field" value="N"$content[active_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="birthday_active" value="Y"$content[active_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="birthday_active" value="N"$content[active_n] /> {--NO--}
                </td>
        </tr>
        <tr>
        </tr>
        <tr>
                <td class="bottom" align="right">
-                       <input type="radio" class="form_field" name="birthday_mode" class="form_field" value="DIRECT"$content[mode_direct] />
+                       <input type="radio" class="form_field" name="birthday_mode" value="DIRECT"$content[mode_direct] />
                        {--ADMIN_BIRTHDAY_MODE_DIRECT--}
                </td>
                <td class="bottom" align="center">
-                       <input type="radio" class="form_field" name="birthday_mode" class="form_field" value="REF"$content[mode_ref] />
+                       <input type="radio" class="form_field" name="birthday_mode" value="REF"$content[mode_ref] />
                        {--ADMIN_BIRTHDAY_MODE_REF--}
                </td>
        </tr>
index a94eff1..ffaf648 100644 (file)
@@ -11,8 +11,8 @@
                        {--ADMIN_BONUS_RALLYE_IS_ACTIVE--}
                </td>
                <td class="bottom" align="center">
-                       <input type="radio" class="form_field" name="bonus_active" class="form_field" value="Y"$content[active_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="bonus_active" class="form_field" value="N"$content[active_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="bonus_active" value="Y"$content[active_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="bonus_active" value="N"$content[active_n] /> {--NO--}
                </td>
        </tr>
        <tr>
@@ -20,8 +20,8 @@
                        {--ADMIN_BONUS_INCLUDE_OWN--}
                </td>
                <td class="bottom" align="center">
-                       <input type="radio" class="form_field" name="bonus_include_own" class="form_field" value="Y"$content[include_own_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="bonus_include_own" class="form_field" value="N"$content[include_own_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="bonus_include_own" value="Y"$content[include_own_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="bonus_include_own" value="N"$content[include_own_n] /> {--NO--}
                </td>
        </tr>
        <tr>
@@ -29,8 +29,8 @@
                        {--ADMIN_BONUS_RALLYE_CLICK_INCLUDE--}
                </td>
                <td class="bottom" align="center">
-                       <input type="radio" class="form_field" name="bonus_click_yn" class="form_field" value="Y"$content[click_yn_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="bonus_click_yn" class="form_field" value="N"$content[click_yn_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="bonus_click_yn" value="Y"$content[click_yn_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="bonus_click_yn" value="N"$content[click_yn_n] /> {--NO--}
                </td>
        </tr>
        <tr>
@@ -38,8 +38,8 @@
                        {--ADMIN_BONUS_RALLYE_LOGIN_INCLUDE--}
                </td>
                <td class="bottom" align="center">
-                       <input type="radio" class="form_field" name="bonus_login_yn" class="form_field" value="Y"$content[login_yn_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="bonus_login_yn" class="form_field" value="N"$content[login_yn_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="bonus_login_yn" value="Y"$content[login_yn_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="bonus_login_yn" value="N"$content[login_yn_n] /> {--NO--}
                </td>
        </tr>
        <tr>
@@ -47,8 +47,8 @@
                        {--ADMIN_BONUS_RALLYE_ORDER_INCLUDE--}
                </td>
                <td class="bottom" align="center">
-                       <input type="radio" class="form_field" name="bonus_order_yn" class="form_field" value="Y"$content[order_yn_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="bonus_order_yn" class="form_field" value="N"$content[order_yn_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="bonus_order_yn" value="Y"$content[order_yn_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="bonus_order_yn" value="N"$content[order_yn_n] /> {--NO--}
                </td>
        </tr>
        <tr>
@@ -56,8 +56,8 @@
                        {--ADMIN_BONUS_RALLYE_STATS_INCLUDE--}
                </td>
                <td class="bottom" align="center">
-                       <input type="radio" class="form_field" name="bonus_stats_yn" class="form_field" value="Y"$content[stats_yn_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="bonus_stats_yn" class="form_field" value="N"$content[stats_yn_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="bonus_stats_yn" value="Y"$content[stats_yn_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="bonus_stats_yn" value="N"$content[stats_yn_n] /> {--NO--}
                </td>
        </tr>
        <tr>
@@ -65,8 +65,8 @@
                        {--ADMIN_BONUS_RALLYE_REFERAL_INCLUDE--}
                </td>
                <td class="bottom" align="center">
-                       <input type="radio" class="form_field" name="bonus_ref_yn" class="form_field" value="Y"$content[ref_yn_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="bonus_ref_yn" class="form_field" value="N"$content[ref_yn_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="bonus_ref_yn" value="Y"$content[ref_yn_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="bonus_ref_yn" value="N"$content[ref_yn_n] /> {--NO--}
                </td>
        </tr>
        <tr>
                        {--ADMIN_BONUS_RALLYE_ENABLE_NOTIFY--}
                </td>
                <td align="center">
-                       <input type="radio" class="form_field" name="bonus_enable_notify" class="form_field" value="Y"$content[enable_notify_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="bonus_enable_notify" class="form_field" value="N"$content[enable_notify_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="bonus_enable_notify" value="Y"$content[enable_notify_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="bonus_enable_notify" value="N"$content[enable_notify_n] /> {--NO--}
                </td>
        </tr>
        <tr>
                        {--ADMIN_BONUS_RALLYE_DISABLE_NOTIFY--}
                </td>
                <td align="center">
-                       <input type="radio" class="form_field" name="bonus_disable_notify" class="form_field" value="Y"$content[disable_notify_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="bonus_disable_notify" class="form_field" value="N"$content[disable_notify_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="bonus_disable_notify" value="Y"$content[disable_notify_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="bonus_disable_notify" value="N"$content[disable_notify_n] /> {--NO--}
                </td>
        </tr>
        <tr>
                        {--ADMIN_BONUS_RALLYE_NEW_MEMBER_NOTIFY--}
                </td>
                <td align="center">
-                       <input type="radio" class="form_field" name="bonus_new_member_notify" class="form_field" value="Y"$content[new_member_notify_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="bonus_new_member_notify" class="form_field" value="N"$content[new_member_notify_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="bonus_new_member_notify" value="Y"$content[new_member_notify_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="bonus_new_member_notify" value="N"$content[new_member_notify_n] /> {--NO--}
                </td>
        </tr>
        <tr>
index b8100a7..0d1a724 100644 (file)
@@ -65,8 +65,8 @@
        <tr>
                <td align="right" height="20">{--ADMIN_DOUBLER_SENT_ALL--}:</td>
                <td style="padding-left: 5px">
-                       <input type="radio" class="form_field" name="doubler_sent_all" class="form_field" value="Y"$content[sent_all_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="doubler_sent_all" class="form_field" value="N"$content[sent_all_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="doubler_sent_all" value="Y"$content[sent_all_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="doubler_sent_all" value="N"$content[sent_all_n] /> {--NO--}
                </td>
        </tr>
        <tr>
@@ -74,8 +74,8 @@
                        {--ADMIN_DOUBLER_JACKPOT--}:
                </td>
                <td style="padding-left: 5px">
-                       <input type="radio" class="form_field" name="doubler_jackpot" class="form_field" value="Y"$content[jackpot_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="doubler_jackpot" class="form_field" value="N"$content[jackpot_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="doubler_jackpot" value="Y"$content[jackpot_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="doubler_jackpot" value="N"$content[jackpot_n] /> {--NO--}
                </td>
        </tr>
        <tr>
@@ -83,8 +83,8 @@
                        {--ADMIN_DOUBLER_OWN--}:
                </td>
                <td style="padding-left: 5px">
-                       <input type="radio" class="form_field" name="doubler_own" class="form_field" value="Y"$content[own_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="doubler_own" class="form_field" value="N"$content[own_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="doubler_own" value="Y"$content[own_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="doubler_own" value="N"$content[own_n] /> {--NO--}
                </td>
        </tr>
        <tr>
        </tr>
        <tr>
                <td class="bottom" align="center" height="20">
-                       <input type="radio" class="form_field" name="doubler_send_mode" class="form_field" value="DIRECT"$content[send_mode_direct] />
+                       <input type="radio" class="form_field" name="doubler_send_mode" value="DIRECT"$content[send_mode_direct] />
                </td>
                <td class="bottom" style="padding-left: 5px">
-                       <input type="radio" class="form_field" name="doubler_send_mode" class="form_field" value="RESET"$content[send_mode_reset] />
+                       <input type="radio" class="form_field" name="doubler_send_mode" value="RESET"$content[send_mode_reset] />
                </td>
        </tr>
        <tr>
index b7a659c..b6b205f 100644 (file)
@@ -7,12 +7,12 @@
 <tr>
        <td class="{%template,ColorSwitch%}" align="right">{--ADMIN_MAX_RECEIVE_VALUE--}:&nbsp;</td>
        <td class="{%template,ColorSwitch%}">
-               <input type="text" class="form_field" name="val[$content[id]]" class="form_field" value="$content[value]" size="3" maxlength="5" />
+               <input type="text" class="form_field" name="val[$content[id]]" value="$content[value]" size="3" maxlength="5" />
        </td>
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%} bottom" align="right">{--ADMIN_MAX_RECEIVE_COMMENT--}:&nbsp;</td>
        <td class="{%template,ColorSwitch%} bottom">
-               <input type="text" class="form_field" name="comm[$content[id]]" class="form_field" value="$content[comment]" size="25" maxlength="255" />
+               <input type="text" class="form_field" name="comm[$content[id]]" value="$content[comment]" size="25" maxlength="255" />
        </td>
 </tr>
index def016e..bd26917 100644 (file)
@@ -11,8 +11,8 @@
                        {--ADMIN_VERBOSE_SQL--}:
                </td>
                <td class="bottom" width="150" align="right">
-                       <input type="radio" class="form_field" name="verbose_sql" value="Y" class="form_field"$content[verbose_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="verbose_sql" value="N" class="form_field"$content[verbose_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="verbose_sql" value="Y"[verbose_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="verbose_sql" value="N"[verbose_n] /> {--NO--}
                </td>
        </tr>
        <tr>
index 88dac2b..ff1b26d 100644 (file)
@@ -9,7 +9,7 @@
        <tr>
                <td width="300" style="padding-left: 5px">{--ADMIN_HOLIDAY_MAX_HOLIDAY--}:</td>
                <td width="270">
-                       <input type="text" class="form_field" name="holiday_max" class="form_field" value="{?holiday_max?}" size="4" maxlength="6" />
+                       <input type="text" class="form_field" name="holiday_max" value="{?holiday_max?}" size="4" maxlength="6" />
                        <div class="tiny">({--DAYS--})</div>
                </td>
        </tr>
@@ -20,9 +20,9 @@
        <tr>
                <td class="bottom" width="300" style="padding-left: 5px">{--ADMIN_HOLIDAY_MODE--}:</td>
                <td class="bottom" width="270">
-                       <input type="radio" class="form_field" name="holiday_mode" class="form_field" value="RESET"$content[holiday_mode_reset] />
+                       <input type="radio" class="form_field" name="holiday_mode" value="RESET"$content[holiday_mode_reset] />
                        {--ADMIN_HOLIDAY_MODE_RESET--}<br />
-                       <input type="radio" class="form_field" name="holiday_mode" class="form_field" value="DIRECT"$content[holiday_mode_direct] />
+                       <input type="radio" class="form_field" name="holiday_mode" value="DIRECT"$content[holiday_mode_direct] />
                        {--ADMIN_HOLIDAY_MODE_DIRECT--}
                </td>
        </tr>
index 201707c..e7feb6a 100644 (file)
@@ -9,19 +9,19 @@
        <tr>
                <td align="right">{--ADMIN_NICKNAME_MIN_LENGTH--}:</td>
                <td>
-                       <input type="text" class="form_field" name="nickname_len" class="form_field" value="{?nickname_len?}" size="2" maxlength="4" />
+                       <input type="text" class="form_field" name="nickname_len" value="{?nickname_len?}" size="2" maxlength="4" />
                </td>
        </tr>
        <tr>
                <td align="right">{--ADMIN_NICKNAME_PATTERN--}:</td>
                <td>
-                       <input type="text" class="form_field" name="nickname_pattern" class="form_field" value="{?nickname_pattern?}" size="10" maxlength="255" />
+                       <input type="text" class="form_field" name="nickname_pattern" value="{?nickname_pattern?}" size="10" maxlength="255" />
                </td>
        </tr>
        <tr>
                <td class="bottom" align="right">{--ADMIN_NICKNAME_CHARACTERS--}:</td>
                <td class="bottom">
-                       <input type="text" class="form_field" name="nickname_chars" class="form_field" value="{?nickname_chars?}" size="15" maxlength="255" />
+                       <input type="text" class="form_field" name="nickname_chars" value="{?nickname_chars?}" size="15" maxlength="255" />
                </td>
        </tr>
        <tr>
index 3d6c424..09816d9 100644 (file)
                        {--ADMIN_ORDER_MAX_ORDER_SELECT--}
                </td>
                <td class="bottom">
-                       <input type="radio" class="form_field" name="order_max_full" class="form_field" value="MAX"$content[order_max_full_max] />
+                       <input type="radio" class="form_field" name="order_max_full" value="MAX"$content[order_max_full_max] />
                        {--ADMIN_ORDER_MAX--}
                </td>
        </tr>
 
        <tr>
                <td class="bottom">
-                       <input type="radio" class="form_field" name="order_max_full" class="form_field" value="ORDER"$content[order_max_full_order] />
+                       <input type="radio" class="form_field" name="order_max_full" value="ORDER"$content[order_max_full_order] />
                        {--ADMIN_ORDER_ORDER--}
                </td>
        </tr>
                        {--ADMIN_ORDER_MIN_RECEIVER_PER_ORDER--}:
                </td>
                <td class="bottom" align="center">
-                       <input type="input" name="order_min" class="form_field" value="{?order_min?}" size="5" maxlength="20" />
+                       <input type="input" class="form_field" name="order_min" value="{?order_min?}" size="5" maxlength="20" />
                </td>
        </tr>
 
index f2b33a0..00d70e8 100644 (file)
                </td>
                <td class="bottom" align="right">
                        {--ADMIN_CONFIG_POINTS_DIRECT--}
-                       <input type="radio" class="form_field" name="allow_direct_pay" value="Y" class="form_field"$content[allow_direct_pay_y] /><br />
+                       <input type="radio" class="form_field" name="allow_direct_pay" value="Y"$content[allow_direct_pay_y] /><br />
                        <hr noshade width="220">
                        {--ADMIN_CONFIG_POINTS_MAILS--}
-                       <input type="radio" class="form_field" name="allow_direct_pay" value="N" class="form_field"$content[allow_direct_pay_n] />
+                       <input type="radio" class="form_field" name="allow_direct_pay" value="N"$content[allow_direct_pay_n] />
                </td>
        </tr>
        <tr>
                <td class="bottom" align="right">{--ADMIN_CONFIG_REFMODE--}</td>
                <td class="bottom" align="right" style="padding-right: 10px">
                        {--ADMIN_CONFIG_REFMODE_REF--}
-                       <input type="radio" class="form_field" name="reg_points_mode" value="ref" class="form_field"$content[reg_points_mode_ref] />
+                       <input type="radio" class="form_field" name="reg_points_mode" value="ref"$content[reg_points_mode_ref] />
                        <hr noshade width="220">
                        {--ADMIN_CONFIG_REFMODE_DIRECT--}
-                       <input type="radio" class="form_field" name="reg_points_mode" value="direct" class="form_field"$content[reg_points_mode_direct] />
+                       <input type="radio" class="form_field" name="reg_points_mode" value="direct"$content[reg_points_mode_direct] />
                </td>
        </tr>
        <tr>
index a0f3a94..04f04a0 100644 (file)
@@ -9,7 +9,7 @@
        <tr>
                <td width="300" align="right">{--ADMIN_PRIMERA_API_NAME--}:</td>
                <td width="270">
-                       <input type="text" class="form_field" name="primera_api_name" class="form_field" value="{?primera_api_name?}" size="10" maxlength="255" />
+                       <input type="text" class="form_field" name="primera_api_name" value="{?primera_api_name?}" size="10" maxlength="255" />
                </td>
        </tr>
        <tr>
index fe4bbb7..754eda3 100644 (file)
@@ -11,8 +11,8 @@
                {--ADMIN_CONFIG_REMOVEIP_ANON_IP--}
        </td>
        <td width="150" style="padding-left: 10px">
-               <input type="radio" class="form_field" name="removeip_anon_ip" value="Y" class="form_field"$content[removeip_anon_ip_y] /> {--YES--}<br />
-               <input type="radio" class="form_field" name="removeip_anon_ip" value="N" class="form_field"$content[removeip_anon_ip_n] /> {--NO--}
+               <input type="radio" class="form_field" name="removeip_anon_ip" value="Y"$content[removeip_anon_ip_y] /> {--YES--}<br />
+               <input type="radio" class="form_field" name="removeip_anon_ip" value="N"$content[removeip_anon_ip_n] /> {--NO--}
        </td>
 </tr>
 <tr>
@@ -20,8 +20,8 @@
                {--ADMIN_CONFIG_REMOVEIP_ANON_HOST--}
        </td>
        <td width="150" style="padding-left: 10px">
-               <input type="radio" class="form_field" name="removeip_anon_host" value="Y" class="form_field"$content[removeip_anon_host_y] /> {--YES--}<br />
-               <input type="radio" class="form_field" name="removeip_anon_host" value="N" class="form_field"$content[removeip_anon_host_n] /> {--NO--}
+               <input type="radio" class="form_field" name="removeip_anon_host" value="Y"$content[removeip_anon_host_y] /> {--YES--}<br />
+               <input type="radio" class="form_field" name="removeip_anon_host" value="N"$content[removeip_anon_host_n] /> {--NO--}
        </td>
 </tr>
 <tr>
@@ -29,8 +29,8 @@
                {--ADMIN_CONFIG_REMOVEIP_ANON_UA--}
        </td>
        <td width="150" style="padding-left: 10px">
-               <input type="radio" class="form_field" name="removeip_anon_ua" value="Y" class="form_field"$content[removeip_anon_ua_y] /> {--YES--}
-               <input type="radio" class="form_field" name="removeip_anon_ua" value="N" class="form_field"$content[removeip_anon_ua_n] /> {--NO--}
+               <input type="radio" class="form_field" name="removeip_anon_ua" value="Y"$content[removeip_anon_ua_y] /> {--YES--}
+               <input type="radio" class="form_field" name="removeip_anon_ua" value="N"$content[removeip_anon_ua_n] /> {--NO--}
        </td>
 </tr>
 <tr>
@@ -38,8 +38,8 @@
                {--ADMIN_CONFIG_REMOVEIP_ANON_REF--}
        </td>
        <td width="150" style="padding-left: 10px">
-               <input type="radio" class="form_field" name="removeip_anon_ref" value="Y" class="form_field"$content[removeip_anon_ref_y] /> {--YES--}
-               <input type="radio" class="form_field" name="removeip_anon_ref" value="N" class="form_field"$content[removeip_anon_ref_n] /> {--NO--}
+               <input type="radio" class="form_field" name="removeip_anon_ref" value="Y"$content[removeip_anon_ref_y] /> {--YES--}
+               <input type="radio" class="form_field" name="removeip_anon_ref" value="N"$content[removeip_anon_ref_n] /> {--NO--}
        </td>
 </tr>
 <tr>
@@ -59,8 +59,8 @@
                {--ADMIN_CONFIG_REMOVEIP_ADMIN_SHOW--}
        </td>
        <td width="150" style="padding-left: 10px">
-               <input type="radio" class="form_field" name="removeip_admin_show" value="Y" class="form_field"$content[removeip_admin_show_y] /> {--YES--}<br />
-               <input type="radio" class="form_field" name="removeip_admin_show" value="N" class="form_field"$content[removeip_admin_show_n] /> {--NO--}
+               <input type="radio" class="form_field" name="removeip_admin_show" value="Y"$content[removeip_admin_show_y] /> {--YES--}<br />
+               <input type="radio" class="form_field" name="removeip_admin_show" value="N"$content[removeip_admin_show_n] /> {--NO--}
        </td>
 </tr>
 <tr>
@@ -68,8 +68,8 @@
                {--ADMIN_CONFIG_REMOVEIP_GUEST_SHOW--}
        </td>
        <td width="150" style="padding-left: 10px">
-               <input type="radio" class="form_field" name="removeip_guest_show" value="Y" class="form_field"$content[removeip_guest_show_y] /> {--YES--}<br />
-               <input type="radio" class="form_field" name="removeip_guest_show" value="N" class="form_field"$content[removeip_guest_show_n] /> {--NO--}
+               <input type="radio" class="form_field" name="removeip_guest_show" value="Y"$content[removeip_guest_show_y] /> {--YES--}<br />
+               <input type="radio" class="form_field" name="removeip_guest_show" value="N"$content[removeip_guest_show_n] /> {--NO--}
        </td>
 </tr>
 <tr>
@@ -77,8 +77,8 @@
                {--ADMIN_CONFIG_REMOVEIP_MEMBER_SHOW--}
        </td>
        <td width="150" style="padding-left: 10px">
-               <input type="radio" class="form_field" name="removeip_member_show" value="Y" class="form_field"$content[removeip_member_show_y] /> {--YES--}<br />
-               <input type="radio" class="form_field" name="removeip_member_show" value="N" class="form_field"$content[removeip_member_show_n] /> {--NO--}
+               <input type="radio" class="form_field" name="removeip_member_show" value="Y"$content[removeip_member_show_y] /> {--YES--}<br />
+               <input type="radio" class="form_field" name="removeip_member_show" value="N"$content[removeip_member_show_n] /> {--NO--}
        </td>
 </tr>
 <tr>
@@ -86,8 +86,8 @@
                {--ADMIN_CONFIG_REMOVEIP_SPONSOR_SHOW--}
        </td>
        <td class="bottom" width="150" style="padding-left: 10px">
-               <input type="radio" class="form_field" name="removeip_sponsor_show" value="Y" class="form_field"$content[removeip_sponsor_show_y] /> {--YES--}<br />
-               <input type="radio" class="form_field" name="removeip_sponsor_show" value="N" class="form_field"$content[removeip_sponsor_show_n] /> {--NO--}
+               <input type="radio" class="form_field" name="removeip_sponsor_show" value="Y"$content[removeip_sponsor_show_y] /> {--YES--}<br />
+               <input type="radio" class="form_field" name="removeip_sponsor_show" value="N"$content[removeip_sponsor_show_n] /> {--NO--}
        </td>
 </tr>
 <tr>
index ddf645d..01d5188 100644 (file)
@@ -2,7 +2,7 @@
        <td class="{%template,ColorSwitch%} bottom right" align="center">$content[module]</td>
        <td class="{%template,ColorSwitch%} bottom right">{%pipe,fixEmptyContentToDashes=$content[title]%}</td>
        <td class="{%template,ColorSwitch%} bottom" align="center">
-               <input type="radio" class="form_field" name="mod[$content[module]]" class="form_field" value="Y"$content[y_default] /> {--YES--}<br />
-               <input type="radio" class="form_field" name="mod[$content[module]]" class="form_field" value="N"$content[n_default] /> {--NO--}
+               <input type="radio" class="form_field" name="mod[$content[module]]" value="Y"$content[y_default] /> {--YES--}<br />
+               <input type="radio" class="form_field" name="mod[$content[module]]" value="N"$content[n_default] /> {--NO--}
        </td>
 </tr>
index d62e18d..b070135 100644 (file)
@@ -11,7 +11,7 @@
                        <div class="tiny">({--ADMIN_GSTATS_MEMBERS_NOTE--})</div>
                </td>
                <td>
-                       <input type="radio" class="form_field" name="guest_stats" class="form_field" value="members"$content[guest_stats_members] />
+                       <input type="radio" class="form_field" name="guest_stats" value="members"$content[guest_stats_members] />
                </td>
        </tr>
        <tr>
@@ -19,7 +19,7 @@
                        <div class="tiny">({--ADMIN_GSTATS_MODULES_NOTE--})</div>
                </td>
                <td>
-                       <input type="radio" class="form_field" name="guest_stats" class="form_field" value="modules"$content[guest_stats_modules] />
+                       <input type="radio" class="form_field" name="guest_stats" value="modules"$content[guest_stats_modules] />
                </td>
        </tr>
        <tr>
@@ -27,7 +27,7 @@
                        <div class="tiny">({--ADMIN_GSTATS_INACTIVE_NOTE--})</div>
                </td>
                <td class="bottom">
-                       <input type="radio" class="form_field" name="guest_stats" class="form_field" value="inactive"$content[guest_stats_inactive] />
+                       <input type="radio" class="form_field" name="guest_stats" value="inactive"$content[guest_stats_inactive] />
                </td>
        </tr>
        <tr>
@@ -38,7 +38,7 @@
        <tr>
                <td class="bottom" align="right">{--ADMIN_MEMBER_STATS_LIMIT--}:</td>
                <td class="bottom">
-                       <input type="text" class="form_field" name="stats_limit" class="form_field" value="{?stats_limit?}" size="4" maxlength="20" />
+                       <input type="text" class="form_field" name="stats_limit" value="{?stats_limit?}" size="4" maxlength="20" />
                </td>
        </tr>
        <tr>
index c70b7e0..7c97874 100644 (file)
@@ -9,7 +9,7 @@
        <tr>
                <td align="right">{--ADMIN_TRANSFER_MAX--}:</td>
                <td>
-                       <input type="text" class="form_field" name="transfer_max" class="form_field" value="{?transfer_max?}" size="4" maxlength="6" />
+                       <input type="text" class="form_field" name="transfer_max" value="{?transfer_max?}" size="4" maxlength="6" />
                </td>
        </tr>
        <tr>
@@ -23,7 +23,7 @@
        <tr>
                <td align="right">{--ADMIN_TRANSFER_BALANCE--}:</td>
                <td>
-                       <input type="text" class="form_field" name="transfer_balance" class="form_field" value="{?transfer_balance?}" size="4" maxlength="6" />
+                       <input type="text" class="form_field" name="transfer_balance" value="{?transfer_balance?}" size="4" maxlength="6" />
                        <span class="tiny">({?POINTS?})</span>
                </td>
        </tr>
@@ -33,7 +33,7 @@
                        <div class="notice">({--ADMIN_TRANSFER_CODE_NOTE--})</div>
                </td>
                <td>
-                       <input type="text" class="form_field" name="transfer_code" class="form_field" value="{?transfer_code?}" size="4" maxlength="6" />
+                       <input type="text" class="form_field" name="transfer_code" value="{?transfer_code?}" size="4" maxlength="6" />
                </td>
        </tr>
        <tr>
index 01d6d35..84d0fde 100644 (file)
@@ -9,13 +9,13 @@
        <tr>
                <td align="right">{--ADMIN_USER_LIMIT_USER--}:</td>
                <td>
-                       <input type="text" class="form_field" name="user_limit" class="form_field" value="{?user_limit?}" size="4" maxlength="6" />
+                       <input type="text" class="form_field" name="user_limit" value="{?user_limit?}" size="4" maxlength="6" />
                </td>
        </tr>
        <tr>
                <td class="bottom" align="right">{--ADMIN_USER_ALPHA_USER--}:</td>
                <td class="bottom">
-                       <input type="text" class="form_field" name="user_alpha" class="form_field" value="{?user_alpha?}" size="4" maxlength="6" />
+                       <input type="text" class="form_field" name="user_alpha" value="{?user_alpha?}" size="4" maxlength="6" />
                </td>
        </tr>
        <tr>
index 12a9e08..a56df15 100644 (file)
@@ -11,8 +11,8 @@
                        {--ADMIN_CONFIG_VALIDATOR_ENABLED--}
                </td>
                <td class="bottom" width="60">
-                       <input type="radio" class="form_field" name="enable_validator" class="form_field" value="Y"$content[enable_validator_yes] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="enable_validator" class="form_field" value="N"$content[enable_validator_no] /> {--NO--}
+                       <input type="radio" class="form_field" name="enable_validator" value="Y"$content[enable_validator_yes] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="enable_validator" value="N"$content[enable_validator_no] /> {--NO--}
                </td>
        </tr>
        <tr>
index c505836..d64f6e8 100644 (file)
@@ -51,7 +51,7 @@
                        {--ADMIN_WERNIS_MIN_PAYOUT--}:
                </td>
                <td>
-                       <input type="text" class="form_field" name="wernis_min_payout" class="form_field" value="{?wernis_min_payout?}" size="5" maxlength="20" /> Wernis
+                       <input type="text" class="form_field" name="wernis_min_payout" value="{?wernis_min_payout?}" size="5" maxlength="20" /> Wernis
                </td>
        </tr>
        <tr>
@@ -59,7 +59,7 @@
                        {--ADMIN_WERNIS_MIN_WITHDRAW--}:
                </td>
                <td>
-                       <input type="text" class="form_field" name="wernis_min_withdraw" class="form_field" value="{?wernis_min_withdraw?}" size="5" maxlength="20" /> Wernis
+                       <input type="text" class="form_field" name="wernis_min_withdraw" value="{?wernis_min_withdraw?}" size="5" maxlength="20" /> Wernis
                </td>
        </tr>
        <tr>
index 18b6480..c53a5e6 100644 (file)
@@ -1,10 +1,10 @@
 <tr>
        <td align="center" class="{%template,ColorSwitch%} bottom right">$content[id]</td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               <input type="text" class="form_field" name="login[$content[id]]" class="form_field" value="$content[login]" size="20" maxlength="255" />
+               <input type="text" class="form_field" name="login[$content[id]]" value="$content[login]" size="20" maxlength="255" />
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
-               <input type="text" class="form_field" name="email[$content[id]]" class="form_field" value="$content[email]" size="25" maxlength="255" />
+               <input type="text" class="form_field" name="email[$content[id]]" value="$content[email]" size="25" maxlength="255" />
        </td>
        <td align="center" class="{%template,ColorSwitch%} bottom right">
                <input type="password" class="form_field" name="pass1[$content[id]]" size="10" maxlength="255" />
index 754e733..0e351a0 100644 (file)
@@ -6,7 +6,7 @@
 <tr>
        <td align="right" class="{%template,ColorSwitch%}">{--ADMIN_CATEGORY_DESCRIPTION--}:&nbsp;</td>
        <td class="{%template,ColorSwitch%}">
-               <input type="text" class="form_field" name="id[$content[id]]" class="form_field" value="{%pipe,getCategory=$content[id]%}" size="32" maxlength="255" />
+               <input type="text" class="form_field" name="id[$content[id]]" value="{%pipe,getCategory=$content[id]%}" size="32" maxlength="255" />
        </td>
 </tr>
 <tr>
@@ -16,6 +16,6 @@
 <tr>
        <td class="{%template,ColorSwitch%} bottom" align="right">{--ADMIN_ENTER_SORT_KEY--}:&nbsp;</td>
        <td class="{%template,ColorSwitch%} bottom">
-               <input type="text" class="form_field" name="sort[$content[id]]" class="form_field" value="$content[sort]" size="3" maxlength="10" />
+               <input type="text" class="form_field" name="sort[$content[id]]" value="$content[sort]" size="3" maxlength="10" />
        </td>
 </tr>
index 569f26e..75754f5 100644 (file)
@@ -1,10 +1,13 @@
 <tr>
        <td class="{%template,ColorSwitch%} bottom" align="center">
                <strong>$content[id]</strong>
-               <input type="radio" class="form_field" name="id" class="form_field" value="$content[id]" />
+               <input type="radio" class="form_field" name="id" value="$content[id]" />
        </td>
        <td class="{%template,ColorSwitch%} bottom">
                $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]%})
        </td>
 </tr>
index c62f68c..b02ea92 100644 (file)
@@ -6,25 +6,25 @@
 <tr>
        <td class="{%template,ColorSwitch%}" align="right">{--ADMIN_PAYMENT_TIME--}:</td>
        <td class="{%template,ColorSwitch%}">
-               <input type="text" class="form_field" name="time[$content[id]]" class="form_field" value="$content[time]" size="3" maxlength="5" />{--_SECONDS--}
+               <input type="text" class="form_field" name="time[$content[id]]" value="$content[time]" size="3" maxlength="5" />{--_SECONDS--}
        </td>
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%}" align="right">{--ADMIN_PAYMENT_PAYMENT--}:</td>
        <td class="{%template,ColorSwitch%}">
-               <input type="text" class="form_field" name="payment[$content[id]]" class="form_field" value="$content[payment]" size="5" maxlength="8" />{?POINTS?}
+               <input type="text" class="form_field" name="payment[$content[id]]" value="$content[payment]" size="5" maxlength="8" />{?POINTS?}
        </td>
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%}" align="right">{--ADMIN_PAYMENT_PRICE--}:</td>
        <td class="{%template,ColorSwitch%}">
-               <input type="text" class="form_field" name="price[$content[id]]" class="form_field" value="$content[price]" size="5" maxlength="8" />
+               <input type="text" class="form_field" name="price[$content[id]]" value="$content[price]" size="5" maxlength="8" />
                <span class="tiny">({?POINTS?})</span>
        </td>
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%} bottom" align="right">{--ADMIN_PAYMENT_TITLE--}:</td>
        <td class="{%template,ColorSwitch%} bottom">
-               <input type="text" class="form_field" name="mail_title[$content[id]]" class="form_field" value="$content[mail_title]" size="25" maxlength="255" />
+               <input type="text" class="form_field" name="mail_title[$content[id]]" value="$content[mail_title]" size="25" maxlength="255" />
        </td>
 </tr>
index 75b7eb4..80015df 100644 (file)
@@ -2,13 +2,13 @@
        <td class="{%template,ColorSwitch%}" align="right" width="200">{--ADMIN_EDIT_REFERAL_BANNER_URL--}:</td>
        <td class="{%template,ColorSwitch%}" width="350">
                <input type="hidden" name="sel[$content[id]]" value="1" />
-               <input type="text" class="form_field" name="url[$content[id]]" class="form_field" value="$content[url]" size="40" maxlength="255" />
+               <input type="text" class="form_field" name="url[$content[id]]" value="$content[url]" size="40" maxlength="255" />
        </td>
 </tr>
 <tr>
        <td class="{%template,ColorSwitch%}" align="right">{--ADMIN_EDIT_REFERAL_BANNER_ALTERNATIVE_TEXT--}:</td>
        <td class="{%template,ColorSwitch%}">
-               <input type="text" class="form_field" name="alternate[$content[id]]" class="form_field" value="$content[alternate]" size="30" maxlength="255" />
+               <input type="text" class="form_field" name="alternate[$content[id]]" value="$content[alternate]" size="30" maxlength="255" />
        </td>
 </tr>
 <tr>
index 4508777..1d97c9a 100644 (file)
@@ -14,7 +14,7 @@
        <tr>
                <td align="right">{--ENTER_ADMIN_LOGIN--}:</td>
                <td>
-                       <input type="text" class="form_field" name="login" tabindex="1" size="20" maxlength="100" class="form_field" value="$content[login]" />
+                       <input type="text" class="form_field" name="login" tabindex="1" size="20" maxlength="100" value="$content[login]" />
                </td>
        </tr>
        $content[login_message]
index bd574e1..6703be5 100644 (file)
                        <tr>
                                <td align="right">{--NL_MODE_TEXT--}</td>
                                <td>
-                                       <input type="radio" class="form_field" name="mode" class="form_field" value="text" checked="checked" />
+                                       <input type="radio" class="form_field" name="mode" value="text" checked="checked" />
                                </td>
                        </tr>
                        <tr>
                                <td align="right">{--NL_MODE_HTML--}</td>
                                <td>
-                                       <input type="radio" class="form_field" name="mode" class="form_field" value="html" />
+                                       <input type="radio" class="form_field" name="mode" value="html" />
                                </td>
                        </tr>
                </table>
                        <tr>
                                <td>{--YES--}</td>
                                <td>
-                                       <input type="radio" class="form_field" name="auto_urls" class="form_field" value="Y" checked="checked" />
+                                       <input type="radio" class="form_field" name="auto_urls" value="Y" checked="checked" />
                                </td>
                                <td>{--NO--}</td>
                                <td>
-                                       <input type="radio" class="form_field" name="auto_urls" class="form_field" value="N" />
+                                       <input type="radio" class="form_field" name="auto_urls" value="N" />
                                </td>
                        </tr>
                </table>
index 36936d8..d0eff24 100644 (file)
                        <tr>
                                <td width="30%">{--YES--}</td>
                                <td width="20%">
-                                       <input type="radio" class="form_field" name="auto_urls" class="form_field" value="Y" checked="checked" />
+                                       <input type="radio" class="form_field" name="auto_urls" value="Y" checked="checked" />
                                </td>
                                <td width="30%">{--NO--}</td>
                                <td width="20%">
-                                       <input type="radio" class="form_field" name="auto_urls" class="form_field" value="N" />
+                                       <input type="radio" class="form_field" name="auto_urls" value="N" />
                                </td>
                        </tr>
                </table>
@@ -37,7 +37,7 @@
        </tr>
        <tr>
                <td colspan="2" class="table_footer">
-                       <input type="hidden" name="mode" class="form_field" value="text" />
+                       <input type="hidden" name="mode" value="text" />
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
                        <input type="submit" class="form_submit" name="ok" value="{--ADMIN_SEND_NL--}" />
                </td>
index 4a5f8cb..600771b 100644 (file)
@@ -11,7 +11,7 @@
                        {--ADMIN_ENTER_POINTS_SUB--}:
                </td>
                <td>
-                       <input type="text" class="form_field" name="points" size="6" maxlength="7" class="form_field" />
+                       <input type="text" class="form_field" name="points" size="6" maxlength="7" />
                </td>
        </tr>
        <tr>
index d6f9f37..3af3ba8 100644 (file)
 </table>
 
 <div class="big">
-       {--DOUBLER_ALREADY_PAYOUT--}:</div>
-       <br />
+       {--DOUBLER_ALREADY_PAYOUT--}:
+</div>
+
+<div class="para">
        $content[payout_history]
 </div>
 
 <div class="big">
-       {--DOUBLER_NEXT_PAYOUT--}:</div>
-       <br />
+       {--DOUBLER_NEXT_PAYOUT--}:
+</div>
+
+<div class="para">
        {%pipe,generateDoublerTable%}
 </div>
+</div>
index fa1bbea..0dd68cb 100644 (file)
                                        {--AGREE_TO_THIS--}
                                </td>
                                <td width="50%">
-                                       <input type="radio" class="form_field" name="agree" class="form_field" value="Y" /> {--YES--}<br />
-                                       <input type="radio" class="form_field" name="agree" class="form_field" value="N" checked="checked" /> {--NO--}
+                                       <input type="radio" class="form_field" name="agree" value="Y" /> {--YES--}<br />
+                                       <input type="radio" class="form_field" name="agree" value="N" checked="checked" /> {--NO--}
                                </td>
                        </tr>
                        </table>
index 99739c1..ec4a793 100644 (file)
@@ -1,6 +1,6 @@
 <tr>
        <td class="bottom {%template,ColorSwitch%}" height="50" style="padding-left: 2px; padding-right: 2px">
-               <input type="radio" class="form_field" name="pay_type" class="form_field" value="$content[id]" />
+               <input type="radio" class="form_field" name="pay_type" value="$content[id]" />
                $content[pay_name]
                <div align="right">
                        ($content[pay_min_count] $content[pay_currency] = $content[res] {?POINTS?})
index b39683d..d08e2ca 100644 (file)
        </tr>
        <tr>
                <td align="right" class="install_right">{--INSTALLER_SERVER_PATH--}:</td>
-               <td align="left"><input type="text" class="form_field" name="spath" size="50" value="{?PATH?}" class="form_field" /></td>
+               <td align="left"><input type="text" class="form_field" name="spath" size="50" value="{?PATH?}" /></td>
        </tr>
        <tr>
                <td align="right" class="install_right">{--INSTALLER_BASE_URL--} ({--BASE_URL_NOTE--}):</td>
-               <td align="left"><input type="text" class="form_field" name="burl" size="50" value="{?URL?}" class="form_field" /></td>
+               <td align="left"><input type="text" class="form_field" name="burl" size="50" value="{?URL?}" /></td>
        </tr>
        <tr>
                <td align="right" class="install_right">{--INSTALLER_HP_TITLE--}:</td>
-               <td align="left"><input type="text" class="form_field" name="title" size="50" maxlength="255" value="{?MAIN_TITLE?}" class="form_field" /></td>
+               <td align="left"><input type="text" class="form_field" name="title" size="50" maxlength="255" value="{?MAIN_TITLE?}" /></td>
        </tr>
        <tr>
                <td align="right" class="install_right">{--INSTALLER_HP_SLOGAN--}:</td>
-               <td align="left"><input type="text" class="form_field" name="slogan" size="50" maxlength="255" value="{?SLOGAN?}" class="form_field" /></td>
+               <td align="left"><input type="text" class="form_field" name="slogan" size="50" maxlength="255" value="{?SLOGAN?}" /></td>
        </tr>
        <tr>
                <td align="right" class="install_right">{--INSTALLER_HP_EMAIL--}:</td>
-               <td align="left"><input type="text" class="form_field" name="email" size="30" maxlength="255" value="{?WEBMASTER?}" class="form_field" /></td>
+               <td align="left"><input type="text" class="form_field" name="email" size="30" maxlength="255" value="{?WEBMASTER?}" /></td>
        </tr>
        <tr>
                <td colspan="2" align="center">
index 7d47db9..606ecde 100644 (file)
        <tr>
                <td align="right" class="install_right">{--INSTALLER_MYSQL_HOST--}:</td>
                <td align="left">
-                       <input type="text" class="form_field" name="mysql[host]" size="25" value="$content[mysql_host]" class="form_field" />
+                       <input type="text" class="form_field" name="mysql[host]" size="25" value="$content[mysql_host]" />
                </td>
        </tr>
        <tr>
                <td align="right" class="install_right">{--INSTALLER_MYSQL_DBASE--}:</td>
                <td align="left">
-                       <input type="text" class="form_field" name="mysql[dbase]" size="25" value="$content[mysql_dbase]" class="form_field" />
+                       <input type="text" class="form_field" name="mysql[dbase]" size="25" value="$content[mysql_dbase]" />
                </td>
        </tr>
        <tr>
                <td align="right" class="install_right">{--INSTALLER_MYSQL_PREFIX--}:</td>
                <td align="left">
-                       <input type="text" class="form_field" name="mysql[prefix]" size="25" value="$content[mysql_prefix]" class="form_field" />
+                       <input type="text" class="form_field" name="mysql[prefix]" size="25" value="$content[mysql_prefix]" />
                </td>
        </tr>
        <tr>
        <tr>
                <td align="right" class="install_right">{--INSTALLER_MYSQL_LOGIN--}:</td>
                <td align="left">
-                       <input type="text" class="form_field" name="mysql[login]" size="25" value="$content[mysql_login]" class="form_field" />
+                       <input type="text" class="form_field" name="mysql[login]" size="25" value="$content[mysql_login]" />
                </td>
        </tr>
        <tr>
                <td align="right" class="install_right">{--INSTALLER_MYSQL_PASS1--}:</td>
                <td align="left">
-                       <input type="password" class="form_field" name="mysql[pass1]" size="25" class="form_field" />
+                       <input type="password" class="form_field" name="mysql[pass1]" size="25" />
                </td>
        </tr>
        <tr>
                <td align="right" class="install_right">{--INSTALLER_MYSQL_PASS2--}:</td>
                <td align="left">
-                       <input type="password" class="form_field" name="mysql[pass2]" size="25" class="form_field" />
+                       <input type="password" class="form_field" name="mysql[pass2]" size="25" />
                </td>
        </tr>
        <tr>
index 014f06a..b0c4aff 100644 (file)
@@ -1,3 +1,4 @@
+<div align="center">
 <form accept-charset="utf-8" action="{%url=install.php?page=5%}" method="post" target="_self">
 <table border="0" cellspacing="0" cellpadding="0" class="install_main">
        <tr>
        <tr>
                <td align="right" class="install_right">{--INSTALLER_TEXT_SMTP_HOST--}:</td>
                <td align="left">
-                       <input type="text" class="form_field" name="smtp_host" size="25" value="$content[smtp_host]" class="form_field" />
+                       <input type="text" class="form_field" name="smtp_host" size="25" value="$content[smtp_host]
                </td>
        </tr>
        <tr>
                <td align="right" class="install_right">{--INSTALLER_TEXT_SMTP_USER--}:</td>
                <td align="left">
-                       <input type="text" class="form_field" name="smtp_user" size="25" value="$content[smtp_user]" class="form_field" />
+                       <input type="text" class="form_field" name="smtp_user" size="25" value="$content[smtp_user]
                </td>
        </tr>
        <tr>
                <td align="right" class="install_right">{--INSTALLER_TEXT_SMTP_PASS1--}:</td>
                <td align="left">
-                       <input type="password" class="form_field" name="smtp_pass1" size="25" value="$content[smtp_pass1]" class="form_field" />
+                       <input type="password" class="form_field" name="smtp_pass1" size="25" value="$content[smtp_pass1]
                </td>
        </tr>
        <tr>
                <td align="right" class="install_right">{--INSTALLER_TEXT_SMTP_PASS2--}:</td>
                <td align="left">
-                       <input type="password" class="form_field" name="smtp_pass2" size="25" value="$content[smtp_pass2]" class="form_field" />
+                       <input type="password" class="form_field" name="smtp_pass2" size="25" value="$content[smtp_pass2]
                </td>
        </tr>
        <tr>
@@ -53,3 +54,4 @@
        </tr>
 </table>
 </form>
+</div>
index d795e9c..526eb9f 100644 (file)
@@ -28,7 +28,7 @@ function startCounter() {
                                <td align="center">
                                <form accept-charset="utf-8" name="confirm" style="margin-top: 0px;margin-bottom:0px">
                                        {--MEMBER_TIME_COUNTER_1--}
-                                       <input type="text" class="form_field" name="counter" size="$content[tim2]" readonly class="form_field" value="$content[time]" />
+                                       <input type="text" class="form_field" name="counter" size="$content[tim2]" readonly="readonly" value="$content[time]" />
                                        {--MEMBER_TIME_COUNTER_2--}
                                </form>
                                </td>
index 4917c3f..9057457 100644 (file)
@@ -1,9 +1,9 @@
 <tr>
        <td class="{%template,ColorSwitch%} bottom" align="right">$content[cat]</td>
        <td class="{%template,ColorSwitch%} bottom" align="center">
-               <input type="radio" class="form_field" name="cat[$content[id]]" class="form_field" value="Y"$content[jy] />
+               <input type="radio" class="form_field" name="cat[$content[id]]" value="Y"$content[jy] />
                {--YES--}
-               <input type="radio" class="form_field" name="cat[$content[id]]" class="form_field" value="N"$content[jn] />
+               <input type="radio" class="form_field" name="cat[$content[id]]" value="N"$content[jn] />
                {--NO--}
        </td>
 </tr>
index d52d12b..c913c0a 100644 (file)
@@ -11,8 +11,8 @@
                        {--MEMBER_HTML_TEXT--}
                </td>
                <td class="bottom" align="left">
-                       <input type="radio" class="form_field" name="html" class="form_field" value="Y"$content[html_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="html" class="form_field" value="N"$content[html_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="html" value="Y"$content[html_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="html" value="N"$content[html_n] /> {--NO--}
                </td>
        </tr>
        <tr>
index de00576..6d1a042 100644 (file)
@@ -6,10 +6,10 @@
 <tr>
        <td class="bottom" valign="top" align="center" height="20">
                {--MEMBER_HTML_MSG--}:
-               <input type="radio" class="form_field" name="html" class="form_field" value="Y" />
+               <input type="radio" class="form_field" name="html" value="Y" />
        </td>
        <td class="bottom" valign="top" align="center">
                {--MEMBER_NORMAL_MSG--}:
-               <input type="radio" class="form_field" name="html" class="form_field" value="N" checked="checked" />
+               <input type="radio" class="form_field" name="html" value="N" checked="checked" />
        </td>
 </tr>
index e59d4c1..5db1660 100644 (file)
@@ -1,3 +1,4 @@
+<div align="center">
 <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=payout&amp;payout=$content[payout]%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" width="440" class="table dashed">
        <tr>
        <tr>
                <td height="25" align="right">{--MEMBER_PAYOUT_TARGET_BANK--}:</td>
                <td>
-                       <input type="text" class="form_field" name="bank" class="form_field" ize="20" maxlength="255" />
+                       <input type="text" class="form_field" name="bank" ize="20" maxlength="255" />
                </td>
        </tr>
        <tr>
                <td height="25" align="right">{--MEMBER_PAYOUT_OPTIONAL_PASSWORD--}:</td>
                <td>
-                       <input type="password" class="form_field" name="password" class="form_field" ize="10" maxlength="255" />
+                       <input type="password" class="form_field" name="password" ize="10" maxlength="255" />
                </td>
        </tr>
        <tr>
@@ -45,6 +46,7 @@
        </tr>
 </table>
 </form>
+</div>
 
 <div class="notice">
        <div class="para">
index 288e0bc..4dbd460 100644 (file)
@@ -1,6 +1,6 @@
 <tr>
        <td class="{%template,ColorSwitch%} bottom right" align="center" height="30">
-               <input type="radio" class="form_field" name="member_theme" class="form_field" value="$content[unix]"$content[default] />
+               <input type="radio" class="form_field" name="member_theme" value="$content[unix]"$content[default] />
        </td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">$content[theme_name]</td>
        <td class="{%template,ColorSwitch%} bottom right" align="center">
index 09dd3f1..d22d82f 100644 (file)
@@ -5,8 +5,8 @@
                        {--TRANSFER_ALLOW_OPT_IN--}
                </td>
                <td align="center" width="160" class="bottom" height="50">
-                       <input type="radio" class="form_field" name="opt_in" class="form_field" value="Y"$content[allow_y] /> {--YES--}<br />
-                       <input type="radio" class="form_field" name="opt_in" class="form_field" value="N"$content[allow_n] /> {--NO--}
+                       <input type="radio" class="form_field" name="opt_in" value="Y"$content[allow_y] /> {--YES--}<br />
+                       <input type="radio" class="form_field" name="opt_in" value="N"$content[allow_n] /> {--NO--}
                </td>
        </tr>
        <tr>
index a7a5ba6..07cf726 100644 (file)
@@ -11,9 +11,9 @@
                {--GUEST_SPONSOR_RECEIVE_WARNINGS--}
        </td>
        <td class="bottom" align="center">
-               <input type="radio" class="form_field" name="receive_warnings" class="form_field" value="Y"$content[receive_warnings_y] />
+               <input type="radio" class="form_field" name="receive_warnings" value="Y"$content[receive_warnings_y] />
                {--YES--}
-               <input type="radio" class="form_field" name="receive_warnings" class="form_field" value="N"$content[receive_warnings_n] />
+               <input type="radio" class="form_field" name="receive_warnings" value="N"$content[receive_warnings_n] />
                {--NO--}
        </td>
 </tr>