Fixes for installation phase

[mailer.git] / inc / loader / load_cache-them.php

diff --git a/inc/loader/load_cache-them.php b/inc/loader/load_cache-them.php
index 87dd7a1c0daf9b53fbed5c37c55ee13048209aca..cbf87063a7bfb016a3b764150899c27a34c84c01 100644 (file)
--- a/inc/loader/load_cache-them.php
+++ b/inc/loader/load_cache-them.php
@@ -17,7 +17,7 @@
  * 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 *
@@ -38,13 +38,15 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
-} elseif (!EXT_IS_ACTIVE('theme')) {
+       die();
+} elseif (!isExtensionActive('theme')) {
        // Skip this loader
        return false;
 }
 
+// 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
@@ -52,16 +54,16 @@ if (($GLOBALS['cache_instance']->loadCacheFile('themes')) && ($GLOBALS['cache_in
 
        // Restructure the array
        $GLOBALS['cache_array']['themes'] = array();
-       foreach ($cache as $key => $data) {
+       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) {
+                       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) {
+                       foreach ($content as $id => $entry) {
                                $GLOBALS['cache_array']['themes'][$key][$cache['theme_path'][$id]] = $entry;
                        } // END - foreach
                }
@@ -69,31 +71,31 @@ if (($GLOBALS['cache_instance']->loadCacheFile('themes')) && ($GLOBALS['cache_in
 
        // Remove dummy array
        unset($cache);
-} elseif ((getConfig('cache_themes') == 'Y') && (getOutputMode() != '1') && (getOutputMode() != '-1')) {
+} elseif (getOutputMode() != '1') {
        // Create cache file here
        $GLOBALS['cache_instance']->init('THEMES');
-       $GLOBALS['cache_instance']->storeExtensionVersion('theme');
 
        // Load all themes and their data
-       if (GET_EXT_VERSION('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__);
+       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__);
+               $result = SQL_QUERY('SELECT id, theme_path, theme_active, theme_ver FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id`', __FILE__, __LINE__);
        }
-       while ($data = SQL_FETCHARRAY($result)) {
+       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('theme');
        $GLOBALS['cache_instance']->finalize();
 
        // Include loader again
-       require(__FILE__);
+       loadInclude('inc/loader/'.basename(__FILE__));
 }
 
-//
+// [EOF]
 ?>