Commit 113deb13 authored by Tristan Olive's avatar Tristan Olive

Apply HTML purifier filter on input before BBCode filter so that BBCode output isn't filtered out

parent f7104c79
......@@ -84,25 +84,6 @@ function boinc_standard_input_formats() {
// Numbering suffix
'tableofcontents_number_end_letter' => '.',
),
// Settings for: bbcode module
'bbcode' => array(
// Convert addresses to links
'bbcode_make_links' => '1',
// Spam link deterrent
'bbcode_filter_nofollow' => '0',
// Email address encoding
'bbcode_encode_mailto' => '1',
// Smart paragraph and line breaks
'bbcode_paragraph_breaks' => '0',
// Print debugging info
'bbcode_debug' => '0',
),
// Settings for: pathologic module
'pathologic' => array(
// Also considered local
'filter_pathologic_local_paths' => '/',
'filter_pathologic_absolute' => 1,
),
// Settings for: htmlpurifier module
'htmlpurifier' => array(
'htmlpurifier_clear_cac' => array(
......@@ -116,7 +97,7 @@ function boinc_standard_input_formats() {
'#value' => array(
'Attr.EnableID' => '0',
'AutoFormat.AutoParagraph' => '1',
'AutoFormat.Linkify' => '1',
'AutoFormat.Linkify' => '0',
'AutoFormat.RemoveEmpty' => '0',
'Null_HTML.Allowed' => '1',
'HTML.ForbiddenAttributes' => '',
......@@ -129,22 +110,41 @@ function boinc_standard_input_formats() {
),
),
),
// Settings for: bbcode module
'bbcode' => array(
// Convert addresses to links
'bbcode_make_links' => '1',
// Spam link deterrent
'bbcode_filter_nofollow' => '0',
// Email address encoding
'bbcode_encode_mailto' => '1',
// Smart paragraph and line breaks
'bbcode_paragraph_breaks' => '0',
// Print debugging info
'bbcode_debug' => '0',
),
// Settings for: pathologic module
'pathologic' => array(
// Also considered local
'filter_pathologic_local_paths' => '/',
'filter_pathologic_absolute' => 1,
),
);
$input_format->filters = array(
'tableofcontents' => array(
// Delta => Weight for: Table of contents
'0' => '-10',
),
'htmlpurifier' => array(
// Delta => Weight for: HTML Purifier
'0' => '-9',
),
'bbcode' => array(
// Delta => Weight for: BBCode
'0' => '-9',
'0' => '-8',
),
'pathologic' => array(
// Delta => Weight for: Pathologic
'0' => '-8',
),
'htmlpurifier' => array(
// Delta => Weight for: HTML Purifier
'0' => '-7',
),
);
......
......@@ -55,7 +55,7 @@ function boinc_standard_strongarm() {
$strongarm->value = array(
'Attr.EnableID' => '0',
'AutoFormat.AutoParagraph' => '1',
'AutoFormat.Linkify' => '1',
'AutoFormat.Linkify' => '0',
'AutoFormat.RemoveEmpty' => '0',
'Null_HTML.Allowed' => '1',
'HTML.ForbiddenAttributes' => '',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment