Also reset (aka daily reset scripts) renamed. The naming 'reset' came from the time...

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

diff --git a/inc/extensions/ext-order.php b/inc/extensions/ext-order.php
index 9df9339aa288247c5d09e5eaedb766e29f7e1b62..0716da86a1ea1854dcda427d7065db2f98dfe7e0 100644 (file)
--- a/inc/extensions/ext-order.php
+++ b/inc/extensions/ext-order.php
@@ -49,7 +49,7 @@ setExtensionVersionHistory(array('0.0', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
                // SQL commands to run
-               addExtensionSql('');
+               addMemberMenuSql('order','order','Mailbuchung','N','Y',1);
                break;
 
        case 'remove': // Do stuff when removing extension
@@ -73,7 +73,7 @@ switch (getExtensionMode()) {
        case 'update': // Update an extension
                switch (getCurrentExtensionVersion()) {
                        case '0.1.0': // SQL queries for v0.1
-                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD order_max_full ENUM('ORDER','MAX') NOT NULL DEFAULT 'MAX'");
+                               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `order_max_full` ENUM('ORDER','MAX') NOT NULL DEFAULT 'MAX'");
                                addAdminMenuSql('setup','config_order','Mailbuchungsseite','Einstellungen am Mailbuchungsformular.',7);
 
                                // Update notes (these will be set as task text!)
@@ -306,19 +306,12 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us
 `timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY (`id`),
 INDEX (`pool_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='URL blacklist'");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = '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
-                               addMemberMenuSql('main','order','Mailbuchung','N','Y',8);
-
-                               // Update notes (these will be set as task text!)
-                               setExtensionUpdateNotes("Weiteren Menü-Query in Erweiterung verlagert.");
-                               break;
-
                        case '0.5.2': // SQL queries for v0.5.2
                                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` DROP `test_text`");
                                addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` DROP `test_subj`");
@@ -339,7 +332,7 @@ INDEX (`pool_id`)
 
        case 'init': // Do stuff when extension is initialized
                // Do daily reset only when installed and extension version is at least 0.1.1
-               // @TODO This should be moved out to inc/reset/
+               // @TODO This should be moved out to inc/daily/
                if ((isResetModeEnabled()) && (isInstalled()) && (isAdminRegistered()) && (isExtensionInstalledAndNewer('order', '0.1.1'))) {
                        // Reset mail order values
                        $result_ext = SQL_QUERY('UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `mail_orders`=0 WHERE `mail_orders` > 0', __FILE__, __LINE__);