Some dublicated braces removed, some fixed (broken: update depencies got registered...

[mailer.git] / inc / extensions.php

diff --git a/inc/extensions.php b/inc/extensions.php
index cfa4c928d4518f8609820fd0a3d8f362944be4e9..d21e3b4d13d7f2e444790782dfec42774edcf3d3 100644 (file)
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -266,9 +266,16 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr
                                // Remove cache file(s) if extension is active
                                runFilterChain('post_extension_installed', array('ext_name' => EXT_GET_CURR_NAME(), 'task_id' => $task_id));
 
+                               // Remove all SQL commands
+                               UNSET_SQLS();
+
                                // In normal mode return a true on success
                                $ret = true;
                        } elseif ($dry_run) {
+                               // Init SQLs and transfer ext->generic
+                               INIT_SQLS();
+                               SET_SQLS(GET_EXT_SQLS());
+
                                // Rewrite SQL command to keep { and } inside for dry-run
                                foreach (GET_SQLS() as $key => $sql) {
                                        $sql = str_replace('{', "{", str_replace('}', "}", $sql));
@@ -328,6 +335,9 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
        // Set current SQL name
        EXT_SET_CURR_NAME($ext_name);
 
+       // Init EXT_UPDATE_DEPENDS
+       EXT_INIT_UPDATE_DEPENDS();
+
        // Init array
        INIT_EXT_SQLS();
 
@@ -338,6 +348,10 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ":ext_name[{$ext_id}]={EXT_GET_CURR_NAME()}");
        LOAD_EXTENSION(EXT_GET_CURR_NAME(), $load_mode, "", false);
 
+       // Init these SQLs
+       INIT_SQLS();
+       SET_SQLS(GET_EXT_SQLS());
+
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ":SQLs::count=".COUNT_SQLS()."");
        if ((IS_SQLS_VALID() && (COUNT_SQLS() > 0))) {
                // Run SQL commands...
@@ -492,9 +506,6 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
                        LOAD_EXTENSION(EXT_GET_CURR_NAME(), "update", $GLOBALS['cache_array']['update_ver'][EXT_GET_CURR_NAME()], $dry_run);
 
                        if (EXT_GET_UPDATE_DEPENDS() != "") {
-                               // Backup current SQL queries
-                               $GLOBALS['cache_array']['update_sqls'][EXT_GET_CURR_NAME()] = GET_SQLS();
-
                                // Is the extension there?
                                if (GET_EXT_VERSION(EXT_GET_UPDATE_DEPENDS()) != "") {
                                        // Update another extension first!
@@ -503,10 +514,6 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
                                        // Register new extension
                                        $test = REGISTER_EXTENSION(EXT_GET_UPDATE_DEPENDS(), 0, $dry_run, false);
                                }
-
-                               // Restore previous SQL queries
-                               SET_SQLS($GLOBALS['cache_array']['update_sqls'][EXT_GET_CURR_NAME()]);
-                               unset($GLOBALS['cache_array']['update_sqls'][EXT_GET_CURR_NAME()]);
                        } // END - if
 
                        // Add notes
@@ -521,6 +528,10 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
                        unset($GLOBALS['cache_array']['inc_pool'][EXT_GET_CURR_NAME()]);
                } // END - if
 
+               // Init these SQLs
+               INIT_SQLS();
+               SET_SQLS(GET_EXT_SQLS());
+
                // Run SQLs
                runFilterChain('run_sqls', array('dry_run' => $dry_run));
 
@@ -930,32 +941,32 @@ function EXT_ADD_CSS_FILE ($file) {
 
 // Setter for EXT_ALWAYS_ACTIVE flag
 function EXT_SET_ALWAYS_ACTIVE ($active) {
-       $GLOBALS['ext_always_active'] = (string) $active;
+       $GLOBALS['ext_always_active'][EXT_GET_CURR_NAME()] = (string) $active;
 }
 
 // Getter for EXT_ALWAYS_ACTIVE flag
 function EXT_GET_ALWAYS_ACTIVE () {
-       return $GLOBALS['ext_always_active'];
+       return $GLOBALS['ext_always_active'][EXT_GET_CURR_NAME()];
 }
 
 // Setter for EXT_VERSION flag
 function EXT_SET_VERSION ($version) {
-       $GLOBALS['ext_version'] = (float) $version;
+       $GLOBALS['ext_version'][EXT_GET_CURR_NAME()] = (float) $version;
 }
 
 // Getter for EXT_VERSION flag
 function EXT_GET_VERSION () {
-       return $GLOBALS['ext_version'];
+       return $GLOBALS['ext_version'][EXT_GET_CURR_NAME()];
 }
 
 // Setter for EXT_DEPRECATED flag
 function EXT_SET_DEPRECATED ($deprecated) {
-       $GLOBALS['ext_deprecated'] = (string) $deprecated;
+       $GLOBALS['ext_deprecated'][EXT_GET_CURR_NAME()] = (string) $deprecated;
 }
 
 // Getter for EXT_DEPRECATED flag
 function EXT_GET_DEPRECATED () {
-       return $GLOBALS['ext_deprecated'];
+       return $GLOBALS['ext_deprecated'][EXT_GET_CURR_NAME()];
 }
 
 // Setter for EXT_UPDATE_DEPENDS flag
@@ -998,19 +1009,19 @@ function EXT_INIT_RUNNING_UPDATES () {
 
 // Getter for EXT_UPDATE_DEPENDS flag
 function EXT_GET_UPDATE_DEPENDS () {
-       print __FUNCTION__.":".EXT_GET_CURR_NAME()."<br />\n";
+       //* DEBUG: */ print __FUNCTION__.":".EXT_GET_CURR_NAME()."<br />\n";
        return $GLOBALS['ext_update_depends'][EXT_GET_CURR_NAME()];
 }
 
 // Getter for next iterator depency
 function EXT_GET_ITERATOR_UPDATE_DEPENDS () {
-       print __FUNCTION__.":".EXT_GET_CURR_NAME()."<br />\n";
+       //* DEBUG: */ print __FUNCTION__.":".EXT_GET_CURR_NAME()."<br />\n";
        return ($GLOBALS['ext_update_depends'][EXT_GET_CURR_NAME()][EXT_GET_UPDATE_ITERATOR()]);
 }
 
 // Counter for extension update depencies
 function EXT_COUNT_UPDATE_DEPENDS () {
-       print __FUNCTION__.":".EXT_GET_CURR_NAME()."<br />\n";
+       //* DEBUG: */ print __FUNCTION__.":".EXT_GET_CURR_NAME()."<br />\n";
        return count($GLOBALS['ext_update_depends'][EXT_GET_CURR_NAME()]);
 }
 
@@ -1031,7 +1042,7 @@ function EXT_REMOVE_UPDATE_DEPENDS ($ext_name) {
 
 // Init iterator for update depencies
 function EXT_INIT_UPDATE_ITERATOR () {
-       print __FUNCTION__.":".EXT_GET_CURR_NAME()."<br />\n";
+       //* DEBUG: */ print __FUNCTION__.":".EXT_GET_CURR_NAME()."<br />\n";
        $GLOBALS['ext_depend_iterator'][EXT_GET_CURR_NAME()] = 0;
 }
 
@@ -1041,13 +1052,13 @@ function EXT_GET_UPDATE_ITERATOR () {
        if (!isset($GLOBALS['ext_depend_iterator'][EXT_GET_CURR_NAME()])) EXT_INIT_UPDATE_ITERATOR();
 
        // Return it
-       print __FUNCTION__.":".EXT_GET_CURR_NAME()."/".$GLOBALS['ext_depend_iterator'][EXT_GET_CURR_NAME()]."<br />\n";
+       //* DEBUG: */ print __FUNCTION__.":".EXT_GET_CURR_NAME()."/".$GLOBALS['ext_depend_iterator'][EXT_GET_CURR_NAME()]."<br />\n";
        return $GLOBALS['ext_depend_iterator'][EXT_GET_CURR_NAME()];
 }
 
 // Increments the update iterator
 function EXT_INCREMENT_UPDATE_INTERATOR () {
-       print __FUNCTION__.":".EXT_GET_CURR_NAME()."<br />\n";
+       //* DEBUG: */ print __FUNCTION__.":".EXT_GET_CURR_NAME()."<br />\n";
        $GLOBALS['ext_depend_iterator'][EXT_GET_CURR_NAME()]++;
 }
 
@@ -1113,7 +1124,10 @@ function EXT_GET_CURR_NAME () {
 
 // Init SQLs array for current extension
 function INIT_EXT_SQLS () {
-       $GLOBALS['ext_sqls'][EXT_GET_CURR_NAME()] = array();
+       // Auto-init the array now...
+       if (!isset($GLOBALS['ext_sqls'][EXT_GET_CURR_NAME()])) {
+               $GLOBALS['ext_sqls'][EXT_GET_CURR_NAME()] = array();
+       } // END - if
 }
 
 // Adds SQLs to the SQLs array but "assigns" it with current extension name