Remove trailing ?> in PHP library files, add trailing newlines to all other files.

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1253 48356398-32a2-884e-a903-53898d9a118a

INSTALL

@@ -48,7 +48,7 @@ be standards compliant.  HTML Purifier can deal with these doctypes:
 * XHTML 1.0 Strict
 * HTML 4.01 Transitional
 * HTML 4.01 Strict
-* XHTML 1.1 sans Ruby
+* XHTML 1.1 (sans Ruby)
 
 ...and these character encodings:
 
@@ -112,8 +112,9 @@ websites):
 Note that HTML Purifier's support for non-Unicode encodings is crippled by the
 fact that any character not supported by that encoding will be silently
 dropped, EVEN if it is ampersand escaped.  If you want to work around
-this, you are welcome to read docs/enduser-utf8.html for a workaround,
+this, you are welcome to read docs/enduser-utf8.html for a fix,
-but please be cognizant of the issues the "solution" creates.
+but please be cognizant of the issues the "solution" creates (for this
+reason, I do not include the solution in this document).
 
 
 
@@ -139,7 +140,9 @@ Other supported doctypes include:
 There are more configuration directives which can be read about
 here: <http://htmlpurifier.org/live/configdoc/plain.html>  They're a bit boring,
 but they can help out for those of you who like to exert maximum control over
-your code.
+your code.  Some of the more interesting ones are configurable at the
+demo <http://htmlpurifier.org/demo.php> and are well worth looking into
+for your own system.
 
 
 
@@ -156,13 +159,15 @@ The interface is mind-numbingly simple:
     $clean_html = $purifier->purify( $dirty_html );
 
 That's it!  For more examples, check out docs/examples/ (they aren't very
-different though).  Also, SLOW gives advice on what to do if HTML Purifier
+different though).  Also, docs/enduser-slow.html gives advice on what to
-is slowing down your application.
+do if HTML Purifier is slowing down your application.
 
 
 
 6.   Quick install
 
+First, make sure library/HTMLPurifier/DefinitionCache/Serializer is
+writable by the webserver (see Section 7: Caching below for details).
 If your website is in UTF-8 and XHTML Transitional, use this code:
 
 <?php
@@ -189,6 +194,37 @@ If your website is in a different encoding or doctype, use this code:
 
 7. Caching
 
-HTML Purifier generates some cache files to speed up its execution. For
+HTML Purifier generates some cache files (generally one or two) to speed up
-maximum performance, make sure that library/HTMLPurifier/DefinitionCache/Serializer
+its execution. For maximum performance, make sure that
-is writeable by the webserver.
+library/HTMLPurifier/DefinitionCache/Serializer is writeable by the webserver.
+
+If you are in the library/ folder of HTML Purifier, you can set the
+appropriate permissions using:
+
+    chmod -R 0755 HTMLPurifier/DefinitionCache/Serializer
+
+If the above command doesn't work, you may need to assign write permissions
+to all. This may be necessary if your webserver runs as nobody, but is
+not recommended since it means any other user can write files in the
+directory. Use:
+
+    chmod -R 0777 HTMLPurifier/DefinitionCache/Serializer
+
+You can also chmod files via your FTP client; this option
+is usually accessible by right clicking the corresponding directory and
+then selecting "chmod" or "file permissions".
+
+Starting with 2.0.1, HTML Purifier will generate friendly error messages
+that will tell you exactly what you have to chmod the directory to, if in doubt,
+follow its advice.
+
+If you are unable or unwilling to give write permissions to the cache
+directory, you can either disable the cache (and suffer a performance
+hit):
+
+    $config->set('Core', 'DefinitionCache', null);
+
+Or move the cache directory somewhere else (no trailing slash):
+
+    $config->set('Cache', 'SerializerPath', '/home/user/absolute/path');
+

benchmarks/Lexer.php

@@ -165,4 +165,4 @@ echo '<div>Random input was: ' .
 ?>
 
 
-</body></html>
+</body></html>

benchmarks/ProfileDirectLex.php

@@ -15,5 +15,3 @@ $context = new HTMLPurifier_Context();
 for ($i = 0; $i < 10; $i++) {
     $tokens = $lexer->tokenizeHTML($input, $config, $context);
 }
-
-?>

configdoc/generate.php

@@ -41,4 +41,3 @@ if (php_sapi_name() != 'cli') {
     echo 'Files generated successfully.';
 }
 
-?>

configdoc/library/ConfigDoc.auto.php

@@ -7,4 +7,3 @@
 set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path() );
 require_once 'ConfigDoc.php';
 
-?>

configdoc/library/ConfigDoc.php

@@ -36,4 +36,3 @@ class ConfigDoc
     
 }
 
-?>

configdoc/library/ConfigDoc/HTMLXSLTProcessor.php

@@ -60,4 +60,3 @@ class ConfigDoc_HTMLXSLTProcessor
     
 }
 
-?>

configdoc/library/ConfigDoc/XMLSerializer.php

@@ -23,4 +23,3 @@ class ConfigDoc_XMLSerializer
     
 }
 
-?>

configdoc/library/ConfigDoc/XMLSerializer/ConfigSchema.php

@@ -121,4 +121,3 @@ class ConfigDoc_XMLSerializer_ConfigSchema extends ConfigDoc_XMLSerializer
     
 }
 
-?>

configdoc/library/ConfigDoc/XMLSerializer/Types.php

@@ -24,4 +24,3 @@ class ConfigDoc_XMLSerializer_Types extends ConfigDoc_XMLSerializer
     
 }
 
-?>

configdoc/styles/plain.xsl

@@ -148,4 +148,4 @@
         </tr>
     </xsl:template>
     
-</xsl:stylesheet>
+</xsl:stylesheet>

docs/dev-advanced-api.html

@@ -210,4 +210,4 @@ the usual things required are:</p>
 
 <div id="version">$Id$</div>
 
-</body></html>
+</body></html>

docs/dev-naming.html

@@ -79,4 +79,4 @@ help you find the correct functionality more quickly.  Here they are:</p>
 
 <div id="version">$Id$</div>
 
-</body></html>
+</body></html>

docs/dev-optimization.html

@@ -30,4 +30,4 @@ that itch, put it here!</p>
 
 <div id="version">$Id$</div>
 
-</body></html>
+</body></html>

docs/dev-progress.html

@@ -299,4 +299,4 @@ Mozilla on inside and needs -moz-outline, no IE support.</td></tr>
 
 <div id="version">$Id$</div>
 
-</body></html>
+</body></html>

docs/enduser-customize.html

@@ -783,4 +783,4 @@ $form->excludes = array('form' => true);</strong></pre>
 
 <div id="version">$Id: enduser-tidy.html 1158 2007-06-18 19:26:29Z Edward $</div>
 
-</body></html>
+</body></html>

docs/enduser-id.html

@@ -144,4 +144,4 @@ anchors is beyond me.</p>
 <div id="version">$Id$</div>
 
 </body>
-</html>
+</html>

docs/enduser-slow.html

@@ -114,4 +114,4 @@ if you decide to do that! Especially if you port HTML Purifier to C++.
 <tt>;-)</tt></p>
 
 </body>
-</html>
+</html>

docs/enduser-tidy.html

@@ -227,4 +227,4 @@ effectively in the background.</p>
 
 <div id="version">$Id$</div>
 
-</body></html>
+</body></html>

docs/enduser-utf8.html

@@ -1043,4 +1043,4 @@ a more in-depth look into character sets and encodings.</p>
 </ul>
 
 </body>
-</html>
+</html>

docs/enduser-youtube.html

@@ -149,4 +149,4 @@ like that, for that matter), send it over and it might get included
 with the core!</p>
 
 </body>
-</html>
+</html>

docs/examples/basic.php

@@ -20,4 +20,3 @@ $pure_html = $purifier->purify($html);
 
 echo '<pre>' . htmlspecialchars($pure_html) . '</pre>';
 
-?>

docs/index.html

@@ -162,4 +162,4 @@ the code. They may be upgraded to HTML files or stay as TXT scratchpads.</p>
 
 <div id="version">$Id$</div>
 </body>
-</html>
+</html>

docs/ref-devnetwork.html

@@ -42,4 +42,4 @@ the development of this library in these forum threads:</p>
 
 <div id="version">$Id$</div>
 </body>
-</html>
+</html>

docs/ref-proprietary-tags.txt

@@ -21,4 +21,4 @@ HTML Purifier context.
 <xmp>, monospace, replace with pre
 
 These should be put into their own Tidy module, not loaded by default(?). These
-all qualify as "lenient" transforms.
+all qualify as "lenient" transforms.

library/HTMLPurifier.auto.php

@@ -7,4 +7,3 @@
 set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path() );
 require_once 'HTMLPurifier.php';
 
-?>

library/HTMLPurifier.func.php

@@ -18,4 +18,3 @@ function HTMLPurifier($html, $config = null) {
     return $purifier->purify($html, $config);
 }
 
-?>

library/HTMLPurifier.php

@@ -213,4 +213,3 @@ class HTMLPurifier
     
 }
 
-?>

library/HTMLPurifier/AttrCollections.php

@@ -127,4 +127,3 @@ class HTMLPurifier_AttrCollections
     
 }
 
-?>

library/HTMLPurifier/AttrDef.php

@@ -84,4 +84,3 @@ class HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/CSS.php

@@ -66,4 +66,3 @@ class HTMLPurifier_AttrDef_CSS extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/CSS/Background.php

@@ -84,4 +84,3 @@ class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php

@@ -127,4 +127,3 @@ class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/CSS/Border.php

@@ -42,4 +42,3 @@ class HTMLPurifier_AttrDef_CSS_Border extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/CSS/Color.php

@@ -98,4 +98,3 @@ class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/CSS/Composite.php

@@ -35,4 +35,3 @@ class HTMLPurifier_AttrDef_CSS_Composite extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/CSS/Font.php

@@ -148,4 +148,3 @@ class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/CSS/FontFamily.php

@@ -59,4 +59,3 @@ class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/CSS/Length.php

@@ -53,4 +53,3 @@ class HTMLPurifier_AttrDef_CSS_Length extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/CSS/ListStyle.php

@@ -77,4 +77,3 @@ class HTMLPurifier_AttrDef_CSS_ListStyle extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/CSS/Multiple.php

@@ -55,4 +55,3 @@ class HTMLPurifier_AttrDef_CSS_Multiple extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/CSS/Number.php

@@ -58,4 +58,3 @@ class HTMLPurifier_AttrDef_CSS_Number extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/CSS/Percentage.php

@@ -40,4 +40,3 @@ class HTMLPurifier_AttrDef_CSS_Percentage extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/CSS/TextDecoration.php

@@ -34,4 +34,3 @@ class HTMLPurifier_AttrDef_CSS_TextDecoration extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/CSS/URI.php

@@ -55,4 +55,3 @@ class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI
     
 }
 
-?>

library/HTMLPurifier/AttrDef/Enum.php

@@ -63,4 +63,3 @@ class HTMLPurifier_AttrDef_Enum extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/HTML/Bool.php

@@ -27,4 +27,3 @@ class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/HTML/Color.php

@@ -32,4 +32,3 @@ class HTMLPurifier_AttrDef_HTML_Color extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/HTML/FrameTarget.php

@@ -31,4 +31,3 @@ class HTMLPurifier_AttrDef_HTML_FrameTarget extends HTMLPurifier_AttrDef_Enum
     
 }
 
-?>

library/HTMLPurifier/AttrDef/HTML/ID.php

@@ -118,4 +118,3 @@ class HTMLPurifier_AttrDef_HTML_ID extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/HTML/Length.php

@@ -41,4 +41,3 @@ class HTMLPurifier_AttrDef_HTML_Length extends HTMLPurifier_AttrDef_HTML_Pixels
     
 }
 
-?>

library/HTMLPurifier/AttrDef/HTML/LinkTypes.php

@@ -70,4 +70,3 @@ class HTMLPurifier_AttrDef_HTML_LinkTypes extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/HTML/MultiLength.php

@@ -41,4 +41,3 @@ class HTMLPurifier_AttrDef_HTML_MultiLength extends HTMLPurifier_AttrDef_HTML_Le
     
 }
 
-?>

library/HTMLPurifier/AttrDef/HTML/Nmtokens.php

@@ -48,4 +48,3 @@ class HTMLPurifier_AttrDef_HTML_Nmtokens extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/HTML/Pixels.php

@@ -34,4 +34,3 @@ class HTMLPurifier_AttrDef_HTML_Pixels extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/Integer.php

@@ -72,4 +72,3 @@ class HTMLPurifier_AttrDef_Integer extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/Lang.php

@@ -72,4 +72,3 @@ class HTMLPurifier_AttrDef_Lang extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/Text.php

@@ -14,4 +14,3 @@ class HTMLPurifier_AttrDef_Text extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/URI.php

@@ -302,4 +302,4 @@ class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef
     
 }
 
-?>
+

library/HTMLPurifier/AttrDef/URI/Email.php

@@ -14,4 +14,3 @@ class HTMLPurifier_AttrDef_URI_Email extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php

@@ -20,4 +20,3 @@ class HTMLPurifier_AttrDef_URI_Email_SimpleCheck extends HTMLPurifier_AttrDef_UR
     
 }
 
-?>

library/HTMLPurifier/AttrDef/URI/Host.php

@@ -51,4 +51,3 @@ class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/URI/IPv4.php

@@ -39,4 +39,3 @@ class HTMLPurifier_AttrDef_URI_IPv4 extends HTMLPurifier_AttrDef
     
 }
 
-?>

library/HTMLPurifier/AttrDef/URI/IPv6.php

@@ -98,4 +98,3 @@ class HTMLPurifier_AttrDef_URI_IPv6 extends HTMLPurifier_AttrDef_URI_IPv4
     
 }
 
-?>

library/HTMLPurifier/AttrTransform.php

@@ -55,4 +55,3 @@ class HTMLPurifier_AttrTransform
     
 }
 
-?>

library/HTMLPurifier/AttrTransform/BdoDir.php

@@ -28,4 +28,3 @@ class HTMLPurifier_AttrTransform_BdoDir extends HTMLPurifier_AttrTransform
     
 }
 
-?>

library/HTMLPurifier/AttrTransform/BgColor.php

@@ -23,4 +23,3 @@ extends HTMLPurifier_AttrTransform {
     
 }
 
-?>

library/HTMLPurifier/AttrTransform/BoolToCSS.php

@@ -36,4 +36,3 @@ extends HTMLPurifier_AttrTransform {
     
 }
 
-?>

library/HTMLPurifier/AttrTransform/Border.php

@@ -17,4 +17,3 @@ class HTMLPurifier_AttrTransform_Border extends HTMLPurifier_AttrTransform {
     
 }
 
-?>

library/HTMLPurifier/AttrTransform/EnumToCSS.php

@@ -57,4 +57,3 @@ class HTMLPurifier_AttrTransform_EnumToCSS extends HTMLPurifier_AttrTransform {
     
 }
 
-?>

library/HTMLPurifier/AttrTransform/ImgRequired.php

@@ -51,4 +51,3 @@ class HTMLPurifier_AttrTransform_ImgRequired extends HTMLPurifier_AttrTransform
     
 }
 
-?>

library/HTMLPurifier/AttrTransform/ImgSpace.php

@@ -44,4 +44,3 @@ extends HTMLPurifier_AttrTransform {
     
 }
 
-?>

library/HTMLPurifier/AttrTransform/Lang.php

@@ -27,4 +27,3 @@ class HTMLPurifier_AttrTransform_Lang extends HTMLPurifier_AttrTransform
     
 }
 
-?>

library/HTMLPurifier/AttrTransform/Length.php

@@ -26,4 +26,3 @@ class HTMLPurifier_AttrTransform_Length extends HTMLPurifier_AttrTransform
     
 }
 
-?>

library/HTMLPurifier/AttrTransform/Name.php

@@ -18,4 +18,3 @@ class HTMLPurifier_AttrTransform_Name extends HTMLPurifier_AttrTransform
     
 }
 
-?>

library/HTMLPurifier/AttrTypes.php

@@ -79,4 +79,4 @@ class HTMLPurifier_AttrTypes
     }
 }
 
-?>
+

library/HTMLPurifier/AttrValidator.php

@@ -137,4 +137,3 @@ class HTMLPurifier_AttrValidator
     
 }
 
-?>

library/HTMLPurifier/CSSDefinition.php

@@ -226,4 +226,3 @@ class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
     
 }
 
-?>

library/HTMLPurifier/ChildDef.php

@@ -57,4 +57,4 @@ class HTMLPurifier_ChildDef
     }
 }
 
-?>
+

library/HTMLPurifier/ChildDef/Chameleon.php

@@ -49,4 +49,3 @@ class HTMLPurifier_ChildDef_Chameleon extends HTMLPurifier_ChildDef
     }
 }
 
-?>

library/HTMLPurifier/ChildDef/Custom.php

@@ -91,4 +91,3 @@ class HTMLPurifier_ChildDef_Custom extends HTMLPurifier_ChildDef
     }
 }
 
-?>

library/HTMLPurifier/ChildDef/Empty.php

@@ -19,4 +19,3 @@ class HTMLPurifier_ChildDef_Empty extends HTMLPurifier_ChildDef
     }
 }
 
-?>

library/HTMLPurifier/ChildDef/Optional.php

@@ -20,4 +20,3 @@ class HTMLPurifier_ChildDef_Optional extends HTMLPurifier_ChildDef_Required
     }
 }
 
-?>

library/HTMLPurifier/ChildDef/Required.php

@@ -109,4 +109,3 @@ class HTMLPurifier_ChildDef_Required extends HTMLPurifier_ChildDef
     }
 }
 
-?>

library/HTMLPurifier/ChildDef/StrictBlockquote.php

@@ -73,4 +73,3 @@ extends HTMLPurifier_ChildDef_Required
     }
 }
 
-?>

library/HTMLPurifier/ChildDef/Table.php

@@ -141,4 +141,3 @@ class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef
     }
 }
 
-?>

library/HTMLPurifier/Config.php

@@ -455,4 +455,4 @@ class HTMLPurifier_Config
     
 }
 
-?>
+

library/HTMLPurifier/ConfigDef.php

@@ -7,4 +7,3 @@ class HTMLPurifier_ConfigDef {
     var $class = false;
 }
 
-?>

library/HTMLPurifier/ConfigDef/Directive.php

@@ -77,4 +77,3 @@ class HTMLPurifier_ConfigDef_Directive extends HTMLPurifier_ConfigDef
     
 }
 
-?>

library/HTMLPurifier/ConfigDef/DirectiveAlias.php

@@ -24,4 +24,3 @@ class HTMLPurifier_ConfigDef_DirectiveAlias extends HTMLPurifier_ConfigDef
     }
 }
 
-?>

library/HTMLPurifier/ConfigDef/Namespace.php

@@ -20,4 +20,3 @@ class HTMLPurifier_ConfigDef_Namespace extends HTMLPurifier_ConfigDef {
     
 }
 
-?>

library/HTMLPurifier/ConfigSchema.php

@@ -404,4 +404,4 @@ class HTMLPurifier_ConfigSchema {
     }
 }
 
-?>
+

library/HTMLPurifier/ContentSets.php

@@ -147,4 +147,3 @@ class HTMLPurifier_ContentSets
     
 }
 
-?>

library/HTMLPurifier/Context.php

@@ -78,4 +78,3 @@ class HTMLPurifier_Context
     
 }
 
-?>

library/HTMLPurifier/Definition.php

@@ -38,4 +38,3 @@ class HTMLPurifier_Definition
     
 }
 
-?>

library/HTMLPurifier/DefinitionCache.php

@@ -126,4 +126,3 @@ class HTMLPurifier_DefinitionCache
     }
 }
 
-?>

library/HTMLPurifier/DefinitionCache/Decorator.php

@@ -57,4 +57,3 @@ class HTMLPurifier_DefinitionCache_Decorator extends HTMLPurifier_DefinitionCach
     
 }
 
-?>

library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php

@@ -42,4 +42,3 @@ class HTMLPurifier_DefinitionCache_Decorator_Cleanup extends
     
 }
 
-?>

library/HTMLPurifier/DefinitionCache/Decorator/Memory.php

@@ -45,4 +45,3 @@ class HTMLPurifier_DefinitionCache_Decorator_Memory extends
     
 }
 
-?>

library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in

@@ -44,4 +44,3 @@ class HTMLPurifier_DefinitionCache_Decorator_Template extends
     
 }
 
-?>