From de6e0244640fa796f392474a9c387a617bf0171a Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Sun, 10 Feb 2008 22:47:08 +0000 Subject: [PATCH] Regenerate HTMLPurifier.includes.php, and fix parse errors. git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1545 48356398-32a2-884e-a903-53898d9a118a --- library/HTMLPurifier.includes.php | 6 ++++++ library/HTMLPurifier/Token/Empty.php | 5 ++++- library/HTMLPurifier/Token/End.php | 5 ++++- library/HTMLPurifier/Token/Start.php | 5 ++++- library/HTMLPurifier/Token/Tag.php | 2 +- maintenance/generate-includes.php | 4 ++++ 6 files changed, 23 insertions(+), 4 deletions(-) diff --git a/library/HTMLPurifier.includes.php b/library/HTMLPurifier.includes.php index 733c16a6..b03cf153 100644 --- a/library/HTMLPurifier.includes.php +++ b/library/HTMLPurifier.includes.php @@ -167,6 +167,12 @@ require 'HTMLPurifier/Strategy/RemoveForeignElements.php'; require 'HTMLPurifier/Strategy/ValidateAttributes.php'; require 'HTMLPurifier/TagTransform/Font.php'; require 'HTMLPurifier/TagTransform/Simple.php'; +require 'HTMLPurifier/Token/Comment.php'; +require 'HTMLPurifier/Token/Tag.php'; +require 'HTMLPurifier/Token/Empty.php'; +require 'HTMLPurifier/Token/End.php'; +require 'HTMLPurifier/Token/Start.php'; +require 'HTMLPurifier/Token/Text.php'; require 'HTMLPurifier/URIFilter/DisableExternal.php'; require 'HTMLPurifier/URIFilter/DisableExternalResources.php'; require 'HTMLPurifier/URIFilter/HostBlacklist.php'; diff --git a/library/HTMLPurifier/Token/Empty.php b/library/HTMLPurifier/Token/Empty.php index 772015da..0623f7ac 100644 --- a/library/HTMLPurifier/Token/Empty.php +++ b/library/HTMLPurifier/Token/Empty.php @@ -3,4 +3,7 @@ /** * Concrete empty token class. */ -class HTMLPurifier_Token_Empty extends HTMLPurifier_Token_Tag {} +class HTMLPurifier_Token_Empty extends HTMLPurifier_Token_Tag +{ + +} diff --git a/library/HTMLPurifier/Token/End.php b/library/HTMLPurifier/Token/End.php index aa63de6c..fbf45e81 100644 --- a/library/HTMLPurifier/Token/End.php +++ b/library/HTMLPurifier/Token/End.php @@ -7,4 +7,7 @@ * is for optimization reasons, as under normal circumstances, the Lexers * do not pass attributes. */ -class HTMLPurifier_Token_End extends HTMLPurifier_Token_Tag {} +class HTMLPurifier_Token_End extends HTMLPurifier_Token_Tag +{ + +} diff --git a/library/HTMLPurifier/Token/Start.php b/library/HTMLPurifier/Token/Start.php index 56cb3fba..18d5acb9 100644 --- a/library/HTMLPurifier/Token/Start.php +++ b/library/HTMLPurifier/Token/Start.php @@ -3,4 +3,7 @@ /** * Concrete start token class. */ -class HTMLPurifier_Token_Start extends HTMLPurifier_Token_Tag {} +class HTMLPurifier_Token_Start extends HTMLPurifier_Token_Tag +{ + +} diff --git a/library/HTMLPurifier/Token/Tag.php b/library/HTMLPurifier/Token/Tag.php index a4cf371c..43748f70 100644 --- a/library/HTMLPurifier/Token/Tag.php +++ b/library/HTMLPurifier/Token/Tag.php @@ -3,7 +3,7 @@ /** * Abstract class of a tag token (start, end or empty), and its behavior. */ -class HTMLPurifier_Token_Tag extends HTMLPurifier_Token // abstract +class HTMLPurifier_Token_Tag extends HTMLPurifier_Token { /** * Static bool marker that indicates the class is a tag. diff --git a/maintenance/generate-includes.php b/maintenance/generate-includes.php index 5e5e49c8..2e0a2ae6 100644 --- a/maintenance/generate-includes.php +++ b/maintenance/generate-includes.php @@ -59,6 +59,10 @@ foreach ($raw_files as $file) { function get_dependency_lookup($file) { static $cache = array(); if (isset($cache[$file])) return $cache[$file]; + if (!file_exists($file)) { + echo "File doesn't exist: $file\n"; + return array(); + } $fh = fopen($file, 'r'); $deps = array(); while (!feof($fh)) {