', $text);
}
@@ -764,10 +763,10 @@
'#title' => t('URL filter'),
'#collapsible' => TRUE,
);
- $form['filter_urlfilter']['filter_url_length_' . $format] = array(
+ $form['filter_urlfilter']['filter_url_length_' . $format->format_id] = array(
'#type' => 'textfield',
'#title' => t('Maximum link text length'),
- '#default_value' => variable_get('filter_url_length_' . $format, 72),
+ '#default_value' => variable_get('filter_url_length_' . $format->format_id, 72),
'#maxlength' => 4,
'#description' => t('URLs longer than this number of characters will be truncated to prevent long strings that break formatting. The link itself will be retained; just the text portion of the link will be truncated.'),
);
@@ -780,7 +779,7 @@
*/
function _filter_url($text, $format) {
// Pass length to regexp callback
- _filter_url_trim(NULL, variable_get('filter_url_length_' . $format, 72));
+ _filter_url_trim(NULL, variable_get("filter_url_length_$format->format_id", 72));
$text = ' ' . $text . ' ';
Index: modules/filter/filter.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v
retrieving revision 1.30
diff -u -r1.30 filter.admin.inc
--- modules/filter/filter.admin.inc 12 Jun 2009 08:39:37 -0000 1.30
+++ modules/filter/filter.admin.inc 11 Aug 2009 15:36:41 -0000
@@ -47,12 +47,12 @@
drupal_set_message(t('Default format updated.'));
variable_set('filter_default_format', $form_state['values']['default']);
}
- foreach ($form_state['values'] as $id => $data) {
+ foreach ($form_state['values'] as $format_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)
+ ->condition('format_id', $format_id)
->execute();
}
}
@@ -98,7 +98,7 @@
function filter_admin_format_page($format = NULL) {
if (!isset($format->name)) {
drupal_set_title(t('Add text format'), PASS_THROUGH);
- $format = (object)array('name' => '', 'roles' => '', 'format' => '');
+ $format = (object)array('name' => '', 'roles' => '', 'format_id' => 0);
}
return drupal_get_form('filter_admin_format_form', $format);
}
@@ -111,8 +111,8 @@
* @see filter_admin_format_form_submit()
*/
function filter_admin_format_form(&$form_state, $format) {
- $default = ($format->format == variable_get('filter_default_format', 1));
- if ($default) {
+ $is_default = filter_is_default_format($format);
+ if ($is_default) {
$help = t('All roles for the default format must be enabled and cannot be changed.');
$form['default_format'] = array('#type' => 'hidden', '#value' => 1);
}
@@ -127,7 +127,7 @@
// Add a row of checkboxes for form group.
$form['roles'] = array('#type' => 'fieldset',
'#title' => t('Roles'),
- '#description' => $default ? $help : t('Choose which roles may use this text format. Note that roles with the "administer filters" permission can always use all text formats.'),
+ '#description' => $is_default ? $help : t('Choose which roles may use this text format. Note that roles with the "administer filters" permission can always use all text formats.'),
'#tree' => TRUE,
);
@@ -135,33 +135,33 @@
$checked = strpos($format->roles, ",$rid,") !== FALSE;
$form['roles'][$rid] = array('#type' => 'checkbox',
'#title' => $name,
- '#default_value' => ($default || $checked),
+ '#default_value' => ($is_default || $checked),
);
- if ($default) {
+ if ($is_default) {
$form['roles'][$rid]['#disabled'] = TRUE;
}
}
// Table with filters
$all = filter_list_all();
- $enabled = filter_list_format($format->format);
+ $enabled = filter_list_format($format->format_id);
$form['filters'] = array('#type' => 'fieldset',
'#title' => t('Filters'),
'#description' => t('Choose the filters that will be used in this text format.'),
'#tree' => TRUE,
);
- foreach ($all as $id => $filter) {
- $form['filters'][$id] = array('#type' => 'checkbox',
+ foreach ($all as $filter_id => $filter) {
+ $form['filters'][$filter_id] = array('#type' => 'checkbox',
'#title' => $filter->name,
- '#default_value' => isset($enabled[$id]),
- '#description' => module_invoke($filter->module, 'filter', 'description', $filter->delta),
+ '#default_value' => isset($enabled[$filter_id]),
+ '#description' => $filter->description,
);
}
- if (!empty($format->format)) {
- $form['format'] = array('#type' => 'hidden', '#value' => $format->format);
+ if (!empty($format->format_id)) {
+ $form['format_id'] = array('#type' => 'hidden', '#value' => $format->format_id);
// Composition tips (guidelines)
- $tips = _filter_tips($format->format, FALSE);
+ $tips = _filter_tips($format, FALSE);
$tiplist = theme('filter_tips', $tips, FALSE);
if (!$tiplist) {
$tiplist = '' . t('No guidelines available.') . '
';
@@ -182,9 +182,9 @@
* Validate text format form submissions.
*/
function filter_admin_format_form_validate($form, &$form_state) {
- if (!isset($form_state['values']['format'])) {
+ if (!isset($form_state['values']['format_id'])) {
$name = trim($form_state['values']['name']);
- $result = db_query("SELECT format FROM {filter_format} WHERE name = :name", array(':name' => $name))->fetchField();
+ $result = db_query("SELECT format_id FROM {filter_format} WHERE name = :name", array(':name' => $name))->fetchField();
if ($result) {
form_set_error('name', t('Text format names must be unique. A format named %name already exists.', array('%name' => $name)));
}
@@ -195,77 +195,80 @@
* Process text format form submissions.
*/
function filter_admin_format_form_submit($form, &$form_state) {
- $format = isset($form_state['values']['format']) ? $form_state['values']['format'] : NULL;
- $current = filter_list_format($format);
- $name = trim($form_state['values']['name']);
- $cache = TRUE;
-
- // Add a new text format.
- if (!$format) {
- $new = TRUE;
- db_insert('filter_format')
- ->fields(array('name' => $name))
- ->execute();
- $format = db_query("SELECT MAX(format) AS format FROM {filter_format}")->fetchField();
- drupal_set_message(t('Added text format %format.', array('%format' => $name)));
- }
- else {
- drupal_set_message(t('The text format settings have been updated.'));
- }
- db_delete('filter')
- ->condition('format', $format)
- ->execute();
- $query = db_insert('filter')->fields(array('format', 'module', 'delta', 'weight'));
- foreach ($form_state['values']['filters'] as $id => $checked) {
- if ($checked) {
- list($module, $delta) = explode('/', $id);
- // Add new filters to the bottom.
- $weight = isset($current[$id]->weight) ? $current[$id]->weight : 10;
- $query->values(array(
- 'format' => $format,
- 'module' => $module,
- 'delta' => $delta,
- 'weight' => $weight,
- ));
- // Check if there are any 'no cache' filters.
- $cache &= !module_invoke($module, 'filter', 'no cache', $delta);
- }
- $query->execute();
- }
-
+ $format_id = isset($form_state['values']['format_id']) ? $form_state['values']['format_id'] : NULL;
+ $current = filter_list_format($format_id);
+ $form_state['values']['name'] = trim($form_state['values']['name']);
+
+ $format = (object)$form_state['values'];
+
// We store the roles as a string for ease of use.
// We should always set all roles to TRUE when saving a default role.
// We use leading and trailing comma's to allow easy substring matching.
- $roles = array();
+ $format->roles = array();
if (isset($form_state['values']['roles'])) {
foreach ($form_state['values']['roles'] as $id => $checked) {
if ($checked) {
- $roles[] = $id;
+ $format->roles[] = $id;
}
}
}
if (!empty($form_state['values']['default_format'])) {
- $roles = ',' . implode(',', array_keys(user_roles())) . ',';
+ $format->roles = ',' . implode(',', array_keys(user_roles())) . ',';
}
else {
- $roles = ',' . implode(',', $roles) . ',';
+ $format->roles = ',' . implode(',', $format->roles) . ',';
}
- db_update('filter_format')
- ->fields(array(
- 'cache' => $cache,
- 'name' => $name,
- 'roles' => $roles,
- ))
- ->condition('format', $format)
- ->execute();
+ $filter_info = filter_list_all();
+ $format->cache = TRUE;
+ $enabled_filters = array();
+ foreach ($form_state['values']['filters'] as $filter_id => $checked) {
+ if ($checked) {
+ $filter = $filter_info[$filter_id];
+ // Add new filters to the bottom.
+ $filter->weight = isset($current[$filter_id]->weight) ? $current[$filter_id]->weight : 10;
+ // Check if there are any 'no cache' filters.
+ $format->cache &= empty($filter->cache) || $filter->cache; // cache by default.
+ $enabled_filters[$filter_id] = $filter;
+ }
+ }
+
+ // Add a new text format.
+ if (!$format_id) {
+ $new = TRUE;
+ drupal_write_record('filter_format', $format);
+
+ drupal_set_message(t('Added text format %format_name.', array('%format_name' => $format->name)));
+ }
+ else {
+ // Remove all filters associated to the format.
+ db_delete('filter_format_filter')
+ ->condition('format_id', $format->format_id)
+ ->execute();
+ drupal_write_record('filter_format', $format, 'format_id');
+
+ drupal_set_message(t('The text format settings have been updated.'));
+ }
- cache_clear_all($format . ':', 'cache_filter', TRUE);
+ $query = db_insert('filter_format_filter')->fields(array('format_id', 'module', 'filter_id', 'weight'));
+ foreach ($enabled_filters as $filter_id => $filter) {
+ $query->values(array(
+ 'format_id' => $format->format_id,
+ 'module' => $filter->module,
+ 'filter_id' => $filter_id,
+ 'weight' => $filter->weight,
+ ));
+ }
+ $query->execute();
+
+ cache_clear_all($format->format_id . ':', 'cache_filter', TRUE);
- // If a new filter was added, return to the main list of filters. Otherwise, stay on edit filter page to show new changes.
+ // If a new format was added, return to the main list of formats.
+ // Otherwise, stay on edit format page to show new changes.
$return = 'admin/settings/formats';
if (!empty($new)) {
- $return .= '/' . $format;
+ $return .= '/' . $format->format_id;
+ module_invoke_all('filter_format_update', $format);
}
$form_state['redirect'] = $return;
return;
@@ -277,24 +280,14 @@
* @ingroup forms
* @see filter_admin_delete_submit()
*/
-function filter_admin_delete() {
- $format = arg(4);
- $format = db_query('SELECT * FROM {filter_format} WHERE format = :format', array(':format' => $format))->fetchObject();
-
- if ($format) {
- if ($format->format != variable_get('filter_default_format', 1)) {
- $form['format'] = array('#type' => 'hidden', '#value' => $format->format);
- $form['name'] = array('#type' => 'hidden', '#value' => $format->name);
-
- return confirm_form($form, t('Are you sure you want to delete the text format %format?', array('%format' => $format->name)), 'admin/settings/formats', t('If you have any content left in this text format, it will be switched to the default text format. This action cannot be undone.'), t('Delete'), t('Cancel'));
- }
- else {
- drupal_set_message(t('The default format cannot be deleted.'));
- drupal_goto('admin/settings/formats');
- }
+function filter_admin_delete($form_state, $format) {
+ if (!filter_is_default_format($format)) {
+ $form['format'] = array('#type' => 'value', '#value' => $format);
+ return confirm_form($form, t('Are you sure you want to delete the text format %format?', array('%format' => $format->name)), 'admin/settings/formats', t('If you have any content left in this text format, it will be switched to the default text format. This action cannot be undone.'), t('Delete'), t('Cancel'));
}
else {
- drupal_not_found();
+ drupal_set_message(t('The default format cannot be deleted.'));
+ drupal_goto('admin/settings/formats');
}
}
@@ -302,30 +295,20 @@
* Process filter delete form submission.
*/
function filter_admin_delete_submit($form, &$form_state) {
+ $format = $form_state['values']['format'];
+
db_delete('filter_format')
- ->condition('format', $form_state['values']['format'])
+ ->condition('format_id', $format->format_id)
->execute();
- db_delete('filter')
- ->condition('format', $form_state['values']['format'])
- ->execute();
-
- $default = variable_get('filter_default_format', 1);
- // Replace existing instances of the deleted format with the default format.
- if (db_table_exists('comment')) {
- db_update('comment')
- ->fields(array('format' => $default))
- ->condition('format', $form_state['values']['format'])
+
+ db_delete('filter_format_filter')
+ ->condition('format_id', $format->format_id)
->execute();
- }
- if (db_table_exists('box')) {
- db_update('box')
- ->fields(array('format' => $default))
- ->condition('format', $form_state['values']['format'])
- ->execute();
- }
- cache_clear_all($form_state['values']['format'] . ':', 'cache_filter', TRUE);
- drupal_set_message(t('Deleted text format %format.', array('%format' => $form_state['values']['name'])));
+ module_invoke_all('filter_format_delete', $format);
+ cache_clear_all($format->format_id . ':', 'cache_filter', TRUE);
+
+ drupal_set_message(t('Deleted text format %format_name.', array('%format_name' => $format->name)));
$form_state['redirect'] = 'admin/settings/formats';
return;
@@ -346,12 +329,14 @@
* @ingroup forms
*/
function filter_admin_configure(&$form_state, $format) {
- $list = filter_list_format($format->format);
+ $filters = filter_list_format($format->format_id);
$form = array();
- foreach ($list as $filter) {
- $form_module = module_invoke($filter->module, 'filter', 'settings', $filter->delta, $format->format);
- if (isset($form_module) && is_array($form_module)) {
- $form = array_merge($form, $form_module);
+ foreach ($filters as $filter) {
+ if (isset($filter->settings_callback) && drupal_function_exists($filter->settings_callback)) {
+ $settings_form = call_user_func($filter->settings_callback, $format);
+ if (isset($settings_form) && is_array($settings_form)) {
+ $form = array_merge($form, $settings_form);
+ }
}
}
@@ -361,7 +346,7 @@
else {
$form['error'] = array('#markup' => t('No settings are available.'));
}
- $form['format'] = array('#type' => 'hidden', '#value' => $format->format);
+ $form['format'] = array('#type' => 'value', '#value' => $format);
$form['#submit'][] = 'filter_admin_configure_submit';
return $form;
}
@@ -370,7 +355,7 @@
* Clear the filter's cache when configuration settings are saved.
*/
function filter_admin_configure_submit($form, &$form_state) {
- cache_clear_all($form_state['values']['format'] . ':', 'cache_filter', TRUE);
+ cache_clear_all($form_state['values']['format']->format_id . ':', 'cache_filter', TRUE);
}
/**
@@ -390,14 +375,14 @@
*/
function filter_admin_order(&$form_state, $format = NULL) {
// Get list (with forced refresh).
- $filters = filter_list_format($format->format);
+ $filters = filter_list_format($format->format_id);
$form['weights'] = array('#tree' => TRUE);
- foreach ($filters as $id => $filter) {
- $form['names'][$id] = array('#markup' => $filter->name);
- $form['weights'][$id] = array('#type' => 'weight', '#default_value' => $filter->weight);
+ foreach ($filters as $filter_id => $filter) {
+ $form['names'][$filter_id] = array('#markup' => $filter->name);
+ $form['weights'][$filter_id] = array('#type' => 'weight', '#default_value' => $filter->weight);
}
- $form['format'] = array('#type' => 'hidden', '#value' => $format->format);
+ $form['format'] = array('#type' => 'value', '#value' => $format);
$form['submit'] = array('#type' => 'submit', '#value' => t('Save configuration'));
return $form;
@@ -434,16 +419,28 @@
* Process filter order configuration form submission.
*/
function filter_admin_order_submit($form, &$form_state) {
- foreach ($form_state['values']['weights'] as $id => $weight) {
- list($module, $delta) = explode('/', $id);
- db_update('filter')
+ $format = $form_state['values']['format'];
+ foreach ($form_state['values']['weights'] as $filter_id => $weight) {
+ db_update('filter_format_filter')
->fields(array('weight' => $weight))
- ->condition('format', $form_state['values']['format'])
- ->condition('module', $module)
- ->condition('delta', $delta)
+ ->condition('format_id', $format->format_id)
+ ->condition('filter_id', $filter_id)
->execute();
}
drupal_set_message(t('The filter ordering has been saved.'));
- cache_clear_all($form_state['values']['format'] . ':', 'cache_filter', TRUE);
+ module_invoke_all('filter_format_update', $format);
+ cache_clear_all($format->format_id . ':', 'cache_filter', TRUE);
}
+
+/**
+ * Implement hook_modules_uninstalled().
+ */
+function filter_modules_uninstalled($modules) {
+ // Remove filters from unistalled modules.
+ foreach ($modules as $module) {
+ db_delete('filter_format_filter')
+ ->condition('module', $module)
+ ->execute();
+ }
+}
\ No newline at end of file
Index: modules/field/modules/text/text.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/text/text.test,v
retrieving revision 1.9
diff -u -r1.9 text.test
--- modules/field/modules/text/text.test 27 Jul 2009 20:15:35 -0000 1.9
+++ modules/field/modules/text/text.test 11 Aug 2009 15:36:36 -0000
@@ -169,7 +169,7 @@
$this->assertRaw(str_replace('
', '', $value), t('Filtered value is displayed correctly'));
// Allow the user to use the 'Full HTML' format.
- db_update('filter_format')->fields(array('roles' => ',2,'))->condition('format', 2)->execute();
+ db_update('filter_format')->fields(array('roles' => ',2,'))->condition('format_id', 2)->execute();
// Display edition form.
// We should now have a 'text format' selector.
Index: modules/field/modules/text/text.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/modules/text/text.module,v
retrieving revision 1.17
diff -u -r1.17 text.module
--- modules/field/modules/text/text.module 4 Aug 2009 06:38:56 -0000 1.17
+++ modules/field/modules/text/text.module 11 Aug 2009 15:36:34 -0000
@@ -361,7 +361,7 @@
// parse errors.
if (isset($format)) {
$filters = filter_list_format($format);
- if (isset($filters['php/0']) && strpos($text, '' => 6, '
' => 4);
// Newline only indicates a line break if line break converter
// filter is present.
- if (isset($filters['filter/1'])) {
+ if (isset($filters['filter_autop'])) {
$line_breaks["\n"] = 1;
}
$break_points[] = $line_breaks;
@@ -428,7 +428,7 @@
}
// If the htmlcorrector filter is present, apply it to the generated summary.
- if (isset($filters['filter/3'])) {
+ if (isset($filters['filter_htmlcorrector'])) {
$summary = _filter_htmlcorrector($summary);
}
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.365
diff -u -r1.365 system.install
--- modules/system/system.install 8 Aug 2009 20:52:32 -0000 1.365
+++ modules/system/system.install 11 Aug 2009 15:37:38 -0000
@@ -398,14 +398,14 @@
->execute();
// Add text formats.
- $filtered_html_format = db_insert('filter_format')
+ $filtered_html_format_id = db_insert('filter_format')
->fields(array(
'name' => 'Filtered HTML',
'roles' => ',' . DRUPAL_ANONYMOUS_RID . ',' . DRUPAL_AUTHENTICATED_RID . ',',
'cache' => 1,
))
->execute();
- $full_html_format = db_insert('filter_format')
+ $full_html_format_id = db_insert('filter_format')
->fields(array(
'name' => 'Full HTML',
'roles' => '',
@@ -416,62 +416,62 @@
// Enable filters for each text format.
// Filtered HTML:
- db_insert('filter')
- ->fields(array('format', 'module', 'delta', 'weight'))
+ db_insert('filter_format_filter')
+ ->fields(array('format_id', 'module', 'filter_id', 'weight'))
// URL filter.
->values(array(
- 'format' => $filtered_html_format,
+ 'format_id' => $filtered_html_format_id,
'module' => 'filter',
- 'delta' => 2,
+ 'filter_id' => 'filter_url',
'weight' => 0,
))
// HTML filter.
->values(array(
- 'format' => $filtered_html_format,
+ 'format_id' => $filtered_html_format_id,
'module' => 'filter',
- 'delta' => 0,
+ 'filter_id' => 'filter_html',
'weight' => 1,
))
// Line break filter.
->values(array(
- 'format' => $filtered_html_format,
+ 'format_id' => $filtered_html_format_id,
'module' => 'filter',
- 'delta' => 1,
+ 'filter_id' => 'filter_autop',
'weight' => 2,
))
// HTML corrector filter.
->values(array(
- 'format' => $filtered_html_format,
+ 'format_id' => $filtered_html_format_id,
'module' => 'filter',
- 'delta' => 3,
+ 'filter_id' => 'filter_htmlcorrector',
'weight' => 10,
))
// Full HTML:
// URL filter.
->values(array(
- 'format' => $full_html_format,
+ 'format_id' => $full_html_format_id,
'module' => 'filter',
- 'delta' => 2,
+ 'filter_id' => 'filter_url',
'weight' => 0,
))
// Line break filter.
->values(array(
- 'format' => $full_html_format,
+ 'format_id' => $full_html_format_id,
'module' => 'filter',
- 'delta' => 1,
+ 'filter_id' => 'filter_autop',
'weight' => 1,
))
// HTML corrector filter.
->values(array(
- 'format' => $full_html_format,
+ 'format_id' => $full_html_format_id,
'module' => 'filter',
- 'delta' => 3,
+ 'filter_id' => 'filter_htmlcorrector',
'weight' => 10,
))
->execute();
// Set the default input format to Filtered HTML.
- variable_set('filter_default_format', $filtered_html_format);
+ variable_set('filter_default_format', $filtered_html_format_id);
variable_set('node_options_forum', array(0 => 'status'));