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

Issue #2656278 by alexpott, miteshmap, droplet, walangitan, empesan, ejb503, manmohandream, vaidehi bapat, gadaniels72, swentel, jamesdesq, luca_cracco, malaimo29001, Wim Leers, nileema.jadhav: Convert "Limit allowed HTML tags" input field to a textarea

8.4.x
xjm 2017-02-08 20:03:04 -06:00
parent 27509d09d5
commit ec4b75596e
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/modules/filter/src/Plugin/Filter/FilterHtml.php
View File

@ -41,12 +41,10 @@ class FilterHtml extends FilterBase {
*/
public function settingsForm(array $form, FormStateInterface $form_state) {
$form['allowed_html'] = array(
'#type' => 'textfield',
'#type' => 'textarea',
'#title' => $this->t('Allowed HTML tags'),
'#default_value' => $this->settings['allowed_html'],
'#maxlength' => 2048,
'#description' => $this->t('A list of HTML tags that can be used. By default only the <em>lang</em> and <em>dir</em> attributes are allowed for all HTML tags. Each HTML tag may have attributes which are treated as allowed attribute names for that HTML tag. Each attribute may allow all values, or only allow specific values. Attribute names or values may be written as a prefix and wildcard like <em>jump-*</em>. JavaScript event attributes, JavaScript URLs, and CSS are always stripped.'),
'#size' => 250,
'#attached' => array(
'library' => array(
'filter/drupal.filter.filter_html.admin',
@ -70,6 +68,12 @@ class FilterHtml extends FilterBase {
* {@inheritdoc}
*/
public function setConfiguration(array $configuration) {
if (isset($configuration['settings']['allowed_html'])) {
// The javascript in core/modules/filter/filter.filter_html.admin.js
// removes new lines and double spaces so, for consistency when javascript
// is disabled, remove them.
$configuration['settings']['allowed_html'] = preg_replace('/\s+/', ' ', $configuration['settings']['allowed_html']);
}
parent::setConfiguration($configuration);
// Force restrictions to be calculated again.
$this->restrictions = NULL;

6
core/modules/filter/src/Tests/FilterAdminTest.php
View File

@ -206,13 +206,13 @@ class FilterAdminTest extends WebTestBase {
$this->assertTrue($full_format->access('use', $this->adminUser), 'Admin user may use Full HTML.');
$this->assertFalse($full_format->access('use', $this->webUser), 'Web user may not use Full HTML.');
// Add an additional tag.
// Add an additional tag and extra spaces and returns.
$edit = array();
$edit['filters[filter_html][settings][allowed_html]'] = '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd> <quote>';
$edit['filters[filter_html][settings][allowed_html]'] = "<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>\r\n<quote>";
$this->drupalPostForm('admin/config/content/formats/manage/' . $restricted, $edit, t('Save configuration'));
$this->assertUrl('admin/config/content/formats');
$this->drupalGet('admin/config/content/formats/manage/' . $restricted);
$this->assertFieldByName('filters[filter_html][settings][allowed_html]', $edit['filters[filter_html][settings][allowed_html]'], 'Allowed HTML tag added.');
$this->assertFieldByName('filters[filter_html][settings][allowed_html]', "<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd> <quote>", 'Allowed HTML tag added.');
$elements = $this->xpath('//select[@name=:first]/following::select[@name=:second]', array(
':first' => 'filters[' . $first_filter . '][weight]',

14
core/modules/filter/tests/src/Unit/FilterHtmlTest.php
View File

@ -79,4 +79,18 @@ class FilterHtmlTest extends UnitTestCase {
];
}
/**
* @covers ::setConfiguration
*/
public function testSetConfiguration() {
$configuration['settings'] = [
// New lines and spaces are replaced with a single space.
'allowed_html' => "<a> <br>\r\n <p>",
'filter_html_help' => 1,
'filter_html_nofollow' => 0,
];
$filter = new FilterHtml($configuration, 'filter_html', ['provider' => 'test']);
$this->assertSame('<a> <br> <p>', $filter->getConfiguration()['settings']['allowed_html']);
}
}