From: Roland Häder Date: Thu, 6 Jan 2011 05:24:22 +0000 (+0000) Subject: Loader for cache files renamed to avoid a lot naming conflicts X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=cf1c0f69caf5dc2abc2c461ca97696a064456e30 Loader for cache files renamed to avoid a lot naming conflicts --- diff --git a/.gitattributes b/.gitattributes index 83b912b6c6..fe44c7ec96 100644 --- a/.gitattributes +++ b/.gitattributes @@ -330,6 +330,17 @@ inc/libs/yoomedia_functions.php -text svneol=unset#text/plain inc/load_cache.php -text svneol=unset#text/plain inc/load_config.php -text svneol=unset#text/plain inc/loader/.htaccess -text svneol=unset#text/plain +inc/loader/load- -text svneol=unset#text/plain +inc/loader/load-admins.php -text svneol=unset#text/plain +inc/loader/load-config.php -text svneol=unset#text/plain +inc/loader/load-extensions.php -text svneol=unset#text/plain +inc/loader/load-filter.php -text svneol=unset#text/plain +inc/loader/load-imprint.php -text svneol=unset#text/plain +inc/loader/load-modules.php -text svneol=unset#text/plain +inc/loader/load-refdepths.php -text svneol=unset#text/plain +inc/loader/load-refsystem.php -text svneol=unset#text/plain +inc/loader/load-revision.php svneol=native#text/plain +inc/loader/load-themes.php -text svneol=unset#text/plain inc/loader/load_cache- -text svneol=unset#text/plain inc/loader/load_cache-admin.php -text svneol=unset#text/plain inc/loader/load_cache-config.php -text svneol=unset#text/plain diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 0144fdb0df..0964cc015a 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -92,7 +92,7 @@ ./inc/libs/user_functions.php:611: // @TODO Try to rewrite the following unset() ./inc/libs/yoomedia_functions.php:114: $response = YOOMEDIA_QUERY_API('out_textmail.php', true); // @TODO Ask Yoo!Media for test script ./inc/load_config.php:75: // @TODO Rewrite them to avoid this else block -./inc/loader/load_cache-extension.php:13: * @TODO Rewrite this whole file to load_cache-extensions.php * +./inc/loader/load-extensions.php:13: * @TODO Rewrite this whole file * ./inc/module-functions.php:267: // @TODO Nothing helped??? ./inc/module-functions.php:308: // @TODO Rewrite this to a filter ./inc/modules/admin/admin-inc.php:170: // @TODO This and the next getCurrentAdminId() call might be moved into the templates? @@ -231,6 +231,16 @@ ./templates/de/html/member/member_unconfirmed_table_nopoints.tpl:11: ./templates/de/html/surfbar/surfbar_frame_textlinks.tpl:5: ### ### DEPRECATION FOLLOWS: ### ### +./inc/loader/load_cache-admin.php:2:// @DEPRECATED +./inc/loader/load_cache-config.php:2:// @DEPRECATED +./inc/loader/load_cache-extension.php:2:// @DEPRECATED +./inc/loader/load_cache-filter.php:2:// @DEPRECATED +./inc/loader/load_cache-impressum.php:2:// @DEPRECATED +./inc/loader/load_cache-modules.php:2:// @DEPRECATED +./inc/loader/load_cache-refdepths.php:2:// @DEPRECATED +./inc/loader/load_cache-refsystem.php:2:// @DEPRECATED +./inc/loader/load_cache-revision.php:2:// @DEPRECATED +./inc/loader/load_cache-them.php:2:// @DEPRECATED ./inc/modules/admin/admin-inc.php:437:// @DEPRECATED ### ### template-warnings.log follows: ### ### Warning: Not parsing JavaScript templates/de/html/js/js_order_send.tpl. diff --git a/inc/functions.php b/inc/functions.php index f045a8c5a9..60e7da54cb 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1847,7 +1847,7 @@ function rebuildCache ($cache, $inc = '', $force = false) { // Include file given? if (!empty($inc)) { // Construct FQFN - $inc = sprintf("inc/loader/load_cache-%s.php", $inc); + $inc = sprintf("inc/loader/load-%s.php", $inc); // Is the include there? if (isIncludeReadable($inc)) { diff --git a/inc/load_cache.php b/inc/load_cache.php index b1a4e71ad7..9cb09371d9 100644 --- a/inc/load_cache.php +++ b/inc/load_cache.php @@ -54,13 +54,13 @@ $GLOBALS['cache_array']['always_active'] = array(); // Init & set the INC_POOL initIncludePool('cache'); -setIncludePool('cache', getArrayFromDirectory('inc/loader/', 'load_cache-')); +setIncludePool('cache', getArrayFromDirectory('inc/loader/', 'load-')); // Pre-load filter cacher -loadIncludeOnce('inc/loader/load_cache-filter.php'); +loadIncludeOnce('inc/loader/load-filter.php'); // Pre-load extensions cacher -loadIncludeOnce('inc/loader/load_cache-extension.php'); +loadIncludeOnce('inc/loader/load-extension.php'); // Load all includes loadIncludePool('cache'); diff --git a/inc/loader/load- b/inc/loader/load- new file mode 100644 index 0000000000..e8ce4032e5 --- /dev/null +++ b/inc/loader/load- @@ -0,0 +1,73 @@ +loadCacheFile('foo')) && ($GLOBALS['cache_instance']->extensionVersionMatches('foo'))) { + // Load cache + $GLOBALS['cache_array']['foo'] = $GLOBALS['cache_instance']->getArrayFromCache(); +} elseif (isHtmlMode()) { + // Create cache file + $GLOBALS['cache_instance']->init(); + + // Load every data from DB to cache file + $add = runFilterChain('sql_admin_extra_data'); + + // Query the database about this + $result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_foos` ORDER BY `some_bar` ASC', __FILE__, __LINE__); + while ($dummy = SQL_FETCHARRAY($result)) { + // Save row + $GLOBALS['cache_instance']->addRow($dummy); + } // END - while + + // Free memory + SQL_FREERESULT($result); + + // Close cache + $GLOBALS['cache_instance']->storeExtensionVersion('foo'); + $GLOBALS['cache_instance']->finalize(); +} + +// [EOF] +?> diff --git a/inc/loader/load-admins.php b/inc/loader/load-admins.php new file mode 100644 index 0000000000..32d73eef56 --- /dev/null +++ b/inc/loader/load-admins.php @@ -0,0 +1,140 @@ +loadCacheFile('admin')) && ($GLOBALS['cache_instance']->extensionVersionMatches('admins'))) { + // Load cache + $GLOBALS['cache_array']['admin'] = $GLOBALS['cache_instance']->getArrayFromCache(); + + // Check if valid + if ((isset($GLOBALS['cache_array']['admin']['login'])) && (is_array($GLOBALS['cache_array']['admin']['login'])) && (is_array($GLOBALS['cache_array']['admin']['admin_id']))) { + // Check count + if (count($GLOBALS['cache_array']['admin']['login']) == count($GLOBALS['cache_array']['admin']['admin_id'])) { + // Rewrite the cache + $admins = array(); + 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? + if ($key == 'admin_id') { + // Admin id, so use login + $admins[$key][$GLOBALS['cache_array']['admin']['login'][$idx]] = $entry[$idx]; + } else { + // Regular entry so use id + $admins[$key][$GLOBALS['cache_array']['admin']['admin_id'][$idx]] = $entry[$idx]; + } + } // END - foreach + } // END - foreach + + // Transfer back to cache array and remove dummy + $GLOBALS['cache_array']['admin'] = $admins; + unset($admins); + } else { + // Nope, cache file is corrupted! + $GLOBALS['cache_instance']->removeCacheFile(); + unset($GLOBALS['cache_array']['admin']); + } + } else { + // Nope, cache file is corrupted! + $GLOBALS['cache_instance']->removeCacheFile(); + unset($GLOBALS['cache_array']['admin']); + } +} elseif (isHtmlOutputMode()) { + // Create cache file + $GLOBALS['cache_instance']->init(); + + // Load every data from DB to cache file + $add = runFilterChain('sql_admin_extra_data'); + + // Query the database about this + $result_admins = 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)) { + // Save row + $GLOBALS['cache_instance']->addRow($dummy); + } // END - while + + // Free memory + SQL_FREERESULT($result_admins); + + // Close cache + $GLOBALS['cache_instance']->storeExtensionVersion('admins'); + $GLOBALS['cache_instance']->finalize(); +} + +// Next cached table are the admins_acls... +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 + $GLOBALS['cache_array']['admin_acls'] = $GLOBALS['cache_instance']->getArrayFromCache(); + } 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__); + + // Add all rows + while ($content = SQL_FETCHARRAY($result)) { + // Add row to cache file + $GLOBALS['cache_instance']->addRow($content); + } // END - while + + // Free memory + SQL_FREERESULT($result); + + // Close cache + $GLOBALS['cache_instance']->storeExtensionVersion('admins'); + $GLOBALS['cache_instance']->finalize(); + } +} // END - if + +// [EOF] +?> diff --git a/inc/loader/load-config.php b/inc/loader/load-config.php new file mode 100644 index 0000000000..169b9a3343 --- /dev/null +++ b/inc/loader/load-config.php @@ -0,0 +1,81 @@ +loadCacheFile('config')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) { + // Load config from cache + $config = $GLOBALS['cache_instance']->getArrayFromCache(); + + // Swap cache + foreach ($config as $entry => $array) { + // All config levels + foreach ($array as $key => $value) { + $GLOBALS['cache_array']['config'][$key][$entry] = $value; + } // END - foreach + } // END - foreach + + // Remove dummy array + unset($config); +} elseif (isHtmlOutputMode()) { + // Create cache file here + $GLOBALS['cache_instance']->init(); + + // Load all modules and their data + $result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_config` ORDER BY `config` ASC', __FILE__, __LINE__); + while ($content = SQL_FETCHARRAY($result)) { + // Add row to cache file + $GLOBALS['cache_instance']->addRow($content); + } // END - while + + // Free memory + SQL_FREERESULT($result); + + // Close the cache + $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches'); + $GLOBALS['cache_instance']->finalize(); +} + +// [EOF] +?> diff --git a/inc/loader/load-extensions.php b/inc/loader/load-extensions.php new file mode 100644 index 0000000000..ed6443dc51 --- /dev/null +++ b/inc/loader/load-extensions.php @@ -0,0 +1,187 @@ +loadCacheFile('extension')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) { + // Load extension from cache + $EXT_DUMMY = $GLOBALS['cache_instance']->getArrayFromCache(); + + // Init extension inc-pool + $EXT_POOL = array(); + + // Do we have entries? + if (count($EXT_DUMMY) > 0) { + // Init arrays + $EXT_NAMES = array(); + + // Loop through all + foreach ($EXT_DUMMY['ext_name'] as $k => $name) { + // Load CSS file + if ($EXT_DUMMY['ext_css'][$k] == 'Y') addExtensionCssFile($name . '.css'); + + // Load extension file itself + if (($EXT_DUMMY['ext_active'][$k] == 'Y') || ($EXT_DUMMY['ext_keep'][$k] == 'Y')) { + $EXT_POOL[] = $name; + } // END - if + + // Version number + $EXT_DUMMY['ext_version'][$name] = $EXT_DUMMY['ext_version'][$k]; + unset($EXT_DUMMY['ext_version'][$k]); + + // Extension is active + $EXT_DUMMY['ext_active'][$name] = $EXT_DUMMY['ext_active'][$k]; + unset($EXT_DUMMY['ext_active'][$k]); + + // Ext menu + $EXT_DUMMY['ext_menu'][$name] = $EXT_DUMMY['ext_menu'][$k]; + unset($EXT_DUMMY['ext_menu'][$k]); + + // Language file + $EXT_DUMMY['ext_lang'][$name] = $EXT_DUMMY['ext_lang'][$k]; + unset($EXT_DUMMY['ext_lang'][$k]); + + // Functions file + $EXT_DUMMY['ext_func'][$name] = $EXT_DUMMY['ext_func'][$k]; + unset($EXT_DUMMY['ext_func'][$k]); + + // Extension id + $EXT_DUMMY['ext_id'][$name] = $EXT_DUMMY['ext_id'][$k]; + $id = $EXT_DUMMY['ext_id'][$name]; + unset($EXT_DUMMY['ext_id'][$k]); + + // Add ext name + $EXT_NAMES[$id] = $name; + + // Add deprecated flag (defaults to 'not deprecated') + $EXT_DUMMY['ext_deprecated'][$name] = 'N'; + + // Mark it as active extension + $GLOBALS['cache_array']['always_active'][$name] = $EXT_DUMMY['ext_keep'][$k]; + unset($EXT_DUMMY['ext_keep'][$k]); + + // Remove unneccessary data from memory + unset($EXT_DUMMY['ext_css'][$k]); + } // END - foreach + + // Write dummy array back + $EXT_DUMMY['ext_name'] = $EXT_NAMES; + unset($EXT_NAMES); + + // Loading cache is done so let's free some memory! + unset($EXT_DUMMY['ext_keep']); + unset($EXT_DUMMY['ext_css']); + } // END - if + + // Transfer dummy array + $GLOBALS['cache_array']['extension'] = $EXT_DUMMY; + unset($EXT_DUMMY); + + // No database load needed + $res_ext_crt = false; + + // Load all extension files in test-mode (we initialize them later) + foreach ($EXT_POOL as $ext) { + loadExtension($ext, 'test'); + } // END - foreach + + // Remove array and mark cache as loaded + unset($EXT_POOL); +} elseif (isHtmlOutputMode()) { + // Create cache file here + $GLOBALS['cache_instance']->init(); + + // Add more if sql_patches is recent enougth + $add = ''; + if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) $add = ", `ext_has_css` AS ext_css"; + + // Load all modules and their data + $result = SQL_QUERY('SELECT `id` AS ext_id, `ext_name`, `ext_active`, `ext_version`'.$add.' FROM `{?_MYSQL_PREFIX?}_extensions` ORDER BY `ext_name` ASC', __FILE__, __LINE__); + while ($content = SQL_FETCHARRAY($result)) { + // Load extension + loadExtension($content['ext_name'], 'test'); + + // Get menu entry + $content['ext_menu'] = 'N'; + if (ifModuleHasMenu($content['ext_name'], true)) { + // Extension is a module and has menu... pew! + $content['ext_menu'] = 'Y'; + } // END - if + + // Get language entry + $content['ext_lang'] = 'N'; + if (isLanguageIncludeReadable($content['ext_name'])) { + // Readable + $content['ext_lang'] = 'Y'; + } // END - if + + // Get function entry + $content['ext_func'] = 'N'; + if (isExtensionFunctionFileReadable($content['ext_name'])) { + // Readable + $content['ext_func'] = 'Y'; + } // END - if + + // Transfer EXT_ALWAYS_ACTIVE flag + $content['ext_keep'] = getExtensionAlwaysActive(); + + // Fix missing ext_css + if (!isset($content['ext_css'])) $content['ext_css'] = 'N'; + + // Add row to cache file + $GLOBALS['cache_instance']->addRow($content); + } // END - while + + // Free memory + SQL_FREERESULT($result); + + // Close the cache + $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches'); + $GLOBALS['cache_instance']->finalize(); +} + +// [EOF] +?> diff --git a/inc/loader/load-filter.php b/inc/loader/load-filter.php new file mode 100644 index 0000000000..476f5f7071 --- /dev/null +++ b/inc/loader/load-filter.php @@ -0,0 +1,73 @@ +loadCacheFile('filter')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) { + // Load filter from cache + $GLOBALS['cache_array']['filter'] = $GLOBALS['cache_instance']->getArrayFromCache(); + + // Prepare the array here + prepareFilterArray(); +} elseif ((isHtmlOutputMode()) && (isExtensionInstalled('sql_patches'))) { + // Create cache file here + $GLOBALS['cache_instance']->init(); + + // Load all modules and their data + $result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_filters` ORDER BY `filter_name` ASC, `filter_id` ASC', __FILE__, __LINE__); + while ($content = SQL_FETCHARRAY($result)) { + // Add row to cache file + $GLOBALS['cache_instance']->addRow($content); + } // END - while + + // Free memory + SQL_FREERESULT($result); + + // Close the cache + $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches'); + $GLOBALS['cache_instance']->finalize(); +} + +// [EOF] +?> diff --git a/inc/loader/load-imprint.php b/inc/loader/load-imprint.php new file mode 100644 index 0000000000..afe48efd88 --- /dev/null +++ b/inc/loader/load-imprint.php @@ -0,0 +1,76 @@ +loadCacheFile('imprint')) && ($GLOBALS['cache_instance']->extensionVersionMatches('imprint'))) { + // Load cache + $GLOBALS['cache_array']['imprint'] = $GLOBALS['cache_instance']->getArrayFromCache(); +} elseif (isHtmlOutputMode()) { + // Create cache file + $GLOBALS['cache_instance']->init(); + + // Load every data from DB to cache file + $add = runFilterChain('sql_admin_extra_data'); + + // Query the database about this + $result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_imprint_data` ORDER BY `imprint_id` ASC', __FILE__, __LINE__); + while ($dummy = SQL_FETCHARRAY($result)) { + // Save row + $GLOBALS['cache_instance']->addRow($dummy); + } // END - while + + // Free memory + SQL_FREERESULT($result); + + // Close cache + $GLOBALS['cache_instance']->storeExtensionVersion('imprint'); + $GLOBALS['cache_instance']->finalize(); +} + +// [EOF] +?> diff --git a/inc/loader/load-modules.php b/inc/loader/load-modules.php new file mode 100644 index 0000000000..2cb56fa01f --- /dev/null +++ b/inc/loader/load-modules.php @@ -0,0 +1,125 @@ +loadCacheFile('modules')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) { + // Load cache + $GLOBALS['cache_array']['modules'] = $GLOBALS['cache_instance']->getArrayFromCache(); + + // Rewrite module cache + $modArray = $GLOBALS['cache_array']['modules']; + + // Do only process valid arrays + if (!isset($modArray['module'])) { + // We should fix this! + debug_report_bug(__FILE__, __LINE__, 'modArray=
'.print_r($modArray, true).'
'); + } // END - if + + // Rewrite some parts + foreach ($modArray['module'] as $key => $mod) { + // Default without sql_patches + $entries = array('id','title','locked','hidden','admin_only','mem_only'); + + // Is ext-sql_patches newer or equal 0.3.6? + if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) { + // Add 'has_menu' + $entries[] = 'has_menu'; + } // END - if + + // Add all + foreach ($entries as $entry) { + // Is the entry set? + if (isset($GLOBALS['cache_array']['modules'][$entry][$key])) { + // Transfer it + $GLOBALS['cache_array']['modules'][$entry][$mod] = $modArray[$entry][$key]; + + // And delete cache + unset($GLOBALS['cache_array']['modules'][$entry][$key]); + } else { + // Log this for debug purposes + logDebugMessage(basename(__FILE__), __LINE__, 'Entry not found. module=' . $mod . ',key=' . $key . ',entry=' . $entry); + } + } // END - foreach + } // END - foreach + unset($modArray); +} elseif (isHtmlOutputMode()) { + // Create cache file here + $GLOBALS['cache_instance']->init(); + + // Load all modules and their data + if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) { + // Load has_menu + $result = SQL_QUERY('SELECT + `id`, `module`, `title`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`, `has_menu` +FROM + `{?_MYSQL_PREFIX?}_mod_reg` +ORDER BY + `module` ASC', __FILE__, __LINE__); + } else { + // Don't load has_menu + $result = SQL_QUERY('SELECT + `id`, `module`, `title`, `locked`, `hidden`, `admin_only`, `title`, `mem_only` +FROM + `{?_MYSQL_PREFIX?}_mod_reg` +ORDER BY + `module` ASC', __FILE__, __LINE__); + } + + // Cache all data + while ($content = SQL_FETCHARRAY($result)) { + // Add row to cache file + $GLOBALS['cache_instance']->addRow($content); + } // END - while + + // Free memory + SQL_FREERESULT($result); + + // Close the cache + $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches'); + $GLOBALS['cache_instance']->finalize(); +} + +// [EOF] +?> diff --git a/inc/loader/load-refdepths.php b/inc/loader/load-refdepths.php new file mode 100644 index 0000000000..fe4154c063 --- /dev/null +++ b/inc/loader/load-refdepths.php @@ -0,0 +1,70 @@ +loadCacheFile('refdepths')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) { + // Load referal system from cache + $GLOBALS['cache_array']['refdepths'] = $GLOBALS['cache_instance']->getArrayFromCache(); +} elseif (isHtmlOutputMode()) { + // Create cache file here + $GLOBALS['cache_instance']->init(); + + // Load all modules and their data + $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 + $GLOBALS['cache_instance']->addRow($content); + } // END - while + + // Free memory + SQL_FREERESULT($result); + + // Close the cache + $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches'); + $GLOBALS['cache_instance']->finalize(); +} + +// [EOF] +?> diff --git a/inc/loader/load-refsystem.php b/inc/loader/load-refsystem.php new file mode 100644 index 0000000000..ef1b798627 --- /dev/null +++ b/inc/loader/load-refsystem.php @@ -0,0 +1,70 @@ +loadCacheFile('refsystem')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) { + // Load referal system from cache + $GLOBALS['cache_array']['refsystem'] = $GLOBALS['cache_instance']->getArrayFromCache(); +} elseif (isHtmlOutputMode()) { + // Create cache file here + $GLOBALS['cache_instance']->init(); + + // Load all modules and their data + $result = SQL_QUERY('SELECT `id`, `userid`, `level`, `counter` FROM `{?_MYSQL_PREFIX?}_refsystem` ORDER BY `userid` ASC, `level` ASC', __FILE__, __LINE__); + while ($content = SQL_FETCHARRAY($result)) { + // Add row to cache file + $GLOBALS['cache_instance']->addRow($content); + } // END - while + + // Free memory + SQL_FREERESULT($result); + + // Close the cache + $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches'); + $GLOBALS['cache_instance']->finalize(); +} + +// [EOF] +?> diff --git a/inc/loader/load-revision.php b/inc/loader/load-revision.php new file mode 100644 index 0000000000..58ad516d4c --- /dev/null +++ b/inc/loader/load-revision.php @@ -0,0 +1,68 @@ +loadCacheFile('revision')) { + // Load revision from cache + $GLOBALS['cache_array']['revision'] = $GLOBALS['cache_instance']->getArrayFromCache(); +} elseif ((isHtmlOutputMode())) { + // Create cache file here + $GLOBALS['cache_instance']->init(); + + // add the new RevInfos in and saves it to the cache + $GLOBALS['cache_instance']->addRow(getArrayFromRepositoryData()); + + // Close the cache + $GLOBALS['cache_instance']->finalize(); + + // Generate FQFN for old revision file + $FQFN = sprintf("%s/.revision", getCachePath()); + + // Is it there? + if (isFileReadable($FQFN)) { + // Then remove it + removeFile($FQFN); + } // END - if +} + +// [EOF] +?> diff --git a/inc/loader/load-themes.php b/inc/loader/load-themes.php new file mode 100644 index 0000000000..033b686678 --- /dev/null +++ b/inc/loader/load-themes.php @@ -0,0 +1,97 @@ +loadCacheFile('themes')) && ($GLOBALS['cache_instance']->extensionVersionMatches('theme'))) { + // Load referal system from cache + $cache = $GLOBALS['cache_instance']->getArrayFromCache(); + + // Restructure the array + $GLOBALS['cache_array']['themes'] = array(); + 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 ($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 ($content as $id => $entry) { + $GLOBALS['cache_array']['themes'][$key][$cache['theme_path'][$id]] = $entry; + } // END - foreach + } + } // END - foreach + + // Remove dummy array + unset($cache); +} elseif (isHtmlOutputMode()) { + // Create cache file here + $GLOBALS['cache_instance']->init(); + + // Load all themes and their data + if (isExtensionInstalledAndNewer('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__); + } + while ($content = SQL_FETCHARRAY($result)) { + // Add row to cache file + $GLOBALS['cache_instance']->addRow($content); + } // END - while + + // Free memory + SQL_FREERESULT($result); + + // Close the cache + $GLOBALS['cache_instance']->storeExtensionVersion('theme'); + $GLOBALS['cache_instance']->finalize(); +} + +// [EOF] +?> diff --git a/inc/loader/load_cache- b/inc/loader/load_cache- index e8ce4032e5..f551ef47b7 100644 --- a/inc/loader/load_cache- +++ b/inc/loader/load_cache- @@ -1,73 +1,3 @@ loadCacheFile('foo')) && ($GLOBALS['cache_instance']->extensionVersionMatches('foo'))) { - // Load cache - $GLOBALS['cache_array']['foo'] = $GLOBALS['cache_instance']->getArrayFromCache(); -} elseif (isHtmlMode()) { - // Create cache file - $GLOBALS['cache_instance']->init(); - - // Load every data from DB to cache file - $add = runFilterChain('sql_admin_extra_data'); - - // Query the database about this - $result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_foos` ORDER BY `some_bar` ASC', __FILE__, __LINE__); - while ($dummy = SQL_FETCHARRAY($result)) { - // Save row - $GLOBALS['cache_instance']->addRow($dummy); - } // END - while - - // Free memory - SQL_FREERESULT($result); - - // Close cache - $GLOBALS['cache_instance']->storeExtensionVersion('foo'); - $GLOBALS['cache_instance']->finalize(); -} - -// [EOF] +// @DEPRECATED ?> diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php index 5c94bb3ca6..f551ef47b7 100644 --- a/inc/loader/load_cache-admin.php +++ b/inc/loader/load_cache-admin.php @@ -1,140 +1,3 @@ loadCacheFile('admin')) && ($GLOBALS['cache_instance']->extensionVersionMatches('admins'))) { - // Load cache - $GLOBALS['cache_array']['admin'] = $GLOBALS['cache_instance']->getArrayFromCache(); - - // Check if valid - if ((isset($GLOBALS['cache_array']['admin']['login'])) && (is_array($GLOBALS['cache_array']['admin']['login'])) && (is_array($GLOBALS['cache_array']['admin']['admin_id']))) { - // Check count - if (count($GLOBALS['cache_array']['admin']['login']) == count($GLOBALS['cache_array']['admin']['admin_id'])) { - // Rewrite the cache - $admins = array(); - 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? - if ($key == 'admin_id') { - // Admin id, so use login - $admins[$key][$GLOBALS['cache_array']['admin']['login'][$idx]] = $entry[$idx]; - } else { - // Regular entry so use id - $admins[$key][$GLOBALS['cache_array']['admin']['admin_id'][$idx]] = $entry[$idx]; - } - } // END - foreach - } // END - foreach - - // Transfer back to cache array and remove dummy - $GLOBALS['cache_array']['admin'] = $admins; - unset($admins); - } else { - // Nope, cache file is corrupted! - $GLOBALS['cache_instance']->removeCacheFile(); - unset($GLOBALS['cache_array']['admin']); - } - } else { - // Nope, cache file is corrupted! - $GLOBALS['cache_instance']->removeCacheFile(); - unset($GLOBALS['cache_array']['admin']); - } -} elseif (isHtmlOutputMode()) { - // Create cache file - $GLOBALS['cache_instance']->init(); - - // Load every data from DB to cache file - $add = runFilterChain('sql_admin_extra_data'); - - // Query the database about this - $result_admins = 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)) { - // Save row - $GLOBALS['cache_instance']->addRow($dummy); - } // END - while - - // Free memory - SQL_FREERESULT($result_admins); - - // Close cache - $GLOBALS['cache_instance']->storeExtensionVersion('admins'); - $GLOBALS['cache_instance']->finalize(); -} - -// Next cached table are the admins_acls... -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 - $GLOBALS['cache_array']['admin_acls'] = $GLOBALS['cache_instance']->getArrayFromCache(); - } 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__); - - // Add all rows - while ($content = SQL_FETCHARRAY($result)) { - // Add row to cache file - $GLOBALS['cache_instance']->addRow($content); - } // END - while - - // Free memory - SQL_FREERESULT($result); - - // Close cache - $GLOBALS['cache_instance']->storeExtensionVersion('admins'); - $GLOBALS['cache_instance']->finalize(); - } -} // END - if - -// [EOF] +// @DEPRECATED ?> diff --git a/inc/loader/load_cache-config.php b/inc/loader/load_cache-config.php index 1bf71bbc64..f551ef47b7 100644 --- a/inc/loader/load_cache-config.php +++ b/inc/loader/load_cache-config.php @@ -1,81 +1,3 @@ loadCacheFile('config')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) { - // Load config from cache - $config = $GLOBALS['cache_instance']->getArrayFromCache(); - - // Swap cache - foreach ($config as $entry => $array) { - // All config levels - foreach ($array as $key => $value) { - $GLOBALS['cache_array']['config'][$key][$entry] = $value; - } // END - foreach - } // END - foreach - - // Remove dummy array - unset($config); -} elseif (isHtmlOutputMode()) { - // Create cache file here - $GLOBALS['cache_instance']->init(); - - // Load all modules and their data - $result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_config` ORDER BY `config` ASC', __FILE__, __LINE__); - while ($content = SQL_FETCHARRAY($result)) { - // Add row to cache file - $GLOBALS['cache_instance']->addRow($content); - } // END - while - - // Free memory - SQL_FREERESULT($result); - - // Close the cache - $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches'); - $GLOBALS['cache_instance']->finalize(); -} - -// [EOF] +// @DEPRECATED ?> diff --git a/inc/loader/load_cache-extension.php b/inc/loader/load_cache-extension.php index d288f7827d..f551ef47b7 100644 --- a/inc/loader/load_cache-extension.php +++ b/inc/loader/load_cache-extension.php @@ -1,187 +1,3 @@ loadCacheFile('extension')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) { - // Load extension from cache - $EXT_DUMMY = $GLOBALS['cache_instance']->getArrayFromCache(); - - // Init extension inc-pool - $EXT_POOL = array(); - - // Do we have entries? - if (count($EXT_DUMMY) > 0) { - // Init arrays - $EXT_NAMES = array(); - - // Loop through all - foreach ($EXT_DUMMY['ext_name'] as $k => $name) { - // Load CSS file - if ($EXT_DUMMY['ext_css'][$k] == 'Y') addExtensionCssFile($name . '.css'); - - // Load extension file itself - if (($EXT_DUMMY['ext_active'][$k] == 'Y') || ($EXT_DUMMY['ext_keep'][$k] == 'Y')) { - $EXT_POOL[] = $name; - } // END - if - - // Version number - $EXT_DUMMY['ext_version'][$name] = $EXT_DUMMY['ext_version'][$k]; - unset($EXT_DUMMY['ext_version'][$k]); - - // Extension is active - $EXT_DUMMY['ext_active'][$name] = $EXT_DUMMY['ext_active'][$k]; - unset($EXT_DUMMY['ext_active'][$k]); - - // Ext menu - $EXT_DUMMY['ext_menu'][$name] = $EXT_DUMMY['ext_menu'][$k]; - unset($EXT_DUMMY['ext_menu'][$k]); - - // Language file - $EXT_DUMMY['ext_lang'][$name] = $EXT_DUMMY['ext_lang'][$k]; - unset($EXT_DUMMY['ext_lang'][$k]); - - // Functions file - $EXT_DUMMY['ext_func'][$name] = $EXT_DUMMY['ext_func'][$k]; - unset($EXT_DUMMY['ext_func'][$k]); - - // Extension id - $EXT_DUMMY['ext_id'][$name] = $EXT_DUMMY['ext_id'][$k]; - $id = $EXT_DUMMY['ext_id'][$name]; - unset($EXT_DUMMY['ext_id'][$k]); - - // Add ext name - $EXT_NAMES[$id] = $name; - - // Add deprecated flag (defaults to 'not deprecated') - $EXT_DUMMY['ext_deprecated'][$name] = 'N'; - - // Mark it as active extension - $GLOBALS['cache_array']['always_active'][$name] = $EXT_DUMMY['ext_keep'][$k]; - unset($EXT_DUMMY['ext_keep'][$k]); - - // Remove unneccessary data from memory - unset($EXT_DUMMY['ext_css'][$k]); - } // END - foreach - - // Write dummy array back - $EXT_DUMMY['ext_name'] = $EXT_NAMES; - unset($EXT_NAMES); - - // Loading cache is done so let's free some memory! - unset($EXT_DUMMY['ext_keep']); - unset($EXT_DUMMY['ext_css']); - } // END - if - - // Transfer dummy array - $GLOBALS['cache_array']['extension'] = $EXT_DUMMY; - unset($EXT_DUMMY); - - // No database load needed - $res_ext_crt = false; - - // Load all extension files in test-mode (we initialize them later) - foreach ($EXT_POOL as $ext) { - loadExtension($ext, 'test'); - } // END - foreach - - // Remove array and mark cache as loaded - unset($EXT_POOL); -} elseif (isHtmlOutputMode()) { - // Create cache file here - $GLOBALS['cache_instance']->init(); - - // Add more if sql_patches is recent enougth - $add = ''; - if (isExtensionInstalledAndNewer('sql_patches', '0.0.6')) $add = ", `ext_has_css` AS ext_css"; - - // Load all modules and their data - $result = SQL_QUERY('SELECT `id` AS ext_id, `ext_name`, `ext_active`, `ext_version`'.$add.' FROM `{?_MYSQL_PREFIX?}_extensions` ORDER BY `ext_name` ASC', __FILE__, __LINE__); - while ($content = SQL_FETCHARRAY($result)) { - // Load extension - loadExtension($content['ext_name'], 'test'); - - // Get menu entry - $content['ext_menu'] = 'N'; - if (ifModuleHasMenu($content['ext_name'], true)) { - // Extension is a module and has menu... pew! - $content['ext_menu'] = 'Y'; - } // END - if - - // Get language entry - $content['ext_lang'] = 'N'; - if (isLanguageIncludeReadable($content['ext_name'])) { - // Readable - $content['ext_lang'] = 'Y'; - } // END - if - - // Get function entry - $content['ext_func'] = 'N'; - if (isExtensionFunctionFileReadable($content['ext_name'])) { - // Readable - $content['ext_func'] = 'Y'; - } // END - if - - // Transfer EXT_ALWAYS_ACTIVE flag - $content['ext_keep'] = getExtensionAlwaysActive(); - - // Fix missing ext_css - if (!isset($content['ext_css'])) $content['ext_css'] = 'N'; - - // Add row to cache file - $GLOBALS['cache_instance']->addRow($content); - } // END - while - - // Free memory - SQL_FREERESULT($result); - - // Close the cache - $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches'); - $GLOBALS['cache_instance']->finalize(); -} - -// [EOF] +// @DEPRECATED ?> diff --git a/inc/loader/load_cache-filter.php b/inc/loader/load_cache-filter.php index bbc358114a..f551ef47b7 100644 --- a/inc/loader/load_cache-filter.php +++ b/inc/loader/load_cache-filter.php @@ -1,73 +1,3 @@ loadCacheFile('filter')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) { - // Load filter from cache - $GLOBALS['cache_array']['filter'] = $GLOBALS['cache_instance']->getArrayFromCache(); - - // Prepare the array here - prepareFilterArray(); -} elseif ((isHtmlOutputMode()) && (isExtensionInstalled('sql_patches'))) { - // Create cache file here - $GLOBALS['cache_instance']->init(); - - // Load all modules and their data - $result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_filters` ORDER BY `filter_name` ASC, `filter_id` ASC', __FILE__, __LINE__); - while ($content = SQL_FETCHARRAY($result)) { - // Add row to cache file - $GLOBALS['cache_instance']->addRow($content); - } // END - while - - // Free memory - SQL_FREERESULT($result); - - // Close the cache - $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches'); - $GLOBALS['cache_instance']->finalize(); -} - -// [EOF] +// @DEPRECATED ?> diff --git a/inc/loader/load_cache-impressum.php b/inc/loader/load_cache-impressum.php index 34e9cb046d..f551ef47b7 100644 --- a/inc/loader/load_cache-impressum.php +++ b/inc/loader/load_cache-impressum.php @@ -1,76 +1,3 @@ loadCacheFile('imprint')) && ($GLOBALS['cache_instance']->extensionVersionMatches('imprint'))) { - // Load cache - $GLOBALS['cache_array']['imprint'] = $GLOBALS['cache_instance']->getArrayFromCache(); -} elseif (isHtmlOutputMode()) { - // Create cache file - $GLOBALS['cache_instance']->init(); - - // Load every data from DB to cache file - $add = runFilterChain('sql_admin_extra_data'); - - // Query the database about this - $result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_imprint_data` ORDER BY `imprint_id` ASC', __FILE__, __LINE__); - while ($dummy = SQL_FETCHARRAY($result)) { - // Save row - $GLOBALS['cache_instance']->addRow($dummy); - } // END - while - - // Free memory - SQL_FREERESULT($result); - - // Close cache - $GLOBALS['cache_instance']->storeExtensionVersion('imprint'); - $GLOBALS['cache_instance']->finalize(); -} - -// [EOF] +// @DEPRECATED ?> diff --git a/inc/loader/load_cache-modules.php b/inc/loader/load_cache-modules.php index 64a99d3f8b..f551ef47b7 100644 --- a/inc/loader/load_cache-modules.php +++ b/inc/loader/load_cache-modules.php @@ -1,125 +1,3 @@ loadCacheFile('modules')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) { - // Load cache - $GLOBALS['cache_array']['modules'] = $GLOBALS['cache_instance']->getArrayFromCache(); - - // Rewrite module cache - $modArray = $GLOBALS['cache_array']['modules']; - - // Do only process valid arrays - if (!isset($modArray['module'])) { - // We should fix this! - debug_report_bug(__FILE__, __LINE__, 'modArray=
'.print_r($modArray, true).'
'); - } // END - if - - // Rewrite some parts - foreach ($modArray['module'] as $key => $mod) { - // Default without sql_patches - $entries = array('id','title','locked','hidden','admin_only','mem_only'); - - // Is ext-sql_patches newer or equal 0.3.6? - if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) { - // Add 'has_menu' - $entries[] = 'has_menu'; - } // END - if - - // Add all - foreach ($entries as $entry) { - // Is the entry set? - if (isset($GLOBALS['cache_array']['modules'][$entry][$key])) { - // Transfer it - $GLOBALS['cache_array']['modules'][$entry][$mod] = $modArray[$entry][$key]; - - // And delete cache - unset($GLOBALS['cache_array']['modules'][$entry][$key]); - } else { - // Log this for debug purposes - logDebugMessage(basename(__FILE__), __LINE__, 'Entry not found. module=' . $mod . ',key=' . $key . ',entry=' . $entry); - } - } // END - foreach - } // END - foreach - unset($modArray); -} elseif (isHtmlOutputMode()) { - // Create cache file here - $GLOBALS['cache_instance']->init(); - - // Load all modules and their data - if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) { - // Load has_menu - $result = SQL_QUERY('SELECT - `id`, `module`, `title`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`, `has_menu` -FROM - `{?_MYSQL_PREFIX?}_mod_reg` -ORDER BY - `module` ASC', __FILE__, __LINE__); - } else { - // Don't load has_menu - $result = SQL_QUERY('SELECT - `id`, `module`, `title`, `locked`, `hidden`, `admin_only`, `title`, `mem_only` -FROM - `{?_MYSQL_PREFIX?}_mod_reg` -ORDER BY - `module` ASC', __FILE__, __LINE__); - } - - // Cache all data - while ($content = SQL_FETCHARRAY($result)) { - // Add row to cache file - $GLOBALS['cache_instance']->addRow($content); - } // END - while - - // Free memory - SQL_FREERESULT($result); - - // Close the cache - $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches'); - $GLOBALS['cache_instance']->finalize(); -} - -// [EOF] +// @DEPRECATED ?> diff --git a/inc/loader/load_cache-refdepths.php b/inc/loader/load_cache-refdepths.php index d13995f2df..f551ef47b7 100644 --- a/inc/loader/load_cache-refdepths.php +++ b/inc/loader/load_cache-refdepths.php @@ -1,70 +1,3 @@ loadCacheFile('refdepths')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) { - // Load referal system from cache - $GLOBALS['cache_array']['refdepths'] = $GLOBALS['cache_instance']->getArrayFromCache(); -} elseif (isHtmlOutputMode()) { - // Create cache file here - $GLOBALS['cache_instance']->init(); - - // Load all modules and their data - $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 - $GLOBALS['cache_instance']->addRow($content); - } // END - while - - // Free memory - SQL_FREERESULT($result); - - // Close the cache - $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches'); - $GLOBALS['cache_instance']->finalize(); -} - -// [EOF] +// @DEPRECATED ?> diff --git a/inc/loader/load_cache-refsystem.php b/inc/loader/load_cache-refsystem.php index b73baceca3..f551ef47b7 100644 --- a/inc/loader/load_cache-refsystem.php +++ b/inc/loader/load_cache-refsystem.php @@ -1,70 +1,3 @@ loadCacheFile('refsystem')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) { - // Load referal system from cache - $GLOBALS['cache_array']['refsystem'] = $GLOBALS['cache_instance']->getArrayFromCache(); -} elseif (isHtmlOutputMode()) { - // Create cache file here - $GLOBALS['cache_instance']->init(); - - // Load all modules and their data - $result = SQL_QUERY('SELECT `id`, `userid`, `level`, `counter` FROM `{?_MYSQL_PREFIX?}_refsystem` ORDER BY `userid` ASC, `level` ASC', __FILE__, __LINE__); - while ($content = SQL_FETCHARRAY($result)) { - // Add row to cache file - $GLOBALS['cache_instance']->addRow($content); - } // END - while - - // Free memory - SQL_FREERESULT($result); - - // Close the cache - $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches'); - $GLOBALS['cache_instance']->finalize(); -} - -// [EOF] +// @DEPRECATED ?> diff --git a/inc/loader/load_cache-revision.php b/inc/loader/load_cache-revision.php index d15d410c30..f551ef47b7 100644 --- a/inc/loader/load_cache-revision.php +++ b/inc/loader/load_cache-revision.php @@ -1,68 +1,3 @@ loadCacheFile('revision')) { - // Load revision from cache - $GLOBALS['cache_array']['revision'] = $GLOBALS['cache_instance']->getArrayFromCache(); -} elseif ((isHtmlOutputMode())) { - // Create cache file here - $GLOBALS['cache_instance']->init(); - - // add the new RevInfos in and saves it to the cache - $GLOBALS['cache_instance']->addRow(getArrayFromRepositoryData()); - - // Close the cache - $GLOBALS['cache_instance']->finalize(); - - // Generate FQFN for old revision file - $FQFN = sprintf("%s/.revision", getCachePath()); - - // Is it there? - if (isFileReadable($FQFN)) { - // Then remove it - removeFile($FQFN); - } // END - if -} - -// [EOF] +// @DEPRECATED ?> diff --git a/inc/loader/load_cache-them.php b/inc/loader/load_cache-them.php index a6eb3cb4a7..f551ef47b7 100644 --- a/inc/loader/load_cache-them.php +++ b/inc/loader/load_cache-them.php @@ -1,97 +1,3 @@ loadCacheFile('themes')) && ($GLOBALS['cache_instance']->extensionVersionMatches('theme'))) { - // Load referal system from cache - $cache = $GLOBALS['cache_instance']->getArrayFromCache(); - - // Restructure the array - $GLOBALS['cache_array']['themes'] = array(); - 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 ($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 ($content as $id => $entry) { - $GLOBALS['cache_array']['themes'][$key][$cache['theme_path'][$id]] = $entry; - } // END - foreach - } - } // END - foreach - - // Remove dummy array - unset($cache); -} elseif (isHtmlOutputMode()) { - // Create cache file here - $GLOBALS['cache_instance']->init(); - - // Load all themes and their data - if (isExtensionInstalledAndNewer('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__); - } - while ($content = SQL_FETCHARRAY($result)) { - // Add row to cache file - $GLOBALS['cache_instance']->addRow($content); - } // END - while - - // Free memory - SQL_FREERESULT($result); - - // Close the cache - $GLOBALS['cache_instance']->storeExtensionVersion('theme'); - $GLOBALS['cache_instance']->finalize(); -} - -// [EOF] +// @DEPRECATED ?>