xpressengine / xe-core

classes/security/htmlpurifier/library/HTMLPurifier/Token/Tag.php

Indentation +44 added lines, -44 removed lines

@@ -5,53 +5,53 @@
  */
 class HTMLPurifier_Token_Tag extends HTMLPurifier_Token
 {
-    /**
-     * Static bool marker that indicates the class is a tag.
-     *
-     * This allows us to check objects with <tt>!empty($obj->is_tag)</tt>
-     * without having to use a function call <tt>is_a()</tt>.
-     */
-    public $is_tag = true;
+	/**
+	 * Static bool marker that indicates the class is a tag.
+	 *
+	 * This allows us to check objects with <tt>!empty($obj->is_tag)</tt>
+	 * without having to use a function call <tt>is_a()</tt>.
+	 */
+	public $is_tag = true;
 
-    /**
-     * The lower-case name of the tag, like 'a', 'b' or 'blockquote'.
-     *
-     * @note Strictly speaking, XML tags are case sensitive, so we shouldn't
-     * be lower-casing them, but these tokens cater to HTML tags, which are
-     * insensitive.
-     */
-    public $name;
+	/**
+	 * The lower-case name of the tag, like 'a', 'b' or 'blockquote'.
+	 *
+	 * @note Strictly speaking, XML tags are case sensitive, so we shouldn't
+	 * be lower-casing them, but these tokens cater to HTML tags, which are
+	 * insensitive.
+	 */
+	public $name;
 
-    /**
-     * Associative array of the tag's attributes.
-     */
-    public $attr = array();
+	/**
+	 * Associative array of the tag's attributes.
+	 */
+	public $attr = array();
 
-    /**
-     * Non-overloaded constructor, which lower-cases passed tag name.
-     *
-     * @param $name String name.
-     * @param $attr Associative array of attributes.
-     */
-    public function __construct($name, $attr = array(), $line = null, $col = null, $armor = array()) {
-        $this->name = ctype_lower($name) ? $name : strtolower($name);
-        foreach ($attr as $key => $value) {
-            // normalization only necessary when key is not lowercase
-            if (!ctype_lower($key)) {
-                $new_key = strtolower($key);
-                if (!isset($attr[$new_key])) {
-                    $attr[$new_key] = $attr[$key];
-                }
-                if ($new_key !== $key) {
-                    unset($attr[$key]);
-                }
-            }
-        }
-        $this->attr = $attr;
-        $this->line = $line;
-        $this->col  = $col;
-        $this->armor = $armor;
-    }
+	/**
+	 * Non-overloaded constructor, which lower-cases passed tag name.
+	 *
+	 * @param $name String name.
+	 * @param $attr Associative array of attributes.
+	 */
+	public function __construct($name, $attr = array(), $line = null, $col = null, $armor = array()) {
+		$this->name = ctype_lower($name) ? $name : strtolower($name);
+		foreach ($attr as $key => $value) {
+			// normalization only necessary when key is not lowercase
+			if (!ctype_lower($key)) {
+				$new_key = strtolower($key);
+				if (!isset($attr[$new_key])) {
+					$attr[$new_key] = $attr[$key];
+				}
+				if ($new_key !== $key) {
+					unset($attr[$key]);
+				}
+			}
+		}
+		$this->attr = $attr;
+		$this->line = $line;
+		$this->col  = $col;
+		$this->armor = $armor;
+	}
 }
 
 // vim: et sw=4 sts=4

classes/security/htmlpurifier/library/HTMLPurifier/Token/Text.php

Indentation +14 added lines, -14 removed lines

@@ -12,21 +12,21 @@
 class HTMLPurifier_Token_Text extends HTMLPurifier_Token
 {
 
-    public $name = '#PCDATA'; /**< PCDATA tag name compatible with DTD. */
-    public $data; /**< Parsed character data of text. */
-    public $is_whitespace; /**< Bool indicating if node is whitespace. */
+	public $name = '#PCDATA'; /**< PCDATA tag name compatible with DTD. */
+	public $data; /**< Parsed character data of text. */
+	public $is_whitespace; /**< Bool indicating if node is whitespace. */
 
-    /**
-     * Constructor, accepts data and determines if it is whitespace.
-     *
-     * @param $data String parsed character data.
-     */
-    public function __construct($data, $line = null, $col = null) {
-        $this->data = $data;
-        $this->is_whitespace = ctype_space($data);
-        $this->line = $line;
-        $this->col  = $col;
-    }
+	/**
+	 * Constructor, accepts data and determines if it is whitespace.
+	 *
+	 * @param $data String parsed character data.
+	 */
+	public function __construct($data, $line = null, $col = null) {
+		$this->data = $data;
+		$this->is_whitespace = ctype_space($data);
+		$this->line = $line;
+		$this->col  = $col;
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/TokenFactory.php

Indentation +68 added lines, -68 removed lines

@@ -14,80 +14,80 @@
 class HTMLPurifier_TokenFactory
 {
 
-    /**
-     * Prototypes that will be cloned.
-     * @private
-     */
-    // p stands for prototype
-    private $p_start, $p_end, $p_empty, $p_text, $p_comment;
+	/**
+	 * Prototypes that will be cloned.
+	 * @private
+	 */
+	// p stands for prototype
+	private $p_start, $p_end, $p_empty, $p_text, $p_comment;
 
-    /**
-     * Generates blank prototypes for cloning.
-     */
-    public function __construct() {
-        $this->p_start  = new HTMLPurifier_Token_Start('', array());
-        $this->p_end    = new HTMLPurifier_Token_End('');
-        $this->p_empty  = new HTMLPurifier_Token_Empty('', array());
-        $this->p_text   = new HTMLPurifier_Token_Text('');
-        $this->p_comment= new HTMLPurifier_Token_Comment('');
-    }
+	/**
+	 * Generates blank prototypes for cloning.
+	 */
+	public function __construct() {
+		$this->p_start  = new HTMLPurifier_Token_Start('', array());
+		$this->p_end    = new HTMLPurifier_Token_End('');
+		$this->p_empty  = new HTMLPurifier_Token_Empty('', array());
+		$this->p_text   = new HTMLPurifier_Token_Text('');
+		$this->p_comment= new HTMLPurifier_Token_Comment('');
+	}
 
-    /**
-     * Creates a HTMLPurifier_Token_Start.
-     * @param $name Tag name
-     * @param $attr Associative array of attributes
-     * @return Generated HTMLPurifier_Token_Start
-     */
-    public function createStart($name, $attr = array()) {
-        $p = clone $this->p_start;
-        $p->__construct($name, $attr);
-        return $p;
-    }
+	/**
+	 * Creates a HTMLPurifier_Token_Start.
+	 * @param $name Tag name
+	 * @param $attr Associative array of attributes
+	 * @return Generated HTMLPurifier_Token_Start
+	 */
+	public function createStart($name, $attr = array()) {
+		$p = clone $this->p_start;
+		$p->__construct($name, $attr);
+		return $p;
+	}
 
-    /**
-     * Creates a HTMLPurifier_Token_End.
-     * @param $name Tag name
-     * @return Generated HTMLPurifier_Token_End
-     */
-    public function createEnd($name) {
-        $p = clone $this->p_end;
-        $p->__construct($name);
-        return $p;
-    }
+	/**
+	 * Creates a HTMLPurifier_Token_End.
+	 * @param $name Tag name
+	 * @return Generated HTMLPurifier_Token_End
+	 */
+	public function createEnd($name) {
+		$p = clone $this->p_end;
+		$p->__construct($name);
+		return $p;
+	}
 
-    /**
-     * Creates a HTMLPurifier_Token_Empty.
-     * @param $name Tag name
-     * @param $attr Associative array of attributes
-     * @return Generated HTMLPurifier_Token_Empty
-     */
-    public function createEmpty($name, $attr = array()) {
-        $p = clone $this->p_empty;
-        $p->__construct($name, $attr);
-        return $p;
-    }
+	/**
+	 * Creates a HTMLPurifier_Token_Empty.
+	 * @param $name Tag name
+	 * @param $attr Associative array of attributes
+	 * @return Generated HTMLPurifier_Token_Empty
+	 */
+	public function createEmpty($name, $attr = array()) {
+		$p = clone $this->p_empty;
+		$p->__construct($name, $attr);
+		return $p;
+	}
 
-    /**
-     * Creates a HTMLPurifier_Token_Text.
-     * @param $data Data of text token
-     * @return Generated HTMLPurifier_Token_Text
-     */
-    public function createText($data) {
-        $p = clone $this->p_text;
-        $p->__construct($data);
-        return $p;
-    }
+	/**
+	 * Creates a HTMLPurifier_Token_Text.
+	 * @param $data Data of text token
+	 * @return Generated HTMLPurifier_Token_Text
+	 */
+	public function createText($data) {
+		$p = clone $this->p_text;
+		$p->__construct($data);
+		return $p;
+	}
 
-    /**
-     * Creates a HTMLPurifier_Token_Comment.
-     * @param $data Data of comment token
-     * @return Generated HTMLPurifier_Token_Comment
-     */
-    public function createComment($data) {
-        $p = clone $this->p_comment;
-        $p->__construct($data);
-        return $p;
-    }
+	/**
+	 * Creates a HTMLPurifier_Token_Comment.
+	 * @param $data Data of comment token
+	 * @return Generated HTMLPurifier_Token_Comment
+	 */
+	public function createComment($data) {
+		$p = clone $this->p_comment;
+		$p->__construct($data);
+		return $p;
+	}
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
         $this->p_end    = new HTMLPurifier_Token_End('');
         $this->p_empty  = new HTMLPurifier_Token_Empty('', array());
         $this->p_text   = new HTMLPurifier_Token_Text('');
-        $this->p_comment= new HTMLPurifier_Token_Comment('');
+        $this->p_comment = new HTMLPurifier_Token_Comment('');
     }
 
     /**

classes/security/htmlpurifier/library/HTMLPurifier/URIDefinition.php

Indentation +93 added lines, -93 removed lines

@@ -3,99 +3,99 @@
 class HTMLPurifier_URIDefinition extends HTMLPurifier_Definition
 {
 
-    public $type = 'URI';
-    protected $filters = array();
-    protected $postFilters = array();
-    protected $registeredFilters = array();
-
-    /**
-     * HTMLPurifier_URI object of the base specified at %URI.Base
-     */
-    public $base;
-
-    /**
-     * String host to consider "home" base, derived off of $base
-     */
-    public $host;
-
-    /**
-     * Name of default scheme based on %URI.DefaultScheme and %URI.Base
-     */
-    public $defaultScheme;
-
-    public function __construct() {
-        $this->registerFilter(new HTMLPurifier_URIFilter_DisableExternal());
-        $this->registerFilter(new HTMLPurifier_URIFilter_DisableExternalResources());
-        $this->registerFilter(new HTMLPurifier_URIFilter_HostBlacklist());
-        $this->registerFilter(new HTMLPurifier_URIFilter_SafeIframe());
-        $this->registerFilter(new HTMLPurifier_URIFilter_MakeAbsolute());
-        $this->registerFilter(new HTMLPurifier_URIFilter_Munge());
-    }
-
-    public function registerFilter($filter) {
-        $this->registeredFilters[$filter->name] = $filter;
-    }
-
-    public function addFilter($filter, $config) {
-        $r = $filter->prepare($config);
-        if ($r === false) return; // null is ok, for backwards compat
-        if ($filter->post) {
-            $this->postFilters[$filter->name] = $filter;
-        } else {
-            $this->filters[$filter->name] = $filter;
-        }
-    }
-
-    protected function doSetup($config) {
-        $this->setupMemberVariables($config);
-        $this->setupFilters($config);
-    }
-
-    protected function setupFilters($config) {
-        foreach ($this->registeredFilters as $name => $filter) {
-            if ($filter->always_load) {
-                $this->addFilter($filter, $config);
-            } else {
-                $conf = $config->get('URI.' . $name);
-                if ($conf !== false && $conf !== null) {
-                    $this->addFilter($filter, $config);
-                }
-            }
-        }
-        unset($this->registeredFilters);
-    }
-
-    protected function setupMemberVariables($config) {
-        $this->host = $config->get('URI.Host');
-        $base_uri = $config->get('URI.Base');
-        if (!is_null($base_uri)) {
-            $parser = new HTMLPurifier_URIParser();
-            $this->base = $parser->parse($base_uri);
-            $this->defaultScheme = $this->base->scheme;
-            if (is_null($this->host)) $this->host = $this->base->host;
-        }
-        if (is_null($this->defaultScheme)) $this->defaultScheme = $config->get('URI.DefaultScheme');
-    }
-
-    public function getDefaultScheme($config, $context) {
-        return HTMLPurifier_URISchemeRegistry::instance()->getScheme($this->defaultScheme, $config, $context);
-    }
-
-    public function filter(&$uri, $config, $context) {
-        foreach ($this->filters as $name => $f) {
-            $result = $f->filter($uri, $config, $context);
-            if (!$result) return false;
-        }
-        return true;
-    }
-
-    public function postFilter(&$uri, $config, $context) {
-        foreach ($this->postFilters as $name => $f) {
-            $result = $f->filter($uri, $config, $context);
-            if (!$result) return false;
-        }
-        return true;
-    }
+	public $type = 'URI';
+	protected $filters = array();
+	protected $postFilters = array();
+	protected $registeredFilters = array();
+
+	/**
+	 * HTMLPurifier_URI object of the base specified at %URI.Base
+	 */
+	public $base;
+
+	/**
+	 * String host to consider "home" base, derived off of $base
+	 */
+	public $host;
+
+	/**
+	 * Name of default scheme based on %URI.DefaultScheme and %URI.Base
+	 */
+	public $defaultScheme;
+
+	public function __construct() {
+		$this->registerFilter(new HTMLPurifier_URIFilter_DisableExternal());
+		$this->registerFilter(new HTMLPurifier_URIFilter_DisableExternalResources());
+		$this->registerFilter(new HTMLPurifier_URIFilter_HostBlacklist());
+		$this->registerFilter(new HTMLPurifier_URIFilter_SafeIframe());
+		$this->registerFilter(new HTMLPurifier_URIFilter_MakeAbsolute());
+		$this->registerFilter(new HTMLPurifier_URIFilter_Munge());
+	}
+
+	public function registerFilter($filter) {
+		$this->registeredFilters[$filter->name] = $filter;
+	}
+
+	public function addFilter($filter, $config) {
+		$r = $filter->prepare($config);
+		if ($r === false) return; // null is ok, for backwards compat
+		if ($filter->post) {
+			$this->postFilters[$filter->name] = $filter;
+		} else {
+			$this->filters[$filter->name] = $filter;
+		}
+	}
+
+	protected function doSetup($config) {
+		$this->setupMemberVariables($config);
+		$this->setupFilters($config);
+	}
+
+	protected function setupFilters($config) {
+		foreach ($this->registeredFilters as $name => $filter) {
+			if ($filter->always_load) {
+				$this->addFilter($filter, $config);
+			} else {
+				$conf = $config->get('URI.' . $name);
+				if ($conf !== false && $conf !== null) {
+					$this->addFilter($filter, $config);
+				}
+			}
+		}
+		unset($this->registeredFilters);
+	}
+
+	protected function setupMemberVariables($config) {
+		$this->host = $config->get('URI.Host');
+		$base_uri = $config->get('URI.Base');
+		if (!is_null($base_uri)) {
+			$parser = new HTMLPurifier_URIParser();
+			$this->base = $parser->parse($base_uri);
+			$this->defaultScheme = $this->base->scheme;
+			if (is_null($this->host)) $this->host = $this->base->host;
+		}
+		if (is_null($this->defaultScheme)) $this->defaultScheme = $config->get('URI.DefaultScheme');
+	}
+
+	public function getDefaultScheme($config, $context) {
+		return HTMLPurifier_URISchemeRegistry::instance()->getScheme($this->defaultScheme, $config, $context);
+	}
+
+	public function filter(&$uri, $config, $context) {
+		foreach ($this->filters as $name => $f) {
+			$result = $f->filter($uri, $config, $context);
+			if (!$result) return false;
+		}
+		return true;
+	}
+
+	public function postFilter(&$uri, $config, $context) {
+		foreach ($this->postFilters as $name => $f) {
+			$result = $f->filter($uri, $config, $context);
+			if (!$result) return false;
+		}
+		return true;
+	}
 
 }
 

Braces +16 added lines, -5 removed lines

@@ -38,7 +38,10 @@ 
 
     public function addFilter($filter, $config) {
         $r = $filter->prepare($config);
-        if ($r === false) return; // null is ok, for backwards compat
+        if ($r === false) {
+        	return;
+        }
+        // null is ok, for backwards compat
         if ($filter->post) {
             $this->postFilters[$filter->name] = $filter;
         } else {
@@ -72,9 +75,13 @@ 
             $parser = new HTMLPurifier_URIParser();
             $this->base = $parser->parse($base_uri);
             $this->defaultScheme = $this->base->scheme;
-            if (is_null($this->host)) $this->host = $this->base->host;
+            if (is_null($this->host)) {
+            	$this->host = $this->base->host;
+            }
+        }
+        if (is_null($this->defaultScheme)) {
+        	$this->defaultScheme = $config->get('URI.DefaultScheme');
         }
-        if (is_null($this->defaultScheme)) $this->defaultScheme = $config->get('URI.DefaultScheme');
     }
 
     public function getDefaultScheme($config, $context) {
@@ -84,7 +91,9 @@ 
     public function filter(&$uri, $config, $context) {
         foreach ($this->filters as $name => $f) {
             $result = $f->filter($uri, $config, $context);
-            if (!$result) return false;
+            if (!$result) {
+            	return false;
+            }
         }
         return true;
     }
@@ -92,7 +101,9 @@ 
     public function postFilter(&$uri, $config, $context) {
         foreach ($this->postFilters as $name => $f) {
             $result = $f->filter($uri, $config, $context);
-            if (!$result) return false;
+            if (!$result) {
+            	return false;
+            }
         }
         return true;
     }

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
             if ($filter->always_load) {
                 $this->addFilter($filter, $config);
             } else {
-                $conf = $config->get('URI.' . $name);
+                $conf = $config->get('URI.'.$name);
                 if ($conf !== false && $conf !== null) {
                     $this->addFilter($filter, $config);
                 }

classes/security/htmlpurifier/library/HTMLPurifier/URIFilter.php

Indentation +29 added lines, -29 removed lines

@@ -28,39 +28,39 @@
 abstract class HTMLPurifier_URIFilter
 {
 
-    /**
-     * Unique identifier of filter
-     */
-    public $name;
+	/**
+	 * Unique identifier of filter
+	 */
+	public $name;
 
-    /**
-     * True if this filter should be run after scheme validation.
-     */
-    public $post = false;
+	/**
+	 * True if this filter should be run after scheme validation.
+	 */
+	public $post = false;
 
-    /**
-     * True if this filter should always be loaded (this permits
-     * a filter to be named Foo without the corresponding %URI.Foo
-     * directive existing.)
-     */
-    public $always_load = false;
+	/**
+	 * True if this filter should always be loaded (this permits
+	 * a filter to be named Foo without the corresponding %URI.Foo
+	 * directive existing.)
+	 */
+	public $always_load = false;
 
-    /**
-     * Performs initialization for the filter.  If the filter returns
-     * false, this means that it shouldn't be considered active.
-     */
-    public function prepare($config) {return true;}
+	/**
+	 * Performs initialization for the filter.  If the filter returns
+	 * false, this means that it shouldn't be considered active.
+	 */
+	public function prepare($config) {return true;}
 
-    /**
-     * Filter a URI object
-     * @param $uri Reference to URI object variable
-     * @param $config Instance of HTMLPurifier_Config
-     * @param $context Instance of HTMLPurifier_Context
-     * @return bool Whether or not to continue processing: false indicates
-     *         URL is no good, true indicates continue processing. Note that
-     *         all changes are committed directly on the URI object
-     */
-    abstract public function filter(&$uri, $config, $context);
+	/**
+	 * Filter a URI object
+	 * @param $uri Reference to URI object variable
+	 * @param $config Instance of HTMLPurifier_Config
+	 * @param $context Instance of HTMLPurifier_Context
+	 * @return bool Whether or not to continue processing: false indicates
+	 *         URL is no good, true indicates continue processing. Note that
+	 *         all changes are committed directly on the URI object
+	 */
+	abstract public function filter(&$uri, $config, $context);
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
      * Performs initialization for the filter.  If the filter returns
      * false, this means that it shouldn't be considered active.
      */
-    public function prepare($config) {return true;}
+    public function prepare($config) {return true; }
 
     /**
      * Filter a URI object

classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php

Indentation +16 added lines, -16 removed lines

@@ -2,22 +2,22 @@
 
 class HTMLPurifier_URIFilter_DisableExternal extends HTMLPurifier_URIFilter
 {
-    public $name = 'DisableExternal';
-    protected $ourHostParts = false;
-    public function prepare($config) {
-        $our_host = $config->getDefinition('URI')->host;
-        if ($our_host !== null) $this->ourHostParts = array_reverse(explode('.', $our_host));
-    }
-    public function filter(&$uri, $config, $context) {
-        if (is_null($uri->host)) return true;
-        if ($this->ourHostParts === false) return false;
-        $host_parts = array_reverse(explode('.', $uri->host));
-        foreach ($this->ourHostParts as $i => $x) {
-            if (!isset($host_parts[$i])) return false;
-            if ($host_parts[$i] != $this->ourHostParts[$i]) return false;
-        }
-        return true;
-    }
+	public $name = 'DisableExternal';
+	protected $ourHostParts = false;
+	public function prepare($config) {
+		$our_host = $config->getDefinition('URI')->host;
+		if ($our_host !== null) $this->ourHostParts = array_reverse(explode('.', $our_host));
+	}
+	public function filter(&$uri, $config, $context) {
+		if (is_null($uri->host)) return true;
+		if ($this->ourHostParts === false) return false;
+		$host_parts = array_reverse(explode('.', $uri->host));
+		foreach ($this->ourHostParts as $i => $x) {
+			if (!isset($host_parts[$i])) return false;
+			if ($host_parts[$i] != $this->ourHostParts[$i]) return false;
+		}
+		return true;
+	}
 }
 
 // vim: et sw=4 sts=4

Braces +15 added lines, -5 removed lines

@@ -6,15 +6,25 @@
     protected $ourHostParts = false;
     public function prepare($config) {
         $our_host = $config->getDefinition('URI')->host;
-        if ($our_host !== null) $this->ourHostParts = array_reverse(explode('.', $our_host));
+        if ($our_host !== null) {
+        	$this->ourHostParts = array_reverse(explode('.', $our_host));
+        }
     }
     public function filter(&$uri, $config, $context) {
-        if (is_null($uri->host)) return true;
-        if ($this->ourHostParts === false) return false;
+        if (is_null($uri->host)) {
+        	return true;
+        }
+        if ($this->ourHostParts === false) {
+        	return false;
+        }
         $host_parts = array_reverse(explode('.', $uri->host));
         foreach ($this->ourHostParts as $i => $x) {
-            if (!isset($host_parts[$i])) return false;
-            if ($host_parts[$i] != $this->ourHostParts[$i]) return false;
+            if (!isset($host_parts[$i])) {
+            	return false;
+            }
+            if ($host_parts[$i] != $this->ourHostParts[$i]) {
+            	return false;
+            }
         }
         return true;
     }

classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php

Indentation +5 added lines, -5 removed lines

@@ -2,11 +2,11 @@
 
 class HTMLPurifier_URIFilter_DisableExternalResources extends HTMLPurifier_URIFilter_DisableExternal
 {
-    public $name = 'DisableExternalResources';
-    public function filter(&$uri, $config, $context) {
-        if (!$context->get('EmbeddedURI', true)) return true;
-        return parent::filter($uri, $config, $context);
-    }
+	public $name = 'DisableExternalResources';
+	public function filter(&$uri, $config, $context) {
+		if (!$context->get('EmbeddedURI', true)) return true;
+		return parent::filter($uri, $config, $context);
+	}
 }
 
 // vim: et sw=4 sts=4

Braces +3 added lines, -1 removed lines

@@ -4,7 +4,9 @@
 {
     public $name = 'DisableExternalResources';
     public function filter(&$uri, $config, $context) {
-        if (!$context->get('EmbeddedURI', true)) return true;
+        if (!$context->get('EmbeddedURI', true)) {
+        	return true;
+        }
         return parent::filter($uri, $config, $context);
     }
 }

classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/DisableResources.php

Indentation +4 added lines, -4 removed lines

@@ -2,10 +2,10 @@
 
 class HTMLPurifier_URIFilter_DisableResources extends HTMLPurifier_URIFilter
 {
-    public $name = 'DisableResources';
-    public function filter(&$uri, $config, $context) {
-        return !$context->get('EmbeddedURI', true);
-    }
+	public $name = 'DisableResources';
+	public function filter(&$uri, $config, $context) {
+		return !$context->get('EmbeddedURI', true);
+	}
 }
 
 // vim: et sw=4 sts=4

classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php

Indentation +14 added lines, -14 removed lines

@@ -6,20 +6,20 @@
 // points are involved), but I'm not 100% sure
 class HTMLPurifier_URIFilter_HostBlacklist extends HTMLPurifier_URIFilter
 {
-    public $name = 'HostBlacklist';
-    protected $blacklist = array();
-    public function prepare($config) {
-        $this->blacklist = $config->get('URI.HostBlacklist');
-        return true;
-    }
-    public function filter(&$uri, $config, $context) {
-        foreach($this->blacklist as $blacklisted_host_fragment) {
-            if (strpos($uri->host, $blacklisted_host_fragment) !== false) {
-                return false;
-            }
-        }
-        return true;
-    }
+	public $name = 'HostBlacklist';
+	protected $blacklist = array();
+	public function prepare($config) {
+		$this->blacklist = $config->get('URI.HostBlacklist');
+		return true;
+	}
+	public function filter(&$uri, $config, $context) {
+		foreach($this->blacklist as $blacklisted_host_fragment) {
+			if (strpos($uri->host, $blacklisted_host_fragment) !== false) {
+				return false;
+			}
+		}
+		return true;
+	}
 }
 
 // vim: et sw=4 sts=4

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
         return true;
     }
     public function filter(&$uri, $config, $context) {
-        foreach($this->blacklist as $blacklisted_host_fragment) {
+        foreach ($this->blacklist as $blacklisted_host_fragment) {
             if (strpos($uri->host, $blacklisted_host_fragment) !== false) {
                 return false;
             }