MDL-22537 new html purifier backported to stable, unfortunately PHP5 only

lib/htmlpurifier/HTMLPurifier/PercentEncoder.php

@@ -10,16 +10,16 @@
  */
 class HTMLPurifier_PercentEncoder
 {
-    
+
     /**
      * Reserved characters to preserve when using encode().
      */
-    var $preserve = array();
-    
+    protected $preserve = array();
+
     /**
      * String of characters that should be preserved while using encode().
      */
-    function HTMLPurifier_PercentEncoder($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
@@ -28,7 +28,7 @@ class HTMLPurifier_PercentEncoder
         $this->preserve[46] = true; // Period       .
         $this->preserve[95] = true; // Underscore   _
         $this->preserve[126]= true; // Tilde        ~
-        
+
         // extra letters not to escape
         if ($preserve !== false) {
             for ($i = 0, $c = strlen($preserve); $i < $c; $i++) {
@@ -36,7 +36,7 @@ class HTMLPurifier_PercentEncoder
             }
         }
     }
-    
+
     /**
      * Our replacement for urlencode, it encodes all non-reserved characters,
      * as well as any extra characters that were instructed to be preserved.
@@ -47,7 +47,7 @@ class HTMLPurifier_PercentEncoder
      * @param $string String to be encoded
      * @return Encoded string.
      */
-    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])]) ) {
@@ -58,7 +58,7 @@ class HTMLPurifier_PercentEncoder
         }
         return $ret;
     }
-    
+
     /**
      * Fix up percent-encoding by decoding unreserved characters and normalizing.
      * @warning This function is affected by $preserve, even though the
@@ -66,7 +66,7 @@ class HTMLPurifier_PercentEncoder
      *          characters. Be careful when reusing instances of PercentEncoder!
      * @param $string String to normalize
      */
-    function normalize($string) {
+    public function normalize($string) {
         if ($string == '') return '';
         $parts = explode('%', $string);
         $ret = array_shift($parts);
@@ -92,6 +92,7 @@ class HTMLPurifier_PercentEncoder
         }
         return $ret;
     }
-    
+
 }
 
+// vim: et sw=4 sts=4