X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Floader%2Fload_cache-them.php;h=ae2d6bfceb665bea42d094a50f862775983c3547;hb=c6ec27ca8614f750c629f523d0651454ba70a951;hp=2a6e181a16272d4748fb631873c078d62797a6b1;hpb=963e55ca1ea79e255f235e359cde9f7862191dc5;p=mailer.git

diff --git a/inc/loader/load_cache-them.php b/inc/loader/load_cache-them.php
index 2a6e181a16..ae2d6bfceb 100644
--- a/inc/loader/load_cache-them.php
+++ b/inc/loader/load_cache-them.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mehr Cache-Dateien nachladen                     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -33,58 +38,61 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
+	die();
+} elseif (!isExtensionActive('theme')) {
+	// Skip this loader
+	return false;
 }
 
-// Next cached table is the referral system (themes)...
-if ($cacheInstance->cache_file("themes", true) == true) {
-	// Load referral system from cache
-	global $cacheArray;
-	$cache = $cacheInstance->cache_load();
+// Use this code if you don't want to run this cache loader on installation phase
+if (isInstallationPhase()) return;
+
+// Next cached table is the referal system (themes)...
+if (($GLOBALS['cache_instance']->loadCacheFile('themes')) && ($GLOBALS['cache_instance']->extensionVersionMatches('theme'))) {
+	// Load referal system from cache
+	$cache = $GLOBALS['cache_instance']->getArrayFromCache();
 
 	// Restructure the array
-	$cacheArray['themes'] = array();
-	foreach ($cache as $key => $data) {
-		// Skip "theme_path" because we don't need to rebuild it
-		if ($key == "theme_path") {
+	$GLOBALS['cache_array']['themes'] = array();
+	foreach ($cache as $key => $content) {
+		// Skip 'theme_path' because we don't need to rebuild it
+		if ($key == 'theme_path') {
 			// Add entries with id
-			foreach ($data as $id => $entry) {
-				$cacheArray['themes']['theme_path'][$cache['id'][$id]] = $entry;
+			foreach ($content as $id => $entry) {
+				$GLOBALS['cache_array']['themes']['theme_path'][$cache['id'][$id]] = $entry;
 			} // END - foreach
 		} else {
 			// Add all themes with theme name as array index
-			foreach ($data as $id => $entry) {
-				$cacheArray['themes'][$key][$cache['theme_path'][$id]] = $entry;
+			foreach ($content as $id => $entry) {
+				$GLOBALS['cache_array']['themes'][$key][$cache['theme_path'][$id]] = $entry;
 			} // END - foreach
 		}
-	} // END - if
+	} // END - foreach
 
 	// Remove dummy array
 	unset($cache);
-} elseif (($_CONFIG['cache_refsys'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+} elseif (getOutputMode() != 1) {
 	// Create cache file here
-	$cacheInstance->cache_init("themes");
+	$GLOBALS['cache_instance']->init();
 
 	// Load all themes and their data
-	$result = SQL_QUERY("SELECT id, theme_path, theme_active, theme_ver, theme_name FROM "._MYSQL_PREFIX."_themes ORDER BY id", __FILE__, __LINE__);
-	while ($data = SQL_FETCHARRAY($result)) {
+	if (getExtensionVersion('theme') >= '0.0.7') {
+		$result = SQL_QUERY('SELECT id, theme_path, theme_active, theme_ver, theme_name FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id`', __FILE__, __LINE__);
+	} else {
+		$result = SQL_QUERY('SELECT id, theme_path, theme_active, theme_ver FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id`', __FILE__, __LINE__);
+	}
+	while ($content = SQL_FETCHARRAY($result)) {
 		// Add row to cache file
-		$cacheInstance->add_row($data);
+		$GLOBALS['cache_instance']->addRow($content);
 	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);
 
 	// Close the cache
-	$cacheInstance->cache_close();
-
-	// Reload the cache
-	require(__FILE__);
+	$GLOBALS['cache_instance']->storeExtensionVersion('theme');
+	$GLOBALS['cache_instance']->finalize();
 }
 
-// Close file
-$cacheInstance->cache_close();
-
-//
+// [EOF]
 ?>