X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fload_extensions.php;h=726591df3daee00f7e50895b2007fd29a86fd892;hb=85af9126d4e19a1961c44843693d5403f481484c;hp=c033051562e8d1ea0cdbf7136c0cb7143599f676;hpb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc;p=mailer.git

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index c033051562..726591df3d 100644
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -38,64 +38,82 @@ if (!defined('__SECURITY')) {
 }
 
 // Init variables
-global $EXT_CSS_FILES;
-$EXT_CSS_FILES = array();
+EXT_INIT_CSS_FILES();
 $ADD = "";
 
+// Init cache instance and array
+$GLOBALS['cache_instance'] = null;
+$GLOBALS['cache_array'] = array();
+
 // Skip loading extensions
-if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing'))) return;
+if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isInstalling())) {
+	// Init filter system here
+	INIT_FILTER_SYSTEM();
+
+	// Skip loading
+	return;
+} // END - if
 
 // Initialize array for "always keep active extensions"
-$cacheArray['active_extensions'] = array();
+$GLOBALS['cache_array']['active_extensions'] = array();
 
 // By default no cache is set
-$cacheMode = "no";
+$GLOBALS['cacheMode'] = "no";
 
 // Load sql_patchrs extension alone
-LOAD_EXTENSION("sql_patches");
+if (!LOAD_EXTENSION("sql_patches")) {
+	// Could not load sql_patches! ARGH!!!
+	trigger_error("Cannot load extension sql_patches.");
+} // END - if
+
+// Init inc pool array
+$INC_POOL = array();
 
 //
 // Load extensions
 //
 if (EXT_IS_ACTIVE("cache")) {
 	// Load cache extension alone
-	LOAD_EXTENSION("cache");
+	if (!LOAD_EXTENSION("cache")) {
+		// Extension 'cache' was not loaded
+		trigger_error("Cannot load extension cache.");
+	} // END - if
 
 	// Check extension cache
-	switch (($cacheInstance->loadCacheFile("extensions", true)) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
-		case true : $cacheMode = "load"; break;
-		case false: $cacheMode = "init"; break;
+	switch (($GLOBALS['cache_instance']->loadCacheFile("extensions", true)) && ($GLOBALS['cache_instance']->extensionVersionMatches("sql_patches"))) {
+		case true : $GLOBALS['cacheMode'] = "load"; break;
+		case false: $GLOBALS['cacheMode'] = "init"; break;
 	}
 
 	// Do we need to init the cache?
-	if (($cacheMode == "init") && (getConfig('cache_exts') == "Y")) {
+	if (($GLOBALS['cacheMode'] == "init") && (getConfig('cache_exts') == "Y")) {
 		// Init cache file
-		$cacheInstance->init("EXTENSIONS");
-		$cacheInstance->storeExtensionVersion("sql_patches");
-	} elseif (getConfig('cache_exts') == "N") {
+		$GLOBALS['cache_instance']->init("EXTENSIONS");
+		$GLOBALS['cache_instance']->storeExtensionVersion("sql_patches");
+	} elseif (getConfig('cache_exts') != "Y") {
 		// Cache will not be created for extensions
-		$cacheMode = "skip";
+		$GLOBALS['cacheMode'] = "skip";
 	}
 } // END - if
 
 // Load cache?
-if ($cacheMode == "load") {
+if ($GLOBALS['cacheMode'] == "load") {
 	// Init include array
 	$EXT_POOL = array();
 
 	// Re-initialize handler
-	$cacheInstance->loadCacheFile("extensions", true);
+	$GLOBALS['cache_instance']->loadCacheFile("extensions", true);
 
 	// Load extension data from cache file
-	$EXT_DUMMY = $cacheInstance->getArrayFromCache();
+	$EXT_DUMMY = $GLOBALS['cache_instance']->getArrayFromCache();
 
 	// Is the cache file fine?
 	if (!isset($EXT_DUMMY['ext_name'])) {
 		// Cache file is damaged so kill it
-		$cacheInstance->destroyCacheFile();
+		$GLOBALS['cache_instance']->destroyCacheFile();
 
 		// Retry it
-		require(__FILE__);
+		LOAD_INC(__FILE__);
 		return;
 	} // END -  if
 
@@ -103,7 +121,7 @@ if ($cacheMode == "load") {
 	$EXT_NAMES = array();
 	foreach ($EXT_DUMMY['ext_name'] as $k => $name) {
 		// Load CSS file
-		if ($EXT_DUMMY['ext_css'][$k] == "Y") $EXT_CSS_FILES[] = "".$name.".css";
+		if ($EXT_DUMMY['ext_css'][$k] == "Y") EXT_ADD_CSS_FILE("".$name.".css");
 
 		// Load extension file itself
 		if ((($EXT_DUMMY['ext_active'][$k] == "Y") || ($EXT_DUMMY['ext_keep'][$k] == "Y") || (IS_ADMIN())) && (!in_array($name, array("sql_patches", "cache")))) {
@@ -134,7 +152,7 @@ if ($cacheMode == "load") {
 		$EXT_DUMMY['ext_deprecated'][$name] = "N";
 
 		// Mark it as active extension
-		$cacheArray['active_extensions']['$name'] = $EXT_DUMMY['ext_keep'][$k];
+		$GLOBALS['cache_array']['active_extensions']['$name'] = $EXT_DUMMY['ext_keep'][$k];
 		unset($EXT_DUMMY['ext_keep'][$k]);
 
 		// Remove unneccessary data from memory
@@ -148,7 +166,7 @@ if ($cacheMode == "load") {
 	// Loading cache is done so let's free some memory!
 	unset($EXT_DUMMY['ext_keep']);
 	unset($EXT_DUMMY['ext_css']);
-	$cacheArray['extensions'] = $EXT_DUMMY;
+	$GLOBALS['cache_array']['extensions'] = $EXT_DUMMY;
 	unset($EXT_DUMMY);
 
 	// No database load needed
@@ -163,7 +181,7 @@ if ($cacheMode == "load") {
 	INIT_FILTER_SYSTEM();
 
 	// Load more cache files (like admins)
-	require_once(PATH."inc/load_cache.php");
+	LOAD_INC_ONCE("inc/load_cache.php");
 
 	// Remove array
 	unset($EXT_POOL);
@@ -171,7 +189,7 @@ if ($cacheMode == "load") {
 	// If current user is not admin load only activated extensions. But load
 	// them all if we are going to init the cache files. The admin shall use
 	// every available extension for testing purposes.
-	if ((!IS_ADMIN()) && ($cacheMode != "init")) $ADD = " WHERE ext_active='Y'";
+	if ((!IS_ADMIN()) && ($GLOBALS['cacheMode'] != "init")) $ADD = " WHERE ext_active='Y'";
 
 	if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {
 		// Query with CSS file from DB
@@ -190,10 +208,7 @@ ORDER BY ext_name", __FILE__, __LINE__);
 $DEL = array();
 
 // At least one found?
-if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1") && ($CSS != "-1")) || ($cacheMode == "no"))) {
-	// Load session management
-	require_once(PATH."inc/session.php");
-
+if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cacheMode'] == "init") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) || ($GLOBALS['cacheMode'] == "no"))) {
 	// Extensions are registered so we load them
 	while ($content = SQL_FETCHARRAY($res_ext_crt)) {
 		// Get menu entry
@@ -202,11 +217,11 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
 			$content['ext_menu'] = "Y";
 		} // END - if
 
-		// Load extensions
-		$file1 = sprintf("%sinc/extensions/ext-%s.php", PATH, $content['ext_name']);
+		// Generate FQFN for extension
+		$FQFN = sprintf("%sinc/extensions/ext-%s.php", constant('PATH'), $content['ext_name']);
 
 		// Does the extension file exists?
-		if (FILE_READABLE($file1)) {
+		if (FILE_READABLE($FQFN)) {
 			// By default no extension is always active, except sql_patches
 			$EXT_ALWAYS_ACTIVE = "N";
 
@@ -225,12 +240,12 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
 			// CSS file handling:
 			if ((!isset($content['ext_css'])) || ($content['ext_css'] == "Y")) {
 				// Create FQFN for the CSS file
-				$CSS_FILE = sprintf("%stheme/%s/css/%s.css", PATH, GET_CURR_THEME(), $content['ext_name']);
+				$FQFN = sprintf("%stheme/%s/css/%s.css", constant('PATH'), GET_CURR_THEME(), $content['ext_name']);
 
 				// Is the file there?
-				if (FILE_READABLE($CSS_FILE)) {
+				if (FILE_READABLE($FQFN)) {
 					// CSS file for extension was found (use only relative path for now!)
-					$EXT_CSS_FILES[] = $content['ext_name'].".css";
+					EXT_ADD_CSS_FILE($content['ext_name'].".css");
 					$content['ext_css'] = "Y";
 				} else {
 					// Don't load CSS file
@@ -239,14 +254,14 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
 			} // END - if
 
 			// Shall we cache?
-			if ($cacheMode == "init") {
+			if ($GLOBALS['cacheMode'] == "init") {
 				// Add cache row
-				$cacheInstance->addRow($content);
-			} elseif ($cacheMode == "no") {
+				$GLOBALS['cache_instance']->addRow($content);
+			} elseif ($GLOBALS['cacheMode'] == "no") {
 				// Remember this value for later usage
-				$cacheArray['active_extensions'][$content['ext_name']] = $EXT_ALWAYS_ACTIVE;
+				$GLOBALS['cache_array']['active_extensions'][$content['ext_name']] = $EXT_ALWAYS_ACTIVE;
 			}
-		} elseif (!FILE_READABLE($file1)) {
+		} elseif (!FILE_READABLE($FQFN)) {
 			// Deleted extension file so we mark it for removal from DB
 			$DEL[] = $content['ext_name'];
 		}
@@ -255,12 +270,12 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
 	// Init filter system
 	INIT_FILTER_SYSTEM();
 
-	if ($cacheMode == "init") {
+	if ($GLOBALS['cacheMode'] == "init") {
 		// Close cache file
-		$cacheInstance->finalize();
+		$GLOBALS['cache_instance']->finalize();
 
 		// Load more cache files (like admins)
-		require_once(PATH."inc/load_cache.php");
+		LOAD_INC_ONCE("inc/load_cache.php");
 	} // END - if
 
 	// Free memory