X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions.php;h=22f218150d7cfc16d48aa0c5c416eb67d3827d7a;hp=cfa4c928d4518f8609820fd0a3d8f362944be4e9;hb=509ae618cc32ba2b811cf66567d62abc597dc405;hpb=f26aab4a55972825a0d3ef9346c8c8dea8752b7b diff --git a/inc/extensions.php b/inc/extensions.php index cfa4c928d4..22f218150d 100644 --- a/inc/extensions.php +++ b/inc/extensions.php @@ -38,18 +38,18 @@ // Some security stuff... if (!defined('__SECURITY')) { - $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; + $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php'; require($INC); } // Load the extension and maybe found language and function files. -function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run = false) { - // Init array - INIT_INC_POOL(); - +function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = '', $EXT_VER = '', $dry_run = false) { // Set current extension name EXT_SET_CURR_NAME($ext_name); + // Init array + INIT_INC_POOL(); + // Init EXT_UPDATE_DEPENDS EXT_INIT_UPDATE_DEPENDS(); @@ -61,6 +61,8 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run if ((isset($GLOBALS['ext_loaded']['ext'][$ext_name])) && (empty($EXT_LOAD_MODE))) { // Debug message DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension %s already loaded.", $ext_name)); + + // Abort here return false; } // END - if @@ -69,51 +71,61 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run $FQFN = constant('PATH') . $INC; // Is the extension file NOT there? - if (!INCLUDE_READABLE($INC)) { + if (!isIncludeReadable($INC)) { // Debug message - DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension %s not found.", $ext_name)); + DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension %s not found or not readable.", $ext_name)); // Abort here return false; } // END - if // Construct FQFN for language file - $langInclude = sprintf("inc/language/%s_%s.php", $ext_name, GET_LANGUAGE()); + $langInclude = sprintf("inc/language/%s_%s.php", $ext_name, getLanguage()); // Is this include there? - if ((FILE_READABLE($langInclude)) && (!isset($GLOBALS['ext_loaded']['lang'][$ext_name]))) { + if ((isFileReadable($langInclude)) && (!isset($GLOBALS['ext_loaded']['lang'][$ext_name]))) { // Then load it //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "--- Language loaded."); $GLOBALS['ext_loaded']['lang'][$ext_name] = true; - LOAD_INC_ONCE($langInclude); - } // END - if + loadIncludeOnce($langInclude); + } 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() + )); + } // Construct FQFN for functions file $funcsInclude = sprintf("inc/libs/%s_functions.php", $ext_name); // Is this include there? - if ((FILE_READABLE($funcsInclude)) && (!isset($GLOBALS['ext_loaded']['funcs'][$ext_name]))) { + if ((isFileReadable($funcsInclude)) && (!isset($GLOBALS['ext_loaded']['funcs'][$ext_name]))) { // Then load it //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "--- Functions loaded."); $GLOBALS['ext_loaded']['funcs'][$ext_name] = true; - LOAD_INC_ONCE($funcsInclude); + loadIncludeOnce($funcsInclude); + } 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 + )); } // END - if // Extensions are not deprecated by default - EXT_SET_DEPRECATED("N"); + EXT_SET_DEPRECATED('N'); // Extensions are not always active by default - EXT_SET_ALWAYS_ACTIVE("N"); + EXT_SET_ALWAYS_ACTIVE('N'); // Extension update notes - EXT_SET_UPDATE_NOTES(""); + EXT_SET_UPDATE_NOTES(''); // Include the extension file //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Extension loaded."); require($FQFN); // Is this extension deprecated? - if (EXT_GET_DEPRECATED() == "Y") { + if (EXT_GET_DEPRECATED() == 'Y') { // Deactivate the extension DEACTIVATE_EXTENSION($ext_name); @@ -133,15 +145,25 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run // Registeres an extension and possible update depencies function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = true) { - // This shall never do a non-admin user! - if (!IS_ADMIN()) return false; - - // Is this extension already installed? - if (EXT_IS_ACTIVE($ext_name)) return false; - // Set current extension name EXT_SET_CURR_NAME($ext_name); + //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME()." - ENTERED!
\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 + + // 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!
\n"; + return true; + } // END - if + + // This registration is running + EXT_ADD_RUNNING_REGISTRATION($ext_name); + // Init EXT_UPDATE_DEPENDS EXT_INIT_UPDATE_DEPENDS(); @@ -154,8 +176,8 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr 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() + __FUNCTION__, + EXT_GET_CURR_NAME() )); } // END - if } // END - if @@ -173,15 +195,18 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr EXT_SET_REPORTS_FAILURE(false); // Does this extension exists? - //* DEBUG: */ print __LINE__.":".EXT_GET_CURR_NAME()."
\n"; - if (LOAD_EXTENSION(EXT_GET_CURR_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: */ print __LINE__.":".EXT_GET_CURR_NAME()."
\n"; + //* 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_GET_CURR_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_GET_CURR_NAME(), "update", $ver, $dry_run); + LOAD_EXTENSION(EXT_GET_CURR_NAME(), 'update', $ver, $dry_run); // Add update notes to our output ADD_EXTENSION_NOTES($ver); @@ -196,7 +221,10 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr EXT_INCREMENT_UPDATE_INTERATOR(); // Check for required file - if (LOAD_EXTENSION($ext_update, "register", "", $dry_run)) { + 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); @@ -208,9 +236,12 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr // Entry found? if ($task > 0) { // Try to register the extension - //* DEBUG: */ print __LINE__.sprintf(":ext_update=%s,task=%s
\n", $ext_update, $task); + //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().":ext_update=".$ext_update.",taskId=".$task."
\n"; $test = REGISTER_EXTENSION($ext_update, $task, $dry_run, false); - //* DEBUG: */ var_dump($test); + + // 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()) { // Ok, update this extension now @@ -239,19 +270,18 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr } // END - if // Switch back to register mode - $EXT_LOAD_MODE = "register"; + $EXT_LOAD_MODE = 'register'; // Remains true if extension registration reports no failures - //* DEBUG: */ print __LINE__.":".EXT_GET_CURR_NAME(); - //* DEBUG: */ var_dump($test); + //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().':'; var_dump($test); $test = (($test === true) && (EXT_GET_REPORTS_FAILURE() === false)); - //* DEBUG: */ var_dump($test); + //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().':'; var_dump($test); // Does everthing before wents ok? if ($test === true) { // "Dry-run-mode" activated? if ((!$dry_run) && (!EXT_IS_ON_REMOVAL_LIST())) { - //* DEBUG: */ print __LINE__.": ext_name=".EXT_GET_CURR_NAME()."
\n"; + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ext_name=".EXT_GET_CURR_NAME()); // Init SQLs and transfer ext->generic INIT_SQLS(); SET_SQLS(GET_EXT_SQLS()); @@ -260,15 +290,23 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr runFilterChain('pre_extension_installed', array('dry_run' => $dry_run)); // Register extension + //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:insert=".EXT_GET_CURR_NAME().'/'.EXT_GET_VERSION()." - INSERT!
\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()), __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_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)); @@ -286,30 +324,33 @@ function REGISTER_EXTENSION ($ext_name, $task_id, $dry_run = false, $logout = tr } } else { // No, an error occurs while registering extension :-( - //* DEBUG: */ print __LINE__.":".EXT_GET_CURR_NAME()."
\n"; + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "".EXT_GET_CURR_NAME()); $ret = false; } - } elseif (($task_id > 0) && (EXT_GET_CURR_NAME() != "")) { + } elseif (($task_id > 0) && (EXT_GET_CURR_NAME() != '')) { + //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME()."
\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__); + 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__); } // Is this the sql_patches? - //* 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__, ':'.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 - LOAD_URL("modules.php?module=admin&logout=1&".$EXT_LOAD_MODE."=sql_patches"); + redirectToUrl('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); + registerFilter('shutdown', 'REDIRECT_TO_LOGOUT_SQL_PATCHES', true, true); $GLOBALS['ext_load_mode'] = $EXT_LOAD_MODE; } } // END - if // Return status code + //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME()." - LEFT!
\n"; + //* DEBUG: */ var_dump($ret); return $ret; } @@ -323,11 +364,17 @@ 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); + // Init EXT_UPDATE_DEPENDS + EXT_INIT_UPDATE_DEPENDS(); + // Init array INIT_EXT_SQLS(); @@ -335,34 +382,41 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) { $sqlRan = false; // Load extension in detected mode - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ":ext_name[{$ext_id}]={EXT_GET_CURR_NAME()}"); - LOAD_EXTENSION(EXT_GET_CURR_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))) { + // Run any filters depending on the action here + runFilterChain('extension_' . $load_mode, $ext_name); + // Run SQL commands... runFilterChain('run_sqls'); // Removal mode? - if ($load_mode == "remove") { + 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()), __FILE__, __LINE__); + SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `ext_name`='%s' LIMIT 1", + 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"))) { + 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_GET_CURR_NAME()); } // END - if // Is this the sql_patches? - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": {$ext_id}/{EXT_GET_CURR_NAME()}/{$load_mode}"); - if ((EXT_GET_CURR_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&logout=1&".$load_mode."=sql_patches"); + redirectToUrl('modules.php?module=admin&logout=1&' . $load_mode . '=sql_patches'); } // END - if } @@ -372,7 +426,7 @@ function EXT_IS_ACTIVE ($ext_name) { if ((!isInstalled()) || (isInstalling()) || (empty($ext_name))) return false; // Not active is the default - $active = "N"; + $active = 'N'; // Check cache if (isset($GLOBALS['cache_array']['extensions']['ext_active'][$ext_name])) { @@ -384,12 +438,12 @@ function EXT_IS_ACTIVE ($ext_name) { incrementConfigEntry('cache_hits'); } elseif (isset($GLOBALS['ext_loaded'][$ext_name])) { // @TODO Extension is loaded, what next? - mxchange_die("LOADED:$ext_name"); - } elseif (($ext_name == "cache") || (GET_EXT_VERSION("cache") == "")) { + 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__); + $result = SQL_QUERY_ESC("SELECT `ext_active` FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `ext_name`='%s' LIMIT 1", + array($ext_name), __FUNCTION__, __LINE__); // Entry found? if (SQL_NUMROWS($result) == 1) { @@ -401,25 +455,31 @@ function EXT_IS_ACTIVE ($ext_name) { SQL_FREERESULT($result); // Write cache array - //* DEBUG: */ echo $ext_name."[DB]: {$active}
\n"; + //* 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!
\n"; - $GLOBALS['cache_array']['extensions']['ext_active'][$ext_name] = "N"; + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ext_name=".$ext_name.": Not active!"); + $GLOBALS['cache_array']['extensions']['ext_active'][$ext_name] = 'N'; } // Debug message - //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, " ext_name={$ext_name},active={$active}"); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "ext_name={$ext_name},active={$active}"); // Is this extension activated? (For admins we always have active extensions...) - return ($active == "Y"); + return ($active == 'Y'); } // Get version from extensions 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}"); @@ -434,15 +494,18 @@ function GET_EXT_VERSION ($ext_name) { incrementConfigEntry('cache_hits'); } 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__); + $result = SQL_QUERY_ESC("SELECT `ext_version` FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `ext_name`='%s' LIMIT 1", + 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); @@ -470,7 +533,7 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) { INIT_INC_POOL(); // Load extension in test mode - LOAD_EXTENSION($ext_name, "test", $ext_ver, $dry_run); + LOAD_EXTENSION($ext_name, 'test', $ext_ver, $dry_run); // Save version history $history = EXT_GET_VER_HISTORY(); @@ -485,28 +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."
\n"; + 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() != "") { - // 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! - $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); - } + LOAD_EXTENSION(EXT_GET_CURR_NAME(), 'update', $GLOBALS['cache_array']['update_ver'][EXT_GET_CURR_NAME()], $dry_run); + + // 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 - // 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()]); + // Set name back + EXT_SET_CURR_NAME($ext_name); } // END - if // Add notes @@ -521,16 +594,20 @@ 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)); if (!$dry_run) { // Create task - 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()))); + CREATE_EXTENSION_UPDATE_TASK(getCurrentAdminId(), 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_GET_CURR_NAME()], EXT_GET_CURR_NAME()), __FILE__, __LINE__); + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_version='%s' WHERE `ext_name`='%s' LIMIT 1", + array($GLOBALS['cache_array']['update_ver'][EXT_GET_CURR_NAME()], EXT_GET_CURR_NAME()), __FUNCTION__, __LINE__); // Remove arrays UNSET_SQLS(); @@ -543,7 +620,7 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) { } // Output verbose SQL table for extension -function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = "", $dashed = "", $switch = false, $width = "100%") { +function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = '', $dashed = '', $switch = false, $width = '100%') { // Empty title? if (empty($title)) { // Then fix it to default @@ -558,10 +635,10 @@ function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = "", $dashed = "", // Init variables $SW = 2; $i = 1; - $OUT = ""; + $OUT = ''; // Do we have queries? - if ((IS_SQLS_VALID()) && (GET_EXT_VERSION("sql_patches") >= "0.0.7") && (getConfig('verbose_sql') == "Y")) { + if ((IS_SQLS_VALID()) && (GET_EXT_VERSION('sql_patches') >= '0.0.7') && (getConfig('verbose_sql') == 'Y')) { foreach (GET_SQLS() as $idx => $sql) { // Trim out spaces $sql = trim($sql); @@ -594,9 +671,9 @@ function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = "", $dashed = "", // Load main template $OUT = LOAD_TEMPLATE("admin_ext_sql_table", true, $content); - } elseif ((GET_EXT_VERSION("sql_patches") >= "0.0.7") && (getConfig('verbose_sql') == "Y")) { + } elseif ((GET_EXT_VERSION('sql_patches') >= '0.0.7') && (getConfig('verbose_sql') == 'Y')) { // No addional SQL commands to run - $OUT = LOAD_TEMPLATE("admin_settings_saved", true, getMessage('ADMIN_NO_ADDITIONAL_SQLS')); + $OUT = LOAD_TEMPLATE('admin_settings_saved', true, getMessage('ADMIN_NO_ADDITIONAL_SQLS')); } // END - if // Return output @@ -606,7 +683,7 @@ function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = "", $dashed = "", // Get extension name from id function GET_EXT_NAME ($ext_id) { // Init extension name - $ret = ""; + $ret = ''; // Is cache there? if (isset($GLOBALS['cache_array']['extensions']['ext_name'][$ext_id])) { @@ -615,13 +692,15 @@ function GET_EXT_NAME ($ext_id) { // Count cache hits incrementConfigEntry('cache_hits'); - } elseif (!EXT_IS_ACTIVE("cache")) { + } 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__); + $result = SQL_QUERY_ESC("SELECT ext_name FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `id`=%s LIMIT 1", + array(bigintval($ext_id)), __FUNCTION__, __LINE__); list($ret) = SQL_FETCHROW($result); SQL_FREERESULT($result); } + + // Return the extension name return $ret; } @@ -635,10 +714,10 @@ function GET_EXT_ID ($ext_name) { // Count cache hits incrementConfigEntry('cache_hits'); - } elseif (!EXT_IS_ACTIVE("cache")) { + } 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__); + $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_extensions` WHERE `ext_name`='%s' LIMIT 1", + array($ext_name), __FUNCTION__, __LINE__); list($ret) = SQL_FETCHROW($result); SQL_FREERESULT($result); } @@ -650,35 +729,35 @@ function GET_EXT_ID ($ext_name) { // Activate given extension 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__); + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET `ext_active`='Y' WHERE `ext_name`='%s' LIMIT 1", + array($ext_name), __FUNCTION__, __LINE__); // Extension has been activated? if (SQL_AFFECTEDROWS() == 1) { // Then run all queries - EXTENSION_RUN_SQLS(GET_EXT_ID($ext_name), "activate"); + EXTENSION_RUN_SQLS(GET_EXT_ID($ext_name), 'activate'); } // END - if } // Deactivate given extension 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__); + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET `ext_active`='N' WHERE `ext_name`='%s' LIMIT 1", + array($ext_name), __FUNCTION__, __LINE__); // Extension has been activated? if (SQL_AFFECTEDROWS() == 1) { // Then run all queries - EXTENSION_RUN_SQLS(GET_EXT_ID($ext_name), "deactivate"); + EXTENSION_RUN_SQLS(GET_EXT_ID($ext_name), 'deactivate'); // Create new task CREATE_EXTENSION_DEACTIVATION_TASK($ext_name); // Notify the admin - SEND_ADMIN_NOTIFICATION( - getMessage('ADMIN_SUBJECT_EXTENSION_DEACTIVATED'), - "admin_ext_deactivated", - array('ext_name' => $ext_name) + sendAdminNotification( + getMessage('ADMIN_SUBJECT_EXTENSION_DEACTIVATED'), + 'admin_ext_deactivated', + array('ext_name' => $ext_name) ); } // END - if } @@ -689,8 +768,8 @@ function EXT_VERSION_IS_OLDER ($ext_name, $ext_ver) { $currVersion = GET_EXT_VERSION($ext_name); // Remove all dots from both versions - $currVersion = str_replace(".", "", $currVersion); - $ext_ver = str_replace(".", "", $ext_ver); + $currVersion = str_replace('.', '', $currVersion); + $ext_ver = str_replace('.', '', $ext_ver); // Now compare both and return the result return ($currVersion < $ext_ver); @@ -699,15 +778,14 @@ function EXT_VERSION_IS_OLDER ($ext_name, $ext_ver) { // Creates a new task for updated extension 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--}"; + $subject = '[UPDATE-'.$ext_name.'-'.$ext_ver.':] {--ADMIN_UPDATE_EXT_SUBJ--}'; // Is the extension there? - if (GET_EXT_VERSION($ext_name) != "") { + 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__); + createNewTask($subject, $notes, 'EXTENSION_UPDATE', 0, $admin_id); } // END - if } // END - if } @@ -715,32 +793,28 @@ function CREATE_EXTENSION_UPDATE_TASK ($admin_id, $ext_name, $ext_ver, $notes) { // 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? - if ((DETERMINE_TASK_ID_BY_SUBJECT($subject) == 0) && (GET_EXT_VERSION($ext) == "")) { + if ((DETERMINE_TASK_ID_BY_SUBJECT($subject) == 0) && (GET_EXT_VERSION($ext) == '')) { + // Set default message if ext-foo is missing + $message = sprintf(getMessage('ADMIN_EXT_TEXT_FILE_MISSING'), $ext); + // Template file $tpl = sprintf("%stemplates/%s/html/ext/ext_%s.tpl", constant('PATH'), - GET_LANGUAGE(), + getLanguage(), $ext ); - // Load text for task - if (FILE_READABLE($tpl)) { + // Load text for task if found + if (isFileReadable($tpl)) { // Load extension's own text template (HTML!) - $msg = LOAD_TEMPLATE("ext_".$ext, true); + $message = 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__, $message); } // 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())", - array( - $admin_id, - $subject, - SQL_ESCAPE($msg), - ), __FILE__, __LINE__, true, false - ); + createNewTask($subject, $message, 'EXTENSION_UPDATE', 0, $admin_id, false); } // END - if } @@ -750,15 +824,9 @@ function CREATE_EXTENSION_DEACTIVATION_TASK ($ext) { $subject = sprintf("[%s:] %s", $ext, getMessage('TASK_SUBJ_EXTENSION_DEACTIVATED')); // Not installed and do we have created a task for the admin? - if ((DETERMINE_TASK_ID_BY_SUBJECT($subject) == 0) && (GET_EXT_VERSION($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())", - array( - $subject, - SQL_ESCAPE(LOAD_TEMPLATE("task_ext_deactivated", true, $ext)), - ), __FILE__, __LINE__, true, false - ); + createNewTask($subject, SQL_ESCAPE(LOAD_TEMPLATE('task_ext_deactivated', true, $ext)), 'EXTENSION_DEACTIVATION'); } // END - if } @@ -767,25 +835,25 @@ function MODULE_HAS_MENU ($mod, $forceDb = false) { // All is false by default $ret = false; - //* DEBUG: */ print __FUNCTION__."(".__LINE__."):mod={$mod},cache=".GET_EXT_VERSION("cache")."
\n"; - if (GET_EXT_VERSION("cache") >= "0.1.2") { + //* 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])) { // Check module cache and count hit - $ret = ($GLOBALS['cache_array']['modules']['has_menu'][$mod] == "Y"); + $ret = ($GLOBALS['cache_array']['modules']['has_menu'][$mod] == 'Y'); incrementConfigEntry('cache_hits'); } elseif (isset($GLOBALS['cache_array']['extensions']['ext_menu'][$mod])) { // Check cache and count hit - $ret = ($GLOBALS['cache_array']['extensions']['ext_menu'][$mod] == "Y"); + $ret = ($GLOBALS['cache_array']['extensions']['ext_menu'][$mod] == 'Y'); incrementConfigEntry('cache_hits'); - } elseif ((IS_ADMIN()) && ($mod == "admin")) { + } 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))) { + } 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) { @@ -796,18 +864,18 @@ function MODULE_HAS_MENU ($mod, $forceDb = false) { $GLOBALS['cache_array']['extensions']['ext_menu'][$mod] = $has_menu; // Does it have a menu? - $ret = ($has_menu == "Y"); + $ret = ($has_menu == 'Y'); } // END - if // Free memory SQL_FREERESULT($result); - } elseif (GET_EXT_VERSION("sql_patches") == "") { + } elseif (GET_EXT_VERSION('sql_patches') == '') { // No sql_patches installed, so maybe in admin area or no admin registered? - $ret = (((IS_ADMIN()) || (!isAdminRegistered())) && ($mod == "admin")); // Then there is a menu! + $ret = (((IS_ADMIN()) || (!isAdminRegistered())) && ($mod == 'admin')); // Then there is a menu! } // Return status - //* DEBUG: */ var_dump($ret); + //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:currName=".EXT_GET_CURR_NAME().':'; var_dump($ret); return $ret; } @@ -817,8 +885,8 @@ function DETERMINE_EXTENSION_TASK_ID ($ext_name) { $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__); + $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_task_system` WHERE `task_type`='EXTENSION' AND `subject`='[%s:]' LIMIT 1", + array($ext_name), __FUNCTION__, __LINE__); // Entry found? if (SQL_NUMROWS($result) == 1) { @@ -839,8 +907,8 @@ function DETERMINE_TASK_ID_BY_SUBJECT ($subject) { $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__); + $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_task_system` WHERE `subject` LIKE '%s%%' LIMIT 1", + array($subject), __FUNCTION__, __LINE__); // Entry found? if (SQL_NUMROWS($result) == 1) { @@ -858,13 +926,12 @@ function DETERMINE_TASK_ID_BY_SUBJECT ($subject) { // Add updates notes for given version function ADD_EXTENSION_NOTES ($ver) { // Init notes/content - $out = ""; $content = array(); + $out = ''; $content = array(); // Is do we have verbose output enabled? - if ((getConfig('verbose_sql') == "Y") || (!EXT_IS_ACTIVE("sql_patches"))) { - + if ((getConfig('verbose_sql') == 'Y') || (!EXT_IS_ACTIVE('sql_patches'))) { // Update notes found? - if (EXT_GET_UPDATE_NOTES() != "") { + if (EXT_GET_UPDATE_NOTES() != '') { // Update notes found $content = array( 'ver' => $ver, @@ -872,8 +939,8 @@ function ADD_EXTENSION_NOTES ($ver) { ); // Reset them - EXT_SET_UPDATE_NOTES(""); - } elseif (($ver == "0.0") || ($ver == "0.0.0")) { + EXT_SET_UPDATE_NOTES(''); + } elseif (($ver == '0.0') || ($ver == '0.0.0')) { // Initial release $content = array( 'ver' => $ver, @@ -888,7 +955,7 @@ function ADD_EXTENSION_NOTES ($ver) { } // Load template - $out = LOAD_TEMPLATE("admin_ext_notes", true, $content); + $out = LOAD_TEMPLATE('admin_ext_notes', true, $content); } // END - if // Add the notes @@ -930,32 +997,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()] = (string) $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 @@ -968,7 +1035,7 @@ function EXT_ADD_UPDATE_DEPENDS ($updateDepends) { // Is it not yet added? if (!in_array($updateDepends, $GLOBALS['ext_running_updates'])) { - //* DEBUG */ print __FUNCTION__.":".EXT_GET_CURR_NAME()."/".$updateDepends."
\n"; + //* 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; @@ -977,40 +1044,64 @@ function EXT_ADD_UPDATE_DEPENDS ($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: */ print __FUNCTION__.":".EXT_GET_CURR_NAME()."
\n"; + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "currName=".EXT_GET_CURR_NAME()); - // Init update depency map - $GLOBALS['ext_update_depends'][EXT_GET_CURR_NAME()] = array(); + // 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 () { - print __FUNCTION__.":".EXT_GET_CURR_NAME()."
\n"; + //* 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 () { - print __FUNCTION__.":".EXT_GET_CURR_NAME()."
\n"; + //* 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 () { - print __FUNCTION__.":".EXT_GET_CURR_NAME()."
\n"; + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "currName=".EXT_GET_CURR_NAME()); return count($GLOBALS['ext_update_depends'][EXT_GET_CURR_NAME()]); } @@ -1031,7 +1122,7 @@ function EXT_REMOVE_UPDATE_DEPENDS ($ext_name) { // Init iterator for update depencies function EXT_INIT_UPDATE_ITERATOR () { - print __FUNCTION__.":".EXT_GET_CURR_NAME()."
\n"; + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "currName=".EXT_GET_CURR_NAME()); $GLOBALS['ext_depend_iterator'][EXT_GET_CURR_NAME()] = 0; } @@ -1041,13 +1132,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()]."
\n"; + //* 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 () { - print __FUNCTION__.":".EXT_GET_CURR_NAME()."
\n"; + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "currName=".EXT_GET_CURR_NAME()); $GLOBALS['ext_depend_iterator'][EXT_GET_CURR_NAME()]++; } @@ -1083,7 +1174,7 @@ function EXT_GET_UPDATE_NOTES () { // Init extension notice function EXT_INIT_NOTES () { - $GLOBALS['ext_notes'] = ""; + $GLOBALS['ext_notes'] = ''; } // Append extension notice @@ -1113,7 +1204,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 @@ -1127,7 +1221,7 @@ function GET_EXT_SQLS () { 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() + EXT_GET_CURR_NAME() )); } // END - if @@ -1170,5 +1264,26 @@ function EXT_GET_REMOVAL_LIST () { return $GLOBALS['ext_update_remove']; } +// Redirects if the provided extension is not installed +function redirectOnUninstalledExtension ($ext_name) { + // So is the extension there? + if ((!isExtensionInstalled($ext_name)) || (!EXT_IS_ACTIVE($ext_name))) { + // Redirect to index + redirectToUrl('modules.php?module=index&msg=' . getCode('EXTENSION_PROBLEM') . '&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; +} + // ?>