xpressengine / xe-core

classes/security/htmlpurifier/library/HTMLPurifier/ChildDef/Required.php

Indentation +95 added lines, -95 removed lines

@@ -5,113 +5,113 @@
  */
 class HTMLPurifier_ChildDef_Required extends HTMLPurifier_ChildDef
 {
-    /**
-     * Lookup table of allowed elements.
-     * @public
-     */
-    public $elements = array();
-    /**
-     * Whether or not the last passed node was all whitespace.
-     */
-    protected $whitespace = false;
-    /**
-     * @param $elements List of allowed element names (lowercase).
-     */
-    public function __construct($elements) {
-        if (is_string($elements)) {
-            $elements = str_replace(' ', '', $elements);
-            $elements = explode('|', $elements);
-        }
-        $keys = array_keys($elements);
-        if ($keys == array_keys($keys)) {
-            $elements = array_flip($elements);
-            foreach ($elements as $i => $x) {
-                $elements[$i] = true;
-                if (empty($i)) unset($elements[$i]); // remove blank
-            }
-        }
-        $this->elements = $elements;
-    }
-    public $allow_empty = false;
-    public $type = 'required';
-    public function validateChildren($tokens_of_children, $config, $context) {
-        // Flag for subclasses
-        $this->whitespace = false;
+	/**
+	 * Lookup table of allowed elements.
+	 * @public
+	 */
+	public $elements = array();
+	/**
+	 * Whether or not the last passed node was all whitespace.
+	 */
+	protected $whitespace = false;
+	/**
+	 * @param $elements List of allowed element names (lowercase).
+	 */
+	public function __construct($elements) {
+		if (is_string($elements)) {
+			$elements = str_replace(' ', '', $elements);
+			$elements = explode('|', $elements);
+		}
+		$keys = array_keys($elements);
+		if ($keys == array_keys($keys)) {
+			$elements = array_flip($elements);
+			foreach ($elements as $i => $x) {
+				$elements[$i] = true;
+				if (empty($i)) unset($elements[$i]); // remove blank
+			}
+		}
+		$this->elements = $elements;
+	}
+	public $allow_empty = false;
+	public $type = 'required';
+	public function validateChildren($tokens_of_children, $config, $context) {
+		// Flag for subclasses
+		$this->whitespace = false;
 
-        // if there are no tokens, delete parent node
-        if (empty($tokens_of_children)) return false;
+		// if there are no tokens, delete parent node
+		if (empty($tokens_of_children)) return false;
 
-        // the new set of children
-        $result = array();
+		// the new set of children
+		$result = array();
 
-        // current depth into the nest
-        $nesting = 0;
+		// current depth into the nest
+		$nesting = 0;
 
-        // whether or not we're deleting a node
-        $is_deleting = false;
+		// whether or not we're deleting a node
+		$is_deleting = false;
 
-        // whether or not parsed character data is allowed
-        // this controls whether or not we silently drop a tag
-        // or generate escaped HTML from it
-        $pcdata_allowed = isset($this->elements['#PCDATA']);
+		// whether or not parsed character data is allowed
+		// this controls whether or not we silently drop a tag
+		// or generate escaped HTML from it
+		$pcdata_allowed = isset($this->elements['#PCDATA']);
 
-        // a little sanity check to make sure it's not ALL whitespace
-        $all_whitespace = true;
+		// a little sanity check to make sure it's not ALL whitespace
+		$all_whitespace = true;
 
-        // some configuration
-        $escape_invalid_children = $config->get('Core.EscapeInvalidChildren');
+		// some configuration
+		$escape_invalid_children = $config->get('Core.EscapeInvalidChildren');
 
-        // generator
-        $gen = new HTMLPurifier_Generator($config, $context);
+		// generator
+		$gen = new HTMLPurifier_Generator($config, $context);
 
-        foreach ($tokens_of_children as $token) {
-            if (!empty($token->is_whitespace)) {
-                $result[] = $token;
-                continue;
-            }
-            $all_whitespace = false; // phew, we're not talking about whitespace
+		foreach ($tokens_of_children as $token) {
+			if (!empty($token->is_whitespace)) {
+				$result[] = $token;
+				continue;
+			}
+			$all_whitespace = false; // phew, we're not talking about whitespace
 
-            $is_child = ($nesting == 0);
+			$is_child = ($nesting == 0);
 
-            if ($token instanceof HTMLPurifier_Token_Start) {
-                $nesting++;
-            } elseif ($token instanceof HTMLPurifier_Token_End) {
-                $nesting--;
-            }
+			if ($token instanceof HTMLPurifier_Token_Start) {
+				$nesting++;
+			} elseif ($token instanceof HTMLPurifier_Token_End) {
+				$nesting--;
+			}
 
-            if ($is_child) {
-                $is_deleting = false;
-                if (!isset($this->elements[$token->name])) {
-                    $is_deleting = true;
-                    if ($pcdata_allowed && $token instanceof HTMLPurifier_Token_Text) {
-                        $result[] = $token;
-                    } elseif ($pcdata_allowed && $escape_invalid_children) {
-                        $result[] = new HTMLPurifier_Token_Text(
-                            $gen->generateFromToken($token)
-                        );
-                    }
-                    continue;
-                }
-            }
-            if (!$is_deleting || ($pcdata_allowed && $token instanceof HTMLPurifier_Token_Text)) {
-                $result[] = $token;
-            } elseif ($pcdata_allowed && $escape_invalid_children) {
-                $result[] =
-                    new HTMLPurifier_Token_Text(
-                        $gen->generateFromToken($token)
-                    );
-            } else {
-                // drop silently
-            }
-        }
-        if (empty($result)) return false;
-        if ($all_whitespace) {
-            $this->whitespace = true;
-            return false;
-        }
-        if ($tokens_of_children == $result) return true;
-        return $result;
-    }
+			if ($is_child) {
+				$is_deleting = false;
+				if (!isset($this->elements[$token->name])) {
+					$is_deleting = true;
+					if ($pcdata_allowed && $token instanceof HTMLPurifier_Token_Text) {
+						$result[] = $token;
+					} elseif ($pcdata_allowed && $escape_invalid_children) {
+						$result[] = new HTMLPurifier_Token_Text(
+							$gen->generateFromToken($token)
+						);
+					}
+					continue;
+				}
+			}
+			if (!$is_deleting || ($pcdata_allowed && $token instanceof HTMLPurifier_Token_Text)) {
+				$result[] = $token;
+			} elseif ($pcdata_allowed && $escape_invalid_children) {
+				$result[] =
+					new HTMLPurifier_Token_Text(
+						$gen->generateFromToken($token)
+					);
+			} else {
+				// drop silently
+			}
+		}
+		if (empty($result)) return false;
+		if ($all_whitespace) {
+			$this->whitespace = true;
+			return false;
+		}
+		if ($tokens_of_children == $result) return true;
+		return $result;
+	}
 }
 
 // vim: et sw=4 sts=4

Braces +13 added lines, -4 removed lines

@@ -27,7 +27,10 @@ 
             $elements = array_flip($elements);
             foreach ($elements as $i => $x) {
                 $elements[$i] = true;
-                if (empty($i)) unset($elements[$i]); // remove blank
+                if (empty($i)) {
+                	unset($elements[$i]);
+                }
+                // remove blank
             }
         }
         $this->elements = $elements;
@@ -39,7 +42,9 @@ 
         $this->whitespace = false;
 
         // if there are no tokens, delete parent node
-        if (empty($tokens_of_children)) return false;
+        if (empty($tokens_of_children)) {
+        	return false;
+        }
 
         // the new set of children
         $result = array();
@@ -104,12 +109,16 @@ 
                 // drop silently
             }
         }
-        if (empty($result)) return false;
+        if (empty($result)) {
+        	return false;
+        }
         if ($all_whitespace) {
             $this->whitespace = true;
             return false;
         }
-        if ($tokens_of_children == $result) return true;
+        if ($tokens_of_children == $result) {
+        	return true;
+        }
         return $result;
     }
 }

classes/security/htmlpurifier/library/HTMLPurifier/ChildDef/StrictBlockquote.php

Indentation +70 added lines, -70 removed lines

@@ -5,84 +5,84 @@
  */
 class HTMLPurifier_ChildDef_StrictBlockquote extends HTMLPurifier_ChildDef_Required
 {
-    protected $real_elements;
-    protected $fake_elements;
-    public $allow_empty = true;
-    public $type = 'strictblockquote';
-    protected $init = false;
+	protected $real_elements;
+	protected $fake_elements;
+	public $allow_empty = true;
+	public $type = 'strictblockquote';
+	protected $init = false;
 
-    /**
-     * @note We don't want MakeWellFormed to auto-close inline elements since
-     *       they might be allowed.
-     */
-    public function getAllowedElements($config) {
-        $this->init($config);
-        return $this->fake_elements;
-    }
+	/**
+	 * @note We don't want MakeWellFormed to auto-close inline elements since
+	 *       they might be allowed.
+	 */
+	public function getAllowedElements($config) {
+		$this->init($config);
+		return $this->fake_elements;
+	}
 
-    public function validateChildren($tokens_of_children, $config, $context) {
+	public function validateChildren($tokens_of_children, $config, $context) {
 
-        $this->init($config);
+		$this->init($config);
 
-        // trick the parent class into thinking it allows more
-        $this->elements = $this->fake_elements;
-        $result = parent::validateChildren($tokens_of_children, $config, $context);
-        $this->elements = $this->real_elements;
+		// trick the parent class into thinking it allows more
+		$this->elements = $this->fake_elements;
+		$result = parent::validateChildren($tokens_of_children, $config, $context);
+		$this->elements = $this->real_elements;
 
-        if ($result === false) return array();
-        if ($result === true) $result = $tokens_of_children;
+		if ($result === false) return array();
+		if ($result === true) $result = $tokens_of_children;
 
-        $def = $config->getHTMLDefinition();
-        $block_wrap_start = new HTMLPurifier_Token_Start($def->info_block_wrapper);
-        $block_wrap_end   = new HTMLPurifier_Token_End(  $def->info_block_wrapper);
-        $is_inline = false;
-        $depth = 0;
-        $ret = array();
+		$def = $config->getHTMLDefinition();
+		$block_wrap_start = new HTMLPurifier_Token_Start($def->info_block_wrapper);
+		$block_wrap_end   = new HTMLPurifier_Token_End(  $def->info_block_wrapper);
+		$is_inline = false;
+		$depth = 0;
+		$ret = array();
 
-        // assuming that there are no comment tokens
-        foreach ($result as $i => $token) {
-            $token = $result[$i];
-            // ifs are nested for readability
-            if (!$is_inline) {
-                if (!$depth) {
-                     if (
-                        ($token instanceof HTMLPurifier_Token_Text && !$token->is_whitespace) ||
-                        (!$token instanceof HTMLPurifier_Token_Text && !isset($this->elements[$token->name]))
-                     ) {
-                        $is_inline = true;
-                        $ret[] = $block_wrap_start;
-                     }
-                }
-            } else {
-                if (!$depth) {
-                    // starting tokens have been inline text / empty
-                    if ($token instanceof HTMLPurifier_Token_Start || $token instanceof HTMLPurifier_Token_Empty) {
-                        if (isset($this->elements[$token->name])) {
-                            // ended
-                            $ret[] = $block_wrap_end;
-                            $is_inline = false;
-                        }
-                    }
-                }
-            }
-            $ret[] = $token;
-            if ($token instanceof HTMLPurifier_Token_Start) $depth++;
-            if ($token instanceof HTMLPurifier_Token_End)   $depth--;
-        }
-        if ($is_inline) $ret[] = $block_wrap_end;
-        return $ret;
-    }
+		// assuming that there are no comment tokens
+		foreach ($result as $i => $token) {
+			$token = $result[$i];
+			// ifs are nested for readability
+			if (!$is_inline) {
+				if (!$depth) {
+					 if (
+						($token instanceof HTMLPurifier_Token_Text && !$token->is_whitespace) ||
+						(!$token instanceof HTMLPurifier_Token_Text && !isset($this->elements[$token->name]))
+					 ) {
+						$is_inline = true;
+						$ret[] = $block_wrap_start;
+					 }
+				}
+			} else {
+				if (!$depth) {
+					// starting tokens have been inline text / empty
+					if ($token instanceof HTMLPurifier_Token_Start || $token instanceof HTMLPurifier_Token_Empty) {
+						if (isset($this->elements[$token->name])) {
+							// ended
+							$ret[] = $block_wrap_end;
+							$is_inline = false;
+						}
+					}
+				}
+			}
+			$ret[] = $token;
+			if ($token instanceof HTMLPurifier_Token_Start) $depth++;
+			if ($token instanceof HTMLPurifier_Token_End)   $depth--;
+		}
+		if ($is_inline) $ret[] = $block_wrap_end;
+		return $ret;
+	}
 
-    private function init($config) {
-        if (!$this->init) {
-            $def = $config->getHTMLDefinition();
-            // allow all inline elements
-            $this->real_elements = $this->elements;
-            $this->fake_elements = $def->info_content_sets['Flow'];
-            $this->fake_elements['#PCDATA'] = true;
-            $this->init = true;
-        }
-    }
+	private function init($config) {
+		if (!$this->init) {
+			$def = $config->getHTMLDefinition();
+			// allow all inline elements
+			$this->real_elements = $this->elements;
+			$this->fake_elements = $def->info_content_sets['Flow'];
+			$this->fake_elements['#PCDATA'] = true;
+			$this->init = true;
+		}
+	}
 }
 
 // vim: et sw=4 sts=4

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
         $def = $config->getHTMLDefinition();
         $block_wrap_start = new HTMLPurifier_Token_Start($def->info_block_wrapper);
-        $block_wrap_end   = new HTMLPurifier_Token_End(  $def->info_block_wrapper);
+        $block_wrap_end   = new HTMLPurifier_Token_End($def->info_block_wrapper);
         $is_inline = false;
         $depth = 0;
         $ret = array();

Braces +15 added lines, -5 removed lines

@@ -29,8 +29,12 @@ 
         $result = parent::validateChildren($tokens_of_children, $config, $context);
         $this->elements = $this->real_elements;
 
-        if ($result === false) return array();
-        if ($result === true) $result = $tokens_of_children;
+        if ($result === false) {
+        	return array();
+        }
+        if ($result === true) {
+        	$result = $tokens_of_children;
+        }
 
         $def = $config->getHTMLDefinition();
         $block_wrap_start = new HTMLPurifier_Token_Start($def->info_block_wrapper);
@@ -66,10 +70,16 @@ 
                 }
             }
             $ret[] = $token;
-            if ($token instanceof HTMLPurifier_Token_Start) $depth++;
-            if ($token instanceof HTMLPurifier_Token_End)   $depth--;
+            if ($token instanceof HTMLPurifier_Token_Start) {
+            	$depth++;
+            }
+            if ($token instanceof HTMLPurifier_Token_End) {
+            	$depth--;
+            }
+        }
+        if ($is_inline) {
+        	$ret[] = $block_wrap_end;
         }
-        if ($is_inline) $ret[] = $block_wrap_end;
         return $ret;
     }
 

classes/security/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php

Indentation +191 added lines, -191 removed lines

@@ -31,197 +31,197 @@
  */
 class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef
 {
-    public $allow_empty = false;
-    public $type = 'table';
-    public $elements = array('tr' => true, 'tbody' => true, 'thead' => true,
-        'tfoot' => true, 'caption' => true, 'colgroup' => true, 'col' => true);
-    public function __construct() {}
-    public function validateChildren($tokens_of_children, $config, $context) {
-        if (empty($tokens_of_children)) return false;
-
-        // this ensures that the loop gets run one last time before closing
-        // up. It's a little bit of a hack, but it works! Just make sure you
-        // get rid of the token later.
-        $tokens_of_children[] = false;
-
-        // only one of these elements is allowed in a table
-        $caption = false;
-        $thead   = false;
-        $tfoot   = false;
-
-        // as many of these as you want
-        $cols    = array();
-        $content = array();
-
-        $nesting = 0; // current depth so we can determine nodes
-        $is_collecting = false; // are we globbing together tokens to package
-                                // into one of the collectors?
-        $collection = array(); // collected nodes
-        $tag_index = 0; // the first node might be whitespace,
-                            // so this tells us where the start tag is
-        $tbody_mode = false; // if true, then we need to wrap any stray
-                             // <tr>s with a <tbody>.
-
-        foreach ($tokens_of_children as $token) {
-            $is_child = ($nesting == 0);
-
-            if ($token === false) {
-                // terminating sequence started
-            } elseif ($token instanceof HTMLPurifier_Token_Start) {
-                $nesting++;
-            } elseif ($token instanceof HTMLPurifier_Token_End) {
-                $nesting--;
-            }
-
-            // handle node collection
-            if ($is_collecting) {
-                if ($is_child) {
-                    // okay, let's stash the tokens away
-                    // first token tells us the type of the collection
-                    switch ($collection[$tag_index]->name) {
-                        case 'tbody':
-                            $tbody_mode = true;
-                        case 'tr':
-                            $content[] = $collection;
-                            break;
-                        case 'caption':
-                            if ($caption !== false) break;
-                            $caption = $collection;
-                            break;
-                        case 'thead':
-                        case 'tfoot':
-                            $tbody_mode = true;
-                            // XXX This breaks rendering properties with
-                            // Firefox, which never floats a <thead> to
-                            // the top. Ever. (Our scheme will float the
-                            // first <thead> to the top.)  So maybe
-                            // <thead>s that are not first should be
-                            // turned into <tbody>? Very tricky, indeed.
-
-                            // access the appropriate variable, $thead or $tfoot
-                            $var = $collection[$tag_index]->name;
-                            if ($$var === false) {
-                                $$var = $collection;
-                            } else {
-                                // Oops, there's a second one! What
-                                // should we do?  Current behavior is to
-                                // transmutate the first and last entries into
-                                // tbody tags, and then put into content.
-                                // Maybe a better idea is to *attach
-                                // it* to the existing thead or tfoot?
-                                // We don't do this, because Firefox
-                                // doesn't float an extra tfoot to the
-                                // bottom like it does for the first one.
-                                $collection[$tag_index]->name = 'tbody';
-                                $collection[count($collection)-1]->name = 'tbody';
-                                $content[] = $collection;
-                            }
-                            break;
-                         case 'colgroup':
-                            $cols[] = $collection;
-                            break;
-                    }
-                    $collection = array();
-                    $is_collecting = false;
-                    $tag_index = 0;
-                } else {
-                    // add the node to the collection
-                    $collection[] = $token;
-                }
-            }
-
-            // terminate
-            if ($token === false) break;
-
-            if ($is_child) {
-                // determine what we're dealing with
-                if ($token->name == 'col') {
-                    // the only empty tag in the possie, we can handle it
-                    // immediately
-                    $cols[] = array_merge($collection, array($token));
-                    $collection = array();
-                    $tag_index = 0;
-                    continue;
-                }
-                switch($token->name) {
-                    case 'caption':
-                    case 'colgroup':
-                    case 'thead':
-                    case 'tfoot':
-                    case 'tbody':
-                    case 'tr':
-                        $is_collecting = true;
-                        $collection[] = $token;
-                        continue;
-                    default:
-                        if (!empty($token->is_whitespace)) {
-                            $collection[] = $token;
-                            $tag_index++;
-                        }
-                        continue;
-                }
-            }
-        }
-
-        if (empty($content)) return false;
-
-        $ret = array();
-        if ($caption !== false) $ret = array_merge($ret, $caption);
-        if ($cols !== false)    foreach ($cols as $token_array) $ret = array_merge($ret, $token_array);
-        if ($thead !== false)   $ret = array_merge($ret, $thead);
-        if ($tfoot !== false)   $ret = array_merge($ret, $tfoot);
-
-        if ($tbody_mode) {
-            // a little tricky, since the start of the collection may be
-            // whitespace
-            $inside_tbody = false;
-            foreach ($content as $token_array) {
-                // find the starting token
-                foreach ($token_array as $t) {
-                    if ($t->name === 'tr' || $t->name === 'tbody') {
-                        break;
-                    }
-                } // iterator variable carries over
-                if ($t->name === 'tr') {
-                    if ($inside_tbody) {
-                        $ret = array_merge($ret, $token_array);
-                    } else {
-                        $ret[] = new HTMLPurifier_Token_Start('tbody');
-                        $ret = array_merge($ret, $token_array);
-                        $inside_tbody = true;
-                    }
-                } elseif ($t->name === 'tbody') {
-                    if ($inside_tbody) {
-                        $ret[] = new HTMLPurifier_Token_End('tbody');
-                        $inside_tbody = false;
-                        $ret = array_merge($ret, $token_array);
-                    } else {
-                        $ret = array_merge($ret, $token_array);
-                    }
-                } else {
-                    trigger_error("tr/tbody in content invariant failed in Table ChildDef", E_USER_ERROR);
-                }
-            }
-            if ($inside_tbody) {
-                $ret[] = new HTMLPurifier_Token_End('tbody');
-            }
-        } else {
-            foreach ($content as $token_array) {
-                // invariant: everything in here is <tr>s
-                $ret = array_merge($ret, $token_array);
-            }
-        }
-
-        if (!empty($collection) && $is_collecting == false){
-            // grab the trailing space
-            $ret = array_merge($ret, $collection);
-        }
-
-        array_pop($tokens_of_children); // remove phantom token
-
-        return ($ret === $tokens_of_children) ? true : $ret;
-
-    }
+	public $allow_empty = false;
+	public $type = 'table';
+	public $elements = array('tr' => true, 'tbody' => true, 'thead' => true,
+		'tfoot' => true, 'caption' => true, 'colgroup' => true, 'col' => true);
+	public function __construct() {}
+	public function validateChildren($tokens_of_children, $config, $context) {
+		if (empty($tokens_of_children)) return false;
+
+		// this ensures that the loop gets run one last time before closing
+		// up. It's a little bit of a hack, but it works! Just make sure you
+		// get rid of the token later.
+		$tokens_of_children[] = false;
+
+		// only one of these elements is allowed in a table
+		$caption = false;
+		$thead   = false;
+		$tfoot   = false;
+
+		// as many of these as you want
+		$cols    = array();
+		$content = array();
+
+		$nesting = 0; // current depth so we can determine nodes
+		$is_collecting = false; // are we globbing together tokens to package
+								// into one of the collectors?
+		$collection = array(); // collected nodes
+		$tag_index = 0; // the first node might be whitespace,
+							// so this tells us where the start tag is
+		$tbody_mode = false; // if true, then we need to wrap any stray
+							 // <tr>s with a <tbody>.
+
+		foreach ($tokens_of_children as $token) {
+			$is_child = ($nesting == 0);
+
+			if ($token === false) {
+				// terminating sequence started
+			} elseif ($token instanceof HTMLPurifier_Token_Start) {
+				$nesting++;
+			} elseif ($token instanceof HTMLPurifier_Token_End) {
+				$nesting--;
+			}
+
+			// handle node collection
+			if ($is_collecting) {
+				if ($is_child) {
+					// okay, let's stash the tokens away
+					// first token tells us the type of the collection
+					switch ($collection[$tag_index]->name) {
+						case 'tbody':
+							$tbody_mode = true;
+						case 'tr':
+							$content[] = $collection;
+							break;
+						case 'caption':
+							if ($caption !== false) break;
+							$caption = $collection;
+							break;
+						case 'thead':
+						case 'tfoot':
+							$tbody_mode = true;
+							// XXX This breaks rendering properties with
+							// Firefox, which never floats a <thead> to
+							// the top. Ever. (Our scheme will float the
+							// first <thead> to the top.)  So maybe
+							// <thead>s that are not first should be
+							// turned into <tbody>? Very tricky, indeed.
+
+							// access the appropriate variable, $thead or $tfoot
+							$var = $collection[$tag_index]->name;
+							if ($$var === false) {
+								$$var = $collection;
+							} else {
+								// Oops, there's a second one! What
+								// should we do?  Current behavior is to
+								// transmutate the first and last entries into
+								// tbody tags, and then put into content.
+								// Maybe a better idea is to *attach
+								// it* to the existing thead or tfoot?
+								// We don't do this, because Firefox
+								// doesn't float an extra tfoot to the
+								// bottom like it does for the first one.
+								$collection[$tag_index]->name = 'tbody';
+								$collection[count($collection)-1]->name = 'tbody';
+								$content[] = $collection;
+							}
+							break;
+						 case 'colgroup':
+							$cols[] = $collection;
+							break;
+					}
+					$collection = array();
+					$is_collecting = false;
+					$tag_index = 0;
+				} else {
+					// add the node to the collection
+					$collection[] = $token;
+				}
+			}
+
+			// terminate
+			if ($token === false) break;
+
+			if ($is_child) {
+				// determine what we're dealing with
+				if ($token->name == 'col') {
+					// the only empty tag in the possie, we can handle it
+					// immediately
+					$cols[] = array_merge($collection, array($token));
+					$collection = array();
+					$tag_index = 0;
+					continue;
+				}
+				switch($token->name) {
+					case 'caption':
+					case 'colgroup':
+					case 'thead':
+					case 'tfoot':
+					case 'tbody':
+					case 'tr':
+						$is_collecting = true;
+						$collection[] = $token;
+						continue;
+					default:
+						if (!empty($token->is_whitespace)) {
+							$collection[] = $token;
+							$tag_index++;
+						}
+						continue;
+				}
+			}
+		}
+
+		if (empty($content)) return false;
+
+		$ret = array();
+		if ($caption !== false) $ret = array_merge($ret, $caption);
+		if ($cols !== false)    foreach ($cols as $token_array) $ret = array_merge($ret, $token_array);
+		if ($thead !== false)   $ret = array_merge($ret, $thead);
+		if ($tfoot !== false)   $ret = array_merge($ret, $tfoot);
+
+		if ($tbody_mode) {
+			// a little tricky, since the start of the collection may be
+			// whitespace
+			$inside_tbody = false;
+			foreach ($content as $token_array) {
+				// find the starting token
+				foreach ($token_array as $t) {
+					if ($t->name === 'tr' || $t->name === 'tbody') {
+						break;
+					}
+				} // iterator variable carries over
+				if ($t->name === 'tr') {
+					if ($inside_tbody) {
+						$ret = array_merge($ret, $token_array);
+					} else {
+						$ret[] = new HTMLPurifier_Token_Start('tbody');
+						$ret = array_merge($ret, $token_array);
+						$inside_tbody = true;
+					}
+				} elseif ($t->name === 'tbody') {
+					if ($inside_tbody) {
+						$ret[] = new HTMLPurifier_Token_End('tbody');
+						$inside_tbody = false;
+						$ret = array_merge($ret, $token_array);
+					} else {
+						$ret = array_merge($ret, $token_array);
+					}
+				} else {
+					trigger_error("tr/tbody in content invariant failed in Table ChildDef", E_USER_ERROR);
+				}
+			}
+			if ($inside_tbody) {
+				$ret[] = new HTMLPurifier_Token_End('tbody');
+			}
+		} else {
+			foreach ($content as $token_array) {
+				// invariant: everything in here is <tr>s
+				$ret = array_merge($ret, $token_array);
+			}
+		}
+
+		if (!empty($collection) && $is_collecting == false){
+			// grab the trailing space
+			$ret = array_merge($ret, $collection);
+		}
+
+		array_pop($tokens_of_children); // remove phantom token
+
+		return ($ret === $tokens_of_children) ? true : $ret;
+
+	}
 }
 
 // vim: et sw=4 sts=4

Spacing +3 added lines, -3 removed lines

@@ -113,7 +113,7 @@ 
                                 // doesn't float an extra tfoot to the
                                 // bottom like it does for the first one.
                                 $collection[$tag_index]->name = 'tbody';
-                                $collection[count($collection)-1]->name = 'tbody';
+                                $collection[count($collection) - 1]->name = 'tbody';
                                 $content[] = $collection;
                             }
                             break;
@@ -143,7 +143,7 @@ 
                     $tag_index = 0;
                     continue;
                 }
-                switch($token->name) {
+                switch ($token->name) {
                     case 'caption':
                     case 'colgroup':
                     case 'thead':
@@ -212,7 +212,7 @@ 
             }
         }
 
-        if (!empty($collection) && $is_collecting == false){
+        if (!empty($collection) && $is_collecting == false) {
             // grab the trailing space
             $ret = array_merge($ret, $collection);
         }

Braces +24 added lines, -8 removed lines

@@ -37,7 +37,9 @@ 
         'tfoot' => true, 'caption' => true, 'colgroup' => true, 'col' => true);
     public function __construct() {}
     public function validateChildren($tokens_of_children, $config, $context) {
-        if (empty($tokens_of_children)) return false;
+        if (empty($tokens_of_children)) {
+        	return false;
+        }
 
         // this ensures that the loop gets run one last time before closing
         // up. It's a little bit of a hack, but it works! Just make sure you
@@ -85,7 +87,9 @@ 
                             $content[] = $collection;
                             break;
                         case 'caption':
-                            if ($caption !== false) break;
+                            if ($caption !== false) {
+                            	break;
+                            }
                             $caption = $collection;
                             break;
                         case 'thead':
@@ -131,7 +135,9 @@ 
             }
 
             // terminate
-            if ($token === false) break;
+            if ($token === false) {
+            	break;
+            }
 
             if ($is_child) {
                 // determine what we're dealing with
@@ -163,13 +169,23 @@ 
             }
         }
 
-        if (empty($content)) return false;
+        if (empty($content)) {
+        	return false;
+        }
 
         $ret = array();
-        if ($caption !== false) $ret = array_merge($ret, $caption);
-        if ($cols !== false)    foreach ($cols as $token_array) $ret = array_merge($ret, $token_array);
-        if ($thead !== false)   $ret = array_merge($ret, $thead);
-        if ($tfoot !== false)   $ret = array_merge($ret, $tfoot);
+        if ($caption !== false) {
+        	$ret = array_merge($ret, $caption);
+        }
+        if ($cols !== false) {
+        	foreach ($cols as $token_array) $ret = array_merge($ret, $token_array);
+        }
+        if ($thead !== false) {
+        	$ret = array_merge($ret, $thead);
+        }
+        if ($tfoot !== false) {
+        	$ret = array_merge($ret, $tfoot);
+        }
 
         if ($tbody_mode) {
             // a little tricky, since the start of the collection may be

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

Indentation +142 added lines, -142 removed lines

@@ -5,159 +5,159 @@
  */
 class HTMLPurifier_ConfigSchema {
 
-    /**
-     * Defaults of the directives and namespaces.
-     * @note This shares the exact same structure as HTMLPurifier_Config::$conf
-     */
-    public $defaults = array();
+	/**
+	 * Defaults of the directives and namespaces.
+	 * @note This shares the exact same structure as HTMLPurifier_Config::$conf
+	 */
+	public $defaults = array();
 
-    /**
-     * The default property list. Do not edit this property list.
-     */
-    public $defaultPlist;
+	/**
+	 * The default property list. Do not edit this property list.
+	 */
+	public $defaultPlist;
 
-    /**
-     * Definition of the directives. The structure of this is:
-     *
-     *  array(
-     *      'Namespace' => array(
-     *          'Directive' => new stdclass(),
-     *      )
-     *  )
-     *
-     * The stdclass may have the following properties:
-     *
-     *  - If isAlias isn't set:
-     *      - type: Integer type of directive, see HTMLPurifier_VarParser for definitions
-     *      - allow_null: If set, this directive allows null values
-     *      - aliases: If set, an associative array of value aliases to real values
-     *      - allowed: If set, a lookup array of allowed (string) values
-     *  - If isAlias is set:
-     *      - namespace: Namespace this directive aliases to
-     *      - name: Directive name this directive aliases to
-     *
-     * In certain degenerate cases, stdclass will actually be an integer. In
-     * that case, the value is equivalent to an stdclass with the type
-     * property set to the integer. If the integer is negative, type is
-     * equal to the absolute value of integer, and allow_null is true.
-     *
-     * This class is friendly with HTMLPurifier_Config. If you need introspection
-     * about the schema, you're better of using the ConfigSchema_Interchange,
-     * which uses more memory but has much richer information.
-     */
-    public $info = array();
+	/**
+	 * Definition of the directives. The structure of this is:
+	 *
+	 *  array(
+	 *      'Namespace' => array(
+	 *          'Directive' => new stdclass(),
+	 *      )
+	 *  )
+	 *
+	 * The stdclass may have the following properties:
+	 *
+	 *  - If isAlias isn't set:
+	 *      - type: Integer type of directive, see HTMLPurifier_VarParser for definitions
+	 *      - allow_null: If set, this directive allows null values
+	 *      - aliases: If set, an associative array of value aliases to real values
+	 *      - allowed: If set, a lookup array of allowed (string) values
+	 *  - If isAlias is set:
+	 *      - namespace: Namespace this directive aliases to
+	 *      - name: Directive name this directive aliases to
+	 *
+	 * In certain degenerate cases, stdclass will actually be an integer. In
+	 * that case, the value is equivalent to an stdclass with the type
+	 * property set to the integer. If the integer is negative, type is
+	 * equal to the absolute value of integer, and allow_null is true.
+	 *
+	 * This class is friendly with HTMLPurifier_Config. If you need introspection
+	 * about the schema, you're better of using the ConfigSchema_Interchange,
+	 * which uses more memory but has much richer information.
+	 */
+	public $info = array();
 
-    /**
-     * Application-wide singleton
-     */
-    static protected $singleton;
+	/**
+	 * Application-wide singleton
+	 */
+	static protected $singleton;
 
-    public function __construct() {
-        $this->defaultPlist = new HTMLPurifier_PropertyList();
-    }
+	public function __construct() {
+		$this->defaultPlist = new HTMLPurifier_PropertyList();
+	}
 
-    /**
-     * Unserializes the default ConfigSchema.
-     */
-    public static function makeFromSerial() {
-        $contents = file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema.ser');
-        $r = unserialize($contents);
-        if (!$r) {
-            $hash = sha1($contents);
-            trigger_error("Unserialization of configuration schema failed, sha1 of file was $hash", E_USER_ERROR);
-        }
-        return $r;
-    }
+	/**
+	 * Unserializes the default ConfigSchema.
+	 */
+	public static function makeFromSerial() {
+		$contents = file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema.ser');
+		$r = unserialize($contents);
+		if (!$r) {
+			$hash = sha1($contents);
+			trigger_error("Unserialization of configuration schema failed, sha1 of file was $hash", E_USER_ERROR);
+		}
+		return $r;
+	}
 
-    /**
-     * Retrieves an instance of the application-wide configuration definition.
-     */
-    public static function instance($prototype = null) {
-        if ($prototype !== null) {
-            HTMLPurifier_ConfigSchema::$singleton = $prototype;
-        } elseif (HTMLPurifier_ConfigSchema::$singleton === null || $prototype === true) {
-            HTMLPurifier_ConfigSchema::$singleton = HTMLPurifier_ConfigSchema::makeFromSerial();
-        }
-        return HTMLPurifier_ConfigSchema::$singleton;
-    }
+	/**
+	 * Retrieves an instance of the application-wide configuration definition.
+	 */
+	public static function instance($prototype = null) {
+		if ($prototype !== null) {
+			HTMLPurifier_ConfigSchema::$singleton = $prototype;
+		} elseif (HTMLPurifier_ConfigSchema::$singleton === null || $prototype === true) {
+			HTMLPurifier_ConfigSchema::$singleton = HTMLPurifier_ConfigSchema::makeFromSerial();
+		}
+		return HTMLPurifier_ConfigSchema::$singleton;
+	}
 
-    /**
-     * Defines a directive for configuration
-     * @warning Will fail of directive's namespace is defined.
-     * @warning This method's signature is slightly different from the legacy
-     *          define() static method! Beware!
-     * @param $namespace Namespace the directive is in
-     * @param $name Key of directive
-     * @param $default Default value of directive
-     * @param $type Allowed type of the directive. See
-     *      HTMLPurifier_DirectiveDef::$type for allowed values
-     * @param $allow_null Whether or not to allow null values
-     */
-    public function add($key, $default, $type, $allow_null) {
-        $obj = new stdclass();
-        $obj->type = is_int($type) ? $type : HTMLPurifier_VarParser::$types[$type];
-        if ($allow_null) $obj->allow_null = true;
-        $this->info[$key] = $obj;
-        $this->defaults[$key] = $default;
-        $this->defaultPlist->set($key, $default);
-    }
+	/**
+	 * Defines a directive for configuration
+	 * @warning Will fail of directive's namespace is defined.
+	 * @warning This method's signature is slightly different from the legacy
+	 *          define() static method! Beware!
+	 * @param $namespace Namespace the directive is in
+	 * @param $name Key of directive
+	 * @param $default Default value of directive
+	 * @param $type Allowed type of the directive. See
+	 *      HTMLPurifier_DirectiveDef::$type for allowed values
+	 * @param $allow_null Whether or not to allow null values
+	 */
+	public function add($key, $default, $type, $allow_null) {
+		$obj = new stdclass();
+		$obj->type = is_int($type) ? $type : HTMLPurifier_VarParser::$types[$type];
+		if ($allow_null) $obj->allow_null = true;
+		$this->info[$key] = $obj;
+		$this->defaults[$key] = $default;
+		$this->defaultPlist->set($key, $default);
+	}
 
-    /**
-     * Defines a directive value alias.
-     *
-     * Directive value aliases are convenient for developers because it lets
-     * them set a directive to several values and get the same result.
-     * @param $namespace Directive's namespace
-     * @param $name Name of Directive
-     * @param $aliases Hash of aliased values to the real alias
-     */
-    public function addValueAliases($key, $aliases) {
-        if (!isset($this->info[$key]->aliases)) {
-            $this->info[$key]->aliases = array();
-        }
-        foreach ($aliases as $alias => $real) {
-            $this->info[$key]->aliases[$alias] = $real;
-        }
-    }
+	/**
+	 * Defines a directive value alias.
+	 *
+	 * Directive value aliases are convenient for developers because it lets
+	 * them set a directive to several values and get the same result.
+	 * @param $namespace Directive's namespace
+	 * @param $name Name of Directive
+	 * @param $aliases Hash of aliased values to the real alias
+	 */
+	public function addValueAliases($key, $aliases) {
+		if (!isset($this->info[$key]->aliases)) {
+			$this->info[$key]->aliases = array();
+		}
+		foreach ($aliases as $alias => $real) {
+			$this->info[$key]->aliases[$alias] = $real;
+		}
+	}
 
-    /**
-     * Defines a set of allowed values for a directive.
-     * @warning This is slightly different from the corresponding static
-     *          method definition.
-     * @param $namespace Namespace of directive
-     * @param $name Name of directive
-     * @param $allowed Lookup array of allowed values
-     */
-    public function addAllowedValues($key, $allowed) {
-        $this->info[$key]->allowed = $allowed;
-    }
+	/**
+	 * Defines a set of allowed values for a directive.
+	 * @warning This is slightly different from the corresponding static
+	 *          method definition.
+	 * @param $namespace Namespace of directive
+	 * @param $name Name of directive
+	 * @param $allowed Lookup array of allowed values
+	 */
+	public function addAllowedValues($key, $allowed) {
+		$this->info[$key]->allowed = $allowed;
+	}
 
-    /**
-     * Defines a directive alias for backwards compatibility
-     * @param $namespace
-     * @param $name Directive that will be aliased
-     * @param $new_namespace
-     * @param $new_name Directive that the alias will be to
-     */
-    public function addAlias($key, $new_key) {
-        $obj = new stdclass;
-        $obj->key = $new_key;
-        $obj->isAlias = true;
-        $this->info[$key] = $obj;
-    }
+	/**
+	 * Defines a directive alias for backwards compatibility
+	 * @param $namespace
+	 * @param $name Directive that will be aliased
+	 * @param $new_namespace
+	 * @param $new_name Directive that the alias will be to
+	 */
+	public function addAlias($key, $new_key) {
+		$obj = new stdclass;
+		$obj->key = $new_key;
+		$obj->isAlias = true;
+		$this->info[$key] = $obj;
+	}
 
-    /**
-     * Replaces any stdclass that only has the type property with type integer.
-     */
-    public function postProcess() {
-        foreach ($this->info as $key => $v) {
-            if (count((array) $v) == 1) {
-                $this->info[$key] = $v->type;
-            } elseif (count((array) $v) == 2 && isset($v->allow_null)) {
-                $this->info[$key] = -$v->type;
-            }
-        }
-    }
+	/**
+	 * Replaces any stdclass that only has the type property with type integer.
+	 */
+	public function postProcess() {
+		foreach ($this->info as $key => $v) {
+			if (count((array) $v) == 1) {
+				$this->info[$key] = $v->type;
+			} elseif (count((array) $v) == 2 && isset($v->allow_null)) {
+				$this->info[$key] = -$v->type;
+			}
+		}
+	}
 
 }
 

Braces +3 added lines, -1 removed lines

@@ -96,7 +96,9 @@
     public function add($key, $default, $type, $allow_null) {
         $obj = new stdclass();
         $obj->type = is_int($type) ? $type : HTMLPurifier_VarParser::$types[$type];
-        if ($allow_null) $obj->allow_null = true;
+        if ($allow_null) {
+        	$obj->allow_null = true;
+        }
         $this->info[$key] = $obj;
         $this->defaults[$key] = $default;
         $this->defaultPlist->set($key, $default);

classes/security/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php

Indentation +31 added lines, -31 removed lines

@@ -7,37 +7,37 @@
 class HTMLPurifier_ConfigSchema_Builder_ConfigSchema
 {
 
-    public function build($interchange) {
-        $schema = new HTMLPurifier_ConfigSchema();
-        foreach ($interchange->directives as $d) {
-            $schema->add(
-                $d->id->key,
-                $d->default,
-                $d->type,
-                $d->typeAllowsNull
-            );
-            if ($d->allowed !== null) {
-                $schema->addAllowedValues(
-                    $d->id->key,
-                    $d->allowed
-                );
-            }
-            foreach ($d->aliases as $alias) {
-                $schema->addAlias(
-                    $alias->key,
-                    $d->id->key
-                );
-            }
-            if ($d->valueAliases !== null) {
-                $schema->addValueAliases(
-                    $d->id->key,
-                    $d->valueAliases
-                );
-            }
-        }
-        $schema->postProcess();
-        return $schema;
-    }
+	public function build($interchange) {
+		$schema = new HTMLPurifier_ConfigSchema();
+		foreach ($interchange->directives as $d) {
+			$schema->add(
+				$d->id->key,
+				$d->default,
+				$d->type,
+				$d->typeAllowsNull
+			);
+			if ($d->allowed !== null) {
+				$schema->addAllowedValues(
+					$d->id->key,
+					$d->allowed
+				);
+			}
+			foreach ($d->aliases as $alias) {
+				$schema->addAlias(
+					$alias->key,
+					$d->id->key
+				);
+			}
+			if ($d->valueAliases !== null) {
+				$schema->addValueAliases(
+					$d->id->key,
+					$d->valueAliases
+				);
+			}
+		}
+		$schema->postProcess();
+		return $schema;
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/Xml.php

Indentation +93 added lines, -93 removed lines

@@ -7,99 +7,99 @@
 class HTMLPurifier_ConfigSchema_Builder_Xml extends XMLWriter
 {
 
-    protected $interchange;
-    private $namespace;
-
-    protected function writeHTMLDiv($html) {
-        $this->startElement('div');
-
-        $purifier = HTMLPurifier::getInstance();
-        $html = $purifier->purify($html);
-        $this->writeAttribute('xmlns', 'http://www.w3.org/1999/xhtml');
-        $this->writeRaw($html);
-
-        $this->endElement(); // div
-    }
-
-    protected function export($var) {
-        if ($var === array()) return 'array()';
-        return var_export($var, true);
-    }
-
-    public function build($interchange) {
-        // global access, only use as last resort
-        $this->interchange = $interchange;
-
-        $this->setIndent(true);
-        $this->startDocument('1.0', 'UTF-8');
-        $this->startElement('configdoc');
-        $this->writeElement('title', $interchange->name);
-
-        foreach ($interchange->directives as $directive) {
-            $this->buildDirective($directive);
-        }
-
-        if ($this->namespace) $this->endElement(); // namespace
-
-        $this->endElement(); // configdoc
-        $this->flush();
-    }
-
-    public function buildDirective($directive) {
-
-        // Kludge, although I suppose having a notion of a "root namespace"
-        // certainly makes things look nicer when documentation is built.
-        // Depends on things being sorted.
-        if (!$this->namespace || $this->namespace !== $directive->id->getRootNamespace()) {
-            if ($this->namespace) $this->endElement(); // namespace
-            $this->namespace = $directive->id->getRootNamespace();
-            $this->startElement('namespace');
-            $this->writeAttribute('id', $this->namespace);
-            $this->writeElement('name', $this->namespace);
-        }
-
-        $this->startElement('directive');
-        $this->writeAttribute('id', $directive->id->toString());
-
-        $this->writeElement('name', $directive->id->getDirective());
-
-        $this->startElement('aliases');
-            foreach ($directive->aliases as $alias) $this->writeElement('alias', $alias->toString());
-        $this->endElement(); // aliases
-
-        $this->startElement('constraints');
-            if ($directive->version) $this->writeElement('version', $directive->version);
-            $this->startElement('type');
-                if ($directive->typeAllowsNull) $this->writeAttribute('allow-null', 'yes');
-                $this->text($directive->type);
-            $this->endElement(); // type
-            if ($directive->allowed) {
-                $this->startElement('allowed');
-                    foreach ($directive->allowed as $value => $x) $this->writeElement('value', $value);
-                $this->endElement(); // allowed
-            }
-            $this->writeElement('default', $this->export($directive->default));
-            $this->writeAttribute('xml:space', 'preserve');
-            if ($directive->external) {
-                $this->startElement('external');
-                    foreach ($directive->external as $project) $this->writeElement('project', $project);
-                $this->endElement();
-            }
-        $this->endElement(); // constraints
-
-        if ($directive->deprecatedVersion) {
-            $this->startElement('deprecated');
-                $this->writeElement('version', $directive->deprecatedVersion);
-                $this->writeElement('use', $directive->deprecatedUse->toString());
-            $this->endElement(); // deprecated
-        }
-
-        $this->startElement('description');
-            $this->writeHTMLDiv($directive->description);
-        $this->endElement(); // description
-
-        $this->endElement(); // directive
-    }
+	protected $interchange;
+	private $namespace;
+
+	protected function writeHTMLDiv($html) {
+		$this->startElement('div');
+
+		$purifier = HTMLPurifier::getInstance();
+		$html = $purifier->purify($html);
+		$this->writeAttribute('xmlns', 'http://www.w3.org/1999/xhtml');
+		$this->writeRaw($html);
+
+		$this->endElement(); // div
+	}
+
+	protected function export($var) {
+		if ($var === array()) return 'array()';
+		return var_export($var, true);
+	}
+
+	public function build($interchange) {
+		// global access, only use as last resort
+		$this->interchange = $interchange;
+
+		$this->setIndent(true);
+		$this->startDocument('1.0', 'UTF-8');
+		$this->startElement('configdoc');
+		$this->writeElement('title', $interchange->name);
+
+		foreach ($interchange->directives as $directive) {
+			$this->buildDirective($directive);
+		}
+
+		if ($this->namespace) $this->endElement(); // namespace
+
+		$this->endElement(); // configdoc
+		$this->flush();
+	}
+
+	public function buildDirective($directive) {
+
+		// Kludge, although I suppose having a notion of a "root namespace"
+		// certainly makes things look nicer when documentation is built.
+		// Depends on things being sorted.
+		if (!$this->namespace || $this->namespace !== $directive->id->getRootNamespace()) {
+			if ($this->namespace) $this->endElement(); // namespace
+			$this->namespace = $directive->id->getRootNamespace();
+			$this->startElement('namespace');
+			$this->writeAttribute('id', $this->namespace);
+			$this->writeElement('name', $this->namespace);
+		}
+
+		$this->startElement('directive');
+		$this->writeAttribute('id', $directive->id->toString());
+
+		$this->writeElement('name', $directive->id->getDirective());
+
+		$this->startElement('aliases');
+			foreach ($directive->aliases as $alias) $this->writeElement('alias', $alias->toString());
+		$this->endElement(); // aliases
+
+		$this->startElement('constraints');
+			if ($directive->version) $this->writeElement('version', $directive->version);
+			$this->startElement('type');
+				if ($directive->typeAllowsNull) $this->writeAttribute('allow-null', 'yes');
+				$this->text($directive->type);
+			$this->endElement(); // type
+			if ($directive->allowed) {
+				$this->startElement('allowed');
+					foreach ($directive->allowed as $value => $x) $this->writeElement('value', $value);
+				$this->endElement(); // allowed
+			}
+			$this->writeElement('default', $this->export($directive->default));
+			$this->writeAttribute('xml:space', 'preserve');
+			if ($directive->external) {
+				$this->startElement('external');
+					foreach ($directive->external as $project) $this->writeElement('project', $project);
+				$this->endElement();
+			}
+		$this->endElement(); // constraints
+
+		if ($directive->deprecatedVersion) {
+			$this->startElement('deprecated');
+				$this->writeElement('version', $directive->deprecatedVersion);
+				$this->writeElement('use', $directive->deprecatedUse->toString());
+			$this->endElement(); // deprecated
+		}
+
+		$this->startElement('description');
+			$this->writeHTMLDiv($directive->description);
+		$this->endElement(); // description
+
+		$this->endElement(); // directive
+	}
 
 }
 

Braces +26 added lines, -8 removed lines

@@ -22,7 +22,9 @@ 
     }
 
     protected function export($var) {
-        if ($var === array()) return 'array()';
+        if ($var === array()) {
+        	return 'array()';
+        }
         return var_export($var, true);
     }
 
@@ -39,7 +41,10 @@ 
             $this->buildDirective($directive);
         }
 
-        if ($this->namespace) $this->endElement(); // namespace
+        if ($this->namespace) {
+        	$this->endElement();
+        }
+        // namespace
 
         $this->endElement(); // configdoc
         $this->flush();
@@ -51,7 +56,10 @@ 
         // certainly makes things look nicer when documentation is built.
         // Depends on things being sorted.
         if (!$this->namespace || $this->namespace !== $directive->id->getRootNamespace()) {
-            if ($this->namespace) $this->endElement(); // namespace
+            if ($this->namespace) {
+            	$this->endElement();
+            }
+            // namespace
             $this->namespace = $directive->id->getRootNamespace();
             $this->startElement('namespace');
             $this->writeAttribute('id', $this->namespace);
@@ -64,25 +72,35 @@ 
         $this->writeElement('name', $directive->id->getDirective());
 
         $this->startElement('aliases');
-            foreach ($directive->aliases as $alias) $this->writeElement('alias', $alias->toString());
+            foreach ($directive->aliases as $alias) {
+            	$this->writeElement('alias', $alias->toString());
+            }
         $this->endElement(); // aliases
 
         $this->startElement('constraints');
-            if ($directive->version) $this->writeElement('version', $directive->version);
+            if ($directive->version) {
+            	$this->writeElement('version', $directive->version);
+            }
             $this->startElement('type');
-                if ($directive->typeAllowsNull) $this->writeAttribute('allow-null', 'yes');
+                if ($directive->typeAllowsNull) {
+                	$this->writeAttribute('allow-null', 'yes');
+                }
                 $this->text($directive->type);
             $this->endElement(); // type
             if ($directive->allowed) {
                 $this->startElement('allowed');
-                    foreach ($directive->allowed as $value => $x) $this->writeElement('value', $value);
+                    foreach ($directive->allowed as $value => $x) {
+                    	$this->writeElement('value', $value);
+                    }
                 $this->endElement(); // allowed
             }
             $this->writeElement('default', $this->export($directive->default));
             $this->writeAttribute('xml:space', 'preserve');
             if ($directive->external) {
                 $this->startElement('external');
-                    foreach ($directive->external as $project) $this->writeElement('project', $project);
+                    foreach ($directive->external as $project) {
+                    	$this->writeElement('project', $project);
+                    }
                 $this->endElement();
             }
         $this->endElement(); // constraints

classes/security/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange.php

Indentation +25 added lines, -25 removed lines

@@ -8,34 +8,34 @@
 class HTMLPurifier_ConfigSchema_Interchange
 {
 
-    /**
-     * Name of the application this schema is describing.
-     */
-    public $name;
+	/**
+	 * Name of the application this schema is describing.
+	 */
+	public $name;
 
-    /**
-     * Array of Directive ID => array(directive info)
-     */
-    public $directives = array();
+	/**
+	 * Array of Directive ID => array(directive info)
+	 */
+	public $directives = array();
 
-    /**
-     * Adds a directive array to $directives
-     */
-    public function addDirective($directive) {
-        if (isset($this->directives[$i = $directive->id->toString()])) {
-            throw new HTMLPurifier_ConfigSchema_Exception("Cannot redefine directive '$i'");
-        }
-        $this->directives[$i] = $directive;
-    }
+	/**
+	 * Adds a directive array to $directives
+	 */
+	public function addDirective($directive) {
+		if (isset($this->directives[$i = $directive->id->toString()])) {
+			throw new HTMLPurifier_ConfigSchema_Exception("Cannot redefine directive '$i'");
+		}
+		$this->directives[$i] = $directive;
+	}
 
-    /**
-     * Convenience function to perform standard validation. Throws exception
-     * on failed validation.
-     */
-    public function validate() {
-        $validator = new HTMLPurifier_ConfigSchema_Validator();
-        return $validator->validate($this);
-    }
+	/**
+	 * Convenience function to perform standard validation. Throws exception
+	 * on failed validation.
+	 */
+	public function validate() {
+		$validator = new HTMLPurifier_ConfigSchema_Validator();
+		return $validator->validate($this);
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php

Indentation +54 added lines, -54 removed lines

@@ -6,71 +6,71 @@
 class HTMLPurifier_ConfigSchema_Interchange_Directive
 {
 
-    /**
-     * ID of directive, instance of HTMLPurifier_ConfigSchema_Interchange_Id.
-     */
-    public $id;
+	/**
+	 * ID of directive, instance of HTMLPurifier_ConfigSchema_Interchange_Id.
+	 */
+	public $id;
 
-    /**
-     * String type, e.g. 'integer' or 'istring'.
-     */
-    public $type;
+	/**
+	 * String type, e.g. 'integer' or 'istring'.
+	 */
+	public $type;
 
-    /**
-     * Default value, e.g. 3 or 'DefaultVal'.
-     */
-    public $default;
+	/**
+	 * Default value, e.g. 3 or 'DefaultVal'.
+	 */
+	public $default;
 
-    /**
-     * HTML description.
-     */
-    public $description;
+	/**
+	 * HTML description.
+	 */
+	public $description;
 
-    /**
-     * Boolean whether or not null is allowed as a value.
-     */
-    public $typeAllowsNull = false;
+	/**
+	 * Boolean whether or not null is allowed as a value.
+	 */
+	public $typeAllowsNull = false;
 
-    /**
-     * Lookup table of allowed scalar values, e.g. array('allowed' => true).
-     * Null if all values are allowed.
-     */
-    public $allowed;
+	/**
+	 * Lookup table of allowed scalar values, e.g. array('allowed' => true).
+	 * Null if all values are allowed.
+	 */
+	public $allowed;
 
-    /**
-     * List of aliases for the directive,
-     * e.g. array(new HTMLPurifier_ConfigSchema_Interchange_Id('Ns', 'Dir'))).
-     */
-    public $aliases = array();
+	/**
+	 * List of aliases for the directive,
+	 * e.g. array(new HTMLPurifier_ConfigSchema_Interchange_Id('Ns', 'Dir'))).
+	 */
+	public $aliases = array();
 
-    /**
-     * Hash of value aliases, e.g. array('alt' => 'real'). Null if value
-     * aliasing is disabled (necessary for non-scalar types).
-     */
-    public $valueAliases;
+	/**
+	 * Hash of value aliases, e.g. array('alt' => 'real'). Null if value
+	 * aliasing is disabled (necessary for non-scalar types).
+	 */
+	public $valueAliases;
 
-    /**
-     * Version of HTML Purifier the directive was introduced, e.g. '1.3.1'.
-     * Null if the directive has always existed.
-     */
-    public $version;
+	/**
+	 * Version of HTML Purifier the directive was introduced, e.g. '1.3.1'.
+	 * Null if the directive has always existed.
+	 */
+	public $version;
 
-    /**
-     * ID of directive that supercedes this old directive, is an instance
-     * of HTMLPurifier_ConfigSchema_Interchange_Id. Null if not deprecated.
-     */
-    public $deprecatedUse;
+	/**
+	 * ID of directive that supercedes this old directive, is an instance
+	 * of HTMLPurifier_ConfigSchema_Interchange_Id. Null if not deprecated.
+	 */
+	public $deprecatedUse;
 
-    /**
-     * Version of HTML Purifier this directive was deprecated. Null if not
-     * deprecated.
-     */
-    public $deprecatedVersion;
+	/**
+	 * Version of HTML Purifier this directive was deprecated. Null if not
+	 * deprecated.
+	 */
+	public $deprecatedVersion;
 
-    /**
-     * List of external projects this directive depends on, e.g. array('CSSTidy').
-     */
-    public $external = array();
+	/**
+	 * List of external projects this directive depends on, e.g. array('CSSTidy').
+	 */
+	public $external = array();
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Id.php

Indentation +25 added lines, -25 removed lines

@@ -6,31 +6,31 @@
 class HTMLPurifier_ConfigSchema_Interchange_Id
 {
 
-    public $key;
-
-    public function __construct($key) {
-        $this->key = $key;
-    }
-
-    /**
-     * @warning This is NOT magic, to ensure that people don't abuse SPL and
-     *          cause problems for PHP 5.0 support.
-     */
-    public function toString() {
-        return $this->key;
-    }
-
-    public function getRootNamespace() {
-        return substr($this->key, 0, strpos($this->key, "."));
-    }
-
-    public function getDirective() {
-        return substr($this->key, strpos($this->key, ".") + 1);
-    }
-
-    public static function make($id) {
-        return new HTMLPurifier_ConfigSchema_Interchange_Id($id);
-    }
+	public $key;
+
+	public function __construct($key) {
+		$this->key = $key;
+	}
+
+	/**
+	 * @warning This is NOT magic, to ensure that people don't abuse SPL and
+	 *          cause problems for PHP 5.0 support.
+	 */
+	public function toString() {
+		return $this->key;
+	}
+
+	public function getRootNamespace() {
+		return substr($this->key, 0, strpos($this->key, "."));
+	}
+
+	public function getDirective() {
+		return substr($this->key, strpos($this->key, ".") + 1);
+	}
+
+	public static function make($id) {
+		return new HTMLPurifier_ConfigSchema_Interchange_Id($id);
+	}
 
 }