X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fload_extensions.php;h=82337575ee6fa11e6853dcb71b8ff1245beefaa1;hb=3b95154ce2a1a5609a08bf665ee315098c8874e0;hp=91a3fb690cd07b10325107e7ced61ec730342d45;hpb=75ad748a68473ace540251427a74fb781b1145e9;p=mailer.git

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index 91a3fb690c..82337575ee 100644
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -43,20 +43,17 @@ $EXT_CSS_FILES = array();
 $ADD = "";
 
 // Skip loading extensions
-if ((!mxchange_installed) || (mxchange_installing)) return;
+if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing'))) return;
 
 // Load default sql_patches extension if present
-if (file_exists(PATH."inc/extensions/ext-sql_patches.php") && is_readable(PATH."inc/extensions/ext-sql_patches.php"))
-{
+if (file_exists(PATH."inc/extensions/ext-sql_patches.php") && is_readable(PATH."inc/extensions/ext-sql_patches.php")) {
 	// Load it...
 	$EXT_LOAD_MODE = "";
 	require_once(PATH."inc/extensions/ext-sql_patches.php");
-	$KEEP_ACTIVE = array('sql_patches' => "Y"); // KEEP THIS ALWAYS ACTIVE!
-}
- else
-{
+	$cacheArray['active_extensions'] = array('sql_patches' => 'Y'); // KEEP THIS ALWAYS ACTIVE!
+} else {
 	// Initialize array for "always keep active extensions"
-	$KEEP_ACTIVE = array();
+	$cacheArray['active_extensions'] = array();
 }
 
 //
@@ -66,52 +63,50 @@ if (EXT_IS_ACTIVE("cache"))
 {
 	// Load cache extension alone
 	include_once(PATH."inc/libs/cache_functions.php");
-	$CACHE_FILE = "";
+	$cacheMode = "";
 	include_once(PATH."inc/extensions/ext-cache.php");
-	switch($CACHE->cache_file("extensions", true))
+	switch($cacheInstance->cache_file("extensions", true))
 	{
-		case true : $CACHE_FILE = "load"; break;
-		case false: $CACHE_FILE = "init"; break;
+		case true : $cacheMode = "load"; break;
+		case false: $cacheMode = "init"; break;
 	}
 
 	// Do not recreate cache file when it's switched off!
-	if (($CACHE_FILE == "init") && ($CONFIG['cache_exts'] == "N")) $CACHE_FILE = "skip";
+	if (($cacheMode == "init") && ($_CONFIG['cache_exts'] == 'N')) $cacheMode = "skip";
 
 	// Load language
-	if ($CACHE_FILE == "load") include(PATH."inc/language/cache_".GET_LANGUAGE().".php");
-}
- else
-{
-	$CACHE_FILE = "no";
+	if ($cacheMode == "load") include(PATH."inc/language/cache_".GET_LANGUAGE().".php");
+} else {
+	$cacheMode = "no";
 }
 
-if ($CACHE_FILE == "load")
+if ($cacheMode == "load")
 {
 	// Load more cache files (like admins)
 	require_once(PATH."inc/load_cache.php");
 
 	// Re-initialize handler
-	$CACHE->cache_file("extensions", true);
+	$cacheInstance->cache_file("extensions", true);
 
 	// Load extension data from cache file
-	$EXT_DUMMY = $CACHE->cache_load();
+	$EXT_DUMMY = $cacheInstance->cache_load();
 	foreach ($EXT_DUMMY['ext_name'] as $k=>$name)
 	{
 		// Load functions file
-		if ($EXT_DUMMY['ext_funcs'][$k] == "Y") require_once(PATH."inc/libs/".$name."_functions.php");
+		if ($EXT_DUMMY['ext_funcs'][$k] == 'Y') require_once(PATH."inc/libs/".$name."_functions.php");
 
 		// Load Language file
-		if ($EXT_DUMMY['ext_lang'][$k] == "Y")
+		if ($EXT_DUMMY['ext_lang'][$k] == 'Y')
 		{
 			$INC = sprintf(PATH."inc/language/%s_%s.php", $name, GET_LANGUAGE());
 			if (file_exists($INC)) require_once($INC);
 		}
 
 		// Load CSS file
-		if ($EXT_DUMMY['ext_css'][$k] == "Y") $EXT_CSS_FILES[] = "".$name.".css";
+		if ($EXT_DUMMY['ext_css'][$k] == 'Y') $EXT_CSS_FILES[] = "".$name.".css";
 
 		// Load extension file itself
-		if (($EXT_DUMMY['ext_active'][$k] == "Y") || ($EXT_DUMMY['ext_keep'][$k] == "Y") || (IS_ADMIN()))
+		if (($EXT_DUMMY['ext_active'][$k] == 'Y') || ($EXT_DUMMY['ext_keep'][$k] == 'Y') || (IS_ADMIN()))
 		{
 			require_once(PATH."inc/extensions/ext-".$name.".php");
 		}
@@ -123,7 +118,7 @@ if ($CACHE_FILE == "load")
 		unset($EXT_DUMMY['ext_active'][$k]);
 		$EXT_DUMMY['ext_menu'][$name] = $EXT_DUMMY['ext_menu'][$k];
 		unset($EXT_DUMMY['ext_menu'][$k]);
-		$KEEP_ACTIVE['$name'] = $EXT_DUMMY['ext_keep'][$k];
+		$cacheArray['active_extensions']['$name'] = $EXT_DUMMY['ext_keep'][$k];
 		unset($EXT_DUMMY['ext_keep'][$k]);
 		$k2 = $EXT_DUMMY['ext_id'][$k];
 		$EXT_DUMMY['ext_id'][$k2] = $name;
@@ -136,14 +131,14 @@ if ($CACHE_FILE == "load")
 	}
 
 	// Close cache file
-	$CACHE->cache_close();
+	$cacheInstance->cache_close();
 
 	// Loading cache is done so let's free some memory!
 	unset($EXT_DUMMY['ext_lang']);
 	unset($EXT_DUMMY['ext_keep']);
 	unset($EXT_DUMMY['ext_css']);
 	unset($EXT_DUMMY['ext_funcs']);
-	$EXTENSIONS = $EXT_DUMMY;
+	$cacheArray['extensions'] = $EXT_DUMMY;
 	unset($EXT_DUMMY);
 
 	// No database load needed
@@ -153,7 +148,7 @@ if ($CACHE_FILE == "load")
 {
 	// If current user is not admin load only activated extensions
 	// The admin shall use every available extension for testing purposes
-	if (!IS_ADMIN()) $ADD = " WHERE ext_active='Y'";
+	if ((!IS_ADMIN()) && ($cacheMode != "init")) $ADD = " WHERE ext_active='Y'";
 
 	if (GET_EXT_VERSION("sql_patches") >= "0.0.6")
 	{
@@ -175,13 +170,13 @@ ORDER BY ext_name", __FILE__, __LINE__);
 $DEL = array();
 
 // At least one found?
-if ((SQL_NUMROWS($res_ext_crt) > 0) && (($CACHE_FILE == "init") || ($CACHE_FILE == "no")) && ($CSS != "1") && ($CSS != "-1"))
+if ((SQL_NUMROWS($res_ext_crt) > 0) && (($cacheMode == "init") || ($cacheMode == "no")) && ($CSS != "1") && ($CSS != "-1"))
 {
 	// Load theme management
 	require_once(PATH."inc/theme-manager.php");
 
 	// If we need to init the cache init it now
-	if ($CACHE_FILE == "init") $CACHE->cache_init("EXTENSIONS");
+	if ($cacheMode == "init") $cacheInstance->cache_init("EXTENSIONS");
 
 	// Extensions are registered so we load them
 	while (list($EXT_ID, $name, $lang, $css, $active, $version) = SQL_FETCHROW($res_ext_crt))
@@ -193,11 +188,11 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($CACHE_FILE == "init") || ($CACHE_FILE
 		//* DEBUG: */ echo "*".$name."/".$menu."*<br>";
 
 		// An empty menu entry will be interpreted as N (no menu) to avoid problems
-		if (empty($menu)) $menu = "N";
+		if (empty($menu)) $menu = 'N';
 
 		// Load extensions
 		$file1 = sprintf(PATH."inc/extensions/ext-%s.php", $name);
-		$file2 = $file1; $EXT_CSS = "N"; $EXT_ALWAYS_ACTIVE = "N";
+		$file2 = $file1; $EXT_CSS = 'N'; $EXT_ALWAYS_ACTIVE = 'N';
 
 		// Special functions file
 		$file3 = sprintf(PATH."inc/libs/%s_functions.php", $name);
@@ -214,26 +209,26 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($CACHE_FILE == "init") || ($CACHE_FILE
 			if (file_exists($file3) && is_readable($file3))
 			{
 				// Special functions file
-				$funcs = "Y";
+				$funcs = 'Y';
 				require_once($file3);
 			}
 			 else
 			{
 				// Don't load functions file
-				$funcs = "N";
+				$funcs = 'N';
 			}
 
 			// Do we need a language file?
 			if (($file1 != $file2) && (file_exists($file2)) && (is_readable($file2)))
 			{
 				// Load language file
-				$lang = "Y";
+				$lang = 'Y';
 				include($file2);
 			}
 			 else
 			{
 				// Don't load language file
-				$lang = "N";
+				$lang = 'N';
 			}
 
 			// Load extension
@@ -245,10 +240,10 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($CACHE_FILE == "init") || ($CACHE_FILE
 			 else
 			{
 				// KEEP sql_patches ALWAYS ACTIVE!
-				$EXT_ALWAYS_ACTIVE = "Y";
+				$EXT_ALWAYS_ACTIVE = 'Y';
 			}
 
-			if ($css == "Y")
+			if ($css == 'Y')
 			{
 				$CSS_FILE = PATH."theme/".GET_CURR_THEME()."/css/".$name.".css";
 				if (file_exists($CSS_FILE))
@@ -259,14 +254,14 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($CACHE_FILE == "init") || ($CACHE_FILE
 				 else
 				{
 					// Don't load CSS file
-					$css = "N";
+					$css = 'N';
 				}
 			}
 
 			// Add cache row
-			if ($CACHE_FILE == "init")
+			if ($cacheMode == "init")
 			{
-				$CACHE->add_row(array(
+				$cacheInstance->add_row(array(
 					'ext_id'      => $EXT_ID,
 					'ext_name'    => $name,
 					'ext_lang'    => $lang,
@@ -278,10 +273,10 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($CACHE_FILE == "init") || ($CACHE_FILE
 					'ext_keep'    => $EXT_ALWAYS_ACTIVE,
 				));
 			}
-			 elseif ($CACHE_FILE == "no")
+			 elseif ($cacheMode == "no")
 			{
 				// Remember this value for later usage
-				$KEEP_ACTIVE[$name] = $EXT_ALWAYS_ACTIVE;
+				$cacheArray['active_extensions'][$name] = $EXT_ALWAYS_ACTIVE;
 			}
 		}
 		 elseif (!file_exists($file1))
@@ -291,10 +286,10 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($CACHE_FILE == "init") || ($CACHE_FILE
 		}
 	}
 
-	if ($CACHE_FILE == "init")
+	if ($cacheMode == "init")
 	{
 		// Close cache file
-		$CACHE->cache_close();
+		$cacheInstance->cache_close();
 
 		// Load more cache files (like admins)
 		require_once(PATH."inc/load_cache.php");
@@ -304,16 +299,6 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && (($CACHE_FILE == "init") || ($CACHE_FILE
 // Free memory
 SQL_FREERESULT($res_ext_crt);
 
-// Compile configuration system
-/**
- * Commented out...
- *
- *foreach ($CONFIG as $k=>$v)
- *{
- *	$CONFIG[$k] = COMPILE_CODE($v);
- *}
- */
-
 // Load include files
 if (!empty($INC_POOL[0]))
 {