Fixes for installation phase

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

diff --git a/inc/loader/load_cache-refdepths.php b/inc/loader/load_cache-refdepths.php
index 28da4a7d4a13a50b9517585650a2cde1e61116a1..5bb6ab76d832c019e33b69e988b1474b6f7a2788 100644 (file)
--- a/inc/loader/load_cache-refdepths.php
+++ b/inc/loader/load_cache-refdepths.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 *
@@ -32,52 +37,38 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-       require($INC);
+if (!defined('__SECURITY')) {
+       die();
 }
 
-// Next cached table is the referral system (refdepths)...
-if ($cacheInstance->cache_file("refdepths", true) == true) {
-       // Load referral system from cache
-       global $cacheArray;
-       $cacheArray['ref_depths'] = $cacheInstance->cache_load();
-
-       // Valid cache file
-       $CNT = 0;
-       foreach ($cacheArray['ref_depths'] as $k => $array) {
-               $CNT += count($array);
-       }
+// Use this code if you don't want to run this cache loader on installation phase
+if (isInstallationPhase()) return;
 
-       // When there is a period (.) in the result this test will fail and so the cache file is
-       // damaged/corrupted
-       $TEST = "failed";
-       if (count($cacheArray['ref_depths']) > 0 ) $TEST = ($CNT / (count($cacheArray['ref_depths'])));
-       if ($TEST != bigintval($TEST)) {
-               // Cache file is corrupted!
-               $cacheInstance->cache_destroy();
-               unset($cacheArray['ref_depths']);
-       }
-} elseif (($_CONFIG['cache_refdepth'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+// Next cached table is the referal system (refdepths)...
+if (($GLOBALS['cache_instance']->loadCacheFile('refdepths')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) {
+       // Load referal system from cache
+       $GLOBALS['cache_array']['ref_depths'] = $GLOBALS['cache_instance']->getArrayFromCache();
+} elseif (getOutputMode() != '1') {
        // Create cache file here
-       $cacheInstance->cache_init("REFDEPTHS");
+       $GLOBALS['cache_instance']->init('REFDEPTHS');
 
        // Load all modules and their data
-       $result = SQL_QUERY("SELECT id, level, percents FROM "._MYSQL_PREFIX."_refdepths ORDER BY level", __FILE__, __LINE__);
-       while ($DATA = SQL_FETCHARRAY($result)) {
+       $result = SQL_QUERY('SELECT id, level, percents FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY level', __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);
 
-       // Reload the cache
-       require(__FILE__);
-}
+       // Close the cache
+       $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches');
+       $GLOBALS['cache_instance']->finalize();
 
-// Close file
-$cacheInstance->cache_close();
+       // Include loader again
+       loadInclude('inc/loader/'.basename(__FILE__));
+}
 
-//
+// [EOF]
 ?>