diff --git a/core/modules/block/block.install b/core/modules/block/block.install index a5bd3c4..33a0a5b 100644 --- a/core/modules/block/block.install +++ b/core/modules/block/block.install @@ -163,7 +163,7 @@ function block_schema() { 'type' => 'varchar', 'length' => 255, 'not null' => FALSE, - 'description' => 'The {filter_format}.format of the block body.', + 'description' => 'The format id of the block body.', ), ), 'unique keys' => array( diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockTest.php index 7446052..8920061 100644 --- a/core/modules/block/lib/Drupal/block/Tests/BlockTest.php +++ b/core/modules/block/lib/Drupal/block/Tests/BlockTest.php @@ -36,12 +36,12 @@ function setUp() { config('system.site')->set('page.front', 'test-page')->save(); // Create Full HTML text format. - $full_html_format = array( + $full_html_format_config = array( 'format' => 'full_html', 'name' => 'Full HTML', ); - $full_html_format = (object) $full_html_format; - filter_format_save($full_html_format); + $full_html_format = entity_create('filter_format', $full_html_format_config); + $full_html_format->save(); $this->checkPermissions(array(), TRUE); // Create and log in an administrative user having access to the Full HTML diff --git a/core/modules/filter/config/filter.format.plain_text.yml b/core/modules/filter/config/filter.format.plain_text.yml new file mode 100644 index 0000000..5967ffe --- /dev/null +++ b/core/modules/filter/config/filter.format.plain_text.yml @@ -0,0 +1,45 @@ +format: plain_text +name: 'Plain text' +cache: '1' +status: '1' +weight: '10' +roles: + anonymous: anonymous + authenticated: authenticated + administrator: administrator +filters: + filter_html_escape: + module: filter + settings: { } + status: '1' + weight: '0' + filter_url: + module: filter + settings: + filter_url_length: '72' + status: '1' + weight: '1' + filter_autop: + module: filter + settings: { } + status: '1' + weight: '2' + filter_html: + module: filter + settings: + allowed_html: '' + filter_html_help: '0' + filter_html_nofollow: '0' + status: '0' + weight: '0' + filter_html_image_secure: + module: filter + settings: { } + status: '0' + weight: '0' + filter_htmlcorrector: + module: filter + settings: { } + status: '0' + weight: '0' +langcode: und diff --git a/core/modules/filter/filter.admin.inc b/core/modules/filter/filter.admin.inc index c01fb93..b81e4cd 100644 --- a/core/modules/filter/filter.admin.inc +++ b/core/modules/filter/filter.admin.inc @@ -61,13 +61,12 @@ function filter_admin_overview($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) { if (is_array($data) && isset($data['weight'])) { // Only update if this is a form element with weight. - db_update('filter_format') - ->fields(array('weight' => $data['weight'])) - ->condition('format', $id) - ->execute(); + $filter_formats[$id]->weight = $data['weight']; + $filter_formats[$id]->save(); } } filter_formats_reset(); @@ -133,10 +132,8 @@ function theme_filter_admin_overview($variables) { function filter_admin_format_page($format = NULL) { if (!isset($format->name)) { drupal_set_title(t('Add text format')); - $format = (object) array( - 'format' => NULL, - 'name' => '', - ); + + $format = entity_create('filter_format', array()); } return drupal_get_form('filter_admin_format_form', $format); } @@ -276,11 +273,11 @@ function filter_admin_format_form($form, &$form_state, $format) { ); foreach ($filter_info as $name => $filter) { - if (isset($filter['settings callback'])) { - $function = $filter['settings callback']; + if (isset($filter['settings_callback'])) { + $function = $filter['settings_callback']; // Pass along stored filter settings and default settings, but also the // format object and all filters to allow for complex implementations. - $defaults = (isset($filter['default settings']) ? $filter['default settings'] : array()); + $defaults = (isset($filter['default_settings']) ? $filter['default_settings'] : array()); $settings_form = $function($form, $form_state, $filters[$name], $format, $defaults, $filters); if (!empty($settings_form)) { $form['filters']['settings'][$name] = array( @@ -345,9 +342,12 @@ function filter_admin_format_form_validate($form, &$form_state) { form_set_value($form['format'], $format_format, $form_state); form_set_value($form['name'], $format_name, $form_state); - $result = db_query("SELECT format FROM {filter_format} WHERE name = :name AND format <> :format", array(':name' => $format_name, ':format' => $format_format))->fetchField(); - if ($result) { - form_set_error('name', t('Text format names must be unique. A format named %name already exists.', array('%name' => $format_name))); + $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; + } } } @@ -365,14 +365,7 @@ function filter_admin_format_form_submit($form, &$form_state) { foreach ($form_state['values'] as $key => $value) { $format->$key = $value; } - $status = filter_format_save($format); - - // Save user permissions. - if ($permission = filter_permission_name($format)) { - foreach ($format->roles as $rid => $enabled) { - user_role_change_permissions($rid, array($permission => $enabled)); - } - } + $status = $format->save(); switch ($status) { case SAVED_NEW: diff --git a/core/modules/filter/filter.api.php b/core/modules/filter/filter.api.php index f11a528..2331cea 100644 --- a/core/modules/filter/filter.api.php +++ b/core/modules/filter/filter.api.php @@ -11,109 +11,18 @@ */ /** - * Define content filters. - * - * User submitted content is passed through a group of filters before it is - * output in HTML, in order to remove insecure or unwanted parts, correct or - * enhance the formatting, transform special keywords, etc. A group of filters - * is referred to as a "text format". Administrators can create as many text - * formats as needed. Individual filters can be enabled and configured - * differently for each text format. - * - * This hook is invoked by filter_get_filters() and allows modules to register - * input filters they provide. - * - * Filtering is a two-step process. First, the content is 'prepared' by calling - * the 'prepare callback' function for every filter. The purpose of the - * 'prepare callback' is to escape HTML-like structures. For example, imagine a - * filter which allows the user to paste entire chunks of programming code - * without requiring manual escaping of special HTML characters like < or &. If - * the programming code were left untouched, then other filters could think it - * was HTML and change it. For many filters, the prepare step is not necessary. - * - * The second step is the actual processing step. The result from passing the - * text through all the filters' prepare steps gets passed to all the filters - * again, this time with the 'process callback' function. The process callbacks - * should then actually change the content: transform URLs into hyperlinks, - * convert smileys into images, etc. - * - * For performance reasons content is only filtered once; the result is stored - * in the cache table and retrieved from the cache the next time the same piece - * of content is displayed. If a filter's output is dynamic, it can override - * the cache mechanism, but obviously this should be used with caution: having - * one filter that does not support caching in a particular text format - * disables caching for the entire format, not just for one filter. - * - * Beware of the filter cache when developing your module: it is advised to set - * your filter to 'cache' => FALSE while developing, but be sure to remove that - * setting if it's not needed, when you are no longer in development mode. - * - * @return - * An associative array of filters, whose keys are internal filter names, - * which should be unique and therefore prefixed with the name of the module. - * Each value is an associative array describing the filter, with the - * following elements (all are optional except as noted): - * - title: (required) An administrative summary of what the filter does. - * - description: Additional administrative information about the filter's - * behavior, if needed for clarification. - * - settings callback: The name of a function that returns configuration - * form elements for the filter. See hook_filter_FILTER_settings() for - * details. - * - default settings: An associative array containing default settings for - * the filter, to be applied when the filter has not been configured yet. - * - prepare callback: The name of a function that escapes the content before - * the actual filtering happens. See hook_filter_FILTER_prepare() for - * details. - * - process callback: (required) The name the function that performs the - * actual filtering. See hook_filter_FILTER_process() for details. - * - cache (default TRUE): Specifies whether the filtered text can be cached. - * Note that setting this to FALSE makes the entire text format not - * cacheable, which may have an impact on the site's overall performance. - * See filter_format_allowcache() for details. - * - tips callback: The name of a function that returns end-user-facing - * filter usage guidelines for the filter. See hook_filter_FILTER_tips() - * for details. - * - weight: A default weight for the filter in new text formats. - * - * @see filter_example.module - * @see hook_filter_info_alter() - */ -function hook_filter_info() { - $filters['filter_html'] = array( - 'title' => t('Limit allowed HTML tags'), - 'description' => t('Allows you to restrict the HTML tags the user can use. It will also remove harmful content such as JavaScript events, JavaScript URLs and CSS styles from those tags that are not removed.'), - 'process callback' => '_filter_html', - 'settings callback' => '_filter_html_settings', - 'default settings' => array( - 'allowed_html' => '