X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions.php;h=9d2c0a44184b7fb6932aca4acb3dfab530ec9497;hp=608efa6227dea95ea363a96639f43ab3243da597;hb=4913351e083ec29bfd7d98710e6a9da6c92bd648;hpb=143e78d4231adddd9e706cbf55ec5dd8c1651890
diff --git a/inc/extensions.php b/inc/extensions.php
index 608efa6227..9d2c0a4418 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -41,6 +41,7 @@ if (!defined('__SECURITY')) {
function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
{
global $NOTES, $_CONFIG, $INC_POOL, $cacheInstance;
+
// We want to register an extension and registration status is by default "failed" (= false)
$EXT_LOAD_MODE = "register"; $ret = false; $SQLs = array();
$INC_POOL = array();
@@ -48,6 +49,13 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
// This shall never do a non-admin user!
if (!IS_ADMIN()) return false;
+ // 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?
+ $EXT_LANG_PREFIX = $ext_name;
+
+ // By default we have no failtures
+ $EXT_REPORTS_FAILURE = false;
+
// Is this extension already installed?
if (EXT_IS_ACTIVE($ext_name)) return false;
@@ -57,6 +65,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
@@ -88,19 +97,25 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
$SQLs = array();
$test = false;
- // Backup language as well
- $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)) {
- // File exists so let's load it
+ // Bacup version number
$VER_BACKUP = $EXT_VERSION;
+
+ // Backup language as well
+ $LANG_BCK = $EXT_LANG_PREFIX;
+
+ // Save the Parrent $EXT_ALWAYS_ACTIVE for later!
+ $EXT_ALWAYS_ACTIVE_PARRENT = $EXT_ALWAYS_ACTIVE;
+
+ // Set EXT_ALWAYS_ACTIVE for update
+ $EXT_ALWAYS_ACTIVE = "N";
+
+ // File exists so let's load it
require($file);
- $EXT_VERSION = $VER_BACKUP;
// If versions mismatch update extension first
$ext_ver = GET_EXT_VERSION($EXT_UPDATE_DEPENDS);
@@ -132,6 +147,15 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
// Nothing to register / update before...
$test = true;
}
+
+ // Restore version number
+ $EXT_VERSION = $VER_BACKUP;
+
+ // Restore language back
+ $EXT_LANG_PREFIX = $LANG_BCK;
+
+ // Restore $EXT_ALWAYS_ACTIVE with the value from parrent
+ $EXT_ALWAYS_ACTIVE = $EXT_ALWAYS_ACTIVE_PARRENT;
} else {
// Required file for update does not exists!
$test = true;
@@ -140,7 +164,6 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
// Finally restore previous SQLs
$SQLs = $SQLs2; unset($SQLs2);
- $EXT_LANG_PREFIX = $LANG_BCK;
} else {
// Does not depend on an other extension
$test = true;
@@ -149,6 +172,9 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
// Switch back to register mode
$EXT_LOAD_MODE = "register";
+ // Remains true if extension registration reports no failtures
+ $test = ($test && !$EXT_REPORTS_FAILURE);
+
// Does everthing before wents ok?
if ($test) {
// "Dry-run-mode" activated?
@@ -186,6 +212,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
@@ -239,9 +268,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 +285,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 +302,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,19 +323,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";
@@ -313,6 +333,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) {
@@ -341,11 +373,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!
@@ -353,11 +390,8 @@ 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}");
+ //* 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");
@@ -369,12 +403,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 +425,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 +491,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)
{
@@ -561,7 +607,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",
@@ -580,7 +626,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",
@@ -616,5 +662,6 @@ function EXT_VERSION_IS_OLDER ($ext_name, $ext_ver) {
// Now compare both and return the result
return ($currVersion < $ext_ver);
}
+
//
?>