addCreateTableSql() is now more encapsulated

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

diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index 5b6e60fda9511b4382a7a2d862b953e89924e6a5..6bdaf75503c913f0e7e6f2515745b1b29acbade4 100644 (file)
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -50,7 +50,7 @@ switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
                // SQL commands to run
                addDropTableSql('rallye_data');
-               addCreateTableSql('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 '',
@@ -62,29 +62,31 @@ switch (getExtensionMode()) {
 `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 COMMENT = 'Main rallye data'");
+PRIMARY KEY (`id`),
+KEY (`admin_id`)",
+                       'Main rallye data');
+
                addDropTableSql('rallye_prices');
-               addCreateTableSql('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,
 `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 COMMENT = 'Prices data for a rallye'");
+PRIMARY KEY (`id`),
+INDEX (`rallye_id`)",
+                       'Prices data for a rallye');
+
                addDropTableSql('rallye_users');
-               addCreateTableSql('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,
 `refs` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
+PRIMARY KEY (`id`),
 INDEX (`rallye_id`),
-INDEX (`userid`),
-PRIMARY KEY (`id`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Rallye->user connection table'");
+INDEX (`userid`)",
+                       '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);
@@ -94,10 +96,10 @@ PRIMARY KEY (`id`)
                addAdminMenuSql('rallye','list_rallyes','Rallyes verwalten','Alle bestehenden Ref-Rallyes auflisten, bearbeiten, stoppen, löschen usw.',3);
 
                // Guest menu
-               addGuestMenuSql('main', 'rallyes', 'Ref-Rallyes', 'N', 'Y', 9);
+               addGuestMenuSql('main', 'rallyes', 'Ref-Rallyes', 9);
 
                // Member menu
-               addMemberMenuSql('main', 'rallyes', 'Ref-Rallyes', 'N', 'Y', 9);
+               addMemberMenuSql('main', 'rallyes', 'Ref-Rallyes', 9);
                break;
 
        case 'remove': // Do stuff when removing extension
@@ -108,8 +110,8 @@ PRIMARY KEY (`id`)
 
                // Remove menus
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='rallye'");
-               addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `what`='rallyes'");
-               addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='rallyes'");
+               addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `what`='rallyes' LIMIT 1");
+               addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='rallyes' LIMIT 1");
 
                // Unregister filter
                unregisterFilter(__FUNCTION__, __LINE__, 'extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', true, isExtensionDryRun());