mirror/php-htmlpurifier
1
0
Fork 0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-07-30 19:00:10 +02:00
Code Issues Releases Wiki Activity

Implement working linkification, now, the real challenge is to get it to play nice with auto-paragraphing.

Browse Source 
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1216 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2007-06-24 02:45:38 +00:00
parent 291fa4cb29
commit 31704c92f6
2 changed files with 94 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
library/HTMLPurifier/Strategy/MakeWellFormed.php
View File

@@ -5,6 +5,7 @@ require_once 'HTMLPurifier/HTMLDefinition.php';
require_once 'HTMLPurifier/Generator.php';
require_once 'HTMLPurifier/Injector/AutoParagraph.php';
require_once 'HTMLPurifier/Injector/Linkify.php';
HTMLPurifier_ConfigSchema::define(
'Core', 'AutoParagraph', false, 'bool', '
@@ -16,6 +17,16 @@ HTMLPurifier_ConfigSchema::define(
'
);
HTMLPurifier_ConfigSchema::define(
'Core', 'AutoLinkify', false, 'bool', '
<p>
This directive will cause HTML Purifier to automatically linkify
text that looks like URLs. This directive has been available since
2.0.1.
</p>
'
);
/**
* Takes tokens makes them well-formed (balance end tags, etc.)
*/
@@ -49,6 +60,12 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
$injector_disabled[] = false;
}
if ($config->get('Core', 'AutoLinkify')) {
$injector[] = new HTMLPurifier_Injector_Linkify();
$injector_skip[] = 0;
$injector_disabled[] = false;
}
$current_injector = 0;
$context->register('Injector', $injector);
@@ -60,13 +77,12 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
// if all goes well, this token will be passed through unharmed
$token = $tokens[$tokens_index];
// this will be more complicated
if (isset($injector[$current_injector])) {
if ($injector_skip[$current_injector] > 0) {
$injector_skip[$current_injector]--;
$injector_disabled[$current_injector] = true;
foreach ($injector as $i => $x) {
if ($injector_skip[$i] > 0) {
$injector_skip[$i]--;
$injector_disabled[$i] = true;
} else {
$injector_disabled[$current_injector] = false;
$injector_disabled[$i] = false;
}
}
@@ -74,8 +90,14 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
if (empty( $token->is_tag )) {
if ($token->type === 'text') {
if (isset($injector[$current_injector]) && !$injector_disabled[$current_injector]) {
$injector[$current_injector]->handleText($token, $config, $context);
foreach ($injector as $i => $x) {
if (!$injector_disabled[$i]) {
$x->handleText($token, $config, $context);
}
if (is_array($token)) {
$current_injector = $i;
break;
}
}
}
@@ -127,8 +149,14 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
$current_nesting[] = $parent; // undo the pop
}
if (isset($injector[$current_injector]) && !$injector_disabled[$current_injector]) {
$injector[$current_injector]->handleStart($token, $config, $context);
foreach ($injector as $i => $x) {
if (!$injector_disabled[$i]) {
$x->handleStart($token, $config, $context);
}
if (is_array($token)) {
$current_injector = $i;
break;
}
}
$this->processToken($token, $config, $context);