Extension ext-forced continued:

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

diff --git a/inc/extensions/ext-order.php b/inc/extensions/ext-order.php
index 1341bb39bde3371c27b1c340bde506c29831c4eb..8a125bf515f60b4231b6fead745bd1618e6fdf8e 100644 (file)
--- a/inc/extensions/ext-order.php
+++ b/inc/extensions/ext-order.php
@@ -49,7 +49,7 @@ setExtensionVersionHistory(array('0.0.0', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
                // SQL commands to run
-               addMemberMenuSql('order', 'order', 'Mailbuchung', 'N', 'Y', 1);
+               addMemberMenuSql('order', 'order', 'Mailbuchung', 1);
                break;
 
        case 'remove': // Do stuff when removing extension
@@ -57,6 +57,10 @@ switch (getExtensionMode()) {
                addDropTableSql('url_blacklist');
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='config_order' LIMIT 1");
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `action`='order'");
+
+               // Remove these filters
+               unregisterFilter(__FUNCTION__, __LINE__, 'get_total_points', 'ORDER_POINTS', true, isExtensionDryRun());
+               unregisterFilter(__FUNCTION__, __LINE__, 'get_own_points', 'ORDER_POINTS', true, isExtensionDryRun());
                break;
 
        case 'activate': // Do stuff when admin activates this extension
@@ -82,8 +86,6 @@ switch (getExtensionMode()) {
                                break;
 
                        case '0.1.1': // SQL queries for v0.1.1
-                               // OLD QUERIES: addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `what`='config_order' LIMIT 1");
-                               // OLD QUERIES: addAdminMenuSql('setup','config_order','Mailbuchungsseite','Einstellungen am Mailbuchungsformular.',7);
                                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD `mail_orders` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0");
 
                                // Update notes (these will be set as task text!)
@@ -271,8 +273,8 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us
                                break;
 
                        case '0.4.6': // SQL queries for v0.4.6
-                               addMemberMenuSql('order', NULL, 'Mailbuchungen', 'N', 'Y', 3);
-                               addMemberMenuSql('order', 'order2', 'Framekiller-Mails', 'N', 'Y', 2);
+                               addMemberMenuSql('order', NULL, 'Mailbuchungen', 3);
+                               addMemberMenuSql('order', 'order2', 'Framekiller-Mails', 2);
                                addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='order', `sort`=1, `title`='Klick-Mails' WHERE `what`='order' LIMIT 1");
 
                                // Update notes (these will be set as task text!)
@@ -300,19 +302,24 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us
 
                        case '0.5.0': // SQL queries for v0.5.0
                                addDropTableSql('url_blacklist');
-                               addCreateTableSql('url_blacklist', "(
+                               addCreateTableSql('url_blacklist', "
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `url` VARCHAR(255) NOT NULL DEFAULT '',
 `pool_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY (`id`),
-INDEX (`pool_id`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'URL blacklist'");
+INDEX (`pool_id`)",
+                                       'URL blacklist');
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Tabelle für URL-Sperrliste angelegt.");
                                break;
 
+                       case '0.5.1': // SQL queries for v0.5.1
+                               // Update notes (these will be set as task text!)
+                               setExtensionUpdateNotes("Nicht mehr gültiges Update.");
+                               break;
+
                        case '0.5.2': // SQL queries for v0.5.2
                                addConfigDropSql('test_text');
                                addConfigDropSql('test_subj');
@@ -324,8 +331,8 @@ INDEX (`pool_id`)
                                break;
 
                        case '0.5.3': // SQL queries for v0.5.3
-                               addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_points` ADD `order_points` FLOAT(20,5) NOT NULL DEFAULT 0.00000');
-                               addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_points` ADD `locked_order_points` FLOAT(20,5) NOT NULL DEFAULT 0.00000');
+                               addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_points` ADD `order_points` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000');
+                               addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_user_points` ADD `locked_order_points` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000');
 
                                // This update depends on ext-user
                                addExtensionDependency('user');