pradosoft / prado

framework/3rdParty/ReCaptcha/recaptchalib.php

Doc Comments +6 added lines

@@ -211,6 +211,9 @@ 
 
 /* Mailhide related code */
 
+/**
+ * @param string $ky
+ */
 function _recaptcha_aes_encrypt($val,$ky) {
 	if (! function_exists ("mcrypt_encrypt")) {
 		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
@@ -222,6 +225,9 @@ 
 }
 
 
+/**
+ * @param null|string $x
+ */
 function _recaptcha_mailhide_urlbase64 ($x) {
 	return strtr(base64_encode ($x), '+/', '-_');
 }

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>");
 	}
 	
 

Spacing +38 added lines, -38 removed lines

@@ -44,13 +44,13 @@ 
  * @param $data - array of string elements to be encoded
  * @return string - encoded request
  */
-function _recaptcha_qsencode ($data) {
+function _recaptcha_qsencode($data) {
         $req = "";
-        foreach ( $data as $key => $value )
-                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+        foreach ($data as $key => $value)
+                $req .= $key . '=' . urlencode(stripslashes($value)) . '&';
 
         // Cut the last '&'
-        $req=substr($req,0,strlen($req)-1);
+        $req = substr($req, 0, strlen($req) - 1);
         return $req;
 }
 
@@ -66,7 +66,7 @@ 
  */
 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";
@@ -77,13 +77,13 @@ 
         $http_request .= $req;
 
         $response = '';
-        if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
+        if (false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10))) {
                 die ('Could not open socket');
         }
 
         fwrite($fs, $http_request);
 
-        while ( !feof($fs) )
+        while (!feof($fs))
                 $response .= fgets($fs, 1160); // One TCP-IP packet
         fclose($fs);
         $response = explode("\r\n\r\n", $response, 2);
@@ -103,7 +103,7 @@ 
 
  * @return string - The HTML to be embedded in the user's form.
  */
-function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
+function recaptcha_get_html($pubkey, $error = null, $use_ssl = false)
 {
 	if ($pubkey == null || $pubkey == '') {
 		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
@@ -119,7 +119,7 @@ 
         if ($error) {
            $errorpart = "&amp;error=" . $error;
         }
-        return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
+        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/>
@@ -149,7 +149,7 @@ 
   * @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())
+function recaptcha_check_answer($privkey, $remoteip, $challenge, $response, $extra_params = array())
 {
 	if ($privkey == null || $privkey == '') {
 		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
@@ -169,8 +169,8 @@ 
                 return $recaptcha_response;
         }
 
-        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
-                                          array (
+        $response = _recaptcha_http_post(RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
+                                          array(
                                                  'privatekey' => $privkey,
                                                  'remoteip' => $remoteip,
                                                  'challenge' => $challenge,
@@ -178,10 +178,10 @@ 
                                                  ) + $extra_params
                                           );
 
-        $answers = explode ("\n", $response [1]);
+        $answers = explode("\n", $response [1]);
         $recaptcha_response = new ReCaptchaResponse();
 
-        if (trim ($answers [0]) == 'true') {
+        if (trim($answers [0]) == 'true') {
                 $recaptcha_response->is_valid = true;
         }
         else {
@@ -199,31 +199,31 @@ 
  * @param string $domain The domain where the page is hosted
  * @param string $appname The name of your application
  */
-function recaptcha_get_signup_url ($domain = null, $appname = null) {
-	return "https://www.google.com/recaptcha/admin/create?" .  _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname));
+function recaptcha_get_signup_url($domain = null, $appname = null) {
+	return "https://www.google.com/recaptcha/admin/create?" . _recaptcha_qsencode(array('domains' => $domain, 'app' => $appname));
 }
 
 function _recaptcha_aes_pad($val) {
 	$block_size = 16;
-	$numpad = $block_size - (strlen ($val) % $block_size);
-	return str_pad($val, strlen ($val) + $numpad, chr($numpad));
+	$numpad = $block_size - (strlen($val) % $block_size);
+	return str_pad($val, strlen($val) + $numpad, chr($numpad));
 }
 
 /* Mailhide related code */
 
-function _recaptcha_aes_encrypt($val,$ky) {
-	if (! function_exists ("mcrypt_encrypt")) {
+function _recaptcha_aes_encrypt($val, $ky) {
+	if (!function_exists("mcrypt_encrypt")) {
 		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
 	}
-	$mode=MCRYPT_MODE_CBC;   
-	$enc=MCRYPT_RIJNDAEL_128;
-	$val=_recaptcha_aes_pad($val);
+	$mode = MCRYPT_MODE_CBC;   
+	$enc = MCRYPT_RIJNDAEL_128;
+	$val = _recaptcha_aes_pad($val);
 	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
 }
 
 
-function _recaptcha_mailhide_urlbase64 ($x) {
-	return strtr(base64_encode ($x), '+/', '-_');
+function _recaptcha_mailhide_urlbase64($x) {
+	return strtr(base64_encode($x), '+/', '-_');
 }
 
 /* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
@@ -235,9 +235,9 @@ 
 	
 
 	$ky = pack('H*', $privkey);
-	$cryptmail = _recaptcha_aes_encrypt ($email, $ky);
+	$cryptmail = _recaptcha_aes_encrypt($email, $ky);
 	
-	return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
+	return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64($cryptmail);
 }
 
 /**
@@ -245,15 +245,15 @@ 
  * eg, given johndoe@example,com return ["john", "example.com"].
  * the email is then displayed as john...@example.com
  */
-function _recaptcha_mailhide_email_parts ($email) {
-	$arr = preg_split("/@/", $email );
+function _recaptcha_mailhide_email_parts($email) {
+	$arr = preg_split("/@/", $email);
 
-	if (strlen ($arr[0]) <= 4) {
-		$arr[0] = substr ($arr[0], 0, 1);
-	} else if (strlen ($arr[0]) <= 6) {
-		$arr[0] = substr ($arr[0], 0, 3);
+	if (strlen($arr[0]) <= 4) {
+		$arr[0] = substr($arr[0], 0, 1);
+	} else if (strlen($arr[0]) <= 6) {
+		$arr[0] = substr($arr[0], 0, 3);
 	} else {
-		$arr[0] = substr ($arr[0], 0, 4);
+		$arr[0] = substr($arr[0], 0, 4);
 	}
 	return $arr;
 }
@@ -265,11 +265,11 @@ 
  * http://www.google.com/recaptcha/mailhide/apikey
  */
 function recaptcha_mailhide_html($pubkey, $privkey, $email) {
-	$emailparts = _recaptcha_mailhide_email_parts ($email);
-	$url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
+	$emailparts = _recaptcha_mailhide_email_parts($email);
+	$url = recaptcha_mailhide_url($pubkey, $privkey, $email);
 	
-	return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
-		"' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
+	return htmlentities($emailparts[0]) . "<a href='" . htmlentities($url) .
+		"' onclick=\"window.open('" . htmlentities($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities($emailparts [1]);
 
 }
 

Braces +8 added lines, -6 removed lines

@@ -46,8 +46,9 @@ 
  */
 function _recaptcha_qsencode ($data) {
         $req = "";
-        foreach ( $data as $key => $value )
-                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+        foreach ( $data as $key => $value ) {
+                        $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+        }
 
         // Cut the last '&'
         $req=substr($req,0,strlen($req)-1);
@@ -83,8 +84,10 @@ 
 
         fwrite($fs, $http_request);
 
-        while ( !feof($fs) )
-                $response .= fgets($fs, 1160); // One TCP-IP packet
+        while ( !feof($fs) ) {
+                        $response .= fgets($fs, 1160);
+        }
+        // One TCP-IP packet
         fclose($fs);
         $response = explode("\r\n\r\n", $response, 2);
 
@@ -183,8 +186,7 @@ 
 
         if (trim ($answers [0]) == 'true') {
                 $recaptcha_response->is_valid = true;
-        }
-        else {
+        } else {
                 $recaptcha_response->is_valid = false;
                 $recaptcha_response->error = $answers [1];
         }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 
         $req = _recaptcha_qsencode ($data);
 
-        $http_request  = "POST $path HTTP/1.0\r\n";
+        $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";

framework/3rdParty/SafeHtml/HTMLSax3.php

Doc Comments +12 added lines, -3 removed lines

@@ -196,7 +196,7 @@ 
     /**
     * Returns the next character from the XML document or void if at end
     * @access protected
-    * @return mixed
+    * @return string|null
     */
     function scanCharacter() {
         if ($this->position < $this->length) {
@@ -332,6 +332,7 @@ 
     * parser options
     * @var TSax3 instance of user front end class
     * @access protected
+    * @param TSax3 $htmlsax
     */
     function __construct(& $htmlsax) {
         parent::__construct($htmlsax);
@@ -397,6 +398,7 @@ 
     * parser options
     * @var TSax3 instance of user front end class
     * @access protected
+    * @param TSax3 $htmlsax
     */
     function __construct(& $htmlsax) {
         parent::__construct($htmlsax);
@@ -508,7 +510,7 @@ 
     * if supplied argument is not an object.
     * @param object handler object containing SAX callback methods
     * @access public
-    * @return mixed
+    * @return boolean|null
     */
     function set_object(&$object) {
         if ( is_object($object) ) {
@@ -546,7 +548,7 @@ 
     * @param string name of parser option
     * @param int (optional) 1 to switch on, 0 for off
     * @access public
-    * @return boolean
+    * @return boolean|null
     */
     function set_option($name, $value=1) {
         if ( array_key_exists($name,$this->state_parser->parser_options) ) {
@@ -568,6 +570,7 @@ 
     * function myDataHander(& $parser,$data){}
     * </pre>
     * @param string name of method
+    * @param string $data_method
     * @access public
     * @return void
     * @see set_object
@@ -591,6 +594,8 @@ 
     * </pre>
     * @param string name of open method
     * @param string name of close method
+    * @param string $opening_method
+    * @param string $closing_method
     * @access public
     * @return void
     * @see set_object
@@ -610,6 +615,7 @@ 
     * function myPIHander(& $parser,$target, $data){}
     * </pre>
     * @param string name of method
+    * @param string $pi_method
     * @access public
     * @return void
     * @see set_object
@@ -628,6 +634,7 @@ 
     * function myEscapeHander(& $parser, $data){}
     * </pre>
     * @param string name of method
+    * @param string $escape_method
     * @access public
     * @return void
     * @see set_object
@@ -645,6 +652,7 @@ 
     * function myJaspHander(& $parser, $data){}
     * </pre>
     * @param string name of method
+    * @param string $jasp_method
     * @access public
     * @return void
     * @see set_object
@@ -684,6 +692,7 @@ 
     /**
     * Start parsing some XML
     * @param string XML document
+    * @param string $data
     * @access public
     * @return void
     */

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);
+	}
 }

Spacing +30 added lines, -30 removed lines

@@ -29,8 +29,8 @@ 
 * Required classes
 */
 
-require_once(dirname(__FILE__).'/HTMLSax3/States.php');
-require_once(dirname(__FILE__).'/HTMLSax3/Decorators.php');
+require_once(dirname(__FILE__) . '/HTMLSax3/States.php');
+require_once(dirname(__FILE__) . '/HTMLSax3/Decorators.php');
 
 /**
 * Base State Parser
@@ -246,56 +246,56 @@ 
     * @return void
     */
     function parse($data) {
-        if ($this->parser_options['XML_OPTION_TRIM_DATA_NODES']==1) {
+        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_object_data = & $decorator;
             $this->handler_method_data = 'trimData';
         }
-        if ($this->parser_options['XML_OPTION_CASE_FOLDING']==1) {
+        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';
+            $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) {
+        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_object_data = & $decorator;
             $this->handler_method_data = 'breakData';
         }
-        if ($this->parser_options['XML_OPTION_TAB_BREAK']==1) {
+        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_object_data = & $decorator;
             $this->handler_method_data = 'breakData';
         }
-        if ($this->parser_options['XML_OPTION_ENTITIES_UNPARSED']==1) {
+        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_object_data = & $decorator;
             $this->handler_method_data = 'breakData';
         }
-        if ($this->parser_options['XML_OPTION_ENTITIES_PARSED']==1) {
+        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_object_data = & $decorator;
             $this->handler_method_data = 'breakData';
         }
         // Note switched on by default
-        if ($this->parser_options['XML_OPTION_STRIP_ESCAPES']==1) {
+        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_object_escape = & $decorator;
             $this->handler_method_escape = 'strip';
         }
         $this->rawtext = $data;
@@ -511,12 +511,12 @@ 
     * @return mixed
     */
     function set_object(&$object) {
-        if ( is_object($object) ) {
-            $this->state_parser->handler_default =& $object;
+        if (is_object($object)) {
+            $this->state_parser->handler_default = & $object;
             return true;
         } else {
             require_once('PEAR.php');
-            PEAR::raiseError('TSax3::set_object requires '.
+            PEAR::raiseError('TSax3::set_object requires ' .
                 'an object instance');
         }
     }
@@ -548,13 +548,13 @@ 
     * @access public
     * @return boolean
     */
-    function set_option($name, $value=1) {
-        if ( array_key_exists($name,$this->state_parser->parser_options) ) {
+    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');
+            PEAR::raiseError('TSax3::set_option(' . $name . ') illegal');
         }
     }
 
@@ -573,7 +573,7 @@ 
     * @see set_object
     */
     function set_data_handler($data_method) {
-        $this->state_parser->handler_object_data =& $this->state_parser->handler_default;
+        $this->state_parser->handler_object_data = & $this->state_parser->handler_default;
         $this->state_parser->handler_method_data = $data_method;
     }
 
@@ -596,7 +596,7 @@ 
     * @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_object_element = & $this->state_parser->handler_default;
         $this->state_parser->handler_method_opening = $opening_method;
         $this->state_parser->handler_method_closing = $closing_method;
     }
@@ -615,7 +615,7 @@ 
     * @see set_object
     */
     function set_pi_handler($pi_method) {
-        $this->state_parser->handler_object_pi =& $this->state_parser->handler_default;
+        $this->state_parser->handler_object_pi = & $this->state_parser->handler_default;
         $this->state_parser->handler_method_pi = $pi_method;
     }
 
@@ -633,7 +633,7 @@ 
     * @see set_object
     */
     function set_escape_handler($escape_method) {
-        $this->state_parser->handler_object_escape =& $this->state_parser->handler_default;
+        $this->state_parser->handler_object_escape = & $this->state_parser->handler_default;
         $this->state_parser->handler_method_escape = $escape_method;
     }
 
@@ -649,8 +649,8 @@ 
     * @return void
     * @see set_object
     */
-    function set_jasp_handler ($jasp_method) {
-        $this->state_parser->handler_object_jasp =& $this->state_parser->handler_default;
+    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;
     }
 

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -214,7 +214,7 @@ 
     function scanUntilString($string) {
         $start = $this->position;
         $this->position = strpos($this->rawtext, $string, $start);
-        if ($this->position === FALSE) {
+        if ($this->position === false) {
             $this->position = $this->length;
         }
         return substr($this->rawtext, $start, $this->position - $start);
@@ -354,7 +354,7 @@ 
     */
     function scanUntilCharacters($string) {
         $startpos = $this->position;
-        while ($this->position < $this->length && strpos($string, $this->rawtext{$this->position}) === FALSE) {
+        while ($this->position < $this->length && strpos($string, $this->rawtext{$this->position}) === false) {
             $this->position++;
         }
         return substr($this->rawtext, $startpos, $this->position - $startpos);
@@ -367,7 +367,7 @@ 
     */
     function ignoreWhitespace() {
         while ($this->position < $this->length &&
-            strpos(" \n\r\t", $this->rawtext{$this->position}) !== FALSE) {
+            strpos(" \n\r\t", $this->rawtext{$this->position}) !== false) {
             $this->position++;
         }
     }

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

Doc Comments +12 added lines

@@ -48,6 +48,7 @@ 
     * Constructs TSax3_Trim
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
@@ -96,6 +97,8 @@ 
     * @param object handler object being decorated
     * @param string original open handler method
     * @param string original close handler method
+    * @param string $orig_open_method
+    * @param string $orig_close_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_open_method, $orig_close_method) {
@@ -146,6 +149,7 @@ 
     * Constructs TSax3_LineFeed
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
@@ -188,6 +192,7 @@ 
     * Constructs TSax3_Tab
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
@@ -231,6 +236,7 @@ 
     * Constructs TSax3_Entities_Parsed
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
@@ -255,6 +261,10 @@ 
 * Compatibility with older PHP versions
 */
 if (version_compare(phpversion(), '4.3', '<') && !function_exists('html_entity_decode') ) {
+
+    /**
+     * @param integer $style
+     */
     function html_entity_decode($str, $style=ENT_NOQUOTES) {
         return strtr($str,
             array_flip(get_html_translation_table(HTML_ENTITIES,$style)));
@@ -283,6 +293,7 @@ 
     * Constructs TSax3_Entities_Unparsed
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
@@ -326,6 +337,7 @@ 
     * Constructs TSax3_Entities_Unparsed
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {

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);
+	}
 }

Spacing +27 added lines, -27 removed lines

@@ -51,7 +51,7 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_method = $orig_method;
     }
     /**
@@ -99,7 +99,7 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_open_method, $orig_close_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_open_method = $orig_open_method;
         $this->orig_close_method = $orig_close_method;
     }
@@ -110,7 +110,7 @@ 
     * @param array tag attributes
     * @access protected
     */
-    function foldOpen(&$parser, $tag, $attrs=array(), $empty = FALSE) {
+    function foldOpen(&$parser, $tag, $attrs = array(), $empty = FALSE) {
         $this->orig_obj->{$this->orig_open_method}($parser, strtoupper($tag), $attrs, $empty);
     }
     /**
@@ -149,7 +149,7 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_method = $orig_method;
     }
     /**
@@ -159,8 +159,8 @@ 
     * @access protected
     */
     function breakData(&$parser, $data) {
-        $data = explode("\n",$data);
-        foreach ( $data as $chunk ) {
+        $data = explode("\n", $data);
+        foreach ($data as $chunk) {
             $this->orig_obj->{$this->orig_method}($parser, $chunk);
         }
     }
@@ -191,7 +191,7 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_method = $orig_method;
     }
     /**
@@ -201,8 +201,8 @@ 
     * @access protected
     */
     function breakData(&$parser, $data) {
-        $data = explode("\t",$data);
-        foreach ( $data as $chunk ) {
+        $data = explode("\t", $data);
+        foreach ($data as $chunk) {
             $this->orig_obj->{$this->orig_method}($this, $chunk);
         }
     }
@@ -234,7 +234,7 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_method = $orig_method;
     }
     /**
@@ -244,9 +244,9 @@ 
     * @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);
+        $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);
         }
     }
@@ -254,10 +254,10 @@ 
 /**
 * Compatibility with older PHP versions
 */
-if (version_compare(phpversion(), '4.3', '<') && !function_exists('html_entity_decode') ) {
-    function html_entity_decode($str, $style=ENT_NOQUOTES) {
+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)));
+            array_flip(get_html_translation_table(HTML_ENTITIES, $style)));
     }
 }
 /**
@@ -286,7 +286,7 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_method = $orig_method;
     }
     /**
@@ -296,8 +296,8 @@ 
     * @access protected
     */
     function breakData(&$parser, $data) {
-        $data = preg_split('/(&.+?;)/',$data,-1,PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-        foreach ( $data as $chunk ) {
+        $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);
         }
     }
@@ -329,7 +329,7 @@ 
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
-        $this->orig_obj =& $orig_obj;
+        $this->orig_obj = & $orig_obj;
         $this->orig_method = $orig_method;
     }
     /**
@@ -340,20 +340,20 @@ 
     */
     function strip(&$parser, $data) {
         // Check for HTML comments first
-        if ( substr($data,0,2) == '--' ) {
+        if (substr($data, 0, 2) == '--') {
             $patterns = array(
-                '/^\-\-/',          // Opening comment: --
-                '/\-\-$/',          // Closing comment: --
+                '/^\-\-/', // Opening comment: --
+                '/\-\-$/', // Closing comment: --
             );
-            $data = preg_replace($patterns,'',$data);
+            $data = preg_replace($patterns, '', $data);
 
         // Check for XML CDATA sections (note: don't do both!)
-        } else if ( substr($data,0,1) == '[' ) {
+        } else if (substr($data, 0, 1) == '[') {
             $patterns = array(
                 '/^\[.*CDATA.*\[/s', // Opening CDATA
-                '/\].*\]$/s',       // Closing CDATA
+                '/\].*\]$/s', // Closing CDATA
                 );
-            $data = preg_replace($patterns,'',$data);
+            $data = preg_replace($patterns, '', $data);
         }
 
         $this->orig_obj->{$this->orig_method}($this, $data);

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -110,7 +110,7 @@ 
     * @param array tag attributes
     * @access protected
     */
-    function foldOpen(&$parser, $tag, $attrs=array(), $empty = FALSE) {
+    function foldOpen(&$parser, $tag, $attrs=array(), $empty = false) {
         $this->orig_obj->{$this->orig_open_method}($parser, strtoupper($tag), $attrs, $empty);
     }
     /**
@@ -119,7 +119,7 @@ 
     * @param string tag name
     * @access protected
     */
-    function foldClose(&$parser, $tag, $empty = FALSE) {
+    function foldClose(&$parser, $tag, $empty = false) {
         $this->orig_obj->{$this->orig_close_method}($parser, strtoupper($tag), $empty);
     }
 }

framework/3rdParty/SafeHtml/TSafeHtmlParser.php

Doc Comments +1 added lines, -1 removed lines

@@ -480,7 +480,7 @@
     /**
      * Closing tag handler - called from HTMLSax
      *
-     * @param object $parsers HTML parser
+     * @param object $parser HTML parser
      * @param string $name    tag name
      * @return boolean
      * @access private

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]), '=').'-';
+	}
 }
 
 /*

Spacing +39 added lines, -39 removed lines

@@ -135,7 +135,7 @@ 
      * @var array
      * @access public
      */
-    public $singleTags = array('area', 'br', 'img', 'input', 'hr', 'wbr', );
+    public $singleTags = array('area', 'br', 'img', 'input', 'hr', 'wbr',);
 
     /**
      * List of dangerous tags (such tags will be deleted)
@@ -144,10 +144,10 @@ 
      * @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',
+        'applet', 'base', 'basefont', 'bgsound', 'blink', 'body',
+        'embed', 'frame', 'frameset', 'head', 'html', 'ilayer',
+        'iframe', 'layer', 'link', 'meta', 'object', 'style',
+        'title', 'script',
         );
 
     /**
@@ -157,7 +157,7 @@ 
      * @var array
      * @access public
      */
-    public $deleteTagsContent = array('script', 'style', 'title', 'xml', );
+    public $deleteTagsContent = array('script', 'style', 'title', 'xml',);
 
     /**
      * Type of protocols filtering ('white' or 'black')
@@ -174,11 +174,11 @@ 
      * @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',
+        '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',
         );
 
     /**
@@ -188,9 +188,9 @@ 
      * @access public
      */
     public $whiteProtocols = array(
-        'ed2k',   'file', 'ftp',  'gopher', 'http',  'https',
-        'irc',    'mailto', 'news', 'nntp', 'telnet', 'webcal',
-        'xmpp',   'callto',
+        'ed2k', 'file', 'ftp', 'gopher', 'http', 'https',
+        'irc', 'mailto', 'news', 'nntp', 'telnet', 'webcal',
+        'xmpp', 'callto',
         );
 
     /**
@@ -213,8 +213,8 @@ 
      * @access public
      */
     public $cssKeywords = array(
-        'absolute', 'behavior',       'behaviour',   'content', 'expression',
-        'fixed',    'include-source', 'moz-binding',
+        'absolute', 'behavior', 'behaviour', 'content', 'expression',
+        'fixed', 'include-source', 'moz-binding',
         );
 
     /**
@@ -235,11 +235,11 @@ 
      * @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',
+        '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',
         );
 
     /**
@@ -250,7 +250,7 @@ 
      */
     public $tableTags = array(
         'caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
-        'thead',   'tr',
+        'thead', 'tr',
         );
 
     /**
@@ -259,7 +259,7 @@ 
      * @var array
      * @access public
      */
-    public $listTags = array('dir', 'menu', 'ol', 'ul', 'dl', );
+    public $listTags = array('dir', 'menu', 'ol', 'ul', 'dl',);
 
     /**
      * List of dangerous attributes
@@ -276,7 +276,7 @@ 
      * @var array
      * @access public
      */
-    public $attributesNS = array('xml:lang', );
+    public $attributesNS = array('xml:lang',);
 
     /**
      * Constructs class
@@ -288,7 +288,7 @@ 
         //making regular expressions based on Proto & CSS arrays
         foreach ($this->blackProtocols as $proto) {
             $preg = "/[\s\x01-\x1F]*";
-            for ($i=0; $i<strlen($proto); $i++) {
+            for ($i = 0; $i < strlen($proto); $i++) {
                 $preg .= $proto{$i} . "[\s\x01-\x1F]*";
             }
             $preg .= ":/i";
@@ -308,7 +308,7 @@ 
      * @return boolean
      * @access private
      */
-    private function _writeAttrs ($attrs)
+    private function _writeAttrs($attrs)
     {
         if (is_array($attrs)) {
             foreach ($attrs as $name => $value) {
@@ -366,7 +366,7 @@ 
 
                 $tempval = preg_replace_callback(
                         '/&#(\d+);?/m',
-                        function ($matches) {
+                        function($matches) {
                             return chr($matches[0]);
                         },
                         $value
@@ -374,7 +374,7 @@ 
 
                 $tempval = preg_replace_callback(
                         '/&#x([0-9a-f]+);?/mi',
-                        function ($matches) {
+                        function($matches) {
                             return chr(hexdec($matches[0]));
                         },
                         $tempval
@@ -418,7 +418,7 @@ 
 
         if (in_array($name, $this->deleteTagsContent)) {
             array_push($this->_dcStack, $name);
-            $this->_dcCounter[$name] = isset($this->_dcCounter[$name]) ? $this->_dcCounter[$name]+1 : 1;
+            $this->_dcCounter[$name] = isset($this->_dcCounter[$name]) ? $this->_dcCounter[$name] + 1 : 1;
         }
         if (count($this->_dcStack) != 0) {
             return true;
@@ -456,7 +456,7 @@ 
 
         // 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->_listScope == $this->_liStack[count($this->_liStack) - 1])
         {
             $this->_closeHandler($parser, 'li');
         }
@@ -472,8 +472,8 @@ 
         $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;
+        array_push($this->_stack, $name);
+        $this->_counter[$name] = isset($this->_counter[$name]) ? $this->_counter[$name] + 1 : 1;
         return true;
     }
 
@@ -574,7 +574,7 @@ 
      * @return string Processed (X)HTML document
      * @access public
      */
-    public function getXHTML ()
+    public function getXHTML()
     {
         while ($tag = array_pop($this->_stack)) {
             $this->_closeTag($tag);
@@ -602,12 +602,12 @@ 
      * @return string Processed (X)HTML document
      * @access public
      */
-    public function parse($doc, $isUTF7=false)
+    public function parse($doc, $isUTF7 = false)
     {
 	   $this->clear();
 
        // Save all '<' symbols
-       $doc = preg_replace("/<(?=[^a-zA-Z\/\!\?\%])/", '&lt;', (string)$doc);
+       $doc = preg_replace("/<(?=[^a-zA-Z\/\!\?\%])/", '&lt;', (string) $doc);
 
        // Web documents shouldn't contains \x00 symbol
        $doc = str_replace("\x00", '', $doc);
@@ -616,16 +616,16 @@ 
        $doc = str_replace("\xC0\xBC", '&lt;', $doc);
 
        // UTF-7 encoding ASCII decode
-       if($isUTF7)
+       if ($isUTF7)
             $doc = $this->repackUTF7($doc);
 
        // Instantiate the parser
-       $parser= new TSax3();
+       $parser = new TSax3();
 
        // Set up the parser
        $parser->set_object($this);
 
-       $parser->set_element_handler('_openHandler','_closeHandler');
+       $parser->set_element_handler('_openHandler', '_closeHandler');
        $parser->set_data_handler('_dataHandler');
        $parser->set_escape_handler('_escapeHandler');
 
@@ -671,7 +671,7 @@ 
      */
     private function repackUTF7Back($str)
     {
-       return $str[1].'+'.rtrim(base64_encode($str[2]), '=').'-';
+       return $str[1] . '+' . rtrim(base64_encode($str[2]), '=') . '-';
     }
 }
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -331,7 +331,7 @@
                     }
                 }
 
-                if (($value === TRUE) || (is_null($value))) {
+                if (($value === true) || (is_null($value))) {
                     $value = $name;
                 }
 

framework/3rdParty/TextHighlighter/Text/Highlighter.php

Doc Comments +1 added lines, -1 removed lines

@@ -151,7 +151,6 @@ 
      * Called by subclssses' constructors to enable/disable
      * optional highlighter rules
      *
-     * @param array $defines  Conditional defines
      *
      * @access protected
      */
@@ -232,6 +231,7 @@ 
      * Helper function to find matching brackets
      *
      * @access private
+     * @param string $str
      */
     function _matchingBrackets($str)
     {

Spacing +20 added lines, -20 removed lines

@@ -32,12 +32,12 @@ 
     /**
      * use numbered list
      */
-    define ('HL_NUMBERS_LI'    ,    1);
+    define('HL_NUMBERS_LI', 1);
     /**
      * Use 2-column table with line numbers in left column and code in  right column.
      * Forces $options['tag'] = HL_TAG_PRE
      */
-    define ('HL_NUMBERS_TABLE'    , 2);
+    define('HL_NUMBERS_TABLE', 2);
     /**#@-*/
 }
 
@@ -46,7 +46,7 @@ 
 /**
  * for our purpose, it is infinity
  */
-define ('HL_INFINITY',      1000000000);
+define('HL_INFINITY', 1000000000);
 
 // }}}
 
@@ -163,7 +163,7 @@ 
             $defines = array();
         }
         foreach ($this->_conditions as $name => $actions) {
-            foreach($actions as $action) {
+            foreach ($actions as $action) {
                 $present = in_array($name, $defines);
                 if (!$action[1]) {
                     $present = !$present;
@@ -197,7 +197,7 @@ 
     public static function factory($lang, $options = array())
     {
         $lang = strtoupper($lang);
-        $langFile = dirname(__FILE__)."/Highlighter/$lang.php";
+        $langFile = dirname(__FILE__) . "/Highlighter/$lang.php";
         if (is_file($langFile))
         	include_once $langFile;
         else
@@ -256,7 +256,7 @@ 
         } else {
             $endpos = -1;
         }
-        preg_match ($this->_regs[$this->_state], $this->_str, $m, PREG_OFFSET_CAPTURE, $this->_pos);
+        preg_match($this->_regs[$this->_state], $this->_str, $m, PREG_OFFSET_CAPTURE, $this->_pos);
         $n = 1;
 
 
@@ -264,7 +264,7 @@ 
             if (!isset($m[$n])) {
                 break;
             }
-            if ($m[$n][1]>-1 && ($endpos == -1 || $m[$n][1] < $endpos)) {
+            if ($m[$n][1] > -1 && ($endpos == -1 || $m[$n][1] < $endpos)) {
                 if ($this->_states[$this->_state][$i] != -1) {
                     $this->_tokenStack[] = array($this->_delim[$this->_state][$i], $m[$n][0]);
                 } else {
@@ -272,17 +272,17 @@ 
                     if (isset($this->_parts[$this->_state][$i])) {
                         $parts = array();
                         $partpos = $m[$n][1];
-                        for ($j=1; $j<=$count; $j++) {
-                            if ($m[$j+$n][1] < 0) {
+                        for ($j = 1; $j <= $count; $j++) {
+                            if ($m[$j + $n][1] < 0) {
                                 continue;
                             }
                             if (isset($this->_parts[$this->_state][$i][$j])) {
-                                if ($m[$j+$n][1] > $partpos) {
-                                    array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$j+$n][1]-$partpos)));
+                                if ($m[$j + $n][1] > $partpos) {
+                                    array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$j + $n][1] - $partpos)));
                                 }
-                                array_unshift($parts, array($this->_parts[$this->_state][$i][$j], $m[$j+$n][0]));
+                                array_unshift($parts, array($this->_parts[$this->_state][$i][$j], $m[$j + $n][0]));
                             }
-                            $partpos = $m[$j+$n][1] + strlen($m[$j+$n][0]);
+                            $partpos = $m[$j + $n][1] + strlen($m[$j + $n][0]);
                         }
                         if ($partpos < $m[$n][1] + strlen($m[$n][0])) {
                             array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$n][1] - $partpos + strlen($m[$n][0]))));
@@ -302,7 +302,7 @@ 
                     }
                 }
                 if ($m[$n][1] > $this->_pos) {
-                    $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $m[$n][1]-$this->_pos));
+                    $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $m[$n][1] - $this->_pos));
                 }
                 $this->_pos = $m[$n][1] + strlen($m[$n][0]);
                 if ($this->_states[$this->_state][$i] != -1) {
@@ -313,13 +313,13 @@ 
                     $this->_state = $this->_states[$this->_state][$i];
                     $this->_endpattern = $this->_end[$this->_state];
                     if ($this->_subst[$l][$i]) {
-                        for ($k=0; $k<=$this->_counts[$l][$i]; $k++) {
-                            if (!isset($m[$i+$k])) {
+                        for ($k = 0; $k <= $this->_counts[$l][$i]; $k++) {
+                            if (!isset($m[$i + $k])) {
                                 break;
                             }
-                            $quoted = preg_quote($m[$n+$k][0], '/');
-                            $this->_endpattern = str_replace('%'.$k.'%', $quoted, $this->_endpattern);
-                            $this->_endpattern = str_replace('%b'.$k.'%', $this->_matchingBrackets($quoted), $this->_endpattern);
+                            $quoted = preg_quote($m[$n + $k][0], '/');
+                            $this->_endpattern = str_replace('%' . $k . '%', $quoted, $this->_endpattern);
+                            $this->_endpattern = str_replace('%b' . $k . '%', $this->_matchingBrackets($quoted), $this->_endpattern);
                         }
                     }
                 }
@@ -331,7 +331,7 @@ 
         if ($endpos > -1) {
             $this->_tokenStack[] = array($this->_lastdelim, $endmatch);
             if ($endpos > $this->_pos) {
-                $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $endpos-$this->_pos));
+                $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $endpos - $this->_pos));
             }
             list($this->_state, $this->_lastdelim, $this->_lastinner, $this->_endpattern) = array_pop($this->_stack);
             $this->_pos = $endpos + strlen($endmatch);

Indentation +298 added lines, -298 removed lines

@@ -25,20 +25,20 @@ 
 // BC trick : define constants related to default
 // renderer if needed
 if (!defined('HL_NUMBERS_LI')) {
-    /**#@+
+	/**#@+
      * Constant for use with $options['numbers']
      * @see Text_Highlighter_Renderer_Html::_init()
      */
-    /**
-     * use numbered list
-     */
-    define ('HL_NUMBERS_LI'    ,    1);
-    /**
-     * Use 2-column table with line numbers in left column and code in  right column.
-     * Forces $options['tag'] = HL_TAG_PRE
-     */
-    define ('HL_NUMBERS_TABLE'    , 2);
-    /**#@-*/
+	/**
+	 * use numbered list
+	 */
+	define ('HL_NUMBERS_LI'    ,    1);
+	/**
+	 * Use 2-column table with line numbers in left column and code in  right column.
+	 * Forces $options['tag'] = HL_TAG_PRE
+	 */
+	define ('HL_NUMBERS_TABLE'    , 2);
+	/**#@-*/
 }
 
 // }}}
@@ -92,295 +92,295 @@ 
 
 class Text_Highlighter
 {
-    // {{{ members
-
-    /**
-     * Syntax highlighting rules.
-     * Auto-generated classes set this var
-     *
-     * @access protected
-     * @see _init
-     * @var array
-     */
-    var $_syntax;
-
-    /**
-     * Renderer object.
-     *
-     * @access private
-     * @var array
-     */
-    var $_renderer;
-
-    /**
-     * Options. Keeped for BC
-     *
-     * @access protected
-     * @var array
-     */
-    var $_options = array();
-
-    /**
-     * Conditionds
-     *
-     * @access protected
-     * @var array
-     */
-    var $_conditions = array();
-
-    /**
-     * Disabled keywords
-     *
-     * @access protected
-     * @var array
-     */
-    var $_disabled = array();
-
-    /**
-     * Language
-     *
-     * @access protected
-     * @var string
-     */
-    var $_language = '';
-
-    // }}}
-    // {{{ _checkDefines
-
-    /**
-     * Called by subclssses' constructors to enable/disable
-     * optional highlighter rules
-     *
-     * @param array $defines  Conditional defines
-     *
-     * @access protected
-     */
-    function _checkDefines()
-    {
-        if (isset($this->_options['defines'])) {
-            $defines = $this->_options['defines'];
-        } else {
-            $defines = array();
-        }
-        foreach ($this->_conditions as $name => $actions) {
-            foreach($actions as $action) {
-                $present = in_array($name, $defines);
-                if (!$action[1]) {
-                    $present = !$present;
-                }
-                if ($present) {
-                    unset($this->_disabled[$action[0]]);
-                } else {
-                    $this->_disabled[$action[0]] = true;
-                }
-            }
-        }
-    }
-
-    // }}}
-    // {{{ factory
-
-    /**
-     * Create a new Highlighter object for specified language
-     *
-     * @param string $lang    language, for example "SQL"
-     * @param array  $options Rendering options. This
-     * parameter is only keeped for BC reasons, use
-     * {@link Text_Highlighter::setRenderer()} instead
-     *
-     * @return mixed a newly created Highlighter object, or
-     * a PEAR error object on error
-     *
-     * @static
-     * @access public
-     */
-    public static function factory($lang, $options = array())
-    {
-        $lang = strtoupper($lang);
-        $langFile = dirname(__FILE__)."/Highlighter/$lang.php";
-        if (is_file($langFile))
-        	include_once $langFile;
-        else
-        	return false;
-
-        $classname = 'Text_Highlighter_' . $lang;
-
-        if (!class_exists($classname))
-        	return false;
+	// {{{ members
+
+	/**
+	 * Syntax highlighting rules.
+	 * Auto-generated classes set this var
+	 *
+	 * @access protected
+	 * @see _init
+	 * @var array
+	 */
+	var $_syntax;
+
+	/**
+	 * Renderer object.
+	 *
+	 * @access private
+	 * @var array
+	 */
+	var $_renderer;
+
+	/**
+	 * Options. Keeped for BC
+	 *
+	 * @access protected
+	 * @var array
+	 */
+	var $_options = array();
+
+	/**
+	 * Conditionds
+	 *
+	 * @access protected
+	 * @var array
+	 */
+	var $_conditions = array();
+
+	/**
+	 * Disabled keywords
+	 *
+	 * @access protected
+	 * @var array
+	 */
+	var $_disabled = array();
+
+	/**
+	 * Language
+	 *
+	 * @access protected
+	 * @var string
+	 */
+	var $_language = '';
+
+	// }}}
+	// {{{ _checkDefines
+
+	/**
+	 * Called by subclssses' constructors to enable/disable
+	 * optional highlighter rules
+	 *
+	 * @param array $defines  Conditional defines
+	 *
+	 * @access protected
+	 */
+	function _checkDefines()
+	{
+		if (isset($this->_options['defines'])) {
+			$defines = $this->_options['defines'];
+		} else {
+			$defines = array();
+		}
+		foreach ($this->_conditions as $name => $actions) {
+			foreach($actions as $action) {
+				$present = in_array($name, $defines);
+				if (!$action[1]) {
+					$present = !$present;
+				}
+				if ($present) {
+					unset($this->_disabled[$action[0]]);
+				} else {
+					$this->_disabled[$action[0]] = true;
+				}
+			}
+		}
+	}
+
+	// }}}
+	// {{{ factory
+
+	/**
+	 * Create a new Highlighter object for specified language
+	 *
+	 * @param string $lang    language, for example "SQL"
+	 * @param array  $options Rendering options. This
+	 * parameter is only keeped for BC reasons, use
+	 * {@link Text_Highlighter::setRenderer()} instead
+	 *
+	 * @return mixed a newly created Highlighter object, or
+	 * a PEAR error object on error
+	 *
+	 * @static
+	 * @access public
+	 */
+	public static function factory($lang, $options = array())
+	{
+		$lang = strtoupper($lang);
+		$langFile = dirname(__FILE__)."/Highlighter/$lang.php";
+		if (is_file($langFile))
+			include_once $langFile;
+		else
+			return false;
+
+		$classname = 'Text_Highlighter_' . $lang;
+
+		if (!class_exists($classname))
+			return false;
 
 		return new $classname($options);
-    }
-
-    // }}}
-    // {{{ setRenderer
-
-    /**
-     * Set renderer object
-     *
-     * @param object $renderer  Text_Highlighter_Renderer
-     *
-     * @access public
-     */
-    function setRenderer($renderer)
-    {
-        $this->_renderer = $renderer;
-    }
-
-    // }}}
-
-    /**
-     * Helper function to find matching brackets
-     *
-     * @access private
-     */
-    function _matchingBrackets($str)
-    {
-        return strtr($str, '()<>[]{}', ')(><][}{');
-    }
-
-
-
-
-    function _getToken()
-    {
-        if (!empty($this->_tokenStack)) {
-            return array_pop($this->_tokenStack);
-        }
-        if ($this->_pos >= $this->_len) {
-            return NULL;
-        }
-
-        if ($this->_state != -1 && preg_match($this->_endpattern, $this->_str, $m, PREG_OFFSET_CAPTURE, $this->_pos)) {
-            $endpos = $m[0][1];
-            $endmatch = $m[0][0];
-        } else {
-            $endpos = -1;
-        }
-        preg_match ($this->_regs[$this->_state], $this->_str, $m, PREG_OFFSET_CAPTURE, $this->_pos);
-        $n = 1;
-
-
-         foreach ($this->_counts[$this->_state] as $i=>$count) {
-            if (!isset($m[$n])) {
-                break;
-            }
-            if ($m[$n][1]>-1 && ($endpos == -1 || $m[$n][1] < $endpos)) {
-                if ($this->_states[$this->_state][$i] != -1) {
-                    $this->_tokenStack[] = array($this->_delim[$this->_state][$i], $m[$n][0]);
-                } else {
-                    $inner = $this->_inner[$this->_state][$i];
-                    if (isset($this->_parts[$this->_state][$i])) {
-                        $parts = array();
-                        $partpos = $m[$n][1];
-                        for ($j=1; $j<=$count; $j++) {
-                            if ($m[$j+$n][1] < 0) {
-                                continue;
-                            }
-                            if (isset($this->_parts[$this->_state][$i][$j])) {
-                                if ($m[$j+$n][1] > $partpos) {
-                                    array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$j+$n][1]-$partpos)));
-                                }
-                                array_unshift($parts, array($this->_parts[$this->_state][$i][$j], $m[$j+$n][0]));
-                            }
-                            $partpos = $m[$j+$n][1] + strlen($m[$j+$n][0]);
-                        }
-                        if ($partpos < $m[$n][1] + strlen($m[$n][0])) {
-                            array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$n][1] - $partpos + strlen($m[$n][0]))));
-                        }
-                        $this->_tokenStack = array_merge($this->_tokenStack, $parts);
-                    } else {
-                        foreach ($this->_keywords[$this->_state][$i] as $g => $re) {
-                            if (isset($this->_disabled[$g])) {
-                                continue;
-                            }
-                            if (preg_match($re, $m[$n][0])) {
-                                $inner = $this->_kwmap[$g];
-                                break;
-                            }
-                        }
-                        $this->_tokenStack[] = array($inner, $m[$n][0]);
-                    }
-                }
-                if ($m[$n][1] > $this->_pos) {
-                    $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $m[$n][1]-$this->_pos));
-                }
-                $this->_pos = $m[$n][1] + strlen($m[$n][0]);
-                if ($this->_states[$this->_state][$i] != -1) {
-                    $this->_stack[] = array($this->_state, $this->_lastdelim, $this->_lastinner, $this->_endpattern);
-                    $this->_lastinner = $this->_inner[$this->_state][$i];
-                    $this->_lastdelim = $this->_delim[$this->_state][$i];
-                    $l = $this->_state;
-                    $this->_state = $this->_states[$this->_state][$i];
-                    $this->_endpattern = $this->_end[$this->_state];
-                    if ($this->_subst[$l][$i]) {
-                        for ($k=0; $k<=$this->_counts[$l][$i]; $k++) {
-                            if (!isset($m[$i+$k])) {
-                                break;
-                            }
-                            $quoted = preg_quote($m[$n+$k][0], '/');
-                            $this->_endpattern = str_replace('%'.$k.'%', $quoted, $this->_endpattern);
-                            $this->_endpattern = str_replace('%b'.$k.'%', $this->_matchingBrackets($quoted), $this->_endpattern);
-                        }
-                    }
-                }
-                return array_pop($this->_tokenStack);
-            }
-            $n += $count + 1;
-        }
-
-        if ($endpos > -1) {
-            $this->_tokenStack[] = array($this->_lastdelim, $endmatch);
-            if ($endpos > $this->_pos) {
-                $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $endpos-$this->_pos));
-            }
-            list($this->_state, $this->_lastdelim, $this->_lastinner, $this->_endpattern) = array_pop($this->_stack);
-            $this->_pos = $endpos + strlen($endmatch);
-            return array_pop($this->_tokenStack);
-        }
-        $p = $this->_pos;
-        $this->_pos = HL_INFINITY;
-        return array($this->_lastinner, substr($this->_str, $p));
-    }
-
-
-
-
-    // {{{ highlight
-
-    /**
-     * Highlights code
-     *
-     * @param  string $str      Code to highlight
-     * @access public
-     * @return string Highlighted text
-     *
-     */
-
-    function highlight($str)
-    {
-        if (!($this->_renderer)) {
-            include_once('Text/Highlighter/Renderer/Html.php');
-            $this->_renderer = new Text_Highlighter_Renderer_Html($this->_options);
-        }
-        $this->_state = -1;
-        $this->_pos = 0;
-        $this->_stack = array();
-        $this->_tokenStack = array();
-        $this->_lastinner = $this->_defClass;
-        $this->_lastdelim = $this->_defClass;
-        $this->_endpattern = '';
-        $this->_renderer->reset();
-        $this->_renderer->setCurrentLanguage($this->_language);
-        $this->_str = $this->_renderer->preprocess($str);
-        $this->_len = strlen($this->_str);
-        while ($token = $this->_getToken()) {
-            $this->_renderer->acceptToken($token[0], $token[1]);
-        }
-        $this->_renderer->finalize();
-        return $this->_renderer->getOutput();
-    }
-
-    // }}}
+	}
+
+	// }}}
+	// {{{ setRenderer
+
+	/**
+	 * Set renderer object
+	 *
+	 * @param object $renderer  Text_Highlighter_Renderer
+	 *
+	 * @access public
+	 */
+	function setRenderer($renderer)
+	{
+		$this->_renderer = $renderer;
+	}
+
+	// }}}
+
+	/**
+	 * Helper function to find matching brackets
+	 *
+	 * @access private
+	 */
+	function _matchingBrackets($str)
+	{
+		return strtr($str, '()<>[]{}', ')(><][}{');
+	}
+
+
+
+
+	function _getToken()
+	{
+		if (!empty($this->_tokenStack)) {
+			return array_pop($this->_tokenStack);
+		}
+		if ($this->_pos >= $this->_len) {
+			return NULL;
+		}
+
+		if ($this->_state != -1 && preg_match($this->_endpattern, $this->_str, $m, PREG_OFFSET_CAPTURE, $this->_pos)) {
+			$endpos = $m[0][1];
+			$endmatch = $m[0][0];
+		} else {
+			$endpos = -1;
+		}
+		preg_match ($this->_regs[$this->_state], $this->_str, $m, PREG_OFFSET_CAPTURE, $this->_pos);
+		$n = 1;
+
+
+		 foreach ($this->_counts[$this->_state] as $i=>$count) {
+			if (!isset($m[$n])) {
+				break;
+			}
+			if ($m[$n][1]>-1 && ($endpos == -1 || $m[$n][1] < $endpos)) {
+				if ($this->_states[$this->_state][$i] != -1) {
+					$this->_tokenStack[] = array($this->_delim[$this->_state][$i], $m[$n][0]);
+				} else {
+					$inner = $this->_inner[$this->_state][$i];
+					if (isset($this->_parts[$this->_state][$i])) {
+						$parts = array();
+						$partpos = $m[$n][1];
+						for ($j=1; $j<=$count; $j++) {
+							if ($m[$j+$n][1] < 0) {
+								continue;
+							}
+							if (isset($this->_parts[$this->_state][$i][$j])) {
+								if ($m[$j+$n][1] > $partpos) {
+									array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$j+$n][1]-$partpos)));
+								}
+								array_unshift($parts, array($this->_parts[$this->_state][$i][$j], $m[$j+$n][0]));
+							}
+							$partpos = $m[$j+$n][1] + strlen($m[$j+$n][0]);
+						}
+						if ($partpos < $m[$n][1] + strlen($m[$n][0])) {
+							array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$n][1] - $partpos + strlen($m[$n][0]))));
+						}
+						$this->_tokenStack = array_merge($this->_tokenStack, $parts);
+					} else {
+						foreach ($this->_keywords[$this->_state][$i] as $g => $re) {
+							if (isset($this->_disabled[$g])) {
+								continue;
+							}
+							if (preg_match($re, $m[$n][0])) {
+								$inner = $this->_kwmap[$g];
+								break;
+							}
+						}
+						$this->_tokenStack[] = array($inner, $m[$n][0]);
+					}
+				}
+				if ($m[$n][1] > $this->_pos) {
+					$this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $m[$n][1]-$this->_pos));
+				}
+				$this->_pos = $m[$n][1] + strlen($m[$n][0]);
+				if ($this->_states[$this->_state][$i] != -1) {
+					$this->_stack[] = array($this->_state, $this->_lastdelim, $this->_lastinner, $this->_endpattern);
+					$this->_lastinner = $this->_inner[$this->_state][$i];
+					$this->_lastdelim = $this->_delim[$this->_state][$i];
+					$l = $this->_state;
+					$this->_state = $this->_states[$this->_state][$i];
+					$this->_endpattern = $this->_end[$this->_state];
+					if ($this->_subst[$l][$i]) {
+						for ($k=0; $k<=$this->_counts[$l][$i]; $k++) {
+							if (!isset($m[$i+$k])) {
+								break;
+							}
+							$quoted = preg_quote($m[$n+$k][0], '/');
+							$this->_endpattern = str_replace('%'.$k.'%', $quoted, $this->_endpattern);
+							$this->_endpattern = str_replace('%b'.$k.'%', $this->_matchingBrackets($quoted), $this->_endpattern);
+						}
+					}
+				}
+				return array_pop($this->_tokenStack);
+			}
+			$n += $count + 1;
+		}
+
+		if ($endpos > -1) {
+			$this->_tokenStack[] = array($this->_lastdelim, $endmatch);
+			if ($endpos > $this->_pos) {
+				$this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $endpos-$this->_pos));
+			}
+			list($this->_state, $this->_lastdelim, $this->_lastinner, $this->_endpattern) = array_pop($this->_stack);
+			$this->_pos = $endpos + strlen($endmatch);
+			return array_pop($this->_tokenStack);
+		}
+		$p = $this->_pos;
+		$this->_pos = HL_INFINITY;
+		return array($this->_lastinner, substr($this->_str, $p));
+	}
+
+
+
+
+	// {{{ highlight
+
+	/**
+	 * Highlights code
+	 *
+	 * @param  string $str      Code to highlight
+	 * @access public
+	 * @return string Highlighted text
+	 *
+	 */
+
+	function highlight($str)
+	{
+		if (!($this->_renderer)) {
+			include_once('Text/Highlighter/Renderer/Html.php');
+			$this->_renderer = new Text_Highlighter_Renderer_Html($this->_options);
+		}
+		$this->_state = -1;
+		$this->_pos = 0;
+		$this->_stack = array();
+		$this->_tokenStack = array();
+		$this->_lastinner = $this->_defClass;
+		$this->_lastdelim = $this->_defClass;
+		$this->_endpattern = '';
+		$this->_renderer->reset();
+		$this->_renderer->setCurrentLanguage($this->_language);
+		$this->_str = $this->_renderer->preprocess($str);
+		$this->_len = strlen($this->_str);
+		while ($token = $this->_getToken()) {
+			$this->_renderer->acceptToken($token[0], $token[1]);
+		}
+		$this->_renderer->finalize();
+		return $this->_renderer->getOutput();
+	}
+
+	// }}}
 
 }
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -247,7 +247,7 @@
             return array_pop($this->_tokenStack);
         }
         if ($this->_pos >= $this->_len) {
-            return NULL;
+            return null;
         }
 
         if ($this->_state != -1 && preg_match($this->_endpattern, $this->_str, $m, PREG_OFFSET_CAPTURE, $this->_pos)) {

framework/3rdParty/TextHighlighter/Text/Highlighter/Generator.php

Doc Comments +1 added lines, -1 removed lines

@@ -262,6 +262,7 @@ 
     * Sets the input xml file to be parsed
     *
     * @param    string      Filename (full path)
+    * @param string $file
     * @return   boolean
     * @access   public
     */
@@ -768,7 +769,6 @@ 
     * Add an error message
     *
     * @param integer $code Error code
-    * @param mixed   $message Error message or array with error message parameters
     * @param integer $lineNo Source code line number
     * @access private
     */

Indentation +1092 added lines, -1092 removed lines

@@ -67,949 +67,949 @@ 
 
 class Text_Highlighter_Generator extends  XML_Parser
 {
-    // {{{ properties
-    /**
-    * Whether to do case folding.
-    * We have to declare it here, because XML_Parser
-    * sets case folding in constructor
-    *
-    * @var  boolean
-    */
-    var $folding = false;
-
-    /**
-    * Holds name of file with highlighting rules
-    *
-    * @var string
-    * @access private
-    */
-    var $_syntaxFile;
-
-    /**
-    * Current element being processed
-    *
-    * @var array
-    * @access private
-    */
-    var $_element;
-
-    /**
-    * List of regions
-    *
-    * @var array
-    * @access private
-    */
-    var $_regions = array();
-
-    /**
-    * List of blocks
-    *
-    * @var array
-    * @access private
-    */
-    var $_blocks = array();
-
-    /**
-    * List of keyword groups
-    *
-    * @var array
-    * @access private
-    */
-    var $_keywords = array();
-
-    /**
-    * List of authors
-    *
-    * @var array
-    * @access private
-    */
-    var $_authors = array();
-
-    /**
-    * Name of language
-    *
-    * @var string
-    * @access public
-    */
-    var $language = '';
-
-    /**
-    * Generated code
-    *
-    * @var string
-    * @access private
-    */
-    var $_code = '';
-
-    /**
-    * Default class
-    *
-    * @var string
-    * @access private
-    */
-    var $_defClass = 'default';
-
-    /**
-    * Comment
-    *
-    * @var string
-    * @access private
-    */
-    var $_comment = '';
-
-    /**
-    * Flag for comment processing
-    *
-    * @var boolean
-    * @access private
-    */
-    var $_inComment = false;
-
-    /**
-    * Sorting order of current block/region
-    *
-    * @var integer
-    * @access private
-    */
-    var $_blockOrder = 0;
-
-    /**
-    * Generation errors
-    *
-    * @var array
-    * @access private
-    */
-    var $_errors;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-    * Constructor
-    *
-    * @param string $syntaxFile Name of XML file
-    * with syntax highlighting rules
-    *
-    * @access public
-    */
-
-    function __construct($syntaxFile = '')
-    {
-        XML_Parser::XML_Parser(null, 'func');
-        $this->_errors = array();
-        $this->_declareErrorMessages();
-        if ($syntaxFile) {
-            $this->setInputFile($syntaxFile);
-        }
-    }
-
-    // }}}
-    // {{{ _formatError
-
-    /**
-    * Format error message
-    *
-    * @param int $code error code
-    * @param string $params parameters
-    * @param string $fileName file name
-    * @param int $lineNo line number
-    * @return  array
-    * @access  public
-    */
-    function _formatError($code, $params, $fileName, $lineNo)
-    {
-        $template = $this->_templates[$code];
-        $ret = call_user_func_array('sprintf', array_merge(array($template), $params));
-        if ($fileName) {
-            $ret = '[' . $fileName . '] ' . $ret;
-        }
-        if ($lineNo) {
-            $ret .= ' (line ' . $lineNo . ')';
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ declareErrorMessages
-
-    /**
-    * Set up error message templates
-    *
-    * @access  private
-    */
-    function _declareErrorMessages()
-    {
-        $this->_templates = array (
-        TEXT_HIGHLIGHTER_EMPTY_RE => 'Empty regular expression',
-        TEXT_HIGHLIGHTER_INVALID_RE => 'Invalid regular expression : %s',
-        TEXT_HIGHLIGHTER_EMPTY_OR_MISSING => 'Empty or missing %s',
-        TEXT_HIGHLIGHTER_EMPTY  => 'Empty %s',
-        TEXT_HIGHLIGHTER_REGION_REGION => 'Region %s refers undefined region %s',
-        TEXT_HIGHLIGHTER_REGION_BLOCK => 'Region %s refers undefined block %s',
-        TEXT_HIGHLIGHTER_BLOCK_REGION => 'Block %s refers undefined region %s',
-        TEXT_HIGHLIGHTER_KEYWORD_BLOCK => 'Keyword group %s refers undefined block %s',
-        TEXT_HIGHLIGHTER_KEYWORD_INHERITS => 'Keyword group %s inherits undefined block %s',
-        TEXT_HIGHLIGHTER_PARSE => '%s',
-        TEXT_HIGHLIGHTER_FILE_WRITE => 'Error writing file %s',
-        TEXT_HIGHLIGHTER_FILE_READ => '%s'
-        );
-    }
-
-    // }}}
-    // {{{ setInputFile
-
-    /**
-    * Sets the input xml file to be parsed
-    *
-    * @param    string      Filename (full path)
-    * @return   boolean
-    * @access   public
-    */
-    function setInputFile($file)
-    {
-        $this->_syntaxFile = $file;
-        $ret = parent::setInputFile($file);
-        if (PEAR::isError($ret)) {
-            $this->_error(TEXT_HIGHLIGHTER_FILE_READ, $ret->message);
-            return false;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ generate
-
-    /**
-    * Generates class code
-    *
-    * @access public
-    */
-
-    function generate()
-    {
-        $this->_regions    = array();
-        $this->_blocks     = array();
-        $this->_keywords   = array();
-        $this->language    = '';
-        $this->_code       = '';
-        $this->_defClass   = 'default';
-        $this->_comment    = '';
-        $this->_inComment  = false;
-        $this->_authors    = array();
-        $this->_blockOrder = 0;
-        $this->_errors   = array();
-
-        $ret = $this->parse();
-        if (PEAR::isError($ret)) {
-            $this->_error(TEXT_HIGHLIGHTER_PARSE, $ret->message);
-            return false;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ getCode
-
-    /**
-    * Returns generated code as a string.
-    *
-    * @return string Generated code
-    * @access public
-    */
-
-    function getCode()
-    {
-        return $this->_code;
-    }
-
-    // }}}
-    // {{{ saveCode
-
-    /**
-    * Saves generated class to file. Note that {@link Text_Highlighter::factory()}
-    * assumes that filename is uppercase (SQL.php, DTD.php, etc), and file
-    * is located in Text/Highlighter
-    *
-    * @param string $filename Name of file to write the code to
-    * @return boolean true on success, false on failure
-    * @access public
-    */
-
-    function saveCode($filename)
-    {
-        $f = @fopen($filename, 'wb');
-        if (!$f) {
-            $this->_error(TEXT_HIGHLIGHTER_FILE_WRITE, array('outfile'=>$filename));
-            return false;
-        }
-        fwrite ($f, $this->_code);
-        fclose($f);
-        return true;
-    }
-
-    // }}}
-    // {{{ hasErrors
-
-    /**
-    * Reports if there were errors
-    *
-    * @return boolean
-    * @access public
-    */
-
-    function hasErrors()
-    {
-        return count($this->_errors) > 0;
-    }
-
-    // }}}
-    // {{{ getErrors
-
-    /**
-    * Returns errors
-    *
-    * @return array
-    * @access public
-    */
-
-    function getErrors()
-    {
-        return $this->_errors;
-    }
-
-    // }}}
-    // {{{ _sortBlocks
-
-    /**
-    * Sorts blocks
-    *
-    * @access private
-    */
-
-    function _sortBlocks($b1, $b2) {
-        return $b1['order'] - $b2['order'];
-    }
-
-    // }}}
-    // {{{ _sortLookFor
-    /**
-    * Sort 'look for' list
-    * @return int
-    * @param string $b1
-    * @param string $b2
-    */
-    function _sortLookFor($b1, $b2) {
-        $o1 = isset($this->_blocks[$b1]) ? $this->_blocks[$b1]['order'] : $this->_regions[$b1]['order'];
-        $o2 = isset($this->_blocks[$b2]) ? $this->_blocks[$b2]['order'] : $this->_regions[$b2]['order'];
-        return $o1 - $o2;
-    }
-
-    // }}}
-    // {{{ _makeRE
-
-    /**
-    * Adds delimiters and modifiers to regular expression if necessary
-    *
-    * @param string $text Original RE
-    * @return string Final RE
-    * @access private
-    */
-    function _makeRE($text, $case = false)
-    {
-        if (!strlen($text)) {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_RE);
-        }
-        if (!strlen($text) || $text{0} != '/') {
-            $text = '/' . $text . '/';
-        }
-        if (!$case) {
-            $text .= 'i';
-        }
-        $php_errormsg = '';
-        @preg_match($text, '');
-        if ($php_errormsg) {
-            $this->_error(TEXT_HIGHLIGHTER_INVALID_RE, $php_errormsg);
-        }
-        preg_match ('#^/(.+)/(.*)$#', $text, $m);
-        if (@$m[2]) {
-            $text = '(?' . $m[2] . ')' . $m[1];
-        } else {
-            $text = $m[1];
-        }
-        return $text;
-    }
-
-    // }}}
-    // {{{ _exportArray
-
-    /**
-    * Exports array as PHP code
-    *
-    * @param array $array
-    * @return string Code
-    * @access private
-    */
-    function _exportArray($array)
-    {
-        $array = var_export($array, true);
-        return trim(preg_replace('~^(\s*)~m','        \1\1',$array));
-    }
-
-    // }}}
-    // {{{ _countSubpatterns
-    /**
-    * Find number of capturing suppaterns in regular expression
-    * @return int
-    * @param string $re Regular expression (without delimiters)
-    */
-    function _countSubpatterns($re)
-    {
-        preg_match_all('/' . $re . '/', '', $m);
-        return count($m)-1;
-    }
-
-    // }}}
-
-    /**#@+
+	// {{{ properties
+	/**
+	 * Whether to do case folding.
+	 * We have to declare it here, because XML_Parser
+	 * sets case folding in constructor
+	 *
+	 * @var  boolean
+	 */
+	var $folding = false;
+
+	/**
+	 * Holds name of file with highlighting rules
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_syntaxFile;
+
+	/**
+	 * Current element being processed
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_element;
+
+	/**
+	 * List of regions
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_regions = array();
+
+	/**
+	 * List of blocks
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_blocks = array();
+
+	/**
+	 * List of keyword groups
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_keywords = array();
+
+	/**
+	 * List of authors
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_authors = array();
+
+	/**
+	 * Name of language
+	 *
+	 * @var string
+	 * @access public
+	 */
+	var $language = '';
+
+	/**
+	 * Generated code
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_code = '';
+
+	/**
+	 * Default class
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_defClass = 'default';
+
+	/**
+	 * Comment
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $_comment = '';
+
+	/**
+	 * Flag for comment processing
+	 *
+	 * @var boolean
+	 * @access private
+	 */
+	var $_inComment = false;
+
+	/**
+	 * Sorting order of current block/region
+	 *
+	 * @var integer
+	 * @access private
+	 */
+	var $_blockOrder = 0;
+
+	/**
+	 * Generation errors
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_errors;
+
+	// }}}
+	// {{{ constructor
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $syntaxFile Name of XML file
+	 * with syntax highlighting rules
+	 *
+	 * @access public
+	 */
+
+	function __construct($syntaxFile = '')
+	{
+		XML_Parser::XML_Parser(null, 'func');
+		$this->_errors = array();
+		$this->_declareErrorMessages();
+		if ($syntaxFile) {
+			$this->setInputFile($syntaxFile);
+		}
+	}
+
+	// }}}
+	// {{{ _formatError
+
+	/**
+	 * Format error message
+	 *
+	 * @param int $code error code
+	 * @param string $params parameters
+	 * @param string $fileName file name
+	 * @param int $lineNo line number
+	 * @return  array
+	 * @access  public
+	 */
+	function _formatError($code, $params, $fileName, $lineNo)
+	{
+		$template = $this->_templates[$code];
+		$ret = call_user_func_array('sprintf', array_merge(array($template), $params));
+		if ($fileName) {
+			$ret = '[' . $fileName . '] ' . $ret;
+		}
+		if ($lineNo) {
+			$ret .= ' (line ' . $lineNo . ')';
+		}
+		return $ret;
+	}
+
+	// }}}
+	// {{{ declareErrorMessages
+
+	/**
+	 * Set up error message templates
+	 *
+	 * @access  private
+	 */
+	function _declareErrorMessages()
+	{
+		$this->_templates = array (
+		TEXT_HIGHLIGHTER_EMPTY_RE => 'Empty regular expression',
+		TEXT_HIGHLIGHTER_INVALID_RE => 'Invalid regular expression : %s',
+		TEXT_HIGHLIGHTER_EMPTY_OR_MISSING => 'Empty or missing %s',
+		TEXT_HIGHLIGHTER_EMPTY  => 'Empty %s',
+		TEXT_HIGHLIGHTER_REGION_REGION => 'Region %s refers undefined region %s',
+		TEXT_HIGHLIGHTER_REGION_BLOCK => 'Region %s refers undefined block %s',
+		TEXT_HIGHLIGHTER_BLOCK_REGION => 'Block %s refers undefined region %s',
+		TEXT_HIGHLIGHTER_KEYWORD_BLOCK => 'Keyword group %s refers undefined block %s',
+		TEXT_HIGHLIGHTER_KEYWORD_INHERITS => 'Keyword group %s inherits undefined block %s',
+		TEXT_HIGHLIGHTER_PARSE => '%s',
+		TEXT_HIGHLIGHTER_FILE_WRITE => 'Error writing file %s',
+		TEXT_HIGHLIGHTER_FILE_READ => '%s'
+		);
+	}
+
+	// }}}
+	// {{{ setInputFile
+
+	/**
+	 * Sets the input xml file to be parsed
+	 *
+	 * @param    string      Filename (full path)
+	 * @return   boolean
+	 * @access   public
+	 */
+	function setInputFile($file)
+	{
+		$this->_syntaxFile = $file;
+		$ret = parent::setInputFile($file);
+		if (PEAR::isError($ret)) {
+			$this->_error(TEXT_HIGHLIGHTER_FILE_READ, $ret->message);
+			return false;
+		}
+		return true;
+	}
+
+	// }}}
+	// {{{ generate
+
+	/**
+	 * Generates class code
+	 *
+	 * @access public
+	 */
+
+	function generate()
+	{
+		$this->_regions    = array();
+		$this->_blocks     = array();
+		$this->_keywords   = array();
+		$this->language    = '';
+		$this->_code       = '';
+		$this->_defClass   = 'default';
+		$this->_comment    = '';
+		$this->_inComment  = false;
+		$this->_authors    = array();
+		$this->_blockOrder = 0;
+		$this->_errors   = array();
+
+		$ret = $this->parse();
+		if (PEAR::isError($ret)) {
+			$this->_error(TEXT_HIGHLIGHTER_PARSE, $ret->message);
+			return false;
+		}
+		return true;
+	}
+
+	// }}}
+	// {{{ getCode
+
+	/**
+	 * Returns generated code as a string.
+	 *
+	 * @return string Generated code
+	 * @access public
+	 */
+
+	function getCode()
+	{
+		return $this->_code;
+	}
+
+	// }}}
+	// {{{ saveCode
+
+	/**
+	 * Saves generated class to file. Note that {@link Text_Highlighter::factory()}
+	 * assumes that filename is uppercase (SQL.php, DTD.php, etc), and file
+	 * is located in Text/Highlighter
+	 *
+	 * @param string $filename Name of file to write the code to
+	 * @return boolean true on success, false on failure
+	 * @access public
+	 */
+
+	function saveCode($filename)
+	{
+		$f = @fopen($filename, 'wb');
+		if (!$f) {
+			$this->_error(TEXT_HIGHLIGHTER_FILE_WRITE, array('outfile'=>$filename));
+			return false;
+		}
+		fwrite ($f, $this->_code);
+		fclose($f);
+		return true;
+	}
+
+	// }}}
+	// {{{ hasErrors
+
+	/**
+	 * Reports if there were errors
+	 *
+	 * @return boolean
+	 * @access public
+	 */
+
+	function hasErrors()
+	{
+		return count($this->_errors) > 0;
+	}
+
+	// }}}
+	// {{{ getErrors
+
+	/**
+	 * Returns errors
+	 *
+	 * @return array
+	 * @access public
+	 */
+
+	function getErrors()
+	{
+		return $this->_errors;
+	}
+
+	// }}}
+	// {{{ _sortBlocks
+
+	/**
+	 * Sorts blocks
+	 *
+	 * @access private
+	 */
+
+	function _sortBlocks($b1, $b2) {
+		return $b1['order'] - $b2['order'];
+	}
+
+	// }}}
+	// {{{ _sortLookFor
+	/**
+	 * Sort 'look for' list
+	 * @return int
+	 * @param string $b1
+	 * @param string $b2
+	 */
+	function _sortLookFor($b1, $b2) {
+		$o1 = isset($this->_blocks[$b1]) ? $this->_blocks[$b1]['order'] : $this->_regions[$b1]['order'];
+		$o2 = isset($this->_blocks[$b2]) ? $this->_blocks[$b2]['order'] : $this->_regions[$b2]['order'];
+		return $o1 - $o2;
+	}
+
+	// }}}
+	// {{{ _makeRE
+
+	/**
+	 * Adds delimiters and modifiers to regular expression if necessary
+	 *
+	 * @param string $text Original RE
+	 * @return string Final RE
+	 * @access private
+	 */
+	function _makeRE($text, $case = false)
+	{
+		if (!strlen($text)) {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_RE);
+		}
+		if (!strlen($text) || $text{0} != '/') {
+			$text = '/' . $text . '/';
+		}
+		if (!$case) {
+			$text .= 'i';
+		}
+		$php_errormsg = '';
+		@preg_match($text, '');
+		if ($php_errormsg) {
+			$this->_error(TEXT_HIGHLIGHTER_INVALID_RE, $php_errormsg);
+		}
+		preg_match ('#^/(.+)/(.*)$#', $text, $m);
+		if (@$m[2]) {
+			$text = '(?' . $m[2] . ')' . $m[1];
+		} else {
+			$text = $m[1];
+		}
+		return $text;
+	}
+
+	// }}}
+	// {{{ _exportArray
+
+	/**
+	 * Exports array as PHP code
+	 *
+	 * @param array $array
+	 * @return string Code
+	 * @access private
+	 */
+	function _exportArray($array)
+	{
+		$array = var_export($array, true);
+		return trim(preg_replace('~^(\s*)~m','        \1\1',$array));
+	}
+
+	// }}}
+	// {{{ _countSubpatterns
+	/**
+	 * Find number of capturing suppaterns in regular expression
+	 * @return int
+	 * @param string $re Regular expression (without delimiters)
+	 */
+	function _countSubpatterns($re)
+	{
+		preg_match_all('/' . $re . '/', '', $m);
+		return count($m)-1;
+	}
+
+	// }}}
+
+	/**#@+
     * @access private
     * @param resource $xp      XML parser resource
     * @param string   $elem    XML element name
     * @param array    $attribs XML element attributes
     */
 
-    // {{{ xmltag_Default
-
-    /**
-    * start handler for <default> element
-    */
-    function xmltag_Default($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
-        }
-        $this->_defClass = @$attribs['innerGroup'];
-    }
-
-    // }}}
-    // {{{ xmltag_Region
-
-    /**
-    * start handler for <region> element
-    */
-    function xmltag_Region($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['name']) || $attribs['name'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'region name');
-        }
-        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
-        }
-        $this->_element = array('name' => $attribs['name']);
-        $this->_element['line'] = xml_get_current_line_number($this->parser);
-        if (isset($attribs['case'])) {
-            $this->_element['case'] = $attribs['case'] == 'yes';
-        } else {
-            $this->_element['case'] = $this->_case;
-        }
-        $this->_element['innerGroup'] = $attribs['innerGroup'];
-        $this->_element['delimGroup'] = isset($attribs['delimGroup']) ?
-        $attribs['delimGroup'] :
-        $attribs['innerGroup'];
-        $this->_element['start'] = $this->_makeRE(@$attribs['start'], $this->_element['case']);
-        $this->_element['end'] = $this->_makeRE(@$attribs['end'], $this->_element['case']);
-        $this->_element['contained'] = @$attribs['contained'] == 'yes';
-        $this->_element['never-contained'] = @$attribs['never-contained'] == 'yes';
-        $this->_element['remember'] = @$attribs['remember'] == 'yes';
-        if (isset($attribs['startBOL']) && $attribs['startBOL'] == 'yes') {
-            $this->_element['startBOL'] = true;
-        }
-        if (isset($attribs['endBOL']) && $attribs['endBOL'] == 'yes') {
-            $this->_element['endBOL'] = true;
-        }
-        if (isset($attribs['neverAfter'])) {
-            $this->_element['neverafter'] = $this->_makeRE($attribs['neverAfter']);
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_Block
-
-    /**
-    * start handler for <block> element
-    */
-    function xmltag_Block($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['name']) || $attribs['name'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'block name');
-        }
-        if (isset($attribs['innerGroup']) && $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY, 'innerGroup');
-        }
-        $this->_element = array('name' => $attribs['name']);
-        $this->_element['line'] = xml_get_current_line_number($this->parser);
-        if (isset($attribs['case'])) {
-            $this->_element['case'] = $attribs['case'] == 'yes';
-        } else {
-            $this->_element['case'] = $this->_case;
-        }
-        if (isset($attribs['innerGroup'])) {
-            $this->_element['innerGroup'] = @$attribs['innerGroup'];
-        }
-        $this->_element['match'] = $this->_makeRE($attribs['match'], $this->_element['case']);
-        $this->_element['contained'] = @$attribs['contained'] == 'yes';
-        $this->_element['multiline'] = @$attribs['multiline'] == 'yes';
-        if (isset($attribs['BOL']) && $attribs['BOL'] == 'yes') {
-            $this->_element['BOL'] = true;
-        }
-        if (isset($attribs['neverAfter'])) {
-            $this->_element['neverafter'] = $this->_makeRE($attribs['neverAfter']);
-        }
-    }
-
-    // }}}
-    // {{{ cdataHandler
-
-    /**
-    * Character data handler. Used for comment
-    */
-    function cdataHandler($xp, $cdata)
-    {
-        if ($this->_inComment) {
-            $this->_comment .= $cdata;
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_Comment
-
-    /**
-    * start handler for <comment> element
-    */
-    function xmltag_Comment($xp, $elem, $attribs)
-    {
-        $this->_comment = '';
-        $this->_inComment = true;
-    }
-
-    // }}}
-    // {{{ xmltag_PartGroup
-
-    /**
-    * start handler for <partgroup> element
-    */
-    function xmltag_PartGroup($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
-        }
-        $this->_element['partClass'][$attribs['index']] = @$attribs['innerGroup'];
-    }
-
-    // }}}
-    // {{{ xmltag_PartClass
-
-    /**
-    * start handler for <partclass> element
-    */
-    function xmltag_PartClass($xp, $elem, $attribs)
-    {
-        $this->xmltag_PartGroup($xp, $elem, $attribs);
-    }
-
-    // }}}
-    // {{{ xmltag_Keywords
-
-    /**
-    * start handler for <keywords> element
-    */
-    function xmltag_Keywords($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['name']) || $attribs['name'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'keyword group name');
-        }
-        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
-        }
-        if (!isset($attribs['inherits']) || $attribs['inherits'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'inherits');
-        }
-        $this->_element = array('name'=>@$attribs['name']);
-        $this->_element['line'] = xml_get_current_line_number($this->parser);
-        $this->_element['innerGroup'] = @$attribs['innerGroup'];
-        if (isset($attribs['case'])) {
-            $this->_element['case'] = $attribs['case'] == 'yes';
-        } else {
-            $this->_element['case'] = $this->_case;
-        }
-        $this->_element['inherits'] = @$attribs['inherits'];
-        if (isset($attribs['otherwise'])) {
-            $this->_element['otherwise'] = $attribs['otherwise'];
-        }
-        if (isset($attribs['ifdef'])) {
-            $this->_element['ifdef'] = $attribs['ifdef'];
-        }
-        if (isset($attribs['ifndef'])) {
-            $this->_element['ifndef'] = $attribs['ifndef'];
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_Keyword
-
-    /**
-    * start handler for <keyword> element
-    */
-    function xmltag_Keyword($xp, $elem, $attribs)
-    {
-        if (!isset($attribs['match']) || $attribs['match'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'match');
-        }
-        $keyword = @$attribs['match'];
-        if (!$this->_element['case']) {
-            $keyword = strtolower($keyword);
-        }
-        $this->_element['match'][$keyword] = true;
-    }
-
-    // }}}
-    // {{{ xmltag_Contains
-
-    /**
-    * start handler for <contains> element
-    */
-    function xmltag_Contains($xp, $elem, $attribs)
-    {
-        $this->_element['contains-all'] = @$attribs['all'] == 'yes';
-        if (isset($attribs['region'])) {
-            $this->_element['contains']['region'][$attribs['region']] =
-            xml_get_current_line_number($this->parser);
-        }
-        if (isset($attribs['block'])) {
-            $this->_element['contains']['block'][$attribs['block']] =
-            xml_get_current_line_number($this->parser);
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_But
-
-    /**
-    * start handler for <but> element
-    */
-    function xmltag_But($xp, $elem, $attribs)
-    {
-        if (isset($attribs['region'])) {
-            $this->_element['not-contains']['region'][$attribs['region']] = true;
-        }
-        if (isset($attribs['block'])) {
-            $this->_element['not-contains']['block'][$attribs['block']] = true;
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_Onlyin
-
-    /**
-    * start handler for <onlyin> element
-    */
-    function xmltag_Onlyin($xp, $elem, $attribs)
-    {
-        if (!isset($attribs['region']) || $attribs['region'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'region');
-        }
-        $this->_element['onlyin'][$attribs['region']] = xml_get_current_line_number($this->parser);
-    }
-
-    // }}}
-    // {{{ xmltag_Author
-
-    /**
-    * start handler for <author> element
-    */
-    function xmltag_Author($xp, $elem, $attribs)
-    {
-        if (!isset($attribs['name']) || $attribs['name'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'author name');
-        }
-        $this->_authors[] = array(
-        'name'  => @$attribs['name'],
-        'email' => (string)@$attribs['email']
-        );
-    }
-
-    // }}}
-    // {{{ xmltag_Highlight
-
-    /**
-    * start handler for <highlight> element
-    */
-    function xmltag_Highlight($xp, $elem, $attribs)
-    {
-        if (!isset($attribs['lang']) || $attribs['lang'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'language name');
-        }
-        $this->_code = '';
-        $this->language = strtoupper(@$attribs['lang']);
-        $this->_case = @$attribs['case'] == 'yes';
-    }
-
-    // }}}
-
-    /**#@-*/
-
-    // {{{ _error
-
-    /**
-    * Add an error message
-    *
-    * @param integer $code Error code
-    * @param mixed   $message Error message or array with error message parameters
-    * @param integer $lineNo Source code line number
-    * @access private
-    */
-    function _error($code, $params = array(), $lineNo = 0)
-    {
-        if (!$lineNo && !empty($this->parser)) {
-            $lineNo = xml_get_current_line_number($this->parser);
-        }
-        $this->_errors[] = $this->_formatError($code, $params, $this->_syntaxFile, $lineNo);
-    }
-
-    // }}}
-    // {{{ _aliasAttributes
-
-    /**
-    * BC trick
-    *
-    * @param array $attrs attributes
-    */
-    function _aliasAttributes(&$attrs)
-    {
-        if (isset($attrs['innerClass']) && !isset($attrs['innerGroup'])) {
-            $attrs['innerGroup'] = $attrs['innerClass'];
-        }
-        if (isset($attrs['delimClass']) && !isset($attrs['delimGroup'])) {
-            $attrs['delimGroup'] = $attrs['delimClass'];
-        }
-        if (isset($attrs['partClass']) && !isset($attrs['partGroup'])) {
-            $attrs['partGroup'] = $attrs['partClass'];
-        }
-    }
-
-    // }}}
-
-    /**#@+
+	// {{{ xmltag_Default
+
+	/**
+	 * start handler for <default> element
+	 */
+	function xmltag_Default($xp, $elem, $attribs)
+	{
+		$this->_aliasAttributes($attribs);
+		if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
+		}
+		$this->_defClass = @$attribs['innerGroup'];
+	}
+
+	// }}}
+	// {{{ xmltag_Region
+
+	/**
+	 * start handler for <region> element
+	 */
+	function xmltag_Region($xp, $elem, $attribs)
+	{
+		$this->_aliasAttributes($attribs);
+		if (!isset($attribs['name']) || $attribs['name'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'region name');
+		}
+		if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
+		}
+		$this->_element = array('name' => $attribs['name']);
+		$this->_element['line'] = xml_get_current_line_number($this->parser);
+		if (isset($attribs['case'])) {
+			$this->_element['case'] = $attribs['case'] == 'yes';
+		} else {
+			$this->_element['case'] = $this->_case;
+		}
+		$this->_element['innerGroup'] = $attribs['innerGroup'];
+		$this->_element['delimGroup'] = isset($attribs['delimGroup']) ?
+		$attribs['delimGroup'] :
+		$attribs['innerGroup'];
+		$this->_element['start'] = $this->_makeRE(@$attribs['start'], $this->_element['case']);
+		$this->_element['end'] = $this->_makeRE(@$attribs['end'], $this->_element['case']);
+		$this->_element['contained'] = @$attribs['contained'] == 'yes';
+		$this->_element['never-contained'] = @$attribs['never-contained'] == 'yes';
+		$this->_element['remember'] = @$attribs['remember'] == 'yes';
+		if (isset($attribs['startBOL']) && $attribs['startBOL'] == 'yes') {
+			$this->_element['startBOL'] = true;
+		}
+		if (isset($attribs['endBOL']) && $attribs['endBOL'] == 'yes') {
+			$this->_element['endBOL'] = true;
+		}
+		if (isset($attribs['neverAfter'])) {
+			$this->_element['neverafter'] = $this->_makeRE($attribs['neverAfter']);
+		}
+	}
+
+	// }}}
+	// {{{ xmltag_Block
+
+	/**
+	 * start handler for <block> element
+	 */
+	function xmltag_Block($xp, $elem, $attribs)
+	{
+		$this->_aliasAttributes($attribs);
+		if (!isset($attribs['name']) || $attribs['name'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'block name');
+		}
+		if (isset($attribs['innerGroup']) && $attribs['innerGroup'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY, 'innerGroup');
+		}
+		$this->_element = array('name' => $attribs['name']);
+		$this->_element['line'] = xml_get_current_line_number($this->parser);
+		if (isset($attribs['case'])) {
+			$this->_element['case'] = $attribs['case'] == 'yes';
+		} else {
+			$this->_element['case'] = $this->_case;
+		}
+		if (isset($attribs['innerGroup'])) {
+			$this->_element['innerGroup'] = @$attribs['innerGroup'];
+		}
+		$this->_element['match'] = $this->_makeRE($attribs['match'], $this->_element['case']);
+		$this->_element['contained'] = @$attribs['contained'] == 'yes';
+		$this->_element['multiline'] = @$attribs['multiline'] == 'yes';
+		if (isset($attribs['BOL']) && $attribs['BOL'] == 'yes') {
+			$this->_element['BOL'] = true;
+		}
+		if (isset($attribs['neverAfter'])) {
+			$this->_element['neverafter'] = $this->_makeRE($attribs['neverAfter']);
+		}
+	}
+
+	// }}}
+	// {{{ cdataHandler
+
+	/**
+	 * Character data handler. Used for comment
+	 */
+	function cdataHandler($xp, $cdata)
+	{
+		if ($this->_inComment) {
+			$this->_comment .= $cdata;
+		}
+	}
+
+	// }}}
+	// {{{ xmltag_Comment
+
+	/**
+	 * start handler for <comment> element
+	 */
+	function xmltag_Comment($xp, $elem, $attribs)
+	{
+		$this->_comment = '';
+		$this->_inComment = true;
+	}
+
+	// }}}
+	// {{{ xmltag_PartGroup
+
+	/**
+	 * start handler for <partgroup> element
+	 */
+	function xmltag_PartGroup($xp, $elem, $attribs)
+	{
+		$this->_aliasAttributes($attribs);
+		if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
+		}
+		$this->_element['partClass'][$attribs['index']] = @$attribs['innerGroup'];
+	}
+
+	// }}}
+	// {{{ xmltag_PartClass
+
+	/**
+	 * start handler for <partclass> element
+	 */
+	function xmltag_PartClass($xp, $elem, $attribs)
+	{
+		$this->xmltag_PartGroup($xp, $elem, $attribs);
+	}
+
+	// }}}
+	// {{{ xmltag_Keywords
+
+	/**
+	 * start handler for <keywords> element
+	 */
+	function xmltag_Keywords($xp, $elem, $attribs)
+	{
+		$this->_aliasAttributes($attribs);
+		if (!isset($attribs['name']) || $attribs['name'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'keyword group name');
+		}
+		if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
+		}
+		if (!isset($attribs['inherits']) || $attribs['inherits'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'inherits');
+		}
+		$this->_element = array('name'=>@$attribs['name']);
+		$this->_element['line'] = xml_get_current_line_number($this->parser);
+		$this->_element['innerGroup'] = @$attribs['innerGroup'];
+		if (isset($attribs['case'])) {
+			$this->_element['case'] = $attribs['case'] == 'yes';
+		} else {
+			$this->_element['case'] = $this->_case;
+		}
+		$this->_element['inherits'] = @$attribs['inherits'];
+		if (isset($attribs['otherwise'])) {
+			$this->_element['otherwise'] = $attribs['otherwise'];
+		}
+		if (isset($attribs['ifdef'])) {
+			$this->_element['ifdef'] = $attribs['ifdef'];
+		}
+		if (isset($attribs['ifndef'])) {
+			$this->_element['ifndef'] = $attribs['ifndef'];
+		}
+	}
+
+	// }}}
+	// {{{ xmltag_Keyword
+
+	/**
+	 * start handler for <keyword> element
+	 */
+	function xmltag_Keyword($xp, $elem, $attribs)
+	{
+		if (!isset($attribs['match']) || $attribs['match'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'match');
+		}
+		$keyword = @$attribs['match'];
+		if (!$this->_element['case']) {
+			$keyword = strtolower($keyword);
+		}
+		$this->_element['match'][$keyword] = true;
+	}
+
+	// }}}
+	// {{{ xmltag_Contains
+
+	/**
+	 * start handler for <contains> element
+	 */
+	function xmltag_Contains($xp, $elem, $attribs)
+	{
+		$this->_element['contains-all'] = @$attribs['all'] == 'yes';
+		if (isset($attribs['region'])) {
+			$this->_element['contains']['region'][$attribs['region']] =
+			xml_get_current_line_number($this->parser);
+		}
+		if (isset($attribs['block'])) {
+			$this->_element['contains']['block'][$attribs['block']] =
+			xml_get_current_line_number($this->parser);
+		}
+	}
+
+	// }}}
+	// {{{ xmltag_But
+
+	/**
+	 * start handler for <but> element
+	 */
+	function xmltag_But($xp, $elem, $attribs)
+	{
+		if (isset($attribs['region'])) {
+			$this->_element['not-contains']['region'][$attribs['region']] = true;
+		}
+		if (isset($attribs['block'])) {
+			$this->_element['not-contains']['block'][$attribs['block']] = true;
+		}
+	}
+
+	// }}}
+	// {{{ xmltag_Onlyin
+
+	/**
+	 * start handler for <onlyin> element
+	 */
+	function xmltag_Onlyin($xp, $elem, $attribs)
+	{
+		if (!isset($attribs['region']) || $attribs['region'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'region');
+		}
+		$this->_element['onlyin'][$attribs['region']] = xml_get_current_line_number($this->parser);
+	}
+
+	// }}}
+	// {{{ xmltag_Author
+
+	/**
+	 * start handler for <author> element
+	 */
+	function xmltag_Author($xp, $elem, $attribs)
+	{
+		if (!isset($attribs['name']) || $attribs['name'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'author name');
+		}
+		$this->_authors[] = array(
+		'name'  => @$attribs['name'],
+		'email' => (string)@$attribs['email']
+		);
+	}
+
+	// }}}
+	// {{{ xmltag_Highlight
+
+	/**
+	 * start handler for <highlight> element
+	 */
+	function xmltag_Highlight($xp, $elem, $attribs)
+	{
+		if (!isset($attribs['lang']) || $attribs['lang'] === '') {
+			$this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'language name');
+		}
+		$this->_code = '';
+		$this->language = strtoupper(@$attribs['lang']);
+		$this->_case = @$attribs['case'] == 'yes';
+	}
+
+	// }}}
+
+	/**#@-*/
+
+	// {{{ _error
+
+	/**
+	 * Add an error message
+	 *
+	 * @param integer $code Error code
+	 * @param mixed   $message Error message or array with error message parameters
+	 * @param integer $lineNo Source code line number
+	 * @access private
+	 */
+	function _error($code, $params = array(), $lineNo = 0)
+	{
+		if (!$lineNo && !empty($this->parser)) {
+			$lineNo = xml_get_current_line_number($this->parser);
+		}
+		$this->_errors[] = $this->_formatError($code, $params, $this->_syntaxFile, $lineNo);
+	}
+
+	// }}}
+	// {{{ _aliasAttributes
+
+	/**
+	 * BC trick
+	 *
+	 * @param array $attrs attributes
+	 */
+	function _aliasAttributes(&$attrs)
+	{
+		if (isset($attrs['innerClass']) && !isset($attrs['innerGroup'])) {
+			$attrs['innerGroup'] = $attrs['innerClass'];
+		}
+		if (isset($attrs['delimClass']) && !isset($attrs['delimGroup'])) {
+			$attrs['delimGroup'] = $attrs['delimClass'];
+		}
+		if (isset($attrs['partClass']) && !isset($attrs['partGroup'])) {
+			$attrs['partGroup'] = $attrs['partClass'];
+		}
+	}
+
+	// }}}
+
+	/**#@+
     * @access private
     * @param resource $xp      XML parser resource
     * @param string   $elem    XML element name
     */
 
-    // {{{ xmltag_Comment_
-
-    /**
-    * end handler for <comment> element
-    */
-    function xmltag_Comment_($xp, $elem)
-    {
-        $this->_inComment = false;
-    }
-
-    // }}}
-    // {{{ xmltag_Region_
-
-    /**
-    * end handler for <region> element
-    */
-    function xmltag_Region_($xp, $elem)
-    {
-        $this->_element['type'] = 'region';
-        $this->_element['order'] = $this->_blockOrder ++;
-        $this->_regions[$this->_element['name']] = $this->_element;
-    }
-
-    // }}}
-    // {{{ xmltag_Keywords_
-
-    /**
-    * end handler for <keywords> element
-    */
-    function xmltag_Keywords_($xp, $elem)
-    {
-        $this->_keywords[$this->_element['name']] = $this->_element;
-    }
-
-    // }}}
-    // {{{ xmltag_Block_
-
-    /**
-    * end handler for <block> element
-    */
-    function xmltag_Block_($xp, $elem)
-    {
-        $this->_element['type'] = 'block';
-        $this->_element['order'] = $this->_blockOrder ++;
-        $this->_blocks[$this->_element['name']] = $this->_element;
-    }
-
-    // }}}
-    // {{{ xmltag_Highlight_
-
-    /**
-    * end handler for <highlight> element
-    */
-    function xmltag_Highlight_($xp, $elem)
-    {
-        $conditions = array();
-        $toplevel = array();
-        foreach ($this->_blocks as $i => $current) {
-            if (!$current['contained'] && !isset($current['onlyin'])) {
-                $toplevel[] = $i;
-            }
-            foreach ((array)@$current['onlyin'] as $region => $lineNo) {
-                if (!isset($this->_regions[$region])) {
-                    $this->_error(TEXT_HIGHLIGHTER_BLOCK_REGION,
-                    array(
-                    'block' => $current['name'],
-                    'region' => $region
-                    ));
-                }
-            }
-        }
-        foreach ($this->_regions as $i=>$current) {
-            if (!$current['contained'] && !isset($current['onlyin'])) {
-                $toplevel[] = $i;
-            }
-            foreach ((array)@$current['contains']['region'] as $region => $lineNo) {
-                if (!isset($this->_regions[$region])) {
-                    $this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
-                    array(
-                    'region1' => $current['name'],
-                    'region2' => $region
-                    ));
-                }
-            }
-            foreach ((array)@$current['contains']['block'] as $region => $lineNo) {
-                if (!isset($this->_blocks[$region])) {
-                    $this->_error(TEXT_HIGHLIGHTER_REGION_BLOCK,
-                    array(
-                    'block' => $current['name'],
-                    'region' => $region
-                    ));
-                }
-            }
-            foreach ((array)@$current['onlyin'] as $region => $lineNo) {
-                if (!isset($this->_regions[$region])) {
-                    $this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
-                    array(
-                    'region1' => $current['name'],
-                    'region2' => $region
-                    ));
-                }
-            }
-            foreach ($this->_regions as $j => $region) {
-                if (isset($region['onlyin'])) {
-                    $suits = isset($region['onlyin'][$current['name']]);
-                } elseif (isset($current['not-contains']['region'][$region['name']])) {
-                    $suits = false;
-                } elseif (isset($current['contains']['region'][$region['name']])) {
-                    $suits = true;
-                } else {
-                    $suits = @$current['contains-all'] && @!$region['never-contained'];
-                }
-                if ($suits) {
-                    $this->_regions[$i]['lookfor'][] = $j;
-                }
-            }
-            foreach ($this->_blocks as $j=>$region) {
-                if (isset($region['onlyin'])) {
-                    $suits = isset($region['onlyin'][$current['name']]);
-                } elseif (isset($current['not-contains']['block'][$region['name']])) {
-                    $suits = false;
-                } elseif (isset($current['contains']['block'][$region['name']])) {
-                    $suits = true;
-                } else {
-                    $suits = @$current['contains-all'] && @!$region['never-contained'];
-                }
-                if ($suits) {
-                    $this->_regions[$i]['lookfor'][] = $j;
-                }
-            }
-        }
-        foreach ($this->_blocks as $i=>$current) {
-            unset ($this->_blocks[$i]['never-contained']);
-            unset ($this->_blocks[$i]['contained']);
-            unset ($this->_blocks[$i]['contains-all']);
-            unset ($this->_blocks[$i]['contains']);
-            unset ($this->_blocks[$i]['onlyin']);
-            unset ($this->_blocks[$i]['line']);
-        }
-
-        foreach ($this->_regions as $i=>$current) {
-            unset ($this->_regions[$i]['never-contained']);
-            unset ($this->_regions[$i]['contained']);
-            unset ($this->_regions[$i]['contains-all']);
-            unset ($this->_regions[$i]['contains']);
-            unset ($this->_regions[$i]['onlyin']);
-            unset ($this->_regions[$i]['line']);
-        }
-
-        foreach ($this->_keywords as $name => $keyword) {
-            if (isset($keyword['ifdef'])) {
-                $conditions[$keyword['ifdef']][] = array($name, true);
-            }
-            if (isset($keyword['ifndef'])) {
-                $conditions[$keyword['ifndef']][] = array($name, false);
-            }
-            unset($this->_keywords[$name]['line']);
-            if (!isset($this->_blocks[$keyword['inherits']])) {
-                $this->_error(TEXT_HIGHLIGHTER_KEYWORD_INHERITS,
-                array(
-                'keyword' => $keyword['name'],
-                'block' => $keyword['inherits']
-                ));
-            }
-            if (isset($keyword['otherwise']) && !isset($this->_blocks[$keyword['otherwise']]) ) {
-                $this->_error(TEXT_HIGHLIGHTER_KEYWORD_BLOCK,
-                array(
-                'keyword' => $keyword['name'],
-                'block' => $keyword['inherits']
-                ));
-            }
-        }
-
-        $syntax=array(
-        'keywords'   => $this->_keywords,
-        'blocks'     => array_merge($this->_blocks, $this->_regions),
-        'toplevel'   => $toplevel,
-        );
-        uasort($syntax['blocks'], array(&$this, '_sortBlocks'));
-        foreach ($syntax['blocks'] as $name => $block) {
-            if ($block['type'] == 'block') {
-                continue;
-            }
-            if (is_array(@$syntax['blocks'][$name]['lookfor'])) {
-                usort($syntax['blocks'][$name]['lookfor'], array(&$this, '_sortLookFor'));
-            }
-        }
-        usort($syntax['toplevel'], array(&$this, '_sortLookFor'));
-        $syntax['case'] = $this->_case;
-        $this->_code = <<<CODE
+	// {{{ xmltag_Comment_
+
+	/**
+	 * end handler for <comment> element
+	 */
+	function xmltag_Comment_($xp, $elem)
+	{
+		$this->_inComment = false;
+	}
+
+	// }}}
+	// {{{ xmltag_Region_
+
+	/**
+	 * end handler for <region> element
+	 */
+	function xmltag_Region_($xp, $elem)
+	{
+		$this->_element['type'] = 'region';
+		$this->_element['order'] = $this->_blockOrder ++;
+		$this->_regions[$this->_element['name']] = $this->_element;
+	}
+
+	// }}}
+	// {{{ xmltag_Keywords_
+
+	/**
+	 * end handler for <keywords> element
+	 */
+	function xmltag_Keywords_($xp, $elem)
+	{
+		$this->_keywords[$this->_element['name']] = $this->_element;
+	}
+
+	// }}}
+	// {{{ xmltag_Block_
+
+	/**
+	 * end handler for <block> element
+	 */
+	function xmltag_Block_($xp, $elem)
+	{
+		$this->_element['type'] = 'block';
+		$this->_element['order'] = $this->_blockOrder ++;
+		$this->_blocks[$this->_element['name']] = $this->_element;
+	}
+
+	// }}}
+	// {{{ xmltag_Highlight_
+
+	/**
+	 * end handler for <highlight> element
+	 */
+	function xmltag_Highlight_($xp, $elem)
+	{
+		$conditions = array();
+		$toplevel = array();
+		foreach ($this->_blocks as $i => $current) {
+			if (!$current['contained'] && !isset($current['onlyin'])) {
+				$toplevel[] = $i;
+			}
+			foreach ((array)@$current['onlyin'] as $region => $lineNo) {
+				if (!isset($this->_regions[$region])) {
+					$this->_error(TEXT_HIGHLIGHTER_BLOCK_REGION,
+					array(
+					'block' => $current['name'],
+					'region' => $region
+					));
+				}
+			}
+		}
+		foreach ($this->_regions as $i=>$current) {
+			if (!$current['contained'] && !isset($current['onlyin'])) {
+				$toplevel[] = $i;
+			}
+			foreach ((array)@$current['contains']['region'] as $region => $lineNo) {
+				if (!isset($this->_regions[$region])) {
+					$this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
+					array(
+					'region1' => $current['name'],
+					'region2' => $region
+					));
+				}
+			}
+			foreach ((array)@$current['contains']['block'] as $region => $lineNo) {
+				if (!isset($this->_blocks[$region])) {
+					$this->_error(TEXT_HIGHLIGHTER_REGION_BLOCK,
+					array(
+					'block' => $current['name'],
+					'region' => $region
+					));
+				}
+			}
+			foreach ((array)@$current['onlyin'] as $region => $lineNo) {
+				if (!isset($this->_regions[$region])) {
+					$this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
+					array(
+					'region1' => $current['name'],
+					'region2' => $region
+					));
+				}
+			}
+			foreach ($this->_regions as $j => $region) {
+				if (isset($region['onlyin'])) {
+					$suits = isset($region['onlyin'][$current['name']]);
+				} elseif (isset($current['not-contains']['region'][$region['name']])) {
+					$suits = false;
+				} elseif (isset($current['contains']['region'][$region['name']])) {
+					$suits = true;
+				} else {
+					$suits = @$current['contains-all'] && @!$region['never-contained'];
+				}
+				if ($suits) {
+					$this->_regions[$i]['lookfor'][] = $j;
+				}
+			}
+			foreach ($this->_blocks as $j=>$region) {
+				if (isset($region['onlyin'])) {
+					$suits = isset($region['onlyin'][$current['name']]);
+				} elseif (isset($current['not-contains']['block'][$region['name']])) {
+					$suits = false;
+				} elseif (isset($current['contains']['block'][$region['name']])) {
+					$suits = true;
+				} else {
+					$suits = @$current['contains-all'] && @!$region['never-contained'];
+				}
+				if ($suits) {
+					$this->_regions[$i]['lookfor'][] = $j;
+				}
+			}
+		}
+		foreach ($this->_blocks as $i=>$current) {
+			unset ($this->_blocks[$i]['never-contained']);
+			unset ($this->_blocks[$i]['contained']);
+			unset ($this->_blocks[$i]['contains-all']);
+			unset ($this->_blocks[$i]['contains']);
+			unset ($this->_blocks[$i]['onlyin']);
+			unset ($this->_blocks[$i]['line']);
+		}
+
+		foreach ($this->_regions as $i=>$current) {
+			unset ($this->_regions[$i]['never-contained']);
+			unset ($this->_regions[$i]['contained']);
+			unset ($this->_regions[$i]['contains-all']);
+			unset ($this->_regions[$i]['contains']);
+			unset ($this->_regions[$i]['onlyin']);
+			unset ($this->_regions[$i]['line']);
+		}
+
+		foreach ($this->_keywords as $name => $keyword) {
+			if (isset($keyword['ifdef'])) {
+				$conditions[$keyword['ifdef']][] = array($name, true);
+			}
+			if (isset($keyword['ifndef'])) {
+				$conditions[$keyword['ifndef']][] = array($name, false);
+			}
+			unset($this->_keywords[$name]['line']);
+			if (!isset($this->_blocks[$keyword['inherits']])) {
+				$this->_error(TEXT_HIGHLIGHTER_KEYWORD_INHERITS,
+				array(
+				'keyword' => $keyword['name'],
+				'block' => $keyword['inherits']
+				));
+			}
+			if (isset($keyword['otherwise']) && !isset($this->_blocks[$keyword['otherwise']]) ) {
+				$this->_error(TEXT_HIGHLIGHTER_KEYWORD_BLOCK,
+				array(
+				'keyword' => $keyword['name'],
+				'block' => $keyword['inherits']
+				));
+			}
+		}
+
+		$syntax=array(
+		'keywords'   => $this->_keywords,
+		'blocks'     => array_merge($this->_blocks, $this->_regions),
+		'toplevel'   => $toplevel,
+		);
+		uasort($syntax['blocks'], array(&$this, '_sortBlocks'));
+		foreach ($syntax['blocks'] as $name => $block) {
+			if ($block['type'] == 'block') {
+				continue;
+			}
+			if (is_array(@$syntax['blocks'][$name]['lookfor'])) {
+				usort($syntax['blocks'][$name]['lookfor'], array(&$this, '_sortLookFor'));
+			}
+		}
+		usort($syntax['toplevel'], array(&$this, '_sortLookFor'));
+		$syntax['case'] = $this->_case;
+		$this->_code = <<<CODE
 <?php
 /**
  * Auto-generated class. {$this->language} syntax highlighting
 CODE;
 
-        if ($this->_comment) {
-            $comment = preg_replace('~^~m',' * ',$this->_comment);
-            $this->_code .= "\n * \n" . $comment;
-        }
+		if ($this->_comment) {
+			$comment = preg_replace('~^~m',' * ',$this->_comment);
+			$this->_code .= "\n * \n" . $comment;
+		}
 
-        $this->_code .= <<<CODE
+		$this->_code .= <<<CODE
 
  *
  * PHP version 4 and 5
@@ -1029,15 +1029,15 @@ 
 
 CODE;
 
-        foreach ($this->_authors as $author) {
-            $this->_code .= ' * @author ' . $author['name'];
-            if ($author['email']) {
-                $this->_code .= ' <' . $author['email'] . '>';
-            }
-            $this->_code .= "\n";
-        }
+		foreach ($this->_authors as $author) {
+			$this->_code .= ' * @author ' . $author['name'];
+			if ($author['email']) {
+				$this->_code .= ' <' . $author['email'] . '>';
+			}
+			$this->_code .= "\n";
+		}
 
-        $this->_code .= <<<CODE
+		$this->_code .= <<<CODE
  *
  */
 
@@ -1046,16 +1046,16 @@ 
  *
 
 CODE;
-        foreach ($this->_authors as $author) {
-            $this->_code .= ' * @author ' . $author['name'];
-            if ($author['email']) {
-                $this->_code .= ' <' . $author['email']. '>';
-            }
-            $this->_code .= "\n";
-        }
+		foreach ($this->_authors as $author) {
+			$this->_code .= ' * @author ' . $author['name'];
+			if ($author['email']) {
+				$this->_code .= ' <' . $author['email']. '>';
+			}
+			$this->_code .= "\n";
+		}
 
 
-        $this->_code .= <<<CODE
+		$this->_code .= <<<CODE
  * @category   Text
  * @package    Text_Highlighter
  * @copyright  2004-2006 Andrey Demenev
@@ -1067,11 +1067,11 @@ 
 {
 
 CODE;
-        $this->_code .= 'var $_language = \'' . strtolower($this->language) . "';\n\n";
-        $array = var_export($syntax, true);
-        $array = trim(preg_replace('~^(\s*)~m','        \1\1',$array));
-        //        \$this->_syntax = $array;
-        $this->_code .= <<<CODE
+		$this->_code .= 'var $_language = \'' . strtolower($this->language) . "';\n\n";
+		$array = var_export($syntax, true);
+		$array = trim(preg_replace('~^(\s*)~m','        \1\1',$array));
+		//        \$this->_syntax = $array;
+		$this->_code .= <<<CODE
 
     /**
      *  Constructor
@@ -1083,154 +1083,154 @@ 
     {
 
 CODE;
-        $this->_code .= <<<CODE
+		$this->_code .= <<<CODE
 
         \$this->_options = \$options;
 CODE;
-        $states = array();
-        $i = 0;
-        foreach ($syntax['blocks'] as $name => $block) {
-            if ($block['type'] == 'region') {
-                $states[$name] = $i++;
-            }
-        }
-        $regs = array();
-        $counts = array();
-        $delim = array();
-        $inner = array();
-        $end = array();
-        $stat = array();
-        $keywords = array();
-        $parts = array();
-        $kwmap = array();
-        $subst = array();
-        $re = array();
-        $ce = array();
-        $rd = array();
-        $in = array();
-        $st = array();
-        $kw = array();
-        $sb = array();
-        foreach ($syntax['toplevel'] as $name) {
-            $block = $syntax['blocks'][$name];
-            if ($block['type'] == 'block') {
-                $kwm = array();
-                $re[] = '(' . $block['match'] . ')';
-                $ce[] = $this->_countSubpatterns($block['match']);
-                $rd[] = '';
-                $sb[] = false;;
-                $st[] = -1;
-                foreach ($syntax['keywords'] as $kwname => $kwgroup) {
-                    if ($kwgroup['inherits'] != $name) {
-                        continue;
-                    }
-                    $gre = implode('|', array_keys($kwgroup['match']));
-                    if (!$kwgroup['case']) {
-                        $gre = '(?i)' . $gre;
-                    }
-                    $kwm[$kwname][] =  $gre;
-                    $kwmap[$kwname] = $kwgroup['innerGroup'];
-                }
-                foreach ($kwm as $g => $ma) {
-                    $kwm[$g] = '/^(' . implode(')|(', $ma) . ')$/';
-                }
-                $kw[] = $kwm;
-            } else {
-                $kw[] = -1;
-                $re[] = '(' . $block['start'] . ')';
-                $ce[] = $this->_countSubpatterns($block['start']);
-                $rd[] = $block['delimGroup'];
-                $st[] = $states[$name];
-                $sb[] = $block['remember'];
-            }
-            $in[] = $block['innerGroup'];
-        }
-        $re = implode('|', $re);
-        $regs[-1] = '/' . $re . '/';
-        $counts[-1] = $ce;
-        $delim[-1] = $rd;
-        $inner[-1] = $in;
-        $stat[-1] = $st;
-        $keywords[-1] = $kw;
-        $subst[-1] = $sb;
-
-        foreach ($syntax['blocks'] as $ablock) {
-            if ($ablock['type'] != 'region') {
-                continue;
-            }
-            $end[] = '/' . $ablock['end'] . '/';
-            $re = array();
-            $ce = array();
-            $rd = array();
-            $in = array();
-            $st = array();
-            $kw = array();
-            $pc = array();
-            $sb = array();
-            foreach ((array)@$ablock['lookfor'] as $name) {
-                $block = $syntax['blocks'][$name];
-                if (isset($block['partClass'])) {
-                    $pc[] = $block['partClass'];
-                } else {
-                    $pc[] = null;
-                }
-                if ($block['type'] == 'block') {
-                    $kwm = array();;
-                    $re[] = '(' . $block['match'] . ')';
-                    $ce[] = $this->_countSubpatterns($block['match']);
-                    $rd[] = '';
-                    $sb[] = false;
-                    $st[] = -1;
-                    foreach ($syntax['keywords'] as $kwname => $kwgroup) {
-                        if ($kwgroup['inherits'] != $name) {
-                            continue;
-                        }
-                        $gre = implode('|', array_keys($kwgroup['match']));
-                        if (!$kwgroup['case']) {
-                            $gre = '(?i)' . $gre;
-                        }
-                        $kwm[$kwname][] =  $gre;
-                        $kwmap[$kwname] = $kwgroup['innerGroup'];
-                    }
-                    foreach ($kwm as $g => $ma) {
-                        $kwm[$g] = '/^(' . implode(')|(', $ma) . ')$/';
-                    }
-                    $kw[] = $kwm;
-                } else {
-                    $sb[] = $block['remember'];
-                    $kw[] = -1;
-                    $re[] = '(' . $block['start'] . ')';
-                    $ce[] = $this->_countSubpatterns($block['start']);
-                    $rd[] = $block['delimGroup'];
-                    $st[] = $states[$name];
-                }
-                $in[] = $block['innerGroup'];
-            }
-            $re = implode('|', $re);
-            $regs[] = '/' . $re . '/';
-            $counts[] = $ce;
-            $delim[] = $rd;
-            $inner[] = $in;
-            $stat[] = $st;
-            $keywords[] = $kw;
-            $parts[] = $pc;
-            $subst[] = $sb;
-        }
-
-
-        $this->_code .= "\n        \$this->_regs = " . $this->_exportArray($regs);
-        $this->_code .= ";\n        \$this->_counts = " .$this->_exportArray($counts);
-        $this->_code .= ";\n        \$this->_delim = " .$this->_exportArray($delim);
-        $this->_code .= ";\n        \$this->_inner = " .$this->_exportArray($inner);
-        $this->_code .= ";\n        \$this->_end = " .$this->_exportArray($end);
-        $this->_code .= ";\n        \$this->_states = " .$this->_exportArray($stat);
-        $this->_code .= ";\n        \$this->_keywords = " .$this->_exportArray($keywords);
-        $this->_code .= ";\n        \$this->_parts = " .$this->_exportArray($parts);
-        $this->_code .= ";\n        \$this->_subst = " .$this->_exportArray($subst);
-        $this->_code .= ";\n        \$this->_conditions = " .$this->_exportArray($conditions);
-        $this->_code .= ";\n        \$this->_kwmap = " .$this->_exportArray($kwmap);
-        $this->_code .= ";\n        \$this->_defClass = '" .$this->_defClass . '\'';
-        $this->_code .= <<<CODE
+		$states = array();
+		$i = 0;
+		foreach ($syntax['blocks'] as $name => $block) {
+			if ($block['type'] == 'region') {
+				$states[$name] = $i++;
+			}
+		}
+		$regs = array();
+		$counts = array();
+		$delim = array();
+		$inner = array();
+		$end = array();
+		$stat = array();
+		$keywords = array();
+		$parts = array();
+		$kwmap = array();
+		$subst = array();
+		$re = array();
+		$ce = array();
+		$rd = array();
+		$in = array();
+		$st = array();
+		$kw = array();
+		$sb = array();
+		foreach ($syntax['toplevel'] as $name) {
+			$block = $syntax['blocks'][$name];
+			if ($block['type'] == 'block') {
+				$kwm = array();
+				$re[] = '(' . $block['match'] . ')';
+				$ce[] = $this->_countSubpatterns($block['match']);
+				$rd[] = '';
+				$sb[] = false;;
+				$st[] = -1;
+				foreach ($syntax['keywords'] as $kwname => $kwgroup) {
+					if ($kwgroup['inherits'] != $name) {
+						continue;
+					}
+					$gre = implode('|', array_keys($kwgroup['match']));
+					if (!$kwgroup['case']) {
+						$gre = '(?i)' . $gre;
+					}
+					$kwm[$kwname][] =  $gre;
+					$kwmap[$kwname] = $kwgroup['innerGroup'];
+				}
+				foreach ($kwm as $g => $ma) {
+					$kwm[$g] = '/^(' . implode(')|(', $ma) . ')$/';
+				}
+				$kw[] = $kwm;
+			} else {
+				$kw[] = -1;
+				$re[] = '(' . $block['start'] . ')';
+				$ce[] = $this->_countSubpatterns($block['start']);
+				$rd[] = $block['delimGroup'];
+				$st[] = $states[$name];
+				$sb[] = $block['remember'];
+			}
+			$in[] = $block['innerGroup'];
+		}
+		$re = implode('|', $re);
+		$regs[-1] = '/' . $re . '/';
+		$counts[-1] = $ce;
+		$delim[-1] = $rd;
+		$inner[-1] = $in;
+		$stat[-1] = $st;
+		$keywords[-1] = $kw;
+		$subst[-1] = $sb;
+
+		foreach ($syntax['blocks'] as $ablock) {
+			if ($ablock['type'] != 'region') {
+				continue;
+			}
+			$end[] = '/' . $ablock['end'] . '/';
+			$re = array();
+			$ce = array();
+			$rd = array();
+			$in = array();
+			$st = array();
+			$kw = array();
+			$pc = array();
+			$sb = array();
+			foreach ((array)@$ablock['lookfor'] as $name) {
+				$block = $syntax['blocks'][$name];
+				if (isset($block['partClass'])) {
+					$pc[] = $block['partClass'];
+				} else {
+					$pc[] = null;
+				}
+				if ($block['type'] == 'block') {
+					$kwm = array();;
+					$re[] = '(' . $block['match'] . ')';
+					$ce[] = $this->_countSubpatterns($block['match']);
+					$rd[] = '';
+					$sb[] = false;
+					$st[] = -1;
+					foreach ($syntax['keywords'] as $kwname => $kwgroup) {
+						if ($kwgroup['inherits'] != $name) {
+							continue;
+						}
+						$gre = implode('|', array_keys($kwgroup['match']));
+						if (!$kwgroup['case']) {
+							$gre = '(?i)' . $gre;
+						}
+						$kwm[$kwname][] =  $gre;
+						$kwmap[$kwname] = $kwgroup['innerGroup'];
+					}
+					foreach ($kwm as $g => $ma) {
+						$kwm[$g] = '/^(' . implode(')|(', $ma) . ')$/';
+					}
+					$kw[] = $kwm;
+				} else {
+					$sb[] = $block['remember'];
+					$kw[] = -1;
+					$re[] = '(' . $block['start'] . ')';
+					$ce[] = $this->_countSubpatterns($block['start']);
+					$rd[] = $block['delimGroup'];
+					$st[] = $states[$name];
+				}
+				$in[] = $block['innerGroup'];
+			}
+			$re = implode('|', $re);
+			$regs[] = '/' . $re . '/';
+			$counts[] = $ce;
+			$delim[] = $rd;
+			$inner[] = $in;
+			$stat[] = $st;
+			$keywords[] = $kw;
+			$parts[] = $pc;
+			$subst[] = $sb;
+		}
+
+
+		$this->_code .= "\n        \$this->_regs = " . $this->_exportArray($regs);
+		$this->_code .= ";\n        \$this->_counts = " .$this->_exportArray($counts);
+		$this->_code .= ";\n        \$this->_delim = " .$this->_exportArray($delim);
+		$this->_code .= ";\n        \$this->_inner = " .$this->_exportArray($inner);
+		$this->_code .= ";\n        \$this->_end = " .$this->_exportArray($end);
+		$this->_code .= ";\n        \$this->_states = " .$this->_exportArray($stat);
+		$this->_code .= ";\n        \$this->_keywords = " .$this->_exportArray($keywords);
+		$this->_code .= ";\n        \$this->_parts = " .$this->_exportArray($parts);
+		$this->_code .= ";\n        \$this->_subst = " .$this->_exportArray($subst);
+		$this->_code .= ";\n        \$this->_conditions = " .$this->_exportArray($conditions);
+		$this->_code .= ";\n        \$this->_kwmap = " .$this->_exportArray($kwmap);
+		$this->_code .= ";\n        \$this->_defClass = '" .$this->_defClass . '\'';
+		$this->_code .= <<<CODE
 ;
         \$this->_checkDefines();
     }

Spacing +47 added lines, -48 removed lines

@@ -27,18 +27,18 @@ 
 
 // {{{ error codes
 
-define ('TEXT_HIGHLIGHTER_EMPTY_RE',          1);
-define ('TEXT_HIGHLIGHTER_INVALID_RE',        2);
-define ('TEXT_HIGHLIGHTER_EMPTY_OR_MISSING',  3);
-define ('TEXT_HIGHLIGHTER_EMPTY',             4);
-define ('TEXT_HIGHLIGHTER_REGION_REGION',     5);
-define ('TEXT_HIGHLIGHTER_REGION_BLOCK',      6);
-define ('TEXT_HIGHLIGHTER_BLOCK_REGION',      7);
-define ('TEXT_HIGHLIGHTER_KEYWORD_BLOCK',     8);
-define ('TEXT_HIGHLIGHTER_KEYWORD_INHERITS',  9);
-define ('TEXT_HIGHLIGHTER_PARSE',            10);
-define ('TEXT_HIGHLIGHTER_FILE_WRITE',       11);
-define ('TEXT_HIGHLIGHTER_FILE_READ',        12);
+define('TEXT_HIGHLIGHTER_EMPTY_RE', 1);
+define('TEXT_HIGHLIGHTER_INVALID_RE', 2);
+define('TEXT_HIGHLIGHTER_EMPTY_OR_MISSING', 3);
+define('TEXT_HIGHLIGHTER_EMPTY', 4);
+define('TEXT_HIGHLIGHTER_REGION_REGION', 5);
+define('TEXT_HIGHLIGHTER_REGION_BLOCK', 6);
+define('TEXT_HIGHLIGHTER_BLOCK_REGION', 7);
+define('TEXT_HIGHLIGHTER_KEYWORD_BLOCK', 8);
+define('TEXT_HIGHLIGHTER_KEYWORD_INHERITS', 9);
+define('TEXT_HIGHLIGHTER_PARSE', 10);
+define('TEXT_HIGHLIGHTER_FILE_WRITE', 11);
+define('TEXT_HIGHLIGHTER_FILE_READ', 12);
 // }}}
 
 /**
@@ -239,7 +239,7 @@ 
     */
     function _declareErrorMessages()
     {
-        $this->_templates = array (
+        $this->_templates = array(
         TEXT_HIGHLIGHTER_EMPTY_RE => 'Empty regular expression',
         TEXT_HIGHLIGHTER_INVALID_RE => 'Invalid regular expression : %s',
         TEXT_HIGHLIGHTER_EMPTY_OR_MISSING => 'Empty or missing %s',
@@ -297,7 +297,7 @@ 
         $this->_inComment  = false;
         $this->_authors    = array();
         $this->_blockOrder = 0;
-        $this->_errors   = array();
+        $this->_errors = array();
 
         $ret = $this->parse();
         if (PEAR::isError($ret)) {
@@ -342,7 +342,7 @@ 
             $this->_error(TEXT_HIGHLIGHTER_FILE_WRITE, array('outfile'=>$filename));
             return false;
         }
-        fwrite ($f, $this->_code);
+        fwrite($f, $this->_code);
         fclose($f);
         return true;
     }
@@ -430,7 +430,7 @@ 
         if ($php_errormsg) {
             $this->_error(TEXT_HIGHLIGHTER_INVALID_RE, $php_errormsg);
         }
-        preg_match ('#^/(.+)/(.*)$#', $text, $m);
+        preg_match('#^/(.+)/(.*)$#', $text, $m);
         if (@$m[2]) {
             $text = '(?' . $m[2] . ')' . $m[1];
         } else {
@@ -452,7 +452,7 @@ 
     function _exportArray($array)
     {
         $array = var_export($array, true);
-        return trim(preg_replace('~^(\s*)~m','        \1\1',$array));
+        return trim(preg_replace('~^(\s*)~m', '        \1\1', $array));
     }
 
     // }}}
@@ -465,7 +465,7 @@ 
     function _countSubpatterns($re)
     {
         preg_match_all('/' . $re . '/', '', $m);
-        return count($m)-1;
+        return count($m) - 1;
     }
 
     // }}}
@@ -515,8 +515,7 @@ 
         }
         $this->_element['innerGroup'] = $attribs['innerGroup'];
         $this->_element['delimGroup'] = isset($attribs['delimGroup']) ?
-        $attribs['delimGroup'] :
-        $attribs['innerGroup'];
+        $attribs['delimGroup'] : $attribs['innerGroup'];
         $this->_element['start'] = $this->_makeRE(@$attribs['start'], $this->_element['case']);
         $this->_element['end'] = $this->_makeRE(@$attribs['end'], $this->_element['case']);
         $this->_element['contained'] = @$attribs['contained'] == 'yes';
@@ -738,7 +737,7 @@ 
         }
         $this->_authors[] = array(
         'name'  => @$attribs['name'],
-        'email' => (string)@$attribs['email']
+        'email' => (string) @$attribs['email']
         );
     }
 
@@ -828,7 +827,7 @@ 
     function xmltag_Region_($xp, $elem)
     {
         $this->_element['type'] = 'region';
-        $this->_element['order'] = $this->_blockOrder ++;
+        $this->_element['order'] = $this->_blockOrder++;
         $this->_regions[$this->_element['name']] = $this->_element;
     }
 
@@ -852,7 +851,7 @@ 
     function xmltag_Block_($xp, $elem)
     {
         $this->_element['type'] = 'block';
-        $this->_element['order'] = $this->_blockOrder ++;
+        $this->_element['order'] = $this->_blockOrder++;
         $this->_blocks[$this->_element['name']] = $this->_element;
     }
 
@@ -870,7 +869,7 @@ 
             if (!$current['contained'] && !isset($current['onlyin'])) {
                 $toplevel[] = $i;
             }
-            foreach ((array)@$current['onlyin'] as $region => $lineNo) {
+            foreach ((array) @$current['onlyin'] as $region => $lineNo) {
                 if (!isset($this->_regions[$region])) {
                     $this->_error(TEXT_HIGHLIGHTER_BLOCK_REGION,
                     array(
@@ -884,7 +883,7 @@ 
             if (!$current['contained'] && !isset($current['onlyin'])) {
                 $toplevel[] = $i;
             }
-            foreach ((array)@$current['contains']['region'] as $region => $lineNo) {
+            foreach ((array) @$current['contains']['region'] as $region => $lineNo) {
                 if (!isset($this->_regions[$region])) {
                     $this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
                     array(
@@ -893,7 +892,7 @@ 
                     ));
                 }
             }
-            foreach ((array)@$current['contains']['block'] as $region => $lineNo) {
+            foreach ((array) @$current['contains']['block'] as $region => $lineNo) {
                 if (!isset($this->_blocks[$region])) {
                     $this->_error(TEXT_HIGHLIGHTER_REGION_BLOCK,
                     array(
@@ -902,7 +901,7 @@ 
                     ));
                 }
             }
-            foreach ((array)@$current['onlyin'] as $region => $lineNo) {
+            foreach ((array) @$current['onlyin'] as $region => $lineNo) {
                 if (!isset($this->_regions[$region])) {
                     $this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
                     array(
@@ -973,7 +972,7 @@ 
                 'block' => $keyword['inherits']
                 ));
             }
-            if (isset($keyword['otherwise']) && !isset($this->_blocks[$keyword['otherwise']]) ) {
+            if (isset($keyword['otherwise']) && !isset($this->_blocks[$keyword['otherwise']])) {
                 $this->_error(TEXT_HIGHLIGHTER_KEYWORD_BLOCK,
                 array(
                 'keyword' => $keyword['name'],
@@ -982,7 +981,7 @@ 
             }
         }
 
-        $syntax=array(
+        $syntax = array(
         'keywords'   => $this->_keywords,
         'blocks'     => array_merge($this->_blocks, $this->_regions),
         'toplevel'   => $toplevel,
@@ -1005,7 +1004,7 @@ 
 CODE;
 
         if ($this->_comment) {
-            $comment = preg_replace('~^~m',' * ',$this->_comment);
+            $comment = preg_replace('~^~m', ' * ', $this->_comment);
             $this->_code .= "\n * \n" . $comment;
         }
 
@@ -1049,7 +1048,7 @@ 
         foreach ($this->_authors as $author) {
             $this->_code .= ' * @author ' . $author['name'];
             if ($author['email']) {
-                $this->_code .= ' <' . $author['email']. '>';
+                $this->_code .= ' <' . $author['email'] . '>';
             }
             $this->_code .= "\n";
         }
@@ -1069,7 +1068,7 @@ 
 CODE;
         $this->_code .= 'var $_language = \'' . strtolower($this->language) . "';\n\n";
         $array = var_export($syntax, true);
-        $array = trim(preg_replace('~^(\s*)~m','        \1\1',$array));
+        $array = trim(preg_replace('~^(\s*)~m', '        \1\1', $array));
         //        \$this->_syntax = $array;
         $this->_code .= <<<CODE
 
@@ -1118,7 +1117,7 @@ 
                 $re[] = '(' . $block['match'] . ')';
                 $ce[] = $this->_countSubpatterns($block['match']);
                 $rd[] = '';
-                $sb[] = false;;
+                $sb[] = false; ;
                 $st[] = -1;
                 foreach ($syntax['keywords'] as $kwname => $kwgroup) {
                     if ($kwgroup['inherits'] != $name) {
@@ -1128,7 +1127,7 @@ 
                     if (!$kwgroup['case']) {
                         $gre = '(?i)' . $gre;
                     }
-                    $kwm[$kwname][] =  $gre;
+                    $kwm[$kwname][] = $gre;
                     $kwmap[$kwname] = $kwgroup['innerGroup'];
                 }
                 foreach ($kwm as $g => $ma) {
@@ -1167,7 +1166,7 @@ 
             $kw = array();
             $pc = array();
             $sb = array();
-            foreach ((array)@$ablock['lookfor'] as $name) {
+            foreach ((array) @$ablock['lookfor'] as $name) {
                 $block = $syntax['blocks'][$name];
                 if (isset($block['partClass'])) {
                     $pc[] = $block['partClass'];
@@ -1175,7 +1174,7 @@ 
                     $pc[] = null;
                 }
                 if ($block['type'] == 'block') {
-                    $kwm = array();;
+                    $kwm = array(); ;
                     $re[] = '(' . $block['match'] . ')';
                     $ce[] = $this->_countSubpatterns($block['match']);
                     $rd[] = '';
@@ -1189,7 +1188,7 @@ 
                         if (!$kwgroup['case']) {
                             $gre = '(?i)' . $gre;
                         }
-                        $kwm[$kwname][] =  $gre;
+                        $kwm[$kwname][] = $gre;
                         $kwmap[$kwname] = $kwgroup['innerGroup'];
                     }
                     foreach ($kwm as $g => $ma) {
@@ -1219,17 +1218,17 @@ 
 
 
         $this->_code .= "\n        \$this->_regs = " . $this->_exportArray($regs);
-        $this->_code .= ";\n        \$this->_counts = " .$this->_exportArray($counts);
-        $this->_code .= ";\n        \$this->_delim = " .$this->_exportArray($delim);
-        $this->_code .= ";\n        \$this->_inner = " .$this->_exportArray($inner);
-        $this->_code .= ";\n        \$this->_end = " .$this->_exportArray($end);
-        $this->_code .= ";\n        \$this->_states = " .$this->_exportArray($stat);
-        $this->_code .= ";\n        \$this->_keywords = " .$this->_exportArray($keywords);
-        $this->_code .= ";\n        \$this->_parts = " .$this->_exportArray($parts);
-        $this->_code .= ";\n        \$this->_subst = " .$this->_exportArray($subst);
-        $this->_code .= ";\n        \$this->_conditions = " .$this->_exportArray($conditions);
-        $this->_code .= ";\n        \$this->_kwmap = " .$this->_exportArray($kwmap);
-        $this->_code .= ";\n        \$this->_defClass = '" .$this->_defClass . '\'';
+        $this->_code .= ";\n        \$this->_counts = " . $this->_exportArray($counts);
+        $this->_code .= ";\n        \$this->_delim = " . $this->_exportArray($delim);
+        $this->_code .= ";\n        \$this->_inner = " . $this->_exportArray($inner);
+        $this->_code .= ";\n        \$this->_end = " . $this->_exportArray($end);
+        $this->_code .= ";\n        \$this->_states = " . $this->_exportArray($stat);
+        $this->_code .= ";\n        \$this->_keywords = " . $this->_exportArray($keywords);
+        $this->_code .= ";\n        \$this->_parts = " . $this->_exportArray($parts);
+        $this->_code .= ";\n        \$this->_subst = " . $this->_exportArray($subst);
+        $this->_code .= ";\n        \$this->_conditions = " . $this->_exportArray($conditions);
+        $this->_code .= ";\n        \$this->_kwmap = " . $this->_exportArray($kwmap);
+        $this->_code .= ";\n        \$this->_defClass = '" . $this->_defClass . '\'';
         $this->_code .= <<<CODE
 ;
         \$this->_checkDefines();

Upper-Lower-Casing +7 added lines, -7 removed lines

@@ -1002,7 +1002,7 @@ 
 <?php
 /**
  * Auto-generated class. {$this->language} syntax highlighting
-CODE;
+code;
 
         if ($this->_comment) {
             $comment = preg_replace('~^~m',' * ',$this->_comment);
@@ -1027,7 +1027,7 @@ 
  * @package    Text_Highlighter
  * @version    generated from: $this->_syntaxFile
 
-CODE;
+code;
 
         foreach ($this->_authors as $author) {
             $this->_code .= ' * @author ' . $author['name'];
@@ -1045,7 +1045,7 @@ 
  * Auto-generated class. {$this->language} syntax highlighting
  *
 
-CODE;
+code;
         foreach ($this->_authors as $author) {
             $this->_code .= ' * @author ' . $author['name'];
             if ($author['email']) {
@@ -1066,7 +1066,7 @@ 
 class  Text_Highlighter_{$this->language} extends Text_Highlighter
 {
 
-CODE;
+code;
         $this->_code .= 'var $_language = \'' . strtolower($this->language) . "';\n\n";
         $array = var_export($syntax, true);
         $array = trim(preg_replace('~^(\s*)~m','        \1\1',$array));
@@ -1082,11 +1082,11 @@ 
     function __construct(\$options=array())
     {
 
-CODE;
+code;
         $this->_code .= <<<CODE
 
         \$this->_options = \$options;
-CODE;
+code;
         $states = array();
         $i = 0;
         foreach ($syntax['blocks'] as $name => $block) {
@@ -1236,7 +1236,7 @@ 
     }
 
 }
-CODE;
+code;
 }
 
 // }}}

framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer.php

Doc Comments +1 added lines, -1 removed lines

@@ -68,7 +68,6 @@ 
      *
      * @access public
      *
-     * @param  array $options  Rendering options. Renderer-specific.
      */
     function reset()
     {
@@ -130,6 +129,7 @@ 
      * Set current language
      *
      * @abstract
+     * @param string $lang
      * @return void
      * @access public
      *

Indentation +95 added lines, -95 removed lines

@@ -35,109 +35,109 @@
 
 class Text_Highlighter_Renderer
 {
-    /**
-     * Renderer options
-     *
-     * @var array
-     * @access protected
-     */
-    public $_options = array();
+	/**
+	 * Renderer options
+	 *
+	 * @var array
+	 * @access protected
+	 */
+	public $_options = array();
 
-    /**
-     * Current language
-     *
-     * @var string
-     * @access protected
-     */
-    public $_language = '';
+	/**
+	 * Current language
+	 *
+	 * @var string
+	 * @access protected
+	 */
+	public $_language = '';
 
-    /**
-     * Constructor
-     *
-     * @access public
-     *
-     * @param  array $options  Rendering options. Renderer-specific.
-     */
-    function __construct($options = array())
-    {
-        $this->_options = $options;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @access public
+	 *
+	 * @param  array $options  Rendering options. Renderer-specific.
+	 */
+	function __construct($options = array())
+	{
+		$this->_options = $options;
+	}
 
-    /**
-     * Resets renderer state
-     *
-     * @access public
-     *
-     * @param  array $options  Rendering options. Renderer-specific.
-     */
-    function reset()
-    {
-        return;
-    }
+	/**
+	 * Resets renderer state
+	 *
+	 * @access public
+	 *
+	 * @param  array $options  Rendering options. Renderer-specific.
+	 */
+	function reset()
+	{
+		return;
+	}
 
-    /**
-     * Preprocesses code
-     *
-     * @access public
-     *
-     * @param  string $str Code to preprocess
-     * @return string Preprocessed code
-     */
-    function preprocess($str)
-    {
-        return $str;
-    }
+	/**
+	 * Preprocesses code
+	 *
+	 * @access public
+	 *
+	 * @param  string $str Code to preprocess
+	 * @return string Preprocessed code
+	 */
+	function preprocess($str)
+	{
+		return $str;
+	}
 
-    /**
-     * Accepts next token
-     *
-     * @abstract
-     * @access public
-     *
-     * @param  string $class   Token class
-     * @param  string $content Token content
-     */
-    function acceptToken($class, $content)
-    {
-        return;
-    }
+	/**
+	 * Accepts next token
+	 *
+	 * @abstract
+	 * @access public
+	 *
+	 * @param  string $class   Token class
+	 * @param  string $content Token content
+	 */
+	function acceptToken($class, $content)
+	{
+		return;
+	}
 
-    /**
-     * Signals that no more tokens are available
-     *
-     * @access public
-     *
-     */
-    function finalize()
-    {
-        return;
-    }
+	/**
+	 * Signals that no more tokens are available
+	 *
+	 * @access public
+	 *
+	 */
+	function finalize()
+	{
+		return;
+	}
 
-    /**
-     * Get generated output
-     *
-     * @abstract
-     * @return mixed Renderer-specific
-     * @access public
-     *
-     */
-    function getOutput()
-    {
-        return;
-    }
+	/**
+	 * Get generated output
+	 *
+	 * @abstract
+	 * @return mixed Renderer-specific
+	 * @access public
+	 *
+	 */
+	function getOutput()
+	{
+		return;
+	}
 
-    /**
-     * Set current language
-     *
-     * @abstract
-     * @return void
-     * @access public
-     *
-     */
-    function setCurrentLanguage($lang)
-    {
-        $this->_language = $lang;
-    }
+	/**
+	 * Set current language
+	 *
+	 * @abstract
+	 * @return void
+	 * @access public
+	 *
+	 */
+	function setCurrentLanguage($lang)
+	{
+		$this->_language = $lang;
+	}
 
 }
 

framework/3rdParty/WsdlGen/WsdlMessage.php

Doc Comments -1 removed lines

@@ -59,7 +59,6 @@
 
 	/**
 	 * Return the message as a DOM element
-	 * @param 		DOMDocument		$wsdl		The wsdl document the messages will be children of
 	 */
 	public function getMessageElement(DOMDocument $dom)
 	{

framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php

Doc Comments +6 added lines

@@ -208,6 +208,7 @@ 
 	 * @param string active record class name.
 	 * @param array row data
 	 * @param array foreign key column names
+	 * @param string $type
 	 * @return TActiveRecord
 	 */
 	protected function createFkObject($type,$row,$foreignKeys)
@@ -227,6 +228,7 @@ 
 	 * @param TTableInfo association table info
 	 * @param array field names
 	 * @param array field values
+	 * @param TActiveRecordCriteria $criteria
 	 */
 	public function createCommand($criteria, $foreignKeys,$indexValues,$sourceKeys)
 	{
@@ -341,6 +343,10 @@ 
 		return $this->getCommandBuilder()->onExecuteCommand($command, $command->execute()) > 0;
 	}
 
+	/**
+	 * @param TActiveRecord $obj
+	 * @param TDbCommandBuilder $builder
+	 */
 	private function updateAssociationTable($obj,$fkObjects, $builder)
 	{
 		$source = $this->getSourceRecordValues($obj);

Indentation +4 added lines, -4 removed lines

@@ -90,10 +90,10 @@
 	private $_association_columns=array();
 
 	/**
-	* Get the foreign key index values from the results and make calls to the
-	* database to find the corresponding foreign objects using association table.
-	* @param array original results.
-	*/
+	 * Get the foreign key index values from the results and make calls to the
+	 * database to find the corresponding foreign objects using association table.
+	 * @param array original results.
+	 */
 	protected function collectForeignObjects(&$results)
 	{
 		list($sourceKeys, $foreignKeys) = $this->getRelationForeignKeys();

Spacing +52 added lines, -52 removed lines

@@ -87,7 +87,7 @@ 
 	private $_association;
 	private $_sourceTable;
 	private $_foreignTable;
-	private $_association_columns=array();
+	private $_association_columns = array();
 
 	/**
 	* Get the foreign key index values from the results and make calls to the
@@ -99,7 +99,7 @@ 
 		list($sourceKeys, $foreignKeys) = $this->getRelationForeignKeys();
 		$properties = array_values($sourceKeys);
 		$indexValues = $this->getIndexValues($properties, $results);
-		$this->fetchForeignObjects($results, $foreignKeys,$indexValues,$sourceKeys);
+		$this->fetchForeignObjects($results, $foreignKeys, $indexValues, $sourceKeys);
 	}
 
 	/**
@@ -119,16 +119,16 @@ 
 	 */
 	protected function getAssociationTable()
 	{
-		if($this->_association===null)
+		if ($this->_association === null)
 		{
 			$gateway = $this->getSourceRecord()->getRecordGateway();
 			$conn = $this->getSourceRecord()->getDbConnection();
 			//table name may include the fk column name separated with a dot.
 			$table = explode('.', $this->getContext()->getAssociationTable());
-			if(count($table)>1)
+			if (count($table) > 1)
 			{
 				$columns = preg_replace('/^\((.*)\)/', '\1', $table[1]);
-				$this->_association_columns = preg_split('/\s*[, ]\*/',$columns);
+				$this->_association_columns = preg_split('/\s*[, ]\*/', $columns);
 			}
 			$this->_association = $gateway->getTableInfo($conn, $table[0]);
 		}
@@ -140,7 +140,7 @@ 
 	 */
 	protected function getSourceTable()
 	{
-		if($this->_sourceTable===null)
+		if ($this->_sourceTable === null)
 		{
 			$gateway = $this->getSourceRecord()->getRecordGateway();
 			$this->_sourceTable = $gateway->getRecordTableInfo($this->getSourceRecord());
@@ -153,7 +153,7 @@ 
 	 */
 	protected function getForeignTable()
 	{
-		if($this->_foreignTable===null)
+		if ($this->_foreignTable === null)
 		{
 			$gateway = $this->getSourceRecord()->getRecordGateway();
 			$fkObject = $this->getContext()->getForeignRecordFinder();
@@ -185,20 +185,20 @@ 
 	 * @param array field names
 	 * @param array foreign key index values.
 	 */
-	protected function fetchForeignObjects(&$results,$foreignKeys,$indexValues,$sourceKeys)
+	protected function fetchForeignObjects(&$results, $foreignKeys, $indexValues, $sourceKeys)
 	{
 		$criteria = $this->getCriteria();
 		$finder = $this->getContext()->getForeignRecordFinder();
 		$type = get_class($finder);
-		$command = $this->createCommand($criteria, $foreignKeys,$indexValues,$sourceKeys);
+		$command = $this->createCommand($criteria, $foreignKeys, $indexValues, $sourceKeys);
 		$srcProps = array_keys($sourceKeys);
-		$collections=array();
-		foreach($this->getCommandBuilder()->onExecuteCommand($command, $command->query()) as $row)
+		$collections = array();
+		foreach ($this->getCommandBuilder()->onExecuteCommand($command, $command->query()) as $row)
 		{
 			$hash = $this->getObjectHash($row, $srcProps);
-			foreach($srcProps as $column)
+			foreach ($srcProps as $column)
 				unset($row[$column]);
-			$obj = $this->createFkObject($type,$row,$foreignKeys);
+			$obj = $this->createFkObject($type, $row, $foreignKeys);
 			$collections[$hash][] = $obj;
 		}
 		$this->setResultCollection($results, $collections, array_values($sourceKeys));
@@ -210,13 +210,13 @@ 
 	 * @param array foreign key column names
 	 * @return TActiveRecord
 	 */
-	protected function createFkObject($type,$row,$foreignKeys)
+	protected function createFkObject($type, $row, $foreignKeys)
 	{
 		$obj = TActiveRecord::createRecord($type, $row);
-		if(count($this->_association_columns) > 0)
+		if (count($this->_association_columns) > 0)
 		{
-			$i=0;
-			foreach($foreignKeys as $ref=>$fk)
+			$i = 0;
+			foreach ($foreignKeys as $ref=>$fk)
 				$obj->setColumnValue($ref, $row[$this->_association_columns[$i++]]);
 		}
 		return $obj;
@@ -228,13 +228,13 @@ 
 	 * @param array field names
 	 * @param array field values
 	 */
-	public function createCommand($criteria, $foreignKeys,$indexValues,$sourceKeys)
+	public function createCommand($criteria, $foreignKeys, $indexValues, $sourceKeys)
 	{
-		$innerJoin = $this->getAssociationJoin($foreignKeys,$indexValues,$sourceKeys);
+		$innerJoin = $this->getAssociationJoin($foreignKeys, $indexValues, $sourceKeys);
 		$fkTable = $this->getForeignTable()->getTableFullName();
 		$srcColumns = $this->getSourceColumns($sourceKeys);
-		if(($where=$criteria->getCondition())===null)
-			$where='1=1';
+		if (($where = $criteria->getCondition()) === null)
+			$where = '1=1';
 		$sql = "SELECT {$fkTable}.*, {$srcColumns} FROM {$fkTable} {$innerJoin} WHERE {$where}";
 
 		$parameters = $criteria->getParameters()->toArray();
@@ -243,7 +243,7 @@ 
 		$offset = $criteria->getOffset();
 
 		$builder = $this->getForeignCommandBuilder()->getBuilder();
-		$command = $builder->applyCriterias($sql,$parameters,$ordering,$limit,$offset);
+		$command = $builder->applyCriterias($sql, $parameters, $ordering, $limit, $offset);
 		$this->getCommandBuilder()->onCreateCommand($command, $criteria);
 		return $command;
 	}
@@ -254,12 +254,12 @@ 
 	 */
 	protected function getSourceColumns($sourceKeys)
 	{
-		$columns=array();
+		$columns = array();
 		$table = $this->getAssociationTable();
 		$tableName = $table->getTableFullName();
-		$columnNames = array_merge(array_keys($sourceKeys),$this->_association_columns);
-		foreach($columnNames as $name)
-			$columns[] = $tableName.'.'.$table->getColumn($name)->getColumnName();
+		$columnNames = array_merge(array_keys($sourceKeys), $this->_association_columns);
+		foreach ($columnNames as $name)
+			$columns[] = $tableName . '.' . $table->getColumn($name)->getColumnName();
 		return implode(', ', $columns);
 	}
 
@@ -270,9 +270,9 @@ 
 	 * @param array source table column names.
 	 * @return string inner join condition for M-N relationship via association table.
 	 */
-	protected function getAssociationJoin($foreignKeys,$indexValues,$sourceKeys)
+	protected function getAssociationJoin($foreignKeys, $indexValues, $sourceKeys)
 	{
-		$refInfo= $this->getAssociationTable();
+		$refInfo = $this->getAssociationTable();
 		$fkInfo = $this->getForeignTable();
 
 		$refTable = $refInfo->getTableFullName();
@@ -280,10 +280,10 @@ 
 
 		$joins = array();
 		$hasAssociationColumns = count($this->_association_columns) > 0;
-		$i=0;
-		foreach($foreignKeys as $ref=>$fk)
+		$i = 0;
+		foreach ($foreignKeys as $ref=>$fk)
 		{
-			if($hasAssociationColumns)
+			if ($hasAssociationColumns)
 				$refField = $refInfo->getColumn($this->_association_columns[$i++])->getColumnName();
 			else
 				$refField = $refInfo->getColumn($ref)->getColumnName();
@@ -291,7 +291,7 @@ 
 			$joins[] = "{$fkTable}.{$fkField} = {$refTable}.{$refField}";
 		}
 		$joinCondition = implode(' AND ', $joins);
-		$index = $this->getCommandBuilder()->getIndexKeyCondition($refInfo,array_keys($sourceKeys), $indexValues);
+		$index = $this->getCommandBuilder()->getIndexKeyCondition($refInfo, array_keys($sourceKeys), $indexValues);
 		return "INNER JOIN {$refTable} ON ({$joinCondition}) AND {$index}";
 	}
 
@@ -303,12 +303,12 @@ 
 	{
 		$obj = $this->getContext()->getSourceRecord();
 		$fkObjects = &$obj->{$this->getContext()->getProperty()};
-		$success=true;
-		if(($total = count($fkObjects))> 0)
+		$success = true;
+		if (($total = count($fkObjects)) > 0)
 		{
 			$source = $this->getSourceRecord();
 			$builder = $this->getAssociationTableCommandBuilder();
-			for($i=0;$i<$total;$i++)
+			for ($i = 0; $i < $total; $i++)
 				$success = $fkObjects[$i]->save() && $success;
 			return $this->updateAssociationTable($obj, $fkObjects, $builder) && $success;
 		}
@@ -324,33 +324,33 @@ 
 		return $this->getAssociationTable()->createCommandBuilder($conn);
 	}
 
-	private function hasAssociationData($builder,$data)
+	private function hasAssociationData($builder, $data)
 	{
-		$condition=array();
+		$condition = array();
 		$table = $this->getAssociationTable();
-		foreach($data as $name=>$value)
-			$condition[] = $table->getColumn($name)->getColumnName().' = ?';
-		$command = $builder->createCountCommand(implode(' AND ', $condition),array_values($data));
+		foreach ($data as $name=>$value)
+			$condition[] = $table->getColumn($name)->getColumnName() . ' = ?';
+		$command = $builder->createCountCommand(implode(' AND ', $condition), array_values($data));
 		$result = $this->getCommandBuilder()->onExecuteCommand($command, intval($command->queryScalar()));
 		return intval($result) > 0;
 	}
 
-	private function addAssociationData($builder,$data)
+	private function addAssociationData($builder, $data)
 	{
 		$command = $builder->createInsertCommand($data);
 		return $this->getCommandBuilder()->onExecuteCommand($command, $command->execute()) > 0;
 	}
 
-	private function updateAssociationTable($obj,$fkObjects, $builder)
+	private function updateAssociationTable($obj, $fkObjects, $builder)
 	{
 		$source = $this->getSourceRecordValues($obj);
 		$foreignKeys = $this->findForeignKeys($this->getAssociationTable(), $fkObjects[0]);
-		$success=true;
-		foreach($fkObjects as $fkObject)
+		$success = true;
+		foreach ($fkObjects as $fkObject)
 		{
-			$data = array_merge($source, $this->getForeignObjectValues($foreignKeys,$fkObject));
-			if(!$this->hasAssociationData($builder,$data))
-				$success = $this->addAssociationData($builder,$data) && $success;
+			$data = array_merge($source, $this->getForeignObjectValues($foreignKeys, $fkObject));
+			if (!$this->hasAssociationData($builder, $data))
+				$success = $this->addAssociationData($builder, $data) && $success;
 		}
 		return $success;
 	}
@@ -360,16 +360,16 @@ 
 		$sourceKeys = $this->findForeignKeys($this->getAssociationTable(), $obj);
 		$indexValues = $this->getIndexValues(array_values($sourceKeys), $obj);
 		$data = array();
-		$i=0;
-		foreach($sourceKeys as $name=>$srcKey)
+		$i = 0;
+		foreach ($sourceKeys as $name=>$srcKey)
 			$data[$name] = $indexValues[0][$i++];
 		return $data;
 	}
 
-	private function getForeignObjectValues($foreignKeys,$fkObject)
+	private function getForeignObjectValues($foreignKeys, $fkObject)
 	{
-		$data=array();
-		foreach($foreignKeys as $name=>$fKey)
+		$data = array();
+		foreach ($foreignKeys as $name=>$fKey)
 			$data[$name] = $fkObject->getColumnValue($fKey);
 		return $data;
 	}

Braces +21 added lines, -14 removed lines

@@ -196,8 +196,9 @@ 
 		foreach($this->getCommandBuilder()->onExecuteCommand($command, $command->query()) as $row)
 		{
 			$hash = $this->getObjectHash($row, $srcProps);
-			foreach($srcProps as $column)
-				unset($row[$column]);
+			foreach($srcProps as $column) {
+							unset($row[$column]);
+			}
 			$obj = $this->createFkObject($type,$row,$foreignKeys);
 			$collections[$hash][] = $obj;
 		}
@@ -216,8 +217,9 @@ 
 		if(count($this->_association_columns) > 0)
 		{
 			$i=0;
-			foreach($foreignKeys as $ref=>$fk)
-				$obj->setColumnValue($ref, $row[$this->_association_columns[$i++]]);
+			foreach($foreignKeys as $ref=>$fk) {
+							$obj->setColumnValue($ref, $row[$this->_association_columns[$i++]]);
+			}
 		}
 		return $obj;
 	}
@@ -258,8 +260,9 @@ 
 		$table = $this->getAssociationTable();
 		$tableName = $table->getTableFullName();
 		$columnNames = array_merge(array_keys($sourceKeys),$this->_association_columns);
-		foreach($columnNames as $name)
-			$columns[] = $tableName.'.'.$table->getColumn($name)->getColumnName();
+		foreach($columnNames as $name) {
+					$columns[] = $tableName.'.'.$table->getColumn($name)->getColumnName();
+		}
 		return implode(', ', $columns);
 	}
 
@@ -308,8 +311,9 @@ 
 		{
 			$source = $this->getSourceRecord();
 			$builder = $this->getAssociationTableCommandBuilder();
-			for($i=0;$i<$total;$i++)
-				$success = $fkObjects[$i]->save() && $success;
+			for($i=0;$i<$total;$i++) {
+							$success = $fkObjects[$i]->save() && $success;
+			}
 			return $this->updateAssociationTable($obj, $fkObjects, $builder) && $success;
 		}
 		return $success;
@@ -328,8 +332,9 @@ 
 	{
 		$condition=array();
 		$table = $this->getAssociationTable();
-		foreach($data as $name=>$value)
-			$condition[] = $table->getColumn($name)->getColumnName().' = ?';
+		foreach($data as $name=>$value) {
+					$condition[] = $table->getColumn($name)->getColumnName().' = ?';
+		}
 		$command = $builder->createCountCommand(implode(' AND ', $condition),array_values($data));
 		$result = $this->getCommandBuilder()->onExecuteCommand($command, intval($command->queryScalar()));
 		return intval($result) > 0;
@@ -361,16 +366,18 @@ 
 		$indexValues = $this->getIndexValues(array_values($sourceKeys), $obj);
 		$data = array();
 		$i=0;
-		foreach($sourceKeys as $name=>$srcKey)
-			$data[$name] = $indexValues[0][$i++];
+		foreach($sourceKeys as $name=>$srcKey) {
+					$data[$name] = $indexValues[0][$i++];
+		}
 		return $data;
 	}
 
 	private function getForeignObjectValues($foreignKeys,$fkObject)
 	{
 		$data=array();
-		foreach($foreignKeys as $name=>$fKey)
-			$data[$name] = $fkObject->getColumnValue($fKey);
+		foreach($foreignKeys as $name=>$fKey) {
+					$data[$name] = $fkObject->getColumnValue($fKey);
+		}
 		return $data;
 	}
 }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -235,7 +235,7 @@
 		$srcColumns = $this->getSourceColumns($sourceKeys);
 		if(($where=$criteria->getCondition())===null)
 			$where='1=1';
-		$sql = "SELECT {$fkTable}.*, {$srcColumns} FROM {$fkTable} {$innerJoin} WHERE {$where}";
+		$sql = "select {$fkTable}.*, {$srcColumns} FROM {$fkTable} {$innerJoin} WHERE {$where}";
 
 		$parameters = $criteria->getParameters()->toArray();
 		$ordering = $criteria->getOrdersBy();