X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fload_extensions.php;h=dd92ec8e18af86410f5ce6b75632ff1e9d2a214b;hb=155f46e7464ead4e1e6e5441b68846823658ff3e;hp=fae66b3b568d0b6bd4fc9ba83a9b5dd6fc6b0f11;hpb=3a9723e159b1d9621c8a62927c9b911d6b484286;p=mailer.git

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index fae66b3b56..dd92ec8e18 100644
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -72,7 +72,7 @@ if (EXT_IS_ACTIVE("cache")) {
 		// Init cache file
 		$cacheInstance->init("EXTENSIONS");
 		$cacheInstance->storeExtensionVersion("sql_patches");
-	} elseif (getConfig('cache_exts') == "N") {
+	} elseif (getConfig('cache_exts') != "Y") {
 		// Cache will not be created for extensions
 		$cacheMode = "skip";
 	}
@@ -95,7 +95,7 @@ if ($cacheMode == "load") {
 		$cacheInstance->destroyCacheFile();
 
 		// Retry it
-		require(__FILE__);
+		LOAD_INC(__FILE__);
 		return;
 	} // END -  if
 
@@ -154,14 +154,17 @@ if ($cacheMode == "load") {
 	// No database load needed
 	$res_ext_crt = false;
 
-	// Load more cache files (like admins)
-	require_once(PATH."inc/load_cache.php");
-
 	// Load all extension files
 	foreach ($EXT_POOL as $ext) {
 		LOAD_EXTENSION($ext);
 	} // END - foreach
 
+	// Init filter system
+	INIT_FILTER_SYSTEM();
+
+	// Load more cache files (like admins)
+	LOAD_INC_ONCE("inc/load_cache.php");
+
 	// Remove array
 	unset($EXT_POOL);
 } else {
@@ -173,12 +176,12 @@ if ($cacheMode == "load") {
 	if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {
 		// Query with CSS file from DB
 		$res_ext_crt = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_has_css AS ext_css, ext_active, ext_version
-FROM "._MYSQL_PREFIX."_extensions".$ADD."
+FROM `{!_MYSQL_PREFIX!}_extensions`".$ADD."
 ORDER BY ext_name", __FILE__, __LINE__);
 	} else {
 		// Old obsolete query string
 		$res_ext_crt = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_name, ext_active, ext_version
-FROM "._MYSQL_PREFIX."_extensions".$ADD."
+FROM `{!_MYSQL_PREFIX!}_extensions`".$ADD."
 ORDER BY ext_name", __FILE__, __LINE__);
 	}
 }
@@ -189,7 +192,7 @@ $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");
+	LOAD_INC_ONCE("inc/session.php");
 
 	// Extensions are registered so we load them
 	while ($content = SQL_FETCHARRAY($res_ext_crt)) {
@@ -200,8 +203,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
 		} // END - if
 
 		// Load extensions
-		$file1 = sprintf("%sinc/extensions/ext-%s.php", PATH, $content['ext_name']);
-		$EXT_CSS = "N"; $EXT_ALWAYS_ACTIVE = "N";
+		$file1 = sprintf("%sinc/extensions/ext-%s.php", constant('PATH'), $content['ext_name']);
 
 		// Does the extension file exists?
 		if (FILE_READABLE($file1)) {
@@ -223,7 +225,7 @@ 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']);
+				$CSS_FILE = sprintf("%stheme/%s/css/%s.css", constant('PATH'), GET_CURR_THEME(), $content['ext_name']);
 
 				// Is the file there?
 				if (FILE_READABLE($CSS_FILE)) {
@@ -250,17 +252,23 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
 		}
 	} // END - while
 
+	// Init filter system
+	INIT_FILTER_SYSTEM();
+
 	if ($cacheMode == "init") {
 		// Close cache file
 		$cacheInstance->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
 	SQL_FREERESULT($res_ext_crt);
-} // END - if
+} elseif (!EXT_IS_ACTIVE("cache")) {
+	// Init filter system even when there are no extensions installed. #16
+	INIT_FILTER_SYSTEM();
+}
 
 // Run the filter
 RUN_FILTER('load_includes', $INC_POOL);
@@ -270,11 +278,11 @@ if (!empty($DEL[0])) {
 	// Remove extensions from two tables: extension registry and tasks table
 	foreach ($DEL as $del_ext) {
 		// First remove entry from extensions table
-		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_extensions WHERE ext_name='%s' LIMIT 1",
+		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
 			array($del_ext), __FILE__, __LINE__);
 
 		// Remove (maybe?) found tasks (main task and possible updates
-		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_task_system WHERE subject='[%s:]' AND (task_type='EXTENSION' OR task_type='EXTENSION_UPDATE')",
+		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_task_system` WHERE subject='[%s:]' AND (task_type='EXTENSION' OR task_type='EXTENSION_UPDATE')",
 			array($del_ext), __FILE__, __LINE__);
 	} // END - foreach