Introduced wrapper function addCreateTableSql(), fixed parameter order:

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

diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index 3215d9b4ea616ced2d76013ab42e953bb4021a93..21f53da8ff8f09b4842a9177fb03d736506c4134 100644 (file)
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -49,8 +49,8 @@ setExtensionVersionHistory(array('0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0
 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("CREATE TABLE `{?_MYSQL_PREFIX?}_rallye_data` (
+               addDropTableSql('rallye_data');
+               addCreateTableSql('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 '',
@@ -64,9 +64,9 @@ switch (getExtensionMode()) {
 `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` (
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Main rallye data'");
+               addDropTableSql('rallye_prices');
+               addCreateTableSql('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,
@@ -74,9 +74,9 @@ PRIMARY KEY (`id`)
 `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` (
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Prices data for a rallye'");
+               addDropTableSql('rallye_users');
+               addCreateTableSql('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,
@@ -84,7 +84,7 @@ PRIMARY KEY (`id`)
 INDEX (`rallye_id`),
 INDEX (`userid`),
 PRIMARY KEY (`id`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Rallye->user connection table'");
 
                // Admin menu
                addAdminMenuSql('rallye', NULL, 'Rallye-Management','Richten Sie neue Ref-Rallyes ein, die zeitgesteuert anfangen und aufhöhren. Dabei wird alles weitere automatisch geregelt.',9);
@@ -102,9 +102,9 @@ PRIMARY KEY (`id`)
 
        case 'remove': // Do stuff when removing extension
                // Drop tables
-               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`');
+               addDropTableSql('rallye_data');
+               addDropTableSql('rallye_prices');
+               addDropTableSql('rallye_users');
 
                // Remove menus
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='rallye'");
@@ -326,7 +326,7 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
 
        case 'init': // Do stuff when extension is initialized
                // Do stuff only when not in CSS mode
-               // @TODO Move this code into rallye_functions.php
+               // @TODO Move this code into a hook
                if (!isCssOutputMode()) {
                        // Get total member count
                        $total = getTotalConfirmedUser();