? modules/syndication ? profiles/custom/.DS_Store Index: profiles/custom/custom.profile =================================================================== RCS file: profiles/custom/custom.profile diff -N profiles/custom/custom.profile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ profiles/custom/custom.profile 10 Oct 2008 20:10:13 -0000 @@ -0,0 +1,107 @@ + 'Custom', + 'description' => 'Enables only minimum functionality.' + ); +} + +/** + * Return a list of tasks that this profile supports. + * + * @return + * A keyed array of tasks the profile will perform during + * the final stage. The keys of the array will be used internally, + * while the values will be displayed to the user in the installer + * task list. + */ +function custom_profile_task_list() { +} + +/** + * Perform any final installation tasks for this profile. + * + * The installer goes through the profile-select -> locale-select + * -> requirements -> database -> profile-install-batch + * -> locale-initial-batch -> configure -> locale-remaining-batch + * -> finished -> done tasks, in this order, if you don't implement + * this function in your profile. + * + * If this function is implemented, you can have any number of + * custom tasks to perform after 'configure', implementing a state + * machine here to walk the user through those tasks. First time, + * this function gets called with $task set to 'profile', and you + * can advance to further tasks by setting $task to your tasks' + * identifiers, used as array keys in the hook_profile_task_list() + * above. You must avoid the reserved tasks listed in + * install_reserved_tasks(). If you implement your custom tasks, + * this function will get called in every HTTP request (for form + * processing, printing your information screens and so on) until + * you advance to the 'profile-finished' task, with which you + * hand control back to the installer. Each custom page you + * return needs to provide a way to continue, such as a form + * submission or a link. You should also set custom page titles. + * + * You should define the list of custom tasks you implement by + * returning an array of them in hook_profile_task_list(), as these + * show up in the list of tasks on the installer user interface. + * + * Remember that the user will be able to reload the pages multiple + * times, so you might want to use variable_set() and variable_get() + * to remember your data and control further processing, if $task + * is insufficient. Should a profile want to display a form here, + * it can; the form should set '#redirect' to FALSE, and rely on + * an action in the submit handler, such as variable_set(), to + * detect submission and proceed to further tasks. See the configuration + * form handling code in install_tasks() for an example. + * + * Important: Any temporary variables should be removed using + * variable_del() before advancing to the 'profile-finished' phase. + * + * @param $task + * The current $task of the install system. When hook_profile_tasks() + * is first called, this is 'profile'. + * @param $url + * Complete URL to be used for a link or form action on a custom page, + * if providing any, to allow the user to proceed with the installation. + * + * @return + * An optional HTML string to display to the user. Only used if you + * modify the $task, otherwise discarded. + */ +function custom_profile_tasks(&$task, $url) { + module_disable(array('locale')); +} + +/** + * Implementation of hook_form_alter(). + * + * Allows the profile to alter the site-configuration form. This is + * called through custom invocation, so $form_state is not populated. + */ +function custom_form_alter(&$form, $form_state, $form_id) { + if ($form_id == 'install_configure') { + // Set default for site name field. + $form['site_information']['site_name']['#default_value'] = $_SERVER['SERVER_NAME']; + } +} Index: profiles/default/default.profile =================================================================== RCS file: /cvs/drupal/drupal/profiles/default/default.profile,v retrieving revision 1.30 diff -u -p -r1.30 default.profile --- profiles/default/default.profile 8 Oct 2008 03:27:56 -0000 1.30 +++ profiles/default/default.profile 10 Oct 2008 20:10:13 -0000 @@ -21,8 +21,8 @@ function default_profile_modules() { */ function default_profile_details() { return array( - 'name' => 'Drupal', - 'description' => 'Select this profile to enable some basic Drupal functionality and the default theme.' + 'name' => 'Default', + 'description' => 'Enables some basic Drupal functionality and adds dummy data.', ); } Index: profiles/expert/expert.profile =================================================================== RCS file: profiles/expert/expert.profile diff -N profiles/expert/expert.profile --- profiles/expert/expert.profile 5 Jul 2008 10:58:12 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,107 +0,0 @@ - 'Drupal (experts only)', - 'description' => 'Select this profile to install with only minimum functionality enabled.' - ); -} - -/** - * Return a list of tasks that this profile supports. - * - * @return - * A keyed array of tasks the profile will perform during - * the final stage. The keys of the array will be used internally, - * while the values will be displayed to the user in the installer - * task list. - */ -function expert_profile_task_list() { -} - -/** - * Perform any final installation tasks for this profile. - * - * The installer goes through the profile-select -> locale-select - * -> requirements -> database -> profile-install-batch - * -> locale-initial-batch -> configure -> locale-remaining-batch - * -> finished -> done tasks, in this order, if you don't implement - * this function in your profile. - * - * If this function is implemented, you can have any number of - * custom tasks to perform after 'configure', implementing a state - * machine here to walk the user through those tasks. First time, - * this function gets called with $task set to 'profile', and you - * can advance to further tasks by setting $task to your tasks' - * identifiers, used as array keys in the hook_profile_task_list() - * above. You must avoid the reserved tasks listed in - * install_reserved_tasks(). If you implement your custom tasks, - * this function will get called in every HTTP request (for form - * processing, printing your information screens and so on) until - * you advance to the 'profile-finished' task, with which you - * hand control back to the installer. Each custom page you - * return needs to provide a way to continue, such as a form - * submission or a link. You should also set custom page titles. - * - * You should define the list of custom tasks you implement by - * returning an array of them in hook_profile_task_list(), as these - * show up in the list of tasks on the installer user interface. - * - * Remember that the user will be able to reload the pages multiple - * times, so you might want to use variable_set() and variable_get() - * to remember your data and control further processing, if $task - * is insufficient. Should a profile want to display a form here, - * it can; the form should set '#redirect' to FALSE, and rely on - * an action in the submit handler, such as variable_set(), to - * detect submission and proceed to further tasks. See the configuration - * form handling code in install_tasks() for an example. - * - * Important: Any temporary variables should be removed using - * variable_del() before advancing to the 'profile-finished' phase. - * - * @param $task - * The current $task of the install system. When hook_profile_tasks() - * is first called, this is 'profile'. - * @param $url - * Complete URL to be used for a link or form action on a custom page, - * if providing any, to allow the user to proceed with the installation. - * - * @return - * An optional HTML string to display to the user. Only used if you - * modify the $task, otherwise discarded. - */ -function expert_profile_tasks(&$task, $url) { - module_disable(array('locale')); -} - -/** - * Implementation of hook_form_alter(). - * - * Allows the profile to alter the site-configuration form. This is - * called through custom invocation, so $form_state is not populated. - */ -function expert_form_alter(&$form, $form_state, $form_id) { - if ($form_id == 'install_configure') { - // Set default for site name field. - $form['site_information']['site_name']['#default_value'] = $_SERVER['SERVER_NAME']; - } -}