xpressengine / xe-core

classes/security/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php

Indentation +171 added lines, -171 removed lines

@@ -11,177 +11,177 @@
 class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
 {
 
-    public function execute($tokens, $config, $context) {
-        $definition = $config->getHTMLDefinition();
-        $generator = new HTMLPurifier_Generator($config, $context);
-        $result = array();
-
-        $escape_invalid_tags = $config->get('Core.EscapeInvalidTags');
-        $remove_invalid_img  = $config->get('Core.RemoveInvalidImg');
-
-        // currently only used to determine if comments should be kept
-        $trusted = $config->get('HTML.Trusted');
-        $comment_lookup = $config->get('HTML.AllowedComments');
-        $comment_regexp = $config->get('HTML.AllowedCommentsRegexp');
-        $check_comments = $comment_lookup !== array() || $comment_regexp !== null;
-
-        $remove_script_contents = $config->get('Core.RemoveScriptContents');
-        $hidden_elements     = $config->get('Core.HiddenElements');
-
-        // remove script contents compatibility
-        if ($remove_script_contents === true) {
-            $hidden_elements['script'] = true;
-        } elseif ($remove_script_contents === false && isset($hidden_elements['script'])) {
-            unset($hidden_elements['script']);
-        }
-
-        $attr_validator = new HTMLPurifier_AttrValidator();
-
-        // removes tokens until it reaches a closing tag with its value
-        $remove_until = false;
-
-        // converts comments into text tokens when this is equal to a tag name
-        $textify_comments = false;
-
-        $token = false;
-        $context->register('CurrentToken', $token);
-
-        $e = false;
-        if ($config->get('Core.CollectErrors')) {
-            $e =& $context->get('ErrorCollector');
-        }
-
-        foreach($tokens as $token) {
-            if ($remove_until) {
-                if (empty($token->is_tag) || $token->name !== $remove_until) {
-                    continue;
-                }
-            }
-            if (!empty( $token->is_tag )) {
-                // DEFINITION CALL
-
-                // before any processing, try to transform the element
-                if (
-                    isset($definition->info_tag_transform[$token->name])
-                ) {
-                    $original_name = $token->name;
-                    // there is a transformation for this tag
-                    // DEFINITION CALL
-                    $token = $definition->
-                                info_tag_transform[$token->name]->
-                                    transform($token, $config, $context);
-                    if ($e) $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Tag transform', $original_name);
-                }
-
-                if (isset($definition->info[$token->name])) {
-
-                    // mostly everything's good, but
-                    // we need to make sure required attributes are in order
-                    if (
-                        ($token instanceof HTMLPurifier_Token_Start || $token instanceof HTMLPurifier_Token_Empty) &&
-                        $definition->info[$token->name]->required_attr &&
-                        ($token->name != 'img' || $remove_invalid_img) // ensure config option still works
-                    ) {
-                        $attr_validator->validateToken($token, $config, $context);
-                        $ok = true;
-                        foreach ($definition->info[$token->name]->required_attr as $name) {
-                            if (!isset($token->attr[$name])) {
-                                $ok = false;
-                                break;
-                            }
-                        }
-                        if (!$ok) {
-                            if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Missing required attribute', $name);
-                            continue;
-                        }
-                        $token->armor['ValidateAttributes'] = true;
-                    }
-
-                    if (isset($hidden_elements[$token->name]) && $token instanceof HTMLPurifier_Token_Start) {
-                        $textify_comments = $token->name;
-                    } elseif ($token->name === $textify_comments && $token instanceof HTMLPurifier_Token_End) {
-                        $textify_comments = false;
-                    }
-
-                } elseif ($escape_invalid_tags) {
-                    // invalid tag, generate HTML representation and insert in
-                    if ($e) $e->send(E_WARNING, 'Strategy_RemoveForeignElements: Foreign element to text');
-                    $token = new HTMLPurifier_Token_Text(
-                        $generator->generateFromToken($token)
-                    );
-                } else {
-                    // check if we need to destroy all of the tag's children
-                    // CAN BE GENERICIZED
-                    if (isset($hidden_elements[$token->name])) {
-                        if ($token instanceof HTMLPurifier_Token_Start) {
-                            $remove_until = $token->name;
-                        } elseif ($token instanceof HTMLPurifier_Token_Empty) {
-                            // do nothing: we're still looking
-                        } else {
-                            $remove_until = false;
-                        }
-                        if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign meta element removed');
-                    } else {
-                        if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign element removed');
-                    }
-                    continue;
-                }
-            } elseif ($token instanceof HTMLPurifier_Token_Comment) {
-                // textify comments in script tags when they are allowed
-                if ($textify_comments !== false) {
-                    $data = $token->data;
-                    $token = new HTMLPurifier_Token_Text($data);
-                } elseif ($trusted || $check_comments) {
-                    // always cleanup comments
-                    $trailing_hyphen = false;
-                    if ($e) {
-                        // perform check whether or not there's a trailing hyphen
-                        if (substr($token->data, -1) == '-') {
-                            $trailing_hyphen = true;
-                        }
-                    }
-                    $token->data = rtrim($token->data, '-');
-                    $found_double_hyphen = false;
-                    while (strpos($token->data, '--') !== false) {
-                        $found_double_hyphen = true;
-                        $token->data = str_replace('--', '-', $token->data);
-                    }
-                    if ($trusted || !empty($comment_lookup[trim($token->data)]) || ($comment_regexp !== NULL && preg_match($comment_regexp, trim($token->data)))) {
-                        // OK good
-                        if ($e) {
-                            if ($trailing_hyphen) {
-                                $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Trailing hyphen in comment removed');
-                            }
-                            if ($found_double_hyphen) {
-                                $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Hyphens in comment collapsed');
-                            }
-                        }
-                    } else {
-                        if ($e) {
-                            $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Comment removed');
-                        }
-                        continue;
-                    }
-                } else {
-                    // strip comments
-                    if ($e) $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Comment removed');
-                    continue;
-                }
-            } elseif ($token instanceof HTMLPurifier_Token_Text) {
-            } else {
-                continue;
-            }
-            $result[] = $token;
-        }
-        if ($remove_until && $e) {
-            // we removed tokens until the end, throw error
-            $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Token removed to end', $remove_until);
-        }
-
-        $context->destroy('CurrentToken');
-
-        return $result;
-    }
+	public function execute($tokens, $config, $context) {
+		$definition = $config->getHTMLDefinition();
+		$generator = new HTMLPurifier_Generator($config, $context);
+		$result = array();
+
+		$escape_invalid_tags = $config->get('Core.EscapeInvalidTags');
+		$remove_invalid_img  = $config->get('Core.RemoveInvalidImg');
+
+		// currently only used to determine if comments should be kept
+		$trusted = $config->get('HTML.Trusted');
+		$comment_lookup = $config->get('HTML.AllowedComments');
+		$comment_regexp = $config->get('HTML.AllowedCommentsRegexp');
+		$check_comments = $comment_lookup !== array() || $comment_regexp !== null;
+
+		$remove_script_contents = $config->get('Core.RemoveScriptContents');
+		$hidden_elements     = $config->get('Core.HiddenElements');
+
+		// remove script contents compatibility
+		if ($remove_script_contents === true) {
+			$hidden_elements['script'] = true;
+		} elseif ($remove_script_contents === false && isset($hidden_elements['script'])) {
+			unset($hidden_elements['script']);
+		}
+
+		$attr_validator = new HTMLPurifier_AttrValidator();
+
+		// removes tokens until it reaches a closing tag with its value
+		$remove_until = false;
+
+		// converts comments into text tokens when this is equal to a tag name
+		$textify_comments = false;
+
+		$token = false;
+		$context->register('CurrentToken', $token);
+
+		$e = false;
+		if ($config->get('Core.CollectErrors')) {
+			$e =& $context->get('ErrorCollector');
+		}
+
+		foreach($tokens as $token) {
+			if ($remove_until) {
+				if (empty($token->is_tag) || $token->name !== $remove_until) {
+					continue;
+				}
+			}
+			if (!empty( $token->is_tag )) {
+				// DEFINITION CALL
+
+				// before any processing, try to transform the element
+				if (
+					isset($definition->info_tag_transform[$token->name])
+				) {
+					$original_name = $token->name;
+					// there is a transformation for this tag
+					// DEFINITION CALL
+					$token = $definition->
+								info_tag_transform[$token->name]->
+									transform($token, $config, $context);
+					if ($e) $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Tag transform', $original_name);
+				}
+
+				if (isset($definition->info[$token->name])) {
+
+					// mostly everything's good, but
+					// we need to make sure required attributes are in order
+					if (
+						($token instanceof HTMLPurifier_Token_Start || $token instanceof HTMLPurifier_Token_Empty) &&
+						$definition->info[$token->name]->required_attr &&
+						($token->name != 'img' || $remove_invalid_img) // ensure config option still works
+					) {
+						$attr_validator->validateToken($token, $config, $context);
+						$ok = true;
+						foreach ($definition->info[$token->name]->required_attr as $name) {
+							if (!isset($token->attr[$name])) {
+								$ok = false;
+								break;
+							}
+						}
+						if (!$ok) {
+							if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Missing required attribute', $name);
+							continue;
+						}
+						$token->armor['ValidateAttributes'] = true;
+					}
+
+					if (isset($hidden_elements[$token->name]) && $token instanceof HTMLPurifier_Token_Start) {
+						$textify_comments = $token->name;
+					} elseif ($token->name === $textify_comments && $token instanceof HTMLPurifier_Token_End) {
+						$textify_comments = false;
+					}
+
+				} elseif ($escape_invalid_tags) {
+					// invalid tag, generate HTML representation and insert in
+					if ($e) $e->send(E_WARNING, 'Strategy_RemoveForeignElements: Foreign element to text');
+					$token = new HTMLPurifier_Token_Text(
+						$generator->generateFromToken($token)
+					);
+				} else {
+					// check if we need to destroy all of the tag's children
+					// CAN BE GENERICIZED
+					if (isset($hidden_elements[$token->name])) {
+						if ($token instanceof HTMLPurifier_Token_Start) {
+							$remove_until = $token->name;
+						} elseif ($token instanceof HTMLPurifier_Token_Empty) {
+							// do nothing: we're still looking
+						} else {
+							$remove_until = false;
+						}
+						if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign meta element removed');
+					} else {
+						if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign element removed');
+					}
+					continue;
+				}
+			} elseif ($token instanceof HTMLPurifier_Token_Comment) {
+				// textify comments in script tags when they are allowed
+				if ($textify_comments !== false) {
+					$data = $token->data;
+					$token = new HTMLPurifier_Token_Text($data);
+				} elseif ($trusted || $check_comments) {
+					// always cleanup comments
+					$trailing_hyphen = false;
+					if ($e) {
+						// perform check whether or not there's a trailing hyphen
+						if (substr($token->data, -1) == '-') {
+							$trailing_hyphen = true;
+						}
+					}
+					$token->data = rtrim($token->data, '-');
+					$found_double_hyphen = false;
+					while (strpos($token->data, '--') !== false) {
+						$found_double_hyphen = true;
+						$token->data = str_replace('--', '-', $token->data);
+					}
+					if ($trusted || !empty($comment_lookup[trim($token->data)]) || ($comment_regexp !== NULL && preg_match($comment_regexp, trim($token->data)))) {
+						// OK good
+						if ($e) {
+							if ($trailing_hyphen) {
+								$e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Trailing hyphen in comment removed');
+							}
+							if ($found_double_hyphen) {
+								$e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Hyphens in comment collapsed');
+							}
+						}
+					} else {
+						if ($e) {
+							$e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Comment removed');
+						}
+						continue;
+					}
+				} else {
+					// strip comments
+					if ($e) $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Comment removed');
+					continue;
+				}
+			} elseif ($token instanceof HTMLPurifier_Token_Text) {
+			} else {
+				continue;
+			}
+			$result[] = $token;
+		}
+		if ($remove_until && $e) {
+			// we removed tokens until the end, throw error
+			$e->send(E_ERROR, 'Strategy_RemoveForeignElements: Token removed to end', $remove_until);
+		}
+
+		$context->destroy('CurrentToken');
+
+		return $result;
+	}
 
 }
 

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
         $check_comments = $comment_lookup !== array() || $comment_regexp !== null;
 
         $remove_script_contents = $config->get('Core.RemoveScriptContents');
-        $hidden_elements     = $config->get('Core.HiddenElements');
+        $hidden_elements = $config->get('Core.HiddenElements');
 
         // remove script contents compatibility
         if ($remove_script_contents === true) {
@@ -48,16 +48,16 @@ 
 
         $e = false;
         if ($config->get('Core.CollectErrors')) {
-            $e =& $context->get('ErrorCollector');
+            $e = & $context->get('ErrorCollector');
         }
 
-        foreach($tokens as $token) {
+        foreach ($tokens as $token) {
             if ($remove_until) {
                 if (empty($token->is_tag) || $token->name !== $remove_until) {
                     continue;
                 }
             }
-            if (!empty( $token->is_tag )) {
+            if (!empty($token->is_tag)) {
                 // DEFINITION CALL
 
                 // before any processing, try to transform the element

Braces +18 added lines, -6 removed lines

@@ -70,7 +70,9 @@ 
                     $token = $definition->
                                 info_tag_transform[$token->name]->
                                     transform($token, $config, $context);
-                    if ($e) $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Tag transform', $original_name);
+                    if ($e) {
+                    	$e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Tag transform', $original_name);
+                    }
                 }
 
                 if (isset($definition->info[$token->name])) {
@@ -91,7 +93,9 @@ 
                             }
                         }
                         if (!$ok) {
-                            if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Missing required attribute', $name);
+                            if ($e) {
+                            	$e->send(E_ERROR, 'Strategy_RemoveForeignElements: Missing required attribute', $name);
+                            }
                             continue;
                         }
                         $token->armor['ValidateAttributes'] = true;
@@ -105,7 +109,9 @@ 
 
                 } elseif ($escape_invalid_tags) {
                     // invalid tag, generate HTML representation and insert in
-                    if ($e) $e->send(E_WARNING, 'Strategy_RemoveForeignElements: Foreign element to text');
+                    if ($e) {
+                    	$e->send(E_WARNING, 'Strategy_RemoveForeignElements: Foreign element to text');
+                    }
                     $token = new HTMLPurifier_Token_Text(
                         $generator->generateFromToken($token)
                     );
@@ -120,9 +126,13 @@ 
                         } else {
                             $remove_until = false;
                         }
-                        if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign meta element removed');
+                        if ($e) {
+                        	$e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign meta element removed');
+                        }
                     } else {
-                        if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign element removed');
+                        if ($e) {
+                        	$e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign element removed');
+                        }
                     }
                     continue;
                 }
@@ -164,7 +174,9 @@ 
                     }
                 } else {
                     // strip comments
-                    if ($e) $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Comment removed');
+                    if ($e) {
+                    	$e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Comment removed');
+                    }
                     continue;
                 }
             } elseif ($token instanceof HTMLPurifier_Token_Text) {

classes/security/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php

Indentation +18 added lines, -18 removed lines

@@ -7,32 +7,32 @@
 class HTMLPurifier_Strategy_ValidateAttributes extends HTMLPurifier_Strategy
 {
 
-    public function execute($tokens, $config, $context) {
+	public function execute($tokens, $config, $context) {
 
-        // setup validator
-        $validator = new HTMLPurifier_AttrValidator();
+		// setup validator
+		$validator = new HTMLPurifier_AttrValidator();
 
-        $token = false;
-        $context->register('CurrentToken', $token);
+		$token = false;
+		$context->register('CurrentToken', $token);
 
-        foreach ($tokens as $key => $token) {
+		foreach ($tokens as $key => $token) {
 
-            // only process tokens that have attributes,
-            //   namely start and empty tags
-            if (!$token instanceof HTMLPurifier_Token_Start && !$token instanceof HTMLPurifier_Token_Empty) continue;
+			// only process tokens that have attributes,
+			//   namely start and empty tags
+			if (!$token instanceof HTMLPurifier_Token_Start && !$token instanceof HTMLPurifier_Token_Empty) continue;
 
-            // skip tokens that are armored
-            if (!empty($token->armor['ValidateAttributes'])) continue;
+			// skip tokens that are armored
+			if (!empty($token->armor['ValidateAttributes'])) continue;
 
-            // note that we have no facilities here for removing tokens
-            $validator->validateToken($token, $config, $context);
+			// note that we have no facilities here for removing tokens
+			$validator->validateToken($token, $config, $context);
 
-            $tokens[$key] = $token; // for PHP 4
-        }
-        $context->destroy('CurrentToken');
+			$tokens[$key] = $token; // for PHP 4
+		}
+		$context->destroy('CurrentToken');
 
-        return $tokens;
-    }
+		return $tokens;
+	}
 
 }
 

Braces +6 added lines, -2 removed lines

@@ -19,10 +19,14 @@
 
             // only process tokens that have attributes,
             //   namely start and empty tags
-            if (!$token instanceof HTMLPurifier_Token_Start && !$token instanceof HTMLPurifier_Token_Empty) continue;
+            if (!$token instanceof HTMLPurifier_Token_Start && !$token instanceof HTMLPurifier_Token_Empty) {
+            	continue;
+            }
 
             // skip tokens that are armored
-            if (!empty($token->armor['ValidateAttributes'])) continue;
+            if (!empty($token->armor['ValidateAttributes'])) {
+            	continue;
+            }
 
             // note that we have no facilities here for removing tokens
             $validator->validateToken($token, $config, $context);

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

Indentation +21 added lines, -21 removed lines

@@ -10,30 +10,30 @@
  */
 class HTMLPurifier_StringHash extends ArrayObject
 {
-    protected $accessed = array();
+	protected $accessed = array();
 
-    /**
-     * Retrieves a value, and logs the access.
-     */
-    public function offsetGet($index) {
-        $this->accessed[$index] = true;
-        return parent::offsetGet($index);
-    }
+	/**
+	 * Retrieves a value, and logs the access.
+	 */
+	public function offsetGet($index) {
+		$this->accessed[$index] = true;
+		return parent::offsetGet($index);
+	}
 
-    /**
-     * Returns a lookup array of all array indexes that have been accessed.
-     * @return Array in form array($index => true).
-     */
-    public function getAccessed() {
-        return $this->accessed;
-    }
+	/**
+	 * Returns a lookup array of all array indexes that have been accessed.
+	 * @return Array in form array($index => true).
+	 */
+	public function getAccessed() {
+		return $this->accessed;
+	}
 
-    /**
-     * Resets the access array.
-     */
-    public function resetAccessed() {
-        $this->accessed = array();
-    }
+	/**
+	 * Resets the access array.
+	 */
+	public function resetAccessed() {
+		$this->accessed = array();
+	}
 }
 
 // vim: et sw=4 sts=4

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

Indentation +73 added lines, -73 removed lines

@@ -28,82 +28,82 @@
 class HTMLPurifier_StringHashParser
 {
 
-    public $default = 'ID';
+	public $default = 'ID';
 
-    /**
-     * Parses a file that contains a single string-hash.
-     */
-    public function parseFile($file) {
-        if (!file_exists($file)) return false;
-        $fh = fopen($file, 'r');
-        if (!$fh) return false;
-        $ret = $this->parseHandle($fh);
-        fclose($fh);
-        return $ret;
-    }
+	/**
+	 * Parses a file that contains a single string-hash.
+	 */
+	public function parseFile($file) {
+		if (!file_exists($file)) return false;
+		$fh = fopen($file, 'r');
+		if (!$fh) return false;
+		$ret = $this->parseHandle($fh);
+		fclose($fh);
+		return $ret;
+	}
 
-    /**
-     * Parses a file that contains multiple string-hashes delimited by '----'
-     */
-    public function parseMultiFile($file) {
-        if (!file_exists($file)) return false;
-        $ret = array();
-        $fh = fopen($file, 'r');
-        if (!$fh) return false;
-        while (!feof($fh)) {
-            $ret[] = $this->parseHandle($fh);
-        }
-        fclose($fh);
-        return $ret;
-    }
+	/**
+	 * Parses a file that contains multiple string-hashes delimited by '----'
+	 */
+	public function parseMultiFile($file) {
+		if (!file_exists($file)) return false;
+		$ret = array();
+		$fh = fopen($file, 'r');
+		if (!$fh) return false;
+		while (!feof($fh)) {
+			$ret[] = $this->parseHandle($fh);
+		}
+		fclose($fh);
+		return $ret;
+	}
 
-    /**
-     * Internal parser that acepts a file handle.
-     * @note While it's possible to simulate in-memory parsing by using
-     *       custom stream wrappers, if such a use-case arises we should
-     *       factor out the file handle into its own class.
-     * @param $fh File handle with pointer at start of valid string-hash
-     *            block.
-     */
-    protected function parseHandle($fh) {
-        $state   = false;
-        $single  = false;
-        $ret     = array();
-        do {
-            $line = fgets($fh);
-            if ($line === false) break;
-            $line = rtrim($line, "\n\r");
-            if (!$state && $line === '') continue;
-            if ($line === '----') break;
-            if (strncmp('--#', $line, 3) === 0) {
-                // Comment
-                continue;
-            } elseif (strncmp('--', $line, 2) === 0) {
-                // Multiline declaration
-                $state = trim($line, '- ');
-                if (!isset($ret[$state])) $ret[$state] = '';
-                continue;
-            } elseif (!$state) {
-                $single = true;
-                if (strpos($line, ':') !== false) {
-                    // Single-line declaration
-                    list($state, $line) = explode(':', $line, 2);
-                    $line = trim($line);
-                } else {
-                    // Use default declaration
-                    $state  = $this->default;
-                }
-            }
-            if ($single) {
-                $ret[$state] = $line;
-                $single = false;
-                $state  = false;
-            } else {
-                $ret[$state] .= "$line\n";
-            }
-        } while (!feof($fh));
-        return $ret;
-    }
+	/**
+	 * Internal parser that acepts a file handle.
+	 * @note While it's possible to simulate in-memory parsing by using
+	 *       custom stream wrappers, if such a use-case arises we should
+	 *       factor out the file handle into its own class.
+	 * @param $fh File handle with pointer at start of valid string-hash
+	 *            block.
+	 */
+	protected function parseHandle($fh) {
+		$state   = false;
+		$single  = false;
+		$ret     = array();
+		do {
+			$line = fgets($fh);
+			if ($line === false) break;
+			$line = rtrim($line, "\n\r");
+			if (!$state && $line === '') continue;
+			if ($line === '----') break;
+			if (strncmp('--#', $line, 3) === 0) {
+				// Comment
+				continue;
+			} elseif (strncmp('--', $line, 2) === 0) {
+				// Multiline declaration
+				$state = trim($line, '- ');
+				if (!isset($ret[$state])) $ret[$state] = '';
+				continue;
+			} elseif (!$state) {
+				$single = true;
+				if (strpos($line, ':') !== false) {
+					// Single-line declaration
+					list($state, $line) = explode(':', $line, 2);
+					$line = trim($line);
+				} else {
+					// Use default declaration
+					$state  = $this->default;
+				}
+			}
+			if ($single) {
+				$ret[$state] = $line;
+				$single = false;
+				$state  = false;
+			} else {
+				$ret[$state] .= "$line\n";
+			}
+		} while (!feof($fh));
+		return $ret;
+	}
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
                     $line = trim($line);
                 } else {
                     // Use default declaration
-                    $state  = $this->default;
+                    $state = $this->default;
                 }
             }
             if ($single) {

Braces +24 added lines, -8 removed lines

@@ -34,9 +34,13 @@ 
      * Parses a file that contains a single string-hash.
      */
     public function parseFile($file) {
-        if (!file_exists($file)) return false;
+        if (!file_exists($file)) {
+        	return false;
+        }
         $fh = fopen($file, 'r');
-        if (!$fh) return false;
+        if (!$fh) {
+        	return false;
+        }
         $ret = $this->parseHandle($fh);
         fclose($fh);
         return $ret;
@@ -46,10 +50,14 @@ 
      * Parses a file that contains multiple string-hashes delimited by '----'
      */
     public function parseMultiFile($file) {
-        if (!file_exists($file)) return false;
+        if (!file_exists($file)) {
+        	return false;
+        }
         $ret = array();
         $fh = fopen($file, 'r');
-        if (!$fh) return false;
+        if (!$fh) {
+        	return false;
+        }
         while (!feof($fh)) {
             $ret[] = $this->parseHandle($fh);
         }
@@ -71,17 +79,25 @@ 
         $ret     = array();
         do {
             $line = fgets($fh);
-            if ($line === false) break;
+            if ($line === false) {
+            	break;
+            }
             $line = rtrim($line, "\n\r");
-            if (!$state && $line === '') continue;
-            if ($line === '----') break;
+            if (!$state && $line === '') {
+            	continue;
+            }
+            if ($line === '----') {
+            	break;
+            }
             if (strncmp('--#', $line, 3) === 0) {
                 // Comment
                 continue;
             } elseif (strncmp('--', $line, 2) === 0) {
                 // Multiline declaration
                 $state = trim($line, '- ');
-                if (!isset($ret[$state])) $ret[$state] = '';
+                if (!isset($ret[$state])) {
+                	$ret[$state] = '';
+                }
                 continue;
             } elseif (!$state) {
                 $single = true;

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

Indentation +22 added lines, -22 removed lines

@@ -6,30 +6,30 @@
 abstract class HTMLPurifier_TagTransform
 {
 
-    /**
-     * Tag name to transform the tag to.
-     */
-    public $transform_to;
+	/**
+	 * Tag name to transform the tag to.
+	 */
+	public $transform_to;
 
-    /**
-     * Transforms the obsolete tag into the valid tag.
-     * @param $tag Tag to be transformed.
-     * @param $config Mandatory HTMLPurifier_Config object
-     * @param $context Mandatory HTMLPurifier_Context object
-     */
-    abstract public function transform($tag, $config, $context);
+	/**
+	 * Transforms the obsolete tag into the valid tag.
+	 * @param $tag Tag to be transformed.
+	 * @param $config Mandatory HTMLPurifier_Config object
+	 * @param $context Mandatory HTMLPurifier_Context object
+	 */
+	abstract public function transform($tag, $config, $context);
 
-    /**
-     * Prepends CSS properties to the style attribute, creating the
-     * attribute if it doesn't exist.
-     * @warning Copied over from AttrTransform, be sure to keep in sync
-     * @param $attr Attribute array to process (passed by reference)
-     * @param $css CSS to prepend
-     */
-    protected function prependCSS(&$attr, $css) {
-        $attr['style'] = isset($attr['style']) ? $attr['style'] : '';
-        $attr['style'] = $css . $attr['style'];
-    }
+	/**
+	 * Prepends CSS properties to the style attribute, creating the
+	 * attribute if it doesn't exist.
+	 * @warning Copied over from AttrTransform, be sure to keep in sync
+	 * @param $attr Attribute array to process (passed by reference)
+	 * @param $css CSS to prepend
+	 */
+	protected function prependCSS(&$attr, $css) {
+		$attr['style'] = isset($attr['style']) ? $attr['style'] : '';
+		$attr['style'] = $css . $attr['style'];
+	}
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
      */
     public function prependCSS(&$attr, $css) {
         $attr['style'] = isset($attr['style']) ? $attr['style'] : '';
-        $attr['style'] = $css . $attr['style'];
+        $attr['style'] = $css.$attr['style'];
     }
 
     /**

classes/security/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php

Indentation +64 added lines, -64 removed lines

@@ -18,81 +18,81 @@
 class HTMLPurifier_TagTransform_Font extends HTMLPurifier_TagTransform
 {
 
-    public $transform_to = 'span';
+	public $transform_to = 'span';
 
-    protected $_size_lookup = array(
-        '0' => 'xx-small',
-        '1' => 'xx-small',
-        '2' => 'small',
-        '3' => 'medium',
-        '4' => 'large',
-        '5' => 'x-large',
-        '6' => 'xx-large',
-        '7' => '300%',
-        '-1' => 'smaller',
-        '-2' => '60%',
-        '+1' => 'larger',
-        '+2' => '150%',
-        '+3' => '200%',
-        '+4' => '300%'
-    );
+	protected $_size_lookup = array(
+		'0' => 'xx-small',
+		'1' => 'xx-small',
+		'2' => 'small',
+		'3' => 'medium',
+		'4' => 'large',
+		'5' => 'x-large',
+		'6' => 'xx-large',
+		'7' => '300%',
+		'-1' => 'smaller',
+		'-2' => '60%',
+		'+1' => 'larger',
+		'+2' => '150%',
+		'+3' => '200%',
+		'+4' => '300%'
+	);
 
-    public function transform($tag, $config, $context) {
+	public function transform($tag, $config, $context) {
 
-        if ($tag instanceof HTMLPurifier_Token_End) {
-            $new_tag = clone $tag;
-            $new_tag->name = $this->transform_to;
-            return $new_tag;
-        }
+		if ($tag instanceof HTMLPurifier_Token_End) {
+			$new_tag = clone $tag;
+			$new_tag->name = $this->transform_to;
+			return $new_tag;
+		}
 
-        $attr = $tag->attr;
-        $prepend_style = '';
+		$attr = $tag->attr;
+		$prepend_style = '';
 
-        // handle color transform
-        if (isset($attr['color'])) {
-            $prepend_style .= 'color:' . $attr['color'] . ';';
-            unset($attr['color']);
-        }
+		// handle color transform
+		if (isset($attr['color'])) {
+			$prepend_style .= 'color:' . $attr['color'] . ';';
+			unset($attr['color']);
+		}
 
-        // handle face transform
-        if (isset($attr['face'])) {
-            $prepend_style .= 'font-family:' . $attr['face'] . ';';
-            unset($attr['face']);
-        }
+		// handle face transform
+		if (isset($attr['face'])) {
+			$prepend_style .= 'font-family:' . $attr['face'] . ';';
+			unset($attr['face']);
+		}
 
-        // handle size transform
-        if (isset($attr['size'])) {
-            // normalize large numbers
-            if ($attr['size'] !== '') {
-                if ($attr['size']{0} == '+' || $attr['size']{0} == '-') {
-                    $size = (int) $attr['size'];
-                    if ($size < -2) $attr['size'] = '-2';
-                    if ($size > 4)  $attr['size'] = '+4';
-                } else {
-                    $size = (int) $attr['size'];
-                    if ($size > 7) $attr['size'] = '7';
-                }
-            }
-            if (isset($this->_size_lookup[$attr['size']])) {
-                $prepend_style .= 'font-size:' .
-                  $this->_size_lookup[$attr['size']] . ';';
-            }
-            unset($attr['size']);
-        }
+		// handle size transform
+		if (isset($attr['size'])) {
+			// normalize large numbers
+			if ($attr['size'] !== '') {
+				if ($attr['size']{0} == '+' || $attr['size']{0} == '-') {
+					$size = (int) $attr['size'];
+					if ($size < -2) $attr['size'] = '-2';
+					if ($size > 4)  $attr['size'] = '+4';
+				} else {
+					$size = (int) $attr['size'];
+					if ($size > 7) $attr['size'] = '7';
+				}
+			}
+			if (isset($this->_size_lookup[$attr['size']])) {
+				$prepend_style .= 'font-size:' .
+				  $this->_size_lookup[$attr['size']] . ';';
+			}
+			unset($attr['size']);
+		}
 
-        if ($prepend_style) {
-            $attr['style'] = isset($attr['style']) ?
-                $prepend_style . $attr['style'] :
-                $prepend_style;
-        }
+		if ($prepend_style) {
+			$attr['style'] = isset($attr['style']) ?
+				$prepend_style . $attr['style'] :
+				$prepend_style;
+		}
 
-        $new_tag = clone $tag;
-        $new_tag->name = $this->transform_to;
-        $new_tag->attr = $attr;
+		$new_tag = clone $tag;
+		$new_tag->name = $this->transform_to;
+		$new_tag->attr = $attr;
 
-        return $new_tag;
+		return $new_tag;
 
-    }
+	}
 }
 
 // vim: et sw=4 sts=4

Braces +9 added lines, -3 removed lines

@@ -66,11 +66,17 @@
             if ($attr['size'] !== '') {
                 if ($attr['size']{0} == '+' || $attr['size']{0} == '-') {
                     $size = (int) $attr['size'];
-                    if ($size < -2) $attr['size'] = '-2';
-                    if ($size > 4)  $attr['size'] = '+4';
+                    if ($size < -2) {
+                    	$attr['size'] = '-2';
+                    }
+                    if ($size > 4) {
+                    	$attr['size'] = '+4';
+                    }
                 } else {
                     $size = (int) $attr['size'];
-                    if ($size > 7) $attr['size'] = '7';
+                    if ($size > 7) {
+                    	$attr['size'] = '7';
+                    }
                 }
             }
             if (isset($this->_size_lookup[$attr['size']])) {

Spacing +5 added lines, -6 removed lines

@@ -50,13 +50,13 @@ 
 
         // handle color transform
         if (isset($attr['color'])) {
-            $prepend_style .= 'color:' . $attr['color'] . ';';
+            $prepend_style .= 'color:'.$attr['color'].';';
             unset($attr['color']);
         }
 
         // handle face transform
         if (isset($attr['face'])) {
-            $prepend_style .= 'font-family:' . $attr['face'] . ';';
+            $prepend_style .= 'font-family:'.$attr['face'].';';
             unset($attr['face']);
         }
 
@@ -74,16 +74,15 @@ 
                 }
             }
             if (isset($this->_size_lookup[$attr['size']])) {
-                $prepend_style .= 'font-size:' .
-                  $this->_size_lookup[$attr['size']] . ';';
+                $prepend_style .= 'font-size:'.
+                  $this->_size_lookup[$attr['size']].';';
             }
             unset($attr['size']);
         }
 
         if ($prepend_style) {
             $attr['style'] = isset($attr['style']) ?
-                $prepend_style . $attr['style'] :
-                $prepend_style;
+                $prepend_style.$attr['style'] : $prepend_style;
         }
 
         $new_tag = clone $tag;

classes/security/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php

Indentation +19 added lines, -19 removed lines

@@ -8,27 +8,27 @@
 class HTMLPurifier_TagTransform_Simple extends HTMLPurifier_TagTransform
 {
 
-    protected $style;
+	protected $style;
 
-    /**
-     * @param $transform_to Tag name to transform to.
-     * @param $style CSS style to add to the tag
-     */
-    public function __construct($transform_to, $style = null) {
-        $this->transform_to = $transform_to;
-        $this->style = $style;
-    }
+	/**
+	 * @param $transform_to Tag name to transform to.
+	 * @param $style CSS style to add to the tag
+	 */
+	public function __construct($transform_to, $style = null) {
+		$this->transform_to = $transform_to;
+		$this->style = $style;
+	}
 
-    public function transform($tag, $config, $context) {
-        $new_tag = clone $tag;
-        $new_tag->name = $this->transform_to;
-        if (!is_null($this->style) &&
-            ($new_tag instanceof HTMLPurifier_Token_Start || $new_tag instanceof HTMLPurifier_Token_Empty)
-        ) {
-            $this->prependCSS($new_tag->attr, $this->style);
-        }
-        return $new_tag;
-    }
+	public function transform($tag, $config, $context) {
+		$new_tag = clone $tag;
+		$new_tag->name = $this->transform_to;
+		if (!is_null($this->style) &&
+			($new_tag instanceof HTMLPurifier_Token_Start || $new_tag instanceof HTMLPurifier_Token_Empty)
+		) {
+			$this->prependCSS($new_tag->attr, $this->style);
+		}
+		return $new_tag;
+	}
 
 }
 

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

Indentation +47 added lines, -47 removed lines

@@ -4,53 +4,53 @@
  * Abstract base token class that all others inherit from.
  */
 class HTMLPurifier_Token {
-    public $line; /**< Line number node was on in source document. Null if unknown. */
-    public $col;  /**< Column of line node was on in source document. Null if unknown. */
-
-    /**
-     * Lookup array of processing that this token is exempt from.
-     * Currently, valid values are "ValidateAttributes" and
-     * "MakeWellFormed_TagClosedError"
-     */
-    public $armor = array();
-
-    /**
-     * Used during MakeWellFormed.
-     */
-    public $skip;
-    public $rewind;
-    public $carryover;
-
-    public function __get($n) {
-      if ($n === 'type') {
-        trigger_error('Deprecated type property called; use instanceof', E_USER_NOTICE);
-        switch (get_class($this)) {
-          case 'HTMLPurifier_Token_Start':      return 'start';
-          case 'HTMLPurifier_Token_Empty':      return 'empty';
-          case 'HTMLPurifier_Token_End':        return 'end';
-          case 'HTMLPurifier_Token_Text':       return 'text';
-          case 'HTMLPurifier_Token_Comment':    return 'comment';
-          default: return null;
-        }
-      }
-    }
-
-    /**
-     * Sets the position of the token in the source document.
-     */
-    public function position($l = null, $c = null) {
-        $this->line = $l;
-        $this->col  = $c;
-    }
-
-    /**
-     * Convenience function for DirectLex settings line/col position.
-     */
-    public function rawPosition($l, $c) {
-        if ($c === -1) $l++;
-        $this->line = $l;
-        $this->col  = $c;
-    }
+	public $line; /**< Line number node was on in source document. Null if unknown. */
+	public $col;  /**< Column of line node was on in source document. Null if unknown. */
+
+	/**
+	 * Lookup array of processing that this token is exempt from.
+	 * Currently, valid values are "ValidateAttributes" and
+	 * "MakeWellFormed_TagClosedError"
+	 */
+	public $armor = array();
+
+	/**
+	 * Used during MakeWellFormed.
+	 */
+	public $skip;
+	public $rewind;
+	public $carryover;
+
+	public function __get($n) {
+	  if ($n === 'type') {
+		trigger_error('Deprecated type property called; use instanceof', E_USER_NOTICE);
+		switch (get_class($this)) {
+		  case 'HTMLPurifier_Token_Start':      return 'start';
+		  case 'HTMLPurifier_Token_Empty':      return 'empty';
+		  case 'HTMLPurifier_Token_End':        return 'end';
+		  case 'HTMLPurifier_Token_Text':       return 'text';
+		  case 'HTMLPurifier_Token_Comment':    return 'comment';
+		  default: return null;
+		}
+	  }
+	}
+
+	/**
+	 * Sets the position of the token in the source document.
+	 */
+	public function position($l = null, $c = null) {
+		$this->line = $l;
+		$this->col  = $c;
+	}
+
+	/**
+	 * Convenience function for DirectLex settings line/col position.
+	 */
+	public function rawPosition($l, $c) {
+		if ($c === -1) $l++;
+		$this->line = $l;
+		$this->col  = $c;
+	}
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  */
 class HTMLPurifier_Token {
     public $line; /**< Line number node was on in source document. Null if unknown. */
-    public $col;  /**< Column of line node was on in source document. Null if unknown. */
+    public $col; /**< Column of line node was on in source document. Null if unknown. */
 
     /**
      * Lookup array of processing that this token is exempt from.

Braces +3 added lines, -1 removed lines

@@ -47,7 +47,9 @@
      * Convenience function for DirectLex settings line/col position.
      */
     public function rawPosition($l, $c) {
-        if ($c === -1) $l++;
+        if ($c === -1) {
+        	$l++;
+        }
         $this->line = $l;
         $this->col  = $c;
     }

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

Indentation +12 added lines, -12 removed lines

@@ -5,18 +5,18 @@
  */
 class HTMLPurifier_Token_Comment extends HTMLPurifier_Token
 {
-    public $data; /**< Character data within comment. */
-    public $is_whitespace = true;
-    /**
-     * Transparent constructor.
-     *
-     * @param $data String comment data.
-     */
-    public function __construct($data, $line = null, $col = null) {
-        $this->data = $data;
-        $this->line = $line;
-        $this->col  = $col;
-    }
+	public $data; /**< Character data within comment. */
+	public $is_whitespace = true;
+	/**
+	 * Transparent constructor.
+	 *
+	 * @param $data String comment data.
+	 */
+	public function __construct($data, $line = null, $col = null) {
+		$this->data = $data;
+		$this->line = $line;
+		$this->col  = $col;
+	}
 }
 
 // vim: et sw=4 sts=4