mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2025-08-05 05:37:49 +02:00
PSR-2 reformatting PHPDoc corrections
With minor corrections. Signed-off-by: Marcus Bointon <marcus@synchromedia.co.uk> Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
This commit is contained in:
committed by
Edward Z. Yang
parent
19eee14899
commit
fac747bdbd
@@ -13,17 +13,26 @@ class HTMLPurifier_PercentEncoder
|
||||
|
||||
/**
|
||||
* Reserved characters to preserve when using encode().
|
||||
* @type array
|
||||
*/
|
||||
protected $preserve = array();
|
||||
|
||||
/**
|
||||
* String of characters that should be preserved while using encode().
|
||||
* @param bool $preserve
|
||||
*/
|
||||
public function __construct($preserve = false) {
|
||||
public function __construct($preserve = false)
|
||||
{
|
||||
// unreserved letters, ought to const-ify
|
||||
for ($i = 48; $i <= 57; $i++) $this->preserve[$i] = true; // digits
|
||||
for ($i = 65; $i <= 90; $i++) $this->preserve[$i] = true; // upper-case
|
||||
for ($i = 97; $i <= 122; $i++) $this->preserve[$i] = true; // lower-case
|
||||
for ($i = 48; $i <= 57; $i++) { // digits
|
||||
$this->preserve[$i] = true;
|
||||
}
|
||||
for ($i = 65; $i <= 90; $i++) { // upper-case
|
||||
$this->preserve[$i] = true;
|
||||
}
|
||||
for ($i = 97; $i <= 122; $i++) { // lower-case
|
||||
$this->preserve[$i] = true;
|
||||
}
|
||||
$this->preserve[45] = true; // Dash -
|
||||
$this->preserve[46] = true; // Period .
|
||||
$this->preserve[95] = true; // Underscore _
|
||||
@@ -44,13 +53,14 @@ class HTMLPurifier_PercentEncoder
|
||||
* Assumes that the string has already been normalized, making any
|
||||
* and all percent escape sequences valid. Percents will not be
|
||||
* re-escaped, regardless of their status in $preserve
|
||||
* @param $string String to be encoded
|
||||
* @return Encoded string.
|
||||
* @param string $string String to be encoded
|
||||
* @return string Encoded string.
|
||||
*/
|
||||
public function encode($string) {
|
||||
public function encode($string)
|
||||
{
|
||||
$ret = '';
|
||||
for ($i = 0, $c = strlen($string); $i < $c; $i++) {
|
||||
if ($string[$i] !== '%' && !isset($this->preserve[$int = ord($string[$i])]) ) {
|
||||
if ($string[$i] !== '%' && !isset($this->preserve[$int = ord($string[$i])])) {
|
||||
$ret .= '%' . sprintf('%02X', $int);
|
||||
} else {
|
||||
$ret .= $string[$i];
|
||||
@@ -64,10 +74,14 @@ class HTMLPurifier_PercentEncoder
|
||||
* @warning This function is affected by $preserve, even though the
|
||||
* usual desired behavior is for this not to preserve those
|
||||
* characters. Be careful when reusing instances of PercentEncoder!
|
||||
* @param $string String to normalize
|
||||
* @param string $string String to normalize
|
||||
* @return string
|
||||
*/
|
||||
public function normalize($string) {
|
||||
if ($string == '') return '';
|
||||
public function normalize($string)
|
||||
{
|
||||
if ($string == '') {
|
||||
return '';
|
||||
}
|
||||
$parts = explode('%', $string);
|
||||
$ret = array_shift($parts);
|
||||
foreach ($parts as $part) {
|
||||
@@ -92,7 +106,6 @@ class HTMLPurifier_PercentEncoder
|
||||
}
|
||||
return $ret;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// vim: et sw=4 sts=4
|
||||
|
Reference in New Issue
Block a user