Commit af5478b8 authored by alexpott's avatar alexpott
Browse files

Issue #1987124 by tim.plunkett, h3rj4n, dawehner: Convert...

Issue #1987124 by tim.plunkett, h3rj4n, dawehner: Convert filter_admin_format_page() and filter_admin_overview() to a Controller.
parent 0cb8f162
...@@ -162,6 +162,8 @@ protected function match(array $condition, $value) { ...@@ -162,6 +162,8 @@ protected function match(array $condition, $value) {
return $value >= $condition['value']; return $value >= $condition['value'];
case '<=': case '<=':
return $value <= $condition['value']; return $value <= $condition['value'];
case '<>':
return $value != $condition['value'];
case 'IN': case 'IN':
return array_search($value, $condition['value']) !== FALSE; return array_search($value, $condition['value']) !== FALSE;
case 'NOT IN': case 'NOT IN':
......
...@@ -426,6 +426,10 @@ protected function submitEntityLanguage(array $form, array &$form_state) { ...@@ -426,6 +426,10 @@ protected function submitEntityLanguage(array $form, array &$form_state) {
*/ */
public function buildEntity(array $form, array &$form_state) { public function buildEntity(array $form, array &$form_state) {
$entity = clone $this->entity; $entity = clone $this->entity;
// If you submit a form, the form state comes from caching, which forces
// the controller to be the one before caching. Ensure to have the
// controller of the current request.
$form_state['controller'] = $this;
// @todo Move entity_form_submit_build_entity() here. // @todo Move entity_form_submit_build_entity() here.
// @todo Exploit the Field API to process the submitted entity field. // @todo Exploit the Field API to process the submitted entity field.
entity_form_submit_build_entity($entity->entityType(), $entity, $form, $form_state); entity_form_submit_build_entity($entity->entityType(), $entity, $form, $form_state);
......
...@@ -51,7 +51,7 @@ function testAdmin() { ...@@ -51,7 +51,7 @@ function testAdmin() {
$ckeditor = $manager->createInstance('ckeditor'); $ckeditor = $manager->createInstance('ckeditor');
$this->drupalLogin($this->admin_user); $this->drupalLogin($this->admin_user);
$this->drupalGet('admin/config/content/formats/filtered_html'); $this->drupalGet('admin/config/content/formats/manage/filtered_html');
// Ensure no Editor config entity exists yet. // Ensure no Editor config entity exists yet.
$editor = entity_load('editor', 'filtered_html'); $editor = entity_load('editor', 'filtered_html');
...@@ -118,7 +118,7 @@ function testAdmin() { ...@@ -118,7 +118,7 @@ function testAdmin() {
$this->assertIdentical($expected_settings, $editor->settings, 'The Editor config entity has the correct settings.'); $this->assertIdentical($expected_settings, $editor->settings, 'The Editor config entity has the correct settings.');
// Configure the Styles plugin, and ensure the updated settings are saved. // Configure the Styles plugin, and ensure the updated settings are saved.
$this->drupalGet('admin/config/content/formats/filtered_html'); $this->drupalGet('admin/config/content/formats/manage/filtered_html');
$edit = array( $edit = array(
'editor[settings][plugins][stylescombo][styles]' => "h1.title|Title\np.callout|Callout\n\n", 'editor[settings][plugins][stylescombo][styles]' => "h1.title|Title\np.callout|Callout\n\n",
); );
...@@ -131,7 +131,7 @@ function testAdmin() { ...@@ -131,7 +131,7 @@ function testAdmin() {
// Change the buttons that appear on the toolbar (in JavaScript, this is // Change the buttons that appear on the toolbar (in JavaScript, this is
// done via drag and drop, but here we can only emulate the end result of // done via drag and drop, but here we can only emulate the end result of
// that interaction). Test multiple toolbar rows and a divider within a row. // that interaction). Test multiple toolbar rows and a divider within a row.
$this->drupalGet('admin/config/content/formats/filtered_html'); $this->drupalGet('admin/config/content/formats/manage/filtered_html');
$expected_settings['toolbar']['buttons'] = array( $expected_settings['toolbar']['buttons'] = array(
array('Undo', '|', 'Redo'), array('Undo', '|', 'Redo'),
array('JustifyCenter'), array('JustifyCenter'),
...@@ -148,7 +148,7 @@ function testAdmin() { ...@@ -148,7 +148,7 @@ function testAdmin() {
// CKEditor plugin — this should not affect the Editor config entity. // CKEditor plugin — this should not affect the Editor config entity.
module_enable(array('ckeditor_test')); module_enable(array('ckeditor_test'));
drupal_container()->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions(); drupal_container()->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
$this->drupalGet('admin/config/content/formats/filtered_html'); $this->drupalGet('admin/config/content/formats/manage/filtered_html');
$ultra_llama_mode_checkbox = $this->xpath('//input[@type="checkbox" and @name="editor[settings][plugins][llama_contextual_and_button][ultra_llama_mode]" and not(@checked)]'); $ultra_llama_mode_checkbox = $this->xpath('//input[@type="checkbox" and @name="editor[settings][plugins][llama_contextual_and_button][ultra_llama_mode]" and not(@checked)]');
$this->assertTrue(count($ultra_llama_mode_checkbox) === 1, 'The "Ultra llama mode" checkbox exists and is not checked.'); $this->assertTrue(count($ultra_llama_mode_checkbox) === 1, 'The "Ultra llama mode" checkbox exists and is not checked.');
$editor = entity_load('editor', 'filtered_html'); $editor = entity_load('editor', 'filtered_html');
...@@ -156,12 +156,12 @@ function testAdmin() { ...@@ -156,12 +156,12 @@ function testAdmin() {
$this->assertIdentical($expected_settings, $editor->settings, 'The Editor config entity has the correct settings.'); $this->assertIdentical($expected_settings, $editor->settings, 'The Editor config entity has the correct settings.');
// Finally, check the "Ultra llama mode" checkbox. // Finally, check the "Ultra llama mode" checkbox.
$this->drupalGet('admin/config/content/formats/filtered_html'); $this->drupalGet('admin/config/content/formats/manage/filtered_html');
$edit = array( $edit = array(
'editor[settings][plugins][llama_contextual_and_button][ultra_llama_mode]' => '1', 'editor[settings][plugins][llama_contextual_and_button][ultra_llama_mode]' => '1',
); );
$this->drupalPost(NULL, $edit, t('Save configuration')); $this->drupalPost(NULL, $edit, t('Save configuration'));
$this->drupalGet('admin/config/content/formats/filtered_html'); $this->drupalGet('admin/config/content/formats/manage/filtered_html');
$ultra_llama_mode_checkbox = $this->xpath('//input[@type="checkbox" and @name="editor[settings][plugins][llama_contextual_and_button][ultra_llama_mode]" and @checked="checked"]'); $ultra_llama_mode_checkbox = $this->xpath('//input[@type="checkbox" and @name="editor[settings][plugins][llama_contextual_and_button][ultra_llama_mode]" and @checked="checked"]');
$this->assertTrue(count($ultra_llama_mode_checkbox) === 1, 'The "Ultra llama mode" checkbox exists and is checked.'); $this->assertTrue(count($ultra_llama_mode_checkbox) === 1, 'The "Ultra llama mode" checkbox exists and is checked.');
$expected_settings['plugins']['llama_contextual_and_button']['ultra_llama_mode'] = '1'; $expected_settings['plugins']['llama_contextual_and_button']['ultra_llama_mode'] = '1';
......
...@@ -156,11 +156,11 @@ function editor_form_filter_admin_overview_alter(&$form, $form_state) { ...@@ -156,11 +156,11 @@ function editor_form_filter_admin_overview_alter(&$form, $form_state) {
} }
/** /**
* Implements hook_form_FORM_ID_alter(). * Implements hook_form_BASE_FORM_ID_alter() for 'filter_format_form'.
*/ */
function editor_form_filter_admin_format_form_alter(&$form, &$form_state) { function editor_form_filter_format_form_alter(&$form, &$form_state) {
if (!isset($form_state['editor'])) { if (!isset($form_state['editor'])) {
$format_id = $form['#format']->format; $format_id = $form_state['controller']->getEntity()->id();
$form_state['editor'] = editor_load($format_id); $form_state['editor'] = editor_load($format_id);
$form_state['editor_manager'] = Drupal::service('plugin.manager.editor'); $form_state['editor_manager'] = Drupal::service('plugin.manager.editor');
} }
...@@ -226,15 +226,15 @@ function editor_form_filter_admin_format_form_alter(&$form, &$form_state) { ...@@ -226,15 +226,15 @@ function editor_form_filter_admin_format_form_alter(&$form, &$form_state) {
$settings_form['#element_validate'][] = array($plugin, 'settingsFormValidate'); $settings_form['#element_validate'][] = array($plugin, 'settingsFormValidate');
$form['editor']['settings']['subform'] = $plugin->settingsForm($settings_form, $form_state, $editor); $form['editor']['settings']['subform'] = $plugin->settingsForm($settings_form, $form_state, $editor);
$form['editor']['settings']['subform']['#parents'] = array('editor', 'settings'); $form['editor']['settings']['subform']['#parents'] = array('editor', 'settings');
$form['#submit'][] = array($plugin, 'settingsFormSubmit'); $form['actions']['submit']['#submit'][] = array($plugin, 'settingsFormSubmit');
} }
$form['#validate'][] = 'editor_form_filter_admin_format_validate'; $form['#validate'][] = 'editor_form_filter_admin_format_validate';
$form['#submit'][] = 'editor_form_filter_admin_format_submit'; $form['actions']['submit']['#submit'][] = 'editor_form_filter_admin_format_submit';
} }
/** /**
* Button submit handler for filter_admin_format_form()'s 'editor_configure' button. * Button submit handler for filter_format_form()'s 'editor_configure' button.
*/ */
function editor_form_filter_admin_format_editor_configure($form, &$form_state) { function editor_form_filter_admin_format_editor_configure($form, &$form_state) {
$editor = $form_state['editor']; $editor = $form_state['editor'];
...@@ -244,7 +244,7 @@ function editor_form_filter_admin_format_editor_configure($form, &$form_state) { ...@@ -244,7 +244,7 @@ function editor_form_filter_admin_format_editor_configure($form, &$form_state) {
} }
elseif (empty($editor) || $form_state['values']['editor']['editor'] !== $editor->editor) { elseif (empty($editor) || $form_state['values']['editor']['editor'] !== $editor->editor) {
$editor = entity_create('editor', array( $editor = entity_create('editor', array(
'format' => $form['#format']->format, 'format' => $form_state['controller']->getEntity()->id(),
'editor' => $form_state['values']['editor']['editor'], 'editor' => $form_state['values']['editor']['editor'],
)); ));
$form_state['editor'] = $editor; $form_state['editor'] = $editor;
...@@ -254,14 +254,14 @@ function editor_form_filter_admin_format_editor_configure($form, &$form_state) { ...@@ -254,14 +254,14 @@ function editor_form_filter_admin_format_editor_configure($form, &$form_state) {
} }
/** /**
* AJAX callback handler for filter_admin_format_form(). * AJAX callback handler for filter_format_form().
*/ */
function editor_form_filter_admin_form_ajax($form, &$form_state) { function editor_form_filter_admin_form_ajax($form, &$form_state) {
return $form['editor']['settings']; return $form['editor']['settings'];
} }
/** /**
* Additional validate handler for filter_admin_format_form(). * Additional validate handler for filter_format_form().
*/ */
function editor_form_filter_admin_format_validate($form, &$form_state) { function editor_form_filter_admin_format_validate($form, &$form_state) {
// This validate handler is not applicable when using the 'Configure' button. // This validate handler is not applicable when using the 'Configure' button.
...@@ -279,11 +279,11 @@ function editor_form_filter_admin_format_validate($form, &$form_state) { ...@@ -279,11 +279,11 @@ function editor_form_filter_admin_format_validate($form, &$form_state) {
} }
/** /**
* Additional submit handler for filter_admin_format_form(). * Additional submit handler for filter_format_form().
*/ */
function editor_form_filter_admin_format_submit($form, &$form_state) { function editor_form_filter_admin_format_submit($form, &$form_state) {
// Delete the existing editor if disabling or switching between editors. // Delete the existing editor if disabling or switching between editors.
$format_id = $form['#format']->format; $format_id = $form_state['controller']->getEntity()->id();
$original_editor = editor_load($format_id); $original_editor = editor_load($format_id);
if ($original_editor && $original_editor->editor != $form_state['values']['editor']) { if ($original_editor && $original_editor->editor != $form_state['values']['editor']) {
$original_editor->delete(); $original_editor->delete();
...@@ -293,7 +293,7 @@ function editor_form_filter_admin_format_submit($form, &$form_state) { ...@@ -293,7 +293,7 @@ function editor_form_filter_admin_format_submit($form, &$form_state) {
if ($form_state['editor'] !== FALSE) { if ($form_state['editor'] !== FALSE) {
// Ensure the text format is set: when creating a new text format, this // Ensure the text format is set: when creating a new text format, this
// would equal the empty string. // would equal the empty string.
$form_state['editor']->format = $form['#format']->format; $form_state['editor']->format = $format_id;
$form_state['editor']->settings = $form_state['values']['editor']['settings']; $form_state['editor']->settings = $form_state['values']['editor']['settings'];
$form_state['editor']->save(); $form_state['editor']->save();
} }
......
...@@ -50,7 +50,7 @@ function setUp() { ...@@ -50,7 +50,7 @@ function setUp() {
*/ */
function testNoEditorAvailable() { function testNoEditorAvailable() {
$this->drupalLogin($this->admin_user); $this->drupalLogin($this->admin_user);
$this->drupalGet('admin/config/content/formats/filtered_html'); $this->drupalGet('admin/config/content/formats/manage/filtered_html');
// Ensure the form field order is correct. // Ensure the form field order is correct.
$roles_pos = strpos($this->drupalGetContent(), 'Roles'); $roles_pos = strpos($this->drupalGetContent(), 'Roles');
...@@ -75,7 +75,7 @@ function testNoEditorAvailable() { ...@@ -75,7 +75,7 @@ function testNoEditorAvailable() {
function testAddEditorToExistingFormat() { function testAddEditorToExistingFormat() {
$this->enableUnicornEditor(); $this->enableUnicornEditor();
$this->drupalLogin($this->admin_user); $this->drupalLogin($this->admin_user);
$this->drupalGet('admin/config/content/formats/filtered_html'); $this->drupalGet('admin/config/content/formats/manage/filtered_html');
$edit = $this->selectUnicornEditor(); $edit = $this->selectUnicornEditor();
// Configure Unicorn Editor's setting to another value. // Configure Unicorn Editor's setting to another value.
$edit['editor[settings][foo]'] = 'baz'; $edit['editor[settings][foo]'] = 'baz';
...@@ -155,7 +155,7 @@ protected function verifyUnicornEditorConfiguration($format_id, $foo = 'bar') { ...@@ -155,7 +155,7 @@ protected function verifyUnicornEditorConfiguration($format_id, $foo = 'bar') {
$this->assertIdentical($editor->settings['ponies too'], true, 'The text editor defaults are retrieved correctly.'); $this->assertIdentical($editor->settings['ponies too'], true, 'The text editor defaults are retrieved correctly.');
$this->assertIdentical($editor->settings['rainbows'], true, 'The text editor defaults added by hook_editor_settings_defaults() are retrieved correctly.'); $this->assertIdentical($editor->settings['rainbows'], true, 'The text editor defaults added by hook_editor_settings_defaults() are retrieved correctly.');
$this->assertIdentical($editor->settings['sparkles'], false, 'The text editor defaults modified by hook_editor_settings_defaults_alter() are retrieved correctly.'); $this->assertIdentical($editor->settings['sparkles'], false, 'The text editor defaults modified by hook_editor_settings_defaults_alter() are retrieved correctly.');
$this->drupalGet('admin/config/content/formats/'. $format_id); $this->drupalGet('admin/config/content/formats/manage/'. $format_id);
$select = $this->xpath('//select[@name="editor[editor]"]'); $select = $this->xpath('//select[@name="editor[editor]"]');
$select_is_disabled = $this->xpath('//select[@name="editor[editor]" and @disabled="disabled"]'); $select_is_disabled = $this->xpath('//select[@name="editor[editor]" and @disabled="disabled"]');
$options = $this->xpath('//select[@name="editor[editor]"]/option'); $options = $this->xpath('//select[@name="editor[editor]"]/option');
......
<?php
/**
* @file
* Administrative page callbacks for the Filter module.
*/
/**
* Page callback: Form constructor for a form to list and reorder text formats.
*
* @see filter_menu()
* @see filter_admin_overview_submit()
* @ingroup forms
*/
function filter_admin_overview($form) {
// Overview of all formats.
$formats = filter_formats();
$fallback_format = filter_fallback_format();
$form['#tree'] = TRUE;
$form['formats'] = array(
'#type' => 'table',
'#header' => array(t('Name'), t('Roles'), t('Weight'), t('Operations')),
'#tabledrag' => array(
array('order', 'sibling', 'text-format-order-weight'),
),
);
foreach ($formats as $id => $format) {
$form['formats'][$id]['#attributes']['class'][] = 'draggable';
$form['formats'][$id]['#weight'] = $format->weight;
$links = array();
$links['configure'] = array(
'title' => t('configure'),
'href' => "admin/config/content/formats/$id",
);
// Check whether this is the fallback text format. This format is available
// to all roles and cannot be disabled via the admin interface.
$form['formats'][$id]['#is_fallback'] = ($id == $fallback_format);
if ($form['formats'][$id]['#is_fallback']) {
$form['formats'][$id]['name'] = array('#markup' => drupal_placeholder($format->name));
if (config('filter.settings')->get('always_show_fallback_choice')) {
$roles_markup = drupal_placeholder(t('All roles may use this format'));
}
else {
$roles_markup = drupal_placeholder(t('This format is shown when no other formats are available'));
}
}
else {
$form['formats'][$id]['name'] = array('#markup' => check_plain($format->name));
$roles = array_map('check_plain', filter_get_roles_by_format($format));
$roles_markup = $roles ? implode(', ', $roles) : t('No roles may use this format');
$links['disable'] = array(
'title' => t('disable'),
'href' => "admin/config/content/formats/$id/disable",
);
}
$form['formats'][$id]['roles'] = array('#markup' => $roles_markup);
$form['formats'][$id]['weight'] = array(
'#type' => 'weight',
'#title' => t('Weight for @title', array('@title' => $format->name)),
'#title_display' => 'invisible',
'#default_value' => $format->weight,
'#attributes' => array('class' => array('text-format-order-weight')),
);
$form['formats'][$id]['operations'] = array(
'#type' => 'operations',
'#links' => $links,
);
}
$form['actions'] = array('#type' => 'actions');
$form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save changes'));
return $form;
}
/**
* Form submission handler for filter_admin_overview().
*/
function filter_admin_overview_submit($form, &$form_state) {
$filter_formats = filter_formats();
foreach ($form_state['values']['formats'] as $id => $data) {
// Only update if this is a form element with weight.
if (is_array($data) && isset($data['weight'])) {
$filter_formats[$id]->set('weight', $data['weight']);
$filter_formats[$id]->save();
}
}
filter_formats_reset();
drupal_set_message(t('The text format ordering has been saved.'));
}
/**
* Page callback: Displays the text format add/edit form.
*
* @param object|null $format
* (optional) An object representing a format, with the following properties:
* - format: A machine-readable name representing the ID of the text format
* to save. If this corresponds to an existing text format, that format
* will be updated; otherwise, a new format will be created.
* - name: The title of the text format.
* - cache: An integer indicating whether the text format is cacheable (1) or
* not (0). Defaults to 1.
* - status: (optional) An integer indicating whether the text format is
* enabled (1) or not (0). Defaults to 1.
* - weight: (optional) The weight of the text format, which controls its
* placement in text format lists. If omitted, the weight is set to 0.
* Defaults to NULL.
*
* @return
* A form array.
*
* @see filter_menu()
*/
function filter_admin_format_page($format = NULL) {
if (!isset($format->name)) {
drupal_set_title(t('Add text format'));
$format = entity_create('filter_format', array());
}
return drupal_get_form('filter_admin_format_form', $format);
}
/**
* Form constructor for the text format add/edit form.
*
* @param $format
* A format object having the properties:
* - format: A machine-readable name representing the ID of the text format to
* save. If this corresponds to an existing text format, that format will be
* updated; otherwise, a new format will be created.
* - name: The title of the text format.
* - cache: (optional) An integer indicating whether the text format is
* cacheable (1) or not (0). Defaults to 1.
* - status: (optional) An integer indicating whether the text format is
* enabled (1) or not (0). Defaults to 1.
* - weight: (optional) The weight of the text format, which controls its
* placement in text format lists. If omitted, the weight is set to 0.
*
* @see filter_admin_format_form_validate()
* @see filter_admin_format_form_submit()
* @ingroup forms
*/
function filter_admin_format_form($form, &$form_state, $format) {
$is_fallback = ($format->format == filter_fallback_format());
$form['#format'] = $format;
$form['#tree'] = TRUE;
$form['#attached']['library'][] = array('filter', 'drupal.filter.admin');
$form['name'] = array(
'#type' => 'textfield',
'#title' => t('Name'),
'#default_value' => $format->name,
'#required' => TRUE,
'#weight' => -30,
);
$form['format'] = array(
'#type' => 'machine_name',
'#required' => TRUE,
'#default_value' => $format->format,
'#maxlength' => 255,
'#machine_name' => array(
'exists' => 'filter_format_exists',
'source' => array('name'),
),
'#disabled' => !empty($format->format),
'#weight' => -20,
);
// @todo Remove once moved to FilterFormatFormController.
$form['langcode'] = array(
'#type' => 'value',
'#value' => !$format->isNew() ? $format->langcode : language_default()->langcode,
);
// Add user role access selection.
$form['roles'] = array(
'#type' => 'checkboxes',
'#title' => t('Roles'),
'#options' => array_map('check_plain', user_role_names()),
'#disabled' => $is_fallback,
'#weight' => -10,
);
if ($is_fallback) {
$form['roles']['#description'] = t('All roles for this text format must be enabled and cannot be changed.');
}
if (!empty($format->format)) {
// If editing an existing text format, pre-select its current permissions.
$form['roles']['#default_value'] = array_keys(filter_get_roles_by_format($format));
}
elseif ($admin_role = config('user.settings')->get('admin_role')) {
// If adding a new text format and the site has an administrative role,
// pre-select that role so as to grant administrators access to the new
// text format permission by default.
$form['roles']['#default_value'] = array($admin_role);
}
// Create filter plugin instances for all available filters, including both
// enabled/configured ones as well as new and not yet unconfigured ones.
$filters = $format->filters()->sort();
// Filter status.
$form['filters']['status'] = array(
'#type' => 'item',
'#title' => t('Enabled filters'),
'#prefix' => '<div id="filters-status-wrapper">',
'#suffix' => '</div>',
// This item is used as a pure wrapping container with heading. Ignore its
// value, since 'filters' should only contain filter definitions.
// @see http://drupal.org/node/1829202
'#input' => FALSE,
);
// Filter order (tabledrag).
$form['filters']['order'] = array(
'#type' => 'table',
// For filter.admin.js
'#attributes' => array('id' => 'filter-order'),
'#title' => t('Filter processing order'),
'#tabledrag' => array(
array('order', 'sibling', 'filter-order-weight'),
),
'#tree' => FALSE,
'#input' => FALSE,
'#theme_wrappers' => array('form_element'),
);
// Filter settings.
$form['filter_settings'] = array(
'#type' => 'vertical_tabs',
'#title' => t('Filter settings'),
);
foreach ($filters as $name => $filter) {
$form['filters']['status'][$name] = array(
'#type' => 'checkbox',
'#title' => $filter->getLabel(),
'#default_value' => $filter->status,
'#parents' => array('filters', $name, 'status'),
'#description' => $filter->getDescription(),
'#weight' => $filter->weight,
);
$form['filters']['order'][$name]['#attributes']['class'][] = 'draggable';
$form['filters']['order'][$name]['#weight'] = $filter->weight;
$form['filters']['order'][$name]['filter'] = array(
'#markup' => $filter->getLabel(),
);
$form['filters']['order'][$name]['weight'] = array(
'#type' => 'weight',
'#title' => t('Weight for @title', array('@title' => $filter->getLabel())),
'#title_display' => 'invisible',
'#delta' => 50,
'#default_value' => $filter->weight,
'#parents' => array('filters', $name, 'weight'),
'#attributes' => array('class' => array('filter-order-weight')),
);
// Retrieve the settings form of the filter plugin. The plugin should not be
// aware of the text format. Therefore, it only receives a set of minimal
// base properties to allow advanced implementations to work.
$settings_form = array(
'#parents' => array('filters', $name, 'settings'),
'#tree' => TRUE,
);
$settings_form = $filter->settingsForm($settings_form, $form_state);
if (!empty($settings_form)) {
$form['filters']['settings'][$name] = array(
'#type' => 'details',
'#title' => $filter->getLabel(),
'#weight' => $filter->weight,
'#parents' => array('filters', $name, 'settings'),
'#group' => 'filter_settings',
);
$form['filters']['settings'][$name] += $settings_form;
}
}
$form['actions'] = array('#type' => 'actions');
$form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration'));
return $form;
}
/**
* Form validation handler for filter_admin_format_form().
*
* @see filter_admin_format_form_submit()
*/
function filter_admin_format_form_validate($form, &$form_state) {
$format_format = trim($form_state['values']['format']);
$format_name = trim($form_state['values']['name']);
// Ensure that the values to be saved later are exactly the ones validated.
form_set_value($form['format'], $format_format, $form_state);
form_set_value($form['name'], $format_name, $form_state);
$filter_formats = entity_load_multiple('filter_format');
foreach ($filter_formats as $format) {
if ($format->name == $format_name && $format->format != $format_format) {
form_set_error('name', t('Text format names must be unique. A format named %name already exists.', array('%name' => $format_name)));
break;
}
}
}
/**
* Form submission handler for filter_admin_format_form().
*
* @see filter_admin_format_form_validate()
*/
function filter_admin_format_form_submit($form, &$form_state) {
// Remove unnecessary values.
form_state_values_clean($form_state);
// Add the submitted form values to the text format, and save it.
$format = $form['#format'];
foreach ($form_state['values'] as $key => $value) {