'. t("The normal cache mode is suitable for most sites and does not cause any side effects. The aggressive cache mode causes Drupal to skip the loading (boot) and unloading (exit) of enabled modules when serving a cached page. This results in an additional performance boost but can cause unwanted side effects.") .'
'; - $problem_modules = array_unique(array_merge(module_implements('boot'), module_implements('exit'))); - sort($problem_modules); - if (count($problem_modules) > 0) { - $description_core .= ''. t('The following enabled modules are incompatible with aggressive mode caching and will probably not function properly: %modules', array('%modules' => implode(', ', $problem_modules))) .'.
'; + $form['#title'] = t('Anonymous page caching'); + $form['page_compression']['#title'] = t('Gzip page compression (Boost & Core)'); + $form['#description'] = t('Enabling the page cache will offer a significant performance boost. Drupal can store and send compressed cached pages requested by anonymous users. By caching the first request to the page, Drupal does not have to construct the page each time it is viewed. The page must first be visited by an anonymous user in order for the cache to work on subsequent requests for that page. Boost & Core caching do not work for logged in users.'); + $form['boost_core_clear'] = array( + '#type' => 'submit', + '#value' => t('Clear core page cached data: !count pages', array('!count' => boost_count_core_db())), + '#submit' => array('boost_clear_core_page_cache_submit'), + ); + + return $form; +} + +/** + * Process system_themes_form form submissions. + */ +function boost_admin_performance_page_submit($form, &$form_state) { + variable_del('boost_previously'); + extract($form_state['values'], EXTR_SKIP | EXTR_REFS); + + if (empty($boost_enabled) && !empty($boost_previously)) { // the cache was previously enabled + variable_set('boost_ignore_flush', 0); + if (boost_cache_clear_all()) { + drupal_set_message(t('Boost: Static page cache cleared.')); + } + } + else if ($boost_ignore_flush == 0 && (variable_get('preprocess_css', FALSE)==TRUE || variable_get('preprocess_js', FALSE)==TRUE)) { + if (boost_cache_clear_all()) { + drupal_set_message(t('Boost: Static page cache cleared.'), 'warning'); + } + } +} + +/** + * Submit callback; clear system caches. + */ +function boost_admin_clear_cache_submit($form, &$form_state) { + drupal_flush_all_caches(); + if (boost_cache_clear_all()) { + drupal_set_message(t('Static page cache (boost) and all other caches cleared.')); } else { - $description_core .= ''. t('Currently, all enabled modules are compatible with the aggressive caching policy. Please note, if you use aggressive caching and enable new modules, you will need to check this page again to ensure compatibility.') .'
'; + drupal_set_message( + t('Boost: Static page cache NOT cleared. To clear Boosts cache set "Ignore cache flushing:" to \'Disabled\' in the boost advanced settings & try again.', array('@link' => url('admin/settings/performance/boost', array('fragment' => 'edit-boost-ignore-flush-0-wrapper')))), 'warning'); + drupal_set_message(t('All other caches cleared.')); } +} + +/** + * Form builder; Displays Boost's configuration page. + * + * @see system_settings_form() + * + * TODO: Cacheability settings use core code. Look at Blocks. + * http://drupal.org/node/337756 + */ +function boost_admin_boost_performance_page() { + Global $base_path; + $period = drupal_map_assoc(array(0, 60, 180, 300, 600, 900, 1800, 2700, 3600, 10800, 21600, 32400, 43200, 64800, 86400, 2*86400, 3*86400, 4*86400, 5*86400, 6*86400, 604800, 2*604800, 3*604800, 4*604800, 8*604800, 16*604800, 52*604800), 'format_interval'); $period[0] = '<' . t('none') . '>'; - // Take over the relevant existing settings - $form['page_compression']['#title'] = t('Gzip page compression (Boost & Core)'); - $form['boost'] = array( '#type' => 'fieldset', '#title' => t('Boost File Cache'), ); - // Inject Boost-specific settings $form['boost']['boost_enabled'] = array( '#type' => 'radios', '#title' => t('Boost - Static page cache'), @@ -108,84 +148,6 @@ function boost_admin_performance_page($f '#submit' => array('boost_clear_expired_cache_submit'), ); - // Alter core page cache settings. - $form['core'] = array( - '#type' => 'fieldset', - '#title' => t('Core Database Cache'), - ); - $form['core']['cache'] = array( - '#type' => 'radios', - '#title' => t('Core - Database page cache'), - '#default_value' => variable_get('cache', CACHE_DISABLED), - '#options' => array( - CACHE_DISABLED => t('Disabled'), - CACHE_NORMAL => t('Normal (recommended for production sites, no side effects)'), - CACHE_AGGRESSIVE => t('Aggressive (experts only, possible side effects)'), - ), - '#description' => t("If boost can not or will not cache the page, then the database will try to cache it. If boost can cache the page then it will not appear in the database cache. This is the standard Drupal cache.") . $description_core, - ); - $form['core']['cache_lifetime'] = array( - '#type' => 'select', - '#title' => t('Core - Default minimum cache lifetime'), - '#default_value' => variable_get('cache_lifetime', 0), - '#options' => $period, - '#description' => t('On high-traffic sites, it may be necessary to enforce a minimum cache lifetime. The minimum cache lifetime is the minimum amount of time that will elapse before the cache is emptied and recreated, and is applied to both page and block caches. A larger minimum cache lifetime offers better performance, but users will not see new content for a longer period of time.') - ); - $form['core']['boost_core_clear'] = array( - '#type' => 'submit', - '#value' => t('Clear core page cached data: !count pages', array('!count' => boost_count_core_db())), - '#submit' => array('boost_clear_core_page_cache_submit'), - ); - - return $form; -} - -/** - * Process system_themes_form form submissions. - */ -function boost_admin_performance_page_submit($form, &$form_state) { - variable_del('boost_previously'); - extract($form_state['values'], EXTR_SKIP | EXTR_REFS); - - if (empty($boost_enabled) && !empty($boost_previously)) { // the cache was previously enabled - variable_set('boost_ignore_flush', 0); - if (boost_cache_clear_all()) { - drupal_set_message(t('Boost: Static page cache cleared.')); - } - } - else if ($boost_ignore_flush == 0 && (variable_get('preprocess_css', FALSE)==TRUE || variable_get('preprocess_js', FALSE)==TRUE)) { - if (boost_cache_clear_all()) { - drupal_set_message(t('Boost: Static page cache cleared.'), 'warning'); - } - } -} - -/** - * Submit callback; clear system caches. - */ -function boost_admin_clear_cache_submit($form, &$form_state) { - drupal_flush_all_caches(); - if (boost_cache_clear_all()) { - drupal_set_message(t('Static page cache (boost) and all other caches cleared.')); - } - else { - drupal_set_message( - t('Boost: Static page cache NOT cleared. To clear Boosts cache set "Ignore cache flushing:" to \'Disabled\' in the boost advanced settings & try again.', array('@link' => url('admin/settings/performance/boost', array('fragment' => 'edit-boost-ignore-flush-0-wrapper')))), 'warning'); - drupal_set_message(t('All other caches cleared.')); - } -} - -/** - * Form builder; Displays Boost's configuration page. - * - * @see system_settings_form() - * - * TODO: Cacheability settings use core code. Look at Blocks. - * http://drupal.org/node/337756 - */ -function boost_admin_boost_performance_page() { - Global $base_path; - // Cacheability settings $options = array(t('Cache every page except the listed pages.'), t('Cache only the listed pages.')); $description = t("Enter one page per line as Drupal paths. The '*' character is a wild-card. Example paths are '%blog' for the blog page and %blog-wild-card for every personal blog. %front is the front page.", array('%blog' => 'blog', '%blog-wild-card' => 'blog/*', '%front' => '