X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload-admins.php;h=e3b5663ed209ef87de256bac418460ccfbfd0406;hb=678f314de00d41c3990fc49742545cd2e78dd3cc;hp=eb3d516155c67cdcd592b458c4418fce5d0e7be8;hpb=4b10617e87d23f8813857c05b6696f6398a23b90;p=mailer.git

diff --git a/inc/loader/load-admins.php b/inc/loader/load-admins.php
index eb3d516155..e3b5663ed2 100644
--- a/inc/loader/load-admins.php
+++ b/inc/loader/load-admins.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -57,7 +57,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('admin')) && ($GLOBALS['cache_ins
 			foreach ($GLOBALS['cache_array']['admin']['login'] as $idx => $admin) {
 				// Rewrite all entries
 				foreach ($GLOBALS['cache_array']['admin'] as $key => $entry) {
-					// Do we have login or regular entries?
+					// Is there login or regular entries?
 					if ($key == 'admin_id') {
 						// Admin id, so use login
 						$admins[$key][$GLOBALS['cache_array']['admin']['login'][$idx]] = $entry[$idx];
@@ -81,7 +81,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('admin')) && ($GLOBALS['cache_ins
 		$GLOBALS['cache_instance']->removeCacheFile();
 		unset($GLOBALS['cache_array']['admin']);
 	}
-} elseif (isHtmlOutputMode()) {
+} elseif ((isHtmlOutputMode()) || (isRawOutputMode())) {
 	// Create cache file
 	$GLOBALS['cache_instance']->init();
 
@@ -89,19 +89,23 @@ if (($GLOBALS['cache_instance']->loadCacheFile('admin')) && ($GLOBALS['cache_ins
 	$add = runFilterChain('sql_admin_extra_data');
 
 	// Query the database about this
-	$result_admins = SQL_QUERY('SELECT
-	`id` AS admin_id, `login`, `password`, `email`' . $add . '
+	$result = SQL_QUERY('SELECT
+	`id` AS `admin_id`,
+	`login`,
+	`password`,
+	`email`
+	' . $add . '
 FROM
 	`{?_MYSQL_PREFIX?}_admins`
 ORDER BY
 	`login` ASC', __FILE__, __LINE__);
-	while ($dummy = SQL_FETCHARRAY($result_admins)) {
+	while ($row = SQL_FETCHARRAY($result)) {
 		// Save row
-		$GLOBALS['cache_instance']->addRow($dummy);
+		$GLOBALS['cache_instance']->addRow($row);
 	} // END - while
 
 	// Free memory
-	SQL_FREERESULT($result_admins);
+	SQL_FREERESULT($result);
 
 	// Close cache
 	$GLOBALS['cache_instance']->storeExtensionVersion('admins');
@@ -112,14 +116,48 @@ ORDER BY
 if (isExtensionInstalledAndNewer('admins', '0.3')) {
 	// Check for cache file
 	if (($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) && ($GLOBALS['cache_instance']->extensionVersionMatches('admins'))) {
-		// Load referal system from cache
+		// Load admin ACLs from cache
 		$GLOBALS['cache_array']['admin_acls'] = $GLOBALS['cache_instance']->getArrayFromCache();
-	} elseif (isHtmlOutputMode()) {
+
+		// Check if valid
+		if ((isset($GLOBALS['cache_array']['admin_acls']['admin_id'])) && (is_array($GLOBALS['cache_array']['admin_acls']['admin_id'])) && (isset($GLOBALS['cache_array']['admin_acls']['access_mode'])) && (is_array($GLOBALS['cache_array']['admin_acls']['access_mode']))) {
+			// Check count
+			if (count($GLOBALS['cache_array']['admin_acls']['admin_id']) == count($GLOBALS['cache_array']['admin_acls']['access_mode'])) {
+				// Rewrite the cache
+				$admins = array();
+				foreach ($GLOBALS['cache_array']['admin_acls']['admin_id'] as $idx => $admin) {
+					// Rewrite all entries
+					foreach ($GLOBALS['cache_array']['admin_acls'] as $key => $entry) {
+						// Is there 'admin_id' or regular entries?
+						if ($key != 'admin_id') {
+							// Regular entry so use id
+							array_push($admins[$key][$GLOBALS['cache_array']['admin_acls']['admin_id'][$idx]], $entry[$idx]);
+						} // END - if
+					} // END - foreach
+				} // END - foreach
+
+				// Transfer back to cache array and remove dummy
+				$GLOBALS['cache_array']['admin_acls'] = $admins;
+				unset($admins);
+			} else {
+				// Nope, cache file is corrupted!
+				$GLOBALS['cache_instance']->removeCacheFile();
+				unset($GLOBALS['cache_array']['admin_acls']);
+			}
+		} elseif (count($GLOBALS['cache_array']['admin_acls']) > 0) {
+			// Nope, cache file is corrupted!
+			$GLOBALS['cache_instance']->removeCacheFile();
+			unset($GLOBALS['cache_array']['admin_acls']);
+		} elseif (isDebugModeEnabled()) {
+			// This may drive a lot messages to the logfile
+			//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'No entry found in admin_acls to rewrite.');
+		}
+	} elseif ((isHtmlOutputMode()) || (isRawOutputMode())) {
 		// Create cache file here
 		$GLOBALS['cache_instance']->init();
 
-		// 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` ASC, `action_menu` ASC, `what_menu` ASC', __FILE__, __LINE__);
+		// Load all admins and their data
+		$result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_admins_acls` ORDER BY `admin_id` ASC,`action_menu` ASC,`what_menu` ASC', __FILE__, __LINE__);
 
 		// Add all rows
 		while ($content = SQL_FETCHARRAY($result)) {