X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions.php;h=ba65fb3649aec021a10536b64bc80071e3eab821;hb=9b87babf90b27658be4a1cef2c0465e2ce9ed681;hp=90a5af3374eab55fb16506297fa3fc5e4a24bbd4;hpb=c5e685ff1b1bd296243b9bfcd8921969fa09d53f;p=mailer.git
diff --git a/inc/extensions.php b/inc/extensions.php
index 90a5af3374..ba65fb3649 100644
--- a/inc/extensions.php
+++ b/inc/extensions.php
@@ -39,7 +39,7 @@ if (!defined('__SECURITY')) {
// Load the extension and maybe found language and function files.
function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run = false, &$SQLs = array()) {
- global $EXT_LOADED, $_CONFIG, $CSS, $cacheMode, $EXT_VER_HISTORY;
+ global $_CONFIG, $EXT_VER_HISTORY;
global $INC_POOL, $EXT_UPDATE_DEPENDS, $EXT_DEPRECATED, $UPDATE_NOTES;
global $EXT_VERSION, $EXT_ALWAYS_ACTIVE;
@@ -48,7 +48,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
// Is the extension already loaded?
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Loading extension {$ext_name}, mode={$EXT_LOAD_MODE}, ver={$EXT_VER}.");
- if ((isset($EXT_LOADED['ext'][$ext_name])) && (empty($EXT_LOAD_MODE))) {
+ if ((isset($GLOBALS['ext_loaded']['ext'][$ext_name])) && (empty($EXT_LOAD_MODE))) {
// Debug message
DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension %s already loaded.", $ext_name));
return false;
@@ -61,7 +61,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
);
// Is the extension file NOT there?
- if (!FILE_READABLE($extInclude)) {
+ if (!FILE_READABLE($FQFN)) {
// Debug message
DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension %s not found.", $ext_name));
@@ -73,10 +73,10 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
$langInclude = sprintf("inc/language/%s_%s.php", $ext_name, GET_LANGUAGE());
// Is this include there?
- if ((FILE_READABLE($langInclude)) && (!isset($EXT_LOADED['lang'][$ext_name]))) {
+ if ((FILE_READABLE($langInclude)) && (!isset($GLOBALS['ext_loaded']['lang'][$ext_name]))) {
// Then load it
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "--- Language loaded.");
- $EXT_LOADED['lang'][$ext_name] = true;
+ $GLOBALS['ext_loaded']['lang'][$ext_name] = true;
LOAD_INC_ONCE($langInclude);
} // END - if
@@ -84,10 +84,10 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
$funcsInclude = sprintf("inc/libs/%s_functions.php", $ext_name);
// Is this include there?
- if ((FILE_READABLE($funcsInclude)) && (!isset($EXT_LOADED['funcs'][$ext_name]))) {
+ if ((FILE_READABLE($funcsInclude)) && (!isset($GLOBALS['ext_loaded']['funcs'][$ext_name]))) {
// Then load it
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "--- Functions loaded.");
- $EXT_LOADED['funcs'][$ext_name] = true;
+ $GLOBALS['ext_loaded']['funcs'][$ext_name] = true;
LOAD_INC_ONCE($funcsInclude);
} // END - if
@@ -105,7 +105,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
// Include the extension file
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Extension loaded.");
- require($extInclude);
+ require($FQFN);
// Is this extension deprecated?
if ($EXT_DEPRECATED == "Y") {
@@ -119,7 +119,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
// Mark it as loaded in normal mode
if (empty($EXT_LOAD_MODE)) {
// Mark it now...
- $EXT_LOADED['ext'][$ext_name] = true;
+ $GLOBALS['ext_loaded']['ext'][$ext_name] = true;
} // END - if
// All fine!
@@ -128,7 +128,7 @@ function LOAD_EXTENSION ($ext_name, $EXT_LOAD_MODE = "", $EXT_VER = "", $dry_run
// Registeres an extension and possible update depencies
function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = true) {
- global $UPDATE_NOTES, $INC_POOL, $cacheInstance;
+ global $UPDATE_NOTES, $INC_POOL;
global $EXT_VER_HISTORY, $NOTES, $EXT_ALWAYS_ACTIVE, $EXT_VERSION;
global $EXT_UPDATE_DEPENDS;
@@ -256,7 +256,7 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": LOAD!");
if ($logout) {
// Then redirect to logout
- LOAD_URL("modules.php?module=admin&logout=1&".$EXT_LOAD_MODE."=sql_patches");
+ LOAD_URL("modules.php?module=admin&logout=1&".$EXT_LOAD_MODE."=sql_patches");
} else {
// Add temporary filter
REGISTER_FILTER('shutdown', 'REDIRECT_TO_LOGOUT_SQL_PATCHES', true, true);
@@ -271,8 +271,6 @@ function EXTENSION_REGISTER ($ext_name, $task_id, $dry_run = false, $logout = tr
// Run SQL queries for given extension id
// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
- global $cacheInstance;
-
// This shall never do a non-admin user!
if (!IS_ADMIN()) return false;
@@ -315,28 +313,29 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
if (($ext_name == "sql_patches") && (($load_mode == "register") || ($load_mode == "remove"))) {
// Then redirect to logout
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": LOAD!");
- LOAD_URL("modules.php?module=admin&logout=1&".$load_mode."=sql_patches");
+ LOAD_URL("modules.php?module=admin&logout=1&".$load_mode."=sql_patches");
} // END - if
}
// Check if given extension is active
function EXT_IS_ACTIVE ($ext_name) {
- global $cacheArray;
-
// Extensions are all inactive during installation
- if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing')) || (empty($ext_name))) return false;
+ if ((!isInstalled()) || (isInstalling()) || (empty($ext_name))) return false;
// Not active is the default
$active = "N";
// Check cache
- if (isset($cacheArray['extensions']['ext_active'][$ext_name])) {
+ if (isset($GLOBALS['cache_array']['extensions']['ext_active'][$ext_name])) {
// Load from cache
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "CACHE! ext_name={$ext_name}");
- $active = $cacheArray['extensions']['ext_active'][$ext_name];
+ $active = $GLOBALS['cache_array']['extensions']['ext_active'][$ext_name];
// Count cache hits
incrementConfigEntry('cache_hits');
+ } elseif (isset($GLOBALS['ext_loaded'][$ext_name])) {
+ // Extension is loaded!
+ die("LOADED:$ext_name");
} elseif (($ext_name == "cache") || (GET_EXT_VERSION("cache") == "")) {
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "DB! ext_name={$ext_name}");
// Load from database
@@ -354,11 +353,11 @@ function EXT_IS_ACTIVE ($ext_name) {
// Write cache array
//* DEBUG: */ echo $ext_name."[DB]: {$active}");
- $cacheArray['extensions']['ext_active'][$ext_name] = $active;
+ $GLOBALS['cache_array']['extensions']['ext_active'][$ext_name] = $active;
} else {
// Extension not active!
//* DEBUG: */ echo $ext_name.": Not active!");
- $cacheArray['extensions']['ext_active'][$ext_name] = "N";
+ $GLOBALS['cache_array']['extensions']['ext_active'][$ext_name] = "N";
}
// Debug message
@@ -369,22 +368,22 @@ function EXT_IS_ACTIVE ($ext_name) {
}
// Get version from extensions
function GET_EXT_VERSION ($ext_name) {
- global $cacheArray, $cacheInstance;
+ // By default no extension is found
$ext_ver = false;
// Extensions are all inactive during installation
- if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing'))) return "";
+ if ((!isInstalled()) || (isInstalling())) return "";
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": ext_name={$ext_name}");
// Is the cache written?
- if (isset($cacheArray['extensions']['ext_version'][$ext_name])) {
+ if (isset($GLOBALS['cache_array']['extensions']['ext_version'][$ext_name])) {
// Load data from cache
//* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, ": CACHE!");
- $ext_ver = $cacheArray['extensions']['ext_version'][$ext_name];
+ $ext_ver = $GLOBALS['cache_array']['extensions']['ext_version'][$ext_name];
// Count cache hits
incrementConfigEntry('cache_hits');
- } elseif (!is_object($cacheInstance)) {
+ } elseif ((!isset($GLOBALS['cache_instance'])) || (!is_object($GLOBALS['cache_instance']))) {
// Load from database
$result = SQL_QUERY_ESC("SELECT ext_version FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
array($ext_name), __FILE__, __LINE__);
@@ -399,7 +398,7 @@ function GET_EXT_VERSION ($ext_name) {
SQL_FREERESULT($result);
// Set cache
- $cacheArray['extensions']['ext_version'][$ext_name] = $ext_ver;
+ $GLOBALS['cache_array']['extensions']['ext_version'][$ext_name] = $ext_ver;
}
// Return result
@@ -410,8 +409,8 @@ function GET_EXT_VERSION ($ext_name) {
// Updates a given extension with current extension version to latest version
function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
// This shall never do a non-admin user!
- global $cacheInstance, $UPDATE_NOTES, $NOTES, $EXT_VER_HISTORY;
- global $EXT_UPDATE_DEPENDS, $EXT_VERSION, $INC_POOL, $cacheArray, $SQLs;
+ global $UPDATE_NOTES, $NOTES, $EXT_VER_HISTORY;
+ global $EXT_UPDATE_DEPENDS, $EXT_VERSION, $INC_POOL, $SQLs;
// Init arrays
$SQLs = array(); $INC_POOL = array();
@@ -439,14 +438,14 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
// And load SQL queries in order of version history
for ($idx = ($start + 1); $idx < sizeof($history); $idx++) {
// Set extension version
- $cacheArray['update_ver'][$ext_name] = $history[$idx];
+ $GLOBALS['cache_array']['update_ver'][$ext_name] = $history[$idx];
// Load again...
- LOAD_EXTENSION($ext_name, "update", $cacheArray['update_ver'][$ext_name], $dry_run, $SQLs);
+ LOAD_EXTENSION($ext_name, "update", $GLOBALS['cache_array']['update_ver'][$ext_name], $dry_run, $SQLs);
if (!empty($EXT_UPDATE_DEPENDS)) {
// Backup current SQL queries
- $cacheArray['update_sqls'][$ext_name] = $SQLs;
+ $GLOBALS['cache_array']['update_sqls'][$ext_name] = $SQLs;
// Is the extension there?
if (GET_EXT_VERSION($EXT_UPDATE_DEPENDS) != "") {
@@ -458,20 +457,20 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
}
// Restore previous SQL queries
- $SQLs = $cacheArray['update_sqls'][$ext_name];
- unset($cacheArray['update_sqls'][$ext_name]);
+ $SQLs = $GLOBALS['cache_array']['update_sqls'][$ext_name];
+ unset($GLOBALS['cache_array']['update_sqls'][$ext_name]);
} // END - if
// Add notes
- $NOTES .= ADD_EXTENSION_NOTES($cacheArray['update_ver'][$ext_name], $UPDATE_NOTES);
+ $NOTES .= ADD_EXTENSION_NOTES($GLOBALS['cache_array']['update_ver'][$ext_name], $UPDATE_NOTES);
} // END - for
// In real-mode execute any existing includes
if (!$dry_run) {
- $cacheArray['inc_pool'][$ext_name] = $INC_POOL;
+ $GLOBALS['cache_array']['inc_pool'][$ext_name] = $INC_POOL;
RUN_FILTER('load_includes', $INC_POOL);
- $INC_POOL = $cacheArray['inc_pool'][$ext_name];
- unset($cacheArray['inc_pool'][$ext_name]);
+ $INC_POOL = $GLOBALS['cache_array']['inc_pool'][$ext_name];
+ unset($GLOBALS['cache_array']['inc_pool'][$ext_name]);
} // END - if
// Run SQLs
@@ -479,15 +478,15 @@ function EXTENSION_UPDATE ($ext_name, $ext_ver, $dry_run = false) {
if (!$dry_run) {
// Create task
- CREATE_EXTENSION_UPDATE_TASK(GET_CURRENT_ADMIN_ID(), $ext_name, $cacheArray['update_ver'][$ext_name], addslashes($NOTES));
+ CREATE_EXTENSION_UPDATE_TASK(GET_CURRENT_ADMIN_ID(), $ext_name, $GLOBALS['cache_array']['update_ver'][$ext_name], SQL_ESCAPE($NOTES));
// Update extension's version
SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_version='%s' WHERE ext_name='%s' LIMIT 1",
- array($cacheArray['update_ver'][$ext_name], $ext_name), __FILE__, __LINE__);
+ array($GLOBALS['cache_array']['update_ver'][$ext_name], $ext_name), __FILE__, __LINE__);
// Remove arrays
unset($SQLs);
- unset($cacheArray['update_ver'][$ext_name]);
+ unset($GLOBALS['cache_array']['update_ver'][$ext_name]);
// Run filters on success extension update
RUN_FILTER('extension_update', $ext_name);
@@ -563,15 +562,13 @@ function EXTENSION_VERBOSE_TABLE ($queries = array(), $title = "", $dashed = "",
// Get extension name from id
function GET_EXT_NAME ($ext_id) {
- global $cacheArray;
-
// Init extension name
$ret = "";
// Is cache there?
- if (isset($cacheArray['extensions']['ext_name'][$ext_id])) {
+ if (isset($GLOBALS['cache_array']['extensions']['ext_name'][$ext_id])) {
// Load from cache
- $ret = $cacheArray['extensions']['ext_name'][$ext_id];
+ $ret = $GLOBALS['cache_array']['extensions']['ext_name'][$ext_id];
// Count cache hits
incrementConfigEntry('cache_hits');
@@ -587,13 +584,11 @@ function GET_EXT_NAME ($ext_id) {
// Get extension id from name
function GET_EXT_ID ($ext_name) {
- global $cacheArray;
-
// Init ID number
$ret = 0;
- if (isset($cacheArray['extensions']['ext_id'][$ext_name])) {
+ if (isset($GLOBALS['cache_array']['extensions']['ext_id'][$ext_name])) {
// Load from cache
- $ret = $cacheArray['extensions']['ext_id'][$ext_name];
+ $ret = $GLOBALS['cache_array']['extensions']['ext_id'][$ext_name];
// Count cache hits
incrementConfigEntry('cache_hits');
@@ -700,7 +695,7 @@ VALUES (%s,0,'NEW','EXTENSION','%s','%s',UNIX_TIMESTAMP())",
array(
$admin_id,
$subject,
- addslashes($msg),
+ SQL_ESCAPE($msg),
), __FILE__, __LINE__, true, false
);
} // END - if
@@ -718,7 +713,7 @@ function CREATE_EXTENSION_DEACTIVATION_TASK ($ext) {
VALUES (0,0,'NEW','EXTENSION_DEACTIVATION','%s','%s',UNIX_TIMESTAMP())",
array(
$subject,
- addslashes(LOAD_TEMPLATE("task_ext_deactivated", true, $ext)),
+ SQL_ESCAPE(LOAD_TEMPLATE("task_ext_deactivated", true, $ext)),
), __FILE__, __LINE__, true, false
);
} // END - if
@@ -726,20 +721,19 @@ VALUES (0,0,'NEW','EXTENSION_DEACTIVATION','%s','%s',UNIX_TIMESTAMP())",
// Checks if the module has a menu
function MODULE_HAS_MENU ($mod, $forceDb = false) {
- global $cacheArray;
-
// All is false by default
$ret = false;
+
//* DEBUG: */ print __FUNCTION__."(".__LINE__."):mod={$mod},cache=".GET_EXT_VERSION("cache")."
\n";
if (GET_EXT_VERSION("cache") >= "0.1.2") {
// Cache version is okay, so let's check the cache!
- if (isset($cacheArray['modules']['has_menu'][$mod])) {
+ if (isset($GLOBALS['cache_array']['modules']['has_menu'][$mod])) {
// Check module cache and count hit
- $ret = ($cacheArray['modules']['has_menu'][$mod] == "Y");
+ $ret = ($GLOBALS['cache_array']['modules']['has_menu'][$mod] == "Y");
incrementConfigEntry('cache_hits');
- } elseif (isset($cacheArray['extensions']['ext_menu'][$mod])) {
+ } elseif (isset($GLOBALS['cache_array']['extensions']['ext_menu'][$mod])) {
// Check cache and count hit
- $ret = ($cacheArray['extensions']['ext_menu'][$mod] == "Y");
+ $ret = ($GLOBALS['cache_array']['extensions']['ext_menu'][$mod] == "Y");
incrementConfigEntry('cache_hits');
} elseif ((IS_ADMIN()) && ($mod == "admin")) {
// Admin module has always a menu!
@@ -756,7 +750,7 @@ function MODULE_HAS_MENU ($mod, $forceDb = false) {
list($has_menu) = SQL_FETCHROW($result);
// Fake cache... ;-)
- $cacheArray['extensions']['ext_menu'][$mod] = $has_menu;
+ $GLOBALS['cache_array']['extensions']['ext_menu'][$mod] = $has_menu;
// Does it have a menu?
$ret = ($has_menu == "Y");
@@ -765,8 +759,8 @@ function MODULE_HAS_MENU ($mod, $forceDb = false) {
// Free memory
SQL_FREERESULT($result);
} elseif (GET_EXT_VERSION("sql_patches") == "") {
- // No sql_patches installed, so maybe in admin area?
- $ret = ((IS_ADMIN()) && ($mod == "admin")); // Then there is a menu!
+ // No sql_patches installed, so maybe in admin area or no admin registered?
+ $ret = (((IS_ADMIN()) || (!isAdminRegistered())) && ($mod == "admin")); // Then there is a menu!
}
// Return status
@@ -856,5 +850,38 @@ function ADD_EXTENSION_NOTES ($ver, &$UPDATE_NOTES) {
return $out;
}
+// Getter for CSS files array
+function EXT_GET_CSS_FILES () {
+ // By default no additional CSS files are found
+ $cssFiles = array();
+
+ // Is the array there?
+ if (isset($GLOBALS['css_files'])) {
+ // Then use it
+ $cssFiles = $GLOBALS['css_files'];
+ } // END - if
+
+ // Return array
+ return $cssFiles;
+}
+
+// Init CSS files array
+function EXT_INIT_CSS_FILES () {
+ // Simply init it
+ $GLOBALS['css_files'] = array();
+}
+
+// Add new entry
+function EXT_ADD_CSS_FILE ($file) {
+ // Is the array there?
+ if (!isset($GLOBALS['css_files'])) {
+ // Then auto-init them
+ EXT_INIT_CSS_FILES();
+ } // END - if
+
+ // Add the entry
+ $GLOBALS['css_files'][] = $file;
+}
+
//
?>