X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions.php;h=8be7feba1048bd7e43f14930d50f0c56961e8636;hb=bfe24b8d5abcc23e3330580c3ffbeab93166b29b;hp=1851e5d4a851379affe3c2b345b75e45dc8f53c6;hpb=f7f6e55ee0d90558ad773ce6168767c0af816696;p=mailer.git
diff --git a/inc/extensions.php b/inc/extensions.php
index 1851e5d4a8..8be7feba10 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;
@@ -245,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;
@@ -256,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) {
@@ -273,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__);
@@ -294,19 +299,7 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
array($id), __FILE__, __LINE__);
} // END - if
- //* DEBUG: */ echo __FUNCTION__.":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))) {
- //* DEBUG: */ echo __LINE__.": DESTROY!
\n";
- // Remove cache files
- if ($cacheInstance->cache_file("extensions", true)) $cacheInstance->cache_destroy();
- if ($cacheInstance->cache_file("mod_reg", true)) $cacheInstance->cache_destroy();
- if ($cacheInstance->cache_file("config", true)) $cacheInstance->cache_destroy();
-
- // @TODO This causes the whole (!) menu cache being purged
- CACHE_PURGE_ADMIN_MENU();
- } // END - if
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):mode={$EXT_LOAD_MODE}
\n";
// Is this the sql_patches?
//* DEBUG: */ echo __LINE__.": {$id}/{$ext_name}/{$EXT_LOAD_MODE}
\n";
@@ -316,6 +309,18 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
LOAD_URL("modules.php?module=admin&logout=1&".$EXT_LOAD_MODE."=sql_patches");
} // 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) || ($EXT_LOAD_MODE == "activate") || ($EXT_LOAD_MODE == "deactivate"))) {
+ //* DEBUG: */ echo __LINE__.": DESTROY!
\n";
+ // Remove cache files
+ if ($cacheInstance->cache_file("extensions", true)) $cacheInstance->cache_destroy();
+ if ($cacheInstance->cache_file("mod_reg", true)) $cacheInstance->cache_destroy();
+ if ($cacheInstance->cache_file("config", true)) $cacheInstance->cache_destroy();
+
+ // @TODO This causes the whole (!) menu cache being purged
+ CACHE_PURGE_ADMIN_MENU();
+ } // END - if
}
// Check if given extension is active
function EXT_IS_ACTIVE ($ext_name) {
@@ -344,11 +349,16 @@ function EXT_IS_ACTIVE ($ext_name) {
// Extension was not found!
return false;
}
+
+ // Load entry
list($active) = SQL_FETCHROW($result);
- //* DEBUG: */ echo $ext_name."[DB]: {$active}
\n";
+
+ // Free result
SQL_FREERESULT($result);
+
// Write cache array
+ //* DEBUG: */ echo $ext_name."[DB]: {$active}
\n";
$cacheArray['extensions']['ext_active'][$ext_name] = $active;
} else {
// Extension not active!
@@ -356,9 +366,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}");
@@ -372,12 +379,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
@@ -394,7 +401,7 @@ function GET_EXT_VERSION ($ext_name) {
}
// Return result
- //* DEBUG: */ echo __FUNCTION__.": ret={$ret}
\n";
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."): ret={$ret}
\n";
return $ret;
}
//
@@ -576,7 +583,7 @@ function GET_EXT_NAME ($id) {
$ret = $cacheArray['extensions']['ext_name'][$id];
// Count cache hits
- $_CONFIG['cache_hits']++;
+ if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
} elseif (!EXT_IS_ACTIVE("cache")) {
// Load from database
$result = SQL_QUERY_ESC("SELECT ext_name FROM "._MYSQL_PREFIX."_extensions WHERE id=%s LIMIT 1",
@@ -595,7 +602,7 @@ function GET_EXT_ID($name) {
$ret = $cacheArray['extensions']['ext_id'][$name];
// Count cache hits
- $_CONFIG['cache_hits']++;
+ if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
} elseif (!EXT_IS_ACTIVE("cache")) {
// Load from database
$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_extensions WHERE ext_name='%s' LIMIT 1",