pradosoft / prado

framework/Collections/TAttributeCollection.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TAttributeCollection classes
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Collections
- */
+	 * TAttributeCollection classes
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Collections
+	 */
 
 /**
  * Includes TMap class

framework/Collections/TList.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TList, TListIterator classes
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Collections
- */
+	 * TList, TListIterator classes
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Collections
+	 */
 
 /**
  * TList class

framework/3rdParty/WsdlGen/Wsdl.php

Indentation +14 added lines, -14 removed lines

@@ -1,19 +1,19 @@
 <?php
 /**
- * Wsdl file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2005 by Marcus Nyeholt. All rights reserved.
- *
- * To contact the author write to {@link mailto:tanus@users.sourceforge.net Marcus Nyeholt}
- * This file is part of the PRADO framework from {@link http://www.xisc.com}
- *
- * @author Marcus Nyeholt		<tanus@users.sourceforge.net>
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @package System.Web.Services.SOAP
- */
+	 * Wsdl file.
+	 *
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the BSD License.
+	 *
+	 * Copyright(c) 2005 by Marcus Nyeholt. All rights reserved.
+	 *
+	 * To contact the author write to {@link mailto:tanus@users.sourceforge.net Marcus Nyeholt}
+	 * This file is part of the PRADO framework from {@link http://www.xisc.com}
+	 *
+	 * @author Marcus Nyeholt		<tanus@users.sourceforge.net>
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+	 * @package System.Web.Services.SOAP
+	 */
 
 /**
  * Contains the dom object used to build up the wsdl. The

framework/3rdParty/WsdlGen/WsdlMessage.php

Indentation +14 added lines, -14 removed lines

@@ -1,19 +1,19 @@
 <?php
 /**
- * WsdlMessage file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2005 by Marcus Nyeholt. All rights reserved.
- *
- * To contact the author write to {@link mailto:tanus@users.sourceforge.net Marcus Nyeholt}
- * This file is part of the PRADO framework from {@link http://www.xisc.com}
- *
- * @author Marcus Nyeholt		<tanus@users.sourceforge.net>
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @package System.Web.Services.SOAP
- */
+	 * WsdlMessage file.
+	 *
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the BSD License.
+	 *
+	 * Copyright(c) 2005 by Marcus Nyeholt. All rights reserved.
+	 *
+	 * To contact the author write to {@link mailto:tanus@users.sourceforge.net Marcus Nyeholt}
+	 * This file is part of the PRADO framework from {@link http://www.xisc.com}
+	 *
+	 * @author Marcus Nyeholt		<tanus@users.sourceforge.net>
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+	 * @package System.Web.Services.SOAP
+	 */
 
 /**
  * Represents a WSDL message. This is bound to the portTypes

framework/3rdParty/FirePHPCore/fb.php

Indentation +23 added lines, -23 removed lines

@@ -73,8 +73,8 @@ 
    * @return void
    */
   public static function setEnabled($Enabled) {
-    $instance = FirePHP::getInstance(true);
-    $instance->setEnabled($Enabled);
+	$instance = FirePHP::getInstance(true);
+	$instance->setEnabled($Enabled);
   }
   
   /**
@@ -84,8 +84,8 @@ 
    * @return boolean TRUE if enabled
    */
   public static function getEnabled() {
-    $instance = FirePHP::getInstance(true);
-    return $instance->getEnabled();
+	$instance = FirePHP::getInstance(true);
+	return $instance->getEnabled();
   }  
   
   /**
@@ -99,8 +99,8 @@ 
    * @return void
    */
   public static function setObjectFilter($Class, $Filter) {
-    $instance = FirePHP::getInstance(true);
-    $instance->setObjectFilter($Class, $Filter);
+	$instance = FirePHP::getInstance(true);
+	$instance->setObjectFilter($Class, $Filter);
   }
   
   /**
@@ -111,8 +111,8 @@ 
    * @return void
    */
   public static function setOptions($Options) {
-    $instance = FirePHP::getInstance(true);
-    $instance->setOptions($Options);
+	$instance = FirePHP::getInstance(true);
+	$instance->setOptions($Options);
   }
 
   /**
@@ -122,8 +122,8 @@ 
    * @return array The options
    */
   public static function getOptions() {
-    $instance = FirePHP::getInstance(true);
-    return $instance->getOptions();
+	$instance = FirePHP::getInstance(true);
+	return $instance->getOptions();
   }
 
   /**
@@ -136,9 +136,9 @@ 
    */
   public static function send()
   {
-    $instance = FirePHP::getInstance(true);
-    $args = func_get_args();
-    return call_user_func_array(array($instance,'fb'),$args);
+	$instance = FirePHP::getInstance(true);
+	$args = func_get_args();
+	return call_user_func_array(array($instance,'fb'),$args);
   }
 
   /**
@@ -153,8 +153,8 @@ 
    * @return true
    */
   public static function group($Name, $Options=null) {
-    $instance = FirePHP::getInstance(true);
-    return $instance->group($Name, $Options);
+	$instance = FirePHP::getInstance(true);
+	return $instance->group($Name, $Options);
   }
 
   /**
@@ -164,7 +164,7 @@ 
    * @throws Exception
    */
   public static function groupEnd() {
-    return self::send(null, null, FirePHP::GROUP_END);
+	return self::send(null, null, FirePHP::GROUP_END);
   }
 
   /**
@@ -177,7 +177,7 @@ 
    * @throws Exception
    */
   public static function log($Object, $Label=null) {
-    return self::send($Object, $Label, FirePHP::LOG);
+	return self::send($Object, $Label, FirePHP::LOG);
   } 
 
   /**
@@ -190,7 +190,7 @@ 
    * @throws Exception
    */
   public static function info($Object, $Label=null) {
-    return self::send($Object, $Label, FirePHP::INFO);
+	return self::send($Object, $Label, FirePHP::INFO);
   } 
 
   /**
@@ -203,7 +203,7 @@ 
    * @throws Exception
    */
   public static function warn($Object, $Label=null) {
-    return self::send($Object, $Label, FirePHP::WARN);
+	return self::send($Object, $Label, FirePHP::WARN);
   } 
 
   /**
@@ -216,7 +216,7 @@ 
    * @throws Exception
    */
   public static function error($Object, $Label=null) {
-    return self::send($Object, $Label, FirePHP::ERROR);
+	return self::send($Object, $Label, FirePHP::ERROR);
   } 
 
   /**
@@ -229,7 +229,7 @@ 
    * @throws Exception
    */
   public static function dump($Key, $Variable) {
-    return self::send($Variable, $Key, FirePHP::DUMP);
+	return self::send($Variable, $Key, FirePHP::DUMP);
   } 
 
   /**
@@ -241,7 +241,7 @@ 
    * @throws Exception
    */
   public static function trace($Label) {
-    return self::send($Label, FirePHP::TRACE);
+	return self::send($Label, FirePHP::TRACE);
   } 
 
   /**
@@ -254,7 +254,7 @@ 
    * @throws Exception
    */
   public static function table($Label, $Table) {
-    return self::send($Table, $Label, FirePHP::TABLE);
+	return self::send($Table, $Label, FirePHP::TABLE);
   } 
 
 }

framework/3rdParty/ReCaptcha/recaptchalib.php

Indentation +72 added lines, -73 removed lines

@@ -45,13 +45,13 @@ 
  * @return string - encoded request
  */
 function _recaptcha_qsencode ($data) {
-        $req = "";
-        foreach ( $data as $key => $value )
-                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+		$req = "";
+		foreach ( $data as $key => $value )
+				$req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
 
-        // Cut the last '&'
-        $req=substr($req,0,strlen($req)-1);
-        return $req;
+		// Cut the last '&'
+		$req=substr($req,0,strlen($req)-1);
+		return $req;
 }
 
 
@@ -66,29 +66,29 @@ 
  */
 function _recaptcha_http_post($host, $path, $data, $port = 80) {
 
-        $req = _recaptcha_qsencode ($data);
+		$req = _recaptcha_qsencode ($data);
 
-        $http_request  = "POST $path HTTP/1.0\r\n";
-        $http_request .= "Host: $host\r\n";
-        $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
-        $http_request .= "Content-Length: " . strlen($req) . "\r\n";
-        $http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
-        $http_request .= "\r\n";
-        $http_request .= $req;
+		$http_request  = "POST $path HTTP/1.0\r\n";
+		$http_request .= "Host: $host\r\n";
+		$http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
+		$http_request .= "Content-Length: " . strlen($req) . "\r\n";
+		$http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
+		$http_request .= "\r\n";
+		$http_request .= $req;
 
-        $response = '';
-        if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
-                die ('Could not open socket');
-        }
+		$response = '';
+		if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
+				die ('Could not open socket');
+		}
 
-        fwrite($fs, $http_request);
+		fwrite($fs, $http_request);
 
-        while ( !feof($fs) )
-                $response .= fgets($fs, 1160); // One TCP-IP packet
-        fclose($fs);
-        $response = explode("\r\n\r\n", $response, 2);
+		while ( !feof($fs) )
+				$response .= fgets($fs, 1160); // One TCP-IP packet
+		fclose($fs);
+		$response = explode("\r\n\r\n", $response, 2);
 
-        return $response;
+		return $response;
 }
 
 
@@ -100,7 +100,6 @@ 
  * @param string $pubkey A public key for reCAPTCHA
  * @param string $error The error given by reCAPTCHA (optional, default is null)
  * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false)
-
  * @return string - The HTML to be embedded in the user's form.
  */
 function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
@@ -110,16 +109,16 @@ 
 	}
 	
 	if ($use_ssl) {
-                $server = RECAPTCHA_API_SECURE_SERVER;
-        } else {
-                $server = RECAPTCHA_API_SERVER;
-        }
+				$server = RECAPTCHA_API_SECURE_SERVER;
+		} else {
+				$server = RECAPTCHA_API_SERVER;
+		}
 
-        $errorpart = "";
-        if ($error) {
-           $errorpart = "&error=" . $error;
-        }
-        return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
+		$errorpart = "";
+		if ($error) {
+		   $errorpart = "&amp;error=" . $error;
+		}
+		return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
 
 	<noscript>
   		<iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
@@ -135,20 +134,20 @@ 
  * A ReCaptchaResponse is returned from recaptcha_check_answer()
  */
 class ReCaptchaResponse {
-        var $is_valid;
-        var $error;
+		var $is_valid;
+		var $error;
 }
 
 
 /**
-  * Calls an HTTP POST function to verify if the user's guess was correct
-  * @param string $privkey
-  * @param string $remoteip
-  * @param string $challenge
-  * @param string $response
-  * @param array $extra_params an array of extra variables to post to the server
-  * @return ReCaptchaResponse
-  */
+ * Calls an HTTP POST function to verify if the user's guess was correct
+ * @param string $privkey
+ * @param string $remoteip
+ * @param string $challenge
+ * @param string $response
+ * @param array $extra_params an array of extra variables to post to the server
+ * @return ReCaptchaResponse
+ */
 function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
 {
 	if ($privkey == null || $privkey == '') {
@@ -161,34 +160,34 @@ 
 
 	
 	
-        //discard spam submissions
-        if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
-                $recaptcha_response = new ReCaptchaResponse();
-                $recaptcha_response->is_valid = false;
-                $recaptcha_response->error = 'incorrect-captcha-sol';
-                return $recaptcha_response;
-        }
-
-        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
-                                          array (
-                                                 'privatekey' => $privkey,
-                                                 'remoteip' => $remoteip,
-                                                 'challenge' => $challenge,
-                                                 'response' => $response
-                                                 ) + $extra_params
-                                          );
-
-        $answers = explode ("\n", $response [1]);
-        $recaptcha_response = new ReCaptchaResponse();
-
-        if (trim ($answers [0]) == 'true') {
-                $recaptcha_response->is_valid = true;
-        }
-        else {
-                $recaptcha_response->is_valid = false;
-                $recaptcha_response->error = $answers [1];
-        }
-        return $recaptcha_response;
+		//discard spam submissions
+		if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
+				$recaptcha_response = new ReCaptchaResponse();
+				$recaptcha_response->is_valid = false;
+				$recaptcha_response->error = 'incorrect-captcha-sol';
+				return $recaptcha_response;
+		}
+
+		$response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
+										  array (
+												 'privatekey' => $privkey,
+												 'remoteip' => $remoteip,
+												 'challenge' => $challenge,
+												 'response' => $response
+												 ) + $extra_params
+										  );
+
+		$answers = explode ("\n", $response [1]);
+		$recaptcha_response = new ReCaptchaResponse();
+
+		if (trim ($answers [0]) == 'true') {
+				$recaptcha_response->is_valid = true;
+		}
+		else {
+				$recaptcha_response->is_valid = false;
+				$recaptcha_response->error = $answers [1];
+		}
+		return $recaptcha_response;
 
 }
 
@@ -230,7 +229,7 @@ 
 function recaptcha_mailhide_url($pubkey, $privkey, $email) {
 	if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
 		die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
-		     "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
+			 "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
 	}
 	
 

framework/3rdParty/SafeHtml/HTMLSax3.php

Indentation +604 added lines, -604 removed lines

@@ -39,114 +39,114 @@ 
 * @abstract
 */
 class TSax3_StateParser {
-    /**
-    * Instance of user front end class to be passed to callbacks
-    * @var TSax3
-    * @access private
-    */
-    public $htmlsax;
-    /**
-    * User defined object for handling elements
-    * @var object
-    * @access private
-    */
-    public $handler_object_element;
-    /**
-    * User defined open tag handler method
-    * @var string
-    * @access private
-    */
-    public $handler_method_opening;
-    /**
-    * User defined close tag handler method
-    * @var string
-    * @access private
-    */
-    public $handler_method_closing;
-    /**
-    * User defined object for handling data in elements
-    * @var object
-    * @access private
-    */
-    public $handler_object_data;
-    /**
-    * User defined data handler method
-    * @var string
-    * @access private
-    */
-    public $handler_method_data;
-    /**
-    * User defined object for handling processing instructions
-    * @var object
-    * @access private
-    */
-    public $handler_object_pi;
-    /**
-    * User defined processing instruction handler method
-    * @var string
-    * @access private
-    */
-    public $handler_method_pi;
-    /**
-    * User defined object for handling JSP/ASP tags
-    * @var object
-    * @access private
-    */
-    public $handler_object_jasp;
-    /**
-    * User defined JSP/ASP handler method
-    * @var string
-    * @access private
-    */
-    public $handler_method_jasp;
-    /**
-    * User defined object for handling XML escapes
-    * @var object
-    * @access private
-    */
-    public $handler_object_escape;
-    /**
-    * User defined XML escape handler method
-    * @var string
-    * @access private
-    */
-    public $handler_method_escape;
-    /**
-    * User defined handler object or NullHandler
-    * @var object
-    * @access private
-    */
-    public $handler_default;
-    /**
-    * Parser options determining parsing behavior
-    * @var array
-    * @access private
-    */
-    protected $parser_options = array();
-    /**
-    * XML document being parsed
-    * @var string
-    * @access private
-    */
-    protected $rawtext;
-    /**
-    * Position in XML document relative to start (0)
-    * @var int
-    * @access private
-    */
-    protected $position;
-    /**
-    * Length of the XML document in characters
-    * @var int
-    * @access private
-    */
-    protected $length;
-    /**
-    * Array of state objects
-    * @var array
-    * @access private
-    */
-    protected $State = array();
+	/**
+	 * Instance of user front end class to be passed to callbacks
+	 * @var TSax3
+	 * @access private
+	 */
+	public $htmlsax;
+	/**
+	 * User defined object for handling elements
+	 * @var object
+	 * @access private
+	 */
+	public $handler_object_element;
+	/**
+	 * User defined open tag handler method
+	 * @var string
+	 * @access private
+	 */
+	public $handler_method_opening;
+	/**
+	 * User defined close tag handler method
+	 * @var string
+	 * @access private
+	 */
+	public $handler_method_closing;
+	/**
+	 * User defined object for handling data in elements
+	 * @var object
+	 * @access private
+	 */
+	public $handler_object_data;
+	/**
+	 * User defined data handler method
+	 * @var string
+	 * @access private
+	 */
+	public $handler_method_data;
+	/**
+	 * User defined object for handling processing instructions
+	 * @var object
+	 * @access private
+	 */
+	public $handler_object_pi;
+	/**
+	 * User defined processing instruction handler method
+	 * @var string
+	 * @access private
+	 */
+	public $handler_method_pi;
+	/**
+	 * User defined object for handling JSP/ASP tags
+	 * @var object
+	 * @access private
+	 */
+	public $handler_object_jasp;
+	/**
+	 * User defined JSP/ASP handler method
+	 * @var string
+	 * @access private
+	 */
+	public $handler_method_jasp;
+	/**
+	 * User defined object for handling XML escapes
+	 * @var object
+	 * @access private
+	 */
+	public $handler_object_escape;
+	/**
+	 * User defined XML escape handler method
+	 * @var string
+	 * @access private
+	 */
+	public $handler_method_escape;
+	/**
+	 * User defined handler object or NullHandler
+	 * @var object
+	 * @access private
+	 */
+	public $handler_default;
+	/**
+	 * Parser options determining parsing behavior
+	 * @var array
+	 * @access private
+	 */
+	protected $parser_options = array();
+	/**
+	 * XML document being parsed
+	 * @var string
+	 * @access private
+	 */
+	protected $rawtext;
+	/**
+	 * Position in XML document relative to start (0)
+	 * @var int
+	 * @access private
+	 */
+	protected $position;
+	/**
+	 * Length of the XML document in characters
+	 * @var int
+	 * @access private
+	 */
+	protected $length;
+	/**
+	 * Array of state objects
+	 * @var array
+	 * @access private
+	 */
+	protected $State = array();
 
 	const TSAX3_STATE_STOP = 0;
 	const TSAX3_STATE_START = 1;
@@ -157,166 +157,166 @@ 
 	const TSAX3_STATE_JASP = 7;
 	const TSAX3_STATE_PI = 8;
 
-    /**
-    * Constructs TSax3_StateParser setting up states
-    * @var TSax3 instance of user front end class
-    * @access protected
-    */
-    protected function __construct($htmlsax) {
-        $this->htmlsax = $htmlsax;
-        $this->State[self::TSAX3_STATE_START] = new TSax3_StartingState();
-
-        $this->State[self::TSAX3_STATE_CLOSING_TAG] = new TSax3_ClosingTagState();
-        $this->State[self::TSAX3_STATE_TAG] = new TSax3_TagState();
-        $this->State[self::TSAX3_STATE_OPENING_TAG] = new TSax3_OpeningTagState();
-
-        $this->State[self::TSAX3_STATE_PI] = new TSax3_PiState();
-        $this->State[self::TSAX3_STATE_JASP] = new TSax3_JaspState();
-        $this->State[self::TSAX3_STATE_ESCAPE] = new TSax3_EscapeState();
-    }
-
-    /**
-    * Moves the position back one character
-    * @access protected
-    * @return void
-    */
-    function unscanCharacter() {
-        $this->position -= 1;
-    }
-
-    /**
-    * Moves the position forward one character
-    * @access protected
-    * @return void
-    */
-    function ignoreCharacter() {
-        $this->position += 1;
-    }
-
-    /**
-    * Returns the next character from the XML document or void if at end
-    * @access protected
-    * @return mixed
-    */
-    function scanCharacter() {
-        if ($this->position < $this->length) {
-            return $this->rawtext{$this->position++};
-        }
-    }
-
-    /**
-    * Returns a string from the current position to the next occurance
-    * of the supplied string
-    * @param string string to search until
-    * @access protected
-    * @return string
-    */
-    function scanUntilString($string) {
-        $start = $this->position;
-        $this->position = strpos($this->rawtext, $string, $start);
-        if ($this->position === FALSE) {
-            $this->position = $this->length;
-        }
-        return substr($this->rawtext, $start, $this->position - $start);
-    }
-
-    /**
-    * Returns a string from the current position until the first instance of
-    * one of the characters in the supplied string argument
-    * @param string string to search until
-    * @access protected
-    * @return string
-    * @abstract
-    */
-    function scanUntilCharacters($string) {}
-
-    /**
-    * Moves the position forward past any whitespace characters
-    * @access protected
-    * @return void
-    * @abstract
-    */
-    function ignoreWhitespace() {}
-
-    /**
-    * Begins the parsing operation, setting up any decorators, depending on
-    * parse options invoking _parse() to execute parsing
-    * @param string XML document to parse
-    * @access protected
-    * @return void
-    */
-    function parse($data) {
-        if ($this->parser_options['XML_OPTION_TRIM_DATA_NODES']==1) {
-            $decorator = new TSax3_Trim(
-                $this->handler_object_data,
-                $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
-            $this->handler_method_data = 'trimData';
-        }
-        if ($this->parser_options['XML_OPTION_CASE_FOLDING']==1) {
-            $open_decor = new TSax3_CaseFolding(
-                $this->handler_object_element,
-                $this->handler_method_opening,
-                $this->handler_method_closing);
-            $this->handler_object_element =& $open_decor;
-            $this->handler_method_opening ='foldOpen';
-            $this->handler_method_closing ='foldClose';
-        }
-        if ($this->parser_options['XML_OPTION_LINEFEED_BREAK']==1) {
-            $decorator = new TSax3_Linefeed(
-                $this->handler_object_data,
-                $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
-            $this->handler_method_data = 'breakData';
-        }
-        if ($this->parser_options['XML_OPTION_TAB_BREAK']==1) {
-            $decorator = new TSax3_Tab(
-                $this->handler_object_data,
-                $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
-            $this->handler_method_data = 'breakData';
-        }
-        if ($this->parser_options['XML_OPTION_ENTITIES_UNPARSED']==1) {
-            $decorator = new TSax3_Entities_Unparsed(
-                $this->handler_object_data,
-                $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
-            $this->handler_method_data = 'breakData';
-        }
-        if ($this->parser_options['XML_OPTION_ENTITIES_PARSED']==1) {
-            $decorator = new TSax3_Entities_Parsed(
-                $this->handler_object_data,
-                $this->handler_method_data);
-            $this->handler_object_data =& $decorator;
-            $this->handler_method_data = 'breakData';
-        }
-        // Note switched on by default
-        if ($this->parser_options['XML_OPTION_STRIP_ESCAPES']==1) {
-            $decorator = new TSax3_Escape_Stripper(
-                $this->handler_object_escape,
-                $this->handler_method_escape);
-            $this->handler_object_escape =& $decorator;
-            $this->handler_method_escape = 'strip';
-        }
-        $this->rawtext = $data;
-        $this->length = strlen($data);
-        $this->position = 0;
-        $this->_parse();
-    }
-
-    /**
-    * Performs the parsing itself, delegating calls to a specific parser
-    * state
-    * @param constant state object to parse with
-    * @access protected
-    * @return void
-    */
-    function _parse($state = self::TSAX3_STATE_START) {
-        do {
-            $state = $this->State[$state]->parse($this);
-        } while ($state != self::TSAX3_STATE_STOP &&
-                    $this->position < $this->length);
-    }
+	/**
+	 * Constructs TSax3_StateParser setting up states
+	 * @var TSax3 instance of user front end class
+	 * @access protected
+	 */
+	protected function __construct($htmlsax) {
+		$this->htmlsax = $htmlsax;
+		$this->State[self::TSAX3_STATE_START] = new TSax3_StartingState();
+
+		$this->State[self::TSAX3_STATE_CLOSING_TAG] = new TSax3_ClosingTagState();
+		$this->State[self::TSAX3_STATE_TAG] = new TSax3_TagState();
+		$this->State[self::TSAX3_STATE_OPENING_TAG] = new TSax3_OpeningTagState();
+
+		$this->State[self::TSAX3_STATE_PI] = new TSax3_PiState();
+		$this->State[self::TSAX3_STATE_JASP] = new TSax3_JaspState();
+		$this->State[self::TSAX3_STATE_ESCAPE] = new TSax3_EscapeState();
+	}
+
+	/**
+	 * Moves the position back one character
+	 * @access protected
+	 * @return void
+	 */
+	function unscanCharacter() {
+		$this->position -= 1;
+	}
+
+	/**
+	 * Moves the position forward one character
+	 * @access protected
+	 * @return void
+	 */
+	function ignoreCharacter() {
+		$this->position += 1;
+	}
+
+	/**
+	 * Returns the next character from the XML document or void if at end
+	 * @access protected
+	 * @return mixed
+	 */
+	function scanCharacter() {
+		if ($this->position < $this->length) {
+			return $this->rawtext{$this->position++};
+		}
+	}
+
+	/**
+	 * Returns a string from the current position to the next occurance
+	 * of the supplied string
+	 * @param string string to search until
+	 * @access protected
+	 * @return string
+	 */
+	function scanUntilString($string) {
+		$start = $this->position;
+		$this->position = strpos($this->rawtext, $string, $start);
+		if ($this->position === FALSE) {
+			$this->position = $this->length;
+		}
+		return substr($this->rawtext, $start, $this->position - $start);
+	}
+
+	/**
+	 * Returns a string from the current position until the first instance of
+	 * one of the characters in the supplied string argument
+	 * @param string string to search until
+	 * @access protected
+	 * @return string
+	 * @abstract
+	 */
+	function scanUntilCharacters($string) {}
+
+	/**
+	 * Moves the position forward past any whitespace characters
+	 * @access protected
+	 * @return void
+	 * @abstract
+	 */
+	function ignoreWhitespace() {}
+
+	/**
+	 * Begins the parsing operation, setting up any decorators, depending on
+	 * parse options invoking _parse() to execute parsing
+	 * @param string XML document to parse
+	 * @access protected
+	 * @return void
+	 */
+	function parse($data) {
+		if ($this->parser_options['XML_OPTION_TRIM_DATA_NODES']==1) {
+			$decorator = new TSax3_Trim(
+				$this->handler_object_data,
+				$this->handler_method_data);
+			$this->handler_object_data =& $decorator;
+			$this->handler_method_data = 'trimData';
+		}
+		if ($this->parser_options['XML_OPTION_CASE_FOLDING']==1) {
+			$open_decor = new TSax3_CaseFolding(
+				$this->handler_object_element,
+				$this->handler_method_opening,
+				$this->handler_method_closing);
+			$this->handler_object_element =& $open_decor;
+			$this->handler_method_opening ='foldOpen';
+			$this->handler_method_closing ='foldClose';
+		}
+		if ($this->parser_options['XML_OPTION_LINEFEED_BREAK']==1) {
+			$decorator = new TSax3_Linefeed(
+				$this->handler_object_data,
+				$this->handler_method_data);
+			$this->handler_object_data =& $decorator;
+			$this->handler_method_data = 'breakData';
+		}
+		if ($this->parser_options['XML_OPTION_TAB_BREAK']==1) {
+			$decorator = new TSax3_Tab(
+				$this->handler_object_data,
+				$this->handler_method_data);
+			$this->handler_object_data =& $decorator;
+			$this->handler_method_data = 'breakData';
+		}
+		if ($this->parser_options['XML_OPTION_ENTITIES_UNPARSED']==1) {
+			$decorator = new TSax3_Entities_Unparsed(
+				$this->handler_object_data,
+				$this->handler_method_data);
+			$this->handler_object_data =& $decorator;
+			$this->handler_method_data = 'breakData';
+		}
+		if ($this->parser_options['XML_OPTION_ENTITIES_PARSED']==1) {
+			$decorator = new TSax3_Entities_Parsed(
+				$this->handler_object_data,
+				$this->handler_method_data);
+			$this->handler_object_data =& $decorator;
+			$this->handler_method_data = 'breakData';
+		}
+		// Note switched on by default
+		if ($this->parser_options['XML_OPTION_STRIP_ESCAPES']==1) {
+			$decorator = new TSax3_Escape_Stripper(
+				$this->handler_object_escape,
+				$this->handler_method_escape);
+			$this->handler_object_escape =& $decorator;
+			$this->handler_method_escape = 'strip';
+		}
+		$this->rawtext = $data;
+		$this->length = strlen($data);
+		$this->position = 0;
+		$this->_parse();
+	}
+
+	/**
+	 * Performs the parsing itself, delegating calls to a specific parser
+	 * state
+	 * @param constant state object to parse with
+	 * @access protected
+	 * @return void
+	 */
+	function _parse($state = self::TSAX3_STATE_START) {
+		do {
+			$state = $this->State[$state]->parse($this);
+		} while ($state != self::TSAX3_STATE_STOP &&
+					$this->position < $this->length);
+	}
 }
 
 /**
@@ -327,61 +327,61 @@ 
 * @see TSax3_StateParser_Gtet430
 */
 class TSax3_StateParser_Lt430 extends TSax3_StateParser {
-    /**
-    * Constructs TSax3_StateParser_Lt430 defining available
-    * parser options
-    * @var TSax3 instance of user front end class
-    * @access protected
-    */
-    function __construct(& $htmlsax) {
-        parent::__construct($htmlsax);
-        $this->parser_options['XML_OPTION_TRIM_DATA_NODES'] = 0;
-        $this->parser_options['XML_OPTION_CASE_FOLDING'] = 0;
-        $this->parser_options['XML_OPTION_LINEFEED_BREAK'] = 0;
-        $this->parser_options['XML_OPTION_TAB_BREAK'] = 0;
-        $this->parser_options['XML_OPTION_ENTITIES_PARSED'] = 0;
-        $this->parser_options['XML_OPTION_ENTITIES_UNPARSED'] = 0;
-        $this->parser_options['XML_OPTION_STRIP_ESCAPES'] = 0;
+	/**
+	 * Constructs TSax3_StateParser_Lt430 defining available
+	 * parser options
+	 * @var TSax3 instance of user front end class
+	 * @access protected
+	 */
+	function __construct(& $htmlsax) {
+		parent::__construct($htmlsax);
+		$this->parser_options['XML_OPTION_TRIM_DATA_NODES'] = 0;
+		$this->parser_options['XML_OPTION_CASE_FOLDING'] = 0;
+		$this->parser_options['XML_OPTION_LINEFEED_BREAK'] = 0;
+		$this->parser_options['XML_OPTION_TAB_BREAK'] = 0;
+		$this->parser_options['XML_OPTION_ENTITIES_PARSED'] = 0;
+		$this->parser_options['XML_OPTION_ENTITIES_UNPARSED'] = 0;
+		$this->parser_options['XML_OPTION_STRIP_ESCAPES'] = 0;
 		//var_dump($this->parser_options);
-    }
-
-    /**
-    * Returns a string from the current position until the first instance of
-    * one of the characters in the supplied string argument
-    * @param string string to search until
-    * @access protected
-    * @return string
-    */
-    function scanUntilCharacters($string) {
-        $startpos = $this->position;
-        while ($this->position < $this->length && strpos($string, $this->rawtext{$this->position}) === FALSE) {
-            $this->position++;
-        }
-        return substr($this->rawtext, $startpos, $this->position - $startpos);
-    }
-
-    /**
-    * Moves the position forward past any whitespace characters
-    * @access protected
-    * @return void
-    */
-    function ignoreWhitespace() {
-        while ($this->position < $this->length &&
-            strpos(" \n\r\t", $this->rawtext{$this->position}) !== FALSE) {
-            $this->position++;
-        }
-    }
-
-    /**
-    * Begins the parsing operation, setting up the unparsed XML entities
-    * decorator if necessary then delegating further work to parent
-    * @param string XML document to parse
-    * @access protected
-    * @return void
-    */
-    function parse($data) {
-        parent::parse($data);
-    }
+	}
+
+	/**
+	 * Returns a string from the current position until the first instance of
+	 * one of the characters in the supplied string argument
+	 * @param string string to search until
+	 * @access protected
+	 * @return string
+	 */
+	function scanUntilCharacters($string) {
+		$startpos = $this->position;
+		while ($this->position < $this->length && strpos($string, $this->rawtext{$this->position}) === FALSE) {
+			$this->position++;
+		}
+		return substr($this->rawtext, $startpos, $this->position - $startpos);
+	}
+
+	/**
+	 * Moves the position forward past any whitespace characters
+	 * @access protected
+	 * @return void
+	 */
+	function ignoreWhitespace() {
+		while ($this->position < $this->length &&
+			strpos(" \n\r\t", $this->rawtext{$this->position}) !== FALSE) {
+			$this->position++;
+		}
+	}
+
+	/**
+	 * Begins the parsing operation, setting up the unparsed XML entities
+	 * decorator if necessary then delegating further work to parent
+	 * @param string XML document to parse
+	 * @access protected
+	 * @return void
+	 */
+	function parse($data) {
+		parent::parse($data);
+	}
 }
 
 /**
@@ -392,56 +392,56 @@ 
 * @see TSax3_StateParser_Lt430
 */
 class TSax3_StateParser_Gtet430 extends TSax3_StateParser {
-    /**
-    * Constructs TSax3_StateParser_Gtet430 defining available
-    * parser options
-    * @var TSax3 instance of user front end class
-    * @access protected
-    */
-    function __construct(& $htmlsax) {
-        parent::__construct($htmlsax);
-        $this->parser_options['XML_OPTION_TRIM_DATA_NODES'] = 0;
-        $this->parser_options['XML_OPTION_CASE_FOLDING'] = 0;
-        $this->parser_options['XML_OPTION_LINEFEED_BREAK'] = 0;
-        $this->parser_options['XML_OPTION_TAB_BREAK'] = 0;
-        $this->parser_options['XML_OPTION_ENTITIES_PARSED'] = 0;
-        $this->parser_options['XML_OPTION_ENTITIES_UNPARSED'] = 0;
-        $this->parser_options['XML_OPTION_STRIP_ESCAPES'] = 0;
-    }
-    /**
-    * Returns a string from the current position until the first instance of
-    * one of the characters in the supplied string argument.
-    * @param string string to search until
-    * @access protected
-    * @return string
-    */
-    function scanUntilCharacters($string) {
-        $startpos = $this->position;
-        $length = strcspn($this->rawtext, $string, $startpos);
-        $this->position += $length;
-        return substr($this->rawtext, $startpos, $length);
-    }
-
-    /**
-    * Moves the position forward past any whitespace characters
-    * @access protected
-    * @return void
-    */
-    function ignoreWhitespace() {
-        $this->position += strspn($this->rawtext, " \n\r\t", $this->position);
-    }
-
-    /**
-    * Begins the parsing operation, setting up the parsed and unparsed
-    * XML entity decorators if necessary then delegating further work
-    * to parent
-    * @param string XML document to parse
-    * @access protected
-    * @return void
-    */
-    function parse($data) {
-        parent::parse($data);
-    }
+	/**
+	 * Constructs TSax3_StateParser_Gtet430 defining available
+	 * parser options
+	 * @var TSax3 instance of user front end class
+	 * @access protected
+	 */
+	function __construct(& $htmlsax) {
+		parent::__construct($htmlsax);
+		$this->parser_options['XML_OPTION_TRIM_DATA_NODES'] = 0;
+		$this->parser_options['XML_OPTION_CASE_FOLDING'] = 0;
+		$this->parser_options['XML_OPTION_LINEFEED_BREAK'] = 0;
+		$this->parser_options['XML_OPTION_TAB_BREAK'] = 0;
+		$this->parser_options['XML_OPTION_ENTITIES_PARSED'] = 0;
+		$this->parser_options['XML_OPTION_ENTITIES_UNPARSED'] = 0;
+		$this->parser_options['XML_OPTION_STRIP_ESCAPES'] = 0;
+	}
+	/**
+	 * Returns a string from the current position until the first instance of
+	 * one of the characters in the supplied string argument.
+	 * @param string string to search until
+	 * @access protected
+	 * @return string
+	 */
+	function scanUntilCharacters($string) {
+		$startpos = $this->position;
+		$length = strcspn($this->rawtext, $string, $startpos);
+		$this->position += $length;
+		return substr($this->rawtext, $startpos, $length);
+	}
+
+	/**
+	 * Moves the position forward past any whitespace characters
+	 * @access protected
+	 * @return void
+	 */
+	function ignoreWhitespace() {
+		$this->position += strspn($this->rawtext, " \n\r\t", $this->position);
+	}
+
+	/**
+	 * Begins the parsing operation, setting up the parsed and unparsed
+	 * XML entity decorators if necessary then delegating further work
+	 * to parent
+	 * @param string XML document to parse
+	 * @access protected
+	 * @return void
+	 */
+	function parse($data) {
+		parent::parse($data);
+	}
 }
 
 /**
@@ -450,13 +450,13 @@ 
 * @access protected
 */
 class TSax3_NullHandler {
-    /**
-    * Generic handler method which does nothing
-    * @access protected
-    * @return void
-    */
-    function DoNothing() {
-    }
+	/**
+	 * Generic handler method which does nothing
+	 * @access protected
+	 * @return void
+	 */
+	function DoNothing() {
+	}
 }
 
 /**
@@ -465,229 +465,229 @@ 
 * @access public
 */
 class TSax3 {
-    /**
-    * Instance of concrete subclass of TSax3_StateParser
-    * @var TSax3_StateParser
-    * @access private
-    */
-    private $state_parser;
-
-    /**
-    * Constructs TSax3 selecting concrete StateParser subclass
-    * depending on PHP version being used as well as setting the default
-    * NullHandler for all callbacks<br />
-    * <b>Example:</b>
-    * <pre>
-    * $myHandler = & new MyHandler();
-    * $parser = new TSax3();
-    * $parser->set_object($myHandler);
-    * $parser->set_option('XML_OPTION_CASE_FOLDING');
-    * $parser->set_element_handler('myOpenHandler','myCloseHandler');
-    * $parser->set_data_handler('myDataHandler');
-    * $parser->parser($xml);
-    * </pre>
-    * @access public
-    */
-    function __construct() {
-        if (version_compare(phpversion(), '4.3', 'ge')) {
-            $this->state_parser = new TSax3_StateParser_Gtet430($this);
-        } else {
-            $this->state_parser = new TSax3_StateParser_Lt430($this);
-        }
-        $nullhandler = new TSax3_NullHandler();
-        $this->set_object($nullhandler);
-        $this->set_element_handler('DoNothing', 'DoNothing');
-        $this->set_data_handler('DoNothing');
-        $this->set_pi_handler('DoNothing');
-        $this->set_jasp_handler('DoNothing');
-        $this->set_escape_handler('DoNothing');
-    }
-
-    /**
-    * Sets the user defined handler object. Returns a PEAR Error
-    * if supplied argument is not an object.
-    * @param object handler object containing SAX callback methods
-    * @access public
-    * @return mixed
-    */
-    function set_object(&$object) {
-        if ( is_object($object) ) {
-            $this->state_parser->handler_default =& $object;
-            return true;
-        } else {
-            require_once('PEAR.php');
-            PEAR::raiseError('TSax3::set_object requires '.
-                'an object instance');
-        }
-    }
-
-    /**
-    * Sets a parser option. By default all options are switched off.
-    * Returns a PEAR Error if option is invalid<br />
-    * <b>Available options:</b>
-    * <ul>
-    * <li>XML_OPTION_TRIM_DATA_NODES: trim whitespace off the beginning
-    * and end of data passed to the data handler</li>
-    * <li>XML_OPTION_LINEFEED_BREAK: linefeeds result in additional data
-    * handler calls</li>
-    * <li>XML_OPTION_TAB_BREAK: tabs result in additional data handler
-    * calls</li>
-    * <li>XML_OPTION_ENTITIES_UNPARSED: XML entities are returned as
-    * seperate data handler calls in unparsed form</li>
-    * <li>XML_OPTION_ENTITIES_PARSED: (PHP 4.3.0+ only) XML entities are
-    * returned as seperate data handler calls and are parsed with
-    * PHP's html_entity_decode() function</li>
-    * <li>XML_OPTION_STRIP_ESCAPES: strips out the -- -- comment markers
-    * or CDATA markup inside an XML escape, if found.</li>
-    * </ul>
-    * To get HTMLSax to behave in the same way as the native PHP SAX parser,
-    * using it's default state, you need to switch on XML_OPTION_LINEFEED_BREAK,
-    * XML_OPTION_ENTITIES_PARSED and XML_OPTION_CASE_FOLDING
-    * @param string name of parser option
-    * @param int (optional) 1 to switch on, 0 for off
-    * @access public
-    * @return boolean
-    */
-    function set_option($name, $value=1) {
-        if ( array_key_exists($name,$this->state_parser->parser_options) ) {
-            $this->state_parser->parser_options[$name] = $value;
-            return true;
-        } else {
-            require_once('PEAR.php');
-            PEAR::raiseError('TSax3::set_option('.$name.') illegal');
-        }
-    }
-
-    /**
-    * Sets the data handler method which deals with the contents of XML
-    * elements.<br />
-    * The handler method must accept two arguments, the first being an
-    * instance of TSax3 and the second being the contents of an
-    * XML element e.g.
-    * <pre>
-    * function myDataHander(& $parser,$data){}
-    * </pre>
-    * @param string name of method
-    * @access public
-    * @return void
-    * @see set_object
-    */
-    function set_data_handler($data_method) {
-        $this->state_parser->handler_object_data =& $this->state_parser->handler_default;
-        $this->state_parser->handler_method_data = $data_method;
-    }
-
-    /**
-    * Sets the open and close tag handlers
-    * <br />The open handler method must accept three arguments; the parser,
-    * the tag name and an array of attributes e.g.
-    * <pre>
-    * function myOpenHander(& $parser,$tagname,$attrs=array()){}
-    * </pre>
-    * The close handler method must accept two arguments; the parser and
-    * the tag name e.g.
-    * <pre>
-    * function myCloseHander(& $parser,$tagname){}
-    * </pre>
-    * @param string name of open method
-    * @param string name of close method
-    * @access public
-    * @return void
-    * @see set_object
-    */
-    function set_element_handler($opening_method, $closing_method) {
-        $this->state_parser->handler_object_element =& $this->state_parser->handler_default;
-        $this->state_parser->handler_method_opening = $opening_method;
-        $this->state_parser->handler_method_closing = $closing_method;
-    }
-
-    /**
-    * Sets the processing instruction handler method e.g. for PHP open
-    * and close tags<br />
-    * The handler method must accept three arguments; the parser, the
-    * PI target and data inside the PI
-    * <pre>
-    * function myPIHander(& $parser,$target, $data){}
-    * </pre>
-    * @param string name of method
-    * @access public
-    * @return void
-    * @see set_object
-    */
-    function set_pi_handler($pi_method) {
-        $this->state_parser->handler_object_pi =& $this->state_parser->handler_default;
-        $this->state_parser->handler_method_pi = $pi_method;
-    }
-
-    /**
-    * Sets the XML escape handler method e.g. for comments and doctype
-    * declarations<br />
-    * The handler method must accept two arguments; the parser and the
-    * contents of the escaped section
-    * <pre>
-    * function myEscapeHander(& $parser, $data){}
-    * </pre>
-    * @param string name of method
-    * @access public
-    * @return void
-    * @see set_object
-    */
-    function set_escape_handler($escape_method) {
-        $this->state_parser->handler_object_escape =& $this->state_parser->handler_default;
-        $this->state_parser->handler_method_escape = $escape_method;
-    }
-
-    /**
-    * Sets the JSP/ASP markup handler<br />
-    * The handler method must accept two arguments; the parser and
-    * body of the JASP tag
-    * <pre>
-    * function myJaspHander(& $parser, $data){}
-    * </pre>
-    * @param string name of method
-    * @access public
-    * @return void
-    * @see set_object
-    */
-    function set_jasp_handler ($jasp_method) {
-        $this->state_parser->handler_object_jasp =& $this->state_parser->handler_default;
-        $this->state_parser->handler_method_jasp = $jasp_method;
-    }
-
-    /**
-    * Returns the current string position of the "cursor" inside the XML
-    * document
-    * <br />Intended for use from within a user defined handler called
-    * via the $parser reference e.g.
-    * <pre>
-    * function myDataHandler(& $parser,$data) {
-    *     echo( 'Current position: '.$parser->get_current_position() );
-    * }
-    * </pre>
-    * @access public
-    * @return int
-    * @see get_length
-    */
-    function get_current_position() {
-        return $this->state_parser->position;
-    }
-
-    /**
-    * Returns the string length of the XML document being parsed
-    * @access public
-    * @return int
-    */
-    function get_length() {
-        return $this->state_parser->length;
-    }
-
-    /**
-    * Start parsing some XML
-    * @param string XML document
-    * @access public
-    * @return void
-    */
-    function parse($data) {
-        $this->state_parser->parse($data);
-    }
+	/**
+	 * Instance of concrete subclass of TSax3_StateParser
+	 * @var TSax3_StateParser
+	 * @access private
+	 */
+	private $state_parser;
+
+	/**
+	 * Constructs TSax3 selecting concrete StateParser subclass
+	 * depending on PHP version being used as well as setting the default
+	 * NullHandler for all callbacks<br />
+	 * <b>Example:</b>
+	 * <pre>
+	 * $myHandler = & new MyHandler();
+	 * $parser = new TSax3();
+	 * $parser->set_object($myHandler);
+	 * $parser->set_option('XML_OPTION_CASE_FOLDING');
+	 * $parser->set_element_handler('myOpenHandler','myCloseHandler');
+	 * $parser->set_data_handler('myDataHandler');
+	 * $parser->parser($xml);
+	 * </pre>
+	 * @access public
+	 */
+	function __construct() {
+		if (version_compare(phpversion(), '4.3', 'ge')) {
+			$this->state_parser = new TSax3_StateParser_Gtet430($this);
+		} else {
+			$this->state_parser = new TSax3_StateParser_Lt430($this);
+		}
+		$nullhandler = new TSax3_NullHandler();
+		$this->set_object($nullhandler);
+		$this->set_element_handler('DoNothing', 'DoNothing');
+		$this->set_data_handler('DoNothing');
+		$this->set_pi_handler('DoNothing');
+		$this->set_jasp_handler('DoNothing');
+		$this->set_escape_handler('DoNothing');
+	}
+
+	/**
+	 * Sets the user defined handler object. Returns a PEAR Error
+	 * if supplied argument is not an object.
+	 * @param object handler object containing SAX callback methods
+	 * @access public
+	 * @return mixed
+	 */
+	function set_object(&$object) {
+		if ( is_object($object) ) {
+			$this->state_parser->handler_default =& $object;
+			return true;
+		} else {
+			require_once('PEAR.php');
+			PEAR::raiseError('TSax3::set_object requires '.
+				'an object instance');
+		}
+	}
+
+	/**
+	 * Sets a parser option. By default all options are switched off.
+	 * Returns a PEAR Error if option is invalid<br />
+	 * <b>Available options:</b>
+	 * <ul>
+	 * <li>XML_OPTION_TRIM_DATA_NODES: trim whitespace off the beginning
+	 * and end of data passed to the data handler</li>
+	 * <li>XML_OPTION_LINEFEED_BREAK: linefeeds result in additional data
+	 * handler calls</li>
+	 * <li>XML_OPTION_TAB_BREAK: tabs result in additional data handler
+	 * calls</li>
+	 * <li>XML_OPTION_ENTITIES_UNPARSED: XML entities are returned as
+	 * seperate data handler calls in unparsed form</li>
+	 * <li>XML_OPTION_ENTITIES_PARSED: (PHP 4.3.0+ only) XML entities are
+	 * returned as seperate data handler calls and are parsed with
+	 * PHP's html_entity_decode() function</li>
+	 * <li>XML_OPTION_STRIP_ESCAPES: strips out the -- -- comment markers
+	 * or CDATA markup inside an XML escape, if found.</li>
+	 * </ul>
+	 * To get HTMLSax to behave in the same way as the native PHP SAX parser,
+	 * using it's default state, you need to switch on XML_OPTION_LINEFEED_BREAK,
+	 * XML_OPTION_ENTITIES_PARSED and XML_OPTION_CASE_FOLDING
+	 * @param string name of parser option
+	 * @param int (optional) 1 to switch on, 0 for off
+	 * @access public
+	 * @return boolean
+	 */
+	function set_option($name, $value=1) {
+		if ( array_key_exists($name,$this->state_parser->parser_options) ) {
+			$this->state_parser->parser_options[$name] = $value;
+			return true;
+		} else {
+			require_once('PEAR.php');
+			PEAR::raiseError('TSax3::set_option('.$name.') illegal');
+		}
+	}
+
+	/**
+	 * Sets the data handler method which deals with the contents of XML
+	 * elements.<br />
+	 * The handler method must accept two arguments, the first being an
+	 * instance of TSax3 and the second being the contents of an
+	 * XML element e.g.
+	 * <pre>
+	 * function myDataHander(& $parser,$data){}
+	 * </pre>
+	 * @param string name of method
+	 * @access public
+	 * @return void
+	 * @see set_object
+	 */
+	function set_data_handler($data_method) {
+		$this->state_parser->handler_object_data =& $this->state_parser->handler_default;
+		$this->state_parser->handler_method_data = $data_method;
+	}
+
+	/**
+	 * Sets the open and close tag handlers
+	 * <br />The open handler method must accept three arguments; the parser,
+	 * the tag name and an array of attributes e.g.
+	 * <pre>
+	 * function myOpenHander(& $parser,$tagname,$attrs=array()){}
+	 * </pre>
+	 * The close handler method must accept two arguments; the parser and
+	 * the tag name e.g.
+	 * <pre>
+	 * function myCloseHander(& $parser,$tagname){}
+	 * </pre>
+	 * @param string name of open method
+	 * @param string name of close method
+	 * @access public
+	 * @return void
+	 * @see set_object
+	 */
+	function set_element_handler($opening_method, $closing_method) {
+		$this->state_parser->handler_object_element =& $this->state_parser->handler_default;
+		$this->state_parser->handler_method_opening = $opening_method;
+		$this->state_parser->handler_method_closing = $closing_method;
+	}
+
+	/**
+	 * Sets the processing instruction handler method e.g. for PHP open
+	 * and close tags<br />
+	 * The handler method must accept three arguments; the parser, the
+	 * PI target and data inside the PI
+	 * <pre>
+	 * function myPIHander(& $parser,$target, $data){}
+	 * </pre>
+	 * @param string name of method
+	 * @access public
+	 * @return void
+	 * @see set_object
+	 */
+	function set_pi_handler($pi_method) {
+		$this->state_parser->handler_object_pi =& $this->state_parser->handler_default;
+		$this->state_parser->handler_method_pi = $pi_method;
+	}
+
+	/**
+	 * Sets the XML escape handler method e.g. for comments and doctype
+	 * declarations<br />
+	 * The handler method must accept two arguments; the parser and the
+	 * contents of the escaped section
+	 * <pre>
+	 * function myEscapeHander(& $parser, $data){}
+	 * </pre>
+	 * @param string name of method
+	 * @access public
+	 * @return void
+	 * @see set_object
+	 */
+	function set_escape_handler($escape_method) {
+		$this->state_parser->handler_object_escape =& $this->state_parser->handler_default;
+		$this->state_parser->handler_method_escape = $escape_method;
+	}
+
+	/**
+	 * Sets the JSP/ASP markup handler<br />
+	 * The handler method must accept two arguments; the parser and
+	 * body of the JASP tag
+	 * <pre>
+	 * function myJaspHander(& $parser, $data){}
+	 * </pre>
+	 * @param string name of method
+	 * @access public
+	 * @return void
+	 * @see set_object
+	 */
+	function set_jasp_handler ($jasp_method) {
+		$this->state_parser->handler_object_jasp =& $this->state_parser->handler_default;
+		$this->state_parser->handler_method_jasp = $jasp_method;
+	}
+
+	/**
+	 * Returns the current string position of the "cursor" inside the XML
+	 * document
+	 * <br />Intended for use from within a user defined handler called
+	 * via the $parser reference e.g.
+	 * <pre>
+	 * function myDataHandler(& $parser,$data) {
+	 *     echo( 'Current position: '.$parser->get_current_position() );
+	 * }
+	 * </pre>
+	 * @access public
+	 * @return int
+	 * @see get_length
+	 */
+	function get_current_position() {
+		return $this->state_parser->position;
+	}
+
+	/**
+	 * Returns the string length of the XML document being parsed
+	 * @access public
+	 * @return int
+	 */
+	function get_length() {
+		return $this->state_parser->length;
+	}
+
+	/**
+	 * Start parsing some XML
+	 * @param string XML document
+	 * @access public
+	 * @return void
+	 */
+	function parse($data) {
+		$this->state_parser->parse($data);
+	}
 }

framework/3rdParty/SafeHtml/TSafeHtmlParser.php

Indentation +614 added lines, -614 removed lines

@@ -57,622 +57,622 @@
  */
 class TSafeHtmlParser
 {
-    /**
-     * Storage for resulting HTML output
-     *
-     * @var string
-     * @access private
-     */
-    private $_xhtml = '';
-
-    /**
-     * Array of counters for each tag
-     *
-     * @var array
-     * @access private
-     */
-    private $_counter = array();
-
-    /**
-     * Stack of unclosed tags
-     *
-     * @var array
-     * @access private
-     */
-    private $_stack = array();
-
-    /**
-     * Array of counters for tags that must be deleted with all content
-     *
-     * @var array
-     * @access private
-     */
-    private $_dcCounter = array();
-
-    /**
-     * Stack of unclosed tags that must be deleted with all content
-     *
-     * @var array
-     * @access private
-     */
-    private $_dcStack = array();
-
-    /**
-     * Stores level of list (ol/ul) nesting
-     *
-     * @var int
-     * @access private
-     */
-    private $_listScope = 0;
-
-    /**
-     * Stack of unclosed list tags
-     *
-     * @var array
-     * @access private
-     */
-    private $_liStack = array();
-
-    /**
-     * Array of prepared regular expressions for protocols (schemas) matching
-     *
-     * @var array
-     * @access private
-     */
-    private $_protoRegexps = array();
-
-    /**
-     * Array of prepared regular expressions for CSS matching
-     *
-     * @var array
-     * @access private
-     */
-    private $_cssRegexps = array();
-
-    /**
-     * List of single tags ("<tag />")
-     *
-     * @var array
-     * @access public
-     */
-    public $singleTags = array('area', 'br', 'img', 'input', 'hr', 'wbr', );
-
-    /**
-     * List of dangerous tags (such tags will be deleted)
-     *
-     * @var array
-     * @access public
-     */
-    public $deleteTags = array(
-        'applet', 'base',   'basefont', 'bgsound', 'blink',  'body',
-        'embed',  'frame',  'frameset', 'head',    'html',   'ilayer',
-        'iframe', 'layer',  'link',     'meta',    'object', 'style',
-        'title',  'script',
-        );
-
-    /**
-     * List of dangerous tags (such tags will be deleted, and all content
-     * inside this tags will be also removed)
-     *
-     * @var array
-     * @access public
-     */
-    public $deleteTagsContent = array('script', 'style', 'title', 'xml', );
-
-    /**
-     * Type of protocols filtering ('white' or 'black')
-     *
-     * @var string
-     * @access public
-     */
-    public $protocolFiltering = 'white';
-
-    /**
-     * List of "dangerous" protocols (used for blacklist-filtering)
-     *
-     * @var array
-     * @access public
-     */
-    public $blackProtocols = array(
-        'about',   'chrome',     'data',       'disk',     'hcp',
-        'help',    'javascript', 'livescript', 'lynxcgi',  'lynxexec',
-        'ms-help', 'ms-its',     'mhtml',      'mocha',    'opera',
-        'res',     'resource',   'shell',      'vbscript', 'view-source',
-        'vnd.ms.radio',          'wysiwyg',
-        );
-
-    /**
-     * List of "safe" protocols (used for whitelist-filtering)
-     *
-     * @var array
-     * @access public
-     */
-    public $whiteProtocols = array(
-        'ed2k',   'file', 'ftp',  'gopher', 'http',  'https',
-        'irc',    'mailto', 'news', 'nntp', 'telnet', 'webcal',
-        'xmpp',   'callto',
-        );
-
-    /**
-     * List of attributes that can contain protocols
-     *
-     * @var array
-     * @access public
-     */
-    public $protocolAttributes = array(
-        'action', 'background', 'codebase', 'dynsrc', 'href', 'lowsrc', 'src',
-        );
-
-    /**
-     * List of dangerous CSS keywords
-     *
-     * Whole style="" attribute will be removed, if parser will find one of
-     * these keywords
-     *
-     * @var array
-     * @access public
-     */
-    public $cssKeywords = array(
-        'absolute', 'behavior',       'behaviour',   'content', 'expression',
-        'fixed',    'include-source', 'moz-binding',
-        );
-
-    /**
-     * List of tags that can have no "closing tag"
-     *
-     * @var array
-     * @access public
-     * @deprecated XHTML does not allow such tags
-     */
-    public $noClose = array();
-
-    /**
-     * List of block-level tags that terminates paragraph
-     *
-     * Paragraph will be closed when this tags opened
-     *
-     * @var array
-     * @access public
-     */
-    public $closeParagraph = array(
-        'address', 'blockquote', 'center', 'dd',      'dir',       'div',
-        'dl',      'dt',         'h1',     'h2',      'h3',        'h4',
-        'h5',      'h6',         'hr',     'isindex', 'listing',   'marquee',
-        'menu',    'multicol',   'ol',     'p',       'plaintext', 'pre',
-        'table',   'ul',         'xmp',
-        );
-
-    /**
-     * List of table tags, all table tags outside a table will be removed
-     *
-     * @var array
-     * @access public
-     */
-    public $tableTags = array(
-        'caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
-        'thead',   'tr',
-        );
-
-    /**
-     * List of list tags
-     *
-     * @var array
-     * @access public
-     */
-    public $listTags = array('dir', 'menu', 'ol', 'ul', 'dl', );
-
-    /**
-     * List of dangerous attributes
-     *
-     * @var array
-     * @access public
-     */
-    public $attributes = array('dynsrc');
-    //public $attributes = array('dynsrc', 'id', 'name', ); //id and name are dangerous?
-
-    /**
-     * List of allowed "namespaced" attributes
-     *
-     * @var array
-     * @access public
-     */
-    public $attributesNS = array('xml:lang', );
-
-    /**
-     * Constructs class
-     *
-     * @access public
-     */
-    public function __construct()
-    {
-        //making regular expressions based on Proto & CSS arrays
-        foreach ($this->blackProtocols as $proto) {
-            $preg = "/[\s\x01-\x1F]*";
-            for ($i=0; $i<strlen($proto); $i++) {
-                $preg .= $proto{$i} . "[\s\x01-\x1F]*";
-            }
-            $preg .= ":/i";
-            $this->_protoRegexps[] = $preg;
-        }
-
-        foreach ($this->cssKeywords as $css) {
-            $this->_cssRegexps[] = '/' . $css . '/i';
-        }
-        return true;
-    }
-
-    /**
-     * Handles the writing of attributes - called from $this->_openHandler()
-     *
-     * @param array $attrs array of attributes $name => $value
-     * @return boolean
-     * @access private
-     */
-    private function _writeAttrs ($attrs)
-    {
-        if (is_array($attrs)) {
-            foreach ($attrs as $name => $value) {
-
-                $name = strtolower($name);
-
-                if (strpos($name, 'on') === 0) {
-                    continue;
-                }
-                if (strpos($name, 'data') === 0) {
-                    continue;
-                }
-                if (in_array($name, $this->attributes)) {
-                    continue;
-                }
-                if (!preg_match("/^[a-z0-9]+$/i", $name)) {
-                    if (!in_array($name, $this->attributesNS))
-                    {
-                        continue;
-                    }
-                }
-
-                if (($value === TRUE) || (is_null($value))) {
-                    $value = $name;
-                }
-
-                if ($name == 'style') {
-
-                   // removes insignificant backslahes
-                   $value = str_replace("\\", '', $value);
-
-                   // removes CSS comments
-                   while (1)
-                   {
-                     $_value = preg_replace("!/\*.*?\*/!s", '', $value);
-                     if ($_value == $value) break;
-                     $value = $_value;
-                   }
-
-                   // replace all & to &amp;
-                   $value = str_replace('&amp;', '&', $value);
-                   $value = str_replace('&', '&amp;', $value);
-
-                   foreach ($this->_cssRegexps as $css) {
-                       if (preg_match($css, $value)) {
-                           continue 2;
-                       }
-                   }
-                   foreach ($this->_protoRegexps as $proto) {
-                       if (preg_match($proto, $value)) {
-                           continue 2;
-                       }
-                   }
-                }
-
-                $tempval = preg_replace_callback(
-                        '/&#(\d+);?/m',
-                        function ($matches) {
-                            return chr($matches[0]);
-                        },
-                        $value
-                    ); //"'
-
-                $tempval = preg_replace_callback(
-                        '/&#x([0-9a-f]+);?/mi',
-                        function ($matches) {
-                            return chr(hexdec($matches[0]));
-                        },
-                        $tempval
-                    );
-
-                if ((in_array($name, $this->protocolAttributes)) &&
-                    (strpos($tempval, ':') !== false))
-                {
-                    if ($this->protocolFiltering == 'black') {
-                        foreach ($this->_protoRegexps as $proto) {
-                            if (preg_match($proto, $tempval)) continue 2;
-                        }
-                    } else {
-                        $_tempval = explode(':', $tempval);
-                        $proto = $_tempval[0];
-                        if (!in_array($proto, $this->whiteProtocols)) {
-                            continue;
-                        }
-                    }
-                }
-
-                $value = str_replace("\"", "&quot;", $value);
-                $this->_xhtml .= ' ' . $name . '="' . $value . '"';
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Opening tag handler - called from HTMLSax
-     *
-     * @param object $parser HTML Parser
-     * @param string $name   tag name
-     * @param array  $attrs  tag attributes
-     * @return boolean
-     * @access private
-     */
-    public function _openHandler(&$parser, $name, $attrs)
-    {
-        $name = strtolower($name);
-
-        if (in_array($name, $this->deleteTagsContent)) {
-            array_push($this->_dcStack, $name);
-            $this->_dcCounter[$name] = isset($this->_dcCounter[$name]) ? $this->_dcCounter[$name]+1 : 1;
-        }
-        if (count($this->_dcStack) != 0) {
-            return true;
-        }
-
-        if (in_array($name, $this->deleteTags)) {
-            return true;
-        }
-
-        if (!preg_match("/^[a-z0-9]+$/i", $name)) {
-            if (preg_match("!(?:\@|://)!i", $name)) {
-                $this->_xhtml .= '&lt;' . $name . '&gt;';
-            }
-            return true;
-        }
-
-        if (in_array($name, $this->singleTags)) {
-            $this->_xhtml .= '<' . $name;
-            $this->_writeAttrs($attrs);
-            $this->_xhtml .= ' />';
-            return true;
-        }
-
-        // TABLES: cannot open table elements when we are not inside table
-        if ((isset($this->_counter['table'])) && ($this->_counter['table'] <= 0)
-            && (in_array($name, $this->tableTags)))
-        {
-            return true;
-        }
-
-        // PARAGRAPHS: close paragraph when closeParagraph tags opening
-        if ((in_array($name, $this->closeParagraph)) && (in_array('p', $this->_stack))) {
-            $this->_closeHandler($parser, 'p');
-        }
-
-        // LISTS: we should close <li> if <li> of the same level opening
-        if ($name == 'li' && count($this->_liStack) &&
-            $this->_listScope == $this->_liStack[count($this->_liStack)-1])
-        {
-            $this->_closeHandler($parser, 'li');
-        }
-
-        // LISTS: we want to know on what nesting level of lists we are
-        if (in_array($name, $this->listTags)) {
-            $this->_listScope++;
-        }
-        if ($name == 'li') {
-            array_push($this->_liStack, $this->_listScope);
-        }
-
-        $this->_xhtml .= '<' . $name;
-        $this->_writeAttrs($attrs);
-        $this->_xhtml .= '>';
-        array_push($this->_stack,$name);
-        $this->_counter[$name] = isset($this->_counter[$name]) ? $this->_counter[$name]+1 : 1;
-        return true;
-    }
-
-    /**
-     * Closing tag handler - called from HTMLSax
-     *
-     * @param object $parsers HTML parser
-     * @param string $name    tag name
-     * @return boolean
-     * @access private
-     */
-    public function _closeHandler(&$parser, $name)
-    {
-
-        $name = strtolower($name);
-
-        if (isset($this->_dcCounter[$name]) && ($this->_dcCounter[$name] > 0) &&
-            (in_array($name, $this->deleteTagsContent)))
-        {
-           while ($name != ($tag = array_pop($this->_dcStack))) {
-            $this->_dcCounter[$tag]--;
-           }
-
-           $this->_dcCounter[$name]--;
-        }
-
-        if (count($this->_dcStack) != 0) {
-            return true;
-        }
-
-        if ((isset($this->_counter[$name])) && ($this->_counter[$name] > 0)) {
-           while ($name != ($tag = array_pop($this->_stack))) {
-               $this->_closeTag($tag);
-           }
-
-           $this->_closeTag($name);
-        }
-        return true;
-    }
-
-    /**
-     * Closes tag
-     *
-     * @param string $tag tag name
-     * @return boolean
-     * @access private
-     */
-    public function _closeTag($tag)
-    {
-        if (!in_array($tag, $this->noClose)) {
-            $this->_xhtml .= '</' . $tag . '>';
-        }
-
-        $this->_counter[$tag]--;
-
-        if (in_array($tag, $this->listTags)) {
-            $this->_listScope--;
-        }
-
-        if ($tag == 'li') {
-            array_pop($this->_liStack);
-        }
-        return true;
-    }
-
-    /**
-     * Character data handler - called from HTMLSax
-     *
-     * @param object $parser HTML parser
-     * @param string $data   textual data
-     * @return boolean
-     * @access private
-     */
-    public function _dataHandler(&$parser, $data)
-    {
-        if (count($this->_dcStack) == 0) {
-            $this->_xhtml .= $data;
-        }
-        return true;
-    }
-
-    /**
-     * Escape handler - called from HTMLSax
-     *
-     * @param object $parser HTML parser
-     * @param string $data   comments or other type of data
-     * @return boolean
-     * @access private
-     */
-    public function _escapeHandler(&$parser, $data)
-    {
-        return true;
-    }
-
-    /**
-     * Returns the XHTML document
-     *
-     * @return string Processed (X)HTML document
-     * @access public
-     */
-    public function getXHTML ()
-    {
-        while ($tag = array_pop($this->_stack)) {
-            $this->_closeTag($tag);
-        }
-
-        return $this->_xhtml;
-    }
-
-    /**
-     * Clears current document data
-     *
-     * @return boolean
-     * @access public
-     */
-    public function clear()
-    {
-        $this->_xhtml = '';
-        return true;
-    }
-
-    /**
-     * Main parsing fuction
-     *
-     * @param string $doc HTML document for processing
-     * @return string Processed (X)HTML document
-     * @access public
-     */
-    public function parse($doc, $isUTF7=false)
-    {
+	/**
+	 * Storage for resulting HTML output
+	 *
+	 * @var string
+	 * @access private
+	 */
+	private $_xhtml = '';
+
+	/**
+	 * Array of counters for each tag
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $_counter = array();
+
+	/**
+	 * Stack of unclosed tags
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $_stack = array();
+
+	/**
+	 * Array of counters for tags that must be deleted with all content
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $_dcCounter = array();
+
+	/**
+	 * Stack of unclosed tags that must be deleted with all content
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $_dcStack = array();
+
+	/**
+	 * Stores level of list (ol/ul) nesting
+	 *
+	 * @var int
+	 * @access private
+	 */
+	private $_listScope = 0;
+
+	/**
+	 * Stack of unclosed list tags
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $_liStack = array();
+
+	/**
+	 * Array of prepared regular expressions for protocols (schemas) matching
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $_protoRegexps = array();
+
+	/**
+	 * Array of prepared regular expressions for CSS matching
+	 *
+	 * @var array
+	 * @access private
+	 */
+	private $_cssRegexps = array();
+
+	/**
+	 * List of single tags ("<tag />")
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $singleTags = array('area', 'br', 'img', 'input', 'hr', 'wbr', );
+
+	/**
+	 * List of dangerous tags (such tags will be deleted)
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $deleteTags = array(
+		'applet', 'base',   'basefont', 'bgsound', 'blink',  'body',
+		'embed',  'frame',  'frameset', 'head',    'html',   'ilayer',
+		'iframe', 'layer',  'link',     'meta',    'object', 'style',
+		'title',  'script',
+		);
+
+	/**
+	 * List of dangerous tags (such tags will be deleted, and all content
+	 * inside this tags will be also removed)
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $deleteTagsContent = array('script', 'style', 'title', 'xml', );
+
+	/**
+	 * Type of protocols filtering ('white' or 'black')
+	 *
+	 * @var string
+	 * @access public
+	 */
+	public $protocolFiltering = 'white';
+
+	/**
+	 * List of "dangerous" protocols (used for blacklist-filtering)
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $blackProtocols = array(
+		'about',   'chrome',     'data',       'disk',     'hcp',
+		'help',    'javascript', 'livescript', 'lynxcgi',  'lynxexec',
+		'ms-help', 'ms-its',     'mhtml',      'mocha',    'opera',
+		'res',     'resource',   'shell',      'vbscript', 'view-source',
+		'vnd.ms.radio',          'wysiwyg',
+		);
+
+	/**
+	 * List of "safe" protocols (used for whitelist-filtering)
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $whiteProtocols = array(
+		'ed2k',   'file', 'ftp',  'gopher', 'http',  'https',
+		'irc',    'mailto', 'news', 'nntp', 'telnet', 'webcal',
+		'xmpp',   'callto',
+		);
+
+	/**
+	 * List of attributes that can contain protocols
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $protocolAttributes = array(
+		'action', 'background', 'codebase', 'dynsrc', 'href', 'lowsrc', 'src',
+		);
+
+	/**
+	 * List of dangerous CSS keywords
+	 *
+	 * Whole style="" attribute will be removed, if parser will find one of
+	 * these keywords
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $cssKeywords = array(
+		'absolute', 'behavior',       'behaviour',   'content', 'expression',
+		'fixed',    'include-source', 'moz-binding',
+		);
+
+	/**
+	 * List of tags that can have no "closing tag"
+	 *
+	 * @var array
+	 * @access public
+	 * @deprecated XHTML does not allow such tags
+	 */
+	public $noClose = array();
+
+	/**
+	 * List of block-level tags that terminates paragraph
+	 *
+	 * Paragraph will be closed when this tags opened
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $closeParagraph = array(
+		'address', 'blockquote', 'center', 'dd',      'dir',       'div',
+		'dl',      'dt',         'h1',     'h2',      'h3',        'h4',
+		'h5',      'h6',         'hr',     'isindex', 'listing',   'marquee',
+		'menu',    'multicol',   'ol',     'p',       'plaintext', 'pre',
+		'table',   'ul',         'xmp',
+		);
+
+	/**
+	 * List of table tags, all table tags outside a table will be removed
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $tableTags = array(
+		'caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
+		'thead',   'tr',
+		);
+
+	/**
+	 * List of list tags
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $listTags = array('dir', 'menu', 'ol', 'ul', 'dl', );
+
+	/**
+	 * List of dangerous attributes
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $attributes = array('dynsrc');
+	//public $attributes = array('dynsrc', 'id', 'name', ); //id and name are dangerous?
+
+	/**
+	 * List of allowed "namespaced" attributes
+	 *
+	 * @var array
+	 * @access public
+	 */
+	public $attributesNS = array('xml:lang', );
+
+	/**
+	 * Constructs class
+	 *
+	 * @access public
+	 */
+	public function __construct()
+	{
+		//making regular expressions based on Proto & CSS arrays
+		foreach ($this->blackProtocols as $proto) {
+			$preg = "/[\s\x01-\x1F]*";
+			for ($i=0; $i<strlen($proto); $i++) {
+				$preg .= $proto{$i} . "[\s\x01-\x1F]*";
+			}
+			$preg .= ":/i";
+			$this->_protoRegexps[] = $preg;
+		}
+
+		foreach ($this->cssKeywords as $css) {
+			$this->_cssRegexps[] = '/' . $css . '/i';
+		}
+		return true;
+	}
+
+	/**
+	 * Handles the writing of attributes - called from $this->_openHandler()
+	 *
+	 * @param array $attrs array of attributes $name => $value
+	 * @return boolean
+	 * @access private
+	 */
+	private function _writeAttrs ($attrs)
+	{
+		if (is_array($attrs)) {
+			foreach ($attrs as $name => $value) {
+
+				$name = strtolower($name);
+
+				if (strpos($name, 'on') === 0) {
+					continue;
+				}
+				if (strpos($name, 'data') === 0) {
+					continue;
+				}
+				if (in_array($name, $this->attributes)) {
+					continue;
+				}
+				if (!preg_match("/^[a-z0-9]+$/i", $name)) {
+					if (!in_array($name, $this->attributesNS))
+					{
+						continue;
+					}
+				}
+
+				if (($value === TRUE) || (is_null($value))) {
+					$value = $name;
+				}
+
+				if ($name == 'style') {
+
+				   // removes insignificant backslahes
+				   $value = str_replace("\\", '', $value);
+
+				   // removes CSS comments
+				   while (1)
+				   {
+					 $_value = preg_replace("!/\*.*?\*/!s", '', $value);
+					 if ($_value == $value) break;
+					 $value = $_value;
+				   }
+
+				   // replace all & to &amp;
+				   $value = str_replace('&amp;', '&', $value);
+				   $value = str_replace('&', '&amp;', $value);
+
+				   foreach ($this->_cssRegexps as $css) {
+					   if (preg_match($css, $value)) {
+						   continue 2;
+					   }
+				   }
+				   foreach ($this->_protoRegexps as $proto) {
+					   if (preg_match($proto, $value)) {
+						   continue 2;
+					   }
+				   }
+				}
+
+				$tempval = preg_replace_callback(
+						'/&#(\d+);?/m',
+						function ($matches) {
+							return chr($matches[0]);
+						},
+						$value
+					); //"'
+
+				$tempval = preg_replace_callback(
+						'/&#x([0-9a-f]+);?/mi',
+						function ($matches) {
+							return chr(hexdec($matches[0]));
+						},
+						$tempval
+					);
+
+				if ((in_array($name, $this->protocolAttributes)) &&
+					(strpos($tempval, ':') !== false))
+				{
+					if ($this->protocolFiltering == 'black') {
+						foreach ($this->_protoRegexps as $proto) {
+							if (preg_match($proto, $tempval)) continue 2;
+						}
+					} else {
+						$_tempval = explode(':', $tempval);
+						$proto = $_tempval[0];
+						if (!in_array($proto, $this->whiteProtocols)) {
+							continue;
+						}
+					}
+				}
+
+				$value = str_replace("\"", "&quot;", $value);
+				$this->_xhtml .= ' ' . $name . '="' . $value . '"';
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Opening tag handler - called from HTMLSax
+	 *
+	 * @param object $parser HTML Parser
+	 * @param string $name   tag name
+	 * @param array  $attrs  tag attributes
+	 * @return boolean
+	 * @access private
+	 */
+	public function _openHandler(&$parser, $name, $attrs)
+	{
+		$name = strtolower($name);
+
+		if (in_array($name, $this->deleteTagsContent)) {
+			array_push($this->_dcStack, $name);
+			$this->_dcCounter[$name] = isset($this->_dcCounter[$name]) ? $this->_dcCounter[$name]+1 : 1;
+		}
+		if (count($this->_dcStack) != 0) {
+			return true;
+		}
+
+		if (in_array($name, $this->deleteTags)) {
+			return true;
+		}
+
+		if (!preg_match("/^[a-z0-9]+$/i", $name)) {
+			if (preg_match("!(?:\@|://)!i", $name)) {
+				$this->_xhtml .= '&lt;' . $name . '&gt;';
+			}
+			return true;
+		}
+
+		if (in_array($name, $this->singleTags)) {
+			$this->_xhtml .= '<' . $name;
+			$this->_writeAttrs($attrs);
+			$this->_xhtml .= ' />';
+			return true;
+		}
+
+		// TABLES: cannot open table elements when we are not inside table
+		if ((isset($this->_counter['table'])) && ($this->_counter['table'] <= 0)
+			&& (in_array($name, $this->tableTags)))
+		{
+			return true;
+		}
+
+		// PARAGRAPHS: close paragraph when closeParagraph tags opening
+		if ((in_array($name, $this->closeParagraph)) && (in_array('p', $this->_stack))) {
+			$this->_closeHandler($parser, 'p');
+		}
+
+		// LISTS: we should close <li> if <li> of the same level opening
+		if ($name == 'li' && count($this->_liStack) &&
+			$this->_listScope == $this->_liStack[count($this->_liStack)-1])
+		{
+			$this->_closeHandler($parser, 'li');
+		}
+
+		// LISTS: we want to know on what nesting level of lists we are
+		if (in_array($name, $this->listTags)) {
+			$this->_listScope++;
+		}
+		if ($name == 'li') {
+			array_push($this->_liStack, $this->_listScope);
+		}
+
+		$this->_xhtml .= '<' . $name;
+		$this->_writeAttrs($attrs);
+		$this->_xhtml .= '>';
+		array_push($this->_stack,$name);
+		$this->_counter[$name] = isset($this->_counter[$name]) ? $this->_counter[$name]+1 : 1;
+		return true;
+	}
+
+	/**
+	 * Closing tag handler - called from HTMLSax
+	 *
+	 * @param object $parsers HTML parser
+	 * @param string $name    tag name
+	 * @return boolean
+	 * @access private
+	 */
+	public function _closeHandler(&$parser, $name)
+	{
+
+		$name = strtolower($name);
+
+		if (isset($this->_dcCounter[$name]) && ($this->_dcCounter[$name] > 0) &&
+			(in_array($name, $this->deleteTagsContent)))
+		{
+		   while ($name != ($tag = array_pop($this->_dcStack))) {
+			$this->_dcCounter[$tag]--;
+		   }
+
+		   $this->_dcCounter[$name]--;
+		}
+
+		if (count($this->_dcStack) != 0) {
+			return true;
+		}
+
+		if ((isset($this->_counter[$name])) && ($this->_counter[$name] > 0)) {
+		   while ($name != ($tag = array_pop($this->_stack))) {
+			   $this->_closeTag($tag);
+		   }
+
+		   $this->_closeTag($name);
+		}
+		return true;
+	}
+
+	/**
+	 * Closes tag
+	 *
+	 * @param string $tag tag name
+	 * @return boolean
+	 * @access private
+	 */
+	public function _closeTag($tag)
+	{
+		if (!in_array($tag, $this->noClose)) {
+			$this->_xhtml .= '</' . $tag . '>';
+		}
+
+		$this->_counter[$tag]--;
+
+		if (in_array($tag, $this->listTags)) {
+			$this->_listScope--;
+		}
+
+		if ($tag == 'li') {
+			array_pop($this->_liStack);
+		}
+		return true;
+	}
+
+	/**
+	 * Character data handler - called from HTMLSax
+	 *
+	 * @param object $parser HTML parser
+	 * @param string $data   textual data
+	 * @return boolean
+	 * @access private
+	 */
+	public function _dataHandler(&$parser, $data)
+	{
+		if (count($this->_dcStack) == 0) {
+			$this->_xhtml .= $data;
+		}
+		return true;
+	}
+
+	/**
+	 * Escape handler - called from HTMLSax
+	 *
+	 * @param object $parser HTML parser
+	 * @param string $data   comments or other type of data
+	 * @return boolean
+	 * @access private
+	 */
+	public function _escapeHandler(&$parser, $data)
+	{
+		return true;
+	}
+
+	/**
+	 * Returns the XHTML document
+	 *
+	 * @return string Processed (X)HTML document
+	 * @access public
+	 */
+	public function getXHTML ()
+	{
+		while ($tag = array_pop($this->_stack)) {
+			$this->_closeTag($tag);
+		}
+
+		return $this->_xhtml;
+	}
+
+	/**
+	 * Clears current document data
+	 *
+	 * @return boolean
+	 * @access public
+	 */
+	public function clear()
+	{
+		$this->_xhtml = '';
+		return true;
+	}
+
+	/**
+	 * Main parsing fuction
+	 *
+	 * @param string $doc HTML document for processing
+	 * @return string Processed (X)HTML document
+	 * @access public
+	 */
+	public function parse($doc, $isUTF7=false)
+	{
 	   $this->clear();
 
-       // Save all '<' symbols
-       $doc = preg_replace("/<(?=[^a-zA-Z\/\!\?\%])/", '&lt;', (string)$doc);
-
-       // Web documents shouldn't contains \x00 symbol
-       $doc = str_replace("\x00", '', $doc);
-
-       // Opera6 bug workaround
-       $doc = str_replace("\xC0\xBC", '&lt;', $doc);
-
-       // UTF-7 encoding ASCII decode
-       if($isUTF7)
-            $doc = $this->repackUTF7($doc);
-
-       // Instantiate the parser
-       $parser= new TSax3();
-
-       // Set up the parser
-       $parser->set_object($this);
-
-       $parser->set_element_handler('_openHandler','_closeHandler');
-       $parser->set_data_handler('_dataHandler');
-       $parser->set_escape_handler('_escapeHandler');
-
-       $parser->parse($doc);
-
-       return $this->getXHTML();
-
-    }
-
-
-    /**
-     * UTF-7 decoding fuction
-     *
-     * @param string $str HTML document for recode ASCII part of UTF-7 back to ASCII
-     * @return string Decoded document
-     * @access private
-     */
-    private function repackUTF7($str)
-    {
-       return preg_replace_callback('!\+([0-9a-zA-Z/]+)\-!', array($this, 'repackUTF7Callback'), $str);
-    }
-
-    /**
-     * Additional UTF-7 decoding fuction
-     *
-     * @param string $str String for recode ASCII part of UTF-7 back to ASCII
-     * @return string Recoded string
-     * @access private
-     */
-    private function repackUTF7Callback($str)
-    {
-       $str = base64_decode($str[1]);
-       $str = preg_replace_callback('/^((?:\x00.)*)((?:[^\x00].)+)/', array($this, 'repackUTF7Back'), $str);
-       return preg_replace('/\x00(.)/', '$1', $str);
-    }
-
-    /**
-     * Additional UTF-7 encoding fuction
-     *
-     * @param string $str String for recode ASCII part of UTF-7 back to ASCII
-     * @return string Recoded string
-     * @access private
-     */
-    private function repackUTF7Back($str)
-    {
-       return $str[1].'+'.rtrim(base64_encode($str[2]), '=').'-';
-    }
+	   // Save all '<' symbols
+	   $doc = preg_replace("/<(?=[^a-zA-Z\/\!\?\%])/", '&lt;', (string)$doc);
+
+	   // Web documents shouldn't contains \x00 symbol
+	   $doc = str_replace("\x00", '', $doc);
+
+	   // Opera6 bug workaround
+	   $doc = str_replace("\xC0\xBC", '&lt;', $doc);
+
+	   // UTF-7 encoding ASCII decode
+	   if($isUTF7)
+			$doc = $this->repackUTF7($doc);
+
+	   // Instantiate the parser
+	   $parser= new TSax3();
+
+	   // Set up the parser
+	   $parser->set_object($this);
+
+	   $parser->set_element_handler('_openHandler','_closeHandler');
+	   $parser->set_data_handler('_dataHandler');
+	   $parser->set_escape_handler('_escapeHandler');
+
+	   $parser->parse($doc);
+
+	   return $this->getXHTML();
+
+	}
+
+
+	/**
+	 * UTF-7 decoding fuction
+	 *
+	 * @param string $str HTML document for recode ASCII part of UTF-7 back to ASCII
+	 * @return string Decoded document
+	 * @access private
+	 */
+	private function repackUTF7($str)
+	{
+	   return preg_replace_callback('!\+([0-9a-zA-Z/]+)\-!', array($this, 'repackUTF7Callback'), $str);
+	}
+
+	/**
+	 * Additional UTF-7 decoding fuction
+	 *
+	 * @param string $str String for recode ASCII part of UTF-7 back to ASCII
+	 * @return string Recoded string
+	 * @access private
+	 */
+	private function repackUTF7Callback($str)
+	{
+	   $str = base64_decode($str[1]);
+	   $str = preg_replace_callback('/^((?:\x00.)*)((?:[^\x00].)+)/', array($this, 'repackUTF7Back'), $str);
+	   return preg_replace('/\x00(.)/', '$1', $str);
+	}
+
+	/**
+	 * Additional UTF-7 encoding fuction
+	 *
+	 * @param string $str String for recode ASCII part of UTF-7 back to ASCII
+	 * @return string Recoded string
+	 * @access private
+	 */
+	private function repackUTF7Back($str)
+	{
+	   return $str[1].'+'.rtrim(base64_encode($str[2]), '=').'-';
+	}
 }
 
 /*

framework/3rdParty/SafeHtml/HTMLSax3/Decorators.php

Indentation +270 added lines, -270 removed lines

@@ -32,40 +32,40 @@ 
 * @access protected
 */
 class TSax3_Trim {
-    /**
-    * Original handler object
-    * @var object
-    * @access private
-    */
-    private $orig_obj;
-    /**
-    * Original handler method
-    * @var string
-    * @access private
-    */
-    private $orig_method;
-    /**
-    * Constructs TSax3_Trim
-    * @param object handler object being decorated
-    * @param string original handler method
-    * @access protected
-    */
-    function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
-        $this->orig_method = $orig_method;
-    }
-    /**
-    * Trims the data
-    * @param TSax3
-    * @param string element data
-    * @access protected
-    */
-    function trimData(&$parser, $data) {
-        $data = trim($data);
-        if ($data != '') {
-            $this->orig_obj->{$this->orig_method}($parser, $data);
-        }
-    }
+	/**
+	 * Original handler object
+	 * @var object
+	 * @access private
+	 */
+	private $orig_obj;
+	/**
+	 * Original handler method
+	 * @var string
+	 * @access private
+	 */
+	private $orig_method;
+	/**
+	 * Constructs TSax3_Trim
+	 * @param object handler object being decorated
+	 * @param string original handler method
+	 * @access protected
+	 */
+	function __construct(&$orig_obj, $orig_method) {
+		$this->orig_obj =& $orig_obj;
+		$this->orig_method = $orig_method;
+	}
+	/**
+	 * Trims the data
+	 * @param TSax3
+	 * @param string element data
+	 * @access protected
+	 */
+	function trimData(&$parser, $data) {
+		$data = trim($data);
+		if ($data != '') {
+			$this->orig_obj->{$this->orig_method}($parser, $data);
+		}
+	}
 }
 /**
 * Coverts tag names to upper case
@@ -73,55 +73,55 @@ 
 * @access protected
 */
 class TSax3_CaseFolding {
-    /**
-    * Original handler object
-    * @var object
-    * @access private
-    */
-    private $orig_obj;
-    /**
-    * Original open handler method
-    * @var string
-    * @access private
-    */
-    private $orig_open_method;
-    /**
-    * Original close handler method
-    * @var string
-    * @access private
-    */
-    private $orig_close_method;
-    /**
-    * Constructs TSax3_CaseFolding
-    * @param object handler object being decorated
-    * @param string original open handler method
-    * @param string original close handler method
-    * @access protected
-    */
-    function __construct(&$orig_obj, $orig_open_method, $orig_close_method) {
-        $this->orig_obj =& $orig_obj;
-        $this->orig_open_method = $orig_open_method;
-        $this->orig_close_method = $orig_close_method;
-    }
-    /**
-    * Folds up open tag callbacks
-    * @param TSax3
-    * @param string tag name
-    * @param array tag attributes
-    * @access protected
-    */
-    function foldOpen(&$parser, $tag, $attrs=array(), $empty = FALSE) {
-        $this->orig_obj->{$this->orig_open_method}($parser, strtoupper($tag), $attrs, $empty);
-    }
-    /**
-    * Folds up close tag callbacks
-    * @param TSax3
-    * @param string tag name
-    * @access protected
-    */
-    function foldClose(&$parser, $tag, $empty = FALSE) {
-        $this->orig_obj->{$this->orig_close_method}($parser, strtoupper($tag), $empty);
-    }
+	/**
+	 * Original handler object
+	 * @var object
+	 * @access private
+	 */
+	private $orig_obj;
+	/**
+	 * Original open handler method
+	 * @var string
+	 * @access private
+	 */
+	private $orig_open_method;
+	/**
+	 * Original close handler method
+	 * @var string
+	 * @access private
+	 */
+	private $orig_close_method;
+	/**
+	 * Constructs TSax3_CaseFolding
+	 * @param object handler object being decorated
+	 * @param string original open handler method
+	 * @param string original close handler method
+	 * @access protected
+	 */
+	function __construct(&$orig_obj, $orig_open_method, $orig_close_method) {
+		$this->orig_obj =& $orig_obj;
+		$this->orig_open_method = $orig_open_method;
+		$this->orig_close_method = $orig_close_method;
+	}
+	/**
+	 * Folds up open tag callbacks
+	 * @param TSax3
+	 * @param string tag name
+	 * @param array tag attributes
+	 * @access protected
+	 */
+	function foldOpen(&$parser, $tag, $attrs=array(), $empty = FALSE) {
+		$this->orig_obj->{$this->orig_open_method}($parser, strtoupper($tag), $attrs, $empty);
+	}
+	/**
+	 * Folds up close tag callbacks
+	 * @param TSax3
+	 * @param string tag name
+	 * @access protected
+	 */
+	function foldClose(&$parser, $tag, $empty = FALSE) {
+		$this->orig_obj->{$this->orig_close_method}($parser, strtoupper($tag), $empty);
+	}
 }
 /**
 * Breaks up data by linefeed characters, resulting in additional
@@ -130,40 +130,40 @@ 
 * @access protected
 */
 class TSax3_Linefeed {
-    /**
-    * Original handler object
-    * @var object
-    * @access private
-    */
-    private $orig_obj;
-    /**
-    * Original handler method
-    * @var string
-    * @access private
-    */
-    private $orig_method;
-    /**
-    * Constructs TSax3_LineFeed
-    * @param object handler object being decorated
-    * @param string original handler method
-    * @access protected
-    */
-    function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
-        $this->orig_method = $orig_method;
-    }
-    /**
-    * Breaks the data up by linefeeds
-    * @param TSax3
-    * @param string element data
-    * @access protected
-    */
-    function breakData(&$parser, $data) {
-        $data = explode("\n",$data);
-        foreach ( $data as $chunk ) {
-            $this->orig_obj->{$this->orig_method}($parser, $chunk);
-        }
-    }
+	/**
+	 * Original handler object
+	 * @var object
+	 * @access private
+	 */
+	private $orig_obj;
+	/**
+	 * Original handler method
+	 * @var string
+	 * @access private
+	 */
+	private $orig_method;
+	/**
+	 * Constructs TSax3_LineFeed
+	 * @param object handler object being decorated
+	 * @param string original handler method
+	 * @access protected
+	 */
+	function __construct(&$orig_obj, $orig_method) {
+		$this->orig_obj =& $orig_obj;
+		$this->orig_method = $orig_method;
+	}
+	/**
+	 * Breaks the data up by linefeeds
+	 * @param TSax3
+	 * @param string element data
+	 * @access protected
+	 */
+	function breakData(&$parser, $data) {
+		$data = explode("\n",$data);
+		foreach ( $data as $chunk ) {
+			$this->orig_obj->{$this->orig_method}($parser, $chunk);
+		}
+	}
 }
 /**
 * Breaks up data by tab characters, resulting in additional
@@ -172,40 +172,40 @@ 
 * @access protected
 */
 class TSax3_Tab {
-    /**
-    * Original handler object
-    * @var object
-    * @access private
-    */
-    private $orig_obj;
-    /**
-    * Original handler method
-    * @var string
-    * @access private
-    */
-    private $orig_method;
-    /**
-    * Constructs TSax3_Tab
-    * @param object handler object being decorated
-    * @param string original handler method
-    * @access protected
-    */
-    function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
-        $this->orig_method = $orig_method;
-    }
-    /**
-    * Breaks the data up by linefeeds
-    * @param TSax3
-    * @param string element data
-    * @access protected
-    */
-    function breakData(&$parser, $data) {
-        $data = explode("\t",$data);
-        foreach ( $data as $chunk ) {
-            $this->orig_obj->{$this->orig_method}($this, $chunk);
-        }
-    }
+	/**
+	 * Original handler object
+	 * @var object
+	 * @access private
+	 */
+	private $orig_obj;
+	/**
+	 * Original handler method
+	 * @var string
+	 * @access private
+	 */
+	private $orig_method;
+	/**
+	 * Constructs TSax3_Tab
+	 * @param object handler object being decorated
+	 * @param string original handler method
+	 * @access protected
+	 */
+	function __construct(&$orig_obj, $orig_method) {
+		$this->orig_obj =& $orig_obj;
+		$this->orig_method = $orig_method;
+	}
+	/**
+	 * Breaks the data up by linefeeds
+	 * @param TSax3
+	 * @param string element data
+	 * @access protected
+	 */
+	function breakData(&$parser, $data) {
+		$data = explode("\t",$data);
+		foreach ( $data as $chunk ) {
+			$this->orig_obj->{$this->orig_method}($this, $chunk);
+		}
+	}
 }
 /**
 * Breaks up data by XML entities and parses them with html_entity_decode(),
@@ -215,50 +215,50 @@ 
 * @access protected
 */
 class TSax3_Entities_Parsed {
-    /**
-    * Original handler object
-    * @var object
-    * @access private
-    */
-    private $orig_obj;
-    /**
-    * Original handler method
-    * @var string
-    * @access private
-    */
-    private $orig_method;
-    /**
-    * Constructs TSax3_Entities_Parsed
-    * @param object handler object being decorated
-    * @param string original handler method
-    * @access protected
-    */
-    function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
-        $this->orig_method = $orig_method;
-    }
-    /**
-    * Breaks the data up by XML entities
-    * @param TSax3
-    * @param string element data
-    * @access protected
-    */
-    function breakData(&$parser, $data) {
-        $data = preg_split('/(&.+?;)/',$data,-1,PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-        foreach ( $data as $chunk ) {
-            $chunk = html_entity_decode($chunk,ENT_NOQUOTES);
-            $this->orig_obj->{$this->orig_method}($this, $chunk);
-        }
-    }
+	/**
+	 * Original handler object
+	 * @var object
+	 * @access private
+	 */
+	private $orig_obj;
+	/**
+	 * Original handler method
+	 * @var string
+	 * @access private
+	 */
+	private $orig_method;
+	/**
+	 * Constructs TSax3_Entities_Parsed
+	 * @param object handler object being decorated
+	 * @param string original handler method
+	 * @access protected
+	 */
+	function __construct(&$orig_obj, $orig_method) {
+		$this->orig_obj =& $orig_obj;
+		$this->orig_method = $orig_method;
+	}
+	/**
+	 * Breaks the data up by XML entities
+	 * @param TSax3
+	 * @param string element data
+	 * @access protected
+	 */
+	function breakData(&$parser, $data) {
+		$data = preg_split('/(&.+?;)/',$data,-1,PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+		foreach ( $data as $chunk ) {
+			$chunk = html_entity_decode($chunk,ENT_NOQUOTES);
+			$this->orig_obj->{$this->orig_method}($this, $chunk);
+		}
+	}
 }
 /**
 * Compatibility with older PHP versions
 */
 if (version_compare(phpversion(), '4.3', '<') && !function_exists('html_entity_decode') ) {
-    function html_entity_decode($str, $style=ENT_NOQUOTES) {
-        return strtr($str,
-            array_flip(get_html_translation_table(HTML_ENTITIES,$style)));
-    }
+	function html_entity_decode($str, $style=ENT_NOQUOTES) {
+		return strtr($str,
+			array_flip(get_html_translation_table(HTML_ENTITIES,$style)));
+	}
 }
 /**
 * Breaks up data by XML entities but leaves them unparsed,
@@ -267,40 +267,40 @@ 
 * @access protected
 */
 class TSax3_Entities_Unparsed {
-    /**
-    * Original handler object
-    * @var object
-    * @access private
-    */
-    private $orig_obj;
-    /**
-    * Original handler method
-    * @var string
-    * @access private
-    */
-    private $orig_method;
-    /**
-    * Constructs TSax3_Entities_Unparsed
-    * @param object handler object being decorated
-    * @param string original handler method
-    * @access protected
-    */
-    function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
-        $this->orig_method = $orig_method;
-    }
-    /**
-    * Breaks the data up by XML entities
-    * @param TSax3
-    * @param string element data
-    * @access protected
-    */
-    function breakData(&$parser, $data) {
-        $data = preg_split('/(&.+?;)/',$data,-1,PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-        foreach ( $data as $chunk ) {
-            $this->orig_obj->{$this->orig_method}($this, $chunk);
-        }
-    }
+	/**
+	 * Original handler object
+	 * @var object
+	 * @access private
+	 */
+	private $orig_obj;
+	/**
+	 * Original handler method
+	 * @var string
+	 * @access private
+	 */
+	private $orig_method;
+	/**
+	 * Constructs TSax3_Entities_Unparsed
+	 * @param object handler object being decorated
+	 * @param string original handler method
+	 * @access protected
+	 */
+	function __construct(&$orig_obj, $orig_method) {
+		$this->orig_obj =& $orig_obj;
+		$this->orig_method = $orig_method;
+	}
+	/**
+	 * Breaks the data up by XML entities
+	 * @param TSax3
+	 * @param string element data
+	 * @access protected
+	 */
+	function breakData(&$parser, $data) {
+		$data = preg_split('/(&.+?;)/',$data,-1,PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+		foreach ( $data as $chunk ) {
+			$this->orig_obj->{$this->orig_method}($this, $chunk);
+		}
+	}
 }
 
 /**
@@ -310,52 +310,52 @@ 
 * @access protected
 */
 class TSax3_Escape_Stripper {
-    /**
-    * Original handler object
-    * @var object
-    * @access private
-    */
-    private $orig_obj;
-    /**
-    * Original handler method
-    * @var string
-    * @access private
-    */
-    private $orig_method;
-    /**
-    * Constructs TSax3_Entities_Unparsed
-    * @param object handler object being decorated
-    * @param string original handler method
-    * @access protected
-    */
-    function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
-        $this->orig_method = $orig_method;
-    }
-    /**
-    * Breaks the data up by XML entities
-    * @param TSax3
-    * @param string element data
-    * @access protected
-    */
-    function strip(&$parser, $data) {
-        // Check for HTML comments first
-        if ( substr($data,0,2) == '--' ) {
-            $patterns = array(
-                '/^\-\-/',          // Opening comment: --
-                '/\-\-$/',          // Closing comment: --
-            );
-            $data = preg_replace($patterns,'',$data);
+	/**
+	 * Original handler object
+	 * @var object
+	 * @access private
+	 */
+	private $orig_obj;
+	/**
+	 * Original handler method
+	 * @var string
+	 * @access private
+	 */
+	private $orig_method;
+	/**
+	 * Constructs TSax3_Entities_Unparsed
+	 * @param object handler object being decorated
+	 * @param string original handler method
+	 * @access protected
+	 */
+	function __construct(&$orig_obj, $orig_method) {
+		$this->orig_obj =& $orig_obj;
+		$this->orig_method = $orig_method;
+	}
+	/**
+	 * Breaks the data up by XML entities
+	 * @param TSax3
+	 * @param string element data
+	 * @access protected
+	 */
+	function strip(&$parser, $data) {
+		// Check for HTML comments first
+		if ( substr($data,0,2) == '--' ) {
+			$patterns = array(
+				'/^\-\-/',          // Opening comment: --
+				'/\-\-$/',          // Closing comment: --
+			);
+			$data = preg_replace($patterns,'',$data);
 
-        // Check for XML CDATA sections (note: don't do both!)
-        } else if ( substr($data,0,1) == '[' ) {
-            $patterns = array(
-                '/^\[.*CDATA.*\[/s', // Opening CDATA
-                '/\].*\]$/s',       // Closing CDATA
-                );
-            $data = preg_replace($patterns,'',$data);
-        }
+		// Check for XML CDATA sections (note: don't do both!)
+		} else if ( substr($data,0,1) == '[' ) {
+			$patterns = array(
+				'/^\[.*CDATA.*\[/s', // Opening CDATA
+				'/\].*\]$/s',       // Closing CDATA
+				);
+			$data = preg_replace($patterns,'',$data);
+		}
 
-        $this->orig_obj->{$this->orig_method}($this, $data);
-    }
+		$this->orig_obj->{$this->orig_method}($this, $data);
+	}
 }