X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions.php;h=c7d794ada47167ae081470ed02337af3dd84d39d;hb=4dc51510f306afb139b2f97b750e4dee6b021579;hp=711a3d163966b7e40f4f43ed01e9d723bec4b04a;hpb=49654afc3fc819c4a9e65be2d870782f5e33e60d;p=mailer.git
diff --git a/inc/extensions.php b/inc/extensions.php
index 711a3d1639..c7d794ada4 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -55,7 +55,7 @@ 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_exists($file) && is_readable($file))
+ if (FILE_READABLE($file))
{
// Extension was found so we can load it in registration mode
require($file);
@@ -98,7 +98,7 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
$file = sprintf("%sinc/extensions/ext-%s.php", PATH, $EXT_UPDATE_DEPENDS);
// Check for required file
- if (file_exists($file) && is_readable($file))
+ if (FILE_READABLE($file))
{
// File exists so let's load it
$VER_BACKUP = $EXT_VERSION;
@@ -191,7 +191,7 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
foreach ($INC_POOL as $inc) {
require_once($inc);
} // END - foreach
- }
+ } // 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')",
@@ -201,7 +201,10 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
ADMIN_SOLVE_TASK($id);
// In normal mode return a true on success
- $ret = true; unset($SQLs);
+ $ret = true;
+
+ // Remove SQLs
+ unset($SQLs);
} else {
// Rewrite SQL command to keep { and } inside
foreach ($SQLs as $key => $sql) {
@@ -241,6 +244,9 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
global $cacheInstance;
$SQLs = array();
+ // By default no SQL has been executed
+ $sqlRan = false;
+
// This shall never do a non-admin user!
if (!IS_ADMIN()) return false;
@@ -249,9 +255,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";
$file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
- if (file_exists($file) && is_readable($file)) require($file);
+ if (FILE_READABLE($file)) {
+ // Load the include
+ require($file);
+ }
+ //* DEBUG: */ echo __FUNCTION__.":SQLs::count=".count($SQLs)."
\n";
if ((is_array($SQLs) && (sizeof($SQLs) > 0))) {
// Run SQL commands...
foreach ($SQLs as $sql) {
@@ -261,6 +272,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";
if (substr(strtolower($sql), 0, 11) == "alter table") {
// Analyse the alteration command
SQL_ALTER_TABLE($sql, __FILE__, __LINE__);
@@ -268,6 +280,9 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
// Run regular SQL command
$result = SQL_QUERY($sql, __FILE__, __LINE__, false);
}
+
+ // An SQL has been executed
+ $sqlRan = true;
} // END - if
} // END - foreach
@@ -278,8 +293,10 @@ 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") != "")) {
+ 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();
@@ -305,20 +322,22 @@ function EXT_IS_ACTIVE ($ext_name, $ignore_admin = false, $ignore_cache = false)
// Extension's file name will also be checked
$file = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
- if ((!file_exists($file)) && (!is_readable($file))) return false;
+ if (!FILE_READABLE($file)) return false;
//* DEBUG: */ echo "*".$ext_name."(".count($cacheArray).")
";
- // Failed is the default
- $ret = false;
+ // Not active is the default
+ $active = "N";
+
+ // Check cache
if ((!empty($cacheArray['extensions']['ext_active'][$ext_name])) && (!$ignore_cache)) {
// Load from cache
- //* DEBUG: */ echo "CACHE!
\n";
+ //* DEBUG: */ echo "CACHE! ext_name={$ext_name}
\n";
$active = $cacheArray['extensions']['ext_active'][$ext_name];
// Count cache hits
if (isset($_CONFIG['cache_hits'])) $_CONFIG['cache_hits']++;
- } else {
- //* DEBUG: */ echo "DB!
\n";
+ } elseif (($ext_name == "cache") || (GET_EXT_VERSION("cache") == "")) {
+ //* DEBUG: */ echo "DB! ext_name={$ext_name}
\n";
// Load from database
$result = SQL_QUERY_ESC("SELECT ext_active FROM "._MYSQL_PREFIX."_extensions WHERE ext_name='%s' LIMIT 1",
array($ext_name), __FILE__, __LINE__);
@@ -327,26 +346,29 @@ function EXT_IS_ACTIVE ($ext_name, $ignore_admin = false, $ignore_cache = false)
return false;
}
list($active) = SQL_FETCHROW($result);
+ //* DEBUG: */ echo $ext_name."[DB]: {$active}
\n";
SQL_FREERESULT($result);
// Write cache array
$cacheArray['extensions']['ext_active'][$ext_name] = $active;
+ } else {
+ // Extension not active!
+ //* DEBUG: */ echo $ext_name.": Not active!
\n";
+ $cacheArray['extensions']['ext_active'][$ext_name] = "N";
}
- // Is this extension activated? (For admins we always have active extensions...)
+ // Create FQFN for extension file
$inc = sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name);
- // Shorter way
+
+ // Debug message
+ //DEBUG_LOG(__FUNCTION__.": ext_name={$ext_name},active={$active}");
+
+ // Is this extension activated? (For admins we always have active extensions...)
return (
(
- ($active == "Y") || (
- (IS_ADMIN()) &&
- (!$ignore_admin) &&
- (!empty($active))
- )
- ) && (
- file_exists($inc)
+ $active == "Y"
) && (
- is_readable($inc)
+ FILE_READABLE($inc)
)
);
}
@@ -357,10 +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";
// Is the cache written?
if (!empty($cacheArray['extensions']['ext_version'][$ext_name])) {
// Load data from cache
+ //* DEBUG: */ echo __FUNCTION__.": CACHE!
\n";
$ret = $cacheArray['extensions']['ext_version'][$ext_name];
// Count cache hits
@@ -375,6 +399,9 @@ function GET_EXT_VERSION ($ext_name) {
// Set cache
$cacheArray['extensions']['ext_version'][$ext_name] = $ret;
}
+
+ // Return result
+ //* DEBUG: */ echo __FUNCTION__.": ret={$ret}
\n";
return $ret;
}
//
@@ -464,16 +491,7 @@ function EXTENSION_UPDATE($file, $ext, $EXT_VER, $dry_run=false)
$ext_subj = "[UPDATE-".$ext."-".$EXT_VERSION.":] ".ADMIN_UPDATE_EXT_SUBJ;
// Create task
- $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE subject='%s' LIMIT 1",
- array($ext_subj), __FILE__, __LINE__);
- if (SQL_NUMROWS($result) == 0) {
- // Task not created so it's a brand-new extension which we need to register and create a task for!
- $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, userid, status, task_type, subject, text, task_created) VALUES ('%s', '0', 'NEW', 'EXTENSION_UPDATE', '%s', '%s', UNIX_TIMESTAMP())",
- array(GET_ADMIN_ID(get_session('admin_login')), $ext_subj, addslashes($NOTES)), __FILE__, __LINE__);
- }
-
- // Free memory
- SQL_FREERESULT($result);
+ CREATE_EXTENSION_UPDATE_TASK(GET_ADMIN_ID(get_session('admin_login')), $ext_subj, addslashes($NOTES));
// Update extension's version
$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_version='%s' WHERE ext_name='%s' LIMIT 1",