Code style changed, ext-user continued:

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

diff --git a/inc/extensions/ext-country.php b/inc/extensions/ext-country.php
index 46fceed039c2e6d4bdb4e31310291598e28abdcd..5e62d49da6326ac38ad2d756fa3bbd8145ee4227 100644 (file)
--- a/inc/extensions/ext-country.php
+++ b/inc/extensions/ext-country.php
@@ -59,7 +59,7 @@ switch (getExtensionMode()) {
 `descr` VARCHAR(255) NOT NULL DEFAULT 'Deutschland',
 `is_active` ENUM('Y','N') NOT NULL DEFAULT 'N',
 PRIMARY KEY (`id`),
-UNIQUE (`code`)",
+UNIQUE INDEX (`code`)",
                        'Country codes and their full-length descriptions');
 
                // Insert first (Germany) country
@@ -69,8 +69,11 @@ UNIQUE (`code`)",
                addAdminMenuSql('country', NULL, 'Ländercodes verwalten','Stellen Sie hier Ländercodes ein, damit auch internationale Mitglieder sich zu Ihrem {OPEN_CONFIG}mt_word{CLOSE_CONFIG} anmelden können.', 8);
                addAdminMenuSql('country','list_country','Verwalten','Hinzufügen, Ändern und Löschen von Ländercodes.', 1);
 
+               // This extension depends on ext-user
+               addExtensionDependency('user');
+
                // Add entry to user table
-               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD country_code BIGINT(20) UNSIGNED NOT NULL DEFAULT 1");
+               addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD `country_code` BIGINT(20) UNSIGNED NOT NULL DEFAULT 1");
                break;
 
        case 'remove': // Do stuff when removing extension
@@ -79,7 +82,7 @@ UNIQUE (`code`)",
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='country'");
 
                // Unregister filter
-               unregisterFilter(__FILE__, __LINE__, 'pre_user_registration', 'COUNTRY_USER_REGISTRATION_ADD_SQL_COLUMNS', true, isExtensionDryRun());
+               unregisterFilter(__FILE__, __LINE__, 'pre_user_registration', 'COUNTRY_USER_REGISTRATION_ADD_SQL_COLUMNS', TRUE, isExtensionDryRun());
                break;
 
        case 'activate': // Do stuff when admin activates this extension
@@ -116,7 +119,7 @@ UNIQUE (`code`)",
 
                        case '0.0.5': // SQL queries for v0.0.5
                                // Register a filter
-                               registerFilter(__FILE__, __LINE__, 'pre_user_registration', 'COUNTRY_USER_REGISTRATION_ADD_SQL_COLUMNS', false, true, isExtensionDryRun());
+                               registerFilter(__FILE__, __LINE__, 'pre_user_registration', 'COUNTRY_USER_REGISTRATION_ADD_SQL_COLUMNS', FALSE, TRUE, isExtensionDryRun());
 
                                // This depends on ext-register
                                addExtensionDependency('register');