X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Floader%2Fload_cache-admin.php;h=11d80fe5118e3fcb59c2df467d4a561e719f8b5b;hp=9210709caa2b5394c7efcb0d2ce86767ce5445ef;hb=03f62d0b89aa9276ac37f4d616d940fae184d850;hpb=7f104f6fe558bb56b4205241435a2357c2feece1

diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php
index 9210709caa..11d80fe511 100644
--- a/inc/loader/load_cache-admin.php
+++ b/inc/loader/load_cache-admin.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * 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                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,133 +38,108 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 } // END - if
 
 // Let's start with the admins table...
-if (($cacheInstance->cache_file("admins", true) == true) && ($cacheInstance->ext_version_matches("admins"))) {
+if (($GLOBALS['cache_instance']->loadCacheFile('admins')) && ($GLOBALS['cache_instance']->extensionVersionMatches('admins'))) {
 	// Load cache
-	global $cacheArray;
-	$cacheArray['admins'] = $cacheInstance->cache_load();
+	$GLOBALS['cache_array']['admins'] = $GLOBALS['cache_instance']->getArrayFromCache();
 
 	// Check if valid
-	if ((is_array($cacheArray['admins']['login'])) && (is_array($cacheArray['admins']['aid']))) {
+	if ((isset($GLOBALS['cache_array']['admins']['login'])) && (is_array($GLOBALS['cache_array']['admins']['login'])) && (is_array($GLOBALS['cache_array']['admins']['aid']))) {
 		// Check count
-		if (count($cacheArray['admins']['login']) == count($cacheArray['admins']['aid'])) {
-			//* DEBUG: */ echo "<PRE>";
-			//* DEBUG: */ print_r($cacheArray['admins']);
-
-			// The cache file seems to be fine
-			foreach ($cacheArray['admins']['login'] as $k => $login) {
-				// Rewrite default_acl
-				$cacheArray['admins']['aid'][$login]      = $cacheArray['admins']['aid'][$k];
-				$cacheArray['admins']['password'][$login] = $cacheArray['admins']['password'][$k];
-				$cacheArray['admins']['email'][$login]    = $cacheArray['admins']['email'][$k];
-
-				// Some extra data depending on version
-				if (GET_EXT_VERSION("admins") >= "0.3") {
-					$cacheArray['admins']['def_acl'][$login]  = $cacheArray['admins']['def_acl'][$k];
-					if (GET_EXT_VERSION("admins") >= "0.6.7") {
-						$cacheArray['admins']['la_mode'][$login]  = $cacheArray['admins']['la_mode'][$k];
-						if (GET_EXT_VERSION("admins") >= "0.7.0") {
-							$cacheArray['admins']['login_failtures'][$login] = $cacheArray['admins']['login_failtures'][$k];
-							$cacheArray['admins']['last_failture'][$login]   = $cacheArray['admins']['last_failture'][$k];
-						} // END - if
+		if (count($GLOBALS['cache_array']['admins']['login']) == count($GLOBALS['cache_array']['admins']['aid'])) {
+			// Get "id map"
+			$idMap = $GLOBALS['cache_array']['admins']['aid'];
+
+			// Rewrite the cache array
+			for ($idx = (count($idMap) - 1); $idx >= 0; $idx--) {
+				// Rewrite all entries
+				foreach ($GLOBALS['cache_array']['admins'] as $key=>$entryArray) {
+					// Rewrite the entry
+					if ($key == 'aid') {
+						// Rewrite admin id (use login name as index)
+						$GLOBALS['cache_array']['admins']['aid'][$GLOBALS['cache_array']['admins']['login'][$idx]] = $entryArray[$idx];
+					} else {
+						// Rewrite regular entry
+						$GLOBALS['cache_array']['admins'][$key][$idMap[$idx]] = $entryArray[$idx];
+					}
+
+					// Is the last entry reached?
+					if ($idx == 0) {
+						// Remove it
+						unset($GLOBALS['cache_array']['admins'][$key][0]);
 					} // END - if
 				} // END - if
-
-				//* DEBUG: */ print_r($cacheArray['admins']);
-
-				// Clear array
-				foreach (array('aid', 'def_acl', 'la_mode', 'password', 'email', 'login_failtures', 'last_failture') as $rem) {
-					if (isset($cacheArray['admins'][$rem][$k])) unset($cacheArray['admins'][$rem][$k]);
-				} // END - foreach
-			} // END - if
-
-			//* DEBUG: */ print_r($cacheArray['admins']);
-
-			// Rewrite Login
-			foreach ($cacheArray['admins']['login'] as $k => $login) {
-				$cacheArray['admins']['login'][$cacheArray['admins']['aid'][$login]] = $login;
-				if (!in_array($k, $cacheArray['admins']['aid'])) {
-					unset($cacheArray['admins']['login'][$k]);
-				} // END - if
-			} // END - foreach
-
-			//* DEBUG: */ echo "****\n";
-			//* DEBUG: */ print_r($cacheArray['admins']);
-			//* DEBUG: */ echo "</PRE>";
-			//* DEBUG: */ die();
+			} // END - for
 		} else {
 			// Nope, cache file is corrupted!
-			$cacheInstance->cache_destroy();
+			$GLOBALS['cache_instance']->destroyCacheFile();
+			unset($GLOBALS['cache_array']['admins']);
 		}
 	} else {
 		// Nope, cache file is corrupted!
-		$cacheInstance->cache_destroy();
-		unset($cacheArray['admins']);
+		$GLOBALS['cache_instance']->destroyCacheFile();
+		unset($GLOBALS['cache_array']['admins']);
 	}
-} elseif (($_CONFIG['cache_admins'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+} elseif ((getConfig('cache_admins') == 'Y') && (getOutputMode() != '1') && (getOutputMode() != '-1')) {
 	// Create cache file
-	$cacheInstance->cache_init("ADMINS");
-	$cacheInstance->store_extension_version("admins");
+	$GLOBALS['cache_instance']->init('ADMINS');
+	$GLOBALS['cache_instance']->storeExtensionVersion('admins');
 
 	// Load every data from DB to cache file
-	$ADD = ", id, id";
-	if (GET_EXT_VERSION("admins") >= "0.3")   $ADD  = ", default_acl AS def_acl";
-	if (GET_EXT_VERSION("admins") >= "0.6.7") $ADD .= ", la_mode";
-	if (GET_EXT_VERSION("admins") >= "0.7.0") $ADD .= ", login_failtures, UNIX_TIMESTAMP(last_failture) AS last_failture";
+	$add = runFilterChain('sql_admin_extra_data');
 
 	// Query the database about this
-	$result_admins = SQL_QUERY("SELECT id AS aid, login, password, email".$ADD."
-FROM "._MYSQL_PREFIX."_admins
-ORDER BY login", __FILE__, __LINE__);
-	while($dummy = SQL_FETCHARRAY($result_admins)) {
+	$result_admins = SQL_QUERY('SELECT id AS aid, login, password, email'.$add.'
+FROM `{!_MYSQL_PREFIX!}_admins`
+ORDER BY login', __FILE__, __LINE__);
+	while ($dummy = SQL_FETCHARRAY($result_admins)) {
 		// Save row
-		$cacheInstance->add_row($dummy);
+		$GLOBALS['cache_instance']->addRow($dummy);
 	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result_admins);
 
 	// Close cache
-	$cacheInstance->cache_close();
+	$GLOBALS['cache_instance']->finalize();
 
-	// Reload the cache
+	// Include loader again
 	require(__FILE__);
 }
 
-// Close file
-$cacheInstance->cache_close();
-
 // Next cached table are the admins_acls...
-if (GET_EXT_VERSION("admins") >= "0.3") {
+if (GET_EXT_VERSION('admins') >= '0.3') {
 	// Check for cache file
-	if ($cacheInstance->cache_file("admins_acls", true) == true) {
-		// Load referral system from cache
-		global $cacheArray;
-		$cacheArray['admin_acls'] = $cacheInstance->cache_load();
-	} elseif (($_CONFIG['cache_acls'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+	if (($GLOBALS['cache_instance']->loadCacheFile('admins_acls')) && ($GLOBALS['cache_instance']->extensionVersionMatches('admins'))) {
+		// Load referal system from cache
+		$GLOBALS['cache_array']['admin_acls'] = $GLOBALS['cache_instance']->getArrayFromCache();
+	} elseif ((getConfig('cache_acls') == 'Y') && (getOutputMode() != '1') && (getOutputMode() != '-1')) {
 		// Create cache file here
-		$cacheInstance->cache_init("ADMINS_ACLS");
+		$GLOBALS['cache_instance']->init('ADMINS_ACLS');
+		$GLOBALS['cache_instance']->storeExtensionVersion('admins');
+
+		// Load all modules and their data (column 'id' is no longer required)
+		$result = SQL_QUERY('SELECT admin_id, action_menu, what_menu, access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` ORDER BY admin_id, action_menu, what_menu', __FILE__, __LINE__);
 
-		// Load all modules and their data
-		$result = SQL_QUERY("SELECT id, admin_id, action_menu, what_menu, access_mode FROM "._MYSQL_PREFIX."_admins_acls ORDER BY admin_id, action_menu, what_menu", __FILE__, __LINE__);
+		// Add all rows
 		while ($data = SQL_FETCHARRAY($result)) {
 			// Add row to cache file
-			$cacheInstance->add_row($data);
+			$GLOBALS['cache_instance']->addRow($data);
 		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);
 
-		// Reload the cache
+		// Close cache
+		$GLOBALS['cache_instance']->finalize();
+
+		// Include loader again
 		require(__FILE__);
 	}
-
-	// Close file
-	$cacheInstance->cache_close();
 } // END - if
 
 //