X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fload_extensions.php;h=4fc530349ea17a17f1bd50c7b09c23aa44bd5984;hp=256cb97daa0fb13f0599d8d149854c8ba2a39740;hb=b78901ad398c21e1fd0ab0baf56036c4d422db32;hpb=6586600d8020147192e5f28ca2a3a0153f774d3c

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index 256cb97daa..4fc530349e 100644
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -45,27 +45,21 @@ $ADD = "";
 // Skip loading extensions
 if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing'))) return;
 
-// Load default sql_patches extension if present
-if (FILE_READABLE(PATH."inc/extensions/ext-sql_patches.php")) {
-	// Load it...
-	$EXT_LOAD_MODE = "";
-	require_once(PATH."inc/extensions/ext-sql_patches.php");
-	$cacheArray['active_extensions'] = array('sql_patches' => 'Y'); // KEEP THIS ALWAYS ACTIVE!
-} else {
-	// Initialize array for "always keep active extensions"
-	$cacheArray['active_extensions'] = array();
-}
+// Initialize array for "always keep active extensions"
+$cacheArray['active_extensions'] = array();
 
 // By default no cache is set
 $cacheMode = "no";
 
+// Load sql_patchrs extension alone
+LOAD_EXTENSION("sql_patches");
+
 //
 // Load extensions
 //
 if (EXT_IS_ACTIVE("cache")) {
 	// Load cache extension alone
-	include_once(PATH."inc/libs/cache_functions.php");
-	include_once(PATH."inc/extensions/ext-cache.php");
+	LOAD_EXTENSION("cache");
 
 	// Check extension cache
 	switch (($cacheInstance->loadCacheFile("extensions", true)) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
@@ -74,11 +68,11 @@ if (EXT_IS_ACTIVE("cache")) {
 	}
 
 	// Do we need to init the cache?
-	if (($cacheMode == "init") && ($_CONFIG['cache_exts'] == "Y")) {
+	if (($cacheMode == "init") && (getConfig('cache_exts') == "Y")) {
 		// Init cache file
 		$cacheInstance->init("EXTENSIONS");
 		$cacheInstance->storeExtensionVersion("sql_patches");
-	} elseif ($_CONFIG['cache_exts'] == "N") {
+	} elseif (getConfig('cache_exts') == "N") {
 		// Cache will not be created for extensions
 		$cacheMode = "skip";
 	}
@@ -100,33 +94,20 @@ if ($cacheMode == "load") {
 		// Cache file is damaged so kill it
 		$cacheInstance->destroyCacheFile();
 
-		// Skip any further execution
+		// Retry it
+		require(__FILE__);
 		return;
 	} // END -  if
 
 	// Begin with the cache preparation of extensions
 	$EXT_NAMES = array();
 	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");
-		} // END - if
-
-		// Load Language file
-		if ($EXT_DUMMY['ext_lang'][$k] == "Y") {
-			$INC = sprintf("%sinc/language/%s_%s.php", PATH, $name, GET_LANGUAGE());
-			if (FILE_READABLE($INC)) {
-				// Add it
-				$EXT_POOL[] = $INC;
-			} // END -  if
-		} // END - if
-
 		// Load CSS file
 		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())) {
-			$EXT_POOL[] = sprintf("%sinc/extensions/ext-%s.php", PATH, $name);
+		if ((($EXT_DUMMY['ext_active'][$k] == "Y") || ($EXT_DUMMY['ext_keep'][$k] == "Y") || (IS_ADMIN())) && (!in_array($name, array("sql_patches", "cache")))) {
+			$EXT_POOL[] = $name;
 		} // END - if
 
 		// Version number
@@ -157,9 +138,7 @@ if ($cacheMode == "load") {
 		unset($EXT_DUMMY['ext_keep'][$k]);
 
 		// Remove unneccessary data from memory
-		unset($EXT_DUMMY['ext_lang'][$k]);
 		unset($EXT_DUMMY['ext_css'][$k]);
-		unset($EXT_DUMMY['ext_funcs'][$k]);
 	} // END - foreach
 
 	// Write dummy array back
@@ -167,24 +146,25 @@ if ($cacheMode == "load") {
 	unset($EXT_NAMES);
 
 	// 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']);
 	$cacheArray['extensions'] = $EXT_DUMMY;
 	unset($EXT_DUMMY);
 
 	// 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 $inc) {
-		require_once($inc);
+	foreach ($EXT_POOL as $ext) {
+		LOAD_EXTENSION($ext);
 	} // END - foreach
 
+	// Init filter system
+	INIT_FILTER_SYSTEM();
+
+	// Load more cache files (like admins)
+	require_once(PATH."inc/load_cache.php");
+
 	// Remove array
 	unset($EXT_POOL);
 } else {
@@ -195,12 +175,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_lang_file AS ext_lang, ext_has_css AS ext_css, ext_active, ext_version
+		$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."
 ORDER BY ext_name", __FILE__, __LINE__);
 	} else {
 		// Old obsolete query string
-		$res_ext_crt = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_lang_file AS ext_lang, ext_name, ext_active, ext_version
+		$res_ext_crt = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_name, ext_active, ext_version
 FROM "._MYSQL_PREFIX."_extensions".$ADD."
 ORDER BY ext_name", __FILE__, __LINE__);
 	}
@@ -211,8 +191,8 @@ $DEL = array();
 
 // At least one found?
 if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1") && ($CSS != "-1")) || ($cacheMode == "no"))) {
-	// Load theme management
-	require_once(PATH."inc/theme-manager.php");
+	// Load session management
+	require_once(PATH."inc/session.php");
 
 	// Extensions are registered so we load them
 	while ($content = SQL_FETCHARRAY($res_ext_crt)) {
@@ -224,45 +204,16 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
 
 		// Load extensions
 		$file1 = sprintf("%sinc/extensions/ext-%s.php", PATH, $content['ext_name']);
-		$file2 = $file1; $EXT_CSS = "N"; $EXT_ALWAYS_ACTIVE = "N";
-
-		// Special functions file
-		$file3 = sprintf("%sinc/libs/%s_functions.php", PATH, $content['ext_name']);
 
 		// Does the extension file exists?
 		if (FILE_READABLE($file1)) {
-			// If there's no language file specified we don't need to load one... ;-)
-			if (!empty($content['ext_lang'])) {
-				// Create language file
-				$file2 = sprintf("%sinc/language/%s_%s.php", PATH, $content['ext_lang'], GET_LANGUAGE());
-			} // END - if
-
-			if (FILE_READABLE($file3)) {
-				// Special functions file
-				$content['ext_funcs'] = "Y";
-				require_once($file3);
-			} else {
-				// Don't load functions file
-				$content['ext_funcs'] = "N";
-			}
-
-			// Do we need a language file?
-			if (($file1 != $file2) && (FILE_READABLE($file2))) {
-				// Load language file
-				$content['ext_lang'] = "Y";
-				include($file2);
-			} else {
-				// Don't load language file
-				$content['ext_lang'] = "N";
-			}
-
 			// By default no extension is always active, except sql_patches
 			$EXT_ALWAYS_ACTIVE = "N";
 
 			// Load extension
-			if ($content['ext_name'] != "sql_patches") {
-				// Load extension's file
-				include_once($file1);
+			if (($content['ext_name'] != "sql_patches") && (($content['ext_name'] != "cache") || (!EXT_IS_ACTIVE("cache")))) {
+				// Load extension
+				LOAD_EXTENSION($content['ext_name']);
 			} else {
 				// Keep sql_patches always active
 				$EXT_ALWAYS_ACTIVE = "Y";
@@ -301,6 +252,9 @@ 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();
@@ -311,17 +265,13 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
 
 	// Free memory
 	SQL_FREERESULT($res_ext_crt);
-} // END - if
-
-// Load include files if found
-if (!empty($INC_POOL[0])) {
-	foreach ($INC_POOL as $inc) {
-		require_once($inc);
-	} // END - foreach
+} else {
+	// Init filter system even when there are no extensions installed. #16
+	INIT_FILTER_SYSTEM();
+}
 
-	// Remove array
-	unset($INC_POOL);
-} // END - if
+// Run the filter
+RUN_FILTER('load_includes', $INC_POOL);
 
 // Uninstall extensions that are no longer in our system
 if (!empty($DEL[0])) {
@@ -332,7 +282,7 @@ if (!empty($DEL[0])) {
 			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 LIKE '[%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