Several rewrites/renames, fixes for installation. Resolves #104

[mailer.git] / inc / extensions.php

diff --git a/inc/extensions.php b/inc/extensions.php
index 7d599905f74250189931dcae43dc5e56d90048e8..68a6ae3326f7ff5e489b841f4661d12e3465098e 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -216,14 +216,14 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
                        // "Dry-run-mode" activated?
                        if (!$dry_run) {
                                // Run installation pre-installation filters
-                               RUN_FILTER('pre_extension_installed', array('dry_run' => $dry_run));
+                               runFilterChain('pre_extension_installed', array('dry_run' => $dry_run));
 
                                // Register extension
                                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_extensions` (ext_name, ext_active, ext_version) VALUES ('%s','%s','%s')",
                                        array($ext_name, EXT_GET_ALWAYS_ACTIVE(), EXT_GET_VERSION()), __FILE__, __LINE__);
 
                                // Remove cache file(s) if extension is active
-                               RUN_FILTER('post_extension_installed', array('ext_name' => $ext_name, 'task_id' => $task_id, 'inc_pool' => $INC_POOL));
+                               runFilterChain('post_extension_installed', array('ext_name' => $ext_name, 'task_id' => $task_id, 'inc_pool' => $INC_POOL));
 
                                // In normal mode return a true on success
                                $ret = true;
@@ -292,7 +292,7 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ":SQLs::count=".COUNT_SQLS()."");
        if ((IS_SQLS_VALID() && (COUNT_SQLS() > 0))) {
                // Run SQL commands...
-               RUN_FILTER('run_sqls', array('dry_run' => false));
+               runFilterChain('run_sqls');
 
                // Removal mode?
                if ($load_mode == "remove") {
@@ -305,7 +305,7 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
        // Remove cache file(s) if extension is active
        if (((EXT_IS_ACTIVE("cache")) || (GET_EXT_VERSION("cache") != "")) && (((SQL_AFFECTEDROWS() == 1)) || ($sqlRan === true) || ($load_mode == "activate") || ($load_mode == "deactivate"))) {
                // Run filters
-               RUN_FILTER('post_extension_run_sql', $ext_name);
+               runFilterChain('post_extension_run_sql', $ext_name);
        } // END - if
 
        // Is this the sql_patches?
@@ -469,13 +469,13 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
                // In real-mode execute any existing includes
                if (!$dry_run) {
                        $GLOBALS['cache_array']['inc_pool'][$ext_name] = $INC_POOL;
-                       RUN_FILTER('load_includes', $INC_POOL);
+                       runFilterChain('load_includes', $INC_POOL);
                        $INC_POOL = $GLOBALS['cache_array']['inc_pool'][$ext_name];
                        unset($GLOBALS['cache_array']['inc_pool'][$ext_name]);
                } // END - if
 
                // Run SQLs
-               RUN_FILTER('run_sqls', array('dry_run' => $dry_run));
+               runFilterChain('run_sqls', array('dry_run' => $dry_run));
 
                if (!$dry_run) {
                        // Create task
@@ -490,7 +490,7 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
                        unset($GLOBALS['cache_array']['update_ver'][$ext_name]);
 
                        // Run filters on success extension update
-                       RUN_FILTER('extension_update', $ext_name);
+                       runFilterChain('extension_update', $ext_name);
                } // END - if
        } // END - if
 }