Fixes for extension problems while installing/removing (still double-registration...
[mailer.git] / inc / extensions.php
index 765d1d8100b7c582068f4ca8445f558c1737eeeb..5f3a704895bc1a7588896fdbecb018a6e5c2158b 100644 (file)
@@ -88,7 +88,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = '', $EXT_VER = '', $dry_run
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "--- Language loaded.");
                $GLOBALS['ext_loaded']['lang'][$ext_name] = true;
                loadIncludeOnce($langInclude);
-       } elseif ($ext_name != 'sql_patches') {
+       } elseif ((isDebugModeEnabled()) && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme')) {
                // No language file is not so good...
                DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("WARNING: Extension %s has no language file or we cannot read from it. lang=%s",
                        $ext_name, getLanguage()
@@ -104,7 +104,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = '', $EXT_VER = '', $dry_run
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "--- Functions loaded.");
                $GLOBALS['ext_loaded']['funcs'][$ext_name] = true;
                loadIncludeOnce($funcsInclude);
-       } elseif ($ext_name != 'sql_patches') {
+       } elseif ((isDebugModeEnabled()) && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme')) {
                // No functions file is not so good...
                DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("WARNING: Extension %s has no own functions file or we cannot read from it.",
                        $ext_name
@@ -238,6 +238,9 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr
                                                // Try to register the extension
                                                //* 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);
+
+                                               // Reset extension name
+                                               EXT_SET_CURR_NAME($ext_name);
                                                //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().':'; var_dump($test);
                                        } // END - if
                                } elseif ($ext_ver != EXT_GET_VERSION()) {
@@ -289,7 +292,7 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr
                                // Register extension
                                //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:insert=".EXT_GET_CURR_NAME().'/'.EXT_GET_VERSION()." - INSERT!<br />\n";
                                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_extensions` (ext_name, ext_active, ext_version) VALUES ('%s','%s','%s')",
-                               array(EXT_GET_CURR_NAME(), EXT_GET_ALWAYS_ACTIVE(), EXT_GET_VERSION()), __FUNCTION__, __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_GET_CURR_NAME(), 'task_id' => $task_id));
@@ -328,7 +331,7 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr
                //* 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)), __FUNCTION__, __LINE__);
+                       array(bigintval($task_id)), __FUNCTION__, __LINE__);
        }
 
        // Is this the sql_patches?
@@ -361,7 +364,10 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
        $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;
+       if (empty($ext_name)) {
+               // We should fix these all!
+               debug_report_bug(__FUNCTION__ . ': ext_name is empty. ext_id=' . $ext_id);
+       } // END - if
 
        // Set current SQL name
        EXT_SET_CURR_NAME($ext_name);
@@ -385,6 +391,9 @@ 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 any filters depending on the action here
+               runFilterChain('extension_' . $load_mode, $ext_name);
+
                // Run SQL commands...
                runFilterChain('run_sqls');
 
@@ -392,7 +401,7 @@ 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_GET_CURR_NAME()), __FUNCTION__, __LINE__);
+                               array(EXT_GET_CURR_NAME()), __FUNCTION__, __LINE__);
                } // END - if
        } // END - if
 
@@ -434,7 +443,7 @@ function EXT_IS_ACTIVE ($ext_name) {
                //* 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), __FUNCTION__, __LINE__);
+                       array($ext_name), __FUNCTION__, __LINE__);
 
                // Entry found?
                if (SQL_NUMROWS($result) == 1) {
@@ -468,7 +477,7 @@ function GET_EXT_VERSION ($ext_name) {
        // 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.");
+               debug_report_bug(__FUNCTION__ . ': ext_name is empty which is not allowed here.');
        } // END - if
 
        // Extensions are all inactive during installation
@@ -486,14 +495,17 @@ 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), __FUNCTION__, __LINE__);
+                       array($ext_name), __FUNCTION__, __LINE__);
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": DB - ".SQL_NUMROWS($result)."");
 
                // Is the extension there?
                if (SQL_NUMROWS($result) == 1) {
                        // Load entry
                        list($ext_ver) = SQL_FETCHROW($result);
-               } // END - if
+               } elseif (isDebugModeEnabled()) {
+                       // Not found!
+                       DEBUG_LOG(__FUNCTION__, __LINE__, sprintf(": Cannot find extension %s in database!", $ext_name));
+               }
 
                // Free result
                SQL_FREERESULT($result);
@@ -536,21 +548,38 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
 
                // And load SQL queries in order of version history
                for ($idx = ($start + 1); $idx < count($history); $idx++) {
+                       // Set current extension name
+                       //* DEBUG: */ print __FUNCTION__.'['.__LINE__.':] ext_name='.$ext_name.'<br />';
+                       EXT_SET_CURR_NAME($ext_name);
+
                        // Set extension version
                        $GLOBALS['cache_array']['update_ver'][EXT_GET_CURR_NAME()] = $history[$idx];
 
                        // Load again...
                        LOAD_EXTENSION(EXT_GET_CURR_NAME(), 'update', $GLOBALS['cache_array']['update_ver'][EXT_GET_CURR_NAME()], $dry_run);
 
-                       if (EXT_GET_UPDATE_DEPENDS() != '') {
-                               // 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 = REGISTER_EXTENSION(EXT_GET_UPDATE_DEPENDS(), 0, $dry_run, false);
-                               }
+                       // Get all depencies
+                       $depencies = EXT_GET_UPDATE_DEPENDS();
+
+                       // Nothing to apply?
+                       if (count($depencies) > 0) {
+                               // Apply all extension depencies
+                               foreach ($depencies as $ext_depend) {
+                                       // Set it as current
+                                       EXT_SET_CURR_NAME($ext_depend);
+
+                                       // Is the extension there?
+                                       if (GET_EXT_VERSION($ext_depend) != '') {
+                                               // Update another extension first!
+                                               $test = EXTENSION_UPDATE($ext_depend, GET_EXT_VERSION($ext_depend), $dry_run);
+                                       } else {
+                                               // Register new extension
+                                               $test = REGISTER_EXTENSION($ext_depend, 0, $dry_run, false);
+                                       }
+                               } // END - foreach
+
+                               // Set name back
+                               EXT_SET_CURR_NAME($ext_name);
                        } // END - if
 
                        // Add notes
@@ -666,10 +695,12 @@ 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)), __FUNCTION__, __LINE__);
+                       array(bigintval($ext_id)), __FUNCTION__, __LINE__);
                list($ret) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
        }
+
+       // Return the extension name
        return $ret;
 }
 
@@ -686,7 +717,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), __FUNCTION__, __LINE__);
+                       array($ext_name), __FUNCTION__, __LINE__);
                list($ret) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
        }
@@ -913,7 +944,6 @@ function ADD_EXTENSION_NOTES ($ver) {
 
        // Is do we have verbose output enabled?
        if ((getConfig('verbose_sql') == 'Y') || (!EXT_IS_ACTIVE('sql_patches'))) {
-
                // Update notes found?
                if (EXT_GET_UPDATE_NOTES() != '') {
                        // Update notes found
@@ -1251,11 +1281,23 @@ function EXT_GET_REMOVAL_LIST () {
 // Redirects if the provided extension is not installed
 function redirectOnUninstalledExtension ($ext_name) {
        // So is the extension there?
-       if (!EXT_IS_ACTIVE($ext_name)) {
+       if ((!isExtensionInstalled($ext_name)) || (!EXT_IS_ACTIVE($ext_name))) {
                // Redirect to index
                redirectToUrl('modules.php?module=index&amp;msg=' . getCode('EXTENSION_PROBLEM') . '&amp;ext=' . $ext_name);
        } // END - if
 }
 
+// Determines wether the given extension is installed
+function isExtensionInstalled ($ext_name) {
+       // Default is not installed
+       $isInstalled = false;
+
+       // Check cache ext_version
+       $isInstalled = isset($GLOBALS['cache_array']['extensions']['ext_version'][$ext_name]);
+
+       // Return status
+       return $isInstalled;
+}
+
 //
 ?>