--- a/web/wp-includes/kses.php Thu Sep 16 15:45:36 2010 +0000
+++ b/web/wp-includes/kses.php Mon Nov 19 18:26:13 2012 +0100
@@ -1,38 +1,45 @@
<?php
/**
- * HTML/XHTML filter that only allows some elements and attributes
+ * kses 0.2.2 - HTML/XHTML filter that only allows some elements and attributes
+ * Copyright (C) 2002, 2003, 2005 Ulf Harnhammar
+ *
+ * This program is free software and open source software; you can redistribute
+ * it and/or modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * [kses strips evil scripts!]
*
* Added wp_ prefix to avoid conflicts with existing kses users
*
* @version 0.2.2
* @copyright (C) 2002, 2003, 2005
- * @author Ulf Harnhammar <metaur@users.sourceforge.net>
+ * @author Ulf Harnhammar <http://advogato.org/person/metaur/>
*
* @package External
* @subpackage KSES
*
- * @internal
- * *** CONTACT INFORMATION ***
- * E-mail: metaur at users dot sourceforge dot net
- * Web page: http://sourceforge.net/projects/kses
- * Paper mail: Ulf Harnhammar
- * Ymergatan 17 C
- * 753 25 Uppsala
- * SWEDEN
- *
- * [kses strips evil scripts!]
*/
/**
- * 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 a plugin.
*
* @since 1.2.0
*/
-if (!defined('CUSTOM_TAGS'))
- define('CUSTOM_TAGS', false);
+if ( ! defined( 'CUSTOM_TAGS' ) )
+ define( 'CUSTOM_TAGS', false );
-if (!CUSTOM_TAGS) {
+if ( ! CUSTOM_TAGS ) {
/**
* Kses global for default allowable HTML tags.
*
@@ -44,255 +51,390 @@
$allowedposttags = array(
'address' => array(),
'a' => array(
- 'class' => array (),
- 'href' => array (),
- 'id' => array (),
- 'title' => array (),
- 'rel' => array (),
- 'rev' => array (),
- 'name' => array (),
- 'target' => array()),
+ 'class' => true,
+ 'href' => true,
+ 'id' => true,
+ 'title' => true,
+ 'rel' => true,
+ 'rev' => true,
+ 'name' => true,
+ 'target' => true,
+ ),
'abbr' => array(
- 'class' => array (),
- 'title' => array ()),
+ 'class' => true,
+ 'title' => true,
+ ),
'acronym' => array(
- 'title' => array ()),
+ 'title' => true,
+ ),
+ 'article' => array(
+ 'align' => true,
+ 'class' => true,
+ 'dir' => true,
+ 'lang' => true,
+ 'style' => true,
+ 'xml:lang' => true,
+ ),
+ 'aside' => array(
+ 'align' => true,
+ 'class' => true,
+ 'dir' => true,
+ 'lang' => true,
+ 'style' => true,
+ 'xml:lang' => true,
+ ),
'b' => array(),
'big' => array(),
'blockquote' => array(
- 'id' => array (),
- 'cite' => array (),
- 'class' => array(),
- 'lang' => array(),
- 'xml:lang' => array()),
+ 'id' => true,
+ 'cite' => true,
+ 'class' => true,
+ 'lang' => true,
+ 'xml:lang' => true,
+ ),
'br' => array (
- 'class' => array ()),
+ 'class' => true,
+ ),
'button' => array(
- 'disabled' => array (),
- 'name' => array (),
- 'type' => array (),
- 'value' => array ()),
+ 'disabled' => true,
+ 'name' => true,
+ 'type' => true,
+ 'value' => true,
+ ),
'caption' => array(
- 'align' => array (),
- 'class' => array ()),
+ 'align' => true,
+ 'class' => true,
+ ),
'cite' => array (
- 'class' => array(),
- 'dir' => array(),
- 'lang' => array(),
- 'title' => array ()),
+ 'class' => true,
+ 'dir' => true,
+ 'lang' => true,
+ 'title' => true,
+ ),
'code' => array (
- 'style' => array()),
+ 'style' => true,
+ ),
'col' => array(
- 'align' => array (),
- 'char' => array (),
- 'charoff' => array (),
- 'span' => array (),
- 'dir' => array(),
- 'style' => array (),
- 'valign' => array (),
- 'width' => array ()),
+ 'align' => true,
+ 'char' => true,
+ 'charoff' => true,
+ 'span' => true,
+ 'dir' => true,
+ 'style' => true,
+ 'valign' => true,
+ 'width' => true,
+ ),
'del' => array(
- 'datetime' => array ()),
+ 'datetime' => true,
+ ),
'dd' => array(),
+ 'details' => array(
+ 'align' => true,
+ 'class' => true,
+ 'dir' => true,
+ 'lang' => true,
+ 'open' => true,
+ 'style' => true,
+ 'xml:lang' => true,
+ ),
'div' => array(
- 'align' => array (),
- 'class' => array (),
- 'dir' => array (),
- 'lang' => array(),
- 'style' => array (),
- 'xml:lang' => array()),
+ 'align' => true,
+ 'class' => true,
+ 'dir' => true,
+ 'lang' => true,
+ 'style' => true,
+ 'xml:lang' => true,
+ ),
'dl' => array(),
'dt' => array(),
'em' => array(),
'fieldset' => array(),
+ 'figure' => array(
+ 'align' => true,
+ 'class' => true,
+ 'dir' => true,
+ 'lang' => true,
+ 'style' => true,
+ 'xml:lang' => true,
+ ),
+ 'figcaption' => array(
+ 'align' => true,
+ 'class' => true,
+ 'dir' => true,
+ 'lang' => true,
+ 'style' => true,
+ 'xml:lang' => true,
+ ),
'font' => array(
- 'color' => array (),
- 'face' => array (),
- 'size' => array ()),
+ 'color' => true,
+ 'face' => true,
+ 'size' => true,
+ ),
+ 'footer' => array(
+ 'align' => true,
+ 'class' => true,
+ 'dir' => true,
+ 'lang' => true,
+ 'style' => true,
+ 'xml:lang' => true,
+ ),
'form' => array(
- 'action' => array (),
- 'accept' => array (),
- 'accept-charset' => array (),
- 'enctype' => array (),
- 'method' => array (),
- 'name' => array (),
- 'target' => array ()),
+ 'action' => true,
+ 'accept' => true,
+ 'accept-charset' => true,
+ 'enctype' => true,
+ 'method' => true,
+ 'name' => true,
+ 'target' => true,
+ ),
'h1' => array(
- 'align' => array (),
- 'class' => array (),
- 'id' => array (),
- 'style' => array ()),
+ 'align' => true,
+ 'class' => true,
+ 'id' => true,
+ 'style' => true,
+ ),
'h2' => array (
- 'align' => array (),
- 'class' => array (),
- 'id' => array (),
- 'style' => array ()),
+ 'align' => true,
+ 'class' => true,
+ 'id' => true,
+ 'style' => true,
+ ),
'h3' => array (
- 'align' => array (),
- 'class' => array (),
- 'id' => array (),
- 'style' => array ()),
+ 'align' => true,
+ 'class' => true,
+ 'id' => true,
+ 'style' => true,
+ ),
'h4' => array (
- 'align' => array (),
- 'class' => array (),
- 'id' => array (),
- 'style' => array ()),
+ 'align' => true,
+ 'class' => true,
+ 'id' => true,
+ 'style' => true,
+ ),
'h5' => array (
- 'align' => array (),
- 'class' => array (),
- 'id' => array (),
- 'style' => array ()),
+ 'align' => true,
+ 'class' => true,
+ 'id' => true,
+ 'style' => true,
+ ),
'h6' => array (
- 'align' => array (),
- 'class' => array (),
- 'id' => array (),
- 'style' => array ()),
+ 'align' => true,
+ 'class' => true,
+ 'id' => true,
+ 'style' => true,
+ ),
+ 'header' => array(
+ 'align' => true,
+ 'class' => true,
+ 'dir' => true,
+ 'lang' => true,
+ 'style' => true,
+ 'xml:lang' => true,
+ ),
+ 'hgroup' => array(
+ 'align' => true,
+ 'class' => true,
+ 'dir' => true,
+ 'lang' => true,
+ 'style' => true,
+ 'xml:lang' => true,
+ ),
'hr' => array (
- 'align' => array (),
- 'class' => array (),
- 'noshade' => array (),
- 'size' => array (),
- 'width' => array ()),
+ 'align' => true,
+ 'class' => true,
+ 'noshade' => true,
+ 'size' => true,
+ 'width' => true,
+ ),
'i' => array(),
'img' => array(
- 'alt' => array (),
- 'align' => array (),
- 'border' => array (),
- 'class' => array (),
- 'height' => array (),
- 'hspace' => array (),
- 'longdesc' => array (),
- 'vspace' => array (),
- 'src' => array (),
- 'style' => array (),
- 'width' => array ()),
+ 'alt' => true,
+ 'align' => true,
+ 'border' => true,
+ 'class' => true,
+ 'height' => true,
+ 'hspace' => true,
+ 'longdesc' => true,
+ 'vspace' => true,
+ 'src' => true,
+ 'style' => true,
+ 'width' => true,
+ ),
'ins' => array(
- 'datetime' => array (),
- 'cite' => array ()),
+ 'datetime' => true,
+ 'cite' => true,
+ ),
'kbd' => array(),
'label' => array(
- 'for' => array ()),
+ 'for' => true,
+ ),
'legend' => array(
- 'align' => array ()),
+ 'align' => true,
+ ),
'li' => array (
- 'align' => array (),
- 'class' => array ()),
+ 'align' => true,
+ 'class' => true,
+ ),
+ 'menu' => array (
+ 'class' => true,
+ 'style' => true,
+ 'type' => true,
+ ),
+ 'nav' => array(
+ 'align' => true,
+ 'class' => true,
+ 'dir' => true,
+ 'lang' => true,
+ 'style' => true,
+ 'xml:lang' => true,
+ ),
'p' => array(
- 'class' => array (),
- 'align' => array (),
- 'dir' => array(),
- 'lang' => array(),
- 'style' => array (),
- 'xml:lang' => array()),
+ 'class' => true,
+ 'align' => true,
+ 'dir' => true,
+ 'lang' => true,
+ 'style' => true,
+ 'xml:lang' => true,
+ ),
'pre' => array(
- 'style' => array(),
- 'width' => array ()),
+ 'style' => true,
+ 'width' => true,
+ ),
'q' => array(
- 'cite' => array ()),
+ 'cite' => true,
+ ),
's' => array(),
'span' => array (
- 'class' => array (),
- 'dir' => array (),
- 'align' => array (),
- 'lang' => array (),
- 'style' => array (),
- 'title' => array (),
- 'xml:lang' => array()),
+ 'class' => true,
+ 'dir' => true,
+ 'align' => true,
+ 'lang' => true,
+ 'style' => true,
+ 'title' => true,
+ 'xml:lang' => true,
+ ),
+ 'section' => array(
+ 'align' => true,
+ 'class' => true,
+ 'dir' => true,
+ 'lang' => true,
+ 'style' => true,
+ 'xml:lang' => true,
+ ),
'strike' => array(),
'strong' => array(),
'sub' => array(),
+ 'summary' => array(
+ 'align' => true,
+ 'class' => true,
+ 'dir' => true,
+ 'lang' => true,
+ 'style' => true,
+ 'xml:lang' => true,
+ ),
'sup' => array(),
'table' => array(
- 'align' => array (),
- 'bgcolor' => array (),
- 'border' => array (),
- 'cellpadding' => array (),
- 'cellspacing' => array (),
- 'class' => array (),
- 'dir' => array(),
- 'id' => array(),
- 'rules' => array (),
- 'style' => array (),
- 'summary' => array (),
- 'width' => array ()),
+ 'align' => true,
+ 'bgcolor' => true,
+ 'border' => true,
+ 'cellpadding' => true,
+ 'cellspacing' => true,
+ 'class' => true,
+ 'dir' => true,
+ 'id' => true,
+ 'rules' => true,
+ 'style' => true,
+ 'summary' => true,
+ 'width' => true,
+ ),
'tbody' => array(
- 'align' => array (),
- 'char' => array (),
- 'charoff' => array (),
- 'valign' => array ()),
+ 'align' => true,
+ 'char' => true,
+ 'charoff' => true,
+ 'valign' => true,
+ ),
'td' => array(
- 'abbr' => array (),
- 'align' => array (),
- 'axis' => array (),
- 'bgcolor' => array (),
- 'char' => array (),
- 'charoff' => array (),
- 'class' => array (),
- 'colspan' => array (),
- 'dir' => array(),
- 'headers' => array (),
- 'height' => array (),
- 'nowrap' => array (),
- 'rowspan' => array (),
- 'scope' => array (),
- 'style' => array (),
- 'valign' => array (),
- 'width' => array ()),
+ 'abbr' => true,
+ 'align' => true,
+ 'axis' => true,
+ 'bgcolor' => true,
+ 'char' => true,
+ 'charoff' => true,
+ 'class' => true,
+ 'colspan' => true,
+ 'dir' => true,
+ 'headers' => true,
+ 'height' => true,
+ 'nowrap' => true,
+ 'rowspan' => true,
+ 'scope' => true,
+ 'style' => true,
+ 'valign' => true,
+ 'width' => true,
+ ),
'textarea' => array(
- 'cols' => array (),
- 'rows' => array (),
- 'disabled' => array (),
- 'name' => array (),
- 'readonly' => array ()),
+ 'cols' => true,
+ 'rows' => true,
+ 'disabled' => true,
+ 'name' => true,
+ 'readonly' => true,
+ ),
'tfoot' => array(
- 'align' => array (),
- 'char' => array (),
- 'class' => array (),
- 'charoff' => array (),
- 'valign' => array ()),
+ 'align' => true,
+ 'char' => true,
+ 'class' => true,
+ 'charoff' => true,
+ 'valign' => true,
+ ),
'th' => array(
- 'abbr' => array (),
- 'align' => array (),
- 'axis' => array (),
- 'bgcolor' => array (),
- 'char' => array (),
- 'charoff' => array (),
- 'class' => array (),
- 'colspan' => array (),
- 'headers' => array (),
- 'height' => array (),
- 'nowrap' => array (),
- 'rowspan' => array (),
- 'scope' => array (),
- 'valign' => array (),
- 'width' => array ()),
+ 'abbr' => true,
+ 'align' => true,
+ 'axis' => true,
+ 'bgcolor' => true,
+ 'char' => true,
+ 'charoff' => true,
+ 'class' => true,
+ 'colspan' => true,
+ 'headers' => true,
+ 'height' => true,
+ 'nowrap' => true,
+ 'rowspan' => true,
+ 'scope' => true,
+ 'valign' => true,
+ 'width' => true,
+ ),
'thead' => array(
- 'align' => array (),
- 'char' => array (),
- 'charoff' => array (),
- 'class' => array (),
- 'valign' => array ()),
+ 'align' => true,
+ 'char' => true,
+ 'charoff' => true,
+ 'class' => true,
+ 'valign' => true,
+ ),
'title' => array(),
'tr' => array(
- 'align' => array (),
- 'bgcolor' => array (),
- 'char' => array (),
- 'charoff' => array (),
- 'class' => array (),
- 'style' => array (),
- 'valign' => array ()),
+ 'align' => true,
+ 'bgcolor' => true,
+ 'char' => true,
+ 'charoff' => true,
+ 'class' => true,
+ 'style' => true,
+ 'valign' => true,
+ ),
'tt' => array(),
'u' => array(),
'ul' => array (
- 'class' => array (),
- 'style' => array (),
- 'type' => array ()),
+ 'class' => true,
+ 'style' => true,
+ 'type' => true,
+ ),
'ol' => array (
- 'class' => array (),
- 'start' => array (),
- 'style' => array (),
- 'type' => array ()),
- 'var' => array ());
+ 'class' => true,
+ 'start' => true,
+ 'style' => true,
+ 'type' => true,
+ ),
+ 'var' => array(),
+ );
/**
* Kses allowed HTML elements.
@@ -302,20 +444,25 @@
*/
$allowedtags = array(
'a' => array(
- 'href' => array (),
- 'title' => array ()),
+ 'href' => true,
+ 'title' => true,
+ ),
'abbr' => array(
- 'title' => array ()),
+ 'title' => true,
+ ),
'acronym' => array(
- 'title' => array ()),
+ 'title' => true,
+ ),
'b' => array(),
'blockquote' => array(
- 'cite' => array ()),
+ 'cite' => true,
+ ),
// 'br' => array(),
- 'cite' => array (),
+ 'cite' => array(),
'code' => array(),
'del' => array(
- 'datetime' => array ()),
+ 'datetime' => true,
+ ),
// 'dd' => array(),
// 'dl' => array(),
// 'dt' => array(),
@@ -325,7 +472,8 @@
// 'ol' => array(),
// 'p' => array(),
'q' => array(
- 'cite' => array ()),
+ 'cite' => true,
+ ),
'strike' => array(),
'strong' => array(),
// 'sub' => array(),
@@ -333,6 +481,50 @@
// 'u' => array(),
// 'ul' => array(),
);
+
+ $allowedentitynames = array(
+ 'nbsp', 'iexcl', 'cent', 'pound', 'curren', 'yen',
+ 'brvbar', 'sect', 'uml', 'copy', 'ordf', 'laquo',
+ 'not', 'shy', 'reg', 'macr', 'deg', 'plusmn',
+ 'acute', 'micro', 'para', 'middot', 'cedil', 'ordm',
+ 'raquo', 'iquest', 'Agrave', 'Aacute', 'Acirc', 'Atilde',
+ 'Auml', 'Aring', 'AElig', 'Ccedil', 'Egrave', 'Eacute',
+ 'Ecirc', 'Euml', 'Igrave', 'Iacute', 'Icirc', 'Iuml',
+ 'ETH', 'Ntilde', 'Ograve', 'Oacute', 'Ocirc', 'Otilde',
+ 'Ouml', 'times', 'Oslash', 'Ugrave', 'Uacute', 'Ucirc',
+ 'Uuml', 'Yacute', 'THORN', 'szlig', 'agrave', 'aacute',
+ 'acirc', 'atilde', 'auml', 'aring', 'aelig', 'ccedil',
+ 'egrave', 'eacute', 'ecirc', 'euml', 'igrave', 'iacute',
+ 'icirc', 'iuml', 'eth', 'ntilde', 'ograve', 'oacute',
+ 'ocirc', 'otilde', 'ouml', 'divide', 'oslash', 'ugrave',
+ 'uacute', 'ucirc', 'uuml', 'yacute', 'thorn', 'yuml',
+ 'quot', 'amp', 'lt', 'gt', 'apos', 'OElig',
+ 'oelig', 'Scaron', 'scaron', 'Yuml', 'circ', 'tilde',
+ 'ensp', 'emsp', 'thinsp', 'zwnj', 'zwj', 'lrm',
+ 'rlm', 'ndash', 'mdash', 'lsquo', 'rsquo', 'sbquo',
+ 'ldquo', 'rdquo', 'bdquo', 'dagger', 'Dagger', 'permil',
+ 'lsaquo', 'rsaquo', 'euro', 'fnof', 'Alpha', 'Beta',
+ 'Gamma', 'Delta', 'Epsilon', 'Zeta', 'Eta', 'Theta',
+ 'Iota', 'Kappa', 'Lambda', 'Mu', 'Nu', 'Xi',
+ 'Omicron', 'Pi', 'Rho', 'Sigma', 'Tau', 'Upsilon',
+ 'Phi', 'Chi', 'Psi', 'Omega', 'alpha', 'beta',
+ 'gamma', 'delta', 'epsilon', 'zeta', 'eta', 'theta',
+ 'iota', 'kappa', 'lambda', 'mu', 'nu', 'xi',
+ 'omicron', 'pi', 'rho', 'sigmaf', 'sigma', 'tau',
+ 'upsilon', 'phi', 'chi', 'psi', 'omega', 'thetasym',
+ 'upsih', 'piv', 'bull', 'hellip', 'prime', 'Prime',
+ 'oline', 'frasl', 'weierp', 'image', 'real', 'trade',
+ 'alefsym', 'larr', 'uarr', 'rarr', 'darr', 'harr',
+ 'crarr', 'lArr', 'uArr', 'rArr', 'dArr', 'hArr',
+ 'forall', 'part', 'exist', 'empty', 'nabla', 'isin',
+ 'notin', 'ni', 'prod', 'sum', 'minus', 'lowast',
+ 'radic', 'prop', 'infin', 'ang', 'and', 'or',
+ 'cap', 'cup', 'int', 'sim', 'cong', 'asymp',
+ 'ne', 'equiv', 'le', 'ge', 'sub', 'sup',
+ 'nsub', 'sube', 'supe', 'oplus', 'otimes', 'perp',
+ 'sdot', 'lceil', 'rceil', 'lfloor', 'rfloor', 'lang',
+ 'rang', 'loz', 'spades', 'clubs', 'hearts', 'diams',
+ );
}
/**
@@ -344,9 +536,9 @@
* 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.
+ * 'irc', 'gopher', 'nntp', 'feed', 'telnet, 'mms', 'rtsp' and 'svn'. This
+ * covers all common link protocols, except for 'javascript' which should not
+ * be allowed for untrusted users.
*
* @since 1.0.0
*
@@ -355,7 +547,9 @@
* @param array $allowed_protocols Optional. Allowed protocol in links.
* @return string Filtered content with only allowed HTML elements
*/
-function wp_kses($string, $allowed_html, $allowed_protocols = array ('http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet')) {
+function wp_kses($string, $allowed_html, $allowed_protocols = array ()) {
+ if ( empty( $allowed_protocols ) )
+ $allowed_protocols = wp_allowed_protocols();
$string = wp_kses_no_null($string);
$string = wp_kses_js_entities($string);
$string = wp_kses_normalize_entities($string);
@@ -368,7 +562,7 @@
* 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.
+ * parameters are passed to the hooks and expected to receive a string.
*
* @since 1.0.0
*
@@ -409,8 +603,18 @@
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);
+ return preg_replace_callback( '%(<!--.*?(-->|$))|(<[^>]*(>|$)|>)%', '_wp_kses_split_callback', $string );
+}
+
+/**
+ * Callback for wp_kses_split.
+ *
+ * @since 3.1.0
+ * @access private
+ */
+function _wp_kses_split_callback( $match ) {
+ global $pass_allowed_html, $pass_allowed_protocols;
+ return wp_kses_split2( $match[0], $pass_allowed_html, $pass_allowed_protocols );
}
/**
@@ -441,9 +645,9 @@
return '>';
# It matched a ">" character
- if (preg_match('%^<!--(.*?)(-->)?$%', $string, $matches)) {
- $string = str_replace(array('<!--', '-->'), '', $matches[1]);
- while ( $string != $newstring = wp_kses($string, $allowed_html, $allowed_protocols) )
+ if ( '<!--' == substr( $string, 0, 4 ) ) {
+ $string = str_replace( array('<!--', '-->'), '', $string );
+ while ( $string != ($newstring = wp_kses($string, $allowed_html, $allowed_protocols)) )
$string = $newstring;
if ( $string == '' )
return '';
@@ -463,15 +667,15 @@
$elem = $matches[2];
$attrlist = $matches[3];
- if (!@isset($allowed_html[strtolower($elem)]))
+ if ( ! isset($allowed_html[strtolower($elem)]) )
return '';
# They are using a not allowed HTML element
if ($slash != '')
- return "<$slash$elem>";
+ return "</$elem>";
# No attributes are allowed for closing elements
- return wp_kses_attr("$slash$elem", $attrlist, $allowed_html, $allowed_protocols);
+ return wp_kses_attr( $elem, $attrlist, $allowed_html, $allowed_protocols );
}
/**
@@ -495,64 +699,60 @@
# Is there a closing XHTML slash at the end of the attributes?
$xhtml_slash = '';
- if (preg_match('%\s/\s*$%', $attr))
+ if (preg_match('%\s*/\s*$%', $attr))
$xhtml_slash = ' /';
# Are any attributes allowed at all for this element?
-
- if (@ count($allowed_html[strtolower($element)]) == 0)
+ if ( ! isset($allowed_html[strtolower($element)]) || count($allowed_html[strtolower($element)]) == 0 )
return "<$element$xhtml_slash>";
# Split it
-
$attrarr = wp_kses_hair($attr, $allowed_protocols);
# Go through $attrarr, and save the allowed attributes for this element
# in $attr2
-
$attr2 = '';
+ $allowed_attr = $allowed_html[strtolower($element)];
foreach ($attrarr as $arreach) {
- if (!@ isset ($allowed_html[strtolower($element)][strtolower($arreach['name'])]))
+ if ( ! isset( $allowed_attr[strtolower($arreach['name'])] ) )
+ continue; # the attribute is not allowed
+
+ $current = $allowed_attr[strtolower($arreach['name'])];
+ if ( $current == '' )
continue; # the attribute is not allowed
- $current = $allowed_html[strtolower($element)][strtolower($arreach['name'])];
- if ($current == '')
- continue; # the attribute is not allowed
+ if ( strtolower( $arreach['name'] ) == 'style' ) {
+ $orig_value = $arreach['value'];
+ $value = safecss_filter_attr( $orig_value );
- if (!is_array($current))
+ if ( empty( $value ) )
+ continue;
+
+ $arreach['value'] = $value;
+ $arreach['whole'] = str_replace( $orig_value, $value, $arreach['whole'] );
+ }
+
+ if ( ! is_array($current) ) {
$attr2 .= ' '.$arreach['whole'];
# there are no checks
- else {
+ } else {
# there are some checks
$ok = true;
- foreach ($current as $currkey => $currval)
- if (!wp_kses_check_attr_val($arreach['value'], $arreach['vless'], $currkey, $currval)) {
+ foreach ($current as $currkey => $currval) {
+ if ( ! wp_kses_check_attr_val($arreach['value'], $arreach['vless'], $currkey, $currval) ) {
$ok = false;
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)
+ if ( $ok )
$attr2 .= ' '.$arreach['whole']; # it passed them
} # if !is_array($current)
} # foreach
# Remove any "<" or ">" characters
-
$attr2 = preg_replace('/[<>]/', '', $attr2);
return "<$element$attr2$xhtml_slash>";
@@ -566,7 +766,7 @@
* 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. It also reduces duplicate attributes by using the
+ * 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
@@ -611,7 +811,7 @@
{
$working = 1;
$mode = 0;
- if(FALSE === array_key_exists($attrname, $attrarr)) {
+ if(false === array_key_exists($attrname, $attrarr)) {
$attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
}
$attr = preg_replace('/^\s+/', '', $attr);
@@ -621,14 +821,14 @@
case 2 : # attribute value, a URL after href= for instance
- if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match))
+ if (preg_match('%^"([^"]*)"(\s+|/?$)%', $attr, $match))
# "value"
{
$thisval = $match[1];
- if ( in_array($attrname, $uris) )
+ if ( in_array(strtolower($attrname), $uris) )
$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
- if(FALSE === array_key_exists($attrname, $attrarr)) {
+ if(false === array_key_exists($attrname, $attrarr)) {
$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
}
$working = 1;
@@ -637,14 +837,14 @@
break;
}
- if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match))
+ if (preg_match("%^'([^']*)'(\s+|/?$)%", $attr, $match))
# 'value'
{
$thisval = $match[1];
- if ( in_array($attrname, $uris) )
+ if ( in_array(strtolower($attrname), $uris) )
$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
- if(FALSE === array_key_exists($attrname, $attrarr)) {
+ if(false === array_key_exists($attrname, $attrarr)) {
$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
}
$working = 1;
@@ -653,14 +853,14 @@
break;
}
- if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match))
+ if (preg_match("%^([^\s\"']+)(\s+|/?$)%", $attr, $match))
# value
{
$thisval = $match[1];
- if ( in_array($attrname, $uris) )
+ if ( in_array(strtolower($attrname), $uris) )
$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
- if(FALSE === array_key_exists($attrname, $attrarr)) {
+ 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.
@@ -679,7 +879,7 @@
}
} # while
- if ($mode == 1 && FALSE === array_key_exists($attrname, $attrarr))
+ if ($mode == 1 && false === array_key_exists($attrname, $attrarr))
# special case, for when the attribute list ends with a valueless
# attribute like "selected"
$attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
@@ -691,15 +891,15 @@
* Performs different checks for attribute values.
*
* The currently implemented checks are "maxlen", "minlen", "maxval", "minval"
- * and "valueless" with even more checks to come soon.
+ * and "valueless".
*
* @since 1.0.0
*
* @param string $value Attribute value
- * @param string $vless Whether the value is valueless or not. Use 'y' or 'n'
+ * @param string $vless Whether the value is valueless. Use 'y' or 'n'
* @param string $checkname What $checkvalue is checking for.
* @param mixed $checkvalue What constraint the value should pass
- * @return bool Whether check passes (true) or not (false)
+ * @return bool Whether check passes
*/
function wp_kses_check_attr_val($value, $vless, $checkname, $checkvalue) {
$ok = true;
@@ -736,7 +936,7 @@
break;
case 'minval' :
- # The minval check checks that the attribute value is a positive integer,
+ # The minval check makes sure that the attribute value is a positive integer,
# and that it is not smaller than the given value.
if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
@@ -746,7 +946,7 @@
break;
case 'valueless' :
- # The valueless check checks if the attribute has a value
+ # The valueless check makes sure if the attribute has a value
# (like <a href="blah">) or not (<option selected>). If the given value
# is a "y" or a "Y", the attribute must not have a value.
# If the given value is an "n" or an "N", the attribute must have one.
@@ -775,18 +975,21 @@
*/
function wp_kses_bad_protocol($string, $allowed_protocols) {
$string = wp_kses_no_null($string);
- $string2 = $string.'a';
+ $iterations = 0;
- while ($string != $string2) {
- $string2 = $string;
+ do {
+ $original_string = $string;
$string = wp_kses_bad_protocol_once($string, $allowed_protocols);
- } # while
+ } while ( $original_string != $string && ++$iterations < 6 );
+
+ if ( $original_string != $string )
+ return '';
return $string;
}
/**
- * Removes any NULL characters in $string.
+ * Removes any null characters in $string.
*
* @since 1.0.0
*
@@ -803,14 +1006,14 @@
/**
* Strips slashes from in front of quotes.
*
- * This function changes the character sequence \" to just ". It leaves all
+ * 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
*
* @param string $string String to strip slashes
- * @return string Fixed strings with quoted slashes
+ * @return string Fixed string with quoted slashes
*/
function wp_kses_stripslashes($string) {
return preg_replace('%\\\\"%', '"', $string);
@@ -879,15 +1082,20 @@
* @param string $allowed_protocols Allowed protocols
* @return string Sanitized content
*/
-function wp_kses_bad_protocol_once($string, $allowed_protocols) {
- global $_kses_allowed_protocols;
- $_kses_allowed_protocols = $allowed_protocols;
-
- $string2 = preg_split('/:|:|:/i', $string, 2);
- if ( isset($string2[1]) && !preg_match('%/\?%', $string2[0]) )
- $string = wp_kses_bad_protocol_once2($string2[0]) . trim($string2[1]);
- else
- $string = preg_replace_callback('/^((&[^;]*;|[\sA-Za-z0-9])*)'.'(:|:|&#[Xx]3[Aa];)\s*/', 'wp_kses_bad_protocol_once2', $string);
+function wp_kses_bad_protocol_once($string, $allowed_protocols, $count = 1 ) {
+ $string2 = preg_split( '/:|�*58;|�*3a;/i', $string, 2 );
+ if ( isset($string2[1]) && ! preg_match('%/\?%', $string2[0]) ) {
+ $string = trim( $string2[1] );
+ $protocol = wp_kses_bad_protocol_once2( $string2[0], $allowed_protocols );
+ if ( 'feed:' == $protocol ) {
+ if ( $count > 2 )
+ return '';
+ $string = wp_kses_bad_protocol_once( $string, $allowed_protocols, ++$count );
+ if ( empty( $string ) )
+ return $string;
+ }
+ $string = $protocol . $string;
+ }
return $string;
}
@@ -896,34 +1104,24 @@
* 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.
+ * whitelist or not, and returns different data depending on the answer.
*
* @access private
* @since 1.0.0
*
- * @param mixed $matches string or preg_replace_callback() matches array to check for bad protocols
+ * @param string $string URI scheme to check against the whitelist
+ * @param string $allowed_protocols Allowed protocols
* @return string Sanitized content
*/
-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;
- }
-
+function wp_kses_bad_protocol_once2( $string, $allowed_protocols ) {
$string2 = wp_kses_decode_entities($string);
$string2 = preg_replace('/\s/', '', $string2);
$string2 = wp_kses_no_null($string2);
$string2 = strtolower($string2);
$allowed = false;
- foreach ( (array) $_kses_allowed_protocols as $one_protocol)
- if (strtolower($one_protocol) == $string2) {
+ foreach ( (array) $allowed_protocols as $one_protocol )
+ if ( strtolower($one_protocol) == $string2 ) {
$allowed = true;
break;
}
@@ -952,9 +1150,9 @@
# 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});/', 'wp_kses_normalize_entities2', $string);
- $string = preg_replace_callback('/&#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/', 'wp_kses_normalize_entities3', $string);
+ $string = preg_replace_callback('/&([A-Za-z]{2,8});/', 'wp_kses_named_entities', $string);
+ $string = preg_replace_callback('/&#(0*[0-9]{1,7});/', 'wp_kses_normalize_entities2', $string);
+ $string = preg_replace_callback('/&#[Xx](0*[0-9A-Fa-f]{1,6});/', 'wp_kses_normalize_entities3', $string);
return $string;
}
@@ -962,7 +1160,28 @@
/**
* Callback for wp_kses_normalize_entities() regular expression.
*
- * This function helps wp_kses_normalize_entities() to only accept 16 bit values
+ * This function only accepts valid named entity references, which are finite,
+ * case-sensitive, and highly scrutinized by HTML and XML validators.
+ *
+ * @since 3.0.0
+ *
+ * @param array $matches preg_replace_callback() matches array
+ * @return string Correctly encoded entity
+ */
+function wp_kses_named_entities($matches) {
+ global $allowedentitynames;
+
+ if ( empty($matches[1]) )
+ return '';
+
+ $i = $matches[1];
+ return ( ( ! in_array($i, $allowedentitynames) ) ? "&$i;" : "&$i;" );
+}
+
+/**
+ * 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.
*
* @access private
@@ -972,11 +1191,18 @@
* @return string Correctly encoded entity
*/
function wp_kses_normalize_entities2($matches) {
- if ( ! isset($matches[1]) || empty($matches[1]) )
+ if ( empty($matches[1]) )
return '';
$i = $matches[1];
- return ( ( ! valid_unicode($i) ) || ($i > 65535) ? "&#$i;" : "&#$i;" );
+ if (valid_unicode($i)) {
+ $i = str_pad(ltrim($i,'0'), 3, '0', STR_PAD_LEFT);
+ $i = "&#$i;";
+ } else {
+ $i = "&#$i;";
+ }
+
+ return $i;
}
/**
@@ -991,18 +1217,18 @@
* @return string Correctly encoded entity
*/
function wp_kses_normalize_entities3($matches) {
- if ( ! isset($matches[2]) || empty($matches[2]) )
+ if ( empty($matches[1]) )
return '';
- $hexchars = $matches[2];
- return ( ( ! valid_unicode(hexdec($hexchars)) ) ? "&#x$hexchars;" : "&#x$hexchars;" );
+ $hexchars = $matches[1];
+ return ( ( ! valid_unicode(hexdec($hexchars)) ) ? "&#x$hexchars;" : '&#x'.ltrim($hexchars,'0').';' );
}
/**
* 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
+ * @return bool True if the value was a valid Unicode number
*/
function valid_unicode($i) {
return ( $i == 0x9 || $i == 0xa || $i == 0xd ||
@@ -1137,10 +1363,15 @@
* @uses add_filter() See description for what functions are added to what hooks.
*/
function kses_init_filters() {
- // Normal filtering.
- add_filter('pre_comment_content', 'wp_filter_kses');
+ // Normal filtering
add_filter('title_save_pre', 'wp_filter_kses');
+ // Comment filtering
+ if ( current_user_can( 'unfiltered_html' ) )
+ add_filter( 'pre_comment_content', 'wp_filter_post_kses' );
+ else
+ add_filter( 'pre_comment_content', 'wp_filter_kses' );
+
// Post filtering
add_filter('content_save_pre', 'wp_filter_post_kses');
add_filter('excerpt_save_pre', 'wp_filter_post_kses');
@@ -1160,10 +1391,13 @@
* @since 2.0.6
*/
function kses_remove_filters() {
- // Normal filtering.
- remove_filter('pre_comment_content', 'wp_filter_kses');
+ // Normal filtering
remove_filter('title_save_pre', 'wp_filter_kses');
+ // Comment filtering
+ remove_filter( 'pre_comment_content', 'wp_filter_post_kses' );
+ remove_filter( 'pre_comment_content', 'wp_filter_kses' );
+
// Post filtering
remove_filter('content_save_pre', 'wp_filter_post_kses');
remove_filter('excerpt_save_pre', 'wp_filter_post_kses');
@@ -1178,7 +1412,7 @@
* 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
+ * 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
@@ -1196,14 +1430,22 @@
add_action('init', 'kses_init');
add_action('set_current_user', 'kses_init');
+/**
+ * Inline CSS filter
+ *
+ * @since 2.8.1
+ */
function safecss_filter_attr( $css, $deprecated = '' ) {
+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '2.8.1' ); // Never implemented
+
$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
+ if ( preg_match( '%[\\(&=}]|/\*%', $css ) ) // remove any inline css containing \ ( & } = or comments
return '';
- $css_array = split( ';', trim( $css ) );
+ $css_array = explode( ';', 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',
@@ -1228,7 +1470,7 @@
if ( strpos( $css_item, ':' ) === false ) {
$found = true;
} else {
- $parts = split( ':', $css_item );
+ $parts = explode( ':', $css_item );
if ( in_array( trim( $parts[0] ), $allowed_attr ) )
$found = true;
}