',
@@ -938,6 +938,15 @@ if (Drupal.jsEnabled) {
'#weight' => 10,
);
+ $form['server_settings']['update_status_module'] = array(
+ '#type' => 'radios',
+ '#title' => st('Update notifications'),
+ '#options' => array(0 => st('Disabled'), 1 => st('Check for updates automatically.')),
+ '#default_value' => 1,
+ '#description' => st('Drupal can check periodically for important bug fixes and security releases. In order to notify you of updates, your site will send anonymous information on its installed components to drupal.org (see the
Drupal.org privacy policy). It is
highly recommended that you enable this option for your site\'s security. For more information, view
How update checking works page.', array('@privacy' => 'http://drupal.org/privacy', '@update' => 'http://drupal.org/update')),
+ '#weight' => 15,
+ );
+
$form['submit'] = array(
'#type' => 'submit',
'#value' => st('Save'),
@@ -947,6 +956,7 @@ if (Drupal.jsEnabled) {
if (function_exists($hook_form_alter)) {
$hook_form_alter($form, 'install_configure');
}
+
return $form;
}
@@ -969,6 +979,11 @@ function install_configure_form_submit($
variable_set('site_mail', $form_state['values']['site_mail']);
variable_set('date_default_timezone', $form_state['values']['date_default_timezone']);
+ // Enable Update status module if this option was selected.
+ if ($form_state['values']['update_status_module']) {
+ drupal_install_modules(array('update'));
+ }
+
// Turn this off temporarily so that we can pass a password through.
variable_set('user_email_verification', FALSE);
$form_state['old_values'] = $form_state['values'];
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.156
diff -u -p -r1.156 system.install
--- modules/system/system.install 26 Sep 2007 20:01:17 -0000 1.156
+++ modules/system/system.install 29 Sep 2007 15:35:50 -0000
@@ -187,6 +187,23 @@ function system_requirements($phase) {
include_once './includes/unicode.inc';
$requirements = array_merge($requirements, unicode_requirements());
+ // Check for Update status module.
+ if ($phase == 'runtime') {
+ if (!module_exists('update')) {
+ $requirements['update status'] = array(
+ 'value' => $t('Not enabled'),
+ 'severity' => REQUIREMENT_ERROR,
+ 'description' => $t('Update notifucations are not enabled. It is highly recommended that you enable the Update status module from the
module administration page in order to stay up-to-date on new releases.', array('@module' => url('admin/build/modules'))),
+ );
+ }
+ else {
+ $requirements['update status'] = array(
+ 'value' => $t('Enabled'),
+ );
+ }
+ $requirements['update status']['title'] = $t('Update notifications');
+ }
+
return $requirements;
}
@@ -3634,6 +3651,8 @@ function system_update_6026() {
drupal_set_installed_schema_version('update', 0);
module_enable(array('update'));
menu_rebuild();
+ drupal_set_message(t('The Update module was automatically enabled. This module automatically checks for new versions of modules and themes. For more information, please read the
Update module help page.', array('@update-help' => url('admin/help/update'))), 'warning');
+
return $ret;
}
Index: modules/update/update.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/update/update.module,v
retrieving revision 1.1
diff -u -p -r1.1 update.module
--- modules/update/update.module 11 Jul 2007 15:15:40 -0000 1.1
+++ modules/update/update.module 29 Sep 2007 15:35:50 -0000
@@ -71,6 +71,13 @@ function update_help($path, $arg) {
// These two pages don't need additional nagging.
break;
+ case 'admin/help#update':
+ $output = '
'. t("The Update status module periodically checks for new versions of your site's software (including contributed modules and themes), and alerts you to available updates.") .'
';
+ $output .= '
'. t('The log of available updates will indicate when new releases are ready for download, and you may configure various options, including frequency of update checking and notification options, at the Update status module settings page.', array('@update-log' => url('admin/logs/updates'), '@update-settings' => url('admin/logs/updates/settings'))) .'
';
+ $output .= '
'. t('Please note that in order to provide this information, anonymous usage statistics are sent to drupal.org. Please see the drupal.org privacy policy for more information. If desired, you may disable the Update status module from the module administration page.', array('@privacy' => 'http://drupal.org/privacy', '@modules' => url('admin/build/modules'))) .'
';
+ $output .= '
'. t('For more information please read the configuration and customization handbook Update status page.', array('@update' => 'http://drupal.org/handbook/modules/update')) .'
';
+ return $output;
+
default:
// Otherwise, if we're on *any* admin page and there's a security
// update missing, print an error message about it.
Index: profiles/default/default.profile
===================================================================
RCS file: /cvs/drupal/drupal/profiles/default/default.profile,v
retrieving revision 1.16
diff -u -p -r1.16 default.profile
--- profiles/default/default.profile 11 Jul 2007 15:15:40 -0000 1.16
+++ profiles/default/default.profile 29 Sep 2007 15:35:51 -0000
@@ -8,7 +8,7 @@
* An array of modules to be enabled.
*/
function default_profile_modules() {
- return array('color', 'comment', 'help', 'menu', 'taxonomy', 'dblog', 'update');
+ return array('color', 'comment', 'help', 'menu', 'taxonomy', 'dblog');
}
/**