' . t("The normal page cache mode is suitable for most sites and does not cause any side effects. The aggressive page 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.") . '
'; + $form['caching'] = array( + '#type' => 'fieldset', + '#title' => t('Caching'), + ); + $cache = variable_get('cache', CACHE_DISABLED); + $js_hide = $cache != CACHE_AGGRESSIVE ? 'js-hide' : ''; $problem_modules = array_unique(array_merge(module_implements('boot'), module_implements('exit'))); - sort($problem_modules); - if (count($problem_modules) > 0) { - $description .= '' . t('The following enabled modules are incompatible with aggressive page caching mode and will not function properly: %modules', array('%modules' => implode(', ', $problem_modules))) . '.
'; + $module_names = array(); + foreach ($problem_modules as $module) { + $info = drupal_parse_info_file(drupal_get_path('module', $module) . "/$module.info"); + $module_names[] = $info['name']; + } + sort($module_names); + $description = ' ' . t('The following enabled modules will not function properly with aggressive caching: %modules', array('%modules' => implode(', ', $module_names))) . ''; } else { - $description .= '' . t('Currently, all enabled modules are compatible with the aggressive page caching policy. Please note, if you use aggressive page caching and enable new modules, you will need to check this setting again to ensure compatibility.') . '
'; + $description = ' ' . t('Note: if you use aggressive page caching and enable new modules, you will need to check this setting again to ensure compatibility.') . ''; } - $form['page_cache'] = array( - '#type' => 'fieldset', - '#title' => t('Page cache'), - '#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 a web page, Drupal does not have to construct the page each time it is viewed.'), - '#weight' => -1, - ); - - $form['page_cache']['cache'] = array( + $form['caching']['cache'] = array( '#type' => 'radios', - '#title' => t('Page caching mode'), - '#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' => $description + '#title' => t('Page cache for anonymous users'), + '#default_value' => $cache, + '#options' => array(CACHE_DISABLED => t('Disabled'), CACHE_NORMAL => t('Normal (recommended)'), CACHE_AGGRESSIVE => t('Aggressive (possible side effects)')), + '#description' => t('Aggressive caching skipshook_boot() and hook_exit(), which results in an additional performance boost but can cause modules to malfunction.') . $description,
);
-
- $period = drupal_map_assoc(array(0, 60, 180, 300, 600, 900, 1800, 2700, 3600, 10800, 21600, 32400, 43200, 86400), 'format_interval');
- $period[0] = '<' . t('none') . '>';
- $form['page_cache']['cache_lifetime'] = array(
+ $period = drupal_map_assoc(array(60, 180, 300, 600, 900, 1800, 2700, 3600, 10800, 21600, 32400, 43200, 86400), 'format_interval');
+ $form['caching']['cache_lifetime'] = array(
'#type' => 'select',
'#title' => t('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['page_cache']['page_compression'] = array(
- '#type' => 'radios',
- '#title' => t('Page compression'),
- '#default_value' => variable_get('page_compression', TRUE),
- '#options' => array(t('Disabled'), t('Enabled')),
- '#description' => t("By default, Drupal compresses the pages it caches in order to save bandwidth and improve download times. This option should be disabled when using a webserver that performs compression."),
+ '#description' => t('The minimum amount of time that will elapse before the caches are recreated.')
);
+ $directory = file_directory_path();
+ $is_writable = is_dir($directory) && is_writable($directory);
+ $public_downloads = (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC) == FILE_DOWNLOADS_PUBLIC);
+ $disabled = !$is_writable && !$public_downloads;
+ $disabled_message = '';
+ if(!$is_writable && !$public_downloads) {
+ $disabled_message = ' ' . t('Please set up the files directory and set the download method to public to make these optimizations available.', array('!file-system' => url('admin/settings/file-system')));
+ }
+ elseif(!$is_writable) {
+ $disabled_message = ' ' . t('Please set up the files directory to make these optimizations available.', array('!file-system' => url('admin/settings/file-system')));
+ }
+ elseif(!$public_downloads) {
+ $disabled_message = ' ' . t('Please set the download method to public to make these optimizations available.', array('!file-system' => url('admin/settings/file-system')));
+ }
$form['bandwidth_optimizations'] = array(
'#type' => 'fieldset',
'#title' => t('Bandwidth optimizations'),
- '#description' => '' . t('Drupal can automatically optimize external resources like CSS and JavaScript, which can reduce both the size and number of requests made to your website. CSS files can be aggregated and compressed into a single file, while JavaScript files are aggregated (but not compressed). These optional optimizations may reduce server load, bandwidth requirements, and page loading times.') . '
' . t('These options are disabled if you have not set up your files directory, or if your download method is set to private.') . '
' + '#description' => t('External resources can be optimized automatically, which can reduce both the size and number of requests made to your website.') . $disabled_message, ); - $directory = file_directory_path(); - $is_writable = is_dir($directory) && is_writable($directory) && (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC) == FILE_DOWNLOADS_PUBLIC); + // Do not allow Drupal to gzip pages if the server alredy does that. + if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') === FALSE) { + $js_hide = $cache == CACHE_DISABLED ? ' class="js-hide"' : ''; + $form['bandwidth_optimizations']['page_compression'] = array( + '#type' => 'checkbox', + '#title' => t('Compress cached pages.'), + '#default_value' => variable_get('page_compression', TRUE), + '#prefix' => '