From 65d0e1fdfe3144aa58156e81d4f31fa6ff52c664 Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <edwardzyang@thewritingpot.com>
Date: Mon, 11 Feb 2008 00:15:04 +0000
Subject: [PATCH] [3.1.0] HTMLPURIFIER_PREFIX can be defined outside of HTML
 Purifier - Update TODO

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1548 48356398-32a2-884e-a903-53898d9a118a
---
 NEWS                               |  1 +
 TODO                               | 19 ++++++++++++++++---
 library/HTMLPurifier/Bootstrap.php |  4 +++-
 maintenance/merge-library.php      |  2 +-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 59e28488..f2a49abe 100644
--- a/NEWS
+++ b/NEWS
@@ -40,6 +40,7 @@ NEWS ( CHANGELOG and HISTORY )                                     HTMLPurifier
 . tests/index.php can now be run from any directory.
 . HTMLPurifier_Token subclasses split into seperate files
 . HTMLPURIFIER_PREFIX now is defined in Bootstrap.php, NOT HTMLPurifier.php
+. HTMLPURIFIER_PREFIX can now be defined outside of HTML Purifier
 
 3.0.0, released 2008-01-06
 # HTML Purifier is PHP 5 only! The 2.1.x branch will be maintained
diff --git a/TODO b/TODO
index e2c9e263..b11bdb49 100644
--- a/TODO
+++ b/TODO
@@ -12,21 +12,34 @@ amount of effort to implement, it may get endlessly delayed. Do not be
 afraid to cast your vote for the next feature to be implemented!
 
 IMPORTANT
+ - We should do a release candidate, because of the major changes
  - Get everything into configuration objects (filters, I'm looking at you)
  - Factor demo.php into a set of Printer classes, and then create a stub
    file for users here (inside the actual HTML Purifier library)
+    - Support exporting configuration, so users can easily tweak settings
+      in the demo, and then copy-paste into their own setup
  - Test HTMLPurifier.auto.php, HTMLPurifier.includes.php, and combinations
-   of the two.
+   of the two. This is related to standalone in tests/index.php
  - Document new ConfigSchema setup and format; dev-includes.txt is a base
    but we need it in HTML
  - Document new methods of including the library
- - We should do a release candidate, because of the major changes
  - Move utility classes for ConfigSchema into HTML Purifier itself: they're
    that important
  - Factor generate-schema-cache.php into a class, so that the maintenance script
    is as small as possible
  - Document which scripts need to be called when a change is made
- - Semi-automated smoketests using PHPT style files
+ - Semi-automated smoketests using PHPT style files (probably should be part
+   of SimpleTest framework)
+ - Check if Bootstrap needs to be conditional in standalone (also, check other
+   files in standalone)
+ - Update demo.php and all other code that has some relation to this
+ - Rename merge-library.php script
+ - Create "super" script which performs all regeneration actions
+ - Factor out command line parser into its own class
+ - Remove all includes from unit tests, and remove blanks/ folder and generation
+ - Document that standalone doesn't load autoload by default, so you need
+   to include HTMLPurifier.autoload.php after it
+ - Simplify merge library script by removing recursion? (or other things)
 
 3.1 release [Error'ed]
  # Error logging for filtering/cleanup procedures
diff --git a/library/HTMLPurifier/Bootstrap.php b/library/HTMLPurifier/Bootstrap.php
index e4ad0dfb..cb8273f7 100644
--- a/library/HTMLPurifier/Bootstrap.php
+++ b/library/HTMLPurifier/Bootstrap.php
@@ -1,7 +1,9 @@
 <?php
 
 // constants are slow, but we'll make one exception
-define('HTMLPURIFIER_PREFIX', realpath(dirname(__FILE__) . '/..'));
+if (!defined('HTMLPURIFIER_PREFIX')) {
+    define('HTMLPURIFIER_PREFIX', realpath(dirname(__FILE__) . '/..'));
+}
 
 /**
  * Bootstrap class that contains meta-functionality for HTML Purifier such as
diff --git a/maintenance/merge-library.php b/maintenance/merge-library.php
index 8e88be41..0d60d927 100755
--- a/maintenance/merge-library.php
+++ b/maintenance/merge-library.php
@@ -134,7 +134,7 @@ $contents = str_replace(
     // Note that bootstrap is now inside the standalone file
     "define('HTMLPURIFIER_PREFIX', realpath(dirname(__FILE__) . '/..'));",
     "define('HTMLPURIFIER_PREFIX', dirname(__FILE__) . '/standalone');
-set_include_path(HTMLPURIFIER_PREFIX . PATH_SEPARATOR . get_include_path());",
+    set_include_path(HTMLPURIFIER_PREFIX . PATH_SEPARATOR . get_include_path());",
     $contents
 );
 file_put_contents('HTMLPurifier.standalone.php', $contents);