From 41c9226f3dbe763ffc25e1659f694f55b0d1b7a3 Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Thu, 9 Apr 2009 12:47:10 -0400 Subject: [PATCH] Style refresh: add/remove vimlines, fix minor factual errors. Signed-off-by: Edward Z. Yang --- benchmarks/samples/Lexer/1.html | 3 ++- benchmarks/samples/Lexer/2.html | 3 ++- benchmarks/samples/Lexer/3.html | 3 ++- benchmarks/samples/Lexer/4.html | 3 ++- configdoc/styles/plain.xsl | 3 ++- configdoc/types.xml | 3 ++- docs/dev-advanced-api.html | 3 ++- docs/dev-config-bcbreaks.txt | 4 ++-- docs/dev-config-schema.html | 3 ++- docs/dev-flush.html | 3 ++- docs/dev-naming.html | 3 ++- docs/dev-optimization.html | 3 ++- docs/dev-progress.html | 3 ++- docs/enduser-customize.html | 3 ++- docs/enduser-id.html | 3 ++- docs/enduser-slow.html | 3 ++- docs/enduser-tidy.html | 3 ++- docs/enduser-uri-filter.html | 24 ++++++---------------- docs/enduser-utf8.html | 3 ++- docs/enduser-youtube.html | 3 ++- docs/fixquotes.htc | 3 ++- docs/index.html | 9 +++++++- docs/proposal-colors.html | 3 ++- docs/proposal-plists.txt | 1 + docs/ref-devnetwork.html | 3 ++- docs/specimens/html-align-to-css.html | 2 -- docs/specimens/jochem-blok-word.html | 2 -- docs/specimens/windows-live-mail-desktop-beta.html | 2 -- maintenance/add-vimline.php | 4 +++- maintenance/update-config.php | 2 +- smoketests/attrTransform.xml | 3 ++- smoketests/basic/allElements.html | 3 ++- smoketests/basic/legacy.html | 3 ++- smoketests/xssAttacks.xml | 2 -- tests/HTMLPurifier/HTMLModule/NameTest.php | 2 ++ .../HTMLT/trusted-comments-required.htmlt | 1 + .../HTMLT/trusted-comments-table.htmlt | 1 + tests/HTMLPurifier/HTMLT/trusted-comments.htmlt | 1 + 38 files changed, 74 insertions(+), 55 deletions(-) diff --git a/benchmarks/samples/Lexer/1.html b/benchmarks/samples/Lexer/1.html index 3405bd44..45cf907b 100644 --- a/benchmarks/samples/Lexer/1.html +++ b/benchmarks/samples/Lexer/1.html @@ -52,4 +52,5 @@ - + diff --git a/benchmarks/samples/Lexer/2.html b/benchmarks/samples/Lexer/2.html index 8a97025d..a5644576 100644 --- a/benchmarks/samples/Lexer/2.html +++ b/benchmarks/samples/Lexer/2.html @@ -16,4 +16,5 @@ function qs(el) {if (window.RegExp && window.encodeURIComponent) {var ue=el.href // -->
Web    Images    Groups    News    Froogle    Local    more »
 
  Advanced Search
  Preferences
  Language Tools


Advertising Programs - Business Solutions - About Google

©2006 Google

- + diff --git a/benchmarks/samples/Lexer/3.html b/benchmarks/samples/Lexer/3.html index 8d22105e..9e9f1a36 100644 --- a/benchmarks/samples/Lexer/3.html +++ b/benchmarks/samples/Lexer/3.html @@ -127,4 +127,5 @@ if (objAdMgr.isSlotAvailable("leaderboard")) { - + diff --git a/benchmarks/samples/Lexer/4.html b/benchmarks/samples/Lexer/4.html index 93593805..27cea255 100644 --- a/benchmarks/samples/Lexer/4.html +++ b/benchmarks/samples/Lexer/4.html @@ -539,4 +539,5 @@ Retrieved from "http://en.w - + diff --git a/configdoc/styles/plain.xsl b/configdoc/styles/plain.xsl index cae76dfd..07fb5fcd 100644 --- a/configdoc/styles/plain.xsl +++ b/configdoc/styles/plain.xsl @@ -232,4 +232,5 @@ - + diff --git a/configdoc/types.xml b/configdoc/types.xml index 24f8a05f..3e3ee388 100644 --- a/configdoc/types.xml +++ b/configdoc/types.xml @@ -13,4 +13,5 @@ Mixed - + diff --git a/docs/dev-advanced-api.html b/docs/dev-advanced-api.html index 25302a4c..0233a56d 100644 --- a/docs/dev-advanced-api.html +++ b/docs/dev-advanced-api.html @@ -215,4 +215,5 @@ the usual things required are:

- + diff --git a/docs/dev-config-bcbreaks.txt b/docs/dev-config-bcbreaks.txt index a548b120..29a58ca2 100644 --- a/docs/dev-config-bcbreaks.txt +++ b/docs/dev-config-bcbreaks.txt @@ -1,7 +1,7 @@ Configuration Backwards-Compatibility Breaks -In version 3.3.0, the configuration subsystem (composed of the outwards +In version 4.0.0, the configuration subsystem (composed of the outwards facing Config class, as well as the ConfigSchema and ConfigSchema_Interchange subsystems), was significantly revamped to make use of property lists. While most of the changes are internal, some internal APIs were changed for the @@ -76,4 +76,4 @@ Any method that took $namespace, $directive now takes $key. Removed. - + vim: et sw=4 sts=4 diff --git a/docs/dev-config-schema.html b/docs/dev-config-schema.html index 75a164d2..8b816b53 100644 --- a/docs/dev-config-schema.html +++ b/docs/dev-config-schema.html @@ -373,4 +373,5 @@ Test.Example - + diff --git a/docs/dev-flush.html b/docs/dev-flush.html index 8dd291b1..4a3a7835 100644 --- a/docs/dev-flush.html +++ b/docs/dev-flush.html @@ -64,4 +64,5 @@ - + diff --git a/docs/dev-naming.html b/docs/dev-naming.html index 44b1bac5..cea4b006 100644 --- a/docs/dev-naming.html +++ b/docs/dev-naming.html @@ -79,4 +79,5 @@ help you find the correct functionality more quickly. Here they are:

- + diff --git a/docs/dev-optimization.html b/docs/dev-optimization.html index ba677da0..78f56581 100644 --- a/docs/dev-optimization.html +++ b/docs/dev-optimization.html @@ -29,4 +29,5 @@ that itch, put it here!

- + diff --git a/docs/dev-progress.html b/docs/dev-progress.html index 03a35232..714665b1 100644 --- a/docs/dev-progress.html +++ b/docs/dev-progress.html @@ -305,4 +305,5 @@ Mozilla on inside and needs -moz-outline, no IE support. - + diff --git a/docs/enduser-customize.html b/docs/enduser-customize.html index 10132d1e..3562b4bb 100644 --- a/docs/enduser-customize.html +++ b/docs/enduser-customize.html @@ -795,4 +795,5 @@ $form->excludes = array('form' => true); - + diff --git a/docs/enduser-id.html b/docs/enduser-id.html index 76e85c08..808e2129 100644 --- a/docs/enduser-id.html +++ b/docs/enduser-id.html @@ -144,4 +144,5 @@ anchors is beyond me.

- + diff --git a/docs/enduser-slow.html b/docs/enduser-slow.html index ea2d9a01..f0ea02de 100644 --- a/docs/enduser-slow.html +++ b/docs/enduser-slow.html @@ -116,4 +116,5 @@ if you decide to do that! Especially if you port HTML Purifier to C++. - + diff --git a/docs/enduser-tidy.html b/docs/enduser-tidy.html index 0d7fad18..1721c717 100644 --- a/docs/enduser-tidy.html +++ b/docs/enduser-tidy.html @@ -227,4 +227,5 @@ effectively in the background.

- + diff --git a/docs/enduser-uri-filter.html b/docs/enduser-uri-filter.html index 18d69936..d1b3354a 100644 --- a/docs/enduser-uri-filter.html +++ b/docs/enduser-uri-filter.html @@ -160,27 +160,14 @@ 

$uri = $config->getDefinition('URI');
-$uri->addFilter(new HTMLPurifier_URIFilter_NameOfFilter());
+$uri->addFilter(new HTMLPurifier_URIFilter_NameOfFilter(), $config);

- If you want to be really fancy, you can define a configuration directive - for your filter and have HTML Purifier automatically manage whether or - not your filter gets loaded or not (this is how internal filters manage - things): + After adding a filter, you won't be able to set configuration directives. + Structure your code accordingly.

-
HTMLPurifier_ConfigSchema::define(
-    'URI', 'NameOfFilter', false, 'bool',
-    'What your filter does.'
-);
-$uri = $config->getDefinition('URI', true);
-$uri->registerFilter(new HTMLPurifier_URIFilter_NameOfFilter());
-
- -

- Now, your filter will only be called when %URI.NameOfFilter - is set to true. -

+

Post-filter

@@ -213,4 +200,5 @@ $uri->registerFilter(new HTMLPurifier_URIFilter_NameOfFilter()) - + diff --git a/docs/enduser-utf8.html b/docs/enduser-utf8.html index 42773611..d20b3c7a 100644 --- a/docs/enduser-utf8.html +++ b/docs/enduser-utf8.html @@ -1056,4 +1056,5 @@ a more in-depth look into character sets and encodings.

- + diff --git a/docs/enduser-youtube.html b/docs/enduser-youtube.html index 367e62cb..aaf8bdbc 100644 --- a/docs/enduser-youtube.html +++ b/docs/enduser-youtube.html @@ -149,4 +149,5 @@ with the core!

- + diff --git a/docs/fixquotes.htc b/docs/fixquotes.htc index 0477071a..80dda2dc 100644 --- a/docs/fixquotes.htc +++ b/docs/fixquotes.htc @@ -5,4 +5,5 @@ function init() { } - + diff --git a/docs/index.html b/docs/index.html index 029c003b..3c4ecc71 100644 --- a/docs/index.html +++ b/docs/index.html @@ -119,6 +119,12 @@ the code. They may be upgraded to HTML files or stay as TXT scratchpads.

Development + Config BC Breaks + Backwards-incompatible changes in HTML Purifier 4.0.0 + + + + Development Code Quality Issues Enumerates code quality issues and places that need to be refactored. @@ -178,4 +184,5 @@ the code. They may be upgraded to HTML files or stay as TXT scratchpads.

- + diff --git a/docs/proposal-colors.html b/docs/proposal-colors.html index f45ebc86..65763388 100644 --- a/docs/proposal-colors.html +++ b/docs/proposal-colors.html @@ -45,4 +45,5 @@ something like that? - + diff --git a/docs/proposal-plists.txt b/docs/proposal-plists.txt index dcffd57d..eef8ade6 100644 --- a/docs/proposal-plists.txt +++ b/docs/proposal-plists.txt @@ -215,3 +215,4 @@ this is to squash all of the parents. But I don't need iteration. + vim: et sw=4 sts=4 diff --git a/docs/ref-devnetwork.html b/docs/ref-devnetwork.html index b3f38796..2e9d142e 100644 --- a/docs/ref-devnetwork.html +++ b/docs/ref-devnetwork.html @@ -43,4 +43,5 @@ the development of this library in these forum threads:

- + diff --git a/docs/specimens/html-align-to-css.html b/docs/specimens/html-align-to-css.html index f912d305..0adf76aa 100644 --- a/docs/specimens/html-align-to-css.html +++ b/docs/specimens/html-align-to-css.html @@ -163,5 +163,3 @@ div.segment {width:250px; float:left; margin-top:1em;} - - diff --git a/docs/specimens/jochem-blok-word.html b/docs/specimens/jochem-blok-word.html index beb86a8a..1cc08f88 100644 --- a/docs/specimens/jochem-blok-word.html +++ b/docs/specimens/jochem-blok-word.html @@ -127,5 +127,3 @@ style='color:black'>www.example.com/disclaimer

- - diff --git a/docs/specimens/windows-live-mail-desktop-beta.html b/docs/specimens/windows-live-mail-desktop-beta.html index f2d0620f..735b4bd9 100644 --- a/docs/specimens/windows-live-mail-desktop-beta.html +++ b/docs/specimens/windows-live-mail-desktop-beta.html @@ -72,5 +72,3 @@ title="Join Windows Live to share photos using Windows Live Photo E-mail.">Onlin pictures are available for 30 days. Get Windows Live Mail desktop to create your own photo e-mails. - - diff --git a/maintenance/add-vimline.php b/maintenance/add-vimline.php index 4b4cde58..34a177f2 100644 --- a/maintenance/add-vimline.php +++ b/maintenance/add-vimline.php @@ -21,6 +21,7 @@ foreach ($files as $file) { !is_file($file) || prefix_is('./docs/doxygen', $file) || prefix_is('./library/standalone', $file) || + prefix_is('./docs/specimens', $file) || postfix_is('.ser', $file) || postfix_is('.tgz', $file) || postfix_is('.patch', $file) || @@ -38,6 +39,7 @@ foreach ($files as $file) { postfix_is('configdoc/usage.xml', $file) || postfix_is('library/HTMLPurifier.includes.php', $file) || postfix_is('library/HTMLPurifier.safe-includes.php', $file) || + postfix_is('smoketests/xssAttacks.xml', $file) || // phpt files postfix_is('.diff', $file) || postfix_is('.exp', $file) || @@ -71,7 +73,7 @@ foreach ($files as $file) { case '.xsl': case '.xml': case '.htc': - $line = ''; + $line = ""; break; case '.htmlt': $no_nl = true; diff --git a/maintenance/update-config.php b/maintenance/update-config.php index 23e10d05..2d8a7a9c 100644 --- a/maintenance/update-config.php +++ b/maintenance/update-config.php @@ -31,4 +31,4 @@ foreach ($raw_files as $file) { file_put_contents($file, $contents); } - +// vim: et sw=4 sts=4 diff --git a/smoketests/attrTransform.xml b/smoketests/attrTransform.xml index 842a4824..8272f4ac 100644 --- a/smoketests/attrTransform.xml +++ b/smoketests/attrTransform.xml @@ -188,4 +188,5 @@ --> - + diff --git a/smoketests/basic/allElements.html b/smoketests/basic/allElements.html index d00a83a1..994c8df4 100644 --- a/smoketests/basic/allElements.html +++ b/smoketests/basic/allElements.html @@ -78,4 +78,5 @@ otherwise there will be problems.

- + diff --git a/smoketests/basic/legacy.html b/smoketests/basic/legacy.html index c4d59fe0..0ff1c7b5 100644 --- a/smoketests/basic/legacy.html +++ b/smoketests/basic/legacy.html @@ -123,4 +123,5 @@ hr@size - + diff --git a/smoketests/xssAttacks.xml b/smoketests/xssAttacks.xml index ad29de37..df741b6d 100644 --- a/smoketests/xssAttacks.xml +++ b/smoketests/xssAttacks.xml @@ -1305,5 +1305,3 @@ JavaScript link location - - diff --git a/tests/HTMLPurifier/HTMLModule/NameTest.php b/tests/HTMLPurifier/HTMLModule/NameTest.php index 55180b2e..9152710b 100644 --- a/tests/HTMLPurifier/HTMLModule/NameTest.php +++ b/tests/HTMLPurifier/HTMLModule/NameTest.php @@ -28,3 +28,5 @@ class HTMLPurifier_HTMLModule_NameTest extends HTMLPurifier_HTMLModuleHarness } } + +// vim: et sw=4 sts=4 diff --git a/tests/HTMLPurifier/HTMLT/trusted-comments-required.htmlt b/tests/HTMLPurifier/HTMLT/trusted-comments-required.htmlt index 2ce367bf..62dc159d 100644 --- a/tests/HTMLPurifier/HTMLT/trusted-comments-required.htmlt +++ b/tests/HTMLPurifier/HTMLT/trusted-comments-required.htmlt @@ -3,3 +3,4 @@ HTML.Trusted = true --HTML-- --EXPECT-- +--# vim: et sw=4 sts=4 diff --git a/tests/HTMLPurifier/HTMLT/trusted-comments-table.htmlt b/tests/HTMLPurifier/HTMLT/trusted-comments-table.htmlt index 085a0d02..89d80feb 100644 --- a/tests/HTMLPurifier/HTMLT/trusted-comments-table.htmlt +++ b/tests/HTMLPurifier/HTMLT/trusted-comments-table.htmlt @@ -2,3 +2,4 @@ HTML.Trusted = true --HTML--
Foo
+--# vim: et sw=4 sts=4 diff --git a/tests/HTMLPurifier/HTMLT/trusted-comments.htmlt b/tests/HTMLPurifier/HTMLT/trusted-comments.htmlt index 8b565774..93b4a35a 100644 --- a/tests/HTMLPurifier/HTMLT/trusted-comments.htmlt +++ b/tests/HTMLPurifier/HTMLT/trusted-comments.htmlt @@ -2,3 +2,4 @@ HTML.Trusted = true --HTML-- +--# vim: et sw=4 sts=4 -- 2.11.4.GIT