Using this your site can "call home" to another Drupal server. By calling home to drupal.org and sending a list of your installed modules and themes, you help rank projects on drupal.org and so assist all Drupal administrators to find the best components for meeting their needs. If you want to register with a different server, you can change the Drupal XML-RPC server setting -- but the server has to be able to handle Drupal XML. Some XML-RPC servers may present directories of all registered sites. To get all your site information listed, go to the site information settings page and set the site name, the e-mail address, the slogan, and the mission statement.
', array('@site-settings' => url('admin/settings/site-information'))); case 'user/help#drupal': return variable_get('drupal_authentication_service', 0) ? t("Drupal is the name of the software that powers %this-site. There are Drupal web sites all over the world, and many of them share their registration databases so that users may freely log in to any Drupal site using a single Drupal ID.
-So please feel free to log in to your account here at %this-site with a username from another Drupal site. The format of a Drupal ID is similar to an e-mail address: username@server. An example of a valid Drupal ID is mwlily@drupal.org.
", array('@Drupal' => 'http://drupal.org', '%this-site' => variable_get('site_name', 'this web site'))) : ''; +So please feel free to log in to your account here at %this-site with a username from another Drupal site. The format of a Drupal ID is similar to an e-mail address: username@server. An example of a valid Drupal ID is mwlily@drupal.org.
", array('@Drupal' => 'http://drupal.org', '%this-site' => variable_get('site_name', DRUPAL_DEFAULT_SITE_NAME))) : ''; } } function drupal_sites_registry_settings() { // Check if all required fields are present - if ((variable_get('site_name', 'Drupal') == 'Drupal') || (variable_get('site_name', 'Drupal') == '')) { + if ((variable_get('site_name', DRUPAL_DEFAULT_SITE_NAME) == DRUPAL_DEFAULT_SITE_NAME) || (variable_get('site_name', DRUPAL_DEFAULT_SITE_NAME) == '')) { form_set_error('drupal_directory', t('You must set the name of your site on the administer » settings » site information page.', array('@url' => url('admin/settings/site-information')))); } else if (variable_get('site_mail', ini_get('sendmail_from')) == '') { Index: modules/filter/filter.module =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v retrieving revision 1.148 diff -u -p -r1.148 filter.module --- modules/filter/filter.module 26 Oct 2006 05:31:14 -0000 1.148 +++ modules/filter/filter.module 19 Nov 2006 22:35:15 -0000 @@ -177,7 +177,7 @@ function filter_filter_tips($delta, $forThis 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.
For more information see W3C\'s HTML Specifications or use your favorite search engine to find other sites that explain HTML.
'); $tips = array( - 'a' => array( t('Anchors are used to make links to other pages.'), ''. variable_get('site_name', 'Drupal') .''), + 'a' => array( t('Anchors are used to make links to other pages.'), ''. variable_get('site_name', DRUPAL_DEFAULT_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 withline 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'), ''. t('Strong'). ''), Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.731 diff -u -p -r1.731 node.module --- modules/node/node.module 17 Nov 2006 07:01:38 -0000 1.731 +++ modules/node/node.module 19 Nov 2006 22:35:18 -0000 @@ -1800,7 +1800,7 @@ function node_feed($nodes = 0, $channel $channel_defaults = array( 'version' => '2.0', - 'title' => variable_get('site_name', 'Drupal') .' - '. variable_get('site_slogan', ''), + 'title' => variable_get('site_name', DRUPAL_DEFAULT_SITE_NAME) .' - '. variable_get('site_slogan', ''), 'link' => $base_url, 'description' => variable_get('site_mission', ''), 'language' => $locale @@ -2323,7 +2323,7 @@ function node_page_default() { if (db_num_rows($result)) { $feed_url = url('rss.xml', NULL, NULL, TRUE); - drupal_add_feed($feed_url, variable_get('site_name', 'Drupal') .' '. t('RSS')); + drupal_add_feed($feed_url, variable_get('site_name', DRUPAL_DEFAULT_SITE_NAME) .' '. t('RSS')); $output = ''; while ($node = db_fetch_object($result)) { Index: modules/ping/ping.module =================================================================== RCS file: /cvs/drupal/drupal/modules/ping/ping.module,v retrieving revision 1.44 diff -u -p -r1.44 ping.module --- modules/ping/ping.module 7 Sep 2006 08:12:24 -0000 1.44 +++ modules/ping/ping.module 19 Nov 2006 22:35:19 -0000 @@ -34,9 +34,9 @@ function ping_help($section) { function ping_cron() { global $base_url; - if (variable_get('site_name', 0)) { + if (variable_get('site_name', DRUPAL_DEFAULT_SITE_NAME) != DRUPAL_DEFAULT_SITE_NAME) { if (db_num_rows(db_query("SELECT nid FROM {node} WHERE status = 1 AND (created > '". variable_get('cron_last', time()) ."' OR changed > '". variable_get('cron_last', time()) ."')"))) { - _ping_notify(variable_get('site_name', ''), $base_url); + _ping_notify(variable_get('site_name', DRUPAL_DEFAULT_SITE_NAME), $base_url); } } } Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.398 diff -u -p -r1.398 system.module --- modules/system/system.module 17 Nov 2006 17:22:45 -0000 1.398 +++ modules/system/system.module 19 Nov 2006 22:35:22 -0000 @@ -542,7 +542,7 @@ function system_site_information_setting $form['site_name'] = array( '#type' => 'textfield', '#title' => t('Name'), - '#default_value' => variable_get('site_name', 'Drupal'), + '#default_value' => variable_get('site_name', DRUPAL_DEFAULT_SITE_NAME), '#description' => t('The name of this web site.'), '#required' => TRUE ); @@ -844,6 +844,7 @@ function system_site_maintenance_setting '#description' => t('When set to "Online", all visitors will be able to browse your site normally. When set to "Off-line", only users with the "administer site configuration" permission will be able to access your site to perform maintenance; all other visitors will see the site off-line message configured below. Authorized users can log in during "Off-line" mode directly via the user login page.', array('@user-login' => url('user'))), ); + // DRUPAL_DEFAULT_SITE_NAME deliberatley not used here for the default Drupal site name. $form['site_offline_message'] = array( '#type' => 'textarea', '#title' => t('Site off-line message'), Index: modules/taxonomy/taxonomy.module =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v retrieving revision 1.323 diff -u -p -r1.323 taxonomy.module --- modules/taxonomy/taxonomy.module 10 Nov 2006 19:40:23 -0000 1.323 +++ modules/taxonomy/taxonomy.module 19 Nov 2006 22:35:23 -0000 @@ -1324,7 +1324,7 @@ function taxonomy_term_page($str_tids = case 'feed': $term = taxonomy_get_term($tids[0]); $channel['link'] = url('taxonomy/term/'. $str_tids .'/'. $depth, NULL, NULL, TRUE); - $channel['title'] = variable_get('site_name', 'Drupal') .' - '. $title; + $channel['title'] = variable_get('site_name', DRUPAL_DEFAULT_SITE_NAME) .' - '. $title; $channel['description'] = $term->description; $result = taxonomy_select_nodes($tids, $terms['operator'], $depth, FALSE); Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.712 diff -u -p -r1.712 user.module --- modules/user/user.module 17 Nov 2006 21:46:32 -0000 1.712 +++ modules/user/user.module 19 Nov 2006 22:35:27 -0000 @@ -897,10 +897,10 @@ function user_login($msg = '') { '#attributes' => array('tabindex' => '1'), ); if (variable_get('drupal_authentication_service', FALSE) && count(user_auth_help_links()) > 0) { - $form['name']['#description'] = t('Enter your @s username, or an ID from one of our affiliates: !a.', array('@s' => variable_get('site_name', 'local'), '!a' => implode(', ', user_auth_help_links()))); + $form['name']['#description'] = t('Enter your @s username, or an ID from one of our affiliates: !a.', array('@s' => variable_get('site_name', DRUPAL_DEFAULT_SITE_NAME), '!a' => implode(', ', user_auth_help_links()))); } else { - $form['name']['#description'] = t('Enter your @s username.', array('@s' => variable_get('site_name', 'local'))); + $form['name']['#description'] = t('Enter your @s username.', array('@s' => variable_get('site_name', DRUPAL_DEFAULT_SITE_NAME))); } $form['pass'] = array('#type' => 'password', '#title' => t('Password'), @@ -1060,7 +1060,7 @@ function user_pass_submit($form_id, $for $from = variable_get('site_mail', ini_get('sendmail_from')); // Mail one time login URL and instructions. - $variables = array('!username' => $account->name, '!site' => variable_get('site_name', 'Drupal'), '!login_url' => user_pass_reset_url($account), '!uri' => $base_url, '!uri_brief' => substr($base_url, strlen('http://')), '!mailto' => $account->mail, '!date' => format_date(time()), '!login_uri' => url('user', NULL, NULL, TRUE), '!edit_uri' => url('user/'. $account->uid .'/edit', NULL, NULL, TRUE)); + $variables = array('!username' => $account->name, '!site' => variable_get('site_name', DRUPAL_DEFAULT_SITE_NAME), '!login_url' => user_pass_reset_url($account), '!uri' => $base_url, '!uri_brief' => substr($base_url, strlen('http://')), '!mailto' => $account->mail, '!date' => format_date(time()), '!login_uri' => url('user', NULL, NULL, TRUE), '!edit_uri' => url('user/'. $account->uid .'/edit', NULL, NULL, TRUE)); $subject = _user_mail_text('pass_subject', $variables); $body = _user_mail_text('pass_body', $variables); $mail_success = drupal_mail('user-pass', $account->mail, $subject, $body, $from); @@ -1229,7 +1229,7 @@ function user_register_submit($form_id, $account = user_save('', array_merge($form_values, array('pass' => $pass, 'init' => $mail, 'roles' => $roles, 'status' => ($admin || variable_get('user_register', 1) == 1)))); watchdog('user', t('New user: %name %email.', array('%name' => $name, '%email' => '<'. $mail .'>')), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $account->uid .'/edit')); - $variables = array('!username' => $name, '!site' => variable_get('site_name', 'Drupal'), '!password' => $pass, '!uri' => $base_url, '!uri_brief' => substr($base_url, strlen('http://')), '!mailto' => $mail, '!date' => format_date(time()), '!login_uri' => url('user', NULL, NULL, TRUE), '!edit_uri' => url('user/'. $account->uid .'/edit', NULL, NULL, TRUE), '!login_url' => user_pass_reset_url($account)); + $variables = array('!username' => $name, '!site' => variable_get('site_name', DRUPAL_DEFAULT_SITE_NAME), '!password' => $pass, '!uri' => $base_url, '!uri_brief' => substr($base_url, strlen('http://')), '!mailto' => $mail, '!date' => format_date(time()), '!login_uri' => url('user', NULL, NULL, TRUE), '!edit_uri' => url('user/'. $account->uid .'/edit', NULL, NULL, TRUE), '!login_url' => user_pass_reset_url($account)); // The first user may login immediately, and receives a customized welcome e-mail. if ($account->uid == 1) { @@ -2340,6 +2340,7 @@ function user_help($section) { case 'admin/user/search': return t('Enter a simple pattern ("*" may be used as a wildcard match) to search for a username. For example, one may search for "br" and Drupal might return "brian", "brad", and "brenda".
'); case 'user/help#user': + // DRUPAL_DEFAULT_SITE_NAME deliberatley not used here for the default Drupal site name. $site = variable_get('site_name', 'this website'); $affiliates = user_auth_help_links(); Index: themes/chameleon/chameleon.theme =================================================================== RCS file: /cvs/drupal/drupal/themes/chameleon/chameleon.theme,v retrieving revision 1.54 diff -u -p -r1.54 chameleon.theme --- themes/chameleon/chameleon.theme 23 Oct 2006 21:06:19 -0000 1.54 +++ themes/chameleon/chameleon.theme 19 Nov 2006 22:35:27 -0000 @@ -47,7 +47,7 @@ function chameleon_page($content, $show_ $output .= "". l(variable_get('site_name', 'drupal'), ""). "
"; + $output .= "". l(variable_get('site_name', DRUPAL_DEFAULT_SITE_NAME), ""). "
"; } if (theme_get_setting('toggle_slogan')) { $output .= "". variable_get('site_slogan', '') ."
";
Index: themes/engines/phptemplate/phptemplate.engine
===================================================================
RCS file: /cvs/drupal/drupal/themes/engines/phptemplate/phptemplate.engine,v
retrieving revision 1.50
diff -u -p -r1.50 phptemplate.engine
--- themes/engines/phptemplate/phptemplate.engine 23 Oct 2006 06:45:17 -0000 1.50
+++ themes/engines/phptemplate/phptemplate.engine 19 Nov 2006 22:35:28 -0000
@@ -186,10 +186,10 @@ function phptemplate_page($content, $sho
// Construct page title
if (drupal_get_title()) {
- $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'Drupal'));
+ $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', DRUPAL_DEFAULT_SITE_NAME));
}
else {
- $head_title = array(variable_get('site_name', 'drupal'));
+ $head_title = array(variable_get('site_name', DRUPAL_DEFAULT_SITE_NAME));
if (variable_get('site_slogan', '')) {
$head_title[] = variable_get('site_slogan', '');
}
@@ -215,7 +215,7 @@ function phptemplate_page($content, $sho
'secondary_links' => menu_secondary_links(),
'sidebar_left' => $sidebar_left,
'sidebar_right' => $sidebar_right,
- 'site_name' => (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : ''),
+ 'site_name' => (theme_get_setting('toggle_name') ? variable_get('site_name', DRUPAL_DEFAULT_SITE_NAME) : ''),
'site_slogan' => (theme_get_setting('toggle_slogan') ? variable_get('site_slogan', '') : ''),
'css' => drupal_add_css(),
'styles' => drupal_get_css(),