A lot has been rewritten, ext-teams added, ext-forced continued:

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

diff --git a/inc/extensions/ext-holiday.php b/inc/extensions/ext-holiday.php
index 587ffb0b76251cd39ef14989c6f33222ccd76e6d..6f595ce84acbd751284fb9ec7ba3448af78c17ab 100644 (file)
--- a/inc/extensions/ext-holiday.php
+++ b/inc/extensions/ext-holiday.php
@@ -50,15 +50,15 @@ switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
                // Create database
                addDropTableSql('user_holidays');
-               addCreateTableSql('user_holidays', "(
+               addCreateTableSql('user_holidays', "
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `holiday_start` VARCHAR(10) NOT NULL DEFAULT 0,
 `holiday_end` VARCHAR(10) NOT NULL DEFAULT 0,
 `comments` LONGTEXT NOT NULL,
-INDEX (`userid`),
-PRIMARY KEY (`id`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'User holiday data'");
+PRIMARY KEY (`id`),
+INDEX (`userid`)",
+                       'User holiday data');
 
                // Add default values to config
                addConfigAddSql('holiday_max', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT 30');
@@ -82,7 +82,7 @@ PRIMARY KEY (`id`)
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='holiday' LIMIT 1");
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='holiday' LIMIT 4");
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `value`=0 LIMIT 1");
-               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`, `comment`) VALUES (0,'Urlaub')");
+               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (`value`,`comment`) VALUES (0,'Urlaub')");
                break;
 
        case 'activate': // Do stuff when admin activates this extension
@@ -187,11 +187,11 @@ PRIMARY KEY (`id`)
                                break;
 
                        case '0.1.8': // SQL queries for v0.1.8
-                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`, `la_action`, `la_what`) VALUES ('member', '', 'list_holiday')");
-                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`, `la_action`, `la_what`) VALUES ('member', '', 'del_holiday')");
-                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`, `la_action`, `la_what`) VALUES ('config', '', 'config_holiday')");
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`,`la_action`,`la_what`) VALUES ('member', '', 'list_holiday')");
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`,`la_action`,`la_what`) VALUES ('member', '', 'del_holiday')");
+                               addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu_las` (`la_id`,`la_action`,`la_what`) VALUES ('config', '', 'config_holiday')");
 
-                               // Depends on sql_patches (or you have to execute these both SQL statements by phpMyAdmin
+                               // Depends on ext-sql_patches (or you have to execute these both SQL statements by phpMyAdmin
                                addExtensionDependency('sql_patches');
 
                                // Update notes (these will be set as task text!)