Fixes for extension problems while installing/removing (still double-registration...

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

diff --git a/inc/extensions/ext-admins.php b/inc/extensions/ext-admins.php
index c698c25af797d85f70aa3ec88228ef1d28654ad5..695d2800756e230cd66de5b5fdc4989854da5899 100644 (file)
--- a/inc/extensions/ext-admins.php
+++ b/inc/extensions/ext-admins.php
@@ -50,7 +50,7 @@ EXT_SET_VER_HISTORY(array('0.0', '0.1.0', '0.2.0', '0.3.0', '0.3.1', '0.4.0', '0
 
 switch ($EXT_LOAD_MODE)
 {
-       case 'register': // Do stuff when installation is running (modules.php?module=admin&action=login is called)
+       case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
                // SQL commands to run
                ADD_EXT_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins', NULL, 'Admin-Management','Administratoren anlegen, löschen oder Passwort/E-Mail Adresse ändern.','1')");
                ADD_EXT_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('admins','admins_add','Admin hinzufügen','Neuen Admin-Account anlegen','0')");
@@ -65,7 +65,7 @@ switch ($EXT_LOAD_MODE)
                ADD_EXT_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_admins` DROP default_acl");
 
                // Remove filters
-               UNREGISTER_FILTER('sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', true, $dry_run);
+               unregisterFilter('sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', true, $dry_run);
                break;
 
        case 'activate': // Do stuff when admin activates this extension
@@ -290,17 +290,17 @@ PRIMARY KEY (id)
                                EXT_ADD_UPDATE_DEPENDS('sql_patches');
 
                                // Add filters
-                               REGISTER_FILTER('sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', false, true, $dry_run);
+                               registerFilter('sql_admin_extra_data', 'ADD_EXTRA_SQL_DATA', false, true, $dry_run);
 
                                // Update notes (these will be set as task text!)
                                EXT_SET_UPDATE_NOTES("Filter hinzugef&uuml;gt und ist von <strong>sql_patches</strong> abh&auml;ngig.");
                                break;
 
                        case '0.7.2': // SQL queries for v0.7.2
-                               ADD_EXT_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_admins` DROP login_failtures");
-                               ADD_EXT_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_admins` DROP last_failture");
-                               ADD_EXT_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_admins` ADD login_failures BIGINT(20) UNSIGNED NOT NULL DEFAULT 0");
-                               ADD_EXT_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_admins` ADD last_failure TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00'");
+                               ADD_EXT_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_admins` DROP `login_failtures`");
+                               ADD_EXT_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_admins` DROP `last_failture`");
+                               ADD_EXT_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_admins` ADD `login_failures` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0");
+                               ADD_EXT_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_admins` ADD `last_failure` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00'");
 
                                // Update notes (these will be set as task text!)
                                EXT_SET_UPDATE_NOTES("Schreibweise korregiert.");