Index: imagecache_ui.module
===================================================================
--- imagecache_ui.module
+++ imagecache_ui.module
@@ -156,7 +156,7 @@
'#title' => t('Preset Namespace'),
'#default_value' => '',
'#description' => t('The namespace is used in URLs for images to tell imagecache how to process an image. Please only use alphanumeric characters, underscores (_), and hyphens (-) for preset names.'),
- '#validate' => array('imagecache_element_presetname_validate' => array()),
+ '#required' => TRUE,
);
$form['submit'] = array(
'#type' => 'submit',
@@ -172,16 +172,19 @@
$form_state['redirect'] = 'admin/build/imagecache/'. $preset['presetid'];
}
-function imagecache_element_presetname_validate($element) {
+function imagecache_ui_preset_add_form_validate($form, &$form_state) {
+ $values = $form_state['values'];
// Check for duplicates
- $presets = imagecache_presets();
- if (in_array($element['#value'], $presets)) {
- form_set_error($element['#name'], t('The namespace you have chosen is already in use.'));
+ foreach(imagecache_presets() as $preset) {
+ if (in_array($values['presetname'], $preset)) {
+ form_set_error('presetname', t('The namespace you have chosen is already in use.'));
+ break;
+ }
}
// Check for illegal characters in preset names
- if (preg_match('/[^0-9a-zA-Z_\-]/', $element['#value'])) {
- form_set_error($element['#name'], t('Please only use alphanumeric characters, underscores (_), and hyphens (-) for preset names.'));
+ if (preg_match('/[^0-9a-zA-Z_\-]/', $values['presetname'])) {
+ form_set_error('presetname', t('Please only use alphanumeric characters, underscores (_), and hyphens (-) for preset names.'));
}
}
@@ -254,7 +257,7 @@
'#title' => t('Preset Namespace'),
'#default_value' => $preset['presetname'],
'#description' => t('The namespace is used in URL\'s for images to tell imagecache how to process an image. Please only use alphanumeric characters, underscores (_), and hyphens (-) for preset names.'),
- '#validate' => array('imagecache_element_presetname_validate' => array()),
+ '#required' => TRUE,
);
$form['presetid'] = array(
'#type' => 'value',
@@ -388,6 +391,8 @@
'#value' => l($imagecache_path, $imagecache_path) .'
'. l("", $imagecache_path, array('html' => true)),
);
+ $form['#validate'][] = 'imagecache_ui_preset_add_form_validate';
+
return $form;
}