Index: CHANGELOG.txt
===================================================================
RCS file: /cvs/drupal/drupal/CHANGELOG.txt,v
retrieving revision 1.316
diff -u -p -r1.316 CHANGELOG.txt
--- CHANGELOG.txt 27 Jun 2009 23:10:59 -0000 1.316
+++ CHANGELOG.txt 6 Jul 2009 12:49:28 -0000
@@ -73,6 +73,8 @@ Drupal 7.0, xxxx-xx-xx (development vers
* If your site is being upgraded from Drupal 6 and you do not have the
contributed date or event modules installed, user time zone settings will
fallback to the system time zone and will have to be reconfigured by each user.
+- Filter system:
+ * Refactored the HTML corrector to take advantage of PHP5 features.
- Removed ping module:
* Contributed modules with similar functionality are available.
- Refactored the "access rules" component of user module:
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.262
diff -u -p -r1.262 filter.module
--- modules/filter/filter.module 5 Jul 2009 18:00:08 -0000 1.262
+++ modules/filter/filter.module 6 Jul 2009 12:49:28 -0000
@@ -757,74 +757,19 @@ function _filter_url($text, $format) {
* Scan input and make sure that all HTML tags are properly closed and nested.
*/
function _filter_htmlcorrector($text) {
- // Prepare tag lists.
- static $no_nesting, $single_use;
- if (!isset($no_nesting)) {
- // Tags which cannot be nested but are typically left unclosed.
- $no_nesting = drupal_map_assoc(array('li', 'p'));
+ // DOM can load HTML soup. But, HTML soup can throw warnings, suppress them.
+ $htmlDom = @DOMDocument::loadHTML('' . $text . '');
- // Single use tags in HTML4
- $single_use = drupal_map_assoc(array('base', 'meta', 'link', 'hr', 'br', 'param', 'img', 'area', 'input', 'col', 'frame'));
+ // The result of DOMDocument->saveXML($bodyNode) is a partial (X)HTML document.
+ // We only need what is inside the body tag.
+ // The "s" modifier makes "." match newlines too.
+ $bodyNode = $htmlDom->getElementsByTagName('body')->item(0);
+ if (preg_match("|^]*>(.*)$|s", $htmlDom->saveXML($bodyNode), $matches)) {
+ return $matches[1];
}
-
- // Properly entify angles.
- $text = preg_replace('!<([^a-zA-Z/])!', '<\1', $text);
-
- // Split tags from text.
- $split = preg_split('/<([^>]+?)>/', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
- // Note: PHP ensures the array consists of alternating delimiters and literals
- // and begins and ends with a literal (inserting $null as required).
-
- $tag = FALSE; // Odd/even counter. Tag or no tag.
- $stack = array();
- $output = '';
- foreach ($split as $value) {
- // Process HTML tags.
- if ($tag) {
- list($tagname) = explode(' ', strtolower($value), 2);
- // Closing tag
- if ($tagname{0} == '/') {
- $tagname = substr($tagname, 1);
- // Discard XHTML closing tags for single use tags.
- if (!isset($single_use[$tagname])) {
- // See if we possibly have a matching opening tag on the stack.
- if (in_array($tagname, $stack)) {
- // Close other tags lingering first.
- do {
- $output .= '';
- } while (array_shift($stack) != $tagname);
- }
- // Otherwise, discard it.
- }
- }
- // Opening tag
- else {
- // See if we have an identical 'no nesting' tag already open and close it if found.
- if (count($stack) && ($stack[0] == $tagname) && isset($no_nesting[$stack[0]])) {
- $output .= '';
- }
- // Push non-single-use tags onto the stack
- if (!isset($single_use[$tagname])) {
- array_unshift($stack, $tagname);
- }
- // Add trailing slash to single-use tags as per X(HT)ML.
- else {
- $value = rtrim($value, ' /') . ' /';
- }
- $output .= '<' . $value . '>';
- }
- }
- else {
- // Passthrough all text.
- $output .= $value;
- }
- $tag = !$tag;
- }
- // Close remaining tags.
- while (count($stack) > 0) {
- $output .= '';
+ else {
+ return "";
}
- return $output;
}
/**
Index: modules/filter/filter.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.test,v
retrieving revision 1.26
diff -u -p -r1.26 filter.test
--- modules/filter/filter.test 3 Jul 2009 18:26:35 -0000 1.26
+++ modules/filter/filter.test 6 Jul 2009 12:49:28 -0000
@@ -182,24 +182,20 @@ class FilterAdminTestCase extends Drupal
}
}
-class FilterTestCase extends DrupalWebTestCase {
+/**
+ * Unit tests for core filters.
+ */
+class FilterUnitTest extends DrupalWebTestCase {
protected $format;
public static function getInfo() {
return array(
'name' => t('Core filters'),
- 'description' => t('Filter each filter individually: Convert URLs into links, Convert line breaks, Correct broken HTML, Escape all HTML, Limit allowed HTML tags.'),
+ 'description' => t('Filter each filter individually: Convert line breaks, Correct broken HTML.'),
'group' => t('Filter'),
);
}
- function setUp() {
- parent::setUp();
-
- $admin_user = $this->drupalCreateUser(array('administer filters', 'create page content'));
- $this->drupalLogin($admin_user);
- }
-
/**
* Test the line break filter.
*/
@@ -594,11 +590,11 @@ class FilterTestCase extends DrupalWebTe
}
/**
- * Test the HTML corrector.
+ * Test the HTML corrector filter.
*
* @todo This test could really use some validity checking function.
*/
- function testHtmlCorrector() {
+ function testHtmlCorrectorFilter() {
// Tag closing.
$f = _filter_htmlcorrector('