X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions.php;h=64e4c486993fe001850a65d2f25707c8557f0437;hb=660bf694d3714cb69ac67e7a62b345f93c8a119e;hp=c6721cc0100bb50e4e4f16f94f0bbed1d8ed967d;hpb=07a07340291a560c3da7715d4d51c9b2f0d2adf2;p=mailer.git
diff --git a/inc/extensions.php b/inc/extensions.php
index c6721cc010..64e4c48699 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -55,16 +55,18 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
$file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
// Does this extension exists?
- if (FILE_READABLE($file))
- {
+ if (FILE_READABLE($file)) {
// Extension was found so we can load it in registration mode
+ $EXT_ALWAYS_ACTIVE = "N";
require($file);
// And run possible updates
$EXT_LOAD_MODE = "update"; $EXT_UPDATE_DEPENDS = "";
- foreach ($EXT_VER_HISTORY as $EXT_VER)
- {
+ foreach ($EXT_VER_HISTORY as $EXT_VER) {
+ // Load extension in update mode
require($file);
+
+ // Do we have an update?
if (((GET_EXT_VERSION("sql_patches") != "") && ($_CONFIG['verbose_sql'] == "Y")) || (!EXT_IS_ACTIVE("sql_patches"))) {
if (!empty($UPDATE_NOTES)) {
// Update notes found
@@ -77,60 +79,62 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
// No update notes found!
$NOTES .= "v".$EXT_VER.":
".NO_UPDATE_NOTES."
\n";
}
- }
- }
+ } // END - if
+ } // END - foreach
// Does this extension depends on an outstanding update of another update?
- if (!empty($EXT_UPDATE_DEPENDS))
- {
+ if (!empty($EXT_UPDATE_DEPENDS)) {
// Backup SQL commands and clear current
- $SQLs2 = $SQLs; $SQLs = array(); $test = false;
+ $SQLs2 = $SQLs;
+ $SQLs = array();
+ $test = false;
// Backup language as well
- $LANG_BCK = $EXT_LANG_PREFIX; $EXT_ALWAYS_ACTIVE = "N";
+ $LANG_BCK = $EXT_LANG_PREFIX;
+ $EXT_ALWAYS_ACTIVE = "N";
// Load required extension also in update mode
$file = sprintf("%sinc/extensions/ext-%s.php", PATH, $EXT_UPDATE_DEPENDS);
// Check for required file
- if (FILE_READABLE($file))
- {
+ if (FILE_READABLE($file)) {
// File exists so let's load it
$VER_BACKUP = $EXT_VERSION;
+ $EXT_ALWAYS_ACTIVE = "N";
require($file);
$EXT_VERSION = $VER_BACKUP;
// If versions mismatch update extension first
$ext_ver = GET_EXT_VERSION($EXT_UPDATE_DEPENDS);
- if (empty($ext_ver))
- {
+
+ // Extension version set?
+ 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__);
- if (SQL_NUMROWS($result) == 1)
- {
+
+ // Entry found?
+ if (SQL_NUMROWS($result) == 1) {
// Task found so load task's ID and register extension...
list($task) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
+
+ // Try to register the extension
$test = EXTENSION_REGISTER($EXT_UPDATE_DEPENDS, $task, $dry_run);
- }
- }
- elseif ($ext_ver != $EXT_VERSION)
- {
+ } // 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);
// All okay!
$test = true;
- }
- else
- {
+ } else {
// Nothing to register / update before...
$test = true;
}
- }
- else
- {
+ } else {
// Required file for update does not exists!
$test = true;
// But this is fine for the first time...
@@ -139,9 +143,7 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
// Finally restore previous SQLs
$SQLs = $SQLs2; unset($SQLs2);
$EXT_LANG_PREFIX = $LANG_BCK;
- }
- else
- {
+ } else {
// Does not depend on an other extension
$test = true;
}
@@ -186,10 +188,13 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
foreach ($INC_POOL as $inc) {
require_once($inc);
} // END - foreach
+
+ // Remove array
+ unset($INC_POOL);
} // END - if
// Register extension
- $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_extensions (ext_name, ext_lang_file, ext_active, ext_version) VALUES ('%s', '%s', '%s', '%s')",
+ $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_extensions (ext_name, ext_lang_file, ext_active, ext_version) VALUES ('%s','%s','%s','%s')",
array($ext_name, $EXT_LANG_PREFIX, $EXT_ALWAYS_ACTIVE, $EXT_VERSION), __FILE__, __LINE__);
// Update task management
@@ -239,9 +244,12 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
}
//
function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
- global $cacheInstance;
+ global $cacheInstance, $_CONFIG;
$SQLs = array();
+ // Extensions are never active by default
+ $EXT_ALWAYS_ACTIVE = "N";
+
// By default no SQL has been executed
$sqlRan = false;
@@ -253,14 +261,14 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
if (empty($ext_name)) return false;
// Load extension in detected mode
- //* DEBUG: */ echo __FUNCTION__.":ext_name[{$id}]={$ext_name}
\n";
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):ext_name[{$id}]={$ext_name}
\n";
$file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
if (FILE_READABLE($file)) {
// Load the include
require($file);
- }
+ } // END - if
- //* DEBUG: */ echo __FUNCTION__.":SQLs::count=".count($SQLs)."
\n";
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):SQLs::count=".count($SQLs)."
\n";
if ((is_array($SQLs) && (sizeof($SQLs) > 0))) {
// Run SQL commands...
foreach ($SQLs as $sql) {
@@ -270,7 +278,7 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
// Is there still an SQL query?
if (!empty($sql)) {
// Do we have an "ALTER TABLE" command?
- //* DEBUG: */ echo __FUNCTION__.":SQL={$SQL}
\n";
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):SQL={$SQL}
\n";
if (substr(strtolower($sql), 0, 11) == "alter table") {
// Analyse the alteration command
SQL_ALTER_TABLE($sql, __FILE__, __LINE__);
@@ -291,7 +299,7 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
array($id), __FILE__, __LINE__);
} // END - if
- //* DEBUG: */ echo __FUNCTION__.":mode={$EXT_LOAD_MODE}
\n";
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):mode={$EXT_LOAD_MODE}
\n";
// Remove cache file(s) if extension is active
if (((EXT_IS_ACTIVE("cache")) || (GET_EXT_VERSION("cache") != "")) && (((SQL_AFFECTEDROWS() == 1) && ($EXT_LOAD_MODE == "remove")) || ($sqlRan === true))) {
@@ -353,9 +361,6 @@ function EXT_IS_ACTIVE ($ext_name) {
$cacheArray['extensions']['ext_active'][$ext_name] = "N";
}
- // Create FQFN for extension file
- $inc = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
-
// Debug message
//DEBUG_LOG(__FUNCTION__.": ext_name={$ext_name},active={$active}");
@@ -369,12 +374,12 @@ function GET_EXT_VERSION ($ext_name) {
// Extensions are all inactive during installation
if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing'))) return "";
- //* DEBUG: */ echo __FUNCTION__.": ext_name={$ext_name}
\n";
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."): ext_name={$ext_name}
\n";
// Is the cache written?
if (!empty($cacheArray['extensions']['ext_version'][$ext_name])) {
// Load data from cache
- //* DEBUG: */ echo __FUNCTION__.": CACHE!
\n";
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."): CACHE!
\n";
$ret = $cacheArray['extensions']['ext_version'][$ext_name];
// Count cache hits
@@ -391,21 +396,28 @@ function GET_EXT_VERSION ($ext_name) {
}
// Return result
- //* DEBUG: */ echo __FUNCTION__.": ret={$ret}
\n";
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."): ret={$ret}
\n";
return $ret;
}
//
function EXTENSION_UPDATE($file, $ext, $EXT_VER, $dry_run=false)
{
// This shall never do a non-admin user!
- global $cacheInstance, $_CONFIG, $NOTES; $SQLs = array();
+ global $cacheInstance, $_CONFIG, $NOTES;
+
+ // Init arrays
+ $SQLs = array(); $INC_POOL = array();
+
+ // Only admins are allowed to update extensions
if ((!IS_ADMIN()) || (empty($ext))) return false;
// Load extension in update mode
$EXT_LOAD_MODE = "update"; $EXT_UPDATE_DEPENDS = ""; $NOTES = "";
- include(PATH."inc/extensions/".$file);
- if (!empty($EXT_UPDATE_DEPENDS))
- {
+
+ // Load extension file
+ include(sprintf("%sinc/extensions/%s", PATH, $file));
+
+ 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);
}
@@ -450,9 +462,16 @@ function EXTENSION_UPDATE($file, $ext, $EXT_VER, $dry_run=false)
}
}
+ // 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))
- {
+ if ((is_array($SQLs)) && (!$dry_run)) {
// Run SQL commands
foreach ($SQLs as $sql)
{
@@ -614,5 +633,6 @@ function EXT_VERSION_IS_OLDER ($ext_name, $ext_ver) {
// Now compare both and return the result
return ($currVersion < $ext_ver);
}
+
//
?>