X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload_cache-filter.php;h=300bdd64f981f2ee2176ba218602b891411a66c4;hb=d167b280d9e930b6a0faabe2a555092ca8eb5f86;hp=25b9083fdbc7479e4f87feb1dfc2a94c88f923d1;hpb=ec1b93001abb7699e5e886249a102f5a861bad26;p=mailer.git

diff --git a/inc/loader/load_cache-filter.php b/inc/loader/load_cache-filter.php
index 25b9083fdb..300bdd64f9 100644
--- a/inc/loader/load_cache-filter.php
+++ b/inc/loader/load_cache-filter.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/26/2008 *
- * ===============                              Last change: 08/26/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 08/26/2008 *
+ * ===================                          Last change: 08/26/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : load_cache-filter.php                            *
@@ -10,14 +10,15 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mehr Cache-Dateien nachladen                     *
  * -------------------------------------------------------------------- *
- * $Revision:: 1092                                                   $ *
- * $Date:: 2009-07-28 20:50:32 +0200 (Tue, 28 Jul 2009)               $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: quix0r                                                   $ *
+ * $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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,38 +39,37 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-}
+	die();
+} // END - if
 
-// Skip this cache if we count usage
-if ((getConfig('update_filter_usage') == 'Y') || (EXT_VERSION_IS_OLDER('cache', '0.2.3'))) return;
+// Use this code if you don't want to run this cache loader on installation phase
+if (isInstallationPhase()) return;
 
 // Next cached table is the filteruration (filter)...
-if (($GLOBALS['cache_instance']->loadCacheFile('filter', true)) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) {
+if (($GLOBALS['cache_instance']->loadCacheFile('filter')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) {
 	// Load filter from cache
 	$GLOBALS['cache_array']['filter'] = $GLOBALS['cache_instance']->getArrayFromCache();
-} elseif ((getConfig('cache_filter') == 'Y') && (getOutputMode() != '1') && (getOutputMode() != '-1')) {
+
+	// Prepare the array here
+	prepareFilterArray();
+} elseif ((getOutputMode() != 1) && (isExtensionInstalled('sql_patches'))) {
 	// Create cache file here
-	$GLOBALS['cache_instance']->init('FILTER');
-	$GLOBALS['cache_instance']->storeExtensionVersion('sql_patches');
+	$GLOBALS['cache_instance']->init();
 
 	// Load all modules and their data
-	$result = SQL_QUERY('SELECT * FROM `{!_MYSQL_PREFIX!}_filters` ORDER BY `filter_name` ASC', __FILE__, __LINE__);
-	while ($data = SQL_FETCHARRAY($result)) {
+	$result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_filters` ORDER BY `filter_name` ASC, `filter_id` ASC', __FILE__, __LINE__);
+	while ($content = SQL_FETCHARRAY($result)) {
 		// Add row to cache file
-		$GLOBALS['cache_instance']->addRow($data);
+		$GLOBALS['cache_instance']->addRow($content);
 	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);
 
 	// Close the cache
+	$GLOBALS['cache_instance']->storeExtensionVersion('sql_patches');
 	$GLOBALS['cache_instance']->finalize();
-
-	// Include loader again
-	require(__FILE__);
 }
 
-//
+// [EOF]
 ?>