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

Implement URIScheme and subclasses except for mailto. Remove fragment from components, as it is scheme independent.

Browse Source 
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@218 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2006-08-12 18:58:54 +00:00
parent e56c3fcd20
commit d28bad648a
10 changed files with 250 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
library/HTMLPurifier/AttrDef/URI.php
View File

@@ -49,7 +49,9 @@ class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef
$scheme_obj =& $registry->getScheme($scheme, $config);
if (!$scheme_obj) return ''; // invalid scheme, clean it out
} else {
$scheme_obj =& $registry->getScheme($config->get('URI', 'DefaultScheme'), $config);
$scheme_obj =& $registry->getScheme(
$config->get('URI', 'DefaultScheme'), $config
);
}
@@ -99,11 +101,8 @@ class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef
// userinfo and host are validated within the regexp
// regenerate authority
$authority =
($userinfo === null ? '' : ($userinfo . '@')) .
$host .
($port === null ? '' : (':' . $port));
} else {
$port = $host = $userinfo = null;
}
@@ -120,10 +119,21 @@ class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef
// okay, now we defer execution to the subobject for more processing
list($authority, $path, $query, $fragment) =
$scheme_obj->validateComponents($authority, $path, $query, $fragment);
// note that $fragment is omitted
list($userinfo, $host, $port, $path, $query) =
$scheme_obj->validateComponents(
$userinfo, $host, $port, $path, $query, $config
);
// reconstruct authority
$authority = null;
if (!is_null($userinfo) || !is_null($host) || !is_null($port)) {
$authority = '';
if($userinfo !== null) $authority .= $userinfo . '@';
$authority .= $host;
if($port !== null) $authority .= ':' . $port;
}
// reconstruct the result
$result = '';