Introduced wrapper function addCreateTableSql(), fixed parameter order:

[mailer.git] / inc / extensions / ext-bank.php

diff --git a/inc/extensions/ext-bank.php b/inc/extensions/ext-bank.php
index be9151be460137c3427f9db62698b0fc6bc0fc2f..b3ac7785524d16e32c3c0fd3fedb5d010bf2be55 100644 (file)
--- a/inc/extensions/ext-bank.php
+++ b/inc/extensions/ext-bank.php
@@ -53,47 +53,47 @@ switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
                // SQL commands to run
                addDropTableSql('bank_accounts');
-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_bank_accounts` (
-id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-account_created BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-account_locked BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-locked_reason TINYTEXT,
-status ENUM('NEW','ACTIVE','LOCKED') NOT NULL DEFAULT 'NEW',
-account_balance FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000,
-output_mode ENUM('LOGIN','EMAIL','DISABLED'),
-pin VARCHAR(50) NOT NULL DEFAULT '',
-tan_mode ENUM('NORMAL','INDEXED'),
-tan_list_status ENUM('PENDING','ACTIVE','INVALID','LOCKED') NOT NULL DEFAULT 'PENDING',
-tan_key VARCHAR(50) NOT NULL DEFAULT '',
-month_transfered BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-last_tan VARCHAR(5) NOT NULL DEFAULT '00000',
-last_tan_stamp BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-last_tan_purpose TINYTEXT,
-account_type ENUM('CHECK','SAVING') NOT NULL DEFAULT 'CHECK',
-overdraft_credit FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000,
-PRIMARY KEY (id),
-UNIQUE KEY (pin),
-INDEX `userid_type` (userid, account_type),
-INDEX (account_created),
-INDEX (account_locked),
-INDEX (last_tan_stamp)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci");
+               addCreateTableSql('bank_accounts', "(
+`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+`userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`account_created` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`account_locked` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`locked_reason` TINYTEXT,
+`status` ENUM('NEW','ACTIVE','LOCKED') NOT NULL DEFAULT 'NEW',
+`account_balance` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000,
+`output_mode` ENUM('LOGIN','EMAIL','DISABLED'),
+`pin` VARCHAR(50) NOT NULL DEFAULT '',
+`tan_mode` ENUM('NORMAL','INDEXED'),
+`tan_list_status` ENUM('PENDING','ACTIVE','INVALID','LOCKED') NOT NULL DEFAULT 'PENDING',
+`tan_key` VARCHAR(50) NOT NULL DEFAULT '',
+`month_transfered` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`last_tan` VARCHAR(5) NOT NULL DEFAULT '00000',
+`last_tan_stamp` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`last_tan_purpose` TINYTEXT,
+`account_type` ENUM('CHECK','SAVING') NOT NULL DEFAULT 'CHECK',
+`overdraft_credit` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000,
+PRIMARY KEY (`id`),
+UNIQUE KEY (`pin`),
+INDEX `userid_type` (`userid`, `account_type`),
+INDEX (`account_created`),
+INDEX (`account_locked`),
+INDEX (`last_tan_stamp`)
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'User bank accounts data'");
                addDropTableSql('bank_transfers');
-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_bank_transfers` (
-id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-to_account_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-from_account_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
-points_amount FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000,
-day_bookkeeping CHAR(4) NOT NULL DEFAULT '0000',
-day_available CHAR(4) NOT NULL DEFAULT '0000',
-transfer_purpose TINYTEXT,
-PRIMARY KEY (id),
-INDEX (to_account_id, from_account_id),
-INDEX (day_bookkeeping, day_available)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci");
+               addCreateTableSql('bank_transfers', "(
+`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+`to_account_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`from_account_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+`points_amount` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000,
+`day_bookkeeping` CHAR(4) NOT NULL DEFAULT '0000',
+`day_available` CHAR(4) NOT NULL DEFAULT '0000',
+`transfer_purpose` TINYTEXT,
+PRIMARY KEY (`id`),
+INDEX (`to_account_id`, `from_account_id`),
+INDEX (`day_bookkeeping`, `day_available`)
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Bank user->user transfers'");
                addDropTableSql('bank_packages');
-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_bank_packages` (
+               addCreateTableSql('bank_packages', "(
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `title` VARCHAR(255) NOT NULL DEFAULT '',
 `description` TINYTEXT,
@@ -111,13 +111,13 @@ INDEX (day_bookkeeping, day_available)
 `free_account_stuff` TINYTEXT null,
 `tan_lock` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
 PRIMARY KEY (`id`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci");
-               // free_account_stuff will be a list of columns of the table _bank_packages
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Bank account packages'");
+               // 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
                // should be fine. More than one entry and not DISABLED ;) are not supported.
                addDropTableSql('bank_tanlist');
-               addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_bank_tanlist` (
+               addCreateTableSql('bank_tanlist', "(
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `idx` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
 `account_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
@@ -125,7 +125,7 @@ PRIMARY KEY (`id`)
 `used` ENUM('Y','N') NOT NULL DEFAULT 'N',
 PRIMARY KEY (`id`),
 UNIQUE (`account_id`, `tan`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Bank TAN lists per user'");
 
                // Admin menu queries
                addAdminMenuSql('bank', NULL, 'Bank-Accounts','Verwalten Sie hier alle Bank-Accounts Ihrer Mitglieder, sowie Angebotspakete und Überweisungen.', 6);