diff options
| -rw-r--r-- | includes/form.inc | 5 | ||||
| -rw-r--r-- | includes/locale.inc | 20 | ||||
| -rw-r--r-- | install.php | 6 | ||||
| -rw-r--r-- | modules/aggregator/aggregator.module | 10 | ||||
| -rw-r--r-- | modules/block/block.module | 12 | ||||
| -rw-r--r-- | modules/book/book.module | 4 | ||||
| -rw-r--r-- | modules/color/color.module | 2 | ||||
| -rw-r--r-- | modules/comment/comment.module | 22 | ||||
| -rw-r--r-- | modules/contact/contact.module | 12 | ||||
| -rw-r--r-- | modules/dblog/dblog.module | 2 | ||||
| -rw-r--r-- | modules/filter/filter.module | 10 | ||||
| -rw-r--r-- | modules/forum/forum.module | 6 | ||||
| -rw-r--r-- | modules/locale/locale.module | 2 | ||||
| -rw-r--r-- | modules/menu/menu.module | 10 | ||||
| -rw-r--r-- | modules/node/content_types.inc | 6 | ||||
| -rw-r--r-- | modules/node/node.module | 22 | ||||
| -rw-r--r-- | modules/path/path.module | 8 | ||||
| -rw-r--r-- | modules/poll/poll.module | 2 | ||||
| -rw-r--r-- | modules/profile/profile.module | 6 | ||||
| -rw-r--r-- | modules/search/search.module | 8 | ||||
| -rw-r--r-- | modules/system/system.module | 16 | ||||
| -rw-r--r-- | modules/taxonomy/taxonomy.module | 10 | ||||
| -rw-r--r-- | modules/throttle/throttle.module | 2 | ||||
| -rw-r--r-- | modules/upload/upload.module | 8 | ||||
| -rw-r--r-- | modules/user/user.module | 38 |
25 files changed, 124 insertions, 125 deletions
diff --git a/includes/form.inc b/includes/form.inc index 39972177f..32662e718 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -392,7 +392,7 @@ function drupal_prepare_form($form_id, &$form, &$form_state) { } drupal_alter('form_'. $form_id, $form, $form_state); - drupal_alter('form', $form, $form_id, $form_state); + drupal_alter('form', $form, $form_state, $form_id); } @@ -613,7 +613,7 @@ function form_execute_handlers($type, &$form, &$form_state) { $batch['sets'][] = array('form_submit' => $function); } else { - $function($form_state['values'], $form, $form_state); + $function($form, $form_state, $form_state['values']); } $return = TRUE; } @@ -1238,6 +1238,7 @@ function password_confirm_validate($form, &$form_state) { form_set_value($form, $pass1, $form_state); return $form; + } /** diff --git a/includes/locale.inc b/includes/locale.inc index 1fba748bc..141279c4a 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -82,7 +82,7 @@ function theme_locale_languages_overview_form($form) { /** * Process language overview form submissions, updating existing languages. */ -function locale_languages_overview_form_submit($form_values, $form, &$form_state) { +function locale_languages_overview_form_submit($form, &$form_state, $form_values) { $languages = language_list(); $enabled_count = 0; foreach ($languages as $langcode => $language) { @@ -266,7 +266,7 @@ function _locale_languages_common_controls(&$form, $language = NULL) { /** * Validate the language addition form. */ -function locale_languages_predefined_form_validate($form_values, $form, &$form_state) { +function locale_languages_predefined_form_validate($form, &$form_state, $form_values) { $langcode = $form_values['langcode']; if ($duplicate = db_num_rows(db_query("SELECT language FROM {languages} WHERE language = '%s'", $langcode)) != 0) { @@ -289,7 +289,7 @@ function locale_languages_predefined_form_validate($form_values, $form, &$form_s /** * Process the language addition form submission. */ -function locale_languages_predefined_form_submit($form_values, $form, &$form_state) { +function locale_languages_predefined_form_submit($form, &$form_state, $form_values) { $langcode = $form_values['langcode']; if (isset($form_values['name'])) { // Custom language form. @@ -316,7 +316,7 @@ function locale_languages_predefined_form_submit($form_values, $form, &$form_sta /** * Validate the language editing form. Reused for custom language addition too. */ -function locale_languages_edit_form_validate($form_values, $form, &$form_state) { +function locale_languages_edit_form_validate($form, &$form_state, $form_values) { if (!empty($form_values['domain']) && !empty($form_values['prefix'])) { form_set_error('prefix', t('Domain and path prefix values should not be set at the same time.')); } @@ -335,7 +335,7 @@ function locale_languages_edit_form_validate($form_values, $form, &$form_state) /** * Process the language editing form submission. */ -function locale_languages_edit_form_submit($form_values, $form, &$form_state) { +function locale_languages_edit_form_submit($form, &$form_state, $form_values) { db_query("UPDATE {languages} SET name = '%s', native = '%s', domain = '%s', prefix = '%s', direction = %d WHERE language = '%s'", $form_values['name'], $form_values['native'], $form_values['domain'], $form_values['prefix'], $form_values['direction'], $form_values['langcode']); $default = language_default(); if ($default->language == $form_values['langcode']) { @@ -389,7 +389,7 @@ function locale_languages_delete_form($langcode) { /** * Process language deletion submissions. */ -function locale_languages_delete_form_submit($form_values, $form, &$form_state) { +function locale_languages_delete_form_submit($form, &$form_state, $form_values) { $languages = language_list(); if (isset($languages[$form_values['langcode']])) { db_query("DELETE FROM {languages} WHERE language = '%s'", $form_values['langcode']); @@ -440,7 +440,7 @@ function locale_languages_configure_form() { /** * Submit function for language negotiation settings. */ -function locale_languages_configure_form_submit($form_values, $form, &$form_state) { +function locale_languages_configure_form_submit($form, &$form_state, $form_values) { variable_set('language_negotiation', $form_values['language_negotiation']); drupal_set_message(t('Language negotiation configuration saved.')); $form_state['redirect'] = 'admin/settings/language'; @@ -613,7 +613,7 @@ function locale_translate_import_form() { /** * Process the locale import form submission. */ -function locale_translate_import_form_submit($form_values, $form, &$form_state) { +function locale_translate_import_form_submit($form, &$form_state, $form_values) { // Ensure we have the file uploaded if ($file = file_check_upload('file')) { @@ -716,7 +716,7 @@ function locale_translate_export_pot_form() { /** * Process a translation (or template) export form submission. */ -function locale_translate_export_po_form_submit($form_values, $form, &$form_state) { +function locale_translate_export_po_form_submit($form, &$form_state, $form_values) { // If template is required, language code is not given. _locale_export_po(isset($form_values['langcode']) ? $form_values['langcode'] : NULL, $form_values['group']); } @@ -785,7 +785,7 @@ function locale_translate_edit_form($lid) { * Process string editing form submissions. * Saves all translations of one string submitted from a form. */ -function locale_translate_edit_form_submit($form_values, $form, &$form_state) { +function locale_translate_edit_form_submit($form, &$form_state, $form_values) { $lid = $form_values['lid']; foreach ($form_values['translations'] as $key => $value) { $trans = db_fetch_object(db_query("SELECT translation FROM {locales_target} WHERE lid = %d AND language = '%s'", $lid, $key)); diff --git a/install.php b/install.php index aa51aabb1..3578a369d 100644 --- a/install.php +++ b/install.php @@ -335,7 +335,7 @@ function install_settings_form($profile, $install_locale, $settings_file, $db_ur /** * Form API validate for install_settings form. */ -function install_settings_form_validate($form_values, $form, &$form_state) { +function install_settings_form_validate($form, &$form_state, $form_values) { global $db_url; _install_settings_form_validate($form_values['db_prefix'], $form_values['db_type'], $form_values['db_user'], $form_values['db_pass'], $form_values['db_host'], $form_values['db_port'], $form_values['db_path'], $form_values['settings_file'], $form_state, $form); } @@ -926,7 +926,7 @@ if (Drupal.jsEnabled) { return $form; } -function install_configure_form_validate($form_values, $form, &$form_state) { +function install_configure_form_validate($form, &$form_state, $form_values) { if ($error = user_validate_name($form_values['account']['name'])) { form_error($form['admin_account']['account']['name'], $error); } @@ -938,7 +938,7 @@ function install_configure_form_validate($form_values, $form, &$form_state) { } } -function install_configure_form_submit($form_values, $form, &$form_state) { +function install_configure_form_submit($form, &$form_state, $form_values) { global $user; variable_set('site_name', $form_values['site_name']); diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index f0074b584..806c59a95 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -357,7 +357,7 @@ function aggregator_form_category($edit = array('title' => '', 'description' => /** * Validate aggregator_form_feed form submissions. */ -function aggregator_form_category_validate($form_values, $form, &$form_state) { +function aggregator_form_category_validate($form, &$form_state, $form_values) { if ($form_values['op'] == t('Submit')) { // Check for duplicate titles if (isset($form_values['cid'])) { @@ -376,7 +376,7 @@ function aggregator_form_category_validate($form_values, $form, &$form_state) { * Process aggregator_form_category form submissions. * @todo Add delete confirmation dialog. */ -function aggregator_form_category_submit($form_values, $form, &$form_state) { +function aggregator_form_category_submit($form, &$form_state, $form_values) { if ($form_values['op'] == t('Delete')) { $title = $form_values['title']; // Unset the title: @@ -492,7 +492,7 @@ function aggregator_form_feed($edit = array('refresh' => 900, 'title' => '', 'ur /** * Validate aggregator_form_feed form submissions. */ -function aggregator_form_feed_validate($form_values, $form, &$form_state) { +function aggregator_form_feed_validate($form, &$form_state, $form_values) { if ($form_values['op'] == t('Submit')) { // Check for duplicate titles if (isset($form_values['fid'])) { @@ -516,7 +516,7 @@ function aggregator_form_feed_validate($form_values, $form, &$form_state) { * Process aggregator_form_feed form submissions. * @todo Add delete confirmation dialog. */ -function aggregator_form_feed_submit($form_values, $form, &$form_state) { +function aggregator_form_feed_submit($form, &$form_state, $form_values) { if ($form_values['op'] == t('Delete')) { $title = $form_values['title']; // Unset the title: @@ -1170,7 +1170,7 @@ function aggregator_page_list_validate($form_id, &$form) { } } -function aggregator_page_list_submit($form_values, $form, &$form_state) { +function aggregator_page_list_submit($form, &$form_state, $form_values) { foreach ($form_values['categories'] as $iid => $selection) { db_query('DELETE FROM {aggregator_category_item} WHERE iid = %d', $iid); foreach ($selection as $cid) { diff --git a/modules/block/block.module b/modules/block/block.module index 84aa136aa..f7c27c69e 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -292,7 +292,7 @@ function _block_compare($a, $b) { /** * Process main block administration form submission. */ -function block_admin_display_submit($form_values, $form, &$form_state) { +function block_admin_display_submit($form, &$form_state, $form_values) { foreach ($form_values as $block) { $block['status'] = $block['region'] != BLOCK_REGION_NONE; $block['region'] = $block['status'] ? $block['region'] : ''; @@ -498,7 +498,7 @@ function block_admin_configure($module = NULL, $delta = 0) { return $form; } -function block_admin_configure_validate($form_values, $form, &$form_state) { +function block_admin_configure_validate($form, &$form_state, $form_values) { if ($form_values['module'] == 'block') { if (empty($form_values['info']) || db_num_rows(db_query("SELECT bid FROM {boxes} WHERE bid != %d AND info = '%s'", $form_values['delta'], $form_values['info']))) { form_set_error('info', t('Please ensure that each block description is unique.')); @@ -506,7 +506,7 @@ function block_admin_configure_validate($form_values, $form, &$form_state) { } } -function block_admin_configure_submit($form_values, $form, &$form_state) { +function block_admin_configure_submit($form, &$form_state, $form_values) { if (!form_get_errors()) { db_query("UPDATE {blocks} SET visibility = %d, pages = '%s', custom = %d, title = '%s' WHERE module = '%s' AND delta = '%s'", $form_values['visibility'], trim($form_values['pages']), $form_values['custom'], $form_values['title'], $form_values['module'], $form_values['delta']); db_query("DELETE FROM {blocks_roles} WHERE module = '%s' AND delta = '%s'", $form_values['module'], $form_values['delta']); @@ -528,7 +528,7 @@ function block_add_block_form() { return block_admin_configure('block', NULL); } -function block_add_block_form_validate($form_values, $form, &$form_state) { +function block_add_block_form_validate($form, &$form_state, $form_values) { if (empty($form_values['info']) || db_num_rows(db_query("SELECT info FROM {boxes} WHERE info = '%s'", $form_values['info']))) { form_set_error('info', t('Please ensure that each block description is unique.')); } @@ -537,7 +537,7 @@ function block_add_block_form_validate($form_values, $form, &$form_state) { /** * Save the new custom block. */ -function block_add_block_form_submit($form_values, $form, &$form_state) { +function block_add_block_form_submit($form, &$form_state, $form_values) { $delta = db_next_id('{boxes}_bid'); foreach (list_themes() as $key => $theme) { @@ -573,7 +573,7 @@ function block_box_delete($bid = 0) { /** * Deletion of custom blocks. */ -function block_box_delete_submit($form_values, $form, &$form_state) { +function block_box_delete_submit($form, &$form_state, $form_values) { db_query('DELETE FROM {boxes} WHERE bid = %d', $form_values['bid']); db_query("DELETE FROM {blocks} WHERE module = 'block' AND delta = %d", $form_values['bid']); drupal_set_message(t('The block %name has been removed.', array('%name' => $form_values['info']))); diff --git a/modules/book/book.module b/modules/book/book.module index 1d272cbb3..8dc1250b4 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -298,7 +298,7 @@ function book_outline($node) { /** * Handles book outline form submissions. */ -function book_outline_submit($form_values, $form, &$form_state) { +function book_outline_submit($form, &$form_state, $form_values) { $op = $form_values['op']; $node = node_load($form_values['nid']); @@ -931,7 +931,7 @@ function book_admin_orphan() { return $form; } -function book_admin_edit_submit($form_values, $form, &$form_state) { +function book_admin_edit_submit($form, &$form_state, $form_values) { foreach ($form_values['table'] as $row) { $node = node_load($row['nid']); diff --git a/modules/color/color.module b/modules/color/color.module index 1ea6c2a1b..027e7bd1a 100644 --- a/modules/color/color.module +++ b/modules/color/color.module @@ -14,7 +14,7 @@ function color_theme() { /** * Implementation of hook_form_alter(). */ -function color_form_alter(&$form, $form_id) { +function color_form_alter(&$form, $form_state, $form_id) { // Insert the color changer into the theme settings page. // TODO: Last condition in the following if disables color changer when private files are used this should be solved in a different way. See issue #92059. if ($form_id == 'system_theme_settings' && color_get_info(arg(4)) && function_exists('gd_info') && variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC) == FILE_DOWNLOADS_PUBLIC) { diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 6839c259e..9e6c25c8c 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -422,7 +422,7 @@ function comment_link($type, $node = NULL, $teaser = FALSE) { return $links; } -function comment_form_alter(&$form, $form_id) { +function comment_form_alter(&$form, $form_state, $form_id) { if ($form_id == 'node_type_form' && isset($form['identity']['type'])) { $form['workflow']['comment'] = array( '#type' => 'radios', @@ -1129,7 +1129,7 @@ function comment_confirm_delete($comment) { 'comment_confirm_delete'); } -function comment_confirm_delete_submit($form_values, $form, &$form_state) { +function comment_confirm_delete_submit($form, &$form_state, $form_values) { drupal_set_message(t('The comment and all its replies have been deleted.')); $comment = $form['#comment']; @@ -1229,7 +1229,7 @@ function comment_admin_overview($type = 'new', $arg) { /** * We can't execute any 'Update options' if no comments were selected. */ -function comment_admin_overview_validate($form_values, $form, &$form_state) { +function comment_admin_overview_validate($form, &$form_state, $form_values) { $form_values['comments'] = array_diff($form_values['comments'], array(0)); if (count($form_values['comments']) == 0) { form_set_error('', t('Please select one or more comments to perform the update on.')); @@ -1241,7 +1241,7 @@ function comment_admin_overview_validate($form_values, $form, &$form_state) { * Execute the chosen 'Update option' on the selected comments, such as * publishing, unpublishing or deleting. */ -function comment_admin_overview_submit($form_values, $form, &$form_state) { +function comment_admin_overview_submit($form, &$form_state, $form_values) { $operations = comment_operations(); if ($operations[$form_values['operation']][1]) { // extract the appropriate database query operation @@ -1326,7 +1326,7 @@ function comment_multiple_delete_confirm() { /** * Perform the actual comment deletion. */ -function comment_multiple_delete_confirm_submit($form_values, $form, &$form_state) { +function comment_multiple_delete_confirm_submit($form, &$form_state, $form_values) { if ($form_values['confirm']) { foreach ($form_values['comments'] as $cid => $value) { $comment = _comment_load($cid); @@ -1684,7 +1684,7 @@ function comment_form_add_preview($form, $edit, &$form_state) { return $form; } -function comment_form_validate($form_values, $form, &$form_state) { +function comment_form_validate($form, &$form_state, $form_values) { foreach (array('name', 'homepage', 'mail') as $field) { //set cookie for 365 days setcookie('comment_info_'. $field, $form_values[$field], time() + 31536000); @@ -1692,7 +1692,7 @@ function comment_form_validate($form_values, $form, &$form_state) { comment_validate($form_values); } -function _comment_form_submit($form_values) { +function _comment_form_submit(&$form_values) { if (!isset($form_values['date'])) { $form_values['date'] = 'now'; } @@ -1717,12 +1717,10 @@ function _comment_form_submit($form_values) { $form_values['subject'] = t('(No subject)'); } } - - return $form_values; } -function comment_form_submit(&$form_values, $form, &$form_state) { - $form_values = _comment_form_submit($form_values); +function comment_form_submit($form, &$form_state, $form_values) { + _comment_form_submit($form_state['values']); if ($cid = comment_save($form_values)) { $form_state['redirect'] = array('node/'. $form_values['nid'], NULL, "comment-$cid"); return; @@ -1808,7 +1806,7 @@ function theme_comment_controls($form) { return theme('box', t('Comment viewing options'), $output); } -function comment_controls_submit($form_values, $form, &$form_state) { +function comment_controls_submit($form, &$form_state, $form_values) { global $user; $mode = $form_values['mode']; diff --git a/modules/contact/contact.module b/modules/contact/contact.module index 950930995..016082e4e 100644 --- a/modules/contact/contact.module +++ b/modules/contact/contact.module @@ -209,7 +209,7 @@ function contact_admin_edit($cid = NULL) { /** * Validate the contact category edit page form submission. */ -function contact_admin_edit_validate($form_values, $form, &$form_state) { +function contact_admin_edit_validate($form, &$form_state, $form_values) { if (empty($form_values['category'])) { form_set_error('category', t('You must enter a category.')); } @@ -229,7 +229,7 @@ function contact_admin_edit_validate($form_values, $form, &$form_state) { /** * Process the contact category edit page form submission. */ -function contact_admin_edit_submit($form_values, $form, &$form_state) { +function contact_admin_edit_submit($form, &$form_state, $form_values) { if ($form_values['selected']) { // Unselect all other contact categories. db_query('UPDATE {contact} SET selected = 0'); @@ -276,7 +276,7 @@ function contact_admin_delete($cid = NULL) { /** * Process category delete form submission. */ -function contact_admin_delete_submit($form_values, $form, &$form_state) { +function contact_admin_delete_submit($form, &$form_state, $form_values) { db_query("DELETE FROM {contact} WHERE cid = %d", arg(4)); drupal_set_message(t('Category %category has been deleted.', array('%category' => $form_values['category']))); watchdog('mail', 'Contact form: category %category deleted.', array('%category' => $form_values['category']), WATCHDOG_NOTICE); @@ -359,7 +359,7 @@ function contact_mail_user($recipient) { /** * Process the personal contact page form submission. */ -function contact_mail_user_submit($form_values, $form, &$form_state) { +function contact_mail_user_submit($form, &$form_state, $form_values) { global $user; $account = user_load(array('uid' => arg(1), 'status' => 1)); @@ -496,7 +496,7 @@ function contact_mail_page() { /** * Validate the site-wide contact page form submission. */ -function contact_mail_page_validate($form_values, $form, &$form_state) { +function contact_mail_page_validate($form, &$form_state, $form_values) { if (!$form_values['cid']) { form_set_error('category', t('You must select a valid category.')); } @@ -508,7 +508,7 @@ function contact_mail_page_validate($form_values, $form, &$form_state) { /** * Process the site-wide contact page form submission. */ -function contact_mail_page_submit($form_values, $form, &$form_state) { +function contact_mail_page_submit($form, &$form_state, $form_values) { // E-mail address of the sender: as the form field is a text field, // all instances of \r and \n have been automatically stripped from it. diff --git a/modules/dblog/dblog.module b/modules/dblog/dblog.module index c812f0383..6bc52126e 100644 --- a/modules/dblog/dblog.module +++ b/modules/dblog/dblog.module @@ -369,7 +369,7 @@ function theme_dblog_filters($form) { return $output; } -function dblog_filter_form_validate($form_values, $form, &$form_state) { +function dblog_filter_form_validate($form, &$form_state, $form_values) { if ($form_values['op'] == t('Filter') && empty($form_values['type']) && empty($form_values['severity'])) { form_set_error('type', t('You must select something to filter by.')); } diff --git a/modules/filter/filter.module b/modules/filter/filter.module index bfc7d1c49..9a4239649 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -296,7 +296,7 @@ function filter_admin_overview() { return $form; } -function filter_admin_overview_submit($form_values, $form, &$form_state) { +function filter_admin_overview_submit($form, &$form_state, $form_values) { // Process form submission to set the default format if (is_numeric($form_values['default'])) { drupal_set_message(t('Default format updated.')); @@ -352,7 +352,7 @@ function filter_admin_delete() { /** * Process filter delete form submission. */ -function filter_admin_delete_submit($form_values, $form, &$form_state) { +function filter_admin_delete_submit($form, &$form_state, $form_values) { db_query("DELETE FROM {filter_formats} WHERE format = %d", $form_values['format']); db_query("DELETE FROM {filters} WHERE format = %d", $form_values['format']); @@ -442,7 +442,7 @@ function filter_admin_format_form($format = NULL) { /** * Validate filter format form submissions. */ -function filter_admin_format_form_validate($form_values, $form, &$form_state) { +function filter_admin_format_form_validate($form, &$form_state, $form_values) { if (!isset($form_values['format'])) { $name = trim($form_values['name']); $result = db_fetch_object(db_query("SELECT format FROM {filter_formats} WHERE name='%s'", $name)); @@ -455,7 +455,7 @@ function filter_admin_format_form_validate($form_values, $form, &$form_state) { /** * Process filter format form submissions. */ -function filter_admin_format_form_submit($form_values, $form, &$form_state) { +function filter_admin_format_form_submit($form, &$form_state, $form_values) { $format = isset($form_values['format']) ? $form_values['format'] : NULL; $current = filter_list_format($format); $name = trim($form_values['name']); @@ -551,7 +551,7 @@ function theme_filter_admin_order($form) { /** * Process filter order configuration form submission. */ -function filter_admin_order_submit($form_values, $form, &$form_state) { +function filter_admin_order_submit($form, &$form_state, $form_values) { foreach ($form_values['weights'] as $id => $weight) { list($module, $delta) = explode('/', $id); db_query("UPDATE {filters} SET weight = %d WHERE format = %d AND module = '%s' AND delta = %d", $weight, $form_values['format'], $module, $delta); diff --git a/modules/forum/forum.module b/modules/forum/forum.module index 6d865df52..a7c1a48fc 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -230,7 +230,7 @@ function forum_admin_settings() { /** * Implementation of hook_form_alter(). */ -function forum_form_alter(&$form, $form_id) { +function forum_form_alter(&$form, $form_state, $form_id) { // hide critical options from forum vocabulary if ($form_id == 'taxonomy_form_vocabulary') { if (isset($form['vid']) && $form['vid']['#value'] == _forum_get_vid()) { @@ -568,7 +568,7 @@ function forum_form_forum($edit = array()) { /** * Process forum form and container form submissions. */ -function forum_form_submit($form_values, $form, &$form_state) { +function forum_form_submit($form, &$form_state, $form_values) { if ($form['form_id'] == 'forum_form_container') { $container = TRUE; $type = t('forum container'); @@ -613,7 +613,7 @@ function forum_confirm_delete($tid) { /** * Implementation of forms api _submit call. Deletes a forum after confirmation. */ -function forum_confirm_delete_submit($form_values, $form, &$form_state) { +function forum_confirm_delete_submit($form, &$form_state, $form_values) { taxonomy_del_term($form_values['tid']); drupal_set_message(t('The forum %term and all sub-forums and associated posts have been deleted.', array('%term' => $form_values['name']))); watchdog('content', 'forum: deleted %term and all its sub-forums and associated posts.', array('%term' => $form_values['name'])); diff --git a/modules/locale/locale.module b/modules/locale/locale.module index 8d826fd55..3a4e835c1 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -214,7 +214,7 @@ function locale_user($type, $edit, &$user, $category = NULL) { /** * Implementation of hook_form_alter(). Adds language fields to forms. */ -function locale_form_alter(&$form, $form_id) { +function locale_form_alter(&$form, $form_state, $form_id) { switch ($form_id) { // Language field for paths diff --git a/modules/menu/menu.module b/modules/menu/menu.module index 8ba005110..d7ce16b7b 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -294,7 +294,7 @@ function menu_edit_item_form($type, $mid = 0) { return $form; } -function menu_edit_item_form_validate($form_values, $form, &$form_state) { +function menu_edit_item_form_validate($form, &$form_state, $form_values) { if (isset($form_values['path'])) { $path = $form_values['path']; // Skip external links. @@ -314,7 +314,7 @@ function menu_edit_item_form_validate($form_values, $form, &$form_state) { /** * Process menu and menu item add/edit form submissions. */ -function menu_edit_item_form_submit($form_values, $form, &$form_state) { +function menu_edit_item_form_submit($form, &$form_state, $form_values) { menu_edit_item_save($form_values); $form_state['redirect'] = 'admin/build/menu'; return; @@ -468,7 +468,7 @@ function menu_item_delete_form($mid) { /** * Process menu delete form submissions. */ -function menu_item_delete_form_submit($form_values, $form, &$form_state) { +function menu_item_delete_form_submit($form, &$form_state, $form_values) { menu_delete_item($form_values['path']); $t_args = array('%title' => $form_values['title']); @@ -501,7 +501,7 @@ function menu_reset_item($mid) { /** * Process menu reset item form submissions. */ -function menu_reset_item_submit($form_values, $form, &$form_state) { +function menu_reset_item_submit($form, &$form_state, $form_values) { menu_delete_item($form_values['mid']); drupal_set_message(t('The menu item was reset to its default settings.')); @@ -578,7 +578,7 @@ function _menu_nodeapi(&$node, $op) { * Implementation of hook_form_alter(). * Add menu item fields to the node form. */ -function _menu_form_alter(&$form, $form_id) { +function _menu_form_alter(&$form, $form_state, $form_id) { if (isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id) { $item = array(); if ($form['nid']['#value'] > 0) { diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc index 91ec2ac86..39ace1a35 100644 --- a/modules/node/content_types.inc +++ b/modules/node/content_types.inc @@ -216,7 +216,7 @@ function node_type_form($type = NULL) { /** * Implementation of hook_form_validate(). */ -function node_type_form_validate($form_values, $form, &$form_state) { +function node_type_form_validate($form, &$form_state, $form_values) { $type = new stdClass(); $type->type = trim($form_values['type']); $type->name = trim($form_values['name']); @@ -252,7 +252,7 @@ function node_type_form_validate($form_values, $form, &$form_state) { /** * Implementation of hook_form_submit(). */ -function node_type_form_submit($form_values, $form, &$form_state) { +function node_type_form_submit($form, &$form_state, $form_values) { $op = isset($form_values['op']) ? $form_values['op'] : ''; $type = new stdClass(); @@ -398,7 +398,7 @@ function node_type_delete_confirm($type) { /** * Process content type delete confirm submissions. */ -function node_type_delete_confirm_submit($form_values, $form, &$form_state) { +function node_type_delete_confirm_submit($form, &$form_state, $form_values) { node_type_delete($form_values['type']); $t_args = array('%name' => $form_values['name']); diff --git a/modules/node/node.module b/modules/node/node.module index 114888fbd..cfc9adaf0 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1066,7 +1066,7 @@ function node_configure() { /** * Form validate callback. */ -function node_configure_validate($form_values, $form, &$form_state) { +function node_configure_validate($form, &$form_state, $form_values) { if ($form_values['op'] == t('Rebuild permissions')) { drupal_goto('admin/content/node-settings/rebuild'); } @@ -1521,7 +1521,7 @@ function theme_node_filters($form) { /** * Process result from node administration filter form. */ -function node_filter_form_submit($form_values, $form, &$form_state) { +function node_filter_form_submit($form, &$form_state, $form_values) { $filters = node_filters(); switch ($form_values['op']) { case t('Filter'): @@ -1549,7 +1549,7 @@ function node_filter_form_submit($form_values, $form, &$form_state) { /** * Submit the node administration update form. */ -function node_admin_nodes_submit($form_values, $form, &$form_state) { +function node_admin_nodes_submit($form, &$form_state, $form_values) { $operations = module_invoke_all('node_operations'); $operation = $operations[$form_values['operation']]; // Filter out unchecked nodes @@ -1569,7 +1569,7 @@ function node_admin_nodes_submit($form_values, $form, &$form_state) { } } -function node_admin_nodes_validate($form_values, $form, &$form_state) { +function node_admin_nodes_validate($form, &$form_state, $form_values) { $nodes = array_filter($form_values['nodes']); if (count($nodes) == 0) { form_set_error('', t('No items selected.')); @@ -1690,7 +1690,7 @@ function node_multiple_delete_confirm() { t('Delete all'), t('Cancel')); } -function node_multiple_delete_confirm_submit($form_values, $form, &$form_state) { +function node_multiple_delete_confirm_submit($form, &$form_state, $form_values) { if ($form_values['confirm']) { foreach ($form_values['nodes'] as $nid => $value) { node_delete($nid); @@ -2007,7 +2007,7 @@ function node_validate($node, $form = array()) { node_invoke_nodeapi($node, 'validate', $form); } -function node_form_validate($form_values, $form, &$form_state) { +function node_form_validate($form, &$form_state, $form_values) { node_validate($form_values, $form); } @@ -2148,7 +2148,7 @@ function node_form($node, $form_state = NULL) { return $form; } -function node_form_build_preview($form_values, $form, &$form_state) { +function node_form_build_preview($form, &$form_state, $form_values) { // We do not want to execute button level handlers, we want the form level // handlers to go in and change the submitted values. unset($form_state['submit_handlers']); @@ -2315,7 +2315,7 @@ function theme_node_log_message($log) { return '<div class="log"><div class="title">'. t('Log') .':</div>'. $log .'</div>'; } -function node_form_submit($form_values, $form, &$form_state) { +function node_form_submit($form, &$form_state, $form_values) { global $user; // We do not want to execute button level handlers, we want the form level @@ -2368,7 +2368,7 @@ function node_delete_confirm($node) { /** * Execute node deletion */ -function node_delete_confirm_submit($form_values, $form, &$form_state) { +function node_delete_confirm_submit($form, &$form_state, $form_values) { if ($form_values['confirm']) { node_delete($form_values['nid']); } @@ -2560,7 +2560,7 @@ function node_update_index() { /** * Implementation of hook_form_alter(). */ -function node_form_alter(&$form, $form_id) { +function node_form_alter(&$form, $form_state, $form_id) { // Advanced node search form if ($form_id == 'search_form' && $form['module']['#value'] == 'node' && user_access('use advanced search')) { // Keyword boxes: @@ -2630,7 +2630,7 @@ function node_form_alter(&$form, $form_id) { /** * Form API callback for the search form. Registered in node_form_alter(). */ -function node_search_validate($form_values, $form, &$form_state) { +function node_search_validate($form, &$form_state, $form_values) { // Initialise using any existing basic search keywords. $keys = $form_values['processed_keys']; diff --git a/modules/path/path.module b/modules/path/path.module index 59920c7d5..df8228451 100644 --- a/modules/path/path.module +++ b/modules/path/path.module @@ -105,7 +105,7 @@ function path_admin_delete_confirm($pid) { /** * Execute URL alias deletion **/ -function path_admin_delete_confirm_submit($form_values, $form, &$form_state) { +function path_admin_delete_confirm_submit($form, &$form_state, $form_values) { if ($form_values['confirm']) { path_admin_delete($form_values['pid']); $form_state['redirect'] = 'admin/build/path'; @@ -266,7 +266,7 @@ function path_nodeapi(&$node, $op, $arg) { /** * Implementation of hook_form_alter(). */ -function path_form_alter(&$form, $form_id) { +function path_form_alter(&$form, $form_state, $form_id) { if (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] .'_node_form' == $form_id) { $path = isset($form['#node']->path) ? $form['#node']->path : NULL; $form['path'] = array( @@ -367,7 +367,7 @@ function path_load($pid) { /** * Verify that a new URL alias is valid */ -function path_form_validate($form_values, $form, &$form_state) { +function path_form_validate($form, &$form_state, $form_values) { $src = $form_values['src']; $dst = $form_values['dst']; $pid = isset($form_values['pid']) ? $form_values['pid'] : 0; @@ -382,7 +382,7 @@ function path_form_validate($form_values, $form, &$form_state) { /** * Save a new URL alias to the database. */ -function path_form_submit($form_values, $form, &$form_state) { +function path_form_submit($form, &$form_state, $form_values) { // Language is only set if locale module is enabled path_set_alias($form_values['src'], $form_values['dst'], isset($form_values['pid']) ? $form_values['pid'] : 0, isset($form_values['language']) ? $form_values['language'] : ''); diff --git a/modules/poll/poll.module b/modules/poll/poll.module index 8fb710cae..396a845ce 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -99,7 +99,7 @@ function poll_delete($node) { /** * Implementation of hook_submit(). */ -function poll_node_form_submit(&$form_values, $form, &$form_state) { +function poll_node_form_submit(&$form, &$form_state, $form_values) { // Renumber fields $form_values['choice'] = array_values($form_values['choice']); $form_values['teaser'] = poll_teaser((object)$form_values); diff --git a/modules/profile/profile.module b/modules/profile/profile.module index af6d23d84..bb32b15bc 100644 --- a/modules/profile/profile.module +++ b/modules/profile/profile.module @@ -331,7 +331,7 @@ Unless you know what you are doing, it is highly recommended that you prefix the /** * Validate profile_field_form submissions. */ -function profile_field_form_validate($form_values, $form, &$form_state) { +function profile_field_form_validate($form, &$form_state, $form_values) { // Validate the 'field name': if (preg_match('/[^a-zA-Z0-9_-]/', $form_values['name'])) { form_set_error('name', t('The specified form name contains one or more illegal characters. Spaces or any other special characters except dash (-) and underscore (_) are not allowed.')); @@ -367,7 +367,7 @@ function profile_field_form_validate($form_values, $form, &$form_state) { /** * Process profile_field_form submissions. */ -function profile_field_form_submit($form_values, $form, &$form_state) { +function profile_field_form_submit($form, &$form_state, $form_values) { if (!isset($form_values['fid'])) { db_query("INSERT INTO {profile_fields} (title, name, explanation, category, type, weight, required, register, visibility, autocomplete, options, page) VALUES ('%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, %d, '%s', '%s')", $form_values['title'], $form_values['name'], $form_values['explanation'], $form_values['category'], $form_values['type'], $form_values['weight'], $form_values['required'], $form_values['register'], $form_values['visibility'], $form_values['autocomplete'], $form_values['options'], $form_values['page']); @@ -407,7 +407,7 @@ function profile_field_delete($fid) { /** * Process a field delete form submission. */ -function profile_field_delete_submit($form_values, $form, &$form_state) { +function profile_field_delete_submit($form, &$form_state, $form_values) { db_query('DELETE FROM {profile_fields} WHERE fid = %d', $form_values['fid']); db_query('DELETE FROM {profile_values} WHERE fid = %d', $form_values['fid']); diff --git a/modules/search/search.module b/modules/search/search.module index af9d0e80f..6592ac99c 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -207,7 +207,7 @@ function _search_menu($name) { /** * Validate callback. */ -function search_admin_settings_validate($form_values, $form, &$form_state) { +function search_admin_settings_validate($form, &$form_state, $form_values) { if ($form_values['op'] == t('Re-index site')) { drupal_goto('admin/settings/search/wipe'); } @@ -1044,14 +1044,14 @@ function search_form($action = '', $keys = '', $type = NULL, $prompt = NULL) { * search_form_validate() is used solely to set the 'processed_keys' form * value for the basic search form. */ -function search_form_validate($form_values, $form, &$form_state) { +function search_form_validate($form, &$form_state, $form_values) { form_set_value($form['basic']['inline']['processed_keys'], trim($form_values['keys']), $form_state); } /** * Process a search form submission. */ -function search_form_submit($form_values, $form, &$form_state) { +function search_form_submit($form, &$form_state, $form_values) { $keys = $form_values['processed_keys']; if ($keys == '') { form_set_error('keys', t('Please enter some keywords.')); @@ -1088,7 +1088,7 @@ function search_box($form_id) { /** * Process a block search form submission. */ -function search_box_form_submit($form_values, $form, &$form_state) { +function search_box_form_submit($form, &$form_state, $form_values) { $form_id = $form['form_id']['#value']; $form_state['redirect'] = 'search/node/'. trim($form_values[$form_id .'_keys']); return; diff --git a/modules/system/system.module b/modules/system/system.module index b94bc9742..53b496d30 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -442,7 +442,7 @@ function system_admin_theme_settings() { } -function system_admin_theme_submit($form_values, $form, &$form_state) { +function system_admin_theme_submit($form, &$form_state, $form_values) { // If we're changing themes, make sure the theme has its blocks initialized. if ($form_values['admin_theme'] != variable_get('admin_theme', '0')) { $result = db_query("SELECT status FROM {blocks} WHERE theme = '%s'", $form_values['admin_theme']); @@ -943,7 +943,7 @@ if (Drupal.jsEnabled) { return $form; } -function system_date_time_settings_submit($form_values, $form, &$form_state) { +function system_date_time_settings_submit($form, &$form_state, $form_values) { if ($form_values['date_format_short'] == 'custom') { $form_values['date_format_short'] = $form_values['date_format_short_custom']; } @@ -1238,7 +1238,7 @@ function system_settings_form($form) { return $form; } -function system_theme_settings_submit($form_values, $form, &$form_state) { +function system_theme_settings_submit($form, &$form_state, $form_values) { $op = isset($_POST['op']) ? $_POST['op'] : ''; $key = $form_values['var']; @@ -1264,7 +1264,7 @@ function system_theme_settings_submit($form_values, $form, &$form_state) { * add an array_filter value to your form. * */ -function system_settings_form_submit($form_values, $form, &$form_state) { +function system_settings_form_submit($form, &$form_state, $form_values) { $op = isset($form_values['op']) ? $form_values['op'] : ''; // Exclude unnecessary elements. @@ -1369,7 +1369,7 @@ function theme_system_themes_form($form) { } -function system_themes_form_submit($form_values, $form, &$form_state) { +function system_themes_form_submit($form, &$form_state, $form_values) { // Store list of previously enabled themes and disable all themes $old_theme_list = $new_theme_list = array(); @@ -1645,7 +1645,7 @@ function system_module_build_dependencies($modules, $form_values) { /** * Submit callback; handles modules form submission. */ -function system_modules_submit($form_values, $form, &$form_state) { +function system_modules_submit($form, &$form_state, $form_values) { include_once './includes/install.inc'; $new_modules = array(); @@ -1946,7 +1946,7 @@ function theme_system_modules_uninstall($form) { * @param * $form_values Submitted form values. */ -function system_modules_uninstall_validate($form_values, $form, &$form_state) { +function system_modules_uninstall_validate($form, &$form_state, $form_values) { // Form submitted, but no modules selected. if (!count(array_filter($form_values['uninstall']))) { drupal_set_message(t('No modules selected.'), 'error'); @@ -1962,7 +1962,7 @@ function system_modules_uninstall_validate($form_values, $form, &$form_state) { * @param * $form_values Submitted form values. */ -function system_modules_uninstall_submit($form_values, $form, &$form_state) { +function system_modules_uninstall_submit($form, &$form_state, $form_values) { // Make sure the install API is available. include_once './includes/install.inc'; diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index c008e301e..d86502782 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -304,7 +304,7 @@ function taxonomy_form_vocabulary($edit = array()) { /** * Accept the form submission for a vocabulary and save the results. */ -function taxonomy_form_vocabulary_submit($form_values, $form, &$form_state) { +function taxonomy_form_vocabulary_submit($form, &$form_state, $form_values) { // Fix up the nodes array to remove unchecked nodes. $form_values['nodes'] = array_filter($form_values['nodes']); switch (taxonomy_save_vocabulary($form_values)) { @@ -393,7 +393,7 @@ function taxonomy_vocabulary_confirm_delete($vid) { t('Cancel')); } -function taxonomy_vocabulary_confirm_delete_submit($form_values, $form, &$form_state) { +function taxonomy_vocabulary_confirm_delete_submit($form, &$form_state, $form_values) { $status = taxonomy_del_vocabulary($form_values['vid']); drupal_set_message(t('Deleted vocabulary %name.', array('%name' => $form_values['name']))); watchdog('taxonomy', 'Deleted vocabulary %name.', array('%name' => $form_values['name']), WATCHDOG_NOTICE); @@ -479,7 +479,7 @@ function taxonomy_form_term($vocabulary, $edit = array()) { /** * Accept the form submission for a taxonomy term and save the result. */ -function taxonomy_form_term_submit($form_values, $form, &$form_state) { +function taxonomy_form_term_submit($form, &$form_state, $form_values) { switch (taxonomy_save_term($form_values)) { case SAVED_NEW: drupal_set_message(t('Created new term %term.', array('%term' => $form_values['name']))); @@ -629,7 +629,7 @@ function taxonomy_term_confirm_delete($tid) { t('Cancel')); } -function taxonomy_term_confirm_delete_submit($form_values, $form, &$form_state) { +function taxonomy_term_confirm_delete_submit($form, &$form_state, $form_values) { taxonomy_del_term($form_values['tid']); drupal_set_message(t('Deleted term %name.', array('%name' => $form_values['name']))); watchdog('taxonomy', 'Deleted term %name.', array('%name' => $form_values['name']), WATCHDOG_NOTICE); @@ -702,7 +702,7 @@ function taxonomy_get_vocabularies($type = NULL) { * Implementation of hook_form_alter(). * Generate a form for selecting terms to associate with a node. */ -function taxonomy_form_alter(&$form, $form_id) { +function taxonomy_form_alter(&$form, $form_state, $form_id) { if (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] .'_node_form' == $form_id) { $node = $form['#node']; diff --git a/modules/throttle/throttle.module b/modules/throttle/throttle.module index 81bb1fd00..e1e4b630d 100644 --- a/modules/throttle/throttle.module +++ b/modules/throttle/throttle.module @@ -156,7 +156,7 @@ function throttle_admin_settings() { return system_settings_form($form); } -function throttle_admin_settings_validate($form_values, $form, &$form_state) { +function throttle_admin_settings_validate($form, &$form_state, $form_values) { if (!is_numeric($form_values['throttle_anonymous']) || $form_values['throttle_anonymous'] < 0) { form_set_error('throttle_anonymous', t("%value is not a valid auto-throttle setting. Please enter a positive numeric value.", array('%value' => $form_values['throttle_anonymous']))); } diff --git a/modules/upload/upload.module b/modules/upload/upload.module index b7127aa2f..fb9b633cc 100644 --- a/modules/upload/upload.module +++ b/modules/upload/upload.module @@ -119,7 +119,7 @@ function upload_init() { /** * Form API callback to validate the upload settings form. */ -function upload_admin_settings_validate($form_values, $form, &$form_state) { +function upload_admin_settings_validate($form, &$form_state, $form_values) { if (($form_values['upload_max_resolution'] != '0')) { if (!preg_match('/^[0-9]+x[0-9]+$/', $form_values['upload_max_resolution'])) { form_set_error('upload_max_resolution', t('The maximum allowed image size expressed as WIDTHxHEIGHT (e.g. 640x480). Set to 0 for no restriction.')); @@ -350,7 +350,7 @@ function _upload_prepare(&$node) { } } -function upload_form_alter(&$form, $form_id) { +function upload_form_alter(&$form, $form_state, $form_id) { if ($form_id == 'node_type_form' && isset($form['identity']['type'])) { $form['workflow']['upload'] = array( '#type' => 'radios', @@ -912,9 +912,9 @@ function upload_js() { '#tree' => FALSE, '#parents' => array(), ); - drupal_alter('form', $form, 'upload_js'); + drupal_alter('form', $form, array(), 'upload_js'); $form_state = array('submitted' => FALSE); - $form = form_builder('upload_js', $form, $form_state); + $form = form_builder('upload_js', $form, array()); $output = theme('status_messages') . drupal_render($form); // We send the updated file attachments form. print drupal_to_js(array('status' => TRUE, 'data' => $output)); diff --git a/modules/user/user.module b/modules/user/user.module index 60ec40052..c3df981c4 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -318,7 +318,7 @@ function user_validate_mail($mail) { } } -function user_validate_picture(&$form_values, $form, &$form_state) { +function user_validate_picture(&$form, &$form_state, $form_values) { // If required, validate the uploaded picture. if (isset($form['picture']) && ($file = file_check_upload('picture_upload'))) { // Check that uploaded file is an image, with a maximum file size @@ -1066,7 +1066,7 @@ function user_login($msg = '') { return $form; } -function user_login_validate($form_values, $form, &$form_state) { +function user_login_validate($form, &$form_state, $form_values) { if ($form_values['name']) { if (user_is_blocked($form_values['name'])) { // blocked in user administration @@ -1087,7 +1087,7 @@ function user_login_validate($form_values, $form, &$form_state) { } } -function user_login_submit($form_values, $form, &$form_state) { +function user_login_submit($form, &$form_state, $form_values) { global $user; if ($user->uid) { watchdog('user', 'Session opened for %name.', array('%name' => $user->name)); @@ -1182,7 +1182,7 @@ function user_pass() { return $form; } -function user_pass_validate($form_values, $form, &$form_state) { +function user_pass_validate($form, &$form_state, $form_values) { $name = trim($form_values['name']); if (valid_email_address($name)) { $account = user_load(array('mail' => $name, 'status' => 1)); @@ -1198,7 +1198,7 @@ function user_pass_validate($form_values, $form, &$form_state) { } } -function user_pass_submit($form_values, $form, &$form_state) { +function user_pass_submit($form, &$form_state, $form_values) { $account = $form_values['account']; // Mail one time login URL and instructions. $mail_success = _user_mail_notify('password_reset', $account); @@ -1335,11 +1335,11 @@ function user_register() { return $form; } -function user_register_validate($form_values, $form, &$form_state) { +function user_register_validate($form, &$form_state, $form_values) { user_module_invoke('validate', $form_values, $form_values, 'account'); } -function user_register_submit($form_values, $form, &$form_state) { +function user_register_submit($form, &$form_state, $form_values) { global $base_url; $admin = user_access('administer users'); @@ -1618,7 +1618,7 @@ function user_delete($edit, $uid) { module_invoke_all('user', 'delete', $edit, $account); } -function user_edit_validate($form_values, $form, &$form_state) { +function user_edit_validate($form, &$form_state, $form_values) { user_module_invoke('validate', $form_values, $form_values['_account'], $form_values['_category']); // Validate input to ensure that non-privileged users can't alter protected data. if ((!user_access('administer users') && array_intersect(array_keys($form_values), array('uid', 'init', 'session'))) || (!user_access('administer access control') && isset($form_values['roles']))) { @@ -1628,7 +1628,7 @@ function user_edit_validate($form_values, $form, &$form_state) { } } -function user_edit_submit($form_values, $form, &$form_state) { +function user_edit_submit($form, &$form_state, $form_values) { $account = $form_values['_account']; $category = $form_values['_category']; unset($form_values['_account'], $form_values['op'], $form_values['submit'], $form_values['delete'], $form_values['form_token'], $form_values['form_id'], $form_values['_category']); @@ -1752,13 +1752,13 @@ function user_admin_access_check() { return $output; } -function user_admin_access_check_validate($form_values, $form, &$form_state) { +function user_admin_access_check_validate($form, &$form_state, $form_values) { if (empty($form_values['test'])) { form_set_error($form_values['type'], t('No value entered. Please enter a test string and try again.')); } } -function user_admin_access_check_submit($form_values, $form, &$form_state) { +function user_admin_access_check_submit($form, &$form_state, $form_values) { switch ($form_values['type']) { case 'user': if (drupal_is_denied('user', $form_values['test'])) { @@ -1829,7 +1829,7 @@ function user_admin_access_delete_confirm($aid = 0) { return $output; } -function user_admin_access_delete_confirm_submit($form_values, $form, &$form_state) { +function user_admin_access_delete_confirm_submit($form, &$form_state, $form_values) { db_query('DELETE FROM {access} WHERE aid = %d', $form_values['aid']); drupal_set_message(t('The access rule has been deleted.')); $form_state['redirect'] = 'admin/user/rules'; @@ -2022,7 +2022,7 @@ function theme_user_admin_perm($form) { return $output; } -function user_admin_perm_submit($form_values, $form, &$form_state) { +function user_admin_perm_submit($form, &$form_state, $form_values) { // Save permissions: $result = db_query('SELECT * FROM {role}'); while ($role = db_fetch_object($result)) { @@ -2093,7 +2093,7 @@ function user_admin_role() { return $form; } -function user_admin_role_validate($form_values, $form, &$form_state) { +function user_admin_role_validate($form, &$form_state, $form_values) { if ($form_values['name']) { if ($form_values['op'] == t('Save role')) { if (db_result(db_query("SELECT COUNT(*) FROM {role} WHERE name = '%s' AND rid != %d", $form_values['name'], $form_values['rid']))) { @@ -2111,7 +2111,7 @@ function user_admin_role_validate($form_values, $form, &$form_state) { } } -function user_admin_role_submit($form_values, $form, &$form_state) { +function user_admin_role_submit($form, &$form_state, $form_values) { if ($form_values['op'] == t('Save role')) { db_query("UPDATE {role} SET name = '%s' WHERE rid = %d", $form_values['name'], $form_values['rid']); drupal_set_message(t('The role has been renamed.')); @@ -2263,7 +2263,7 @@ function theme_user_admin_account($form) { /** * Submit the user administration update form. */ -function user_admin_account_submit($form_values, $form, &$form_state) { +function user_admin_account_submit($form, &$form_state, $form_values) { $operations = module_invoke_all('user_operations'); $operation = $operations[$form_values['operation']]; // Filter out unchecked accounts. @@ -2282,7 +2282,7 @@ function user_admin_account_submit($form_values, $form, &$form_state) { } } -function user_admin_account_validate($form_values, $form, &$form_state) { +function user_admin_account_validate($form, &$form_state, $form_values) { $form_values['accounts'] = array_filter($form_values['accounts']); if (count($form_values['accounts']) == 0) { form_set_error('', t('No users selected.')); @@ -2434,7 +2434,7 @@ function user_multiple_delete_confirm() { t('Delete all'), t('Cancel')); } -function user_multiple_delete_confirm_submit($form_values, $form, &$form_state) { +function user_multiple_delete_confirm_submit($form, &$form_state, $form_values) { if ($form_values['confirm']) { foreach ($form_values['accounts'] as $uid => $value) { user_delete($form_values, $uid); @@ -3012,7 +3012,7 @@ function theme_user_filters($form) { /** * Process result from user administration filter form. */ -function user_filter_form_submit($form_values, $form, &$form_state) { +function user_filter_form_submit($form, &$form_state, $form_values) { $op = $form_values['op']; $filters = user_filters(); switch ($op) { |