Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#52484 by chx: filter_form needs validation

4.7.x
Neil Drumm 2006-03-05 02:46:55 +00:00
parent d797819821
commit 4b663a62af
3 changed files with 49 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/form.inc
View File

@ -170,7 +170,8 @@ function drupal_submit_form($form_id, $form, $callback = NULL) {
function _form_validate($elements, $form_id = NULL) { function _form_validate($elements, $form_id = NULL) {
/* Validate the current input */ /* Validate the current input */
if (!$elements['#validated'] && ($elements['#input'] || isset($form_id))) { if (!$elements['#validated']) {
if ($elements['#input'] || isset($form_id)) {
// An empty textfield returns '' so we use empty(). An empty checkbox // An empty textfield returns '' so we use empty(). An empty checkbox
// and a textfield could return '0' and empty('0') returns TRUE so we // and a textfield could return '0' and empty('0') returns TRUE so we
// need a special check for the '0' string. // need a special check for the '0' string.
@ -200,6 +201,7 @@ function _form_validate($elements, $form_id = NULL) {
watchdog('form', t('Illegal choice %choice in %name element.', array('%choice' => theme_placeholder(check_plain($v)), '%name' => theme('placeholder', empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title'])), WATCHDOG_ERROR)); watchdog('form', t('Illegal choice %choice in %name element.', array('%choice' => theme_placeholder(check_plain($v)), '%name' => theme('placeholder', empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title'])), WATCHDOG_ERROR));
} }
} }
}
// User-applied checks. // User-applied checks.
if (isset($elements['#validate'])) { if (isset($elements['#validate'])) {

11
modules/filter.module
View File

@ -802,6 +802,7 @@ function filter_form($value = FILTER_FORMAT_DEFAULT, $weight = NULL, $parents =
'#collapsible' => TRUE, '#collapsible' => TRUE,
'#collapsed' => TRUE, '#collapsed' => TRUE,
'#weight' => $weight, '#weight' => $weight,
'#validate' => array('filter_form_validate' => array()),
); );
// Multiple formats available: display radio buttons with tips. // Multiple formats available: display radio buttons with tips.
foreach ($formats as $format) { foreach ($formats as $format) {
@ -829,6 +830,16 @@ function filter_form($value = FILTER_FORMAT_DEFAULT, $weight = NULL, $parents =
return $form; return $form;
} }
function filter_form_validate($form) {
foreach (element_children($form) as $key) {
if ($form[$key]['#value'] == $form[$key]['#return_value']) {
return;
}
}
form_error($form, t('An illegal choice has been detected. Please contact the site administrator.'));
watchdog('form', t('Illegal choice %choice in %name element.', array('%choice' => theme('placeholder', check_plain($v)), '%name' => theme_placeholder(empty($form['#title']) ? $form['#parents'][0] : $form['#title'])), WATCHDOG_ERROR));
}
/** /**
* Returns true if the user is allowed to access this format. * Returns true if the user is allowed to access this format.
*/ */

11
modules/filter/filter.module
View File

@ -802,6 +802,7 @@ function filter_form($value = FILTER_FORMAT_DEFAULT, $weight = NULL, $parents =
'#collapsible' => TRUE, '#collapsible' => TRUE,
'#collapsed' => TRUE, '#collapsed' => TRUE,
'#weight' => $weight, '#weight' => $weight,
'#validate' => array('filter_form_validate' => array()),
); );
// Multiple formats available: display radio buttons with tips. // Multiple formats available: display radio buttons with tips.
foreach ($formats as $format) { foreach ($formats as $format) {
@ -829,6 +830,16 @@ function filter_form($value = FILTER_FORMAT_DEFAULT, $weight = NULL, $parents =
return $form; return $form;
} }
function filter_form_validate($form) {
foreach (element_children($form) as $key) {
if ($form[$key]['#value'] == $form[$key]['#return_value']) {
return;
}
}
form_error($form, t('An illegal choice has been detected. Please contact the site administrator.'));
watchdog('form', t('Illegal choice %choice in %name element.', array('%choice' => theme('placeholder', check_plain($v)), '%name' => theme_placeholder(empty($form['#title']) ? $form['#parents'][0] : $form['#title'])), WATCHDOG_ERROR));
}
/** /**
* Returns true if the user is allowed to access this format. * Returns true if the user is allowed to access this format.
*/ */