Final fixes for SQL execution
[mailer.git] / inc / extensions.php
index d95384706f28812a36822505e4955a043326bbd9..1439e97a8c18e1e9bc0be0828af2670fdb0c3629 100644 (file)
@@ -38,8 +38,8 @@ 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 $EXT_LOADED, $_CONFIG, $CSS, $cacheMode, $SQLs, $EXT_VER_HISTORY;
+function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run = false, &$SQLs = array()) {
+       global $EXT_LOADED, $_CONFIG, $CSS, $cacheMode, $EXT_VER_HISTORY;
        global $INC_POOL, $EXT_UPDATE_DEPENDS, $EXT_DEPRECATED, $UPDATE_NOTES;
        global $EXT_VERSION, $EXT_ALWAYS_ACTIVE;
 
@@ -123,10 +123,11 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
        return true;
 }
 
-//
-function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run=false) {
-       global $UPDATE_NOTES, $_CONFIG, $INC_POOL, $cacheInstance;
-       global $EXT_VER_HISTORY, $SQLs, $NOTES, $EXT_ALWAYS_ACTIVE, $EXT_VERSION;
+// Registeres an extension and possible update depencies
+function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = true) {
+       global $UPDATE_NOTES, $INC_POOL, $cacheInstance;
+       global $EXT_VER_HISTORY, $NOTES, $EXT_ALWAYS_ACTIVE, $EXT_VERSION;
+       global $EXT_UPDATE_DEPENDS;
 
        // This shall never do a non-admin user!
        if (!IS_ADMIN()) return false;
@@ -139,19 +140,17 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run=false) {
        $NOTES = "";
        $INC_POOL = array();
 
-       // By default the language prefix is the extension's name
-       // @TODO: Do we really need this one anymore? Can't we just take $ext_name and done?
        // By default we have no failtures
        $EXT_REPORTS_FAILURE = false;
 
        // Does this extension exists?
-       if (LOAD_EXTENSION($ext_name, "register", "", $dry_run)) {
+       if (LOAD_EXTENSION($ext_name, "register", "", $dry_run, $SQLs)) {
                // And run possible updates
                $history = $EXT_VER_HISTORY;
                foreach ($history as $ver) {
                        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ext_name={$ext_name}, ext_ver={$ver}");
                        // Load extension in update mode
-                       LOAD_EXTENSION($ext_name, "update", $ver, $dry_run);
+                       LOAD_EXTENSION($ext_name, "update", $ver, $dry_run, $SQLs);
 
                        // Do we have an update?
                        if (((GET_EXT_VERSION("sql_patches") != "") && (getConfig('verbose_sql') == "Y")) || (!EXT_IS_ACTIVE("sql_patches"))) {
@@ -175,32 +174,26 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run=false) {
                        $SQLs2 = $SQLs;
                        $SQLs  = array();
                        $test  = false;
+                       $ext_update = $EXT_UPDATE_DEPENDS;
 
                        // Check for required file
-                       if (LOAD_EXTENSION($EXT_UPDATE_DEPENDS, "register", "", $dry_run)) {
+                       if (LOAD_EXTENSION($ext_update, "register", "", $dry_run, $SQLs)) {
                                // If versions mismatch update extension first
-                               $ext_ver = GET_EXT_VERSION($EXT_UPDATE_DEPENDS);
+                               $ext_ver = GET_EXT_VERSION($ext_update);
 
                                // Extension version set? If empty the extension is not registered
                                if (empty($ext_ver)) {
                                        // Extension not registered so far so first load task's ID...
-                                       $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE task_type='EXTENSION' AND subject LIKE '[%s:]%%' LIMIT 1",
-                                               array($EXT_UPDATE_DEPENDS), __FILE__, __LINE__);
+                                       $task = DETERMINE_EXTENSION_TASK_ID($ext_update);
 
                                        // Entry found?
-                                       if (SQL_NUMROWS($result) == 1) {
-                                               // Task found so load task's ID and register extension...
-                                               list($task) = SQL_FETCHROW($result);
-
+                                       if ($task > 0) {
                                                // Try to register the extension
-                                               $test = EXTENSION_REGISTER($EXT_UPDATE_DEPENDS, $task, $dry_run);
+                                               $test = EXTENSION_REGISTER($ext_update, $task, $dry_run, false);
                                        } // END - if
-
-                                       // Free result
-                                       SQL_FREERESULT($result);
                                } elseif ($ext_ver != $EXT_VERSION) {
                                        // Ok, update this extension now
-                                       EXTENSION_UPDATE(basename($file), $EXT_UPDATE_DEPENDS, $ext_ver, $dry_run);
+                                       EXTENSION_UPDATE($ext_update, $ext_ver, $dry_run);
 
                                        // All okay!
                                        $test = true;
@@ -231,53 +224,18 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run=false) {
                if ($test) {
                        // "Dry-run-mode" activated?
                        if (!$dry_run) {
-                               // Run all SQLs
-                               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?
-                                               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);
-                                               }
-                                       } // END - if
-                               } // END - foreach
-
-                               // Remove cache file(s) if extension is active
-                               RUN_FILTER('post_extension_installed', $ext_name);
-
-                               // Check for added include files
-                               if (count($INC_POOL > 0)) {
-                                       // Loads every include file
-                                       foreach ($INC_POOL as $inc) {
-                                               require_once($inc);
-                                       } // END - foreach
-
-                                       // Remove array
-                                       unset($INC_POOL);
-                               } // END - if
+                               // Run installation pre-installation filters
+                               RUN_FILTER('pre_extension_installed', array('dry_run' => $dry_run, 'sqls' => $SQLs));
 
                                // Register extension
                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_extensions (ext_name, ext_active, ext_version) VALUES ('%s','%s','%s')",
                                        array($ext_name, $EXT_ALWAYS_ACTIVE, $EXT_VERSION), __FILE__, __LINE__);
 
-                               // Update task management
-                               ADMIN_SOLVE_TASK($task_id);
-
-                               // @TODO This causes the whole (!) menu cache being purged
-                               CACHE_PURGE_ADMIN_MENU();
+                               // 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));
 
                                // In normal mode return a true on success
                                $ret = true;
-
-                               // Remove SQLs
-                               unset($SQLs);
                        } else {
                                // Rewrite SQL command to keep { and } inside
                                foreach ($SQLs as $key => $sql) {
@@ -298,15 +256,21 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run=false) {
        } elseif (($task_id > 0) && (!empty($ext_name))) {
                // Remove task from system when id and extension's name is valid
                $result = 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)), __FILE__, __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)) {
-               // Then redirect to logout
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": LOAD!");
-               LOAD_URL("modules.php?module=admin&logout=1&".$EXT_LOAD_MODE."=sql_patches");
+               if ($logout) {
+                       // Then redirect to logout
+                       LOAD_URL("modules.php?module=admin&logout=1&".$EXT_LOAD_MODE."=sql_patches");
+               } else {
+                       // Add temporary filter
+                       REGISTER_FILTER('shutdown', 'REDIRECT_TO_LOGOUT_SQL_PATCHES', true, true);
+                       $GLOBALS['ext_load_mode'] = $EXT_LOAD_MODE;
+               }
        } // END - if
 
        // Return status code
@@ -316,48 +280,29 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run=false) {
 // Run SQL queries for given extension id
 // @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
-       global $cacheInstance, $_CONFIG, $SQLs;
+       global $cacheInstance;
 
-       // Extensions are never active by default
-       $EXT_ALWAYS_ACTIVE = "N";
+       // This shall never do a non-admin user!
+       if (!IS_ADMIN()) return false;
+
+       // Init array
+       $SQLs = array();
 
        // By default no SQL has been executed
        $sqlRan = false;
 
-       // 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 (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);
+       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', array('dry_run' => false, 'sqls' => $SQLs));
 
                // Removal mode?
                if ($load_mode == "remove") {
@@ -371,9 +316,6 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
        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);
-
-               // @TODO This causes the whole (!) menu cache being purged
-               CACHE_PURGE_ADMIN_MENU();
        } // END - if
 
        // Is this the sql_patches?
@@ -396,7 +338,7 @@ function EXT_IS_ACTIVE ($ext_name) {
        $active = "N";
 
        // Check cache
-       if (!empty($cacheArray['extensions']['ext_active'][$ext_name])) {
+       if (isset($cacheArray['extensions']['ext_active'][$ext_name])) {
                // Load from cache
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "CACHE! ext_name={$ext_name}");
                $active = $cacheArray['extensions']['ext_active'][$ext_name];
@@ -410,14 +352,11 @@ function EXT_IS_ACTIVE ($ext_name) {
                        array($ext_name), __FILE__, __LINE__);
 
                // Entry found?
-               if (SQL_NUMROWS($result) == 0) {
-                       // Extension was not found!
-                       return false;
+               if (SQL_NUMROWS($result) == 1) {
+                       // Load entry
+                       list($active) = SQL_FETCHROW($result);
                } // END - if
 
-               // Load entry
-               list($active) = SQL_FETCHROW($result);
-
                // Free result
                SQL_FREERESULT($result);
 
@@ -439,40 +378,48 @@ function EXT_IS_ACTIVE ($ext_name) {
 // Get version from extensions
 function GET_EXT_VERSION ($ext_name) {
        global $cacheArray, $_CONFIG, $cacheInstance;
-       $ret = false;
+       $ext_ver = false;
 
        // Extensions are all inactive during installation
        if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing'))) return "";
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": ext_name={$ext_name}");
 
        // Is the cache written?
-       if (!empty($cacheArray['extensions']['ext_version'][$ext_name])) {
+       if (isset($cacheArray['extensions']['ext_version'][$ext_name])) {
                // Load data from cache
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": CACHE!");
-               $ret = $cacheArray['extensions']['ext_version'][$ext_name];
+               $ext_ver = $cacheArray['extensions']['ext_version'][$ext_name];
 
                // Count cache hits
                if (getConfig('cache_hits') > 0) $_CONFIG['cache_hits']++; else $_CONFIG['cache_hits'] = 1;
        } elseif (!is_object($cacheInstance)) {
                // 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__);
-               list($ret) = SQL_FETCHROW($result);
+                       array($ext_name), __FILE__, __LINE__);
+
+               // Is the extension there?
+               if (SQL_NUMROWS($result) == 1) {
+                       // Load entry
+                       list($ext_ver) = SQL_FETCHROW($result);
+               } // END - if
+
+               // Free result
                SQL_FREERESULT($result);
 
                // Set cache
-               $cacheArray['extensions']['ext_version'][$ext_name] = $ret;
+               $cacheArray['extensions']['ext_version'][$ext_name] = $ext_ver;
        }
 
        // Return result
-       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": ret={$ret}");
-       return $ret;
+       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": ret={$ext_ver}");
+       return $ext_ver;
 }
-//
-function EXTENSION_UPDATE ($file, $ext_name, $ext_ver, $dry_run=false) {
+
+// 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 $cacheInstance, $_CONFIG, $UPDATE_NOTES, $NOTES, $EXT_VER_HISTORY;
-       global $EXT_UPDATE_DEPENDS, $EXT_VERSION;
+       global $cacheInstance, $UPDATE_NOTES, $NOTES, $EXT_VER_HISTORY;
+       global $EXT_UPDATE_DEPENDS, $EXT_VERSION, $INC_POOL, $cacheArray, $SQLs;
 
        // Init arrays
        $SQLs = array(); $INC_POOL = array();
@@ -480,17 +427,15 @@ function EXTENSION_UPDATE ($file, $ext_name, $ext_ver, $dry_run=false) {
        // Only admins are allowed to update extensions
        if ((!IS_ADMIN()) || (empty($ext_name))) return false;
 
-       // Load extension in update mode
-       LOAD_EXTENSION($ext_name, "update". $ext_ver, $dry_run);
-
-       if (!empty($EXT_UPDATE_DEPENDS)) {
-               // Update another extension first!
-               $test = EXTENSION_UPDATE(("ext-".$EXT_UPDATE_DEPENDS.".php"), $EXT_UPDATE_DEPENDS, GET_EXT_VERSION($EXT_UPDATE_DEPENDS), $dry_run);
-       }
+       // Load extension in test mode
+       LOAD_EXTENSION($ext_name, "test", $ext_ver, $dry_run, $SQLs);
 
        // Save version history
        $history = $EXT_VER_HISTORY;
 
+       // Remove old SQLs array to prevent possible bugs
+       $SQLs = array();
+
        // Check if version is updated
        if ((($EXT_VERSION != $ext_ver) || ($dry_run)) && (is_array($history))) {
                // Search for starting point
@@ -499,74 +444,67 @@ function EXTENSION_UPDATE ($file, $ext_name, $ext_ver, $dry_run=false) {
 
                // And load SQL queries in order of version history
                for ($idx = ($start + 1); $idx < sizeof($history); $idx++) {
-                       // Remove old SQLs array to prevent possible bugs
-                       if (!$dry_run) { unset($SQLs); $SQLs = array(); }
-
                        // Set extension version
-                       $ver = $history[$idx];
+                       $cacheArray['update_ver'][$ext_name] = $history[$idx];
 
                        // Load again...
-                       LOAD_EXTENSION($ext_name, "update", $ver, $dry_run);
+                       LOAD_EXTENSION($ext_name, "update", $cacheArray['update_ver'][$ext_name], $dry_run, $SQLs);
+
+                       if (!empty($EXT_UPDATE_DEPENDS)) {
+                               // Backup current SQL queries
+                               $cacheArray['update_sqls'][$ext_name] = $SQLs;
+
+                               // Is the extension there?
+                               if (GET_EXT_VERSION($EXT_UPDATE_DEPENDS) != "") {
+                                       // Update another extension first!
+                                       $test = EXTENSION_UPDATE($EXT_UPDATE_DEPENDS, GET_EXT_VERSION($EXT_UPDATE_DEPENDS), $dry_run);
+                               } else {
+                                       // Register new extension
+                                       $test = EXTENSION_REGISTER($EXT_UPDATE_DEPENDS, 0, $dry_run, false);
+                               }
+
+                               // Restore previous SQL queries
+                               $SQLs = $cacheArray['update_sqls'][$ext_name];
+                               unset($cacheArray['update_sqls'][$ext_name]);
+                       } // END - if
 
                        // Add notes
                        if (getConfig('verbose_sql') == "Y") {
                                if (!empty($UPDATE_NOTES)) {
                                        // Update notes found
-                                       $NOTES .= ("<div class=\"update_notes\"><strong>v".$ver.":</strong><br />".$UPDATE_NOTES."</div>");
+                                       $NOTES .= ("<div class=\"update_notes\"><strong>v".$cacheArray['update_ver'][$ext_name].":</strong><br />".$UPDATE_NOTES."</div>");
                                        $UPDATE_NOTES = "";
-                               } elseif ($ver == "0.0") {
+                               } elseif ($cacheArray['update_ver'][$ext_name] == "0.0") {
                                        // Initial release
-                                       $NOTES .= ("<div class=\"update_notes\"><strong>v".$ver.":</strong><br />".INITIAL_RELEASE."</div>");
+                                       $NOTES .= ("<div class=\"update_notes\"><strong>v".$cacheArray['update_ver'][$ext_name].":</strong><br />".INITIAL_RELEASE."</div>");
                                } else {
-                                       $NOTES .= ("<div class=\"update_notes\"><strong>v".$ver.":</strong><br /><I>".NO_UPDATE_NOTES."</I></div>");
+                                       $NOTES .= ("<div class=\"update_notes\"><strong>v".$cacheArray['update_ver'][$ext_name].":</strong><br /><I>".NO_UPDATE_NOTES."</I></div>");
                                }
                        } // END - if
-
-                       // In real-mode execute any existing includes
-                       if ((!$dry_run) && (count($INC_POOL) > 0)) {
-                               // Include all files
-                               foreach ($INC_POOL as $fqfn) {
-                                       require_once($fqfn);
-                               } // END - foreach
-                       } // END - if
-
-                       // Run SQLs
-                       if ((is_array($SQLs)) && (!$dry_run)) {
-                               // Run SQL commands
-                               foreach ($SQLs as $sql)
-                               {
-                                       $sql = trim($sql);
-                                       if (!empty($sql))
-                                       {
-                                               // Do we have an "ALTER TABLE" command?
-                                               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);
-                                               }
-                                       }
-                               }
-                       } elseif (GET_EXT_VERSION("sql_patches") == "") {
-                               // Remove SQLs if extension is not installed
-                               $SQLs = array();
-                       }
                } // END - for
 
+               // In real-mode execute any existing includes
                if (!$dry_run) {
-                       // In normal mode insert task and update extension's version...
-                       $ext_subj = "[UPDATE-".$ext_name."-".$EXT_VERSION.":] ".ADMIN_UPDATE_EXT_SUBJ;
+                       $cacheArray['inc_pool'][$ext_name] = $INC_POOL;
+                       RUN_FILTER('load_includes', $INC_POOL);
+                       $INC_POOL = $cacheArray['inc_pool'][$ext_name];
+                       unset($cacheArray['inc_pool'][$ext_name]);
+               } // END - if
 
+               // Run SQLs
+               RUN_FILTER('run_sqls', array('dry_run' => $dry_run, 'sqls' => $SQLs));
+
+               if (!$dry_run) {
                        // Create task
-                       CREATE_EXTENSION_UPDATE_TASK(GET_CURRENT_ADMIN_ID(), $ext_subj, addslashes($NOTES));
+                       CREATE_EXTENSION_UPDATE_TASK(GET_CURRENT_ADMIN_ID(), $ext_name, $cacheArray['update_ver'][$ext_name], addslashes($NOTES));
 
                        // Update extension's version
                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_version='%s' WHERE ext_name='%s' LIMIT 1",
-                               array($EXT_VERSION, $ext_name), __FILE__, __LINE__);
+                               array($cacheArray['update_ver'][$ext_name], $ext_name), __FILE__, __LINE__);
 
-                       // Remove array
+                       // Remove arrays
                        unset($SQLs);
+                       unset($cacheArray['update_ver'][$ext_name]);
 
                        // Run filters on success extension update
                        RUN_FILTER('extension_update', $ext_name);
@@ -574,12 +512,12 @@ function EXTENSION_UPDATE ($file, $ext_name, $ext_ver, $dry_run=false) {
                        // In "dry-run" mode return array with SQL commands
                        return $SQLs;
                }
-       }
+       } // END - if
 }
 
 // Output verbose SQL table for extension
 function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = ADMIN_SQLS_EXECUTED_ON_REMOVAL, $dashed = "", $switch = false, $width = "100%") {
-       global $_CONFIG, $SQLs;
+       global $SQLs;
 
        // Are there some queries in $queries?
        if (count($queries) > 0) {
@@ -643,7 +581,7 @@ function GET_EXT_NAME ($ext_id) {
        $ret = "";
 
        // Is cache there?
-       if (!empty($cacheArray['extensions']['ext_name'][$ext_id])) {
+       if (isset($cacheArray['extensions']['ext_name'][$ext_id])) {
                // Load from cache
                $ret = $cacheArray['extensions']['ext_name'][$ext_id];
 
@@ -729,26 +667,25 @@ function EXT_VERSION_IS_OLDER ($ext_name, $ext_ver) {
 }
 
 // Creates a new task for updated extension
-function CREATE_EXTENSION_UPDATE_TASK ($admin_id, $subject, $notes) {
-       // Check if task is not there
-       $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE subject='%s' LIMIT 1",
-               array($subject), __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) == 0) {
-               // Task not created so it's a brand-new extension which we need to register and create a task for!
-               $result = 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__);
+function CREATE_EXTENSION_UPDATE_TASK ($admin_id, $ext_name, $ext_ver, $notes) {
+       // Create subject line
+       $subject = "[UPDATE-".$ext_name."-".$ext_ver.":] ".ADMIN_UPDATE_EXT_SUBJ;
+
+       // Is the extension there?
+       if (GET_EXT_VERSION($ext_name) != "") {
+               // Check if task is not there
+               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__);
+               } // END - if
        } // END - if
-
-       // Free memory
-       SQL_FREERESULT($result);
 }
 
 // Creates a new task for newly installed extension
 function CREATE_NEW_EXTENSION_TASK ($admin_id, $subject, $ext) {
        // Not installed and do we have created a task for the admin?
-       $result = SQL_QUERY_ESC("SELECT `id` FROM `"._MYSQL_PREFIX."_task_system` WHERE `subject` LIKE '%s%%' LIMIT 1",
-               array($subject), __FILE__, __LINE__);
-       if ((SQL_NUMROWS($result) == 0) && (GET_EXT_VERSION($ext) == "")) {
+       if ((DETERMINE_TASK_ID_BY_SUBJECT($subject) == 0) && (GET_EXT_VERSION($ext) == "")) {
                // Template file
                $tpl = sprintf("%stemplates/%s/html/ext/ext_%s.tpl",
                        PATH,
@@ -775,9 +712,6 @@ VALUES (%s,0,'NEW','EXTENSION','%s','%s',UNIX_TIMESTAMP())",
                        ),  __FILE__, __LINE__, true, false
                );
        } // END - if
-
-       // Free memory
-       SQL_FREERESULT($result);
 }
 
 // Creates a task for automatically deactivated (deprecated) extension
@@ -786,9 +720,7 @@ function CREATE_EXTENSION_DEACTIVATION_TASK ($ext) {
        $subject = sprintf("[%s:] %s", $ext, TASK_SUBJ_EXTENSION_DEACTIVATED);
 
        // Not installed and do we have created a task for the admin?
-       $result = SQL_QUERY_ESC("SELECT `id` FROM `"._MYSQL_PREFIX."_task_system` WHERE `subject` = '%s' LIMIT 1",
-               array($subject), __FILE__, __LINE__);
-       if ((SQL_NUMROWS($result) == 0) && (GET_EXT_VERSION($ext) != "")) {
+       if ((DETERMINE_TASK_ID_BY_SUBJECT($subject) == 0) && (GET_EXT_VERSION($ext) != "")) {
                // Task not created so add it
                $result_insert = 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())",
@@ -803,5 +735,99 @@ VALUES (0,0,'NEW','EXTENSION_DEACTIVATION','%s','%s',UNIX_TIMESTAMP())",
        SQL_FREERESULT($result);
 }
 
+// Checks if the module has a menu
+function MODULE_HAS_MENU ($mod, $forceDb = false) {
+       global $cacheArray, $_CONFIG;
+
+       // All is false by default
+       $ret = false;
+       //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):mod={$mod},cache=".GET_EXT_VERSION("cache")."<br />\n";
+       if (GET_EXT_VERSION("cache") >= "0.1.2") {
+               // Cache version is okay, so let's check the cache!
+               if (isset($cacheArray['modules']['has_menu'][$mod])) {
+                       // Check module cache and count hit
+                       $ret = ($cacheArray['modules']['has_menu'][$mod] == "Y");
+                       if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+               } elseif (isset($cacheArray['extensions']['ext_menu'][$mod])) {
+                       // Check cache and count hit
+                       $ret = ($cacheArray['extensions']['ext_menu'][$mod] == "Y");
+                       if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+               } elseif ((IS_ADMIN()) && ($mod == "admin")) {
+                       // Admin module has always a menu!
+                       $ret = true;
+               }
+       } 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__);
+
+               // Entry found?
+               if (SQL_NUMROWS($result) == 1) {
+                       // Load "has_menu" column
+                       list($has_menu) = SQL_FETCHROW($result);
+
+                       // Fake cache... ;-)
+                       $cacheArray['extensions']['ext_menu'][$mod] = $has_menu;
+
+                       // Does it have a menu?
+                       $ret = ($has_menu == "Y");
+               } // END  - if
+
+               // Free memory
+               SQL_FREERESULT($result);
+       } elseif (GET_EXT_VERSION("sql_patches") == "") {
+               // No sql_patches installed, so maybe in admin area?
+               $ret = ((IS_ADMIN()) && ($mod == "admin")); // Then there is a menu!
+       }
+
+       // Return status
+       //* DEBUG: */ var_dump($ret);
+       return $ret;
+}
+
+// Determines the task id for given extension
+function DETERMINE_EXTENSION_TASK_ID ($ext_name) {
+       // Default is not found
+       $task_id = 0;
+
+       // 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__);
+
+       // Entry found?
+       if (SQL_NUMROWS($result) == 1) {
+               // Task found so load task's ID and register extension...
+               list($task_id) = SQL_FETCHROW($result);
+       } // END - if
+
+       // Free result
+       SQL_FREERESULT($result);
+
+       // Return it
+       return $task_id;
+}
+
+// Determines the task id for given subject
+function DETERMINE_TASK_ID_BY_SUBJECT ($subject) {
+       // Default is not found
+       $task_id = 0;
+
+       // 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__);
+
+       // Entry found?
+       if (SQL_NUMROWS($result) == 1) {
+               // Task found so load task's ID and register extension...
+               list($task_id) = SQL_FETCHROW($result);
+       } // END - if
+
+       // Free result
+       SQL_FREERESULT($result);
+
+       // Return it
+       return $task_id;
+}
+
 //
 ?>