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

lib/htmlpurifier/HTMLPurifier/URI.php

@@ -1,8 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/URIParser.php';
-require_once 'HTMLPurifier/URIFilter.php';
-
 /**
  * HTML Purifier's internal representation of a URI.
  * @note
@@ -13,13 +10,13 @@ require_once 'HTMLPurifier/URIFilter.php';
  */
 class HTMLPurifier_URI
 {
-    
-    var $scheme, $userinfo, $host, $port, $path, $query, $fragment;
-    
+
+    public $scheme, $userinfo, $host, $port, $path, $query, $fragment;
+
     /**
      * @note Automatically normalizes scheme and port
      */
-    function HTMLPurifier_URI($scheme, $userinfo, $host, $port, $path, $query, $fragment) {
+    public function __construct($scheme, $userinfo, $host, $port, $path, $query, $fragment) {
         $this->scheme = is_null($scheme) || ctype_lower($scheme) ? $scheme : strtolower($scheme);
         $this->userinfo = $userinfo;
         $this->host = $host;
@@ -28,15 +25,15 @@ class HTMLPurifier_URI
         $this->query = $query;
         $this->fragment = $fragment;
     }
-    
+
     /**
      * Retrieves a scheme object corresponding to the URI's scheme/default
      * @param $config Instance of HTMLPurifier_Config
      * @param $context Instance of HTMLPurifier_Context
      * @return Scheme object appropriate for validating this URI
      */
-    function getSchemeObj($config, &$context) {
-        $registry =& HTMLPurifier_URISchemeRegistry::instance();
+    public function getSchemeObj($config, $context) {
+        $registry = HTMLPurifier_URISchemeRegistry::instance();
         if ($this->scheme !== null) {
             $scheme_obj = $registry->getScheme($this->scheme, $config, $context);
             if (!$scheme_obj) return false; // invalid scheme, clean it out
@@ -55,7 +52,7 @@ class HTMLPurifier_URI
         }
         return $scheme_obj;
     }
-    
+
     /**
      * Generic validation method applicable for all schemes. May modify
      * this URI in order to get it into a compliant form.
@@ -63,13 +60,13 @@ class HTMLPurifier_URI
      * @param $context Instance of HTMLPurifier_Context
      * @return True if validation/filtering succeeds, false if failure
      */
-    function validate($config, &$context) {
-        
+    public function validate($config, $context) {
+
         // ABNF definitions from RFC 3986
         $chars_sub_delims = '!$&\'()*+,;=';
         $chars_gen_delims = ':/?#[]@';
         $chars_pchar = $chars_sub_delims . ':@';
-        
+
         // validate scheme (MUST BE FIRST!)
         if (!is_null($this->scheme) && is_null($this->host)) {
             $def = $config->getDefinition('URI');
@@ -77,25 +74,25 @@ class HTMLPurifier_URI
                 $this->scheme = null;
             }
         }
-        
+
         // validate host
         if (!is_null($this->host)) {
             $host_def = new HTMLPurifier_AttrDef_URI_Host();
             $this->host = $host_def->validate($this->host, $config, $context);
             if ($this->host === false) $this->host = null;
         }
-        
+
         // validate username
         if (!is_null($this->userinfo)) {
             $encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . ':');
             $this->userinfo = $encoder->encode($this->userinfo);
         }
-        
+
         // validate port
         if (!is_null($this->port)) {
             if ($this->port < 1 || $this->port > 65535) $this->port = null;
         }
-        
+
         // validate path
         $path_parts = array();
         $segments_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/');
@@ -120,7 +117,7 @@ class HTMLPurifier_URI
             $segment_nc_encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . '@');
             $c = strpos($this->path, '/');
             if ($c !== false) {
-                $this->path = 
+                $this->path =
                     $segment_nc_encoder->encode(substr($this->path, 0, $c)) .
                     $segments_encoder->encode(substr($this->path, $c));
             } else {
@@ -130,27 +127,27 @@ class HTMLPurifier_URI
             // path-empty (hier and relative)
             $this->path = ''; // just to be safe
         }
-        
+
         // qf = query and fragment
         $qf_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/?');
-        
+
         if (!is_null($this->query)) {
             $this->query = $qf_encoder->encode($this->query);
         }
-        
+
         if (!is_null($this->fragment)) {
             $this->fragment = $qf_encoder->encode($this->fragment);
         }
-        
+
         return true;
-        
+
     }
-    
+
     /**
      * Convert URI back to string
      * @return String URI appropriate for output
      */
-    function toString() {
+    public function toString() {
         // reconstruct authority
         $authority = null;
         if (!is_null($this->host)) {
@@ -159,7 +156,7 @@ class HTMLPurifier_URI
             $authority .= $this->host;
             if(!is_null($this->port))     $authority .= ':' . $this->port;
         }
-        
+
         // reconstruct the result
         $result = '';
         if (!is_null($this->scheme))    $result .= $this->scheme . ':';
@@ -167,16 +164,10 @@ class HTMLPurifier_URI
         $result .= $this->path;
         if (!is_null($this->query))     $result .= '?' . $this->query;
         if (!is_null($this->fragment))  $result .= '#' . $this->fragment;
-        
+
         return $result;
     }
-    
-    /**
-     * Returns a copy of the URI object
-     */
-    function copy() {
-        return unserialize(serialize($this));
-    }
-    
+
 }
 
+// vim: et sw=4 sts=4