'. st('Congratulations, @drupal has been successfully installed.', array('@drupal' => drupal_install_profile_name())) .'
'; @@ -620,8 +626,9 @@ function install_task_list($active = NUL 'install' => st('Installation'), ); + $profiles = install_find_profiles(); // Remove profiles if only one profile exists. - if (count(install_find_profiles()) == 1) { + if (count($profiles) == 1) { unset($tasks['profile']); } @@ -630,6 +637,15 @@ function install_task_list($active = NUL unset($tasks['locale']); } + if (isset($_GET['profile']) && isset($profiles[$_GET['profile']])) { + $function = $_GET['profile'] . '_profile_tasks'; + if (function_exists($function)) { + $result = $function(); + if (is_array($result)) { + $tasks += $result; + } + } + } drupal_set_content('left', theme_task_list($tasks, $active)); } Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.777 diff -u -p -r1.777 user.module --- modules/user/user.module 30 Apr 2007 17:03:29 -0000 1.777 +++ modules/user/user.module 5 May 2007 20:39:18 -0000 @@ -1375,7 +1375,10 @@ function user_register_submit($form_id, // The first user may login immediately, and receives a customized welcome e-mail. if ($account->uid == 1) { drupal_mail('user-register-admin', $mail, t('Drupal user account details for !s', array('!s' => $name)), strtr(t("!username,\n\nYou may now login to !uri using the following username and password:\n\n username: !username\n password: !password\n\n!edit_uri\n\n--drupal"), $variables), $from); - drupal_set_message(t('Welcome to Drupal. You are user #1, which gives you full and immediate access. All future registrants will receive their passwords via e-mail, so please make sure your website e-mail address is set properly under the general settings on the site information settings page.
Your password is %pass. You may change your password below.
', array('%pass' => $pass, '@settings' => url('admin/settings/site-information')))); + drupal_set_message(t('Welcome to Drupal. You are user #1, which gives you full and immediate access. All future registrants will receive their passwords via e-mail, so please make sure your website e-mail address is set properly under the general settings on the site information settings page.')); + if (variable_get('user_email_verification', TRUE)) { + drupal_set_message(t('
Your password is %pass. You may change your password below.
', array('%pass' => $pass, '@settings' => url('admin/settings/site-information')))); + } user_authenticate($account->name, trim($pass)); return 'user/1/edit'; Index: profiles/default/default.profile =================================================================== RCS file: /cvs/drupal/drupal/profiles/default/default.profile,v retrieving revision 1.9 diff -u -p -r1.9 default.profile --- profiles/default/default.profile 10 Apr 2007 10:10:27 -0000 1.9 +++ profiles/default/default.profile 5 May 2007 20:39:18 -0000 @@ -25,6 +25,26 @@ function default_profile_details() { } /** + * Return a list of tasks that this profile supports. + * + * @return + * A keyed array of tasks the profile will perform during the _final stage. + */ +function default_profile_tasks() { + return array('profile_info' => st('Enter site details')); +} + +/** + * Return the current task during the final stage + * + * @return + * A key to the tasks array, as defined in *_profile_tasks() + */ +function default_profile_final_task() { + return 'profile_info'; +} + +/** * Perform any final installation tasks for this profile. * * @return @@ -32,6 +52,81 @@ function default_profile_details() { * screen. */ function default_profile_final() { + $account = user_load(1); + if ($account) { + drupal_goto(); + } + return drupal_get_form('default_profile_final_form'); +} + +function default_profile_final_form() { + // This is necessary to add the state to the $_GET args so the install + // system will know that it is done and we've taken over. + $form['#action'] = 'install.php?profile=default&state=profile_info'; + $form['intro'] = array( + '#value' => t('Now, please provide some basic information for your site, so that we may finalize this information.'), + ); + $form['site_name'] = array( + '#type' => 'textfield', + '#title' => t('Name'), + '#default_value' => variable_get('site_name', 'Drupal'), + '#description' => t('The name of this website.'), + '#required' => TRUE + ); + $form['site_mail'] = array( + '#type' => 'textfield', + '#title' => t('E-mail address'), + '#default_value' => variable_get('site_mail', ini_get('sendmail_from')), + '#description' => t('A valid e-mail address to be used as the "From" address by the auto-mailer during registration, new password requests, notifications, etc. To lessen the likelihood of e-mail being marked as spam, this e-mail address should use the same domain as the website.'), + '#required' => TRUE, + ); + $form['account']['#tree'] = TRUE; + $form['account']['name'] = array('#type' => 'textfield', + '#title' => t('Admin username'), + '#maxlength' => USERNAME_MAX_LENGTH, + '#description' => t('Your preferred administrator username; punctuation is not allowed except for periods, hyphens, and underscores.'), + '#required' => TRUE, + ); + + $form['account']['mail'] = array('#type' => 'textfield', + '#title' => t('Admin E-mail address'), + '#maxlength' => EMAIL_MAX_LENGTH, + '#description' => t('A valid e-mail address. All e-mails from the system will be sent to this address. The e-mail address is not made public and will only be used if you wish to receive a new password or wish to receive certain news or notifications by e-mail.'), + '#required' => TRUE, + ); + $form['account']['pass'] = array( + '#type' => 'password_confirm', + '#description' => t('Provide a password for the admin account in both fields.'), + '#required' => TRUE, + '#size' => 25, + ); + + $zones = _system_zonelist(); + + $form['date_default_timezone'] = array( + '#type' => 'select', + '#title' => t('Default time zone'), + '#default_value' => variable_get('date_default_timezone', 0), + '#options' => $zones, + '#description' => t('Select the default site time zone.') + ); + $form['submit'] = array( + '#type' => 'submit', + '#value' => t('Submit'), + ); + return $form; +} + +function default_profile_final_form_submit($form_id, $form_values) { + variable_set('site_name', $form_values['site_name']); + variable_set('site_mail', $form_values['site_mail']); + variable_set('date_default_timezone', $form_values['date_default_timezone']); + // Turn this off temporarily so that we can pass a password through. + variable_set('user_email_verification', FALSE); + user_register_submit('user_register', $form_values['account']); + variable_set('user_email_verification', TRUE); + drupal_set_message(t('Site installation completed! Welcome to your new site!')); + // Insert default user-defined node types into the database. For a complete // list of available node type attributes, refer to the node type API // documentation at: http://api.drupal.org/api/HEAD/function/hook_node_info.