X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions.php;h=07fd2858b0eba2875b4bc0b4b7df4efbdd0d3dfe;hp=ab142b07cd88253789c76f107bb19c3726291c23;hb=c47144dd555bbab4acdf9085e4623900dedb0e7c;hpb=b0cde844dd14cfd237a2a690129f1e5aa9470c0a
diff --git a/inc/extensions.php b/inc/extensions.php
index ab142b07cd..07fd2858b0 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -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;
@@ -55,7 +55,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
} // END - if
// Construct FQFN for extension file
- $extInclude = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
+ $extInclude = sprintf("inc/extensions/ext-%s.php", $ext_name);
// Is the extension file NOT there?
if (!FILE_READABLE($extInclude)) {
@@ -67,25 +67,25 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
} // END - if
// Construct FQFN for language file
- $langInclude = sprintf("%sinc/language/%s_%s.php", PATH, $ext_name, GET_LANGUAGE());
+ $langInclude = sprintf("inc/language/%s_%s.php", $ext_name, GET_LANGUAGE());
// Is this include there?
if ((FILE_READABLE($langInclude)) && (!isset($EXT_LOADED['lang'][$ext_name]))) {
// Then load it
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "--- Language loaded.");
$EXT_LOADED['lang'][$ext_name] = true;
- require($langInclude);
+ LOAD_INC_ONCE($langInclude);
} // END - if
// Construct FQFN for functions file
- $funcsInclude = sprintf("%sinc/libs/%s_functions.php", PATH, $ext_name);
+ $funcsInclude = sprintf("inc/libs/%s_functions.php", $ext_name);
// Is this include there?
if ((FILE_READABLE($funcsInclude)) && (!isset($EXT_LOADED['funcs'][$ext_name]))) {
// Then load it
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "--- Functions loaded.");
$EXT_LOADED['funcs'][$ext_name] = true;
- require($funcsInclude);
+ LOAD_INC_ONCE($funcsInclude);
} // END - if
// Extensions are not deprecated by default
@@ -102,7 +102,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
// Include the extension file
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Extension loaded.");
- require($extInclude);
+ LOAD_INC($extInclude);
// Is this extension deprecated?
if ($EXT_DEPRECATED == "Y") {
@@ -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,34 +140,20 @@ 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
+ // By default we have no failures
$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);
-
- // Do we have an update?
- if (((GET_EXT_VERSION("sql_patches") != "") && (getConfig('verbose_sql') == "Y")) || (!EXT_IS_ACTIVE("sql_patches"))) {
- if (!empty($UPDATE_NOTES)) {
- // Update notes found
- $NOTES .= ("v".$ver.":
".$UPDATE_NOTES."
");
- $UPDATE_NOTES = "";
- } elseif (($ver == "0.0") || ($ver == "0.0.0")) {
- // Initial release
- $NOTES .= ("v".$ver.":
".INITIAL_RELEASE."
");
- } else {
- // No update notes found!
- $NOTES .= ("v".$ver.":
".NO_UPDATE_NOTES."
");
- }
- } // END - if
+ LOAD_EXTENSION($ext_name, "update", $ver, $dry_run, $SQLs);
+
+ // Add update notes to our output
+ $NOTES .= ADD_EXTENSION_NOTES($ver, $UPDATE_NOTES);
} // END - foreach
// Does this extension depends on an outstanding update of another update?
@@ -175,32 +162,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;
@@ -224,60 +205,25 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run=false) {
// Switch back to register mode
$EXT_LOAD_MODE = "register";
- // Remains true if extension registration reports no failtures
+ // Remains true if extension registration reports no failures
$test = ($test && !$EXT_REPORTS_FAILURE);
// Does everthing before wents ok?
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')",
+ 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) {
@@ -297,16 +243,22 @@ 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__);
+ 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__);
}
// 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,53 +268,35 @@ 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 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);
+ 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") {
// Delete this extension (remember to remove it from your server *before* you click on welcome!
- $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_extensions WHERE ext_name='%s' LIMIT 1",
+ SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
array($ext_name), __FILE__, __LINE__);
} // END - if
} // END - if
@@ -371,9 +305,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?
@@ -387,7 +318,7 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
// Check if given extension is active
function EXT_IS_ACTIVE ($ext_name) {
- global $cacheArray, $_CONFIG;
+ global $cacheArray;
// Extensions are all inactive during installation
if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing')) || (empty($ext_name))) return false;
@@ -396,28 +327,25 @@ 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];
// Count cache hits
- if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+ incrementConfigEntry('cache_hits');
} 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",
+ $result = SQL_QUERY_ESC("SELECT ext_active FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
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);
@@ -438,135 +366,125 @@ function EXT_IS_ACTIVE ($ext_name) {
}
// Get version from extensions
function GET_EXT_VERSION ($ext_name) {
- global $cacheArray, $_CONFIG, $cacheInstance;
- $ret = false;
+ global $cacheArray, $cacheInstance;
+ $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;
+ incrementConfigEntry('cache_hits');
} 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);
+ $result = SQL_QUERY_ESC("SELECT ext_version FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
+ 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();
+ // Init notes
+ $NOTES = "";
+
// 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
$start = array_search($ext_ver, $history);
- $NOTES = "";
// 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);
- // Add notes
- if (getConfig('verbose_sql') == "Y") {
- if (!empty($UPDATE_NOTES)) {
- // Update notes found
- $NOTES .= ("v".$ver.":
".$UPDATE_NOTES."
");
- $UPDATE_NOTES = "";
- } elseif ($ver == "0.0") {
- // Initial release
- $NOTES .= ("v".$ver.":
".INITIAL_RELEASE."
");
+ 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 {
- $NOTES .= ("v".$ver.":
".NO_UPDATE_NOTES."
");
+ // Register new extension
+ $test = EXTENSION_REGISTER($EXT_UPDATE_DEPENDS, 0, $dry_run, false);
}
- } // 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
+ // Restore previous SQL queries
+ $SQLs = $cacheArray['update_sqls'][$ext_name];
+ unset($cacheArray['update_sqls'][$ext_name]);
} // 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();
- }
+ // Add notes
+ $NOTES .= ADD_EXTENSION_NOTES($cacheArray['update_ver'][$ext_name], $UPDATE_NOTES);
} // 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__);
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_version='%s' WHERE ext_name='%s' LIMIT 1",
+ 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 +492,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 = "480") {
- global $_CONFIG, $SQLs;
+function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = ADMIN_SQLS_EXECUTED_ON_REMOVAL, $dashed = "", $switch = false, $width = "100%") {
+ global $SQLs;
// Are there some queries in $queries?
if (count($queries) > 0) {
@@ -588,48 +506,47 @@ function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = ADMIN_SQLS_EXECUT
} // END - if
// Init variables
- $S = false; $SW = 2; $i = 1;
+ $SW = 2; $i = 1;
$OUT = "";
// Do we have queries?
if ((is_array($SQLs)) && (GET_EXT_VERSION("sql_patches") >= "0.0.7") && (getConfig('verbose_sql') == "Y")) {
- $OUT = "
-
-
- |
- ".$title.":
- |
-
\n";
foreach ($SQLs as $idx => $sql) {
+ // Trim out spaces
$sql = trim($sql);
+
+ // Output command if set
if (!empty($sql)) {
- $S = true;
- $OUT .= "
- | ".$i.". |
-
- ".$sql."
- |
-
\n";
- if ($switch) $SW = 3 - $SW;
+ // Prepare output for template
+ $content = array(
+ 'sw' => $SW,
+ 'i' => $i,
+ 'sql' => $sql
+ );
+
+ // Load row template
+ $OUT .= LOAD_TEMPLATE("admin_ext_sql_row", true, $content);
+
+ // Switch color and count up
+ $SW = 3 - $SW;
$i++;
- }
- }
- }
+ } // END - if
+ } // END - foreach
- if ((!$S) && (GET_EXT_VERSION("sql_patches") >= "0.0.7") && (getConfig('verbose_sql') == "Y")) {
- // No addional SQL commands to run
- $OUT .= "
- |
- ".ADMIN_NO_ADDIONAL_SQLS."
- |
-
\n";
- }
+ // Prepare content for template
+ $content = array(
+ 'width' => $width,
+ 'dashed' => $dashed,
+ 'title' => $title,
+ 'out' => $OUT
+ );
- if (!empty($OUT)) {
- // Add missing close-table tag
- $OUT .= "
-
\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");
+ incrementConfigEntry('cache_hits');
+ } elseif (isset($cacheArray['extensions']['ext_menu'][$mod])) {
+ // Check cache and count hit
+ $ret = ($cacheArray['extensions']['ext_menu'][$mod] == "Y");
+ incrementConfigEntry('cache_hits');
+ } 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 memory
+ // 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;
+}
+
+// Add updates notes for given version
+function ADD_EXTENSION_NOTES ($ver, &$UPDATE_NOTES) {
+ // Init notes/content
+ $out = ""; $content = array();
+
+ // Is do we have verbose output enabled?
+ if ((getConfig('verbose_sql') == "Y") || (!EXT_IS_ACTIVE("sql_patches"))) {
+
+ // Update notes found?
+ if (!empty($UPDATE_NOTES)) {
+ // Update notes found
+ $content = array(
+ 'ver' => $ver,
+ 'notes' => $UPDATE_NOTES
+ );
+ $UPDATE_NOTES = "";
+ } elseif (($ver == "0.0") || ($ver == "0.0.0")) {
+ // Initial release
+ $content = array(
+ 'ver' => $ver,
+ 'notes' => INITIAL_RELEASE
+ );
+ } else {
+ // No update notes found!
+ $content = array(
+ 'ver' => $ver,
+ 'notes' => NO_UPDATE_NOTES
+ );
+ }
+
+ // Load template
+ $out = LOAD_TEMPLATE("admin_ext_notes", true, $content);
+ } // END - if
+
+ // Return the output
+ return $out;
}
//