' . 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.") . '
'; - - $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))) . '.
'; - } - 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.') . '
'; - } - $form['page_cache'] = array( + $form['caching'] = 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.'), + '#title' => t('Caching'), '#weight' => -1, ); - $form['page_cache']['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 - ); - $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( + $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.') + '#description' => t('The minimum amount of time that will elapse before the page and block caches are recreated. 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( + + $problem_modules = array_unique(array_merge(module_implements('boot'), module_implements('exit'))); + if (count($problem_modules) > 0) { + $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('Note: if you use aggressive page caching and enable new modules, you will need to check this setting again to ensure compatibility.'); + } + $cache = variable_get('cache', CACHE_DISABLED); + $form['caching']['cache'] = array( '#type' => 'radios', + '#title' => t('Page cache'), + '#default_value' => $cache, + '#options' => array(CACHE_DISABLED => t('Disabled'), CACHE_NORMAL => t('Normal (recommended)'), CACHE_AGGRESSIVE => t('Aggressive (possible side effects)')), + '#description' => t('Pages requested by anonymous users can be cached and sent compressed. Aggressive caching skips 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.') . $description, + ); + $js_hide = $cache == CACHE_DISABLED ? ' class="js-hide"' : ''; + $form['caching']['page_compression'] = array( + '#type' => 'checkbox', '#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("Compress cached pages to save bandwidth and improve download times. This option should be disabled when using a webserver that performs compression."), + '#prefix' => '' . 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 automatically be optimized, which can reduce both the size and number of requests made to your website. Note: these options may interfere with theme and module development.') . $disabled_message, ); - $directory = file_directory_path(); - $is_writable = is_dir($directory) && is_writable($directory) && (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC) == FILE_DOWNLOADS_PUBLIC); $form['bandwidth_optimizations']['preprocess_css'] = array( - '#type' => 'radios', + '#type' => 'checkbox', '#title' => t('Optimize CSS files'), '#default_value' => intval(variable_get('preprocess_css', 0) && $is_writable), - '#disabled' => !$is_writable, - '#options' => array(t('Disabled'), t('Enabled')), - '#description' => t('This option can interfere with theme development and should only be enabled in a production environment.'), + '#disabled' => $disabled, + '#description' => t('Aggregate and compress CSS files into a single file.'), ); $form['bandwidth_optimizations']['preprocess_js'] = array( - '#type' => 'radios', + '#type' => 'checkbox', '#title' => t('Optimize JavaScript files'), '#default_value' => intval(variable_get('preprocess_js', 0) && $is_writable), - '#disabled' => !$is_writable, - '#options' => array(t('Disabled'), t('Enabled')), - '#description' => t('This option can interfere with module development and should only be enabled in a production environment.'), + '#disabled' => $disabled, + '#description' => t('Aggregate JavaScript files.'), ); $form['clear_cache'] = array( '#type' => 'fieldset', '#title' => t('Clear cached data'), - '#description' => t('Caching data improves performance, but may cause problems while troubleshooting new modules, themes, or translations, if outdated information has been cached. To refresh all cached data on your site, click the button below. Warning: high-traffic sites will experience performance slowdowns while cached data is rebuilt.'), + '#description' => t('Caching data improves performance, but may cause problems while troubleshooting new modules, themes, or translations, if outdated information has been cached. Warning: high-traffic sites will experience performance slowdowns while cached data is rebuilt.'), ); $form['clear_cache']['clear'] = array( @@ -1531,7 +1546,7 @@ function system_regional_settings() { $form['locale'] = array( '#type' => 'fieldset', - '#title' => t('Locale settings'), + '#title' => t('Locale'), ); $form['locale']['site_default_country'] = array( @@ -1539,65 +1554,63 @@ function system_regional_settings() { '#title' => t('Default country'), '#default_value' => variable_get('site_default_country', ''), '#options' => $countries, - '#description' => t('Select the default country for the site.'), '#attributes' => array('class' => 'country-detect'), ); - $form['locale']['date_default_timezone'] = array( - '#type' => 'select', - '#title' => t('Default time zone'), - '#default_value' => variable_get('date_default_timezone', date_default_timezone_get()), - '#options' => $zones, - '#description' => t('Select the default time zone for the site.'), - ); - $form['locale']['date_first_day'] = array( '#type' => 'select', '#title' => t('First day of week'), '#default_value' => variable_get('date_first_day', 0), '#options' => array(0 => t('Sunday'), 1 => t('Monday'), 2 => t('Tuesday'), 3 => t('Wednesday'), 4 => t('Thursday'), 5 => t('Friday'), 6 => t('Saturday')), - '#description' => t('The first day of the week for calendar views.') ); $form['timezone'] = array( '#type' => 'fieldset', - '#title' => t('User time zones'), + '#title' => t('Time zones'), ); + $form['timezone']['date_default_timezone'] = array( + '#type' => 'select', + '#title' => t('Default time zone'), + '#default_value' => variable_get('date_default_timezone', date_default_timezone_get()), + '#options' => $zones, + ); + + $configurable_timezones = variable_get('configurable_timezones', 1); $form['timezone']['configurable_timezones'] = array( - '#type' => 'radios', - '#title' => t('User-configurable time zones'), - '#default_value' => variable_get('configurable_timezones', 1), - '#options' => array(0 => t('Disabled'), 1 => t('Enabled')), - '#description' => t('When enabled, users can set their own time zone and dates will be displayed accordingly.') + '#type' => 'checkbox', + '#title' => t('Users may set their own time zone.'), + '#default_value' => $configurable_timezones, ); - $form['timezone']['user_default_timezone'] = array( - '#type' => 'radios', - '#title' => t('User time zone defaults'), - '#default_value' => variable_get('user_default_timezone', DRUPAL_USER_TIMEZONE_DEFAULT), - '#options' => array( - DRUPAL_USER_TIMEZONE_DEFAULT => t('New users will be set to the default time zone at registration.'), - DRUPAL_USER_TIMEZONE_EMPTY => t('New users will get an empty time zone at registration.'), - DRUPAL_USER_TIMEZONE_SELECT => t('New users will select their own time zone at registration.'), - ), - '#description' => t('Method for setting user time zones at registration when user-configurable time zones are enabled. This only affects the initial time zone setting for a new registration. Users will be able to change their time zone any time they edit their account.') + $js_hide = !$configurable_timezones ? ' class="js-hide"' : ''; + $form['timezone']['configurable_timezones_wrapper'] = array( + '#prefix' => '