'. st('Congratulations, @drupal has been successfully installed.', array('@drupal' => drupal_install_profile_name())) .'
'; - - // Show profile finalization info. - $function = $profile .'_profile_final'; - if (function_exists($function)) { - // More steps required - $profile_message = $function(); + if (empty($state)) { + variable_set('install_state', 'finalize'); + $state = 'finalize'; + } + + if ($state == 'finalize') { + drupal_set_title(st('Enter site details')); + menu_rebuild(); + + // We break the form up so we can tell when it's been successfully + // submitted. + $form = drupal_retrieve_form('install_finalize_form'); + + // In order to find out if the form was successfully submitted or not, + // we do a little song and dance to set the form to 'programmed' and check + // to make sure this is really the form being submitted. It'd better be. + if ($_POST && $_POST['form_id'] == 'install_finalize_form') { + $form['#programmed'] = TRUE; + $form['#post'] = $_POST; + } + + if (!drupal_process_form('install_finalize_form', $form)) { + $output = drupal_render_form('install_finalize_form', $form); + install_task_list('finalize'); + } } - menu_rebuild(); - // If the profile returned a welcome message, use that instead of default. - if (isset($profile_message)) { - $output .= $profile_message; - } - else { - // No more steps - $output .= ''. (drupal_set_message() ? st('Please review the messages above before continuing on to your new site.', array('@url' => url(''))) : st('You may now visit your new site.', array('@url' => url('')))) .'
'; + // If we have no output, then install.php is done and now we turn to + // our profile to finalize things. + if (empty($output)) { + // Show profile finalization info. + $function = $profile .'_profile_final'; + if (function_exists($function)) { + // More steps required + $output = $function($state); + } + + // This comes after the above so it can make decisions based upon + // form results. + + $function = $profile .'_profile_final_task'; + if (function_exists($function) && $task = $function($state)) { + $state = $task; + } + else { + $state = 'complete'; + } + + install_task_list($state); + variable_set('install_state', $state); + + // Store install profile for later use. + if ($state == 'complete') { + drupal_set_title(st('@drupal installation complete', array('@drupal' => drupal_install_profile_name()))); + + variable_set('install_profile', $profile); + + $output = ''. (drupal_set_message() ? st('Please review the messages above before continuing on to your new site.', array('@url' => url(''))) : st('You may now visit your new site.', array('@url' => url('')))) .'
'; + + $function = $profile .'_profile_final_message'; + if (function_exists($function)) { + $output .= $function(); + } + } } // Output page. print theme('maintenance_page', $output); @@ -618,10 +670,12 @@ function install_task_list($active = NUL 'requirements' => st('Verify requirements'), 'database' => st('Database setup'), 'install' => st('Installation'), + 'finalize' => st('Enter site details'), ); + $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,7 +684,119 @@ 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; + } + } + } + + // Let the theming function know that 'complete' includes everything, + // even though it's not in the list. + if ($active == 'complete') { + $active = NULL; + } drupal_set_content('left', theme_task_list($tasks, $active)); } +function install_finalize_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['intro'] = array( + '#value' => t('To finalize installation, please configure the following 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('Site 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('Administrator 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('Administrator 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 administrator 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. By default, dates in this site will be displayed in the chosen time zone.') + ); + + drupal_add_js(drupal_get_path('module', 'system') .'/system.js', 'module'); + drupal_add_js(array('cleanURL' => array('success' => t('Your server has been successfully tested to support this feature.'), 'failure' => t('Your system configuration does not currently support this feature. The handbook page on Clean URLs has additional troubleshooting information.'), 'testing' => t('Testing clean URLs...'))), 'setting'); + drupal_add_js(' +// Global Killswitch +if (Drupal.jsEnabled) { + $(document).ready(function() { + Drupal.cleanURLsInstallCheck(); + Drupal.installDefaultTimezone(); + }); +}', 'inline'); + + $form['clean_url'] = array( + '#type' => 'radios', + '#title' => t('Clean URLs'), + '#default_value' => variable_get('clean_url', 0), + '#options' => array(t('Disabled'), t('Enabled')), + '#description' => t('This option makes Drupal emit "clean" URLs (i.e. without?q= in the URL).'),
+ '#disabled' => TRUE,
+ '#prefix' => '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.', array('@settings' => url('admin/settings/site-information')))); + if (variable_get('user_email_verification', TRUE)) { + drupal_set_message(t('
Your password is %pass. You may change your password below.
', array('%pass' => $pass))); + } 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 7 May 2007 21:03:50 -0000 @@ -25,13 +25,50 @@ 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 the current task during the final stage + * + * @param + * The current state of the install system. + * + * @return + * A key to the tasks array, as defined in *_profile_tasks(), or NULL + * to indicate that everything is complete. + */ +function default_profile_final_task($state) { +} + +/** + * Display a final message to the user after all install steps are complete. + * + * @return + * A string containing the message. + */ +function default_profile_final_message() { +} + +/** * Perform any final installation tasks for this profile. * + * @param $key + * The $key returned by default_profile_final_task (if any) or the + * $state if that was not set. + * * @return * An optional HTML string to display to the user on the final installation * screen. */ -function default_profile_final() { +function default_profile_final($key) { + // Should a profile want to display a form here, it can; it should set the + // 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. @@ -74,3 +111,4 @@ function default_profile_final() { $theme_settings['toggle_node_info_page'] = FALSE; variable_set('theme_settings', $theme_settings); } +