X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fload_extensions.php;h=975ffc393ecb60f04f2d78377cdd6dd76c093505;hb=5e1a9e64cac94cf48e754b95366f1a82febb2b5d;hp=ad2298df621875eb83f35689322470219b8d83c9;hpb=09dbff80156d99975509699166b6c79a9b13344f;p=mailer.git

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index ad2298df62..975ffc393e 100644
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -10,7 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Alle Erweiterungen laden                         *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * @TODO Rewrite this whole file to load_cache-extensions.php           *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -39,53 +46,65 @@ if (!defined('__SECURITY')) {
 
 // Init variables
 EXT_INIT_CSS_FILES();
-$ADD = "";
+$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 ((!isInstalled()) || (isInstalling())) {
+	// Init filter system here
+	INIT_FILTER_SYSTEM();
+
+	// Skip loading
+	return;
+} // END - if
 
 // Initialize array for "always keep active extensions"
 $GLOBALS['cache_array']['active_extensions'] = array();
 
 // By default no cache is set
-$GLOBALS['cacheMode'] = "no";
+$GLOBALS['cache_mode'] = "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();
+INIT_INC_POOL();
 
 //
 // 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 (($GLOBALS['cache_instance']->loadCacheFile("extensions", true)) && ($GLOBALS['cache_instance']->extensionVersionMatches("sql_patches"))) {
-		case true : $GLOBALS['cacheMode'] = "load"; break;
-		case false: $GLOBALS['cacheMode'] = "init"; break;
+		case true : $GLOBALS['cache_mode'] = "load"; break;
+		case false: $GLOBALS['cache_mode'] = "init"; break;
 	}
 
 	// Do we need to init the cache?
-	if (($GLOBALS['cacheMode'] == "init") && (getConfig('cache_exts') == "Y")) {
+	if (($GLOBALS['cache_mode'] == "init") && (getConfig('cache_exts') == "Y")) {
 		// Init cache file
 		$GLOBALS['cache_instance']->init("EXTENSIONS");
 		$GLOBALS['cache_instance']->storeExtensionVersion("sql_patches");
 	} elseif (getConfig('cache_exts') != "Y") {
 		// Cache will not be created for extensions
-		$GLOBALS['cacheMode'] = "skip";
+		$GLOBALS['cache_mode'] = "skip";
 	}
 } // END - if
 
 // Load cache?
-if ($GLOBALS['cacheMode'] == "load") {
+if ($GLOBALS['cache_mode'] == "load") {
 	// Init include array
 	$EXT_POOL = array();
 
@@ -101,7 +120,7 @@ if ($GLOBALS['cacheMode'] == "load") {
 		$GLOBALS['cache_instance']->destroyCacheFile();
 
 		// Retry it
-		LOAD_INC(__FILE__);
+		require(__FILE__);
 		return;
 	} // END -  if
 
@@ -177,17 +196,17 @@ if ($GLOBALS['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()) && ($GLOBALS['cacheMode'] != "init")) $ADD = " WHERE ext_active='Y'";
+	if ((!IS_ADMIN()) && ($GLOBALS['cache_mode'] != "init")) $add = " WHERE ext_active='Y'";
 
 	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__);
 	}
 }
@@ -196,7 +215,7 @@ ORDER BY ext_name", __FILE__, __LINE__);
 $DEL = array();
 
 // At least one found?
-if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cacheMode'] == "init") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) || ($GLOBALS['cacheMode'] == "no"))) {
+if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cache_mode'] == "init") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) || ($GLOBALS['cache_mode'] == "no"))) {
 	// Extensions are registered so we load them
 	while ($content = SQL_FETCHARRAY($res_ext_crt)) {
 		// Get menu entry
@@ -211,7 +230,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cacheMode'] == "init") && ($
 		// Does the extension file exists?
 		if (FILE_READABLE($FQFN)) {
 			// By default no extension is always active, except sql_patches
-			$EXT_ALWAYS_ACTIVE = "N";
+			EXT_SET_ALWAYS_ACTIVE("N");
 
 			// Load extension
 			if (($content['ext_name'] != "sql_patches") && (($content['ext_name'] != "cache") || (!EXT_IS_ACTIVE("cache")))) {
@@ -219,11 +238,11 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cacheMode'] == "init") && ($
 				LOAD_EXTENSION($content['ext_name']);
 			} else {
 				// Keep sql_patches always active
-				$EXT_ALWAYS_ACTIVE = "Y";
+				EXT_SET_ALWAYS_ACTIVE("Y");
 			}
 
 			// Transfer EXT_ALWAYS_ACTIVE flag
-			$content['ext_keep'] = $EXT_ALWAYS_ACTIVE;
+			$content['ext_keep'] = EXT_GET_ALWAYS_ACTIVE();
 
 			// CSS file handling:
 			if ((!isset($content['ext_css'])) || ($content['ext_css'] == "Y")) {
@@ -242,12 +261,12 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cacheMode'] == "init") && ($
 			} // END - if
 
 			// Shall we cache?
-			if ($GLOBALS['cacheMode'] == "init") {
+			if ($GLOBALS['cache_mode'] == "init") {
 				// Add cache row
 				$GLOBALS['cache_instance']->addRow($content);
-			} elseif ($GLOBALS['cacheMode'] == "no") {
+			} elseif ($GLOBALS['cache_mode'] == "no") {
 				// Remember this value for later usage
-				$GLOBALS['cache_array']['active_extensions'][$content['ext_name']] = $EXT_ALWAYS_ACTIVE;
+				$GLOBALS['cache_array']['active_extensions'][$content['ext_name']] = EXT_GET_ALWAYS_ACTIVE();
 			}
 		} elseif (!FILE_READABLE($FQFN)) {
 			// Deleted extension file so we mark it for removal from DB
@@ -258,7 +277,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cacheMode'] == "init") && ($
 	// Init filter system
 	INIT_FILTER_SYSTEM();
 
-	if ($GLOBALS['cacheMode'] == "init") {
+	if ($GLOBALS['cache_mode'] == "init") {
 		// Close cache file
 		$GLOBALS['cache_instance']->finalize();
 
@@ -274,7 +293,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cacheMode'] == "init") && ($
 }
 
 // Run the filter
-RUN_FILTER('load_includes', $INC_POOL);
+runFilterChain('load_includes');
 
 // Uninstall extensions that are no longer in our system
 if (!empty($DEL[0])) {