diff --git a/core/includes/common.inc b/core/includes/common.inc index 15c54d3..292abb8 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -6914,6 +6914,9 @@ function drupal_common_theme() { 'form' => array( 'render element' => 'element', ), + 'form_error_message' => array( + 'render element' => 'element', + ), 'textarea' => array( 'render element' => 'element', ), diff --git a/core/includes/form.inc b/core/includes/form.inc index c94bc62..9ebd949 100644 --- a/core/includes/form.inc +++ b/core/includes/form.inc @@ -858,7 +858,7 @@ function drupal_process_form($form_id, &$form, &$form_state) { // browser don't increment all the element IDs needlessly. drupal_static_reset('drupal_html_id'); - if ($form_state['submitted'] && !form_get_errors() && !$form_state['rebuild']) { + if ($form_state['submitted'] && !$form_state['rebuild'] && !form_get_errors()) { // Execute form submit handlers. form_execute_handlers('submit', $form, $form_state); @@ -902,9 +902,16 @@ function drupal_process_form($form_id, &$form, &$form_state) { // Set a flag to indicate the the form has been processed and executed. $form_state['executed'] = TRUE; + // Occassionally a form will set an error in its submit handler so we make + // sure to display those errors here before the form is redirected. + form_display_errors($form); + // Redirect the form based on values in $form_state. drupal_redirect_form($form_state); } + else { + form_display_errors($form); + } // Don't rebuild or cache form submissions invoked via drupal_form_submit(). if (!empty($form_state['programmed'])) { @@ -948,6 +955,34 @@ function drupal_process_form($form_id, &$form, &$form_state) { } /** + * Displays the given form's errors and links each error to the form element + * in question. + * + * @param $form + * An associative array containing the structure of the form. + */ +function form_display_errors($form) { + if ($errors = form_get_errors()) { + $error_links = array(); + foreach ($errors as $key => $error) { + $element = form_get_element($key, $form); + if ($element) { + $title = isset($element['#title']) ? $element['#title'] : $key; + $error_links[] = l($element['#title'], '', array('fragment' => 'edit-' . str_replace('_', '-', $key), 'external' => TRUE)); + } + else { + drupal_set_message($error, 'error'); + unset($errors[$key]); + } + } + + if (!empty($error_links)) { + drupal_set_message(format_plural(count($error_links), '1 error has been found', '@count errors have been found') . ': ' . implode(', ', $error_links), 'error'); + } + } +} + +/** * Prepares a structured form array. * * Adds required elements, executes any hook_form_alter functions, and @@ -1175,6 +1210,7 @@ function drupal_validate_form($form_id, &$form, &$form_state) { $values[$name] = $button_value; } } + $form_state['values'] = $values; } } @@ -1599,9 +1635,6 @@ function form_set_error($name = NULL, $message = '', $limit_validation_errors = } if ($record) { $form[$name] = $message; - if ($message) { - drupal_set_message($message, 'error'); - } } } @@ -1634,11 +1667,13 @@ function form_get_errors() { function form_get_error($element) { $form = form_set_error(); $parents = array(); - foreach ($element['#parents'] as $parent) { - $parents[] = $parent; - $key = implode('][', $parents); - if (isset($form[$key])) { - return $form[$key]; + if (isset($element['#parents'])) { + foreach ($element['#parents'] as $parent) { + $parents[] = $parent; + $key = implode('][', $parents); + if (isset($form[$key])) { + return $form[$key]; + } } } } @@ -1757,6 +1792,7 @@ function form_builder($form_id, &$element, &$form_state) { '#required' => FALSE, '#attributes' => array(), '#title_display' => 'before', + '#hide_errors' => FALSE, ); // Special handling if we're on the top level form element. @@ -1933,6 +1969,39 @@ function form_builder($form_id, &$element, &$form_state) { } /** + * Given a form and an element key, this function returns the element no matter + * how deep within the form array the key exists. If the key is not found an + * empty array is returned. + * + * @param string $element_key + * The key to search for. + * + * @param array $form + * A structured form array to search. + * + * @return Array + */ +function form_get_element($element_key, $form) { + $element = array(); + foreach (element_children($form) as $key) { + if ($key === $element_key) { + $element = $form[$key]; + break; + } + else { + if (is_array($form[$key])) { + $element = form_get_element($element_key, $form[$key]); + if (!empty($element)) { + break; + } + } + } + } + + return $element; +} + +/** * Adds the #name and #value properties of an input element before rendering. */ function _form_builder_handle_input_element($form_id, &$element, &$form_state) { @@ -3048,6 +3117,8 @@ function form_process_radios($element) { '#parents' => $element['#parents'], '#id' => drupal_html_id('edit-' . implode('-', $parents_for_id)), '#ajax' => isset($element['#ajax']) ? $element['#ajax'] : NULL, + // Errors should only be shown on the parent radios element. + '#hide_errors' => TRUE, '#weight' => $weight, ); } @@ -3201,6 +3272,8 @@ function form_process_checkboxes($element) { '#default_value' => isset($value[$key]) ? $key : NULL, '#attributes' => $element['#attributes'], '#ajax' => isset($element['#ajax']) ? $element['#ajax'] : NULL, + // Errors should only be shown on the parent checkboxes element. + '#hide_errors' => TRUE, '#weight' => $weight, ); } @@ -4358,6 +4431,8 @@ function theme_form_element($variables) { '#title_display' => 'before', ); + $variables['errors'] = form_get_error($element); + // Add element #id for #type 'item'. if (isset($element['#markup']) && !empty($element['#id'])) { $attributes['id'] = $element['#id']; @@ -4374,8 +4449,17 @@ function theme_form_element($variables) { if (!empty($element['#attributes']['disabled'])) { $attributes['class'][] = 'form-disabled'; } + // Add a class if an error exists. + if (!empty($variables['errors'])) { + $attributes['class'][] = 'form-error'; + } $output = '