// Some security stuff...
if (!defined('__SECURITY')) {
die();
-} // END - if
-
-// Use this code if you don't want to run this cache loader on installation phase
-if (isInstallationPhase()) return;
+} elseif (isInstallationPhase()) {
+ // Use this code if you don't want to run this cache loader on installation phase
+ return;
+}
// Let's start with the admins table...
if (($GLOBALS['cache_instance']->loadCacheFile('admin')) && ($GLOBALS['cache_instance']->extensionVersionMatches('admins'))) {
$add = runFilterChain('sql_admin_extra_data');
// Query the database about this
- $result_admins = SQL_QUERY('SELECT
+ $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 ($dummy = SQL_FETCHARRAY($result)) {
// Save row
$GLOBALS['cache_instance']->addRow($dummy);
} // END - while
// Free memory
- SQL_FREERESULT($result_admins);
+ SQL_FREERESULT($result);
// Close cache
$GLOBALS['cache_instance']->storeExtensionVersion('admins');
if (($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) && ($GLOBALS['cache_instance']->extensionVersionMatches('admins'))) {
// Load referal system from cache
$GLOBALS['cache_array']['admin_acls'] = $GLOBALS['cache_instance']->getArrayFromCache();
+
+ // 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) {
+ // Do we have 'admin_id' or regular entries?
+ if ($key != 'admin_id') {
+ // Regular entry so use id
+ $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()) {
// 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)) {