Major fixes in filters/extensions, other improvements:

[mailer.git] / inc / extensions.php

diff --git a/inc/extensions.php b/inc/extensions.php
index df5e51e9e67c0fbb6985b3e3ae59f0f86ebd32bc..5686e7c0edd0e11a50de5e688da0f7e98d6543d8 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -126,7 +126,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
 // Registeres an extension and possible update depencies
 function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = true) {
        global $UPDATE_NOTES, $_CONFIG, $INC_POOL, $cacheInstance;
-       global $EXT_VER_HISTORY, $SQLs, $NOTES, $EXT_ALWAYS_ACTIVE, $EXT_VERSION;
+       global $EXT_VER_HISTORY, $NOTES, $EXT_ALWAYS_ACTIVE, $EXT_VERSION;
        global $EXT_UPDATE_DEPENDS;
 
        // This shall never do a non-admin user!
@@ -299,31 +299,12 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
 
        // Load extension in detected mode
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ":ext_name[{$ext_id}]={$ext_name}");
-       LOAD_EXTENSION($ext_name, $load_mode, false, $SQLs);
+       LOAD_EXTENSION($ext_name, $load_mode, "", false, $SQLs);
 
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ":SQLs::count=".count($SQLs)."");
        if ((is_array($SQLs) && (sizeof($SQLs) > 0))) {
                // Run SQL commands...
-               foreach ($SQLs as $sql) {
-                       // Trim spaces away which we don't need
-                       $sql = trim($sql);
-
-                       // Is there still an SQL query?
-                       if (!empty($sql)) {
-                               // Do we have an "ALTER TABLE" command?
-                               //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ":SQL={$SQL}");
-                               if (substr(strtolower($sql), 0, 11) == "alter table") {
-                                       // Analyse the alteration command
-                                       SQL_ALTER_TABLE($sql, __FILE__, __LINE__);
-                               } else {
-                                       // Run regular SQL command
-                                       $result = SQL_QUERY($sql, __FILE__, __LINE__, false);
-                               }
-
-                               // An SQL has been executed
-                               $sqlRan = true;
-                       } // END - if
-               } // END - foreach
+               RUN_FILTER('run_sqls');
 
                // Removal mode?
                if ($load_mode == "remove") {
@@ -440,7 +421,7 @@ function GET_EXT_VERSION ($ext_name) {
 function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
        // This shall never do a non-admin user!
        global $cacheInstance, $_CONFIG, $UPDATE_NOTES, $NOTES, $EXT_VER_HISTORY;
-       global $EXT_UPDATE_DEPENDS, $EXT_VERSION, $INC_POOL, $SQLs, $cacheArray;
+       global $EXT_UPDATE_DEPENDS, $EXT_VERSION, $INC_POOL, $cacheArray;
 
        // Init arrays
        $SQLs = array(); $INC_POOL = array();