************************************************************************/
// Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
require($INC);
}
// Next cached table is the configuration (config)...
-if ($cacheInstance->cache_file("config", true) == true) {
+if (($GLOBALS['cache_instance']->loadCacheFile("config", true)) && ($GLOBALS['cache_instance']->extensionVersionMatches("sql_patches"))) {
// Load config from cache
- global $cacheArray;
- $cacheArrayConfig = $cacheInstance->cache_load();
+ $GLOBALS['cache_array']['config'] = $GLOBALS['cache_instance']->getArrayFromCache();
- // Valid cache file
- $CNT = 0; $newCache = array();
- foreach ($cacheArrayConfig as $key => $array) {
- foreach ($array as $key2 => $value) {
- $newCache[$key2][$key] = $value;
- }
- $CNT += count($array);
- }
-
- // Overwrite the config with the cache version
- $cacheArray['config'] = $newCache;
- unset($newCache);
-
- // 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['config']) > 0 ) $TEST = ($CNT / (count($cacheArray['config'])));
- if ($TEST != bigintval($TEST)) {
- // Cache file is corrupted!
- $cacheInstance->cache_destroy();
- unset($cacheArray['config']);
- }
-} elseif (($_CONFIG['cache_config'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+ // @TODO: Do we really need to cache the config???
+} elseif ((getConfig('cache_config') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
// Create cache file here
- $cacheInstance->cache_init("CONFIG");
+ $GLOBALS['cache_instance']->init("CONFIG");
+ $GLOBALS['cache_instance']->storeExtensionVersion("sql_patches");
// Load all modules and their data
- $result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX."_config ORDER BY config", __FILE__, __LINE__);
- while ($DATA = SQL_FETCHARRAY($result)) {
+ $result = SQL_QUERY("SELECT * FROM `{!_MYSQL_PREFIX!}_config` ORDER BY config ASC", __FILE__, __LINE__);
+ 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);
+ // Close the cache
+ $GLOBALS['cache_instance']->finalize();
+
// Reload the cache
- require(__FILE__);
+ LOAD_INC(__FILE__);
}
-// Close file
-$cacheInstance->cache_close();
-
//
?>