Rewrites of debug lines, possible fix for extension installation bug
[mailer.git] / inc / extensions.php
index b2bca3ea6e981370752cac884f830f5af679966f..2ef4bb88fdbdf051f0961a29ed6e0db091a88073 100644 (file)
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Erweiterungen-Management                         *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -39,10 +44,17 @@ if (!defined('__SECURITY')) {
 
 // Load the extension and maybe found language and function files.
 function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run = false) {
-       global $INC_POOL;
+       // Set current extension name
+       EXT_SET_CURR_NAME($ext_name);
 
        // Init array
-       $INC_POOL = array();
+       INIT_INC_POOL();
+
+       // Init EXT_UPDATE_DEPENDS
+       EXT_INIT_UPDATE_DEPENDS();
+
+       // Init current extension name list
+       INIT_EXT_SQLS();
 
        // Is the extension already loaded?
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Loading extension {$ext_name}, mode={$EXT_LOAD_MODE}, ver={$EXT_VER}.");
@@ -93,9 +105,6 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
        // Extensions are not always active by default
        EXT_SET_ALWAYS_ACTIVE("N");
 
-       // By default an extension update does not depend on other extensions
-       EXT_SET_UPDATE_DEPENDS("");
-
        // Extension update notes
        EXT_SET_UPDATE_NOTES("");
 
@@ -123,50 +132,87 @@ 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 $INC_POOL;
-       global $NOTES;
+function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = true) {
+       // Set current extension name
+       EXT_SET_CURR_NAME($ext_name);
 
-       // This shall never do a non-admin user!
-       if (!IS_ADMIN()) return false;
+       //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME()." - ENTERED!<br />\n";
+       // This shall never do a non-admin user or if the extension is active (already installed)
+       if ((!IS_ADMIN()) || (EXT_IS_ACTIVE($ext_name))) {
+               return false;
+       } // END - if
 
-       // Is this extension already installed?
-       if (EXT_IS_ACTIVE($ext_name)) return false;
+       // When this extension is already in install/update phase, all is fine
+       if (EXT_IS_REGISTER_RUNNING($ext_name)) {
+               // Then abort here which is fine
+               //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME()." - ALREADY!<br />\n";
+               return true;
+       } // END - if
 
-       // Init queries
-       INIT_SQLS();
+       // This registration is running
+       EXT_ADD_RUNNING_REGISTRATION($ext_name);
+
+       // Init EXT_UPDATE_DEPENDS
+       EXT_INIT_UPDATE_DEPENDS();
+
+       // Is the task id zero? Then we need to auto-fix it here
+       if ($task_id == 0) {
+               // Try to find the task
+               $task_id = DETERMINE_EXTENSION_TASK_ID(EXT_GET_CURR_NAME());
+
+               // Still zero and not in dry-run?
+               if (($task_id == 0) && (!$dry_run)) {
+                       // Then request a bug report
+                       debug_report_bug(sprintf("%s: task_id is still zero after DETERMINE_EXTENSION_TASK_ID(%s)",
+                               __FUNCTION__,
+                               EXT_GET_CURR_NAME()
+                       ));
+               } // END - if
+       } // END - if
+
+       // Init queries and notes
+       INIT_EXT_SQLS();
+       EXT_INIT_NOTES();
 
        // Init variables
        $ret = false;
-       $NOTES = "";
-       $INC_POOL = array();
+       $test = false;
+       INIT_INC_POOL();
 
        // By default we have no failures
        EXT_SET_REPORTS_FAILURE(false);
 
        // Does this extension exists?
-       if (LOAD_EXTENSION($ext_name, "register", "", $dry_run)) {
+       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "currName=".EXT_GET_CURR_NAME()."");
+       if (LOAD_EXTENSION(EXT_GET_CURR_NAME(), "register", "", $dry_run)) {
+               // Set current extension name again
+               EXT_SET_CURR_NAME($ext_name);
+
                // And run possible updates
+               //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "".EXT_GET_CURR_NAME());
                $history = EXT_GET_VER_HISTORY();
                foreach ($history as $ver) {
-                       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ext_name={$ext_name}, ext_ver={$ver}");
+                       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ext_name=".EXT_GET_CURR_NAME().", ext_ver={$ver}");
                        // Load extension in update mode
-                       LOAD_EXTENSION($ext_name, "update", $ver, $dry_run);
+                       LOAD_EXTENSION(EXT_GET_CURR_NAME(), "update", $ver, $dry_run);
 
                        // Add update notes to our output
-                       $NOTES .= ADD_EXTENSION_NOTES($ver);
+                       ADD_EXTENSION_NOTES($ver);
                } // END - foreach
 
                // Does this extension depends on an outstanding update of another update?
-               if (EXT_GET_UPDATE_DEPENDS() != "") {
-                       // Backup SQL commands and clear current
-                       $SQLs2 = GET_SQLS();
-                       INIT_SQLS();
-                       $test  = false;
-                       $ext_update = EXT_GET_UPDATE_DEPENDS();
+               for ($dmy = EXT_GET_UPDATE_ITERATOR(); EXT_GET_UPDATE_ITERATOR() < EXT_COUNT_UPDATE_DEPENDS();) {
+                       // Get next update
+                       $ext_update = EXT_GET_ITERATOR_UPDATE_DEPENDS();
+
+                       // Increment here to avoid endless loop
+                       EXT_INCREMENT_UPDATE_INTERATOR();
 
                        // Check for required file
                        if (LOAD_EXTENSION($ext_update, "register", "", $dry_run)) {
+                               // Set current extension name again
+                               EXT_SET_CURR_NAME($ext_name);
+
                                // If versions mismatch update extension first
                                $ext_ver = GET_EXT_VERSION($ext_update);
 
@@ -178,7 +224,9 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
                                        // Entry found?
                                        if ($task > 0) {
                                                // Try to register the extension
-                                               $test = EXTENSION_REGISTER($ext_update, $task, $dry_run, false);
+                                               //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().":ext_update=".$ext_update.",taskId=".$task."<br />\n";
+                                               $test = REGISTER_EXTENSION($ext_update, $task, $dry_run, false);
+                                               //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().":"; var_dump($test);
                                        } // END - if
                                } elseif ($ext_ver != EXT_GET_VERSION()) {
                                        // Ok, update this extension now
@@ -196,37 +244,54 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
                                // But this is fine for the first time...
                        }
 
-                       // Finally restore previous SQLs
-                       SET_SQLS($SQLs2); unset($SQLs2);
-               } else {
-                       // Does not depend on an other extension
+                       // Restore the current extension name
+                       EXT_SET_CURR_NAME($ext_name);
+               } // END - for
+
+               // Is there no update?
+               if (EXT_COUNT_UPDATE_DEPENDS(EXT_GET_CURR_NAME()) == 0) {
+                       // Then test is passed!
                        $test = true;
-               }
+               } // END - if
 
                // Switch back to register mode
                $EXT_LOAD_MODE = "register";
 
                // Remains true if extension registration reports no failures
+               //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().":"; var_dump($test);
                $test = (($test === true) && (EXT_GET_REPORTS_FAILURE() === false));
+               //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().":"; var_dump($test);
 
                // Does everthing before wents ok?
-               if ($test) {
+               if ($test === true) {
                        // "Dry-run-mode" activated?
-                       if (!$dry_run) {
+                       if ((!$dry_run) && (!EXT_IS_ON_REMOVAL_LIST())) {
+                               //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, " ext_name=".EXT_GET_CURR_NAME());
+                               // Init SQLs and transfer ext->generic
+                               INIT_SQLS();
+                               SET_SQLS(GET_EXT_SQLS());
+
                                // Run installation pre-installation filters
                                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__);
+                                       array(EXT_GET_CURR_NAME(), EXT_GET_ALWAYS_ACTIVE(), EXT_GET_VERSION()), __FUNCTION__, __LINE__);
 
                                // Remove cache file(s) if extension is active
-                               runFilterChain('post_extension_installed', array('ext_name' => $ext_name, 'task_id' => $task_id, 'inc_pool' => $INC_POOL));
+                               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;
-                       } else {
-                               // Rewrite SQL command to keep { and } inside
+                       } 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('{', "&#123;", str_replace('}', "&#125;", $sql));
                                        SET_SQL_KEY($key, $sql);
@@ -237,20 +302,25 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
 
                                // Remove all SQL commands
                                UNSET_SQLS();
+                       } else {
+                               // Extension has been removed for updates, so all is fine!
+                               $ret = true;
                        }
                } else {
                        // No, an error occurs while registering extension :-(
+                       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "".EXT_GET_CURR_NAME());
                        $ret = false;
                }
-       } elseif (($task_id > 0) && (!empty($ext_name))) {
+       } elseif (($task_id > 0) && (EXT_GET_CURR_NAME() != "")) {
+               //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME()."<br />\n";
                // Remove task from system when id and extension's name is valid
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_task_system` WHERE id=%s AND `status`='NEW' LIMIT 1",
-                       array(bigintval($task_id)), __FILE__, __LINE__);
+                       array(bigintval($task_id)), __FUNCTION__, __LINE__);
        }
 
        // Is this the sql_patches?
-       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ":{$ext_name}/{$EXT_LOAD_MODE}");
-       if (($ext_name == "sql_patches") && (($EXT_LOAD_MODE == "register") || ($EXT_LOAD_MODE == "remove")) && (!$dry_run) && ($test)) {
+       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ":".EXT_GET_CURR_NAME()."/{$EXT_LOAD_MODE}");
+       if ((EXT_GET_CURR_NAME() == "sql_patches") && (($EXT_LOAD_MODE == "register") || ($EXT_LOAD_MODE == "remove")) && (!$dry_run) && ($test)) {
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": LOAD!");
                if ($logout === true) {
                        // Then redirect to logout
@@ -263,6 +333,8 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
        } // END - if
 
        // Return status code
+       //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME()." - LEFT!<br />\n";
+       //* DEBUG: */ var_dump($ret);
        return $ret;
 }
 
@@ -272,20 +344,31 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
        // This shall never do a non-admin user!
        if (!IS_ADMIN()) return false;
 
+       // Get extension's name
+       $ext_name = GET_EXT_NAME($ext_id);
+
+       // If it is not set then maybe there is no extension for that ID number
+       if ($ext_name == "") return false;
+
+       // Set current SQL name
+       EXT_SET_CURR_NAME($ext_name);
+
+       // Init EXT_UPDATE_DEPENDS
+       EXT_INIT_UPDATE_DEPENDS();
+
        // Init array
-       INIT_SQLS();
+       INIT_EXT_SQLS();
 
        // By default no SQL has been executed
        $sqlRan = false;
 
-       // Get extension's name
-       $ext_name = GET_EXT_NAME($ext_id);
-       // If it is not set then maybe there is no extension for that ID number
-       if (empty($ext_name)) return false;
-
        // Load extension in detected mode
-       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ":ext_name[{$ext_id}]={$ext_name}");
-       LOAD_EXTENSION($ext_name, $load_mode, "", false);
+       //* 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))) {
@@ -296,19 +379,19 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
                if ($load_mode == "remove") {
                        // Delete this extension (remember to remove it from your server *before* you click on welcome!
                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
-                               array($ext_name), __FILE__, __LINE__);
+                               array(EXT_GET_CURR_NAME()), __FUNCTION__, __LINE__);
                } // END - if
        } // END - if
 
        // 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
-               runFilterChain('post_extension_run_sql', $ext_name);
+               runFilterChain('post_extension_run_sql', EXT_GET_CURR_NAME());
        } // END - if
 
        // Is this the sql_patches?
-       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": {$ext_id}/{$ext_name}/{$load_mode}");
-       if (($ext_name == "sql_patches") && (($load_mode == "register") || ($load_mode == "remove"))) {
+       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": id=".$ext_id.",currName=".EXT_GET_CURR_NAME().",loadMode=".$load_mode);
+       if ((EXT_GET_CURR_NAME() == "sql_patches") && (($load_mode == "register") || ($load_mode == "remove"))) {
                // Then redirect to logout
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": LOAD!");
                LOAD_URL("modules.php?module=admin&amp;logout=1&amp;".$load_mode."=sql_patches");
@@ -332,13 +415,13 @@ function EXT_IS_ACTIVE ($ext_name) {
                // Count cache hits
                incrementConfigEntry('cache_hits');
        } elseif (isset($GLOBALS['ext_loaded'][$ext_name])) {
-               // Extension is loaded!
-               die("LOADED:$ext_name");
+               // @TODO Extension is loaded, what next?
+               app_die(__FUNCTION__, __LINE__, "LOADED:$ext_name");
        } elseif (($ext_name == "cache") || (GET_EXT_VERSION("cache") == "")) {
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "DB! ext_name={$ext_name}");
                // Load from database
                $result = SQL_QUERY_ESC("SELECT ext_active FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
-                       array($ext_name), __FILE__, __LINE__);
+                       array($ext_name), __FUNCTION__, __LINE__);
 
                // Entry found?
                if (SQL_NUMROWS($result) == 1) {
@@ -350,11 +433,11 @@ function EXT_IS_ACTIVE ($ext_name) {
                SQL_FREERESULT($result);
 
                // Write cache array
-               //* DEBUG: */ echo $ext_name."[DB]: {$active}");
+               //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ext_name=".$ext_name."[DB]: {$active}");
                $GLOBALS['cache_array']['extensions']['ext_active'][$ext_name] = $active;
        } else {
                // Extension not active!
-               //* DEBUG: */ echo $ext_name.": Not active!");
+               //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ext_name=".$ext_name.": Not active!");
                $GLOBALS['cache_array']['extensions']['ext_active'][$ext_name] = "N";
        }
 
@@ -369,6 +452,12 @@ function GET_EXT_VERSION ($ext_name) {
        // By default no extension is found
        $ext_ver = false;
 
+       // Empty extension name should be fixed!
+       if (empty($ext_name)) {
+               // Please report this bug!
+               debug_report_bug(__FUNCTION__.": ext_name is empty which is not allowed here.");
+       } // END - if
+
        // Extensions are all inactive during installation
        if ((!isInstalled()) || (isInstalling())) return "";
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": ext_name={$ext_name}");
@@ -384,7 +473,7 @@ function GET_EXT_VERSION ($ext_name) {
        } elseif (!isCacheInstanceValid()) {
                // Load from database
                $result = SQL_QUERY_ESC("SELECT ext_version FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
-                       array($ext_name), __FILE__, __LINE__);
+                       array($ext_name), __FUNCTION__, __LINE__);
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": DB - ".SQL_NUMROWS($result)."");
 
                // Is the extension there?
@@ -407,20 +496,17 @@ function GET_EXT_VERSION ($ext_name) {
 
 // Updates a given extension with current extension version to latest version
 function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
-       // This shall never do a non-admin user!
-       global $NOTES;
-       global $INC_POOL;
-
-       // Init arrays
-       INIT_SQLS();
-       $INC_POOL = array();
-
-       // Init notes
-       $NOTES = "";
-
        // Only admins are allowed to update extensions
        if ((!IS_ADMIN()) || (empty($ext_name))) return false;
 
+       // Set current SQL name
+       EXT_SET_CURR_NAME($ext_name);
+
+       // Init arrays
+       INIT_EXT_SQLS();
+       EXT_INIT_NOTES();
+       INIT_INC_POOL();
+
        // Load extension in test mode
        LOAD_EXTENSION($ext_name, "test", $ext_ver, $dry_run);
 
@@ -428,7 +514,7 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
        $history = EXT_GET_VER_HISTORY();
 
        // Remove old SQLs array to prevent possible bugs
-       INIT_SQLS();
+       INIT_EXT_SQLS();
 
        // Check if version is updated
        if (((EXT_GET_VERSION() != $ext_ver) || ($dry_run)) && (is_array($history))) {
@@ -436,60 +522,57 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
                $start = array_search($ext_ver, $history);
 
                // And load SQL queries in order of version history
-               for ($idx = ($start + 1); $idx < sizeof($history); $idx++) {
+               for ($idx = ($start + 1); $idx < count($history); $idx++) {
                        // Set extension version
-                       $GLOBALS['cache_array']['update_ver'][$ext_name] = $history[$idx];
+                       $GLOBALS['cache_array']['update_ver'][EXT_GET_CURR_NAME()] = $history[$idx];
 
                        // Load again...
-                       LOAD_EXTENSION($ext_name, "update", $GLOBALS['cache_array']['update_ver'][$ext_name], $dry_run);
+                       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_name] = GET_SQLS();
-
                                // Is the extension there?
                                if (GET_EXT_VERSION(EXT_GET_UPDATE_DEPENDS()) != "") {
                                        // Update another extension first!
                                        $test = EXTENSION_UPDATE(EXT_GET_UPDATE_DEPENDS(), GET_EXT_VERSION(EXT_GET_UPDATE_DEPENDS()), $dry_run);
                                } else {
                                        // Register new extension
-                                       $test = EXTENSION_REGISTER(EXT_GET_UPDATE_DEPENDS(), 0, $dry_run, false);
+                                       $test = REGISTER_EXTENSION(EXT_GET_UPDATE_DEPENDS(), 0, $dry_run, false);
                                }
-
-                               // Restore previous SQL queries
-                               SET_SQLS($GLOBALS['cache_array']['update_sqls'][$ext_name]);
-                               unset($GLOBALS['cache_array']['update_sqls'][$ext_name]);
                        } // END - if
 
                        // Add notes
-                       $NOTES .= ADD_EXTENSION_NOTES($GLOBALS['cache_array']['update_ver'][$ext_name]);
+                       ADD_EXTENSION_NOTES($GLOBALS['cache_array']['update_ver'][EXT_GET_CURR_NAME()]);
                } // END - for
 
                // In real-mode execute any existing includes
                if (!$dry_run) {
-                       $GLOBALS['cache_array']['inc_pool'][$ext_name] = $INC_POOL;
-                       runFilterChain('load_includes', $INC_POOL);
-                       $INC_POOL = $GLOBALS['cache_array']['inc_pool'][$ext_name];
-                       unset($GLOBALS['cache_array']['inc_pool'][$ext_name]);
+                       $GLOBALS['cache_array']['inc_pool'][EXT_GET_CURR_NAME()] = GET_INC_POOL();
+                       runFilterChain('load_includes');
+                       SET_INC_POOL($GLOBALS['cache_array']['inc_pool'][EXT_GET_CURR_NAME()]);
+                       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));
 
                if (!$dry_run) {
                        // Create task
-                       CREATE_EXTENSION_UPDATE_TASK(GET_CURRENT_ADMIN_ID(), $ext_name, $GLOBALS['cache_array']['update_ver'][$ext_name], SQL_ESCAPE($NOTES));
+                       CREATE_EXTENSION_UPDATE_TASK(GET_CURRENT_ADMIN_ID(), EXT_GET_CURR_NAME(), $GLOBALS['cache_array']['update_ver'][EXT_GET_CURR_NAME()], SQL_ESCAPE(EXT_GET_NOTES(EXT_GET_NOTES())));
 
                        // Update extension's version
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_version='%s' WHERE ext_name='%s' LIMIT 1",
-                               array($GLOBALS['cache_array']['update_ver'][$ext_name], $ext_name), __FILE__, __LINE__);
+                               array($GLOBALS['cache_array']['update_ver'][EXT_GET_CURR_NAME()], EXT_GET_CURR_NAME()), __FUNCTION__, __LINE__);
 
                        // Remove arrays
                        UNSET_SQLS();
-                       unset($GLOBALS['cache_array']['update_ver'][$ext_name]);
+                       unset($GLOBALS['cache_array']['update_ver'][EXT_GET_CURR_NAME()]);
 
                        // Run filters on success extension update
-                       runFilterChain('extension_update', $ext_name);
+                       runFilterChain('extension_update', EXT_GET_CURR_NAME());
                } // END - if
        } // END - if
 }
@@ -570,7 +653,7 @@ function GET_EXT_NAME ($ext_id) {
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                $result = SQL_QUERY_ESC("SELECT ext_name FROM `{!_MYSQL_PREFIX!}_extensions` WHERE id=%s LIMIT 1",
-                       array(bigintval($ext_id)), __FILE__, __LINE__);
+                       array(bigintval($ext_id)), __FUNCTION__, __LINE__);
                list($ret) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
        }
@@ -590,7 +673,7 @@ function GET_EXT_ID ($ext_name) {
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
-                       array($ext_name), __FILE__, __LINE__);
+                       array($ext_name), __FUNCTION__, __LINE__);
                list($ret) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
        }
@@ -603,7 +686,7 @@ function GET_EXT_ID ($ext_name) {
 function ACTIVATE_EXTENSION ($ext_name) {
        // Activate the extension
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='Y' WHERE ext_name='%s' LIMIT 1",
-               array($ext_name), __FILE__, __LINE__);
+               array($ext_name), __FUNCTION__, __LINE__);
 
        // Extension has been activated?
        if (SQL_AFFECTEDROWS() == 1) {
@@ -616,7 +699,7 @@ function ACTIVATE_EXTENSION ($ext_name) {
 function DEACTIVATE_EXTENSION($ext_name) {
        // Activate the extension
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='N' WHERE ext_name='%s' LIMIT 1",
-               array($ext_name), __FILE__, __LINE__);
+               array($ext_name), __FUNCTION__, __LINE__);
 
        // Extension has been activated?
        if (SQL_AFFECTEDROWS() == 1) {
@@ -659,7 +742,7 @@ function CREATE_EXTENSION_UPDATE_TASK ($admin_id, $ext_name, $ext_ver, $notes) {
                if (DETERMINE_TASK_ID_BY_SUBJECT($subject) == 0) {
                        // Task not created so it's a brand-new extension which we need to register and create a task for!
                        SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (assigned_admin, userid, status, task_type, subject, text, task_created) VALUES ('%s','0','NEW','EXTENSION_UPDATE','%s','%s', UNIX_TIMESTAMP())",
-                               array($admin_id, $subject, $notes), __FILE__, __LINE__);
+                               array($admin_id, $subject, $notes), __FUNCTION__, __LINE__);
                } // END - if
        } // END - if
 }
@@ -675,23 +758,26 @@ function CREATE_NEW_EXTENSION_TASK ($admin_id, $subject, $ext) {
                        $ext
                );
 
-               // Load text for task
+               // Set default message if ext-foo is missing
+               $msg = sprintf(getMessage('ADMIN_EXT_TEXT_FILE_MISSING'), $ext);
+
+               // Load text for task if found
                if (FILE_READABLE($tpl)) {
                        // Load extension's own text template (HTML!)
-                       $msg = LOAD_TEMPLATE("ext_".$ext, true);
+                       $msg = LOAD_TEMPLATE("ext_" . $ext, true);
                } else {
-                       // Load default message
-                       $msg = LOAD_TEMPLATE("admin_new_ext", "", 0);
+                       // Write this in debug.log as well
+                       DEBUG_LOG(__FUNCTION__, __LINE__, $msg);
                }
 
                // Task not created so it's a brand-new extension which we need to register and create a task for!
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (assigned_admin, userid, status, task_type, subject, text, task_created)
-VALUES (%s,0,'NEW','EXTENSION','%s','%s',UNIX_TIMESTAMP())",
+VALUES (%s, 0, 'NEW', 'EXTENSION', '%s', '%s', UNIX_TIMESTAMP())",
                        array(
                                $admin_id,
                                $subject,
-                               SQL_ESCAPE($msg),
-                       ),  __FILE__, __LINE__, true, false
+                               smartAddSlashes($msg),
+                       ),  __FUNCTION__, __LINE__, true, false, false
                );
        } // END - if
 }
@@ -705,11 +791,11 @@ function CREATE_EXTENSION_DEACTIVATION_TASK ($ext) {
        if ((DETERMINE_TASK_ID_BY_SUBJECT($subject) == 0) && (GET_EXT_VERSION($ext) != "")) {
                // Task not created so add it
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (assigned_admin, userid, status, task_type, subject, text, task_created)
-VALUES (0,0,'NEW','EXTENSION_DEACTIVATION','%s','%s',UNIX_TIMESTAMP())",
+VALUES (0, 0, 'NEW', 'EXTENSION_DEACTIVATION', '%s', '%s', UNIX_TIMESTAMP())",
                        array(
                                $subject,
                                SQL_ESCAPE(LOAD_TEMPLATE("task_ext_deactivated", true, $ext)),
-                       ),  __FILE__, __LINE__, true, false
+                       ),  __FUNCTION__, __LINE__, true, false
                );
        } // END - if
 }
@@ -719,7 +805,7 @@ function MODULE_HAS_MENU ($mod, $forceDb = false) {
        // All is false by default
        $ret = false;
 
-       //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):mod={$mod},cache=".GET_EXT_VERSION("cache")."<br />\n";
+       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "mod={$mod},cache=".GET_EXT_VERSION("cache"));
        if (GET_EXT_VERSION("cache") >= "0.1.2") {
                // Cache version is okay, so let's check the cache!
                if (isset($GLOBALS['cache_array']['modules']['has_menu'][$mod])) {
@@ -736,8 +822,8 @@ function MODULE_HAS_MENU ($mod, $forceDb = false) {
                }
        } elseif ((GET_EXT_VERSION("sql_patches") >= "0.3.6") && ((!EXT_IS_ACTIVE("cache")) || ($forceDb === true))) {
                // Check database for entry
-               $result = SQL_QUERY_ESC("SELECT has_menu FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE module='%s' LIMIT 1",
-                       array($mod), __FILE__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT has_menu FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE `module`='%s' LIMIT 1",
+                       array($mod), __FUNCTION__, __LINE__);
 
                // Entry found?
                if (SQL_NUMROWS($result) == 1) {
@@ -759,7 +845,7 @@ function MODULE_HAS_MENU ($mod, $forceDb = false) {
        }
 
        // Return status
-       //* DEBUG: */ var_dump($ret);
+       //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().":"; var_dump($ret);
        return $ret;
 }
 
@@ -770,7 +856,7 @@ function DETERMINE_EXTENSION_TASK_ID ($ext_name) {
 
        // Search for extension task's id
        $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_task_system` WHERE task_type='EXTENSION' AND subject='[%s:]' LIMIT 1",
-               array($ext_name), __FILE__, __LINE__);
+               array($ext_name), __FUNCTION__, __LINE__);
 
        // Entry found?
        if (SQL_NUMROWS($result) == 1) {
@@ -792,7 +878,7 @@ function DETERMINE_TASK_ID_BY_SUBJECT ($subject) {
 
        // Search for task id
        $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_task_system` WHERE subject LIKE '%s%%' LIMIT 1",
-               array($subject), __FILE__, __LINE__);
+               array($subject), __FUNCTION__, __LINE__);
 
        // Entry found?
        if (SQL_NUMROWS($result) == 1) {
@@ -822,6 +908,8 @@ function ADD_EXTENSION_NOTES ($ver) {
                                'ver'   => $ver,
                                'notes' => EXT_GET_UPDATE_NOTES()
                        );
+
+                       // Reset them
                        EXT_SET_UPDATE_NOTES("");
                } elseif (($ver == "0.0") || ($ver == "0.0.0")) {
                        // Initial release
@@ -841,8 +929,8 @@ function ADD_EXTENSION_NOTES ($ver) {
                $out = LOAD_TEMPLATE("admin_ext_notes", true, $content);
        } // END - if
 
-       // Return the output
-       return $out;
+       // Add the notes
+       EXT_APPEND_NOTES($out);
 }
 
 // Getter for CSS files array
@@ -880,47 +968,154 @@ function EXT_ADD_CSS_FILE ($file) {
 
 // Setter for EXT_ALWAYS_ACTIVE flag
 function EXT_SET_ALWAYS_ACTIVE ($active) {
-       $GLOBALS['ext_always_active'] = $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'] = $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'] = $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
-function EXT_SET_UPDATE_DEPENDS ($updateDepends) {
-       $GLOBALS['ext_update_depends'] = $updateDepends;
+function EXT_ADD_UPDATE_DEPENDS ($updateDepends) {
+       // Is the update depency empty? (NEED TO BE FIXED!)
+       if (empty($updateDepends)) {
+               // Please report this bug!
+               debug_report_bug("updateDepends is left empty!");
+       } // END - if
+
+       // Is it not yet added?
+       if (!in_array($updateDepends, $GLOBALS['ext_running_updates'])) {
+               //* DEBUG */ DEBUG_LOG(__FUNCTION__, __LINE__, "currName=".EXT_GET_CURR_NAME()."/".$updateDepends);
+               // Add it to the list of extension update depencies map
+               $GLOBALS['ext_update_depends'][EXT_GET_CURR_NAME()][] = (string) $updateDepends;
+
+               // Remember it in the list of running updates
+               $GLOBALS['ext_running_updates'][] = $updateDepends;
+       } // END - if
+}
+
+// Checks wether the given extension registration is in progress
+function EXT_IS_REGISTER_RUNNING ($ext_name) {
+       return ((isset($GLOBALS['ext_register_running'])) && (in_array($ext_name, $GLOBALS['ext_register_running'])));
+}
+
+// Init EXT_UPDATE_DEPENDS flag
+function EXT_INIT_UPDATE_DEPENDS () {
+       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "currName=".EXT_GET_CURR_NAME());
+
+       // Init update depency map automatically if not found
+       if (!EXT_IS_UPDATE_DEPENDS_INIT()) {
+               //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "currName=".EXT_GET_CURR_NAME()." - INIT!");
+               $GLOBALS['ext_update_depends'][EXT_GET_CURR_NAME()] = array();
+       } // END - if
+
+       // Init running updates array
+       EXT_INIT_RUNNING_UPDATES();
+}
+
+// Adds an extension as "registration in progress"
+function EXT_ADD_RUNNING_REGISTRATION ($ext_name) {
+       // Is it running?
+       if (!EXT_IS_REGISTER_RUNNING($ext_name)) {
+               // Then add it!
+               $GLOBALS['ext_register_running'][] = $ext_name;
+       } // END - if
+}
+
+// Checks wether EXT_UPDATE_DEPENDS is initialized
+function EXT_IS_UPDATE_DEPENDS_INIT () {
+       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "currName=".EXT_GET_CURR_NAME());
+       return (isset($GLOBALS['ext_update_depends'][EXT_GET_CURR_NAME()]));
+}
+
+// Initializes the list of running updates
+function EXT_INIT_RUNNING_UPDATES () {
+       // Auto-init ext_running_updates
+       if (!isset($GLOBALS['ext_running_updates'])) {
+               $GLOBALS['ext_running_updates'] = array();
+               $GLOBALS['ext_register_running'] = array();
+       } // END - if
 }
 
 // Getter for EXT_UPDATE_DEPENDS flag
 function EXT_GET_UPDATE_DEPENDS () {
-       return $GLOBALS['ext_update_depends'];
+       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "currName=".EXT_GET_CURR_NAME());
+       return $GLOBALS['ext_update_depends'][EXT_GET_CURR_NAME()];
+}
+
+// Getter for next iterator depency
+function EXT_GET_ITERATOR_UPDATE_DEPENDS () {
+       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "currName=".EXT_GET_CURR_NAME());
+       return ($GLOBALS['ext_update_depends'][EXT_GET_CURR_NAME()][EXT_GET_UPDATE_ITERATOR()]);
+}
+
+// Counter for extension update depencies
+function EXT_COUNT_UPDATE_DEPENDS () {
+       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "currName=".EXT_GET_CURR_NAME());
+       return count($GLOBALS['ext_update_depends'][EXT_GET_CURR_NAME()]);
+}
+
+// Removes given extension from update denpency list
+function EXT_REMOVE_UPDATE_DEPENDS ($ext_name) {
+       // Look it up
+       $key = array_search($ext_name, EXT_GET_UPDATE_DEPENDS());
+
+       // Is it valid?
+       if ($key !== false) {
+               // Then remove it
+               unset($GLOBALS['ext_update_depends'][EXT_GET_CURR_NAME()][$key]);
+
+               // And sort the array
+               ksort($GLOBALS['ext_update_depends'][EXT_GET_CURR_NAME()]);
+       } // END - if
+}
+
+// Init iterator for update depencies
+function EXT_INIT_UPDATE_ITERATOR () {
+       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "currName=".EXT_GET_CURR_NAME());
+       $GLOBALS['ext_depend_iterator'][EXT_GET_CURR_NAME()] = 0;
+}
+
+// Getter for depency iterator
+function EXT_GET_UPDATE_ITERATOR () {
+       // Auto-init iterator
+       if (!isset($GLOBALS['ext_depend_iterator'][EXT_GET_CURR_NAME()])) EXT_INIT_UPDATE_ITERATOR();
+
+       // Return it
+       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "currName=".EXT_GET_CURR_NAME()."/".$GLOBALS['ext_depend_iterator'][EXT_GET_CURR_NAME()]);
+       return $GLOBALS['ext_depend_iterator'][EXT_GET_CURR_NAME()];
+}
+
+// Increments the update iterator
+function EXT_INCREMENT_UPDATE_INTERATOR () {
+       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "currName=".EXT_GET_CURR_NAME());
+       $GLOBALS['ext_depend_iterator'][EXT_GET_CURR_NAME()]++;
 }
 
 // Setter for EXT_REPORTS_FAILURE flag
 function EXT_SET_REPORTS_FAILURE ($reportsFailure) {
-       $GLOBALS['ext_reports_failure'] = $reportsFailure;
+       $GLOBALS['ext_reports_failure'] = (bool) $reportsFailure;
 }
 
 // Getter for EXT_REPORTS_FAILURE flag
@@ -933,14 +1128,14 @@ function EXT_SET_VER_HISTORY ($verHistory) {
        $GLOBALS['ext_ver_history'] = (array) $verHistory;
 }
 
-// Getter for EXT_VER_HISTORY flag
+// Getter for EXT_VER_HISTORY array
 function EXT_GET_VER_HISTORY () {
        return $GLOBALS['ext_ver_history'];
 }
 
 // Setter for EXT_UPDATE_NOTES flag
 function EXT_SET_UPDATE_NOTES ($updateNotes) {
-       $GLOBALS['ext_update_notes'] = (array) $updateNotes;
+       $GLOBALS['ext_update_notes'] = (string) $updateNotes;
 }
 
 // Getter for EXT_UPDATE_NOTES flag
@@ -948,5 +1143,97 @@ function EXT_GET_UPDATE_NOTES () {
        return $GLOBALS['ext_update_notes'];
 }
 
+// Init extension notice
+function EXT_INIT_NOTES () {
+       $GLOBALS['ext_notes'] = "";
+}
+
+// Append extension notice
+function EXT_APPEND_NOTES ($notes) {
+       $GLOBALS['ext_notes'] .= (string) $notes;
+}
+
+// Getter for extension notes
+function EXT_GET_NOTES () {
+       return $GLOBALS['ext_notes'];
+}
+
+// Setter for current extension name
+function EXT_SET_CURR_NAME ($ext_name) {
+       $GLOBALS['curr_ext_name'] = (string) $ext_name;
+}
+
+// Getter for current extension name
+function EXT_GET_CURR_NAME () {
+       if (isset($GLOBALS['curr_ext_name'])) {
+               return $GLOBALS['curr_ext_name'];
+       } // END - if
+
+       // Not set!
+       debug_report_bug(__FUNCTION__.": curr_ext_name not initialized. Please execute INIT_EXT_SQLS() before calling this function.");
+}
+
+// Init SQLs array for current extension
+function INIT_EXT_SQLS () {
+       // 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
+function ADD_EXT_SQL ($sql) {
+       $GLOBALS['ext_sqls'][EXT_GET_CURR_NAME()][] = $sql;
+}
+
+// Getter for SQLs array for current extension
+function GET_EXT_SQLS () {
+       // Output debug backtrace if not found (SHOULD NOT HAPPEN!)
+       if (!isset($GLOBALS['ext_sqls'][EXT_GET_CURR_NAME()])) {
+               // Not found, should not happen
+               debug_report_bug(sprintf("ext_sqls is empty, current extension: %s",
+                       EXT_GET_CURR_NAME()
+               ));
+       } // END - if
+
+       // Return the array
+       return $GLOBALS['ext_sqls'][EXT_GET_CURR_NAME()];
+}
+
+// Removes SQLs for current extension
+function UNSET_EXT_SQLS () {
+       unset($GLOBALS['ext_sqls'][EXT_GET_CURR_NAME()]);
+}
+
+// Auto-initializes the removal list
+function EXT_INIT_REMOVAL_LIST () {
+       // Is the remove list there?
+       if (!isset($GLOBALS['ext_update_remove'])) {
+               // Then create it
+               $GLOBALS['ext_update_remove'] = array();
+       } // END - if
+}
+
+// Checks wether the current extension is on the removal list
+function EXT_IS_ON_REMOVAL_LIST () {
+       // Init removal list
+       EXT_INIT_REMOVAL_LIST();
+
+       // Is it there?
+       return (in_array(EXT_GET_CURR_NAME(), $GLOBALS['ext_update_remove']));
+}
+
+// Adds the current extension to the removal list
+function EXT_ADD_CURRENT_TO_REMOVAL_LIST () {
+       // Simply add it
+       $GLOBALS['ext_update_remove'][] = EXT_GET_CURR_NAME();
+}
+
+// Getter for removal list
+function EXT_GET_REMOVAL_LIST () {
+       // Return the removal list
+       return $GLOBALS['ext_update_remove'];
+}
+
 //
 ?>