X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions.php;h=64e4c486993fe001850a65d2f25707c8557f0437;hb=3c2f106c02f6d86a90f529a0564abcbbe716fe71;hp=b480c0e5a49c4d5b016ce7330b51cc3729bd2752;hpb=2cce06a4f4ff6bdbf0a14dcf7d2a89944b472c69;p=mailer.git
diff --git a/inc/extensions.php b/inc/extensions.php
index b480c0e5a4..64e4c48699 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -57,6 +57,7 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
// Does this extension exists?
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
@@ -99,6 +100,7 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
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;
@@ -186,6 +188,9 @@ 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
@@ -242,6 +247,9 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
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,14 +396,19 @@ 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
@@ -452,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)
{
@@ -616,5 +633,6 @@ function EXT_VERSION_IS_OLDER ($ext_name, $ext_ver) {
// Now compare both and return the result
return ($currVersion < $ext_ver);
}
+
//
?>