adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Optimizing Sanitize::html() by caching default charset. Closes #496. Also charset passed in $options parameter now takes precedence over the default value obtained from app's config value 'App.encoding'

Browse source
This commit is contained in:
ADmad 2010-03-23 00:39:24 +05:30
parent 817ebf5ec8
commit 209af202ec
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cake/libs/sanitize.php
View file

@ -80,7 +80,7 @@ class Sanitize {
/**
* Returns given string safe for display as HTML. Renders entities.
*
*
* strip_tags() does not validating HTML syntax or structure, so it might strip whole passages
* with broken HTML.
*
@ -97,9 +97,16 @@ class Sanitize {
* @static
*/
function html($string, $options = array()) {
static $defaultCharset = false;
if ($defaultCharset === false) {
$defaultCharset = Configure::read('App.encoding');
if ($defaultCharset === null) {
$defaultCharset = 'UTF-8';
}
}
$default = array(
'remove' => false,
'charset' => 'UTF-8',
'charset' => $defaultCharset,
'quotes' => ENT_QUOTES
);
@ -108,11 +115,8 @@ class Sanitize {
if ($options['remove']) {
$string = strip_tags($string);
}
$encoding = Configure::read('App.encoding');
if (empty($encoding)) {
$encoding = $options['charset'];
}
return htmlentities($string, $options['quotes'], $encoding);
return htmlentities($string, $options['quotes'], $options['charset']);
}
/**
@ -197,15 +201,15 @@ class Sanitize {
/**
* Sanitizes given array or value for safe input. Use the options to specify
* the connection to use, and what filters should be applied (with a boolean
* value). Valid filters:
* value). Valid filters:
*
* - odd_spaces - removes any non space whitespace characters
* - encode - Encode any html entities. Encode must be true for the `remove_html` to work.
* - dollar - Escape `$` with `\$`
* - carriage - Remove `\r`
* - unicode -
* - unicode -
* - escape - Should the string be SQL escaped.
* - backslash -
* - backslash -
* - remove_html - Strip HTML with strip_tags. `encode` must be true for this option to work.
*
* @param mixed $data Data to sanitize