X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions.php;h=50820f59487c26cde3fe1cd6b96fba6b129bcdbe;hp=970e0a71ad57cabdcc4a61aa4d0ba088b98ba384;hb=23f39916099dad094d2d2b0fe54d335bddc986db;hpb=efe6057fdb1c02a518172e985298e66accef90d0
diff --git a/inc/extensions.php b/inc/extensions.php
index 970e0a71ad..50820f5948 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -32,11 +32,11 @@
************************************************************************/
// Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
require($INC);
}
+
//
function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
{
@@ -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')",
@@ -200,8 +200,14 @@ function EXTENSION_REGISTER ($ext_name, $id, $dry_run=false)
// Update task management
ADMIN_SOLVE_TASK($id);
+ // @TODO This causes the whole (!) menu cache being purged
+ CACHE_PURGE_ADMIN_MENU();
+
// 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 +247,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 +258,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 +275,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 +283,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,13 +296,18 @@ 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();
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
// Is this the sql_patches?
@@ -297,30 +320,25 @@ function EXTENSION_RUN_SQLS($id, $EXT_LOAD_MODE) {
} // END - if
}
// Check if given extension is active
-function EXT_IS_ACTIVE ($ext_name, $ignore_admin = false, $ignore_cache = false) {
+function EXT_IS_ACTIVE ($ext_name) {
global $cacheArray, $_CONFIG;
// Extensions are all inactive during installation
if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing')) || (empty($ext_name))) return 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;
- //* DEBUG: */ echo "*".$ext_name."(".count($cacheArray).")
";
-
// Not active is the default
$active = "N";
// Check cache
- if ((!empty($cacheArray['extensions']['ext_active'][$ext_name])) && (!$ignore_cache)) {
+ if (!empty($cacheArray['extensions']['ext_active'][$ext_name])) {
// 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']++;
} elseif (($ext_name == "cache") || (GET_EXT_VERSION("cache") == "")) {
- //* DEBUG: */ echo "DB!
\n";
+ //* 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__);
@@ -347,15 +365,7 @@ function EXT_IS_ACTIVE ($ext_name, $ignore_admin = false, $ignore_cache = false)
//DEBUG_LOG(__FUNCTION__.": ext_name={$ext_name},active={$active}");
// Is this extension activated? (For admins we always have active extensions...)
- return (
- (
- $active == "Y"
- ) && (
- file_exists($inc)
- ) && (
- is_readable($inc)
- )
- );
+ return ($active == "Y");
}
// Get version from extensions
function GET_EXT_VERSION ($ext_name) {
@@ -364,10 +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";
// 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
@@ -382,6 +394,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;
}
//
@@ -580,5 +595,17 @@ function GET_EXT_ID($name) {
// Return value
return $ret;
}
+// Activate given extension
+function ACTIVATE_EXTENSION($ext_name) {
+ // Activate the extension
+ $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='Y' WHERE ext_name='%s' LIMIT 1",
+ array($ext_name), __FILE__, __LINE__);
+
+ // Extension has been activated?
+ if (SQL_AFFECTEDROWS() == 1) {
+ // Then run all queries
+ EXTENSION_RUN_SQLS(GET_EXT_ID($ext_name), "activate");
+ } // END - if
+}
//
?>