From ee71bda9cc7d75f090ae2e1a2d05d4903523e112 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 4 Mar 2009 18:59:09 +0000 Subject: [PATCH] MyISAM/InnoDB support added --- inc/databases.php | 2 +- inc/extensions/ext-admins.php | 4 +- inc/extensions/ext-bank.php | 8 ++-- inc/extensions/ext-beg.php | 2 +- inc/extensions/ext-birthday.php | 2 +- inc/extensions/ext-bonus.php | 4 +- inc/extensions/ext-booking.php | 2 +- inc/extensions/ext-country.php | 2 +- inc/extensions/ext-debug.php | 8 ++-- inc/extensions/ext-holiday.php | 2 +- inc/extensions/ext-mediadata.php | 2 +- inc/extensions/ext-nickname.php | 2 +- inc/extensions/ext-online.php | 2 +- inc/extensions/ext-optimize.php | 2 +- inc/extensions/ext-payout.php | 4 +- inc/extensions/ext-primera.php | 2 +- inc/extensions/ext-rallye.php | 6 +-- inc/extensions/ext-refback.php | 2 +- inc/extensions/ext-register.php | 2 +- inc/extensions/ext-sponsor.php | 24 ++++++------ inc/extensions/ext-sql_patches.php | 10 ++--- inc/extensions/ext-surfbar.php | 10 ++--- inc/extensions/ext-theme.php | 2 +- inc/extensions/ext-transfer.php | 4 +- inc/extensions/ext-user.php | 2 +- inc/extensions/ext-wernis.php | 2 +- inc/extensions/ext-yoomedia.php | 2 +- inc/install-inc.php | 14 ++++++- inc/language/install_de.php | 3 ++ install/tables.sql | 42 ++++++++++----------- templates/de/html/install/install_page2.tpl | 12 ++++++ templates/de/html/install/install_page3.tpl | 17 +++++---- 32 files changed, 115 insertions(+), 89 deletions(-) diff --git a/inc/databases.php b/inc/databases.php index 9ce1acd2c0..7feec807b1 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -98,7 +98,7 @@ define('SERVER_URL', "http://www.mxchange.org"); // Current SVN revision //define('CURR_SVN_REVISION', getActualVersion(0)); -define('CURR_SVN_REVISION', "819"); +define('CURR_SVN_REVISION', "820"); define('CURR_SVN_DATE' , getActualVersion(1)); define('CURR_SVN_VERSION' , getActualVersion(2)); diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php index 70ca361a8d..e588777427 100644 --- a/inc/extensions/ext-admins.php +++ b/inc/extensions/ext-admins.php @@ -104,7 +104,7 @@ what_menu VARCHAR(255) NOT NULL DEFAULT '', access_mode ENUM('deny','allow') NOT NULL DEFAULT 'deny', KEY (admin_id), PRIMARY KEY (id) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); // Update notes (these will be set as task text!) EXT_SET_UPDATE_NOTES("Sogn. ACLs werden hinzugefügt: Access Control Lines sind zu deutsch Zugriffkontrollzeilen, mit denen Sie einstellen können, was welcher Admin machen darf oder nicht."); @@ -122,7 +122,7 @@ admin_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, mail_template VARCHAR(255) NOT NULL, KEY (admin_id), PRIMARY KEY (id) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins','admins_mails','Admin-Mails','Stellen Sie hier ein, welcher Admin welche Mail erhalten soll. Sie können dies (derzeit) jedoch erst, wenn einmal die Mail versendet wurde!','5')"); // Update notes (these will be set as task text!) diff --git a/inc/extensions/ext-bank.php b/inc/extensions/ext-bank.php index 0e8f759399..b245c1595a 100644 --- a/inc/extensions/ext-bank.php +++ b/inc/extensions/ext-bank.php @@ -73,7 +73,7 @@ INDEX `uid_type` (uid, account_type), INDEX (account_created), INDEX (account_locked), INDEX (last_tan_stamp) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bank_transfers`"); ADD_SQL("CREATE TABLE `{!_MYSQL_PREFIX!}_bank_transfers` ( id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, @@ -86,7 +86,7 @@ transfer_purpose TINYTEXT, PRIMARY KEY (id), INDEX (to_account_id, from_account_id), INDEX (day_bookkeeping, day_available) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_bank_packages`"); ADD_SQL("CREATE TABLE `{!_MYSQL_PREFIX!}_bank_packages` ( id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, @@ -106,7 +106,7 @@ free_account_income FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000, free_account_stuff TINYTEXT null, tan_lock TINYINT(3) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (id) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); // 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 @@ -120,7 +120,7 @@ tan VARCHAR(50) NOT NULL DEFAULT '', used ENUM('Y','N') NOT NULL DEFAULT 'N', PRIMARY KEY (id), UNIQUE (account_id, tan) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); // Admin menu queries ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('bank', NULL, 'Bank-Accounts','Verwalten Sie hier alle Bank-Accounts Ihrer Mitglieder, sowie Angebotspakete und Überweisungen.', 6)"); diff --git a/inc/extensions/ext-beg.php b/inc/extensions/ext-beg.php index 4fb5328091..d6c3c1935c 100644 --- a/inc/extensions/ext-beg.php +++ b/inc/extensions/ext-beg.php @@ -62,7 +62,7 @@ remote_ip VARCHAR(15) NOT NULL DEFAULT '0.0.0.0', timeout VARCHAR(10) NOT NULL DEFAULT '', KEY (userid), PRIMARY KEY(id) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); break; case "remove": // Do stuff when removing extension diff --git a/inc/extensions/ext-birthday.php b/inc/extensions/ext-birthday.php index 99761ac17a..b6a45dbf3c 100644 --- a/inc/extensions/ext-birthday.php +++ b/inc/extensions/ext-birthday.php @@ -85,7 +85,7 @@ points BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, chk_value VARCHAR(255) NOT NULL DEFAULT '', KEY(userid), PRIMARY KEY(id) -) Type=MyISAM"); +) Type={!_TABLE_TYPE!}"); ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_birthday','Geburtstagsmails','Stellen Sie hier ein, ob die Mitglieder {!POINTS!} (nicht automatisch) gutgeschrieben kommen sollen oder nicht.', 9)"); // Update notes (these will be set as task text!) diff --git a/inc/extensions/ext-bonus.php b/inc/extensions/ext-bonus.php index 0594eb1601..5db31d82ec 100644 --- a/inc/extensions/ext-bonus.php +++ b/inc/extensions/ext-bonus.php @@ -66,7 +66,7 @@ clicks BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, mails_sent BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, KEY(cat_id), PRIMARY KEY (id) -)TYPE=MyISAM"); +)TYPE={!_TABLE_TYPE!}"); ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_user_links` MODIFY link_type ENUM('NORMAL','BONUS') NOT NULL DEFAULT 'NORMAL'"); ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_user_links` ADD bonus_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0"); ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_user_links` ADD INDEX (bonus_id)"); @@ -148,7 +148,7 @@ PRIMARY KEY(id), KEY mail_id (mail_id), KEY bonus_id (bonus_id), KEY userid (userid) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); // Update notes (these will be set as task text!) EXT_SET_UPDATE_NOTES("Turbo-Bonus wird in Tabelle gezählt für Anzeige, wer alles bereits geklickt hat und welchen Platz er gemacht hat."); diff --git a/inc/extensions/ext-booking.php b/inc/extensions/ext-booking.php index 571a958f70..f32143f462 100644 --- a/inc/extensions/ext-booking.php +++ b/inc/extensions/ext-booking.php @@ -60,7 +60,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad `points` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.0000, INDEX (`userid`), PRIMARY KEY(`id`) -) TYPE=MyISAM COMMENT='Member points booking table'"); +) TYPE={!_TABLE_TYPE!} COMMENT='Member points booking table'"); // Admin menu ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_booking','Kontoauszug','Einstellungen am Kontoauszug für Mitglieder vornehmen.', 14)"); diff --git a/inc/extensions/ext-country.php b/inc/extensions/ext-country.php index e36370e5cb..c4a86d32de 100644 --- a/inc/extensions/ext-country.php +++ b/inc/extensions/ext-country.php @@ -55,7 +55,7 @@ descr VARCHAR(255) NOT NULL DEFAULT 'Deutschland', is_active ENUM('Y','N') NOT NULL DEFAULT 'N', KEY(code), PRIMARY KEY(id) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_countries` (code, descr, is_active) VALUES ('DE','Deutschland','Y')"); // Admin menu diff --git a/inc/extensions/ext-debug.php b/inc/extensions/ext-debug.php index 1e7dc59f48..6ced58c3ad 100644 --- a/inc/extensions/ext-debug.php +++ b/inc/extensions/ext-debug.php @@ -60,7 +60,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad `inserted` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, INDEX (`sender_id`), PRIMARY KEY (`id`) -) TYPE=MyISAM COMMENT='Debug log data'"); +) TYPE={!_TABLE_TYPE!} COMMENT='Debug log data'"); // Table against debug log abuse ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_debug_log_abuse`"); @@ -72,7 +72,7 @@ PRIMARY KEY (`id`) `inserted` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, INDEX (`client_id`), PRIMARY KEY (`id`) -) TYPE=MyISAM COMMENT='Debug log abuse'"); +) TYPE={!_TABLE_TYPE!} COMMENT='Debug log abuse'"); // Table on relay/server for client exchanges ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_debug_client`"); @@ -89,7 +89,7 @@ PRIMARY KEY (`id`) UNIQUE (`key`), UNIQUE (`url`), PRIMARY KEY (`id`) -) TYPE=MyISAM COMMENT='Debug clients'"); +) TYPE={!_TABLE_TYPE!} COMMENT='Debug clients'"); // Add this exchange as first client ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_debug_client` (`url`,`title`,`webmaster`,`status`) VALUES ('{!URL!}','{!MAIN_TITLE!}','{!WEBMASTER!}','ACTIVE')"); @@ -103,7 +103,7 @@ PRIMARY KEY (`id`) INDEX `client_log` (`client_id`,`log_id`), UNIQUE (`log_id`), PRIMARY KEY (`id`) -) TYPE=MyISAM COMMENT='Debug client <-> log connection'"); +) TYPE={!_TABLE_TYPE!} COMMENT='Debug client <-> log connection'"); // Guest menus ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('debug',NULL,'Debug-System','Y','Y',2)"); diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php index a12439a2b6..7bb73f7402 100644 --- a/inc/extensions/ext-holiday.php +++ b/inc/extensions/ext-holiday.php @@ -56,7 +56,7 @@ holiday_end VARCHAR(10) NOT NULL DEFAULT 0, comments LONGBLOB NOT NULL, KEY (userid), PRIMARY KEY(id) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); // Add default values to config ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD holiday_max BIGINT(20) UNSIGNED NOT NULL DEFAULT '30'"); diff --git a/inc/extensions/ext-mediadata.php b/inc/extensions/ext-mediadata.php index 4eb2ca0a54..b8f6145a49 100644 --- a/inc/extensions/ext-mediadata.php +++ b/inc/extensions/ext-mediadata.php @@ -92,7 +92,7 @@ case "update": // Update an extension media_key VARCHAR(255) NOT NULL DEFAULT '', media_value VARCHAR(255) NOT NULL DEFAULT '', PRIMARY KEY(media_key) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); // Update notes (these will be set as task text!) EXT_SET_UPDATE_NOTES("Teile der Mediendaten werden in seperater Tabelle gesichert. Bitte beachten Sie, dass dieses Update nur Daten des aktuellen Zustandes berücksichtigen kann und nicht bereits gelöschter Mitglieder."); diff --git a/inc/extensions/ext-nickname.php b/inc/extensions/ext-nickname.php index b7ea4f60bd..64d4ffaff7 100644 --- a/inc/extensions/ext-nickname.php +++ b/inc/extensions/ext-nickname.php @@ -183,7 +183,7 @@ last_used TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00', INDEX userid (userid), INDEX (last_used DESC), PRIMARY KEY(id) -) TYPE=MyISAM COMMENT='History of used nicknames'"); +) TYPE={!_TABLE_TYPE!} COMMENT='History of used nicknames'"); // Update notes (these will be set as task text!) EXT_SET_UPDATE_NOTES("Historie eingegebener Nicknames hinzugefügt. Mitglied kann auf bereits verwendeter zurückgreifen und Liste selbst löschen."); diff --git a/inc/extensions/ext-online.php b/inc/extensions/ext-online.php index ddf604abb9..3ef81f3122 100644 --- a/inc/extensions/ext-online.php +++ b/inc/extensions/ext-online.php @@ -63,7 +63,7 @@ timestamp VARCHAR(10) NOT NULL DEFAULT 0, PRIMARY KEY(id), KEY(userid), KEY(refid) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','usr_online','Online-Statistik','Eine Liste von derzeit "Online" Usern. Doppelte Einträge könnte auf mangelnden Cookie-Support des Browsers oder auf einen Spider hindeuten.', 1)"); break; diff --git a/inc/extensions/ext-optimize.php b/inc/extensions/ext-optimize.php index 2f96bdb51f..2df802daa5 100644 --- a/inc/extensions/ext-optimize.php +++ b/inc/extensions/ext-optimize.php @@ -51,7 +51,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, gain decimal(10,3) NOT NULL DEFAULT '0.000', PRIMARY KEY(id) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('misc','optimize','DB optimieren','Führen Sie dies ab und an aus, damit überflüssige Daten aus der Datenbank entfernt werden.','5')"); break; diff --git a/inc/extensions/ext-payout.php b/inc/extensions/ext-payout.php index 16b63de9a1..0f4b12eb34 100644 --- a/inc/extensions/ext-payout.php +++ b/inc/extensions/ext-payout.php @@ -60,7 +60,7 @@ status ENUM('NEW','ACCEPTED','REJECTED') NOT NULL DEFAULT 'NEW', KEY(userid), KEY(payout_id), PRIMARY KEY(id) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_payout_types`"); ADD_SQL("CREATE TABLE `{!_MYSQL_PREFIX!}_payout_types` ( id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, @@ -68,7 +68,7 @@ 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=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_payouts','Auszahlungen','Auszahlungsarten einstellen, neu anlegen oder löschen.','15')"); ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('payouts','list_payouts','Anfragen auflisten','Listet alle Auszahlungsanfragen Ihrer Mitglieder auf.','16')"); ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','payout','Auszahlungen','N','N','11')"); diff --git a/inc/extensions/ext-primera.php b/inc/extensions/ext-primera.php index dba05bcbd2..dc6f5dcae2 100644 --- a/inc/extensions/ext-primera.php +++ b/inc/extensions/ext-primera.php @@ -59,7 +59,7 @@ primera_api_message TINYTEXT, primera_api_status VARCHAR(255) NULL DEFAULT NULL, KEY(userid), PRIMARY KEY(id) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); // Confiuration ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD primera_min_payout BIGINT(20) UNSIGNED NOT NULL DEFAULT 40000"); diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php index 8f85034f3d..b7acb33a79 100644 --- a/inc/extensions/ext-rallye.php +++ b/inc/extensions/ext-rallye.php @@ -64,7 +64,7 @@ send_notify ENUM('Y','N') NOT NULL DEFAULT 'Y', notified ENUM('Y','N') NOT NULL DEFAULT 'N', KEY (admin_id), PRIMARY KEY (id) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); ADD_SQL("CREATE TABLE `{!_MYSQL_PREFIX!}_rallye_prices` ( id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, rallye_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, @@ -73,7 +73,7 @@ points BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, info LONGBLOB NOT NULL, KEY (rallye_id), PRIMARY KEY(id) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); ADD_SQL("CREATE TABLE `{!_MYSQL_PREFIX!}_rallye_users` ( id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, rallye_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, @@ -82,7 +82,7 @@ refs BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, KEY (rallye_id), KEY (userid), PRIMARY KEY(id) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); // Admin menu ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('rallye', NULL, 'Rallye-Management','Richten Sie neue Ref-Rallyes ein, die zeitgesteuert anfangen und aufhöhren. Dabei wird alles weitere automatisch geregelt.','9')"); diff --git a/inc/extensions/ext-refback.php b/inc/extensions/ext-refback.php index 79b1f6fab3..693893facf 100644 --- a/inc/extensions/ext-refback.php +++ b/inc/extensions/ext-refback.php @@ -59,7 +59,7 @@ PRIMARY KEY (`id`), UNIQUE `user_refid` (`userid`,`level`,`refid`), KEY (`level`), KEY (`refid`) -) ENGINE=MyISAM COMMENT='User Referals With Refback'"); +) ENGINE={!_TABLE_TYPE!} COMMENT='User Referals With Refback'"); ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','refback','Ref-Back einstellen',4,'N','N')"); break; diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php index 78a93bab03..67d153338c 100644 --- a/inc/extensions/ext-register.php +++ b/inc/extensions/ext-register.php @@ -75,7 +75,7 @@ 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=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); // Add all entries as required (DO NOT DELETE THEM FROM DATABASE!) ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_must_register` (field_name, field_required) VALUES ('surname','Y')"); diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php index 1eb26e78e7..1157f574d5 100644 --- a/inc/extensions/ext-sponsor.php +++ b/inc/extensions/ext-sponsor.php @@ -91,7 +91,7 @@ last_curr VARCHAR(255) NOT NULL DEFAULT '€', KEY(refid), KEY(email), PRIMARY KEY(id) -)TYPE=MyISAM"); +)TYPE={!_TABLE_TYPE!}"); // // Sponsor orders // @@ -111,7 +111,7 @@ KEY (regid), KEY (aid), KEY (sponsorid), PRIMARY KEY(id) -)TYPE=MyISAM"); +)TYPE={!_TABLE_TYPE!}"); // // Pay-types // @@ -123,7 +123,7 @@ pay_rate FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000, pay_min_count BIGINT(20) UNSIGNED NOT NULL DEFAULT 1, pay_currency VARCHAR(255) NOT NULL DEFAULT '€', PRIMARY KEY(id) -)TYPE=MyISAM"); +)TYPE={!_TABLE_TYPE!}"); // // Points-to-action converting // @@ -135,7 +135,7 @@ conv_rate BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, conv_name VARCHAR(255) NOT NULL DEFAULT 'Mails', KEY (ext_name), PRIMARY KEY(id) -)TYPE=MyISAM"); +)TYPE={!_TABLE_TYPE!}"); // // Sponsor menu system (default) // @@ -150,7 +150,7 @@ sort BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, KEY (action), UNIQUE KEY (what), PRIMARY KEY(id) -)TYPE=MyISAM"); +)TYPE={!_TABLE_TYPE!}"); // // Registry for performable actions by your sponsors // @@ -164,7 +164,7 @@ stamp_added VARCHAR(10) NOT NULL DEFAULT 0, KEY(ext_name), KEY(aid), PRIMARY KEY(id) -)TYPE=MyISAM"); +)TYPE={!_TABLE_TYPE!}"); // // URLs from the sponsors // @@ -178,7 +178,7 @@ clicks BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, status ENUM('PENDING','ACTIVE','LOCKED') NOT NULL DEFAULT 'PENDING', KEY(sponsorid), PRIMARY KEY(id) -)TYPE=MyISAM"); +)TYPE={!_TABLE_TYPE!}"); // // Banners of any size from the sponsors // @@ -194,7 +194,7 @@ views BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, status ENUM('PENDING','ACTIVE','LOCKED') NOT NULL DEFAULT 'PENDING', KEY(sponsorid), PRIMARY KEY(id) -)TYPE=MyISAM"); +)TYPE={!_TABLE_TYPE!}"); // // Campaigns // @@ -216,7 +216,7 @@ status ENUM('PENDING','ACTIVE','LOCKED') NOT NULL DEFAULT 'PENDING', KEY(aid), KEY(sponsorid), PRIMARY KEY(id) -)TYPE=MyISAM"); +)TYPE={!_TABLE_TYPE!}"); // // Campaigns + URLs + Banner // @@ -232,7 +232,7 @@ KEY(bannerid), KEY(urlid), KEY(campaignid), PRIMARY KEY(id) -)TYPE=MyISAM"); +)TYPE={!_TABLE_TYPE!}"); // // Allowed data to display (administrative) // @@ -242,7 +242,7 @@ id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, data_row VARCHAR(255) NOT NULL DEFAULT '', display ENUM('Y','N') NOT NULL DEFAULT 'N', PRIMARY KEY(id) -)TYPE=MyISAM"); +)TYPE={!_TABLE_TYPE!}"); // // Allowed data to display (sponsor-side) // @@ -254,7 +254,7 @@ data_row VARCHAR(255) NOT NULL DEFAULT '', display ENUM('Y','N') NOT NULL DEFAULT 'N', KEY(sponsorid), PRIMARY KEY(id) -)TYPE=MyISAM"); +)TYPE={!_TABLE_TYPE!}"); // // Default allowed data to display // diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index c7aef22402..fa7969499b 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -416,7 +416,7 @@ INDEX (la_id), INDEX (la_action), INDEX (la_what), PRIMARY KEY(id) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); // All "logical areas" together ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_admin_menu_las`_data"); ADD_SQL("CREATE TABLE `{!_MYSQL_PREFIX!}_admin_menu_las`_data ( @@ -429,7 +429,7 @@ UNIQUE KEY (la_id), INDEX (la_posx), INDEX (la_posy), PRIMARY KEY(id) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); // Which menu do you like? ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD admin_menu ENUM('NEW','OLD') NOT NULL DEFAULT 'OLD'"); @@ -453,7 +453,7 @@ type ENUM('la','action','what') NOT NULL DEFAULT 'what', clicks BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, INDEX (aid), PRIMARY KEY (id) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); // Update notes (these will be set as task text!) EXT_SET_UPDATE_NOTES("Admin-abhängig werden nun Klicks im Admin-Menü gezählt, die zur automatischen Anpassung des Menüs in den logischen Bereichen diennen. Dieses "intelligente Unbauen" können Sie auch ganz abschalten."); @@ -662,7 +662,7 @@ PRIMARY KEY (id) PRIMARY KEY(`id`), INDEX (`userid`), INDEX (`stats_type`) -) TYPE=MyISAM COMMENT='Member statistics data'"); +) TYPE={!_TABLE_TYPE!} COMMENT='Member statistics data'"); // Update notes (these will be set as task text!) EXT_SET_UPDATE_NOTES("Mitglieder könnnen nun z.B. in den Mail-Details zu jeder Mail sehen, wann sie diese bestätigt haben. Die neue Statistik-Tabelle ist aber universell einsetzbar."); @@ -690,7 +690,7 @@ INDEX (`stats_type`) `filter_function` VARCHAR(255) NOT NULL DEFAULT '', `filter_active` ENUM('N','Y') NOT NULL DEFAULT 'Y', PRIMARY KEY (`filter_id`) -) TYPE=MyISAM COMMENT='Filter system'"); +) TYPE={!_TABLE_TYPE!} COMMENT='Filter system'"); ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','list_filter','Filter-Management', 'Zeigt alle im System registrierten Filter an und lässt diese de- bzw. wieder aktivieren.', 17)"); // Update notes (these will be set as task text!) diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php index ef85899937..81b2130a05 100644 --- a/inc/extensions/ext-surfbar.php +++ b/inc/extensions/ext-surfbar.php @@ -65,7 +65,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad PRIMARY KEY(`id`), UNIQUE KEY `userid_url` (`userid`,`url`), INDEX `status_userid` (`status`,`userid`) -) TYPE=MyISAM COMMENT='Surfbar URLs'"); +) TYPE={!_TABLE_TYPE!} COMMENT='Surfbar URLs'"); // Reload locks ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_surfbar_locks`"); @@ -77,7 +77,7 @@ INDEX `status_userid` (`status`,`userid`) PRIMARY KEY(`id`), UNIQUE KEY `userid_url` (`userid`,`url_id`), INDEX (`url_id`) -) TYPE=MyISAM COMMENT='Surfbar reload locks'"); +) TYPE={!_TABLE_TYPE!} COMMENT='Surfbar reload locks'"); // Surfbar salts ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_surfbar_salts`"); @@ -89,7 +89,7 @@ INDEX (`url_id`) PRIMARY KEY(`id`), UNIQUE KEY `userid_url` (`userid`,`url_id`), INDEX (`url_id`) -) TYPE=MyISAM COMMENT='Surfbar last used salts'"); +) TYPE={!_TABLE_TYPE!} COMMENT='Surfbar last used salts'"); // Statistics ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_surfbar_stats`"); @@ -102,7 +102,7 @@ INDEX (`url_id`) PRIMARY KEY (`id`), UNIQUE KEY `userid_url` (`userid`,`url_id`), INDEX (`url_id`) -) TYPE=MyISAM COMMENT='Surfbar Statistics'"); +) TYPE={!_TABLE_TYPE!} COMMENT='Surfbar Statistics'"); // Member actions pending on status ADD_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_surfbar_actions`"); @@ -113,7 +113,7 @@ INDEX (`url_id`) `new_status` ENUM('PENDING','ACTIVE','LOCKED','STOPPED','REJECTED','DELETED','MIGRATED','DEPLETED') NULL DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `status_action` (`status`,`action`) -) TYPE=MyISAM COMMENT='Surfbar Member Actions'"); +) TYPE={!_TABLE_TYPE!} COMMENT='Surfbar Member Actions'"); // Member actions ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_actions` (`status`,`action`,`new_status`) VALUES ('PENDING','RETREAT','DELETED')"); diff --git a/inc/extensions/ext-theme.php b/inc/extensions/ext-theme.php index 7daf616437..4ad35051a3 100644 --- a/inc/extensions/ext-theme.php +++ b/inc/extensions/ext-theme.php @@ -123,7 +123,7 @@ theme_ver VARCHAR(255) NOT NULL DEFAULT '0.0', PRIMARY KEY (`id`), UNIQUE KEY (`theme_path`), INDEX (`theme_active`) -) TYPE=MyISAM COMMENT='Themes'"); +) TYPE={!_TABLE_TYPE!} COMMENT='Themes'"); // Admin menu ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('theme', NULL, 'Themes','Verwalten Sie hier alle Designs (Themes) Ihres Mailtausch-Scriptes.', 8)"); diff --git a/inc/extensions/ext-transfer.php b/inc/extensions/ext-transfer.php index 911997a132..e952879c1d 100644 --- a/inc/extensions/ext-transfer.php +++ b/inc/extensions/ext-transfer.php @@ -62,7 +62,7 @@ trans_id VARCHAR(12) NOT NULL DEFAULT '', KEY (userid), KEY (from_uid), PRIMARY KEY(id) -) Type=MyISAM"); +) Type={!_TABLE_TYPE!}"); // Transfers to a member ADD_SQL("CREATE TABLE `{!_MYSQL_PREFIX!}_user_transfers_out` ( @@ -76,7 +76,7 @@ trans_id VARCHAR(12) NOT NULL DEFAULT '', KEY (userid), KEY (to_uid), PRIMARY KEY(id) -) Type=MyISAM"); +) Type={!_TABLE_TYPE!}"); // Admin menu ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('transfer', NULL, '{!POINTS!}-Transfer','Verwalten Sie hier die {!POINTS!}-Transaktionen zwischen Ihren Mitgliedern.', 7)"); diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php index 3eeb2fa284..159c046263 100644 --- a/inc/extensions/ext-user.php +++ b/inc/extensions/ext-user.php @@ -244,7 +244,7 @@ case "update": // Update an extension `del_reason` TINYTEXT, INDEX (`userid`), PRIMARY KEY(`id`) -) TYPE=MyISAM COMMENT='List of deleted users'"); +) TYPE={!_TABLE_TYPE!} COMMENT='List of deleted users'"); // Update notes (these will be set as task text!) EXT_SET_UPDATE_NOTES("Der Sperrgrund wird nun mit abgespeichert und beim Löschen des Users mit ausgesendet."); diff --git a/inc/extensions/ext-wernis.php b/inc/extensions/ext-wernis.php index d27f6abfad..c197471bab 100644 --- a/inc/extensions/ext-wernis.php +++ b/inc/extensions/ext-wernis.php @@ -59,7 +59,7 @@ wernis_api_message TINYTEXT, wernis_api_status VARCHAR(255) NULL DEFAULT NULL, KEY(userid), PRIMARY KEY(id) -) TYPE=MyISAM"); +) TYPE={!_TABLE_TYPE!}"); // Confiuration ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD wernis_min_payout BIGINT(20) UNSIGNED NOT NULL DEFAULT '40000'"); diff --git a/inc/extensions/ext-yoomedia.php b/inc/extensions/ext-yoomedia.php index d0e2cd57ea..d9720a0bad 100644 --- a/inc/extensions/ext-yoomedia.php +++ b/inc/extensions/ext-yoomedia.php @@ -76,7 +76,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad `inserted` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE `y_type` (`type`,`y_id`) -) TYPE=MyISAM COMMENT='Reload lock reminder for Yoo!Media campaigns'"); +) TYPE={!_TABLE_TYPE!} COMMENT='Reload lock reminder for Yoo!Media campaigns'"); break; case "remove": // Do stuff when removing extension diff --git a/inc/install-inc.php b/inc/install-inc.php index ed5a6b1317..1631b93f87 100644 --- a/inc/install-inc.php +++ b/inc/install-inc.php @@ -100,6 +100,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) if (empty($mysql['login'])) $mysql['login'] = "your_login"; if (empty($mysql['host'])) $mysql['host'] = "localhost"; if (empty($mysql['prefix'])) $mysql['prefix'] = "mxchange_"; + if (empty($mysql['type'])) $mysql['type'] = "MyISAM"; if (getTotalFatalErrors() > 0) { OUTPUT_HTML(""); foreach (getFatalArray() as $key => $err) { @@ -110,6 +111,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) define('__MYSQL_HOST' , $mysql['host']); define('__MYSQL_DBASE' , $mysql['dbase']); define('__MYSQL_PREFIX', $mysql['prefix']); + define('__TABLE_TYPE' , $mysql['type']); define('__MYSQL_LOGIN' , $mysql['login']); define('__SPATH_VALUE' , REQUEST_POST('spath')); define('__BURL_VALUE' , REQUEST_POST('burl')); @@ -143,6 +145,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) define('__MYSQL_HOST' , $mysql['host']); define('__MYSQL_DBASE' , $mysql['dbase']); define('__MYSQL_PREFIX' , $mysql['prefix']); + define('__TABLE_TYPE' , $mysql['type']); define('__MYSQL_LOGIN' , $mysql['login']); define('__MYSQL_PASS1' , $mysql['pass1']); define('__MYSQL_PASS2' , $mysql['pass2']); @@ -169,6 +172,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) define('__MYSQL_HOST' , $mysql['host']); define('__MYSQL_DBASE' , $mysql['dbase']); define('__MYSQL_PREFIX' , $mysql['prefix']); + define('__TABLE_TYPE' , $mysql['type']); define('__MYSQL_LOGIN' , $mysql['login']); // SMTP settings @@ -248,9 +252,9 @@ if ((!isInstalled()) || (!isAdminRegistered())) "); foreach ($mysql as $key => $value) { - OUTPUT_HTML(" "); + OUTPUT_HTML(" "); } - OUTPUT_HTML(" + OUTPUT_HTML(" @@ -291,6 +295,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) $fileContent = str_replace("{!prefix!}", $mysql['prefix'], $fileContent); } // END - while + // Replace the {!type!} with actual one + while (strpos($fileContent, "{!type!}") !== false) { + $fileContent = str_replace("{!type!}", $mysql['type'], $fileContent); + } // END - while + // And split it up against ;\n ... SET_SQLS(merge_array(GET_SQLS(), explode(";\n", $fileContent))); } else { @@ -324,6 +333,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) changeDataInFile(REQUEST_POST('spath')."inc/config.php", "MYSQL-LOGIN", " 'login' => \"", "\",", $mysql['login'], 0); changeDataInFile(REQUEST_POST('spath')."inc/config.php", "MYSQL-PASSWORD", " 'password' => \"", "\",", $mysql['pass1'], 0); changeDataInFile(REQUEST_POST('spath')."inc/config.php", "MYSQL-PREFIX", "define('_MYSQL_PREFIX', \"", "\");", $mysql['prefix'], 0); + changeDataInFile(REQUEST_POST('spath')."inc/config.php", "TABLE-TYPE", "define('_TABLE_TYPE', \"", "\");", $mysql['type'], 0); changeDataInFile(REQUEST_POST('spath')."inc/config.php", "SMTP-HOSTNAME", "define('SMTP_HOSTNAME', \"", "\");", REQUEST_POST('smtp_host'), 0); changeDataInFile(REQUEST_POST('spath')."inc/config.php", "SMTP-USER", "define('SMTP_USER', \"", "\");", REQUEST_POST('smtp_user'), 0); changeDataInFile(REQUEST_POST('spath')."inc/config.php", "SMTP-PASSWORD", "define('SMTP_PASSWORD', \"", "\");", REQUEST_POST('smtp_pass1'), 0); diff --git a/inc/language/install_de.php b/inc/language/install_de.php index c663fc67cc..006d86454b 100644 --- a/inc/language/install_de.php +++ b/inc/language/install_de.php @@ -65,6 +65,9 @@ define('HP_EMAIL', "E-Mail-Adresse"); define('MYSQL_HOST', "Server-Hostname"); define('MYSQL_DBASE', "Datenbank"); define('MYSQL_PREFIX', "Präfix für alle Tabellen"); +define('MYSQL_TABLE_TYPE', "Tabellentyp: (MyISAM ist meistens ausreichend)"); +define('TABLE_TYPE_MYISAM', "MyISAM (langsamer, da Tabelle gelockt wird)"); +define('TABLE_TYPE_INNODB', "InnoDB (schneller, da zweilenweis gelockt wird)"); define('MYSQL_LOGIN', "Ihr Loginname"); define('MYSQL_PASS1', "Ihr Passwort"); define('MYSQL_PASS2', "Passwortwiederholung"); diff --git a/install/tables.sql b/install/tables.sql index e6d64afe90..2903b2733d 100644 --- a/install/tables.sql +++ b/install/tables.sql @@ -7,7 +7,7 @@ CREATE TABLE `{!prefix!}admin_menu` ( `sort` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `descr` BLOB NOT NULL, PRIMARY KEY (`id`) -) TYPE=MyISAM; +) TYPE={!type!}; DROP TABLE IF EXISTS `{!prefix!}admins`; CREATE TABLE `{!prefix!}admins` ( @@ -15,7 +15,7 @@ CREATE TABLE `{!prefix!}admins` ( `login` VARCHAR(100) NOT NULL DEFAULT '', `password` VARCHAR(40) NOT NULL DEFAULT '', PRIMARY KEY (`id`) -) TYPE=MyISAM; +) TYPE={!type!}; DROP TABLE IF EXISTS `{!prefix!}cats`; CREATE TABLE `{!prefix!}cats` ( @@ -24,7 +24,7 @@ CREATE TABLE `{!prefix!}cats` ( `visible` ENUM('Y','N') NOT NULL DEFAULT 'Y', `sort` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`) -) TYPE=MyISAM; +) TYPE={!type!}; DROP TABLE IF EXISTS `{!prefix!}config`; CREATE TABLE `{!prefix!}config` ( @@ -42,7 +42,7 @@ CREATE TABLE `{!prefix!}config` ( `test_subj` ENUM('Y','N') NOT NULL DEFAULT 'Y', `autosend_active` ENUM('Y','N') NOT NULL DEFAULT 'N', PRIMARY KEY (`config`) -) TYPE=MyISAM; +) TYPE={!type!}; INSERT INTO `{!prefix!}config` VALUES (0,5,2000,200,5,'Y','N','Y',86400,'Y',1000,'Y','N'); @@ -57,7 +57,7 @@ CREATE TABLE `{!prefix!}guest_menu` ( `locked` ENUM('Y','N') NOT NULL DEFAULT 'Y', `counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`) -) TYPE=MyISAM; +) TYPE={!type!}; DROP TABLE IF EXISTS `{!prefix!}max_receive`; CREATE TABLE `{!prefix!}max_receive` ( @@ -65,7 +65,7 @@ CREATE TABLE `{!prefix!}max_receive` ( `value` MEDIUMINT(9) NOT NULL DEFAULT 0, `comment` VARCHAR(255) NOT NULL DEFAULT '', PRIMARY KEY (`id`) -) TYPE=MyISAM; +) TYPE={!type!}; DROP TABLE IF EXISTS `{!prefix!}member_menu`; CREATE TABLE `{!prefix!}member_menu` ( @@ -78,7 +78,7 @@ CREATE TABLE `{!prefix!}member_menu` ( `locked` ENUM('Y','N') NOT NULL DEFAULT 'Y', `counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`) -) TYPE=MyISAM; +) TYPE={!type!}; DROP TABLE IF EXISTS `{!prefix!}mod_reg`; CREATE TABLE `{!prefix!}mod_reg` ( @@ -91,7 +91,7 @@ CREATE TABLE `{!prefix!}mod_reg` ( `mem_only` ENUM('Y','N') NOT NULL DEFAULT 'N', `clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`) -) TYPE=MyISAM; +) TYPE={!type!}; INSERT INTO `{!prefix!}mod_reg` VALUES (1,'admin','N','N','Y','','N',0); INSERT INTO `{!prefix!}mod_reg` VALUES (2,'index','N','N','N','','N',0); @@ -109,7 +109,7 @@ CREATE TABLE `{!prefix!}payments` ( `mail_title` VARCHAR(255) NOT NULL DEFAULT '', `price` FLOAT(5,5) UNSIGNED NOT NULL DEFAULT '0.00000', PRIMARY KEY (`id`) -) TYPE=MyISAM; +) TYPE={!type!}; DROP TABLE IF EXISTS `{!prefix!}pool`; CREATE TABLE `{!prefix!}pool` ( @@ -125,7 +125,7 @@ CREATE TABLE `{!prefix!}pool` ( `target_send` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `cat_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`) -) TYPE=MyISAM; +) TYPE={!type!}; DROP TABLE IF EXISTS `{!prefix!}refbanner`; CREATE TABLE `{!prefix!}refbanner` ( @@ -135,7 +135,7 @@ CREATE TABLE `{!prefix!}refbanner` ( `visible` ENUM('Y','N') NOT NULL DEFAULT 'Y', `counter` BIGINT(22) NOT NULL DEFAULT 0, PRIMARY KEY (`id`) -) TYPE=MyISAM; +) TYPE={!type!}; DROP TABLE IF EXISTS `{!prefix!}refdepths`; CREATE TABLE `{!prefix!}refdepths` ( @@ -143,7 +143,7 @@ CREATE TABLE `{!prefix!}refdepths` ( `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0, `percents` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`) -) TYPE=MyISAM; +) TYPE={!type!}; INSERT INTO `{!prefix!}refdepths` VALUES (1,0,100); INSERT INTO `{!prefix!}refdepths` VALUES (2,1,30); @@ -159,7 +159,7 @@ CREATE TABLE `{!prefix!}refsystem` ( `level` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0, `counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`) -) TYPE=MyISAM; +) TYPE={!type!}; DROP TABLE IF EXISTS `{!prefix!}user_cats`; CREATE TABLE `{!prefix!}user_cats` ( @@ -167,7 +167,7 @@ CREATE TABLE `{!prefix!}user_cats` ( `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `cat_id` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`) -) TYPE=MyISAM; +) TYPE={!type!}; DROP TABLE IF EXISTS `{!prefix!}user_data`; CREATE TABLE `{!prefix!}user_data` ( @@ -197,7 +197,7 @@ CREATE TABLE `{!prefix!}user_data` ( `used_points` FLOAT(22,3) NOT NULL DEFAULT '0.000', `emails_sent` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`userid`) -) TYPE=MyISAM; +) TYPE={!type!}; DROP TABLE IF EXISTS `{!prefix!}user_points`; CREATE TABLE `{!prefix!}user_points` ( @@ -206,7 +206,7 @@ CREATE TABLE `{!prefix!}user_points` ( `ref_depth` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0, `points` FLOAT(22,3) NOT NULL DEFAULT '0.000', PRIMARY KEY (`id`) -) TYPE=MyISAM; +) TYPE={!type!}; ALTER TABLE `{!prefix!}config` ADD `max_send` TINYINT(3) UNSIGNED NOT NULL DEFAULT '100'; ALTER TABLE `{!prefix!}config` ADD `url_blacklist` ENUM('Y','N') NOT NULL DEFAULT 'Y'; @@ -224,7 +224,7 @@ CREATE TABLE `{!prefix!}user_links` ( `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `link_type` ENUM('NORMAL') NOT NULL DEFAULT 'NORMAL', PRIMARY KEY (`id`) -) TYPE=MyISAM; +) TYPE={!type!}; DROP TABLE IF EXISTS `{!prefix!}user_stats`; CREATE TABLE `{!prefix!}user_stats` ( @@ -240,7 +240,7 @@ CREATE TABLE `{!prefix!}user_stats` ( `timestamp_sstart` VARCHAR(10) NOT NULL DEFAULT '', `timestamp_send` VARCHAR(10) NOT NULL DEFAULT '', PRIMARY KEY (`id`) -) TYPE=MyISAM; +) TYPE={!type!}; ALTER TABLE `{!prefix!}user_data` ADD `joined` VARCHAR(10) NOT NULL DEFAULT 0; ALTER TABLE `{!prefix!}config` ADD `last_update` VARCHAR(10) NOT NULL DEFAULT 0; @@ -279,7 +279,7 @@ CREATE TABLE `{!prefix!}task_system` ( `task_created` VARCHAR(10) NOT NULL DEFAULT 0, KEY (`assigned_admin`), PRIMARY KEY (`id`) -) TYPE=MyISAM; +) TYPE={!type!}; ALTER TABLE `{!prefix!}pool` ADD INDEX (`sender`); ALTER TABLE `{!prefix!}pool` ADD INDEX (`payment_id`); @@ -312,14 +312,14 @@ CREATE TABLE `{!prefix!}extensions` ( `ext_active` ENUM('Y','N') NOT NULL DEFAULT 'N', `ext_version` VARCHAR(255) NOT NULL DEFAULT 'INVALID', PRIMARY KEY (`id`) -) TYPE=MyISAM; +) TYPE={!type!}; DROP TABLE IF EXISTS `{!prefix!}jackpot`; CREATE TABLE `{!prefix!}jackpot` ( `ok` CHAR(2) NOT NULL DEFAULT 'ok', `points` FLOAT(20,3) NOT NULL DEFAULT '0.000', PRIMARY KEY (`ok`) -) TYPE=MyISAM; +) TYPE={!type!}; ALTER TABLE `{!prefix!}config` ADD `activate_xchange` BIGINT(20) UNSIGNED NOT NULL DEFAULT 100; ALTER TABLE `{!prefix!}config` ADD `order_multi_page` ENUM('Y','N') NOT NULL DEFAULT 'Y'; diff --git a/templates/de/html/install/install_page2.tpl b/templates/de/html/install/install_page2.tpl index 3c94e03ed3..6aeabef076 100644 --- a/templates/de/html/install/install_page2.tpl +++ b/templates/de/html/install/install_page2.tpl @@ -40,6 +40,18 @@   + + {--MYSQL_TABLE_TYPE--} :  + + + + + +   + {--MYSQL_LOGIN--} :  - - + + - - - - - - + + + + + + + -- 2.30.2