X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions.php;h=7ed3d4943421a8f3f4068b01758fdb77650e5b57;hb=5d0d05a99b39c75b54cd6b02c6093cf71532cd83;hp=608cb3234fa92c51de596fb65019fec9637a045e;hpb=7989ec603971c0dc8dc35d8be4e72f8098b83baa;p=mailer.git
diff --git a/inc/extensions.php b/inc/extensions.php
index 608cb3234f..7ed3d49434 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 $EXT_LOADED, $_CONFIG, $EXT_VER_HISTORY;
global $INC_POOL, $EXT_UPDATE_DEPENDS, $EXT_DEPRECATED, $UPDATE_NOTES;
global $EXT_VERSION, $EXT_ALWAYS_ACTIVE;
@@ -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;
@@ -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;
@@ -321,8 +319,6 @@ function EXTENSION_RUN_SQLS ($ext_id, $load_mode) {
// 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;
@@ -330,10 +326,10 @@ function EXT_IS_ACTIVE ($ext_name) {
$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');
@@ -354,11 +350,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,7 +365,7 @@ 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
@@ -377,14 +373,14 @@ function GET_EXT_VERSION ($ext_name) {
//* 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 +395,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 +406,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 +435,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 +454,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 +475,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], SQL_ESCAPE($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 +559,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 +581,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');
@@ -726,20 +718,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 +747,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");
@@ -856,5 +847,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;
+}
+
//
?>