diff --git a/core/includes/ajax.inc b/core/includes/ajax.inc index a20acd8..b3665ce 100644 --- a/core/includes/ajax.inc +++ b/core/includes/ajax.inc @@ -516,7 +516,7 @@ function ajax_prepare_response($page_callback_result) { case MENU_SITE_OFFLINE: $commands[] = ajax_command_alert(filter_xss_admin(variable_get('maintenance_mode_message', - t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal')))))); + t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => config('system.site')->get('site_name')))))); break; } } diff --git a/core/includes/common.inc b/core/includes/common.inc index 19e0d59..6a07ae8 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -2532,6 +2532,7 @@ function drupal_deliver_html_page($page_callback_result) { // Menu status constants are integers; page content is a string or array. if (is_int($page_callback_result)) { + $config = config('system.site'); // @todo: Break these up into separate functions? switch ($page_callback_result) { case MENU_NOT_FOUND: @@ -2548,7 +2549,7 @@ function drupal_deliver_html_page($page_callback_result) { $_GET['destination'] = current_path(); } - $path = drupal_get_normal_path(variable_get('site_404', '')); + $path = drupal_get_normal_path($config->get('site_404')); if ($path && $path != current_path()) { // Custom 404 handler. Set the active item in case there are tabs to // display, or other dependencies on the path. @@ -2577,7 +2578,7 @@ function drupal_deliver_html_page($page_callback_result) { $_GET['destination'] = current_path(); } - $path = drupal_get_normal_path(variable_get('site_403', '')); + $path = drupal_get_normal_path($config->get('site_403')); if ($path && $path != current_path()) { // Custom 403 handler. Set the active item in case there are tabs to // display or other dependencies on the path. @@ -2600,7 +2601,7 @@ function drupal_deliver_html_page($page_callback_result) { drupal_add_http_header('Status', '503 Service unavailable'); drupal_set_title(t('Site under maintenance')); print theme('maintenance_page', array('content' => filter_xss_admin(variable_get('maintenance_mode_message', - t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal'))))))); + t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => config('system.site')->get('site_name'))))))); break; } } diff --git a/core/includes/gettext.inc b/core/includes/gettext.inc index 4e3b221..979adb2 100644 --- a/core/includes/gettext.inc +++ b/core/includes/gettext.inc @@ -955,7 +955,7 @@ function _locale_export_po_generate($language = NULL, $strings = array(), $heade if (!isset($header)) { if (isset($language)) { - $header = '# ' . $language->name . ' translation of ' . variable_get('site_name', 'Drupal') . "\n"; + $header = '# ' . $language->name . ' translation of ' . config('system.site')->get('site_name') . "\n"; $header .= '# Generated by ' . $user->name . ' <' . $user->mail . ">\n"; $header .= "#\n"; $header .= "msgid \"\"\n"; diff --git a/core/includes/mail.inc b/core/includes/mail.inc index f58a76e..c7925e9 100644 --- a/core/includes/mail.inc +++ b/core/includes/mail.inc @@ -118,7 +118,8 @@ define('MAIL_LINE_ENDINGS', isset($_SERVER['WINDIR']) || strpos($_SERVER['SERVER * accepted at php-level, which still doesn't guarantee it to be delivered.) */ function drupal_mail($module, $key, $to, $language, $params = array(), $from = NULL, $send = TRUE) { - $default_from = variable_get('site_mail', ini_get('sendmail_from')); + $site_mail = config('system.site')->get('site_mail'); + $default_from = empty($site_mail) ? ini_get('sendmail_from') : $site_mail; // Bundle up the variables into a structured array for altering. $message = array( diff --git a/core/includes/path.inc b/core/includes/path.inc index 0c7e4d4..0635f80 100644 --- a/core/includes/path.inc +++ b/core/includes/path.inc @@ -22,7 +22,7 @@ function drupal_path_initialize() { // If on the front page, resolve to the front page path, including for calls // to current_path() while drupal_get_normal_path() is in progress. if (empty($path)) { - $path = variable_get('site_frontpage', 'user'); + $path = config('system.site')->get('site_frontpage'); _current_path($path); } @@ -298,7 +298,7 @@ function drupal_is_front_page() { $is_front_page = &$drupal_static_fast['is_front_page']; if (!isset($is_front_page)) { - $is_front_page = (current_path() == variable_get('site_frontpage', 'user')); + $is_front_page = (current_path() == config('system.site')->get('site_frontpage')); } return $is_front_page; @@ -329,7 +329,7 @@ function drupal_match_path($path, $patterns) { $replacements = array( '|', '.*', - '\1' . preg_quote(variable_get('site_frontpage', 'user'), '/') . '\2' + '\1' . preg_quote(config('system.site')->get('site_frontpage'), '/') . '\2' ); $patterns_quoted = preg_quote($patterns, '/'); $regexps[$patterns] = '/^(' . preg_replace($to_replace, $replacements, $patterns_quoted) . ')$/'; diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 7d638f6..eaa2339 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -2530,17 +2530,18 @@ function template_preprocess_html(&$variables) { drupal_add_html_head_link(array('rel' => 'shortcut icon', 'href' => drupal_strip_dangerous_protocols($favicon), 'type' => $type)); } + $config = config('system.site'); // Construct page title. if (drupal_get_title()) { $head_title = array( 'title' => strip_tags(drupal_get_title()), - 'name' => check_plain(variable_get('site_name', 'Drupal')), + 'name' => check_plain($config->get('site_name')), ); } else { - $head_title = array('name' => check_plain(variable_get('site_name', 'Drupal'))); - if (variable_get('site_slogan', '')) { - $head_title['slogan'] = filter_xss_admin(variable_get('site_slogan', '')); + $head_title = array('name' => check_plain($config->get('site_name'))); + if ($config->get('site_slogan')) { + $head_title['slogan'] = filter_xss_admin($config->get('site_slogan')); } } $variables['head_title_array'] = $head_title; @@ -2574,6 +2575,7 @@ function template_preprocess_html(&$variables) { */ function template_preprocess_page(&$variables) { $language_interface = drupal_container()->get(LANGUAGE_TYPE_INTERFACE); + $config = config('system.site'); // Move some variables to the top level for themer convenience and template cleanliness. $variables['show_messages'] = $variables['page']['#show_messages']; @@ -2602,8 +2604,8 @@ function template_preprocess_page(&$variables) { $variables['main_menu'] = theme_get_setting('toggle_main_menu') ? menu_main_menu() : array(); $variables['secondary_menu'] = theme_get_setting('toggle_secondary_menu') ? menu_secondary_menu() : array(); $variables['action_links'] = menu_local_actions(); - $variables['site_name'] = (theme_get_setting('toggle_name') ? filter_xss_admin(variable_get('site_name', 'Drupal')) : ''); - $variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? filter_xss_admin(variable_get('site_slogan', '')) : ''); + $variables['site_name'] = (theme_get_setting('toggle_name') ? filter_xss_admin($config->get('site_name')) : ''); + $variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? filter_xss_admin($config->get('site_slogan')) : ''); $variables['tabs'] = menu_local_tabs(); if ($node = menu_get_object()) { @@ -2784,17 +2786,18 @@ function template_preprocess_maintenance_page(&$variables) { $variables['layout'] = ($variables['layout'] == 'first') ? 'both' : 'second'; } + $config = config('system.site'); // Construct page title if (drupal_get_title()) { $head_title = array( 'title' => strip_tags(drupal_get_title()), - 'name' => variable_get('site_name', 'Drupal'), + 'name' => $config->get('site_name'), ); } else { - $head_title = array('name' => variable_get('site_name', 'Drupal')); - if (variable_get('site_slogan', '')) { - $head_title['slogan'] = variable_get('site_slogan', ''); + $head_title = array('name' => $config->get('site_name')); + if ($config->get('site_slogan')) { + $head_title['slogan'] = $config->get('site_slogan'); } } @@ -2813,8 +2816,8 @@ function template_preprocess_maintenance_page(&$variables) { $variables['messages'] = $variables['show_messages'] ? theme('status_messages') : ''; $variables['main_menu'] = array(); $variables['secondary_menu'] = array(); - $variables['site_name'] = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : ''); - $variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? variable_get('site_slogan', '') : ''); + $variables['site_name'] = (theme_get_setting('toggle_name') ? $config->get('site_name') : ''); + $variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? $config->get('site_slogan') : ''); $variables['tabs'] = ''; $variables['title'] = drupal_get_title(); diff --git a/core/modules/aggregator/aggregator.pages.inc b/core/modules/aggregator/aggregator.pages.inc index 7f82077..62fb7c5 100644 --- a/core/modules/aggregator/aggregator.pages.inc +++ b/core/modules/aggregator/aggregator.pages.inc @@ -11,7 +11,7 @@ * @see aggregator_menu() */ function aggregator_page_last() { - drupal_add_feed('aggregator/rss', variable_get('site_name', 'Drupal') . ' ' . t('aggregator')); + drupal_add_feed('aggregator/rss', config('system.site')->get('site_name') . ' ' . t('aggregator')); $items = aggregator_load_feed_items('sum'); @@ -61,7 +61,7 @@ function aggregator_page_source_form($form, $form_state, $feed) { * @ingroup forms */ function aggregator_page_category($category) { - drupal_add_feed('aggregator/rss/' . $category['cid'], variable_get('site_name', 'Drupal') . ' ' . t('aggregator - @title', array('@title' => $category['title']))); + drupal_add_feed('aggregator/rss/' . $category['cid'], config('system.site')->get('site_name') . ' ' . t('aggregator - @title', array('@title' => $category['title']))); // It is safe to include the cid in the query because it's loaded from the // database by aggregator_category_load(). @@ -452,7 +452,7 @@ function theme_aggregator_page_rss($variables) { $items .= format_rss_item($feed->ftitle . ': ' . $feed->title, $feed->link, $feed->description, array('pubDate' => date('r', $feed->timestamp))); } - $site_name = variable_get('site_name', 'Drupal'); + $site_name = config('system.site')->get('site_name'); $url = url((isset($category) ? 'aggregator/categories/' . $category->cid : 'aggregator'), array('absolute' => TRUE)); $description = isset($category) ? t('@site_name - aggregated feeds in category @title', array('@site_name' => $site_name, '@title' => $category->title)) : t('@site_name - aggregated feeds', array('@site_name' => $site_name)); @@ -504,7 +504,7 @@ function theme_aggregator_page_opml($variables) { $output = "\n"; $output .= "\n"; $output .= "\n"; - $output .= '' . check_plain(variable_get('site_name', 'Drupal')) . "\n"; + $output .= '' . check_plain(config('system.site')->get('site_name')) . "\n"; $output .= '' . gmdate(DATE_RFC2822, REQUEST_TIME) . "\n"; $output .= "\n"; $output .= "\n"; diff --git a/core/modules/block/block.test b/core/modules/block/block.test index e6b2e42..dd11ae8 100644 --- a/core/modules/block/block.test +++ b/core/modules/block/block.test @@ -166,7 +166,7 @@ class BlockTestCase extends WebTestBase { function testBlockVisibility() { // Enable Node module and change the front page path to 'node'. module_enable(array('node')); - variable_set('site_frontpage', 'node'); + config('system.site')->set('site_frontpage', 'node')->save(); $block = array(); diff --git a/core/modules/contact/contact.install b/core/modules/contact/contact.install index 7ddea45..1849629 100644 --- a/core/modules/contact/contact.install +++ b/core/modules/contact/contact.install @@ -68,11 +68,13 @@ function contact_schema() { * Implements hook_install(). */ function contact_install() { + $site_mail = config('system.site')->get('site_mail'); + $default_from = empty($site_mail) ? ini_get('sendmail_from') : $site_mail; // Insert a default contact category. db_insert('contact') ->fields(array( 'category' => 'Website feedback', - 'recipients' => variable_get('site_mail', ini_get('sendmail_from')), + 'recipients' => $default_from, 'selected' => 1, 'reply' => '', )) diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module index 48c12d9..4840e10c 100644 --- a/core/modules/contact/contact.module +++ b/core/modules/contact/contact.module @@ -170,7 +170,7 @@ function contact_load($cid) { function contact_mail($key, &$message, $params) { $language = $message['language']; $variables = array( - '!site-name' => variable_get('site_name', 'Drupal'), + '!site-name' => config('system.site')->get('site_name'), '!subject' => $params['subject'], '!category' => isset($params['category']['category']) ? $params['category']['category'] : '', '!form-url' => url(current_path(), array('absolute' => TRUE, 'language' => $language)), diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module index 94d8a03..890dfd4 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -1277,7 +1277,7 @@ function _filter_html_tips($filter, $format, $long = FALSE) { $output .= '

' . t('This site allows HTML content. While learning all of HTML may feel intimidating, learning how to use a very small number of the most basic HTML "tags" is very easy. This table provides examples for each tag that is enabled on this site.') . '

'; $output .= '

' . t('For more information see W3C\'s HTML Specifications or use your favorite search engine to find other sites that explain HTML.', array('@html-specifications' => 'http://www.w3.org/TR/html/')) . '

'; $tips = array( - 'a' => array(t('Anchors are used to make links to other pages.'), '' . check_plain(variable_get('site_name', 'Drupal')) . ''), + 'a' => array(t('Anchors are used to make links to other pages.'), '' . check_plain(config('system.site')->get('site_name')) . ''), 'br' => array(t('By default line break tags are automatically added, so use this tag to add additional ones. Use of this tag is different because it is not used with an open/close pair like all the others. Use the extra " /" inside the tag to maintain XHTML 1.0 compatibility'), t('Text with
line break')), 'p' => array(t('By default paragraph tags are automatically added, so use this tag to add additional ones.'), '

' . t('Paragraph one.') . '

' . t('Paragraph two.') . '

'), 'strong' => array(t('Strong', array(), array('context' => 'Font weight')), '' . t('Strong', array(), array('context' => 'Font weight')) . ''), diff --git a/core/modules/locale/locale.test b/core/modules/locale/locale.test index 5e252bf..1b6ff9b 100644 --- a/core/modules/locale/locale.test +++ b/core/modules/locale/locale.test @@ -1642,7 +1642,7 @@ class LocalePathFunctionalTest extends WebTestBase { parent::setUp(array('node', 'locale', 'path')); $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page')); - variable_set('site_frontpage', 'node'); + config('system.site')->set('site_frontpage', 'node')->save(); } /** diff --git a/core/modules/node/node.install b/core/modules/node/node.install index ee89059..3b54fe1 100644 --- a/core/modules/node/node.install +++ b/core/modules/node/node.install @@ -475,7 +475,6 @@ function node_uninstall() { variable_del('node_admin_theme'); variable_del('node_cron_last'); variable_del('node_recent_block_count'); - variable_del('default_nodes_main'); } /** @@ -521,9 +520,9 @@ function _update_7000_node_get_types() { * @see http://drupal.org/node/375397 */ function node_update_8000() { - $front_page = variable_get('site_frontpage'); + $front_page = config('system.site')->get('site_frontpage'); if (!isset($front_page)) { - variable_set('site_frontpage', 'node'); + config('system.site')->set('site_frontpage', 'node')->save(); } } diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 3c3881d..5e3b1ce 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -2429,7 +2429,7 @@ function node_feed($nids = FALSE, $channel = array()) { $channel_defaults = array( 'version' => '2.0', - 'title' => variable_get('site_name', 'Drupal'), + 'title' => config('system.site')->get('site_name'), 'link' => $base_url, 'description' => config('system.rss-publishing')->get('feed_description'), 'language' => $language_content->langcode @@ -2488,7 +2488,7 @@ function node_page_default() { ->orderBy('sticky', 'DESC') ->orderBy('created', 'DESC') ->extend('PagerDefault') - ->limit(variable_get('default_nodes_main', 10)) + ->limit(config('system.site')->get('default_nodes_main')) ->addTag('node_access'); $nids = $select->execute()->fetchCol(); @@ -2498,7 +2498,7 @@ function node_page_default() { $build = node_view_multiple($nodes); // 'rss.xml' is a path, not a file, registered in node_menu(). - drupal_add_feed('rss.xml', variable_get('site_name', 'Drupal') . ' ' . t('RSS')); + drupal_add_feed('rss.xml', config('system.site')->get('site_name') . ' ' . t('RSS')); $build['pager'] = array( '#theme' => 'pager', '#weight' => 5, @@ -2506,7 +2506,7 @@ function node_page_default() { drupal_set_title(''); } else { - drupal_set_title(t('Welcome to @site-name', array('@site-name' => variable_get('site_name', 'Drupal'))), PASS_THROUGH); + drupal_set_title(t('Welcome to @site-name', array('@site-name' => config('system.site')->get('site_name'))), PASS_THROUGH); $default_message = '

' . t('No front page content has been created yet.') . '

'; diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module index 02c0883..1600665 100644 --- a/core/modules/overlay/overlay.module +++ b/core/modules/overlay/overlay.module @@ -635,7 +635,7 @@ function overlay_overlay_parent_initialize() { // Let the client side know which paths are administrative. $paths = path_get_admin_paths(); foreach ($paths as &$type) { - $type = str_replace('', variable_get('site_frontpage', 'user'), $type); + $type = str_replace('', config('system.site')->get('site_frontpage'), $type); } drupal_add_js(array('overlay' => array('paths' => $paths)), 'setting'); $path_prefixes = array(); diff --git a/core/modules/simpletest/simpletest.test b/core/modules/simpletest/simpletest.test index cc4e026..00b4261 100644 --- a/core/modules/simpletest/simpletest.test +++ b/core/modules/simpletest/simpletest.test @@ -49,7 +49,7 @@ class SimpleTestFunctionalTest extends WebTestBase { if (!$this->inCURL()) { $this->drupalGet('node'); $this->assertTrue($this->drupalGetHeader('Date'), t('An HTTP header was received.')); - $this->assertTitle(t('Welcome to @site-name | @site-name', array('@site-name' => variable_get('site_name', 'Drupal'))), t('Site title matches.')); + $this->assertTitle(t('Welcome to @site-name | @site-name', array('@site-name' => config('system.site')->get('site_name'))), t('Site title matches.')); $this->assertNoTitle('Foo', t('Site title does not match.')); // Make sure that we are locked out of the installer when prefixing // using the user-agent header. This is an important security check. diff --git a/core/modules/system/config/system.site.yml b/core/modules/system/config/system.site.yml new file mode 100644 index 0000000..57ec57f --- /dev/null +++ b/core/modules/system/config/system.site.yml @@ -0,0 +1,7 @@ +site_name: 'Drupal' +site_mail: '' +site_slogan: '' +site_frontpage: 'user' +default_nodes_main: '10' +site_403: '' +site_404: '' diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc index f3e2012..2e78a99 100644 --- a/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -1462,6 +1462,9 @@ function system_ip_blocking_delete_submit($form, &$form_state) { * @see system_settings_form() */ function system_site_information_settings() { + $config = config('system.site'); + $site_mail = $config->get('site_mail'); + $default_from = empty($site_mail) ? ini_get('sendmail_from') : $site_mail; $form['site_information'] = array( '#type' => 'fieldset', '#title' => t('Site details'), @@ -1469,19 +1472,19 @@ function system_site_information_settings() { $form['site_information']['site_name'] = array( '#type' => 'textfield', '#title' => t('Site name'), - '#default_value' => variable_get('site_name', 'Drupal'), + '#default_value' => $config->get('site_name'), '#required' => TRUE ); $form['site_information']['site_slogan'] = array( '#type' => 'textfield', '#title' => t('Slogan'), - '#default_value' => variable_get('site_slogan', ''), + '#default_value' => $config->get('site_slogan'), '#description' => t("How this is used depends on your site's theme."), ); $form['site_information']['site_mail'] = array( '#type' => 'email', '#title' => t('E-mail address'), - '#default_value' => variable_get('site_mail', ini_get('sendmail_from')), + '#default_value' => $default_from, '#description' => t("The From address in automated e-mails sent during registration and new password requests, and other notifications. (Use an address ending in your site's domain to help prevent this e-mail being flagged as spam.)"), '#required' => TRUE, ); @@ -1492,17 +1495,17 @@ function system_site_information_settings() { $form['front_page']['site_frontpage'] = array( '#type' => 'textfield', '#title' => t('Default front page'), - '#default_value' => (variable_get('site_frontpage') != 'user' ? drupal_get_path_alias(variable_get('site_frontpage', 'user')) : ''), + '#default_value' => ($config->get('site_frontpage') != 'user' ? drupal_get_path_alias(config('system.site')->get('site_frontpage')) : ''), '#size' => 40, '#description' => t('Optionally, specify a relative URL to display as the front page. Leave blank to display the default content feed.'), '#field_prefix' => url(NULL, array('absolute' => TRUE)), ); $form['front_page']['default_nodes_main'] = array( '#type' => 'select', '#title' => t('Number of posts on front page'), - '#default_value' => variable_get('default_nodes_main', 10), + '#default_value' => $config->get('default_nodes_main'), '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)), '#description' => t('The maximum number of posts displayed on overview pages such as the front page.'), - '#access' => (variable_get('site_frontpage') == 'node'), + '#access' => ($config->get('site_frontpage') == 'node'), ); $form['error_page'] = array( '#type' => 'fieldset', @@ -1511,7 +1514,7 @@ function system_site_information_settings() { $form['error_page']['site_403'] = array( '#type' => 'textfield', '#title' => t('Default 403 (access denied) page'), - '#default_value' => variable_get('site_403', ''), + '#default_value' => $config->get('site_403'), '#size' => 40, '#description' => t('This page is displayed when the requested document is denied to the current user. Leave blank to display a generic "access denied" page.'), '#field_prefix' => url(NULL, array('absolute' => TRUE)), @@ -1519,18 +1522,35 @@ function system_site_information_settings() { $form['error_page']['site_404'] = array( '#type' => 'textfield', '#title' => t('Default 404 (not found) page'), - '#default_value' => variable_get('site_404', ''), + '#default_value' => $config->get('site_404'), '#size' => 40, '#description' => t('This page is displayed when no other content matches the requested document. Leave blank to display a generic "page not found" page.'), '#field_prefix' => url(NULL, array('absolute' => TRUE)), ); + $form['#submit'][] = 'system_site_information_settings_submit'; $form['#validate'][] = 'system_site_information_settings_validate'; + //@todo: remove dependence on system_settings_from as this will fire the system_settings_form_submit action. return system_settings_form($form); } /** + * Submit action for site-information form. + */ +function system_site_information_settings_submit($form, &$form_state) { + config('system.site') + ->set('site_name', $form_state['values']['site_name']) + ->set('site_mail', $form_state['values']['site_mail']) + ->set('site_slogan', $form_state['values']['site_slogan']) + ->set('site_frontpage', $form_state['values']['site_frontpage']) + ->set('default_nodes_main', $form_state['values']['default_nodes_main']) + ->set('site_403', $form_state['values']['site_403']) + ->set('site_404', $form_state['values']['site_404']) + ->save(); +} + +/** * Validates the submitted site-information form. */ function system_site_information_settings_validate($form, &$form_state) { @@ -2235,7 +2255,7 @@ function system_site_maintenance_mode() { $form['maintenance_mode_message'] = array( '#type' => 'textarea', '#title' => t('Message to display when in maintenance mode'), - '#default_value' => variable_get('maintenance_mode_message', t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal')))), + '#default_value' => variable_get('maintenance_mode_message', t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => config('system.site')->get('site_name')))), ); return system_settings_form($form); diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php index 2fb21c7..c7a6720 100644 --- a/core/modules/system/system.api.php +++ b/core/modules/system/system.api.php @@ -1525,7 +1525,7 @@ function hook_mail_alter(&$message) { $message['send'] = FALSE; return; } - $message['body'][] = "--\nMail sent out from " . variable_get('site_name', t('Drupal')); + $message['body'][] = "--\nMail sent out from " . config('system.site')->get('site_name'); } } @@ -1990,7 +1990,7 @@ function hook_watchdog(array $log_entry) { $to = 'someone@example.com'; $params = array(); $params['subject'] = t('[@site_name] @severity_desc: Alert from your web site', array( - '@site_name' => variable_get('site_name', 'Drupal'), + '@site_name' => config('system.site')->get('site_name'), '@severity_desc' => $severity_list[$log_entry['severity']], )); @@ -2056,7 +2056,7 @@ function hook_mail($key, &$message, $params) { $account = $params['account']; $context = $params['context']; $variables = array( - '%site_name' => variable_get('site_name', 'Drupal'), + '%site_name' => config('system.site')->get('site_name'), '%username' => user_format_name($account), ); if ($context['hook'] == 'taxonomy') { diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 199f8c0..1d03627 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -1888,6 +1888,13 @@ function system_update_8010() { } /** + * Converts configuration storage for site information to use static files + */ +function system_update_8011() { + config_install_default_config('system'); + update_variables_to_config('system.site'); +} +/** * @} End of "defgroup updates-7.x-to-8.x". * The next series of updates should start at 9000. */ diff --git a/core/modules/system/system.test b/core/modules/system/system.test index 40f590e..1ebcba1 100644 --- a/core/modules/system/system.test +++ b/core/modules/system/system.test @@ -1052,7 +1052,7 @@ class AccessDeniedTestCase extends WebTestBase { // Log back in, set the custom 403 page to /user and remove the block $this->drupalLogin($this->admin_user); - variable_set('site_403', 'user'); + config('system.site')->set('site_403', 'user')->save(); $this->drupalPost('admin/structure/block', array('blocks[user_login][region]' => '-1'), t('Save blocks')); // Check that we can log in from the 403 page. @@ -1123,7 +1123,7 @@ class SiteMaintenanceTestCase extends WebTestBase { parent::setUp(array('node')); // Configure 'node' as front page. - variable_set('site_frontpage', 'node'); + config('system.site')->set('site_frontpage', 'node')->save(); // Create a user allowed to access site in maintenance mode. $this->user = $this->drupalCreateUser(array('access site in maintenance mode')); @@ -1144,7 +1144,7 @@ class SiteMaintenanceTestCase extends WebTestBase { $admin_message = t('Operating in maintenance mode. Go online.', array('@url' => url('admin/config/development/maintenance'))); $user_message = t('Operating in maintenance mode.'); - $offline_message = t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal'))); + $offline_message = t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => config('system.site')->get('site_name'))); $this->drupalGet(''); $this->assertRaw($admin_message, t('Found the site maintenance mode message.')); @@ -1533,7 +1533,7 @@ class FrontPageTestCase extends WebTestBase { $this->node_path = "node/" . $this->drupalCreateNode(array('promote' => 1))->nid; // Configure 'node' as front page. - variable_set('site_frontpage', 'node'); + config('system.site')->set('site_frontpage', 'node')->save(); // Enable front page logging in system_test.module. variable_set('front_page_output', 1); } @@ -2035,13 +2035,15 @@ class TokenReplaceTestCase extends WebTestBase { ); // Set a few site variables. - variable_set('site_name', 'Drupal'); - variable_set('site_slogan', 'Slogan'); + config('system.site') + ->set('site_name', 'Drupal') + ->set('site_slogan', 'Slogan') + ->save(); // Generate and test sanitized tokens. $tests = array(); - $tests['[site:name]'] = check_plain(variable_get('site_name', 'Drupal')); - $tests['[site:slogan]'] = check_plain(variable_get('site_slogan', '')); + $tests['[site:name]'] = check_plain(config('system.site')->get('site_name')); + $tests['[site:slogan]'] = check_plain(config('system.site')->get('site_slogan')); $tests['[site:mail]'] = 'simpletest@example.com'; $tests['[site:url]'] = url('', $url_options); $tests['[site:url-brief]'] = preg_replace(array('!^https?://!', '!/$!'), '', url('', $url_options)); @@ -2056,8 +2058,8 @@ class TokenReplaceTestCase extends WebTestBase { } // Generate and test unsanitized tokens. - $tests['[site:name]'] = variable_get('site_name', 'Drupal'); - $tests['[site:slogan]'] = variable_get('site_slogan', ''); + $tests['[site:name]'] = config('system.site')->get('site_name'); + $tests['[site:slogan]'] = config('system.site')->get('site_slogan'); foreach ($tests as $input => $expected) { $output = token_replace($input, array(), array('language' => $language_interface, 'sanitize' => FALSE)); diff --git a/core/modules/system/system.tokens.inc b/core/modules/system/system.tokens.inc index 2492890..f592a5b 100644 --- a/core/modules/system/system.tokens.inc +++ b/core/modules/system/system.tokens.inc @@ -140,22 +140,24 @@ function system_tokens($type, $tokens, array $data = array(), array $options = a $sanitize = !empty($options['sanitize']); $replacements = array(); - + $config = config('system.site'); + $site_mail = $config->get('site_mail'); + $default_from = empty($site_mail) ? ini_get('sendmail_from') : $site_mail; if ($type == 'site') { foreach ($tokens as $name => $original) { switch ($name) { case 'name': - $site_name = variable_get('site_name', 'Drupal'); + $site_name = $config->get('site_name'); $replacements[$original] = $sanitize ? check_plain($site_name) : $site_name; break; case 'slogan': - $slogan = variable_get('site_slogan', ''); + $slogan = $config->get('site_slogan'); $replacements[$original] = $sanitize ? check_plain($slogan) : $slogan; break; case 'mail': - $replacements[$original] = variable_get('site_mail', ''); + $replacements[$original] = $default_from; break; case 'url': diff --git a/core/modules/system/tests/bootstrap.test b/core/modules/system/tests/bootstrap.test index 098e12e..9fa8e8a 100644 --- a/core/modules/system/tests/bootstrap.test +++ b/core/modules/system/tests/bootstrap.test @@ -114,8 +114,10 @@ class BootstrapPageCacheTestCase extends WebTestBase { function setUp() { parent::setUp(array('node', 'system_test')); - variable_set('site_name', 'Drupal'); - variable_set('site_frontpage', 'node'); + config('system.site') + ->set('site_name', 'Drupal') + ->set('site_frontpage', 'node') + ->save(); } /** @@ -123,8 +125,7 @@ class BootstrapPageCacheTestCase extends WebTestBase { */ function testConditionalRequests() { $config = config('system.performance'); - $config->set('cache', 1); - $config->save(); + $config->set('cache', 1)->save(); // Fill the cache. $this->drupalGet(''); @@ -229,7 +230,7 @@ class BootstrapPageCacheTestCase extends WebTestBase { $this->drupalGet(''); $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', t('Page was cached.')); $this->assertFalse($this->drupalGetHeader('Content-Encoding'), t('A Content-Encoding header was not sent.')); - $this->assertTitle(t('Welcome to @site-name | @site-name', array('@site-name' => variable_get('site_name', 'Drupal'))), t('Site title matches.')); + $this->assertTitle(t('Welcome to @site-name | @site-name', array('@site-name' => config('system.site')->get('site_name'))), t('Site title matches.')); $this->assertRaw('', t('Page was not compressed.')); } } diff --git a/core/modules/system/tests/common.test b/core/modules/system/tests/common.test index b50daad..109b7f4 100644 --- a/core/modules/system/tests/common.test +++ b/core/modules/system/tests/common.test @@ -887,7 +887,7 @@ class CommonDrupalHTTPRequestTestCase extends WebTestBase { $result = drupal_http_request(url('node', array('absolute' => TRUE))); $this->assertEqual($result->code, 200, t('Fetched page successfully.')); $this->drupalSetContent($result->data); - $this->assertTitle(t('Welcome to @site-name | @site-name', array('@site-name' => variable_get('site_name', 'Drupal'))), t('Site title matches.')); + $this->assertTitle(t('Welcome to @site-name | @site-name', array('@site-name' => config('system.site')->get('site_name'))), t('Site title matches.')); // Test that code and status message is returned. $result = drupal_http_request(url('pagedoesnotexist', array('absolute' => TRUE))); diff --git a/core/modules/system/tests/menu.test b/core/modules/system/tests/menu.test index dbd94a1..0759a2f 100644 --- a/core/modules/system/tests/menu.test +++ b/core/modules/system/tests/menu.test @@ -248,7 +248,7 @@ class MenuRouterTestCase extends WebTestBase { function testMaintenanceModeLoginPaths() { variable_set('maintenance_mode', TRUE); - $offline_message = t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal'))); + $offline_message = t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => config('system.site')->get('site_name'))); $this->drupalGet('node'); $this->assertText($offline_message); $this->drupalGet('menu_login_callback'); @@ -1636,8 +1636,10 @@ class MenuTrailTestCase extends MenuWebTestCase { */ function testCustom403And404Pages() { // Set the custom 403 and 404 pages we will use. - variable_set('site_403', 'menu-test/custom-403-page'); - variable_set('site_404', 'menu-test/custom-404-page'); + config('system.site') + ->set('site_403', 'menu-test/custom-403-page') + ->set('site_404', 'menu-test/custom-404-page') + ->save(); // Define the paths we'll visit to trigger 403 and 404 responses during // this test, and the expected active trail for each case. diff --git a/core/modules/system/tests/path.test b/core/modules/system/tests/path.test index 271cd91..429b7c1 100644 --- a/core/modules/system/tests/path.test +++ b/core/modules/system/tests/path.test @@ -29,7 +29,7 @@ class DrupalMatchPathTestCase extends WebTestBase { // Set up a random site front page to test the '' placeholder. $this->front = $this->randomName(); - variable_set('site_frontpage', $this->front); + config('system.site')->set('site_frontpage', $this->front)->save(); // Refresh our static variables from the database. $this->refreshVariables(); } diff --git a/core/modules/system/tests/theme.test b/core/modules/system/tests/theme.test index d7c6fb2..b6c854f 100644 --- a/core/modules/system/tests/theme.test +++ b/core/modules/system/tests/theme.test @@ -31,7 +31,7 @@ class ThemeUnitTest extends WebTestBase { function testThemeSuggestions() { // Set the front page as something random otherwise the CLI // test runner fails. - variable_set('site_frontpage', 'nobody-home'); + config('system.site')->set('site_frontpage', 'nobody-home')->save(); $args = array('node', '1', 'edit'); $suggestions = theme_get_suggestions($args, 'page'); $this->assertEqual($suggestions, array('page__node', 'page__node__%', 'page__node__1', 'page__node__edit'), t('Found expected node edit page suggestions')); @@ -75,7 +75,7 @@ class ThemeUnitTest extends WebTestBase { $original_path = _current_path(); // Set the current path to node because theme_get_suggestions() will query // it to see if we are on the front page. - variable_set('site_frontpage', 'node'); + config('system.site')->set('site_frontpage', 'node')->save(); _current_path('node'); $suggestions = theme_get_suggestions(array('node'), 'page'); // Set it back to not annoy the batch runner. @@ -320,7 +320,7 @@ class ThemeFunctionsTestCase extends WebTestBase { // Required to verify the "active" class in expected links below, and // because the current path is different when running tests manually via // simpletest.module ('batch') and via the testing framework (''). - _current_path(variable_get('site_frontpage', 'user')); + _current_path(config('system.site')->get('site_frontpage')); // Verify that a list of links is properly rendered. $variables = array(); diff --git a/core/modules/taxonomy/taxonomy.pages.inc b/core/modules/taxonomy/taxonomy.pages.inc index c84a6bd..7c81d4c 100644 --- a/core/modules/taxonomy/taxonomy.pages.inc +++ b/core/modules/taxonomy/taxonomy.pages.inc @@ -42,7 +42,7 @@ function taxonomy_term_page(Term $term) { 'term' => taxonomy_term_view($term, 'full'), ); - if ($nids = taxonomy_select_nodes($term->tid, TRUE, variable_get('default_nodes_main', 10))) { + if ($nids = taxonomy_select_nodes($term->tid, TRUE, config('system.site')->get('default_nodes_main'))) { $nodes = node_load_multiple($nids); $build += node_view_multiple($nodes); $build['pager'] = array( @@ -68,7 +68,7 @@ function taxonomy_term_page(Term $term) { */ function taxonomy_term_feed(Term $term) { $channel['link'] = url('taxonomy/term/' . $term->tid, array('absolute' => TRUE)); - $channel['title'] = variable_get('site_name', 'Drupal') . ' - ' . $term->name; + $channel['title'] = config('system.site')->get('site_name') . ' - ' . $term->name; // Only display the description if we have a single term, to avoid clutter and confusion. // HTML will be removed from feed description. $channel['description'] = check_markup($term->description, $term->format, '', TRUE); diff --git a/core/modules/update/update.module b/core/modules/update/update.module index 4b3eab2..d2c662a 100644 --- a/core/modules/update/update.module +++ b/core/modules/update/update.module @@ -500,7 +500,7 @@ function _update_get_cached_available_releases() { function update_mail($key, &$message, $params) { $language = $message['language']; $langcode = $language->langcode; - $message['subject'] .= t('New release(s) available for !site_name', array('!site_name' => variable_get('site_name', 'Drupal')), array('langcode' => $langcode)); + $message['subject'] .= t('New release(s) available for !site_name', array('!site_name' => config('system.site')->get('site_name')), array('langcode' => $langcode)); foreach ($params as $msg_type => $msg_reason) { $message['body'][] = _update_message_text($msg_type, $msg_reason, FALSE, $language); } diff --git a/core/modules/user/user.module b/core/modules/user/user.module index cfde270..e72bfe8 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -1876,7 +1876,7 @@ function user_login($form, &$form_state) { ), ); - $form['name']['#description'] = t('Enter your @s username.', array('@s' => variable_get('site_name', 'Drupal'))); + $form['name']['#description'] = t('Enter your @s username.', array('@s' => config('system.site')->get('site_name'))); $form['pass'] = array('#type' => 'password', '#title' => t('Password'), '#description' => t('Enter the password that accompanies your username.'), @@ -3327,6 +3327,9 @@ function user_preferred_language($account, $default = NULL) { * called. */ function _user_mail_notify($op, $account, $language = NULL) { + $config = config('system.site'); + $site_mail = $config->get('site_mail'); + $default_from = empty($site_mail) ? ini_get('sendmail_from') : $site_mail; // By default, we always notify except for canceled and blocked. $default_notify = ($op != 'status_canceled' && $op != 'status_blocked'); $notify = variable_get('user_mail_' . $op . '_notify', $default_notify); @@ -3337,7 +3340,7 @@ function _user_mail_notify($op, $account, $language = NULL) { if ($op == 'register_pending_approval') { // If a user registered requiring admin approval, notify the admin, too. // We use the site default language for this. - drupal_mail('user', 'register_pending_approval_admin', variable_get('site_mail', ini_get('sendmail_from')), language_default(), $params); + drupal_mail('user', 'register_pending_approval_admin', $default_from, language_default(), $params); } } return empty($mail) ? NULL : $mail['result']; diff --git a/core/themes/bartik/template.php b/core/themes/bartik/template.php index 7db1a31..b3e0cca 100644 --- a/core/themes/bartik/template.php +++ b/core/themes/bartik/template.php @@ -43,6 +43,7 @@ function bartik_process_html(&$variables) { * Implements hook_process_HOOK() for page.tpl.php. */ function bartik_process_page(&$variables) { + $config = config('system.site'); // Hook into color.module. if (module_exists('color')) { _color_page_alter($variables); @@ -53,11 +54,11 @@ function bartik_process_page(&$variables) { $variables['hide_site_slogan'] = theme_get_setting('toggle_slogan') ? FALSE : TRUE; if ($variables['hide_site_name']) { // If toggle_name is FALSE, the site_name will be empty, so we rebuild it. - $variables['site_name'] = filter_xss_admin(variable_get('site_name', 'Drupal')); + $variables['site_name'] = filter_xss_admin($config->get('site_name')); } if ($variables['hide_site_slogan']) { // If toggle_site_slogan is FALSE, the site_slogan will be empty, so we rebuild it. - $variables['site_slogan'] = filter_xss_admin(variable_get('site_slogan', '')); + $variables['site_slogan'] = filter_xss_admin($config->get('site_slogan')); } // Since the title and the shortcut link are both block level elements, // positioning them next to each other is much simpler with a wrapper div. @@ -94,17 +95,18 @@ function bartik_preprocess_maintenance_page(&$variables) { * Implements hook_process_HOOK() for maintenance-page.tpl.php. */ function bartik_process_maintenance_page(&$variables) { + $config = config('system.site'); // Always print the site name and slogan, but if they are toggled off, we'll // just hide them visually. $variables['hide_site_name'] = theme_get_setting('toggle_name') ? FALSE : TRUE; $variables['hide_site_slogan'] = theme_get_setting('toggle_slogan') ? FALSE : TRUE; if ($variables['hide_site_name']) { // If toggle_name is FALSE, the site_name will be empty, so we rebuild it. - $variables['site_name'] = filter_xss_admin(variable_get('site_name', 'Drupal')); + $variables['site_name'] = filter_xss_admin($config->get('site_name')); } if ($variables['hide_site_slogan']) { // If toggle_site_slogan is FALSE, the site_slogan will be empty, so we rebuild it. - $variables['site_slogan'] = filter_xss_admin(variable_get('site_slogan', '')); + $variables['site_slogan'] = filter_xss_admin($config->get('site_slogan')); } } diff --git a/profiles/standard/standard.install b/profiles/standard/standard.install index eef8d0c..aaec981 100644 --- a/profiles/standard/standard.install +++ b/profiles/standard/standard.install @@ -206,7 +206,7 @@ function standard_install() { $query->execute(); // Set front page to "node". - variable_set('site_frontpage', 'node'); + config('system.site')->set('site_frontpage', 'node')->save(); // Insert default pre-defined node types into the database. For a complete // list of available node type attributes, refer to the node type API