X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/177fd6fefd2e3d5a0ea6591c71d660cabdb3c1a4..refs/tags/wordpress-2.9:/wp-includes/kses.php diff --git a/wp-includes/kses.php b/wp-includes/kses.php index ae37fc26..56176b46 100644 --- a/wp-includes/kses.php +++ b/wp-includes/kses.php @@ -24,9 +24,8 @@ */ /** - * You can override this in your my-hacks.php file - * You can also override this in a plugin file. The - * my-hacks.php is deprecated in its usage. + * You can override this in your my-hacks.php file You can also override this + * in a plugin file. The my-hacks.php is deprecated in its usage. * * @since 1.2.0 */ @@ -35,9 +34,10 @@ if (!defined('CUSTOM_TAGS')) if (!CUSTOM_TAGS) { /** - * Kses global for default allowable HTML tags + * Kses global for default allowable HTML tags. + * + * Can be override by using CUSTOM_TAGS constant. * - * Can be override by using CUSTOM_TAGS constant * @global array $allowedposttags * @since 2.0.0 */ @@ -119,23 +119,35 @@ if (!CUSTOM_TAGS) { 'target' => array ()), 'h1' => array( 'align' => array (), - 'class' => array ()), - 'h2' => array( + 'class' => array (), + 'id' => array (), + 'style' => array ()), + 'h2' => array ( 'align' => array (), - 'class' => array ()), - 'h3' => array( + 'class' => array (), + 'id' => array (), + 'style' => array ()), + 'h3' => array ( 'align' => array (), - 'class' => array ()), - 'h4' => array( + 'class' => array (), + 'id' => array (), + 'style' => array ()), + 'h4' => array ( 'align' => array (), - 'class' => array ()), - 'h5' => array( + 'class' => array (), + 'id' => array (), + 'style' => array ()), + 'h5' => array ( 'align' => array (), - 'class' => array ()), - 'h6' => array( + 'class' => array (), + 'id' => array (), + 'style' => array ()), + 'h6' => array ( 'align' => array (), - 'class' => array ()), - 'hr' => array( + 'class' => array (), + 'id' => array (), + 'style' => array ()), + 'hr' => array ( 'align' => array (), 'class' => array (), 'noshade' => array (), @@ -182,8 +194,10 @@ if (!CUSTOM_TAGS) { 'class' => array (), 'dir' => array (), 'align' => array (), + 'lang' => array (), 'style' => array (), - 'title' => array ()), + 'title' => array (), + 'xml:lang' => array()), 'strike' => array(), 'strong' => array(), 'sub' => array(), @@ -271,16 +285,17 @@ if (!CUSTOM_TAGS) { 'u' => array(), 'ul' => array ( 'class' => array (), - 'style' => array (), + 'style' => array (), 'type' => array ()), 'ol' => array ( 'class' => array (), 'start' => array (), - 'style' => array (), + 'style' => array (), 'type' => array ()), 'var' => array ()); + /** - * Kses allowed HTML elements + * Kses allowed HTML elements. * * @global array $allowedtags * @since 1.0.0 @@ -321,17 +336,17 @@ if (!CUSTOM_TAGS) { } /** - * wp_kses() - Filters content and keeps only allowable HTML elements. + * Filters content and keeps only allowable HTML elements. * - * This function makes sure that only the allowed HTML element names, - * attribute names and attribute values plus only sane HTML entities - * will occur in $string. You have to remove any slashes from PHP's - * magic quotes before you call this function. + * This function makes sure that only the allowed HTML element names, attribute + * names and attribute values plus only sane HTML entities will occur in + * $string. You have to remove any slashes from PHP's magic quotes before you + * call this function. * - * The default allowed protocols are 'http', 'https', 'ftp', 'mailto', - * 'news', 'irc', 'gopher', 'nntp', 'feed', and finally 'telnet. This - * covers all common link protocols, except for 'javascript' which - * should not be allowed for untrusted users. + * The default allowed protocols are 'http', 'https', 'ftp', 'mailto', 'news', + * 'irc', 'gopher', 'nntp', 'feed', and finally 'telnet. This covers all common + * link protocols, except for 'javascript' which should not be allowed for + * untrusted users. * * @since 1.0.0 * @@ -350,11 +365,10 @@ function wp_kses($string, $allowed_html, $allowed_protocols = array ('http', 'ht } /** - * wp_kses_hook() - You add any kses hooks here. + * You add any kses hooks here. * - * There is currently only one kses WordPress hook and it is - * called here. All parameters are passed to the hooks and - * expected to recieve a string. + * There is currently only one kses WordPress hook and it is called here. All + * parameters are passed to the hooks and expected to recieve a string. * * @since 1.0.0 * @@ -369,18 +383,18 @@ function wp_kses_hook($string, $allowed_html, $allowed_protocols) { } /** - * wp_kses_version() - This function returns kses' version number. + * This function returns kses' version number. * * @since 1.0.0 * - * @return string Version Number + * @return string KSES Version Number */ function wp_kses_version() { return '0.2.2'; } /** - * wp_kses_split() - Searches for HTML tags, no matter how malformed + * Searches for HTML tags, no matter how malformed. * * It also matches stray ">" characters. * @@ -392,22 +406,26 @@ function wp_kses_version() { * @return string Content with fixed HTML tags */ function wp_kses_split($string, $allowed_html, $allowed_protocols) { - return preg_replace('%((|$))|(<[^>]*(>|$)|>))%e', - "wp_kses_split2('\\1', \$allowed_html, ".'$allowed_protocols)', $string); + global $pass_allowed_html, $pass_allowed_protocols; + $pass_allowed_html = $allowed_html; + $pass_allowed_protocols = $allowed_protocols; + return preg_replace_callback('%((|$))|(<[^>]*(>|$)|>))%', + create_function('$match', 'global $pass_allowed_html, $pass_allowed_protocols; return wp_kses_split2($match[1], $pass_allowed_html, $pass_allowed_protocols);'), $string); } /** - * wp_kses_split2() - Callback for wp_kses_split for fixing malformed HTML tags + * Callback for wp_kses_split for fixing malformed HTML tags. * - * This function does a lot of work. It rejects some very malformed things - * like <:::>. It returns an empty string, if the element isn't allowed (look - * ma, no strip_tags()!). Otherwise it splits the tag into an element and an - * attribute list. + * This function does a lot of work. It rejects some very malformed things like + * <:::>. It returns an empty string, if the element isn't allowed (look ma, no + * strip_tags()!). Otherwise it splits the tag into an element and an attribute + * list. * * After the tag is split into an element and an attribute list, it is run - * through another filter which will remove illegal attributes and once - * that is completed, will be returned. + * through another filter which will remove illegal attributes and once that is + * completed, will be returned. * + * @access private * @since 1.0.0 * @uses wp_kses_attr() * @@ -429,6 +447,10 @@ function wp_kses_split2($string, $allowed_html, $allowed_protocols) { $string = $newstring; if ( $string == '' ) return ''; + // prevent multiple dashes in comments + $string = preg_replace('/--+/', '-', $string); + // prevent three dashes closing a comment + $string = preg_replace('/-$/', '', $string); return ""; } # Allow HTML comments @@ -453,13 +475,13 @@ function wp_kses_split2($string, $allowed_html, $allowed_protocols) { } /** - * wp_kses_attr() - Removes all attributes, if none are allowed for this element + * Removes all attributes, if none are allowed for this element. * * If some are allowed it calls wp_kses_hair() to split them further, and then * it builds up new HTML code from the data that kses_hair() returns. It also - * removes "<" and ">" characters, if there are any left. One more thing it - * does is to check if the tag has a closing XHTML slash, and if it does, it - * puts one in the returned code as well. + * removes "<" and ">" characters, if there are any left. One more thing it does + * is to check if the tag has a closing XHTML slash, and if it does, it puts one + * in the returned code as well. * * @since 1.0.0 * @@ -511,6 +533,19 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) { break; } + if ( $arreach['name'] == 'style' ) { + $orig_value = $arreach['value']; + + $value = safecss_filter_attr($orig_value); + + if ( empty($value) ) + continue; + + $arreach['value'] = $value; + + $arreach['whole'] = str_replace($orig_value, $value, $arreach['whole']); + } + if ($ok) $attr2 .= ' '.$arreach['whole']; # it passed them } # if !is_array($current) @@ -524,14 +559,15 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) { } /** - * wp_kses_hair() - Builds an attribute list from string containing attributes. + * Builds an attribute list from string containing attributes. * * This function does a lot of work. It parses an attribute list into an array * with attribute data, and tries to do the right thing even if it gets weird * input. It will add quotes around attribute values that don't have any quotes * or apostrophes around them, to make it easier to produce HTML code that will * conform to W3C's HTML specification. It will also remove bad URL protocols - * from attribute values. + * from attribute values. It also reduces duplicate attributes by using the + * attribute defined first (foo='bar' foo='baz' will result in foo='bar'). * * @since 1.0.0 * @@ -543,6 +579,7 @@ function wp_kses_hair($attr, $allowed_protocols) { $attrarr = array (); $mode = 0; $attrname = ''; + $uris = array('xmlns', 'profile', 'href', 'src', 'cite', 'classid', 'codebase', 'data', 'usemap', 'longdesc', 'action'); # Loop through the whole attribute list @@ -574,7 +611,9 @@ function wp_kses_hair($attr, $allowed_protocols) { { $working = 1; $mode = 0; - $attrarr[] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y'); + if(FALSE === array_key_exists($attrname, $attrarr)) { + $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y'); + } $attr = preg_replace('/^\s+/', '', $attr); } @@ -585,9 +624,13 @@ function wp_kses_hair($attr, $allowed_protocols) { if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match)) # "value" { - $thisval = wp_kses_bad_protocol($match[1], $allowed_protocols); + $thisval = $match[1]; + if ( in_array($attrname, $uris) ) + $thisval = wp_kses_bad_protocol($thisval, $allowed_protocols); - $attrarr[] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n'); + if(FALSE === array_key_exists($attrname, $attrarr)) { + $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n'); + } $working = 1; $mode = 0; $attr = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr); @@ -597,9 +640,13 @@ function wp_kses_hair($attr, $allowed_protocols) { if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) # 'value' { - $thisval = wp_kses_bad_protocol($match[1], $allowed_protocols); + $thisval = $match[1]; + if ( in_array($attrname, $uris) ) + $thisval = wp_kses_bad_protocol($thisval, $allowed_protocols); - $attrarr[] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n'); + if(FALSE === array_key_exists($attrname, $attrarr)) { + $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n'); + } $working = 1; $mode = 0; $attr = preg_replace("/^'[^']*'(\s+|$)/", '', $attr); @@ -609,9 +656,13 @@ function wp_kses_hair($attr, $allowed_protocols) { if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) # value { - $thisval = wp_kses_bad_protocol($match[1], $allowed_protocols); + $thisval = $match[1]; + if ( in_array($attrname, $uris) ) + $thisval = wp_kses_bad_protocol($thisval, $allowed_protocols); - $attrarr[] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n'); + if(FALSE === array_key_exists($attrname, $attrarr)) { + $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n'); + } # We add quotes to conform to W3C's HTML spec. $working = 1; $mode = 0; @@ -628,16 +679,16 @@ function wp_kses_hair($attr, $allowed_protocols) { } } # while - if ($mode == 1) + if ($mode == 1 && FALSE === array_key_exists($attrname, $attrarr)) # special case, for when the attribute list ends with a valueless # attribute like "selected" - $attrarr[] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y'); + $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y'); return $attrarr; } /** - * wp_kses_check_attr_val() - Performs different checks for attribute values. + * Performs different checks for attribute values. * * The currently implemented checks are "maxlen", "minlen", "maxval", "minval" * and "valueless" with even more checks to come soon. @@ -709,12 +760,12 @@ function wp_kses_check_attr_val($value, $vless, $checkname, $checkvalue) { } /** - * wp_kses_bad_protocol() - Sanitize string from bad protocols + * Sanitize string from bad protocols. * - * This function removes all non-allowed protocols from the beginning - * of $string. It ignores whitespace and the case of the letters, and - * it does understand HTML entities. It does its work in a while loop, - * so it won't be fooled by a string like "javascript:javascript:alert(57)". + * This function removes all non-allowed protocols from the beginning of + * $string. It ignores whitespace and the case of the letters, and it does + * understand HTML entities. It does its work in a while loop, so it won't be + * fooled by a string like "javascript:javascript:alert(57)". * * @since 1.0.0 * @@ -724,7 +775,6 @@ function wp_kses_check_attr_val($value, $vless, $checkname, $checkvalue) { */ function wp_kses_bad_protocol($string, $allowed_protocols) { $string = wp_kses_no_null($string); - $string = preg_replace('/\xad+/', '', $string); # deals with Opera "feature" $string2 = $string.'a'; while ($string != $string2) { @@ -736,7 +786,7 @@ function wp_kses_bad_protocol($string, $allowed_protocols) { } /** - * wp_kses_no_null() - Removes any NULL characters in $string. + * Removes any NULL characters in $string. * * @since 1.0.0 * @@ -751,11 +801,11 @@ function wp_kses_no_null($string) { } /** - * wp_kses_stripslashes() - Strips slashes from in front of quotes + * Strips slashes from in front of quotes. * - * This function changes the character sequence \" to just " - * It leaves all other slashes alone. It's really weird, but the - * quoting from preg_replace(//e) seems to require this. + * This function changes the character sequence \" to just ". It leaves all + * other slashes alone. It's really weird, but the quoting from + * preg_replace(//e) seems to require this. * * @since 1.0.0 * @@ -767,7 +817,7 @@ function wp_kses_stripslashes($string) { } /** - * wp_kses_array_lc() - Goes through an array and changes the keys to all lower case. + * Goes through an array and changes the keys to all lower case. * * @since 1.0.0 * @@ -777,11 +827,11 @@ function wp_kses_stripslashes($string) { function wp_kses_array_lc($inarray) { $outarray = array (); - foreach ($inarray as $inkey => $inval) { + foreach ( (array) $inarray as $inkey => $inval) { $outkey = strtolower($inkey); $outarray[$outkey] = array (); - foreach ($inval as $inkey2 => $inval2) { + foreach ( (array) $inval as $inkey2 => $inval2) { $outkey2 = strtolower($inkey2); $outarray[$outkey][$outkey2] = $inval2; } # foreach $inval @@ -791,7 +841,7 @@ function wp_kses_array_lc($inarray) { } /** - * wp_kses_js_entities() - Removes the HTML JavaScript entities found in early versions of Netscape 4. + * Removes the HTML JavaScript entities found in early versions of Netscape 4. * * @since 1.0.0 * @@ -803,10 +853,10 @@ function wp_kses_js_entities($string) { } /** - * wp_kses_html_error() - Handles parsing errors in wp_kses_hair() + * Handles parsing errors in wp_kses_hair(). * - * The general plan is to remove everything to and including some - * whitespace, but it deals with quotes and apostrophes as well. + * The general plan is to remove everything to and including some whitespace, + * but it deals with quotes and apostrophes as well. * * @since 1.0.0 * @@ -818,10 +868,10 @@ function wp_kses_html_error($string) { } /** - * wp_kses_bad_protocol_once() - Sanitizes content from bad protocols and other characters + * Sanitizes content from bad protocols and other characters. * - * This function searches for URL protocols at the beginning of $string, - * while handling whitespace and HTML entities. + * This function searches for URL protocols at the beginning of $string, while + * handling whitespace and HTML entities. * * @since 1.0.0 * @@ -835,35 +885,44 @@ function wp_kses_bad_protocol_once($string, $allowed_protocols) { $string2 = preg_split('/:|:|:/i', $string, 2); if ( isset($string2[1]) && !preg_match('%/\?%', $string2[0]) ) - $string = wp_kses_bad_protocol_once2($string2[0], $allowed_protocols) . trim($string2[1]); + $string = wp_kses_bad_protocol_once2($string2[0]) . trim($string2[1]); else - $string = preg_replace_callback('/^((&[^;]*;|[\sA-Za-z0-9])*)'.'(:|:|&#[Xx]3[Aa];)\s*/', create_function('$matches', 'global $_kses_allowed_protocols; return wp_kses_bad_protocol_once2($matches[1], $_kses_allowed_protocols);'), $string); + $string = preg_replace_callback('/^((&[^;]*;|[\sA-Za-z0-9])*)'.'(:|:|&#[Xx]3[Aa];)\s*/', 'wp_kses_bad_protocol_once2', $string); return $string; } /** - * wp_kses_bad_protocol_once2() - Callback for wp_kses_bad_protocol_once() regular expression. + * Callback for wp_kses_bad_protocol_once() regular expression. * * This function processes URL protocols, checks to see if they're in the * white-list or not, and returns different data depending on the answer. * + * @access private * @since 1.0.0 * - * @param string $string Content to check for bad protocols - * @param array $allowed_protocols Allowed protocols + * @param mixed $matches string or preg_replace_callback() matches array to check for bad protocols * @return string Sanitized content */ -function wp_kses_bad_protocol_once2($string, $allowed_protocols) { +function wp_kses_bad_protocol_once2($matches) { + global $_kses_allowed_protocols; + + if ( is_array($matches) ) { + if ( ! isset($matches[1]) || empty($matches[1]) ) + return ''; + + $string = $matches[1]; + } else { + $string = $matches; + } + $string2 = wp_kses_decode_entities($string); $string2 = preg_replace('/\s/', '', $string2); $string2 = wp_kses_no_null($string2); - $string2 = preg_replace('/\xad+/', '', $string2); - # deals with Opera "feature" $string2 = strtolower($string2); $allowed = false; - foreach ($allowed_protocols as $one_protocol) + foreach ( (array) $_kses_allowed_protocols as $one_protocol) if (strtolower($one_protocol) == $string2) { $allowed = true; break; @@ -876,11 +935,10 @@ function wp_kses_bad_protocol_once2($string, $allowed_protocols) { } /** - * wp_kses_normalize_entities() - Converts and fixes HTML entities + * Converts and fixes HTML entities. * - * This function normalizes HTML entities. It will convert "AT&T" to the - * correct "AT&T", ":" to ":", "&#XYZZY;" to "&#XYZZY;" - * and so on. + * This function normalizes HTML entities. It will convert "AT&T" to the correct + * "AT&T", ":" to ":", "&#XYZZY;" to "&#XYZZY;" and so on. * * @since 1.0.0 * @@ -895,33 +953,70 @@ function wp_kses_normalize_entities($string) { # Change back the allowed entities in our entity whitelist $string = preg_replace('/&([A-Za-z][A-Za-z0-9]{0,19});/', '&\\1;', $string); - $string = preg_replace_callback('/&#0*([0-9]{1,5});/', create_function('$matches', 'return wp_kses_normalize_entities2($matches[1]);'), $string); - $string = preg_replace('/&#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/', '&#\\1\\2;', $string); + $string = preg_replace_callback('/&#0*([0-9]{1,5});/', 'wp_kses_normalize_entities2', $string); + $string = preg_replace_callback('/&#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/', 'wp_kses_normalize_entities3', $string); return $string; } /** - * wp_kses_normalize_entities2() - Callback for wp_kses_normalize_entities() regular expression + * Callback for wp_kses_normalize_entities() regular expression. * - * This function helps wp_kses_normalize_entities() to only accept 16 bit - * values and nothing more for &#number; entities. + * This function helps wp_kses_normalize_entities() to only accept 16 bit values + * and nothing more for &#number; entities. * + * @access private * @since 1.0.0 * - * @param int $i Number encoded entity + * @param array $matches preg_replace_callback() matches array * @return string Correctly encoded entity */ -function wp_kses_normalize_entities2($i) { - return (($i > 65535) ? "&#$i;" : "&#$i;"); +function wp_kses_normalize_entities2($matches) { + if ( ! isset($matches[1]) || empty($matches[1]) ) + return ''; + + $i = $matches[1]; + return ( ( ! valid_unicode($i) ) || ($i > 65535) ? "&#$i;" : "&#$i;" ); } /** - * wp_kses_decode_entities() - Convert all entities to their character counterparts. + * Callback for wp_kses_normalize_entities() for regular expression. + * + * This function helps wp_kses_normalize_entities() to only accept valid Unicode + * numeric entities in hex form. * - * This function decodes numeric HTML entities (A and A). It - * doesn't do anything with other entities like ä, but we don't need - * them in the URL protocol whitelisting system anyway. + * @access private + * + * @param array $matches preg_replace_callback() matches array + * @return string Correctly encoded entity + */ +function wp_kses_normalize_entities3($matches) { + if ( ! isset($matches[2]) || empty($matches[2]) ) + return ''; + + $hexchars = $matches[2]; + return ( ( ! valid_unicode(hexdec($hexchars)) ) ? "&#x$hexchars;" : "&#x$hexchars;" ); +} + +/** + * Helper function to determine if a Unicode value is valid. + * + * @param int $i Unicode value + * @return bool true if the value was a valid Unicode number + */ +function valid_unicode($i) { + return ( $i == 0x9 || $i == 0xa || $i == 0xd || + ($i >= 0x20 && $i <= 0xd7ff) || + ($i >= 0xe000 && $i <= 0xfffd) || + ($i >= 0x10000 && $i <= 0x10ffff) ); +} + +/** + * Convert all entities to their character counterparts. + * + * This function decodes numeric HTML entities (A and A). It doesn't do + * anything with other entities like ä, but we don't need them in the URL + * protocol whitelisting system anyway. * * @since 1.0.0 * @@ -929,19 +1024,39 @@ function wp_kses_normalize_entities2($i) { * @return string Content after decoded entities */ function wp_kses_decode_entities($string) { - $string = preg_replace('/&#([0-9]+);/e', 'chr("\\1")', $string); - $string = preg_replace('/&#[Xx]([0-9A-Fa-f]+);/e', 'chr(hexdec("\\1"))', $string); + $string = preg_replace_callback('/&#([0-9]+);/', '_wp_kses_decode_entities_chr', $string); + $string = preg_replace_callback('/&#[Xx]([0-9A-Fa-f]+);/', '_wp_kses_decode_entities_chr_hexdec', $string); return $string; } /** - * wp_filter_kses() - Sanitize content with allowed HTML Kses rules + * Regex callback for wp_kses_decode_entities() + * + * @param array $match preg match + * @return string + */ +function _wp_kses_decode_entities_chr( $match ) { + return chr( $match[1] ); +} + +/** + * Regex callback for wp_kses_decode_entities() + * + * @param array $match preg match + * @return string + */ +function _wp_kses_decode_entities_chr_hexdec( $match ) { + return chr( hexdec( $match[1] ) ); +} + +/** + * Sanitize content with allowed HTML Kses rules. * * @since 1.0.0 * @uses $allowedtags * - * @param string $data Content to filter + * @param string $data Content to filter, expected to be escaped with slashes * @return string Filtered content */ function wp_filter_kses($data) { @@ -950,15 +1065,29 @@ function wp_filter_kses($data) { } /** - * wp_filter_post_kses() - Sanitize content for allowed HTML tags for post content + * Sanitize content with allowed HTML Kses rules. + * + * @since 2.9.0 + * @uses $allowedtags + * + * @param string $data Content to filter, expected to not be escaped + * @return string Filtered content + */ +function wp_kses_data($data) { + global $allowedtags; + return wp_kses( $data , $allowedtags ); +} + +/** + * Sanitize content for allowed HTML tags for post content. * - * Post content refers to the page contents of the 'post' type and not - * $_POST data from forms. + * Post content refers to the page contents of the 'post' type and not $_POST + * data from forms. * * @since 2.0.0 * @uses $allowedposttags * - * @param string $data Post content to filter + * @param string $data Post content to filter, expected to be escaped with slashes * @return string Filtered post content with allowed HTML tags and attributes intact. */ function wp_filter_post_kses($data) { @@ -967,7 +1096,24 @@ function wp_filter_post_kses($data) { } /** - * wp_filter_nohtml_kses() - Strips all of the HTML in the content + * Sanitize content for allowed HTML tags for post content. + * + * Post content refers to the page contents of the 'post' type and not $_POST + * data from forms. + * + * @since 2.9.0 + * @uses $allowedposttags + * + * @param string $data Post content to filter + * @return string Filtered post content with allowed HTML tags and attributes intact. + */ +function wp_kses_post($data) { + global $allowedposttags; + return wp_kses( $data , $allowedposttags ); +} + +/** + * Strips all of the HTML in the content. * * @since 2.1.0 * @@ -979,13 +1125,13 @@ function wp_filter_nohtml_kses($data) { } /** - * kses_init_filters() - Adds all Kses input form content filters + * Adds all Kses input form content filters. + * + * All hooks have default priority. The wp_filter_kses() function is added to + * the 'pre_comment_content' and 'title_save_pre' hooks. * - * All hooks have default priority. The wp_filter_kses() fucntion - * is added to the 'pre_comment_content' and 'title_save_pre' - * hooks. The wp_filter_post_kses() function is added to the - * 'content_save_pre', 'excerpt_save_pre', and 'content_filtered_save_pre' - * hooks. + * The wp_filter_post_kses() function is added to the 'content_save_pre', + * 'excerpt_save_pre', and 'content_filtered_save_pre' hooks. * * @since 2.0.0 * @uses add_filter() See description for what functions are added to what hooks. @@ -1002,15 +1148,14 @@ function kses_init_filters() { } /** - * kses_remove_filters() - Removes all Kses input form content filters + * Removes all Kses input form content filters. * - * A quick procedural method to removing all of the filters - * that kses uses for content in WordPress Loop. + * A quick procedural method to removing all of the filters that kses uses for + * content in WordPress Loop. * - * Does not remove the kses_init() function from 'init' hook - * (priority is default). Also does not remove kses_init() - * function from 'set_current_user' hook (priority is also - * default). + * Does not remove the kses_init() function from 'init' hook (priority is + * default). Also does not remove kses_init() function from 'set_current_user' + * hook (priority is also default). * * @since 2.0.6 */ @@ -1026,15 +1171,15 @@ function kses_remove_filters() { } /** - * kses_init() - Sets up most of the Kses filters for input form content + * Sets up most of the Kses filters for input form content. * * If you remove the kses_init() function from 'init' hook and - * 'set_current_user' (priority is default), then none of the - * Kses filter hooks will be added. + * 'set_current_user' (priority is default), then none of the Kses filter hooks + * will be added. * - * First removes all of the Kses filters in case the current user - * does not need to have Kses filter the content. If the user does - * not have unfiltered html capability, then Kses filters are added. + * First removes all of the Kses filters in case the current user does not need + * to have Kses filter the content. If the user does not have unfiltered html + * capability, then Kses filters are added. * * @uses kses_remove_filters() Removes the Kses filters * @uses kses_init_filters() Adds the Kses filters back if the user @@ -1050,4 +1195,49 @@ function kses_init() { add_action('init', 'kses_init'); add_action('set_current_user', 'kses_init'); -?> \ No newline at end of file + +function safecss_filter_attr( $css, $deprecated = '' ) { + $css = wp_kses_no_null($css); + $css = str_replace(array("\n","\r","\t"), '', $css); + + if ( preg_match( '%[\\(&]|/\*%', $css ) ) // remove any inline css containing \ ( & or comments + return ''; + + $css_array = split( ';', trim( $css ) ); + $allowed_attr = apply_filters( 'safe_style_css', array( 'text-align', 'margin', 'color', 'float', + 'border', 'background', 'background-color', 'border-bottom', 'border-bottom-color', + 'border-bottom-style', 'border-bottom-width', 'border-collapse', 'border-color', 'border-left', + 'border-left-color', 'border-left-style', 'border-left-width', 'border-right', 'border-right-color', + 'border-right-style', 'border-right-width', 'border-spacing', 'border-style', 'border-top', + 'border-top-color', 'border-top-style', 'border-top-width', 'border-width', 'caption-side', + 'clear', 'cursor', 'direction', 'font', 'font-family', 'font-size', 'font-style', + 'font-variant', 'font-weight', 'height', 'letter-spacing', 'line-height', 'margin-bottom', + 'margin-left', 'margin-right', 'margin-top', 'overflow', 'padding', 'padding-bottom', + 'padding-left', 'padding-right', 'padding-top', 'text-decoration', 'text-indent', 'vertical-align', + 'width' ) ); + + if ( empty($allowed_attr) ) + return $css; + + $css = ''; + foreach ( $css_array as $css_item ) { + if ( $css_item == '' ) + continue; + $css_item = trim( $css_item ); + $found = false; + if ( strpos( $css_item, ':' ) === false ) { + $found = true; + } else { + $parts = split( ':', $css_item ); + if ( in_array( trim( $parts[0] ), $allowed_attr ) ) + $found = true; + } + if ( $found ) { + if( $css != '' ) + $css .= ';'; + $css .= $css_item; + } + } + + return $css; +}