* initial template

author: emkael <emkael@tlen.pl> 2016-10-11 14:01:29 +0200
committer: emkael <emkael@tlen.pl> 2016-10-11 14:01:29 +0200
commit: 51609351f2c4b5082b7e6f0744cd3811c325303f (patch)
tree: 739015e9ec69bc185ebe30db21369ae0b8b692ce /lib
parent: 8d1b0dad63e3906efa9393ef01d08b77d83417b5 (diff)
135 files changed, 39178 insertions, 0 deletions
diff --git a/lib/CssMin.php b/lib/CssMin.php
new file mode 100644
index 0000000..5d6f473
--- /dev/null
+++ b/lib/CssMin.php
@@ -0,0 +1,5098 @@
+<?php
+/**
+ * CssMin - A (simple) css minifier with benefits
+ * 
+ * --
+ * Copyright (c) 2011 Joe Scylla <joe.scylla@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ * --
+ * 
+ * @package		CssMin
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+/**
+ * Abstract definition of a CSS token class.
+ * 
+ * Every token has to extend this class.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+abstract class aCssToken
+	{
+	/**
+	 * Returns the token as string.
+	 * 
+	 * @return string
+	 */
+	abstract public function __toString();
+	}
+
+/**
+ * Abstract definition of a for a ruleset start token.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+abstract class aCssRulesetStartToken extends aCssToken
+	{
+	
+	}
+
+/**
+ * Abstract definition of a for ruleset end token.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+abstract class aCssRulesetEndToken extends aCssToken
+	{
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "}";
+		}
+	}
+
+/**
+ * Abstract definition of a parser plugin.
+ * 
+ * Every parser plugin have to extend this class. A parser plugin contains the logic to parse one or aspects of a 
+ * stylesheet.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+abstract class aCssParserPlugin
+	{
+	/**
+	 * Plugin configuration.
+	 * 
+	 * @var array
+	 */
+	protected $configuration = array();
+	/**
+	 * The CssParser of the plugin.
+	 * 
+	 * @var CssParser
+	 */
+	protected $parser = null;
+	/**
+	 * Plugin buffer.
+	 * 
+	 * @var string
+	 */
+	protected $buffer = "";
+	/**
+	 * Constructor.
+	 * 
+	 * @param CssParser $parser The CssParser object of this plugin.
+	 * @param array $configuration Plugin configuration [optional]
+	 * @return void
+	 */
+	public function __construct(CssParser $parser, array $configuration = null)
+		{
+		$this->configuration	= $configuration;
+		$this->parser			= $parser;
+		}
+	/**
+	 * Returns the array of chars triggering the parser plugin.
+	 * 
+	 * @return array
+	 */
+	abstract public function getTriggerChars();
+	/**
+	 * Returns the array of states triggering the parser plugin or FALSE if every state will trigger the parser plugin.
+	 * 
+	 * @return array
+	 */
+	abstract public function getTriggerStates();
+	/**
+	 * Parser routine of the plugin.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	abstract public function parse($index, $char, $previousChar, $state);
+	}
+
+/**
+ * Abstract definition of a minifier plugin class. 
+ * 
+ * Minifier plugin process the parsed tokens one by one to apply changes to the token. Every minifier plugin has to 
+ * extend this class.
+ *
+ * @package		CssMin/Minifier/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+abstract class aCssMinifierPlugin
+	{
+	/**
+	 * Plugin configuration.
+	 * 
+	 * @var array
+	 */
+	protected $configuration = array();
+	/**
+	 * The CssMinifier of the plugin.
+	 * 
+	 * @var CssMinifier
+	 */
+	protected $minifier = null;
+	/**
+	 * Constructor.
+	 * 
+	 * @param CssMinifier $minifier The CssMinifier object of this plugin.
+	 * @param array $configuration Plugin configuration [optional]
+	 * @return void
+	 */
+	public function __construct(CssMinifier $minifier, array $configuration = array())
+		{
+		$this->configuration	= $configuration;
+		$this->minifier			= $minifier;
+		}
+	/**
+	 * Apply the plugin to the token.
+	 * 
+	 * @param aCssToken $token Token to process
+	 * @return boolean Return TRUE to break the processing of this token; FALSE to continue
+	 */
+	abstract public function apply(aCssToken &$token);
+	/**
+	 * --
+	 * 
+	 * @return array
+	 */
+	abstract public function getTriggerTokens();
+	}
+
+/**
+ * Abstract definition of a minifier filter class. 
+ * 
+ * Minifier filters allows a pre-processing of the parsed token to add, edit or delete tokens. Every minifier filter
+ * has to extend this class.
+ * 
+ * @package		CssMin/Minifier/Filters
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+abstract class aCssMinifierFilter
+	{
+	/**
+	 * Filter configuration.
+	 * 
+	 * @var array
+	 */
+	protected $configuration = array();
+	/**
+	 * The CssMinifier of the filter.
+	 * 
+	 * @var CssMinifier
+	 */
+	protected $minifier = null;
+	/**
+	 * Constructor.
+	 * 
+	 * @param CssMinifier $minifier The CssMinifier object of this plugin.
+	 * @param array $configuration Filter configuration [optional]
+	 * @return void
+	 */
+	public function __construct(CssMinifier $minifier, array $configuration = array())
+		{
+		$this->configuration	= $configuration;
+		$this->minifier			= $minifier;
+		}
+	/**
+	 * Filter the tokens.
+	 * 
+	 * @param array $tokens Array of objects of type aCssToken
+	 * @return integer Count of added, changed or removed tokens; a return value large than 0 will rebuild the array
+	 */
+	abstract public function apply(array &$tokens);
+	}
+
+/**
+ * Abstract formatter definition.
+ * 
+ * Every formatter have to extend this class.
+ * 
+ * @package		CssMin/Formatter
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+abstract class aCssFormatter
+	{
+	/**
+	 * Indent string.
+	 * 
+	 * @var string
+	 */
+	protected $indent = "    ";
+	/**
+	 * Declaration padding.
+	 * 
+	 * @var integer
+	 */
+	protected $padding = 0;
+	/**
+	 * Tokens.
+	 * 
+	 * @var array
+	 */
+	protected $tokens = array();
+	/**
+	 * Constructor.
+	 * 
+	 * @param array $tokens Array of CssToken
+	 * @param string $indent Indent string [optional]
+	 * @param integer $padding Declaration value padding [optional]
+	 */
+	public function __construct(array $tokens, $indent = null, $padding = null)
+		{
+		$this->tokens	= $tokens;
+		$this->indent	= !is_null($indent) ? $indent : $this->indent;
+		$this->padding	= !is_null($padding) ? $padding : $this->padding;
+		}
+	/**
+	 * Returns the array of aCssToken as formatted string.
+	 * 
+	 * @return string
+	 */
+	abstract public function __toString();
+	}
+
+/**
+ * Abstract definition of a ruleset declaration token.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+abstract class aCssDeclarationToken extends aCssToken
+	{
+	/**
+	 * Is the declaration flagged as important?
+	 * 
+	 * @var boolean
+	 */
+	public $IsImportant = false;
+	/**
+	 * Is the declaration flagged as last one of the ruleset?
+	 * 
+	 * @var boolean
+	 */
+	public $IsLast = false;
+	/**
+	 * Property name of the declaration.
+	 * 
+	 * @var string
+	 */
+	public $Property = "";
+	/**
+	 * Value of the declaration.
+	 * 
+	 * @var string
+	 */
+	public $Value = "";
+	/**
+	 * Set the properties of the @font-face declaration. 
+	 * 
+	 * @param string $property Property of the declaration
+	 * @param string $value Value of the declaration
+	 * @param boolean $isImportant Is the !important flag is set?
+	 * @param boolean $IsLast Is the declaration the last one of the block?
+	 * @return void
+	 */
+	public function __construct($property, $value, $isImportant = false, $isLast = false)
+		{
+		$this->Property		= $property;
+		$this->Value		= $value;
+		$this->IsImportant	= $isImportant;
+		$this->IsLast		= $isLast;
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return $this->Property . ":" . $this->Value . ($this->IsImportant ? " !important" : "") . ($this->IsLast ? "" : ";");
+		}
+	}
+
+/**
+ * Abstract definition of a for at-rule block start token.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+abstract class aCssAtBlockStartToken extends aCssToken
+	{
+	
+	}
+
+/**
+ * Abstract definition of a for at-rule block end token.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+abstract class aCssAtBlockEndToken extends aCssToken
+	{
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "}";
+		}
+	}
+
+/**
+ * {@link aCssFromatter Formatter} returning the CSS source in {@link http://goo.gl/etzLs Whitesmiths indent style}.
+ * 
+ * @package		CssMin/Formatter
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssWhitesmithsFormatter extends aCssFormatter
+	{
+	/**
+	 * Implements {@link aCssFormatter::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		$r				= array();
+		$level			= 0;
+		for ($i = 0, $l = count($this->tokens); $i < $l; $i++)
+			{
+			$token		= $this->tokens[$i];
+			$class		= get_class($token);
+			$indent 	= str_repeat($this->indent, $level);
+			if ($class === "CssCommentToken")
+				{
+				$lines = array_map("trim", explode("\n", $token->Comment));
+				for ($ii = 0, $ll = count($lines); $ii < $ll; $ii++)
+					{
+					$r[] = $indent . (substr($lines[$ii], 0, 1) == "*" ? " " : "") . $lines[$ii];
+					}
+				}
+			elseif ($class === "CssAtCharsetToken")
+				{
+				$r[] = $indent . "@charset " . $token->Charset . ";";
+				}
+			elseif ($class === "CssAtFontFaceStartToken")
+				{
+				$r[] = $indent . "@font-face";
+				$r[] = $this->indent . $indent . "{";
+				$level++;
+				}
+			elseif ($class === "CssAtImportToken")
+				{
+				$r[] = $indent . "@import " . $token->Import . " " . implode(", ", $token->MediaTypes) . ";";
+				}
+			elseif ($class === "CssAtKeyframesStartToken")
+				{
+				$r[] = $indent . "@keyframes \"" . $token->Name . "\"";
+				$r[] = $this->indent . $indent . "{";
+				$level++;
+				}
+			elseif ($class === "CssAtMediaStartToken")
+				{
+				$r[] = $indent . "@media " . implode(", ", $token->MediaTypes);
+				$r[] = $this->indent . $indent . "{";
+				$level++;
+				}
+			elseif ($class === "CssAtPageStartToken")
+				{
+				$r[] = $indent . "@page";
+				$r[] = $this->indent . $indent . "{";
+				$level++;
+				}
+			elseif ($class === "CssAtVariablesStartToken")
+				{
+				$r[] = $indent . "@variables " . implode(", ", $token->MediaTypes);
+				$r[] = $this->indent . $indent . "{";
+				$level++;
+				}
+			elseif ($class === "CssRulesetStartToken" || $class === "CssAtKeyframesRulesetStartToken")
+				{
+				$r[] = $indent . implode(", ", $token->Selectors);
+				$r[] = $this->indent . $indent . "{";
+				$level++;
+				}
+			elseif ($class == "CssAtFontFaceDeclarationToken"
+				|| $class === "CssAtKeyframesRulesetDeclarationToken"
+				|| $class === "CssAtPageDeclarationToken"
+				|| $class == "CssAtVariablesDeclarationToken"
+				|| $class === "CssRulesetDeclarationToken"
+				)
+				{
+				$declaration = $indent . $token->Property . ": ";
+				if ($this->padding)
+					{
+					$declaration = str_pad($declaration, $this->padding, " ", STR_PAD_RIGHT);
+					}
+				$r[] = $declaration . $token->Value . ($token->IsImportant ? " !important" : "") . ";";
+				}
+			elseif ($class === "CssAtFontFaceEndToken"
+				|| $class === "CssAtMediaEndToken"
+				|| $class === "CssAtKeyframesEndToken"
+				|| $class === "CssAtKeyframesRulesetEndToken"
+				|| $class === "CssAtPageEndToken"
+				|| $class === "CssAtVariablesEndToken"
+				|| $class === "CssRulesetEndToken"
+				)
+				{
+				$r[] = $indent . "}";
+				$level--;
+				}
+			}
+		return implode("\n", $r);
+		}
+	}
+
+/**
+ * This {@link aCssMinifierPlugin} will process var-statement and sets the declaration value to the variable value. 
+ * 
+ * This plugin only apply the variable values. The variable values itself will get parsed by the
+ * {@link CssVariablesMinifierFilter}.
+ * 
+ * Example:
+ * <code>
+ * @variables
+ * 		{
+ * 		defaultColor: black;
+ * 		}
+ * color: var(defaultColor);
+ * </code>
+ * 
+ * Will get converted to:
+ * <code>
+ * color:black;
+ * </code>
+ *
+ * @package		CssMin/Minifier/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssVariablesMinifierPlugin extends aCssMinifierPlugin
+	{
+	/**
+	 * Regular expression matching a value.
+	 * 
+	 * @var string
+	 */
+	private $reMatch = "/var\((.+)\)/iSU";
+	/**
+	 * Parsed variables.
+	 * 
+	 * @var array
+	 */
+	private $variables = null;
+	/**
+	 * Returns the variables.
+	 * 
+	 * @return array
+	 */
+	public function getVariables()
+		{
+		return $this->variables;
+		}
+	/**
+	 * Implements {@link aCssMinifierPlugin::minify()}.
+	 * 
+	 * @param aCssToken $token Token to process
+	 * @return boolean Return TRUE to break the processing of this token; FALSE to continue
+	 */
+	public function apply(aCssToken &$token)
+		{
+		if (stripos($token->Value, "var") !== false && preg_match_all($this->reMatch, $token->Value, $m))
+			{
+			$mediaTypes	= $token->MediaTypes;
+			if (!in_array("all", $mediaTypes))
+				{
+				$mediaTypes[] = "all";
+				}
+			for ($i = 0, $l = count($m[0]); $i < $l; $i++)
+				{
+				$variable	= trim($m[1][$i]);
+				foreach ($mediaTypes as $mediaType)
+					{
+					if (isset($this->variables[$mediaType], $this->variables[$mediaType][$variable]))
+						{
+						// Variable value found => set the declaration value to the variable value and return
+						$token->Value = str_replace($m[0][$i], $this->variables[$mediaType][$variable], $token->Value);
+						continue 2;
+						}
+					}
+				// If no value was found trigger an error and replace the token with a CssNullToken
+				CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": No value found for variable <code>" . $variable . "</code> in media types <code>" . implode(", ", $mediaTypes) . "</code>", (string) $token));
+				$token = new CssNullToken();
+				return true;
+				}
+			}
+		return false;
+		}
+	/**
+	 * Implements {@link aMinifierPlugin::getTriggerTokens()}
+	 * 
+	 * @return array
+	 */
+	public function getTriggerTokens()
+		{
+		return array
+			(
+			"CssAtFontFaceDeclarationToken",
+			"CssAtPageDeclarationToken",
+			"CssRulesetDeclarationToken"
+			);
+		}
+	/**
+	 * Sets the variables.
+	 * 
+	 * @param array $variables Variables to set
+	 * @return void
+	 */
+	public function setVariables(array $variables)
+		{
+		$this->variables = $variables;
+		}
+	}
+
+/**
+ * This {@link aCssMinifierFilter minifier filter} will parse the variable declarations out of @variables at-rule 
+ * blocks. The variables will get store in the {@link CssVariablesMinifierPlugin} that will apply the variables to 
+ * declaration.
+ * 
+ * @package		CssMin/Minifier/Filters
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssVariablesMinifierFilter extends aCssMinifierFilter
+	{
+	/**
+	 * Implements {@link aCssMinifierFilter::filter()}.
+	 * 
+	 * @param array $tokens Array of objects of type aCssToken
+	 * @return integer Count of added, changed or removed tokens; a return value large than 0 will rebuild the array
+	 */
+	public function apply(array &$tokens)
+		{
+		$variables			= array();
+		$defaultMediaTypes	= array("all");
+		$mediaTypes			= array();
+		$remove				= array();
+		for($i = 0, $l = count($tokens); $i < $l; $i++)
+			{
+			// @variables at-rule block found
+			if (get_class($tokens[$i]) === "CssAtVariablesStartToken")
+				{
+				$remove[] = $i;
+				$mediaTypes = (count($tokens[$i]->MediaTypes) == 0 ? $defaultMediaTypes : $tokens[$i]->MediaTypes);
+				foreach ($mediaTypes as $mediaType)
+					{
+					if (!isset($variables[$mediaType]))
+						{
+						$variables[$mediaType] = array();
+						}
+					}
+				// Read the variable declaration tokens
+				for($i = $i; $i < $l; $i++)
+					{
+					// Found a variable declaration => read the variable values
+					if (get_class($tokens[$i]) === "CssAtVariablesDeclarationToken")
+						{
+						foreach ($mediaTypes as $mediaType)
+							{
+							$variables[$mediaType][$tokens[$i]->Property] = $tokens[$i]->Value;
+							}
+						$remove[] = $i;
+						}
+					// Found the variables end token => break;
+					elseif (get_class($tokens[$i]) === "CssAtVariablesEndToken")
+						{
+						$remove[] = $i;
+						break;
+						}
+					}
+				}
+			}
+		// Variables in @variables at-rule blocks
+		foreach($variables as $mediaType => $null)
+			{
+			foreach($variables[$mediaType] as $variable => $value)
+				{
+				// If a var() statement in a variable value found...
+				if (stripos($value, "var") !== false && preg_match_all("/var\((.+)\)/iSU", $value, $m))
+					{
+					// ... then replace the var() statement with the variable values.
+					for ($i = 0, $l = count($m[0]); $i < $l; $i++)
+						{
+						$variables[$mediaType][$variable] = str_replace($m[0][$i], (isset($variables[$mediaType][$m[1][$i]]) ? $variables[$mediaType][$m[1][$i]] : ""), $variables[$mediaType][$variable]);
+						}
+					}
+				}
+			}
+		// Remove the complete @variables at-rule block
+		foreach ($remove as $i)
+			{
+			$tokens[$i] = null;
+			}
+		if (!($plugin = $this->minifier->getPlugin("CssVariablesMinifierPlugin")))
+			{
+			CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": The plugin <code>CssVariablesMinifierPlugin</code> was not found but is required for <code>" . __CLASS__ . "</code>"));
+			}
+		else
+			{
+			$plugin->setVariables($variables);
+			}
+		return count($remove);
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for preserve parsing url() values.
+ * 
+ * This plugin return no {@link aCssToken CssToken} but ensures that url() values will get parsed properly.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssUrlParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("(", ")");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return false;
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		// Start of string
+		if ($char === "(" && strtolower(substr($this->parser->getSource(), $index - 3, 4)) === "url(" && $state !== "T_URL")
+			{
+			$this->parser->pushState("T_URL");
+			$this->parser->setExclusive(__CLASS__);
+			}
+		// Escaped LF in url => remove escape backslash and LF
+		elseif ($char === "\n" && $previousChar === "\\" && $state === "T_URL")
+			{
+			$this->parser->setBuffer(substr($this->parser->getBuffer(), 0, -2));
+			}
+		// Parse error: Unescaped LF in string literal
+		elseif ($char === "\n" && $previousChar !== "\\" && $state === "T_URL")
+			{
+			$line = $this->parser->getBuffer();
+			$this->parser->setBuffer(substr($this->parser->getBuffer(), 0, -1) . ")"); // Replace the LF with the url string delimiter
+			$this->parser->popState();
+			$this->parser->unsetExclusive();
+			CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Unterminated string literal", $line . "_"));
+			}
+		// End of string
+		elseif ($char === ")" && $state === "T_URL")
+			{
+			$this->parser->popState();
+			$this->parser->unsetExclusive();
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for preserve parsing string values.
+ * 
+ * This plugin return no {@link aCssToken CssToken} but ensures that string values will get parsed properly.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssStringParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Current string delimiter char.
+	 * 
+	 * @var string
+	 */
+	private $delimiterChar = null;
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("\"", "'", "\n");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return false;
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		// Start of string
+		if (($char === "\"" || $char === "'") && $state !== "T_STRING")
+			{
+			$this->delimiterChar = $char;
+			$this->parser->pushState("T_STRING");
+			$this->parser->setExclusive(__CLASS__);
+			}
+		// Escaped LF in string => remove escape backslash and LF
+		elseif ($char === "\n" && $previousChar === "\\" && $state === "T_STRING")
+			{
+			$this->parser->setBuffer(substr($this->parser->getBuffer(), 0, -2));
+			}
+		// Parse error: Unescaped LF in string literal
+		elseif ($char === "\n" && $previousChar !== "\\" && $state === "T_STRING")
+			{
+			$line = $this->parser->getBuffer();
+			$this->parser->popState();
+			$this->parser->unsetExclusive();
+			$this->parser->setBuffer(substr($this->parser->getBuffer(), 0, -1) . $this->delimiterChar); // Replace the LF with the current string char
+			CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Unterminated string literal", $line . "_"));
+			$this->delimiterChar = null;
+			}
+		// End of string
+		elseif ($char === $this->delimiterChar && $state === "T_STRING")
+			{
+			// If the Previous char is a escape char count the amount of the previous escape chars. If the amount of 
+			// escape chars is uneven do not end the string
+			if ($previousChar == "\\")
+				{
+				$source	= $this->parser->getSource();
+				$c		= 1;
+				$i		= $index - 2;
+				while (substr($source, $i, 1) === "\\")
+					{
+					$c++; $i--;
+					}
+				if ($c % 2)
+					{
+					return false;
+					}
+				}
+			$this->parser->popState();
+			$this->parser->unsetExclusive();
+			$this->delimiterChar = null;
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * This {@link aCssMinifierFilter minifier filter} sorts the ruleset declarations of a ruleset by name.
+ * 
+ * @package		CssMin/Minifier/Filters
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Rowan Beentje <http://assanka.net>
+ * @copyright	Rowan Beentje <http://assanka.net>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssSortRulesetPropertiesMinifierFilter extends aCssMinifierFilter
+	{
+	/**
+	 * Implements {@link aCssMinifierFilter::filter()}.
+	 * 
+	 * @param array $tokens Array of objects of type aCssToken
+	 * @return integer Count of added, changed or removed tokens; a return value larger than 0 will rebuild the array
+	 */
+	public function apply(array &$tokens)
+		{
+		$r = 0;
+		for ($i = 0, $l = count($tokens); $i < $l; $i++)
+			{
+			// Only look for ruleset start rules
+			if (get_class($tokens[$i]) !== "CssRulesetStartToken") { continue; }
+			// Look for the corresponding ruleset end
+			$endIndex = false;
+			for ($ii = $i + 1; $ii < $l; $ii++)
+				{
+				if (get_class($tokens[$ii]) !== "CssRulesetEndToken") { continue; }
+				$endIndex = $ii;
+				break;
+				}
+			if (!$endIndex) { break; }
+			$startIndex = $i;
+			$i = $endIndex;
+			// Skip if there's only one token in this ruleset
+			if ($endIndex - $startIndex <= 2) { continue; }
+			// Ensure that everything between the start and end is a declaration token, for safety
+			for ($ii = $startIndex + 1; $ii < $endIndex; $ii++)
+				{
+				if (get_class($tokens[$ii]) !== "CssRulesetDeclarationToken") { continue(2); }
+				}
+			$declarations = array_slice($tokens, $startIndex + 1, $endIndex - $startIndex - 1);
+			// Check whether a sort is required
+			$sortRequired = $lastPropertyName = false;
+			foreach ($declarations as $declaration)	
+				{
+				if ($lastPropertyName)
+					{
+					if (strcmp($lastPropertyName, $declaration->Property) > 0)
+						{
+						$sortRequired = true;
+						break;
+						}
+					}
+				$lastPropertyName = $declaration->Property;
+				}
+			if (!$sortRequired) { continue; }
+			// Arrange the declarations alphabetically by name
+			usort($declarations, array(__CLASS__, "userDefinedSort1"));
+			// Update "IsLast" property
+			for ($ii = 0, $ll = count($declarations) - 1; $ii <= $ll; $ii++)
+				{
+				if ($ii == $ll)
+					{
+					$declarations[$ii]->IsLast = true;
+					}
+				else
+					{
+					$declarations[$ii]->IsLast = false;
+					}
+				}
+			// Splice back into the array.
+			array_splice($tokens, $startIndex + 1, $endIndex - $startIndex - 1, $declarations);
+			$r += $endIndex - $startIndex - 1;
+			}
+		return $r;
+		}
+	/**
+	 * User defined sort function.
+	 * 
+	 * @return integer
+	 */
+	public static function userDefinedSort1($a, $b)
+		{
+		return strcmp($a->Property, $b->Property);
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the start of a ruleset.
+ * 
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssRulesetStartToken extends aCssRulesetStartToken
+	{
+	/**
+	 * Array of selectors.
+	 * 
+	 * @var array
+	 */
+	public $Selectors = array();
+	/**
+	 * Set the properties of a ruleset token.
+	 * 
+	 * @param array $selectors Selectors of the ruleset 
+	 * @return void
+	 */
+	public function __construct(array $selectors = array())
+		{
+		$this->Selectors = $selectors;
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return implode(",", $this->Selectors) . "{";
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for parsing ruleset block with including declarations.
+ * 
+ * Found rulesets will add a {@link CssRulesetStartToken} and {@link CssRulesetEndToken} to the 
+ * parser; including declarations as {@link CssRulesetDeclarationToken}.
+ *
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssRulesetParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array(",", "{", "}", ":", ";");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return array("T_DOCUMENT", "T_AT_MEDIA", "T_RULESET::SELECTORS", "T_RULESET", "T_RULESET_DECLARATION");
+		}
+	/**
+	 * Selectors.
+	 * 
+	 * @var array
+	 */
+	private $selectors = array();
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		// Start of Ruleset and selectors
+		if ($char === "," && ($state === "T_DOCUMENT" || $state === "T_AT_MEDIA" || $state === "T_RULESET::SELECTORS"))
+			{
+			if ($state !== "T_RULESET::SELECTORS")
+				{
+				$this->parser->pushState("T_RULESET::SELECTORS");
+				}
+			$this->selectors[] = $this->parser->getAndClearBuffer(",{");
+			}
+		// End of selectors and start of declarations
+		elseif ($char === "{" && ($state === "T_DOCUMENT" || $state === "T_AT_MEDIA" || $state === "T_RULESET::SELECTORS"))
+			{
+			if ($this->parser->getBuffer() !== "")
+				{
+				$this->selectors[] = $this->parser->getAndClearBuffer(",{");
+				if ($state == "T_RULESET::SELECTORS")
+					{
+					$this->parser->popState();
+					}
+				$this->parser->pushState("T_RULESET");
+				$this->parser->appendToken(new CssRulesetStartToken($this->selectors));
+				$this->selectors = array();
+				}
+			}
+		// Start of declaration
+		elseif ($char === ":" && $state === "T_RULESET")
+			{
+			$this->parser->pushState("T_RULESET_DECLARATION");
+			$this->buffer = $this->parser->getAndClearBuffer(":;", true);
+			}
+		// Unterminated ruleset declaration
+		elseif ($char === ":" && $state === "T_RULESET_DECLARATION")
+			{
+			// Ignore Internet Explorer filter declarations
+			if ($this->buffer === "filter")
+				{
+				return false;
+				}
+			CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Unterminated declaration", $this->buffer . ":" . $this->parser->getBuffer() . "_"));
+			}
+		// End of declaration
+		elseif (($char === ";" || $char === "}") && $state === "T_RULESET_DECLARATION")
+			{
+			$value = $this->parser->getAndClearBuffer(";}");
+			if (strtolower(substr($value, -10, 10)) === "!important")
+				{
+				$value = trim(substr($value, 0, -10));
+				$isImportant = true;
+				}
+			else
+				{
+				$isImportant = false;
+				}
+			$this->parser->popState();
+			$this->parser->appendToken(new CssRulesetDeclarationToken($this->buffer, $value, $this->parser->getMediaTypes(), $isImportant));
+			// Declaration ends with a right curly brace; so we have to end the ruleset
+			if ($char === "}")
+				{
+				$this->parser->appendToken(new CssRulesetEndToken());
+				$this->parser->popState();
+				}
+			$this->buffer = "";
+			}
+		// End of ruleset
+		elseif ($char === "}" && $state === "T_RULESET")
+			{
+			$this->parser->popState();
+			$this->parser->clearBuffer();
+			$this->parser->appendToken(new CssRulesetEndToken());
+			$this->buffer = "";
+			$this->selectors = array();
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ *  This {@link aCssToken CSS token} represents the end of a ruleset.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssRulesetEndToken extends aCssRulesetEndToken
+	{
+	
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents a ruleset declaration.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssRulesetDeclarationToken extends aCssDeclarationToken
+	{
+	/**
+	 * Media types of the declaration.
+	 * 
+	 * @var array
+	 */
+	public $MediaTypes = array("all");
+	/**
+	 * Set the properties of a ddocument- or at-rule @media level declaration. 
+	 * 
+	 * @param string $property Property of the declaration
+	 * @param string $value Value of the declaration
+	 * @param mixed $mediaTypes Media types of the declaration
+	 * @param boolean $isImportant Is the !important flag is set
+	 * @param boolean $isLast Is the declaration the last one of the ruleset
+	 * @return void
+	 */
+	public function __construct($property, $value, $mediaTypes = null, $isImportant = false, $isLast = false)
+		{
+		parent::__construct($property, $value, $isImportant, $isLast);
+		$this->MediaTypes	= $mediaTypes ? $mediaTypes : array("all");
+		}
+	}
+
+/**
+ * This {@link aCssMinifierFilter minifier filter} sets the IsLast property of any last declaration in a ruleset, 
+ * @font-face at-rule or @page at-rule block. If the property IsLast is TRUE the decrations will get stringified 
+ * without tailing semicolon.
+ * 
+ * @package		CssMin/Minifier/Filters
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssRemoveLastDelarationSemiColonMinifierFilter extends aCssMinifierFilter
+	{
+	/**
+	 * Implements {@link aCssMinifierFilter::filter()}.
+	 * 
+	 * @param array $tokens Array of objects of type aCssToken
+	 * @return integer Count of added, changed or removed tokens; a return value large than 0 will rebuild the array
+	 */
+	public function apply(array &$tokens)
+		{
+		for ($i = 0, $l = count($tokens); $i < $l; $i++)
+			{
+			$current	= get_class($tokens[$i]);
+			$next		= isset($tokens[$i+1]) ? get_class($tokens[$i+1]) : false;
+			if (($current === "CssRulesetDeclarationToken" && $next === "CssRulesetEndToken") ||
+				($current === "CssAtFontFaceDeclarationToken" && $next === "CssAtFontFaceEndToken") || 
+				($current === "CssAtPageDeclarationToken" && $next === "CssAtPageEndToken"))
+				{
+				$tokens[$i]->IsLast = true;
+				}
+			}
+		return 0;
+		}
+	}
+
+/**
+ * This {@link aCssMinifierFilter minifier filter} will remove any empty rulesets (including @keyframes at-rule block 
+ * rulesets).
+ *
+ * @package		CssMin/Minifier/Filters
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssRemoveEmptyRulesetsMinifierFilter extends aCssMinifierFilter
+	{
+	/**
+	 * Implements {@link aCssMinifierFilter::filter()}.
+	 * 
+	 * @param array $tokens Array of objects of type aCssToken
+	 * @return integer Count of added, changed or removed tokens; a return value large than 0 will rebuild the array
+	 */
+	public function apply(array &$tokens)
+		{
+		$r = 0;
+		for ($i = 0, $l = count($tokens); $i < $l; $i++)
+			{
+			$current	= get_class($tokens[$i]);
+			$next		= isset($tokens[$i + 1]) ? get_class($tokens[$i + 1]) : false;
+			if (($current === "CssRulesetStartToken" && $next === "CssRulesetEndToken") ||
+				($current === "CssAtKeyframesRulesetStartToken" && $next === "CssAtKeyframesRulesetEndToken" && !array_intersect(array("from", "0%", "to", "100%"), array_map("strtolower", $tokens[$i]->Selectors)))
+				)
+				{
+				$tokens[$i]		= null;
+				$tokens[$i + 1]	= null;
+				$i++;
+				$r = $r + 2;
+				}
+			}
+		return $r;
+		}
+	}
+
+/**
+ * This {@link aCssMinifierFilter minifier filter} will remove any empty @font-face, @keyframes, @media and @page 
+ * at-rule blocks.
+ * 
+ * @package		CssMin/Minifier/Filters
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssRemoveEmptyAtBlocksMinifierFilter extends aCssMinifierFilter
+	{
+	/**
+	 * Implements {@link aCssMinifierFilter::filter()}.
+	 * 
+	 * @param array $tokens Array of objects of type aCssToken
+	 * @return integer Count of added, changed or removed tokens; a return value large than 0 will rebuild the array
+	 */
+	public function apply(array &$tokens)
+		{
+		$r = 0;
+		for ($i = 0, $l = count($tokens); $i < $l; $i++)
+			{
+			$current	= get_class($tokens[$i]);
+			$next		= isset($tokens[$i + 1]) ? get_class($tokens[$i + 1]) : false;
+			if (($current === "CssAtFontFaceStartToken" && $next === "CssAtFontFaceEndToken") ||
+				($current === "CssAtKeyframesStartToken" && $next === "CssAtKeyframesEndToken") ||
+				($current === "CssAtPageStartToken" && $next === "CssAtPageEndToken") ||
+				($current === "CssAtMediaStartToken" && $next === "CssAtMediaEndToken"))
+				{
+				$tokens[$i]		= null;
+				$tokens[$i + 1]	= null;
+				$i++;
+				$r = $r + 2;
+				}
+			}
+		return $r;
+		}
+	}
+
+/**
+ * This {@link aCssMinifierFilter minifier filter} will remove any comments from the array of parsed tokens.
+ * 
+ * @package		CssMin/Minifier/Filters
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssRemoveCommentsMinifierFilter extends aCssMinifierFilter
+	{
+	/**
+	 * Implements {@link aCssMinifierFilter::filter()}.
+	 * 
+	 * @param array $tokens Array of objects of type aCssToken
+	 * @return integer Count of added, changed or removed tokens; a return value large than 0 will rebuild the array
+	 */
+	public function apply(array &$tokens)
+		{
+		$r = 0;
+		for ($i = 0, $l = count($tokens); $i < $l; $i++)
+			{
+			if (get_class($tokens[$i]) === "CssCommentToken")
+				{
+				$tokens[$i] = null;
+				$r++;
+				}
+			}
+		return $r;
+		}
+	}
+
+/**
+ * CSS Parser.
+ * 
+ * @package		CssMin/Parser
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssParser
+	{
+	/**
+	 * Parse buffer.
+	 * 
+	 * @var string
+	 */
+	private $buffer = "";
+	/**
+	 * {@link aCssParserPlugin Plugins}.
+	 * 
+	 * @var array
+	 */
+	private $plugins = array();
+	/**
+	 * Source to parse.
+	 * 
+	 * @var string
+	 */
+	private $source = "";
+	/**
+	 * Current state.
+	 * 
+	 * @var integer
+	 */
+	private $state = "T_DOCUMENT";
+	/**
+	 * Exclusive state.
+	 * 
+	 * @var string
+	 */
+	private $stateExclusive = false;
+	/**
+	 * Media types state.
+	 * 
+	 * @var mixed
+	 */
+	private $stateMediaTypes = false;
+	/**
+	 * State stack.
+	 * 
+	 * @var array
+	 */
+	private $states = array("T_DOCUMENT");
+	/**
+	 * Parsed tokens.
+	 * 
+	 * @var array
+	 */
+	private $tokens = array();
+	/**
+	 * Constructer.
+	 * 
+	 *  Create instances of the used {@link aCssParserPlugin plugins}.
+	 * 
+	 * @param string $source CSS source [optional]
+	 * @param array $plugins Plugin configuration [optional]
+	 * @return void
+	 */
+	public function __construct($source = null, array $plugins = null)
+		{
+		$plugins = array_merge(array
+			(
+			"Comment"		=> true,
+			"String"		=> true,
+			"Url"			=> true,
+			"Expression"	=> true,
+			"Ruleset"		=> true,
+			"AtCharset"		=> true,
+			"AtFontFace"	=> true,
+			"AtImport"		=> true,
+			"AtKeyframes"	=> true,
+			"AtMedia"		=> true,
+			"AtPage"		=> true,
+			"AtVariables"	=> true
+			), is_array($plugins) ? $plugins : array());
+		// Create plugin instances
+		foreach ($plugins as $name => $config)
+			{
+			if ($config !== false)
+				{
+				$class	= "Css" . $name . "ParserPlugin";
+				$config = is_array($config) ? $config : array();
+				if (class_exists($class))
+					{
+					$this->plugins[] = new $class($this, $config);
+					}
+				else
+					{
+					CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": The plugin <code>" . $name . "</code> with the class name <code>" . $class . "</code> was not found"));
+					}
+				}
+			}
+		if (!is_null($source))
+			{
+			$this->parse($source);
+			}
+		}
+	/**
+	 * Append a token to the array of tokens.
+	 * 
+	 * @param aCssToken $token Token to append
+	 * @return void
+	 */
+	public function appendToken(aCssToken $token)
+		{
+		$this->tokens[] = $token;
+		}
+	/**
+	 * Clears the current buffer.
+	 * 
+	 * @return void
+	 */
+	public function clearBuffer()
+		{
+		$this->buffer = "";
+		}
+	/**
+	 * Returns and clear the current buffer.
+	 * 
+	 * @param string $trim Chars to use to trim the returned buffer
+	 * @param boolean $tolower if TRUE the returned buffer will get converted to lower case
+	 * @return string
+	 */
+	public function getAndClearBuffer($trim = "", $tolower = false)
+		{
+		$r = $this->getBuffer($trim, $tolower);
+		$this->buffer = "";
+		return $r;
+		}
+	/**
+	 * Returns the current buffer.
+	 * 
+	 * @param string $trim Chars to use to trim the returned buffer
+	 * @param boolean $tolower if TRUE the returned buffer will get converted to lower case
+	 * @return string
+	 */
+	public function getBuffer($trim = "", $tolower = false)
+		{
+		$r = $this->buffer;
+		if ($trim)
+			{
+			$r = trim($r, " \t\n\r\0\x0B" . $trim);
+			}
+		if ($tolower)
+			{
+			$r = strtolower($r);
+			}
+		return $r;
+		}
+	/**
+	 * Returns the current media types state.
+	 * 
+	 * @return array
+	 */	
+	public function getMediaTypes()
+		{
+		return $this->stateMediaTypes;
+		}
+	/**
+	 * Returns the CSS source.
+	 * 
+	 * @return string
+	 */
+	public function getSource()
+		{
+		return $this->source;
+		}
+	/**
+	 * Returns the current state.
+	 * 
+	 * @return integer The current state
+	 */
+	public function getState()
+		{
+		return $this->state;
+		}
+	/**
+	 * Returns a plugin by class name.
+	 * 
+	 * @param string $name Class name of the plugin 
+	 * @return aCssParserPlugin
+	 */
+	public function getPlugin($class)
+		{
+		static $index = null;
+		if (is_null($index))
+			{
+			$index = array();
+			for ($i = 0, $l = count($this->plugins); $i < $l; $i++)
+				{
+				$index[get_class($this->plugins[$i])] = $i;
+				}
+			}
+		return isset($index[$class]) ? $this->plugins[$index[$class]] : false;
+		}
+	/**
+	 * Returns the parsed tokens.
+	 * 
+	 * @return array
+	 */
+	public function getTokens()
+		{
+		return $this->tokens;
+		}
+	/**
+	 * Returns if the current state equals the passed state.
+	 * 
+	 * @param integer $state State to compare with the current state
+	 * @return boolean TRUE is the state equals to the passed state; FALSE if not
+	 */
+	public function isState($state)
+		{
+		return ($this->state == $state);
+		}
+	/**
+	 * Parse the CSS source and return a array with parsed tokens.
+	 * 
+	 * @param string $source CSS source
+	 * @return array Array with tokens
+	 */
+	public function parse($source)
+		{
+		// Reset
+		$this->source = "";
+		$this->tokens = array();
+		// Create a global and plugin lookup table for trigger chars; set array of plugins as local variable and create 
+		// several helper variables for plugin handling
+		$globalTriggerChars		= "";
+		$plugins				= $this->plugins;
+		$pluginCount			= count($plugins);
+		$pluginIndex			= array();
+		$pluginTriggerStates	= array();
+		$pluginTriggerChars		= array();
+		for ($i = 0, $l = count($plugins); $i < $l; $i++)
+			{
+			$tPluginClassName				= get_class($plugins[$i]);
+			$pluginTriggerChars[$i]			= implode("", $plugins[$i]->getTriggerChars());
+			$tPluginTriggerStates			= $plugins[$i]->getTriggerStates();
+			$pluginTriggerStates[$i]		= $tPluginTriggerStates === false ? false : "|" . implode("|", $tPluginTriggerStates) . "|";
+			$pluginIndex[$tPluginClassName]	= $i;
+			for ($ii = 0, $ll = strlen($pluginTriggerChars[$i]); $ii < $ll; $ii++)
+				{
+				$c = substr($pluginTriggerChars[$i], $ii, 1);
+				if (strpos($globalTriggerChars, $c) === false)
+					{
+					$globalTriggerChars .= $c;
+					}
+				}
+			}
+		// Normalise line endings
+		$source			= str_replace("\r\n", "\n", $source);	// Windows to Unix line endings
+		$source			= str_replace("\r", "\n", $source);		// Mac to Unix line endings
+		$this->source	= $source;
+		// Variables
+		$buffer			= &$this->buffer;
+		$exclusive		= &$this->stateExclusive;
+		$state			= &$this->state;
+		$c = $p 		= null;
+		// --
+		for ($i = 0, $l = strlen($source); $i < $l; $i++)
+			{
+			// Set the current Char
+			$c = $source[$i]; // Is faster than: $c = substr($source, $i, 1);
+			// Normalize and filter double whitespace characters
+			if ($exclusive === false)
+				{
+				if ($c === "\n" || $c === "\t")
+					{
+					$c = " ";
+					}
+				if ($c === " " && $p === " ")
+					{
+					continue;
+					}
+				}
+			$buffer .= $c;
+			// Extended processing only if the current char is a global trigger char
+			if (strpos($globalTriggerChars, $c) !== false)
+				{
+				// Exclusive state is set; process with the exclusive plugin 
+				if ($exclusive)
+					{
+					$tPluginIndex = $pluginIndex[$exclusive];
+					if (strpos($pluginTriggerChars[$tPluginIndex], $c) !== false && ($pluginTriggerStates[$tPluginIndex] === false || strpos($pluginTriggerStates[$tPluginIndex], $state) !== false))
+						{
+						$r = $plugins[$tPluginIndex]->parse($i, $c, $p, $state);
+						// Return value is TRUE => continue with next char
+						if ($r === true)
+							{
+							continue;
+							}
+						// Return value is numeric => set new index and continue with next char
+						elseif ($r !== false && $r != $i)
+							{
+							$i = $r;
+							continue;
+							}
+						}
+					}
+				// Else iterate through the plugins
+				else
+					{
+					$triggerState = "|" . $state . "|";
+					for ($ii = 0, $ll = $pluginCount; $ii < $ll; $ii++)
+						{
+						// Only process if the current char is one of the plugin trigger chars
+						if (strpos($pluginTriggerChars[$ii], $c) !== false && ($pluginTriggerStates[$ii] === false || strpos($pluginTriggerStates[$ii], $triggerState) !== false))
+							{
+							// Process with the plugin
+							$r = $plugins[$ii]->parse($i, $c, $p, $state);
+							// Return value is TRUE => break the plugin loop and and continue with next char
+							if ($r === true)
+								{
+								break;
+								}
+							// Return value is numeric => set new index, break the plugin loop and and continue with next char
+							elseif ($r !== false && $r != $i)
+								{
+								$i = $r;
+								break;
+								}
+							}
+						}
+					}
+				}
+			$p = $c; // Set the parent char
+			}
+		return $this->tokens;
+		}
+	/**
+	 * Remove the last state of the state stack and return the removed stack value.
+	 * 
+	 * @return integer Removed state value
+	 */
+	public function popState()
+		{
+		$r = array_pop($this->states);
+		$this->state = $this->states[count($this->states) - 1];
+		return $r;
+		}
+	/**
+	 * Adds a new state onto the state stack.
+	 * 
+	 * @param integer $state State to add onto the state stack.
+	 * @return integer The index of the added state in the state stacks
+	 */
+	public function pushState($state)
+		{
+		$r = array_push($this->states, $state);
+		$this->state = $this->states[count($this->states) - 1];
+		return $r;
+		}
+	/**
+	 * Sets/restores the buffer.
+	 * 
+	 * @param string $buffer Buffer to set
+	 * @return void
+	 */	
+	public function setBuffer($buffer)
+		{
+		$this->buffer = $buffer;
+		}
+	/**
+	 * Set the exclusive state.
+	 * 
+	 * @param string $exclusive Exclusive state
+	 * @return void
+	 */	
+	public function setExclusive($exclusive)
+		{
+		$this->stateExclusive = $exclusive; 
+		}
+	/**
+	 * Set the media types state.
+	 * 
+	 * @param array $mediaTypes Media types state
+	 * @return void
+	 */	
+	public function setMediaTypes(array $mediaTypes)
+		{
+		$this->stateMediaTypes = $mediaTypes; 
+		}
+	/**
+	 * Sets the current state in the state stack; equals to {@link CssParser::popState()} + {@link CssParser::pushState()}.
+	 * 
+	 * @param integer $state State to set
+	 * @return integer
+	 */
+	public function setState($state)
+		{
+		$r = array_pop($this->states);
+		array_push($this->states, $state);
+		$this->state = $this->states[count($this->states) - 1];
+		return $r;
+		}
+	/**
+	 * Removes the exclusive state.
+	 * 
+	 * @return void
+	 */
+	public function unsetExclusive()
+		{
+		$this->stateExclusive = false;
+		}
+	/**
+	 * Removes the media types state.
+	 * 
+	 * @return void
+	 */
+	public function unsetMediaTypes()
+		{
+		$this->stateMediaTypes = false;
+		}
+	}
+
+/**
+ * {@link aCssFromatter Formatter} returning the CSS source in {@link http://goo.gl/j4XdU OTBS indent style} (The One True Brace Style).
+ * 
+ * @package		CssMin/Formatter
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssOtbsFormatter extends aCssFormatter
+	{
+	/**
+	 * Implements {@link aCssFormatter::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		$r				= array();
+		$level			= 0;
+		for ($i = 0, $l = count($this->tokens); $i < $l; $i++)
+			{
+			$token		= $this->tokens[$i];
+			$class		= get_class($token);
+			$indent 	= str_repeat($this->indent, $level);
+			if ($class === "CssCommentToken")
+				{
+				$lines = array_map("trim", explode("\n", $token->Comment));
+				for ($ii = 0, $ll = count($lines); $ii < $ll; $ii++)
+					{
+					$r[] = $indent . (substr($lines[$ii], 0, 1) == "*" ? " " : "") . $lines[$ii];
+					}
+				}
+			elseif ($class === "CssAtCharsetToken")
+				{
+				$r[] = $indent . "@charset " . $token->Charset . ";";
+				}
+			elseif ($class === "CssAtFontFaceStartToken")
+				{
+				$r[] = $indent . "@font-face {";
+				$level++;
+				}
+			elseif ($class === "CssAtImportToken")
+				{
+				$r[] = $indent . "@import " . $token->Import . " " . implode(", ", $token->MediaTypes) . ";";
+				}
+			elseif ($class === "CssAtKeyframesStartToken")
+				{
+				$r[] = $indent . "@keyframes \"" . $token->Name . "\" {";
+				$level++;
+				}
+			elseif ($class === "CssAtMediaStartToken")
+				{
+				$r[] = $indent . "@media " . implode(", ", $token->MediaTypes) . " {";
+				$level++;
+				}
+			elseif ($class === "CssAtPageStartToken")
+				{
+				$r[] = $indent . "@page {";
+				$level++;
+				}
+			elseif ($class === "CssAtVariablesStartToken")
+				{
+				$r[] = $indent . "@variables " . implode(", ", $token->MediaTypes) . " {";
+				$level++;
+				}
+			elseif ($class === "CssRulesetStartToken" || $class === "CssAtKeyframesRulesetStartToken")
+				{
+				$r[] = $indent . implode(", ", $token->Selectors) . " {";
+				$level++;
+				}
+			elseif ($class == "CssAtFontFaceDeclarationToken"
+				|| $class === "CssAtKeyframesRulesetDeclarationToken"
+				|| $class === "CssAtPageDeclarationToken"
+				|| $class == "CssAtVariablesDeclarationToken"
+				|| $class === "CssRulesetDeclarationToken"
+				)
+				{
+				$declaration = $indent . $token->Property . ": ";
+				if ($this->padding)
+					{
+					$declaration = str_pad($declaration, $this->padding, " ", STR_PAD_RIGHT);
+					}
+				$r[] = $declaration . $token->Value . ($token->IsImportant ? " !important" : "") . ";";
+				}
+			elseif ($class === "CssAtFontFaceEndToken"
+				|| $class === "CssAtMediaEndToken"
+				|| $class === "CssAtKeyframesEndToken"
+				|| $class === "CssAtKeyframesRulesetEndToken"
+				|| $class === "CssAtPageEndToken"
+				|| $class === "CssAtVariablesEndToken"
+				|| $class === "CssRulesetEndToken"
+				)
+				{
+				$level--;
+				$r[] = str_repeat($indent, $level) . "}";
+				}
+			}
+		return implode("\n", $r);
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} is a utility token that extends {@link aNullToken} and returns only a empty string.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssNullToken extends aCssToken
+	{
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "";
+		}
+	}
+
+/**
+ * CSS Minifier.
+ * 
+ * @package		CssMin/Minifier
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssMinifier
+	{
+	/**
+	 * {@link aCssMinifierFilter Filters}.
+	 *  
+	 * @var array
+	 */
+	private $filters = array();
+	/**
+	 * {@link aCssMinifierPlugin Plugins}.
+	 * 
+	 * @var array
+	 */
+	private $plugins = array();
+	/**
+	 * Minified source.
+	 * 
+	 * @var string
+	 */
+	private $minified = "";
+	/**
+	 * Constructer.
+	 * 
+	 * Creates instances of {@link aCssMinifierFilter filters} and {@link aCssMinifierPlugin plugins}.
+	 * 
+	 * @param string $source CSS source [optional]
+	 * @param array $filters Filter configuration [optional]
+	 * @param array $plugins Plugin configuration [optional]
+	 * @return void
+	 */
+	public function __construct($source = null, array $filters = null, array $plugins = null)
+		{
+		$filters = array_merge(array
+			(
+			"ImportImports"					=> false,
+			"RemoveComments"				=> true, 
+			"RemoveEmptyRulesets"			=> true,
+			"RemoveEmptyAtBlocks"			=> true,
+			"ConvertLevel3Properties"		=> false,
+			"ConvertLevel3AtKeyframes"		=> false,
+			"Variables"						=> true,
+			"RemoveLastDelarationSemiColon"	=> true
+			), is_array($filters) ? $filters : array());
+		$plugins = array_merge(array
+			(
+			"Variables"						=> true,
+			"ConvertFontWeight"				=> false,
+			"ConvertHslColors"				=> false,
+			"ConvertRgbColors"				=> false,
+			"ConvertNamedColors"			=> false,
+			"CompressColorValues"			=> false,
+			"CompressUnitValues"			=> false,
+			"CompressExpressionValues"		=> false
+			), is_array($plugins) ? $plugins : array());
+		// Filters
+		foreach ($filters as $name => $config)
+			{
+			if ($config !== false)
+				{
+				$class	= "Css" . $name . "MinifierFilter";
+				$config = is_array($config) ? $config : array();
+				if (class_exists($class))
+					{
+					$this->filters[] = new $class($this, $config);
+					}
+				else
+					{
+					CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": The filter <code>" . $name . "</code> with the class name <code>" . $class . "</code> was not found"));
+					}
+				}
+			}
+		// Plugins
+		foreach ($plugins as $name => $config)
+			{
+			if ($config !== false)
+				{
+				$class	= "Css" . $name . "MinifierPlugin";
+				$config = is_array($config) ? $config : array();
+				if (class_exists($class))
+					{
+					$this->plugins[] = new $class($this, $config);
+					}
+				else
+					{
+					CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": The plugin <code>" . $name . "</code> with the class name <code>" . $class . "</code> was not found"));
+					}
+				}
+			}
+		// --
+		if (!is_null($source))
+			{
+			$this->minify($source);
+			}
+		}
+	/**
+	 * Returns the minified Source.
+	 * 
+	 * @return string
+	 */
+	public function getMinified()
+		{
+		return $this->minified;
+		}
+	/**
+	 * Returns a plugin by class name.
+	 * 
+	 * @param string $name Class name of the plugin
+	 * @return aCssMinifierPlugin
+	 */
+	public function getPlugin($class)
+		{
+		static $index = null;
+		if (is_null($index))
+			{
+			$index = array();
+			for ($i = 0, $l = count($this->plugins); $i < $l; $i++)
+				{
+				$index[get_class($this->plugins[$i])] = $i;
+				}
+			}
+		return isset($index[$class]) ? $this->plugins[$index[$class]] : false;
+		}
+	/**
+	 * Minifies the CSS source.
+	 * 
+	 * @param string $source CSS source
+	 * @return string
+	 */
+	public function minify($source)
+		{
+		// Variables
+		$r						= "";
+		$parser					= new CssParser($source);
+		$tokens					= $parser->getTokens();
+		$filters 				= $this->filters;
+		$filterCount			= count($this->filters);
+		$plugins				= $this->plugins;
+		$pluginCount			= count($plugins);
+		$pluginIndex			= array();
+		$pluginTriggerTokens	= array();
+		$globalTriggerTokens	= array();
+		for ($i = 0, $l = count($plugins); $i < $l; $i++)
+			{
+			$tPluginClassName				= get_class($plugins[$i]);
+			$pluginTriggerTokens[$i]		= $plugins[$i]->getTriggerTokens();
+			foreach ($pluginTriggerTokens[$i] as $v)
+				{
+				if (!in_array($v, $globalTriggerTokens))
+					{
+					$globalTriggerTokens[] = $v;
+					}
+				}
+			$pluginTriggerTokens[$i] = "|" . implode("|", $pluginTriggerTokens[$i]) . "|";
+			$pluginIndex[$tPluginClassName]	= $i;
+			}
+		$globalTriggerTokens = "|" . implode("|", $globalTriggerTokens) . "|";
+		/*
+		 * Apply filters
+		 */
+		for($i = 0; $i < $filterCount; $i++)
+			{
+			// Apply the filter; if the return value is larger than 0...
+			if ($filters[$i]->apply($tokens) > 0)
+				{
+				// ...then filter null values and rebuild the token array
+				$tokens = array_values(array_filter($tokens));
+				}
+			}
+		$tokenCount = count($tokens);
+		/*
+		 * Apply plugins
+		 */
+		for($i = 0; $i < $tokenCount; $i++)
+			{
+			$triggerToken = "|" . get_class($tokens[$i]) . "|";
+			if (strpos($globalTriggerTokens, $triggerToken) !== false)
+				{
+				for($ii = 0; $ii < $pluginCount; $ii++)
+					{
+					if (strpos($pluginTriggerTokens[$ii], $triggerToken) !== false || $pluginTriggerTokens[$ii] === false)
+						{
+						// Apply the plugin; if the return value is TRUE continue to the next token
+						if ($plugins[$ii]->apply($tokens[$i]) === true)
+							{
+							continue 2;
+							}
+						}
+					}
+				}
+			}
+		// Stringify the tokens
+		for($i = 0; $i < $tokenCount; $i++)
+			{
+			$r .= (string) $tokens[$i];
+			}
+		$this->minified = $r;
+		return $r;
+		}
+	}
+
+/**
+ * CssMin - A (simple) css minifier with benefits
+ * 
+ * --
+ * Copyright (c) 2011 Joe Scylla <joe.scylla@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ * --
+ * 
+ * @package		CssMin
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssMin
+	{
+	/**
+	 * Index of classes
+	 * 
+	 * @var array
+	 */
+	private static $classIndex = array();
+	/**
+	 * Parse/minify errors
+	 * 
+	 * @var array
+	 */
+	private static $errors = array();
+	/**
+	 * Verbose output.
+	 * 
+	 * @var boolean
+	 */
+	private static $isVerbose = false;
+	/**
+	 * {@link http://goo.gl/JrW54 Autoload} function of CssMin.
+	 * 
+	 * @param string $class Name of the class
+	 * @return void
+	 */
+	public static function autoload($class)
+		{
+		if (isset(self::$classIndex[$class]))
+			{
+			require(self::$classIndex[$class]);
+			}
+		}
+	/**
+	 * Return errors
+	 * 
+	 * @return array of {CssError}.
+	 */
+	public static function getErrors()
+		{
+		return self::$errors;
+		}
+	/**
+	 * Returns if there were errors.
+	 * 
+	 * @return boolean
+	 */
+	public static function hasErrors()
+		{
+		return count(self::$errors) > 0;
+		}
+	/**
+	 * Initialises CssMin.
+	 * 
+	 * @return void
+	 */
+	public static function initialise()
+		{
+		// Create the class index for autoloading or including
+		$paths = array(dirname(__FILE__));
+		while (list($i, $path) = each($paths))
+			{
+			$subDirectorys = glob($path . "*", GLOB_MARK | GLOB_ONLYDIR | GLOB_NOSORT);
+			if (is_array($subDirectorys))
+				{
+				foreach ($subDirectorys as $subDirectory)
+					{
+					$paths[] = $subDirectory;
+					}
+				}
+			$files = glob($path . "*.php", 0);
+			if (is_array($files))
+				{
+				foreach ($files as $file)
+					{
+					$class = substr(basename($file), 0, -4);
+					self::$classIndex[$class] = $file;
+					}
+				}
+			}
+		krsort(self::$classIndex);
+		// Only use autoloading if spl_autoload_register() is available and no __autoload() is defined (because 
+		// __autoload() breaks if spl_autoload_register() is used. 
+		if (function_exists("spl_autoload_register") && !is_callable("__autoload"))
+			{
+			spl_autoload_register(array(__CLASS__, "autoload"));
+			}
+		// Otherwise include all class files
+		else
+			{
+			foreach (self::$classIndex as $class => $file)
+				{
+				if (!class_exists($class))
+					{
+					require_once($file);
+					}
+				}
+			}
+		}
+	/**
+	 * Minifies CSS source.
+	 * 
+	 * @param string $source CSS source
+	 * @param array $filters Filter configuration [optional]
+	 * @param array $plugins Plugin configuration [optional]
+	 * @return string Minified CSS
+	 */
+	public static function minify($source, array $filters = null, array $plugins = null)
+		{
+		self::$errors = array();
+		$minifier = new CssMinifier($source, $filters, $plugins);
+		return $minifier->getMinified();
+		}
+	/**
+	 * Parse the CSS source.
+	 * 
+	 * @param string $source CSS source
+	 * @param array $plugins Plugin configuration [optional]
+	 * @return array Array of aCssToken
+	 */
+	public static function parse($source, array $plugins = null)
+		{
+		self::$errors = array();
+		$parser = new CssParser($source, $plugins);
+		return $parser->getTokens();
+		}
+	/**
+	 * --
+	 * 
+	 * @param boolean $to
+	 * @return boolean
+	 */
+	public static function setVerbose($to)
+		{
+		self::$isVerbose = (boolean) $to;
+		return self::$isVerbose;
+		}
+	/**
+	 * --
+	 * 
+	 * @param CssError $error
+	 * @return void
+	 */
+	public static function triggerError(CssError $error)
+		{
+		self::$errors[] = $error;
+		if (self::$isVerbose)
+			{
+			trigger_error((string) $error, E_USER_WARNING);
+			}
+		}
+	}
+// Initialises CssMin
+CssMin::initialise();
+
+/**
+ * This {@link aCssMinifierFilter minifier filter} import external css files defined with the @import at-rule into the 
+ * current stylesheet. 
+ * 
+ * @package		CssMin/Minifier/Filters
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssImportImportsMinifierFilter extends aCssMinifierFilter
+	{
+	/**
+	 * Array with already imported external stylesheets.
+	 * 
+	 * @var array
+	 */
+	private $imported = array();
+	/**
+	 * Implements {@link aCssMinifierFilter::filter()}.
+	 * 
+	 * @param array $tokens Array of objects of type aCssToken
+	 * @return integer Count of added, changed or removed tokens; a return value large than 0 will rebuild the array
+	 */
+	public function apply(array &$tokens)
+		{
+		if (!isset($this->configuration["BasePath"]) || !is_dir($this->configuration["BasePath"]))
+			{
+			CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Base path <code>" . ($this->configuration["BasePath"] ? $this->configuration["BasePath"] : "null"). "</code> is not a directory"));
+			return 0;
+			}
+		for ($i = 0, $l = count($tokens); $i < $l; $i++)
+			{
+			if (get_class($tokens[$i]) === "CssAtImportToken")
+				{
+				$import = $this->configuration["BasePath"] . "/" . $tokens[$i]->Import;
+				// Import file was not found/is not a file
+				if (!is_file($import))
+					{
+					CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Import file <code>" . $import. "</code> was not found.", (string) $tokens[$i]));
+					}
+				// Import file already imported; remove this @import at-rule to prevent recursions
+				elseif (in_array($import, $this->imported))
+					{
+					CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Import file <code>" . $import. "</code> was already imported.", (string) $tokens[$i]));
+					$tokens[$i] = null;
+					}
+				else
+					{
+					$this->imported[] = $import;
+					$parser = new CssParser(file_get_contents($import));
+					$import = $parser->getTokens();
+					// The @import at-rule has media types defined requiring special handling
+					if (count($tokens[$i]->MediaTypes) > 0 && !(count($tokens[$i]->MediaTypes) == 1 && $tokens[$i]->MediaTypes[0] == "all"))
+						{
+						$blocks = array();
+						/*
+						 * Filter or set media types of @import at-rule or remove the @import at-rule if no media type is matching the parent @import at-rule
+						 */
+						for($ii = 0, $ll = count($import); $ii < $ll; $ii++)
+							{
+							if (get_class($import[$ii]) === "CssAtImportToken")
+								{
+								// @import at-rule defines no media type or only the "all" media type; set the media types to the one defined in the parent @import at-rule
+								if (count($import[$ii]->MediaTypes) == 0 || (count($import[$ii]->MediaTypes) == 1 && $import[$ii]->MediaTypes[0] == "all"))
+									{
+									$import[$ii]->MediaTypes = $tokens[$i]->MediaTypes;
+									}
+								// @import at-rule defineds one or more media types; filter out media types not matching with the  parent @import at-rule
+								elseif (count($import[$ii]->MediaTypes > 0))
+									{
+									foreach ($import[$ii]->MediaTypes as $index => $mediaType)
+										{
+										if (!in_array($mediaType, $tokens[$i]->MediaTypes))
+											{
+											unset($import[$ii]->MediaTypes[$index]);
+											}
+										}
+									$import[$ii]->MediaTypes = array_values($import[$ii]->MediaTypes);
+									// If there are no media types left in the @import at-rule remove the @import at-rule
+									if (count($import[$ii]->MediaTypes) == 0)
+										{
+										$import[$ii] = null;
+										}
+									}
+								}
+							}
+						/*
+						 * Remove media types of @media at-rule block not defined in the @import at-rule
+						 */
+						for($ii = 0, $ll = count($import); $ii < $ll; $ii++)
+							{
+							if (get_class($import[$ii]) === "CssAtMediaStartToken")
+								{
+								foreach ($import[$ii]->MediaTypes as $index => $mediaType)
+									{
+									if (!in_array($mediaType, $tokens[$i]->MediaTypes))
+										{
+										unset($import[$ii]->MediaTypes[$index]);
+										}
+									$import[$ii]->MediaTypes = array_values($import[$ii]->MediaTypes);
+									}
+								}
+							}
+						/*
+						 * If no media types left of the @media at-rule block remove the complete block
+						 */
+						for($ii = 0, $ll = count($import); $ii < $ll; $ii++)
+							{
+							if (get_class($import[$ii]) === "CssAtMediaStartToken")
+								{
+								if (count($import[$ii]->MediaTypes) === 0)
+									{
+									for ($iii = $ii; $iii < $ll; $iii++)
+										{
+										if (get_class($import[$iii]) === "CssAtMediaEndToken")
+											{
+											break;
+											}
+										}
+									if (get_class($import[$iii]) === "CssAtMediaEndToken")
+										{
+										array_splice($import, $ii, $iii - $ii + 1, array());
+										$ll = count($import);
+										}
+									}
+								}
+							}
+						/*
+						 * If the media types of the @media at-rule equals the media types defined in the @import 
+						 * at-rule remove the CssAtMediaStartToken and CssAtMediaEndToken token
+						 */ 
+						for($ii = 0, $ll = count($import); $ii < $ll; $ii++)
+							{
+							if (get_class($import[$ii]) === "CssAtMediaStartToken" && count(array_diff($tokens[$i]->MediaTypes, $import[$ii]->MediaTypes)) === 0)
+								{
+								for ($iii = $ii; $iii < $ll; $iii++)
+									{
+									if (get_class($import[$iii]) == "CssAtMediaEndToken")
+										{
+										break;
+										}
+									}
+								if (get_class($import[$iii]) == "CssAtMediaEndToken")
+									{
+									unset($import[$ii]);
+									unset($import[$iii]);
+									$import = array_values($import);
+									$ll = count($import);
+									}
+								}
+							}
+						/**
+						 * Extract CssAtImportToken and CssAtCharsetToken tokens
+						 */
+						for($ii = 0, $ll = count($import); $ii < $ll; $ii++)
+							{
+							$class = get_class($import[$ii]);
+							if ($class === "CssAtImportToken" || $class === "CssAtCharsetToken")
+								{
+								$blocks = array_merge($blocks, array_splice($import, $ii, 1, array()));
+								$ll = count($import);
+								}
+							}
+						/*
+						 * Extract the @font-face, @media and @page at-rule block
+						 */
+						for($ii = 0, $ll = count($import); $ii < $ll; $ii++)
+							{
+							$class = get_class($import[$ii]);
+							if ($class === "CssAtFontFaceStartToken" || $class === "CssAtMediaStartToken" || $class === "CssAtPageStartToken" || $class === "CssAtVariablesStartToken")
+								{
+								for ($iii = $ii; $iii < $ll; $iii++)
+									{
+									$class = get_class($import[$iii]);
+									if ($class === "CssAtFontFaceEndToken" || $class === "CssAtMediaEndToken" || $class === "CssAtPageEndToken" || $class === "CssAtVariablesEndToken")
+										{
+										break;
+										}
+									}
+								$class = get_class($import[$iii]);
+								if (isset($import[$iii]) && ($class === "CssAtFontFaceEndToken" || $class === "CssAtMediaEndToken" || $class === "CssAtPageEndToken" || $class === "CssAtVariablesEndToken"))
+									{
+									$blocks = array_merge($blocks, array_splice($import, $ii, $iii - $ii + 1, array()));
+									$ll = count($import);
+									}
+								}
+							}
+						// Create the import array with extracted tokens and the rulesets wrapped into a @media at-rule block
+						$import = array_merge($blocks, array(new CssAtMediaStartToken($tokens[$i]->MediaTypes)), $import, array(new CssAtMediaEndToken()));
+						}
+					// Insert the imported tokens
+					array_splice($tokens, $i, 1, $import);
+					// Modify parameters of the for-loop
+					$i--;
+					$l = count($tokens);
+					}
+				}
+			}
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for preserve parsing expression() declaration values.
+ * 
+ * This plugin return no {@link aCssToken CssToken} but ensures that expression() declaration values will get parsed 
+ * properly.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssExpressionParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Count of left braces.
+	 * 
+	 * @var integer
+	 */
+	private $leftBraces = 0;
+	/**
+	 * Count of right braces.
+	 * 
+	 * @var integer
+	 */
+	private $rightBraces = 0;
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("(", ")", ";", "}");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return false;
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		// Start of expression
+		if ($char === "(" && strtolower(substr($this->parser->getSource(), $index - 10, 11)) === "expression(" && $state !== "T_EXPRESSION")
+			{
+			$this->parser->pushState("T_EXPRESSION");
+			$this->leftBraces++;
+			}
+		// Count left braces
+		elseif ($char === "(" && $state === "T_EXPRESSION")
+			{
+			$this->leftBraces++;
+			}
+		// Count right braces
+		elseif ($char === ")" && $state === "T_EXPRESSION")
+			{
+			$this->rightBraces++;
+			}
+		// Possible end of expression; if left and right braces are equal the expressen ends
+		elseif (($char === ";" || $char === "}") && $state === "T_EXPRESSION" && $this->leftBraces === $this->rightBraces)
+			{
+			$this->leftBraces = $this->rightBraces = 0;
+			$this->parser->popState();
+			return $index - 1;
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * CSS Error.
+ * 
+ * @package		CssMin
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssError
+	{
+	/**
+	 * File.
+	 * 
+	 * @var string
+	 */
+	public $File = "";
+	/**
+	 * Line.
+	 * 
+	 * @var integer
+	 */
+	public $Line = 0;
+	/**
+	 * Error message.
+	 * 
+	 * @var string
+	 */
+	public $Message = "";
+	/**
+	 * Source.
+	 * 
+	 * @var string
+	 */
+	public $Source = "";
+	/**
+	 * Constructor triggering the error.
+	 * 
+	 * @param string $message Error message
+	 * @param string $source Corresponding line [optional]
+	 * @return void
+	 */
+	public function __construct($file, $line, $message, $source = "")
+		{
+		$this->File		= $file;
+		$this->Line		= $line;
+		$this->Message	= $message;
+		$this->Source	= $source;
+		}
+	/**
+	 * Returns the error as formatted string.
+	 * 
+	 * @return string
+	 */	
+	public function __toString()
+		{
+		return $this->Message . ($this->Source ? ": <br /><code>" . $this->Source . "</code>": "") . "<br />in file " . $this->File . " at line " . $this->Line;
+		}
+	}
+
+/**
+ * This {@link aCssMinifierPlugin} will convert a color value in rgb notation to hexadecimal notation.
+ * 
+ * Example:
+ * <code>
+ * color: rgb(200,60%,5);
+ * </code>
+ * 
+ * Will get converted to:
+ * <code>
+ * color:#c89905;
+ * </code>
+ *
+ * @package		CssMin/Minifier/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssConvertRgbColorsMinifierPlugin extends aCssMinifierPlugin
+	{
+	/**
+	 * Regular expression matching the value.
+	 * 
+	 * @var string
+	 */
+	private $reMatch = "/rgb\s*\(\s*([0-9%]+)\s*,\s*([0-9%]+)\s*,\s*([0-9%]+)\s*\)/iS";
+	/**
+	 * Implements {@link aCssMinifierPlugin::minify()}.
+	 * 
+	 * @param aCssToken $token Token to process
+	 * @return boolean Return TRUE to break the processing of this token; FALSE to continue
+	 */
+	public function apply(aCssToken &$token)
+		{
+		if (stripos($token->Value, "rgb") !== false && preg_match($this->reMatch, $token->Value, $m))
+			{
+			for ($i = 1, $l = count($m); $i < $l; $i++)
+				{
+				if (strpos("%", $m[$i]) !== false)
+					{
+					$m[$i] = substr($m[$i], 0, -1);
+					$m[$i] = (int) (256 * ($m[$i] / 100));
+					}
+				$m[$i] = str_pad(dechex($m[$i]),  2, "0", STR_PAD_LEFT);
+				}
+			$token->Value = str_replace($m[0], "#" . $m[1] . $m[2] . $m[3], $token->Value);
+			}
+		return false;
+		}
+	/**
+	 * Implements {@link aMinifierPlugin::getTriggerTokens()}
+	 * 
+	 * @return array
+	 */
+	public function getTriggerTokens()
+		{
+		return array
+			(
+			"CssAtFontFaceDeclarationToken",
+			"CssAtPageDeclarationToken",
+			"CssRulesetDeclarationToken"
+			);
+		}
+	}
+
+/**
+ * This {@link aCssMinifierPlugin} will convert named color values to hexadecimal notation.
+ * 
+ * Example:
+ * <code>
+ * color: black;
+ * border: 1px solid indigo;
+ * </code>
+ * 
+ * Will get converted to:
+ * <code>
+ * color:#000;
+ * border:1px solid #4b0082;
+ * </code>
+ * 
+ * @package		CssMin/Minifier/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssConvertNamedColorsMinifierPlugin extends aCssMinifierPlugin
+	{
+	
+	/**
+	 * Regular expression matching the value.
+	 * 
+	 * @var string
+	 */
+	private $reMatch = null;
+	/**
+	 * Regular expression replacing the value.
+	 * 
+	 * @var string
+	 */
+	private $reReplace = "\"\${1}\" . \$this->transformation[strtolower(\"\${2}\")] . \"\${3}\"";
+	/**
+	 * Transformation table used by the {@link CssConvertNamedColorsMinifierPlugin::$reReplace replace regular expression}.
+	 * 
+	 * @var array
+	 */
+	private $transformation = array
+		( 
+		"aliceblue"						=> "#f0f8ff",
+		"antiquewhite"					=> "#faebd7",
+		"aqua"							=> "#0ff",
+		"aquamarine"					=> "#7fffd4",
+		"azure"							=> "#f0ffff",
+		"beige"							=> "#f5f5dc",
+		"black"							=> "#000",
+		"blue"							=> "#00f",
+		"blueviolet"					=> "#8a2be2",
+		"brown"							=> "#a52a2a",
+		"burlywood"						=> "#deb887",
+		"cadetblue"						=> "#5f9ea0",
+		"chartreuse"					=> "#7fff00",
+		"chocolate"						=> "#d2691e",
+		"coral"							=> "#ff7f50",
+		"cornflowerblue"				=> "#6495ed",
+		"cornsilk"						=> "#fff8dc",
+		"crimson"						=> "#dc143c",
+		"darkblue"						=> "#00008b",
+		"darkcyan"						=> "#008b8b",
+		"darkgoldenrod"					=> "#b8860b",
+		"darkgray"						=> "#a9a9a9",
+		"darkgreen"						=> "#006400",
+		"darkkhaki"						=> "#bdb76b",
+		"darkmagenta"					=> "#8b008b",
+		"darkolivegreen"				=> "#556b2f",
+		"darkorange"					=> "#ff8c00",
+		"darkorchid"					=> "#9932cc",
+		"darkred"						=> "#8b0000",
+		"darksalmon"					=> "#e9967a",
+		"darkseagreen"					=> "#8fbc8f",
+		"darkslateblue"					=> "#483d8b",
+		"darkslategray"					=> "#2f4f4f",
+		"darkturquoise"					=> "#00ced1",
+		"darkviolet"					=> "#9400d3",
+		"deeppink"						=> "#ff1493",
+		"deepskyblue"					=> "#00bfff",
+		"dimgray"						=> "#696969",
+		"dodgerblue"					=> "#1e90ff",
+		"firebrick"						=> "#b22222",
+		"floralwhite"					=> "#fffaf0",
+		"forestgreen"					=> "#228b22",
+		"fuchsia"						=> "#f0f",
+		"gainsboro"						=> "#dcdcdc",
+		"ghostwhite"					=> "#f8f8ff",
+		"gold"							=> "#ffd700",
+		"goldenrod"						=> "#daa520",
+		"gray"							=> "#808080",
+		"green"							=> "#008000",
+		"greenyellow"					=> "#adff2f",
+		"honeydew"						=> "#f0fff0",
+		"hotpink"						=> "#ff69b4",
+		"indianred"						=> "#cd5c5c",
+		"indigo"						=> "#4b0082",
+		"ivory"							=> "#fffff0",
+		"khaki"							=> "#f0e68c",
+		"lavender"						=> "#e6e6fa",
+		"lavenderblush"					=> "#fff0f5",
+		"lawngreen"						=> "#7cfc00",
+		"lemonchiffon"					=> "#fffacd",
+		"lightblue"						=> "#add8e6",
+		"lightcoral"					=> "#f08080",
+		"lightcyan"						=> "#e0ffff",
+		"lightgoldenrodyellow"			=> "#fafad2",
+		"lightgreen"					=> "#90ee90",
+		"lightgrey"						=> "#d3d3d3",
+		"lightpink"						=> "#ffb6c1",
+		"lightsalmon"					=> "#ffa07a",
+		"lightseagreen"					=> "#20b2aa",
+		"lightskyblue"					=> "#87cefa",
+		"lightslategray"				=> "#789",
+		"lightsteelblue"				=> "#b0c4de",
+		"lightyellow"					=> "#ffffe0",
+		"lime"							=> "#0f0",
+		"limegreen"						=> "#32cd32",
+		"linen"							=> "#faf0e6",
+		"maroon"						=> "#800000",
+		"mediumaquamarine"				=> "#66cdaa",
+		"mediumblue"					=> "#0000cd",
+		"mediumorchid"					=> "#ba55d3",
+		"mediumpurple"					=> "#9370db",
+		"mediumseagreen"				=> "#3cb371",
+		"mediumslateblue"				=> "#7b68ee",
+		"mediumspringgreen"				=> "#00fa9a",
+		"mediumturquoise"				=> "#48d1cc",
+		"mediumvioletred"				=> "#c71585",
+		"midnightblue"					=> "#191970",
+		"mintcream"						=> "#f5fffa",
+		"mistyrose"						=> "#ffe4e1",
+		"moccasin"						=> "#ffe4b5",
+		"navajowhite"					=> "#ffdead",
+		"navy"							=> "#000080",
+		"oldlace"						=> "#fdf5e6",
+		"olive"							=> "#808000",
+		"olivedrab"						=> "#6b8e23",
+		"orange"						=> "#ffa500",
+		"orangered"						=> "#ff4500",
+		"orchid"						=> "#da70d6",
+		"palegoldenrod"					=> "#eee8aa",
+		"palegreen"						=> "#98fb98",
+		"paleturquoise"					=> "#afeeee",
+		"palevioletred"					=> "#db7093",
+		"papayawhip"					=> "#ffefd5",
+		"peachpuff"						=> "#ffdab9",
+		"peru"							=> "#cd853f",
+		"pink"							=> "#ffc0cb",
+		"plum"							=> "#dda0dd",
+		"powderblue"					=> "#b0e0e6",
+		"purple"						=> "#800080",
+		"red"							=> "#f00",
+		"rosybrown"						=> "#bc8f8f",
+		"royalblue"						=> "#4169e1",
+		"saddlebrown"					=> "#8b4513",
+		"salmon"						=> "#fa8072",
+		"sandybrown"					=> "#f4a460",
+		"seagreen"						=> "#2e8b57",
+		"seashell"						=> "#fff5ee",
+		"sienna"						=> "#a0522d",
+		"silver"						=> "#c0c0c0",
+		"skyblue"						=> "#87ceeb",
+		"slateblue"						=> "#6a5acd",
+		"slategray"						=> "#708090",
+		"snow"							=> "#fffafa",
+		"springgreen"					=> "#00ff7f",
+		"steelblue"						=> "#4682b4",
+		"tan"							=> "#d2b48c",
+		"teal"							=> "#008080",
+		"thistle"						=> "#d8bfd8",
+		"tomato"						=> "#ff6347",
+		"turquoise"						=> "#40e0d0",
+		"violet"						=> "#ee82ee",
+		"wheat"							=> "#f5deb3",
+		"white"							=> "#fff",
+		"whitesmoke"					=> "#f5f5f5",
+		"yellow"						=> "#ff0",
+		"yellowgreen"					=> "#9acd32"
+		);
+	/**
+	 * Overwrites {@link aCssMinifierPlugin::__construct()}.
+	 * 
+	 * The constructor will create the {@link CssConvertNamedColorsMinifierPlugin::$reReplace replace regular expression}
+	 * based on the {@link CssConvertNamedColorsMinifierPlugin::$transformation transformation table}.
+	 * 
+	 * @param CssMinifier $minifier The CssMinifier object of this plugin.
+	 * @param array $configuration Plugin configuration [optional]
+	 * @return void
+	 */
+	public function __construct(CssMinifier $minifier, array $configuration = array())
+		{
+		$this->reMatch = "/(^|\s)+(" . implode("|", array_keys($this->transformation)) . ")(\s|$)+/eiS";
+		parent::__construct($minifier, $configuration);
+		}
+	/**
+	 * Implements {@link aCssMinifierPlugin::minify()}.
+	 * 
+	 * @param aCssToken $token Token to process
+	 * @return boolean Return TRUE to break the processing of this token; FALSE to continue
+	 */
+	public function apply(aCssToken &$token)
+		{
+		$lcValue = strtolower($token->Value);
+		// Declaration value equals a value in the transformation table => simple replace
+		if (isset($this->transformation[$lcValue]))
+			{
+			$token->Value = $this->transformation[$lcValue];
+			}
+		// Declaration value contains a value in the transformation table => regular expression replace
+		elseif (preg_match($this->reMatch, $token->Value))
+			{
+			$token->Value = preg_replace($this->reMatch, $this->reReplace, $token->Value);
+			}
+		return false;
+		}
+	/**
+	 * Implements {@link aMinifierPlugin::getTriggerTokens()}
+	 * 
+	 * @return array
+	 */
+	public function getTriggerTokens()
+		{
+		return array
+			(
+			"CssAtFontFaceDeclarationToken",
+			"CssAtPageDeclarationToken",
+			"CssRulesetDeclarationToken"
+			);
+		}
+	}
+
+/**
+ * This {@link aCssMinifierFilter minifier filter} triggers on CSS Level 3 properties and will add declaration tokens
+ * with browser-specific properties.
+ * 
+ * @package		CssMin/Minifier/Filters
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssConvertLevel3PropertiesMinifierFilter extends aCssMinifierFilter
+	{
+	/**
+	 * Css property transformations table. Used to convert CSS3 and proprietary properties to the browser-specific 
+	 * counterparts.
+	 * 
+	 * @var array
+	 */
+	private $transformations = array
+		(
+		// Property						Array(Mozilla, Webkit, Opera, Internet Explorer); NULL values are placeholders and will get ignored
+		"animation"						=> array(null, "-webkit-animation", null, null),
+		"animation-delay"				=> array(null, "-webkit-animation-delay", null, null),
+		"animation-direction" 			=> array(null, "-webkit-animation-direction", null, null),
+		"animation-duration"			=> array(null, "-webkit-animation-duration", null, null),
+		"animation-fill-mode"			=> array(null, "-webkit-animation-fill-mode", null, null),
+		"animation-iteration-count"		=> array(null, "-webkit-animation-iteration-count", null, null),
+		"animation-name"				=> array(null, "-webkit-animation-name", null, null),
+		"animation-play-state"			=> array(null, "-webkit-animation-play-state", null, null),
+		"animation-timing-function"		=> array(null, "-webkit-animation-timing-function", null, null),
+		"appearance"					=> array("-moz-appearance", "-webkit-appearance", null, null),
+		"backface-visibility"			=> array(null, "-webkit-backface-visibility", null, null),
+		"background-clip"				=> array(null, "-webkit-background-clip", null, null),
+		"background-composite"			=> array(null, "-webkit-background-composite", null, null),
+		"background-inline-policy"		=> array("-moz-background-inline-policy", null, null, null),
+		"background-origin"				=> array(null, "-webkit-background-origin", null, null),
+		"background-position-x"			=> array(null, null, null, "-ms-background-position-x"),
+		"background-position-y"			=> array(null, null, null, "-ms-background-position-y"),
+		"background-size"				=> array(null, "-webkit-background-size", null, null),
+		"behavior"						=> array(null, null, null, "-ms-behavior"),
+		"binding"						=> array("-moz-binding", null, null, null),
+		"border-after"					=> array(null, "-webkit-border-after", null, null),
+		"border-after-color"			=> array(null, "-webkit-border-after-color", null, null),
+		"border-after-style"			=> array(null, "-webkit-border-after-style", null, null),
+		"border-after-width"			=> array(null, "-webkit-border-after-width", null, null),
+		"border-before"					=> array(null, "-webkit-border-before", null, null),
+		"border-before-color"			=> array(null, "-webkit-border-before-color", null, null),
+		"border-before-style"			=> array(null, "-webkit-border-before-style", null, null),
+		"border-before-width"			=> array(null, "-webkit-border-before-width", null, null),
+		"border-border-bottom-colors"	=> array("-moz-border-bottom-colors", null, null, null),
+		"border-bottom-left-radius"		=> array("-moz-border-radius-bottomleft", "-webkit-border-bottom-left-radius", null, null),
+		"border-bottom-right-radius"	=> array("-moz-border-radius-bottomright", "-webkit-border-bottom-right-radius", null, null),
+		"border-end"					=> array("-moz-border-end", "-webkit-border-end", null, null),
+		"border-end-color"				=> array("-moz-border-end-color", "-webkit-border-end-color", null, null),
+		"border-end-style"				=> array("-moz-border-end-style", "-webkit-border-end-style", null, null),
+		"border-end-width"				=> array("-moz-border-end-width", "-webkit-border-end-width", null, null),
+		"border-fit"					=> array(null, "-webkit-border-fit", null, null),
+		"border-horizontal-spacing"		=> array(null, "-webkit-border-horizontal-spacing", null, null),
+		"border-image"					=> array("-moz-border-image", "-webkit-border-image", null, null),
+		"border-left-colors"			=> array("-moz-border-left-colors", null, null, null),
+		"border-radius"					=> array("-moz-border-radius", "-webkit-border-radius", null, null),
+		"border-border-right-colors"	=> array("-moz-border-right-colors", null, null, null),
+		"border-start"					=> array("-moz-border-start", "-webkit-border-start", null, null),
+		"border-start-color"			=> array("-moz-border-start-color", "-webkit-border-start-color", null, null),
+		"border-start-style"			=> array("-moz-border-start-style", "-webkit-border-start-style", null, null),
+		"border-start-width"			=> array("-moz-border-start-width", "-webkit-border-start-width", null, null),
+		"border-top-colors"				=> array("-moz-border-top-colors", null, null, null),
+		"border-top-left-radius"		=> array("-moz-border-radius-topleft", "-webkit-border-top-left-radius", null, null),
+		"border-top-right-radius"		=> array("-moz-border-radius-topright", "-webkit-border-top-right-radius", null, null),
+		"border-vertical-spacing"		=> array(null, "-webkit-border-vertical-spacing", null, null),
+		"box-align"						=> array("-moz-box-align", "-webkit-box-align", null, null),
+		"box-direction"					=> array("-moz-box-direction", "-webkit-box-direction", null, null),
+		"box-flex"						=> array("-moz-box-flex", "-webkit-box-flex", null, null),
+		"box-flex-group"				=> array(null, "-webkit-box-flex-group", null, null),
+		"box-flex-lines"				=> array(null, "-webkit-box-flex-lines", null, null),
+		"box-ordinal-group"				=> array("-moz-box-ordinal-group", "-webkit-box-ordinal-group", null, null),
+		"box-orient"					=> array("-moz-box-orient", "-webkit-box-orient", null, null),
+		"box-pack"						=> array("-moz-box-pack", "-webkit-box-pack", null, null),
+		"box-reflect"					=> array(null, "-webkit-box-reflect", null, null),
+		"box-shadow"					=> array("-moz-box-shadow", "-webkit-box-shadow", null, null),
+		"box-sizing"					=> array("-moz-box-sizing", null, null, null),
+		"color-correction"				=> array(null, "-webkit-color-correction", null, null),
+		"column-break-after"			=> array(null, "-webkit-column-break-after", null, null),
+		"column-break-before"			=> array(null, "-webkit-column-break-before", null, null),
+		"column-break-inside"			=> array(null, "-webkit-column-break-inside", null, null),
+		"column-count"					=> array("-moz-column-count", "-webkit-column-count", null, null),
+		"column-gap"					=> array("-moz-column-gap", "-webkit-column-gap", null, null),
+		"column-rule"					=> array("-moz-column-rule", "-webkit-column-rule", null, null),
+		"column-rule-color"				=> array("-moz-column-rule-color", "-webkit-column-rule-color", null, null),
+		"column-rule-style"				=> array("-moz-column-rule-style", "-webkit-column-rule-style", null, null),
+		"column-rule-width"				=> array("-moz-column-rule-width", "-webkit-column-rule-width", null, null),
+		"column-span"					=> array(null, "-webkit-column-span", null, null),
+		"column-width"					=> array("-moz-column-width", "-webkit-column-width", null, null),
+		"columns"						=> array(null, "-webkit-columns", null, null),
+		"filter"						=> array(__CLASS__, "filter"),
+		"float-edge"					=> array("-moz-float-edge", null, null, null),
+		"font-feature-settings"			=> array("-moz-font-feature-settings", null, null, null),
+		"font-language-override"		=> array("-moz-font-language-override", null, null, null),
+		"font-size-delta"				=> array(null, "-webkit-font-size-delta", null, null),
+		"font-smoothing"				=> array(null, "-webkit-font-smoothing", null, null),
+		"force-broken-image-icon"		=> array("-moz-force-broken-image-icon", null, null, null),
+		"highlight"						=> array(null, "-webkit-highlight", null, null),
+		"hyphenate-character"			=> array(null, "-webkit-hyphenate-character", null, null),
+		"hyphenate-locale"				=> array(null, "-webkit-hyphenate-locale", null, null),
+		"hyphens"						=> array(null, "-webkit-hyphens", null, null),
+		"force-broken-image-icon"		=> array("-moz-image-region", null, null, null),
+		"ime-mode"						=> array(null, null, null, "-ms-ime-mode"),
+		"interpolation-mode"			=> array(null, null, null, "-ms-interpolation-mode"),
+		"layout-flow"					=> array(null, null, null, "-ms-layout-flow"),
+		"layout-grid"					=> array(null, null, null, "-ms-layout-grid"),
+		"layout-grid-char"				=> array(null, null, null, "-ms-layout-grid-char"),
+		"layout-grid-line"				=> array(null, null, null, "-ms-layout-grid-line"),
+		"layout-grid-mode"				=> array(null, null, null, "-ms-layout-grid-mode"),
+		"layout-grid-type"				=> array(null, null, null, "-ms-layout-grid-type"),
+		"line-break"					=> array(null, "-webkit-line-break", null, "-ms-line-break"),
+		"line-clamp"					=> array(null, "-webkit-line-clamp", null, null),
+		"line-grid-mode"				=> array(null, null, null, "-ms-line-grid-mode"),
+		"logical-height"				=> array(null, "-webkit-logical-height", null, null),
+		"logical-width"					=> array(null, "-webkit-logical-width", null, null),
+		"margin-after"					=> array(null, "-webkit-margin-after", null, null),
+		"margin-after-collapse"			=> array(null, "-webkit-margin-after-collapse", null, null),
+		"margin-before"					=> array(null, "-webkit-margin-before", null, null),
+		"margin-before-collapse"		=> array(null, "-webkit-margin-before-collapse", null, null),
+		"margin-bottom-collapse"		=> array(null, "-webkit-margin-bottom-collapse", null, null),
+		"margin-collapse"				=> array(null, "-webkit-margin-collapse", null, null),
+		"margin-end"					=> array("-moz-margin-end", "-webkit-margin-end", null, null),
+		"margin-start"					=> array("-moz-margin-start", "-webkit-margin-start", null, null),
+		"margin-top-collapse"			=> array(null, "-webkit-margin-top-collapse", null, null),
+		"marquee "						=> array(null, "-webkit-marquee", null, null),
+		"marquee-direction"				=> array(null, "-webkit-marquee-direction", null, null),
+		"marquee-increment"				=> array(null, "-webkit-marquee-increment", null, null),
+		"marquee-repetition"			=> array(null, "-webkit-marquee-repetition", null, null),
+		"marquee-speed"					=> array(null, "-webkit-marquee-speed", null, null),
+		"marquee-style"					=> array(null, "-webkit-marquee-style", null, null),
+		"mask"							=> array(null, "-webkit-mask", null, null),
+		"mask-attachment"				=> array(null, "-webkit-mask-attachment", null, null),
+		"mask-box-image"				=> array(null, "-webkit-mask-box-image", null, null),
+		"mask-clip"						=> array(null, "-webkit-mask-clip", null, null),
+		"mask-composite"				=> array(null, "-webkit-mask-composite", null, null),
+		"mask-image"					=> array(null, "-webkit-mask-image", null, null),
+		"mask-origin"					=> array(null, "-webkit-mask-origin", null, null),
+		"mask-position"					=> array(null, "-webkit-mask-position", null, null),
+		"mask-position-x"				=> array(null, "-webkit-mask-position-x", null, null),
+		"mask-position-y"				=> array(null, "-webkit-mask-position-y", null, null),
+		"mask-repeat"					=> array(null, "-webkit-mask-repeat", null, null),
+		"mask-repeat-x"					=> array(null, "-webkit-mask-repeat-x", null, null),
+		"mask-repeat-y"					=> array(null, "-webkit-mask-repeat-y", null, null),
+		"mask-size"						=> array(null, "-webkit-mask-size", null, null),
+		"match-nearest-mail-blockquote-color" => array(null, "-webkit-match-nearest-mail-blockquote-color", null, null),
+		"max-logical-height"			=> array(null, "-webkit-max-logical-height", null, null),
+		"max-logical-width"				=> array(null, "-webkit-max-logical-width", null, null),
+		"min-logical-height"			=> array(null, "-webkit-min-logical-height", null, null),
+		"min-logical-width"				=> array(null, "-webkit-min-logical-width", null, null),
+		"object-fit"					=> array(null, null, "-o-object-fit", null),
+		"object-position"				=> array(null, null, "-o-object-position", null),
+		"opacity"						=> array(__CLASS__, "opacity"),
+		"outline-radius"				=> array("-moz-outline-radius", null, null, null),
+		"outline-bottom-left-radius"	=> array("-moz-outline-radius-bottomleft", null, null, null),
+		"outline-bottom-right-radius"	=> array("-moz-outline-radius-bottomright", null, null, null),
+		"outline-top-left-radius"		=> array("-moz-outline-radius-topleft", null, null, null),
+		"outline-top-right-radius"		=> array("-moz-outline-radius-topright", null, null, null),
+		"padding-after"					=> array(null, "-webkit-padding-after", null, null),
+		"padding-before"				=> array(null, "-webkit-padding-before", null, null),
+		"padding-end"					=> array("-moz-padding-end", "-webkit-padding-end", null, null),
+		"padding-start"					=> array("-moz-padding-start", "-webkit-padding-start", null, null),
+		"perspective"					=> array(null, "-webkit-perspective", null, null),
+		"perspective-origin"			=> array(null, "-webkit-perspective-origin", null, null),
+		"perspective-origin-x"			=> array(null, "-webkit-perspective-origin-x", null, null),
+		"perspective-origin-y"			=> array(null, "-webkit-perspective-origin-y", null, null),
+		"rtl-ordering"					=> array(null, "-webkit-rtl-ordering", null, null),
+		"scrollbar-3dlight-color"		=> array(null, null, null, "-ms-scrollbar-3dlight-color"),
+		"scrollbar-arrow-color"			=> array(null, null, null, "-ms-scrollbar-arrow-color"),
+		"scrollbar-base-color"			=> array(null, null, null, "-ms-scrollbar-base-color"),
+		"scrollbar-darkshadow-color"	=> array(null, null, null, "-ms-scrollbar-darkshadow-color"),
+		"scrollbar-face-color"			=> array(null, null, null, "-ms-scrollbar-face-color"),
+		"scrollbar-highlight-color"		=> array(null, null, null, "-ms-scrollbar-highlight-color"),
+		"scrollbar-shadow-color"		=> array(null, null, null, "-ms-scrollbar-shadow-color"),
+		"scrollbar-track-color"			=> array(null, null, null, "-ms-scrollbar-track-color"),
+		"stack-sizing"					=> array("-moz-stack-sizing", null, null, null),
+		"svg-shadow"					=> array(null, "-webkit-svg-shadow", null, null),
+		"tab-size"						=> array("-moz-tab-size", null, "-o-tab-size", null),
+		"table-baseline"				=> array(null, null, "-o-table-baseline", null),
+		"text-align-last"				=> array(null, null, null, "-ms-text-align-last"),
+		"text-autospace"				=> array(null, null, null, "-ms-text-autospace"),
+		"text-combine"					=> array(null, "-webkit-text-combine", null, null),
+		"text-decorations-in-effect"	=> array(null, "-webkit-text-decorations-in-effect", null, null),
+		"text-emphasis"					=> array(null, "-webkit-text-emphasis", null, null),
+		"text-emphasis-color"			=> array(null, "-webkit-text-emphasis-color", null, null),
+		"text-emphasis-position"		=> array(null, "-webkit-text-emphasis-position", null, null),
+		"text-emphasis-style"			=> array(null, "-webkit-text-emphasis-style", null, null),
+		"text-fill-color"				=> array(null, "-webkit-text-fill-color", null, null),
+		"text-justify"					=> array(null, null, null, "-ms-text-justify"),
+		"text-kashida-space"			=> array(null, null, null, "-ms-text-kashida-space"),
+		"text-overflow"					=> array(null, null, "-o-text-overflow", "-ms-text-overflow"),
+		"text-security"					=> array(null, "-webkit-text-security", null, null),
+		"text-size-adjust"				=> array(null, "-webkit-text-size-adjust", null, "-ms-text-size-adjust"),
+		"text-stroke"					=> array(null, "-webkit-text-stroke", null, null),
+		"text-stroke-color"				=> array(null, "-webkit-text-stroke-color", null, null),
+		"text-stroke-width"				=> array(null, "-webkit-text-stroke-width", null, null),
+		"text-underline-position"		=> array(null, null, null, "-ms-text-underline-position"),
+		"transform"						=> array("-moz-transform", "-webkit-transform", "-o-transform", null),
+		"transform-origin"				=> array("-moz-transform-origin", "-webkit-transform-origin", "-o-transform-origin", null),
+		"transform-origin-x"			=> array(null, "-webkit-transform-origin-x", null, null),
+		"transform-origin-y"			=> array(null, "-webkit-transform-origin-y", null, null),
+		"transform-origin-z"			=> array(null, "-webkit-transform-origin-z", null, null),
+		"transform-style"				=> array(null, "-webkit-transform-style", null, null),
+		"transition"					=> array("-moz-transition", "-webkit-transition", "-o-transition", null),
+		"transition-delay"				=> array("-moz-transition-delay", "-webkit-transition-delay", "-o-transition-delay", null),
+		"transition-duration"			=> array("-moz-transition-duration", "-webkit-transition-duration", "-o-transition-duration", null),
+		"transition-property"			=> array("-moz-transition-property", "-webkit-transition-property", "-o-transition-property", null),
+		"transition-timing-function"	=> array("-moz-transition-timing-function", "-webkit-transition-timing-function", "-o-transition-timing-function", null),
+		"user-drag"						=> array(null, "-webkit-user-drag", null, null),
+		"user-focus"					=> array("-moz-user-focus", null, null, null),
+		"user-input"					=> array("-moz-user-input", null, null, null),
+		"user-modify"					=> array("-moz-user-modify", "-webkit-user-modify", null, null),
+		"user-select"					=> array("-moz-user-select", "-webkit-user-select", null, null),
+		"white-space"					=> array(__CLASS__, "whiteSpace"),
+		"window-shadow"					=> array("-moz-window-shadow", null, null, null),
+		"word-break"					=> array(null, null, null, "-ms-word-break"),
+		"word-wrap"						=> array(null, null, null, "-ms-word-wrap"),
+		"writing-mode"					=> array(null, "-webkit-writing-mode", null, "-ms-writing-mode"),
+		"zoom"							=> array(null, null, null, "-ms-zoom")
+		);
+	/**
+	 * Implements {@link aCssMinifierFilter::filter()}.
+	 * 
+	 * @param array $tokens Array of objects of type aCssToken
+	 * @return integer Count of added, changed or removed tokens; a return value large than 0 will rebuild the array
+	 */
+	public function apply(array &$tokens)
+		{
+		$r = 0;
+		$transformations = &$this->transformations;
+		for ($i = 0, $l = count($tokens); $i < $l; $i++)
+			{
+			if (get_class($tokens[$i]) === "CssRulesetDeclarationToken")
+				{
+				$tProperty = $tokens[$i]->Property;
+				if (isset($transformations[$tProperty]))
+					{
+					$result = array();
+					if (is_callable($transformations[$tProperty]))
+						{
+						$result = call_user_func_array($transformations[$tProperty], array($tokens[$i]));
+						if (!is_array($result) && is_object($result))
+							{
+							$result = array($result);
+							}
+						}
+					else
+						{
+						$tValue			= $tokens[$i]->Value;
+						$tMediaTypes	= $tokens[$i]->MediaTypes;
+						foreach ($transformations[$tProperty] as $property)
+							{
+							if ($property !== null)
+								{
+								$result[] = new CssRulesetDeclarationToken($property, $tValue, $tMediaTypes);
+								}
+							}
+						}
+					if (count($result) > 0)
+						{
+						array_splice($tokens, $i + 1, 0, $result);
+						$i += count($result);
+						$l += count($result);
+						}
+					}
+				}
+			}
+		return $r;
+		}
+	/**
+	 * Transforms the Internet Explorer specific declaration property "filter" to Internet Explorer 8+ compatible 
+	 * declaratiopn property "-ms-filter". 
+	 * 
+	 * @param aCssToken $token
+	 * @return array
+	 */
+	private static function filter($token)
+		{
+		$r = array
+			(
+			new CssRulesetDeclarationToken("-ms-filter", "\"" . $token->Value . "\"", $token->MediaTypes),
+			);
+		return $r;
+		}
+	/**
+	 * Transforms "opacity: {value}" into browser specific counterparts.
+	 * 
+	 * @param aCssToken $token
+	 * @return array
+	 */
+	private static function opacity($token)
+		{
+		// Calculate the value for Internet Explorer filter statement
+		$ieValue = (int) ((float) $token->Value * 100);
+		$r = array
+			(
+			// Internet Explorer >= 8
+			new CssRulesetDeclarationToken("-ms-filter", "\"alpha(opacity=" . $ieValue . ")\"", $token->MediaTypes),
+			// Internet Explorer >= 4 <= 7
+			new CssRulesetDeclarationToken("filter", "alpha(opacity=" . $ieValue . ")", $token->MediaTypes),
+			new CssRulesetDeclarationToken("zoom", "1", $token->MediaTypes)
+			);
+		return $r;
+		}
+	/**
+	 * Transforms "white-space: pre-wrap" into browser specific counterparts.
+	 * 
+	 * @param aCssToken $token
+	 * @return array
+	 */
+	private static function whiteSpace($token)
+		{
+		if (strtolower($token->Value) === "pre-wrap")
+			{
+			$r = array
+				(
+				// Firefox < 3
+				new CssRulesetDeclarationToken("white-space", "-moz-pre-wrap", $token->MediaTypes),
+				// Webkit
+				new CssRulesetDeclarationToken("white-space", "-webkit-pre-wrap", $token->MediaTypes),
+				// Opera >= 4 <= 6
+				new CssRulesetDeclarationToken("white-space", "-pre-wrap", $token->MediaTypes),
+				// Opera >= 7
+				new CssRulesetDeclarationToken("white-space", "-o-pre-wrap", $token->MediaTypes),
+				// Internet Explorer >= 5.5
+				new CssRulesetDeclarationToken("word-wrap", "break-word", $token->MediaTypes)
+				);
+			return $r;
+			}
+		else
+			{
+			return array();
+			}
+		}
+	}
+
+/**
+ * This {@link aCssMinifierFilter minifier filter} will convert @keyframes at-rule block to browser specific counterparts.
+ * 
+ * @package		CssMin/Minifier/Filters
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssConvertLevel3AtKeyframesMinifierFilter extends aCssMinifierFilter
+	{
+	/**
+	 * Implements {@link aCssMinifierFilter::filter()}.
+	 * 
+	 * @param array $tokens Array of objects of type aCssToken
+	 * @return integer Count of added, changed or removed tokens; a return value larger than 0 will rebuild the array
+	 */
+	public function apply(array &$tokens)
+		{
+		$r = 0;
+		$transformations = array("-moz-keyframes", "-webkit-keyframes");
+		for ($i = 0, $l = count($tokens); $i < $l; $i++)
+			{
+			if (get_class($tokens[$i]) === "CssAtKeyframesStartToken")
+				{
+				for ($ii = $i; $ii < $l; $ii++)
+					{
+					if (get_class($tokens[$ii]) === "CssAtKeyframesEndToken")
+						{
+						break;
+						}
+					}
+				if (get_class($tokens[$ii]) === "CssAtKeyframesEndToken")
+					{
+					$add	= array();
+					$source	= array();
+					for ($iii = $i; $iii <= $ii; $iii++)
+						{
+						$source[] = clone($tokens[$iii]);
+						}
+					foreach ($transformations as $transformation)
+						{
+						$t = array();
+						foreach ($source as $token)
+							{
+							$t[] = clone($token);
+							}
+						$t[0]->AtRuleName = $transformation;
+						$add = array_merge($add, $t);
+						}
+					if (isset($this->configuration["RemoveSource"]) && $this->configuration["RemoveSource"] === true)
+						{
+						array_splice($tokens, $i, $ii - $i + 1, $add);
+						}
+					else
+						{
+						array_splice($tokens, $ii + 1, 0, $add);
+						}
+					$l = count($tokens);
+					$i = $ii + count($add);
+					$r += count($add);
+					}
+				}
+			}
+		return $r;
+		}
+	}
+
+/**
+ * This {@link aCssMinifierPlugin} will convert a color value in hsl notation to hexadecimal notation.
+ * 
+ * Example:
+ * <code>
+ * color: hsl(232,36%,48%);
+ * </code>
+ * 
+ * Will get converted to:
+ * <code>
+ * color:#4e5aa7;
+ * </code>
+ * 
+ * @package		CssMin/Minifier/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssConvertHslColorsMinifierPlugin extends aCssMinifierPlugin
+	{
+	/**
+	 * Regular expression matching the value.
+	 * 
+	 * @var string
+	 */
+	private $reMatch = "/^hsl\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*%\s*,\s*([0-9]+)\s*%\s*\)/iS";
+	/**
+	 * Implements {@link aCssMinifierPlugin::minify()}.
+	 * 
+	 * @param aCssToken $token Token to process
+	 * @return boolean Return TRUE to break the processing of this token; FALSE to continue
+	 */
+	public function apply(aCssToken &$token)
+		{
+		if (stripos($token->Value, "hsl") !== false && preg_match($this->reMatch, $token->Value, $m))
+			{
+			$token->Value = str_replace($m[0], $this->hsl2hex($m[1], $m[2], $m[3]), $token->Value);
+			}
+		return false;
+		}
+	/**
+	 * Implements {@link aMinifierPlugin::getTriggerTokens()}
+	 * 
+	 * @return array
+	 */
+	public function getTriggerTokens()
+		{
+		return array
+			(
+			"CssAtFontFaceDeclarationToken",
+			"CssAtPageDeclarationToken",
+			"CssRulesetDeclarationToken"
+			);
+		}
+	/**
+	 * Convert a HSL value to hexadecimal notation.
+	 * 
+	 * Based on: {@link http://www.easyrgb.com/index.php?X=MATH&H=19#text19}.
+	 * 
+	 * @param integer $hue Hue
+	 * @param integer $saturation Saturation
+	 * @param integer $lightness Lightnesss
+	 * @return string
+	 */
+	private function hsl2hex($hue, $saturation, $lightness)
+		{
+		$hue		= $hue / 360;
+		$saturation	= $saturation / 100;
+		$lightness	= $lightness / 100;
+		if ($saturation == 0)
+			{
+			$red	= $lightness * 255;
+			$green	= $lightness * 255;
+			$blue	= $lightness * 255;
+			}
+		else
+			{
+			if ($lightness < 0.5 )
+				{
+				$v2 = $lightness * (1 + $saturation);
+				}
+			else
+				{
+				$v2 = ($lightness + $saturation) - ($saturation * $lightness);
+				}
+			$v1		= 2 * $lightness - $v2;
+			$red	= 255 * self::hue2rgb($v1, $v2, $hue + (1 / 3));
+			$green	= 255 * self::hue2rgb($v1, $v2, $hue);
+			$blue	= 255 * self::hue2rgb($v1, $v2, $hue - (1 / 3));
+			}
+		return "#" . str_pad(dechex(round($red)), 2, "0", STR_PAD_LEFT) . str_pad(dechex(round($green)), 2, "0", STR_PAD_LEFT) . str_pad(dechex(round($blue)), 2, "0", STR_PAD_LEFT);
+		}
+	/**
+	 * Apply hue to a rgb color value.
+	 * 
+	 * @param integer $v1 Value 1
+	 * @param integer $v2 Value 2
+	 * @param integer $hue Hue
+	 * @return integer
+	 */
+	private function hue2rgb($v1, $v2, $hue)
+		{
+		if ($hue < 0)
+			{
+			$hue += 1;
+			}
+		if ($hue > 1)
+			{
+			$hue -= 1;
+			}
+		if ((6 * $hue) < 1)
+			{
+			return ($v1 + ($v2 - $v1) * 6 * $hue);
+			}
+		if ((2 * $hue) < 1)
+			{
+			return ($v2);
+			}
+		if ((3 * $hue) < 2)
+			{
+			return ($v1 + ($v2 - $v1) * (( 2 / 3) - $hue) * 6);
+			}
+		return $v1;
+		}
+	}
+
+/**
+ * This {@link aCssMinifierPlugin} will convert the font-weight values normal and bold to their numeric notation.
+ * 
+ * Example:
+ * <code>
+ * font-weight: normal;
+ * font: bold 11px monospace;
+ * </code>
+ * 
+ * Will get converted to:
+ * <code>
+ * font-weight:400;
+ * font:700 11px monospace;
+ * </code>
+ *
+ * @package		CssMin/Minifier/Pluginsn
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssConvertFontWeightMinifierPlugin extends aCssMinifierPlugin
+	{
+	/**
+	 * Array of included declaration properties this plugin will process; others declaration properties will get
+	 * ignored. 
+	 * 
+	 * @var array
+	 */
+	private $include = array
+		(
+		"font",
+		"font-weight"
+		);
+	/**
+	 * Regular expression matching the value.
+	 * 
+	 * @var string
+	 */
+	private $reMatch = null;
+	/**
+	 * Regular expression replace the value.
+	 * 
+	 * @var string
+	 */
+	private $reReplace = "\"\${1}\" . \$this->transformation[\"\${2}\"] . \"\${3}\"";
+	/**
+	 * Transformation table used by the {@link CssConvertFontWeightMinifierPlugin::$reReplace replace regular expression}.
+	 * 
+	 * @var array
+	 */
+	private $transformation = array
+		(
+		"normal"	=> "400",
+ 		"bold"		=> "700"
+		);
+	/**
+	 * Overwrites {@link aCssMinifierPlugin::__construct()}.
+	 * 
+	 * The constructor will create the {@link CssConvertFontWeightMinifierPlugin::$reReplace replace regular expression}
+	 * based on the {@link CssConvertFontWeightMinifierPlugin::$transformation transformation table}.
+	 * 
+	 * @param CssMinifier $minifier The CssMinifier object of this plugin.
+	 * @return void
+	 */
+	public function __construct(CssMinifier $minifier)
+		{
+		$this->reMatch = "/(^|\s)+(" . implode("|", array_keys($this->transformation)). ")(\s|$)+/eiS";
+		parent::__construct($minifier);
+		}
+	/**
+	 * Implements {@link aCssMinifierPlugin::minify()}.
+	 * 
+	 * @param aCssToken $token Token to process
+	 * @return boolean Return TRUE to break the processing of this token; FALSE to continue
+	 */
+	public function apply(aCssToken &$token)
+		{
+		if (in_array($token->Property, $this->include) && preg_match($this->reMatch, $token->Value, $m))
+			{
+			$token->Value = preg_replace($this->reMatch, $this->reReplace, $token->Value);
+			}
+		return false;
+		}
+	/**
+	 * Implements {@link aMinifierPlugin::getTriggerTokens()}
+	 * 
+	 * @return array
+	 */
+	public function getTriggerTokens()
+		{
+		return array
+			(
+			"CssAtFontFaceDeclarationToken",
+			"CssAtPageDeclarationToken",
+			"CssRulesetDeclarationToken"
+			);
+		}
+	}
+
+/**
+ * This {@link aCssMinifierPlugin} will compress several unit values to their short notations. Examples:
+ * 
+ * <code>
+ * padding: 0.5em;
+ * border: 0px;
+ * margin: 0 0 0 0;
+ * </code>
+ * 
+ * Will get compressed to:
+ * 
+ * <code>
+ * padding:.5px;
+ * border:0;
+ * margin:0;
+ * </code>
+ * 
+ * --
+ *
+ * @package		CssMin/Minifier/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssCompressUnitValuesMinifierPlugin extends aCssMinifierPlugin
+	{
+	/**
+	 * Regular expression used for matching and replacing unit values.
+	 * 
+	 * @var array
+	 */
+	private $re = array
+		(
+		"/(^| |-)0\.([0-9]+?)(0+)?(%|em|ex|px|in|cm|mm|pt|pc)/iS" => "\${1}.\${2}\${4}",
+		"/(^| )-?(\.?)0(%|em|ex|px|in|cm|mm|pt|pc)/iS" => "\${1}0",
+		"/(^0\s0\s0\s0)|(^0\s0\s0$)|(^0\s0$)/iS" => "0"
+		);
+	/**
+	 * Regular expression matching the value.
+	 * 
+	 * @var string
+	 */
+	private $reMatch = "/(^| |-)0\.([0-9]+?)(0+)?(%|em|ex|px|in|cm|mm|pt|pc)|(^| )-?(\.?)0(%|em|ex|px|in|cm|mm|pt|pc)|(^0\s0\s0\s0$)|(^0\s0\s0$)|(^0\s0$)/iS";
+	/**
+	 * Implements {@link aCssMinifierPlugin::minify()}.
+	 * 
+	 * @param aCssToken $token Token to process
+	 * @return boolean Return TRUE to break the processing of this token; FALSE to continue
+	 */
+	public function apply(aCssToken &$token)
+		{
+		if (preg_match($this->reMatch, $token->Value))
+			{
+			foreach ($this->re as $reMatch => $reReplace)
+				{
+				$token->Value = preg_replace($reMatch, $reReplace, $token->Value);
+				}
+			}
+		return false;
+		}
+	/**
+	 * Implements {@link aMinifierPlugin::getTriggerTokens()}
+	 * 
+	 * @return array
+	 */
+	public function getTriggerTokens()
+		{
+		return array
+			(
+			"CssAtFontFaceDeclarationToken",
+			"CssAtPageDeclarationToken",
+			"CssRulesetDeclarationToken"
+			);
+		}
+	}
+
+/**
+ * This {@link aCssMinifierPlugin} compress the content of expresssion() declaration values.
+ * 
+ * For compression of expressions {@link https://github.com/rgrove/jsmin-php/ JSMin} will get used. JSMin have to be 
+ * already included or loadable via {@link http://goo.gl/JrW54 PHP autoloading}. 
+ * 
+ * @package		CssMin/Minifier/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssCompressExpressionValuesMinifierPlugin extends aCssMinifierPlugin
+	{
+	/**
+	 * Implements {@link aCssMinifierPlugin::minify()}.
+	 * 
+	 * @param aCssToken $token Token to process
+	 * @return boolean Return TRUE to break the processing of this token; FALSE to continue
+	 */
+	public function apply(aCssToken &$token)
+		{
+		if (class_exists("JSMin") && stripos($token->Value, "expression(") !== false)
+			{
+			$value	= $token->Value;
+			$value	= substr($token->Value, stripos($token->Value, "expression(") + 10);
+			$value	= trim(JSMin::minify($value));
+			$token->Value = "expression(" . $value . ")";
+			}
+		return false;
+		}
+	/**
+	 * Implements {@link aMinifierPlugin::getTriggerTokens()}
+	 * 
+	 * @return array
+	 */
+	public function getTriggerTokens()
+		{
+		return array
+			(
+			"CssAtFontFaceDeclarationToken",
+			"CssAtPageDeclarationToken",
+			"CssRulesetDeclarationToken"
+			);
+		}
+	}
+
+/**
+ * This {@link aCssMinifierPlugin} will convert hexadecimal color value with 6 chars to their 3 char hexadecimal 
+ * notation (if possible). 
+ * 
+ * Example:
+ * <code>
+ * color: #aabbcc;
+ * </code>
+ * 
+ * Will get converted to:
+ * <code>
+ * color:#abc;
+ * </code>
+ * 
+ * @package		CssMin/Minifier/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssCompressColorValuesMinifierPlugin extends aCssMinifierPlugin
+	{
+	/**
+	 * Regular expression matching 6 char hexadecimal color values.
+	 * 
+	 * @var string
+	 */
+	private $reMatch = "/\#([0-9a-f]{6})/iS";
+	/**
+	 * Implements {@link aCssMinifierPlugin::minify()}.
+	 * 
+	 * @param aCssToken $token Token to process
+	 * @return boolean Return TRUE to break the processing of this token; FALSE to continue
+	 */
+	public function apply(aCssToken &$token)
+		{
+		if (strpos($token->Value, "#") !== false && preg_match($this->reMatch, $token->Value, $m))
+			{
+			$value = strtolower($m[1]);
+			if ($value[0] == $value[1] && $value[2] == $value[3] && $value[4] == $value[5])
+				{
+				$token->Value = str_replace($m[0], "#" . $value[0] . $value[2] . $value[4], $token->Value);
+				}
+			}
+		return false;
+		}
+	/**
+	 * Implements {@link aMinifierPlugin::getTriggerTokens()}
+	 * 
+	 * @return array
+	 */
+	public function getTriggerTokens()
+		{
+		return array
+			(
+			"CssAtFontFaceDeclarationToken",
+			"CssAtPageDeclarationToken",
+			"CssRulesetDeclarationToken"
+			);
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents a CSS comment.
+ * 
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssCommentToken extends aCssToken
+	{
+	/**
+	 * Comment as Text.
+	 * 
+	 * @var string
+	 */
+	public $Comment = "";
+	/**
+	 * Set the properties of a comment token.
+	 * 
+	 * @param string $comment Comment including comment delimiters 
+	 * @return void
+	 */
+	public function __construct($comment)
+		{
+		$this->Comment = $comment;
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return $this->Comment;
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for parsing comments.
+ * 
+ * Adds a {@link CssCommentToken} to the parser if a comment was found.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssCommentParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("*", "/");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return false;
+		}
+	/**
+	 * Stored buffer for restore.
+	 * 
+	 * @var string
+	 */
+	private $restoreBuffer = "";
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		if ($char === "*" && $previousChar === "/" && $state !== "T_COMMENT")
+			{
+			$this->parser->pushState("T_COMMENT");
+			$this->parser->setExclusive(__CLASS__);
+			$this->restoreBuffer = substr($this->parser->getAndClearBuffer(), 0, -2);
+			}
+		elseif ($char === "/" && $previousChar === "*" && $state === "T_COMMENT")
+			{
+			$this->parser->popState();
+			$this->parser->unsetExclusive();
+			$this->parser->appendToken(new CssCommentToken("/*" . $this->parser->getAndClearBuffer()));
+			$this->parser->setBuffer($this->restoreBuffer);
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the start of a @variables at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtVariablesStartToken extends aCssAtBlockStartToken
+	{
+	/**
+	 * Media types of the @variables at-rule block.
+	 * 
+	 * @var array
+	 */
+	public $MediaTypes = array();
+	/**
+	 * Set the properties of a @variables at-rule token.
+	 * 
+	 * @param array $mediaTypes Media types
+	 * @return void
+	 */
+	public function __construct($mediaTypes = null)
+		{
+		$this->MediaTypes = $mediaTypes ? $mediaTypes : array("all");
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "";
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for parsing @variables at-rule block with including declarations.
+ * 
+ * Found @variables at-rule blocks will add a {@link CssAtVariablesStartToken} and {@link CssAtVariablesEndToken} to the 
+ * parser; including declarations as {@link CssAtVariablesDeclarationToken}.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtVariablesParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("@", "{", "}", ":", ";");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return array("T_DOCUMENT", "T_AT_VARIABLES::PREPARE", "T_AT_VARIABLES", "T_AT_VARIABLES_DECLARATION");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		// Start of @variables at-rule block
+		if ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 10)) === "@variables")
+			{
+			$this->parser->pushState("T_AT_VARIABLES::PREPARE");
+			$this->parser->clearBuffer();
+			return $index + 10;
+			}
+		// Start of @variables declarations
+		elseif ($char === "{" && $state === "T_AT_VARIABLES::PREPARE")
+			{
+			$this->parser->setState("T_AT_VARIABLES");
+			$mediaTypes = array_filter(array_map("trim", explode(",", $this->parser->getAndClearBuffer("{"))));
+			$this->parser->appendToken(new CssAtVariablesStartToken($mediaTypes));
+			}
+		// Start of @variables declaration
+		if ($char === ":" && $state === "T_AT_VARIABLES")
+			{
+			$this->buffer = $this->parser->getAndClearBuffer(":");
+			$this->parser->pushState("T_AT_VARIABLES_DECLARATION");
+			}
+		// Unterminated @variables declaration
+		elseif ($char === ":" && $state === "T_AT_VARIABLES_DECLARATION")
+			{
+			// Ignore Internet Explorer filter declarations
+			if ($this->buffer === "filter")
+				{
+				return false;
+				}
+			CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Unterminated @variables declaration", $this->buffer . ":" . $this->parser->getBuffer() . "_"));
+			}
+		// End of @variables declaration
+		elseif (($char === ";" || $char === "}") && $state === "T_AT_VARIABLES_DECLARATION")
+			{
+			$value = $this->parser->getAndClearBuffer(";}");
+			if (strtolower(substr($value, -10, 10)) === "!important")
+				{
+				$value = trim(substr($value, 0, -10));
+				$isImportant = true;
+				}
+			else
+				{
+				$isImportant = false;
+				}
+			$this->parser->popState();
+			$this->parser->appendToken(new CssAtVariablesDeclarationToken($this->buffer, $value, $isImportant));
+			$this->buffer = "";
+			}
+		// End of @variables at-rule block
+		elseif ($char === "}" && $state === "T_AT_VARIABLES")
+			{
+			$this->parser->popState();
+			$this->parser->clearBuffer();
+			$this->parser->appendToken(new CssAtVariablesEndToken());
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the end of a @variables at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtVariablesEndToken extends aCssAtBlockEndToken
+	{
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "";
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents a declaration of a @variables at-rule block.
+ * 
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtVariablesDeclarationToken extends aCssDeclarationToken
+	{
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "";
+		}
+	}
+
+/**
+* This {@link aCssToken CSS token} represents the start of a @page at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtPageStartToken extends aCssAtBlockStartToken
+	{
+	/**
+	 * Selector.
+	 * 
+	 * @var string
+	 */
+	public $Selector = "";
+	/**
+	 * Sets the properties of the @page at-rule.
+	 * 
+	 * @param string $selector Selector
+	 * @return void
+	 */
+	public function __construct($selector = "")
+		{
+		$this->Selector = $selector;
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "@page" . ($this->Selector ? " " . $this->Selector : "") . "{";
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for parsing @page at-rule block with including declarations.
+ * 
+ * Found @page at-rule blocks will add a {@link CssAtPageStartToken} and {@link CssAtPageEndToken} to the 
+ * parser; including declarations as {@link CssAtPageDeclarationToken}.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtPageParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("@", "{", "}", ":", ";");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return array("T_DOCUMENT", "T_AT_PAGE::SELECTOR", "T_AT_PAGE", "T_AT_PAGE_DECLARATION");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		// Start of @page at-rule block
+		if ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 5)) === "@page")
+			{
+			$this->parser->pushState("T_AT_PAGE::SELECTOR");
+			$this->parser->clearBuffer();
+			return $index + 5;
+			}
+		// Start of @page declarations
+		elseif ($char === "{" && $state === "T_AT_PAGE::SELECTOR")
+			{
+			$selector = $this->parser->getAndClearBuffer("{");
+			$this->parser->setState("T_AT_PAGE");
+			$this->parser->clearBuffer();
+			$this->parser->appendToken(new CssAtPageStartToken($selector));
+			}
+		// Start of @page declaration
+		elseif ($char === ":" && $state === "T_AT_PAGE")
+			{
+			$this->parser->pushState("T_AT_PAGE_DECLARATION");
+			$this->buffer = $this->parser->getAndClearBuffer(":", true);
+			}
+		// Unterminated @font-face declaration
+		elseif ($char === ":" && $state === "T_AT_PAGE_DECLARATION")
+			{
+			// Ignore Internet Explorer filter declarations
+			if ($this->buffer === "filter")
+				{
+				return false;
+				}
+			CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Unterminated @page declaration", $this->buffer . ":" . $this->parser->getBuffer() . "_"));
+			}
+		// End of @page declaration
+		elseif (($char === ";" || $char === "}") && $state == "T_AT_PAGE_DECLARATION")
+			{
+			$value = $this->parser->getAndClearBuffer(";}");
+			if (strtolower(substr($value, -10, 10)) == "!important")
+				{
+				$value = trim(substr($value, 0, -10));
+				$isImportant = true;
+				}
+			else
+				{
+				$isImportant = false;
+				}
+			$this->parser->popState();
+			$this->parser->appendToken(new CssAtPageDeclarationToken($this->buffer, $value, $isImportant));
+			// --
+			if ($char === "}")
+				{
+				$this->parser->popState();
+				$this->parser->appendToken(new CssAtPageEndToken());
+				}
+			$this->buffer = "";
+			}
+		// End of @page at-rule block
+		elseif ($char === "}" && $state === "T_AT_PAGE")
+			{
+			$this->parser->popState();
+			$this->parser->clearBuffer();
+			$this->parser->appendToken(new CssAtPageEndToken());
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the end of a @page at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtPageEndToken extends aCssAtBlockEndToken
+	{
+	
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents a declaration of a @page at-rule block.
+ * 
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtPageDeclarationToken extends aCssDeclarationToken
+	{
+	
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the start of a @media at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtMediaStartToken extends aCssAtBlockStartToken
+	{
+	/**
+	 * Sets the properties of the @media at-rule.
+	 * 
+	 * @param array $mediaTypes Media types
+	 * @return void
+	 */
+	public function __construct(array $mediaTypes = array())
+		{
+		$this->MediaTypes = $mediaTypes;
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "@media " . implode(",", $this->MediaTypes) . "{";
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for parsing @media at-rule block.
+ * 
+ * Found @media at-rule blocks will add a {@link CssAtMediaStartToken} and {@link CssAtMediaEndToken} to the parser. 
+ * This plugin will also set the the current media types using {@link CssParser::setMediaTypes()} and
+ * {@link CssParser::unsetMediaTypes()}.
+ *
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtMediaParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("@", "{", "}");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return array("T_DOCUMENT", "T_AT_MEDIA::PREPARE", "T_AT_MEDIA");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		if ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 6)) === "@media")
+			{
+			$this->parser->pushState("T_AT_MEDIA::PREPARE");
+			$this->parser->clearBuffer();
+			return $index + 6;
+			}
+		elseif ($char === "{" && $state === "T_AT_MEDIA::PREPARE")
+			{
+			$mediaTypes = array_filter(array_map("trim", explode(",", $this->parser->getAndClearBuffer("{"))));
+			$this->parser->setMediaTypes($mediaTypes);
+			$this->parser->setState("T_AT_MEDIA");
+			$this->parser->appendToken(new CssAtMediaStartToken($mediaTypes));
+			}
+		elseif ($char === "}" && $state === "T_AT_MEDIA")
+			{
+			$this->parser->appendToken(new CssAtMediaEndToken());
+			$this->parser->clearBuffer();
+			$this->parser->unsetMediaTypes();
+			$this->parser->popState();
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the end of a @media at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtMediaEndToken extends aCssAtBlockEndToken
+	{
+	
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the start of a @keyframes at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtKeyframesStartToken extends aCssAtBlockStartToken
+	{
+	/**
+	 * Name of the at-rule.
+	 * 
+	 * @var string
+	 */
+	public $AtRuleName = "keyframes";
+	/**
+	 * Name
+	 * 
+	 * @var string
+	 */
+	public $Name = "";
+	/**
+	 * Sets the properties of the @page at-rule.
+	 * 
+	 * @param string $selector Selector
+	 * @return void
+	 */
+	public function __construct($name, $atRuleName = null)
+		{
+		$this->Name = $name;
+		if (!is_null($atRuleName))
+			{
+			$this->AtRuleName = $atRuleName;
+			}
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "@" . $this->AtRuleName . " \"" . $this->Name . "\"{";
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the start of a ruleset of a @keyframes at-rule block.
+ * 
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtKeyframesRulesetStartToken extends aCssRulesetStartToken
+	{
+	/**
+	 * Array of selectors.
+	 * 
+	 * @var array
+	 */
+	public $Selectors = array();
+	/**
+	 * Set the properties of a ruleset token.
+	 * 
+	 * @param array $selectors Selectors of the ruleset 
+	 * @return void
+	 */
+	public function __construct(array $selectors = array())
+		{
+		$this->Selectors = $selectors;
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return implode(",", $this->Selectors) . "{";
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the end of a ruleset of a @keyframes at-rule block.
+ * 
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtKeyframesRulesetEndToken extends aCssRulesetEndToken
+	{
+	
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents a ruleset declaration of a @keyframes at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtKeyframesRulesetDeclarationToken extends aCssDeclarationToken
+	{
+	
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for parsing @keyframes at-rule blocks, rulesets and declarations.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtKeyframesParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * @var string Keyword
+	 */
+	private $atRuleName = "";
+	/**
+	 * Selectors.
+	 * 
+	 * @var array
+	 */
+	private $selectors = array();
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("@", "{", "}", ":", ",", ";");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return array("T_DOCUMENT", "T_AT_KEYFRAMES::NAME", "T_AT_KEYFRAMES", "T_AT_KEYFRAMES_RULESETS", "T_AT_KEYFRAMES_RULESET", "T_AT_KEYFRAMES_RULESET_DECLARATION");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		// Start of @keyframes at-rule block
+		if ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 10)) === "@keyframes") 
+			{
+			$this->atRuleName = "keyframes";
+			$this->parser->pushState("T_AT_KEYFRAMES::NAME");
+			$this->parser->clearBuffer();
+			return $index + 10;
+			}
+		// Start of @keyframes at-rule block (@-moz-keyframes)
+		elseif ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 15)) === "@-moz-keyframes")
+			{
+			$this->atRuleName = "-moz-keyframes";
+			$this->parser->pushState("T_AT_KEYFRAMES::NAME");
+			$this->parser->clearBuffer();
+			return $index + 15;
+			}
+		// Start of @keyframes at-rule block (@-o-keyframes)
+		elseif ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 13)) === "@-o-keyframes")
+			{
+			$this->atRuleName = "-o-keyframes";
+			$this->parser->pushState("T_AT_KEYFRAMES::NAME");
+			$this->parser->clearBuffer();
+			return $index + 13;
+			}
+		// Start of @keyframes at-rule block (@-ms-keyframes)
+		elseif ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 14)) === "@-ms-keyframes")
+			{
+			$this->atRuleName = "-moz-keyframes";
+			$this->parser->pushState("T_AT_KEYFRAMES::NAME");
+			$this->parser->clearBuffer();
+			return $index + 14;
+			}
+		// Start of @keyframes at-rule block (@-webkit-keyframes)
+		elseif ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 18)) === "@-webkit-keyframes")
+			{
+			$this->atRuleName = "-webkit-keyframes";
+			$this->parser->pushState("T_AT_KEYFRAMES::NAME");
+			$this->parser->clearBuffer();
+			return $index + 18;
+			}
+		// Start of @keyframes rulesets
+		elseif ($char === "{" && $state === "T_AT_KEYFRAMES::NAME")
+			{
+			$name = $this->parser->getAndClearBuffer("{\"'");
+			$this->parser->setState("T_AT_KEYFRAMES_RULESETS");
+			$this->parser->clearBuffer();
+			$this->parser->appendToken(new CssAtKeyframesStartToken($name, $this->atRuleName));
+			}
+		// Start of @keyframe ruleset and selectors
+		if ($char === "," && $state === "T_AT_KEYFRAMES_RULESETS")
+			{
+			$this->selectors[] = $this->parser->getAndClearBuffer(",{");
+			}
+		// Start of a @keyframes ruleset
+		elseif ($char === "{" && $state === "T_AT_KEYFRAMES_RULESETS")
+			{
+			if ($this->parser->getBuffer() !== "")
+				{
+				$this->selectors[] = $this->parser->getAndClearBuffer(",{");
+				$this->parser->pushState("T_AT_KEYFRAMES_RULESET");
+				$this->parser->appendToken(new CssAtKeyframesRulesetStartToken($this->selectors));
+				$this->selectors = array();
+				}
+			}
+		// Start of @keyframes ruleset declaration
+		elseif ($char === ":" && $state === "T_AT_KEYFRAMES_RULESET")
+			{
+			$this->parser->pushState("T_AT_KEYFRAMES_RULESET_DECLARATION");
+			$this->buffer = $this->parser->getAndClearBuffer(":;", true);
+			}
+		// Unterminated @keyframes ruleset declaration
+		elseif ($char === ":" && $state === "T_AT_KEYFRAMES_RULESET_DECLARATION")
+			{
+			// Ignore Internet Explorer filter declarations
+			if ($this->buffer === "filter")
+				{
+				return false;
+				}
+			CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Unterminated @keyframes ruleset declaration", $this->buffer . ":" . $this->parser->getBuffer() . "_"));
+			}
+		// End of declaration
+		elseif (($char === ";" || $char === "}") && $state === "T_AT_KEYFRAMES_RULESET_DECLARATION")
+			{
+			$value = $this->parser->getAndClearBuffer(";}");
+			if (strtolower(substr($value, -10, 10)) === "!important")
+				{
+				$value = trim(substr($value, 0, -10));
+				$isImportant = true;
+				}
+			else
+				{
+				$isImportant = false;
+				}
+			$this->parser->popState();
+			$this->parser->appendToken(new CssAtKeyframesRulesetDeclarationToken($this->buffer, $value, $isImportant));
+			// Declaration ends with a right curly brace; so we have to end the ruleset
+			if ($char === "}")
+				{
+				$this->parser->appendToken(new CssAtKeyframesRulesetEndToken());
+				$this->parser->popState();
+				}
+			$this->buffer = "";
+			}
+		// End of @keyframes ruleset
+		elseif ($char === "}" && $state === "T_AT_KEYFRAMES_RULESET")
+			{
+			$this->parser->clearBuffer();
+			
+			$this->parser->popState();
+			$this->parser->appendToken(new CssAtKeyframesRulesetEndToken());
+			}
+		// End of @keyframes rulesets
+		elseif ($char === "}" && $state === "T_AT_KEYFRAMES_RULESETS")
+			{
+			$this->parser->clearBuffer();
+			$this->parser->popState();
+			$this->parser->appendToken(new CssAtKeyframesEndToken());
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the end of a @keyframes at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtKeyframesEndToken extends aCssAtBlockEndToken
+	{
+	
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents a @import at-rule.
+ * 
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1.b1 (2001-02-22)
+ */
+class CssAtImportToken extends aCssToken
+	{
+	/**
+	 * Import path of the @import at-rule.
+	 * 
+	 * @var string
+	 */
+	public $Import = "";
+	/**
+	 * Media types of the @import at-rule.
+	 * 
+	 * @var array
+	 */
+	public $MediaTypes = array();
+	/**
+	 * Set the properties of a @import at-rule token.
+	 * 
+	 * @param string $import Import path
+	 * @param array $mediaTypes Media types
+	 * @return void
+	 */
+	public function __construct($import, $mediaTypes)
+		{
+		$this->Import		= $import;
+		$this->MediaTypes	= $mediaTypes ? $mediaTypes : array();
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "@import \"" . $this->Import . "\"" . (count($this->MediaTypes) > 0 ? " "  . implode(",", $this->MediaTypes) : ""). ";";
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for parsing @import at-rule.
+ * 
+ * If a @import at-rule was found this plugin will add a {@link CssAtImportToken} to the parser.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtImportParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("@", ";", ",", "\n");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return array("T_DOCUMENT", "T_AT_IMPORT");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		if ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 7)) === "@import")
+			{
+			$this->parser->pushState("T_AT_IMPORT");
+			$this->parser->clearBuffer();
+			return $index + 7;
+			}
+		elseif (($char === ";" || $char === "\n") && $state === "T_AT_IMPORT")
+			{
+			$this->buffer = $this->parser->getAndClearBuffer(";");
+			$pos = false;
+			foreach (array(")", "\"", "'") as $needle)
+				{
+				if (($pos = strrpos($this->buffer, $needle)) !== false)
+					{
+					break;
+					}
+				}
+			$import = substr($this->buffer, 0, $pos + 1);
+			if (stripos($import, "url(") === 0)
+				{
+				$import = substr($import, 4, -1);
+				}
+			$import = trim($import, " \t\n\r\0\x0B'\"");
+			$mediaTypes = array_filter(array_map("trim", explode(",", trim(substr($this->buffer, $pos + 1), " \t\n\r\0\x0B{"))));
+			if ($pos)
+				{
+				$this->parser->appendToken(new CssAtImportToken($import, $mediaTypes));
+				}
+			else
+				{
+				CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Invalid @import at-rule syntax", $this->parser->buffer));
+				}
+			$this->parser->popState();
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the start of a @font-face at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtFontFaceStartToken extends aCssAtBlockStartToken
+	{
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "@font-face{";
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for parsing @font-face at-rule block with including declarations.
+ * 
+ * Found @font-face at-rule blocks will add a {@link CssAtFontFaceStartToken} and {@link CssAtFontFaceEndToken} to the 
+ * parser; including declarations as {@link CssAtFontFaceDeclarationToken}.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtFontFaceParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("@", "{", "}", ":", ";");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return array("T_DOCUMENT", "T_AT_FONT_FACE::PREPARE", "T_AT_FONT_FACE", "T_AT_FONT_FACE_DECLARATION");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		// Start of @font-face at-rule block
+		if ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 10)) === "@font-face")
+			{
+			$this->parser->pushState("T_AT_FONT_FACE::PREPARE");
+			$this->parser->clearBuffer();
+			return $index + 10;
+			}
+		// Start of @font-face declarations
+		elseif ($char === "{" && $state === "T_AT_FONT_FACE::PREPARE")
+			{
+			$this->parser->setState("T_AT_FONT_FACE");
+			$this->parser->clearBuffer();
+			$this->parser->appendToken(new CssAtFontFaceStartToken());
+			}
+		// Start of @font-face declaration
+		elseif ($char === ":" && $state === "T_AT_FONT_FACE")
+			{
+			$this->parser->pushState("T_AT_FONT_FACE_DECLARATION");
+			$this->buffer = $this->parser->getAndClearBuffer(":", true);
+			}
+		// Unterminated @font-face declaration
+		elseif ($char === ":" && $state === "T_AT_FONT_FACE_DECLARATION")
+			{
+			// Ignore Internet Explorer filter declarations
+			if ($this->buffer === "filter")
+				{
+				return false;
+				}
+			CssMin::triggerError(new CssError(__FILE__, __LINE__, __METHOD__ . ": Unterminated @font-face declaration", $this->buffer . ":" . $this->parser->getBuffer() . "_"));
+			}
+		// End of @font-face declaration
+		elseif (($char === ";" || $char === "}") && $state === "T_AT_FONT_FACE_DECLARATION")
+			{
+			$value = $this->parser->getAndClearBuffer(";}");
+			if (strtolower(substr($value, -10, 10)) === "!important")
+				{
+				$value = trim(substr($value, 0, -10));
+				$isImportant = true;
+				}
+			else
+				{
+				$isImportant = false;
+				}
+			$this->parser->popState();
+			$this->parser->appendToken(new CssAtFontFaceDeclarationToken($this->buffer, $value, $isImportant));
+			$this->buffer = "";
+			// --
+			if ($char === "}")
+				{
+				$this->parser->appendToken(new CssAtFontFaceEndToken());
+				$this->parser->popState();
+				}
+			}
+		// End of @font-face at-rule block
+		elseif ($char === "}" && $state === "T_AT_FONT_FACE")
+			{
+			$this->parser->appendToken(new CssAtFontFaceEndToken());
+			$this->parser->clearBuffer();
+			$this->parser->popState();
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the end of a @font-face at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtFontFaceEndToken extends aCssAtBlockEndToken
+	{
+	
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents a declaration of a @font-face at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtFontFaceDeclarationToken extends aCssDeclarationToken
+	{
+	
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents a @charset at-rule.
+ * 
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtCharsetToken extends aCssToken
+	{
+	/**
+	 * Charset of the @charset at-rule.
+	 * 
+	 * @var string
+	 */
+	public $Charset = "";
+	/**
+	 * Set the properties of @charset at-rule token. 
+	 * 
+	 * @param string $charset Charset of the @charset at-rule token
+	 * @return void
+	 */
+	public function __construct($charset)
+		{
+		$this->Charset = $charset;
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "@charset " . $this->Charset . ";";
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for parsing @charset at-rule.
+ * 
+ * If a @charset at-rule was found this plugin will add a {@link CssAtCharsetToken} to the parser.
+ *
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.1
+ */
+class CssAtCharsetParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("@", ";", "\n");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return array("T_DOCUMENT", "T_AT_CHARSET");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		if ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 8)) === "@charset")
+			{
+			$this->parser->pushState("T_AT_CHARSET");
+			$this->parser->clearBuffer();
+			return $index + 8;
+			}
+		elseif (($char === ";" || $char === "\n") && $state === "T_AT_CHARSET")
+			{
+			$charset = $this->parser->getAndClearBuffer(";");
+			$this->parser->popState();
+			$this->parser->appendToken(new CssAtCharsetToken($charset));
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+?>
+\ No newline at end of file
diff --git a/lib/JShrink.php b/lib/JShrink.php
new file mode 100644
index 0000000..8358236
--- /dev/null
+++ b/lib/JShrink.php
@@ -0,0 +1,576 @@
+<?php
+/*
+ * This file is part of the JShrink package.
+ *
+ * (c) Robert Hafner <tedivm@tedivm.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Minifier
+ *
+ * Usage - Minifier::minify($js);
+ * Usage - Minifier::minify($js, $options);
+ * Usage - Minifier::minify($js, array('flaggedComments' => false));
+ *
+ * @package JShrink
+ * @author Robert Hafner <tedivm@tedivm.com>
+ * @license http://www.opensource.org/licenses/bsd-license.php  BSD License
+ */
+class Minifier
+{
+    /**
+     * The input javascript to be minified.
+     *
+     * @var string
+     */
+    protected $input;
+
+    /**
+     * The location of the character (in the input string) that is next to be
+     * processed.
+     *
+     * @var int
+     */
+    protected $index = 0;
+
+    /**
+     * The first of the characters currently being looked at.
+     *
+     * @var string
+     */
+    protected $a = '';
+
+    /**
+     * The next character being looked at (after a);
+     *
+     * @var string
+     */
+    protected $b = '';
+
+    /**
+     * This character is only active when certain look ahead actions take place.
+     *
+     *  @var string
+     */
+    protected $c;
+
+    /**
+     * Contains the options for the current minification process.
+     *
+     * @var array
+     */
+    protected $options;
+
+    /**
+     * Contains the default options for minification. This array is merged with
+     * the one passed in by the user to create the request specific set of
+     * options (stored in the $options attribute).
+     *
+     * @var array
+     */
+    protected static $defaultOptions = array('flaggedComments' => true);
+
+    /**
+     * Contains lock ids which are used to replace certain code patterns and
+     * prevent them from being minified
+     *
+     * @var array
+     */
+    protected $locks = array();
+
+    /**
+     * Takes a string containing javascript and removes unneeded characters in
+     * order to shrink the code without altering it's functionality.
+     *
+     * @param  string      $js      The raw javascript to be minified
+     * @param  array       $options Various runtime options in an associative array
+     * @throws \Exception
+     * @return bool|string
+     */
+    public static function minify($js, $options = array())
+    {
+        try {
+            ob_start();
+
+            $jshrink = new Minifier();
+            $js = $jshrink->lock($js);
+            $jshrink->minifyDirectToOutput($js, $options);
+
+            // Sometimes there's a leading new line, so we trim that out here.
+            $js = ltrim(ob_get_clean());
+            $js = $jshrink->unlock($js);
+            unset($jshrink);
+
+            return $js;
+
+        } catch (\Exception $e) {
+
+            if (isset($jshrink)) {
+                // Since the breakdownScript function probably wasn't finished
+                // we clean it out before discarding it.
+                $jshrink->clean();
+                unset($jshrink);
+            }
+
+            // without this call things get weird, with partially outputted js.
+            ob_end_clean();
+            throw $e;
+        }
+    }
+
+    /**
+     * Processes a javascript string and outputs only the required characters,
+     * stripping out all unneeded characters.
+     *
+     * @param string $js      The raw javascript to be minified
+     * @param array  $options Various runtime options in an associative array
+     */
+    protected function minifyDirectToOutput($js, $options)
+    {
+        $this->initialize($js, $options);
+        $this->loop();
+        $this->clean();
+    }
+
+    /**
+     *  Initializes internal variables, normalizes new lines,
+     *
+     * @param string $js      The raw javascript to be minified
+     * @param array  $options Various runtime options in an associative array
+     */
+    protected function initialize($js, $options)
+    {
+        $this->options = array_merge(static::$defaultOptions, $options);
+        $js = str_replace("\r\n", "\n", $js);
+        $this->input = str_replace("\r", "\n", $js);
+
+        // We add a newline to the end of the script to make it easier to deal
+        // with comments at the bottom of the script- this prevents the unclosed
+        // comment error that can otherwise occur.
+        $this->input .= PHP_EOL;
+
+        // Populate "a" with a new line, "b" with the first character, before
+        // entering the loop
+        $this->a = "\n";
+        $this->b = $this->getReal();
+    }
+
+    /**
+     * The primary action occurs here. This function loops through the input string,
+     * outputting anything that's relevant and discarding anything that is not.
+     */
+    protected function loop()
+    {
+        while ($this->a !== false && !is_null($this->a) && $this->a !== '') {
+
+            switch ($this->a) {
+                // new lines
+                case "\n":
+                    // if the next line is something that can't stand alone preserve the newline
+                    if (strpos('(-+{[@', $this->b) !== false) {
+                        echo $this->a;
+                        $this->saveString();
+                        break;
+                    }
+
+                    // if B is a space we skip the rest of the switch block and go down to the
+                    // string/regex check below, resetting $this->b with getReal
+                    if($this->b === ' ')
+                        break;
+
+                // otherwise we treat the newline like a space
+
+                case ' ':
+                    if(static::isAlphaNumeric($this->b))
+                        echo $this->a;
+
+                    $this->saveString();
+                    break;
+
+                default:
+                    switch ($this->b) {
+                        case "\n":
+                            if (strpos('}])+-"\'', $this->a) !== false) {
+                                echo $this->a;
+                                $this->saveString();
+                                break;
+                            } else {
+                                if (static::isAlphaNumeric($this->a)) {
+                                    echo $this->a;
+                                    $this->saveString();
+                                }
+                            }
+                            break;
+
+                        case ' ':
+                            if(!static::isAlphaNumeric($this->a))
+                                break;
+
+                        default:
+                            // check for some regex that breaks stuff
+                            if ($this->a == '/' && ($this->b == '\'' || $this->b == '"')) {
+                                $this->saveRegex();
+                                continue;
+                            }
+
+                            echo $this->a;
+                            $this->saveString();
+                            break;
+                    }
+            }
+
+            // do reg check of doom
+            $this->b = $this->getReal();
+
+            if(($this->b == '/' && strpos('(,=:[!&|?', $this->a) !== false))
+                $this->saveRegex();
+        }
+    }
+
+    /**
+     * Resets attributes that do not need to be stored between requests so that
+     * the next request is ready to go. Another reason for this is to make sure
+     * the variables are cleared and are not taking up memory.
+     */
+    protected function clean()
+    {
+        unset($this->input);
+        $this->index = 0;
+        $this->a = $this->b = '';
+        unset($this->c);
+        unset($this->options);
+    }
+
+    /**
+     * Returns the next string for processing based off of the current index.
+     *
+     * @return string
+     */
+    protected function getChar()
+    {
+        // Check to see if we had anything in the look ahead buffer and use that.
+        if (isset($this->c)) {
+            $char = $this->c;
+            unset($this->c);
+
+        // Otherwise we start pulling from the input.
+        } else {
+            $char = substr($this->input, $this->index, 1);
+
+            // If the next character doesn't exist return false.
+            if (isset($char) && $char === false) {
+                return false;
+            }
+
+            // Otherwise increment the pointer and use this char.
+            $this->index++;
+        }
+
+        // Normalize all whitespace except for the newline character into a
+        // standard space.
+        if($char !== "\n" && ord($char) < 32)
+
+            return ' ';
+
+        return $char;
+    }
+
+    /**
+     * This function gets the next "real" character. It is essentially a wrapper
+     * around the getChar function that skips comments. This has significant
+     * performance benefits as the skipping is done using native functions (ie,
+     * c code) rather than in script php.
+     *
+     *
+     * @return string            Next 'real' character to be processed.
+     * @throws \RuntimeException
+     */
+    protected function getReal()
+    {
+        $startIndex = $this->index;
+        $char = $this->getChar();
+
+        // Check to see if we're potentially in a comment
+        if ($char !== '/') {
+            return $char;
+        }
+
+        $this->c = $this->getChar();
+
+        if ($this->c == '/') {
+            return $this->processOneLineComments($startIndex);
+
+        } elseif ($this->c == '*') {
+            return $this->processMultiLineComments($startIndex);
+        }
+
+        return $char;
+    }
+
+    /**
+     * Removed one line comments, with the exception of some very specific types of
+     * conditional comments.
+     *
+     * @param  int    $startIndex The index point where "getReal" function started
+     * @return string
+     */
+    protected function processOneLineComments($startIndex)
+    {
+        $thirdCommentString = substr($this->input, $this->index, 1);
+
+        // kill rest of line
+        $this->getNext("\n");
+
+        if ($thirdCommentString == '@') {
+            $endPoint = ($this->index) - $startIndex;
+            unset($this->c);
+            $char = "\n" . substr($this->input, $startIndex, $endPoint);
+        } else {
+            // first one is contents of $this->c
+            $this->getChar();
+            $char = $this->getChar();
+        }
+
+        return $char;
+    }
+
+    /**
+     * Skips multiline comments where appropriate, and includes them where needed.
+     * Conditional comments and "license" style blocks are preserved.
+     *
+     * @param  int               $startIndex The index point where "getReal" function started
+     * @return bool|string       False if there's no character
+     * @throws \RuntimeException Unclosed comments will throw an error
+     */
+    protected function processMultiLineComments($startIndex)
+    {
+        $this->getChar(); // current C
+        $thirdCommentString = $this->getChar();
+
+        // kill everything up to the next */ if it's there
+        if ($this->getNext('*/')) {
+
+            $this->getChar(); // get *
+            $this->getChar(); // get /
+            $char = $this->getChar(); // get next real character
+
+            // Now we reinsert conditional comments and YUI-style licensing comments
+            if (($this->options['flaggedComments'] && $thirdCommentString == '!')
+                || ($thirdCommentString == '@') ) {
+
+                // If conditional comments or flagged comments are not the first thing in the script
+                // we need to echo a and fill it with a space before moving on.
+                if ($startIndex > 0) {
+                    echo $this->a;
+                    $this->a = " ";
+
+                    // If the comment started on a new line we let it stay on the new line
+                    if ($this->input[($startIndex - 1)] == "\n") {
+                        echo "\n";
+                    }
+                }
+
+                $endPoint = ($this->index - 1) - $startIndex;
+                echo substr($this->input, $startIndex, $endPoint);
+
+                return $char;
+            }
+
+        } else {
+            $char = false;
+        }
+
+        if($char === false)
+            throw new \RuntimeException('Unclosed multiline comment at position: ' . ($this->index - 2));
+
+        // if we're here c is part of the comment and therefore tossed
+        if(isset($this->c))
+            unset($this->c);
+
+        return $char;
+    }
+
+    /**
+     * Pushes the index ahead to the next instance of the supplied string. If it
+     * is found the first character of the string is returned and the index is set
+     * to it's position.
+     *
+     * @param  string       $string
+     * @return string|false Returns the first character of the string or false.
+     */
+    protected function getNext($string)
+    {
+        // Find the next occurrence of "string" after the current position.
+        $pos = strpos($this->input, $string, $this->index);
+
+        // If it's not there return false.
+        if($pos === false)
+
+            return false;
+
+        // Adjust position of index to jump ahead to the asked for string
+        $this->index = $pos;
+
+        // Return the first character of that string.
+        return substr($this->input, $this->index, 1);
+    }
+
+    /**
+     * When a javascript string is detected this function crawls for the end of
+     * it and saves the whole string.
+     *
+     * @throws \RuntimeException Unclosed strings will throw an error
+     */
+    protected function saveString()
+    {
+        $startpos = $this->index;
+
+        // saveString is always called after a gets cleared, so we push b into
+        // that spot.
+        $this->a = $this->b;
+
+        // If this isn't a string we don't need to do anything.
+        if ($this->a != "'" && $this->a != '"') {
+            return;
+        }
+
+        // String type is the quote used, " or '
+        $stringType = $this->a;
+
+        // Echo out that starting quote
+        echo $this->a;
+
+        // Loop until the string is done
+        while (1) {
+
+            // Grab the very next character and load it into a
+            $this->a = $this->getChar();
+
+            switch ($this->a) {
+
+                // If the string opener (single or double quote) is used
+                // output it and break out of the while loop-
+                // The string is finished!
+                case $stringType:
+                    break 2;
+
+                // New lines in strings without line delimiters are bad- actual
+                // new lines will be represented by the string \n and not the actual
+                // character, so those will be treated just fine using the switch
+                // block below.
+                case "\n":
+                    throw new \RuntimeException('Unclosed string at position: ' . $startpos );
+                    break;
+
+                // Escaped characters get picked up here. If it's an escaped new line it's not really needed
+                case '\\':
+
+                    // a is a slash. We want to keep it, and the next character,
+                    // unless it's a new line. New lines as actual strings will be
+                    // preserved, but escaped new lines should be reduced.
+                    $this->b = $this->getChar();
+
+                    // If b is a new line we discard a and b and restart the loop.
+                    if ($this->b == "\n") {
+                        break;
+                    }
+
+                    // echo out the escaped character and restart the loop.
+                    echo $this->a . $this->b;
+                    break;
+
+
+                // Since we're not dealing with any special cases we simply
+                // output the character and continue our loop.
+                default:
+                    echo $this->a;
+            }
+        }
+    }
+
+    /**
+     * When a regular expression is detected this function crawls for the end of
+     * it and saves the whole regex.
+     *
+     * @throws \RuntimeException Unclosed regex will throw an error
+     */
+    protected function saveRegex()
+    {
+        echo $this->a . $this->b;
+
+        while (($this->a = $this->getChar()) !== false) {
+            if($this->a == '/')
+                break;
+
+            if ($this->a == '\\') {
+                echo $this->a;
+                $this->a = $this->getChar();
+            }
+
+            if($this->a == "\n")
+                throw new \RuntimeException('Unclosed regex pattern at position: ' . $this->index);
+
+            echo $this->a;
+        }
+        $this->b = $this->getReal();
+    }
+
+    /**
+     * Checks to see if a character is alphanumeric.
+     *
+     * @param  string $char Just one character
+     * @return bool
+     */
+    protected static function isAlphaNumeric($char)
+    {
+        return preg_match('/^[\w\$]$/', $char) === 1 || $char == '/';
+    }
+
+    /**
+     * Replace patterns in the given string and store the replacement
+     *
+     * @param  string $js The string to lock
+     * @return bool
+     */
+    protected function lock($js)
+    {
+        /* lock things like <code>"asd" + ++x;</code> */
+        $lock = '"LOCK---' . crc32(time()) . '"';
+
+        $matches = array();
+        preg_match('/([+-])(\s+)([+-])/', $js, $matches);
+        if (empty($matches)) {
+            return $js;
+        }
+
+        $this->locks[$lock] = $matches[2];
+
+        $js = preg_replace('/([+-])\s+([+-])/', "$1{$lock}$2", $js);
+        /* -- */
+
+        return $js;
+    }
+
+    /**
+     * Replace "locks" with the original characters
+     *
+     * @param  string $js The string to unlock
+     * @return bool
+     */
+    protected function unlock($js)
+    {
+        if (!count($this->locks)) {
+            return $js;
+        }
+
+        foreach ($this->locks as $lock => $replacement) {
+            $js = str_replace($lock, $replacement, $js);
+        }
+
+        return $js;
+    }
+
+}
diff --git a/lib/querypath/CssEventHandler.php b/lib/querypath/CssEventHandler.php
new file mode 100644
index 0000000..7236f01
--- /dev/null
+++ b/lib/querypath/CssEventHandler.php
@@ -0,0 +1,1432 @@
+<?php
+/** @file
+ * This file contains a full implementation of the CssEventHandler interface.
+ * 
+ * The tools in this package initiate a CSS selector parsing routine and then
+ * handle all of the callbacks.
+ *
+ * The implementation provided herein adheres to the CSS 3 Selector specification
+ * with the following caveats:
+ *
+ *  - The negation (:not()) and containment (:has()) pseudo-classes allow *full* 
+ *    selectors and not just simple selectors.
+ *  - There are a variety of additional pseudo-classes supported by this 
+ *    implementation that are not part of the spec. Most of the jQuery 
+ *    pseudo-classes are supported. The :x-root pseudo-class is also supported.
+ *  - Pseudo-classes that require a User Agent to function have been disabled.
+ *    Thus there is no :hover pseudo-class.
+ *  - All pseudo-elements require the double-colon (::) notation. This breaks 
+ *    backward compatibility with the 2.1 spec, but it makes visible the issue
+ *    that pseudo-elements cannot be effectively used with most of the present 
+ *    library. They return <b>stdClass objects with a text property</b> (QP > 1.3)
+ *    instead of elements.
+ *  - The pseudo-classes first-of-type, nth-of-type and last-of-type may or may
+ *    not conform to the specification. The spec is unclear.
+ *  - pseudo-class filters of the form -an+b do not function as described in the
+ *    specification. However, they do behave the same way here as they do in 
+ *    jQuery.
+ *  - This library DOES provide XML namespace aware tools. Selectors can use
+ *    namespaces to increase specificity.
+ *  - This library does nothing with the CSS 3 Selector specificity rating. Of 
+ *    course specificity is preserved (to the best of our abilities), but there
+ *    is no calculation done.
+ *
+ * For detailed examples of how the code works and what selectors are supported,
+ * see the CssEventTests file, which contains the unit tests used for
+ * testing this implementation.
+ *
+ * @author M Butcher <matt@aleph-null.tv>
+ * @license http://opensource.org/licenses/lgpl-2.1.php LGPL (The GNU Lesser GPL) or an MIT-like license.
+ */
+
+/**
+ * Require the parser library.
+ */
+require_once 'CssParser.php';
+
+/**
+ * Handler that tracks progress of a query through a DOM.
+ *
+ * The main idea is that we keep a copy of the tree, and then use an
+ * array to keep track of matches. To handle a list of selectors (using
+ * the comma separator), we have to track both the currently progressing
+ * match and the previously matched elements.
+ *
+ * To use this handler:
+ * @code
+ * $filter = '#id'; // Some CSS selector
+ * $handler = new QueryPathCssParser(DOMNode $dom);
+ * $parser = new CssParser();
+ * $parser->parse($filter, $handler);
+ * $matches = $handler->getMatches();
+ * @endcode
+ *
+ * $matches will be an array of zero or more DOMElement objects.
+ *
+ * @ingroup querypath_css
+ */
+class QueryPathCssEventHandler implements CssEventHandler {
+  protected $dom = NULL; // Always points to the top level.
+  protected $matches = NULL; // The matches
+  protected $alreadyMatched = NULL; // Matches found before current selector.
+  protected $findAnyElement = TRUE;
+  
+  
+  /**
+   * Create a new event handler.
+   */
+  public function __construct($dom) {
+    $this->alreadyMatched = new SplObjectStorage();
+    $matches = new SplObjectStorage();
+    
+    // Array of DOMElements
+    if (is_array($dom) || $dom instanceof SplObjectStorage) {
+      //$matches = array();
+      foreach($dom as $item) {
+        if ($item instanceof DOMNode && $item->nodeType == XML_ELEMENT_NODE) {
+          //$matches[] = $item;
+          $matches->attach($item);
+        }
+      }
+      //$this->dom = count($matches) > 0 ? $matches[0] : NULL;
+      if ($matches->count() > 0) {
+        $matches->rewind();
+        $this->dom = $matches->current();
+      }
+      else {
+        //throw new Exception("Setting DOM to Null");
+        $this->dom = NULL;
+      }
+      $this->matches = $matches;
+    }
+    // DOM Document -- we get the root element.
+    elseif ($dom instanceof DOMDocument) {
+      $this->dom = $dom->documentElement;
+      $matches->attach($dom->documentElement);
+    }
+    // DOM Element -- we use this directly
+    elseif ($dom instanceof DOMElement) {
+      $this->dom = $dom;
+      $matches->attach($dom);
+    }
+    // NodeList -- We turn this into an array
+    elseif ($dom instanceof DOMNodeList) {
+      $a = array(); // Not sure why we are doing this....
+      foreach ($dom as $item) {
+        if ($item->nodeType == XML_ELEMENT_NODE) {
+          $matches->attach($item);
+          $a[] = $item; 
+        }
+      }
+      $this->dom = $a;
+    }
+    // FIXME: Handle SimpleXML!
+    // Uh-oh... we don't support anything else.
+    else {
+      throw new Exception("Unhandled type: " . get_class($dom));
+    }
+    $this->matches = $matches;
+  }
+  
+  /**
+   * Generic finding method.
+   *
+   * This is the primary searching method used throughout QueryPath.
+   *
+   * @param string $filter
+   *  A valid CSS 3 filter.
+   * @return QueryPathCssEventHandler
+   *  Returns itself.
+   */
+  public function find($filter) {
+    $parser = new CssParser($filter, $this);
+    $parser->parse();
+    return $this;
+  }
+  
+  /**
+   * Get the elements that match the evaluated selector.
+   *
+   * This should be called after the filter has been parsed.
+   *
+   * @return array
+   *  The matched items. This is almost always an array of 
+   *  {@link DOMElement} objects. It is always an instance of
+   *  {@link DOMNode} objects.
+   */
+  public function getMatches() {
+    //$result = array_merge($this->alreadyMatched, $this->matches);
+    $result = new SplObjectStorage();
+    foreach($this->alreadyMatched as $m) $result->attach($m);
+    foreach($this->matches as $m) $result->attach($m);
+    return $result;
+  }
+  
+  /**
+   * Find any element with the ID that matches $id.
+   *
+   * If this finds an ID, it will immediately quit. Essentially, it doesn't
+   * enforce ID uniqueness, but it assumes it.
+   *
+   * @param $id
+   *  String ID for an element.
+   */
+  public function elementID($id) {
+    $found = new SplObjectStorage();
+    $matches = $this->candidateList();
+    foreach ($matches as $item) {
+      // Check if any of the current items has the desired ID.
+      if ($item->hasAttribute('id') && $item->getAttribute('id') === $id) {
+        $found->attach($item);
+        break;
+      }
+    }
+    $this->matches = $found;
+    $this->findAnyElement = FALSE;
+  }
+  
+  // Inherited
+  public function element($name) {
+    $matches = $this->candidateList();
+    $this->findAnyElement = FALSE;
+    $found = new SplObjectStorage();
+    foreach ($matches as $item) {
+      // Should the existing item be included?
+      // In some cases (e.g. element is root element)
+      // it definitely should. But what about other cases?
+      if ($item->tagName == $name) {
+        $found->attach($item);
+      }
+      // Search for matching kids.
+      //$nl = $item->getElementsByTagName($name);
+      //$found = array_merge($found, $this->nodeListToArray($nl));
+    }
+    
+    $this->matches = $found;
+  }
+  
+  // Inherited
+  public function elementNS($lname, $namespace = NULL) {
+    $this->findAnyElement = FALSE;
+    $found = new SplObjectStorage();
+    $matches = $this->candidateList();
+    foreach ($matches as $item) {
+      // Looking up NS URI only works if the XMLNS attributes are declared
+      // at a level equal to or above the searching doc. Normalizing a doc
+      // should fix this, but it doesn't. So we have to use a fallback 
+      // detection scheme which basically searches by lname and then 
+      // does a post hoc check on the tagname.
+      
+      //$nsuri = $item->lookupNamespaceURI($namespace);
+      $nsuri = $this->dom->lookupNamespaceURI($namespace);
+      
+      // XXX: Presumably the base item needs to be checked. Spec isn't
+      // too clear, but there are three possibilities:
+      // - base should always be checked (what we do here)
+      // - base should never be checked (only children)
+      // - base should only be checked if it is the root node
+      if ($item instanceof DOMNode 
+          && $item->namespaceURI == $nsuri 
+          && $lname == $item->localName) {
+        $found->attach($item);
+      }
+      
+      if (!empty($nsuri)) {
+        $nl = $item->getElementsByTagNameNS($nsuri, $lname);
+        // If something is found, merge them:
+        //if (!empty($nl)) $found = array_merge($found, $this->nodeListToArray($nl));
+        if (!empty($nl)) $this->attachNodeList($nl, $found);
+      }
+      else {
+        //$nl = $item->getElementsByTagName($namespace . ':' . $lname);
+        $nl = $item->getElementsByTagName($lname);
+        $tagname = $namespace . ':' . $lname;
+        $nsmatches = array();
+        foreach ($nl as $node) {
+          if ($node->tagName == $tagname) {
+            //$nsmatches[] = $node;
+            $found->attach($node);
+          }
+        }
+        // If something is found, merge them:
+        //if (!empty($nsmatches)) $found = array_merge($found, $nsmatches);
+      }
+    }
+    $this->matches = $found;
+  }
+  
+  public function anyElement() {
+    $found = new SplObjectStorage();
+    //$this->findAnyElement = TRUE;
+    $matches = $this->candidateList();
+    foreach ($matches as $item) {
+      $found->attach($item); // Add self
+      // See issue #20 or section 6.2 of this:
+      // http://www.w3.org/TR/2009/PR-css3-selectors-20091215/#universal-selector
+      //$nl = $item->getElementsByTagName('*');
+      //$this->attachNodeList($nl, $found);
+    }
+    
+    $this->matches = $found;
+    $this->findAnyElement = FALSE;
+  }
+  public function anyElementInNS($ns) {
+    //$this->findAnyElement = TRUE;
+    $nsuri = $this->dom->lookupNamespaceURI($ns);
+    $found = new SplObjectStorage();
+    if (!empty($nsuri)) {
+      $matches = $this->candidateList();
+      foreach ($matches as $item) {
+        if ($item instanceOf DOMNode && $nsuri == $item->namespaceURI) {
+          $found->attach($item);
+        }
+      }
+    }
+    $this->matches = $found;//UniqueElementList::get($found);
+    $this->findAnyElement = FALSE;
+  }
+  public function elementClass($name) {
+    
+    $found = new SplObjectStorage();
+    $matches = $this->candidateList();
+    foreach ($matches as $item) {
+      if ($item->hasAttribute('class')) {
+        $classes = explode(' ', $item->getAttribute('class'));
+        if (in_array($name, $classes)) $found->attach($item);
+      }
+    }
+    
+    $this->matches = $found;//UniqueElementList::get($found);
+    $this->findAnyElement = FALSE;
+  }
+  
+  public function attribute($name, $value = NULL, $operation = CssEventHandler::isExactly) {
+    $found = new SplObjectStorage();
+    $matches = $this->candidateList();
+    foreach ($matches as $item) {
+      if ($item->hasAttribute($name)) {
+        if (isset($value)) {
+          // If a value exists, then we need a match.
+          if($this->attrValMatches($value, $item->getAttribute($name), $operation)) {
+            $found->attach($item);
+          }
+        }
+        else {
+          // If no value exists, then we consider it a match.
+          $found->attach($item);
+        }
+      }
+    }
+    $this->matches = $found; //UniqueElementList::get($found);
+    $this->findAnyElement = FALSE;
+  }
+
+  /**
+   * Helper function to find all elements with exact matches.
+   * 
+   * @deprecated All use cases seem to be covered by attribute().
+   */
+  protected function searchForAttr($name, $value = NULL) {
+    $found = new SplObjectStorage();
+    $matches = $this->candidateList();
+    foreach ($matches as $candidate) {
+      if ($candidate->hasAttribute($name)) {
+        // If value is required, match that, too.
+        if (isset($value) && $value == $candidate->getAttribute($name)) {
+          $found->attach($candidate);
+        }
+        // Otherwise, it's a match on name alone.
+        else {
+          $found->attach($candidate);
+        }
+      }
+    }
+    
+    $this->matches = $found;
+  }
+  
+  public function attributeNS($lname, $ns, $value = NULL, $operation = CssEventHandler::isExactly) {
+    $matches = $this->candidateList();
+    $found = new SplObjectStorage();
+    if (count($matches) == 0) {
+      $this->matches = $found;
+      return;
+    }
+    
+    // Get the namespace URI for the given label.
+    //$uri = $matches[0]->lookupNamespaceURI($ns);
+    $matches->rewind();
+    $e = $matches->current();
+    $uri = $e->lookupNamespaceURI($ns);
+    
+    foreach ($matches as $item) {
+      //foreach ($item->attributes as $attr) {
+      //  print "$attr->prefix:$attr->localName ($attr->namespaceURI), Value: $attr->nodeValue\n";
+      //}
+      if ($item->hasAttributeNS($uri, $lname)) {
+        if (isset($value)) {
+          if ($this->attrValMatches($value, $item->getAttributeNS($uri, $lname), $operation)) {
+            $found->attach($item);
+          }
+        }
+        else {
+          $found->attach($item);
+        }
+      }
+    }
+    $this->matches = $found;
+    $this->findAnyElement = FALSE;
+  }
+  
+  /**
+   * This also supports the following nonstandard pseudo classes:
+   *  - :x-reset/:x-root (reset to the main item passed into the constructor. Less drastic than :root)
+   *  - :odd/:even (shorthand for :nth-child(odd)/:nth-child(even))
+   */
+  public function pseudoClass($name, $value = NULL) {
+    $name = strtolower($name);
+    // Need to handle known pseudoclasses.
+    switch($name) {
+      case 'visited':
+      case 'hover':
+      case 'active':
+      case 'focus':
+      case 'animated': //  Last 3 are from jQuery
+      case 'visible':
+      case 'hidden':
+        // These require a UA, which we don't have.
+      case 'target':
+        // This requires a location URL, which we don't have.
+        $this->matches = new SplObjectStorage();
+        break;
+      case 'indeterminate':
+        // The assumption is that there is a UA and the format is HTML.
+        // I don't know if this should is useful without a UA.
+        throw new NotImplementedException(":indeterminate is not implemented.");
+        break;
+      case 'lang':
+        // No value = exception.
+        if (!isset($value)) {
+          throw new NotImplementedException("No handler for lang pseudoclass without value.");
+        }
+        $this->lang($value);
+        break;
+      case 'link':
+        $this->searchForAttr('href');
+        break;
+      case 'root':
+        $found = new SplObjectStorage();
+        if (empty($this->dom)) {
+          $this->matches = $found;
+        }
+        elseif (is_array($this->dom)) {
+          $found->attach($this->dom[0]->ownerDocument->documentElement);
+          $this->matches = $found;
+        }
+        elseif ($this->dom instanceof DOMNode) {
+          $found->attach($this->dom->ownerDocument->documentElement);
+          $this->matches = $found;
+        }
+        elseif ($this->dom instanceof DOMNodeList && $this->dom->length > 0) {
+          $found->attach($this->dom->item(0)->ownerDocument->documentElement);
+          $this->matches = $found;
+        }
+        else {
+          // Hopefully we never get here:
+          $found->attach($this->dom);
+          $this->matches = $found;
+        }
+        break;
+      
+      // NON-STANDARD extensions for reseting to the "top" items set in
+      // the constructor.  
+      case 'x-root':
+      case 'x-reset':
+        $this->matches = new SplObjectStorage();
+        $this->matches->attach($this->dom);
+        break;        
+      
+      // NON-STANDARD extensions for simple support of even and odd. These
+      // are supported by jQuery, FF, and other user agents.  
+      case 'even':
+        $this->nthChild(2, 0);
+        break;
+      case 'odd':
+        $this->nthChild(2, 1);
+        break;
+      
+      // Standard child-checking items.  
+      case 'nth-child':
+        list($aVal, $bVal) = $this->parseAnB($value);
+        $this->nthChild($aVal, $bVal);
+        break;
+      case 'nth-last-child':
+        list($aVal, $bVal) = $this->parseAnB($value);
+        $this->nthLastChild($aVal, $bVal);
+        break;
+      case 'nth-of-type':
+        list($aVal, $bVal) = $this->parseAnB($value);
+        $this->nthOfTypeChild($aVal, $bVal, FALSE);
+        break;
+      case 'nth-last-of-type':
+        list($aVal, $bVal) = $this->parseAnB($value);
+        $this->nthLastOfTypeChild($aVal, $bVal);
+        break;
+      case 'first-child':
+        $this->nthChild(0, 1);
+        break;
+      case 'last-child':
+        $this->nthLastChild(0, 1);
+        break;
+      case 'first-of-type':
+        $this->firstOfType();
+        break;
+      case 'last-of-type':
+        $this->lastOfType();
+        break;
+      case 'only-child':
+        $this->onlyChild();
+        break;
+      case 'only-of-type':
+        $this->onlyOfType();
+        break;
+      case 'empty':
+        $this->emptyElement();
+        break;  
+      case 'not':
+        if (empty($value)) {
+          throw new CssParseException(":not() requires a value.");
+        }
+        $this->not($value);
+        break;
+      // Additional pseudo-classes defined in jQuery:
+      case 'lt':
+      case 'gt':
+      case 'nth':
+      case 'eq':
+      case 'first':
+      case 'last':
+      //case 'even':
+      //case 'odd':
+        $this->getByPosition($name, $value);  
+        break;
+      case 'parent':
+        $matches = $this->candidateList();
+        $found = new SplObjectStorage();
+        foreach ($matches as $match) {
+          if (!empty($match->firstChild)) {
+            $found->attach($match);
+          }
+        }
+        $this->matches = $found;
+        break;
+      
+      case 'enabled':  
+      case 'disabled':  
+      case 'checked':  
+        $this->attribute($name);
+        break;
+      case 'text':
+      case 'radio':
+      case 'checkbox':
+      case 'file':
+      case 'password':
+      case 'submit':
+      case 'image':
+      case 'reset':
+      case 'button':
+        $this->attribute('type', $name);
+        break;
+
+      case 'header':
+        $matches = $this->candidateList();
+        $found = new SplObjectStorage();
+        foreach ($matches as $item) {
+          $tag = $item->tagName;
+          $f = strtolower(substr($tag, 0, 1));
+          if ($f == 'h' && strlen($tag) == 2 && ctype_digit(substr($tag, 1, 1))) {
+            $found->attach($item);
+          }
+        }
+        $this->matches = $found;
+        break;
+      case 'has':
+        $this->has($value);
+        break;
+      // Contains == text matches.
+      // In QP 2.1, this was changed.
+      case 'contains':
+        $value = $this->removeQuotes($value);
+    
+        $matches = $this->candidateList();
+        $found = new SplObjectStorage();
+        foreach ($matches as $item) {
+          if (strpos($item->textContent, $value) !== FALSE) {
+            $found->attach($item);
+          }
+        }
+        $this->matches = $found;
+        break;
+        
+      // Since QP 2.1
+      case 'contains-exactly':
+        $value = $this->removeQuotes($value);
+      
+        $matches = $this->candidateList();
+        $found = new SplObjectStorage();
+        foreach ($matches as $item) {
+          if ($item->textContent == $value) {
+            $found->attach($item);
+          }
+        }
+        $this->matches = $found;
+        break;
+      default:
+        throw new CssParseException("Unknown Pseudo-Class: " . $name);
+    }
+    $this->findAnyElement = FALSE;
+  }
+  
+  /**
+   * Remove leading and trailing quotes.
+   */
+  private function removeQuotes($str) {
+    $f = substr($str, 0, 1);
+    $l = substr($str, -1);
+    if ($f === $l && ($f == '"' || $f == "'")) {
+      $str = substr($str, 1, -1);
+    }
+    return $str;
+  }
+  
+  /**
+   * Pseudo-class handler for a variety of jQuery pseudo-classes.
+   * Handles lt, gt, eq, nth, first, last pseudo-classes.
+   */
+  private function getByPosition($operator, $pos) {
+    $matches = $this->candidateList();
+    $found = new SplObjectStorage();
+    if ($matches->count() == 0) {
+      return;
+    }
+    
+    switch ($operator) {
+      case 'nth':
+      case 'eq':
+        if ($matches->count() >= $pos) {
+          //$found[] = $matches[$pos -1];
+          foreach ($matches as $match) {
+            // CSS is 1-based, so we pre-increment.
+            if ($matches->key() + 1 == $pos) {
+              $found->attach($match);
+              break;
+            }
+          }
+        }
+        break;
+      case 'first':
+        if ($matches->count() > 0) {
+          $matches->rewind(); // This is necessary to init.
+          $found->attach($matches->current());
+        }
+        break;
+      case 'last':
+        if ($matches->count() > 0) {
+          
+          // Spin through iterator.
+          foreach ($matches as $item) {};
+         
+          $found->attach($item);
+        }
+        break;
+      // case 'even': 
+      //         for ($i = 1; $i <= count($matches); ++$i) {
+      //           if ($i % 2 == 0) {
+      //             $found[] = $matches[$i];
+      //           }
+      //         }
+      //         break;
+      //       case 'odd':
+      //         for ($i = 1; $i <= count($matches); ++$i) {
+      //           if ($i % 2 == 0) {
+      //             $found[] = $matches[$i];
+      //           }
+      //         }
+      //         break;
+      case 'lt':
+        $i = 0;
+        foreach ($matches as $item) {
+          if (++$i < $pos) {
+            $found->attach($item);
+          }
+        }
+        break;
+      case 'gt':
+        $i = 0;
+        foreach ($matches as $item) {
+          if (++$i > $pos) {
+            $found->attach($item);
+          }
+        }
+        break;
+    }
+    
+    $this->matches = $found;
+  }
+  
+  /**
+   * Parse an an+b rule for CSS pseudo-classes.
+   * @param $rule
+   *  Some rule in the an+b format.
+   * @return 
+   *  Array (list($aVal, $bVal)) of the two values.
+   * @throws CssParseException
+   *  If the rule does not follow conventions.
+   */
+  protected function parseAnB($rule) {
+    if ($rule == 'even') {
+      return array(2, 0);
+    }
+    elseif ($rule == 'odd') {
+      return array(2, 1);
+    }
+    elseif ($rule == 'n') {
+      return array(1, 0);
+    }
+    elseif (is_numeric($rule)) {
+      return array(0, (int)$rule);
+    }
+    
+    $rule = explode('n', $rule);
+    if (count($rule) == 0) {
+      throw new CssParseException("nth-child value is invalid.");
+    }
+    
+    // Each of these is legal: 1, -1, and -. '-' is shorthand for -1.
+    $aVal = trim($rule[0]);
+    $aVal = ($aVal == '-') ? -1 : (int)$aVal;
+    
+    $bVal = !empty($rule[1]) ? (int)trim($rule[1]) : 0;
+    return array($aVal, $bVal);
+  }
+  
+  /**
+   * Pseudo-class handler for nth-child and all related pseudo-classes.
+   *
+   * @param int $groupSize
+   *  The size of the group (in an+b, this is a).
+   * @param int $elementInGroup 
+   *  The offset in a group. (in an+b this is b).
+   * @param boolean $lastChild
+   *  Whether counting should begin with the last child. By default, this is false.
+   *  Pseudo-classes that start with the last-child can set this to true.
+   */
+  protected function nthChild($groupSize, $elementInGroup, $lastChild = FALSE) {
+    // EXPERIMENTAL: New in Quark. This should be substantially faster 
+    // than the old (jQuery-ish) version. It still has E_STRICT violations
+    // though.
+    $parents = new SplObjectStorage();
+    $matches = new SplObjectStorage();
+    
+    $i = 0;
+    foreach ($this->matches as $item) {
+      $parent = $item->parentNode;
+      
+      // Build up an array of all of children of this parent, and store the 
+      // index of each element for reference later. We only need to do this 
+      // once per parent, though.
+      if (!$parents->contains($parent)) {
+        
+        $c = 0;
+        foreach ($parent->childNodes as $child) {
+          // We only want nodes, and if this call is preceded by an element 
+          // selector, we only want to match elements with the same tag name.
+          // !!! This last part is a grey area in the CSS 3 Selector spec. It seems
+          // necessary to make the implementation match the examples in the spec. However,
+          // jQuery 1.2 does not do this.
+          if ($child->nodeType == XML_ELEMENT_NODE && ($this->findAnyElement || $child->tagName == $item->tagName)) {
+            // This may break E_STRICT.
+            $child->nodeIndex = ++$c;
+          }
+        }
+        // This may break E_STRICT.
+        $parent->numElements = $c;
+        $parents->attach($parent);
+      }
+      
+      // If we are looking for the last child, we count from the end of a list.
+      // Note that we add 1 because CSS indices begin at 1, not 0.
+      if ($lastChild) {
+        $indexToMatch = $item->parentNode->numElements  - $item->nodeIndex + 1;
+      }
+      // Otherwise we count from the beginning of the list.
+      else {
+        $indexToMatch = $item->nodeIndex;
+      }
+      
+      // If group size is 0, then we return element at the right index.
+      if ($groupSize == 0) {
+        if ($indexToMatch == $elementInGroup) 
+          $matches->attach($item);
+      }
+      // If group size != 0, then we grab nth element from group offset by
+      // element in group.
+      else {
+        if (($indexToMatch - $elementInGroup) % $groupSize == 0 
+            && ($indexToMatch - $elementInGroup) / $groupSize >= 0) {
+          $matches->attach($item);
+        }
+      }
+      
+      // Iterate.
+      ++$i;
+    }
+    $this->matches = $matches;
+  }
+  
+  /**
+   * Reverse a set of matches.
+   *
+   * This is now necessary because internal matches are no longer represented
+   * as arrays.
+   * @since QueryPath 2.0
+   *//*
+  private function reverseMatches() {
+    // Reverse the candidate list. There must be a better way of doing
+    // this.
+    $arr = array();
+    foreach ($this->matches as $m) array_unshift($arr, $m);
+    
+    $this->found = new SplObjectStorage();
+    foreach ($arr as $item) $this->found->attach($item);
+  }*/
+  
+  /**
+   * Pseudo-class handler for :nth-last-child and related pseudo-classes.
+   */
+  protected function nthLastChild($groupSize, $elementInGroup) {
+    // New in Quark.
+    $this->nthChild($groupSize, $elementInGroup, TRUE);
+  }
+  
+  /**
+   * Get a list of peer elements.
+   * If $requireSameTag is TRUE, then only peer elements with the same
+   * tagname as the given element will be returned.
+   *
+   * @param $element
+   *  A DomElement.
+   * @param $requireSameTag
+   *  Boolean flag indicating whether all matches should have the same
+   *  element name (tagName) as $element.
+   * @return
+   *  Array of peer elements.
+   *//*
+  protected function listPeerElements($element, $requireSameTag = FALSE) {
+    $peers = array();
+    $parent = $element->parentNode;
+    foreach ($parent->childNodes as $node) {
+      if ($node->nodeType == XML_ELEMENT_NODE) {
+        if ($requireSameTag) {
+          // Need to make sure that the tag matches:
+          if ($element->tagName == $node->tagName) {
+            $peers[] = $node;
+          }
+        }
+        else {
+          $peers[] = $node;
+        }
+      }
+    }
+    return $peers;
+  }
+  */
+  /**
+   * Get the nth child (by index) from matching candidates.
+   *
+   * This is used by pseudo-class handlers.
+   */
+   /*
+  protected function childAtIndex($index, $tagName = NULL) {
+    $restrictToElement = !$this->findAnyElement;
+    $matches = $this->candidateList();
+    $defaultTagName = $tagName;
+    
+    // XXX: Added in Quark: I believe this should return an empty
+    // match set if no child was found tat the index.
+    $this->matches = new SplObjectStorage();
+    
+    foreach ($matches as $item) {
+      $parent = $item->parentNode;
+      
+      // If a default tag name is supplied, we always use it.
+      if (!empty($defaultTagName)) {
+        $tagName = $defaultTagName;
+      }
+      // If we are inside of an element selector, we use the 
+      // tag name of the given elements.
+      elseif ($restrictToElement) {
+        $tagName = $item->tagName;
+      }
+      // Otherwise, we skip the tag name match.
+      else {
+        $tagName = NULL;
+      }
+
+      // Loop through all children looking for matches.
+      $i = 0;
+      foreach ($parent->childNodes as $child) {
+        if ($child->nodeType !== XML_ELEMENT_NODE) {
+          break; // Skip non-elements
+        }
+        
+        // If type is set, then we do type comparison
+        if (!empty($tagName)) {
+          // Check whether tag name matches the type.
+          if ($child->tagName == $tagName) {
+            // See if this is the index we are looking for.
+            if ($i == $index) {
+              //$this->matches = new SplObjectStorage();
+              $this->matches->attach($child);
+              return;
+            }
+            // If it's not the one we are looking for, increment.
+            ++$i;
+          }
+        }
+        // We don't care about type. Any tagName will match.
+        else {
+          if ($i == $index) {
+            $this->matches->attach($child);
+            return;
+          }
+          ++$i;
+        }
+      } // End foreach
+    }
+    
+  }*/
+  
+  /**
+   * Pseudo-class handler for nth-of-type-child.
+   * Not implemented.
+   */
+  protected function nthOfTypeChild($groupSize, $elementInGroup, $lastChild) {
+    // EXPERIMENTAL: New in Quark. This should be substantially faster 
+    // than the old (jQuery-ish) version. It still has E_STRICT violations
+    // though.
+    $parents = new SplObjectStorage();
+    $matches = new SplObjectStorage();
+    
+    $i = 0;
+    foreach ($this->matches as $item) {
+      $parent = $item->parentNode;
+      
+      // Build up an array of all of children of this parent, and store the 
+      // index of each element for reference later. We only need to do this 
+      // once per parent, though.
+      if (!$parents->contains($parent)) {
+        
+        $c = 0;
+        foreach ($parent->childNodes as $child) {
+          // This doesn't totally make sense, since the CSS 3 spec does not require that
+          // this pseudo-class be adjoined to an element (e.g. ' :nth-of-type' is allowed).
+          if ($child->nodeType == XML_ELEMENT_NODE && $child->tagName == $item->tagName) {
+            // This may break E_STRICT.
+            $child->nodeIndex = ++$c;
+          }
+        }
+        // This may break E_STRICT.
+        $parent->numElements = $c;
+        $parents->attach($parent);
+      }
+      
+      // If we are looking for the last child, we count from the end of a list.
+      // Note that we add 1 because CSS indices begin at 1, not 0.
+      if ($lastChild) {
+        $indexToMatch = $item->parentNode->numElements  - $item->nodeIndex + 1;
+      }
+      // Otherwise we count from the beginning of the list.
+      else {
+        $indexToMatch = $item->nodeIndex;
+      }
+      
+      // If group size is 0, then we return element at the right index.
+      if ($groupSize == 0) {
+        if ($indexToMatch == $elementInGroup) 
+          $matches->attach($item);
+      }
+      // If group size != 0, then we grab nth element from group offset by
+      // element in group.
+      else {
+        if (($indexToMatch - $elementInGroup) % $groupSize == 0 
+            && ($indexToMatch - $elementInGroup) / $groupSize >= 0) {
+          $matches->attach($item);
+        }
+      }
+      
+      // Iterate.
+      ++$i;
+    }
+    $this->matches = $matches;
+  }
+  
+  /**
+   * Pseudo-class handler for nth-last-of-type-child.
+   * Not implemented.
+   */
+  protected function nthLastOfTypeChild($groupSize, $elementInGroup) {
+    $this->nthOfTypeChild($groupSize, $elementInGroup, TRUE);    
+  }
+  
+  /**
+   * Pseudo-class handler for :lang
+   */
+  protected function lang($value) {
+    // TODO: This checks for cases where an explicit language is
+    // set. The spec seems to indicate that an element should inherit
+    // language from the parent... but this is unclear.
+    $operator = (strpos($value, '-') !== FALSE) ? self::isExactly : self::containsWithHyphen;
+    
+    $orig = $this->matches;
+    $origDepth = $this->findAnyElement;
+    
+    // Do first pass: attributes in default namespace
+    $this->attribute('lang', $value, $operator);
+    $lang = $this->matches; // Temp array for merging.
+    
+    // Reset
+    $this->matches = $orig;
+    $this->findAnyElement = $origDepth;
+    
+    // Do second pass: attributes in 'xml' namespace.
+    $this->attributeNS('lang', 'xml', $value, $operator);
+    
+    
+    // Merge results. 
+    // FIXME: Note that we lose natural ordering in
+    // the document because we search for xml:lang separately
+    // from lang.
+    foreach ($this->matches as $added) $lang->attach($added);
+    $this->matches = $lang;
+  }
+  
+  /**
+   * Pseudo-class handler for :not(filter).
+   *
+   * This does not follow the specification in the following way: The CSS 3
+   * selector spec says the value of not() must be a simple selector. This
+   * function allows complex selectors.
+   *
+   * @param string $filter
+   *  A CSS selector.
+   */
+  protected function not($filter) {
+    $matches = $this->candidateList();
+    //$found = array();
+    $found = new SplObjectStorage();
+    foreach ($matches as $item) {
+      $handler = new QueryPathCssEventHandler($item);
+      $not_these = $handler->find($filter)->getMatches();
+      if ($not_these->count() == 0) {
+        $found->attach($item);
+      }
+    }
+    // No need to check for unique elements, since the list
+    // we began from already had no duplicates.
+    $this->matches = $found;    
+  }
+  
+  /**
+   * Pseudo-class handler for :has(filter).
+   * This can also be used as a general filtering routine.
+   */
+  public function has($filter) {
+    $matches = $this->candidateList();
+    //$found = array();
+    $found = new SplObjectStorage();
+    foreach ($matches as $item) {
+      $handler = new QueryPathCssEventHandler($item);
+      $these = $handler->find($filter)->getMatches();
+      if (count($these) > 0) {
+        $found->attach($item);
+      }      
+    }
+    $this->matches = $found;
+    return $this;
+  }
+  
+  /**
+   * Pseudo-class handler for :first-of-type.
+   */
+  protected function firstOfType() {
+    $matches = $this->candidateList();
+    $found = new SplObjectStorage();
+    foreach ($matches as $item) {
+      $type = $item->tagName;
+      $parent = $item->parentNode;
+      foreach ($parent->childNodes as $kid) {
+        if ($kid->nodeType == XML_ELEMENT_NODE && $kid->tagName == $type) {
+          if (!$found->contains($kid)) {
+            $found->attach($kid);
+          }
+          break;
+        }
+      }
+    }
+    $this->matches = $found;
+  }
+  
+  /**
+   * Pseudo-class handler for :last-of-type.
+   */
+  protected function lastOfType() {
+    $matches = $this->candidateList();
+    $found = new SplObjectStorage();
+    foreach ($matches as $item) {
+      $type = $item->tagName;
+      $parent = $item->parentNode;
+      for ($i = $parent->childNodes->length - 1; $i >= 0; --$i) {
+        $kid = $parent->childNodes->item($i);
+        if ($kid->nodeType == XML_ELEMENT_NODE && $kid->tagName == $type) {
+          if (!$found->contains($kid)) {
+            $found->attach($kid);
+          }
+          break;
+        }
+      }
+    }
+    $this->matches = $found;
+  }
+  
+  /**
+   * Pseudo-class handler for :only-child.
+   */
+  protected function onlyChild() {
+    $matches = $this->candidateList();
+    $found = new SplObjectStorage();
+    foreach($matches as $item) {
+      $parent = $item->parentNode;
+      $kids = array();
+      foreach($parent->childNodes as $kid) {
+        if ($kid->nodeType == XML_ELEMENT_NODE) {
+          $kids[] = $kid;
+        }
+      }
+      // There should be only one child element, and
+      // it should be the one being tested.
+      if (count($kids) == 1 && $kids[0] === $item) {
+        $found->attach($kids[0]);
+      }
+    }
+    $this->matches = $found;
+  }
+  
+  /**
+   * Pseudo-class handler for :empty.
+   */
+  protected function emptyElement() {
+    $found = new SplObjectStorage();
+    $matches = $this->candidateList();
+    foreach ($matches as $item) {
+      $empty = TRUE;
+      foreach($item->childNodes as $kid) {
+        // From the spec: Elements and Text nodes are the only ones to
+        // affect emptiness.
+        if ($kid->nodeType == XML_ELEMENT_NODE || $kid->nodeType == XML_TEXT_NODE) {
+          $empty = FALSE;
+          break;
+        }
+      }
+      if ($empty) {
+        $found->attach($item);
+      }
+    }
+    $this->matches = $found;
+  }
+  
+  /**
+   * Pseudo-class handler for :only-of-type.
+   */
+  protected function onlyOfType() {
+    $matches = $this->candidateList();
+    $found = new SplObjectStorage();
+    foreach ($matches as $item) {
+      if (!$item->parentNode) {
+        $this->matches = new SplObjectStorage();
+      }
+      $parent = $item->parentNode;
+      $onlyOfType = TRUE;
+      
+      // See if any peers are of the same type
+      foreach($parent->childNodes as $kid) {
+        if ($kid->nodeType == XML_ELEMENT_NODE 
+            && $kid->tagName == $item->tagName 
+            && $kid !== $item) {
+          //$this->matches = new SplObjectStorage();
+          $onlyOfType = FALSE;
+          break;
+        }
+      }
+      
+      // If no others were found, attach this one.
+      if ($onlyOfType) $found->attach($item);
+    }
+    $this->matches = $found;
+  }
+  
+  /**
+   * Check for attr value matches based on an operation.
+   */
+  protected function attrValMatches($needle, $haystack, $operation) {
+    
+    if (strlen($haystack) < strlen($needle)) return FALSE;
+    
+    // According to the spec:  
+    // "The case-sensitivity of attribute names in selectors depends on the document language."
+    // (6.3.2)
+    // To which I say, "huh?". We assume case sensitivity.
+    switch ($operation) {
+      case CssEventHandler::isExactly:
+        return $needle == $haystack;
+      case CssEventHandler::containsWithSpace:
+        return in_array($needle, explode(' ', $haystack));
+      case CssEventHandler::containsWithHyphen:
+        return in_array($needle, explode('-', $haystack));
+      case CssEventHandler::containsInString:
+        return strpos($haystack, $needle) !== FALSE;
+      case CssEventHandler::beginsWith:
+        return strpos($haystack, $needle) === 0;
+      case CssEventHandler::endsWith:
+        //return strrpos($haystack, $needle) === strlen($needle) - 1;
+        return preg_match('/' . $needle . '$/', $haystack) == 1;
+    }
+    return FALSE; // Shouldn't be able to get here.
+  }
+  
+  /**
+   * As the spec mentions, these must be at the end of a selector or
+   * else they will cause errors. Most selectors return elements. Pseudo-elements
+   * do not.
+   */
+  public function pseudoElement($name) {
+    // process the pseudoElement
+    switch ($name) {
+      // XXX: Should this return an array -- first line of 
+      // each of the matched elements?
+      case 'first-line':
+        $matches = $this->candidateList();
+        $found = new SplObjectStorage();
+        $o = new stdClass();
+        foreach ($matches as $item) {
+          $str = $item->textContent;
+          $lines = explode("\n", $str);
+          if (!empty($lines)) {
+            $line = trim($lines[0]);
+            if (!empty($line))
+              $o->textContent = $line;
+              $found->attach($o);//trim($lines[0]);
+          }
+        }
+        $this->matches = $found;
+        break;
+      // XXX: Should this return an array -- first letter of each
+      // of the matched elements?
+      case 'first-letter':
+        $matches = $this->candidateList();
+        $found = new SplObjectStorage();
+        $o = new stdClass();
+        foreach ($matches as $item) {
+          $str = $item->textContent;
+          if (!empty($str)) {
+            $str = substr($str,0, 1);
+            $o->textContent = $str;
+            $found->attach($o);
+          }
+        }
+        $this->matches = $found;
+        break;
+      case 'before':
+      case 'after':
+        // There is nothing in a DOM to return for the before and after 
+        // selectors.
+      case 'selection':
+        // With no user agent, we don't have a concept of user selection.
+        throw new NotImplementedException("The $name pseudo-element is not implemented.");
+        break;
+    }
+    $this->findAnyElement = FALSE;  
+  }
+  public function directDescendant() {
+    $this->findAnyElement = FALSE;
+        
+    $kids = new SplObjectStorage();
+    foreach ($this->matches as $item) {
+      $kidsNL = $item->childNodes;
+      foreach ($kidsNL as $kidNode) {
+        if ($kidNode->nodeType == XML_ELEMENT_NODE) {
+          $kids->attach($kidNode);
+        }
+      }
+    }
+    $this->matches = $kids;
+  }
+  /**
+   * For an element to be adjacent to another, it must be THE NEXT NODE
+   * in the node list. So if an element is surrounded by pcdata, there are
+   * no adjacent nodes. E.g. in <a/>FOO<b/>, the a and b elements are not 
+   * adjacent.
+   *
+   * In a strict DOM parser, line breaks and empty spaces are nodes. That means
+   * nodes like this will not be adjacent: <test/> <test/>. The space between
+   * them makes them non-adjacent. If this is not the desired behavior, pass
+   * in the appropriate flags to your parser. Example:
+   * <code>
+   * $doc = new DomDocument();
+   * $doc->loadXML('<test/> <test/>', LIBXML_NOBLANKS);
+   * </code>
+   */
+  public function adjacent() {
+    $this->findAnyElement = FALSE;
+    // List of nodes that are immediately adjacent to the current one.
+    //$found = array();
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $item) {
+      while (isset($item->nextSibling)) {
+        if (isset($item->nextSibling) && $item->nextSibling->nodeType === XML_ELEMENT_NODE) {
+          $found->attach($item->nextSibling);
+          break;
+        }
+        $item = $item->nextSibling;
+      }
+    }
+    $this->matches = $found;
+  }
+  
+  public function anotherSelector() {
+    $this->findAnyElement = FALSE;
+    // Copy old matches into buffer.
+    if ($this->matches->count() > 0) {
+      //$this->alreadyMatched = array_merge($this->alreadyMatched, $this->matches);
+      foreach ($this->matches as $item) $this->alreadyMatched->attach($item);
+    }
+    
+    // Start over at the top of the tree.
+    $this->findAnyElement = TRUE; // Reset depth flag.
+    $this->matches = new SplObjectStorage();
+    $this->matches->attach($this->dom);
+  }
+  
+  /**
+   * Get all nodes that are siblings to currently selected nodes.
+   *
+   * If two passed in items are siblings of each other, neither will
+   * be included in the list of siblings. Their status as being candidates
+   * excludes them from being considered siblings.
+   */
+  public function sibling() {
+    $this->findAnyElement = FALSE;
+    // Get the nodes at the same level.
+    
+    if ($this->matches->count() > 0) {
+      $sibs = new SplObjectStorage();
+      foreach ($this->matches as $item) {
+        /*$candidates = $item->parentNode->childNodes;
+        foreach ($candidates as $candidate) {
+          if ($candidate->nodeType === XML_ELEMENT_NODE && $candidate !== $item) {
+            $sibs->attach($candidate);
+          }
+        }
+        */
+        while ($item->nextSibling != NULL) {
+          $item = $item->nextSibling;
+          if ($item->nodeType === XML_ELEMENT_NODE) $sibs->attach($item);
+        }
+      }
+      $this->matches = $sibs;
+    }
+  }
+  
+  /**
+   * Get any descendant.
+   */
+  public function anyDescendant() {
+    // Get children:
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $item) {
+      $kids = $item->getElementsByTagName('*');
+      //$found = array_merge($found, $this->nodeListToArray($kids));
+      $this->attachNodeList($kids, $found);
+    }
+    $this->matches = $found;
+    
+    // Set depth flag:
+    $this->findAnyElement = TRUE;
+  }
+  
+  /**
+   * Determine what candidates are in the current scope.
+   *
+   * This is a utility method that gets the list of elements
+   * that should be evaluated in the context. If $this->findAnyElement
+   * is TRUE, this will return a list of every element that appears in
+   * the subtree of $this->matches. Otherwise, it will just return 
+   * $this->matches.
+   */
+  private function candidateList() {
+    if ($this->findAnyElement) {
+      return $this->getAllCandidates($this->matches);
+    }
+    return $this->matches;
+  }
+  
+  /**
+   * Get a list of all of the candidate elements.
+   *
+   * This is used when $this->findAnyElement is TRUE.
+   * @param $elements
+   *  A list of current elements (usually $this->matches).
+   *
+   * @return 
+   *  A list of all candidate elements.
+   */
+  private function getAllCandidates($elements) {
+    $found = new SplObjectStorage();
+    foreach ($elements as $item) {
+      $found->attach($item); // put self in
+      $nl = $item->getElementsByTagName('*');
+      //foreach ($nl as $node) $found[] = $node;
+      $this->attachNodeList($nl, $found);
+    }
+    return $found;
+  }
+  /*
+  public function nodeListToArray($nodeList) {
+    $array = array();
+    foreach ($nodeList as $node) {
+      if ($node->nodeType == XML_ELEMENT_NODE) {
+        $array[] = $node;
+      }
+    }
+    return $array;
+  }
+  */
+  
+  /**
+   * Attach all nodes in a node list to the given SplObjectStorage.
+   */
+  public function attachNodeList(DOMNodeList $nodeList, SplObjectStorage $splos) {
+    foreach ($nodeList as $item) $splos->attach($item);
+  }
+  
+}
+
+/**
+ * Exception thrown for unimplemented CSS.
+ *
+ * This is thrown in cases where some feature is expected, but the current 
+ * implementation does not support that feature.
+ *
+ * @ingroup querypath_css
+ */
+class NotImplementedException extends Exception {}
diff --git a/lib/querypath/CssParser.php b/lib/querypath/CssParser.php
new file mode 100644
index 0000000..2ef2802
--- /dev/null
+++ b/lib/querypath/CssParser.php
@@ -0,0 +1,1108 @@
+<?php
+/** @file
+ * CSS selector parsing classes.
+ *
+ * This file contains the tools necessary for parsing CSS 3 selectors.
+ * In the future it may be expanded to handle all of CSS 3.
+ *
+ * The parser contained herein is has an event-based API. Implementors should
+ * begin by implementing the {@link CssEventHandler} interface. For an example
+ * of how this is done, see {@link CssEventHandler.php}.
+ *
+ * @author M Butcher <matt@aleph-null.tv>
+ * @license http://opensource.org/licenses/lgpl-2.1.php The GNU Lesser GPL (LGPL) or an MIT-like license. 
+ */
+
+/** @addtogroup querypath_css CSS Parsing
+ * QueryPath includes a CSS 3 Selector parser.
+ *
+ *
+ * Typically the parser is not accessed directly. Most developers will use it indirectly from
+ * qp(), htmlqp(), or one of the methods on a QueryPath object.
+ *
+ * This parser is modular and is not tied to QueryPath, so you can use it in your 
+ * own (non-QueryPath) projects if you wish. To dive in, start with CssEventHandler, the
+ * event interface that works like a SAX API for CSS selectors. If you want to check out
+ * the details, check out the parser (CssParser),  scanner (CssScanner), and token list (CssToken).
+ */
+
+require_once 'CssEventHandler.php';
+
+
+/**
+ * An event handler for handling CSS 3 Selector parsing.
+ *
+ * This provides a standard interface for CSS 3 Selector event handling. As the 
+ * parser parses a selector, it will fire events. Implementations of CssEventHandler
+ * can then handle the events.
+ *
+ * This library is inspired by the SAX2 API for parsing XML. Each component of a 
+ * selector fires an event, passing the necessary data on to the event handler.
+ *
+ * @ingroup querypath_css
+ */
+interface CssEventHandler {
+  /** The is-exactly (=) operator. */
+  const isExactly = 0; // = 
+  /** The contains-with-space operator (~=). */
+  const containsWithSpace = 1; // ~=
+  /** The contains-with-hyphen operator (!=). */
+  const containsWithHyphen = 2; // |=
+  /** The contains-in-string operator (*=). */
+  const containsInString = 3; // *=
+  /** The begins-with operator (^=). */
+  const beginsWith = 4; // ^=
+  /** The ends-with operator ($=). */
+  const endsWith = 5; // $=
+  /** The any-element operator (*). */
+  const anyElement = '*';
+  
+  /**
+   * This event is fired when a CSS ID is encountered.
+   * An ID begins with an octothorp: #name.
+   *
+   * @param string $id
+   *  The ID passed in.
+   */
+  public function elementID($id); // #name
+  /**
+   * Handle an element name.
+   * Example: name
+   * @param string $name
+   *  The name of the element.
+   */
+  public function element($name); // name
+  /**
+   * Handle a namespaced element name.
+   * example: namespace|name
+   * @param string $name
+   *  The tag name.
+   * @param string $namespace
+   *  The namespace identifier (Not the URI)
+   */
+  public function elementNS($name, $namespace = NULL);
+  /**
+   * Handle an any-element (*) operator.
+   * Example: *
+   */
+  public function anyElement(); // *
+  /**
+   * Handle an any-element operator that is constrained to a namespace.
+   * Example: ns|*
+   * @param string $ns
+   *  The namespace identifier (not the URI).
+   */
+  public function anyElementInNS($ns); // ns|*
+  /**
+   * Handle a CSS class selector.
+   * Example: .name
+   * @param string $name 
+   *  The name of the class.
+   */
+  public function elementClass($name); // .name
+  /**
+   * Handle an attribute selector.
+   * Example: [name=attr]
+   * Example: [name~=attr]
+   * @param string $name
+   *  The attribute name.
+   * @param string $value
+   *  The value of the attribute, if given.
+   * @param int $operation
+   *  The operation to be used for matching. See {@link CssEventHandler}
+   *  constants for a list of supported operations.
+   */
+  public function attribute($name, $value = NULL, $operation = CssEventHandler::isExactly); // [name=attr]
+  /**
+   * Handle an attribute selector bound to a specific namespace.
+   * Example: [ns|name=attr]
+   * Example: [ns|name~=attr]
+   * @param string $name
+   *  The attribute name.
+   * @param string $ns
+   *  The namespace identifier (not the URI).
+   * @param string $value
+   *  The value of the attribute, if given.
+   * @param int $operation
+   *  The operation to be used for matching. See {@link CssEventHandler}
+   *  constants for a list of supported operations.
+   */
+  public function attributeNS($name, $ns, $value = NULL, $operation = CssEventHandler::isExactly);
+  /**
+   * Handle a pseudo-class.
+   * Example: :name(value)
+   * @param string $name
+   *  The pseudo-class name.
+   * @param string $value
+   *  The value, if one is found.
+   */
+  public function pseudoClass($name, $value = NULL); //:name(value)
+  /**
+   * Handle a pseudo-element.
+   * Example: ::name
+   * @param string $name
+   *  The pseudo-element name.
+   */
+  public function pseudoElement($name); // ::name
+  /**
+   * Handle a direct descendant combinator.
+   * Example: >
+   */
+  public function directDescendant(); // >
+  /**
+   * Handle a adjacent combinator.
+   * Example: +
+   */
+  public function adjacent(); // +
+  /**
+   * Handle an another-selector combinator.
+   * Example: ,
+   */
+  public function anotherSelector(); // ,
+  /**
+   * Handle a sibling combinator.
+   * Example: ~
+   */
+  public function sibling(); // ~ combinator
+  /**
+   * Handle an any-descendant combinator.
+   * Example: ' '
+   */
+  public function anyDescendant(); // ' ' (space) operator.
+  
+}
+
+/**
+ * Tokens for CSS.
+ * This class defines the recognized tokens for the parser, and also 
+ * provides utility functions for error reporting.
+ *
+ * @ingroup querypath_css
+ */
+final class CssToken {
+  const char = 0;
+  const star = 1;
+  const rangle = 2;
+  const dot = 3;
+  const octo = 4;
+  const rsquare = 5;
+  const lsquare = 6;
+  const colon = 7;
+  const rparen = 8;
+  const lparen = 9;
+  const plus = 10;
+  const tilde = 11;
+  const eq = 12;
+  const pipe = 13;
+  const comma = 14;
+  const white = 15;
+  const quote = 16;
+  const squote = 17;
+  const bslash = 18;
+  const carat = 19;
+  const dollar = 20;
+  const at = 21; // This is not in the spec. Apparently, old broken CSS uses it.
+  
+  // In legal range for string.
+  const stringLegal = 99;
+  
+  /**
+   * Get a name for a given constant. Used for error handling.
+   */  
+  static function name($const_int) {
+    $a = array('character', 'star', 'right angle bracket', 
+      'dot', 'octothorp', 'right square bracket', 'left square bracket',
+      'colon', 'right parenthesis', 'left parenthesis', 'plus', 'tilde',
+      'equals', 'vertical bar', 'comma', 'space', 'quote', 'single quote',
+      'backslash', 'carat', 'dollar', 'at');
+    if (isset($a[$const_int]) && is_numeric($const_int)) {
+      return $a[$const_int];
+    }
+    elseif ($const_int == 99) {
+      return 'a legal non-alphanumeric character';
+    }
+    elseif ($const_int == FALSE) {
+      return 'end of file';
+    }
+    return sprintf('illegal character (%s)', $const_int);
+  }
+}
+
+/**
+ * Parse a CSS selector.
+ *
+ * In CSS, a selector is used to identify which element or elements
+ * in a DOM are being selected for the application of a particular style.
+ * Effectively, selectors function as a query language for a structured
+ * document -- almost always HTML or XML.
+ *
+ * This class provides an event-based parser for CSS selectors. It can be
+ * used, for example, as a basis for writing a DOM query engine based on
+ * CSS.
+ *
+ * @ingroup querypath_css
+ */
+class CssParser {
+  protected $scanner = NULL;
+  protected $buffer = '';
+  protected $handler = NULL;
+  protected $strict = FALSE;
+  
+  protected $DEBUG = FALSE;
+  
+  /**
+   * Construct a new CSS parser object. This will attempt to
+   * parse the string as a CSS selector. As it parses, it will 
+   * send events to the CssEventHandler implementation.
+   */
+  public function __construct($string, CssEventHandler $handler) {
+    $this->originalString = $string;
+    $is = new CssInputStream($string);
+    $this->scanner = new CssScanner($is);
+    $this->handler = $handler;
+  }
+  
+  /**
+   * Parse the selector.
+   *
+   * This begins an event-based parsing process that will 
+   * fire events as the selector is handled. A CssEventHandler
+   * implementation will be responsible for handling the events.
+   * @throws CssParseException
+   */
+  public function parse() {
+
+    $this->scanner->nextToken();
+    while ($this->scanner->token !== FALSE) {
+      // Primitive recursion detection.
+      $position = $this->scanner->position();
+      
+      if ($this->DEBUG) {
+        print "PARSE " . $this->scanner->token. "\n";
+      }
+      $this->selector();
+      
+      $finalPosition = $this->scanner->position();
+      
+      if ($this->scanner->token !== FALSE && $finalPosition == $position) {
+        // If we get here, then the scanner did not pop a single character
+        // off of the input stream during a full run of the parser, which
+        // means that the current input does not match any recognizable
+        // pattern.
+        throw new CssParseException('CSS selector is not well formed.');
+      }
+      
+    }
+    
+  }
+  
+  /**
+   * A restricted parser that can only parse simple selectors.
+   * The pseudoClass handler for this parser will throw an 
+   * exception if it encounters a pseudo-element or the
+   * negation pseudo-class.
+   *
+   * @deprecated This is not used anywhere in QueryPath and
+   *  may be removed.
+   *//*
+  public function parseSimpleSelector() {
+    while ($this->scanner->token !== FALSE) {
+      if ($this->DEBUG) print "SIMPLE SELECTOR\n";
+      $this->allElements();
+      $this->elementName();
+      $this->elementClass();
+      $this->elementID();
+      $this->pseudoClass(TRUE); // Operate in restricted mode.
+      $this->attribute();
+      
+      // TODO: Need to add failure conditions here.
+    }
+  }*/
+  
+  /**
+   * Handle an entire CSS selector.
+   */
+  private function selector() {
+    if ($this->DEBUG) print "SELECTOR{$this->scanner->position()}\n";
+    $this->consumeWhitespace(); // Remove leading whitespace
+    $this->simpleSelectors();
+    $this->combinator();
+  }
+  
+  /**
+   * Consume whitespace and return a count of the number of whitespace consumed.
+   */
+  private function consumeWhitespace() {
+    if ($this->DEBUG) print "CONSUME WHITESPACE\n";
+    $white = 0;
+    while ($this->scanner->token == CssToken::white) {
+      $this->scanner->nextToken();
+      ++$white;
+    }
+    return $white;
+  }
+  
+  /**
+   * Handle one of the five combinators: '>', '+', ' ', '~', and ','.
+   * This will call the appropriate event handlers.
+   * @see CssEventHandler::directDescendant(),
+   * @see CssEventHandler::adjacent(), 
+   * @see CssEventHandler::anyDescendant(),
+   * @see CssEventHandler::anotherSelector().
+   */
+  private function combinator() {
+    if ($this->DEBUG) print "COMBINATOR\n";
+    /*
+     * Problem: ' ' and ' > ' are both valid combinators.
+     * So we have to track whitespace consumption to see
+     * if we are hitting the ' ' combinator or if the 
+     * selector just has whitespace padding another combinator.
+     */
+    
+    // Flag to indicate that post-checks need doing
+    $inCombinator = FALSE; 
+    $white = $this->consumeWhitespace();
+    $t = $this->scanner->token;    
+        
+    if ($t == CssToken::rangle) {
+      $this->handler->directDescendant();
+      $this->scanner->nextToken();
+      $inCombinator = TRUE;
+      //$this->simpleSelectors();
+    }
+    elseif ($t == CssToken::plus) {
+      $this->handler->adjacent();
+      $this->scanner->nextToken();
+      $inCombinator = TRUE;
+      //$this->simpleSelectors();
+    }
+    elseif ($t == CssToken::comma) {
+      $this->handler->anotherSelector();
+      $this->scanner->nextToken();
+      $inCombinator = TRUE;
+      //$this->scanner->selectors();
+    }
+    elseif ($t == CssToken::tilde) {
+      $this->handler->sibling();
+      $this->scanner->nextToken();
+      $inCombinator = TRUE;
+    }
+
+    // Check that we don't get two combinators in a row.
+    if ($inCombinator) {
+      $white = 0;
+      if ($this->DEBUG) print "COMBINATOR: " . CssToken::name($t) . "\n";
+      $this->consumeWhitespace();
+      if ($this->isCombinator($this->scanner->token)) {
+        throw new CssParseException("Illegal combinator: Cannot have two combinators in sequence.");
+      }
+    }
+    // Check to see if we have whitespace combinator:
+    elseif ($white > 0) {
+      if ($this->DEBUG) print "COMBINATOR: any descendant\n";
+      $inCombinator = TRUE;
+      $this->handler->anyDescendant();
+    }
+    else {
+      if ($this->DEBUG) print "COMBINATOR: no combinator found.\n";
+    }
+  }
+  
+  /**
+   * Check if the token is a combinator.
+   */
+  private function isCombinator($tok) {
+    $combinators = array(CssToken::plus, CssToken::rangle, CssToken::comma, CssToken::tilde);
+    return in_array($tok, $combinators);
+  }
+  
+  /**
+   * Handle a simple selector.
+   */
+  private function simpleSelectors() {
+    if ($this->DEBUG) print "SIMPLE SELECTOR\n";
+    $this->allElements();
+    $this->elementName();
+    $this->elementClass();
+    $this->elementID();
+    $this->pseudoClass();
+    $this->attribute();
+  }
+  
+  /**
+   * Handles CSS ID selectors.
+   * This will call CssEventHandler::elementID().
+   */
+  private function elementID() {
+    if ($this->DEBUG) print "ELEMENT ID\n";
+    if ($this->scanner->token == CssToken::octo) {
+      $this->scanner->nextToken();
+      if ($this->scanner->token !== CssToken::char) {
+        throw new CssParseException("Expected string after #");
+      }
+      $id = $this->scanner->getNameString();
+      $this->handler->elementID($id);
+    }
+  }
+  
+  /**
+   * Handles CSS class selectors.
+   * This will call the CssEventHandler::elementClass() method.
+   */
+  private function elementClass() {
+    if ($this->DEBUG) print "ELEMENT CLASS\n";
+    if ($this->scanner->token == CssToken::dot) {
+      $this->scanner->nextToken();
+      $this->consumeWhitespace(); // We're very fault tolerent. This should prob through error.
+      $cssClass = $this->scanner->getNameString();
+      $this->handler->elementClass($cssClass);
+    }
+  }
+  
+  /**
+   * Handle a pseudo-class and pseudo-element.
+   *
+   * CSS 3 selectors support separate pseudo-elements, using :: instead
+   * of : for separator. This is now supported, and calls the pseudoElement
+   * handler, CssEventHandler::pseudoElement().
+   *
+   * This will call CssEventHandler::pseudoClass() when a
+   * pseudo-class is parsed.
+   */
+  private function pseudoClass($restricted = FALSE) {
+    if ($this->DEBUG) print "PSEUDO-CLASS\n";
+    if ($this->scanner->token == CssToken::colon) {
+
+      // Check for CSS 3 pseudo element:
+      $isPseudoElement = FALSE;
+      if ($this->scanner->nextToken() === CssToken::colon) {
+        $isPseudoElement = TRUE;
+        $this->scanner->nextToken();
+      }
+      
+      $name = $this->scanner->getNameString();
+      if ($restricted && $name == 'not') {
+        throw new CssParseException("The 'not' pseudo-class is illegal in this context.");
+      }
+      
+      $value = NULL;
+      if ($this->scanner->token == CssToken::lparen) {
+        if ($isPseudoElement) {
+          throw new CssParseException("Illegal left paren. Pseudo-Element cannot have arguments.");
+        }
+        $value = $this->pseudoClassValue();
+      }
+      
+      // FIXME: This should throw errors when pseudo element has values.
+      if ($isPseudoElement) {
+        if ($restricted) {
+          throw new CssParseException("Pseudo-Elements are illegal in this context.");
+        }
+        $this->handler->pseudoElement($name);
+        $this->consumeWhitespace();
+        
+        // Per the spec, pseudo-elements must be the last items in a selector, so we 
+        // check to make sure that we are either at the end of the stream or that a
+        // new selector is starting. Only one pseudo-element is allowed per selector.
+        if ($this->scanner->token !== FALSE && $this->scanner->token !== CssToken::comma) {
+          throw new CssParseException("A Pseudo-Element must be the last item in a selector.");
+        }
+      } 
+      else {
+        $this->handler->pseudoClass($name, $value);
+      }
+    }
+  }
+  
+  /**
+   * Get the value of a pseudo-classes.
+   * 
+   * @return string
+   *  Returns the value found from a pseudo-class.
+   *
+   * @todo Pseudoclasses can be passed pseudo-elements and 
+   *  other pseudo-classes as values, which means :pseudo(::pseudo)
+   *  is legal.
+   */
+  private function pseudoClassValue() {
+    if ($this->scanner->token == CssToken::lparen) {
+      $buf = '';
+
+      // For now, just leave pseudoClass value vague.
+      /*
+      // We have to peek to see if next char is a colon because
+      // pseudo-classes and pseudo-elements are legal strings here.
+      print $this->scanner->peek();
+      if ($this->scanner->peek() == ':') {
+        print "Is pseudo\n";
+        $this->scanner->nextToken();
+      
+        // Pseudo class
+        if ($this->scanner->token == CssToken::colon) {
+          $buf .= ':';
+          $this->scanner->nextToken();
+          // Pseudo element
+          if ($this->scanner->token == CssToken::colon) {
+            $buf .= ':';
+            $this->scanner->nextToken();
+          }
+          // Ident 
+          $buf .= $this->scanner->getNameString();
+        }
+      }
+      else {
+        print "fetching string.\n";
+        $buf .= $this->scanner->getQuotedString();
+        if ($this->scanner->token != CssToken::rparen) {
+          $this->throwError(CssToken::rparen, $this->scanner->token);
+        }
+        $this->scanner->nextToken();
+      }
+      return $buf;
+      */
+      $buf .= $this->scanner->getQuotedString();
+      return $buf;
+    }
+  }
+  
+  /**
+   * Handle element names.
+   * This will call the CssEventHandler::elementName().
+   *
+   * This handles:
+   * <code>
+   *  name (CssEventHandler::element())
+   *  |name (CssEventHandler::element())
+   *  ns|name (CssEventHandler::elementNS())
+   *  ns|* (CssEventHandler::elementNS())
+   * </code>
+   */
+  private function elementName() {
+    if ($this->DEBUG) print "ELEMENT NAME\n";
+    if ($this->scanner->token === CssToken::pipe) {
+      // We have '|name', which is equiv to 'name'
+      $this->scanner->nextToken();
+      $this->consumeWhitespace();
+      $elementName =  $this->scanner->getNameString();
+      $this->handler->element($elementName);
+    }
+    elseif ($this->scanner->token === CssToken::char) {
+      $elementName =  $this->scanner->getNameString();
+      if ($this->scanner->token == CssToken::pipe) {
+        // Get ns|name
+        $elementNS = $elementName;
+        $this->scanner->nextToken();
+        $this->consumeWhitespace();
+        if ($this->scanner->token === CssToken::star) {
+          // We have ns|* 
+          $this->handler->anyElementInNS($elementNS);
+          $this->scanner->nextToken();
+        }
+        elseif ($this->scanner->token !== CssToken::char) {
+          $this->throwError(CssToken::char, $this->scanner->token);
+        }
+        else {
+          $elementName = $this->scanner->getNameString();
+          // We have ns|name
+          $this->handler->elementNS($elementName, $elementNS);
+        }
+        
+      }
+      else {
+        $this->handler->element($elementName);
+      }
+    }
+  }
+  
+  /**
+   * Check for all elements designators. Due to the new CSS 3 namespace
+   * support, this is slightly more complicated, now, as it handles 
+   * the *|name and *|* cases as well as *.
+   *
+   * Calls CssEventHandler::anyElement() or CssEventHandler::elementName().
+   */
+  private function allElements() {
+    if ($this->scanner->token === CssToken::star) {
+      $this->scanner->nextToken();
+      if ($this->scanner->token === CssToken::pipe) {
+        $this->scanner->nextToken();
+        if ($this->scanner->token === CssToken::star) {
+          // We got *|*. According to spec, this requires
+          // that the element has a namespace, so we pass it on
+          // to the handler:
+          $this->scanner->nextToken();
+          $this->handler->anyElementInNS('*');
+        }
+        else {
+          // We got *|name, which means the name MUST be in a namespce,
+          // so we pass this off to elementNameNS().
+          $name = $this->scanner->getNameString();
+          $this->handler->elementNS($name, '*');
+        }
+      }
+      else {
+        $this->handler->anyElement();
+      }
+    }
+  }
+  
+  /**
+   * Handler an attribute.
+   * An attribute can be in one of two forms:
+   * <code>[attrName]</code>
+   * or 
+   * <code>[attrName="AttrValue"]</code>
+   *
+   * This may call the following event handlers: CssEventHandler::attribute().
+   */
+  private function attribute() {
+    if($this->scanner->token == CssToken::lsquare) {
+      $attrVal = $op = $ns = NULL;
+      
+      $this->scanner->nextToken();
+      $this->consumeWhitespace();
+      
+      if ($this->scanner->token === CssToken::at) {
+        if ($this->strict) {
+          throw new CssParseException('The @ is illegal in attributes.');
+        }
+        else {
+          $this->scanner->nextToken();
+          $this->consumeWhitespace();
+        }
+      }
+      
+      if ($this->scanner->token === CssToken::star) {
+        // Global namespace... requires that attr be prefixed,
+        // so we pass this on to a namespace handler.
+        $ns = '*';
+        $this->scanner->nextToken();
+      }
+      if ($this->scanner->token === CssToken::pipe) {
+        // Skip this. It's a global namespace.
+        $this->scanner->nextToken();
+        $this->consumeWhitespace();
+      }
+      
+      $attrName = $this->scanner->getNameString();
+      $this->consumeWhitespace();
+      
+      // Check for namespace attribute: ns|attr. We have to peek() to make 
+      // sure that we haven't hit the |= operator, which looks the same.
+      if ($this->scanner->token === CssToken::pipe && $this->scanner->peek() !== '=') {
+        // We have a namespaced attribute. 
+        $ns = $attrName;
+        $this->scanner->nextToken();
+        $attrName = $this->scanner->getNameString();
+        $this->consumeWhitespace();
+      }
+      
+      // Note: We require that operators do not have spaces 
+      // between characters, e.g. ~= , not ~ =.
+
+      // Get the operator:
+      switch ($this->scanner->token) {
+        case CssToken::eq:
+          $this->consumeWhitespace();
+          $op = CssEventHandler::isExactly;
+          break;
+        case CssToken::tilde:
+          if ($this->scanner->nextToken() !== CssToken::eq) {
+            $this->throwError(CssToken::eq, $this->scanner->token);
+          }
+          $op = CssEventHandler::containsWithSpace;
+          break;
+        case CssToken::pipe:
+          if ($this->scanner->nextToken() !== CssToken::eq) {
+            $this->throwError(CssToken::eq, $this->scanner->token);
+          }
+          $op = CssEventHandler::containsWithHyphen;
+          break;
+        case CssToken::star:
+          if ($this->scanner->nextToken() !== CssToken::eq) {
+            $this->throwError(CssToken::eq, $this->scanner->token);
+          }
+          $op = CssEventHandler::containsInString;
+          break;
+        case CssToken::dollar;
+          if ($this->scanner->nextToken() !== CssToken::eq) {
+            $this->throwError(CssToken::eq, $this->scanner->token);
+          }
+          $op = CssEventHandler::endsWith;
+          break;
+        case CssToken::carat:
+          if ($this->scanner->nextToken() !== CssToken::eq) {
+            $this->throwError(CssToken::eq, $this->scanner->token);
+          }
+          $op = CssEventHandler::beginsWith;
+          break;
+      }
+      
+      if (isset($op)) {
+        // Consume '=' and go on.
+        $this->scanner->nextToken();
+        $this->consumeWhitespace();
+        
+        // So... here we have a problem. The grammer suggests that the
+        // value here is String1 or String2, both of which are enclosed
+        // in quotes of some sort, and both of which allow lots of special 
+        // characters. But the spec itself includes examples like this:
+        //   [lang=fr]
+        // So some bareword support is assumed. To get around this, we assume
+        // that bare words follow the NAME rules, while quoted strings follow
+        // the String1/String2 rules.
+        
+        if ($this->scanner->token === CssToken::quote || $this->scanner->token === CssToken::squote) {
+          $attrVal = $this->scanner->getQuotedString();
+        }
+        else {
+          $attrVal = $this->scanner->getNameString();
+        }
+        
+        if ($this->DEBUG) {
+          print "ATTR: $attrVal AND OP: $op\n";
+        }
+      }
+      
+      $this->consumeWhitespace();
+      
+      if ($this->scanner->token != CssToken::rsquare) {
+        $this->throwError(CssToken::rsquare, $this->scanner->token);
+      }
+      
+      if (isset($ns)) {
+        $this->handler->attributeNS($attrName, $ns, $attrVal, $op);
+      }
+      elseif (isset($attrVal)) {
+        $this->handler->attribute($attrName, $attrVal, $op);
+      }
+      else {
+        $this->handler->attribute($attrName);
+      }
+      $this->scanner->nextToken();
+    }
+  }
+  
+  /**
+   * Utility for throwing a consistantly-formatted parse error.
+   */
+  private function throwError($expected, $got) {
+    $filter = sprintf('Expected %s, got %s', CssToken::name($expected), CssToken::name($got));
+    throw new CssParseException($filter);
+  }
+  
+}
+
+/**
+ * Scanner for CSS selector parsing.
+ *
+ * This provides a simple scanner for traversing an input stream.
+ *
+ * @ingroup querypath_css
+ */
+final class CssScanner {
+  var $is = NULL;
+  public $value = NULL;
+  public $token = NULL;
+  
+  var $recurse = FALSE;
+  var $it = 0;
+  
+  /**
+   * Given a new input stream, tokenize the CSS selector string.
+   * @see CssInputStream
+   * @param CssInputStream $in
+   *  An input stream to be scanned.
+   */
+  public function __construct(CssInputStream $in) {
+    $this->is = $in;
+  }
+  
+  /**
+   * Return the position of the reader in the string.
+   */
+  public function position() {
+    return $this->is->position;
+  }
+  
+  /**
+   * See the next char without removing it from the stack.
+   *
+   * @return char
+   *  Returns the next character on the stack.
+   */
+  public function peek() {
+    return $this->is->peek();
+  }
+  
+  /**
+   * Get the next token in the input stream.
+   *
+   * This sets the current token to the value of the next token in 
+   * the stream.
+   *
+   * @return int
+   *  Returns an int value corresponding to one of the CssToken constants,
+   *  or FALSE if the end of the string is reached. (Remember to use
+   *  strong equality checking on FALSE, since 0 is a valid token id.)
+   */
+  public function nextToken() {
+    $tok = -1;
+    ++$this->it;
+    if ($this->is->isEmpty()) {
+      if ($this->recurse) {
+        throw new Exception("Recursion error detected at iteration " . $this->it . '.');
+        exit();
+      }
+      //print "{$this->it}: All done\n";
+      $this->recurse = TRUE;
+      $this->token = FALSE;
+      return FALSE;
+    }
+    $ch = $this->is->consume();
+    //print __FUNCTION__ . " Testing $ch.\n";
+    if (ctype_space($ch)) {
+      $this->value = ' '; // Collapse all WS to a space.
+      $this->token = $tok = CssToken::white;
+      //$ch = $this->is->consume();
+      return $tok;
+    }
+    
+    if (ctype_alnum($ch) || $ch == '-' || $ch == '_') {
+      // It's a character
+      $this->value = $ch; //strtolower($ch);
+      $this->token = $tok = CssToken::char;
+      return $tok;
+    }
+    
+    $this->value = $ch;
+    
+    switch($ch) {
+      case '*':
+        $tok = CssToken::star;
+        break;
+      case chr(ord('>')):
+        $tok = CssToken::rangle;
+        break;
+      case '.':
+        $tok = CssToken::dot;
+        break;
+      case '#':
+        $tok = CssToken::octo;
+        break;
+      case '[':
+        $tok = CssToken::lsquare;
+        break;
+      case ']':
+        $tok = CssToken::rsquare;
+        break;
+      case ':':
+        $tok = CssToken::colon;
+        break;
+      case '(':
+        $tok = CssToken::lparen;
+        break;
+      case ')':
+        $tok = CssToken::rparen;
+        break;
+      case '+':
+        $tok = CssToken::plus;
+        break;
+      case '~':
+        $tok = CssToken::tilde;
+        break;
+      case '=':
+        $tok = CssToken::eq;
+        break;
+      case '|':
+        $tok = CssToken::pipe;
+        break;
+      case ',':
+        $tok = CssToken::comma;
+        break;
+      case chr(34):
+        $tok = CssToken::quote;
+        break;
+      case "'":
+        $tok = CssToken::squote;
+        break;
+      case '\\':
+        $tok = CssToken::bslash;
+        break;
+      case '^':
+        $tok = CssToken::carat;
+        break;
+      case '$':
+        $tok = CssToken::dollar;
+        break;
+      case '@':
+        $tok = CssToken::at;
+        break;
+    }
+    
+    
+    // Catch all characters that are legal within strings.
+    if ($tok == -1) {
+      // TODO: This should be UTF-8 compatible, but PHP doesn't
+      // have a native UTF-8 string. Should we use external
+      // mbstring library?
+
+      $ord = ord($ch);
+      // Characters in this pool are legal for use inside of
+      // certain strings. Extended ASCII is used here, though I
+      // Don't know if these are really legal.
+      if (($ord >= 32 && $ord <= 126) || ($ord >= 128 && $ord <= 255)) {
+        $tok = CssToken::stringLegal;
+      }
+      else {
+        throw new CSSParseException('Illegal character found in stream: ' . $ord);
+      }
+    }
+    
+    $this->token = $tok;
+    return $tok;
+  }
+  
+  /**
+   * Get a name string from the input stream.
+   * A name string must be composed of 
+   * only characters defined in CssToken:char: -_a-zA-Z0-9
+   */
+  public function getNameString() {
+    $buf = '';
+    while ($this->token === CssToken::char) {
+      $buf .= $this->value;
+      $this->nextToken();
+      //print '_';
+    }
+    return $buf;
+  }
+  
+  /**
+   * This gets a string with any legal 'string' characters.
+   * See CSS Selectors specification, section 11, for the 
+   * definition of string.
+   *
+   * This will check for string1, string2, and the case where a 
+   * string is unquoted (Oddly absent from the "official" grammar, 
+   * though such strings are present as examples in the spec.)
+   *
+   * Note:
+   * Though the grammar supplied by CSS 3 Selectors section 11 does not
+   * address the contents of a pseudo-class value, the spec itself indicates
+   * that a pseudo-class value is a "value between parenthesis" [6.6]. The 
+   * examples given use URLs among other things, making them closer to the 
+   * definition of 'string' than to 'name'. So we handle them here as strings.
+   */
+  public function getQuotedString() {
+    if ($this->token == CssToken::quote || $this->token == CssToken::squote || $this->token == CssToken::lparen) {
+      $end = ($this->token == CssToken::lparen) ? CssToken::rparen : $this->token;
+      $buf = '';
+      $escape = FALSE;
+      
+      $this->nextToken(); // Skip the opening quote/paren
+      
+      // The second conjunct is probably not necessary.
+      while ($this->token !== FALSE && $this->token > -1) {
+        //print "Char: $this->value \n";
+        if ($this->token == CssToken::bslash && !$escape) {
+          // XXX: The backslash (\) is removed here.
+          // Turn on escaping.
+          //$buf .= $this->value;
+          $escape = TRUE;
+        }
+        elseif ($escape) {
+          // Turn off escaping
+          $buf .= $this->value;
+          $escape = FALSE;
+        }
+        elseif ($this->token === $end) {
+          // At end of string; skip token and break.
+          $this->nextToken();
+          break;
+        }
+        else {
+          // Append char.
+          $buf .= $this->value;
+        }
+        $this->nextToken();
+      }
+      return $buf;
+    }
+  }
+  
+  /**
+   * Get a string from the input stream.
+   * This is a convenience function for getting a string of 
+   * characters that are either alphanumber or whitespace. See
+   * the CssToken::white and CssToken::char definitions.
+   *
+   * @deprecated This is not used anywhere in QueryPath.
+   *//*
+  public function getStringPlusWhitespace() {
+    $buf = '';
+    if($this->token === FALSE) {return '';}
+    while ($this->token === CssToken::char || $this->token == CssToken::white) {
+      $buf .= $this->value;
+      $this->nextToken();
+    }
+    return $buf;
+  }*/
+  
+}
+
+/**
+ * Simple wrapper to turn a string into an input stream.
+ * This provides a standard interface on top of an array of 
+ * characters.
+ */
+class CssInputStream {
+  protected $stream = NULL;
+  public $position = 0;
+  /**
+   * Build a new CSS input stream from a string.
+   * 
+   * @param string
+   *  String to turn into an input stream.
+   */
+  function __construct($string) {
+    $this->stream = str_split($string);
+  }
+  /**
+   * Look ahead one character.
+   *
+   * @return char
+   *  Returns the next character, but does not remove it from
+   *  the stream.
+   */
+  function peek() {
+    return $this->stream[0];
+  }
+  /**
+   * Get the next unconsumed character in the stream.
+   * This will remove that character from the front of the
+   * stream and return it.
+   */
+  function consume() {
+    $ret = array_shift($this->stream);
+    if (!empty($ret)) {
+      $this->position++;
+    }
+    return $ret;
+  }
+  /**
+   * Check if the stream is empty.
+   * @return boolean
+   *   Returns TRUE when the stream is empty, FALSE otherwise.
+   */
+  function isEmpty() {
+    return count($this->stream) == 0;
+  }
+}
+
+/**
+ * Exception indicating an error in CSS parsing.
+ *
+ * @ingroup querypath_css
+ */
+class CSSParseException extends EXCEPTION {}
+\ No newline at end of file
diff --git a/lib/querypath/Extension/QPDB.php b/lib/querypath/Extension/QPDB.php
new file mode 100644
index 0000000..1a41657
--- /dev/null
+++ b/lib/querypath/Extension/QPDB.php
@@ -0,0 +1,711 @@
+<?php
+/** @file
+ * This package contains classes for handling database transactions from
+ * within QueryPath.
+ *
+ * The tools here use the PDO (PHP Data Objects) library to execute database
+ * functions.
+ *
+ * Using tools in this package, you can write QueryPath database queries
+ * that query an RDBMS and then insert the results into the document.
+ *
+ * Example:
+ *
+ * @code
+ * <?php
+ * $template = '<?xml version="1.0"?><tr><td class="colOne"/><td class="colTwo"/><td class="colThree"/></tr>';
+ * $qp = qp(QueryPath::HTML_STUB, 'body') // Open a stub HTML doc and select <body/>
+ *  ->append('<table><tbody/></table>')
+ *  ->dbInit($this->dsn)
+ *  ->queryInto('SELECT * FROM qpdb_test WHERE 1', array(), $template)
+ *  ->doneWithQuery()
+ *  ->writeHTML();
+ * ?>
+ * @endcode
+ *
+ * The code above will take the results of a SQL query and insert them into a n
+ * HTML table.
+ *
+ * If you are doing many database operations across multiple QueryPath objects,
+ * it is better to avoid using {@link QPDB::dbInit()}. Instead, you should 
+ * call the static {@link QPDB::baseDB()} method to configure a single database
+ * connection that can be shared by all {@link QueryPath} instances.
+ *
+ * Thus, we could rewrite the above to look like this:
+ * @code
+  * <?php
+  * QPDB::baseDB($someDN);
+  *
+  * $template = '<?xml version="1.0"?><tr><td class="colOne"/><td class="colTwo"/><td class="colThree"/></tr>';
+  * $qp = qp(QueryPath::HTML_STUB, 'body') // Open a stub HTML doc and select <body/>
+  *  ->append('<table><tbody/></table>')
+  *  ->queryInto('SELECT * FROM qpdb_test WHERE 1', array(), $template)
+  *  ->doneWithQuery()
+  *  ->writeHTML();
+  * ?>
+  * @endcode
+ *
+ * Note that in this case, the QueryPath object doesn't need to call a method to
+ * activate the database. There is no call to {@link dbInit()}. Instead, it checks
+ * the base class to find the shared database.
+ *
+ * (Note that if you were to add a dbInit() call to the above, it would create
+ * a new database connection.)
+ *
+ * The result of both of these examples will be identical.
+ * The output looks something like this:
+ * 
+ * @code
+ * <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ * <html xmlns="http://www.w3.org/1999/xhtml">
+ * <head>
+ *  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
+ * 	<title>Untitled</title>
+ * </head>
+ *<body>
+ *<table>
+ * <tbody>
+ *  <tr>
+ *   <td class="colOne">Title 0</td>
+ *   <td class="colTwo">Body 0</td>
+ *   <td class="colThree">Footer 0</td>
+ *  </tr>
+ *  <tr>
+ *   <td class="colOne">Title 1</td>
+ *   <td class="colTwo">Body 1</td>
+ *   <td class="colThree">Footer 1</td>
+ *  </tr>
+ *  <tr>
+ *   <td class="colOne">Title 2</td>
+ *   <td class="colTwo">Body 2</td>
+ *   <td class="colThree">Footer 2</td>
+ *  </tr>
+ *  <tr>
+ *   <td class="colOne">Title 3</td>
+ *   <td class="colTwo">Body 3</td>
+ *   <td class="colThree">Footer 3</td>
+ *  </tr>
+ *  <tr>
+ *   <td class="colOne">Title 4</td>
+ *   <td class="colTwo">Body 4</td>
+ *   <td class="colThree">Footer 4</td>
+ *  </tr>
+ * </tbody>
+ *</table>
+ *</body>
+ *</html>
+ * @endcode
+ *
+ * Note how the CSS classes are used to correlate DB table names to template
+ * locations.
+ *
+ * 
+ * @author M Butcher <matt@aleph-null.tv>
+ * @license http://opensource.org/licenses/lgpl-2.1.php LGPL or MIT-like license.
+ * @see QueryPathExtension
+ * @see QueryPathExtensionRegistry::extend()
+ * @see QPDB
+ */
+ 
+/**
+ * Provide DB access to a QueryPath object.
+ *
+ * This extension provides tools for communicating with a database using the 
+ * QueryPath library. It relies upon PDO for underlying database communiction. This
+ * means that it supports all databases that PDO supports, including MySQL, 
+ * PostgreSQL, and SQLite.
+ *
+ * Here is an extended example taken from the unit tests for this library.
+ * 
+ * Let's say we create a database with code like this:
+ * @code
+ *<?php
+ * public function setUp() {
+ *   $this->db = new PDO($this->dsn);
+ *   $this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+ *   $this->db->exec('CREATE TABLE IF NOT EXISTS qpdb_test (colOne, colTwo, colThree)');
+ *   
+ *   $stmt = $this->db->prepare(
+ *     'INSERT INTO qpdb_test (colOne, colTwo, colThree) VALUES (:one, :two, :three)'
+ *   );
+ *   
+ *   for ($i = 0; $i < 5; ++$i) {
+ *     $vals = array(':one' => 'Title ' . $i, ':two' => 'Body ' . $i, ':three' => 'Footer ' . $i);
+ *     $stmt->execute($vals);
+ *     $stmt->closeCursor();
+ *   }
+ * }
+ * ?>
+ * @endcode
+ * 
+ * From QueryPath with QPDB, we can now do very elaborate DB chains like this:
+ *
+ * @code
+ * <?php
+ * $sql = 'SELECT * FROM qpdb_test';
+ * $args = array();
+ * $qp = qp(QueryPath::HTML_STUB, 'body') // Open a stub HTML doc and select <body/>
+ *   ->append('<h1></h1>') // Add <h1/>
+ *   ->children()  // Select the <h1/>
+ *   ->dbInit($this->dsn) // Connect to the database
+ *   ->query($sql, $args) // Execute the SQL query
+ *   ->nextRow()  // Select a row. By default, no row is selected.
+ *   ->appendColumn('colOne') // Append Row 1, Col 1 (Title 0)
+ *   ->parent() // Go back to the <body/>
+ *   ->append('<p/>') // Append a <p/> to the body
+ *   ->find('p')  // Find the <p/> we just created.
+ *   ->nextRow() // Advance to row 2
+ *   ->prependColumn('colTwo') // Get row 2, col 2. (Body 1)
+ *   ->columnAfter('colThree') // Get row 2 col 3. (Footer 1)
+ *   ->doneWithQuery() // Let QueryPath clean up. YOU SHOULD ALWAYS DO THIS.
+ *   ->writeHTML(); // Write the output as HTML.
+ * ?> 
+ * @endcode
+ *
+ * With the code above, we step through the document, selectively building elements
+ * as we go, and then populating this elements with data from our initial query.
+ *
+ * When the last command, {@link QueryPath:::writeHTML()}, is run, we will get output
+ * like this:
+ * 
+ * @code
+ *   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ *   <html xmlns="http://www.w3.org/1999/xhtml">
+ *     <head>
+ *     	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ *     	<title>Untitled</title>
+ *     </head>
+ *     <body>
+ *       <h1>Title 0</h1>
+ *       <p>Body 1</p>
+ *       Footer 1</body>
+ *    </html>
+ * @endcode
+ *
+ * Notice the body section in particular. This is where the data has been
+ * inserted.
+ *
+ * Sometimes you want to do something a lot simpler, like give QueryPath a 
+ * template and have it navigate a query, inserting the data into a template, and
+ * then inserting the template into the document. This can be done simply with 
+ * the {@link queryInto()} function.
+ *
+ * Here's an example from another unit test:
+ *
+ * @code
+ * <?php
+ * $template = '<?xml version="1.0"?><li class="colOne"/>';
+ * $sql = 'SELECT * FROM qpdb_test';
+ * $args = array();
+ * $qp = qp(QueryPath::HTML_STUB, 'body')
+ *   ->append('<ul/>') // Add a new <ul/>
+ *   ->children() // Select the <ul/>
+ *   ->dbInit($this->dsn) // Initialize the DB
+ *   // BIG LINE: Query the results, run them through the template, and insert them.
+ *   ->queryInto($sql, $args, $template) 
+ *   ->doneWithQuery()
+ *   ->writeHTML(); // Write the results as HTML.
+ * ?>
+ * @endcode 
+ *
+ * The simple code above puts the first column of the select statement
+ * into an unordered list. The example output looks like this:
+ *
+ * @code
+ * <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ * <html xmlns="http://www.w3.org/1999/xhtml">
+ *   <head>
+ *   	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
+ *   	<title>Untitled</title>
+ *    </head>
+ *    <body>
+ *    <ul>
+ *    <li class="colOne">Title 0</li>
+ *    <li class="colOne">Title 1</li>
+ *    <li class="colOne">Title 2</li>
+ *    <li class="colOne">Title 3</li>
+ *    <li class="colOne">Title 4</li>
+ *    </ul>
+ *   </body>
+ * </html>
+ * @endcode
+ *
+ * Typical starting methods for this class are {@link QPDB::baseDB()}, 
+ * {@link QPDB::query()}, and {@link QPDB::queryInto()}.
+ *
+ * @ingroup querypath_extensions
+ */
+class QPDB implements QueryPathExtension {
+  protected $qp;
+  protected $dsn;
+  protected $db;
+  protected $opts;
+  protected $row = NULL;
+  protected $stmt = NULL;
+  
+  protected static $con = NULL;
+  
+  /**
+   * Create a new database instance for all QueryPath objects to share.
+   *
+   * This method need be called only once. From there, other QPDB instances
+   * will (by default) share the same database instance.
+   *
+   * Normally, a DSN should be passed in. Username, password, and db params
+   * are all passed in using the options array.
+   *
+   * On rare occasions, it may be more fitting to pass in an existing database
+   * connection (which must be a {@link PDO} object). In such cases, the $dsn
+   * parameter can take a PDO object instead of a DSN string. The standard options
+   * will be ignored, though.
+   *
+   * <b>Warning:</b> If you pass in a PDO object that is configured to NOT throw
+   * exceptions, you will need to handle error checking differently.
+   *
+   * <b>Remember to always use {@link QPDB::doneWithQuery()} when you are done
+   * with a query. It gives PDO a chance to clean up open connections that may
+   * prevent other instances from accessing or modifying data.</b>
+   *
+   * @param string $dsn
+   *  The DSN of the database to connect to. You can also pass in a PDO object, which
+   *  will set the QPDB object's database to the one passed in.
+   * @param array $options
+   *  An array of configuration options. The following options are currently supported:
+   *  - username => (string)
+   *  - password => (string)
+   *  - db params => (array) These will be passed into the new PDO object.
+   *    See the PDO documentation for a list of options. By default, the
+   *    only flag set is {@link PDO::ATTR_ERRMODE}, which is set to 
+   *    {@link PDO::ERRMODE_EXCEPTION}.
+   * @throws PDOException
+   *  An exception may be thrown if the connection cannot be made.
+   */
+  static function baseDB($dsn, $options = array()) {
+    
+    $opts = $options + array(
+      'username' => NULL,
+      'password' => NULL,
+      'db params' => array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION),
+    );
+    
+    // Allow this to handle the case where an outside
+    // connection does the initialization.
+    if ($dsn instanceof PDO) {
+      self::$con = $dsn;
+      return;
+    }
+    self::$con = new PDO($dsn, $opts['username'], $opts['password'], $opts['db params']);
+  }
+  
+  /**
+   * 
+   * This method may be used to share the connection with other, 
+   * non-QueryPath objects.
+   */
+  static function getBaseDB() {return self::$con;}
+  
+  /**
+   * Used to control whether or not all rows in a result should be cycled through.
+   */
+  protected $cycleRows = FALSE;
+  
+  /**
+   * Construct a new QPDB object. This is usually done by QueryPath itself.
+   */
+  public function __construct(QueryPath $qp) {
+    $this->qp = $qp;
+    // By default, we set it up to use the base DB.
+    $this->db = self::$con;
+  }
+  
+  /**
+   * Create a new connection to the database. Use the PDO DSN syntax for a 
+   * connection string.
+   *
+   * This creates a database connection that will last for the duration of 
+   * the QueryPath object. This method ought to be used only in two cases:
+   * - When you will only run a couple of queries during the life of the 
+   *   process.
+   * - When you need to connect to a database that will only be used for 
+   *   a few things.
+   * Otherwise, you should use {@link QPDB::baseDB} to configure a single
+   * database connection that all of {@link QueryPath} can share.
+   *
+   * <b>Remember to always use {@link QPDB::doneWithQuery()} when you are done
+   * with a query. It gives PDO a chance to clean up open connections that may
+   * prevent other instances from accessing or modifying data.</b>
+   *
+   * @param string $dsn
+   *  The PDO DSN connection string.
+   * @param array $options
+   *  Connection options. The following options are supported:
+   *  - username => (string)
+   *  - password => (string)
+   *  - db params => (array) These will be passed into the new PDO object.
+   *    See the PDO documentation for a list of options. By default, the
+   *    only flag set is {@link PDO::ATTR_ERRMODE}, which is set to 
+   *    {@link PDO::ERRMODE_EXCEPTION}.
+   * @return QueryPath
+   *  The QueryPath object.
+   * @throws PDOException
+   *  The PDO library is configured to throw exceptions, so any of the 
+   *  database functions may throw a PDOException.
+   */
+  public function dbInit($dsn, $options = array()) {
+    $this->opts = $options + array(
+      'username' => NULL,
+      'password' => NULL,
+      'db params' => array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION),
+    );
+    $this->dsn = $dsn;
+    $this->db = new PDO($dsn, $this->opts['username'], $this->opts['password'], $this->opts['db params']);
+    /*
+    foreach ($this->opts['db params'] as $key => $val)
+      $this->db->setAttribute($key, $val);
+    */
+    
+    return $this->qp;
+  }
+  
+  /**
+   * Execute a SQL query, and store the results.
+   *
+   * This will execute a SQL query (as a prepared statement), and then store
+   * the results internally for later use. The data can be iterated using 
+   * {@link nextRow()}. QueryPath can also be instructed to do internal iteration
+   * using the {@link withEachRow()} method. Finally, on the occasion that the 
+   * statement itself is needed, {@link getStatement()} can be used.
+   *
+   * Use this when you need to access the results of a query, or when the 
+   * parameter to a query should be escaped. If the query takes no external 
+   * parameters and does not return results, you may wish to use the 
+   * (ever so slightly faster) {@link exec()} function instead.
+   * 
+   * Make sure you use {@link doneWithQuery()} after finishing with the database
+   * results returned by this method.
+   *
+   * <b>Usage</b>
+   * 
+   * Here is a simple example:
+   * <code>
+   * <?php
+   * QPQDB::baseDB($someDSN);
+   * 
+   * $args = array(':something' => 'myColumn');
+   * qp()->query('SELECT :something FROM foo', $args)->doneWithQuery();
+   * ?>
+   * </code>
+   *
+   * The above would execute the given query, substituting myColumn in place of 
+   * :something before executing the query The {@link doneWithQuery()} method
+   * indicates that we are not going to use the results for anything. This method
+   * discards the results.
+   *
+   * A more typical use of the query() function would involve inserting data
+   * using {@link appendColumn()}, {@link prependColumn()}, {@link columnBefore()},
+   * or {@link columnAfter()}. See the main documentation for {@link QPDB} to view
+   * a more realistic example.
+   * 
+   * @param string $sql
+   *  The query to be executed.
+   * @param array $args
+   *  An associative array of substitutions to make.
+   * @throws PDOException
+   *  Throws an exception if the query cannot be executed.
+   */
+  public function query($sql, $args = array()) {
+    $this->stmt = $this->db->prepare($sql);
+    $this->stmt->execute($args);
+    return $this->qp;
+  }
+  
+  /**
+   * Query and append the results.
+   *
+   * Run a query and inject the results directly into the 
+   * elements in the QueryPath object.
+   *
+   * If the third argument is empty, the data will be inserted directly into
+   * the QueryPath elements unaltered. However, if a template is provided in 
+   * the third parameter, the query data will be merged into that template
+   * and then be added to each QueryPath element.
+   *
+   * The template will be merged once for each row, even if no row data is
+   * appended into the template.
+   *
+   * A template is simply a piece of markup labeled for insertion of
+   * data. See {@link QPTPL} and {@link QPTPL.php} for more information.
+   *
+   * Since this does not use a stanard {@link query()}, there is no need
+   * to call {@link doneWithQuery()} after this method.
+   *
+   * @param string $sql
+   *  The SQL query to execute. In this context, the query is typically a 
+   *  SELECT statement.
+   * @param array $args
+   *  An array of arguments to be substituted into the query. See {@link query()}
+   *  for details.
+   * @param mixed $template
+   *  A template into which query results will be merged prior to being appended
+   *  into the QueryPath. For details on the template, see {@link QPTPL::tpl()}.
+   * @see QPTPL.php
+   * @see QPTPL::tpl()
+   * @see query()
+   */
+  public function queryInto($sql, $args = array(), $template = NULL) {
+    $stmt = $this->db->prepare($sql);
+    $stmt->setFetchMode(PDO::FETCH_ASSOC);
+    $stmt->execute($args);
+    
+    // If no template, put all values in together.
+    if (empty($template)) {
+      foreach ($stmt as $row) foreach ($row as $datum) $this->qp->append($datum);
+    }
+    // Otherwise, we run the results through a template, and then append.
+    else {
+      foreach ($stmt as $row) $this->qp->tpl($template, $row);
+    }
+    
+    $stmt->closeCursor();
+    return $this->qp;
+  }
+  
+  /**
+   * Free up resources when a query is no longer used.
+   *
+   * This function should <i>always</i> be called when the database
+   * results for a query are no longer needed. This frees up the 
+   * database cursor, discards the data, and resets resources for future
+   * use. 
+   *
+   * If this method is not called, some PDO database drivers will not allow
+   * subsequent queries, while others will keep tables in a locked state where
+   * writes will not be allowed.
+   *
+   * @return QueryPath
+   *  The QueryPath object.
+   */
+  public function doneWithQuery() {
+    if (isset($this->stmt) && $this->stmt instanceof PDOStatement) {
+      // Some drivers choke if results haven't been iterated.
+      //while($this->stmt->fetch()) {}
+      $this->stmt->closeCursor();
+    }
+      
+    unset($this->stmt);
+    $this->row = NULL;
+    $this->cycleRows = FALSE;
+    return $this->qp;
+  }
+  
+  /**
+   * Execute a SQL query, but expect no value.
+   * 
+   * If your SQL query will have parameters, you are encouraged to
+   * use {@link query()}, which includes built-in SQL Injection 
+   * protection.
+   *
+   * @param string $sql
+   *  A SQL statement.
+   * @throws PDOException 
+   *  An exception will be thrown if a query cannot be executed.
+   */
+  public function exec($sql) {
+    $this->db->exec($sql);
+    return $this->qp;
+  }
+  
+  /**
+   * Advance the query results row cursor.
+   *
+   * In a result set where more than one row was returned, this will 
+   * move the pointer to the next row in the set.
+   *
+   * The PDO library does not have a consistent way of determining how many
+   * rows a result set has. The suggested technique is to first execute a
+   * COUNT() SQL query and get the data from that.
+   *
+   * The {@link withEachRow()} method will begin at the next row after the
+   * currently selected one.
+   *
+   * @return QueryPath
+   *  The QueryPath object.
+   */
+  public function nextRow() {
+    $this->row = $this->stmt->fetch(PDO::FETCH_ASSOC);
+    return $this->qp;
+  }
+  
+  /**
+   * Set the object to use each row, instead of only one row.
+   *
+   * This is used primarily to instruct QPDB to iterate through all of the 
+   * rows when appending, prepending, inserting before, or inserting after.
+   *
+   * @return QueryPath
+   *  The QueryPath object.
+   * @see appendColumn()
+   * @see prependColumn()
+   * @see columnBefore()
+   * @see columnAfter()
+   */
+  public function withEachRow() {
+    $this->cycleRows = TRUE;
+    return $this->qp;
+  }
+  
+  /**
+   * This is the implementation behind the append/prepend and before/after methods.
+   *
+   * @param mixed $columnName
+   *  The name of the column whose data should be added to the currently selected
+   *  elements. This can be either a string or an array of strings.
+   * @param string $qpFunc
+   *  The name of the QueryPath function that should be executed to insert data
+   *  into the object.
+   * @param string $wrap
+   *  The HTML/XML markup that will be used to wrap around the column data before
+   *  the data is inserted into the QueryPath object.
+   */
+  protected function addData($columnName, $qpFunc = 'append', $wrap = NULL) {
+    $columns = is_array($columnName) ? $columnName : array($columnName);
+    $hasWrap = !empty($wrap);
+    if ($this->cycleRows) {
+      while (($row = $this->stmt->fetch(PDO::FETCH_ASSOC)) !== FALSE) {
+        foreach ($columns as $col) {
+          if (isset($row[$col])) {
+            $data = $row[$col];
+            if ($hasWrap) 
+              $data = qp()->append($wrap)->deepest()->append($data)->top();
+            $this->qp->$qpFunc($data);
+          }
+        }
+      }
+      $this->cycleRows = FALSE;
+      $this->doneWithQuery();
+    }
+    else {
+      if ($this->row !== FALSE) {
+        foreach ($columns as $col) {
+          if (isset($this->row[$col])) {
+            $data = $this->row[$col];
+            if ($hasWrap) 
+              $data = qp()->append($wrap)->deepest()->append($data)->top();
+            $this->qp->$qpFunc($data);
+          }
+        }
+      }
+    }
+    return $this->qp;
+  }
+  
+  /**
+   * Get back the raw PDOStatement object after a {@link query()}.
+   *
+   * @return PDOStatement
+   *  Return the PDO statement object. If this is called and no statement
+   *  has been executed (or the statement has already been cleaned up),
+   *  this will return NULL.
+   */
+  public function getStatement() {
+    return $this->stmt;
+  }
+  
+  /**
+   * Get the last insert ID.
+   *
+   * This will only return a meaningful result when used after an INSERT.
+   *
+   * @return mixed
+   *  Return the ID from the last insert. The value and behavior of this
+   *  is database-dependent. See the official PDO driver documentation for
+   *  the database you are using.
+   * @since 1.3
+   */
+  public function getLastInsertID() {
+    $con = self::$con;
+    return $con->lastInsertId();
+  }
+  
+  /**
+   * Append the data in the given column(s) to the QueryPath.
+   *
+   * This appends data to every item in the current QueryPath. The data will
+   * be retrieved from the database result, using $columnName as the key.
+   *
+   * @param mixed $columnName
+   *  Either a string or an array of strings. The value(s) here should match 
+   *  one or more column headers from the current SQL {@link query}'s results.
+   * @param string $wrap
+   *  IF this is supplied, then the value or values retrieved from the database
+   *  will be wrapped in this HTML/XML before being inserted into the QueryPath.
+   * @see QueryPath::wrap()
+   * @see QueryPath::append()
+   */
+  public function appendColumn($columnName, $wrap = NULL) {
+    return $this->addData($columnName, 'append', $wrap); 
+  }
+  
+  /**
+   * Prepend the data from the given column into the QueryPath.
+   *
+   * This takes the data from the given column(s) and inserts it into each
+   * element currently found in the QueryPath.
+   * @param mixed $columnName
+   *  Either a string or an array of strings. The value(s) here should match 
+   *  one or more column headers from the current SQL {@link query}'s results.
+   * @param string $wrap
+   *  IF this is supplied, then the value or values retrieved from the database
+   *  will be wrapped in this HTML/XML before being inserted into the QueryPath.
+   * @see QueryPath::wrap()
+   * @see QueryPath::prepend()
+   */
+  public function prependColumn($columnName, $wrap = NULL) {
+    return $this->addData($columnName, 'prepend', $wrap);
+  }
+  
+  /**
+   * Insert the data from the given column before each element in the QueryPath.
+   *
+   * This inserts the data before each element in the currently matched QueryPath.
+   *
+   * @param mixed $columnName
+   *  Either a string or an array of strings. The value(s) here should match 
+   *  one or more column headers from the current SQL {@link query}'s results.
+   * @param string $wrap
+   *  IF this is supplied, then the value or values retrieved from the database
+   *  will be wrapped in this HTML/XML before being inserted into the QueryPath.
+   * @see QueryPath::wrap()
+   * @see QueryPath::before()
+   * @see prependColumn()
+   */
+  public function columnBefore($columnName, $wrap = NULL) {
+    return $this->addData($columnName, 'before', $wrap);
+  }
+  
+  /**
+   * Insert data from the given column(s) after each element in the QueryPath.
+   *
+   * This inserts data from the given columns after each element in the QueryPath
+   * object. IF HTML/XML is given in the $wrap parameter, then the column data
+   * will be wrapped in that markup before being inserted into the QueryPath.
+   *
+   * @param mixed $columnName
+   *  Either a string or an array of strings. The value(s) here should match 
+   *  one or more column headers from the current SQL {@link query}'s results.
+   * @param string $wrap
+   *  IF this is supplied, then the value or values retrieved from the database
+   *  will be wrapped in this HTML/XML before being inserted into the QueryPath.
+   * @see QueryPath::wrap()
+   * @see QueryPath::after()
+   * @see appendColumn()
+   */
+  public function columnAfter($columnName, $wrap = NULL) {
+    return $this->addData($columnName, 'after', $wrap);
+  }
+  
+}
+
+// The define allows another class to extend this.
+if (!defined('QPDB_OVERRIDE'))
+  QueryPathExtensionRegistry::extend('QPDB');
+\ No newline at end of file
diff --git a/lib/querypath/Extension/QPList.php b/lib/querypath/Extension/QPList.php
new file mode 100644
index 0000000..87fb860
--- /dev/null
+++ b/lib/querypath/Extension/QPList.php
@@ -0,0 +1,213 @@
+<?php
+/** @file
+ * This extension provides support for common HTML list operations.
+ */
+
+/**
+ * Provide list operations for QueryPath.
+ *
+ * The QPList class is an extension to QueryPath. It provides HTML list generators
+ * that take lists and convert them into bulleted lists inside of QueryPath.
+ *
+ * @deprecated This will be removed from a subsequent version of QueryPath. It will
+ *  be released as a stand-alone extension.
+ * @ingroup querypath_extensions
+ */ 
+class QPList implements QueryPathExtension {
+  const UL = 'ul';
+  const OL = 'ol';
+  const DL = 'dl';
+  
+  protected $qp = NULL;
+  public function __construct(QueryPath $qp) {
+    $this->qp = $qp;
+  }
+  
+  public function appendTable($items, $options = array()) {
+    $opts = $options + array(
+      'table class' => 'qptable',
+    );
+    $base = '<?xml version="1.0"?>
+    <table>
+    <tbody>
+      <tr></tr>
+    </tbody>
+    </table>';
+    
+    $qp = qp($base, 'table')->addClass($opts['table class'])->find('tr');
+    if ($items instanceof TableAble) {
+      $headers = $items->getHeaders();
+      $rows = $items->getRows();
+    }
+    elseif ($items instanceof Traversable) {
+      $headers = array();
+      $rows = $items;
+    }
+    else {
+      $headers = $items['headers'];
+      $rows = $items['rows'];
+    }
+    
+    // Add Headers:
+    foreach ($headers as $header) {
+      $qp->append('<th>' . $header . '</th>');
+    }
+    $qp->top()->find('tr:last');
+    
+    // Add rows and cells.
+    foreach ($rows as $row) {
+      $qp->after('<tr/>')->next();
+      foreach($row as $cell) $qp->append('<td>' . $cell . '</td>');
+    }
+    
+    $this->qp->append($qp->top());
+    
+    return $this->qp;
+  }
+  
+  /**
+   * Append a list of items into an HTML DOM using one of the HTML list structures.
+   * This takes a one-dimensional array and converts it into an HTML UL or OL list,
+   * <b>or</b> it can take an associative array and convert that into a DL list.
+   *
+   * In addition to arrays, this works with any Traversable or Iterator object.
+   *
+   * OL/UL arrays can be nested.
+   *
+   * @param mixed $items
+   *   An indexed array for UL and OL, or an associative array for DL. Iterator and
+   *  Traversable objects can also be used.
+   * @param string $type
+   *  One of ul, ol, or dl. Predefined constants are available for use.
+   * @param array $options
+   *  An associative array of configuration options. The supported options are:
+   *  - 'list class': The class that will be assigned to a list.
+   */
+  public function appendList($items, $type = self::UL, $options = array()) {
+    $opts = $options + array(
+      'list class' => 'qplist',
+    );
+    if ($type == self::DL) {
+      $q = qp('<?xml version="1.0"?><dl></dl>', 'dl')->addClass($opts['list class']);
+      foreach ($items as $dt => $dd) {
+        $q->append('<dt>' . $dt . '</dt><dd>' . $dd . '</dd>');
+      }
+      $q->appendTo($this->qp);
+    }
+    else {
+      $q = $this->listImpl($items, $type, $opts);
+      $this->qp->append($q->find(':root'));
+    }
+    
+    return $this->qp;
+  }
+  
+  /**
+   * Internal recursive list generator for appendList.
+   */
+  protected function listImpl($items, $type, $opts, $q = NULL) {
+    $ele = '<' . $type . '/>';
+    if (!isset($q))
+      $q = qp()->append($ele)->addClass($opts['list class']);
+          
+    foreach ($items as $li) {
+      if ($li instanceof QueryPath) {
+        $q = $this->listImpl($li->get(), $type, $opts, $q);
+      }
+      elseif (is_array($li) || $li instanceof Traversable) {
+        $q->append('<li><ul/></li>')->find('li:last > ul');
+        $q = $this->listImpl($li, $type, $opts, $q);
+        $q->parent();
+      }
+      else {
+        $q->append('<li>' . $li . '</li>');
+      }
+    }
+    return $q;
+  }
+  
+  /**
+   * Unused.
+   */
+  protected function isAssoc($array) {
+    // A clever method from comment on is_array() doc page:
+    return count(array_diff_key($array, range(0, count($array) - 1))) != 0; 
+  }
+}
+QueryPathExtensionRegistry::extend('QPList');
+
+/**
+ * A TableAble object represents tabular data and can be converted to a table.
+ *
+ * The {@link QPList} extension to {@link QueryPath} provides a method for
+ * appending a table to a DOM ({@link QPList::appendTable()}).
+ *
+ * Implementing classes should provide methods for getting headers, rows
+ * of data, and the number of rows in the table ({@link TableAble::size()}).
+ * Implementors may also choose to make classes Iterable or Traversable over
+ * the rows of the table.
+ *
+ * Two very basic implementations of TableAble are provided in this package:
+ *  - {@link QPTableData} provides a generic implementation.
+ *  - {@link QPTableTextData} provides a generic implementation that also escapes
+ *    all data.
+ */
+interface TableAble {
+  public function getHeaders();
+  public function getRows();
+  public function size();
+}
+
+/**
+ * Format data to be inserted into a simple HTML table.
+ *
+ * Data in the headers or rows may contain markup. If you want to 
+ * disallow markup, use a {@see QPTableTextData} object instead.
+ */
+class QPTableData implements TableAble, IteratorAggregate {
+  
+  protected $headers;
+  protected $rows;
+  protected $caption;
+  protected $p = -1;
+  
+  public function setHeaders($array) {$this->headers = $array; return $this;}
+  public function getHeaders() {return $this->headers; }
+  public function setRows($array) {$this->rows = $array; return $this;}
+  public function getRows() {return $this->rows;}
+  public function size() {return count($this->rows);}
+  public function getIterator() {
+    return new ArrayIterator($rows);
+  }
+}
+
+/**
+ * Provides a table where all of the headers and data are treated as text data.
+ * 
+ * This provents marked-up data from being inserted into the DOM as elements. 
+ * Instead, the text is escaped using {@see htmlentities()}.
+ *
+ * @see QPTableData
+ */
+class QPTableTextData extends QPTableData {
+  public function setHeaders($array) {
+    $headers = array();
+    foreach ($array as $header) {
+      $headers[] = htmlentities($header);
+    }
+    parent::setHeaders($headers);
+    return $this;
+  }
+  public function setRows($array) {
+    $count = count($array);
+    for ($i = 0; $i < $count; ++$i) {
+      $cols = array();
+      foreach ($data[$i] as $datum) {
+        $cols[] = htmlentities($datum);
+      }
+      $data[$i] = $cols;
+    }
+    parent::setRows($array);
+    return $this;
+  }
+}
+\ No newline at end of file
diff --git a/lib/querypath/Extension/QPTPL.php b/lib/querypath/Extension/QPTPL.php
new file mode 100644
index 0000000..6e47935
--- /dev/null
+++ b/lib/querypath/Extension/QPTPL.php
@@ -0,0 +1,275 @@
+<?php
+/** @file
+ * QueryPath templates. See QPTPL.
+ */
+/**
+ * QPTPL is a template library for QueryPath.
+ *
+ * The QPTPL extension provides template tools that can be used in 
+ * conjunction with QueryPath.
+ *
+ * There are two basic modes in which this tool operates. Both merge data into
+ * a pure HTML template. Both base their insertions on classes and IDs in the
+ * HTML data. Where they differ is in the kind of data merged into the template.
+ *
+ * One mode takes array data and does a deep (recursive) merge into the template.
+ * It can be used for simple substitutions, but it can also be used to loop through
+ * "rows" of data and create tables.
+ *
+ * The second mode takes a classed object and introspects that object to find out
+ * what CSS classes it is capable of filling. This is one way of bridging an object
+ * model and QueryPath data.
+ *
+ * The unit tests are a good place for documentation, as is the QueryPath webste.
+ *
+ * @author M Butcher <matt@aleph-null.tv>
+ * @license http://opensource.org/licenses/lgpl-2.1.php LGPL or MIT-like license.
+ * @see QueryPathExtension
+ * @see QueryPathExtensionRegistry::extend()
+ * @see https://fedorahosted.org/querypath/wiki/QueryPathTemplate
+ * @ingroup querypath_extensions
+ */
+class QPTPL implements QueryPathExtension {
+  protected $qp;
+  public function __construct(QueryPath $qp) {
+    $this->qp = $qp;
+  }
+  
+  /**
+   * Apply a template to an object and then insert the results.
+   *
+   * This takes a template (an arbitrary fragment of XML/HTML) and an object
+   * or array and inserts the contents of the object into the template. The 
+   * template is then appended to all of the nodes in the current list.
+   *
+   * Note that the data in the object is *not* escaped before it is merged 
+   * into the template. For that reason, an object can return markup (as 
+   * long as it is well-formed).
+   * 
+   * @param mixed $template
+   *  The template. It can be of any of the types that {@link qp()} supports
+   *  natively. Typically it is a string of XML/HTML.
+   * @param mixed $object
+   *  Either an object or an associative array. 
+   *  - In the case where the parameter
+   *  is an object, this will introspect the object, looking for getters (a la
+   *  Java bean behavior). It will then search the document for CSS classes
+   *  that match the method name. The function is then executed and its contents
+   *  inserted into the document. (If the function returns NULL, nothing is 
+   *  inserted.)
+   *  - In the case where the paramter is an associative array, the function will
+   *  look through the template for CSS classes that match the keys of the 
+   *  array. When an array key is found, the array value is inserted into the 
+   *  DOM as a child of the currently matched element(s).
+   * @param array $options
+   *  The options for this function. Valid options are:
+   *  - <None defined yet>
+   * @return QueryPath
+   *  Returns a QueryPath object with all of the changes from the template
+   *  applied into the QueryPath elements.
+   * @see QueryPath::append()
+   */
+  public function tpl($template, $object, $options = array()) {
+    // Handle default options here.
+
+    //$tqp = ($template instanceof QueryPath) ? clone $template: qp($template);
+    $tqp = qp($template);
+    
+    if (is_array($object) || $object instanceof Traversable) {
+      $this->tplArrayR($tqp, $object, $options);
+      return $this->qp->append($tqp->top());
+    }
+    elseif (is_object($object)) {
+      $this->tplObject($tqp, $object, $options);
+    }
+    
+    return $this->qp->append($tqp->top());
+  }
+  
+  /**
+   * Given one template, do substitutions for all objects.
+   *
+   * Using this method, one template can be populated from a variety of 
+   * sources. That one template is then appended to the QueryPath object.
+   * @see tpl()
+   * @param mixed $template
+   *  The template. It can be of any of the types that {@link qp()} supports
+   *  natively. Typically it is a string of XML/HTML.
+   * @param array $objects
+   *  An indexed array containing a list of objects or arrays (See {@link tpl()})
+   *  that will be merged into the template.
+   * @param array $options
+   *  An array of options. See {@link tpl()} for a list.
+   * @return QueryPath
+   *  Returns the QueryPath object.
+   */
+  public function tplAll($template, $objects, $options = array()) {
+    $tqp = qp($template, ':root');
+    foreach ($objects as $object) {
+      if (is_array($object)) 
+        $tqp = $this->tplArrayR($tqp, $object, $options);
+      elseif (is_object($object)) 
+        $tqp = $this->tplObject($tqp, $object, $options);
+    }
+    return $this->qp->append($tqp->top());
+  }
+  
+  /*
+  protected function tplArray($tqp, $array, $options = array()) {
+    
+    // If we find something that's not an array, we try to handle it.
+    if (!is_array($array)) {
+     is_object($array) ? $this->tplObject($tqp, $array, $options) : $tqp->append($array);
+    }
+    // An assoc array means we have mappings of classes to content.
+    elseif ($this->isAssoc($array)) {
+      print 'Assoc array found.' . PHP_EOL;
+      foreach ($array as $key => $value) {
+        $first = substr($key,0,1);
+
+        // We allow classes and IDs if explicit. Otherwise we assume
+        // a class.
+        if ($first != '.' && $first != '#') $key = '.' . $key;
+        
+        if ($tqp->top()->find($key)->size() > 0) {
+          print "Value: " . $value . PHP_EOL;
+          if (is_array($value)) {
+            //$newqp = qp($tqp)->cloneAll();
+            print $tqp->xml();
+            $this->tplArray($tqp, $value, $options);
+            print "Finished recursion\n";
+          }
+          else {
+            print 'QP is ' . $tqp->size() . " inserting value: " . $value . PHP_EOL;
+            
+            $tqp->append($value);
+          }
+        }
+      }
+    }
+    // An indexed array means we have multiple instances of class->content matches.
+    // We copy the portion of the template and then call repeatedly.
+    else {
+      print "Array of arrays found..\n";
+      foreach ($array as $array2) {
+        $clone = qp($tqp->xml());
+        $this->tplArray($clone, $array2, $options);
+        print "Now appending clone.\n" . $clone->xml();
+        $tqp->append($clone->parent());
+      }
+    }
+    
+    
+    //return $tqp->top();
+    return $tqp;
+  }
+  */
+  
+  /**
+   * Introspect objects to map their functions to CSS classes in a template.
+   */
+  protected function tplObject($tqp, $object, $options = array()) {
+    $ref = new ReflectionObject($object);
+    $methods = $ref->getMethods();
+    foreach ($methods as $method) {
+      if (strpos($method->getName(), 'get') === 0) {
+        $cssClass = $this->method2class($method->getName());
+        if ($tqp->top()->find($cssClass)->size() > 0) {
+          $tqp->append($method->invoke($object));
+        }
+        else {
+          // Revert to the find() that found something.
+          $tqp->end();
+        }
+      }
+    }
+    //return $tqp->top();
+    return $tqp;
+  }
+  
+  /**
+   * Recursively merge array data into a template.
+   */
+  public function tplArrayR($qp, $array, $options = NULL) {
+    // If the value looks primitive, append it.
+    if (!is_array($array) && !($array instanceof Traversable)) {
+      $qp->append($array);
+    }
+    // If we are dealing with an associative array, traverse it
+    // and merge as we go.
+    elseif ($this->isAssoc($array)) {
+      // Do key/value substitutions
+      foreach ($array as $k => $v) {
+        
+        // If no dot or hash, assume class.
+        $first = substr($k,0,1);
+        if ($first != '.' && $first != '#') $k = '.' . $k;
+        
+        // If value is an array, recurse.
+        if (is_array($v)) {
+          // XXX: Not totally sure that starting at the 
+          // top is right. Perhaps it should start
+          // at some other context?
+          $this->tplArrayR($qp->top($k), $v, $options);
+        }
+        // Otherwise, try to append value.
+        else {
+          $qp->branch()->children($k)->append($v);
+        }
+      }
+    }
+    // Otherwise we have an indexed array, and we iterate through
+    // it.
+    else {
+      // Get a copy of the current template and then recurse.
+      foreach ($array as $entry) {
+        $eles = $qp->get();
+        $template = array();
+        
+        // We manually deep clone the template.
+        foreach ($eles as $ele) {
+          $template = $ele->cloneNode(TRUE);
+        }
+        $tpl = qp($template);
+        $tpl = $this->tplArrayR($tpl, $entry, $options);
+        $qp->before($tpl);
+      }
+      // Remove the original template without loosing a handle to the
+      // newly injected one.
+      $dead = $qp->branch();
+      $qp->parent();
+      $dead->remove();
+      unset($dead);
+    }
+    return $qp;
+  }
+  
+  /**
+   * Check whether an array is associative.
+   * If the keys of the array are not consecutive integers starting with 0,
+   * this will return false.
+   *
+   * @param array $array
+   *  The array to test.
+   * @return Boolean
+   *  TRUE if this is an associative array, FALSE otherwise.
+   */
+  public function isAssoc($array) {
+    $i = 0;
+    foreach ($array as $k => $v) if ($k !== $i++) return TRUE;
+    // If we get here, all keys passed.
+    return FALSE;
+  }
+
+  /**
+   * Convert a function name to a CSS class selector (e.g. myFunc becomes '.myFunc').
+   * @param string $mname
+   *  Method name.
+   * @return string
+   *  CSS 3 Class Selector.
+   */
+  protected function method2class($mname) {
+    return '.' . substr($mname, 3);
+  }
+}
+QueryPathExtensionRegistry::extend('QPTPL');
+\ No newline at end of file
diff --git a/lib/querypath/Extension/QPXML.php b/lib/querypath/Extension/QPXML.php
new file mode 100644
index 0000000..e91fa6e
--- /dev/null
+++ b/lib/querypath/Extension/QPXML.php
@@ -0,0 +1,209 @@
+<?php
+/** @file
+ * XML extensions. See QPXML.
+ */
+/**
+ * Provide QueryPath with additional XML tools.
+ *
+ * @author M Butcher <matt@aleph-null.tv>
+ * @author Xander Guzman <theshadow@shadowpedia.info>
+ * @license http://opensource.org/licenses/lgpl-2.1.php LGPL or MIT-like license.
+ * @see QueryPathExtension
+ * @see QueryPathExtensionRegistry::extend()
+ * @see QPXML
+ * @ingroup querypath_extensions
+ */
+class QPXML implements QueryPathExtension {
+
+  protected $qp;
+
+  public function __construct(QueryPath $qp) {
+    $this->qp = $qp;
+  }
+
+  public function schema($file) {
+    $doc = $this->qp->branch()->top()->get(0)->ownerDocument;
+
+    if (!$doc->schemaValidate($file)) {
+      throw new QueryPathException('Document did not validate against the schema.');
+    }
+  }
+
+  /**
+   * Get or set a CDATA section.
+   *
+   * If this is given text, it will create a CDATA section in each matched element,
+   * setting that item's value to $text.
+   *
+   * If no parameter is passed in, this will return the first CDATA section that it
+   * finds in the matched elements.
+   *
+   * @param string $text
+   *  The text data to insert into the current matches. If this is NULL, then the first
+   *  CDATA will be returned.
+   *
+   * @return mixed
+   *  If $text is not NULL, this will return a {@link QueryPath}. Otherwise, it will
+   *  return a string. If no CDATA is found, this will return NULL.
+   * @see comment()
+   * @see QueryPath::text()
+   * @see QueryPath::html()
+   */
+  public function cdata($text = NULL) {
+    if (isset($text)) {
+      // Add this text as CDATA in the current elements.
+      foreach ($this->qp->get() as $element) {
+        $cdata = $element->ownerDocument->createCDATASection($text);
+        $element->appendChild($cdata);
+      }
+      return $this->qp;;
+    }
+
+    // Look for CDATA sections.
+    foreach ($this->qp->get() as $ele) {
+      foreach ($ele->childNodes as $node) {
+        if ($node->nodeType == XML_CDATA_SECTION_NODE) {
+          // Return first match.
+          return $node->textContent;
+        }
+      }
+    }
+    return NULL;
+    // Nothing found
+  }
+
+  /**
+   * Get or set a comment.
+   *
+   * This function is used to get or set comments in an XML or HTML document.
+   * If a $text value is passed in (and is not NULL), then this will add a comment
+   * (with the value $text) to every match in the set.
+   *
+   * If no text is passed in, this will return the first comment in the set of matches.
+   * If no comments are found, NULL will be returned.
+   *
+   * @param string $text
+   *  The text of the comment. If set, a new comment will be created in every item 
+   *  wrapped by the current {@link QueryPath}.
+   * @return mixed
+   *  If $text is set, this will return a {@link QueryPath}. If no text is set, this
+   *  will search for a comment and attempt to return the string value of the first
+   *  comment it finds. If no comment is found, NULL will be returned.
+   * @see cdata()
+   */
+  public function comment($text = NULL) {
+    if (isset($text)) {
+      foreach ($this->qp->get() as $element) {
+        $comment = $element->ownerDocument->createComment($text);
+        $element->appendChild($comment);
+      }
+      return $this->qp;
+    }
+    foreach ($this->qp->get() as $ele) {
+      foreach ($ele->childNodes as $node) {
+        if ($node->nodeType == XML_COMMENT_NODE) {
+          // Return first match.
+          return $node->textContent;
+        }
+      }
+    }
+  }
+
+  /**
+   * Get or set a processor instruction.
+   */
+  public function pi($prefix = NULL, $text = NULL) {
+    if (isset($text)) {
+      foreach ($this->qp->get() as $element) {
+        $comment = $element->ownerDocument->createProcessingInstruction($prefix, $text);
+        $element->appendChild($comment);
+      }
+      return $this->qp;
+    }
+    foreach ($this->qp->get() as $ele) {
+      foreach ($ele->childNodes as $node) {
+        if ($node->nodeType == XML_PI_NODE) {
+
+          if (isset($prefix)) {
+            if ($node->tagName == $prefix) {
+              return $node->textContent;
+            }
+          }
+          else {
+            // Return first match.
+            return $node->textContent;
+          }
+        }
+      } // foreach
+    } // foreach
+  }
+  public function toXml() {
+      return $this->qp->document()->saveXml();
+  }
+
+  /**
+   * Create a NIL element.
+   *
+   * @param string $text
+   * @param string $value
+   * @reval object $element
+   */
+  public function createNilElement($text, $value) {
+    $value = ($value)? 'true':'false';
+    $element = $this->qp->createElement($text);
+    $element->attr('xsi:nil', $value);
+    return $element;
+  }
+
+  /**
+   * Create an element with the given namespace.
+   *
+   * @param string $text
+   * @param string $nsUri
+   *   The namespace URI for the given element.
+   * @retval object
+   */
+  public function createElement($text, $nsUri = null) {
+    if (isset ($text)) {
+      foreach ($this->qp->get() as $element) {
+        if ($nsUri === null && strpos($text, ':') !== false) {
+          $ns = array_shift(explode(':', $text));
+          $nsUri = $element->ownerDocument->lookupNamespaceURI($ns);
+
+          if ($nsUri === null) {
+            throw new QueryPathException("Undefined namespace for: " . $text);
+          }
+      }
+
+      $node = null;
+      if ($nsUri !== null) {
+        $node = $element->ownerDocument->createElementNS(
+          $nsUri,
+          $text
+        );
+      } else {
+        $node = $element->ownerDocument->createElement($text);
+      }
+        return qp($node);
+      }
+    }
+    return;
+  }
+
+  /**
+   * Append an element.
+   *
+   * @param string $text
+   * @retval object QueryPath
+   */
+  public function appendElement($text) {
+    if (isset ($text)) {
+      foreach ($this->qp->get() as $element) {
+        $node = $this->qp->createElement($text);
+        qp($element)->append($node);
+      }
+    }
+    return $this->qp;
+  }
+}
+QueryPathExtensionRegistry::extend('QPXML');
diff --git a/lib/querypath/Extension/QPXSL.php b/lib/querypath/Extension/QPXSL.php
new file mode 100644
index 0000000..4adb317
--- /dev/null
+++ b/lib/querypath/Extension/QPXSL.php
@@ -0,0 +1,75 @@
+<?php
+/** @file
+ * Provide QueryPath with XSLT support using the PHP libxslt module.
+ *
+ * This is called 'QPXSL' instead of 'QPXSLT' in accordance with the name
+ * of the PHP extension that provides libxslt support.
+ *
+ * You must have PHP XSL support for this to function.
+ *
+ * @author M Butcher <matt@aleph-null.tv>
+ * @license http://opensource.org/licenses/lgpl-2.1.php LGPL or MIT-like license.
+ * @see QueryPathExtension
+ * @see QueryPathExtensionRegistry::extend()
+ * @see QPXSL
+ * @see QPXML
+ */
+ 
+/**
+ * Provide tools for running XSL Transformation (XSLT) on a document.
+ *
+ * This extension provides the {@link QPXSL::xslt()} function, which transforms
+ * a source XML document into another XML document according to the rules in
+ * an XSLT document.
+ *
+ * This QueryPath extension can be used as follows:
+ * <code>
+ * <?php
+ * require 'QueryPath/QueryPath.php';
+ * require 'QueryPath/Extension/QPXSL.php';
+ *
+ * qp('src.xml')->xslt('stylesheet.xml')->writeXML();
+ * ?>
+ *
+ * This will transform src.xml according to the XSLT rules in 
+ * stylesheet.xml. The results are returned as a QueryPath object, which 
+ * is written to XML using {@link QueryPath::writeXML()}.
+ * </code>
+ *
+ * @ingroup querypath_extensions
+ */
+class QPXSL implements QueryPathExtension {
+  
+  protected $src = NULL;
+  
+  public function __construct(QueryPath $qp) {
+    $this->src = $qp;
+  }
+  
+  /**
+   * Given an XSLT stylesheet, run a transformation.
+   *
+   * This will attempt to read the provided stylesheet and then
+   * execute it on the current source document.
+   *
+   * @param mixed $style
+   *  This takes a QueryPath object or <em>any</em> of the types that the 
+   *  {@link qp()} function can take.
+   * @return QueryPath
+   *  A QueryPath object wrapping the transformed document. Note that this is a 
+   *  <i>different</em> document than the original. As such, it has no history.
+   *  You cannot call {@link QueryPath::end()} to undo a transformation. (However,
+   *  the original source document will remain unchanged.)
+   */
+  public function xslt($style) {
+    if (!($style instanceof QueryPath)) {
+      $style = qp($style);
+    }
+    $sourceDoc = $this->src->top()->get(0)->ownerDocument;
+    $styleDoc = $style->get(0)->ownerDocument;
+    $processor = new XSLTProcessor();
+    $processor->importStylesheet($styleDoc);
+    return qp($processor->transformToDoc($sourceDoc));
+  }
+}
+QueryPathExtensionRegistry::extend('QPXSL');
+\ No newline at end of file
diff --git a/lib/querypath/QueryPath.php b/lib/querypath/QueryPath.php
new file mode 100644
index 0000000..2585ba6
--- /dev/null
+++ b/lib/querypath/QueryPath.php
@@ -0,0 +1,4543 @@
+<?php
+/** @file
+ * The Query Path package provides tools for manipulating a Document Object Model.
+ * The two major DOMs are the XML DOM and the HTML DOM. Using Query Path, you can 
+ * build, parse, search, and modify DOM documents.
+ *
+ * To use Query Path, this is the only file you should need to import.
+ *
+ * Standard usage:
+ * @code
+ * <?php
+ * require 'QueryPath/QueryPath.php';
+ * $qp = qp('#myID', '<?xml version="1.0"?><test><foo id="myID"/></test>');
+ * $qp->append('<new><elements/></new>')->writeHTML();
+ * ?>
+ * @endcode
+ *
+ * The above would print (formatted for readability):
+ * @code
+ * <?xml version="1.0"?>
+ * <test>
+ *  <foo id="myID">
+ *    <new>
+ *      <element/>
+ *    </new>
+ *  </foo>
+ * </test>
+ * @endcode
+ *
+ * To learn about the functions available to a Query Path object, 
+ * see {@link QueryPath}. The {@link qp()} function is used to build
+ * new QueryPath objects. The documentation for that function explains the
+ * wealth of arguments that the function can take.
+ *
+ * Included with the source code for QueryPath is a complete set of unit tests
+ * as well as some example files. Those are good resources for learning about
+ * how to apply QueryPath's tools. The full API documentation can be generated
+ * from these files using PHPDocumentor.
+ *
+ * If you are interested in building extensions for QueryParser, see the 
+ * {@link QueryPathExtender} class. There, you will find information on adding
+ * your own tools to QueryPath.
+ *
+ * QueryPath also comes with a full CSS 3 selector parser implementation. If
+ * you are interested in reusing that in other code, you will want to start
+ * with {@link CssEventHandler.php}, which is the event interface for the parser.
+ *
+ * All of the code in QueryPath is licensed under either the LGPL or an MIT-like
+ * license (you may choose which you prefer). All of the code is Copyright, 2009
+ * by Matt Butcher.
+ *
+ * @author M Butcher <matt @aleph-null.tv>
+ * @license http://opensource.org/licenses/lgpl-2.1.php The GNU Lesser GPL (LGPL) or an MIT-like license.
+ * @see QueryPath
+ * @see qp()
+ * @see http://querypath.org The QueryPath home page.
+ * @see http://api.querypath.org An online version of the API docs.
+ * @see http://technosophos.com For how-tos and examples.
+ * @copyright Copyright (c) 2009, Matt Butcher.
+ * @version 2.1.2
+ *
+ */
+
+/** @addtogroup querypath_core Core API
+ * Core classes and functions for QueryPath.
+ *
+ * These are the classes, objects, and functions that developers who use QueryPath
+ * are likely to use. The qp() and htmlqp() functions are the best place to start,
+ * while most of the frequently used methods are part of the QueryPath object.
+ */
+
+/** @addtogroup querypath_util Utilities
+ * Utility classes for QueryPath.
+ *
+ * These classes add important, but less-often used features to QueryPath. Some of
+ * these are used transparently (QueryPathIterator). Others you can use directly in your 
+ * code (QueryPathEntities).
+ */
+
+/*   * @namespace QueryPath
+ * The core classes that compose QueryPath.
+ *
+ * The QueryPath classes contain the brunt of the QueryPath code. If you are 
+ * interested in working with just the CSS engine, you may want to look at CssEventHandler,
+ * which can be used without the rest of QueryPath. If you are interested in looking 
+ * carefully at QueryPath's implementation details, then the QueryPath class is where you 
+ * should begin. If you are interested in writing extensions, than you may want to look at
+ * QueryPathExtension, and also at some of the simple extensions, such as QPXML.
+ */
+ 
+/**
+ * Regular expression for checking whether a string looks like XML.
+ * @deprecated This is no longer used in QueryPath.
+ */
+define('ML_EXP','/^[^<]*(<(.|\s)+>)[^>]*$/');
+
+/**
+ * The CssEventHandler interfaces with the CSS parser.
+ */
+require_once 'CssEventHandler.php';
+/**
+ * The extender is used to provide support for extensions.
+ */
+require_once 'QueryPathExtension.php';
+
+/**
+ * Build a new Query Path.
+ * This builds a new Query Path object. The new object can be used for 
+ * reading, search, and modifying a document.
+ *
+ * While it is permissible to directly create new instances of a QueryPath
+ * implementation, it is not advised. Instead, you should use this function
+ * as a factory.
+ *
+ * Example:
+ * @code
+ * <?php
+ * qp(); // New empty QueryPath
+ * qp('path/to/file.xml'); // From a file
+ * qp('<html><head></head><body></body></html>'); // From HTML or XML
+ * qp(QueryPath::XHTML_STUB); // From a basic HTML document.
+ * qp(QueryPath::XHTML_STUB, 'title'); // Create one from a basic HTML doc and position it at the title element.
+ *
+ * // Most of the time, methods are chained directly off of this call.
+ * qp(QueryPath::XHTML_STUB, 'body')->append('<h1>Title</h1>')->addClass('body-class');
+ * ?>
+ * @endcode
+ *
+ * This function is used internally by QueryPath. Anything that modifies the
+ * behavior of this function may also modify the behavior of common QueryPath
+ * methods.
+ *
+ * <b>Types of documents that QueryPath can support</b>
+ *
+ *  qp() can take any of these as its first argument:
+ *
+ *  - A string of XML or HTML (See {@link XHTML_STUB})
+ *  - A path on the file system or a URL
+ *  - A {@link DOMDocument} object
+ *  - A {@link SimpleXMLElement} object.
+ *  - A {@link DOMNode} object.
+ *  - An array of {@link DOMNode} objects (generally {@link DOMElement} nodes).
+ *  - Another {@link QueryPath} object.
+ *
+ * Keep in mind that most features of QueryPath operate on elements. Other 
+ * sorts of DOMNodes might not work with all features.
+ *
+ * <b>Supported Options</b>
+ *  - context: A stream context object. This is used to pass context info
+ *    to the underlying file IO subsystem.
+ *  - encoding: A valid character encoding, such as 'utf-8' or 'ISO-8859-1'.
+ *    The default is system-dependant, typically UTF-8. Note that this is 
+ *    only used when creating new documents, not when reading existing content.
+ *    (See convert_to_encoding below.)
+ *  - parser_flags: An OR-combined set of parser flags. The flags supported
+ *    by the DOMDocument PHP class are all supported here.
+ *  - omit_xml_declaration: Boolean. If this is TRUE, then certain output
+ *    methods (like {@link QueryPath::xml()}) will omit the XML declaration
+ *    from the beginning of a document.
+ *  - replace_entities: Boolean. If this is TRUE, then any of the insertion
+ *    functions (before(), append(), etc.) will replace named entities with
+ *    their decimal equivalent, and will replace un-escaped ampersands with 
+ *    a numeric entity equivalent.
+ *  - ignore_parser_warnings: Boolean. If this is TRUE, then E_WARNING messages
+ *    generated by the XML parser will not cause QueryPath to throw an exception.
+ *    This is useful when parsing
+ *    badly mangled HTML, or when failure to find files should not result in 
+ *    an exception. By default, this is FALSE -- that is, parsing warnings and 
+ *    IO warnings throw exceptions.
+ *  - convert_to_encoding: Use the MB library to convert the document to the 
+ *    named encoding before parsing. This is useful for old HTML (set it to
+ *    iso-8859-1 for best results). If this is not supplied, no character set 
+ *    conversion will be performed. See {@link mb_convert_encoding()}.
+ *    (QueryPath 1.3 and later)
+ *  - convert_from_encoding: If 'convert_to_encoding' is set, this option can be
+ *    used to explicitly define what character set the source document is using.
+ *    By default, QueryPath will allow the MB library to guess the encoding.
+ *    (QueryPath 1.3 and later)
+ *  - strip_low_ascii: If this is set to TRUE then markup will have all low ASCII
+ *    characters (<32) stripped out before parsing. This is good in cases where 
+ *    icky HTML has (illegal) low characters in the document.
+ *  - use_parser: If 'xml', Parse the document as XML. If 'html', parse the 
+ *    document as HTML. Note that the XML parser is very strict, while the 
+ *    HTML parser is more lenient, but does enforce some of the DTD/Schema.
+ *    <i>By default, QueryPath autodetects the type.</i>
+ *  - escape_xhtml_js_css_sections: XHTML needs script and css sections to be
+ *    escaped. Yet older readers do not handle CDATA sections, and comments do not
+ *    work properly (for numerous reasons). By default, QueryPath's *XHTML methods
+ *    will wrap a script body with a CDATA declaration inside of C-style comments.
+ *    If you want to change this, you can set this option with one of the 
+ *    JS_CSS_ESCAPE_* constants, or you can write your own.
+ *  - QueryPath_class: (ADVANCED) Use this to set the actual classname that
+ *    {@link qp()} loads as a QueryPath instance. It is assumed that the 
+ *    class is either {@link QueryPath} or a subclass thereof. See the test 
+ *    cases for an example.
+ *
+ * @ingroup querypath_core
+ * @param mixed $document
+ *  A document in one of the forms listed above.
+ * @param string $string 
+ *  A CSS 3 selector.
+ * @param array $options
+ *  An associative array of options. Currently supported options are listed above.
+ * @return QueryPath
+ */
+function qp($document = NULL, $string = NULL, $options = array()) {
+  
+  $qpClass = isset($options['QueryPath_class']) ? $options['QueryPath_class'] : 'QueryPath';
+  
+  $qp = new $qpClass($document, $string, $options);
+  return $qp;
+}
+
+/**
+ * A special-purpose version of {@link qp()} designed specifically for HTML.
+ *
+ * XHTML (if valid) can be easily parsed by {@link qp()} with no problems. However,
+ * because of the way that libxml handles HTML, there are several common steps that
+ * need to be taken to reliably parse non-XML HTML documents. This function is
+ * a convenience tool for configuring QueryPath to parse HTML.
+ *
+ * The following options are automatically set unless overridden:
+ *  - ignore_parser_warnings: TRUE
+ *  - convert_to_encoding: ISO-8859-1 (the best for the HTML parser).
+ *  - convert_from_encoding: auto (autodetect encoding)
+ *  - use_parser: html
+ *
+ * Parser warning messages are also suppressed, so if the parser emits a warning,
+ * the application will not be notified. This is equivalent to 
+ * calling @code@qp()@endcode.
+ *
+ * Warning: Character set conversions will only work if the Multi-Byte (mb) library
+ * is installed and enabled. This is usually enabled, but not always.
+ *
+ * @ingroup querypath_core
+ * @see qp()
+ */
+function htmlqp($document = NULL, $selector = NULL, $options = array()) {
+
+  // Need a way to force an HTML parse instead of an XML parse when the 
+  // doctype is XHTML, since many XHTML documents are not valid XML
+  // (because of coding errors, not by design).
+  
+  $options += array(
+    'ignore_parser_warnings' => TRUE,
+    'convert_to_encoding' => 'ISO-8859-1',
+    'convert_from_encoding' => 'auto',
+    //'replace_entities' => TRUE,
+    'use_parser' => 'html',
+    // This is stripping actually necessary low ASCII.
+    //'strip_low_ascii' => TRUE,
+  );
+  return @qp($document, $selector, $options);
+}
+
+/**
+ * The Query Path object is the primary tool in this library.
+ *
+ * To create a new Query Path, use the {@link qp()} function.
+ *
+ * If you are new to these documents, start at the {@link QueryPath.php} page.
+ * There you will find a quick guide to the tools contained in this project.
+ *
+ * A note on serialization: QueryPath uses DOM classes internally, and those
+ * do not serialize well at all. In addition, QueryPath may contain many
+ * extensions, and there is no guarantee that extensions can serialize. The
+ * moral of the story: Don't serialize QueryPath.
+ *
+ * @see qp()
+ * @see QueryPath.php
+ * @ingroup querypath_core
+ */
+class QueryPath implements IteratorAggregate, Countable {
+  
+  /**
+   * The version string for this version of QueryPath.
+   *
+   * Standard releases will be of the following form: <MAJOR>.<MINOR>[.<PATCH>][-STABILITY].
+   *
+   * Examples:
+   * - 2.0
+   * - 2.1.1
+   * - 2.0-alpha1
+   *
+   * Developer releases will always be of the form dev-<DATE>.
+   *
+   * @since 2.0
+   */
+  const VERSION = '2.1.2';
+  
+  /**
+   * This is a stub HTML 4.01 document.
+   *
+   * <b>Using {@link QueryPath::XHTML_STUB} is preferred.</b>
+   *
+   * This is primarily for generating legacy HTML content. Modern web applications
+   * should use {@link QueryPath::XHTML_STUB}.
+   *
+   * Use this stub with the HTML familiy of methods ({@link html()}, 
+   * {@link writeHTML()}, {@link innerHTML()}).
+   */
+  const HTML_STUB = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+  <html lang="en">
+  <head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <title>Untitled</title>
+  </head>
+  <body></body>
+  </html>';
+  
+  /**
+   * This is a stub XHTML document.
+   * 
+   * Since XHTML is an XML format, you should use XML functions with this document
+   * fragment. For example, you should use {@link xml()}, {@link innerXML()}, and 
+   * {@link writeXML()}.
+   * 
+   * This can be passed into {@link qp()} to begin a new basic HTML document.
+   *
+   * Example:
+   * @code
+   * $qp = qp(QueryPath::XHTML_STUB); // Creates a new XHTML document
+   * $qp->writeXML(); // Writes the document as well-formed XHTML.
+   * @endcode
+   * @since 2.0
+   */
+  const XHTML_STUB = '<?xml version="1.0"?>
+  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+  <html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  <title>Untitled</title>
+  </head>
+  <body></body>
+  </html>';
+  
+  /**
+   * Default parser flags.
+   *
+   * These are flags that will be used if no global or local flags override them.
+   * @since 2.0
+   */
+  const DEFAULT_PARSER_FLAGS = NULL;
+  
+  const JS_CSS_ESCAPE_CDATA = '\\1';
+  const JS_CSS_ESCAPE_CDATA_CCOMMENT = '/* \\1 */';
+  const JS_CSS_ESCAPE_CDATA_DOUBLESLASH = '// \\1';
+  const JS_CSS_ESCAPE_NONE = '';
+  
+  //const IGNORE_ERRORS = 1544; //E_NOTICE | E_USER_WARNING | E_USER_NOTICE;
+  private $errTypes = 771; //E_ERROR; | E_USER_ERROR;
+  
+  /**
+   * The base DOMDocument.
+   */
+  protected $document = NULL;
+  private $options = array(
+    'parser_flags' => NULL,
+    'omit_xml_declaration' => FALSE,
+    'replace_entities' => FALSE,
+    'exception_level' => 771, // E_ERROR | E_USER_ERROR | E_USER_WARNING | E_WARNING
+    'ignore_parser_warnings' => FALSE,
+    'escape_xhtml_js_css_sections' => self::JS_CSS_ESCAPE_CDATA_CCOMMENT,
+  );
+  /**
+   * The array of matches.
+   */
+  protected $matches = array();
+  /**
+   * The last array of matches.
+   */
+  protected $last = array(); // Last set of matches.
+  private $ext = array(); // Extensions array.
+  
+  /**
+   * The number of current matches.
+   *
+   * @see count()
+   */
+  public $length = 0;
+  
+  /**
+   * Constructor.
+   *
+   * This should not be called directly. Use the {@link qp()} factory function
+   * instead.
+   *
+   * @param mixed $document 
+   *   A document-like object.
+   * @param string $string
+   *   A CSS 3 Selector
+   * @param array $options
+   *   An associative array of options.
+   * @see qp()
+   */
+  public function __construct($document = NULL, $string = NULL, $options = array()) {
+    $string = trim($string);
+    $this->options = $options + QueryPathOptions::get() + $this->options;
+    
+    $parser_flags = isset($options['parser_flags']) ? $options['parser_flags'] : self::DEFAULT_PARSER_FLAGS;
+    if (!empty($this->options['ignore_parser_warnings'])) {
+      // Don't convert parser warnings into exceptions.
+      $this->errTypes = 257; //E_ERROR | E_USER_ERROR;
+    }
+    elseif (isset($this->options['exception_level'])) {
+      // Set the error level at which exceptions will be thrown. By default, 
+      // QueryPath will throw exceptions for 
+      // E_ERROR | E_USER_ERROR | E_WARNING | E_USER_WARNING.
+      $this->errTypes = $this->options['exception_level'];
+    }
+    
+    // Empty: Just create an empty QP.
+    if (empty($document)) {
+      $this->document = isset($this->options['encoding']) ? new DOMDocument('1.0', $this->options['encoding']) : new DOMDocument();
+      $this->setMatches(new SplObjectStorage());
+    }
+    // Figure out if document is DOM, HTML/XML, or a filename
+    elseif (is_object($document)) {
+      
+      if ($document instanceof QueryPath) {
+        $this->matches = $document->get(NULL, TRUE);
+        if ($this->matches->count() > 0)
+          $this->document = $this->getFirstMatch()->ownerDocument;
+      }
+      elseif ($document instanceof DOMDocument) {
+        $this->document = $document;
+        //$this->matches = $this->matches($document->documentElement);
+        $this->setMatches($document->documentElement);
+      }
+      elseif ($document instanceof DOMNode) {
+        $this->document = $document->ownerDocument;
+        //$this->matches = array($document);
+        $this->setMatches($document);
+      }
+      elseif ($document instanceof SimpleXMLElement) {
+        $import = dom_import_simplexml($document);
+        $this->document = $import->ownerDocument;
+        //$this->matches = array($import);
+        $this->setMatches($import);
+      }
+      elseif ($document instanceof SplObjectStorage) {
+        if ($document->count() == 0) {
+          throw new QueryPathException('Cannot initialize QueryPath from an empty SplObjectStore');
+        }
+        $this->matches = $document;
+        $this->document = $this->getFirstMatch()->ownerDocument;
+      }
+      else {
+        throw new QueryPathException('Unsupported class type: ' . get_class($document));
+      }
+    }
+    elseif (is_array($document)) {
+      //trigger_error('Detected deprecated array support', E_USER_NOTICE);
+      if (!empty($document) && $document[0] instanceof DOMNode) {
+        $found = new SplObjectStorage();
+        foreach ($document as $item) $found->attach($item);
+        //$this->matches = $found;
+        $this->setMatches($found);
+        $this->document = $this->getFirstMatch()->ownerDocument;
+      }
+    }
+    elseif ($this->isXMLish($document)) {
+      // $document is a string with XML
+      $this->document = $this->parseXMLString($document);
+      $this->setMatches($this->document->documentElement);
+    }
+    else {
+      
+      // $document is a filename
+      $context = empty($options['context']) ? NULL : $options['context'];
+      $this->document = $this->parseXMLFile($document, $parser_flags, $context);
+      $this->setMatches($this->document->documentElement);
+    }
+    
+    // Do a find if the second param was set.
+    if (isset($string) && strlen($string) > 0) {
+      $this->find($string);
+    }
+  }
+  
+  /**
+   * A static function for transforming data into a Data URL.
+   *
+   * This can be used to create Data URLs for injection into CSS, JavaScript, or other 
+   * non-XML/HTML content. If you are working with QP objects, you may want to use
+   * {@link dataURL()} instead.
+   *
+   * @param mixed $data
+   *  The contents to inject as the data. The value can be any one of the following:
+   *  - A URL: If this is given, then the subsystem will read the content from that URL. THIS 
+   *    MUST BE A FULL URL, not a relative path.
+   *  - A string of data: If this is given, then the subsystem will encode the string.
+   *  - A stream or file handle: If this is given, the stream's contents will be encoded
+   *    and inserted as data.
+   *  (Note that we make the assumption here that you would never want to set data to be
+   *  a URL. If this is an incorrect assumption, file a bug.)
+   * @param string $mime
+   *  The MIME type of the document.
+   * @param resource $context
+   *  A valid context. Use this only if you need to pass a stream context. This is only necessary
+   *  if $data is a URL. (See {@link stream_context_create()}).
+   * @return 
+   *  An encoded data URL.
+   */
+  public static function encodeDataURL($data, $mime = 'application/octet-stream', $context = NULL) {
+    if (is_resource($data)) {
+      $data = stream_get_contents($data);
+    }
+    elseif (filter_var($data, FILTER_VALIDATE_URL)) {
+      $data = file_get_contents($data, FALSE, $context);
+    }
+    
+    $encoded = base64_encode($data);
+    
+    return 'data:' . $mime . ';base64,' . $encoded;
+  }
+  
+  /**
+   * Get the effective options for the current QueryPath object.
+   *
+   * This returns an associative array of all of the options as set
+   * for the current QueryPath object. This includes default options,
+   * options directly passed in via {@link qp()} or the constructor,
+   * an options set in the {@link QueryPathOptions} object.
+   *
+   * The order of merging options is this:
+   *  - Options passed in using {@link qp()} are highest priority, and will
+   *    override other options.
+   *  - Options set with {@link QueryPathOptions} will override default options,
+   *    but can be overridden by options passed into {@link qp()}.
+   *  - Default options will be used when no overrides are present.
+   *
+   * This function will return the options currently used, with the above option
+   * overriding having been calculated already.
+   *
+   * @return array
+   *  An associative array of options, calculated from defaults and overridden 
+   *  options. 
+   * @see qp()
+   * @see QueryPathOptions::set()
+   * @see QueryPathOptions::merge()
+   * @since 2.0
+   */
+  public function getOptions() {
+    return $this->options;
+  }
+  
+  /**
+   * Select the root element of the document.
+   *
+   * This sets the current match to the document's root element. For 
+   * practical purposes, this is the same as:
+   * @code
+   * qp($someDoc)->find(':root');
+   * @endcode
+   * However, since it doesn't invoke a parser, it has less overhead. It also 
+   * works in cases where the QueryPath has been reduced to zero elements (a
+   * case that is not handled by find(':root') because there is no element
+   * whose root can be found).
+   *
+   * @param string $selector
+   *  A selector. If this is supplied, QueryPath will navigate to the 
+   *  document root and then run the query. (Added in QueryPath 2.0 Beta 2) 
+   * @return QueryPath
+   *  The QueryPath object, wrapping the root element (document element)
+   *  for the current document.
+   */
+  public function top($selector = NULL) {
+    $this->setMatches($this->document->documentElement);
+    // print '=====================' . PHP_EOL;
+    // var_dump($this->document);
+    // print '=====================' . PHP_EOL;
+    return !empty($selector) ? $this->find($selector) : $this;
+  }
+  
+  /**
+   * Given a CSS Selector, find matching items.
+   *
+   * @param string $selector
+   *   CSS 3 Selector
+   * @return QueryPath
+   * @see filter()
+   * @see is()
+   * @todo If a find() returns zero matches, then a subsequent find() will
+   *  also return zero matches, even if that find has a selector like :root.
+   *  The reason for this is that the {@link QueryPathCssEventHandler} does
+   *  not set the root of the document tree if it cannot find any elements
+   *  from which to determine what the root is. The workaround is to use 
+   *  {@link top()} to select the root element again.
+   */
+  public function find($selector) {
+    
+    // Optimize for ID/Class searches. These two take a long time
+    // when a rdp is used. Using an XPath pushes work to C code.
+    $ids = array();
+    
+    $regex = '/^#([\w-]+)$|^\.([\w-]+)$/'; // $1 is ID, $2 is class.
+    //$regex = '/^#([\w-]+)$/';
+    if (preg_match($regex, $selector, $ids) === 1) {
+      // If $1 is a match, we have an ID.
+      if (!empty($ids[1])) {
+        $xpath = new DOMXPath($this->document);
+        foreach ($this->matches as $item) {
+          
+          // For whatever reasons, the .// does not work correctly
+          // if the selected element is the root element. So we have
+          // an awful hack.
+          if ($item->isSameNode($this->document->documentElement) ) {
+            $xpathQuery = "//*[@id='{$ids[1]}']";
+          }
+          // This is the correct XPath query.
+          else {
+            $xpathQuery = ".//*[@id='{$ids[1]}']";
+          }
+          //$nl = $xpath->query("//*[@id='{$ids[1]}']", $item);
+          //$nl = $xpath->query(".//*[@id='{$ids[1]}']", $item);
+          $nl = $xpath->query($xpathQuery, $item);
+          if ($nl->length > 0) {
+            $this->setMatches($nl->item(0));
+            break;
+          }
+          else {
+            // If no match is found, we set an empty.
+            $this->noMatches();
+          }
+        }
+      }
+      // Quick search for class values. While the XPath can't do it
+      // all, it is faster than doing a recusive node search.
+      else {
+        $xpath = new DOMXPath($this->document);
+        $found = new SplObjectStorage();
+        foreach ($this->matches as $item) {
+          // See comments on this in the #id code above.
+          if ($item->isSameNode($this->document->documentElement) ) {
+            $xpathQuery = "//*[@class]";
+          }
+          // This is the correct XPath query.
+          else {
+            $xpathQuery = ".//*[@class]";
+          }
+          $nl = $xpath->query($xpathQuery, $item);
+          for ($i = 0; $i < $nl->length; ++$i) {
+            $vals = explode(' ', $nl->item($i)->getAttribute('class'));
+            if (in_array($ids[2], $vals)) $found->attach($nl->item($i));
+          }
+        }
+        $this->setMatches($found);
+      }
+      
+      return $this;
+    }
+    
+    
+    $query = new QueryPathCssEventHandler($this->matches);
+    $query->find($selector);
+    //$this->matches = $query->getMatches();
+    $this->setMatches($query->getMatches());
+    return $this;
+  }
+  
+  /**
+   * Execute an XPath query and store the results in the QueryPath.
+   *
+   * Most methods in this class support CSS 3 Selectors. Sometimes, though,
+   * XPath provides a finer-grained query language. Use this to execute
+   * XPath queries.
+   *
+   * Beware, though. QueryPath works best on DOM Elements, but an XPath 
+   * query can return other nodes, strings, and values. These may not work with
+   * other QueryPath functions (though you will be able to access the
+   * values with {@link get()}).
+   *
+   * @param string $query
+   *  An XPath query.
+   * @param array $options
+   *  Currently supported options are:
+   *   - 'namespace_prefix': And XML namespace prefix to be used as the default. Used 
+   *      in conjunction with 'namespace_uri'
+   *   - 'namespace_uri': The URI to be used as the default namespace URI. Used 
+   *      with 'namespace_prefix'
+   * @return QueryPath 
+   *  A QueryPath object wrapping the results of the query.
+   * @see find()
+   * @author M Butcher
+   * @author Xavier Prud'homme
+   */
+  public function xpath($query, $options = array()) {
+    $xpath = new DOMXPath($this->document);
+    
+    // Register a default namespace.
+    if (!empty($options['namespace_prefix']) && !empty($options['namespace_uri'])) {
+      $xpath->registerNamespace($options['namespace_prefix'], $options['namespace_uri']);
+    }
+    
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $item) {
+      $nl = $xpath->query($query, $item);
+      if ($nl->length > 0) {
+        for ($i = 0; $i < $nl->length; ++$i) $found->attach($nl->item($i));
+      }
+    }
+    $this->setMatches($found);
+    return $this;
+  }
+  
+  /**
+   * Get the number of elements currently wrapped by this object.
+   *
+   * Note that there is no length property on this object.
+   *
+   * @return int
+   *  Number of items in the object.
+   * @deprecated QueryPath now implements Countable, so use count().
+   */
+  public function size() {
+    return $this->matches->count();
+  }
+  
+  /**
+   * Get the number of elements currently wrapped by this object.
+   *
+   * Since QueryPath is Countable, the PHP count() function can also
+   * be used on a QueryPath.
+   *
+   * @code
+   * <?php
+   *  count(qp($xml, 'div'));
+   * ?>
+   * @endcode
+   *
+   * @return int
+   *  The number of matches in the QueryPath.
+   */
+  public function count() {
+    return $this->matches->count();
+  }
+  
+  /**
+   * Get one or all elements from this object.
+   *
+   * When called with no paramaters, this returns all objects wrapped by 
+   * the QueryPath. Typically, these are DOMElement objects (unless you have
+   * used {@link map()}, {@link xpath()}, or other methods that can select
+   * non-elements).
+   *
+   * When called with an index, it will return the item in the QueryPath with 
+   * that index number.
+   *
+   * Calling this method does not change the QueryPath (e.g. it is 
+   * non-destructive).
+   *
+   * You can use qp()->get() to iterate over all elements matched. You can
+   * also iterate over qp() itself (QueryPath implementations must be Traversable). 
+   * In the later case, though, each item 
+   * will be wrapped in a QueryPath object. To learn more about iterating
+   * in QueryPath, see {@link examples/techniques.php}.
+   *
+   * @param int $index
+   *   If specified, then only this index value will be returned. If this 
+   *   index is out of bounds, a NULL will be returned.
+   * @param boolean $asObject
+   *   If this is TRUE, an {@link SplObjectStorage} object will be returned 
+   *   instead of an array. This is the preferred method for extensions to use.
+   * @return mixed
+   *   If an index is passed, one element will be returned. If no index is
+   *   present, an array of all matches will be returned.
+   * @see eq()
+   * @see SplObjectStorage
+   */
+  public function get($index = NULL, $asObject = FALSE) {
+    if (isset($index)) {
+      return ($this->size() > $index) ? $this->getNthMatch($index) : NULL;
+    }
+    // Retain support for legacy.
+    if (!$asObject) {
+      $matches = array();
+      foreach ($this->matches as $m) $matches[] = $m;
+      return $matches;
+    }
+    return $this->matches;
+  }
+  
+  /**
+   * Get the DOMDocument that we currently work with.
+   *
+   * This returns the current DOMDocument. Any changes made to this document will be
+   * accessible to QueryPath, as both will share access to the same object.
+   * 
+   * @return DOMDocument
+   */
+  public function document() {
+    return $this->document;
+  }
+  
+  /**
+   * On an XML document, load all XIncludes.
+   *
+   * @return QueryPath
+   */
+  public function xinclude() {
+    $this->document->xinclude();
+    return $this;
+  }
+  
+  /**
+   * Get all current elements wrapped in an array.
+   * Compatibility function for jQuery 1.4, but identical to calling {@link get()}
+   * with no parameters.
+   *
+   * @return array
+   *  An array of DOMNodes (typically DOMElements).
+   */
+  public function toArray() {
+    return $this->get();
+  }
+  /**
+   * Get/set an attribute.
+   * - If no parameters are specified, this returns an associative array of all 
+   *   name/value pairs.
+   * - If both $name and $value are set, then this will set the attribute name/value
+   *   pair for all items in this object. 
+   * - If $name is set, and is an array, then
+   *   all attributes in the array will be set for all items in this object.
+   * - If $name is a string and is set, then the attribute value will be returned.
+   *
+   * When an attribute value is retrieved, only the attribute value of the FIRST
+   * match is returned.
+   *
+   * @param mixed $name
+   *   The name of the attribute or an associative array of name/value pairs.
+   * @param string $value
+   *   A value (used only when setting an individual property).
+   * @return mixed
+   *   If this was a setter request, return the QueryPath object. If this was
+   *   an access request (getter), return the string value.
+   * @see removeAttr()
+   * @see tag()
+   * @see hasAttr()
+   * @see hasClass()
+   */
+  public function attr($name = NULL, $value = NULL) {
+    
+    // Default case: Return all attributes as an assoc array.
+    if (is_null($name)) {
+      if ($this->matches->count() == 0) return NULL;
+      $ele = $this->getFirstMatch();
+      $buffer = array();
+      
+      // This does not appear to be part of the DOM
+      // spec. Nor is it documented. But it works.
+      foreach ($ele->attributes as $name => $attrNode) {
+        $buffer[$name] = $attrNode->value;
+      }
+      return $buffer;
+    }
+    
+    // multi-setter
+    if (is_array($name)) {
+      foreach ($name as $k => $v) {
+        foreach ($this->matches as $m) $m->setAttribute($k, $v);
+      }
+      return $this;
+    }
+    // setter
+    if (isset($value)) {
+      foreach ($this->matches as $m) $m->setAttribute($name, $value);
+      return $this;
+    }
+    
+    //getter
+    if ($this->matches->count() == 0) return NULL;
+    
+    // Special node type handler:
+    if ($name == 'nodeType') {
+      return $this->getFirstMatch()->nodeType;
+    }
+    
+    // Always return first match's attr.
+    return $this->getFirstMatch()->getAttribute($name);
+  }
+  /**
+   * Check to see if the given attribute is present.
+   *
+   * This returns TRUE if <em>all</em> selected items have the attribute, or 
+   * FALSE if at least one item does not have the attribute.
+   *
+   * @param string $attrName
+   *  The attribute name.
+   * @return boolean
+   *  TRUE if all matches have the attribute, FALSE otherwise.
+   * @since 2.0
+   * @see attr()
+   * @see hasClass()
+   */
+  public function hasAttr($attrName) {
+    foreach ($this->matches as $match) {
+      if (!$match->hasAttribute($attrName)) return FALSE;
+    }
+    return TRUE;
+  }
+  
+  /**
+   * Set/get a CSS value for the current element(s).
+   * This sets the CSS value for each element in the QueryPath object.
+   * It does this by setting (or getting) the style attribute (without a namespace).
+   *
+   * For example, consider this code:
+   * @code
+   * <?php
+   * qp(HTML_STUB, 'body')->css('background-color','red')->html();
+   * ?>
+   * @endcode
+   * This will return the following HTML:
+   * @code
+   * <body style="background-color: red"/>
+   * @endcode
+   *
+   * If no parameters are passed into this function, then the current style
+   * element will be returned unparsed. Example:
+   * @code
+   * <?php
+   * qp(HTML_STUB, 'body')->css('background-color','red')->css();
+   * ?>
+   * @endcode
+   * This will return the following:
+   * @code
+   * background-color: red
+   * @endcode
+   *
+   * As of QueryPath 2.1, existing style attributes will be merged with new attributes.
+   * (In previous versions of QueryPath, a call to css() overwrite the existing style
+   * values).
+   *
+   * @param mixed $name
+   *  If this is a string, it will be used as a CSS name. If it is an array,
+   *  this will assume it is an array of name/value pairs of CSS rules. It will
+   *  apply all rules to all elements in the set.
+   * @param string $value
+   *  The value to set. This is only set if $name is a string.
+   * @return QueryPath
+   */
+  public function css($name = NULL, $value = '') {
+    if (empty($name)) {
+      return $this->attr('style');
+    }
+    
+    // Get any existing CSS.
+    $css = array();
+    foreach ($this->matches as $match) {
+      $style = $match->getAttribute('style');
+      if (!empty($style)) {
+        // XXX: Is this sufficient?
+        $style_array = explode(';', $style);
+        foreach ($style_array as $item) {
+          $item = trim($item);
+          
+          // Skip empty attributes.
+          if (strlen($item) == 0) continue;
+          
+          list($css_att, $css_val) = explode(':',$item, 2);
+          $css[$css_att] = trim($css_val);
+        }
+      }
+    }
+    
+    if (is_array($name)) {
+      // Use array_merge instead of + to preserve order.
+      $css = array_merge($css, $name);
+    }
+    else {
+      $css[$name] = $value;
+    }
+    
+    // Collapse CSS into a string.
+    $format = '%s: %s;';
+    $css_string = '';
+    foreach ($css as $n => $v) {
+      $css_string .= sprintf($format, $n, trim($v));
+    }
+    
+    $this->attr('style', $css_string);
+    return $this;
+  }
+  
+  /**
+   * Insert or retrieve a Data URL.
+   *
+   * When called with just $attr, it will fetch the result, attempt to decode it, and
+   * return an array with the MIME type and the application data.
+   *
+   * When called with both $attr and $data, it will inject the data into all selected elements
+   * So @code$qp->dataURL('src', file_get_contents('my.png'), 'image/png')@endcode will inject 
+   * the given PNG image into the selected elements.
+   *
+   * The current implementation only knows how to encode and decode Base 64 data.
+   *
+   * Note that this is known *not* to work on IE 6, but should render fine in other browsers.
+   *
+   * @param string $attr
+   *  The name of the attribute.
+   * @param mixed $data
+   *  The contents to inject as the data. The value can be any one of the following:
+   *  - A URL: If this is given, then the subsystem will read the content from that URL. THIS 
+   *    MUST BE A FULL URL, not a relative path.
+   *  - A string of data: If this is given, then the subsystem will encode the string.
+   *  - A stream or file handle: If this is given, the stream's contents will be encoded
+   *    and inserted as data.
+   *  (Note that we make the assumption here that you would never want to set data to be
+   *  a URL. If this is an incorrect assumption, file a bug.)
+   * @param string $mime
+   *  The MIME type of the document.
+   * @param resource $context
+   *  A valid context. Use this only if you need to pass a stream context. This is only necessary
+   *  if $data is a URL. (See {@link stream_context_create()}).
+   * @return
+   *  If this is called as a setter, this will return a QueryPath object. Otherwise, it
+   *  will attempt to fetch data out of the attribute and return that.
+   * @see http://en.wikipedia.org/wiki/Data:_URL
+   * @see attr()
+   * @since 2.1
+   */
+  public function dataURL($attr, $data = NULL, $mime = 'application/octet-stream', $context = NULL) {
+    if (is_null($data)) {
+      // Attempt to fetch the data
+      $data = $this->attr($attr);
+      if (empty($data) || is_array($data) || strpos($data, 'data:') !== 0) {
+        return;
+      }
+      
+      // So 1 and 2 should be MIME types, and 3 should be the base64-encoded data.
+      $regex = '/^data:([a-zA-Z0-9]+)\/([a-zA-Z0-9]+);base64,(.*)$/';
+      $matches = array();
+      preg_match($regex, $data, $matches);
+      
+      if (!empty($matches)) {
+        $result = array(
+          'mime' => $matches[1] . '/' . $matches[2],
+          'data' => base64_decode($matches[3]),
+        );
+        return $result;
+      }
+    }
+    else {
+      
+      $attVal = self::encodeDataURL($data, $mime, $context);
+      
+      return $this->attr($attr, $attVal);
+      
+    }
+  }
+  
+
+  
+  /**
+   * Remove the named attribute from all elements in the current QueryPath.
+   *
+   * This will remove any attribute with the given name. It will do this on each
+   * item currently wrapped by QueryPath.
+   *
+   * As is the case in jQuery, this operation is not considered destructive.
+   *
+   * @param string $name
+   *  Name of the parameter to remove.
+   * @return QueryPath
+   *  The QueryPath object with the same elements.
+   * @see attr()
+   */
+  public function removeAttr($name) {
+    foreach ($this->matches as $m) {
+      //if ($m->hasAttribute($name))
+        $m->removeAttribute($name);
+    }
+    return $this;
+  }
+  /**
+   * Reduce the matched set to just one.
+   *
+   * This will take a matched set and reduce it to just one item -- the item 
+   * at the index specified. This is a destructive operation, and can be undone
+   * with {@link end()}.
+   *
+   * @param $index
+   *  The index of the element to keep. The rest will be 
+   *  discarded.
+   * @return QueryPath
+   * @see get()
+   * @see is()
+   * @see end()
+   */
+  public function eq($index) {
+    // XXX: Might there be a more efficient way of doing this?
+    $this->setMatches($this->getNthMatch($index));
+    return $this;
+  }
+  /**
+   * Given a selector, this checks to see if the current set has one or more matches.
+   *
+   * Unlike jQuery's version, this supports full selectors (not just simple ones).
+   *
+   * @param string $selector
+   *   The selector to search for. As of QueryPath 2.1.1, this also supports passing a
+   *   DOMNode object.
+   * @return boolean
+   *   TRUE if one or more elements match. FALSE if no match is found.
+   * @see get()
+   * @see eq()
+   */
+  public function is($selector) {
+    
+    if (is_object($selector)) {
+      if ($selector instanceof DOMNode) {
+        return count($this->matches) == 1 && $selector->isSameNode($this->get(0));
+      }
+      elseif ($selector instanceof Traversable) {
+        if (count($selector) != count($this->matches)) {
+          return FALSE;
+        }
+        // Without $seen, there is an edge case here if $selector contains the same object
+        // more than once, but the counts are equal. For example, [a, a, a, a] will
+        // pass an is() on [a, b, c, d]. We use the $seen SPLOS to prevent this.
+        $seen = new SplObjectStorage();
+        foreach ($selector as $item) {
+          if (!$this->matches->contains($item) || $seen->contains($item)) {
+            return FALSE;
+          }
+          $seen->attach($item);
+        }
+        return TRUE;
+      }
+      throw new Exception('Cannot compare an object to a QueryPath.');
+      return FALSE;
+    }
+    
+    foreach ($this->matches as $m) {
+      $q = new QueryPathCssEventHandler($m);
+      if ($q->find($selector)->getMatches()->count()) {
+        return TRUE;
+      }
+    }
+    return FALSE;
+  }
+  /**
+   * Filter a list down to only elements that match the selector.
+   * Use this, for example, to find all elements with a class, or with 
+   * certain children.
+   *
+   * @param string $selector
+   *   The selector to use as a filter.
+   * @return QueryPath
+   *   The QueryPath with non-matching items filtered out.
+   * @see filterLambda()
+   * @see filterCallback()
+   * @see map()
+   * @see find()
+   * @see is()
+   */
+  public function filter($selector) {
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $m) if (qp($m, NULL, $this->options)->is($selector)) $found->attach($m);
+    $this->setMatches($found);
+    return $this;
+  }
+  /**
+   * Filter based on a lambda function.
+   *
+   * The function string will be executed as if it were the body of a 
+   * function. It is passed two arguments:
+   * - $index: The index of the item.
+   * - $item: The current Element.
+   * If the function returns boolean FALSE, the item will be removed from
+   * the list of elements. Otherwise it will be kept.
+   *
+   * Example:
+   * @code
+   * qp('li')->filterLambda('qp($item)->attr("id") == "test"');
+   * @endcode
+   *
+   * The above would filter down the list to only an item whose ID is
+   * 'text'.
+   *
+   * @param string $fn
+   *  Inline lambda function in a string.
+   * @return QueryPath
+   * @see filter()
+   * @see map()
+   * @see mapLambda()
+   * @see filterCallback()
+   */
+  public function filterLambda($fn) {
+    $function = create_function('$index, $item', $fn);
+    $found = new SplObjectStorage();
+    $i = 0;
+    foreach ($this->matches as $item)
+      if ($function($i++, $item) !== FALSE) $found->attach($item);
+    
+    $this->setMatches($found);
+    return $this;
+  }
+  
+  /**
+   * Use regular expressions to filter based on the text content of matched elements.
+   *
+   * Only items that match the given regular expression will be kept. All others will
+   * be removed.
+   *
+   * The regular expression is run against the <i>text content</i> (the PCDATA) of the 
+   * elements. This is a way of filtering elements based on their content. 
+   *
+   * Example:
+   * @code
+   *  <?xml version="1.0"?>
+   *  <div>Hello <i>World</i></div>
+   * @endcode
+   *
+   * @code
+   *  <?php
+   *    // This will be 1.
+   *    qp($xml, 'div')->filterPreg('/World/')->size();
+   *  ?>
+   * @endcode
+   *
+   * The return value above will be 1 because the text content of @codeqp($xml, 'div')@endcode is
+   * @codeHello World@endcode.
+   *
+   * Compare this to the behavior of the <em>:contains()</em> CSS3 pseudo-class.
+   * 
+   * @param string $regex
+   *  A regular expression.
+   * @return QueryPath
+   * @see filter()
+   * @see filterCallback()
+   * @see preg_match()
+   */
+  public function filterPreg($regex) {
+    
+    $found = new SplObjectStorage();
+    
+    foreach ($this->matches as $item) {
+      if (preg_match($regex, $item->textContent) > 0) {
+        $found->attach($item);
+      }
+    }
+    $this->setMatches($found);
+    
+    return $this;
+  }
+  /**
+   * Filter based on a callback function.
+   *
+   * A callback may be any of the following:
+   *  - a function: 'my_func'.
+   *  - an object/method combo: $obj, 'myMethod'
+   *  - a class/method combo: 'MyClass', 'myMethod'
+   * Note that classes are passed in strings. Objects are not.
+   *
+   * Each callback is passed to arguments:
+   *  - $index: The index position of the object in the array.
+   *  - $item: The item to be operated upon.
+   *
+   * If the callback function returns FALSE, the item will be removed from the 
+   * set of matches. Otherwise the item will be considered a match and left alone.
+   *
+   * @param callback $callback.
+   *   A callback either as a string (function) or an array (object, method OR 
+   *   classname, method).
+   * @return QueryPath
+   *   Query path object augmented according to the function.
+   * @see filter()
+   * @see filterLambda()
+   * @see map()
+   * @see is()
+   * @see find()
+   */
+  public function filterCallback($callback) {
+    $found = new SplObjectStorage();
+    $i = 0;
+    if (is_callable($callback)) {
+      foreach($this->matches as $item) 
+        if (call_user_func($callback, $i++, $item) !== FALSE) $found->attach($item);
+    }
+    else {
+      throw new QueryPathException('The specified callback is not callable.');
+    }
+    $this->setMatches($found);
+    return $this;
+  }
+  /**
+   * Filter a list to contain only items that do NOT match.
+   *
+   * @param string $selector
+   *  A selector to use as a negation filter. If the filter is matched, the 
+   *  element will be removed from the list.
+   * @return QueryPath
+   *  The QueryPath object with matching items filtered out.
+   * @see find()
+   */
+  public function not($selector) {
+    $found = new SplObjectStorage();
+    if ($selector instanceof DOMElement) {
+      foreach ($this->matches as $m) if ($m !== $selector) $found->attach($m); 
+    }
+    elseif (is_array($selector)) {
+      foreach ($this->matches as $m) {
+        if (!in_array($m, $selector, TRUE)) $found->attach($m);
+      }
+    }
+    elseif ($selector instanceof SplObjectStorage) {
+      foreach ($this->matches as $m) if ($selector->contains($m)) $found->attach($m); 
+    }
+    else {
+      foreach ($this->matches as $m) if (!qp($m, NULL, $this->options)->is($selector)) $found->attach($m);
+    }
+    $this->setMatches($found);
+    return $this;
+  }
+  /**
+   * Get an item's index.
+   *
+   * Given a DOMElement, get the index from the matches. This is the 
+   * converse of {@link get()}.
+   *
+   * @param DOMElement $subject
+   *  The item to match.
+   * 
+   * @return mixed
+   *  The index as an integer (if found), or boolean FALSE. Since 0 is a 
+   *  valid index, you should use strong equality (===) to test..
+   * @see get()
+   * @see is()
+   */
+  public function index($subject) {
+    
+    $i = 0;
+    foreach ($this->matches as $m) {
+      if ($m === $subject) {
+        return $i;
+      }
+      ++$i;
+    }
+    return FALSE;
+  }
+  /**
+   * Run a function on each item in a set.
+   *
+   * The mapping callback can return anything. Whatever it returns will be
+   * stored as a match in the set, though. This means that afer a map call, 
+   * there is no guarantee that the elements in the set will behave correctly
+   * with other QueryPath functions.
+   *
+   * Callback rules:
+   * - If the callback returns NULL, the item will be removed from the array.
+   * - If the callback returns an array, the entire array will be stored in 
+   *   the results.
+   * - If the callback returns anything else, it will be appended to the array 
+   *   of matches.
+   *
+   * @param callback $callback
+   *  The function or callback to use. The callback will be passed two params:
+   *  - $index: The index position in the list of items wrapped by this object.
+   *  - $item: The current item.
+   *
+   * @return QueryPath
+   *  The QueryPath object wrapping a list of whatever values were returned
+   *  by each run of the callback.
+   *
+   * @see QueryPath::get()
+   * @see filter()
+   * @see find()
+   */
+  public function map($callback) {
+    $found = new SplObjectStorage();
+    
+    if (is_callable($callback)) {
+      $i = 0;
+      foreach ($this->matches as $item) {
+        $c = call_user_func($callback, $i, $item);
+        if (isset($c)) {
+          if (is_array($c) || $c instanceof Iterable) {
+            foreach ($c as $retval) {
+              if (!is_object($retval)) {
+                $tmp = new stdClass();
+                $tmp->textContent = $retval;
+                $retval = $tmp;
+              }
+              $found->attach($retval);
+            }
+          }
+          else {
+            if (!is_object($c)) {
+              $tmp = new stdClass();
+              $tmp->textContent = $c;
+              $c = $tmp;
+            }
+            $found->attach($c);
+          }
+        }
+        ++$i;
+      }
+    }
+    else {
+      throw new QueryPathException('Callback is not callable.');
+    }
+    $this->setMatches($found, FALSE);
+    return $this;
+  }
+  /**
+   * Narrow the items in this object down to only a slice of the starting items.
+   *
+   * @param integer $start
+   *  Where in the list of matches to begin the slice.
+   * @param integer $length
+   *  The number of items to include in the slice. If nothing is specified, the 
+   *  all remaining matches (from $start onward) will be included in the sliced
+   *  list.
+   * @return QueryPath
+   * @see array_slice()
+   */
+  public function slice($start, $length = 0) {
+    $end = $length;
+    $found = new SplObjectStorage();
+    if ($start >= $this->size()) {
+      $this->setMatches($found);
+      return $this;
+    }
+    
+    $i = $j = 0;
+    foreach ($this->matches as $m) {
+      if ($i >= $start) {
+        if ($end > 0 && $j >= $end) {
+          break;
+        }
+        $found->attach($m);
+        ++$j;
+      }
+      ++$i;
+    }
+    
+    $this->setMatches($found);
+    return $this;
+  }
+  /**
+   * Run a callback on each item in the list of items.
+   *
+   * Rules of the callback:
+   * - A callback is passed two variables: $index and $item. (There is no 
+   *   special treatment of $this, as there is in jQuery.)
+   *   - You will want to pass $item by reference if it is not an
+   *     object (DOMNodes are all objects).
+   * - A callback that returns FALSE will stop execution of the each() loop. This
+   *   works like break in a standard loop.
+   * - A TRUE return value from the callback is analogous to a continue statement.
+   * - All other return values are ignored.
+   *
+   * @param callback $callback
+   *  The callback to run.
+   * @return QueryPath
+   *  The QueryPath.
+   * @see eachLambda()
+   * @see filter()
+   * @see map()
+   */
+  public function each($callback) {
+    if (is_callable($callback)) {
+      $i = 0;
+      foreach ($this->matches as $item) {
+        if (call_user_func($callback, $i, $item) === FALSE) return $this;
+        ++$i;
+      }
+    }
+    else {
+      throw new QueryPathException('Callback is not callable.');
+    }
+    return $this;
+  }
+  /**
+   * An each() iterator that takes a lambda function.
+   * 
+   * @param string $lambda
+   *  The lambda function. This will be passed ($index, &$item).
+   * @return QueryPath
+   *  The QueryPath object.
+   * @see each()
+   * @see filterLambda()
+   * @see filterCallback()
+   * @see map()
+   */
+  public function eachLambda($lambda) {
+    $index = 0;
+    foreach ($this->matches as $item) {
+      $fn = create_function('$index, &$item', $lambda);
+      if ($fn($index, $item) === FALSE) return $this;
+      ++$index;
+    }
+    return $this;
+  }
+  /**
+   * Insert the given markup as the last child.
+   *
+   * The markup will be inserted into each match in the set.
+   *
+   * The same element cannot be inserted multiple times into a document. DOM
+   * documents do not allow a single object to be inserted multiple times 
+   * into the DOM. To insert the same XML repeatedly, we must first clone
+   * the object. This has one practical implication: Once you have inserted
+   * an element into the object, you cannot further manipulate the original 
+   * element and expect the changes to be replciated in the appended object.
+   * (They are not the same -- there is no shared reference.) Instead, you
+   * will need to retrieve the appended object and operate on that.
+   *
+   * @param mixed $data
+   *  This can be either a string (the usual case), or a DOM Element.
+   * @return QueryPath
+   *  The QueryPath object.
+   * @see appendTo()
+   * @see prepend()
+   * @throws QueryPathException
+   *  Thrown if $data is an unsupported object type.
+   */
+  public function append($data) {
+    $data = $this->prepareInsert($data);
+    if (isset($data)) {
+      if (empty($this->document->documentElement) && $this->matches->count() == 0) {
+        // Then we assume we are writing to the doc root
+        $this->document->appendChild($data);
+        $found = new SplObjectStorage();
+        $found->attach($this->document->documentElement);
+        $this->setMatches($found);
+      }
+      else {
+        // You can only append in item once. So in cases where we
+        // need to append multiple times, we have to clone the node.
+        foreach ($this->matches as $m) { 
+          // DOMDocumentFragments are even more troublesome, as they don't
+          // always clone correctly. So we have to clone their children.
+          if ($data instanceof DOMDocumentFragment) {
+            foreach ($data->childNodes as $n)
+              $m->appendChild($n->cloneNode(TRUE));
+          }
+          else {
+            // Otherwise a standard clone will do.
+            $m->appendChild($data->cloneNode(TRUE));
+          }
+          
+        }
+      }
+        
+    }
+    return $this;
+  }
+  /**
+   * Append the current elements to the destination passed into the function.
+   *
+   * This cycles through all of the current matches and appends them to 
+   * the context given in $destination. If a selector is provided then the 
+   * $destination is queried (using that selector) prior to the data being
+   * appended. The data is then appended to the found items.
+   *
+   * @param QueryPath $dest
+   *  A QueryPath object that will be appended to.
+   * @return QueryPath
+   *  The original QueryPath, unaltered. Only the destination QueryPath will
+   *  be modified.
+   * @see append()
+   * @see prependTo()
+   * @throws QueryPathException
+   *  Thrown if $data is an unsupported object type.
+   */
+  public function appendTo(QueryPath $dest) {
+    foreach ($this->matches as $m) $dest->append($m);
+    return $this;
+  }
+  /**
+   * Insert the given markup as the first child.
+   *
+   * The markup will be inserted into each match in the set.
+   *
+   * @param mixed $data
+   *  This can be either a string (the usual case), or a DOM Element.
+   * @return QueryPath
+   * @see append()
+   * @see before()
+   * @see after()
+   * @see prependTo()
+   * @throws QueryPathException
+   *  Thrown if $data is an unsupported object type.
+   */
+  public function prepend($data) {
+    $data = $this->prepareInsert($data);
+    if (isset($data)) {
+      foreach ($this->matches as $m) {
+        $ins = $data->cloneNode(TRUE);
+        if ($m->hasChildNodes())
+          $m->insertBefore($ins, $m->childNodes->item(0));
+        else
+          $m->appendChild($ins);
+      }
+    }
+    return $this;
+  }
+  /**
+   * Take all nodes in the current object and prepend them to the children nodes of
+   * each matched node in the passed-in QueryPath object.
+   *
+   * This will iterate through each item in the current QueryPath object and 
+   * add each item to the beginning of the children of each element in the 
+   * passed-in QueryPath object.
+   *
+   * @see insertBefore()
+   * @see insertAfter()
+   * @see prepend()
+   * @see appendTo()
+   * @param QueryPath $dest
+   *  The destination QueryPath object.
+   * @return QueryPath
+   *  The original QueryPath, unmodified. NOT the destination QueryPath.
+   * @throws QueryPathException
+   *  Thrown if $data is an unsupported object type.
+   */
+  public function prependTo(QueryPath $dest) {
+    foreach ($this->matches as $m) $dest->prepend($m);
+    return $this;
+  }
+
+  /**
+   * Insert the given data before each element in the current set of matches.
+   *
+   * This will take the give data (XML or HTML) and put it before each of the items that 
+   * the QueryPath object currently contains. Contrast this with after().
+   * 
+   * @param mixed $data
+   *  The data to be inserted. This can be XML in a string, a DomFragment, a DOMElement,
+   *  or the other usual suspects. (See {@link qp()}).
+   * @return QueryPath
+   *  Returns the QueryPath with the new modifications. The list of elements currently
+   *  selected will remain the same.
+   * @see insertBefore()
+   * @see after()
+   * @see append()
+   * @see prepend()
+   * @throws QueryPathException
+   *  Thrown if $data is an unsupported object type.
+   */
+  public function before($data) {
+    $data = $this->prepareInsert($data);
+    foreach ($this->matches as $m) {
+      $ins = $data->cloneNode(TRUE);
+      $m->parentNode->insertBefore($ins, $m);
+    }
+    
+    return $this;
+  }
+  /**
+   * Insert the current elements into the destination document.
+   * The items are inserted before each element in the given QueryPath document.
+   * That is, they will be siblings with the current elements.
+   *
+   * @param QueryPath $dest
+   *  Destination QueryPath document.
+   * @return QueryPath
+   *  The current QueryPath object, unaltered. Only the destination QueryPath
+   *  object is altered.
+   * @see before()
+   * @see insertAfter()
+   * @see appendTo()
+   * @throws QueryPathException
+   *  Thrown if $data is an unsupported object type.
+   */
+  public function insertBefore(QueryPath $dest) {
+    foreach ($this->matches as $m) $dest->before($m);
+    return $this;
+  }
+  /**
+   * Insert the contents of the current QueryPath after the nodes in the 
+   * destination QueryPath object.
+   *
+   * @param QueryPath $dest
+   *  Destination object where the current elements will be deposited.
+   * @return QueryPath
+   *  The present QueryPath, unaltered. Only the destination object is altered.
+   * @see after()
+   * @see insertBefore()
+   * @see append()
+   * @throws QueryPathException
+   *  Thrown if $data is an unsupported object type.
+   */
+  public function insertAfter(QueryPath $dest) {
+    foreach ($this->matches as $m) $dest->after($m);
+    return $this;
+  }
+  /**
+   * Insert the given data after each element in the current QueryPath object.
+   *
+   * This inserts the element as a peer to the currently matched elements.
+   * Contrast this with {@link append()}, which inserts the data as children
+   * of matched elements.
+   *
+   * @param mixed $data
+   *  The data to be appended.
+   * @return QueryPath
+   *  The QueryPath object (with the items inserted).
+   * @see before()
+   * @see append()
+   * @throws QueryPathException
+   *  Thrown if $data is an unsupported object type.
+   */
+  public function after($data) {
+    $data = $this->prepareInsert($data);
+    foreach ($this->matches as $m) {
+      $ins = $data->cloneNode(TRUE);
+      if (isset($m->nextSibling)) 
+        $m->parentNode->insertBefore($ins, $m->nextSibling);
+      else
+        $m->parentNode->appendChild($ins);
+    }
+    return $this;
+  }
+  /**
+   * Replace the existing element(s) in the list with a new one.
+   *
+   * @param mixed $new
+   *  A DOMElement or XML in a string. This will replace all elements
+   *  currently wrapped in the QueryPath object.
+   * @return QueryPath
+   *  The QueryPath object wrapping <b>the items that were removed</b>.
+   *  This remains consistent with the jQuery API.
+   * @see append()
+   * @see prepend()
+   * @see before()
+   * @see after()
+   * @see remove()
+   * @see replaceAll()
+   */
+  public function replaceWith($new) {
+    $data = $this->prepareInsert($new);
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $m) {
+      $parent = $m->parentNode;
+      $parent->insertBefore($data->cloneNode(TRUE), $m);
+      $found->attach($parent->removeChild($m));
+    }
+    $this->setMatches($found);
+    return $this;
+  }
+  /**
+   * Remove the parent element from the selected node or nodes.
+   *
+   * This takes the given list of nodes and "unwraps" them, moving them out of their parent
+   * node, and then deleting the parent node.
+   *
+   * For example, consider this:
+   *
+   * @code
+   *   <root><wrapper><content/></wrapper></root>
+   * @endcode
+   * 
+   * Now we can run this code:
+   * @code
+   *   qp($xml, 'content')->unwrap();
+   * @endcode
+   *
+   * This will result in:
+   *
+   * @code
+   *   <root><content/></root>
+   * @endcode
+   * This is the opposite of {@link wrap()}.
+   *
+   * <b>The root element cannot be unwrapped.</b> It has no parents.
+   * If you attempt to use unwrap on a root element, this will throw a QueryPathException.
+   * (You can, however, "Unwrap" a child that is a direct descendant of the root element. This
+   * will remove the root element, and replace the child as the root element. Be careful, though.
+   * You cannot set more than one child as a root element.)
+   *
+   * @return QueryPath
+   *  The QueryPath object, with the same element(s) selected.
+   * @throws QueryPathException
+   *  An exception is thrown if one attempts to unwrap a root element.
+   * @see wrap()
+   * @since 2.1
+   * @author mbutcher
+   */
+  public function unwrap() {
+    
+    // We do this in two loops in order to
+    // capture the case where two matches are
+    // under the same parent. Othwerwise we might
+    // remove a match before we can move it.
+    $parents = new SplObjectStorage();
+    foreach ($this->matches as $m) {
+      
+      // Cannot unwrap the root element.
+      if ($m->isSameNode($m->ownerDocument->documentElement)) {
+        throw new QueryPathException('Cannot unwrap the root element.');
+      }
+      
+      // Move children to peer of parent.
+      $parent = $m->parentNode;
+      $old = $parent->removeChild($m);
+      $parent->parentNode->insertBefore($old, $parent);
+      $parents->attach($parent);
+    }
+    
+    // Now that all the children are moved, we 
+    // remove all of the parents.
+    foreach ($parents as $ele) {
+      $ele->parentNode->removeChild($ele);
+    }
+    
+    return $this;
+  }
+  /**
+   * Wrap each element inside of the given markup.
+   *
+   * Markup is usually a string, but it can also be a DOMNode, a document
+   * fragment, a SimpleXMLElement, or another QueryPath object (in which case
+   * the first item in the list will be used.)
+   *
+   * @param mixed $markup 
+   *  Markup that will wrap each element in the current list.
+   * @return QueryPath
+   *  The QueryPath object with the wrapping changes made.
+   * @see wrapAll()
+   * @see wrapInner()
+   */
+  public function wrap($markup) {
+    $data = $this->prepareInsert($markup);
+    
+    // If the markup passed in is empty, we don't do any wrapping.
+    if (empty($data)) {
+      return $this;
+    }
+    
+    foreach ($this->matches as $m) {
+      $copy = $data->firstChild->cloneNode(TRUE);
+      
+      // XXX: Should be able to avoid doing this over and over.
+      if ($copy->hasChildNodes()) {
+        $deepest = $this->deepestNode($copy); 
+        // FIXME: Does this need a different data structure?
+        $bottom = $deepest[0];
+      }
+      else
+        $bottom = $copy;
+
+      $parent = $m->parentNode;
+      $parent->insertBefore($copy, $m);
+      $m = $parent->removeChild($m);
+      $bottom->appendChild($m);
+      //$parent->appendChild($copy);
+    }
+    return $this;  
+  }
+  /**
+   * Wrap all elements inside of the given markup.
+   *
+   * So all elements will be grouped together under this single marked up 
+   * item. This works by first determining the parent element of the first item
+   * in the list. It then moves all of the matching elements under the wrapper
+   * and inserts the wrapper where that first element was found. (This is in 
+   * accordance with the way jQuery works.)
+   *
+   * Markup is usually XML in a string, but it can also be a DOMNode, a document
+   * fragment, a SimpleXMLElement, or another QueryPath object (in which case
+   * the first item in the list will be used.)
+   * 
+   * @param string $markup 
+   *  Markup that will wrap all elements in the current list.
+   * @return QueryPath
+   *  The QueryPath object with the wrapping changes made.
+   * @see wrap()
+   * @see wrapInner()
+   */
+  public function wrapAll($markup) {
+    if ($this->matches->count() == 0) return;
+    
+    $data = $this->prepareInsert($markup);
+    
+    if (empty($data)) {
+      return $this;
+    }
+    
+    if ($data->hasChildNodes()) {
+      $deepest = $this->deepestNode($data); 
+      // FIXME: Does this need fixing?
+      $bottom = $deepest[0];
+    }
+    else
+      $bottom = $data;
+
+    $first = $this->getFirstMatch();
+    $parent = $first->parentNode;
+    $parent->insertBefore($data, $first);
+    foreach ($this->matches as $m) {
+      $bottom->appendChild($m->parentNode->removeChild($m));
+    }
+    return $this;
+  }
+  /**
+   * Wrap the child elements of each item in the list with the given markup.
+   *
+   * Markup is usually a string, but it can also be a DOMNode, a document
+   * fragment, a SimpleXMLElement, or another QueryPath object (in which case
+   * the first item in the list will be used.)
+   *
+   * @param string $markup 
+   *  Markup that will wrap children of each element in the current list.
+   * @return QueryPath
+   *  The QueryPath object with the wrapping changes made.
+   * @see wrap()
+   * @see wrapAll()
+   */
+  public function wrapInner($markup) {
+    $data = $this->prepareInsert($markup);
+    
+    // No data? Short circuit.
+    if (empty($data)) return $this;
+    
+    if ($data->hasChildNodes()) {
+      $deepest = $this->deepestNode($data); 
+      // FIXME: ???
+      $bottom = $deepest[0];
+    }
+    else
+      $bottom = $data;
+      
+    foreach ($this->matches as $m) {
+      if ($m->hasChildNodes()) {
+        while($m->firstChild) {
+          $kid = $m->removeChild($m->firstChild);
+          $bottom->appendChild($kid);
+        }
+      }
+      $m->appendChild($data);
+    }
+    return $this; 
+  }
+  /**
+   * Reduce the set of matches to the deepest child node in the tree.
+   *
+   * This loops through the matches and looks for the deepest child node of all of 
+   * the matches. "Deepest", here, is relative to the nodes in the list. It is 
+   * calculated as the distance from the starting node to the most distant child
+   * node. In other words, it is not necessarily the farthest node from the root
+   * element, but the farthest note from the matched element.
+   *
+   * In the case where there are multiple nodes at the same depth, all of the 
+   * nodes at that depth will be included.
+   *
+   * @return QueryPath
+   *  The QueryPath wrapping the single deepest node.
+   */
+  public function deepest() {
+    $deepest = 0;
+    $winner = new SplObjectStorage();
+    foreach ($this->matches as $m) {
+      $local_deepest = 0;
+      $local_ele = $this->deepestNode($m, 0, NULL, $local_deepest);
+      
+      // Replace with the new deepest.
+      if ($local_deepest > $deepest) {
+        $winner = new SplObjectStorage();
+        foreach ($local_ele as $lele) $winner->attach($lele);
+        $deepest = $local_deepest;
+      }
+      // Augument with other equally deep elements.
+      elseif ($local_deepest == $deepest) {
+        foreach ($local_ele as $lele)
+          $winner->attach($lele);
+      }
+    }
+    $this->setMatches($winner);
+    return $this;
+  }
+  
+  /**
+   * A depth-checking function. Typically, it only needs to be
+   * invoked with the first parameter. The rest are used for recursion.
+   * @see deepest();
+   * @param DOMNode $ele
+   *  The element.
+   * @param int $depth
+   *  The depth guage
+   * @param mixed $current
+   *  The current set.
+   * @param DOMNode $deepest
+   *  A reference to the current deepest node.
+   * @return array
+   *  Returns an array of DOM nodes.
+   */
+  protected function deepestNode(DOMNode $ele, $depth = 0, $current = NULL, &$deepest = NULL) {
+    // FIXME: Should this use SplObjectStorage?
+    if (!isset($current)) $current = array($ele);
+    if (!isset($deepest)) $deepest = $depth;
+    if ($ele->hasChildNodes()) {
+      foreach ($ele->childNodes as $child) {
+        if ($child->nodeType === XML_ELEMENT_NODE) {
+          $current = $this->deepestNode($child, $depth + 1, $current, $deepest);
+        }
+      }
+    }
+    elseif ($depth > $deepest) {
+      $current = array($ele);
+      $deepest = $depth;
+    }
+    elseif ($depth === $deepest) {
+      $current[] = $ele;
+    }
+    return $current;
+  }
+  
+  /**
+   * Prepare an item for insertion into a DOM.
+   *
+   * This handles a variety of boilerplate tasks that need doing before an 
+   * indeterminate object can be inserted into a DOM tree.
+   * - If item is a string, this is converted into a document fragment and returned.
+   * - If item is a QueryPath, then the first item is retrieved and this call function
+   *   is called recursivel.
+   * - If the item is a DOMNode, it is imported into the current DOM if necessary.
+   * - If the item is a SimpleXMLElement, it is converted into a DOM node and then
+   *   imported.
+   *
+   * @param mixed $item
+   *  Item to prepare for insert.
+   * @return mixed
+   *  Returns the prepared item.
+   * @throws QueryPathException
+   *  Thrown if the object passed in is not of a supprted object type.
+   */
+  protected function prepareInsert($item) {
+    if(empty($item)) {
+      return;
+    }
+    elseif (is_string($item)) {
+      // If configured to do so, replace all entities.
+      if ($this->options['replace_entities']) {
+        $item = QueryPathEntities::replaceAllEntities($item);
+      }
+      
+      $frag = $this->document->createDocumentFragment();
+      try {
+        set_error_handler(array('QueryPathParseException', 'initializeFromError'), $this->errTypes);
+        $frag->appendXML($item);
+      }
+      // Simulate a finally block.
+      catch (Exception $e) {
+        restore_error_handler();
+        throw $e;
+      }
+      restore_error_handler();
+      return $frag;
+    }
+    elseif ($item instanceof QueryPath) {
+      if ($item->size() == 0) 
+        return;
+        
+      return $this->prepareInsert($item->get(0));
+    }
+    elseif ($item instanceof DOMNode) {
+      if ($item->ownerDocument !== $this->document) {
+        // Deep clone this and attach it to this document
+        $item = $this->document->importNode($item, TRUE);
+      }
+      return $item;
+    }
+    elseif ($item instanceof SimpleXMLElement) {
+      $element = dom_import_simplexml($item);
+      return $this->document->importNode($element, TRUE);
+    }
+    // What should we do here?
+    //var_dump($item);
+    throw new QueryPathException("Cannot prepare item of unsupported type: " . gettype($item));
+  }
+  /**
+   * The tag name of the first element in the list.
+   *
+   * This returns the tag name of the first element in the list of matches. If
+   * the list is empty, an empty string will be used.
+   *
+   * @see replaceAll()
+   * @see replaceWith()
+   * @return string
+   *  The tag name of the first element in the list.
+   */
+  public function tag() {
+    return ($this->size() > 0) ? $this->getFirstMatch()->tagName : '';
+  }
+  /**
+   * Remove any items from the list if they match the selector.
+   *
+   * In other words, each item that matches the selector will be remove 
+   * from the DOM document. The returned QueryPath wraps the list of 
+   * removed elements.
+   *
+   * If no selector is specified, this will remove all current matches from
+   * the document.
+   *
+   * @param string $selector
+   *  A CSS Selector.
+   * @return QueryPath
+   *  The Query path wrapping a list of removed items.
+   * @see replaceAll()
+   * @see replaceWith()
+   * @see removeChildren()
+   */
+  public function remove($selector = NULL) {
+    if(!empty($selector)) {
+      // Do a non-destructive find.
+      $query = new QueryPathCssEventHandler($this->matches);
+      $query->find($selector);
+      $matches = $query->getMatches();
+    }
+    else {
+      $matches = $this->matches;
+    }
+
+    $found = new SplObjectStorage();
+    foreach ($matches as $item) { 
+      // The item returned is (according to docs) different from 
+      // the one passed in, so we have to re-store it.
+      $found->attach($item->parentNode->removeChild($item));
+    }
+    
+    // Return a clone QueryPath with just the removed items. If
+    // no items are found, this will return an empty QueryPath.
+    return count($found) == 0 ? new QueryPath() : new QueryPath($found);
+  }
+  /**
+   * This replaces everything that matches the selector with the first value
+   * in the current list.
+   *
+   * This is the reverse of replaceWith.
+   *
+   * Unlike jQuery, QueryPath cannot assume a default document. Consequently,
+   * you must specify the intended destination document. If it is omitted, the
+   * present document is assumed to be tthe document. However, that can result
+   * in undefined behavior if the selector and the replacement are not sufficiently
+   * distinct.
+   *
+   * @param string $selector
+   *  The selector.
+   * @param DOMDocument $document
+   *  The destination document.
+   * @return QueryPath
+   *  The QueryPath wrapping the modified document.
+   * @deprecated Due to the fact that this is not a particularly friendly method,
+   *  and that it can be easily replicated using {@see replaceWith()}, it is to be 
+   *  considered deprecated.
+   * @see remove()
+   * @see replaceWith()
+   */
+  public function replaceAll($selector, DOMDocument $document) {
+    $replacement = $this->size() > 0 ? $this->getFirstMatch() : $this->document->createTextNode('');
+    
+    $c = new QueryPathCssEventHandler($document);
+    $c->find($selector);
+    $temp = $c->getMatches();
+    foreach ($temp as $item) {
+      $node = $replacement->cloneNode();
+      $node = $document->importNode($node);
+      $item->parentNode->replaceChild($node, $item);
+    }
+    return qp($document, NULL, $this->options);
+  }
+  /**
+   * Add more elements to the current set of matches.
+   *
+   * This begins the new query at the top of the DOM again. The results found
+   * when running this selector are then merged into the existing results. In
+   * this way, you can add additional elements to the existing set.
+   *
+   * @param string $selector
+   *  A valid selector.
+   * @return QueryPath
+   *  The QueryPath object with the newly added elements.
+   * @see append()
+   * @see after()
+   * @see andSelf()
+   * @see end()
+   */
+  public function add($selector) {
+    
+    // This is destructive, so we need to set $last:
+    $this->last = $this->matches;
+    
+    foreach (qp($this->document, $selector, $this->options)->get() as $item)
+      $this->matches->attach($item);
+    return $this;
+  }
+  /**
+   * Revert to the previous set of matches.
+   *
+   * This will revert back to the last set of matches (before the last 
+   * "destructive" set of operations). This undoes any change made to the set of
+   * matched objects. Functions like find() and filter() change the 
+   * list of matched objects. The end() function will revert back to the last set of
+   * matched items.
+   *
+   * Note that functions that modify the document, but do not change the list of 
+   * matched objects, are not "destructive". Thus, calling append('something')->end()
+   * will not undo the append() call.
+   *
+   * Only one level of changes is stored. Reverting beyond that will result in 
+   * an empty set of matches. Example:
+   *
+   * @code
+   * // The line below returns the same thing as qp(document, 'p');
+   * qp(document, 'p')->find('div')->end();
+   * // This returns an empty array:
+   * qp(document, 'p')->end();
+   * // This returns an empty array:
+   * qp(document, 'p')->find('div')->find('span')->end()->end();
+   * @endcode
+   *
+   * The last one returns an empty array because only one level of changes is stored.
+   *
+   * @return QueryPath
+   *  A QueryPath object reflecting the list of matches prior to the last destructive
+   *  operation.
+   * @see andSelf()
+   * @see add()
+   */
+  public function end() {
+    // Note that this does not use setMatches because it must set the previous
+    // set of matches to empty array.
+    $this->matches = $this->last;
+    $this->last = new SplObjectStorage();
+    return $this;
+  }
+  /**
+   * Combine the current and previous set of matched objects.
+   *
+   * Example:
+   *
+   * @code
+   * qp(document, 'p')->find('div')->andSelf();
+   * @endcode
+   *
+   * The code above will contain a list of all p elements and all div elements that 
+   * are beneath p elements.
+   *
+   * @see end();
+   * @return QueryPath
+   *  A QueryPath object with the results of the last two "destructive" operations.
+   * @see add()
+   * @see end()
+   */
+  public function andSelf() {
+    // This is destructive, so we need to set $last:
+    $last = $this->matches;
+    
+    foreach ($this->last as $item) $this->matches->attach($item);
+    
+    $this->last = $last;
+    return $this;
+  }
+  /**
+   * Remove all child nodes.
+   *
+   * This is equivalent to jQuery's empty() function. (However, empty() is a 
+   * PHP built-in, and cannot be used as a method name.)
+   *
+   * @return QueryPath
+   *  The QueryPath object with the child nodes removed.
+   * @see replaceWith()
+   * @see replaceAll()
+   * @see remove()
+   */
+  public function removeChildren() {
+    foreach ($this->matches as $m) {
+      while($kid = $m->firstChild) {
+        $m->removeChild($kid);
+      }
+    }
+    return $this;
+  }
+  /**
+   * Get the children of the elements in the QueryPath object.
+   *
+   * If a selector is provided, the list of children will be filtered through
+   * the selector.
+   *
+   * @param string $selector
+   *  A valid selector.
+   * @return QueryPath
+   *  A QueryPath wrapping all of the children.
+   * @see removeChildren()
+   * @see parent()
+   * @see parents()
+   * @see next()
+   * @see prev()
+   */
+  public function children($selector = NULL) {
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $m) {
+      foreach($m->childNodes as $c) {
+        if ($c->nodeType == XML_ELEMENT_NODE) $found->attach($c);
+      }
+    }
+    if (empty($selector)) {
+      $this->setMatches($found);
+    }
+    else {
+      $this->matches = $found; // Don't buffer this. It is temporary.
+      $this->filter($selector);
+    }
+    return $this;
+  }
+  /**
+   * Get all child nodes (not just elements) of all items in the matched set.
+   *
+   * It gets only the immediate children, not all nodes in the subtree.
+   *
+   * This does not process iframes. Xinclude processing is dependent on the 
+   * DOM implementation and configuration.
+   *
+   * @return QueryPath
+   *  A QueryPath object wrapping all child nodes for all elements in the 
+   *  QueryPath object.
+   * @see find()
+   * @see text()
+   * @see html()
+   * @see innerHTML()
+   * @see xml()
+   * @see innerXML()
+   */
+  public function contents() {
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $m) {
+      if (empty($m->childNodes)) continue; // Issue #51
+      foreach ($m->childNodes as $c) {
+        $found->attach($c);
+      }
+    }
+    $this->setMatches($found);
+    return $this;
+  }
+  /**
+   * Get a list of siblings for elements currently wrapped by this object.
+   *
+   * This will compile a list of every sibling of every element in the 
+   * current list of elements. 
+   *
+   * Note that if two siblings are present in the QueryPath object to begin with,
+   * then both will be returned in the matched set, since they are siblings of each 
+   * other. In other words,if the matches contain a and b, and a and b are siblings of 
+   * each other, than running siblings will return a set that contains 
+   * both a and b.
+   *
+   * @param string $selector
+   *  If the optional selector is provided, siblings will be filtered through
+   *  this expression.
+   * @return QueryPath
+   *  The QueryPath containing the matched siblings.
+   * @see contents()
+   * @see children()
+   * @see parent()
+   * @see parents()
+   */
+  public function siblings($selector = NULL) {
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $m) {
+      $parent = $m->parentNode;
+      foreach ($parent->childNodes as $n) {
+        if ($n->nodeType == XML_ELEMENT_NODE && $n !== $m) {
+          $found->attach($n);
+        }
+      }
+    }
+    if (empty($selector)) {
+      $this->setMatches($found);
+    }
+    else {
+      $this->matches = $found; // Don't buffer this. It is temporary.
+      $this->filter($selector);
+    }
+    return $this;
+  }
+  /**
+   * Find the closest element matching the selector.
+   *
+   * This finds the closest match in the ancestry chain. It first checks the 
+   * present element. If the present element does not match, this traverses up 
+   * the ancestry chain (e.g. checks each parent) looking for an item that matches.
+   *
+   * It is provided for jQuery 1.3 compatibility.
+   * @param string $selector
+   *  A CSS Selector to match.
+   * @return QueryPath
+   *  The set of matches.
+   * @since 2.0
+   */
+  public function closest($selector) {
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $m) {
+      
+      if (qp($m, NULL, $this->options)->is($selector) > 0) {
+        $found->attach($m);
+      }
+      else {
+        while ($m->parentNode->nodeType !== XML_DOCUMENT_NODE) {
+          $m = $m->parentNode;
+          // Is there any case where parent node is not an element?
+          if ($m->nodeType === XML_ELEMENT_NODE && qp($m, NULL, $this->options)->is($selector) > 0) {
+            $found->attach($m);
+            break;
+          }
+        }
+      }
+      
+    }
+    $this->setMatches($found);
+    return $this;
+  }
+  /**
+   * Get the immediate parent of each element in the QueryPath.
+   *
+   * If a selector is passed, this will return the nearest matching parent for
+   * each element in the QueryPath.
+   *
+   * @param string $selector
+   *  A valid CSS3 selector.
+   * @return QueryPath
+   *  A QueryPath object wrapping the matching parents.
+   * @see children()
+   * @see siblings()
+   * @see parents()
+   */
+  public function parent($selector = NULL) {
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $m) {
+      while ($m->parentNode->nodeType !== XML_DOCUMENT_NODE) {
+        $m = $m->parentNode;
+        // Is there any case where parent node is not an element?
+        if ($m->nodeType === XML_ELEMENT_NODE) {
+          if (!empty($selector)) {
+            if (qp($m, NULL, $this->options)->is($selector) > 0) {
+              $found->attach($m);
+              break;
+            }
+          }
+          else {
+            $found->attach($m);
+            break;
+          }
+        }
+      }
+    }
+    $this->setMatches($found);
+    return $this;
+  }
+  /**
+   * Get all ancestors of each element in the QueryPath.
+   * 
+   * If a selector is present, only matching ancestors will be retrieved.
+   *
+   * @see parent()
+   * @param string $selector
+   *  A valid CSS 3 Selector.
+   * @return QueryPath
+   *  A QueryPath object containing the matching ancestors.
+   * @see siblings()
+   * @see children()
+   */
+  public function parents($selector = NULL) {
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $m) {
+      while ($m->parentNode->nodeType !== XML_DOCUMENT_NODE) {
+        $m = $m->parentNode;
+        // Is there any case where parent node is not an element?
+        if ($m->nodeType === XML_ELEMENT_NODE) {
+          if (!empty($selector)) {
+            if (qp($m, NULL, $this->options)->is($selector) > 0)
+              $found->attach($m);
+          }
+          else 
+            $found->attach($m);
+        }
+      }
+    }
+    $this->setMatches($found);
+    return $this;
+  }
+  /**
+   * Set or get the markup for an element.
+   * 
+   * If $markup is set, then the giving markup will be injected into each
+   * item in the set. All other children of that node will be deleted, and this
+   * new code will be the only child or children. The markup MUST BE WELL FORMED.
+   *
+   * If no markup is given, this will return a string representing the child 
+   * markup of the first node.
+   *
+   * <b>Important:</b> This differs from jQuery's html() function. This function
+   * returns <i>the current node</i> and all of its children. jQuery returns only
+   * the children. This means you do not need to do things like this: 
+   * @code$qp->parent()->html()@endcode.
+   *
+   * By default, this is HTML 4.01, not XHTML. Use {@link xml()} for XHTML.
+   *
+   * @param string $markup
+   *  The text to insert.
+   * @return mixed
+   *  A string if no markup was passed, or a QueryPath if markup was passed.
+   * @see xml()
+   * @see text()
+   * @see contents()
+   */
+  public function html($markup = NULL) {
+    if (isset($markup)) {
+      
+      if ($this->options['replace_entities']) {
+        $markup = QueryPathEntities::replaceAllEntities($markup);
+      }
+      
+      // Parse the HTML and insert it into the DOM
+      //$doc = DOMDocument::loadHTML($markup);
+      $doc = $this->document->createDocumentFragment();
+      $doc->appendXML($markup);
+      $this->removeChildren();
+      $this->append($doc);
+      return $this;
+    }
+    $length = $this->size();
+    if ($length == 0) {
+      return NULL;
+    }
+    // Only return the first item -- that's what JQ does.
+    $first = $this->getFirstMatch();
+
+    // Catch cases where first item is not a legit DOM object.
+    if (!($first instanceof DOMNode)) {
+      return NULL;
+    }
+    
+    // Added by eabrand.
+    if(!$first->ownerDocument->documentElement) {
+      return NULL;
+    }
+    
+    if ($first instanceof DOMDocument || $first->isSameNode($first->ownerDocument->documentElement)) {
+      return $this->document->saveHTML();
+    }
+    // saveHTML cannot take a node and serialize it.
+    return $this->document->saveXML($first);
+  }
+  
+  /**
+   * Fetch the HTML contents INSIDE of the first QueryPath item.
+   *
+   * <b>This behaves the way jQuery's @codehtml()@endcode function behaves.</b>
+   *
+   * This gets all children of the first match in QueryPath. 
+   *
+   * Consider this fragment:
+   * @code
+   * <div>
+   * test <p>foo</p> test
+   * </div>
+   * @endcode
+   *
+   * We can retrieve just the contents of this code by doing something like
+   * this:
+   * @code
+   * qp($xml, 'div')->innerHTML();
+   * @endcode
+   *
+   * This would return the following:
+   * @codetest <p>foo</p> test@endcode
+   *
+   * @return string
+   *  Returns a string representation of the child nodes of the first
+   *  matched element.
+   * @see html()
+   * @see innerXML()
+   * @see innerXHTML()
+   * @since 2.0
+   */
+  public function innerHTML() {
+    return $this->innerXML();
+  } 
+  
+  /**
+   * Fetch child (inner) nodes of the first match.
+   *
+   * This will return the children of the present match. For an example, 
+   * see {@link innerHTML()}.
+   *
+   * @see innerHTML()
+   * @see innerXML()
+   * @return string
+   *  Returns a string of XHTML that represents the children of the present
+   *  node.
+   * @since 2.0
+   */
+  public function innerXHTML() {
+    $length = $this->size();
+    if ($length == 0) {
+      return NULL;
+    }
+    // Only return the first item -- that's what JQ does.
+    $first = $this->getFirstMatch();
+
+    // Catch cases where first item is not a legit DOM object.
+    if (!($first instanceof DOMNode)) {
+      return NULL;
+    }
+    elseif (!$first->hasChildNodes()) {
+      return '';
+    }
+    
+    $buffer = '';
+    foreach ($first->childNodes as $child) {
+      $buffer .= $this->document->saveXML($child, LIBXML_NOEMPTYTAG);
+    }
+    
+    return $buffer;
+  }
+  
+  /**
+   * Fetch child (inner) nodes of the first match.
+   *
+   * This will return the children of the present match. For an example, 
+   * see {@link innerHTML()}.
+   *
+   * @see innerHTML()
+   * @see innerXHTML()
+   * @return string
+   *  Returns a string of XHTML that represents the children of the present
+   *  node.
+   * @since 2.0
+   */
+  public function innerXML() {
+    $length = $this->size();
+    if ($length == 0) {
+      return NULL;
+    }
+    // Only return the first item -- that's what JQ does.
+    $first = $this->getFirstMatch();
+
+    // Catch cases where first item is not a legit DOM object.
+    if (!($first instanceof DOMNode)) {
+      return NULL;
+    }
+    elseif (!$first->hasChildNodes()) {
+      return '';
+    }
+    
+    $buffer = '';
+    foreach ($first->childNodes as $child) {
+      $buffer .= $this->document->saveXML($child);
+    }
+    
+    return $buffer;
+  }
+  
+  /**
+   * Retrieve the text of each match and concatenate them with the given separator.
+   *
+   * This has the effect of looping through all children, retrieving their text
+   * content, and then concatenating the text with a separator.
+   *
+   * @param string $sep
+   *  The string used to separate text items. The default is a comma followed by a
+   *  space.
+   * @param boolean $filterEmpties
+   *  If this is true, empty items will be ignored.
+   * @return string
+   *  The text contents, concatenated together with the given separator between
+   *  every pair of items.
+   * @see implode()
+   * @see text()
+   * @since 2.0
+   */
+  public function textImplode($sep = ', ', $filterEmpties = TRUE) {
+    $tmp = array(); 
+    foreach ($this->matches as $m) {
+      $txt = $m->textContent;
+      $trimmed = trim($txt);
+      // If filter empties out, then we only add items that have content.
+      if ($filterEmpties) {
+        if (strlen($trimmed) > 0) $tmp[] = $txt;
+      }
+      // Else add all content, even if it's empty.
+      else {
+        $tmp[] = $txt;
+      }
+    }
+    return implode($sep, $tmp);
+  }
+  /**
+   * Get the text contents from just child elements.
+   *
+   * This is a specialized variant of textImplode() that implodes text for just the
+   * child elements of the current element.
+   *
+   * @param string $separator
+   *  The separator that will be inserted between found text content.
+   * @return string
+   *  The concatenated values of all children.
+   */
+  function childrenText($separator = ' ') {
+    // Branch makes it non-destructive.
+    return $this->branch()->xpath('descendant::text()')->textImplode($separator);
+  }
+  /**
+   * Get or set the text contents of a node.
+   * @param string $text
+   *  If this is not NULL, this value will be set as the text of the node. It
+   *  will replace any existing content.
+   * @return mixed 
+   *  A QueryPath if $text is set, or the text content if no text
+   *  is passed in as a pram.
+   * @see html()
+   * @see xml()
+   * @see contents()
+   */
+  public function text($text = NULL) {
+    if (isset($text)) {
+      $this->removeChildren();
+      $textNode = $this->document->createTextNode($text);
+      foreach ($this->matches as $m) $m->appendChild($textNode);
+      return $this;
+    }
+    // Returns all text as one string:
+    $buf = '';
+    foreach ($this->matches as $m) $buf .= $m->textContent;
+    return $buf;
+  }
+  /**
+   * Get or set the text before each selected item.
+   *
+   * If $text is passed in, the text is inserted before each currently selected item.
+   *
+   * If no text is given, this will return the concatenated text after each selected element.
+   *
+   * @code
+   * <?php
+   * $xml = '<?xml version="1.0"?><root>Foo<a>Bar</a><b/></root>';
+   * 
+   * // This will return 'Foo'
+   * qp($xml, 'a')->textBefore();
+   *
+   * // This will insert 'Baz' right before <b/>.
+   * qp($xml, 'b')->textBefore('Baz');
+   * ?>
+   * @endcode
+   *
+   * @param string $text
+   *  If this is set, it will be inserted before each node in the current set of
+   *  selected items.
+   * @return mixed
+   *  Returns the QueryPath object if $text was set, and returns a string (possibly empty)
+   *  if no param is passed.
+   */
+  public function textBefore($text = NULL) {
+    if (isset($text)) {
+      $textNode = $this->document->createTextNode($text);
+      return $this->before($textNode);
+    }
+    $buffer = '';
+    foreach ($this->matches as $m) {
+      $p = $m;
+      while (isset($p->previousSibling) && $p->previousSibling->nodeType == XML_TEXT_NODE) {
+        $p = $p->previousSibling;
+        $buffer .= $p->textContent;
+      }
+    }
+    return $buffer;
+  }
+  
+  public function textAfter($text = NULL) {
+    if (isset($text)) {
+      $textNode = $this->document->createTextNode($text);
+      return $this->after($textNode);
+    }
+    $buffer = '';
+    foreach ($this->matches as $m) {
+      $n = $m;
+      while (isset($n->nextSibling) && $n->nextSibling->nodeType == XML_TEXT_NODE) {
+        $n = $n->nextSibling;
+        $buffer .= $n->textContent;
+      }
+    }
+    return $buffer;
+  }
+  
+  /**
+   * Set or get the value of an element's 'value' attribute.
+   *
+   * The 'value' attribute is common in HTML form elements. This is a 
+   * convenience function for accessing the values. Since this is not  common
+   * task on the server side, this method may be removed in future releases. (It 
+   * is currently provided for jQuery compatibility.)
+   *
+   * If a value is provided in the params, then the value will be set for all 
+   * matches. If no params are given, then the value of the first matched element
+   * will be returned. This may be NULL.
+   *
+   * @deprecated Just use attr(). There's no reason to use this on the server.
+   * @see attr()
+   * @param string $value
+   * @return mixed
+   *  Returns a QueryPath if a string was passed in, and a string if no string
+   *  was passed in. In the later case, an error will produce NULL.
+   */
+  public function val($value = NULL) {
+    if (isset($value)) {
+      $this->attr('value', $value);
+      return $this;
+    }
+    return $this->attr('value');
+  }
+  /**
+   * Set or get XHTML markup for an element or elements.
+   * 
+   * This differs from {@link html()} in that it processes (and produces)
+   * strictly XML 1.0 compliant markup.
+   *
+   * Like {@link xml()} and {@link html()}, this functions as both a 
+   * setter and a getter.
+   *
+   * This is a convenience function for fetching HTML in XML format.
+   * It does no processing of the markup (such as schema validation).
+   * @param string $markup
+   *  A string containing XML data.
+   * @return mixed
+   *  If markup is passed in, a QueryPath is returned. If no markup is passed
+   *  in, XML representing the first matched element is returned.
+   * @see html()
+   * @see innerXHTML()
+   */
+  public function xhtml($markup = NULL) {
+    
+    // XXX: This is a minor reworking of the original xml() method.
+    // This should be refactored, probably.
+    // See http://github.com/technosophos/querypath/issues#issue/10
+   
+    $omit_xml_decl = $this->options['omit_xml_declaration'];
+    if ($markup === TRUE) {
+      // Basically, we handle the special case where we don't
+      // want the XML declaration to be displayed.
+      $omit_xml_decl = TRUE;
+    }
+    elseif (isset($markup)) {
+      return $this->xml($markup);
+    }
+    
+    $length = $this->size();
+    if ($length == 0) {
+      return NULL;
+    }
+    
+    // Only return the first item -- that's what JQ does.
+    $first = $this->getFirstMatch();
+    // Catch cases where first item is not a legit DOM object.
+    if (!($first instanceof DOMNode)) {
+      return NULL;
+    }
+    
+    if ($first instanceof DOMDocument || $first->isSameNode($first->ownerDocument->documentElement)) {
+      
+      // Has the unfortunate side-effect of stripping doctype.
+      //$text = ($omit_xml_decl ? $this->document->saveXML($first->ownerDocument->documentElement, LIBXML_NOEMPTYTAG) : $this->document->saveXML(NULL, LIBXML_NOEMPTYTAG));
+      $text = $this->document->saveXML(NULL, LIBXML_NOEMPTYTAG);
+    }
+    else {
+      $text = $this->document->saveXML($first, LIBXML_NOEMPTYTAG);
+    }
+    
+    // Issue #47: Using the old trick for removing the XML tag also removed the 
+    // doctype. So we remove it with a regex:
+    if ($omit_xml_decl) {
+      $text = preg_replace('/<\?xml\s[^>]*\?>/', '', $text);
+    }
+    
+    // This is slightly lenient: It allows for cases where code incorrectly places content
+    // inside of these supposedly unary elements.
+    $unary = '/<(area|base|basefont|br|col|frame|hr|img|input|isindex|link|meta|param)(?(?=\s)([^>\/]+))><\/[^>]*>/i';
+    $text = preg_replace($unary, '<\\1\\2 />', $text);
+    
+    // Experimental: Support for enclosing CDATA sections with comments to be both XML compat
+    // and HTML 4/5 compat
+    $cdata = '/(<!\[CDATA\[|\]\]>)/i';
+    $replace = $this->options['escape_xhtml_js_css_sections'];
+    $text = preg_replace($cdata, $replace, $text);
+    
+    return $text;
+  }
+  /**
+   * Set or get the XML markup for an element or elements.
+   *
+   * Like {@link html()}, this functions in both a setter and a getter mode.
+   * 
+   * In setter mode, the string passed in will be parsed and then appended to the 
+   * elements wrapped by this QueryPath object.When in setter mode, this parses 
+   * the XML using the DOMFragment parser. For that reason, an XML declaration 
+   * is not necessary.
+   *
+   * In getter mode, the first element wrapped by this QueryPath object will be 
+   * converted to an XML string and returned.
+   *
+   * @param string $markup
+   *  A string containing XML data.
+   * @return mixed
+   *  If markup is passed in, a QueryPath is returned. If no markup is passed
+   *  in, XML representing the first matched element is returned.
+   * @see xhtml()
+   * @see html()
+   * @see text()
+   * @see content()
+   * @see innerXML()
+   */
+  public function xml($markup = NULL) {
+    $omit_xml_decl = $this->options['omit_xml_declaration'];
+    if ($markup === TRUE) {
+      // Basically, we handle the special case where we don't
+      // want the XML declaration to be displayed.
+      $omit_xml_decl = TRUE;
+    }
+    elseif (isset($markup)) {
+      if ($this->options['replace_entities']) {
+        $markup = QueryPathEntities::replaceAllEntities($markup);
+      }
+      $doc = $this->document->createDocumentFragment();
+      $doc->appendXML($markup);
+      $this->removeChildren();
+      $this->append($doc);
+      return $this;
+    }
+    $length = $this->size();
+    if ($length == 0) {
+      return NULL;
+    }
+    // Only return the first item -- that's what JQ does.
+    $first = $this->getFirstMatch();
+    
+    // Catch cases where first item is not a legit DOM object.
+    if (!($first instanceof DOMNode)) {
+      return NULL;
+    }
+    
+    if ($first instanceof DOMDocument || $first->isSameNode($first->ownerDocument->documentElement)) {
+      
+      return  ($omit_xml_decl ? $this->document->saveXML($first->ownerDocument->documentElement) : $this->document->saveXML());
+    }
+    return $this->document->saveXML($first);
+  }
+  /**
+   * Send the XML document to the client.
+   * 
+   * Write the document to a file path, if given, or 
+   * to stdout (usually the client).
+   *
+   * This prints the entire document.
+   *
+   * @param string $path
+   *  The path to the file into which the XML should be written. if 
+   *  this is NULL, data will be written to STDOUT, which is usually
+   *  sent to the remote browser.
+   * @param int $options
+   *  (As of QueryPath 2.1) Pass libxml options to the saving mechanism.
+   * @return QueryPath
+   *  The QueryPath object, unmodified.
+   * @see xml()
+   * @see innerXML()
+   * @see writeXHTML()
+   * @throws Exception 
+   *  In the event that a file cannot be written, an Exception will be thrown.
+   */
+  public function writeXML($path = NULL, $options = NULL) {
+    if ($path == NULL) {
+      print $this->document->saveXML(NULL, $options);
+    }
+    else {
+      try {
+        set_error_handler(array('QueryPathIOException', 'initializeFromError'));
+        $this->document->save($path, $options);
+      }
+      catch (Exception $e) {
+        restore_error_handler();
+        throw $e;
+      }
+      restore_error_handler();
+    }
+    return $this;
+  }
+  /**
+   * Writes HTML to output.
+   *
+   * HTML is formatted as HTML 4.01, without strict XML unary tags. This is for
+   * legacy HTML content. Modern XHTML should be written using {@link toXHTML()}.
+   * 
+   * Write the document to stdout (usually the client) or to a file.
+   *
+   * @param string $path
+   *  The path to the file into which the XML should be written. if 
+   *  this is NULL, data will be written to STDOUT, which is usually
+   *  sent to the remote browser.
+   * @return QueryPath
+   *  The QueryPath object, unmodified.
+   * @see html()
+   * @see innerHTML()
+   * @throws Exception 
+   *  In the event that a file cannot be written, an Exception will be thrown.
+   */
+  public function writeHTML($path = NULL) {
+    if ($path == NULL) {
+      print $this->document->saveHTML();
+    }
+    else {
+      try {
+        set_error_handler(array('QueryPathParseException', 'initializeFromError'));
+        $this->document->saveHTMLFile($path);
+      }
+      catch (Exception $e) {
+        restore_error_handler();
+        throw $e;
+      }
+      restore_error_handler();
+    }
+    return $this;
+  }
+  
+  /**
+   * Write an XHTML file to output.
+   *
+   * Typically, you should use this instead of {@link writeHTML()}.
+   *
+   * Currently, this functions identically to {@link toXML()} <i>except that</i>
+   * it always uses closing tags (e.g. always @code<script></script>@endcode, 
+   * never @code<script/>@endcode). It will
+   * write the file as well-formed XML. No XHTML schema validation is done.
+   *
+   * @see writeXML()
+   * @see xml()
+   * @see writeHTML()
+   * @see innerXHTML()
+   * @see xhtml()
+   * @param string $path
+   *  The filename of the file to write to.
+   * @return QueryPath
+   *  Returns the QueryPath, unmodified.
+   * @throws Exception
+   *  In the event that the output file cannot be written, an exception is
+   *  thrown.
+   * @since 2.0
+   */
+  public function writeXHTML($path = NULL) {
+    return $this->writeXML($path, LIBXML_NOEMPTYTAG);
+    /*
+    if ($path == NULL) {
+      print $this->document->saveXML(NULL, LIBXML_NOEMPTYTAG);
+    }
+    else {
+      try {
+        set_error_handler(array('QueryPathIOException', 'initializeFromError'));
+        $this->document->save($path, LIBXML_NOEMPTYTAG);
+      }
+      catch (Exception $e) {
+        restore_error_handler();
+        throw $e;
+      }
+      restore_error_handler();
+    }
+    return $this;
+    */
+  }
+  /**
+   * Get the next sibling of each element in the QueryPath.
+   *
+   * If a selector is provided, the next matching sibling will be returned.
+   *
+   * @param string $selector
+   *  A CSS3 selector.
+   * @return QueryPath
+   *  The QueryPath object.
+   * @see nextAll()
+   * @see prev()
+   * @see children()
+   * @see contents()
+   * @see parent()
+   * @see parents()
+   */
+  public function next($selector = NULL) {
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $m) {
+      while (isset($m->nextSibling)) {
+        $m = $m->nextSibling;
+        if ($m->nodeType === XML_ELEMENT_NODE) {
+          if (!empty($selector)) {
+            if (qp($m, NULL, $this->options)->is($selector) > 0) {
+              $found->attach($m);
+              break;
+            }
+          }
+          else {
+            $found->attach($m);
+            break;
+          }
+        }
+      }
+    }
+    $this->setMatches($found);
+    return $this;
+  }
+  /**
+   * Get all siblings after an element.
+   *
+   * For each element in the QueryPath, get all siblings that appear after
+   * it. If a selector is passed in, then only siblings that match the 
+   * selector will be included.
+   *
+   * @param string $selector 
+   *  A valid CSS 3 selector.
+   * @return QueryPath
+   *  The QueryPath object, now containing the matching siblings.
+   * @see next()
+   * @see prevAll()
+   * @see children()
+   * @see siblings()
+   */
+  public function nextAll($selector = NULL) {
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $m) {
+      while (isset($m->nextSibling)) {
+        $m = $m->nextSibling;
+        if ($m->nodeType === XML_ELEMENT_NODE) {
+          if (!empty($selector)) {
+            if (qp($m, NULL, $this->options)->is($selector) > 0) {
+              $found->attach($m);
+            }
+          }
+          else {
+            $found->attach($m);
+          }
+        }
+      }
+    }
+    $this->setMatches($found);
+    return $this;
+  }
+  /**
+   * Get the next sibling before each element in the QueryPath.
+   *
+   * For each element in the QueryPath, this retrieves the previous sibling
+   * (if any). If a selector is supplied, it retrieves the first matching 
+   * sibling (if any is found).
+   *
+   * @param string $selector
+   *  A valid CSS 3 selector.
+   * @return QueryPath
+   *  A QueryPath object, now containing any previous siblings that have been 
+   *  found.
+   * @see prevAll()
+   * @see next()
+   * @see siblings()
+   * @see children()
+   */
+  public function prev($selector = NULL) {
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $m) {
+      while (isset($m->previousSibling)) {
+        $m = $m->previousSibling;
+        if ($m->nodeType === XML_ELEMENT_NODE) {
+          if (!empty($selector)) {
+            if (qp($m, NULL, $this->options)->is($selector)) {
+              $found->attach($m);
+              break;
+            }
+          }
+          else {
+            $found->attach($m);
+            break;
+          }
+        }
+      }
+    }
+    $this->setMatches($found);
+    return $this;
+  }
+  /**
+   * Get the previous siblings for each element in the QueryPath.
+   *
+   * For each element in the QueryPath, get all previous siblings. If a 
+   * selector is provided, only matching siblings will be retrieved.
+   *
+   * @param string $selector
+   *  A valid CSS 3 selector.
+   * @return QueryPath
+   *  The QueryPath object, now wrapping previous sibling elements.
+   * @see prev()
+   * @see nextAll()
+   * @see siblings()
+   * @see contents()
+   * @see children()
+   */
+  public function prevAll($selector = NULL) {
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $m) {
+      while (isset($m->previousSibling)) {
+        $m = $m->previousSibling;
+        if ($m->nodeType === XML_ELEMENT_NODE) {
+          if (!empty($selector)) {
+            if (qp($m, NULL, $this->options)->is($selector)) {
+              $found->attach($m);
+            }
+          }
+          else {
+            $found->attach($m);
+          }
+        }
+      }
+    }
+    $this->setMatches($found);
+    return $this;
+  }
+  /**
+   * @deprecated Use {@link siblings()}.
+   */
+  public function peers($selector = NULL) {
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $m) {
+      foreach ($m->parentNode->childNodes as $kid) {
+        if ($kid->nodeType == XML_ELEMENT_NODE && $m !== $kid) {
+          if (!empty($selector)) {
+            if (qp($kid, NULL, $this->options)->is($selector)) {
+              $found->attach($kid);
+            }
+          }
+          else {
+            $found->attach($kid);
+          }
+        }
+      }
+    }
+    $this->setMatches($found);
+    return $this;
+  }
+  /**
+   * Add a class to all elements in the current QueryPath.
+   *
+   * This searchers for a class attribute on each item wrapped by the current 
+   * QueryPath object. If no attribute is found, a new one is added and its value
+   * is set to $class. If a class attribute is found, then the value is appended
+   * on to the end.
+   *
+   * @param string $class 
+   *  The name of the class.
+   * @return QueryPath
+   *  Returns the QueryPath object.
+   * @see css()
+   * @see attr()
+   * @see removeClass()
+   * @see hasClass()
+   */
+  public function addClass($class) {
+    foreach ($this->matches as $m) {
+      if ($m->hasAttribute('class')) {
+        $val = $m->getAttribute('class');
+        $m->setAttribute('class', $val . ' ' . $class);
+      }
+      else {
+        $m->setAttribute('class', $class);
+      }
+    }
+    return $this;
+  }
+  /**
+   * Remove the named class from any element in the QueryPath that has it.
+   *
+   * This may result in the entire class attribute being removed. If there
+   * are other items in the class attribute, though, they will not be removed.
+   * 
+   * Example:
+   * Consider this XML:
+   * @code
+   * <element class="first second"/>
+   * @endcode
+   *
+   * Executing this fragment of code will remove only the 'first' class:
+   * @code
+   * qp(document, 'element')->removeClass('first');
+   * @endcode
+   *
+   * The resulting XML will be:
+   * @code
+   * <element class="second"/>
+   * @endcode
+   *
+   * To remove the entire 'class' attribute, you should use {@see removeAttr()}.
+   *
+   * @param string $class
+   *  The class name to remove.
+   * @return QueryPath
+   *  The modified QueryPath object.
+   * @see attr()
+   * @see addClass()
+   * @see hasClass()
+   */
+  public function removeClass($class) {
+    foreach ($this->matches as $m) {
+      if ($m->hasAttribute('class')) {
+        $vals = explode(' ', $m->getAttribute('class'));
+        if (in_array($class, $vals)) {
+          $buf = array();
+          foreach ($vals as $v) {
+            if ($v != $class) $buf[] = $v;
+          }
+          if (count($buf) == 0)
+            $m->removeAttribute('class');
+          else
+            $m->setAttribute('class', implode(' ', $buf));
+        }
+      }
+    }
+    return $this;
+  }
+  /**
+   * Returns TRUE if any of the elements in the QueryPath have the specified class.
+   *
+   * @param string $class
+   *  The name of the class.
+   * @return boolean 
+   *  TRUE if the class exists in one or more of the elements, FALSE otherwise.
+   * @see addClass()
+   * @see removeClass()
+   */
+  public function hasClass($class) {
+    foreach ($this->matches as $m) {
+      if ($m->hasAttribute('class')) {
+        $vals = explode(' ', $m->getAttribute('class'));
+        if (in_array($class, $vals)) return TRUE;
+      }
+    }
+    return FALSE;
+  }
+
+  /**
+   * Branch the base QueryPath into another one with the same matches.
+   *
+   * This function makes a copy of the QueryPath object, but keeps the new copy 
+   * (initially) pointed at the same matches. This object can then be queried without
+   * changing the original QueryPath. However, changes to the elements inside of this
+   * QueryPath will show up in the QueryPath from which it is branched.
+   * 
+   * Compare this operation with {@link cloneAll()}. The cloneAll() call takes
+   * the current QueryPath object and makes a copy of all of its matches. You continue
+   * to operate on the same QueryPath object, but the elements inside of the QueryPath
+   * are copies of those before the call to cloneAll().
+   *
+   * This, on the other hand, copies <i>the QueryPath</i>, but keeps valid 
+   * references to the document and the wrapped elements. A new query branch is 
+   * created, but any changes will be written back to the same document.
+   *
+   * In practice, this comes in handy when you want to do multiple queries on a part
+   * of the document, but then return to a previous set of matches. (see {@link QPTPL}
+   * for examples of this in practice).
+   *
+   * Example:
+   *
+   * @code
+   * <?php
+   * $qp = qp(QueryPath::HTML_STUB);
+   * $branch = $qp->branch();
+   * $branch->find('title')->text('Title');
+   * $qp->find('body')->text('This is the body')->writeHTML;
+   * ?>
+   * @endcode
+   *
+   * Notice that in the code, each of the QueryPath objects is doing its own 
+   * query. However, both are modifying the same document. The result of the above 
+   * would look something like this:
+   *
+   * @code
+   * <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+   * <html xmlns="http://www.w3.org/1999/xhtml">
+   * <head>
+   *    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
+   *    <title>Title</title>
+   * </head>
+   * <body>This is the body</body>
+   * </html>
+   * @endcode
+   *
+   * Notice that while $qp and $banch were performing separate queries, they 
+   * both modified the same document.
+   *
+   * In jQuery or a browser-based solution, you generally do not need a branching
+   * function because there is (implicitly) only one document. In QueryPath, there
+   * is no implicit document. Every document must be explicitly specified (and,
+   * in most cases, parsed -- which is costly). Branching makes it possible to 
+   * work on one document with multiple QueryPath objects.
+   *
+   * @param string $selector
+   *  If a selector is passed in, an additional {@link find()} will be executed
+   *  on the branch before it is returned. (Added in QueryPath 2.0.)
+   * @return QueryPath
+   *  A copy of the QueryPath object that points to the same set of elements that
+   *  the original QueryPath was pointing to.
+   * @since 1.1
+   * @see cloneAll()
+   * @see find()
+   */
+  public function branch($selector = NULL) {
+    $temp = qp($this->matches, NULL, $this->options);
+    if (isset($selector)) $temp->find($selector);
+    return $temp;
+  }
+  /**
+   * Perform a deep clone of each node in the QueryPath.
+   *
+   * This does not clone the QueryPath object, but instead clones the 
+   * list of nodes wrapped by the QueryPath. Every element is deeply 
+   * cloned.
+   *
+   * This method is analogous to jQuery's clone() method.
+   *
+   * This is a destructive operation, which means that end() will revert
+   * the list back to the clone's original.
+   * @see qp()
+   * @return QueryPath
+   */
+  public function cloneAll() {
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $m) $found->attach($m->cloneNode(TRUE));
+    $this->setMatches($found, FALSE);
+    return $this;
+  }
+  
+  /**
+   * Clone the QueryPath.
+   *
+   * This makes a deep clone of the elements inside of the QueryPath.
+   *
+   * This clones only the QueryPathImpl, not all of the decorators. The
+   * clone operator in PHP should handle the cloning of the decorators.
+   */
+  public function __clone() {
+    //XXX: Should we clone the document?
+    
+    // Make sure we clone the kids.
+    $this->cloneAll();
+  }  
+
+  /**
+   * Detach any items from the list if they match the selector.
+   *
+   * In other words, each item that matches the selector will be remove
+   * from the DOM document. The returned QueryPath wraps the list of
+   * removed elements.
+   *
+   * If no selector is specified, this will remove all current matches from
+   * the document.
+   *
+   * @param string $selector
+   *  A CSS Selector.
+   * @return QueryPath
+   *  The Query path wrapping a list of removed items.
+   * @see replaceAll()
+   * @see replaceWith()
+   * @see removeChildren()
+   * @since 2.1
+   * @author eabrand
+   */
+  public function detach($selector = NULL) {
+
+    if(!empty($selector))
+    $this->find($selector);
+
+    $found = new SplObjectStorage();
+    $this->last = $this->matches;
+    foreach ($this->matches as $item) {
+      // The item returned is (according to docs) different from
+      // the one passed in, so we have to re-store it.
+      $found->attach($item->parentNode->removeChild($item));
+    }
+    $this->setMatches($found);
+    return $this;
+  }
+
+  /**
+   * Attach any items from the list if they match the selector.
+   *
+   * If no selector is specified, this will remove all current matches from
+   * the document.
+   *
+   * @param QueryPath $dest
+   *  A QueryPath Selector.
+   * @return QueryPath
+   *  The Query path wrapping a list of removed items.
+   * @see replaceAll()
+   * @see replaceWith()
+   * @see removeChildren()
+   * @since 2.1
+   * @author eabrand
+   */
+  public function attach(QueryPath $dest) {
+    foreach ($this->last as $m) $dest->append($m);
+    return $this;
+  }
+  
+  /**
+   * Reduce the elements matched by QueryPath to only those which contain the given item.
+   *
+   * There are two ways in which this is different from jQuery's implementation:
+   * - We allow ANY DOMNode, not just DOMElements. That means this will work on 
+   *   processor instructions, text nodes, comments, etc.
+   * - Unlike jQuery, this implementation of has() follows QueryPath standard behavior
+   *   and modifies the existing object. It does not create a brand new object.
+   * 
+   * @param mixed $contained
+   *   - If $contained is a CSS selector (e.g. '#foo'), this will test to see
+   *     if the current QueryPath has any elements that contain items that match
+   *     the selector.
+   *   - If $contained is a DOMNode, then this will test to see if THE EXACT DOMNode
+   *     exists in the currently matched elements. (Note that you cannot match across DOM trees, even if it is the same document.)
+   * @since 2.1
+   * @author eabrand
+   * @todo It would be trivially easy to add support for iterating over an array or Iterable of DOMNodes.
+   */
+  public function has($contained) {
+    $found = new SplObjectStorage();
+    
+    // If it's a selector, we just get all of the DOMNodes that match the selector.
+    $nodes = array();
+    if (is_string($contained)) {
+      // Get the list of nodes.
+      $nodes = $this->branch($contained)->get();
+    }
+    elseif ($contained instanceof DOMNode) {
+      // Make a list with one node.
+      $nodes = array($contained);
+    }
+    
+    // Now we go through each of the nodes that we are testing. We want to find
+    // ALL PARENTS that are in our existing QueryPath matches. Those are the
+    // ones we add to our new matches.
+    foreach ($nodes as $original_node) {
+      $node = $original_node;
+      while (!empty($node)/* && $node != $node->ownerDocument*/) {
+        if ($this->matches->contains($node)) {
+          $found->attach($node);
+        }
+        $node = $node->parentNode;
+      }
+    }
+    
+    $this->setMatches($found);
+    return $this;
+  }
+
+  /**
+   * Empty everything within the specified element.
+   *
+   * A convenience function for removeChildren(). This is equivalent to jQuery's 
+   * empty() function. However, `empty` is a built-in in PHP, and cannot be used as a 
+   * function name.
+   *
+   * @return QueryPath
+   *  The QueryPath object with the newly emptied elements.
+   * @see removeChildren()
+   * @since 2.1
+   * @author eabrand
+   * @deprecated The removeChildren() function is the preferred method.
+   */
+  public function emptyElement() {
+    $this->removeChildren();
+    return $this;
+  }
+  
+  /**
+   * Get the even elements, so counter-intuitively 1, 3, 5, etc.
+   *
+   *
+   *
+   * @return QueryPath
+   *  A QueryPath wrapping all of the children.
+   * @see removeChildren()
+   * @see parent()
+   * @see parents()
+   * @see next()
+   * @see prev()
+   * @since 2.1
+   * @author eabrand
+   */
+  public function even() {
+    $found = new SplObjectStorage();
+    $even = false;
+    foreach ($this->matches as $m) {
+      if ($even && $m->nodeType == XML_ELEMENT_NODE) $found->attach($m);
+      $even = ($even) ? false : true;
+    }
+    $this->setMatches($found);
+    $this->matches = $found; // Don't buffer this. It is temporary.
+    return $this;
+  }
+
+  /**
+   * Get the odd elements, so counter-intuitively 0, 2, 4, etc.
+   *
+   *
+   *
+   * @return QueryPath
+   *  A QueryPath wrapping all of the children.
+   * @see removeChildren()
+   * @see parent()
+   * @see parents()
+   * @see next()
+   * @see prev()
+   * @since 2.1
+   * @author eabrand
+   */
+  public function odd() {
+    $found = new SplObjectStorage();
+    $odd = true;
+    foreach ($this->matches as $m) {
+      if ($odd && $m->nodeType == XML_ELEMENT_NODE) $found->attach($m);
+      $odd = ($odd) ? false : true;
+    }
+    $this->setMatches($found);
+    $this->matches = $found; // Don't buffer this. It is temporary.
+    return $this;
+  }
+  
+  /**
+   * Get the first matching element.
+   *
+   *
+   * @return QueryPath
+   *  A QueryPath wrapping all of the children.
+   * @see next()
+   * @see prev()
+   * @since 2.1
+   * @author eabrand
+   */
+  public function first() {
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $m) {
+      if ($m->nodeType == XML_ELEMENT_NODE) {
+        $found->attach($m);
+        break;
+      }
+    }
+    $this->setMatches($found);
+    $this->matches = $found; // Don't buffer this. It is temporary.
+    return $this;
+  }
+
+  /**
+   * Get the first child of the matching element.
+   *
+   *
+   * @return QueryPath
+   *  A QueryPath wrapping all of the children.
+   * @see next()
+   * @see prev()
+   * @since 2.1
+   * @author eabrand
+   */
+  public function firstChild() {
+    // Could possibly use $m->firstChild http://theserverpages.com/php/manual/en/ref.dom.php
+    $found = new SplObjectStorage();
+    $flag = false;
+    foreach ($this->matches as $m) {
+      foreach($m->childNodes as $c) {
+        if ($c->nodeType == XML_ELEMENT_NODE) {
+          $found->attach($c);
+          $flag = true;
+          break;
+        }
+      }
+      if($flag) break;
+    }
+    $this->setMatches($found);
+    $this->matches = $found; // Don't buffer this. It is temporary.
+    return $this;
+  }
+
+  /**
+   * Get the last matching element.
+   *
+   *
+   * @return QueryPath
+   *  A QueryPath wrapping all of the children.
+   * @see next()
+   * @see prev()
+   * @since 2.1
+   * @author eabrand
+   */
+  public function last() {
+    $found = new SplObjectStorage();
+    $item = null;
+    foreach ($this->matches as $m) {
+      if ($m->nodeType == XML_ELEMENT_NODE) {
+        $item = $m;
+      }
+    }
+    if ($item) {
+      $found->attach($item);
+    }
+    $this->setMatches($found);
+    $this->matches = $found; // Don't buffer this. It is temporary.
+    return $this;
+  }
+
+  /**
+   * Get the last child of the matching element.
+   *
+   *
+   * @return QueryPath
+   *  A QueryPath wrapping all of the children.
+   * @see next()
+   * @see prev()
+   * @since 2.1
+   * @author eabrand
+   */
+  public function lastChild() {
+    $found = new SplObjectStorage();
+    $item = null;
+    foreach ($this->matches as $m) {
+      foreach($m->childNodes as $c) {
+        if ($c->nodeType == XML_ELEMENT_NODE) {
+          $item = $c;
+        }
+      }
+      if ($item) {
+        $found->attach($item);
+        $item = null;
+      }
+    }
+    $this->setMatches($found);
+    $this->matches = $found; // Don't buffer this. It is temporary.
+    return $this;
+  }
+
+  /**
+   * Get all siblings after an element until the selector is reached.
+   *
+   * For each element in the QueryPath, get all siblings that appear after
+   * it. If a selector is passed in, then only siblings that match the
+   * selector will be included.
+   *
+   * @param string $selector
+   *  A valid CSS 3 selector.
+   * @return QueryPath
+   *  The QueryPath object, now containing the matching siblings.
+   * @see next()
+   * @see prevAll()
+   * @see children()
+   * @see siblings()
+   * @since 2.1
+   * @author eabrand
+   */
+  public function nextUntil($selector = NULL) {
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $m) {
+      while (isset($m->nextSibling)) {
+        $m = $m->nextSibling;
+        if ($m->nodeType === XML_ELEMENT_NODE) {
+          if (!empty($selector)) {
+            if (qp($m, NULL, $this->options)->is($selector) > 0) {
+              break;
+            }
+            else {
+              $found->attach($m);
+            }
+          }
+          else {
+            $found->attach($m);
+          }
+        }
+      }
+    }
+    $this->setMatches($found);
+    return $this;
+  } 
+
+  /**
+   * Get the previous siblings for each element in the QueryPath
+   * until the selector is reached.
+   *
+   * For each element in the QueryPath, get all previous siblings. If a
+   * selector is provided, only matching siblings will be retrieved.
+   *
+   * @param string $selector
+   *  A valid CSS 3 selector.
+   * @return QueryPath
+   *  The QueryPath object, now wrapping previous sibling elements.
+   * @see prev()
+   * @see nextAll()
+   * @see siblings()
+   * @see contents()
+   * @see children()
+   * @since 2.1
+   * @author eabrand
+   */
+  public function prevUntil($selector = NULL) {
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $m) {
+      while (isset($m->previousSibling)) {
+        $m = $m->previousSibling;
+        if ($m->nodeType === XML_ELEMENT_NODE) {
+          if (!empty($selector) && qp($m, NULL, $this->options)->is($selector))
+          break;
+          else
+          $found->attach($m);
+        }
+      }
+    }
+    $this->setMatches($found);
+    return $this;
+  }
+  
+  /**
+   * Get all ancestors of each element in the QueryPath until the selector is reached.
+   *
+   * If a selector is present, only matching ancestors will be retrieved.
+   *
+   * @see parent()
+   * @param string $selector
+   *  A valid CSS 3 Selector.
+   * @return QueryPath
+   *  A QueryPath object containing the matching ancestors.
+   * @see siblings()
+   * @see children()
+   * @since 2.1
+   * @author eabrand
+   */
+  public function parentsUntil($selector = NULL) {
+    $found = new SplObjectStorage();
+    foreach ($this->matches as $m) {
+      while ($m->parentNode->nodeType !== XML_DOCUMENT_NODE) {
+        $m = $m->parentNode;
+        // Is there any case where parent node is not an element?
+        if ($m->nodeType === XML_ELEMENT_NODE) {
+          if (!empty($selector)) {
+            if (qp($m, NULL, $this->options)->is($selector) > 0)
+            break;
+            else
+            $found->attach($m);
+          }
+          else
+          $found->attach($m);
+        }
+      }
+    }
+    $this->setMatches($found);
+    return $this;
+  }
+  
+  /////// INTERNAL FUNCTIONS ////////
+  
+  
+  /**
+   * Determine whether a given string looks like XML or not.
+   *
+   * Basically, this scans a portion of the supplied string, checking to see
+   * if it has a tag-like structure. It is possible to "confuse" this, which
+   * may subsequently result in parse errors, but in the vast majority of 
+   * cases, this method serves as a valid inicator of whether or not the 
+   * content looks like XML.
+   *
+   * Things that are intentional excluded:
+   * - plain text with no markup.
+   * - strings that look like filesystem paths.
+   * 
+   * Subclasses SHOULD NOT OVERRIDE THIS. Altering it may be altering
+   * core assumptions about how things work. Instead, classes should 
+   * override the constructor and pass in only one of the parsed types
+   * that this class expects.
+   */
+  protected function isXMLish($string) {
+    // Long strings will exhaust the regex engine, so we
+    // grab a representative string.
+    // $test = substr($string, 0, 255);
+    return (strpos($string, '<') !== FALSE && strpos($string, '>') !== FALSE);
+    //return preg_match(ML_EXP, $test) > 0;
+  }
+  
+  private function parseXMLString($string, $flags = NULL) {
+    
+    $document = new DOMDocument('1.0');
+    $lead = strtolower(substr($string, 0, 5)); // <?xml
+    try {
+      set_error_handler(array('QueryPathParseException', 'initializeFromError'), $this->errTypes);
+      
+      if (isset($this->options['convert_to_encoding'])) {
+        // Is there another way to do this?
+        
+        $from_enc = isset($this->options['convert_from_encoding']) ? $this->options['convert_from_encoding'] : 'auto';
+        $to_enc = $this->options['convert_to_encoding'];
+        
+        if (function_exists('mb_convert_encoding')) {
+          $string = mb_convert_encoding($string, $to_enc, $from_enc);
+        }
+        
+      }
+      
+      // This is to avoid cases where low ascii digits have slipped into HTML.
+      // AFAIK, it should not adversly effect UTF-8 documents.
+      if (!empty($this->options['strip_low_ascii'])) {
+        $string = filter_var($string, FILTER_UNSAFE_RAW, FILTER_FLAG_ENCODE_LOW);
+      }
+      
+      // Allow users to override parser settings.
+      if (empty($this->options['use_parser'])) {
+        $useParser = '';
+      }
+      else {
+        $useParser = strtolower($this->options['use_parser']);
+      }
+      
+      // If HTML parser is requested, we use it.
+      if ($useParser == 'html') {
+        $document->loadHTML($string);
+      }
+      // Parse as XML if it looks like XML, or if XML parser is requested.
+      elseif ($lead == '<?xml' || $useParser == 'xml') {
+        if ($this->options['replace_entities']) {
+          $string = QueryPathEntities::replaceAllEntities($string);
+        }
+        $document->loadXML($string, $flags);
+      }
+      // In all other cases, we try the HTML parser.
+      else {
+        $document->loadHTML($string);
+      }
+    }
+    // Emulate 'finally' behavior.
+    catch (Exception $e) {
+      restore_error_handler();
+      throw $e;
+    }
+    restore_error_handler();
+    
+    if (empty($document)) {
+      throw new QueryPathParseException('Unknown parser exception.');
+    }
+    return $document;
+  }
+  
+  /**
+   * EXPERT: Be very, very careful using this.
+   * A utility function for setting the current set of matches.
+   * It makes sure the last matches buffer is set (for end() and andSelf()).
+   * @since 2.0
+   */
+  public function setMatches($matches, $unique = TRUE) {
+    // This causes a lot of overhead....
+    //if ($unique) $matches = self::unique($matches);
+    $this->last = $this->matches;
+    
+    // Just set current matches.
+    if ($matches instanceof SplObjectStorage) {
+      $this->matches = $matches;
+    }
+    // This is likely legacy code that needs conversion.
+    elseif (is_array($matches)) {
+      trigger_error('Legacy array detected.');
+      $tmp = new SplObjectStorage();
+      foreach ($matches as $m) $tmp->attach($m);
+      $this->matches = $tmp;
+    }
+    // For non-arrays, try to create a new match set and 
+    // add this object.
+    else {
+      $found = new SplObjectStorage();
+      if (isset($matches)) $found->attach($matches);
+      $this->matches = $found;
+    }
+    
+    // EXPERIMENTAL: Support for qp()->length.
+    $this->length = $this->matches->count();
+  }
+  
+  /**
+   * Set the match monitor to empty.
+   *
+   * This preserves history.
+   *
+   * @since 2.0
+   */
+  private function noMatches() {
+    $this->setMatches(NULL);
+  }
+    
+  /**
+   * A utility function for retriving a match by index.
+   *
+   * The internal data structure used in QueryPath does not have
+   * strong random access support, so we suppliment it with this method.
+   */
+  private function getNthMatch($index) {
+    if ($index > $this->matches->count() || $index < 0) return;
+    
+    $i = 0;
+    foreach ($this->matches as $m) {
+      if ($i++ == $index) return $m;
+    }
+  }
+  
+  /**
+   * Convenience function for getNthMatch(0).
+   */
+  private function getFirstMatch() {
+    $this->matches->rewind();
+    return $this->matches->current();
+  }
+  
+  /**
+   * Parse just a fragment of XML.
+   * This will automatically prepend an <?xml ?> declaration before parsing.
+   * @param string $string 
+   *   Fragment to parse.
+   * @return DOMDocumentFragment 
+   *   The parsed document fragment.
+   */
+   /*
+  private function parseXMLFragment($string) {
+    $frag = $this->document->createDocumentFragment();
+    $frag->appendXML($string);
+    return $frag;
+  }
+  */
+  
+  /**
+   * Parse an XML or HTML file.
+   *
+   * This attempts to autodetect the type of file, and then parse it.
+   *
+   * @param string $filename
+   *  The file name to parse.
+   * @param int $flags
+   *  The OR-combined flags accepted by the DOM parser. See the PHP documentation
+   *  for DOM or for libxml.
+   * @param resource $context
+   *  The stream context for the file IO. If this is set, then an alternate 
+   *  parsing path is followed: The file is loaded by PHP's stream-aware IO
+   *  facilities, read entirely into memory, and then handed off to 
+   *  {@link parseXMLString()}. On large files, this can have a performance impact.
+   * @throws QueryPathParseException 
+   *  Thrown when a file cannot be loaded or parsed.
+   */
+  private function parseXMLFile($filename, $flags = NULL, $context = NULL) {
+    
+    // If a context is specified, we basically have to do the reading in 
+    // two steps:
+    if (!empty($context)) {
+      try {
+        set_error_handler(array('QueryPathParseException', 'initializeFromError'), $this->errTypes);
+        $contents = file_get_contents($filename, FALSE, $context);
+        
+      }
+      // Apparently there is no 'finally' in PHP, so we have to restore the error
+      // handler this way:
+      catch(Exception $e) {
+        restore_error_handler();
+        throw $e;
+      }
+      restore_error_handler();
+      
+      if ($contents == FALSE) {
+        throw new QueryPathParseException(sprintf('Contents of the file %s could not be retrieved.', $filename));
+      }
+      
+      
+      /* This is basically unneccessary overhead, as it is not more
+       * accurate than the existing method.
+      if (isset($md['wrapper_type']) &&  $md['wrapper_type'] == 'http') {
+        for ($i = 0; $i < count($md['wrapper_data']); ++$i) {
+          if (stripos($md['wrapper_data'][$i], 'content-type:') !== FALSE) {
+            $ct = trim(substr($md['wrapper_data'][$i], 12));
+            if (stripos('text/html') === 0) {
+              $this->parseXMLString($contents, $flags, 'text/html');
+            }
+            else {
+              // We can't account for all of the mime types that have
+              // an XML payload, so we set it to XML.
+              $this->parseXMLString($contents, $flags, 'text/xml');
+            }
+            break;
+          }
+        }
+      }
+      */
+      
+      return $this->parseXMLString($contents, $flags);
+    }
+    
+    $document = new DOMDocument();
+    $lastDot = strrpos($filename, '.');
+    
+    $htmlExtensions = array(
+      '.html' => 1,
+      '.htm' => 1,
+    );
+    
+    // Allow users to override parser settings.
+    if (empty($this->options['use_parser'])) {
+      $useParser = '';
+    }
+    else {
+      $useParser = strtolower($this->options['use_parser']);
+    }
+    
+    $ext = $lastDot !== FALSE ? strtolower(substr($filename, $lastDot)) : '';
+    
+    try {
+      set_error_handler(array('QueryPathParseException', 'initializeFromError'), $this->errTypes);
+      
+      // If the parser is explicitly set to XML, use that parser.
+      if ($useParser == 'xml') {
+        $r = $document->load($filename, $flags);
+      }
+      // Otherwise, see if it looks like HTML.
+      elseif (isset($htmlExtensions[$ext]) || $useParser == 'html') {
+        // Try parsing it as HTML.
+        $r = $document->loadHTMLFile($filename);
+      }
+      // Default to XML.
+      else {
+        $r = $document->load($filename, $flags);
+      }
+      
+    }
+    // Emulate 'finally' behavior.
+    catch (Exception $e) {
+      restore_error_handler();
+      throw $e;
+    }
+    restore_error_handler();
+    
+    
+    
+    /*
+    if ($r == FALSE) {
+      $fmt = 'Failed to load file %s: %s (%s, %s)';
+      $err = error_get_last();
+      if ($err['type'] & self::IGNORE_ERRORS) {
+        // Need to report these somehow...
+        trigger_error($err['message'], E_USER_WARNING);
+      }
+      else {
+        throw new QueryPathParseException(sprintf($fmt, $filename, $err['message'], $err['file'], $err['line']));
+      }
+      
+      //throw new QueryPathParseException(sprintf($fmt, $filename, $err['message'], $err['file'], $err['line']));
+    }
+    */
+    return $document;
+  }
+  
+  /**
+   * Call extension methods.
+   *
+   * This function is used to invoke extension methods. It searches the
+   * registered extenstensions for a matching function name. If one is found,
+   * it is executed with the arguments in the $arguments array.
+   * 
+   * @throws QueryPathException
+   *  An exception is thrown if a non-existent method is called.
+   */
+  public function __call($name, $arguments) {
+    
+    if (!QueryPathExtensionRegistry::$useRegistry) {
+      throw new QueryPathException("No method named $name found (Extensions disabled).");      
+    }
+    
+    // Loading of extensions is deferred until the first time a
+    // non-core method is called. This makes constructing faster, but it
+    // may make the first invocation of __call() slower (if there are 
+    // enough extensions.)
+    //
+    // The main reason for moving this out of the constructor is that most
+    // new QueryPath instances do not use extensions. Charging qp() calls
+    // with the additional hit is not a good idea.
+    //
+    // Also, this will at least limit the number of circular references.
+    if (empty($this->ext)) {
+      // Load the registry
+      $this->ext = QueryPathExtensionRegistry::getExtensions($this);
+    }
+    
+    // Note that an empty ext registry indicates that extensions are disabled.
+    if (!empty($this->ext) && QueryPathExtensionRegistry::hasMethod($name)) {
+      $owner = QueryPathExtensionRegistry::getMethodClass($name);
+      $method = new ReflectionMethod($owner, $name);
+      return $method->invokeArgs($this->ext[$owner], $arguments);
+    }
+    throw new QueryPathException("No method named $name found. Possibly missing an extension.");
+  }
+  
+  /**
+   * Dynamically generate certain properties.
+   *
+   * This is used primarily to increase jQuery compatibility by providing property-like
+   * behaviors.
+   *
+   * Currently defined properties:
+   *   - length: Alias of {@link size()}.
+   */
+   /*
+  public function __get($name) {
+    switch ($name) {
+      case 'length':
+        return $this->size();
+      default:
+        throw new QueryPathException('Unknown or inaccessible property "' . $name . '" (via __get())');
+    }
+  }
+  */
+  
+  /**
+   * Get an iterator for the matches in this object.
+   * @return Iterable
+   *  Returns an iterator.
+   */
+  public function getIterator() {
+    $i = new QueryPathIterator($this->matches);
+    $i->options = $this->options;
+    return $i;
+  }
+}
+
+/**
+ * Perform various tasks on HTML/XML entities.
+ *
+ * @ingroup querypath_util
+ */
+class QueryPathEntities {
+  
+  /**
+   * This is three regexes wrapped into 1. The | divides them.
+   * 1: Match any char-based entity. This will go in $matches[1]
+   * 2: Match any num-based entity. This will go in $matches[2]
+   * 3: Match any hex-based entry. This will go in $matches[3]
+   * 4: Match any ampersand that is not an entity. This goes in $matches[4]
+   *    This last rule will only match if one of the previous two has not already
+   *    matched.
+   * XXX: Are octal encodings for entities acceptable?
+   */
+  //protected static $regex = '/&([\w]+);|&#([\d]+);|&([\w]*[\s$]+)/m';
+  protected static $regex = '/&([\w]+);|&#([\d]+);|&#(x[0-9a-fA-F]+);|(&)/m';
+  
+  /**
+   * Replace all entities.
+   * This will scan a string and will attempt to replace all
+   * entities with their numeric equivalent. This will not work
+   * with specialized entities.
+   *
+   * @param string $string
+   *  The string to perform replacements on.
+   * @return string
+   *  Returns a string that is similar to the original one, but with 
+   *  all entity replacements made.
+   */
+  public static function replaceAllEntities($string) {
+    return preg_replace_callback(self::$regex, 'QueryPathEntities::doReplacement', $string);
+  }
+  
+  /**
+   * Callback for processing replacements.
+   *
+   * @param array $matches
+   *  The regular expression replacement array.
+   */
+  protected static function doReplacement($matches) {
+    // See how the regex above works out.
+    //print_r($matches);
+
+    // From count, we can tell whether we got a 
+    // char, num, or bare ampersand.
+    $count = count($matches);
+    switch ($count) {
+      case 2:
+        // We have a character entity
+        return '&#' . self::replaceEntity($matches[1]) . ';';
+      case 3:
+      case 4:
+        // we have a numeric entity
+        return '&#' . $matches[$count-1] . ';'; 
+      case 5:
+        // We have an unescaped ampersand.
+        return '&#38;';
+    }
+  }
+  
+  /**
+   * Lookup an entity string's numeric equivalent.
+   *
+   * @param string $entity
+   *  The entity whose numeric value is needed.
+   * @return int
+   *  The integer value corresponding to the entity.
+   * @author Matt Butcher
+   * @author Ryan Mahoney
+   */
+  public static function replaceEntity($entity) {
+    return self::$entity_array[$entity];
+  }
+  
+  /**
+   * Conversion mapper for entities in HTML.
+   * Large entity conversion table. This is 
+   * significantly broader in range than 
+   * get_html_translation_table(HTML_ENTITIES).
+   *
+   * This code comes from Rhizome ({@link http://code.google.com/p/sinciput})
+   *
+   * @see get_html_translation_table()
+   */
+  private static $entity_array = array(
+	  'nbsp' => 160, 'iexcl' => 161, 'cent' => 162, 'pound' => 163, 
+	  'curren' => 164, 'yen' => 165, 'brvbar' => 166, 'sect' => 167, 
+	  'uml' => 168, 'copy' => 169, 'ordf' => 170, 'laquo' => 171, 
+	  'not' => 172, 'shy' => 173, 'reg' => 174, 'macr' => 175, 'deg' => 176, 
+	  'plusmn' => 177, 'sup2' => 178, 'sup3' => 179, 'acute' => 180, 
+	  'micro' => 181, 'para' => 182, 'middot' => 183, 'cedil' => 184, 
+	  'sup1' => 185, 'ordm' => 186, 'raquo' => 187, 'frac14' => 188, 
+	  'frac12' => 189, 'frac34' => 190, 'iquest' => 191, 'Agrave' => 192, 
+	  'Aacute' => 193, 'Acirc' => 194, 'Atilde' => 195, 'Auml' => 196, 
+	  'Aring' => 197, 'AElig' => 198, 'Ccedil' => 199, 'Egrave' => 200, 
+	  'Eacute' => 201, 'Ecirc' => 202, 'Euml' => 203, 'Igrave' => 204, 
+	  'Iacute' => 205, 'Icirc' => 206, 'Iuml' => 207, 'ETH' => 208, 
+	  'Ntilde' => 209, 'Ograve' => 210, 'Oacute' => 211, 'Ocirc' => 212, 
+	  'Otilde' => 213, 'Ouml' => 214, 'times' => 215, 'Oslash' => 216, 
+	  'Ugrave' => 217, 'Uacute' => 218, 'Ucirc' => 219, 'Uuml' => 220, 
+	  'Yacute' => 221, 'THORN' => 222, 'szlig' => 223, 'agrave' => 224, 
+	  'aacute' => 225, 'acirc' => 226, 'atilde' => 227, 'auml' => 228, 
+	  'aring' => 229, 'aelig' => 230, 'ccedil' => 231, 'egrave' => 232, 
+	  'eacute' => 233, 'ecirc' => 234, 'euml' => 235, 'igrave' => 236, 
+	  'iacute' => 237, 'icirc' => 238, 'iuml' => 239, 'eth' => 240, 
+	  'ntilde' => 241, 'ograve' => 242, 'oacute' => 243, 'ocirc' => 244, 
+	  'otilde' => 245, 'ouml' => 246, 'divide' => 247, 'oslash' => 248, 
+	  'ugrave' => 249, 'uacute' => 250, 'ucirc' => 251, 'uuml' => 252, 
+	  'yacute' => 253, 'thorn' => 254, 'yuml' => 255, 'quot' => 34, 
+	  'amp' => 38, 'lt' => 60, 'gt' => 62, 'apos' => 39, 'OElig' => 338, 
+	  'oelig' => 339, 'Scaron' => 352, 'scaron' => 353, 'Yuml' => 376, 
+	  'circ' => 710, 'tilde' => 732, 'ensp' => 8194, 'emsp' => 8195, 
+	  'thinsp' => 8201, 'zwnj' => 8204, 'zwj' => 8205, 'lrm' => 8206, 
+	  'rlm' => 8207, 'ndash' => 8211, 'mdash' => 8212, 'lsquo' => 8216, 
+	  'rsquo' => 8217, 'sbquo' => 8218, 'ldquo' => 8220, 'rdquo' => 8221, 
+	  'bdquo' => 8222, 'dagger' => 8224, 'Dagger' => 8225, 'permil' => 8240, 
+	  'lsaquo' => 8249, 'rsaquo' => 8250, 'euro' => 8364, 'fnof' => 402, 
+	  'Alpha' => 913, 'Beta' => 914, 'Gamma' => 915, 'Delta' => 916, 
+	  'Epsilon' => 917, 'Zeta' => 918, 'Eta' => 919, 'Theta' => 920, 
+	  'Iota' => 921, 'Kappa' => 922, 'Lambda' => 923, 'Mu' => 924, 'Nu' => 925, 
+	  'Xi' => 926, 'Omicron' => 927, 'Pi' => 928, 'Rho' => 929, 'Sigma' => 931,
+	  'Tau' => 932, 'Upsilon' => 933, 'Phi' => 934, 'Chi' => 935, 'Psi' => 936,
+	  'Omega' => 937, 'alpha' => 945, 'beta' => 946, 'gamma' => 947, 
+	  'delta' => 948, 'epsilon' => 949, 'zeta' => 950, 'eta' => 951, 
+	  'theta' => 952, 'iota' => 953, 'kappa' => 954, 'lambda' => 955, 
+	  'mu' => 956, 'nu' => 957, 'xi' => 958, 'omicron' => 959, 'pi' => 960, 
+	  'rho' => 961, 'sigmaf' => 962, 'sigma' => 963, 'tau' => 964, 
+	  'upsilon' => 965, 'phi' => 966, 'chi' => 967, 'psi' => 968, 
+	  'omega' => 969, 'thetasym' => 977, 'upsih' => 978, 'piv' => 982, 
+	  'bull' => 8226, 'hellip' => 8230, 'prime' => 8242, 'Prime' => 8243, 
+	  'oline' => 8254, 'frasl' => 8260, 'weierp' => 8472, 'image' => 8465, 
+	  'real' => 8476, 'trade' => 8482, 'alefsym' => 8501, 'larr' => 8592, 
+	  'uarr' => 8593, 'rarr' => 8594, 'darr' => 8595, 'harr' => 8596, 
+	  'crarr' => 8629, 'lArr' => 8656, 'uArr' => 8657, 'rArr' => 8658, 
+	  'dArr' => 8659, 'hArr' => 8660, 'forall' => 8704, 'part' => 8706, 
+	  'exist' => 8707, 'empty' => 8709, 'nabla' => 8711, 'isin' => 8712, 
+	  'notin' => 8713, 'ni' => 8715, 'prod' => 8719, 'sum' => 8721, 
+	  'minus' => 8722, 'lowast' => 8727, 'radic' => 8730, 'prop' => 8733, 
+	  'infin' => 8734, 'ang' => 8736, 'and' => 8743, 'or' => 8744, 'cap' => 8745, 
+	  'cup' => 8746, 'int' => 8747, 'there4' => 8756, 'sim' => 8764, 
+	  'cong' => 8773, 'asymp' => 8776, 'ne' => 8800, 'equiv' => 8801, 
+	  'le' => 8804, 'ge' => 8805, 'sub' => 8834, 'sup' => 8835, 'nsub' => 8836, 
+	  'sube' => 8838, 'supe' => 8839, 'oplus' => 8853, 'otimes' => 8855, 
+	  'perp' => 8869, 'sdot' => 8901, 'lceil' => 8968, 'rceil' => 8969, 
+	  'lfloor' => 8970, 'rfloor' => 8971, 'lang' => 9001, 'rang' => 9002, 
+	  'loz' => 9674, 'spades' => 9824, 'clubs' => 9827, 'hearts' => 9829, 
+	  'diams' => 9830
+	);
+}
+
+/**
+ * An iterator for QueryPath.
+ *
+ * This provides iterator support for QueryPath. You do not need to construct
+ * a QueryPathIterator. QueryPath does this when its {@link QueryPath::getIterator()}
+ * method is called.
+ *
+ * @ingroup querypath_util
+ */
+class QueryPathIterator extends IteratorIterator {
+  public $options = array();
+  private $qp = NULL;
+  
+  public function current() {
+    if (!isset($this->qp)) {
+      $this->qp = qp(parent::current(), NULL, $this->options);
+    }
+    else {
+      $splos = new SplObjectStorage();
+      $splos->attach(parent::current());
+      $this->qp->setMatches($splos);
+    }
+    return $this->qp;
+  }
+}
+
+/**
+ * Manage default options.
+ *
+ * This class stores the default options for QueryPath. When a new 
+ * QueryPath object is constructed, options specified here will be 
+ * used.
+ *
+ * <b>Details</b>
+ * This class defines no options of its own. Instead, it provides a 
+ * central tool for developers to override options set by QueryPath.
+ * When a QueryPath object is created, it will evaluate options in the 
+ * following order:
+ *
+ * - Options passed into {@link qp()} have highest priority.
+ * - Options in {@link QueryPathOptions} (this class) have the next highest priority.
+ * - If the option is not specified elsewhere, QueryPath will use its own defaults.
+ *
+ * @see qp()
+ * @see QueryPathOptions::set()
+ * @ingroup querypath_util
+ */
+class QueryPathOptions {
+  
+  /**
+   * This is the static options array.
+   *
+   * Use the {@link set()}, {@link get()}, and {@link merge()} to
+   * modify this array.
+   */
+  static $options = array();
+  
+  /**
+   * Set the default options.
+   *
+   * The passed-in array will be used as the default options list.
+   *
+   * @param array $array
+   *  An associative array of options.
+   */
+  static function set($array) {
+    self::$options = $array;
+  }
+  
+  /**
+   * Get the default options.
+   *
+   * Get all options currently set as default.
+   *
+   * @return array
+   *  An array of options. Note that only explicitly set options are 
+   *  returned. {@link QueryPath} defines default options which are not
+   *  stored in this object.
+   */
+  static function get() {
+    return self::$options;
+  }
+  
+  /**
+   * Merge the provided array with existing options.
+   *
+   * On duplicate keys, the value in $array will overwrite the 
+   * value stored in the options.
+   *
+   * @param array $array
+   *  Associative array of options to merge into the existing options.
+   */
+  static function merge($array) {
+    self::$options = $array + self::$options;
+  }
+  
+  /**
+   * Returns true of the specified key is already overridden in this object.
+   *
+   * @param string $key
+   *  The key to search for.
+   */
+  static function has($key) {
+    return array_key_exists($key, self::$options);
+  }
+  
+}
+
+/**
+ * Exception indicating that a problem has occured inside of a QueryPath object.
+ *
+ * @ingroup querypath_core
+ */
+class QueryPathException extends Exception {}
+
+/**
+ * Exception indicating that a parser has failed to parse a file.
+ *
+ * This will report parser warnings as well as parser errors. It should only be 
+ * thrown, though, under error conditions.
+ *
+ * @ingroup querypath_core
+ */
+class QueryPathParseException extends QueryPathException {
+  const ERR_MSG_FORMAT = 'Parse error in %s on line %d column %d: %s (%d)';
+  const WARN_MSG_FORMAT = 'Parser warning in %s on line %d column %d: %s (%d)';
+  // trigger_error
+  public function __construct($msg = '', $code = 0, $file = NULL, $line = NULL) {
+
+    $msgs = array();
+    foreach(libxml_get_errors() as $err) {
+      $format = $err->level == LIBXML_ERR_WARNING ? self::WARN_MSG_FORMAT : self::ERR_MSG_FORMAT;
+      $msgs[] = sprintf($format, $err->file, $err->line, $err->column, $err->message, $err->code);
+    }
+    $msg .= implode("\n", $msgs);
+    
+    if (isset($file)) {
+      $msg .= ' (' . $file;
+      if (isset($line)) $msg .= ': ' . $line;
+      $msg .= ')';
+    }
+    
+    parent::__construct($msg, $code);
+  }
+  
+  public static function initializeFromError($code, $str, $file, $line, $cxt) {
+    //printf("\n\nCODE: %s %s\n\n", $code, $str);
+    $class = __CLASS__;
+    throw new $class($str, $code, $file, $line);
+  }
+}
+
+/**
+ * Indicates that an input/output exception has occurred.
+ *
+ * @ingroup querypath_core
+ */
+class QueryPathIOException extends QueryPathParseException {
+  public static function initializeFromError($code, $str, $file, $line, $cxt) {
+    $class = __CLASS__;
+    throw new $class($str, $code, $file, $line);
+  }
+  
+}
+\ No newline at end of file
diff --git a/lib/querypath/QueryPathExtension.php b/lib/querypath/QueryPathExtension.php
new file mode 100644
index 0000000..31e2694
--- /dev/null
+++ b/lib/querypath/QueryPathExtension.php
@@ -0,0 +1,195 @@
+<?php
+/** @file
+ * This file contains the Query Path extension tools.
+ *
+ * Query Path can be extended to support additional features. To do this, 
+ * you need only create a new class that implements {@link QueryPathExtension}
+ * and add your own methods. This class can then be registered as an extension. 
+ * It will then be available through Query Path.
+ *
+ * For information on building your own extension, see {@link QueryPathExtension}.
+ * If you are trying to load an extension you have downloaded, chances are good that
+ * all you need to do is {@link require_once} the file that contains the extension.
+ *
+ * @author M Butcher <matt@aleph-null.tv>
+ * @license http://opensource.org/licenses/lgpl-2.1.php LGPL or MIT-like license.
+ * @see QueryPathExtension
+ * @see QueryPathExtensionRegistry::extend()
+ */
+
+/** @addtogroup querypath_extensions Extensions
+ * The QueryPath extension system and bundled extensions.
+ *
+ * Much like jQuery, QueryPath provides a simple extension mechanism that allows 
+ * extensions to auto-register themselves upon being loaded. For a simple example, see
+ * QPXML. For the internals, see QueryPathExntesion and QueryPath::__construct().
+ */
+
+/**
+ * A QueryPathExtension is a tool that extends the capabilities of a QueryPath object.
+ *
+ * Extensions to QueryPath should implement the QueryPathExtension interface. The
+ * only requirement is that the extension provide a constructor that takes a
+ * QueryPath object as a parameter.
+ *
+ * Here is an example QueryPath extension:
+ * <code><?php
+ * class StubExtensionOne implements QueryPathExtension {
+ *   private $qp = NULL;
+ *   public function __construct(QueryPath $qp) {
+ *     $this->qp = $qp;
+ *   }
+ *
+ *   public function stubToe() {
+ *     $this->qp->find(':root')->append('<toe/>')->end();
+ *     return $this->qp;
+ *   }
+ * }
+ * QueryPathExtensionRegistry::extend('StubExtensionOne');
+ * ?></code>
+ * In this example, the StubExtensionOne class implements QueryPathExtension.
+ * The constructor stores a local copyof the QueryPath object. This is important
+ * if you are planning on fully integrating with QueryPath's Fluent Interface.
+ *
+ * Finally, the stubToe() function illustrates how the extension makes use of 
+ * QueryPath internally, and remains part of the fluent interface by returning
+ * the $qp object.
+ *
+ * Notice that beneath the class, there is a single call to register the 
+ * extension with QueryPath's registry. Your extension should end with a line 
+ * similar to this.
+ *
+ * <b>How is a QueryPath extension called?</b>
+ *
+ * QueryPath extensions are called like regular QueryPath functions. For 
+ * example, the extension above can be called like this:
+ * <code>
+ * qp('some.xml')->stubToe();
+ * </code>
+ * Since it returns the QueryPath ($qp) object, chaining is supported:
+ * <code>
+ * print qp('some.xml')->stubToe()->xml();
+ * </code>
+ * When you write your own extensions, anything that does not need to return a 
+ * specific value should return the QueryPath object. Between that and the 
+ * extension registry, this will provide the best developer experience.
+ *
+ * @ingroup querypath_extensions
+ */
+interface QueryPathExtension {
+  public function __construct(QueryPath $qp);
+}
+
+/**
+ * A registry for QueryPath extensions.
+ *
+ * QueryPath extensions should call the {@link QueryPathExtensionRegistry::extend()}
+ * function to register their extension classes. The QueryPath library then 
+ * uses this information to determine what QueryPath extensions should be loaded and
+ * executed.
+ *
+ * @ingroup querypath_extensions
+ */
+class QueryPathExtensionRegistry {
+  /**
+   * Internal flag indicating whether or not the registry should
+   * be used for automatic extension loading. If this is false, then
+   * implementations should not automatically load extensions.
+   */
+  public static $useRegistry = TRUE;
+  /**
+   * The extension registry. This should consist of an array of class
+   * names.
+   */
+  protected static $extensionRegistry = array();
+  protected static $extensionMethodRegistry = array();
+  /**
+   * Extend QueryPath with the given extension class.
+   */
+  public static function extend($classname) {
+    self::$extensionRegistry[] = $classname;
+    $class = new ReflectionClass($classname);
+    $methods = $class->getMethods();
+    foreach ($methods as $method) {
+      self::$extensionMethodRegistry[$method->getName()] = $classname;
+    }
+  }
+  
+  /**
+   * Check to see if a method is known.
+   * This checks to see if the given method name belongs to one of the 
+   * registered extensions. If it does, then this will return TRUE.
+   *
+   * @param string $name
+   *  The name of the method to search for.
+   * @return boolean
+   *  TRUE if the method exists, false otherwise.
+   */
+  public static function hasMethod($name) {
+    return isset(self::$extensionMethodRegistry[$name]);
+  }
+  
+  /**
+   * Check to see if the given extension class is registered.
+   * Given a class name for a {@link QueryPathExtension} class, this 
+   * will check to see if that class is registered. If so, it will return
+   * TRUE.
+   * 
+   * @param string $name
+   *  The name of the class.
+   * @return boolean
+   *  TRUE if the class is registered, FALSE otherwise.
+   */
+  public static function hasExtension($name) {
+    return in_array($name, self::$extensionRegistry);
+  }
+  
+  /**
+   * Get the class that a given method belongs to.
+   * Given a method name, this will check all registered extension classes
+   * to see if any of them has the named method. If so, this will return 
+   * the classname.
+   *
+   * Note that if two extensions are registered that contain the same 
+   * method name, the last one registred will be the only one recognized.
+   *
+   * @param string $name
+   *  The name of the method.
+   * @return string
+   *  The name of the class.
+   */
+  public static function getMethodClass($name) {
+    return self::$extensionMethodRegistry[$name];
+  }
+  
+  /**
+   * Get extensions for the given QueryPath object.
+   *
+   * Given a {@link QueryPath} object, this will return
+   * an associative array of extension names to (new) instances.
+   * Generally, this is intended to be used internally.
+   *
+   * @param QueryPath $qp
+   *  The QueryPath into which the extensions should be registered.
+   * @return array
+   *  An associative array of classnames to instances.
+   */
+  public static function getExtensions(QueryPath $qp) {
+    $extInstances = array();
+    foreach (self::$extensionRegistry as $ext) {
+      $extInstances[$ext] = new $ext($qp);
+    }
+    return $extInstances;
+  }
+  
+  /**
+   * Enable or disable automatic extension loading.
+   *
+   * If extension autoloading is disabled, then QueryPath will not 
+   * automatically load all registred extensions when a new QueryPath
+   * object is created using {@link qp()}.
+   */
+  public static function autoloadExtensions($boolean = TRUE) {
+    self::$useRegistry = $boolean;
+  }
+}
+\ No newline at end of file
diff --git a/lib/smarty-plugins/block.t.php b/lib/smarty-plugins/block.t.php
new file mode 100644
index 0000000..5b6bc8e
--- /dev/null
+++ b/lib/smarty-plugins/block.t.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * block.t.php - Smarty gettext block plugin
+ *
+ * ------------------------------------------------------------------------- *
+ * This library is free software; you can redistribute it and/or             *
+ * modify it under the terms of the GNU Lesser General Public                *
+ * License as published by the Free Software Foundation; either              *
+ * version 2.1 of the License, or (at your option) any later version.        *
+ *                                                                           *
+ * This library is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU         *
+ * Lesser General Public License for more details.                           *
+ *                                                                           *
+ * You should have received a copy of the GNU Lesser General Public          *
+ * License along with this library; if not, write to the Free Software       *
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA *
+ * ------------------------------------------------------------------------- *
+ *
+ * Installation: simply copy this file to the smarty plugins directory.
+ *
+ * @package	smarty-gettext
+ * @version	$Id: block.t.php 5422 2009-08-27 17:04:11Z rtasarz $
+ * @link	http://smarty-gettext.sourceforge.net/
+ * @author	Sagi Bashari <sagi@boom.org.il>
+ * @copyright 2004-2005 Sagi Bashari
+ */
+ 
+/**
+ * Replaces arguments in a string with their values.
+ * Arguments are represented by % followed by their number.
+ *
+ * @param	string	Source string
+ * @param	mixed	Arguments, can be passed in an array or through single variables.
+ * @returns	string	Modified string
+ */
+function smarty_gettext_strarg($str)
+{
+	$tr = array();
+	$p = 0;
+
+	for ($i=1; $i < func_num_args(); $i++) {
+		$arg = func_get_arg($i);
+		
+		if (is_array($arg)) {
+			foreach ($arg as $aarg) {
+				$tr['%'.++$p] = $aarg;
+			}
+		} else {
+			$tr['%'.++$p] = $arg;
+		}
+	}
+	
+	return strtr($str, $tr);
+}
+
+/**
+ * Smarty block function, provides gettext support for smarty.
+ *
+ * The block content is the text that should be translated.
+ *
+ * Any parameter that is sent to the function will be represented as %n in the translation text, 
+ * where n is 1 for the first parameter. The following parameters are reserved:
+ *   - escape - sets escape mode:
+ *       - 'html' for HTML escaping, this is the default.
+ *       - 'js' for javascript escaping.
+ *       - 'url' for url escaping.
+ *       - 'no'/'off'/0 - turns off escaping
+ *   - plural - The plural version of the text (2nd parameter of ngettext())
+ *   - count - The item count for plural mode (3rd parameter of ngettext())
+ */
+function smarty_block_t($params, $text, &$smarty)
+{
+  if(!$text) {
+    return;
+  }
+  $text = stripslashes($text);
+  
+  // set escape mode
+  if (isset($params['escape'])) {
+    $escape = $params['escape'];
+    unset($params['escape']);
+  }
+  
+  // set plural version
+  if (isset($params['plural'])) {
+    $plural = $params['plural'];
+    unset($params['plural']);
+    
+    // set count
+    if (isset($params['count'])) {
+      $count = $params['count'];
+      unset($params['count']);
+    }
+  }
+  
+  // use plural if required parameters are set
+  if (isset($count) && isset($plural)) {
+    $text = ngettext($text, $plural, $count);
+  } else { // use normal
+    $text = gettext($text);
+  }
+  
+  // run strarg if there are parameters
+  if (count($params)) {
+    $text = smarty_gettext_strarg($text, $params);
+  }
+  
+  if (!isset($escape) || $escape == 'html') { // html escape, default
+    $text = nl2br(htmlspecialchars($text));
+  } elseif (isset($escape)) {
+    switch ($escape) {
+    case 'javascript':
+    case 'js':
+      // javascript escape
+      $text = str_replace('\'', '\\\'', stripslashes($text));
+      break;
+    case 'url':
+      // url escape
+      $text = urlencode($text);
+      break;
+    }
+  }
+  return $text;
+}
+
+?>
diff --git a/lib/smarty-plugins/block.vertical.php b/lib/smarty-plugins/block.vertical.php
new file mode 100644
index 0000000..f0c0c13
--- /dev/null
+++ b/lib/smarty-plugins/block.vertical.php
@@ -0,0 +1,16 @@
+<?php
+
+function smarty_block_vertical($params, $text, &$smarty) {
+
+    if (isset($params['strip'])) {
+        $text = strip_tags($text);
+    }
+
+    $array = array();
+    preg_match_all('/<.*>|[^\.]\.*/', $text, $array);
+
+    return join('<br />', $array[0]);
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty-plugins/function.suit.php b/lib/smarty-plugins/function.suit.php
new file mode 100644
index 0000000..eb166d9
--- /dev/null
+++ b/lib/smarty-plugins/function.suit.php
@@ -0,0 +1,24 @@
+<?php
+
+function smarty_function_suit($params, &$smarty) {
+
+    $params['color'] = strtolower($params['color']);
+
+    static $entities = array(
+                             'c' => '&clubs;',
+                             'd' => '&diams;',
+                             'h' => '&hearts;',
+                             's' => '&spades;'
+                             );
+    static $colors = array(
+                           'c' => 'black',
+                           'd' => 'red',
+                           'h' => 'red',
+                           's' => 'black'
+                           );
+
+    return '<span style="color: '.$colors[$params['color']].'">'.$entities[$params['color']].'</span>';
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty-plugins/function.varvar.php b/lib/smarty-plugins/function.varvar.php
new file mode 100644
index 0000000..36c9776
--- /dev/null
+++ b/lib/smarty-plugins/function.varvar.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Smarty {varvar} function plugin
+ *
+ * Type:     function
+ * Name:     varvar
+ * Purpose:  Assume the input is a string, and if a smarty variable with that name
+ *          is set, return its value. Otherwise, return the original string
+ * @param array
+ * @param Smarty
+ */
+function smarty_function_varvar($params, &$smarty) {
+    $value = $smarty->getTemplateVars();
+    $ret = $value[$params['var']];
+    if ($ret) {
+        return $ret;
+    } else {
+        return $params['var'];
+    }
+}
+?>
+\ No newline at end of file
diff --git a/lib/smarty/Smarty.class.php b/lib/smarty/Smarty.class.php
new file mode 100644
index 0000000..379d8d4
--- /dev/null
+++ b/lib/smarty/Smarty.class.php
@@ -0,0 +1,1502 @@
+<?php
+/**
+ * Project:     Smarty: the PHP compiling template engine
+ * File:        Smarty.class.php
+ * SVN:         $Id: Smarty.class.php 4518 2011-12-18 18:48:07Z rodneyrehm $
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * For questions, help, comments, discussion, etc., please join the
+ * Smarty mailing list. Send a blank e-mail to
+ * smarty-discussion-subscribe@googlegroups.com
+ *
+ * @link http://www.smarty.net/
+ * @copyright 2008 New Digital Group, Inc.
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Uwe Tews
+ * @author Rodney Rehm
+ * @package Smarty
+ * @version 3.1.7
+ */
+
+/**
+ * define shorthand directory separator constant
+ */
+if (!defined('DS')) {
+    define('DS', DIRECTORY_SEPARATOR);
+}
+
+/**
+ * set SMARTY_DIR to absolute path to Smarty library files.
+ * Sets SMARTY_DIR only if user application has not already defined it.
+ */
+if (!defined('SMARTY_DIR')) {
+    define('SMARTY_DIR', dirname(__FILE__) . DS);
+}
+
+/**
+ * set SMARTY_SYSPLUGINS_DIR to absolute path to Smarty internal plugins.
+ * Sets SMARTY_SYSPLUGINS_DIR only if user application has not already defined it.
+ */
+if (!defined('SMARTY_SYSPLUGINS_DIR')) {
+    define('SMARTY_SYSPLUGINS_DIR', SMARTY_DIR . 'sysplugins' . DS);
+}
+if (!defined('SMARTY_PLUGINS_DIR')) {
+    define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DS);
+}
+if (!defined('SMARTY_MBSTRING')) {
+    define('SMARTY_MBSTRING', function_exists('mb_strlen'));
+}
+if (!defined('SMARTY_RESOURCE_CHAR_SET')) {
+    // UTF-8 can only be done properly when mbstring is available!
+    /**
+     * @deprecated in favor of Smarty::$_CHARSET
+     */
+    define('SMARTY_RESOURCE_CHAR_SET', SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1');
+}
+if (!defined('SMARTY_RESOURCE_DATE_FORMAT')) {
+    /**
+     * @deprecated in favor of Smarty::$_DATE_FORMAT
+     */
+    define('SMARTY_RESOURCE_DATE_FORMAT', '%b %e, %Y');
+}
+
+/**
+ * register the class autoloader
+ */
+if (!defined('SMARTY_SPL_AUTOLOAD')) {
+    define('SMARTY_SPL_AUTOLOAD', 0);
+}
+
+if (SMARTY_SPL_AUTOLOAD && set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false) {
+    $registeredAutoLoadFunctions = spl_autoload_functions();
+    if (!isset($registeredAutoLoadFunctions['spl_autoload'])) {
+        spl_autoload_register();
+    }
+} else {
+    spl_autoload_register('smartyAutoload');
+}
+
+/**
+ * Load always needed external class files
+ */
+include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_data.php';
+include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_templatebase.php';
+include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_template.php';
+include_once SMARTY_SYSPLUGINS_DIR.'smarty_resource.php';
+include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_resource_file.php';
+include_once SMARTY_SYSPLUGINS_DIR.'smarty_cacheresource.php';
+include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_cacheresource_file.php';
+
+/**
+ * This is the main Smarty class
+ * @package Smarty
+ */
+class Smarty extends Smarty_Internal_TemplateBase {
+
+    /**#@+
+     * constant definitions
+     */
+
+    /**
+     * smarty version
+     */
+    const SMARTY_VERSION = 'Smarty-3.1.7';
+
+    /**
+     * define variable scopes
+     */
+    const SCOPE_LOCAL = 0;
+    const SCOPE_PARENT = 1;
+    const SCOPE_ROOT = 2;
+    const SCOPE_GLOBAL = 3;
+    /**
+     * define caching modes
+     */
+    const CACHING_OFF = 0;
+    const CACHING_LIFETIME_CURRENT = 1;
+    const CACHING_LIFETIME_SAVED = 2;
+    /**
+     * define compile check modes
+     */
+    const COMPILECHECK_OFF = 0;
+    const COMPILECHECK_ON = 1;
+    const COMPILECHECK_CACHEMISS = 2;
+    /**
+     * modes for handling of "<?php ... ?>" tags in templates.
+     */
+    const PHP_PASSTHRU = 0; //-> print tags as plain text
+    const PHP_QUOTE = 1; //-> escape tags as entities
+    const PHP_REMOVE = 2; //-> escape tags as entities
+    const PHP_ALLOW = 3; //-> escape tags as entities
+    /**
+     * filter types
+     */
+    const FILTER_POST = 'post';
+    const FILTER_PRE = 'pre';
+    const FILTER_OUTPUT = 'output';
+    const FILTER_VARIABLE = 'variable';
+    /**
+     * plugin types
+     */
+    const PLUGIN_FUNCTION = 'function';
+    const PLUGIN_BLOCK = 'block';
+    const PLUGIN_COMPILER = 'compiler';
+    const PLUGIN_MODIFIER = 'modifier';
+    const PLUGIN_MODIFIERCOMPILER = 'modifiercompiler';
+
+    /**#@-*/
+
+    /**
+     * assigned global tpl vars
+     */
+    public static $global_tpl_vars = array();
+
+    /**
+     * error handler returned by set_error_hanlder() in Smarty::muteExpectedErrors()
+     */
+    public static $_previous_error_handler = null;
+    /**
+     * contains directories outside of SMARTY_DIR that are to be muted by muteExpectedErrors()
+     */
+    public static $_muted_directories = array();
+    /**
+     * Flag denoting if Multibyte String functions are available
+     */
+    public static $_MBSTRING = SMARTY_MBSTRING;
+    /**
+     * The character set to adhere to (e.g. "UTF-8")
+     */
+    public static $_CHARSET = SMARTY_RESOURCE_CHAR_SET;
+    /**
+     * The date format to be used internally
+     * (accepts date() and strftime())
+     */
+    public static $_DATE_FORMAT = SMARTY_RESOURCE_DATE_FORMAT;
+    /**
+     * Flag denoting if PCRE should run in UTF-8 mode
+     */
+    public static $_UTF8_MODIFIER = 'u';
+    
+    
+    /**#@+
+     * variables
+     */
+
+    /**
+     * auto literal on delimiters with whitspace
+     * @var boolean
+     */
+    public $auto_literal = true;
+    /**
+     * display error on not assigned variables
+     * @var boolean
+     */
+    public $error_unassigned = false;
+    /**
+     * look up relative filepaths in include_path
+     * @var boolean
+     */
+    public $use_include_path = false;
+    /**
+     * template directory
+     * @var array
+     */
+    private $template_dir = array();
+    /**
+     * joined template directory string used in cache keys
+     * @var string
+     */
+    public $joined_template_dir = null;
+    /**
+     * joined config directory string used in cache keys
+     * @var string
+     */
+    public $joined_config_dir = null;
+    /**
+     * default template handler
+     * @var callable
+     */
+    public $default_template_handler_func = null;
+    /**
+     * default config handler
+     * @var callable
+     */
+    public $default_config_handler_func = null;
+    /**
+     * default plugin handler
+     * @var callable
+     */
+    public $default_plugin_handler_func = null;
+    /**
+     * compile directory
+     * @var string
+     */
+    private $compile_dir = null;
+    /**
+     * plugins directory
+     * @var array
+     */
+    private $plugins_dir = array();
+    /**
+     * cache directory
+     * @var string
+     */
+    private $cache_dir = null;
+    /**
+     * config directory
+     * @var array
+     */
+    private $config_dir = array();
+    /**
+     * force template compiling?
+     * @var boolean
+     */
+    public $force_compile = false;
+    /**
+     * check template for modifications?
+     * @var boolean
+     */
+    public $compile_check = true;
+    /**
+     * use sub dirs for compiled/cached files?
+     * @var boolean
+     */
+    public $use_sub_dirs = false;
+    /**
+     * allow ambiguous resources (that are made unique by the resource handler)
+     * @var boolean
+     */
+    public $allow_ambiguous_resources = false;
+    /**
+     * caching enabled
+     * @var boolean
+     */
+    public $caching = false;
+    /**
+     * merge compiled includes
+     * @var boolean
+     */
+    public $merge_compiled_includes = false;
+    /**
+     * cache lifetime in seconds
+     * @var integer
+     */
+    public $cache_lifetime = 3600;
+    /**
+     * force cache file creation
+     * @var boolean
+     */
+    public $force_cache = false;
+    /**
+     * Set this if you want different sets of cache files for the same
+     * templates.
+     *
+     * @var string
+     */
+    public $cache_id = null;
+    /**
+     * Set this if you want different sets of compiled files for the same
+     * templates.
+     *
+     * @var string
+     */
+    public $compile_id = null;
+    /**
+     * template left-delimiter
+     * @var string
+     */
+    public $left_delimiter = "{";
+    /**
+     * template right-delimiter
+     * @var string
+     */
+    public $right_delimiter = "}";
+    /**#@+
+     * security
+     */
+    /**
+     * class name
+     *
+     * This should be instance of Smarty_Security.
+     *
+     * @var string
+     * @see Smarty_Security
+     */
+    public $security_class = 'Smarty_Security';
+    /**
+     * implementation of security class
+     *
+     * @var Smarty_Security
+     */
+    public $security_policy = null;
+    /**
+     * controls handling of PHP-blocks
+     *
+     * @var integer
+     */
+    public $php_handling = self::PHP_PASSTHRU;
+    /**
+     * controls if the php template file resource is allowed
+     *
+     * @var bool
+     */
+    public $allow_php_templates = false;
+    /**
+     * Should compiled-templates be prevented from being called directly?
+     *
+     * {@internal
+     * Currently used by Smarty_Internal_Template only.
+     * }}
+     *
+     * @var boolean
+     */
+    public $direct_access_security = true;
+    /**#@-*/
+    /**
+     * debug mode
+     *
+     * Setting this to true enables the debug-console.
+     *
+     * @var boolean
+     */
+    public $debugging = false;
+    /**
+     * This determines if debugging is enable-able from the browser.
+     * <ul>
+     *  <li>NONE => no debugging control allowed</li>
+     *  <li>URL => enable debugging when SMARTY_DEBUG is found in the URL.</li>
+     * </ul>
+     * @var string
+     */
+    public $debugging_ctrl = 'NONE';
+    /**
+     * Name of debugging URL-param.
+     *
+     * Only used when $debugging_ctrl is set to 'URL'.
+     * The name of the URL-parameter that activates debugging.
+     *
+     * @var type
+     */
+    public $smarty_debug_id = 'SMARTY_DEBUG';
+    /**
+     * Path of debug template.
+     * @var string
+     */
+    public $debug_tpl = null;
+    /**
+     * When set, smarty uses this value as error_reporting-level.
+     * @var int
+     */
+    public $error_reporting = null;
+    /**
+     * Internal flag for getTags()
+     * @var boolean
+     */
+    public $get_used_tags = false;
+
+    /**#@+
+     * config var settings
+     */
+
+    /**
+     * Controls whether variables with the same name overwrite each other.
+     * @var boolean
+     */
+    public $config_overwrite = true;
+    /**
+     * Controls whether config values of on/true/yes and off/false/no get converted to boolean.
+     * @var boolean
+     */
+    public $config_booleanize = true;
+    /**
+     * Controls whether hidden config sections/vars are read from the file.
+     * @var boolean
+     */
+    public $config_read_hidden = false;
+
+    /**#@-*/
+
+    /**#@+
+     * resource locking
+     */
+
+    /**
+     * locking concurrent compiles
+     * @var boolean
+     */
+    public $compile_locking = true;
+    /**
+     * Controls whether cache resources should emply locking mechanism
+     * @var boolean
+     */
+    public $cache_locking = false;
+    /**
+     * seconds to wait for acquiring a lock before ignoring the write lock
+     * @var float
+     */
+    public $locking_timeout = 10;
+
+    /**#@-*/
+
+    /**
+     * global template functions
+     * @var array
+     */
+    public $template_functions = array();
+    /**
+     * resource type used if none given
+     *
+     * Must be an valid key of $registered_resources.
+     * @var string
+     */
+    public $default_resource_type = 'file';
+    /**
+     * caching type
+     *
+     * Must be an element of $cache_resource_types.
+     *
+     * @var string
+     */
+    public $caching_type = 'file';
+    /**
+     * internal config properties
+     * @var array
+     */
+    public $properties = array();
+    /**
+     * config type
+     * @var string
+     */
+    public $default_config_type = 'file';
+    /**
+     * cached template objects
+     * @var array
+     */
+    public $template_objects = array();
+    /**
+     * check If-Modified-Since headers
+     * @var boolean
+     */
+    public $cache_modified_check = false;
+    /**
+     * registered plugins
+     * @var array
+     */
+    public $registered_plugins = array();
+    /**
+     * plugin search order
+     * @var array
+     */
+    public $plugin_search_order = array('function', 'block', 'compiler', 'class');
+    /**
+     * registered objects
+     * @var array
+     */
+    public $registered_objects = array();
+    /**
+     * registered classes
+     * @var array
+     */
+    public $registered_classes = array();
+    /**
+     * registered filters
+     * @var array
+     */
+    public $registered_filters = array();
+    /**
+     * registered resources
+     * @var array
+     */
+    public $registered_resources = array();
+    /**
+     * resource handler cache
+     * @var array
+     */
+    public $_resource_handlers = array();
+    /**
+     * registered cache resources
+     * @var array
+     */
+    public $registered_cache_resources = array();
+    /**
+     * cache resource handler cache
+     * @var array
+     */
+    public $_cacheresource_handlers = array();
+    /**
+     * autoload filter
+     * @var array
+     */
+    public $autoload_filters = array();
+    /**
+     * default modifier
+     * @var array
+     */
+    public $default_modifiers = array();
+    /**
+     * autoescape variable output
+     * @var boolean
+     */
+    public $escape_html = false;
+    /**
+     * global internal smarty vars
+     * @var array
+     */
+    public static $_smarty_vars = array();
+    /**
+     * start time for execution time calculation
+     * @var int
+     */
+    public $start_time = 0;
+    /**
+     * default file permissions
+     * @var int
+     */
+    public $_file_perms = 0644;
+    /**
+     * default dir permissions
+     * @var int
+     */
+    public $_dir_perms = 0771;
+    /**
+     * block tag hierarchy
+     * @var array
+     */
+    public $_tag_stack = array();
+    /**
+     * self pointer to Smarty object
+     * @var Smarty
+     */
+    public $smarty;
+    /**
+     * required by the compiler for BC
+     * @var string
+     */
+    public $_current_file = null;
+    /**
+     * internal flag to enable parser debugging
+     * @var bool
+     */
+    public $_parserdebug = false;
+    /**
+     * Saved parameter of merged templates during compilation
+     *
+     * @var array
+     */
+    public $merged_templates_func = array();
+    /**#@-*/
+
+    /**
+     * Initialize new Smarty object
+     *
+     */
+    public function __construct()
+    {
+        // selfpointer needed by some other class methods
+        $this->smarty = $this;
+        if (is_callable('mb_internal_encoding')) {
+            mb_internal_encoding(Smarty::$_CHARSET);
+        }
+        $this->start_time = microtime(true);
+        // set default dirs
+        $this->setTemplateDir('.' . DS . 'templates' . DS)
+            ->setCompileDir('.' . DS . 'templates_c' . DS)
+            ->setPluginsDir(SMARTY_PLUGINS_DIR)
+            ->setCacheDir('.' . DS . 'cache' . DS)
+            ->setConfigDir('.' . DS . 'configs' . DS);
+
+        $this->debug_tpl = 'file:' . dirname(__FILE__) . '/debug.tpl';
+        if (isset($_SERVER['SCRIPT_NAME'])) {
+            $this->assignGlobal('SCRIPT_NAME', $_SERVER['SCRIPT_NAME']);
+        }
+    }
+
+
+    /**
+     * Class destructor
+     */
+    public function __destruct()
+    {
+        // intentionally left blank
+    }
+
+    /**
+     * <<magic>> set selfpointer on cloned object
+     */
+    public function __clone()
+    {
+        $this->smarty = $this;
+    }
+
+
+    /**
+     * <<magic>> Generic getter.
+     *
+     * Calls the appropriate getter function.
+     * Issues an E_USER_NOTICE if no valid getter is found.
+     *
+     * @param string $name property name
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        $allowed = array(
+        'template_dir' => 'getTemplateDir',
+        'config_dir' => 'getConfigDir',
+        'plugins_dir' => 'getPluginsDir',
+        'compile_dir' => 'getCompileDir',
+        'cache_dir' => 'getCacheDir',
+        );
+
+        if (isset($allowed[$name])) {
+            return $this->{$allowed[$name]}();
+        } else {
+            trigger_error('Undefined property: '. get_class($this) .'::$'. $name, E_USER_NOTICE);
+        }
+    }
+
+    /**
+     * <<magic>> Generic setter.
+     *
+     * Calls the appropriate setter function.
+     * Issues an E_USER_NOTICE if no valid setter is found.
+     *
+     * @param string $name  property name
+     * @param mixed  $value parameter passed to setter
+     */
+    public function __set($name, $value)
+    {
+        $allowed = array(
+        'template_dir' => 'setTemplateDir',
+        'config_dir' => 'setConfigDir',
+        'plugins_dir' => 'setPluginsDir',
+        'compile_dir' => 'setCompileDir',
+        'cache_dir' => 'setCacheDir',
+        );
+
+        if (isset($allowed[$name])) {
+            $this->{$allowed[$name]}($value);
+        } else {
+            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+        }
+    }
+
+    /**
+     * Check if a template resource exists
+     *
+     * @param string $resource_name template name
+     * @return boolean status
+     */
+    public function templateExists($resource_name)
+    {
+        // create template object
+        $save = $this->template_objects;
+        $tpl = new $this->template_class($resource_name, $this);
+        // check if it does exists
+        $result = $tpl->source->exists;
+        $this->template_objects = $save;
+        return $result;
+    }
+
+    /**
+     * Returns a single or all global  variables
+     *
+     * @param object $smarty
+     * @param string $varname variable name or null
+     * @return string variable value or or array of variables
+     */
+    public function getGlobal($varname = null)
+    {
+        if (isset($varname)) {
+            if (isset(self::$global_tpl_vars[$varname])) {
+                return self::$global_tpl_vars[$varname]->value;
+            } else {
+                return '';
+            }
+        } else {
+            $_result = array();
+            foreach (self::$global_tpl_vars AS $key => $var) {
+                $_result[$key] = $var->value;
+            }
+            return $_result;
+        }
+    }
+
+    /**
+     * Empty cache folder
+     *
+     * @param integer $exp_time expiration time
+     * @param string  $type     resource type
+     * @return integer number of cache files deleted
+     */
+    function clearAllCache($exp_time = null, $type = null)
+    {
+        // load cache resource and call clearAll
+        $_cache_resource = Smarty_CacheResource::load($this, $type);
+        Smarty_CacheResource::invalidLoadedCache($this);
+        return $_cache_resource->clearAll($this, $exp_time);
+    }
+
+    /**
+     * Empty cache for a specific template
+     *
+     * @param string  $template_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time
+     * @param string  $type          resource type
+     * @return integer number of cache files deleted
+     */
+    public function clearCache($template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null)
+    {
+        // load cache resource and call clear
+        $_cache_resource = Smarty_CacheResource::load($this, $type);
+        Smarty_CacheResource::invalidLoadedCache($this);
+        return $_cache_resource->clear($this, $template_name, $cache_id, $compile_id, $exp_time);
+    }
+
+    /**
+     * Loads security class and enables security
+     *
+     * @param string|Smarty_Security $security_class if a string is used, it must be class-name
+     * @return Smarty current Smarty instance for chaining
+     * @throws SmartyException when an invalid class name is provided
+     */
+    public function enableSecurity($security_class = null)
+    {
+        if ($security_class instanceof Smarty_Security) {
+            $this->security_policy = $security_class;
+            return $this;
+        } elseif (is_object($security_class)) {
+            throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
+        }
+        if ($security_class == null) {
+            $security_class = $this->security_class;
+        }
+        if (!class_exists($security_class)) {
+            throw new SmartyException("Security class '$security_class' is not defined");
+        } elseif ($security_class !== 'Smarty_Security' && !is_subclass_of($security_class, 'Smarty_Security')) {
+            throw new SmartyException("Class '$security_class' must extend Smarty_Security.");
+        } else {
+            $this->security_policy = new $security_class($this);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Disable security
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function disableSecurity()
+    {
+        $this->security_policy = null;
+
+        return $this;
+    }
+
+    /**
+     * Set template directory
+     *
+     * @param string|array $template_dir directory(s) of template sources
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function setTemplateDir($template_dir)
+    {
+        $this->template_dir = array();
+        foreach ((array) $template_dir as $k => $v) {
+            $this->template_dir[$k] = rtrim($v, '/\\') . DS;
+        }
+
+        $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir);
+        return $this;
+    }
+
+    /**
+     * Add template directory(s)
+     *
+     * @param string|array $template_dir directory(s) of template sources
+     * @param string       $key          of the array element to assign the template dir to
+     * @return Smarty current Smarty instance for chaining
+     * @throws SmartyException when the given template directory is not valid
+     */
+    public function addTemplateDir($template_dir, $key=null)
+    {
+        // make sure we're dealing with an array
+        $this->template_dir = (array) $this->template_dir;
+
+        if (is_array($template_dir)) {
+            foreach ($template_dir as $k => $v) {
+                if (is_int($k)) {
+                    // indexes are not merged but appended
+                    $this->template_dir[] = rtrim($v, '/\\') . DS;
+                } else {
+                    // string indexes are overridden
+                    $this->template_dir[$k] = rtrim($v, '/\\') . DS;
+                }
+            }
+        } elseif ($key !== null) {
+            // override directory at specified index
+            $this->template_dir[$key] = rtrim($template_dir, '/\\') . DS;
+        } else {
+            // append new directory
+            $this->template_dir[] = rtrim($template_dir, '/\\') . DS;
+        }
+        $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir);
+        return $this;
+    }
+
+    /**
+     * Get template directories
+     *
+     * @param mixed index of directory to get, null to get all
+     * @return array|string list of template directories, or directory of $index
+     */
+    public function getTemplateDir($index=null)
+    {
+        if ($index !== null) {
+            return isset($this->template_dir[$index]) ? $this->template_dir[$index] : null;
+        }
+
+        return (array)$this->template_dir;
+    }
+
+    /**
+     * Set config directory
+     *
+     * @param string|array $template_dir directory(s) of configuration sources
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function setConfigDir($config_dir)
+    {
+        $this->config_dir = array();
+        foreach ((array) $config_dir as $k => $v) {
+            $this->config_dir[$k] = rtrim($v, '/\\') . DS;
+        }
+
+        $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
+        return $this;
+    }
+
+    /**
+     * Add config directory(s)
+     *
+     * @param string|array $config_dir directory(s) of config sources
+     * @param string key of the array element to assign the config dir to
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function addConfigDir($config_dir, $key=null)
+    {
+        // make sure we're dealing with an array
+        $this->config_dir = (array) $this->config_dir;
+
+        if (is_array($config_dir)) {
+            foreach ($config_dir as $k => $v) {
+                if (is_int($k)) {
+                    // indexes are not merged but appended
+                    $this->config_dir[] = rtrim($v, '/\\') . DS;
+                } else {
+                    // string indexes are overridden
+                    $this->config_dir[$k] = rtrim($v, '/\\') . DS;
+                }
+            }
+        } elseif( $key !== null ) {
+            // override directory at specified index
+            $this->config_dir[$key] = rtrim($config_dir, '/\\') . DS;
+        } else {
+            // append new directory
+            $this->config_dir[] = rtrim($config_dir, '/\\') . DS;
+        }
+
+        $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
+        return $this;
+    }
+
+    /**
+     * Get config directory
+     *
+     * @param mixed index of directory to get, null to get all
+     * @return array|string configuration directory
+     */
+    public function getConfigDir($index=null)
+    {
+        if ($index !== null) {
+            return isset($this->config_dir[$index]) ? $this->config_dir[$index] : null;
+        }
+
+        return (array)$this->config_dir;
+    }
+
+    /**
+     * Set plugins directory
+     *
+     * @param string|array $plugins_dir directory(s) of plugins
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function setPluginsDir($plugins_dir)
+    {
+        $this->plugins_dir = array();
+        foreach ((array)$plugins_dir as $k => $v) {
+            $this->plugins_dir[$k] = rtrim($v, '/\\') . DS;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Adds directory of plugin files
+     *
+     * @param object $smarty
+     * @param string $ |array $ plugins folder
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function addPluginsDir($plugins_dir)
+    {
+        // make sure we're dealing with an array
+        $this->plugins_dir = (array) $this->plugins_dir;
+
+        if (is_array($plugins_dir)) {
+            foreach ($plugins_dir as $k => $v) {
+                if (is_int($k)) {
+                    // indexes are not merged but appended
+                    $this->plugins_dir[] = rtrim($v, '/\\') . DS;
+                } else {
+                    // string indexes are overridden
+                    $this->plugins_dir[$k] = rtrim($v, '/\\') . DS;
+                }
+            }
+        } else {
+            // append new directory
+            $this->plugins_dir[] = rtrim($plugins_dir, '/\\') . DS;
+        }
+
+        $this->plugins_dir = array_unique($this->plugins_dir);
+        return $this;
+    }
+
+    /**
+     * Get plugin directories
+     *
+     * @return array list of plugin directories
+     */
+    public function getPluginsDir()
+    {
+        return (array)$this->plugins_dir;
+    }
+
+    /**
+     * Set compile directory
+     *
+     * @param string $compile_dir directory to store compiled templates in
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function setCompileDir($compile_dir)
+    {
+        $this->compile_dir = rtrim($compile_dir, '/\\') . DS;
+        if (!isset(Smarty::$_muted_directories[$this->compile_dir])) {
+            Smarty::$_muted_directories[$this->compile_dir] = null;
+        }
+        return $this;
+    }
+
+    /**
+     * Get compiled directory
+     *
+     * @return string path to compiled templates
+     */
+    public function getCompileDir()
+    {
+        return $this->compile_dir;
+    }
+
+    /**
+     * Set cache directory
+     *
+     * @param string $cache_dir directory to store cached templates in
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function setCacheDir($cache_dir)
+    {
+        $this->cache_dir = rtrim($cache_dir, '/\\') . DS;
+        if (!isset(Smarty::$_muted_directories[$this->cache_dir])) {
+            Smarty::$_muted_directories[$this->cache_dir] = null;
+        }
+        return $this;
+    }
+
+    /**
+     * Get cache directory
+     *
+     * @return string path of cache directory
+     */
+    public function getCacheDir()
+    {
+        return $this->cache_dir;
+    }
+
+    /**
+     * Set default modifiers
+     *
+     * @param array|string $modifiers modifier or list of modifiers to set
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function setDefaultModifiers($modifiers)
+    {
+        $this->default_modifiers = (array) $modifiers;
+        return $this;
+    }
+
+    /**
+     * Add default modifiers
+     *
+     * @param array|string $modifiers modifier or list of modifiers to add
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function addDefaultModifiers($modifiers)
+    {
+        if (is_array($modifiers)) {
+            $this->default_modifiers = array_merge($this->default_modifiers, $modifiers);
+        } else {
+            $this->default_modifiers[] = $modifiers;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get default modifiers
+     *
+     * @return array list of default modifiers
+     */
+    public function getDefaultModifiers()
+    {
+        return $this->default_modifiers;
+    }
+
+
+    /**
+     * Set autoload filters
+     *
+     * @param array $filters filters to load automatically
+     * @param string $type "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function setAutoloadFilters($filters, $type=null)
+    {
+        if ($type !== null) {
+            $this->autoload_filters[$type] = (array) $filters;
+        } else {
+            $this->autoload_filters = (array) $filters;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add autoload filters
+     *
+     * @param array $filters filters to load automatically
+     * @param string $type "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function addAutoloadFilters($filters, $type=null)
+    {
+        if ($type !== null) {
+            if (!empty($this->autoload_filters[$type])) {
+                $this->autoload_filters[$type] = array_merge($this->autoload_filters[$type], (array) $filters);
+            } else {
+                $this->autoload_filters[$type] = (array) $filters;
+            }
+        } else {
+            foreach ((array) $filters as $key => $value) {
+                if (!empty($this->autoload_filters[$key])) {
+                    $this->autoload_filters[$key] = array_merge($this->autoload_filters[$key], (array) $value);
+                } else {
+                    $this->autoload_filters[$key] = (array) $value;
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get autoload filters
+     *
+     * @param string $type type of filter to get autoloads for. Defaults to all autoload filters
+     * @return array array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type was specified
+     */
+    public function getAutoloadFilters($type=null)
+    {
+        if ($type !== null) {
+            return isset($this->autoload_filters[$type]) ? $this->autoload_filters[$type] : array();
+        }
+
+        return $this->autoload_filters;
+    }
+
+    /**
+     * return name of debugging template
+     *
+     * @return string
+     */
+    public function getDebugTemplate()
+    {
+        return $this->debug_tpl;
+    }
+
+    /**
+     * set the debug template
+     *
+     * @param string $tpl_name
+     * @return Smarty current Smarty instance for chaining
+     * @throws SmartyException if file is not readable
+     */
+    public function setDebugTemplate($tpl_name)
+    {
+        if (!is_readable($tpl_name)) {
+            throw new SmartyException("Unknown file '{$tpl_name}'");
+        }
+        $this->debug_tpl = $tpl_name;
+
+        return $this;
+    }
+
+    /**
+     * creates a template object
+     *
+     * @param string $template the resource handle of the template file
+     * @param mixed $cache_id cache id to be used with this template
+     * @param mixed $compile_id compile id to be used with this template
+     * @param object $parent next higher level of Smarty variables
+     * @param boolean $do_clone flag is Smarty object shall be cloned
+     * @return object template object
+     */
+    public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
+    {
+        if (!empty($cache_id) && (is_object($cache_id) || is_array($cache_id))) {
+            $parent = $cache_id;
+            $cache_id = null;
+        }
+        if (!empty($parent) && is_array($parent)) {
+            $data = $parent;
+            $parent = null;
+        } else {
+            $data = null;
+        }
+        // default to cache_id and compile_id of Smarty object
+        $cache_id = $cache_id === null ? $this->cache_id : $cache_id;
+        $compile_id = $compile_id === null ? $this->compile_id : $compile_id;
+        // already in template cache?
+        if ($this->allow_ambiguous_resources) {
+            $_templateId = Smarty_Resource::getUniqueTemplateName($this, $template) . $cache_id . $compile_id;
+        } else {
+            $_templateId = $this->joined_template_dir . '#' . $template . $cache_id . $compile_id;
+        }
+        if (isset($_templateId[150])) {
+            $_templateId = sha1($_templateId);
+        }
+        if ($do_clone) {
+            if (isset($this->template_objects[$_templateId])) {
+                // return cached template object
+                $tpl = clone $this->template_objects[$_templateId];
+                $tpl->smarty = clone $tpl->smarty;
+                $tpl->parent = $parent;
+                $tpl->tpl_vars = array();
+                $tpl->config_vars = array();
+            } else {
+                $tpl = new $this->template_class($template, clone $this, $parent, $cache_id, $compile_id);
+            }
+        } else {
+            if (isset($this->template_objects[$_templateId])) {
+                // return cached template object
+                $tpl = $this->template_objects[$_templateId];
+                $tpl->parent = $parent;
+                $tpl->tpl_vars = array();
+                $tpl->config_vars = array();
+            } else {
+                $tpl = new $this->template_class($template, $this, $parent, $cache_id, $compile_id);
+            }
+        }
+        // fill data if present
+        if (!empty($data) && is_array($data)) {
+            // set up variable values
+            foreach ($data as $_key => $_val) {
+                $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
+            }
+        }
+        return $tpl;
+    }
+
+
+    /**
+     * Takes unknown classes and loads plugin files for them
+     * class name format: Smarty_PluginType_PluginName
+     * plugin filename format: plugintype.pluginname.php
+     *
+     * @param string $plugin_name    class plugin name to load
+     * @param bool   $check          check if already loaded
+     * @return string |boolean filepath of loaded file or false
+     */
+    public function loadPlugin($plugin_name, $check = true)
+    {
+        // if function or class exists, exit silently (already loaded)
+        if ($check && (is_callable($plugin_name) || class_exists($plugin_name, false))) {
+            return true;
+        }
+        // Plugin name is expected to be: Smarty_[Type]_[Name]
+        $_name_parts = explode('_', $plugin_name, 3);
+        // class name must have three parts to be valid plugin
+        // count($_name_parts) < 3 === !isset($_name_parts[2])
+        if (!isset($_name_parts[2]) || strtolower($_name_parts[0]) !== 'smarty') {
+            throw new SmartyException("plugin {$plugin_name} is not a valid name format");
+            return false;
+        }
+        // if type is "internal", get plugin from sysplugins
+        if (strtolower($_name_parts[1]) == 'internal') {
+            $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
+            if (file_exists($file)) {
+                require_once($file);
+                return $file;
+            } else {
+                return false;
+            }
+        }
+        // plugin filename is expected to be: [type].[name].php
+        $_plugin_filename = "{$_name_parts[1]}.{$_name_parts[2]}.php";
+
+        // loop through plugin dirs and find the plugin
+        foreach($this->getPluginsDir() as $_plugin_dir) {
+            $names = array(
+                $_plugin_dir . $_plugin_filename,
+                $_plugin_dir . strtolower($_plugin_filename),
+            );
+            foreach ($names as $file) {
+                if (file_exists($file)) {
+                    require_once($file);
+                    return $file;
+                }
+                if ($this->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
+                    // try PHP include_path
+                    if (($file = Smarty_Internal_Get_Include_Path::getIncludePath($file)) !== false) {
+                        require_once($file);
+                        return $file;
+                    }
+                }
+            }
+        }
+        // no plugin loaded
+        return false;
+    }
+
+    /**
+     * Compile all template files
+     *
+     * @param string $extension file extension
+     * @param bool $force_compile force all to recompile
+     * @param int $time_limit
+     * @param int $max_errors
+     * @return integer number of template files recompiled
+     */
+    public function compileAllTemplates($extention = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
+    {
+        return Smarty_Internal_Utility::compileAllTemplates($extention, $force_compile, $time_limit, $max_errors, $this);
+    }
+
+    /**
+     * Compile all config files
+     *
+     * @param string $extension file extension
+     * @param bool $force_compile force all to recompile
+     * @param int $time_limit
+     * @param int $max_errors
+     * @return integer number of template files recompiled
+     */
+    public function compileAllConfig($extention = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null)
+    {
+        return Smarty_Internal_Utility::compileAllConfig($extention, $force_compile, $time_limit, $max_errors, $this);
+    }
+
+    /**
+     * Delete compiled template file
+     *
+     * @param string $resource_name template name
+     * @param string $compile_id compile id
+     * @param integer $exp_time expiration time
+     * @return integer number of template files deleted
+     */
+    public function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
+    {
+        return Smarty_Internal_Utility::clearCompiledTemplate($resource_name, $compile_id, $exp_time, $this);
+    }
+
+
+    /**
+     * Return array of tag/attributes of all tags used by an template
+     *
+     * @param object $templae template object
+     * @return array of tag/attributes
+     */
+    public function getTags(Smarty_Internal_Template $template)
+    {
+        return Smarty_Internal_Utility::getTags($template);
+    }
+
+    /**
+     * Run installation test
+     *
+     * @param array $errors Array to write errors into, rather than outputting them
+     * @return boolean true if setup is fine, false if something is wrong
+     */
+    public function testInstall(&$errors=null)
+    {
+        return Smarty_Internal_Utility::testInstall($this, $errors);
+    }
+
+    /**
+     * Error Handler to mute expected messages
+     *
+     * @link http://php.net/set_error_handler
+     * @param integer $errno Error level
+     * @return boolean
+     */
+    public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext)
+    {
+        $_is_muted_directory = false;
+
+        // add the SMARTY_DIR to the list of muted directories
+        if (!isset(Smarty::$_muted_directories[SMARTY_DIR])) {
+            $smarty_dir = realpath(SMARTY_DIR);
+            Smarty::$_muted_directories[SMARTY_DIR] = array(
+                'file' => $smarty_dir,
+                'length' => strlen($smarty_dir),
+            );
+        }
+
+        // walk the muted directories and test against $errfile
+        foreach (Smarty::$_muted_directories as $key => &$dir) {
+            if (!$dir) {
+                // resolve directory and length for speedy comparisons
+                $file = realpath($key);
+                $dir = array(
+                    'file' => $file,
+                    'length' => strlen($file),
+                );
+            }
+            if (!strncmp($errfile, $dir['file'], $dir['length'])) {
+                $_is_muted_directory = true;
+                break;
+            }
+        }
+
+        // pass to next error handler if this error did not occur inside SMARTY_DIR
+        // or the error was within smarty but masked to be ignored
+        if (!$_is_muted_directory || ($errno && $errno & error_reporting())) {
+            if (Smarty::$_previous_error_handler) {
+                return call_user_func(Smarty::$_previous_error_handler, $errno, $errstr, $errfile, $errline, $errcontext);
+            } else {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * Enable error handler to mute expected messages
+     *
+     * @return void
+     */
+    public static function muteExpectedErrors()
+    {
+        /*
+            error muting is done because some people implemented custom error_handlers using
+            http://php.net/set_error_handler and for some reason did not understand the following paragraph:
+
+                It is important to remember that the standard PHP error handler is completely bypassed for the
+                error types specified by error_types unless the callback function returns FALSE.
+                error_reporting() settings will have no effect and your error handler will be called regardless -
+                however you are still able to read the current value of error_reporting and act appropriately.
+                Of particular note is that this value will be 0 if the statement that caused the error was
+                prepended by the @ error-control operator.
+
+            Smarty deliberately uses @filemtime() over file_exists() and filemtime() in some places. Reasons include
+                - @filemtime() is almost twice as fast as using an additional file_exists()
+                - between file_exists() and filemtime() a possible race condition is opened,
+                  which does not exist using the simple @filemtime() approach.
+        */
+        $error_handler = array('Smarty', 'mutingErrorHandler');
+        $previous = set_error_handler($error_handler);
+
+        // avoid dead loops
+        if ($previous !== $error_handler) {
+            Smarty::$_previous_error_handler = $previous;
+        }
+    }
+
+    /**
+     * Disable error handler muting expected messages
+     *
+     * @return void
+     */
+    public static function unmuteExpectedErrors()
+    {
+        restore_error_handler();
+    }
+}
+
+// let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8
+if (Smarty::$_CHARSET !== 'UTF-8') {
+    Smarty::$_UTF8_MODIFIER = '';
+}
+
+/**
+ * Smarty exception class
+ * @package Smarty
+ */
+class SmartyException extends Exception {
+}
+
+/**
+ * Smarty compiler exception class
+ * @package Smarty
+ */
+class SmartyCompilerException extends SmartyException  {
+}
+
+/**
+ * Autoloader
+ */
+function smartyAutoload($class)
+{
+    $_class = strtolower($class);
+    $_classes = array(
+        'smarty_config_source' => true,
+        'smarty_config_compiled' => true,
+        'smarty_security' => true,
+        'smarty_cacheresource' => true,
+        'smarty_cacheresource_custom' => true,
+        'smarty_cacheresource_keyvaluestore' => true,
+        'smarty_resource' => true,
+        'smarty_resource_custom' => true,
+        'smarty_resource_uncompiled' => true,
+        'smarty_resource_recompiled' => true,
+    );
+
+    if (!strncmp($_class, 'smarty_internal_', 16) || isset($_classes[$_class])) {
+        include SMARTY_SYSPLUGINS_DIR . $_class . '.php';
+    }
+}
+
+?>
diff --git a/lib/smarty/SmartyBC.class.php b/lib/smarty/SmartyBC.class.php
new file mode 100644
index 0000000..f8f0a13
--- /dev/null
+++ b/lib/smarty/SmartyBC.class.php
@@ -0,0 +1,460 @@
+<?php
+/**
+ * Project:     Smarty: the PHP compiling template engine
+ * File:        SmartyBC.class.php
+ * SVN:         $Id: $
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * For questions, help, comments, discussion, etc., please join the
+ * Smarty mailing list. Send a blank e-mail to
+ * smarty-discussion-subscribe@googlegroups.com
+ *
+ * @link http://www.smarty.net/
+ * @copyright 2008 New Digital Group, Inc.
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Uwe Tews
+ * @author Rodney Rehm
+ * @package Smarty
+ */
+/**
+ * @ignore
+ */
+require(dirname(__FILE__) . '/Smarty.class.php');
+
+/**
+ * Smarty Backward Compatability Wrapper Class
+ *
+ * @package Smarty
+ */
+class SmartyBC extends Smarty {
+
+    /**
+     * Smarty 2 BC
+     * @var string
+     */
+    public $_version = self::SMARTY_VERSION;
+
+    /**
+     * Initialize new SmartyBC object
+     *
+     * @param array $options options to set during initialization, e.g. array( 'forceCompile' => false )
+     */
+    public function __construct(array $options=array())
+    {
+        parent::__construct($options);
+        // register {php} tag
+        $this->registerPlugin('block', 'php', 'smarty_php_tag');
+    }
+
+    /**
+     * wrapper for assign_by_ref
+     *
+     * @param string $tpl_var the template variable name
+     * @param mixed  &$value  the referenced value to assign
+     */
+    public function assign_by_ref($tpl_var, &$value)
+    {
+        $this->assignByRef($tpl_var, $value);
+    }
+
+    /**
+     * wrapper for append_by_ref
+     *
+     * @param string  $tpl_var the template variable name
+     * @param mixed   &$value  the referenced value to append
+     * @param boolean $merge   flag if array elements shall be merged
+     */
+    public function append_by_ref($tpl_var, &$value, $merge = false)
+    {
+        $this->appendByRef($tpl_var, $value, $merge);
+    }
+
+    /**
+     * clear the given assigned template variable.
+     *
+     * @param string $tpl_var the template variable to clear
+     */
+    public function clear_assign($tpl_var)
+    {
+        $this->clearAssign($tpl_var);
+    }
+
+    /**
+     * Registers custom function to be used in templates
+     *
+     * @param string $function      the name of the template function
+     * @param string $function_impl the name of the PHP function to register
+     * @param bool   $cacheable
+     * @param mixed  $cache_attrs
+     */
+    public function register_function($function, $function_impl, $cacheable=true, $cache_attrs=null)
+    {
+        $this->registerPlugin('function', $function, $function_impl, $cacheable, $cache_attrs);
+    }
+
+    /**
+     * Unregisters custom function
+     *
+     * @param string $function name of template function
+     */
+    public function unregister_function($function)
+    {
+        $this->unregisterPlugin('function', $function);
+    }
+
+    /**
+     * Registers object to be used in templates
+     *
+     * @param string  $object      name of template object
+     * @param object  $object_impl the referenced PHP object to register
+     * @param array   $allowed     list of allowed methods (empty = all)
+     * @param boolean $smarty_args smarty argument format, else traditional
+     * @param array   $block_functs list of methods that are block format
+     */
+    public function register_object($object, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
+    {
+        settype($allowed, 'array');
+        settype($smarty_args, 'boolean');
+        $this->registerObject($object, $object_impl, $allowed, $smarty_args, $block_methods);
+    }
+
+    /**
+     * Unregisters object
+     *
+     * @param string $object name of template object
+     */
+    public function unregister_object($object)
+    {
+        $this->unregisterObject($object);
+    }
+
+    /**
+     * Registers block function to be used in templates
+     *
+     * @param string $block      name of template block
+     * @param string $block_impl PHP function to register
+     * @param bool   $cacheable
+     * @param mixed  $cache_attrs
+     */
+    public function register_block($block, $block_impl, $cacheable=true, $cache_attrs=null)
+    {
+        $this->registerPlugin('block', $block, $block_impl, $cacheable, $cache_attrs);
+    }
+
+    /**
+     * Unregisters block function
+     *
+     * @param string $block name of template function
+     */
+    public function unregister_block($block)
+    {
+        $this->unregisterPlugin('block', $block);
+    }
+
+    /**
+     * Registers compiler function
+     *
+     * @param string $function      name of template function
+     * @param string $function_impl name of PHP function to register
+     * @param bool   $cacheable
+     */
+    public function register_compiler_function($function, $function_impl, $cacheable=true)
+    {
+        $this->registerPlugin('compiler', $function, $function_impl, $cacheable);
+    }
+
+    /**
+     * Unregisters compiler function
+     *
+     * @param string $function name of template function
+     */
+    public function unregister_compiler_function($function)
+    {
+        $this->unregisterPlugin('compiler', $function);
+    }
+
+    /**
+     * Registers modifier to be used in templates
+     *
+     * @param string $modifier name of template modifier
+     * @param string $modifier_impl name of PHP function to register
+     */
+    public function register_modifier($modifier, $modifier_impl)
+    {
+        $this->registerPlugin('modifier', $modifier, $modifier_impl);
+    }
+
+    /**
+     * Unregisters modifier
+     *
+     * @param string $modifier name of template modifier
+     */
+    public function unregister_modifier($modifier)
+    {
+        $this->unregisterPlugin('modifier', $modifier);
+    }
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @param string $type      name of resource
+     * @param array  $functions array of functions to handle resource
+     */
+    public function register_resource($type, $functions)
+    {
+        $this->registerResource($type, $functions);
+    }
+
+    /**
+     * Unregisters a resource
+     *
+     * @param string $type name of resource
+     */
+    public function unregister_resource($type)
+    {
+        $this->unregisterResource($type);
+    }
+
+    /**
+     * Registers a prefilter function to apply
+     * to a template before compiling
+     *
+     * @param callable $function
+     */
+    public function register_prefilter($function)
+    {
+        $this->registerFilter('pre', $function);
+    }
+
+    /**
+     * Unregisters a prefilter function
+     *
+     * @param callable $function
+     */
+    public function unregister_prefilter($function)
+    {
+        $this->unregisterFilter('pre', $function);
+    }
+
+    /**
+     * Registers a postfilter function to apply
+     * to a compiled template after compilation
+     *
+     * @param callable $function
+     */
+    public function register_postfilter($function)
+    {
+        $this->registerFilter('post', $function);
+    }
+
+    /**
+     * Unregisters a postfilter function
+     *
+     * @param callable $function
+     */
+    public function unregister_postfilter($function)
+    {
+        $this->unregisterFilter('post', $function);
+    }
+
+    /**
+     * Registers an output filter function to apply
+     * to a template output
+     *
+     * @param callable $function
+     */
+    public function register_outputfilter($function)
+    {
+        $this->registerFilter('output', $function);
+    }
+
+    /**
+     * Unregisters an outputfilter function
+     *
+     * @param callable $function
+     */
+    public function unregister_outputfilter($function)
+    {
+        $this->unregisterFilter('output', $function);
+    }
+
+    /**
+     * load a filter of specified type and name
+     *
+     * @param string $type filter type
+     * @param string $name filter name
+     */
+    public function load_filter($type, $name)
+    {
+        $this->loadFilter($type, $name);
+    }
+
+    /**
+     * clear cached content for the given template and cache id
+     *
+     * @param string $tpl_file   name of template file
+     * @param string $cache_id   name of cache_id
+     * @param string $compile_id name of compile_id
+     * @param string $exp_time   expiration time
+     * @return boolean
+     */
+    public function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null)
+    {
+        return $this->clearCache($tpl_file, $cache_id, $compile_id, $exp_time);
+    }
+
+    /**
+     * clear the entire contents of cache (all templates)
+     *
+     * @param string $exp_time expire time
+     * @return boolean
+     */
+    public function clear_all_cache($exp_time = null)
+    {
+        return $this->clearCache(null, null, null, $exp_time);
+    }
+
+    /**
+     * test to see if valid cache exists for this template
+     *
+     * @param string $tpl_file name of template file
+     * @param string $cache_id
+     * @param string $compile_id
+     * @return boolean
+     */
+    public function is_cached($tpl_file, $cache_id = null, $compile_id = null)
+    {
+        return $this->isCached($tpl_file, $cache_id, $compile_id);
+    }
+
+    /**
+     * clear all the assigned template variables.
+     */
+    public function clear_all_assign()
+    {
+        $this->clearAllAssign();
+    }
+
+    /**
+     * clears compiled version of specified template resource,
+     * or all compiled template files if one is not specified.
+     * This function is for advanced use only, not normally needed.
+     *
+     * @param string $tpl_file
+     * @param string $compile_id
+     * @param string $exp_time
+     * @return boolean results of {@link smarty_core_rm_auto()}
+     */
+    public function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null)
+    {
+        return $this->clearCompiledTemplate($tpl_file, $compile_id, $exp_time);
+    }
+
+    /**
+     * Checks whether requested template exists.
+     *
+     * @param string $tpl_file
+     * @return boolean
+     */
+    public function template_exists($tpl_file)
+    {
+        return $this->templateExists($tpl_file);
+    }
+
+    /**
+     * Returns an array containing template variables
+     *
+     * @param string $name
+     * @return array
+     */
+    public function get_template_vars($name=null)
+    {
+        return $this->getTemplateVars($name);
+    }
+
+    /**
+     * Returns an array containing config variables
+     *
+     * @param string $name
+     * @return array
+     */
+    public function get_config_vars($name=null)
+    {
+        return $this->getConfigVars($name);
+    }
+
+    /**
+     * load configuration values
+     *
+     * @param string $file
+     * @param string $section
+     * @param string $scope
+     */
+    public function config_load($file, $section = null, $scope = 'global')
+    {
+        $this->ConfigLoad($file, $section, $scope);
+    }
+
+    /**
+     * return a reference to a registered object
+     *
+     * @param string $name
+     * @return object
+     */
+    public function get_registered_object($name)
+    {
+        return $this->getRegisteredObject($name);
+    }
+
+    /**
+     * clear configuration values
+     *
+     * @param string $var
+     */
+    public function clear_config($var = null)
+    {
+        $this->clearConfig($var);
+    }
+
+    /**
+     * trigger Smarty error
+     *
+     * @param string $error_msg
+     * @param integer $error_type
+     */
+    public function trigger_error($error_msg, $error_type = E_USER_WARNING)
+    {
+        trigger_error("Smarty error: $error_msg", $error_type);
+    }
+
+}
+
+/**
+ * Smarty {php}{/php} block function
+ *
+ * @param array   $params   parameter list
+ * @param string  $content  contents of the block
+ * @param object  $template template object
+ * @param boolean &$repeat  repeat flag
+ * @return string content re-formatted
+ */
+function smarty_php_tag($params, $content, $template, &$repeat)
+{
+    eval($content);
+    return '';
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/debug.tpl b/lib/smarty/debug.tpl
new file mode 100644
index 0000000..12eef0f
--- /dev/null
+++ b/lib/smarty/debug.tpl
@@ -0,0 +1,133 @@
+{capture name='_smarty_debug' assign=debug_output}
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+    <title>Smarty Debug Console</title>
+<style type="text/css">
+{literal}
+body, h1, h2, td, th, p {
+    font-family: sans-serif;
+    font-weight: normal;
+    font-size: 0.9em;
+    margin: 1px;
+    padding: 0;
+}
+
+h1 {
+    margin: 0;
+    text-align: left;
+    padding: 2px;
+    background-color: #f0c040;
+    color:  black;
+    font-weight: bold;
+    font-size: 1.2em;
+ }
+
+h2 {
+    background-color: #9B410E;
+    color: white;
+    text-align: left;
+    font-weight: bold;
+    padding: 2px;
+    border-top: 1px solid black;
+}
+
+body {
+    background: black; 
+}
+
+p, table, div {
+    background: #f0ead8;
+} 
+
+p {
+    margin: 0;
+    font-style: italic;
+    text-align: center;
+}
+
+table {
+    width: 100%;
+}
+
+th, td {
+    font-family: monospace;
+    vertical-align: top;
+    text-align: left;
+    width: 50%;
+}
+
+td {
+    color: green;
+}
+
+.odd {
+    background-color: #eeeeee;
+}
+
+.even {
+    background-color: #fafafa;
+}
+
+.exectime {
+    font-size: 0.8em;
+    font-style: italic;
+}
+
+#table_assigned_vars th {
+    color: blue;
+}
+
+#table_config_vars th {
+    color: maroon;
+}
+{/literal}
+</style>
+</head>
+<body>
+
+<h1>Smarty Debug Console  -  {if isset($template_name)}{$template_name|debug_print_var nofilter}{else}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
+
+{if !empty($template_data)}
+<h2>included templates &amp; config files (load time in seconds)</h2>
+
+<div>
+{foreach $template_data as $template}
+  <font color=brown>{$template.name}</font>
+  <span class="exectime">
+   (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
+  </span>
+  <br>
+{/foreach}
+</div>
+{/if}
+
+<h2>assigned template variables</h2>
+
+<table id="table_assigned_vars">
+    {foreach $assigned_vars as $vars}
+       <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">   
+       <th>${$vars@key|escape:'html'}</th>
+       <td>{$vars|debug_print_var nofilter}</td></tr>
+    {/foreach}
+</table>
+
+<h2>assigned config file variables (outer template scope)</h2>
+
+<table id="table_config_vars">
+    {foreach $config_vars as $vars}
+       <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">   
+       <th>{$vars@key|escape:'html'}</th>
+       <td>{$vars|debug_print_var nofilter}</td></tr>
+    {/foreach}
+
+</table>
+</body>
+</html>
+{/capture}
+<script type="text/javascript">
+{$id = $template_name|default:''|md5}
+    _smarty_console = window.open("","console{$id}","width=680,height=600,resizable,scrollbars=yes");
+    _smarty_console.document.write("{$debug_output|escape:'javascript' nofilter}");
+    _smarty_console.document.close();
+</script>
diff --git a/lib/smarty/plugins/block.textformat.php b/lib/smarty/plugins/block.textformat.php
new file mode 100644
index 0000000..b22b104
--- /dev/null
+++ b/lib/smarty/plugins/block.textformat.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Smarty plugin to format text blocks
+ *
+ * @package Smarty
+ * @subpackage PluginsBlock
+ */
+
+/**
+ * Smarty {textformat}{/textformat} block plugin
+ *
+ * Type:     block function<br>
+ * Name:     textformat<br>
+ * Purpose:  format text a certain way with preset styles
+ *           or custom wrap/indent settings<br>
+ * Params:
+ * <pre>
+ * - style         - string (email)
+ * - indent        - integer (0)
+ * - wrap          - integer (80)
+ * - wrap_char     - string ("\n")
+ * - indent_char   - string (" ")
+ * - wrap_boundary - boolean (true)
+ * </pre>
+ *
+ * @link http://www.smarty.net/manual/en/language.function.textformat.php {textformat}
+ *       (Smarty online manual)
+ * @param array                    $params   parameters
+ * @param string                   $content  contents of the block
+ * @param Smarty_Internal_Template $template template object
+ * @param boolean                  &$repeat  repeat flag
+ * @return string content re-formatted
+ * @author Monte Ohrt <monte at ohrt dot com>
+ */
+function smarty_block_textformat($params, $content, $template, &$repeat)
+{
+    if (is_null($content)) {
+        return;
+    }
+
+    $style = null;
+    $indent = 0;
+    $indent_first = 0;
+    $indent_char = ' ';
+    $wrap = 80;
+    $wrap_char = "\n";
+    $wrap_cut = false;
+    $assign = null;
+
+    foreach ($params as $_key => $_val) {
+        switch ($_key) {
+            case 'style':
+            case 'indent_char':
+            case 'wrap_char':
+            case 'assign':
+                $$_key = (string)$_val;
+                break;
+
+            case 'indent':
+            case 'indent_first':
+            case 'wrap':
+                $$_key = (int)$_val;
+                break;
+
+            case 'wrap_cut':
+                $$_key = (bool)$_val;
+                break;
+
+            default:
+                trigger_error("textformat: unknown attribute '$_key'");
+        }
+    }
+
+    if ($style == 'email') {
+        $wrap = 72;
+    }
+    // split into paragraphs
+    $_paragraphs = preg_split('![\r\n]{2}!', $content);
+    $_output = '';
+
+
+    foreach ($_paragraphs as &$_paragraph) {
+        if (!$_paragraph) {
+            continue;
+        }
+        // convert mult. spaces & special chars to single space
+        $_paragraph = preg_replace(array('!\s+!' . Smarty::$_UTF8_MODIFIER, '!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER), array(' ', ''), $_paragraph);
+        // indent first line
+        if ($indent_first > 0) {
+            $_paragraph = str_repeat($indent_char, $indent_first) . $_paragraph;
+        }
+        // wordwrap sentences
+        if (Smarty::$_MBSTRING) {
+            require_once(SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php');
+            $_paragraph = smarty_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
+        } else {
+            $_paragraph = wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
+        }
+        // indent lines
+        if ($indent > 0) {
+            $_paragraph = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraph);
+        }
+    }
+    $_output = implode($wrap_char . $wrap_char, $_paragraphs);
+    
+    if ($assign) {
+        $template->assign($assign, $_output);
+    } else {
+        return $_output;
+    }
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/function.counter.php b/lib/smarty/plugins/function.counter.php
new file mode 100644
index 0000000..3906bad
--- /dev/null
+++ b/lib/smarty/plugins/function.counter.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {counter} function plugin
+ *
+ * Type:     function<br>
+ * Name:     counter<br>
+ * Purpose:  print out a counter value
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @link http://www.smarty.net/manual/en/language.function.counter.php {counter}
+ *       (Smarty online manual)
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ * @return string|null
+ */
+function smarty_function_counter($params, $template)
+{
+    static $counters = array();
+
+    $name = (isset($params['name'])) ? $params['name'] : 'default';
+    if (!isset($counters[$name])) {
+        $counters[$name] = array(
+            'start'=>1,
+            'skip'=>1,
+            'direction'=>'up',
+            'count'=>1
+            );
+    }
+    $counter =& $counters[$name];
+
+    if (isset($params['start'])) {
+        $counter['start'] = $counter['count'] = (int)$params['start'];
+    }
+
+    if (!empty($params['assign'])) {
+        $counter['assign'] = $params['assign'];
+    }
+
+    if (isset($counter['assign'])) {
+        $template->assign($counter['assign'], $counter['count']);
+    }
+    
+    if (isset($params['print'])) {
+        $print = (bool)$params['print'];
+    } else {
+        $print = empty($counter['assign']);
+    }
+
+    if ($print) {
+        $retval = $counter['count'];
+    } else {
+        $retval = null;
+    }
+
+    if (isset($params['skip'])) {
+        $counter['skip'] = $params['skip'];
+    }
+    
+    if (isset($params['direction'])) {
+        $counter['direction'] = $params['direction'];
+    }
+
+    if ($counter['direction'] == "down")
+        $counter['count'] -= $counter['skip'];
+    else
+        $counter['count'] += $counter['skip'];
+    
+    return $retval;
+    
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/function.cycle.php b/lib/smarty/plugins/function.cycle.php
new file mode 100644
index 0000000..1778ffb
--- /dev/null
+++ b/lib/smarty/plugins/function.cycle.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {cycle} function plugin
+ *
+ * Type:     function<br>
+ * Name:     cycle<br>
+ * Date:     May 3, 2002<br>
+ * Purpose:  cycle through given values<br>
+ * Params:
+ * <pre>
+ * - name      - name of cycle (optional)
+ * - values    - comma separated list of values to cycle, or an array of values to cycle
+ *               (this can be left out for subsequent calls)
+ * - reset     - boolean - resets given var to true
+ * - print     - boolean - print var or not. default is true
+ * - advance   - boolean - whether or not to advance the cycle
+ * - delimiter - the value delimiter, default is ","
+ * - assign    - boolean, assigns to template var instead of printed.
+ * </pre>
+ * Examples:<br>
+ * <pre>
+ * {cycle values="#eeeeee,#d0d0d0d"}
+ * {cycle name=row values="one,two,three" reset=true}
+ * {cycle name=row}
+ * </pre>
+ *
+ * @link http://www.smarty.net/manual/en/language.function.cycle.php {cycle}
+ *       (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author credit to Mark Priatel <mpriatel@rogers.com>
+ * @author credit to Gerard <gerard@interfold.com>
+ * @author credit to Jason Sweat <jsweat_php@yahoo.com>
+ * @version  1.3
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ * @return string|null
+ */
+
+function smarty_function_cycle($params, $template)
+{
+    static $cycle_vars;
+
+    $name = (empty($params['name'])) ? 'default' : $params['name'];
+    $print = (isset($params['print'])) ? (bool)$params['print'] : true;
+    $advance = (isset($params['advance'])) ? (bool)$params['advance'] : true;
+    $reset = (isset($params['reset'])) ? (bool)$params['reset'] : false;
+
+    if (!isset($params['values'])) {
+        if(!isset($cycle_vars[$name]['values'])) {
+            trigger_error("cycle: missing 'values' parameter");
+            return;
+        }
+    } else {
+        if(isset($cycle_vars[$name]['values'])
+            && $cycle_vars[$name]['values'] != $params['values'] ) {
+            $cycle_vars[$name]['index'] = 0;
+        }
+        $cycle_vars[$name]['values'] = $params['values'];
+    }
+
+    if (isset($params['delimiter'])) {
+        $cycle_vars[$name]['delimiter'] = $params['delimiter'];
+    } elseif (!isset($cycle_vars[$name]['delimiter'])) {
+        $cycle_vars[$name]['delimiter'] = ',';
+    }
+
+    if(is_array($cycle_vars[$name]['values'])) {
+        $cycle_array = $cycle_vars[$name]['values'];
+    } else {
+        $cycle_array = explode($cycle_vars[$name]['delimiter'],$cycle_vars[$name]['values']);
+    }
+
+    if(!isset($cycle_vars[$name]['index']) || $reset ) {
+        $cycle_vars[$name]['index'] = 0;
+    }
+
+    if (isset($params['assign'])) {
+        $print = false;
+        $template->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]);
+    }
+
+    if($print) {
+        $retval = $cycle_array[$cycle_vars[$name]['index']];
+    } else {
+        $retval = null;
+    }
+
+    if($advance) {
+        if ( $cycle_vars[$name]['index'] >= count($cycle_array) -1 ) {
+            $cycle_vars[$name]['index'] = 0;
+        } else {
+            $cycle_vars[$name]['index']++;
+        }
+    }
+
+    return $retval;
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/function.fetch.php b/lib/smarty/plugins/function.fetch.php
new file mode 100644
index 0000000..eca1182
--- /dev/null
+++ b/lib/smarty/plugins/function.fetch.php
@@ -0,0 +1,214 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {fetch} plugin
+ *
+ * Type:     function<br>
+ * Name:     fetch<br>
+ * Purpose:  fetch file, web or ftp data and display results
+ *
+ * @link http://www.smarty.net/manual/en/language.function.fetch.php {fetch}
+ *       (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ * @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable
+ */
+function smarty_function_fetch($params, $template)
+{
+    if (empty($params['file'])) {
+        trigger_error("[plugin] fetch parameter 'file' cannot be empty",E_USER_NOTICE);
+        return;
+    }
+    
+    // strip file protocol
+    if (stripos($params['file'], 'file://') === 0) {
+        $params['file'] = substr($params['file'], 7);
+    }
+    
+    $protocol = strpos($params['file'], '://');
+    if ($protocol !== false) {
+        $protocol = strtolower(substr($params['file'], 0, $protocol));
+    }
+    
+    if (isset($template->smarty->security_policy)) {
+        if ($protocol) {
+            // remote resource (or php stream, …)
+            if(!$template->smarty->security_policy->isTrustedUri($params['file'])) {
+                return;
+            }
+        } else {
+            // local file
+            if(!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) {
+                return;
+            }
+        }
+    }
+
+    $content = '';
+    if ($protocol == 'http') {
+        // http fetch
+        if($uri_parts = parse_url($params['file'])) {
+            // set defaults
+            $host = $server_name = $uri_parts['host'];
+            $timeout = 30;
+            $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
+            $agent = "Smarty Template Engine ". Smarty::SMARTY_VERSION;
+            $referer = "";
+            $uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/';
+            $uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : '';
+            $_is_proxy = false;
+            if(empty($uri_parts['port'])) {
+                $port = 80;
+            } else {
+                $port = $uri_parts['port'];
+            }
+            if(!empty($uri_parts['user'])) {
+                $user = $uri_parts['user'];
+            }
+            if(!empty($uri_parts['pass'])) {
+                $pass = $uri_parts['pass'];
+            }
+            // loop through parameters, setup headers
+            foreach($params as $param_key => $param_value) {
+                switch($param_key) {
+                    case "file":
+                    case "assign":
+                    case "assign_headers":
+                        break;
+                    case "user":
+                        if(!empty($param_value)) {
+                            $user = $param_value;
+                        }
+                        break;
+                    case "pass":
+                        if(!empty($param_value)) {
+                            $pass = $param_value;
+                        }
+                        break;
+                    case "accept":
+                        if(!empty($param_value)) {
+                            $accept = $param_value;
+                        }
+                        break;
+                    case "header":
+                        if(!empty($param_value)) {
+                            if(!preg_match('![\w\d-]+: .+!',$param_value)) {
+                                trigger_error("[plugin] invalid header format '".$param_value."'",E_USER_NOTICE);
+                                return;
+                            } else {
+                                $extra_headers[] = $param_value;
+                            }
+                        }
+                        break;
+                    case "proxy_host":
+                        if(!empty($param_value)) {
+                            $proxy_host = $param_value;
+                        }
+                        break;
+                    case "proxy_port":
+                        if(!preg_match('!\D!', $param_value)) {
+                            $proxy_port = (int) $param_value;
+                        } else {
+                            trigger_error("[plugin] invalid value for attribute '".$param_key."'",E_USER_NOTICE);
+                            return;
+                        }
+                        break;
+                    case "agent":
+                        if(!empty($param_value)) {
+                            $agent = $param_value;
+                        }
+                        break;
+                    case "referer":
+                        if(!empty($param_value)) {
+                            $referer = $param_value;
+                        }
+                        break;
+                    case "timeout":
+                        if(!preg_match('!\D!', $param_value)) {
+                            $timeout = (int) $param_value;
+                        } else {
+                            trigger_error("[plugin] invalid value for attribute '".$param_key."'",E_USER_NOTICE);
+                            return;
+                        }
+                        break;
+                    default:
+                        trigger_error("[plugin] unrecognized attribute '".$param_key."'",E_USER_NOTICE);
+                        return;
+                }
+            }
+            if(!empty($proxy_host) && !empty($proxy_port)) {
+                $_is_proxy = true;
+                $fp = fsockopen($proxy_host,$proxy_port,$errno,$errstr,$timeout);
+            } else {
+                $fp = fsockopen($server_name,$port,$errno,$errstr,$timeout);
+            }
+
+            if(!$fp) {
+                trigger_error("[plugin] unable to fetch: $errstr ($errno)",E_USER_NOTICE);
+                return;
+            } else {
+                if($_is_proxy) {
+                    fputs($fp, 'GET ' . $params['file'] . " HTTP/1.0\r\n");
+                } else {
+                    fputs($fp, "GET $uri HTTP/1.0\r\n");
+                }
+                if(!empty($host)) {
+                    fputs($fp, "Host: $host\r\n");
+                }
+                if(!empty($accept)) {
+                    fputs($fp, "Accept: $accept\r\n");
+                }
+                if(!empty($agent)) {
+                    fputs($fp, "User-Agent: $agent\r\n");
+                }
+                if(!empty($referer)) {
+                    fputs($fp, "Referer: $referer\r\n");
+                }
+                if(isset($extra_headers) && is_array($extra_headers)) {
+                    foreach($extra_headers as $curr_header) {
+                        fputs($fp, $curr_header."\r\n");
+                    }
+                }
+                if(!empty($user) && !empty($pass)) {
+                    fputs($fp, "Authorization: BASIC ".base64_encode("$user:$pass")."\r\n");
+                }
+
+                fputs($fp, "\r\n");
+                while(!feof($fp)) {
+                    $content .= fgets($fp,4096);
+                }
+                fclose($fp);
+                $csplit = preg_split("!\r\n\r\n!",$content,2);
+
+                $content = $csplit[1];
+
+                if(!empty($params['assign_headers'])) {
+                    $template->assign($params['assign_headers'],preg_split("!\r\n!",$csplit[0]));
+                }
+            }
+        } else {
+            trigger_error("[plugin fetch] unable to parse URL, check syntax",E_USER_NOTICE);
+            return;
+        }
+    } else {
+        $content = @file_get_contents($params['file']);
+        if ($content === false) {
+            throw new SmartyException("{fetch} cannot read resource '" . $params['file'] ."'");
+        }
+    }
+
+    if (!empty($params['assign'])) {
+        $template->assign($params['assign'], $content);
+    } else {
+        return $content;
+    }
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/function.html_checkboxes.php b/lib/smarty/plugins/function.html_checkboxes.php
new file mode 100644
index 0000000..fb9584b
--- /dev/null
+++ b/lib/smarty/plugins/function.html_checkboxes.php
@@ -0,0 +1,216 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {html_checkboxes} function plugin
+ *
+ * File:       function.html_checkboxes.php<br>
+ * Type:       function<br>
+ * Name:       html_checkboxes<br>
+ * Date:       24.Feb.2003<br>
+ * Purpose:    Prints out a list of checkbox input types<br>
+ * Examples:
+ * <pre>
+ * {html_checkboxes values=$ids output=$names}
+ * {html_checkboxes values=$ids name='box' separator='<br>' output=$names}
+ * {html_checkboxes values=$ids checked=$checked separator='<br>' output=$names}
+ * </pre>
+ * Params:
+ * <pre>
+ * - name       (optional) - string default "checkbox"
+ * - values     (required) - array
+ * - options    (optional) - associative array
+ * - checked    (optional) - array default not set
+ * - separator  (optional) - ie <br> or &nbsp;
+ * - output     (optional) - the output next to each checkbox
+ * - assign     (optional) - assign the output as an array to this variable
+ * - escape     (optional) - escape the content (not value), defaults to true
+ * </pre>
+ *
+ * @link http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
+ *      (Smarty online manual)
+ * @author     Christopher Kvarme <christopher.kvarme@flashjab.com>
+ * @author credits to Monte Ohrt <monte at ohrt dot com>
+ * @version    1.0
+ * @param array $params parameters
+ * @param object $template template object
+ * @return string
+ * @uses smarty_function_escape_special_chars()
+ */
+function smarty_function_html_checkboxes($params, $template)
+{
+    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+
+    $name = 'checkbox';
+    $values = null;
+    $options = null;
+    $selected = array();
+    $separator = '';
+    $escape = true;
+    $labels = true;
+    $label_ids = false;
+    $output = null;
+
+    $extra = '';
+
+    foreach($params as $_key => $_val) {
+        switch($_key) {
+            case 'name':
+            case 'separator':
+                $$_key = (string) $_val;
+                break;
+
+            case 'escape':
+            case 'labels':
+            case 'label_ids':
+                $$_key = (bool) $_val;
+                break;
+
+            case 'options':
+                $$_key = (array) $_val;
+                break;
+
+            case 'values':
+            case 'output':
+                $$_key = array_values((array) $_val);
+                break;
+
+            case 'checked':
+            case 'selected':
+                if (is_array($_val)) {
+                    $selected = array();
+                    foreach ($_val as $_sel) {
+                        if (is_object($_sel)) {
+                            if (method_exists($_sel, "__toString")) {
+                                $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
+                            } else {
+                                trigger_error("html_checkboxes: selected attribute contains an object of class '". get_class($_sel) ."' without __toString() method", E_USER_NOTICE);
+                                continue;
+                            }
+                        } else {
+                            $_sel = smarty_function_escape_special_chars((string) $_sel);
+                        }
+                        $selected[$_sel] = true;
+                    }
+                } elseif (is_object($_val)) {
+                    if (method_exists($_val, "__toString")) {
+                        $selected = smarty_function_escape_special_chars((string) $_val->__toString());
+                    } else {
+                        trigger_error("html_checkboxes: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE);
+                    }
+                } else {
+                    $selected = smarty_function_escape_special_chars((string) $_val);
+                }
+                break;
+
+            case 'checkboxes':
+                trigger_error('html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead', E_USER_WARNING);
+                $options = (array) $_val;
+                break;
+
+            case 'assign':
+                break;
+
+            default:
+                if(!is_array($_val)) {
+                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
+                } else {
+                    trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                }
+                break;
+        }
+    }
+
+    if (!isset($options) && !isset($values))
+        return ''; /* raise error here? */
+
+    $_html_result = array();
+
+    if (isset($options)) {
+        foreach ($options as $_key=>$_val) {
+            $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape);
+        }
+    } else {
+        foreach ($values as $_i=>$_key) {
+            $_val = isset($output[$_i]) ? $output[$_i] : '';
+            $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape);
+        }
+    }
+
+    if(!empty($params['assign'])) {
+        $template->assign($params['assign'], $_html_result);
+    } else {
+        return implode("\n", $_html_result);
+    }
+
+}
+
+function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape=true) {
+    $_output = '';
+    
+    if (is_object($value)) {
+        if (method_exists($value, "__toString")) {
+            $value = (string) $value->__toString();
+        } else {
+            trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE);
+            return '';
+        }
+    } else {
+        $value = (string) $value;
+    }
+    
+    if (is_object($output)) {
+        if (method_exists($output, "__toString")) {
+            $output = (string) $output->__toString();
+        } else {
+            trigger_error("html_options: output is an object of class '". get_class($output) ."' without __toString() method", E_USER_NOTICE);
+            return '';
+        }
+    } else {
+        $output = (string) $output;
+    }
+    
+    if ($labels) {
+        if ($label_ids) {
+            $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_', $name . '_' . $value));
+            $_output .= '<label for="' . $_id . '">';
+        } else {
+            $_output .= '<label>';
+        } 
+    }
+    
+    $name = smarty_function_escape_special_chars($name);
+    $value = smarty_function_escape_special_chars($value);
+    if ($escape) {
+        $output = smarty_function_escape_special_chars($output);
+    }
+    
+    $_output .= '<input type="checkbox" name="' . $name . '[]" value="' . $value . '"';
+    
+    if ($labels && $label_ids) {
+        $_output .= ' id="' . $_id . '"';
+    }
+    
+    if (is_array($selected)) {
+        if (isset($selected[$value])) {
+            $_output .= ' checked="checked"';
+        }
+    } elseif ($value === $selected) {
+        $_output .= ' checked="checked"';
+    }
+    
+    $_output .= $extra . ' />' . $output;
+    if ($labels) {
+        $_output .= '</label>';
+    }
+    
+    $_output .=  $separator;
+    return $_output;
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/function.html_image.php b/lib/smarty/plugins/function.html_image.php
new file mode 100644
index 0000000..6521966
--- /dev/null
+++ b/lib/smarty/plugins/function.html_image.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {html_image} function plugin
+ * 
+ * Type:     function<br>
+ * Name:     html_image<br>
+ * Date:     Feb 24, 2003<br>
+ * Purpose:  format HTML tags for the image<br>
+ * Examples: {html_image file="/images/masthead.gif"}<br>
+ * Output:   <img src="/images/masthead.gif" width=400 height=23><br>
+ * Params:
+ * <pre>
+ * - file        - (required) - file (and path) of image
+ * - height      - (optional) - image height (default actual height)
+ * - width       - (optional) - image width (default actual width)
+ * - basedir     - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT
+ * - path_prefix - prefix for path output (optional, default empty)
+ * </pre>
+ * 
+ * @link http://www.smarty.net/manual/en/language.function.html.image.php {html_image}
+ *      (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @author credits to Duda <duda@big.hu> 
+ * @version 1.0
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ * @return string 
+ * @uses smarty_function_escape_special_chars()
+ */
+function smarty_function_html_image($params, $template)
+{
+    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+ 
+    $alt = '';
+    $file = '';
+    $height = '';
+    $width = '';
+    $extra = '';
+    $prefix = '';
+    $suffix = '';
+    $path_prefix = '';
+    $basedir = isset($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : '';
+    foreach($params as $_key => $_val) {
+        switch ($_key) {
+            case 'file':
+            case 'height':
+            case 'width':
+            case 'dpi':
+            case 'path_prefix':
+            case 'basedir':
+                $$_key = $_val;
+                break;
+
+            case 'alt':
+                if (!is_array($_val)) {
+                    $$_key = smarty_function_escape_special_chars($_val);
+                } else {
+                    throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                } 
+                break;
+
+            case 'link':
+            case 'href':
+                $prefix = '<a href="' . $_val . '">';
+                $suffix = '</a>';
+                break;
+
+            default:
+                if (!is_array($_val)) {
+                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+                } else {
+                    throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                } 
+                break;
+        } 
+    } 
+
+    if (empty($file)) {
+        trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE);
+        return;
+    } 
+
+    if ($file[0] == '/') {
+        $_image_path = $basedir . $file;
+    } else {
+        $_image_path = $file;
+    }
+    
+    // strip file protocol
+    if (stripos($params['file'], 'file://') === 0) {
+        $params['file'] = substr($params['file'], 7);
+    }
+    
+    $protocol = strpos($params['file'], '://');
+    if ($protocol !== false) {
+        $protocol = strtolower(substr($params['file'], 0, $protocol));
+    }
+    
+    if (isset($template->smarty->security_policy)) {
+        if ($protocol) {
+            // remote resource (or php stream, …)
+            if(!$template->smarty->security_policy->isTrustedUri($params['file'])) {
+                return;
+            }
+        } else {
+            // local file
+            if(!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) {
+                return;
+            }
+        }
+    }
+
+    if (!isset($params['width']) || !isset($params['height'])) {
+        // FIXME: (rodneyrehm) getimagesize() loads the complete file off a remote resource, use custom [jpg,png,gif]header reader!
+        if (!$_image_data = @getimagesize($_image_path)) {
+            if (!file_exists($_image_path)) {
+                trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE);
+                return;
+            } else if (!is_readable($_image_path)) {
+                trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE);
+                return;
+            } else {
+                trigger_error("html_image: '$_image_path' is not a valid image file", E_USER_NOTICE);
+                return;
+            } 
+        }
+
+        if (!isset($params['width'])) {
+            $width = $_image_data[0];
+        } 
+        if (!isset($params['height'])) {
+            $height = $_image_data[1];
+        } 
+    } 
+
+    if (isset($params['dpi'])) {
+        if (strstr($_SERVER['HTTP_USER_AGENT'], 'Mac')) {
+            // FIXME: (rodneyrehm) wrong dpi assumption
+            // don't know who thought this up… even if it was true in 1998, it's definitely wrong in 2011.
+            $dpi_default = 72;
+        } else {
+            $dpi_default = 96;
+        } 
+        $_resize = $dpi_default / $params['dpi'];
+        $width = round($width * $_resize);
+        $height = round($height * $_resize);
+    } 
+
+    return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' . $height . '"' . $extra . ' />' . $suffix;
+} 
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/function.html_options.php b/lib/smarty/plugins/function.html_options.php
new file mode 100644
index 0000000..86266e2
--- /dev/null
+++ b/lib/smarty/plugins/function.html_options.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {html_options} function plugin
+ * 
+ * Type:     function<br>
+ * Name:     html_options<br>
+ * Purpose:  Prints the list of <option> tags generated from
+ *           the passed parameters<br>
+ * Params:
+ * <pre>
+ * - name       (optional) - string default "select"
+ * - values     (required) - if no options supplied) - array
+ * - options    (required) - if no values supplied) - associative array
+ * - selected   (optional) - string default not set
+ * - output     (required) - if not options supplied) - array
+ * - id         (optional) - string default not set
+ * - class      (optional) - string default not set
+ * </pre>
+ * 
+ * @link http://www.smarty.net/manual/en/language.function.html.options.php {html_image}
+ *      (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ * @return string 
+ * @uses smarty_function_escape_special_chars()
+ */
+function smarty_function_html_options($params, $template)
+{
+    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+
+    $name = null;
+    $values = null;
+    $options = null;
+    $selected = null;
+    $output = null;
+    $id = null;
+    $class = null;
+
+    $extra = '';
+
+    foreach ($params as $_key => $_val) {
+        switch ($_key) {
+            case 'name':
+            case 'class':
+            case 'id':
+                $$_key = (string) $_val;
+                break;
+
+            case 'options':
+                $options = (array) $_val;
+                break;
+
+            case 'values':
+            case 'output':
+                $$_key = array_values((array) $_val);
+                break;
+
+            case 'selected':
+                if (is_array($_val)) {
+                    $selected = array();
+                    foreach ($_val as $_sel) {
+                        if (is_object($_sel)) {
+                            if (method_exists($_sel, "__toString")) {
+                                $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
+                            } else {
+                                trigger_error("html_options: selected attribute contains an object of class '". get_class($_sel) ."' without __toString() method", E_USER_NOTICE);
+                                continue;
+                            }
+                        } else {
+                            $_sel = smarty_function_escape_special_chars((string) $_sel);
+                        }
+                        $selected[$_sel] = true;
+                    }
+                } elseif (is_object($_val)) {
+                    if (method_exists($_val, "__toString")) {
+                        $selected = smarty_function_escape_special_chars((string) $_val->__toString());
+                    } else {
+                        trigger_error("html_options: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE);
+                    }
+                } else {
+                    $selected = smarty_function_escape_special_chars((string) $_val);
+                }
+                break;
+
+            default:
+                if (!is_array($_val)) {
+                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+                } else {
+                    trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                } 
+                break;
+        } 
+    }
+
+    if (!isset($options) && !isset($values)) {
+        /* raise error here? */
+        return '';
+    }
+
+    $_html_result = '';
+    $_idx = 0;
+
+    if (isset($options)) {
+        foreach ($options as $_key => $_val) {
+            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
+        }
+    } else {
+        foreach ($values as $_i => $_key) {
+            $_val = isset($output[$_i]) ? $output[$_i] : '';
+            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
+        } 
+    }
+
+    if (!empty($name)) {
+        $_html_class = !empty($class) ? ' class="'.$class.'"' : '';
+        $_html_id = !empty($id) ? ' id="'.$id.'"' : '';
+        $_html_result = '<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result . '</select>' . "\n";
+    } 
+
+    return $_html_result;
+}
+
+function smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, &$idx)
+{
+    if (!is_array($value)) {
+        $_key = smarty_function_escape_special_chars($key);
+        $_html_result = '<option value="' . $_key . '"';
+        if (is_array($selected)) {
+            if (isset($selected[$_key])) {
+                $_html_result .= ' selected="selected"';
+            }
+        } elseif ($_key === $selected) {
+            $_html_result .= ' selected="selected"';
+        }
+        $_html_class = !empty($class) ? ' class="'.$class.' option"' : '';
+        $_html_id = !empty($id) ? ' id="'.$id.'-'.$idx.'"' : '';
+        if (is_object($value)) {
+            if (method_exists($value, "__toString")) {
+                $value = smarty_function_escape_special_chars((string) $value->__toString());
+            } else {
+                trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE);
+                return '';
+            }
+        }
+        $_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
+        $idx++;
+    } else {
+        $_idx = 0;
+        $_html_result = smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id.'-'.$idx) : null, $class, $_idx);
+        $idx++;
+    }
+    return $_html_result;
+} 
+
+function smarty_function_html_options_optgroup($key, $values, $selected, $id, $class, &$idx)
+{
+    $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
+    foreach ($values as $key => $value) {
+        $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $idx);
+    } 
+    $optgroup_html .= "</optgroup>\n";
+    return $optgroup_html;
+} 
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/function.html_radios.php b/lib/smarty/plugins/function.html_radios.php
new file mode 100644
index 0000000..7c83072
--- /dev/null
+++ b/lib/smarty/plugins/function.html_radios.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {html_radios} function plugin
+ * 
+ * File:       function.html_radios.php<br>
+ * Type:       function<br>
+ * Name:       html_radios<br>
+ * Date:       24.Feb.2003<br>
+ * Purpose:    Prints out a list of radio input types<br>
+ * Params:
+ * <pre>
+ * - name       (optional) - string default "radio"
+ * - values     (required) - array
+ * - options    (required) - associative array
+ * - checked    (optional) - array default not set
+ * - separator  (optional) - ie <br> or &nbsp;
+ * - output     (optional) - the output next to each radio button
+ * - assign     (optional) - assign the output as an array to this variable
+ * - escape     (optional) - escape the content (not value), defaults to true
+ * </pre>
+ * Examples:
+ * <pre>
+ * {html_radios values=$ids output=$names}
+ * {html_radios values=$ids name='box' separator='<br>' output=$names}
+ * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
+ * </pre>
+ * 
+ * @link http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
+ *      (Smarty online manual)
+ * @author Christopher Kvarme <christopher.kvarme@flashjab.com> 
+ * @author credits to Monte Ohrt <monte at ohrt dot com> 
+ * @version 1.0
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ * @return string 
+ * @uses smarty_function_escape_special_chars()
+ */
+function smarty_function_html_radios($params, $template)
+{
+    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+
+    $name = 'radio';
+    $values = null;
+    $options = null;
+    $selected = null;
+    $separator = '';
+    $escape = true;
+    $labels = true;
+    $label_ids = false;
+    $output = null;
+    $extra = '';
+
+    foreach($params as $_key => $_val) {
+        switch ($_key) {
+            case 'name':
+            case 'separator':
+                $$_key = (string) $_val;
+                break;
+
+            case 'checked':
+            case 'selected':
+                if (is_array($_val)) {
+                    trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
+                } elseif (is_object($_val)) {
+                    if (method_exists($_val, "__toString")) {
+                        $selected = smarty_function_escape_special_chars((string) $_val->__toString());
+                    } else {
+                        trigger_error("html_radios: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE);
+                    }
+                } else {
+                    $selected = (string) $_val;
+                } 
+                break;
+
+            case 'escape':
+            case 'labels':
+            case 'label_ids':
+                $$_key = (bool) $_val;
+                break;
+
+            case 'options':
+                $$_key = (array) $_val;
+                break;
+
+            case 'values':
+            case 'output':
+                $$_key = array_values((array) $_val);
+                break;
+
+            case 'radios':
+                trigger_error('html_radios: the use of the "radios" attribute is deprecated, use "options" instead', E_USER_WARNING);
+                $options = (array) $_val;
+                break;
+
+            case 'assign':
+                break;
+
+            default:
+                if (!is_array($_val)) {
+                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+                } else {
+                    trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                } 
+                break;
+        } 
+    } 
+
+    if (!isset($options) && !isset($values)) {
+        /* raise error here? */
+        return '';
+    }
+
+    $_html_result = array();
+
+    if (isset($options)) {
+        foreach ($options as $_key => $_val) {
+            $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape);
+        }
+    } else {
+        foreach ($values as $_i => $_key) {
+            $_val = isset($output[$_i]) ? $output[$_i] : '';
+            $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape);
+        } 
+    } 
+
+    if (!empty($params['assign'])) {
+        $template->assign($params['assign'], $_html_result);
+    } else {
+        return implode("\n", $_html_result);
+    } 
+} 
+
+function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape)
+{
+    $_output = '';
+    
+    if (is_object($value)) {
+        if (method_exists($value, "__toString")) {
+            $value = (string) $value->__toString();
+        } else {
+            trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE);
+            return '';
+        }
+    } else {
+        $value = (string) $value;
+    }
+    
+    if (is_object($output)) {
+        if (method_exists($output, "__toString")) {
+            $output = (string) $output->__toString();
+        } else {
+            trigger_error("html_options: output is an object of class '". get_class($output) ."' without __toString() method", E_USER_NOTICE);
+            return '';
+        }
+    } else {
+        $output = (string) $output;
+    }
+    
+    if ($labels) {
+        if ($label_ids) {
+            $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_', $name . '_' . $value));
+            $_output .= '<label for="' . $_id . '">';
+        } else {
+            $_output .= '<label>';
+        } 
+    }
+    
+    $name = smarty_function_escape_special_chars($name);
+    $value = smarty_function_escape_special_chars($value);
+    if ($escape) {
+        $output = smarty_function_escape_special_chars($output);
+    }
+    
+    $_output .= '<input type="radio" name="' . $name . '" value="' . $value . '"';
+
+    if ($labels && $label_ids) {
+        $_output .= ' id="' . $_id . '"';
+    }
+
+    if ($value === $selected) {
+        $_output .= ' checked="checked"';
+    }
+    
+    $_output .= $extra . ' />' . $output;
+    if ($labels) {
+        $_output .= '</label>';
+    }
+    
+    $_output .= $separator;
+    return $_output;
+} 
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/function.html_select_date.php b/lib/smarty/plugins/function.html_select_date.php
new file mode 100644
index 0000000..13c5003
--- /dev/null
+++ b/lib/smarty/plugins/function.html_select_date.php
@@ -0,0 +1,394 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * @ignore
+ */
+require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+/**
+ * @ignore
+ */
+require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
+
+/**
+ * Smarty {html_select_date} plugin
+ * 
+ * Type:     function<br>
+ * Name:     html_select_date<br>
+ * Purpose:  Prints the dropdowns for date selection.
+ * 
+ * ChangeLog:
+ * <pre>
+ *            - 1.0 initial release
+ *            - 1.1 added support for +/- N syntax for begin
+ *              and end year values. (Monte)
+ *            - 1.2 added support for yyyy-mm-dd syntax for
+ *              time value. (Jan Rosier)
+ *            - 1.3 added support for choosing format for
+ *              month values (Gary Loescher)
+ *            - 1.3.1 added support for choosing format for
+ *              day values (Marcus Bointon)
+ *            - 1.3.2 support negative timestamps, force year
+ *              dropdown to include given date unless explicitly set (Monte)
+ *            - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that
+ *              of 0000-00-00 dates (cybot, boots)
+ *            - 2.0 complete rewrite for performance,  
+ *              added attributes month_names, *_id
+ * </pre>
+ * 
+ * @link http://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
+ *      (Smarty online manual)
+ * @version 2.0
+ * @author Andrei Zmievski 
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @author Rodney Rehm
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ * @return string 
+ */
+function smarty_function_html_select_date($params, $template)
+{
+    // generate timestamps used for month names only
+    static $_month_timestamps = null;
+    static $_current_year = null;
+    if ($_month_timestamps === null) {
+        $_current_year = date('Y');
+        $_month_timestamps = array();
+        for ($i = 1; $i <= 12; $i++) {
+            $_month_timestamps[$i] = mktime(0, 0, 0, $i, 1, 2000);
+        }
+    }
+
+    /* Default values. */
+    $prefix = "Date_";
+    $start_year = null;
+    $end_year = null;
+    $display_days = true;
+    $display_months = true;
+    $display_years = true;
+    $month_format = "%B";
+    /* Write months as numbers by default  GL */
+    $month_value_format = "%m";
+    $day_format = "%02d";
+    /* Write day values using this format MB */
+    $day_value_format = "%d";
+    $year_as_text = false;
+    /* Display years in reverse order? Ie. 2000,1999,.... */
+    $reverse_years = false;
+    /* Should the select boxes be part of an array when returned from PHP?
+       e.g. setting it to "birthday", would create "birthday[Day]",
+       "birthday[Month]" & "birthday[Year]". Can be combined with prefix */
+    $field_array = null;
+    /* <select size>'s of the different <select> tags.
+       If not set, uses default dropdown. */
+    $day_size = null;
+    $month_size = null;
+    $year_size = null;
+    /* Unparsed attributes common to *ALL* the <select>/<input> tags.
+       An example might be in the template: all_extra ='class ="foo"'. */
+    $all_extra = null;
+    /* Separate attributes for the tags. */
+    $day_extra = null;
+    $month_extra = null;
+    $year_extra = null;
+    /* Order in which to display the fields.
+       "D" -> day, "M" -> month, "Y" -> year. */
+    $field_order = 'MDY';
+    /* String printed between the different fields. */
+    $field_separator = "\n";
+    $option_separator = "\n";
+    $time = null;
+    // $all_empty = null;
+    // $day_empty = null;
+    // $month_empty = null;
+    // $year_empty = null;
+    $extra_attrs = '';
+    $all_id = null;
+    $day_id = null;
+    $month_id = null;
+    $year_id = null;
+
+    foreach ($params as $_key => $_value) {
+        switch ($_key) {
+            case 'time':
+                if (!is_array($_value) && $_value !== null) {
+                    $time = smarty_make_timestamp($_value);
+                }
+                break;
+                
+            case 'month_names':
+                if (is_array($_value) && count($_value) == 12) {
+                    $$_key = $_value;
+                } else {
+                    trigger_error("html_select_date: month_names must be an array of 12 strings", E_USER_NOTICE);
+                }
+                break;
+                
+            case 'prefix':
+            case 'field_array':
+            case 'start_year':
+            case 'end_year':
+            case 'day_format':
+            case 'day_value_format':
+            case 'month_format':
+            case 'month_value_format':
+            case 'day_size':
+            case 'month_size':
+            case 'year_size':
+            case 'all_extra':
+            case 'day_extra':
+            case 'month_extra':
+            case 'year_extra':
+            case 'field_order':
+            case 'field_separator':
+            case 'option_separator':
+            case 'all_empty':
+            case 'month_empty':
+            case 'day_empty':
+            case 'year_empty':
+            case 'all_id':
+            case 'month_id':
+            case 'day_id':
+            case 'year_id':
+                $$_key = (string)$_value;
+                break;
+
+            case 'display_days':
+            case 'display_months':
+            case 'display_years':
+            case 'year_as_text':
+            case 'reverse_years':
+                $$_key = (bool)$_value;
+                break;
+
+            default:
+                if (!is_array($_value)) {
+                    $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
+                } else {
+                    trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                } 
+                break;
+        } 
+    }
+    
+    // Note: date() is faster than strftime()
+    // Note: explode(date()) is faster than date() date() date()
+    if (isset($params['time']) && is_array($params['time'])) {
+        if (isset($params['time'][$prefix . 'Year'])) {
+            // $_REQUEST[$field_array] given
+            foreach (array('Y' => 'Year',  'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
+                $_variableName = '_' . strtolower($_elementName);
+                $$_variableName = isset($params['time'][$prefix . $_elementName])
+                    ? $params['time'][$prefix . $_elementName]
+                    : date($_elementKey);
+            }
+            $time = mktime(0, 0, 0, $_month, $_day, $_year);
+        } elseif (isset($params['time'][$field_array][$prefix . 'Year'])) {
+            // $_REQUEST given
+            foreach (array('Y' => 'Year',  'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
+                $_variableName = '_' . strtolower($_elementName);
+                $$_variableName = isset($params['time'][$field_array][$prefix . $_elementName])
+                    ? $params['time'][$field_array][$prefix . $_elementName]
+                    : date($_elementKey);
+            }
+            $time = mktime(0, 0, 0, $_month, $_day, $_year);
+        } else {
+            // no date found, use NOW
+            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
+        }
+    } elseif ($time === null) {
+        if (array_key_exists('time', $params)) {
+            $_year = $_month = $_day = $time = null;
+        } else {
+            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
+        }
+    } else {
+        list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d', $time));
+    }
+
+    // make syntax "+N" or "-N" work with $start_year and $end_year
+    // Note preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match) is slower than trim+substr
+    foreach (array('start', 'end') as $key) {
+        $key .= '_year';
+        $t = $$key;
+        if ($t === null) {
+            $$key = (int)$_current_year;
+        } else if ($t[0] == '+') {
+            $$key = (int)($_current_year + trim(substr($t, 1)));
+        } else if ($t[0] == '-') {
+            $$key = (int)($_current_year - trim(substr($t, 1)));
+        } else {
+            $$key = (int)$$key;
+        }
+    }
+
+    // flip for ascending or descending
+    if (($start_year > $end_year && !$reverse_years) || ($start_year < $end_year && $reverse_years)) {
+        $t = $end_year;
+        $end_year = $start_year;
+        $start_year = $t;
+    }
+
+    // generate year <select> or <input>
+    if ($display_years) {
+        $_html_years = '';
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        } 
+        if ($year_extra) {
+            $_extra .= ' ' . $year_extra;
+        }
+        
+        if ($year_as_text) {
+            $_html_years = '<input type="text" name="' . $_name . '" value="' . $_year . '" size="4" maxlength="4"' . $_extra . $extra_attrs . ' />';
+        } else {
+            $_html_years = '<select name="' . $_name . '"';
+            if ($year_id !== null || $all_id !== null) {
+                $_html_years .= ' id="' . smarty_function_escape_special_chars( 
+                    $year_id !== null ? ( $year_id ? $year_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name ) 
+                ) . '"';
+            }
+            if ($year_size) {
+                $_html_years .= ' size="' . $year_size . '"';
+            } 
+            $_html_years .= $_extra . $extra_attrs . '>' . $option_separator;
+            
+            if (isset($year_empty) || isset($all_empty)) {
+                $_html_years .= '<option value="">' . ( isset($year_empty) ? $year_empty : $all_empty ) . '</option>' . $option_separator;
+            }
+            
+            $op = $start_year > $end_year ? -1 : 1;
+            for ($i=$start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
+                $_html_years .= '<option value="' . $i . '"'
+                    . ($_year == $i ? ' selected="selected"' : '')
+                    . '>' . $i . '</option>' . $option_separator;
+            }
+            
+            $_html_years .= '</select>';
+        }
+    }
+    
+    // generate month <select> or <input>
+    if ($display_months) {
+        $_html_month = '';
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        } 
+        if ($month_extra) {
+            $_extra .= ' ' . $month_extra;
+        }
+        
+        $_html_months = '<select name="' . $_name . '"';
+        if ($month_id !== null || $all_id !== null) {
+            $_html_months .= ' id="' . smarty_function_escape_special_chars( 
+                $month_id !== null ? ( $month_id ? $month_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name ) 
+            ) . '"';
+        }
+        if ($month_size) {
+            $_html_months .= ' size="' . $month_size . '"';
+        } 
+        $_html_months .= $_extra . $extra_attrs . '>' . $option_separator;
+        
+        if (isset($month_empty) || isset($all_empty)) {
+            $_html_months .= '<option value="">' . ( isset($month_empty) ? $month_empty : $all_empty ) . '</option>' . $option_separator;
+        }
+        
+        for ($i = 1; $i <= 12; $i++) {
+            $_val = sprintf('%02d', $i);
+            $_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[$i]) : ($month_format == "%m" ? $_val : strftime($month_format, $_month_timestamps[$i]));
+            $_value = $month_value_format == "%m" ? $_val : strftime($month_value_format, $_month_timestamps[$i]);
+            $_html_months .= '<option value="' . $_value . '"'
+                . ($_val == $_month ? ' selected="selected"' : '')
+                . '>' . $_text . '</option>' . $option_separator;
+        }
+        
+        $_html_months .= '</select>';
+    }
+    
+    // generate day <select> or <input>
+    if ($display_days) {
+        $_html_day = '';
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        } 
+        if ($day_extra) {
+            $_extra .= ' ' . $day_extra;
+        }
+        
+        $_html_days = '<select name="' . $_name . '"';
+        if ($day_id !== null || $all_id !== null) {
+            $_html_days .= ' id="' . smarty_function_escape_special_chars( 
+                $day_id !== null ? ( $day_id ? $day_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name ) 
+            ) . '"';
+        }
+        if ($day_size) {
+            $_html_days .= ' size="' . $day_size . '"';
+        } 
+        $_html_days .= $_extra . $extra_attrs . '>' . $option_separator;
+        
+        if (isset($day_empty) || isset($all_empty)) {
+            $_html_days .= '<option value="">' . ( isset($day_empty) ? $day_empty : $all_empty ) . '</option>' . $option_separator;
+        }
+        
+        for ($i = 1; $i <= 31; $i++) {
+            $_val = sprintf('%02d', $i);
+            $_text = $day_format == '%02d' ? $_val : sprintf($day_format, $i);
+            $_value = $day_value_format ==  '%02d' ? $_val : sprintf($day_value_format, $i);
+            $_html_days .= '<option value="' . $_value . '"'
+                . ($_val == $_day ? ' selected="selected"' : '')
+                . '>' . $_text . '</option>' . $option_separator;
+        }
+        
+        $_html_days .= '</select>';
+    }
+
+    // order the fields for output
+    $_html = '';
+    for ($i=0; $i <= 2; $i++) {
+        switch ($field_order[$i]) {
+            case 'Y':
+            case 'y':
+                if (isset($_html_years)) {
+                    if ($_html) {
+                        $_html .= $field_separator;
+                    }
+                    $_html .= $_html_years;
+                }
+            break;
+            
+            case 'm':
+            case 'M':
+                if (isset($_html_months)) {
+                    if ($_html) {
+                        $_html .= $field_separator;
+                    }
+                    $_html .= $_html_months;
+                }
+            break;
+            
+            case 'd':
+            case 'D':
+                if (isset($_html_days)) {
+                    if ($_html) {
+                        $_html .= $field_separator;
+                    }
+                    $_html .= $_html_days;
+                }
+            break;
+        }
+    }
+    return $_html;
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/function.html_select_time.php b/lib/smarty/plugins/function.html_select_time.php
new file mode 100644
index 0000000..9fb8038
--- /dev/null
+++ b/lib/smarty/plugins/function.html_select_time.php
@@ -0,0 +1,366 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * @ignore
+ */
+require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+/**
+ * @ignore
+ */
+require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
+
+/**
+ * Smarty {html_select_time} function plugin
+ *
+ * Type:     function<br>
+ * Name:     html_select_time<br>
+ * Purpose:  Prints the dropdowns for time selection
+ *
+ * @link http://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
+ *          (Smarty online manual)
+ * @author Roberto Berto <roberto@berto.net>
+ * @author Monte Ohrt <monte AT ohrt DOT com>
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ * @return string
+ * @uses smarty_make_timestamp()
+ */
+function smarty_function_html_select_time($params, $template)
+{
+    $prefix = "Time_";
+    $field_array = null;
+    $field_separator = "\n";
+    $option_separator = "\n";
+    $time = null;
+
+    $display_hours = true;
+    $display_minutes = true;
+    $display_seconds = true;
+    $display_meridian = true;
+
+    $hour_format = '%02d';
+    $hour_value_format = '%02d';
+    $minute_format = '%02d';
+    $minute_value_format = '%02d';
+    $second_format = '%02d';
+    $second_value_format = '%02d';
+
+    $hour_size = null;
+    $minute_size = null;
+    $second_size = null;
+    $meridian_size = null;
+
+    $all_empty = null;
+    $hour_empty = null;
+    $minute_empty = null;
+    $second_empty = null;
+    $meridian_empty = null;
+
+    $all_id = null;
+    $hour_id = null;
+    $minute_id = null;
+    $second_id = null;
+    $meridian_id = null;
+
+    $use_24_hours = true;
+    $minute_interval = 1;
+    $second_interval = 1;
+
+    $extra_attrs = '';
+    $all_extra = null;
+    $hour_extra = null;
+    $minute_extra = null;
+    $second_extra = null;
+    $meridian_extra = null;
+
+    foreach ($params as $_key => $_value) {
+        switch ($_key) {
+            case 'time':
+                if (!is_array($_value) && $_value !== null) {
+                    $time = smarty_make_timestamp($_value);
+                }
+                break;
+
+            case 'prefix':
+            case 'field_array':
+
+            case 'field_separator':
+            case 'option_separator':
+
+            case 'all_extra':
+            case 'hour_extra':
+            case 'minute_extra':
+            case 'second_extra':
+            case 'meridian_extra':
+
+            case 'all_empty':
+            case 'hour_empty':
+            case 'minute_empty':
+            case 'second_empty':
+            case 'meridian_empty':
+
+            case 'all_id':
+            case 'hour_id':
+            case 'minute_id':
+            case 'second_id':
+            case 'meridian_id':
+
+            case 'hour_format':
+            case 'hour_value_format':
+            case 'minute_format':
+            case 'minute_value_format':
+            case 'second_format':
+            case 'second_value_format':
+                $$_key = (string)$_value;
+                break;
+
+            case 'display_hours':
+            case 'display_minutes':
+            case 'display_seconds':
+            case 'display_meridian':
+            case 'use_24_hours':
+                $$_key = (bool)$_value;
+                break;
+
+            case 'minute_interval':
+            case 'second_interval':
+
+            case 'hour_size':
+            case 'minute_size':
+            case 'second_size':
+            case 'meridian_size':
+                $$_key = (int)$_value;
+                break;
+
+            default:
+                if (!is_array($_value)) {
+                    $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
+                } else {
+                    trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+                }
+                break;
+        }
+    }
+
+    if (isset($params['time']) && is_array($params['time'])) {
+        if (isset($params['time'][$prefix . 'Hour'])) {
+            // $_REQUEST[$field_array] given
+            foreach (array('H' => 'Hour',  'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
+                $_variableName = '_' . strtolower($_elementName);
+                $$_variableName = isset($params['time'][$prefix . $_elementName])
+                    ? $params['time'][$prefix . $_elementName]
+                    : date($_elementKey);
+            }
+            $_meridian = isset($params['time'][$prefix . 'Meridian'])
+                ? (' ' . $params['time'][$prefix . 'Meridian'])
+                : '';
+            $time = strtotime( $_hour . ':' . $_minute . ':' . $_second . $_meridian );
+            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
+        } elseif (isset($params['time'][$field_array][$prefix . 'Hour'])) {
+            // $_REQUEST given
+            foreach (array('H' => 'Hour',  'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
+                $_variableName = '_' . strtolower($_elementName);
+                $$_variableName = isset($params['time'][$field_array][$prefix . $_elementName])
+                    ? $params['time'][$field_array][$prefix . $_elementName]
+                    : date($_elementKey);
+            }
+            $_meridian = isset($params['time'][$field_array][$prefix . 'Meridian'])
+                ? (' ' . $params['time'][$field_array][$prefix . 'Meridian'])
+                : '';
+            $time = strtotime( $_hour . ':' . $_minute . ':' . $_second . $_meridian );
+            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
+        } else {
+            // no date found, use NOW
+            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
+        }
+    } elseif ($time === null) {
+        if (array_key_exists('time', $params)) {
+            $_hour = $_minute = $_second = $time = null;
+        } else {
+            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s'));
+        }
+    } else {
+        list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
+    }
+
+    // generate hour <select>
+    if ($display_hours) {
+        $_html_hours = '';
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Hour]') : ($prefix . 'Hour');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        }
+        if ($hour_extra) {
+            $_extra .= ' ' . $hour_extra;
+        }
+
+        $_html_hours = '<select name="' . $_name . '"';
+        if ($hour_id !== null || $all_id !== null) {
+            $_html_hours .= ' id="' . smarty_function_escape_special_chars(
+                $hour_id !== null ? ( $hour_id ? $hour_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name )
+            ) . '"';
+        }
+        if ($hour_size) {
+            $_html_hours .= ' size="' . $hour_size . '"';
+        }
+        $_html_hours .= $_extra . $extra_attrs . '>' . $option_separator;
+
+        if (isset($hour_empty) || isset($all_empty)) {
+            $_html_hours .= '<option value="">' . ( isset($hour_empty) ? $hour_empty : $all_empty ) . '</option>' . $option_separator;
+        }
+
+        $start = $use_24_hours ? 0 : 1;
+        $end = $use_24_hours ? 23 : 12;
+        for ($i=$start; $i <= $end; $i++) {
+            $_val = sprintf('%02d', $i);
+            $_text = $hour_format == '%02d' ? $_val : sprintf($hour_format, $i);
+            $_value = $hour_value_format == '%02d' ? $_val : sprintf($hour_value_format, $i);
+
+            if (!$use_24_hours) {
+                $_hour12 = $_hour == 0
+                    ? 12
+                    : ($_hour <= 12 ? $_hour : $_hour -12);
+            }
+
+            $selected = $_hour !== null ? ($use_24_hours ? $_hour == $_val : $_hour12 == $_val) : null;
+            $_html_hours .= '<option value="' . $_value . '"'
+                . ($selected ? ' selected="selected"' : '')
+                . '>' . $_text . '</option>' . $option_separator;
+        }
+
+        $_html_hours .= '</select>';
+    }
+
+    // generate minute <select>
+    if ($display_minutes) {
+        $_html_minutes = '';
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Minute]') : ($prefix . 'Minute');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        }
+        if ($minute_extra) {
+            $_extra .= ' ' . $minute_extra;
+        }
+
+        $_html_minutes = '<select name="' . $_name . '"';
+        if ($minute_id !== null || $all_id !== null) {
+            $_html_minutes .= ' id="' . smarty_function_escape_special_chars(
+                $minute_id !== null ? ( $minute_id ? $minute_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name )
+            ) . '"';
+        }
+        if ($minute_size) {
+            $_html_minutes .= ' size="' . $minute_size . '"';
+        }
+        $_html_minutes .= $_extra . $extra_attrs . '>' . $option_separator;
+
+        if (isset($minute_empty) || isset($all_empty)) {
+            $_html_minutes .= '<option value="">' . ( isset($minute_empty) ? $minute_empty : $all_empty ) . '</option>' . $option_separator;
+        }
+
+        $selected = $_minute !== null ? ($_minute - $_minute % $minute_interval) : null;
+        for ($i=0; $i <= 59; $i += $minute_interval) {
+            $_val = sprintf('%02d', $i);
+            $_text = $minute_format == '%02d' ? $_val : sprintf($minute_format, $i);
+            $_value = $minute_value_format == '%02d' ? $_val : sprintf($minute_value_format, $i);
+            $_html_minutes .= '<option value="' . $_value . '"'
+                . ($selected === $i ? ' selected="selected"' : '')
+                . '>' . $_text . '</option>' . $option_separator;
+        }
+
+        $_html_minutes .= '</select>';
+    }
+
+    // generate second <select>
+    if ($display_seconds) {
+        $_html_seconds = '';
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Second]') : ($prefix . 'Second');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        }
+        if ($second_extra) {
+            $_extra .= ' ' . $second_extra;
+        }
+
+        $_html_seconds = '<select name="' . $_name . '"';
+        if ($second_id !== null || $all_id !== null) {
+            $_html_seconds .= ' id="' . smarty_function_escape_special_chars(
+                $second_id !== null ? ( $second_id ? $second_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name )
+            ) . '"';
+        }
+        if ($second_size) {
+            $_html_seconds .= ' size="' . $second_size . '"';
+        }
+        $_html_seconds .= $_extra . $extra_attrs . '>' . $option_separator;
+
+        if (isset($second_empty) || isset($all_empty)) {
+            $_html_seconds .= '<option value="">' . ( isset($second_empty) ? $second_empty : $all_empty ) . '</option>' . $option_separator;
+        }
+
+        $selected = $_second !== null ? ($_second - $_second % $second_interval) : null;
+        for ($i=0; $i <= 59; $i += $second_interval) {
+            $_val = sprintf('%02d', $i);
+            $_text = $second_format == '%02d' ? $_val : sprintf($second_format, $i);
+            $_value = $second_value_format == '%02d' ? $_val : sprintf($second_value_format, $i);
+            $_html_seconds .= '<option value="' . $_value . '"'
+                . ($selected === $i ? ' selected="selected"' : '')
+                . '>' . $_text . '</option>' . $option_separator;
+        }
+
+        $_html_seconds .= '</select>';
+    }
+
+    // generate meridian <select>
+    if ($display_meridian && !$use_24_hours) {
+        $_html_meridian = '';
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Meridian]') : ($prefix . 'Meridian');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        }
+        if ($meridian_extra) {
+            $_extra .= ' ' . $meridian_extra;
+        }
+
+        $_html_meridian = '<select name="' . $_name . '"';
+        if ($meridian_id !== null || $all_id !== null) {
+            $_html_meridian .= ' id="' . smarty_function_escape_special_chars(
+                $meridian_id !== null ? ( $meridian_id ? $meridian_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name )
+            ) . '"';
+        }
+        if ($meridian_size) {
+            $_html_meridian .= ' size="' . $meridian_size . '"';
+        }
+        $_html_meridian .= $_extra . $extra_attrs . '>' . $option_separator;
+
+        if (isset($meridian_empty) || isset($all_empty)) {
+            $_html_meridian .= '<option value="">' . ( isset($meridian_empty) ? $meridian_empty : $all_empty ) . '</option>' . $option_separator;
+        }
+
+        $_html_meridian .= '<option value="am"'. ($_hour < 12 ? ' selected="selected"' : '') .'>AM</option>' . $option_separator
+            . '<option value="pm"'. ($_hour < 12 ? '' : ' selected="selected"') .'>PM</option>' . $option_separator
+            . '</select>';
+    }
+
+    $_html = '';
+    foreach (array('_html_hours', '_html_minutes', '_html_seconds', '_html_meridian') as $k) {
+        if (isset($$k)) {
+            if ($_html) {
+                $_html .= $field_separator;
+            }
+            $_html .= $$k;
+        }
+    }
+
+    return $_html;
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/function.html_table.php b/lib/smarty/plugins/function.html_table.php
new file mode 100644
index 0000000..6b9cb9d
--- /dev/null
+++ b/lib/smarty/plugins/function.html_table.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {html_table} function plugin
+ *
+ * Type:     function<br>
+ * Name:     html_table<br>
+ * Date:     Feb 17, 2003<br>
+ * Purpose:  make an html table from an array of data<br>
+ * Params:
+ * <pre>
+ * - loop       - array to loop through
+ * - cols       - number of columns, comma separated list of column names
+ *                or array of column names
+ * - rows       - number of rows
+ * - table_attr - table attributes
+ * - th_attr    - table heading attributes (arrays are cycled)
+ * - tr_attr    - table row attributes (arrays are cycled)
+ * - td_attr    - table cell attributes (arrays are cycled)
+ * - trailpad   - value to pad trailing cells with
+ * - caption    - text for caption element
+ * - vdir       - vertical direction (default: "down", means top-to-bottom)
+ * - hdir       - horizontal direction (default: "right", means left-to-right)
+ * - inner      - inner loop (default "cols": print $loop line by line,
+ *                $loop will be printed column by column otherwise)
+ * </pre>
+ * Examples:
+ * <pre>
+ * {table loop=$data}
+ * {table loop=$data cols=4 tr_attr='"bgcolor=red"'}
+ * {table loop=$data cols="first,second,third" tr_attr=$colors}
+ * </pre>
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author credit to Messju Mohr <messju at lammfellpuschen dot de>
+ * @author credit to boots <boots dot smarty at yahoo dot com>
+ * @version 1.1
+ * @link http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
+ *          (Smarty online manual)
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ * @return string
+ */
+function smarty_function_html_table($params, $template)
+{
+    $table_attr = 'border="1"';
+    $tr_attr = '';
+    $th_attr = '';
+    $td_attr = '';
+    $cols = $cols_count = 3;
+    $rows = 3;
+    $trailpad = '&nbsp;';
+    $vdir = 'down';
+    $hdir = 'right';
+    $inner = 'cols';
+    $caption = '';
+    $loop = null;
+
+    if (!isset($params['loop'])) {
+        trigger_error("html_table: missing 'loop' parameter",E_USER_WARNING);
+        return;
+    }
+
+    foreach ($params as $_key => $_value) {
+        switch ($_key) {
+            case 'loop':
+                $$_key = (array)$_value;
+                break;
+
+            case 'cols':
+                if (is_array($_value) && !empty($_value)) {
+                    $cols = $_value;
+                    $cols_count = count($_value);
+                } elseif (!is_numeric($_value) && is_string($_value) && !empty($_value)) {
+                    $cols = explode(',', $_value);
+                    $cols_count = count($cols);
+                } elseif (!empty($_value)) {
+                    $cols_count = (int)$_value;
+                } else {
+                    $cols_count = $cols;
+                }
+                break;
+
+            case 'rows':
+                $$_key = (int)$_value;
+                break;
+
+            case 'table_attr':
+            case 'trailpad':
+            case 'hdir':
+            case 'vdir':
+            case 'inner':
+            case 'caption':
+                $$_key = (string)$_value;
+                break;
+
+            case 'tr_attr':
+            case 'td_attr':
+            case 'th_attr':
+                $$_key = $_value;
+                break;
+        }
+    }
+
+    $loop_count = count($loop);
+    if (empty($params['rows'])) {
+        /* no rows specified */
+        $rows = ceil($loop_count / $cols_count);
+    } elseif (empty($params['cols'])) {
+        if (!empty($params['rows'])) {
+            /* no cols specified, but rows */
+            $cols_count = ceil($loop_count / $rows);
+        }
+    }
+
+    $output = "<table $table_attr>\n";
+
+    if (!empty($caption)) {
+        $output .= '<caption>' . $caption . "</caption>\n";
+    }
+
+    if (is_array($cols)) {
+        $cols = ($hdir == 'right') ? $cols : array_reverse($cols);
+        $output .= "<thead><tr>\n";
+
+        for ($r = 0; $r < $cols_count; $r++) {
+            $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
+            $output .= $cols[$r];
+            $output .= "</th>\n";
+        }
+        $output .= "</tr></thead>\n";
+    }
+
+    $output .= "<tbody>\n";
+    for ($r = 0; $r < $rows; $r++) {
+        $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
+        $rx = ($vdir == 'down') ? $r * $cols_count : ($rows-1 - $r) * $cols_count;
+
+        for ($c = 0; $c < $cols_count; $c++) {
+            $x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count-1 - $c;
+            if ($inner != 'cols') {
+                /* shuffle x to loop over rows*/
+                $x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
+            }
+
+            if ($x < $loop_count) {
+                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[$x] . "</td>\n";
+            } else {
+                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">$trailpad</td>\n";
+            }
+        }
+        $output .= "</tr>\n";
+    }
+    $output .= "</tbody>\n";
+    $output .= "</table>\n";
+
+    return $output;
+}
+
+function smarty_function_html_table_cycle($name, $var, $no)
+{
+    if (!is_array($var)) {
+        $ret = $var;
+    } else {
+        $ret = $var[$no % count($var)];
+    }
+
+    return ($ret) ? ' ' . $ret : '';
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/function.mailto.php b/lib/smarty/plugins/function.mailto.php
new file mode 100644
index 0000000..55d5c06
--- /dev/null
+++ b/lib/smarty/plugins/function.mailto.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {mailto} function plugin
+ *
+ * Type:     function<br>
+ * Name:     mailto<br>
+ * Date:     May 21, 2002
+ * Purpose:  automate mailto address link creation, and optionally encode them.<br>
+ * Params:
+ * <pre>
+ * - address    - (required) - e-mail address
+ * - text       - (optional) - text to display, default is address
+ * - encode     - (optional) - can be one of:
+ *                             * none : no encoding (default)
+ *                             * javascript : encode with javascript
+ *                             * javascript_charcode : encode with javascript charcode
+ *                             * hex : encode with hexidecimal (no javascript)
+ * - cc         - (optional) - address(es) to carbon copy
+ * - bcc        - (optional) - address(es) to blind carbon copy
+ * - subject    - (optional) - e-mail subject
+ * - newsgroups - (optional) - newsgroup(s) to post to
+ * - followupto - (optional) - address(es) to follow up to
+ * - extra      - (optional) - extra tags for the href link
+ * </pre>
+ * Examples:
+ * <pre>
+ * {mailto address="me@domain.com"}
+ * {mailto address="me@domain.com" encode="javascript"}
+ * {mailto address="me@domain.com" encode="hex"}
+ * {mailto address="me@domain.com" subject="Hello to you!"}
+ * {mailto address="me@domain.com" cc="you@domain.com,they@domain.com"}
+ * {mailto address="me@domain.com" extra='class="mailto"'}
+ * </pre>
+ *
+ * @link http://www.smarty.net/manual/en/language.function.mailto.php {mailto}
+ *          (Smarty online manual)
+ * @version 1.2
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author credits to Jason Sweat (added cc, bcc and subject functionality)
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ * @return string
+ */
+function smarty_function_mailto($params, $template)
+{
+    static $_allowed_encoding = array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
+    $extra = '';
+
+    if (empty($params['address'])) {
+        trigger_error("mailto: missing 'address' parameter",E_USER_WARNING);
+        return;
+    } else {
+        $address = $params['address'];
+    }
+
+    $text = $address;
+    // netscape and mozilla do not decode %40 (@) in BCC field (bug?)
+    // so, don't encode it.
+    $search = array('%40', '%2C');
+    $replace = array('@', ',');
+    $mail_parms = array();
+    foreach ($params as $var => $value) {
+        switch ($var) {
+            case 'cc':
+            case 'bcc':
+            case 'followupto':
+                if (!empty($value))
+                    $mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
+                break;
+
+            case 'subject':
+            case 'newsgroups':
+                $mail_parms[] = $var . '=' . rawurlencode($value);
+                break;
+
+            case 'extra':
+            case 'text':
+                $$var = $value;
+
+            default:
+        }
+    }
+
+    if ($mail_parms) {
+        $address .= '?' . join('&', $mail_parms);
+    }
+    
+    $encode = (empty($params['encode'])) ? 'none' : $params['encode'];
+    if (!isset($_allowed_encoding[$encode])) {
+        trigger_error("mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex", E_USER_WARNING);
+        return;
+    }
+    // FIXME: (rodneyrehm) document.write() excues me what? 1998 has passed!
+    if ($encode == 'javascript') {
+        $string = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
+
+        $js_encode = '';
+        for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
+            $js_encode .= '%' . bin2hex($string[$x]);
+        }
+
+        return '<script type="text/javascript">eval(unescape(\'' . $js_encode . '\'))</script>';
+    } elseif ($encode == 'javascript_charcode') {
+        $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+
+        for($x = 0, $y = strlen($string); $x < $y; $x++) {
+            $ord[] = ord($string[$x]);
+        }
+
+        $_ret = "<script type=\"text/javascript\" language=\"javascript\">\n"
+            . "{document.write(String.fromCharCode("
+            . implode(',', $ord)
+            . "))"
+            . "}\n"
+            . "</script>\n";
+
+        return $_ret;
+    } elseif ($encode == 'hex') {
+        preg_match('!^(.*)(\?.*)$!', $address, $match);
+        if (!empty($match[2])) {
+            trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.",E_USER_WARNING);
+            return;
+        }
+        $address_encode = '';
+        for ($x = 0, $_length = strlen($address); $x < $_length; $x++) {
+            if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[$x])) {
+                $address_encode .= '%' . bin2hex($address[$x]);
+            } else {
+                $address_encode .= $address[$x];
+            }
+        }
+        $text_encode = '';
+        for ($x = 0, $_length = strlen($text); $x < $_length; $x++) {
+            $text_encode .= '&#x' . bin2hex($text[$x]) . ';';
+        }
+
+        $mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";
+        return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
+    } else {
+        // no encoding
+        return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+    }
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/function.math.php b/lib/smarty/plugins/function.math.php
new file mode 100644
index 0000000..f4d3f05
--- /dev/null
+++ b/lib/smarty/plugins/function.math.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * This plugin is only for Smarty2 BC
+ * @package Smarty
+ * @subpackage PluginsFunction
+ */
+
+/**
+ * Smarty {math} function plugin
+ *
+ * Type:     function<br>
+ * Name:     math<br>
+ * Purpose:  handle math computations in template
+ *
+ * @link http://www.smarty.net/manual/en/language.function.math.php {math}
+ *          (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ * @return string|null
+ */
+function smarty_function_math($params, $template)
+{
+    static $_allowed_funcs = array(
+        'int' => true, 'abs' => true, 'ceil' => true, 'cos' => true, 'exp' => true, 'floor' => true,
+        'log' => true, 'log10' => true, 'max' => true, 'min' => true, 'pi' => true, 'pow' => true,
+        'rand' => true, 'round' => true, 'sin' => true, 'sqrt' => true, 'srand' => true ,'tan' => true
+    );
+    // be sure equation parameter is present
+    if (empty($params['equation'])) {
+        trigger_error("math: missing equation parameter",E_USER_WARNING);
+        return;
+    }
+
+    $equation = $params['equation'];
+
+    // make sure parenthesis are balanced
+    if (substr_count($equation,"(") != substr_count($equation,")")) {
+        trigger_error("math: unbalanced parenthesis",E_USER_WARNING);
+        return;
+    }
+
+    // match all vars in equation, make sure all are passed
+    preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!",$equation, $match);
+
+    foreach($match[1] as $curr_var) {
+        if ($curr_var && !isset($params[$curr_var]) && !isset($_allowed_funcs[$curr_var])) {
+            trigger_error("math: function call $curr_var not allowed",E_USER_WARNING);
+            return;
+        }
+    }
+
+    foreach($params as $key => $val) {
+        if ($key != "equation" && $key != "format" && $key != "assign") {
+            // make sure value is not empty
+            if (strlen($val)==0) {
+                trigger_error("math: parameter $key is empty",E_USER_WARNING);
+                return;
+            }
+            if (!is_numeric($val)) {
+                trigger_error("math: parameter $key: is not numeric",E_USER_WARNING);
+                return;
+            }
+            $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
+        }
+    }
+    $smarty_math_result = null;
+    eval("\$smarty_math_result = ".$equation.";");
+
+    if (empty($params['format'])) {
+        if (empty($params['assign'])) {
+            return $smarty_math_result;
+        } else {
+            $template->assign($params['assign'],$smarty_math_result);
+        }
+    } else {
+        if (empty($params['assign'])){
+            printf($params['format'],$smarty_math_result);
+        } else {
+            $template->assign($params['assign'],sprintf($params['format'],$smarty_math_result));
+        }
+    }
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifier.capitalize.php b/lib/smarty/plugins/modifier.capitalize.php
new file mode 100644
index 0000000..a78e363
--- /dev/null
+++ b/lib/smarty/plugins/modifier.capitalize.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+/**
+ * Smarty capitalize modifier plugin
+ * 
+ * Type:     modifier<br>
+ * Name:     capitalize<br>
+ * Purpose:  capitalize words in the string
+ *
+ * {@internal {$string|capitalize:true:true} is the fastest option for MBString enabled systems }}
+ *
+ * @param string  $string    string to capitalize
+ * @param boolean $uc_digits also capitalize "x123" to "X123"
+ * @param boolean $lc_rest   capitalize first letters, lowercase all following letters "aAa" to "Aaa"
+ * @return string capitalized string
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @author Rodney Rehm
+ */
+function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = false)
+{
+    if (Smarty::$_MBSTRING) {
+        if ($lc_rest) {
+            // uppercase (including hyphenated words)
+            $upper_string = mb_convert_case( $string, MB_CASE_TITLE, Smarty::$_CHARSET );
+        } else {
+            // uppercase word breaks
+            $upper_string = preg_replace("!(^|[^\p{L}'])([\p{Ll}])!eS" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').mb_convert_case(stripslashes('\\2'),MB_CASE_UPPER, '" . addslashes(Smarty::$_CHARSET) . "')", $string);
+        }
+        // check uc_digits case
+        if (!$uc_digits) {
+            if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) {
+                foreach($matches[1] as $match) {
+                    $upper_string = substr_replace($upper_string, mb_strtolower($match[0], Smarty::$_CHARSET), $match[1], strlen($match[0]));
+                }
+            } 
+        }
+        $upper_string = preg_replace("!((^|\s)['\"])(\w)!e" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').mb_convert_case(stripslashes('\\3'),MB_CASE_UPPER, '" . addslashes(Smarty::$_CHARSET) . "')", $upper_string);
+        return $upper_string;
+    }
+    
+    // lowercase first
+    if ($lc_rest) {
+        $string = strtolower($string);
+    }
+    // uppercase (including hyphenated words)
+    $upper_string = preg_replace("!(^|[^\p{L}'])([\p{Ll}])!eS" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').ucfirst(stripslashes('\\2'))", $string); 
+    // check uc_digits case
+    if (!$uc_digits) {
+        if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) {
+            foreach($matches[1] as $match) {
+                $upper_string = substr_replace($upper_string, strtolower($match[0]), $match[1], strlen($match[0]));
+            }
+        } 
+    }
+    $upper_string = preg_replace("!((^|\s)['\"])(\w)!e" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').strtoupper(stripslashes('\\3'))", $upper_string);
+    return $upper_string;
+} 
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifier.date_format.php b/lib/smarty/plugins/modifier.date_format.php
new file mode 100644
index 0000000..3cca7d3
--- /dev/null
+++ b/lib/smarty/plugins/modifier.date_format.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+/**
+ * Smarty date_format modifier plugin
+ * 
+ * Type:     modifier<br>
+ * Name:     date_format<br>
+ * Purpose:  format datestamps via strftime<br>
+ * Input:<br>
+ *          - string: input date string
+ *          - format: strftime format for output
+ *          - default_date: default date if $string is empty
+ * 
+ * @link http://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @param string $string       input date string
+ * @param string $format       strftime format for output
+ * @param string $default_date default date if $string is empty
+ * @param string $formatter    either 'strftime' or 'auto'
+ * @return string |void
+ * @uses smarty_make_timestamp()
+ */
+function smarty_modifier_date_format($string, $format=null, $default_date='', $formatter='auto')
+{
+    if ($format === null) {
+        $format = Smarty::$_DATE_FORMAT;
+    }
+    /**
+    * Include the {@link shared.make_timestamp.php} plugin
+    */
+    require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
+    if ($string != '') {
+        $timestamp = smarty_make_timestamp($string);
+    } elseif ($default_date != '') {
+        $timestamp = smarty_make_timestamp($default_date);
+    } else {
+        return;
+    } 
+    if($formatter=='strftime'||($formatter=='auto'&&strpos($format,'%')!==false)) {
+        if (DS == '\\') {
+            $_win_from = array('%D', '%h', '%n', '%r', '%R', '%t', '%T');
+            $_win_to = array('%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S');
+            if (strpos($format, '%e') !== false) {
+                $_win_from[] = '%e';
+                $_win_to[] = sprintf('%\' 2d', date('j', $timestamp));
+            } 
+            if (strpos($format, '%l') !== false) {
+                $_win_from[] = '%l';
+                $_win_to[] = sprintf('%\' 2d', date('h', $timestamp));
+            } 
+            $format = str_replace($_win_from, $_win_to, $format);
+        } 
+        return strftime($format, $timestamp);
+    } else {
+        return date($format, $timestamp);
+    }
+} 
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifier.debug_print_var.php b/lib/smarty/plugins/modifier.debug_print_var.php
new file mode 100644
index 0000000..fa44100
--- /dev/null
+++ b/lib/smarty/plugins/modifier.debug_print_var.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Smarty plugin
+ * 
+ * @package Smarty
+ * @subpackage Debug
+ */
+
+/**
+ * Smarty debug_print_var modifier plugin
+ * 
+ * Type:     modifier<br>
+ * Name:     debug_print_var<br>
+ * Purpose:  formats variable contents for display in the console
+ *
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @param array|object $var     variable to be formatted
+ * @param integer      $depth   maximum recursion depth if $var is an array
+ * @param integer      $length  maximum string length if $var is a string
+ * @return string 
+ */
+function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
+{
+    $_replace = array("\n" => '<i>\n</i>',
+        "\r" => '<i>\r</i>',
+        "\t" => '<i>\t</i>'
+        );
+
+    switch (gettype($var)) {
+        case 'array' :
+            $results = '<b>Array (' . count($var) . ')</b>';
+            foreach ($var as $curr_key => $curr_val) {
+                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
+                 . '<b>' . strtr($curr_key, $_replace) . '</b> =&gt; '
+                 . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
+                $depth--;
+            } 
+            break;
+            
+        case 'object' :
+            $object_vars = get_object_vars($var);
+            $results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
+            foreach ($object_vars as $curr_key => $curr_val) {
+                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
+                 . '<b> -&gt;' . strtr($curr_key, $_replace) . '</b> = '
+                 . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
+                $depth--;
+            } 
+            break;
+            
+        case 'boolean' :
+        case 'NULL' :
+        case 'resource' :
+            if (true === $var) {
+                $results = 'true';
+            } elseif (false === $var) {
+                $results = 'false';
+            } elseif (null === $var) {
+                $results = 'null';
+            } else {
+                $results = htmlspecialchars((string) $var);
+            } 
+            $results = '<i>' . $results . '</i>';
+            break;
+            
+        case 'integer' :
+        case 'float' :
+            $results = htmlspecialchars((string) $var);
+            break;
+            
+        case 'string' :
+            $results = strtr($var, $_replace);
+            if (Smarty::$_MBSTRING) {
+                if (mb_strlen($var, Smarty::$_CHARSET) > $length) {
+                    $results = mb_substr($var, 0, $length - 3, Smarty::$_CHARSET) . '...';
+                }
+            } else {
+                if (isset($var[$length])) {
+                    $results = substr($var, 0, $length - 3) . '...';
+                }
+            }
+
+            $results = htmlspecialchars('"' . $results . '"');
+            break;
+            
+        case 'unknown type' :
+        default :
+            $results = strtr((string) $var, $_replace);
+            if (Smarty::$_MBSTRING) {
+                if (mb_strlen($results, Smarty::$_CHARSET) > $length) {
+                    $results = mb_substr($results, 0, $length - 3, Smarty::$_CHARSET) . '...';
+                }
+            } else {
+                if (strlen($results) > $length) {
+                    $results = substr($results, 0, $length - 3) . '...';
+                }
+            }
+             
+            $results = htmlspecialchars($results);
+    } 
+
+    return $results;
+} 
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifier.escape.php b/lib/smarty/plugins/modifier.escape.php
new file mode 100644
index 0000000..523d065
--- /dev/null
+++ b/lib/smarty/plugins/modifier.escape.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+/**
+ * Smarty escape modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     escape<br>
+ * Purpose:  escape string for output
+ *
+ * @link http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @param string  $string        input string
+ * @param string  $esc_type      escape type
+ * @param string  $char_set      character set, used for htmlspecialchars() or htmlentities()
+ * @param boolean $double_encode encode already encoded entitites again, used for htmlspecialchars() or htmlentities()
+ * @return string escaped input string
+ */
+function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
+{
+    if (!$char_set) {
+        $char_set = Smarty::$_CHARSET;
+    }
+
+    switch ($esc_type) {
+        case 'html':
+            return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
+
+        case 'htmlall':
+            if (Smarty::$_MBSTRING) {
+                // mb_convert_encoding ignores htmlspecialchars()
+                $string = htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
+                // htmlentities() won't convert everything, so use mb_convert_encoding
+                return mb_convert_encoding($string, 'HTML-ENTITIES', $char_set);
+            }
+
+            // no MBString fallback
+            return htmlentities($string, ENT_QUOTES, $char_set, $double_encode);
+
+        case 'url':
+            return rawurlencode($string);
+
+        case 'urlpathinfo':
+            return str_replace('%2F', '/', rawurlencode($string));
+
+        case 'quotes':
+            // escape unescaped single quotes
+            return preg_replace("%(?<!\\\\)'%", "\\'", $string);
+
+        case 'hex':
+            // escape every byte into hex
+            // Note that the UTF-8 encoded character ä will be represented as %c3%a4
+            $return = '';
+            $_length = strlen($string);
+            for ($x = 0; $x < $_length; $x++) {
+                $return .= '%' . bin2hex($string[$x]);
+            }
+            return $return;
+
+        case 'hexentity':
+            $return = '';
+            if (Smarty::$_MBSTRING) {
+                require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
+                $return = '';
+                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
+                    $return .= '&#x' . strtoupper(dechex($unicode)) . ';';
+                }
+                return $return;
+            }
+            // no MBString fallback
+            $_length = strlen($string);
+            for ($x = 0; $x < $_length; $x++) {
+                $return .= '&#x' . bin2hex($string[$x]) . ';';
+            }
+            return $return;
+
+        case 'decentity':
+            $return = '';
+            if (Smarty::$_MBSTRING) {
+                require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
+                $return = '';
+                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
+                    $return .= '&#' . $unicode . ';';
+                }
+                return $return;
+            }
+            // no MBString fallback
+            $_length = strlen($string);
+            for ($x = 0; $x < $_length; $x++) {
+                $return .= '&#' . ord($string[$x]) . ';';
+            }
+            return $return;
+
+        case 'javascript':
+            // escape quotes and backslashes, newlines, etc.
+            return strtr($string, array('\\' => '\\\\', "'" => "\\'", '"' => '\\"', "\r" => '\\r', "\n" => '\\n', '</' => '<\/'));
+
+        case 'mail':
+            if (Smarty::$_MBSTRING) {
+                require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
+                return smarty_mb_str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
+            }
+            // no MBString fallback
+            return str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
+
+        case 'nonstd':
+            // escape non-standard chars, such as ms document quotes
+            $return = '';
+            if (Smarty::$_MBSTRING) {
+                require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
+                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
+                    if ($unicode >= 126) {
+                        $return .= '&#' . $unicode . ';';
+                    } else {
+                        $return .= chr($unicode);
+                    }
+                }
+                return $return;
+            }
+
+            $_length = strlen($string);
+            for ($_i = 0; $_i < $_length; $_i++) {
+                $_ord = ord(substr($string, $_i, 1));
+                // non-standard char, escape it
+                if ($_ord >= 126) {
+                    $return .= '&#' . $_ord . ';';
+                } else {
+                    $return .= substr($string, $_i, 1);
+                }
+            }
+            return $return;
+
+        default:
+            return $string;
+    }
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifier.regex_replace.php b/lib/smarty/plugins/modifier.regex_replace.php
new file mode 100644
index 0000000..f9fd5fa
--- /dev/null
+++ b/lib/smarty/plugins/modifier.regex_replace.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+/**
+ * Smarty regex_replace modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     regex_replace<br>
+ * Purpose:  regular expression search/replace
+ *
+ * @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php
+ *          regex_replace (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @param string       $string   input string
+ * @param string|array $search   regular expression(s) to search for
+ * @param string|array $replace  string(s) that should be replaced
+ * @return string
+ */
+function smarty_modifier_regex_replace($string, $search, $replace)
+{
+    if(is_array($search)) {
+        foreach($search as $idx => $s) {
+            $search[$idx] = _smarty_regex_replace_check($s);
+        }
+    } else {
+        $search = _smarty_regex_replace_check($search);
+    }
+    return preg_replace($search, $replace, $string);
+}
+
+/**
+ * @param  string $search string(s) that should be replaced
+ * @return string
+ * @ignore
+ */
+function _smarty_regex_replace_check($search)
+{
+    // null-byte injection detection
+    // anything behind the first null-byte is ignored
+    if (($pos = strpos($search,"\0")) !== false) {
+        $search = substr($search,0,$pos);
+    }
+    // remove eval-modifier from $search
+    if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
+        $search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);
+    }
+    return $search;
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifier.replace.php b/lib/smarty/plugins/modifier.replace.php
new file mode 100644
index 0000000..4d71a6e
--- /dev/null
+++ b/lib/smarty/plugins/modifier.replace.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+/**
+ * Smarty replace modifier plugin
+ * 
+ * Type:     modifier<br>
+ * Name:     replace<br>
+ * Purpose:  simple search/replace
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @author Uwe Tews 
+ * @param string $string  input string
+ * @param string $search  text to search for
+ * @param string $replace replacement text
+ * @return string 
+ */
+function smarty_modifier_replace($string, $search, $replace)
+{
+    if (Smarty::$_MBSTRING) {
+        require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
+        return smarty_mb_str_replace($search, $replace, $string);
+    }
+    
+    return str_replace($search, $replace, $string);
+} 
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifier.spacify.php b/lib/smarty/plugins/modifier.spacify.php
new file mode 100644
index 0000000..a907232
--- /dev/null
+++ b/lib/smarty/plugins/modifier.spacify.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+
+/**
+ * Smarty spacify modifier plugin
+ * 
+ * Type:     modifier<br>
+ * Name:     spacify<br>
+ * Purpose:  add spaces between characters in a string
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @param string $string       input string
+ * @param string $spacify_char string to insert between characters.
+ * @return string
+ */
+function smarty_modifier_spacify($string, $spacify_char = ' ')
+{
+    // well… what about charsets besides latin and UTF-8?
+    return implode($spacify_char, preg_split('//' . Smarty::$_UTF8_MODIFIER, $string, -1, PREG_SPLIT_NO_EMPTY));
+} 
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifier.truncate.php b/lib/smarty/plugins/modifier.truncate.php
new file mode 100644
index 0000000..9a803ec
--- /dev/null
+++ b/lib/smarty/plugins/modifier.truncate.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifier
+ */
+ 
+/**
+ * Smarty truncate modifier plugin
+ * 
+ * Type:     modifier<br>
+ * Name:     truncate<br>
+ * Purpose:  Truncate a string to a certain length if necessary,
+ *               optionally splitting in the middle of a word, and
+ *               appending the $etc string or inserting $etc into the middle.
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com> 
+ * @param string  $string      input string
+ * @param integer $length      length of truncated text
+ * @param string  $etc         end string
+ * @param boolean $break_words truncate at word boundary
+ * @param boolean $middle      truncate in the middle of text
+ * @return string truncated string
+ */
+function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false) {
+    if ($length == 0)
+        return '';
+
+    if (Smarty::$_MBSTRING) {
+        if (mb_strlen($string, Smarty::$_CHARSET) > $length) {
+            $length -= min($length, mb_strlen($etc, Smarty::$_CHARSET));
+            if (!$break_words && !$middle) {
+                $string = preg_replace('/\s+?(\S+)?$/' . Smarty::$_UTF8_MODIFIER, '', mb_substr($string, 0, $length + 1, Smarty::$_CHARSET));
+            } 
+            if (!$middle) {
+                return mb_substr($string, 0, $length, Smarty::$_CHARSET) . $etc;
+            }
+            return mb_substr($string, 0, $length / 2, Smarty::$_CHARSET) . $etc . mb_substr($string, - $length / 2, $length, Smarty::$_CHARSET);
+        }
+        return $string;
+    }
+    
+    // no MBString fallback
+    if (isset($string[$length])) {
+        $length -= min($length, strlen($etc));
+        if (!$break_words && !$middle) {
+            $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1));
+        } 
+        if (!$middle) {
+            return substr($string, 0, $length) . $etc;
+        }
+        return substr($string, 0, $length / 2) . $etc . substr($string, - $length / 2);
+    }
+    return $string;
+} 
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifiercompiler.cat.php b/lib/smarty/plugins/modifiercompiler.cat.php
new file mode 100644
index 0000000..1cfe630
--- /dev/null
+++ b/lib/smarty/plugins/modifiercompiler.cat.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+
+/**
+ * Smarty cat modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     cat<br>
+ * Date:     Feb 24, 2003<br>
+ * Purpose:  catenate a value to a variable<br>
+ * Input:    string to catenate<br>
+ * Example:  {$var|cat:"foo"}
+ *
+ * @link http://smarty.php.net/manual/en/language.modifier.cat.php cat
+ *          (Smarty online manual)
+ * @author   Uwe Tews
+ * @param array $params parameters
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_cat($params, $compiler)
+{
+    return '('.implode(').(', $params).')';
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifiercompiler.count_characters.php b/lib/smarty/plugins/modifiercompiler.count_characters.php
new file mode 100644
index 0000000..98e8efa
--- /dev/null
+++ b/lib/smarty/plugins/modifiercompiler.count_characters.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+
+/**
+ * Smarty count_characters modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     count_characteres<br>
+ * Purpose:  count the number of characters in a text
+ *
+ * @link http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
+ * @author Uwe Tews
+ * @param array $params parameters
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_count_characters($params, $compiler)
+{
+    if (!isset($params[1]) || $params[1] != 'true') {
+        return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[0] . ', $tmp)';
+    }
+    if (Smarty::$_MBSTRING) {
+        return 'mb_strlen(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
+    }
+    // no MBString fallback
+    return 'strlen(' . $params[0] . ')';
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifiercompiler.count_paragraphs.php b/lib/smarty/plugins/modifiercompiler.count_paragraphs.php
new file mode 100644
index 0000000..0e1b0af
--- /dev/null
+++ b/lib/smarty/plugins/modifiercompiler.count_paragraphs.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+
+/**
+ * Smarty count_paragraphs modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     count_paragraphs<br>
+ * Purpose:  count the number of paragraphs in a text
+ *
+ * @link http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
+ *          count_paragraphs (Smarty online manual)
+ * @author Uwe Tews
+ * @param array $params parameters
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_count_paragraphs($params, $compiler)
+{
+    // count \r or \n characters
+    return '(preg_match_all(\'#[\r\n]+#\', ' . $params[0] . ', $tmp)+1)';
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifiercompiler.count_sentences.php b/lib/smarty/plugins/modifiercompiler.count_sentences.php
new file mode 100644
index 0000000..2f517be
--- /dev/null
+++ b/lib/smarty/plugins/modifiercompiler.count_sentences.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+
+/**
+ * Smarty count_sentences modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     count_sentences
+ * Purpose:  count the number of sentences in a text
+ *
+ * @link http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
+ *          count_sentences (Smarty online manual)
+ * @author Uwe Tews
+ * @param array $params parameters
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_count_sentences($params, $compiler)
+{
+    // find periods, question marks, exclamation marks with a word before but not after.
+    return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . Smarty::$_UTF8_MODIFIER . '", ' . $params[0] . ', $tmp)';
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifiercompiler.count_words.php b/lib/smarty/plugins/modifiercompiler.count_words.php
new file mode 100644
index 0000000..e05738c
--- /dev/null
+++ b/lib/smarty/plugins/modifiercompiler.count_words.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+
+/**
+ * Smarty count_words modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     count_words<br>
+ * Purpose:  count the number of words in a text
+ *
+ * @link http://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
+ * @author Uwe Tews
+ * @param array $params parameters
+ * @return string with compiled code
+*/
+function smarty_modifiercompiler_count_words($params, $compiler)
+{
+    if (Smarty::$_MBSTRING) {
+        // return 'preg_match_all(\'#[\w\pL]+#' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
+        // expression taken from http://de.php.net/manual/en/function.str-word-count.php#85592
+        return 'preg_match_all(\'/\p{L}[\p{L}\p{Mn}\p{Pd}\\\'\x{2019}]*/' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
+    }
+    // no MBString fallback
+    return 'str_word_count(' . $params[0] . ')';
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifiercompiler.default.php b/lib/smarty/plugins/modifiercompiler.default.php
new file mode 100644
index 0000000..4f831a5
--- /dev/null
+++ b/lib/smarty/plugins/modifiercompiler.default.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+
+/**
+ * Smarty default modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     default<br>
+ * Purpose:  designate default value for empty variables
+ *
+ * @link http://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
+ * @author Uwe Tews
+ * @param array $params parameters
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_default ($params, $compiler)
+{
+    $output = $params[0];
+    if (!isset($params[1])) {
+        $params[1] = "''";
+    }
+    
+    array_shift($params);
+    foreach ($params as $param) {
+        $output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
+    }
+    return $output;
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifiercompiler.escape.php b/lib/smarty/plugins/modifiercompiler.escape.php
new file mode 100644
index 0000000..b4cd3c8
--- /dev/null
+++ b/lib/smarty/plugins/modifiercompiler.escape.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+
+/**
+ * @ignore
+ */
+require_once( SMARTY_PLUGINS_DIR .'shared.literal_compiler_param.php' );
+
+/**
+ * Smarty escape modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     escape<br>
+ * Purpose:  escape string for output
+ *
+ * @link http://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
+ * @author Rodney Rehm
+ * @param array $params parameters
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_escape($params, $compiler)
+{
+    try {
+        $esc_type = smarty_literal_compiler_param($params, 1, 'html');
+        $char_set = smarty_literal_compiler_param($params, 2, Smarty::$_CHARSET);
+        $double_encode = smarty_literal_compiler_param($params, 3, true);
+
+        if (!$char_set) {
+            $char_set = Smarty::$_CHARSET;
+        }
+
+        switch ($esc_type) {
+            case 'html':
+                return 'htmlspecialchars('
+                    . $params[0] .', ENT_QUOTES, '
+                    . var_export($char_set, true) . ', '
+                    . var_export($double_encode, true) . ')';
+
+            case 'htmlall':
+                if (Smarty::$_MBSTRING) {
+                    return 'mb_convert_encoding(htmlspecialchars('
+                        . $params[0] .', ENT_QUOTES, '
+                        . var_export($char_set, true) . ', '
+                        . var_export($double_encode, true)
+                        . '), "HTML-ENTITIES", '
+                        . var_export($char_set, true) . ')';
+                }
+
+                // no MBString fallback
+                return 'htmlentities('
+                    . $params[0] .', ENT_QUOTES, '
+                    . var_export($char_set, true) . ', '
+                    . var_export($double_encode, true) . ')';
+
+            case 'url':
+                return 'rawurlencode(' . $params[0] . ')';
+
+            case 'urlpathinfo':
+                return 'str_replace("%2F", "/", rawurlencode(' . $params[0] . '))';
+
+            case 'quotes':
+                // escape unescaped single quotes
+                return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'",' . $params[0] . ')';
+
+            case 'javascript':
+                // escape quotes and backslashes, newlines, etc.
+                return 'strtr(' . $params[0] . ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/" ))';
+
+        }
+    } catch(SmartyException $e) {
+        // pass through to regular plugin fallback
+    }
+
+    // could not optimize |escape call, so fallback to regular plugin
+    if ($compiler->tag_nocache | $compiler->nocache) {
+        $compiler->template->required_plugins['nocache']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR .'modifier.escape.php';
+        $compiler->template->required_plugins['nocache']['escape']['modifier']['function'] = 'smarty_modifier_escape';
+    } else {
+        $compiler->template->required_plugins['compiled']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR .'modifier.escape.php';
+        $compiler->template->required_plugins['compiled']['escape']['modifier']['function'] = 'smarty_modifier_escape';
+    }
+    return 'smarty_modifier_escape(' . join( ', ', $params ) . ')';
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifiercompiler.from_charset.php b/lib/smarty/plugins/modifiercompiler.from_charset.php
new file mode 100644
index 0000000..93b568a
--- /dev/null
+++ b/lib/smarty/plugins/modifiercompiler.from_charset.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+
+/**
+ * Smarty from_charset modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     from_charset<br>
+ * Purpose:  convert character encoding from $charset to internal encoding
+ *
+ * @author Rodney Rehm
+ * @param array $params parameters
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_from_charset($params, $compiler)
+{
+    if (!Smarty::$_MBSTRING) {
+        // FIXME: (rodneyrehm) shouldn't this throw an error?
+        return $params[0];
+    }
+
+    if (!isset($params[1])) {
+        $params[1] = '"ISO-8859-1"';
+    }
+
+    return 'mb_convert_encoding(' . $params[0] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[1] . ')';
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifiercompiler.indent.php b/lib/smarty/plugins/modifiercompiler.indent.php
new file mode 100644
index 0000000..020c4fd
--- /dev/null
+++ b/lib/smarty/plugins/modifiercompiler.indent.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+
+/**
+ * Smarty indent modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     indent<br>
+ * Purpose:  indent lines of text
+ *
+ * @link http://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
+ * @author Uwe Tews
+ * @param array $params parameters
+ * @return string with compiled code
+ */
+
+function smarty_modifiercompiler_indent($params, $compiler)
+{
+    if (!isset($params[1])) {
+        $params[1] = 4;
+    }
+    if (!isset($params[2])) {
+        $params[2] = "' '";
+    }
+    return 'preg_replace(\'!^!m\',str_repeat(' . $params[2] . ',' . $params[1] . '),' . $params[0] . ')';
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifiercompiler.lower.php b/lib/smarty/plugins/modifiercompiler.lower.php
new file mode 100644
index 0000000..1845cc1
--- /dev/null
+++ b/lib/smarty/plugins/modifiercompiler.lower.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+
+/**
+ * Smarty lower modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     lower<br>
+ * Purpose:  convert string to lowercase
+ *
+ * @link http://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Uwe Tews
+ * @param array $params parameters
+ * @return string with compiled code
+ */
+
+function smarty_modifiercompiler_lower($params, $compiler)
+{
+    if (Smarty::$_MBSTRING) {
+        return 'mb_strtolower(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')' ;
+    }
+    // no MBString fallback
+    return 'strtolower(' . $params[0] . ')';
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifiercompiler.noprint.php b/lib/smarty/plugins/modifiercompiler.noprint.php
new file mode 100644
index 0000000..3ca2657
--- /dev/null
+++ b/lib/smarty/plugins/modifiercompiler.noprint.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+
+/**
+ * Smarty noprint modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     noprint<br>
+ * Purpose:  return an empty string
+ *
+ * @author   Uwe Tews
+ * @param array $params parameters
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_noprint($params, $compiler)
+{
+    return "''";
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifiercompiler.string_format.php b/lib/smarty/plugins/modifiercompiler.string_format.php
new file mode 100644
index 0000000..8334597
--- /dev/null
+++ b/lib/smarty/plugins/modifiercompiler.string_format.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+
+/**
+ * Smarty string_format modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     string_format<br>
+ * Purpose:  format strings via sprintf
+ *
+ * @link http://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
+ * @author Uwe Tews
+ * @param array $params parameters
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_string_format($params, $compiler)
+{
+    return 'sprintf(' . $params[1] . ',' . $params[0] . ')';
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifiercompiler.strip.php b/lib/smarty/plugins/modifiercompiler.strip.php
new file mode 100644
index 0000000..f1d5db0
--- /dev/null
+++ b/lib/smarty/plugins/modifiercompiler.strip.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+
+/**
+ * Smarty strip modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     strip<br>
+ * Purpose:  Replace all repeated spaces, newlines, tabs
+ *              with a single space or supplied replacement string.<br>
+ * Example:  {$var|strip} {$var|strip:"&nbsp;"}<br>
+ * Date:     September 25th, 2002
+ *
+ * @link http://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
+ * @author Uwe Tews
+ * @param array $params parameters
+ * @return string with compiled code
+ */
+
+function smarty_modifiercompiler_strip($params, $compiler)
+{
+    if (!isset($params[1])) {
+        $params[1] = "' '";
+    }
+    return "preg_replace('!\s+!" . Smarty::$_UTF8_MODIFIER . "', {$params[1]},{$params[0]})";
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifiercompiler.strip_tags.php b/lib/smarty/plugins/modifiercompiler.strip_tags.php
new file mode 100644
index 0000000..296a3a2
--- /dev/null
+++ b/lib/smarty/plugins/modifiercompiler.strip_tags.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+
+/**
+ * Smarty strip_tags modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     strip_tags<br>
+ * Purpose:  strip html tags from text
+ *
+ * @link http://www.smarty.net/manual/en/language.modifier.strip.tags.php strip_tags (Smarty online manual)
+ * @author Uwe Tews
+ * @param array $params parameters
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_strip_tags($params, $compiler)
+{
+   if (!isset($params[1])) {
+        $params[1] = true;
+    }
+    if ($params[1] === true) {
+        return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
+    } else {
+        return 'strip_tags(' . $params[0] . ')';
+    }
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifiercompiler.to_charset.php b/lib/smarty/plugins/modifiercompiler.to_charset.php
new file mode 100644
index 0000000..f5cdf45
--- /dev/null
+++ b/lib/smarty/plugins/modifiercompiler.to_charset.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+
+/**
+ * Smarty to_charset modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     to_charset<br>
+ * Purpose:  convert character encoding from internal encoding to $charset
+ *
+ * @author Rodney Rehm
+ * @param array $params parameters
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_to_charset($params, $compiler)
+{
+    if (!Smarty::$_MBSTRING) {
+        // FIXME: (rodneyrehm) shouldn't this throw an error?
+        return $params[0];
+    }
+
+    if (!isset($params[1])) {
+        $params[1] = '"ISO-8859-1"';
+    }
+
+    return 'mb_convert_encoding(' . $params[0] . ', ' . $params[1] . ', "' . addslashes(Smarty::$_CHARSET) . '")';
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifiercompiler.unescape.php b/lib/smarty/plugins/modifiercompiler.unescape.php
new file mode 100644
index 0000000..ce0bd63
--- /dev/null
+++ b/lib/smarty/plugins/modifiercompiler.unescape.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+
+/**
+ * Smarty unescape modifier plugin
+ *
+ * Type:     modifier<br>
+ * Name:     unescape<br>
+ * Purpose:  unescape html entities
+ *
+ * @author Rodney Rehm
+ * @param array $params parameters
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_unescape($params, $compiler)
+{
+    if (!isset($params[1])) {
+        $params[1] = 'html';
+    }
+    if (!isset($params[2])) {
+        $params[2] = '\'' . addslashes(Smarty::$_CHARSET) . '\'';
+    } else {
+        $params[2] = "'" . $params[2] . "'";
+    }
+
+    switch (trim($params[1], '"\'')) {
+        case 'entity':
+            return 'mb_convert_encoding(' . $params[0] . ', ' . $params[2] . ', \'HTML-ENTITIES\')';
+        case 'htmlall':
+            if (Smarty::$_MBSTRING) {
+                return 'mb_convert_encoding(' . $params[0] . ', ' . $params[2] . ', \'HTML-ENTITIES\')';
+            }
+            return 'html_entity_decode(' . $params[0] . ', ENT_QUOTES, ' . $params[2] . ')';
+
+        case 'html':
+            return 'htmlspecialchars_decode(' . $params[0] . ', ENT_QUOTES)';
+
+        default:
+            return $params[0];
+    }
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifiercompiler.upper.php b/lib/smarty/plugins/modifiercompiler.upper.php
new file mode 100644
index 0000000..f368e37
--- /dev/null
+++ b/lib/smarty/plugins/modifiercompiler.upper.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+
+/**
+ * Smarty upper modifier plugin
+ * 
+ * Type:     modifier<br>
+ * Name:     lower<br>
+ * Purpose:  convert string to uppercase
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
+ * @author Uwe Tews 
+ * @param array $params parameters
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_upper($params, $compiler)
+{
+    if (Smarty::$_MBSTRING) {
+        return 'mb_strtoupper(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')' ;
+    }
+    // no MBString fallback
+    return 'strtoupper(' . $params[0] . ')';
+} 
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/modifiercompiler.wordwrap.php b/lib/smarty/plugins/modifiercompiler.wordwrap.php
new file mode 100644
index 0000000..f6845ad
--- /dev/null
+++ b/lib/smarty/plugins/modifiercompiler.wordwrap.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+
+/**
+ * Smarty wordwrap modifier plugin
+ * 
+ * Type:     modifier<br>
+ * Name:     wordwrap<br>
+ * Purpose:  wrap a string of text at a given length
+ * 
+ * @link http://smarty.php.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
+ * @author Uwe Tews 
+ * @param array $params parameters
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_wordwrap($params, $compiler)
+{
+    if (!isset($params[1])) {
+        $params[1] = 80;
+    } 
+    if (!isset($params[2])) {
+        $params[2] = '"\n"';
+    } 
+    if (!isset($params[3])) {
+        $params[3] = 'false';
+    } 
+    $function = 'wordwrap';
+    if (Smarty::$_MBSTRING) {
+        if ($compiler->tag_nocache | $compiler->nocache) {
+            $compiler->template->required_plugins['nocache']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR .'shared.mb_wordwrap.php';
+            $compiler->template->required_plugins['nocache']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
+        } else {
+            $compiler->template->required_plugins['compiled']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR .'shared.mb_wordwrap.php';
+            $compiler->template->required_plugins['compiled']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
+        }
+        $function = 'smarty_mb_wordwrap';
+    }
+    return $function . '(' . $params[0] . ',' . $params[1] . ',' . $params[2] . ',' . $params[3] . ')';
+} 
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/outputfilter.trimwhitespace.php b/lib/smarty/plugins/outputfilter.trimwhitespace.php
new file mode 100644
index 0000000..41828e1
--- /dev/null
+++ b/lib/smarty/plugins/outputfilter.trimwhitespace.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsFilter
+ */
+
+/**
+ * Smarty trimwhitespace outputfilter plugin
+ *
+ * Trim unnecessary whitespace from HTML markup.
+ *
+ * @author   Rodney Rehm
+ * @param string                   $source input string
+ * @param Smarty_Internal_Template $smarty Smarty object
+ * @return string filtered output
+ */
+function smarty_outputfilter_trimwhitespace($source, Smarty_Internal_Template $smarty)
+{
+    $store = array();
+    $_store = 0;
+    $_offset = 0;
+
+    // Unify Line-Breaks to \n
+    $source = preg_replace("/\015\012|\015|\012/", "\n", $source);
+
+    // capture Internet Explorer Conditional Comments
+    if (preg_match_all('#<!--\[[^\]]+\]>.*?<!\[[^\]]+\]-->#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+        foreach ($matches as $match) {
+            $store[] = $match[0][0];
+            $_length = strlen($match[0][0]);
+            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+            $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length);
+
+            $_offset += $_length - strlen($replace);
+            $_store++;
+        }
+    }
+
+    // Strip all HTML-Comments
+    $source = preg_replace( '#<!--.*?-->#ms', '', $source );
+
+    // capture html elements not to be messed with
+    $_offset = 0;
+    if (preg_match_all('#<(script|pre|textarea)[^>]*>.*?</\\1>#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+        foreach ($matches as $match) {
+            $store[] = $match[0][0];
+            $_length = strlen($match[0][0]);
+            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+            $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length);
+
+            $_offset += $_length - strlen($replace);
+            $_store++;
+        }
+    }
+
+    $expressions = array(
+        // replace multiple spaces between tags by a single space
+        // can't remove them entirely, becaue that might break poorly implemented CSS display:inline-block elements
+        '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s' => '\1 \2',
+        // remove spaces between attributes (but not in attribute values!)
+        '#(([a-z0-9]\s*=\s*(["\'])[^\3]*?\3)|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \4',
+        // note: for some very weird reason trim() seems to remove spaces inside attributes.
+        // maybe a \0 byte or something is interfering?
+        '#^\s+<#Ss' => '<',
+        '#>\s+$#Ss' => '>',
+    );
+
+    $source = preg_replace( array_keys($expressions), array_values($expressions), $source );
+    // note: for some very weird reason trim() seems to remove spaces inside attributes.
+    // maybe a \0 byte or something is interfering?
+    // $source = trim( $source );
+
+    // capture html elements not to be messed with
+    $_offset = 0;
+    if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+        foreach ($matches as $match) {
+            $store[] = $match[0][0];
+            $_length = strlen($match[0][0]);
+            $replace = array_shift($store);
+            $source = substr_replace($source, $replace, $match[0][1] + $_offset, $_length);
+
+            $_offset += strlen($replace) - $_length;
+            $_store++;
+        }
+    }
+
+    return $source;
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/shared.escape_special_chars.php b/lib/smarty/plugins/shared.escape_special_chars.php
new file mode 100644
index 0000000..d2609b6
--- /dev/null
+++ b/lib/smarty/plugins/shared.escape_special_chars.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Smarty shared plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsShared
+ */
+
+if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
+    /**
+     * escape_special_chars common function
+     *
+     * Function: smarty_function_escape_special_chars<br>
+     * Purpose:  used by other smarty functions to escape
+     *           special chars except for already escaped ones
+     *
+     * @author   Monte Ohrt <monte at ohrt dot com>
+     * @param string $string text that should by escaped
+     * @return string
+     */
+    function smarty_function_escape_special_chars($string)
+    {
+        if (!is_array($string)) {
+            $string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false);
+        }
+        return $string;
+    }  
+} else {         
+    /**
+     * escape_special_chars common function
+     *
+     * Function: smarty_function_escape_special_chars<br>
+     * Purpose:  used by other smarty functions to escape
+     *           special chars except for already escaped ones
+     *
+     * @author   Monte Ohrt <monte at ohrt dot com>
+     * @param string $string text that should by escaped
+     * @return string
+     */
+    function smarty_function_escape_special_chars($string)
+    {
+        if (!is_array($string)) {
+            $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
+            $string = htmlspecialchars($string);
+            $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string); 
+        }
+        return $string;
+    }                                                                                                             
+} 
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/shared.literal_compiler_param.php b/lib/smarty/plugins/shared.literal_compiler_param.php
new file mode 100644
index 0000000..dbcd937
--- /dev/null
+++ b/lib/smarty/plugins/shared.literal_compiler_param.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsShared
+ */
+
+/**
+ * evaluate compiler parameter
+ *
+ * @param array   $params  parameter array as given to the compiler function
+ * @param integer $index   array index of the parameter to convert
+ * @param mixed   $default value to be returned if the parameter is not present
+ * @return mixed evaluated value of parameter or $default
+ * @throws SmartyException if parameter is not a literal (but an expression, variable, …)
+ * @author Rodney Rehm
+ */
+function smarty_literal_compiler_param($params, $index, $default=null)
+{
+    // not set, go default
+    if (!isset($params[$index])) {
+        return $default;
+    }
+    // test if param is a literal
+    if (!preg_match('/^([\'"]?)[a-zA-Z0-9]+(\\1)$/', $params[$index])) {
+        throw new SmartyException('$param[' . $index . '] is not a literal and is thus not evaluatable at compile time');
+    }
+
+    $t = null;
+    eval("\$t = " . $params[$index] . ";");
+    return $t;
+}
diff --git a/lib/smarty/plugins/shared.make_timestamp.php b/lib/smarty/plugins/shared.make_timestamp.php
new file mode 100644
index 0000000..5d7c97e
--- /dev/null
+++ b/lib/smarty/plugins/shared.make_timestamp.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Smarty shared plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsShared
+ */
+
+/**
+ * Function: smarty_make_timestamp<br>
+ * Purpose:  used by other smarty functions to make a timestamp from a string.
+ *
+ * @author   Monte Ohrt <monte at ohrt dot com>
+ * @param DateTime|int|string $string  date object, timestamp or string that can be converted using strtotime()
+ * @return int
+ */
+function smarty_make_timestamp($string)
+{
+    if (empty($string)) {
+        // use "now":
+        return time();
+    } elseif ($string instanceof DateTime) {
+        return $string->getTimestamp();
+    } elseif (strlen($string) == 14 && ctype_digit($string)) {
+        // it is mysql timestamp format of YYYYMMDDHHMMSS?
+        return mktime(substr($string, 8, 2),substr($string, 10, 2),substr($string, 12, 2),
+                       substr($string, 4, 2),substr($string, 6, 2),substr($string, 0, 4));
+    } elseif (is_numeric($string)) {
+        // it is a numeric string, we handle it as timestamp
+        return (int) $string;
+    } else {
+        // strtotime should handle it
+        $time = strtotime($string);
+        if ($time == -1 || $time === false) {
+            // strtotime() was not able to parse $string, use "now":
+            return time();
+        }
+        return $time;
+    }
+}
+
+?>
diff --git a/lib/smarty/plugins/shared.mb_str_replace.php b/lib/smarty/plugins/shared.mb_str_replace.php
new file mode 100644
index 0000000..ecafeb7
--- /dev/null
+++ b/lib/smarty/plugins/shared.mb_str_replace.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Smarty shared plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsShared
+ */
+if (!function_exists('smarty_mb_str_replace')) {
+
+    /**
+     * Multibyte string replace
+     *
+     * @param string $search  the string to be searched
+     * @param string $replace the replacement string
+     * @param string $subject the source string
+     * @param int    &$count  number of matches found
+     * @return string replaced string
+     * @author Rodney Rehm
+     */
+    function smarty_mb_str_replace($search, $replace, $subject, &$count=0)
+    {
+        if (!is_array($search) && is_array($replace)) {
+            return false;
+        }
+        if (is_array($subject)) {
+            // call mb_replace for each single string in $subject
+            foreach ($subject as &$string) {
+                $string = &smarty_mb_str_replace($search, $replace, $string, $c);
+                $count += $c;
+            }
+        } elseif (is_array($search)) {
+            if (!is_array($replace)) {
+                foreach ($search as &$string) {
+                    $subject = smarty_mb_str_replace($string, $replace, $subject, $c);
+                    $count += $c;
+                }
+            } else {
+                $n = max(count($search), count($replace));
+                while ($n--) {
+                    $subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c);
+                    $count += $c;
+                    next($search);
+                    next($replace);
+                }
+            }
+        } else {
+            $parts = mb_split(preg_quote($search), $subject);
+            $count = count($parts) - 1;
+            $subject = implode($replace, $parts);
+        }
+        return $subject;
+    }
+
+}
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/shared.mb_unicode.php b/lib/smarty/plugins/shared.mb_unicode.php
new file mode 100644
index 0000000..e7f839e
--- /dev/null
+++ b/lib/smarty/plugins/shared.mb_unicode.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Smarty shared plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsShared
+ */
+
+/**
+ * convert characters to their decimal unicode equivalents
+ *
+ * @link http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+ * @param string $string   characters to calculate unicode of
+ * @param string $encoding encoding of $string, if null mb_internal_encoding() is used
+ * @return array sequence of unicodes
+ * @author Rodney Rehm
+ */
+function smarty_mb_to_unicode($string, $encoding=null) {
+    if ($encoding) {
+        $expanded = mb_convert_encoding($string, "UTF-32BE", $encoding);
+    } else {
+        $expanded = mb_convert_encoding($string, "UTF-32BE");
+    }
+    return unpack("N*", $expanded);
+}
+
+/**
+ * convert unicodes to the character of given encoding
+ *
+ * @link http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+ * @param integer|array $unicode  single unicode or list of unicodes to convert
+ * @param string        $encoding encoding of returned string, if null mb_internal_encoding() is used
+ * @return string unicode as character sequence in given $encoding
+ * @author Rodney Rehm
+ */
+function smarty_mb_from_unicode($unicode, $encoding=null) {
+    $t = '';
+    if (!$encoding) {
+        $encoding = mb_internal_encoding();
+    }
+    foreach((array) $unicode as $utf32be) {
+        $character = pack("N*", $utf32be);
+        $t .= mb_convert_encoding($character, $encoding, "UTF-32BE");
+    }
+    return $t;
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/shared.mb_wordwrap.php b/lib/smarty/plugins/shared.mb_wordwrap.php
new file mode 100644
index 0000000..ba3498c
--- /dev/null
+++ b/lib/smarty/plugins/shared.mb_wordwrap.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Smarty shared plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsShared
+ */
+
+if(!function_exists('smarty_mb_wordwrap')) {
+
+    /**
+     * Wrap a string to a given number of characters
+     *
+     * @link http://php.net/manual/en/function.wordwrap.php for similarity
+     * @param string  $str   the string to wrap
+     * @param int     $width the width of the output
+     * @param string  $break the character used to break the line
+     * @param boolean $cut   ignored parameter, just for the sake of
+     * @return string wrapped string
+     * @author Rodney Rehm
+     */
+    function smarty_mb_wordwrap($str, $width=75, $break="\n", $cut=false)
+    {
+        // break words into tokens using white space as a delimiter
+        $tokens = preg_split('!(\s)!S' . Smarty::$_UTF8_MODIFIER, $str, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
+        $length = 0;
+        $t = '';
+        $_previous = false;
+
+        foreach ($tokens as $_token) {
+            $token_length = mb_strlen($_token, Smarty::$_CHARSET);
+            $_tokens = array($_token);
+            if ($token_length > $width) {
+                // remove last space
+                $t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
+                $_previous = false;
+                $length = 0;
+
+                if ($cut) {
+                    $_tokens = preg_split('!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER, $_token, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
+                    // broken words go on a new line
+                    $t .= $break;
+                }
+            }
+
+            foreach ($_tokens as $token) {
+                $_space = !!preg_match('!^\s$!S' . Smarty::$_UTF8_MODIFIER, $token);
+                $token_length = mb_strlen($token, Smarty::$_CHARSET);
+                $length += $token_length;
+
+                if ($length > $width) {
+                    // remove space before inserted break
+                    if ($_previous && $token_length < $width) {
+                        $t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
+                    }
+
+                    // add the break before the token
+                    $t .= $break;
+                    $length = $token_length;
+
+                    // skip space after inserting a break
+                    if ($_space) {
+                        $length = 0;
+                        continue;
+                    }
+                } else if ($token == "\n") {
+                    // hard break must reset counters
+                    $_previous = 0;
+                    $length = 0;
+                } else {
+                    // remember if we had a space or not
+                    $_previous = $_space;
+                }
+                // add the token
+                $t .= $token;
+            }
+        }
+
+        return $t;
+    }
+
+}
+?>
+\ No newline at end of file
diff --git a/lib/smarty/plugins/variablefilter.htmlspecialchars.php b/lib/smarty/plugins/variablefilter.htmlspecialchars.php
new file mode 100644
index 0000000..aff711e
--- /dev/null
+++ b/lib/smarty/plugins/variablefilter.htmlspecialchars.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsFilter
+ */
+
+/**
+ * Smarty htmlspecialchars variablefilter plugin
+ *
+ * @param string                   $source input string
+ * @param Smarty_Internal_Template $smarty Smarty object
+ * @return string filtered output
+ */
+function smarty_variablefilter_htmlspecialchars($source, $smarty)
+{
+    return htmlspecialchars($source, ENT_QUOTES, Smarty::$_CHARSET);
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_cacheresource.php b/lib/smarty/sysplugins/smarty_cacheresource.php
new file mode 100644
index 0000000..ca18add
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_cacheresource.php
@@ -0,0 +1,381 @@
+<?php
+/**
+* Smarty Internal Plugin
+*
+* @package Smarty
+* @subpackage Cacher
+*/
+
+/**
+* Cache Handler API
+*
+* @package Smarty
+* @subpackage Cacher
+* @author Rodney Rehm
+*/
+abstract class Smarty_CacheResource {
+    /**
+    * cache for Smarty_CacheResource instances
+    * @var array
+    */
+    public static $resources = array();
+
+    /**
+    * resource types provided by the core
+    * @var array
+    */
+    protected static $sysplugins = array(
+        'file' => true,
+    );
+
+    /**
+    * populate Cached Object with meta data from Resource
+    *
+    * @param Smarty_Template_Cached $cached cached object
+    * @param Smarty_Internal_Template $_template template object
+    * @return void
+    */
+    public abstract function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template);
+
+    /**
+    * populate Cached Object with timestamp and exists from Resource
+    *
+    * @param Smarty_Template_Cached $source cached object
+    * @return void
+    */
+    public abstract function populateTimestamp(Smarty_Template_Cached $cached);
+
+    /**
+    * Read the cached template and process header
+    *
+    * @param Smarty_Internal_Template $_template template object
+    * @param Smarty_Template_Cached $cached cached object
+    * @return booelan true or false if the cached content does not exist
+    */
+    public abstract function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null);
+
+    /**
+    * Write the rendered template output to cache
+    *
+    * @param Smarty_Internal_Template $_template template object
+    * @param string $content content to cache
+    * @return boolean success
+    */
+    public abstract function writeCachedContent(Smarty_Internal_Template $_template, $content);
+
+    /**
+    * Return cached content
+    *
+    * @param Smarty_Internal_Template $_template template object
+    * @param string $content content of cache
+    */
+    public function getCachedContent(Smarty_Internal_Template $_template)
+    {
+        if ($_template->cached->handler->process($_template)) {
+            ob_start();
+            $_template->properties['unifunc']($_template);
+            return ob_get_clean();
+        }
+        return null;
+    }
+
+    /**
+    * Empty cache
+    *
+    * @param Smarty $smarty Smarty object
+    * @param integer $exp_time expiration time (number of seconds, not timestamp)
+    * @return integer number of cache files deleted
+    */
+    public abstract function clearAll(Smarty $smarty, $exp_time=null);
+
+    /**
+    * Empty cache for a specific template
+    *
+    * @param Smarty $smarty Smarty object
+    * @param string $resource_name template name
+    * @param string $cache_id cache id
+    * @param string $compile_id compile id
+    * @param integer $exp_time expiration time (number of seconds, not timestamp)
+    * @return integer number of cache files deleted
+    */
+    public abstract function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time);
+
+
+    public function locked(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        // theoretically locking_timeout should be checked against time_limit (max_execution_time)
+        $start = microtime(true);
+        $hadLock = null;
+        while ($this->hasLock($smarty, $cached)) {
+            $hadLock = true;
+            if (microtime(true) - $start > $smarty->locking_timeout) {
+                // abort waiting for lock release
+                return false;
+            }
+            sleep(1);
+        }
+        return $hadLock;
+    }
+
+    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        // check if lock exists
+        return false;
+    }
+
+    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        // create lock
+        return true;
+    }
+
+    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        // release lock
+        return true;
+    }
+
+
+    /**
+    * Load Cache Resource Handler
+    *
+    * @param Smarty $smarty Smarty object
+    * @param string $type name of the cache resource
+    * @return Smarty_CacheResource Cache Resource Handler
+    */
+    public static function load(Smarty $smarty, $type = null)
+    {
+        if (!isset($type)) {
+            $type = $smarty->caching_type;
+        }
+
+        // try smarty's cache
+        if (isset($smarty->_cacheresource_handlers[$type])) {
+            return $smarty->_cacheresource_handlers[$type];
+        }
+        
+        // try registered resource
+        if (isset($smarty->registered_cache_resources[$type])) {
+            // do not cache these instances as they may vary from instance to instance
+            return $smarty->_cacheresource_handlers[$type] = $smarty->registered_cache_resources[$type];
+        }
+        // try sysplugins dir
+        if (isset(self::$sysplugins[$type])) {
+            if (!isset(self::$resources[$type])) {
+                $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
+                self::$resources[$type] = new $cache_resource_class();
+            }
+            return $smarty->_cacheresource_handlers[$type] = self::$resources[$type];
+        }
+        // try plugins dir
+        $cache_resource_class = 'Smarty_CacheResource_' . ucfirst($type);
+        if ($smarty->loadPlugin($cache_resource_class)) {
+            if (!isset(self::$resources[$type])) {
+                self::$resources[$type] = new $cache_resource_class();
+            }
+            return $smarty->_cacheresource_handlers[$type] = self::$resources[$type];
+        }
+        // give up
+        throw new SmartyException("Unable to load cache resource '{$type}'");
+    }
+
+    /**
+    * Invalid Loaded Cache Files
+    *
+    * @param Smarty $smarty Smarty object
+    */
+    public static function invalidLoadedCache(Smarty $smarty)
+    {
+        foreach ($smarty->template_objects as $tpl) {
+            if (isset($tpl->cached)) {
+                $tpl->cached->valid = false;
+                $tpl->cached->processed = false;
+            }
+        }
+    }
+}
+
+/**
+* Smarty Resource Data Object
+*
+* Cache Data Container for Template Files
+*
+* @package Smarty
+* @subpackage TemplateResources
+* @author Rodney Rehm
+*/
+class Smarty_Template_Cached {
+    /**
+    * Source Filepath
+    * @var string
+    */
+    public $filepath = false;
+
+    /**
+    * Source Content
+    * @var string
+    */
+    public $content = null;
+
+    /**
+    * Source Timestamp
+    * @var integer
+    */
+    public $timestamp = false;
+
+    /**
+    * Source Existance
+    * @var boolean
+    */
+    public $exists = false;
+
+    /**
+    * Cache Is Valid
+    * @var boolean
+    */
+    public $valid = false;
+
+    /**
+    * Cache was processed
+    * @var boolean
+    */
+    public $processed = false;
+
+    /**
+    * CacheResource Handler
+    * @var Smarty_CacheResource
+    */
+    public $handler = null;
+
+    /**
+    * Template Compile Id (Smarty_Internal_Template::$compile_id)
+    * @var string
+    */
+    public $compile_id = null;
+
+    /**
+    * Template Cache Id (Smarty_Internal_Template::$cache_id)
+    * @var string
+    */
+    public $cache_id = null;
+
+    /**
+    * Id for cache locking
+    * @var string
+    */
+    public $lock_id = null;
+
+    /**
+    * flag that cache is locked by this instance
+    * @var bool
+    */
+    public $is_locked = false;
+
+    /**
+    * Source Object
+    * @var Smarty_Template_Source
+    */
+    public $source = null;
+
+    /**
+    * create Cached Object container
+    *
+    * @param Smarty_Internal_Template $_template template object
+    */
+    public function __construct(Smarty_Internal_Template $_template)
+    {
+        $this->compile_id = $_template->compile_id;
+        $this->cache_id = $_template->cache_id;
+        $this->source = $_template->source;
+        $_template->cached = $this;
+        $smarty = $_template->smarty;
+
+        //
+        // load resource handler
+        //
+        $this->handler = $handler = Smarty_CacheResource::load($smarty); // Note: prone to circular references
+
+        //
+        //    check if cache is valid
+        //
+        if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || $_template->source->recompiled) {
+            $handler->populate($this, $_template);
+            return;
+        }
+        while (true) {
+            while (true) {
+                $handler->populate($this, $_template);
+                if ($this->timestamp === false || $smarty->force_compile || $smarty->force_cache) {
+                    $this->valid = false;
+                } else {
+                    $this->valid = true;
+                }
+                if ($this->valid && $_template->caching == Smarty::CACHING_LIFETIME_CURRENT && $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)) {
+                    // lifetime expired
+                    $this->valid = false;
+                }
+                if ($this->valid || !$_template->smarty->cache_locking) {
+                    break;
+                }
+                if (!$this->handler->locked($_template->smarty, $this)) {
+                    $this->handler->acquireLock($_template->smarty, $this);
+                    break 2;
+                }
+            }
+            if ($this->valid) {
+                if (!$_template->smarty->cache_locking || $this->handler->locked($_template->smarty, $this) === null) {
+                    // load cache file for the following checks
+                    if ($smarty->debugging) {
+                        Smarty_Internal_Debug::start_cache($_template);
+                    }
+                    if($handler->process($_template, $this) === false) {
+                        $this->valid = false;
+                    } else {
+                        $this->processed = true;
+                    }
+                    if ($smarty->debugging) {
+                        Smarty_Internal_Debug::end_cache($_template);
+                    }
+                } else {
+                    continue;
+                }
+            } else {
+                return;
+            }
+            if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED && $_template->properties['cache_lifetime'] >= 0 && (time() > ($_template->cached->timestamp + $_template->properties['cache_lifetime']))) {
+                $this->valid = false;
+            }
+            if (!$this->valid && $_template->smarty->cache_locking) {
+                $this->handler->acquireLock($_template->smarty, $this);
+                return;
+            } else {
+                return;
+            }
+        }
+    }
+
+    /**
+    * Write this cache object to handler
+    *
+    * @param Smarty_Internal_Template $_template template object
+    * @param string $content content to cache
+    * @return boolean success
+    */
+    public function write(Smarty_Internal_Template $_template, $content)
+    {
+        if (!$_template->source->recompiled) {
+            if ($this->handler->writeCachedContent($_template, $content)) {
+                $this->timestamp = time();
+                $this->exists = true;
+                $this->valid = true;
+                if ($_template->smarty->cache_locking) {
+                    $this->handler->releaseLock($_template->smarty, $this);
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_cacheresource_custom.php b/lib/smarty/sysplugins/smarty_cacheresource_custom.php
new file mode 100644
index 0000000..16fe72e
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_cacheresource_custom.php
@@ -0,0 +1,238 @@
+<?php
+/**
+ * Smarty Internal Plugin
+ *
+ * @package Smarty
+ * @subpackage Cacher
+ */
+
+/**
+ * Cache Handler API
+ *
+ * @package Smarty
+ * @subpackage Cacher
+ * @author Rodney Rehm
+ */
+abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
+
+    /**
+     * fetch cached content and its modification time from data source
+     *
+     * @param string $id         unique cache content identifier
+     * @param string $name       template name
+     * @param string $cache_id   cache id
+     * @param string $compile_id compile id
+     * @param string $content    cached content
+     * @param integer $mtime cache modification timestamp (epoch)
+     * @return void
+     */
+    protected abstract function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime);
+
+    /**
+     * Fetch cached content's modification timestamp from data source
+     *
+     * {@internal implementing this method is optional.
+     *  Only implement it if modification times can be accessed faster than loading the complete cached content.}}
+     *
+     * @param string $id         unique cache content identifier
+     * @param string $name       template name
+     * @param string $cache_id   cache id
+     * @param string $compile_id compile id
+     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
+     */
+    protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
+    {
+        return null;
+    }
+
+    /**
+     * Save content to cache
+     *
+     * @param string       $id         unique cache content identifier
+     * @param string       $name       template name
+     * @param string       $cache_id   cache id
+     * @param string       $compile_id compile id
+     * @param integer|null $exp_time   seconds till expiration or null
+     * @param string $content content to cache
+     * @return boolean success
+     */
+    protected abstract function save($id, $name, $cache_id, $compile_id, $exp_time, $content);
+
+    /**
+     * Delete content from cache
+     *
+     * @param string       $name       template name
+     * @param string       $cache_id   cache id
+     * @param string       $compile_id compile id
+     * @param integer|null $exp_time   seconds till expiration time in seconds or null
+     * @return integer number of deleted caches
+     */
+    protected abstract function delete($name, $cache_id, $compile_id, $exp_time);
+
+    /**
+     * populate Cached Object with meta data from Resource
+     *
+     * @param Smarty_Template_Cached   $cached    cached object
+     * @param Smarty_Internal_Template $_template template object
+     * @return void
+     */
+    public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
+    {
+        $_cache_id = isset($cached->cache_id) ? preg_replace('![^\w\|]+!', '_', $cached->cache_id) : null;
+        $_compile_id = isset($cached->compile_id) ? preg_replace('![^\w\|]+!', '_', $cached->compile_id) : null;
+
+        $cached->filepath = sha1($cached->source->filepath . $_cache_id . $_compile_id);
+        $this->populateTimestamp($cached);
+    }
+
+    /**
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Cached $source cached object
+     * @return void
+     */
+    public function populateTimestamp(Smarty_Template_Cached $cached)
+    {
+        $mtime = $this->fetchTimestamp($cached->filepath, $cached->source->name, $cached->cache_id, $cached->compile_id);
+        if ($mtime !== null) {
+            $cached->timestamp = $mtime;
+            $cached->exists = !!$cached->timestamp;
+            return;
+        }
+        $timestamp = null;
+        $this->fetch($cached->filepath, $cached->source->name, $cached->cache_id, $cached->compile_id, $cached->content, $timestamp);
+        $cached->timestamp = isset($timestamp) ? $timestamp : false;
+        $cached->exists = !!$cached->timestamp;
+    }
+
+    /**
+     * Read the cached template and process the header
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param Smarty_Template_Cached $cached cached object
+     * @return booelan true or false if the cached content does not exist
+     */
+    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null)
+    {
+        if (!$cached) {
+            $cached = $_template->cached;
+        }
+        $content = $cached->content ? $cached->content : null;
+        $timestamp = $cached->timestamp ? $cached->timestamp : null;
+        if ($content === null || !$timestamp) {
+            $this->fetch(
+                $_template->cached->filepath,
+                $_template->source->name,
+                $_template->cache_id,
+                $_template->compile_id,
+                $content,
+                $timestamp
+            );
+        }
+        if (isset($content)) {
+            $_smarty_tpl = $_template;
+            eval("?>" . $content);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Write the rendered template output to cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $content   content to cache
+     * @return boolean success
+     */
+    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
+    {
+        return $this->save(
+            $_template->cached->filepath,
+            $_template->source->name,
+            $_template->cache_id,
+            $_template->compile_id,
+            $_template->properties['cache_lifetime'],
+            $content
+        );
+    }
+
+    /**
+     * Empty cache
+     *
+     * @param Smarty  $smarty   Smarty object
+     * @param integer $exp_time expiration time (number of seconds, not timestamp)
+     * @return integer number of cache files deleted
+     */
+    public function clearAll(Smarty $smarty, $exp_time=null)
+    {
+        $this->cache = array();
+        return $this->delete(null, null, null, $exp_time);
+    }
+
+    /**
+     * Empty cache for a specific template
+     *
+     * @param Smarty  $smarty        Smarty object
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     * @return integer number of cache files deleted
+     */
+    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+    {
+        $this->cache = array();
+        return $this->delete($resource_name, $cache_id, $compile_id, $exp_time);
+    }
+    
+    /**
+     * Check is cache is locked for this template
+     *
+     * @param Smarty $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     * @return booelan true or false if cache is locked
+     */
+    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $id = $cached->filepath;
+        $name = $cached->source->name . '.lock';
+        
+        $mtime = $this->fetchTimestamp($id, $name, null, null);
+        if ($mtime === null) {
+            $this->fetch($id, $name, null, null, $content, $mtime);
+        }
+        
+        return $mtime && time() - $mtime < $smarty->locking_timeout;
+    }
+
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     */
+    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $cached->is_locked = true;
+        
+        $id = $cached->filepath;
+        $name = $cached->source->name . '.lock';
+        $this->save($id, $name, null, null, $smarty->locking_timeout, '');
+    }
+
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     */
+    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $cached->is_locked = false;
+        
+        $id = $cached->filepath;
+        $name = $cached->source->name . '.lock';
+        $this->delete($name, null, null, null);
+    }
+}
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php b/lib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php
new file mode 100644
index 0000000..dff9b65
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php
@@ -0,0 +1,463 @@
+<?php
+/**
+ * Smarty Internal Plugin
+ *
+ * @package Smarty
+ * @subpackage Cacher
+ */
+
+/**
+ * Smarty Cache Handler Base for Key/Value Storage Implementations
+ *
+ * This class implements the functionality required to use simple key/value stores
+ * for hierarchical cache groups. key/value stores like memcache or APC do not support
+ * wildcards in keys, therefore a cache group cannot be cleared like "a|*" - which
+ * is no problem to filesystem and RDBMS implementations.
+ *
+ * This implementation is based on the concept of invalidation. While one specific cache
+ * can be identified and cleared, any range of caches cannot be identified. For this reason
+ * each level of the cache group hierarchy can have its own value in the store. These values
+ * are nothing but microtimes, telling us when a particular cache group was cleared for the
+ * last time. These keys are evaluated for every cache read to determine if the cache has
+ * been invalidated since it was created and should hence be treated as inexistent.
+ *
+ * Although deep hierarchies are possible, they are not recommended. Try to keep your
+ * cache groups as shallow as possible. Anything up 3-5 parents should be ok. So
+ * »a|b|c« is a good depth where »a|b|c|d|e|f|g|h|i|j|k« isn't. Try to join correlating
+ * cache groups: if your cache groups look somewhat like »a|b|$page|$items|$whatever«
+ * consider using »a|b|c|$page-$items-$whatever« instead.
+ *
+ * @package Smarty
+ * @subpackage Cacher
+ * @author Rodney Rehm
+ */
+abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
+
+    /**
+     * cache for contents
+     * @var array
+     */
+    protected $contents = array();
+    /**
+     * cache for timestamps
+     * @var array
+     */
+    protected $timestamps = array();
+
+    /**
+     * populate Cached Object with meta data from Resource
+     *
+     * @param Smarty_Template_Cached   $cached    cached object
+     * @param Smarty_Internal_Template $_template template object
+     * @return void
+     */
+    public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
+    {
+        $cached->filepath = $_template->source->uid
+                . '#' . $this->sanitize($cached->source->name)
+                . '#' . $this->sanitize($cached->cache_id)
+                . '#' . $this->sanitize($cached->compile_id);
+
+        $this->populateTimestamp($cached);
+    }
+
+    /**
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Cached $cached cached object
+     * @return void
+     */
+    public function populateTimestamp(Smarty_Template_Cached $cached)
+    {
+        if (!$this->fetch($cached->filepath, $cached->source->name, $cached->cache_id, $cached->compile_id, $content, $timestamp, $cached->source->uid)) {
+            return;
+        }
+        $cached->content = $content;
+        $cached->timestamp = (int) $timestamp;
+        $cached->exists = $cached->timestamp;
+    }
+
+    /**
+     * Read the cached template and process the header
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param Smarty_Template_Cached $cached cached object
+     * @return booelan true or false if the cached content does not exist
+     */
+    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null)
+    {
+        if (!$cached) {
+            $cached = $_template->cached;
+        }
+        $content = $cached->content ? $cached->content : null;
+        $timestamp = $cached->timestamp ? $cached->timestamp : null;
+        if ($content === null || !$timestamp) {
+            if (!$this->fetch($_template->cached->filepath, $_template->source->name, $_template->cache_id, $_template->compile_id, $content, $timestamp, $_template->source->uid)) {
+                return false;
+            }
+        }
+        if (isset($content)) {
+            $_smarty_tpl = $_template;
+            eval("?>" . $content);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Write the rendered template output to cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string $content content to cache
+     * @return boolean success
+     */
+    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
+    {
+        $this->addMetaTimestamp($content);
+        return $this->write(array($_template->cached->filepath => $content), $_template->properties['cache_lifetime']);
+    }
+
+    /**
+     * Empty cache
+     *
+     * {@internal the $exp_time argument is ignored altogether }}
+     *
+     * @param Smarty  $smarty   Smarty object
+     * @param integer $exp_time expiration time [being ignored]
+     * @return integer number of cache files deleted [always -1]
+     * @uses purge() to clear the whole store
+     * @uses invalidate() to mark everything outdated if purge() is inapplicable
+     */
+    public function clearAll(Smarty $smarty, $exp_time=null)
+    {
+        if (!$this->purge()) {
+            $this->invalidate(null);
+        }
+        return -1;
+    }
+
+    /**
+     * Empty cache for a specific template
+     *
+     * {@internal the $exp_time argument is ignored altogether}}
+     *
+     * @param Smarty  $smarty        Smarty object
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time [being ignored]
+     * @return integer number of cache files deleted [always -1]
+     * @uses buildCachedFilepath() to generate the CacheID
+     * @uses invalidate() to mark CacheIDs parent chain as outdated
+     * @uses delete() to remove CacheID from cache
+     */
+    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+    {
+        $uid = $this->getTemplateUid($smarty, $resource_name, $cache_id, $compile_id);
+        $cid = $uid . '#' . $this->sanitize($resource_name) . '#' . $this->sanitize($cache_id) . '#' . $this->sanitize($compile_id);
+        $this->delete(array($cid));
+        $this->invalidate($cid, $resource_name, $cache_id, $compile_id, $uid);
+        return -1;
+    }
+    /**
+     * Get template's unique ID
+     *
+     * @param Smarty $smarty        Smarty object
+     * @param string $resource_name template name
+     * @param string $cache_id      cache id
+     * @param string $compile_id    compile id
+     * @return string filepath of cache file
+     */
+    protected function getTemplateUid(Smarty $smarty, $resource_name, $cache_id, $compile_id)
+    {
+        $uid = '';
+        if (isset($resource_name)) {
+            $tpl = new $smarty->template_class($resource_name, $smarty);
+            if ($tpl->source->exists) {
+                $uid = $tpl->source->uid;
+            }
+            
+            // remove from template cache
+            if ($smarty->allow_ambiguous_resources) {
+                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
+            } else {
+                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
+            }
+            if (isset($_templateId[150])) {
+                $_templateId = sha1($_templateId);
+            }
+            unset($smarty->template_objects[$_templateId]);
+        }
+        return $uid;
+    }
+
+    /**
+     * Sanitize CacheID components
+     *
+     * @param string $string CacheID component to sanitize
+     * @return string sanitized CacheID component
+     */
+    protected function sanitize($string)
+    {
+        // some poeple smoke bad weed
+        $string = trim($string, '|');
+        if (!$string) {
+            return null;
+        }
+        return preg_replace('#[^\w\|]+#S', '_', $string);
+    }
+
+    /**
+     * Fetch and prepare a cache object.
+     *
+     * @param string  $cid           CacheID to fetch
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param string  $content       cached content
+     * @param integer &$timestamp    cached timestamp (epoch)
+     * @param string  $resource_uid  resource's uid
+     * @return boolean success
+     */
+    protected function fetch($cid, $resource_name = null, $cache_id = null, $compile_id = null, &$content = null, &$timestamp = null, $resource_uid = null)
+    {
+        $t = $this->read(array($cid));
+        $content = !empty($t[$cid]) ? $t[$cid] : null;
+        $timestamp = null;
+
+        if ($content && ($timestamp = $this->getMetaTimestamp($content))) {
+            $invalidated = $this->getLatestInvalidationTimestamp($cid, $resource_name, $cache_id, $compile_id, $resource_uid);
+            if ($invalidated > $timestamp) {
+                $timestamp = null;
+                $content = null;
+            }
+        }
+
+        return !!$content;
+    }
+
+    /**
+     * Add current microtime to the beginning of $cache_content
+     *
+     * {@internal the header uses 8 Bytes, the first 4 Bytes are the seconds, the second 4 Bytes are the microseconds}}
+     *
+     * @param string &$content the content to be cached
+     */
+    protected function addMetaTimestamp(&$content)
+    {
+        $mt = explode(" ", microtime());
+        $ts = pack("NN", $mt[1], (int) ($mt[0] * 100000000));
+        $content = $ts . $content;
+    }
+
+    /**
+     * Extract the timestamp the $content was cached
+     *
+     * @param string &$content the cached content
+     * @return float the microtime the content was cached
+     */
+    protected function getMetaTimestamp(&$content)
+    {
+        $s = unpack("N", substr($content, 0, 4));
+        $m = unpack("N", substr($content, 4, 4));
+        $content = substr($content, 8);
+        return $s[1] + ($m[1] / 100000000);
+    }
+
+    /**
+     * Invalidate CacheID
+     *
+     * @param string $cid           CacheID
+     * @param string $resource_name template name
+     * @param string $cache_id      cache id
+     * @param string $compile_id    compile id
+     * @param string $resource_uid  source's uid
+     * @return void
+     */
+    protected function invalidate($cid = null, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
+    {
+        $now = microtime(true);
+        $key = null;
+        // invalidate everything
+        if (!$resource_name && !$cache_id && !$compile_id) {
+            $key = 'IVK#ALL';
+        }
+        // invalidate all caches by template
+        else if ($resource_name && !$cache_id && !$compile_id) {
+            $key = 'IVK#TEMPLATE#' . $resource_uid . '#' . $this->sanitize($resource_name);
+        }
+        // invalidate all caches by cache group
+        else if (!$resource_name && $cache_id && !$compile_id) {
+            $key = 'IVK#CACHE#' . $this->sanitize($cache_id);
+        }
+        // invalidate all caches by compile id
+        else if (!$resource_name && !$cache_id && $compile_id) {
+            $key = 'IVK#COMPILE#' . $this->sanitize($compile_id);
+        }
+        // invalidate by combination
+        else {
+            $key = 'IVK#CID#' . $cid;
+        }
+        $this->write(array($key => $now));
+    }
+
+    /**
+     * Determine the latest timestamp known to the invalidation chain
+     *
+     * @param string $cid           CacheID to determine latest invalidation timestamp of
+     * @param string $resource_name template name
+     * @param string $cache_id      cache id
+     * @param string $compile_id    compile id
+     * @param string $resource_uid  source's filepath
+     * @return float the microtime the CacheID was invalidated
+     */
+    protected function getLatestInvalidationTimestamp($cid, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
+    {
+        // abort if there is no CacheID
+        if (false && !$cid) {
+            return 0;
+        }
+        // abort if there are no InvalidationKeys to check
+        if (!($_cid = $this->listInvalidationKeys($cid, $resource_name, $cache_id, $compile_id, $resource_uid))) {
+            return 0;
+        }
+        
+        // there are no InValidationKeys
+        if (!($values = $this->read($_cid))) {
+            return 0;
+        }
+        // make sure we're dealing with floats
+        $values = array_map('floatval', $values);
+        return max($values);
+    }
+
+    /**
+     * Translate a CacheID into the list of applicable InvalidationKeys.
+     *
+     * Splits "some|chain|into|an|array" into array( '#clearAll#', 'some', 'some|chain', 'some|chain|into', ... )
+     *
+     * @param string $cid           CacheID to translate
+     * @param string $resource_name template name
+     * @param string $cache_id      cache id
+     * @param string $compile_id    compile id
+     * @param string $resource_uid  source's filepath
+     * @return array list of InvalidationKeys
+     * @uses $invalidationKeyPrefix to prepend to each InvalidationKey
+     */
+    protected function listInvalidationKeys($cid, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
+    {
+        $t = array('IVK#ALL');
+        $_name = $_compile = '#';
+        if ($resource_name) {
+            $_name .= $resource_uid . '#' . $this->sanitize($resource_name);
+            $t[] = 'IVK#TEMPLATE' . $_name;
+        }
+        if ($compile_id) {
+            $_compile .= $this->sanitize($compile_id);
+            $t[] = 'IVK#COMPILE' . $_compile;
+        }
+        $_name .= '#';
+        // some poeple smoke bad weed
+        $cid = trim($cache_id, '|');
+        if (!$cid) {
+            return $t;
+        }
+        $i = 0;
+        while (true) {
+            // determine next delimiter position
+            $i = strpos($cid, '|', $i);
+            // add complete CacheID if there are no more delimiters
+            if ($i === false) {
+                $t[] = 'IVK#CACHE#' . $cid;
+                $t[] = 'IVK#CID' . $_name . $cid . $_compile;
+                $t[] = 'IVK#CID' . $_name . $_compile;
+                break;
+            }
+            $part = substr($cid, 0, $i);
+            // add slice to list
+            $t[] = 'IVK#CACHE#' . $part;
+            $t[] = 'IVK#CID' . $_name . $part . $_compile;
+            // skip past delimiter position
+            $i++;
+        }
+        return $t;
+    }
+
+    /**
+     * Check is cache is locked for this template
+     *
+     * @param Smarty $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     * @return booelan true or false if cache is locked
+     */
+    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $key = 'LOCK#' . $cached->filepath;
+        $data = $this->read(array($key));
+        return $data && time() - $data[$key] < $smarty->locking_timeout;
+    }
+
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     */
+    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $cached->is_locked = true;
+        $key = 'LOCK#' . $cached->filepath;
+        $this->write(array($key => time()), $smarty->locking_timeout);
+    }
+
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     */
+    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $cached->is_locked = false;
+        $key = 'LOCK#' . $cached->filepath;
+        $this->delete(array($key));
+    }
+
+    /**
+     * Read values for a set of keys from cache
+     *
+     * @param array $keys list of keys to fetch
+     * @return array list of values with the given keys used as indexes
+     */
+    protected abstract function read(array $keys);
+
+    /**
+     * Save values for a set of keys to cache
+     *
+     * @param array $keys   list of values to save
+     * @param int   $expire expiration time
+     * @return boolean true on success, false on failure
+     */
+    protected abstract function write(array $keys, $expire=null);
+
+    /**
+     * Remove values from cache
+     *
+     * @param array $keys list of keys to delete
+     * @return boolean true on success, false on failure
+     */
+    protected abstract function delete(array $keys);
+
+    /**
+     * Remove *all* values from cache
+     *
+     * @return boolean true on success, false on failure
+     */
+    protected function purge()
+    {
+        return false;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_config_source.php b/lib/smarty/sysplugins/smarty_config_source.php
new file mode 100644
index 0000000..043ff13
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_config_source.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Smarty Internal Plugin
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ */
+
+/**
+ * Smarty Resource Data Object
+ *
+ * Meta Data Container for Config Files
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Rodney Rehm
+ *
+ * @property string $content
+ * @property int    $timestamp
+ * @property bool   $exists
+ */
+class Smarty_Config_Source extends Smarty_Template_Source {
+
+    /**
+     * create Config Object container
+     *
+     * @param Smarty_Resource $handler          Resource Handler this source object communicates with
+     * @param Smarty          $smarty           Smarty instance this source object belongs to
+     * @param string          $resource         full config_resource
+     * @param string          $type             type of resource
+     * @param string          $name             resource name
+     * @param string          $unique_resource  unqiue resource name
+     */
+    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name, $unique_resource)
+    {
+        $this->handler = $handler; // Note: prone to circular references
+
+        // Note: these may be ->config_compiler_class etc in the future
+        //$this->config_compiler_class = $handler->config_compiler_class;
+        //$this->config_lexer_class = $handler->config_lexer_class;
+        //$this->config_parser_class = $handler->config_parser_class;
+
+        $this->smarty = $smarty;
+        $this->resource = $resource;
+        $this->type = $type;
+        $this->name = $name;
+        $this->unique_resource = $unique_resource;
+    }
+
+    /**
+     * <<magic>> Generic setter.
+     *
+     * @param string $property_name valid: content, timestamp, exists
+     * @param mixed  $value         newly assigned value (not check for correct type)
+     * @throws SmartyException when the given property name is not valid
+     */
+    public function __set($property_name, $value)
+    {
+        switch ($property_name) {
+            case 'content':
+            case 'timestamp':
+            case 'exists':
+                $this->$property_name = $value;
+                break;
+
+            default:
+                throw new SmartyException("invalid config property '$property_name'.");
+        }
+    }
+
+    /**
+     * <<magic>> Generic getter.
+     *
+     * @param string $property_name valid: content, timestamp, exists
+     * @throws SmartyException when the given property name is not valid
+     */
+    public function __get($property_name)
+    {
+        switch ($property_name) {
+            case 'timestamp':
+            case 'exists':
+                $this->handler->populateTimestamp($this);
+                return $this->$property_name;
+
+            case 'content':
+                return $this->content = $this->handler->getContent($this);
+
+            default:
+                throw new SmartyException("config property '$property_name' does not exist.");
+        }
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php b/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php
new file mode 100644
index 0000000..2519541
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php
@@ -0,0 +1,264 @@
+<?php
+/**
+ * Smarty Internal Plugin CacheResource File
+ *
+ * @package Smarty
+ * @subpackage Cacher
+ * @author Uwe Tews
+ * @author Rodney Rehm
+ */
+
+/**
+ * This class does contain all necessary methods for the HTML cache on file system
+ *
+ * Implements the file system as resource for the HTML cache Version ussing nocache inserts.
+ *
+ * @package Smarty
+ * @subpackage Cacher
+ */
+class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
+
+    /**
+     * populate Cached Object with meta data from Resource
+     *
+     * @param Smarty_Template_Cached   $cached    cached object
+     * @param Smarty_Internal_Template $_template template object
+     * @return void
+     */
+    public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
+    {
+        $_source_file_path = str_replace(':', '.', $_template->source->filepath);
+        $_cache_id = isset($_template->cache_id) ? preg_replace('![^\w\|]+!', '_', $_template->cache_id) : null;
+        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
+        $_filepath = $_template->source->uid;
+        // if use_sub_dirs, break file into directories
+        if ($_template->smarty->use_sub_dirs) {
+            $_filepath = substr($_filepath, 0, 2) . DS
+                . substr($_filepath, 2, 2) . DS
+                . substr($_filepath, 4, 2) . DS
+                . $_filepath;
+        }
+        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
+        if (isset($_cache_id)) {
+            $_cache_id = str_replace('|', $_compile_dir_sep, $_cache_id) . $_compile_dir_sep;
+        } else {
+            $_cache_id = '';
+        }
+        if (isset($_compile_id)) {
+            $_compile_id = $_compile_id . $_compile_dir_sep;
+        } else {
+            $_compile_id = '';
+        }
+        $_cache_dir = $_template->smarty->getCacheDir();
+        if ($_template->smarty->cache_locking) {
+            // create locking file name
+            // relative file name?
+            if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_cache_dir)) {
+                $_lock_dir = rtrim(getcwd(), '/\\') . DS . $_cache_dir;
+            } else {
+                $_lock_dir = $_cache_dir;
+            }
+            $cached->lock_id = $_lock_dir.sha1($_cache_id.$_compile_id.$_template->source->uid).'.lock';
+        }
+        $cached->filepath = $_cache_dir . $_cache_id . $_compile_id . $_filepath . '.' . basename($_source_file_path) . '.php';
+        $cached->timestamp = @filemtime($cached->filepath);
+        $cached->exists = !!$cached->timestamp;
+    }
+
+    /**
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Cached $cached cached object
+     * @return void
+     */
+    public function populateTimestamp(Smarty_Template_Cached $cached)
+    {
+        $cached->timestamp = @filemtime($cached->filepath);
+        $cached->exists = !!$cached->timestamp;
+    }
+
+    /**
+     * Read the cached template and process its header
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param Smarty_Template_Cached $cached cached object
+     * @return booelan true or false if the cached content does not exist
+     */
+    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null)
+    {
+        $_smarty_tpl = $_template;
+        return @include $_template->cached->filepath;
+    }
+
+    /**
+     * Write the rendered template output to cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $content   content to cache
+     * @return boolean success
+     */
+    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
+    {
+        if (Smarty_Internal_Write_File::writeFile($_template->cached->filepath, $content, $_template->smarty) === true) {
+            $_template->cached->timestamp = filemtime($_template->cached->filepath);
+            $_template->cached->exists = !!$_template->cached->timestamp;
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Empty cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param integer                  $exp_time  expiration time (number of seconds, not timestamp)
+     * @return integer number of cache files deleted
+     */
+    public function clearAll(Smarty $smarty, $exp_time = null)
+    {
+        return $this->clear($smarty, null, null, null, $exp_time);
+    }
+
+    /**
+     * Empty cache for a specific template
+     *
+     * @param Smarty  $_template     template object
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     * @return integer number of cache files deleted
+    */
+    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+    {
+        $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
+        $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
+        $_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
+        $_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
+        $_dir = $smarty->getCacheDir();
+        $_dir_length = strlen($_dir);
+        if (isset($_cache_id)) {
+            $_cache_id_parts = explode('|', $_cache_id);
+            $_cache_id_parts_count = count($_cache_id_parts);
+            if ($smarty->use_sub_dirs) {
+                foreach ($_cache_id_parts as $id_part) {
+                    $_dir .= $id_part . DS;
+                }
+            }
+        }
+        if (isset($resource_name)) {
+            $_save_stat = $smarty->caching;
+            $smarty->caching = true;
+            $tpl = new $smarty->template_class($resource_name, $smarty);
+            $smarty->caching = $_save_stat;
+
+            // remove from template cache
+            $tpl->source; // have the template registered before unset()
+            if ($smarty->allow_ambiguous_resources) {
+                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
+            } else {
+                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
+            }
+            if (isset($_templateId[150])) {
+                $_templateId = sha1($_templateId);
+            }
+            unset($smarty->template_objects[$_templateId]);
+
+            if ($tpl->source->exists) {
+                $_resourcename_parts = basename(str_replace('^', '/', $tpl->cached->filepath));
+            } else {
+                return 0;
+            }
+        }
+        $_count = 0;
+        $_time = time();
+        if (file_exists($_dir)) {
+            $_cacheDirs = new RecursiveDirectoryIterator($_dir);
+            $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
+            foreach ($_cache as $_file) {
+                if (substr($_file->getBasename(),0,1) == '.' || strpos($_file, '.svn') !== false) continue;
+                // directory ?
+                if ($_file->isDir()) {
+                    if (!$_cache->isDot()) {
+                        // delete folder if empty
+                        @rmdir($_file->getPathname());
+                    }
+                } else {
+                    $_parts = explode($_dir_sep, str_replace('\\', '/', substr((string)$_file, $_dir_length)));
+                    $_parts_count = count($_parts);
+                    // check name
+                    if (isset($resource_name)) {
+                        if ($_parts[$_parts_count-1] != $_resourcename_parts) {
+                            continue;
+                        }
+                    }
+                    // check compile id
+                    if (isset($_compile_id) && (!isset($_parts[$_parts_count-2 - $_compile_id_offset]) || $_parts[$_parts_count-2 - $_compile_id_offset] != $_compile_id)) {
+                        continue;
+                    }
+                    // check cache id
+                    if (isset($_cache_id)) {
+                        // count of cache id parts
+                        $_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset : $_parts_count - 1 - $_compile_id_offset;
+                        if ($_parts_count < $_cache_id_parts_count) {
+                            continue;
+                        }
+                        for ($i = 0; $i < $_cache_id_parts_count; $i++) {
+                            if ($_parts[$i] != $_cache_id_parts[$i]) continue 2;
+                        }
+                    }
+                    // expired ?
+                    if (isset($exp_time) && $_time - @filemtime($_file) < $exp_time) {
+                        continue;
+                    }
+                    $_count += @unlink((string) $_file) ? 1 : 0;
+                }
+            }
+        }
+        return $_count;
+    }
+
+    /**
+     * Check is cache is locked for this template
+     *
+     * @param Smarty $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     * @return booelan true or false if cache is locked
+     */
+    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+            clearstatcache(true, $cached->lock_id);
+        } else {
+            clearstatcache();
+        }
+        $t = @filemtime($cached->lock_id);
+        return $t && (time() - $t < $smarty->locking_timeout);
+    }
+
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     */
+    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $cached->is_locked = true;
+        touch($cached->lock_id);
+    }
+
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     */
+    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $cached->is_locked = false;
+        @unlink($cached->lock_id);
+    }
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_append.php b/lib/smarty/sysplugins/smarty_internal_compile_append.php
new file mode 100644
index 0000000..f6036e8
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_append.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Append
+ *
+ * Compiles the {append} tag
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Append Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign {
+
+    /**
+     * Compiles code for the {append} tag
+     *
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        // the following must be assigned at runtime because it will be overwritten in parent class
+        $this->required_attributes = array('var', 'value');
+        $this->shorttag_order = array('var', 'value');
+        $this->optional_attributes = array('scope', 'index');
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        // map to compile assign attributes
+        if (isset($_attr['index'])) {
+            $_params['smarty_internal_index'] = '[' . $_attr['index'] . ']';
+            unset($_attr['index']);
+        } else {
+            $_params['smarty_internal_index'] = '[]';
+        }
+        $_new_attr = array();
+        foreach ($_attr as $key => $value) {
+            $_new_attr[] = array($key => $value);
+        }
+        // call compile assign
+        return parent::compile($_new_attr, $compiler, $_params);
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_assign.php b/lib/smarty/sysplugins/smarty_internal_compile_assign.php
new file mode 100644
index 0000000..40e4686
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_assign.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Assign
+ *
+ * Compiles the {assign} tag
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Assign Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for the {assign} tag
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        // the following must be assigned at runtime because it will be overwritten in Smarty_Internal_Compile_Append
+        $this->required_attributes = array('var', 'value');
+        $this->shorttag_order = array('var', 'value');
+        $this->optional_attributes = array('scope');
+        $_nocache = 'null';
+        $_scope = Smarty::SCOPE_LOCAL;
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        // nocache ?
+        if ($compiler->tag_nocache || $compiler->nocache) {
+            $_nocache = 'true';
+            // create nocache var to make it know for further compiling
+            $compiler->template->tpl_vars[trim($_attr['var'], "'")] = new Smarty_variable(null, true);
+        }
+        // scope setup
+        if (isset($_attr['scope'])) {
+            $_attr['scope'] = trim($_attr['scope'], "'\"");
+            if ($_attr['scope'] == 'parent') {
+                $_scope = Smarty::SCOPE_PARENT;
+            } elseif ($_attr['scope'] == 'root') {
+                $_scope = Smarty::SCOPE_ROOT;
+            } elseif ($_attr['scope'] == 'global') {
+                $_scope = Smarty::SCOPE_GLOBAL;
+            } else {
+                $compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno);
+            }
+        }
+        // compiled output
+        if (isset($parameter['smarty_internal_index'])) {
+            $output = "<?php \$_smarty_tpl->createLocalArrayVariable($_attr[var], $_nocache, $_scope);\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value$parameter[smarty_internal_index] = $_attr[value];";
+        } else {
+            $output = "<?php \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_variable($_attr[value], $_nocache, $_scope);";
+        }
+        if ($_scope == Smarty::SCOPE_PARENT) {
+            $output .= "\nif (\$_smarty_tpl->parent != null) \$_smarty_tpl->parent->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
+        } elseif ($_scope == Smarty::SCOPE_ROOT || $_scope == Smarty::SCOPE_GLOBAL) {
+            $output .= "\n\$_ptr = \$_smarty_tpl->parent; while (\$_ptr != null) {\$_ptr->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]]; \$_ptr = \$_ptr->parent; }";
+        }
+        if ( $_scope == Smarty::SCOPE_GLOBAL) {
+            $output .= "\nSmarty::\$global_tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
+        }
+        $output .= '?>';
+        return $output;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_block.php b/lib/smarty/sysplugins/smarty_internal_compile_block.php
new file mode 100644
index 0000000..b129eaf
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_block.php
@@ -0,0 +1,264 @@
+<?php
+/**
+* Smarty Internal Plugin Compile Block
+*
+* Compiles the {block}{/block} tags
+*
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+
+/**
+* Smarty Internal Plugin Compile Block Class
+*
+* @package Smarty
+* @subpackage Compiler
+*/
+class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase {
+
+    /**
+    * Attribute definition: Overwrites base class.
+    *
+    * @var array
+    * @see Smarty_Internal_CompileBase
+    */
+    public $required_attributes = array('name');
+    /**
+    * Attribute definition: Overwrites base class.
+    *
+    * @var array
+    * @see Smarty_Internal_CompileBase
+    */
+    public $shorttag_order = array('name', 'hide');
+    /**
+    * Attribute definition: Overwrites base class.
+    *
+    * @var array
+    * @see Smarty_Internal_CompileBase
+    */
+    public $optional_attributes = array('hide');
+
+    /**
+    * Compiles code for the {block} tag
+    *
+    * @param array  $args     array with attributes from parser
+    * @param object $compiler compiler object
+    * @return boolean true
+    */
+    public function compile($args, $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $save = array($_attr, $compiler->parser->current_buffer, $compiler->nocache, $compiler->smarty->merge_compiled_includes, $compiler->merged_templates, $compiler->smarty->merged_templates_func, $compiler->template->properties, $compiler->template->has_nocache_code);
+        $this->openTag($compiler, 'block', $save);
+        if ($_attr['nocache'] == true) {
+            $compiler->nocache = true;
+        }
+        // set flag for {block} tag
+        $compiler->inheritance = true;
+        // must merge includes
+        $compiler->smarty->merge_compiled_includes = true;
+
+        $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
+        $compiler->has_code = false;
+        return true;
+    }
+
+    /**
+    * Save or replace child block source by block name during parsing
+    *
+    * @param string $block_content     block source content
+    * @param string $block_tag         opening block tag
+    * @param object $template          template object
+    * @param string $filepath          filepath of template source
+    */
+    public static function saveBlockData($block_content, $block_tag, $template, $filepath)
+    {
+        $_rdl = preg_quote($template->smarty->right_delimiter);
+        $_ldl = preg_quote($template->smarty->left_delimiter);
+        if ($template->smarty->auto_literal) {
+            $al = '\s*';
+        } else {
+            $al = '';
+        }
+        if (0 == preg_match("!({$_ldl}{$al}block\s+)(name=)?(\w+|'.*'|\".*\")(\s*?)?((append|prepend|nocache)?(\s*)?(hide)?)?(\s*{$_rdl})!", $block_tag, $_match)) {
+            $error_text = 'Syntax Error in template "' . $template->source->filepath . '"   "' . htmlspecialchars($block_tag) . '" illegal options';
+            throw new SmartyCompilerException($error_text);
+        } else {
+            $_name = trim($_match[3], '\'"');
+            if ($_match[8] != 'hide' || isset($template->block_data[$_name])) {        // replace {$smarty.block.child}
+                // do we have {$smart.block.child} in nested {block} tags?
+                if (0 != preg_match_all("!({$_ldl}{$al}block\s+)(name=)?(\w+|'.*'|\".*\")([\s\S]*?{$_rdl})([\s\S]*?)({$_ldl}{$al}\\\$smarty\.block\.child{$_rdl})([\s\S]*?{$_ldl}{$al}/block{$_rdl})!", $block_content, $_match2)) {
+                    foreach($_match2[3] as $name) {
+                        // get it's replacement
+                        $_name2 = trim($name, '\'"');
+                        if (isset($template->block_data[$_name2])) {
+                            $replacement = $template->block_data[$_name2]['source'];
+                        } else {
+                            $replacement = '';
+                        }
+                        // replace {$smarty.block.child} tag
+                        $search = array("%({$_ldl}{$al}block[\s\S]*?{$name}[\s\S]*?{$_rdl})([\s\S]*?)({$_ldl}{$al}\\\$smarty\.block\.child{$_rdl})([\s\S]*?{$_ldl}{$al}/block{$_rdl})%","/���child���/");
+                        $replace = array('\2���child���', $replacement);
+                        $block_content = preg_replace($search, $replace , $block_content);
+                    }
+                }
+                // do we have not nested {$smart.block.child}
+                if (0 != preg_match("/({$_ldl}{$al}\\\$smarty\.block\.child{$_rdl})/", $block_content, $_match2)) {
+                    // get child replacement for this block
+                    if (isset($template->block_data[$_name])) {
+                        $replacement = $template->block_data[$_name]['source'];
+                        unset($template->block_data[$_name]);
+                    } else {
+                        $replacement = '';
+                    }
+                    $block_content = preg_replace("/({$_ldl}{$al}\\\$smarty\.block\.child{$_rdl})/", $replacement, $block_content);
+                }
+                if (isset($template->block_data[$_name])) {
+                    if (strpos($template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) {
+                        $template->block_data[$_name]['source'] =
+                        str_replace('%%%%SMARTY_PARENT%%%%', $block_content, $template->block_data[$_name]['source']);
+                    } elseif ($template->block_data[$_name]['mode'] == 'prepend') {
+                        $template->block_data[$_name]['source'] .= $block_content;
+                    } elseif ($template->block_data[$_name]['mode'] == 'append') {
+                        $template->block_data[$_name]['source'] = $block_content . $template->block_data[$_name]['source'];
+                    }
+                } else {
+                    $template->block_data[$_name]['source'] = $block_content;
+                    $template->block_data[$_name]['file'] = $filepath;
+                }
+                if ($_match[6] == 'append') {
+                    $template->block_data[$_name]['mode'] = 'append';
+                } elseif ($_match[6] == 'prepend') {
+                    $template->block_data[$_name]['mode'] = 'prepend';
+                } else {
+                    $template->block_data[$_name]['mode'] = 'replace';
+                }
+            }
+        }
+    }
+
+    /**
+    * Compile saved child block source
+    *
+    * @param object $compiler  compiler object
+    * @param string $_name     optional name of child block
+    * @return string   compiled code of schild block
+    */
+    public static function compileChildBlock($compiler, $_name = null)
+    {
+        $_output = '';
+        // if called by {$smarty.block.child} we must search the name of enclosing {block}
+        if ($_name == null) {
+            $stack_count = count($compiler->_tag_stack);
+            while (--$stack_count >= 0) {
+                if ($compiler->_tag_stack[$stack_count][0] == 'block') {
+                    $_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'] ,"'\"");
+                    break;
+                }
+            }
+            // flag that child is already compile by {$smarty.block.child} inclusion
+            $compiler->template->block_data[$_name]['compiled'] = true;
+        }
+        if ($_name == null) {
+            $compiler->trigger_template_error('{$smarty.block.child} used out of context', $compiler->lex->taglineno);
+        }
+        // undefined child?
+        if (!isset($compiler->template->block_data[$_name]['source'])) {
+            return '';
+        }
+        $_tpl = new Smarty_Internal_template ('string:' . $compiler->template->block_data[$_name]['source'], $compiler->smarty, $compiler->template, $compiler->template->cache_id,
+        $compiler->template->compile_id = null, $compiler->template->caching, $compiler->template->cache_lifetime);
+        $_tpl->variable_filters = $compiler->template->variable_filters;
+        $_tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
+        $_tpl->source->filepath = $compiler->template->block_data[$_name]['file'];
+        $_tpl->allow_relative_path = true;
+        if ($compiler->nocache) {
+            $_tpl->compiler->forceNocache = 2;
+        } else {
+            $_tpl->compiler->forceNocache = 1;
+        }
+        $_tpl->compiler->suppressHeader = true;
+        $_tpl->compiler->suppressTemplatePropertyHeader = true;
+        $_tpl->compiler->suppressMergedTemplates = true;
+        if (strpos($compiler->template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) {
+            $_output = str_replace('%%%%SMARTY_PARENT%%%%', $compiler->parser->current_buffer->to_smarty_php(), $_tpl->compiler->compileTemplate($_tpl));
+        } elseif ($compiler->template->block_data[$_name]['mode'] == 'prepend') {
+            $_output = $_tpl->compiler->compileTemplate($_tpl) . $compiler->parser->current_buffer->to_smarty_php();
+        } elseif ($compiler->template->block_data[$_name]['mode'] == 'append') {
+            $_output = $compiler->parser->current_buffer->to_smarty_php() . $_tpl->compiler->compileTemplate($_tpl);
+        } elseif (!empty($compiler->template->block_data[$_name])) {
+            $_output = $_tpl->compiler->compileTemplate($_tpl);
+        }
+        $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $_tpl->properties['file_dependency']);
+        $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $_tpl->properties['function']);
+        $compiler->merged_templates = array_merge($compiler->merged_templates, $_tpl->compiler->merged_templates);
+        $compiler->template->variable_filters = $_tpl->variable_filters;
+        if ($_tpl->has_nocache_code) {
+            $compiler->template->has_nocache_code = true;
+        }
+        foreach($_tpl->required_plugins as $code => $tmp1) {
+            foreach($tmp1 as $name => $tmp) {
+                foreach($tmp as $type => $data) {
+                    $compiler->template->required_plugins[$code][$name][$type] = $data;
+                }
+            }
+        }
+        unset($_tpl);
+        return $_output;
+    }
+
+}
+
+/**
+* Smarty Internal Plugin Compile BlockClose Class
+*
+* @package Smarty
+* @subpackage Compiler
+*/
+class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase {
+
+    /**
+    * Compiles code for the {/block} tag
+    *
+    * @param array  $args     array with attributes from parser
+    * @param object $compiler compiler object
+    * @return string compiled code
+    */
+    public function compile($args, $compiler)
+    {
+        $compiler->has_code = true;
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $saved_data = $this->closeTag($compiler, array('block'));
+        $_name = trim($saved_data[0]['name'], "\"'");
+        if (isset($compiler->template->block_data[$_name]) && !isset($compiler->template->block_data[$_name]['compiled'])) {
+            // restore to status before {block} tag as new subtemplate code of parent {block} is not needed
+            $compiler->merged_templates = $saved_data[4];
+            $compiler->smarty->merged_templates_func = $saved_data[5];
+            $compiler->template->properties = $saved_data[6];
+            $compiler->template->has_nocache_code = $saved_data[7];
+            $_output = Smarty_Internal_Compile_Block::compileChildBlock($compiler, $_name);
+        } else {
+            if (isset($saved_data[0]['hide']) && !isset($compiler->template->block_data[$_name]['source'])) {
+                $_output = '';
+            } else {
+                $_output = $compiler->parser->current_buffer->to_smarty_php();
+            }
+            unset ($compiler->template->block_data[$_name]['compiled']);
+        }
+        // reset flags
+        $compiler->parser->current_buffer = $saved_data[1];
+        $compiler->nocache = $saved_data[2];
+        $compiler->smarty->merge_compiled_includes = $saved_data[3];
+        // reset flag for {block} tag
+        $compiler->inheritance = false;
+        // $_output content has already nocache code processed
+        $compiler->suppressNocacheProcessing = true;
+        return $_output;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_break.php b/lib/smarty/sysplugins/smarty_internal_compile_break.php
new file mode 100644
index 0000000..259c66e
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_break.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Break
+ *
+ * Compiles the {break} tag
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+/**
+ * Smarty Internal Plugin Compile Break Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase {
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('levels');
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('levels');
+
+    /**
+     * Compiles code for the {break} tag
+     *
+     * @param array  $args array with attributes from parser
+     * @param object $compiler   compiler object
+     * @param array  $parameter  array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+
+        if ($_attr['nocache'] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+        }
+
+        if (isset($_attr['levels'])) {
+            if (!is_numeric($_attr['levels'])) {
+                $compiler->trigger_template_error('level attribute must be a numeric constant', $compiler->lex->taglineno);
+            }
+            $_levels = $_attr['levels'];
+        } else {
+            $_levels = 1;
+        }
+        $level_count = $_levels;
+        $stack_count = count($compiler->_tag_stack) - 1;
+        while ($level_count > 0 && $stack_count >= 0) {
+            if (isset($_is_loopy[$compiler->_tag_stack[$stack_count][0]])) {
+                $level_count--;
+            }
+            $stack_count--;
+        }
+        if ($level_count != 0) {
+            $compiler->trigger_template_error("cannot break {$_levels} level(s)", $compiler->lex->taglineno);
+        }
+        $compiler->has_code = true;
+        return "<?php break {$_levels}?>";
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_call.php b/lib/smarty/sysplugins/smarty_internal_compile_call.php
new file mode 100644
index 0000000..af12a04
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_call.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Function_Call
+ *
+ * Compiles the calls of user defined tags defined by {function}
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Function_Call Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('name');
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('name');
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
+
+    /**
+     * Compiles the calls of user defined tags defined by {function}
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        // save possible attributes
+        if (isset($_attr['assign'])) {
+            // output will be stored in a smarty variable instead of beind displayed
+            $_assign = $_attr['assign'];
+        }
+        $_name = $_attr['name'];
+        if ($compiler->compiles_template_function) {
+            $compiler->called_functions[] = trim($_name, "'\"");
+        }
+        unset($_attr['name'], $_attr['assign'], $_attr['nocache']);
+        // set flag (compiled code of {function} must be included in cache file
+        if ($compiler->nocache || $compiler->tag_nocache) {
+            $_nocache = 'true';
+        } else {
+            $_nocache = 'false';
+        }
+        $_paramsArray = array();
+        foreach ($_attr as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
+            }
+        }
+        if (isset($compiler->template->properties['function'][$_name]['parameter'])) {
+            foreach ($compiler->template->properties['function'][$_name]['parameter'] as $_key => $_value) {
+                if (!isset($_attr[$_key])) {
+                    if (is_int($_key)) {
+                        $_paramsArray[] = "$_key=>$_value";
+                    } else {
+                        $_paramsArray[] = "'$_key'=>$_value";
+                    }
+                }
+            }
+        } elseif (isset($compiler->smarty->template_functions[$_name]['parameter'])) {
+            foreach ($compiler->smarty->template_functions[$_name]['parameter'] as $_key => $_value) {
+                if (!isset($_attr[$_key])) {
+                    if (is_int($_key)) {
+                        $_paramsArray[] = "$_key=>$_value";
+                    } else {
+                        $_paramsArray[] = "'$_key'=>$_value";
+                    }
+                }
+            }
+        }
+        //varibale name?
+        if (!(strpos($_name, '$') === false)) {
+            $call_cache = $_name;
+            $call_function = '$tmp = "smarty_template_function_".' . $_name . '; $tmp';
+        } else {
+            $_name = trim($_name, "'\"");
+            $call_cache = "'{$_name}'";
+            $call_function = 'smarty_template_function_' . $_name;
+        }
+
+        $_params = 'array(' . implode(",", $_paramsArray) . ')';
+        $_hash = str_replace('-', '_', $compiler->template->properties['nocache_hash']);
+        // was there an assign attribute
+        if (isset($_assign)) {
+            if ($compiler->template->caching) {
+                $_output = "<?php ob_start(); Smarty_Internal_Function_Call_Handler::call ({$call_cache},\$_smarty_tpl,{$_params},'{$_hash}',{$_nocache}); \$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
+            } else {
+                $_output = "<?php ob_start(); {$call_function}(\$_smarty_tpl,{$_params}); \$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
+            }
+        } else {
+            if ($compiler->template->caching) {
+                $_output = "<?php Smarty_Internal_Function_Call_Handler::call ({$call_cache},\$_smarty_tpl,{$_params},'{$_hash}',{$_nocache});?>\n";
+            } else {
+                $_output = "<?php {$call_function}(\$_smarty_tpl,{$_params});?>\n";
+            }
+        }
+        return $_output;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_capture.php b/lib/smarty/sysplugins/smarty_internal_compile_capture.php
new file mode 100644
index 0000000..9a5071e
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_capture.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Capture
+ *
+ * Compiles the {capture} tag
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Capture Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase {
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('name');
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('name', 'assign', 'append');
+
+    /**
+     * Compiles code for the {capture} tag
+     *
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+
+        $buffer = isset($_attr['name']) ? $_attr['name'] : "'default'";
+        $assign = isset($_attr['assign']) ? $_attr['assign'] : 'null';
+        $append = isset($_attr['append']) ? $_attr['append'] : 'null';
+
+        $compiler->_capture_stack[0][] = array($buffer, $assign, $append, $compiler->nocache);
+        // maybe nocache because of nocache variables
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        $_output = "<?php \$_smarty_tpl->_capture_stack[0][] = array($buffer, $assign, $append); ob_start(); ?>";
+
+        return $_output;
+    }
+
+}
+
+/**
+ * Smarty Internal Plugin Compile Captureclose Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for the {/capture} tag
+     *
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        // must endblock be nocache?
+        if ($compiler->nocache) {
+            $compiler->tag_nocache = true;
+        }
+
+        list($buffer, $assign, $append, $compiler->nocache) = array_pop($compiler->_capture_stack[0]);
+
+        $_output = "<?php list(\$_capture_buffer, \$_capture_assign, \$_capture_append) = array_pop(\$_smarty_tpl->_capture_stack[0]);\n";
+        $_output .= "if (!empty(\$_capture_buffer)) {\n";
+        $_output .= " if (isset(\$_capture_assign)) \$_smarty_tpl->assign(\$_capture_assign, ob_get_contents());\n";
+        $_output .= " if (isset( \$_capture_append)) \$_smarty_tpl->append( \$_capture_append, ob_get_contents());\n";
+        $_output .= " Smarty::\$_smarty_vars['capture'][\$_capture_buffer]=ob_get_clean();\n";
+        $_output .= "} else \$_smarty_tpl->capture_error();?>";
+        return $_output;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_config_load.php b/lib/smarty/sysplugins/smarty_internal_compile_config_load.php
new file mode 100644
index 0000000..deaa052
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_config_load.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Config Load
+ *
+ * Compiles the {config load} tag
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Config Load Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase {
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('file');
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('file','section');
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('section', 'scope');
+
+    /**
+     * Compiles code for the {config_load} tag
+     *
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        static $_is_legal_scope = array('local' => true,'parent' => true,'root' => true,'global' => true);
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+
+        if ($_attr['nocache'] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+        }
+
+
+        // save posible attributes
+        $conf_file = $_attr['file'];
+        if (isset($_attr['section'])) {
+            $section = $_attr['section'];
+        } else {
+            $section = 'null';
+        }
+        $scope = 'local';
+        // scope setup
+        if (isset($_attr['scope'])) {
+            $_attr['scope'] = trim($_attr['scope'], "'\"");
+            if (isset($_is_legal_scope[$_attr['scope']])) {
+                $scope = $_attr['scope'];
+           } else {
+                $compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno);
+           }
+        }
+        // create config object
+        $_output = "<?php  \$_config = new Smarty_Internal_Config($conf_file, \$_smarty_tpl->smarty, \$_smarty_tpl);";
+        $_output .= "\$_config->loadConfigVars($section, '$scope'); ?>";
+        return $_output;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_continue.php b/lib/smarty/sysplugins/smarty_internal_compile_continue.php
new file mode 100644
index 0000000..4082a93
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_continue.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Continue
+ *
+ * Compiles the {continue} tag
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Continue Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase {
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('levels');
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('levels');
+
+    /**
+     * Compiles code for the {continue} tag
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+
+        if ($_attr['nocache'] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+        }
+
+        if (isset($_attr['levels'])) {
+            if (!is_numeric($_attr['levels'])) {
+                $compiler->trigger_template_error('level attribute must be a numeric constant', $compiler->lex->taglineno);
+            }
+            $_levels = $_attr['levels'];
+        } else {
+            $_levels = 1;
+        }
+        $level_count = $_levels;
+        $stack_count = count($compiler->_tag_stack) - 1;
+        while ($level_count > 0 && $stack_count >= 0) {
+            if (isset($_is_loopy[$compiler->_tag_stack[$stack_count][0]])) {
+                $level_count--;
+            }
+            $stack_count--;
+        }
+        if ($level_count != 0) {
+            $compiler->trigger_template_error("cannot continue {$_levels} level(s)", $compiler->lex->taglineno);
+        }
+        $compiler->has_code = true;
+        return "<?php continue {$_levels}?>";
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_debug.php b/lib/smarty/sysplugins/smarty_internal_compile_debug.php
new file mode 100644
index 0000000..f50c7ae
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_debug.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Debug
+ *
+ * Compiles the {debug} tag.
+ * It opens a window the the Smarty Debugging Console.
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Debug Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for the {debug} tag
+     *
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+
+        // compile always as nocache
+        $compiler->tag_nocache = true;
+
+        // display debug template
+        $_output = "<?php \$_smarty_tpl->smarty->loadPlugin('Smarty_Internal_Debug'); Smarty_Internal_Debug::display_debug(\$_smarty_tpl); ?>";
+        return $_output;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_eval.php b/lib/smarty/sysplugins/smarty_internal_compile_eval.php
new file mode 100644
index 0000000..6cf481b
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_eval.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Eval
+ *
+ * Compiles the {eval} tag.
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Eval Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase {
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('var');
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('assign');
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('var','assign');
+
+    /**
+     * Compiles code for the {eval} tag
+     *
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $this->required_attributes = array('var');
+        $this->optional_attributes = array('assign');
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        if (isset($_attr['assign'])) {
+              // output will be stored in a smarty variable instead of beind displayed
+            $_assign = $_attr['assign'];
+        }
+
+        // create template object
+        $_output = "\$_template = new {$compiler->smarty->template_class}('eval:'.".$_attr['var'].", \$_smarty_tpl->smarty, \$_smarty_tpl);";
+        //was there an assign attribute?
+        if (isset($_assign)) {
+            $_output .= "\$_smarty_tpl->assign($_assign,\$_template->fetch());";
+        } else {
+            $_output .= "echo \$_template->fetch();";
+        }
+        return "<?php $_output ?>";
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_extends.php b/lib/smarty/sysplugins/smarty_internal_compile_extends.php
new file mode 100644
index 0000000..8a4deee
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_extends.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+* Smarty Internal Plugin Compile extend
+*
+* Compiles the {extends} tag
+*
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+
+/**
+* Smarty Internal Plugin Compile extend Class
+*
+* @package Smarty
+* @subpackage Compiler
+*/
+class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase {
+
+    /**
+    * Attribute definition: Overwrites base class.
+    *
+    * @var array
+    * @see Smarty_Internal_CompileBase
+    */
+    public $required_attributes = array('file');
+    /**
+    * Attribute definition: Overwrites base class.
+    *
+    * @var array
+    * @see Smarty_Internal_CompileBase
+    */
+    public $shorttag_order = array('file');
+
+    /**
+    * Compiles code for the {extends} tag
+    *
+    * @param array  $args     array with attributes from parser
+    * @param object $compiler compiler object
+    * @return string compiled code
+    */
+    public function compile($args, $compiler)
+    {
+        static $_is_stringy = array('string' => true, 'eval' => true);
+        $this->_rdl = preg_quote($compiler->smarty->right_delimiter);
+        $this->_ldl = preg_quote($compiler->smarty->left_delimiter);
+        $filepath = $compiler->template->source->filepath;
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr['nocache'] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+        }
+
+        $_smarty_tpl = $compiler->template;
+        $include_file = null;
+        if (strpos($_attr['file'], '$_tmp') !== false) {
+            $compiler->trigger_template_error('illegal value for file attribute', $compiler->lex->taglineno);
+        }
+        eval('$include_file = ' . $_attr['file'] . ';');
+        // create template object
+        $_template = new $compiler->smarty->template_class($include_file, $compiler->smarty, $compiler->template);
+        // save file dependency
+        if (isset($_is_stringy[$_template->source->type])) {
+            $template_sha1 = sha1($include_file);
+        } else {
+            $template_sha1 = sha1($_template->source->filepath);
+        }
+        if (isset($compiler->template->properties['file_dependency'][$template_sha1])) {
+            $compiler->trigger_template_error("illegal recursive call of \"{$include_file}\"", $compiler->lex->line - 1);
+        }
+        $compiler->template->properties['file_dependency'][$template_sha1] = array($_template->source->filepath, $_template->source->timestamp, $_template->source->type);
+        $_content = substr($compiler->template->source->content, $compiler->lex->counter - 1);
+        if (preg_match_all("!({$this->_ldl}block\s(.+?){$this->_rdl})!", $_content, $s) !=
+        preg_match_all("!({$this->_ldl}/block{$this->_rdl})!", $_content, $c)) {
+            $compiler->trigger_template_error('unmatched {block} {/block} pairs');
+        }
+        preg_match_all("!{$this->_ldl}block\s(.+?){$this->_rdl}|{$this->_ldl}/block{$this->_rdl}|{$this->_ldl}\*([\S\s]*?)\*{$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
+        $_result_count = count($_result[0]);
+        $_start = 0;
+        while ($_start+1 < $_result_count) {
+            $_end = 0;
+            $_level = 1;
+            if (substr($_result[0][$_start][0],0,strlen($compiler->smarty->left_delimiter)+1) == $compiler->smarty->left_delimiter.'*') {
+                $_start++;
+                continue;
+            }
+            while ($_level != 0) {
+                $_end++;
+                if (substr($_result[0][$_start + $_end][0],0,strlen($compiler->smarty->left_delimiter)+1) == $compiler->smarty->left_delimiter.'*') {
+                    continue;
+                }
+                if (!strpos($_result[0][$_start + $_end][0], '/')) {
+                    $_level++;
+                } else {
+                    $_level--;
+                }
+            }
+            $_block_content = str_replace($compiler->smarty->left_delimiter . '$smarty.block.parent' . $compiler->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%',
+            substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0])));
+            Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $compiler->template, $filepath);
+            $_start = $_start + $_end + 1;
+        }
+        if ($_template->source->type == 'extends') {
+            $_template->block_data = $compiler->template->block_data;
+        }
+        $compiler->template->source->content = $_template->source->content;
+        if ($_template->source->type == 'extends') {
+            $compiler->template->block_data = $_template->block_data;
+            foreach ($_template->source->components as $key => $component) {
+                $compiler->template->properties['file_dependency'][$key] = array($component->filepath, $component->timestamp, $component->type);
+            }
+        }
+        $compiler->template->source->filepath = $_template->source->filepath;
+        $compiler->abort_and_recompile = true;
+        return '';
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_for.php b/lib/smarty/sysplugins/smarty_internal_compile_for.php
new file mode 100644
index 0000000..057f4fb
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_for.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile For
+ *
+ * Compiles the {for} {forelse} {/for} tags
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile For Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for the {for} tag
+     *
+     * Smarty 3 does implement two different sytaxes:
+     *
+     * - {for $var in $array}
+     * For looping over arrays or iterators
+     *
+     * - {for $x=0; $x<$y; $x++}
+     * For general loops
+     *
+     * The parser is gereration different sets of attribute by which this compiler can
+     * determin which syntax is used.
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        if ($parameter == 0) {
+            $this->required_attributes = array('start', 'to');
+            $this->optional_attributes = array('max', 'step');
+        } else {
+            $this->required_attributes = array('start', 'ifexp', 'var', 'step');
+            $this->optional_attributes = array();
+        }
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+
+        $output = "<?php ";
+        if ($parameter == 1) {
+            foreach ($_attr['start'] as $_statement) {
+                $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;";
+                $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value];\n";
+            }
+            $output .= "  if ($_attr[ifexp]){ for (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$_attr[var]]->value$_attr[step]){\n";
+        } else {
+            $_statement = $_attr['start'];
+            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;";
+            if (isset($_attr['step'])) {
+                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = $_attr[step];";
+            } else {
+                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = 1;";
+            }
+            if (isset($_attr['max'])) {
+                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int)min(ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step)),$_attr[max]);\n";
+            } else {
+                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int)ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step));\n";
+            }
+            $output .= "if (\$_smarty_tpl->tpl_vars[$_statement[var]]->total > 0){\n";
+            $output .= "for (\$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value], \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration = 1;\$_smarty_tpl->tpl_vars[$_statement[var]]->iteration <= \$_smarty_tpl->tpl_vars[$_statement[var]]->total;\$_smarty_tpl->tpl_vars[$_statement[var]]->value += \$_smarty_tpl->tpl_vars[$_statement[var]]->step, \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration++){\n";
+            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->first = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == 1;";
+            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->last = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == \$_smarty_tpl->tpl_vars[$_statement[var]]->total;";
+        }
+        $output .= "?>";
+
+        $this->openTag($compiler, 'for', array('for', $compiler->nocache));
+        // maybe nocache because of nocache variables
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        // return compiled code
+        return $output;
+    }
+
+}
+
+/**
+ * Smarty Internal Plugin Compile Forelse Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for the {forelse} tag
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr  = $this->getAttributes($compiler, $args);
+
+        list($openTag, $nocache) = $this->closeTag($compiler, array('for'));
+        $this->openTag($compiler, 'forelse', array('forelse', $nocache));
+        return "<?php }} else { ?>";
+    }
+
+}
+
+/**
+ * Smarty Internal Plugin Compile Forclose Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for the {/for} tag
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        // must endblock be nocache?
+        if ($compiler->nocache) {
+            $compiler->tag_nocache = true;
+        }
+
+        list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('for', 'forelse'));
+
+        if ($openTag == 'forelse') {
+            return "<?php }  ?>";
+        } else {
+            return "<?php }} ?>";
+        }
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_foreach.php b/lib/smarty/sysplugins/smarty_internal_compile_foreach.php
new file mode 100644
index 0000000..1354c89
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_foreach.php
@@ -0,0 +1,231 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Foreach
+ *
+ * Compiles the {foreach} {foreachelse} {/foreach} tags
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Foreach Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('from', 'item');
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('name', 'key');
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('from','item','key','name');
+
+    /**
+     * Compiles code for the {foreach} tag
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $tpl = $compiler->template;
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+
+        $from = $_attr['from'];
+        $item = $_attr['item'];
+        if (!strncmp("\$_smarty_tpl->tpl_vars[$item]", $from, strlen($item) + 24)) {
+            $compiler->trigger_template_error("item variable {$item} may not be the same variable as at 'from'", $compiler->lex->taglineno);
+        }
+
+        if (isset($_attr['key'])) {
+            $key = $_attr['key'];
+        } else {
+            $key = null;
+        }
+
+        $this->openTag($compiler, 'foreach', array('foreach', $compiler->nocache, $item, $key));
+        // maybe nocache because of nocache variables
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+
+        if (isset($_attr['name'])) {
+            $name = $_attr['name'];
+            $has_name = true;
+            $SmartyVarName = '$smarty.foreach.' . trim($name, '\'"') . '.';
+        } else {
+            $name = null;
+            $has_name = false;
+        }
+        $ItemVarName = '$' . trim($item, '\'"') . '@';
+        // evaluates which Smarty variables and properties have to be computed
+        if ($has_name) {
+            $usesSmartyFirst = strpos($tpl->source->content, $SmartyVarName . 'first') !== false;
+            $usesSmartyLast = strpos($tpl->source->content, $SmartyVarName . 'last') !== false;
+            $usesSmartyIndex = strpos($tpl->source->content, $SmartyVarName . 'index') !== false;
+            $usesSmartyIteration = strpos($tpl->source->content, $SmartyVarName . 'iteration') !== false;
+            $usesSmartyShow = strpos($tpl->source->content, $SmartyVarName . 'show') !== false;
+            $usesSmartyTotal = strpos($tpl->source->content, $SmartyVarName . 'total') !== false;
+        } else {
+            $usesSmartyFirst = false;
+            $usesSmartyLast = false;
+            $usesSmartyTotal = false;
+            $usesSmartyShow = false;
+        }
+
+        $usesPropFirst = $usesSmartyFirst || strpos($tpl->source->content, $ItemVarName . 'first') !== false;
+        $usesPropLast = $usesSmartyLast || strpos($tpl->source->content, $ItemVarName . 'last') !== false;
+        $usesPropIndex = $usesPropFirst || strpos($tpl->source->content, $ItemVarName . 'index') !== false;
+        $usesPropIteration = $usesPropLast || strpos($tpl->source->content, $ItemVarName . 'iteration') !== false;
+        $usesPropShow = strpos($tpl->source->content, $ItemVarName . 'show') !== false;
+        $usesPropTotal = $usesSmartyTotal || $usesSmartyShow || $usesPropShow || $usesPropLast || strpos($tpl->source->content, $ItemVarName . 'total') !== false;
+        // generate output code
+        $output = "<?php ";
+        $output .= " \$_smarty_tpl->tpl_vars[$item] = new Smarty_Variable; \$_smarty_tpl->tpl_vars[$item]->_loop = false;\n";
+        if ($key != null) {
+            $output .= " \$_smarty_tpl->tpl_vars[$key] = new Smarty_Variable;\n";
+        }
+        $output .= " \$_from = $from; if (!is_array(\$_from) && !is_object(\$_from)) { settype(\$_from, 'array');}\n";
+        if ($usesPropTotal) {
+            $output .= " \$_smarty_tpl->tpl_vars[$item]->total= \$_smarty_tpl->_count(\$_from);\n";
+        }
+        if ($usesPropIteration) {
+            $output .= " \$_smarty_tpl->tpl_vars[$item]->iteration=0;\n";
+        }
+        if ($usesPropIndex) {
+            $output .= " \$_smarty_tpl->tpl_vars[$item]->index=-1;\n";
+        }
+        if ($usesPropShow) {
+            $output .= " \$_smarty_tpl->tpl_vars[$item]->show = (\$_smarty_tpl->tpl_vars[$item]->total > 0);\n";
+        }
+        if ($has_name) {
+            if ($usesSmartyTotal) {
+                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['total'] = \$_smarty_tpl->tpl_vars[$item]->total;\n";
+            }
+            if ($usesSmartyIteration) {
+                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['iteration']=0;\n";
+            }
+            if ($usesSmartyIndex) {
+                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['index']=-1;\n";
+            }
+            if ($usesSmartyShow) {
+                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['show']=(\$_smarty_tpl->tpl_vars[$item]->total > 0);\n";
+            }
+        }
+        $output .= "foreach (\$_from as \$_smarty_tpl->tpl_vars[$item]->key => \$_smarty_tpl->tpl_vars[$item]->value){\n\$_smarty_tpl->tpl_vars[$item]->_loop = true;\n";
+        if ($key != null) {
+            $output .= " \$_smarty_tpl->tpl_vars[$key]->value = \$_smarty_tpl->tpl_vars[$item]->key;\n";
+        }
+        if ($usesPropIteration) {
+            $output .= " \$_smarty_tpl->tpl_vars[$item]->iteration++;\n";
+        }
+        if ($usesPropIndex) {
+            $output .= " \$_smarty_tpl->tpl_vars[$item]->index++;\n";
+        }
+        if ($usesPropFirst) {
+            $output .= " \$_smarty_tpl->tpl_vars[$item]->first = \$_smarty_tpl->tpl_vars[$item]->index === 0;\n";
+        }
+        if ($usesPropLast) {
+            $output .= " \$_smarty_tpl->tpl_vars[$item]->last = \$_smarty_tpl->tpl_vars[$item]->iteration === \$_smarty_tpl->tpl_vars[$item]->total;\n";
+        }
+        if ($has_name) {
+            if ($usesSmartyFirst) {
+                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['first'] = \$_smarty_tpl->tpl_vars[$item]->first;\n";
+            }
+            if ($usesSmartyIteration) {
+                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['iteration']++;\n";
+            }
+            if ($usesSmartyIndex) {
+                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['index']++;\n";
+            }
+            if ($usesSmartyLast) {
+                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['last'] = \$_smarty_tpl->tpl_vars[$item]->last;\n";
+            }
+        }
+        $output .= "?>";
+
+        return $output;
+    }
+}
+
+/**
+ * Smarty Internal Plugin Compile Foreachelse Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for the {foreachelse} tag
+     *
+     * @param array  $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array  $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+
+        list($openTag, $nocache, $item, $key) = $this->closeTag($compiler, array('foreach'));
+        $this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $item, $key));
+
+        return "<?php }\nif (!\$_smarty_tpl->tpl_vars[$item]->_loop) {\n?>";
+    }
+
+}
+
+/**
+ * Smarty Internal Plugin Compile Foreachclose Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for the {/foreach} tag
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        // must endblock be nocache?
+        if ($compiler->nocache) {
+            $compiler->tag_nocache = true;
+        }
+
+        list($openTag, $compiler->nocache, $item, $key) = $this->closeTag($compiler, array('foreach', 'foreachelse'));
+
+        return "<?php } ?>";
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_function.php b/lib/smarty/sysplugins/smarty_internal_compile_function.php
new file mode 100644
index 0000000..876b13d
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_function.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Function
+ *
+ * Compiles the {function} {/function} tags
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Function Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase {
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('name');
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('name');
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
+
+    /**
+     * Compiles code for the {function} tag
+     *
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return boolean true
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+
+        if ($_attr['nocache'] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+        }
+        unset($_attr['nocache']);
+        $save = array($_attr, $compiler->parser->current_buffer,
+            $compiler->template->has_nocache_code, $compiler->template->required_plugins);
+        $this->openTag($compiler, 'function', $save);
+        $_name = trim($_attr['name'], "'\"");
+        unset($_attr['name']);
+        // set flag that we are compiling a template function
+        $compiler->compiles_template_function = true;
+        $compiler->template->properties['function'][$_name]['parameter'] = array();
+        $_smarty_tpl = $compiler->template;
+        foreach ($_attr as $_key => $_data) {
+            eval ('$tmp='.$_data.';');
+            $compiler->template->properties['function'][$_name]['parameter'][$_key] = $tmp;
+        }
+        $compiler->smarty->template_functions[$_name]['parameter'] = $compiler->template->properties['function'][$_name]['parameter'];
+        if ($compiler->template->caching) {
+            $output = '';
+        } else {
+            $output = "<?php if (!function_exists('smarty_template_function_{$_name}')) {
+    function smarty_template_function_{$_name}(\$_smarty_tpl,\$params) {
+    \$saved_tpl_vars = \$_smarty_tpl->tpl_vars;
+    foreach (\$_smarty_tpl->smarty->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);};
+    foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
+        }
+        // Init temporay context
+        $compiler->template->required_plugins = array('compiled' => array(), 'nocache' => array());
+        $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
+        $compiler->parser->current_buffer->append_subtree(new _smarty_tag($compiler->parser, $output));
+        $compiler->template->has_nocache_code = false;
+        $compiler->has_code = false;
+        $compiler->template->properties['function'][$_name]['compiled'] = '';
+        return true;
+    }
+
+}
+
+/**
+ * Smarty Internal Plugin Compile Functionclose Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for the {/function} tag
+     *
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return boolean true
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $_attr = $this->getAttributes($compiler, $args);
+        $saved_data = $this->closeTag($compiler, array('function'));
+        $_name = trim($saved_data[0]['name'], "'\"");
+        // build plugin include code
+        $plugins_string = '';
+        if (!empty($compiler->template->required_plugins['compiled'])) {
+            $plugins_string = '<?php ';
+            foreach($compiler->template->required_plugins['compiled'] as $tmp) {
+                foreach($tmp as $data) {
+                    $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$data['file']}';\n";
+                }
+            }
+            $plugins_string .= '?>';
+        }
+        if (!empty($compiler->template->required_plugins['nocache'])) {
+            $plugins_string .= "<?php echo '/*%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/<?php ";
+            foreach($compiler->template->required_plugins['nocache'] as $tmp) {
+                foreach($tmp as $data) {
+                    $plugins_string .= "if (!is_callable(\'{$data['function']}\')) include \'{$data['file']}\';\n";
+                }
+            }
+            $plugins_string .= "?>/*/%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/';?>\n";
+        }
+         // remove last line break from function definition
+         $last = count($compiler->parser->current_buffer->subtrees) - 1;
+         if ($compiler->parser->current_buffer->subtrees[$last] instanceof _smarty_linebreak) {
+             unset($compiler->parser->current_buffer->subtrees[$last]);
+         }
+        // if caching save template function for possible nocache call
+        if ($compiler->template->caching) {
+            $compiler->template->properties['function'][$_name]['compiled'] .= $plugins_string
+             . $compiler->parser->current_buffer->to_smarty_php();
+            $compiler->template->properties['function'][$_name]['nocache_hash'] = $compiler->template->properties['nocache_hash'];
+            $compiler->template->properties['function'][$_name]['has_nocache_code'] = $compiler->template->has_nocache_code;
+            $compiler->template->properties['function'][$_name]['called_functions'] = $compiler->called_functions;
+            $compiler->called_functions = array();
+            $compiler->smarty->template_functions[$_name] = $compiler->template->properties['function'][$_name];
+            $compiler->has_code = false;
+            $output = true;
+        } else {
+            $output = $plugins_string . $compiler->parser->current_buffer->to_smarty_php() . "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;}}?>\n";
+        }
+        // reset flag that we are compiling a template function
+        $compiler->compiles_template_function = false;
+        // restore old compiler status
+        $compiler->parser->current_buffer = $saved_data[1];
+        $compiler->template->has_nocache_code = $compiler->template->has_nocache_code | $saved_data[2];
+        $compiler->template->required_plugins = $saved_data[3];
+        return $output;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_if.php b/lib/smarty/sysplugins/smarty_internal_compile_if.php
new file mode 100644
index 0000000..8794b01
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_if.php
@@ -0,0 +1,207 @@
+<?php
+/**
+* Smarty Internal Plugin Compile If
+*
+* Compiles the {if} {else} {elseif} {/if} tags
+*
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+
+/**
+* Smarty Internal Plugin Compile If Class
+*
+* @package Smarty
+* @subpackage Compiler
+*/
+class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase {
+
+    /**
+    * Compiles code for the {if} tag
+    *
+    * @param array  $args       array with attributes from parser
+    * @param object $compiler   compiler object
+    * @param array  $parameter  array with compilation parameter
+    * @return string compiled code
+    */
+    public function compile($args, $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $this->openTag($compiler, 'if', array(1, $compiler->nocache));
+        // must whole block be nocache ?
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+
+        if (!array_key_exists("if condition",$parameter)) {
+            $compiler->trigger_template_error("missing if condition", $compiler->lex->taglineno);
+        }
+
+        if (is_array($parameter['if condition'])) {
+            if ($compiler->nocache) {
+                $_nocache = ',true';
+                // create nocache var to make it know for further compiling
+                if (is_array($parameter['if condition']['var'])) {
+                    $compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
+                } else {
+                    $compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
+                }
+            } else {
+                $_nocache = '';
+            }
+            if (is_array($parameter['if condition']['var'])) {
+                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]) || !is_array(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value)) \$_smarty_tpl->createLocalArrayVariable(".$parameter['if condition']['var']['var']."$_nocache);\n";
+                $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value".$parameter['if condition']['var']['smarty_internal_index']." = ".$parameter['if condition']['value']."){?>";
+            } else {
+                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."])) \$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."] = new Smarty_Variable(null{$_nocache});";
+                $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."]->value = ".$parameter['if condition']['value']."){?>";
+            }
+            return $_output;
+        } else {
+            return "<?php if ({$parameter['if condition']}){?>";
+        }
+    }
+
+}
+
+/**
+* Smarty Internal Plugin Compile Else Class
+*
+* @package Smarty
+* @subpackage Compiler
+*/
+class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase {
+
+    /**
+    * Compiles code for the {else} tag
+    *
+    * @param array  $args       array with attributes from parser
+    * @param object $compiler   compiler object
+    * @param array  $parameter  array with compilation parameter
+    * @return string compiled code
+    */
+    public function compile($args, $compiler, $parameter)
+    {
+        list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
+        $this->openTag($compiler, 'else', array($nesting, $compiler->tag_nocache));
+
+        return "<?php }else{ ?>";
+    }
+
+}
+
+/**
+* Smarty Internal Plugin Compile ElseIf Class
+*
+* @package Smarty
+* @subpackage Compiler
+*/
+class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase {
+
+    /**
+    * Compiles code for the {elseif} tag
+    *
+    * @param array  $args       array with attributes from parser
+    * @param object $compiler   compiler object
+    * @param array  $parameter  array with compilation parameter
+    * @return string compiled code
+    */
+    public function compile($args, $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+
+        list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
+
+        if (!array_key_exists("if condition",$parameter)) {
+            $compiler->trigger_template_error("missing elseif condition", $compiler->lex->taglineno);
+        }
+
+        if (is_array($parameter['if condition'])) {
+            $condition_by_assign = true;
+            if ($compiler->nocache) {
+                $_nocache = ',true';
+                // create nocache var to make it know for further compiling
+                if (is_array($parameter['if condition']['var'])) {
+                    $compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
+                } else {
+                    $compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
+                }
+            } else {
+                $_nocache = '';
+            }
+        } else {
+            $condition_by_assign = false;
+        }
+
+        if (empty($compiler->prefix_code)) {
+            if ($condition_by_assign) {
+                $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
+                if (is_array($parameter['if condition']['var'])) {
+                    $_output = "<?php }else{ if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
+                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>";
+                } else {
+                    $_output = "<?php  }else{ if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
+                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . "){?>";
+                }
+                return $_output;
+            } else {
+                $this->openTag($compiler, 'elseif', array($nesting, $compiler->tag_nocache));
+                return "<?php }elseif({$parameter['if condition']}){?>";
+            }
+        } else {
+            $tmp = '';
+            foreach ($compiler->prefix_code as $code)
+            $tmp .= $code;
+            $compiler->prefix_code = array();
+            $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
+            if ($condition_by_assign) {
+                if (is_array($parameter['if condition']['var'])) {
+                    $_output = "<?php }else{?>{$tmp}<?php  if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
+                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>";
+                } else {
+                    $_output = "<?php }else{?>{$tmp}<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
+                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . "){?>";
+                }
+                return $_output;
+            } else {
+                return "<?php }else{?>{$tmp}<?php if ({$parameter['if condition']}){?>";
+            }
+        }
+    }
+
+}
+
+/**
+* Smarty Internal Plugin Compile Ifclose Class
+*
+* @package Smarty
+* @subpackage Compiler
+*/
+class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase {
+
+    /**
+    * Compiles code for the {/if} tag
+    *
+    * @param array  $args       array with attributes from parser
+    * @param object $compiler   compiler object
+    * @param array  $parameter  array with compilation parameter
+    * @return string compiled code
+    */
+    public function compile($args, $compiler, $parameter)
+    {
+        // must endblock be nocache?
+        if ($compiler->nocache) {
+            $compiler->tag_nocache = true;
+        }
+        list($nesting, $compiler->nocache) = $this->closeTag($compiler, array('if', 'else', 'elseif'));
+        $tmp = '';
+        for ($i = 0; $i < $nesting; $i++) {
+            $tmp .= '}';
+        }
+        return "<?php {$tmp}?>";
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_include.php b/lib/smarty/sysplugins/smarty_internal_compile_include.php
new file mode 100644
index 0000000..bd050c3
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_include.php
@@ -0,0 +1,215 @@
+<?php
+/**
+* Smarty Internal Plugin Compile Include
+*
+* Compiles the {include} tag
+*
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+
+/**
+* Smarty Internal Plugin Compile Include Class
+*
+* @package Smarty
+* @subpackage Compiler
+*/
+class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
+
+    /**
+    * caching mode to create nocache code but no cache file
+    */
+    const CACHING_NOCACHE_CODE = 9999;
+    /**
+    * Attribute definition: Overwrites base class.
+    *
+    * @var array
+    * @see Smarty_Internal_CompileBase
+    */
+    public $required_attributes = array('file');
+    /**
+    * Attribute definition: Overwrites base class.
+    *
+    * @var array
+    * @see Smarty_Internal_CompileBase
+    */
+    public $shorttag_order = array('file');
+    /**
+    * Attribute definition: Overwrites base class.
+    *
+    * @var array
+    * @see Smarty_Internal_CompileBase
+    */
+    public $option_flags = array('nocache', 'inline', 'caching');
+    /**
+    * Attribute definition: Overwrites base class.
+    *
+    * @var array
+    * @see Smarty_Internal_CompileBase
+    */
+    public $optional_attributes = array('_any');
+
+    /**
+    * Compiles code for the {include} tag
+    *
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        // save posible attributes
+        $include_file = $_attr['file'];
+
+        if (isset($_attr['assign'])) {
+            // output will be stored in a smarty variable instead of beind displayed
+            $_assign = $_attr['assign'];
+        }
+
+        $_parent_scope = Smarty::SCOPE_LOCAL;
+        if (isset($_attr['scope'])) {
+            $_attr['scope'] = trim($_attr['scope'], "'\"");
+            if ($_attr['scope'] == 'parent') {
+                $_parent_scope = Smarty::SCOPE_PARENT;
+            } elseif ($_attr['scope'] == 'root') {
+                $_parent_scope = Smarty::SCOPE_ROOT;
+            } elseif ($_attr['scope'] == 'global') {
+                $_parent_scope = Smarty::SCOPE_GLOBAL;
+            }
+        }
+        $_caching = 'null';
+        if ($compiler->nocache || $compiler->tag_nocache) {
+            $_caching = Smarty::CACHING_OFF;
+        }
+        // default for included templates
+        if ($compiler->template->caching && !$compiler->nocache && !$compiler->tag_nocache) {
+            $_caching = self::CACHING_NOCACHE_CODE;
+        }
+        /*
+        * if the {include} tag provides individual parameter for caching
+        * it will not be included into the common cache file and treated like
+        * a nocache section
+        */
+        if (isset($_attr['cache_lifetime'])) {
+            $_cache_lifetime = $_attr['cache_lifetime'];
+            $compiler->tag_nocache = true;
+            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
+        } else {
+            $_cache_lifetime = 'null';
+        }
+        if (isset($_attr['cache_id'])) {
+            $_cache_id = $_attr['cache_id'];
+            $compiler->tag_nocache = true;
+            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
+        } else {
+            $_cache_id = '$_smarty_tpl->cache_id';
+        }
+        if (isset($_attr['compile_id'])) {
+            $_compile_id = $_attr['compile_id'];
+        } else {
+            $_compile_id = '$_smarty_tpl->compile_id';
+        }
+        if ($_attr['caching'] === true) {
+            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
+        }
+        if ($_attr['nocache'] === true) {
+            $compiler->tag_nocache = true;
+            $_caching = Smarty::CACHING_OFF;
+        }
+
+        $has_compiled_template = false;
+        if (($compiler->smarty->merge_compiled_includes || $_attr['inline'] === true) && !$compiler->template->source->recompiled
+            && !($compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache)) && $_caching != Smarty::CACHING_LIFETIME_CURRENT) {
+            // check if compiled code can be merged (contains no variable part)
+            if (!$compiler->has_variable_string && (substr_count($include_file, '"') == 2 or substr_count($include_file, "'") == 2)
+               and substr_count($include_file, '(') == 0 and substr_count($include_file, '$_smarty_tpl->') == 0) {
+                $tpl_name = null;
+                eval("\$tpl_name = $include_file;");
+                if (!isset($compiler->smarty->merged_templates_func[$tpl_name]) || $compiler->inheritance) {
+                    $tpl = new $compiler->smarty->template_class ($tpl_name, $compiler->smarty, $compiler->template, $compiler->template->cache_id, $compiler->template->compile_id);
+                    // save unique function name
+                    $compiler->smarty->merged_templates_func[$tpl_name]['func'] = $tpl->properties['unifunc'] = 'content_'.uniqid('', false);
+                    // use current nocache hash for inlined code
+                    $compiler->smarty->merged_templates_func[$tpl_name]['nocache_hash'] = $tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
+                    if ($compiler->template->caching) {
+                        // needs code for cached page but no cache file
+                        $tpl->caching = self::CACHING_NOCACHE_CODE;
+                    }
+                    // make sure whole chain gest compiled
+                    $tpl->mustCompile = true;
+                    if (!($tpl->source->uncompiled) && $tpl->source->exists) {
+                        // get compiled code
+                        $compiled_code = $tpl->compiler->compileTemplate($tpl);
+                        // release compiler object to free memory
+                        unset($tpl->compiler);
+                        // merge compiled code for {function} tags
+                        $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $tpl->properties['function']);
+                        // merge filedependency
+                        $tpl->properties['file_dependency'][$tpl->source->uid] = array($tpl->source->filepath, $tpl->source->timestamp,$tpl->source->type);
+                        $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $tpl->properties['file_dependency']);
+                        // remove header code
+                        $compiled_code = preg_replace("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", '', $compiled_code);
+                        if ($tpl->has_nocache_code) {
+                            // replace nocache_hash
+                            $compiled_code = preg_replace("/{$tpl->properties['nocache_hash']}/", $compiler->template->properties['nocache_hash'], $compiled_code);
+                            $compiler->template->has_nocache_code = true;
+                        }
+                        $compiler->merged_templates[$tpl->properties['unifunc']] = $compiled_code;
+                        $has_compiled_template = true;
+                    }
+                } else {
+                    $has_compiled_template = true;
+                }
+            }
+        }
+        // delete {include} standard attributes
+        unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['compile_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']);
+        // remaining attributes must be assigned as smarty variable
+        if (!empty($_attr)) {
+            if ($_parent_scope == Smarty::SCOPE_LOCAL) {
+                // create variables
+                foreach ($_attr as $key => $value) {
+                    $_pairs[] = "'$key'=>$value";
+                }
+                $_vars = 'array('.join(',',$_pairs).')';
+                $_has_vars = true;
+            } else {
+                $compiler->trigger_template_error('variable passing not allowed in parent/global scope', $compiler->lex->taglineno);
+            }
+        } else {
+            $_vars = 'array()';
+            $_has_vars = false;
+        }
+        if ($has_compiled_template) {
+            $_hash = $compiler->smarty->merged_templates_func[$tpl_name]['nocache_hash'];
+            $_output = "<?php /*  Call merged included template \"" . $tpl_name . "\" */\n";
+            $_output .= "\$_tpl_stack[] = \$_smarty_tpl;\n";
+            $_output .= " \$_smarty_tpl = \$_smarty_tpl->setupInlineSubTemplate($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope, '$_hash');\n";
+            if (isset($_assign)) {
+                $_output .= 'ob_start(); ';
+            }
+            $_output .= $compiler->smarty->merged_templates_func[$tpl_name]['func']. "(\$_smarty_tpl);\n";
+            $_output .= "\$_smarty_tpl = array_pop(\$_tpl_stack); ";
+            if (isset($_assign)) {
+                $_output .= " \$_smarty_tpl->tpl_vars[$_assign] = new Smarty_variable(ob_get_clean());";
+            }
+            $_output .= "/*  End of included template \"" . $tpl_name . "\" */?>";
+            return $_output;
+        }
+
+        // was there an assign attribute
+        if (isset($_assign)) {
+            $_output = "<?php \$_smarty_tpl->tpl_vars[$_assign] = new Smarty_variable(\$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope));?>\n";;
+        } else {
+            $_output = "<?php echo \$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope);?>\n";
+        }
+        return $_output;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_include_php.php b/lib/smarty/sysplugins/smarty_internal_compile_include_php.php
new file mode 100644
index 0000000..d527123
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_include_php.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Include PHP
+ *
+ * Compiles the {include_php} tag
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Insert Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('file');
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('file');
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('once', 'assign');
+
+    /**
+     * Compiles code for the {include_php} tag
+     *
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        if (!($compiler->smarty instanceof SmartyBC)) {
+            throw new SmartyException("{include_php} is deprecated, use SmartyBC class to enable");
+        }
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+
+        $_output = '<?php ';
+
+        $_smarty_tpl = $compiler->template;
+        $_filepath = false;
+        eval('$_file = ' . $_attr['file'] . ';');
+        if (!isset($compiler->smarty->security_policy) && file_exists($_file)) {
+            $_filepath = $_file;
+        } else {
+            if (isset($compiler->smarty->security_policy)) {
+                $_dir = $compiler->smarty->security_policy->trusted_dir;
+            } else {
+                $_dir = $compiler->smarty->trusted_dir;
+            }
+            if (!empty($_dir)) {
+                foreach((array)$_dir as $_script_dir) {
+                    $_script_dir = rtrim($_script_dir, '/\\') . DS;
+                    if (file_exists($_script_dir . $_file)) {
+                        $_filepath = $_script_dir .  $_file;
+                        break;
+                    }
+                }
+            }
+        }
+        if ($_filepath == false) {
+            $compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", $compiler->lex->taglineno);
+        }
+
+        if (isset($compiler->smarty->security_policy)) {
+            $compiler->smarty->security_policy->isTrustedPHPDir($_filepath);
+        }
+
+        if (isset($_attr['assign'])) {
+            // output will be stored in a smarty variable instead of being displayed
+            $_assign = $_attr['assign'];
+        }
+        $_once = '_once';
+        if (isset($_attr['once'])) {
+            if ($_attr['once'] == 'false') {
+                $_once = '';
+            }
+        }
+
+        if (isset($_assign)) {
+            return "<?php ob_start(); include{$_once} ('{$_filepath}'); \$_smarty_tpl->assign({$_assign},ob_get_contents()); ob_end_clean();?>";
+        } else {
+            return "<?php include{$_once} ('{$_filepath}');?>\n";
+        }
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_insert.php b/lib/smarty/sysplugins/smarty_internal_compile_insert.php
new file mode 100644
index 0000000..e4d3f93
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_insert.php
@@ -0,0 +1,142 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Compile Insert
+ *
+ * Compiles the {insert} tag
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Insert Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('name');
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('name');
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
+
+    /**
+     * Compiles code for the {insert} tag
+     *
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        // never compile as nocache code
+        $compiler->suppressNocacheProcessing = true;
+        $compiler->tag_nocache = true;
+        $_smarty_tpl = $compiler->template;
+        $_name = null;
+        $_script = null;
+
+        $_output = '<?php ';
+        // save posible attributes
+        eval('$_name = ' . $_attr['name'] . ';');
+        if (isset($_attr['assign'])) {
+            // output will be stored in a smarty variable instead of being displayed
+            $_assign = $_attr['assign'];
+            // create variable to make shure that the compiler knows about its nocache status
+            $compiler->template->tpl_vars[trim($_attr['assign'], "'")] = new Smarty_Variable(null, true);
+        }
+        if (isset($_attr['script'])) {
+            // script which must be included
+            $_function = "smarty_insert_{$_name}";
+            $_smarty_tpl = $compiler->template;
+            $_filepath = false;
+            eval('$_script = ' . $_attr['script'] . ';');
+            if (!isset($compiler->smarty->security_policy) && file_exists($_script)) {
+                $_filepath = $_script;
+            } else {
+                if (isset($compiler->smarty->security_policy)) {
+                    $_dir = $compiler->smarty->security_policy->trusted_dir;
+                } else {
+                    $_dir = $compiler->smarty->trusted_dir;
+                }
+                if (!empty($_dir)) {
+                    foreach((array)$_dir as $_script_dir) {
+                        $_script_dir = rtrim($_script_dir, '/\\') . DS;
+                        if (file_exists($_script_dir . $_script)) {
+                            $_filepath = $_script_dir . $_script;
+                            break;
+                        }
+                    }
+                }
+            }
+            if ($_filepath == false) {
+                $compiler->trigger_template_error("{insert} missing script file '{$_script}'", $compiler->lex->taglineno);
+            }
+            // code for script file loading
+            $_output .= "require_once '{$_filepath}' ;";
+            require_once $_filepath;
+            if (!is_callable($_function)) {
+                $compiler->trigger_template_error(" {insert} function '{$_function}' is not callable in script file '{$_script}'", $compiler->lex->taglineno);
+            }
+        } else {
+            $_filepath = 'null';
+            $_function = "insert_{$_name}";
+            // function in PHP script ?
+            if (!is_callable($_function)) {
+                // try plugin
+                if (!$_function = $compiler->getPlugin($_name, 'insert')) {
+                    $compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'", $compiler->lex->taglineno);
+                }
+            }
+        }
+        // delete {insert} standard attributes
+        unset($_attr['name'], $_attr['assign'], $_attr['script'], $_attr['nocache']);
+        // convert attributes into parameter array string
+        $_paramsArray = array();
+        foreach ($_attr as $_key => $_value) {
+            $_paramsArray[] = "'$_key' => $_value";
+        }
+        $_params = 'array(' . implode(", ", $_paramsArray) . ')';
+        // call insert
+        if (isset($_assign)) {
+            if ($_smarty_tpl->caching) {
+                $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}',{$_assign});?>";
+            } else {
+                $_output .= "\$_smarty_tpl->assign({$_assign} , {$_function} ({$_params},\$_smarty_tpl), true);?>";
+            }
+        } else {
+            $compiler->has_output = true;
+            if ($_smarty_tpl->caching) {
+                $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}');?>";
+            } else {
+                $_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>";
+            }
+        }
+        return $_output;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_ldelim.php b/lib/smarty/sysplugins/smarty_internal_compile_ldelim.php
new file mode 100644
index 0000000..9906325
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_ldelim.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Ldelim
+ *
+ * Compiles the {ldelim} tag
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Ldelim Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for the {ldelim} tag
+     *
+     * This tag does output the left delimiter
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr['nocache'] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+        }
+        // this tag does not return compiled code
+        $compiler->has_code = true;
+        return $compiler->smarty->left_delimiter;
+    }
+
+}
+
+?>
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_nocache.php b/lib/smarty/sysplugins/smarty_internal_compile_nocache.php
new file mode 100644
index 0000000..5fb71b7
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_nocache.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Nocache
+ *
+ * Compiles the {nocache} {/nocache} tags.
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Nocache Classv
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for the {nocache} tag
+     *
+     * This tag does not generate compiled output. It only sets a compiler flag.
+     *
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     * @return bool
+     */
+    public function compile($args, $compiler)
+    {
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr['nocache'] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+        }
+        // enter nocache mode
+        $compiler->nocache = true;
+        // this tag does not return compiled code
+        $compiler->has_code = false;
+        return true;
+    }
+
+}
+
+/**
+ * Smarty Internal Plugin Compile Nocacheclose Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for the {/nocache} tag
+     *
+     * This tag does not generate compiled output. It only sets a compiler flag.
+     *
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     * @return bool
+     */
+    public function compile($args, $compiler)
+    {
+        $_attr = $this->getAttributes($compiler, $args);
+        // leave nocache mode
+        $compiler->nocache = false;
+        // this tag does not return compiled code
+        $compiler->has_code = false;
+        return true;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php b/lib/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php
new file mode 100644
index 0000000..5288f45
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Block Plugin
+ *
+ * Compiles code for the execution of block plugin
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Block Plugin Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_CompileBase {
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
+
+    /**
+     * Compiles code for the execution of block plugin
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     * @param string $tag       name of block plugin
+     * @param string $function  PHP function name
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter, $tag, $function)
+    {
+        if (!isset($tag[5]) || substr($tag, -5) != 'close') {
+            // opening tag of block plugin
+            // check and get attributes
+            $_attr = $this->getAttributes($compiler, $args);
+            if ($_attr['nocache'] === true) {
+                $compiler->tag_nocache = true;
+            }
+               unset($_attr['nocache']);
+            // convert attributes into parameter array string
+            $_paramsArray = array();
+            foreach ($_attr as $_key => $_value) {
+                if (is_int($_key)) {
+                    $_paramsArray[] = "$_key=>$_value";
+                } else {
+                    $_paramsArray[] = "'$_key'=>$_value";
+                }
+            }
+            $_params = 'array(' . implode(",", $_paramsArray) . ')';
+
+            $this->openTag($compiler, $tag, array($_params, $compiler->nocache));
+            // maybe nocache because of nocache variables or nocache plugin
+            $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+            // compile code
+            $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+        } else {
+            // must endblock be nocache?
+            if ($compiler->nocache) {
+                $compiler->tag_nocache = true;
+            }
+            // closing tag of block plugin, restore nocache
+            list($_params, $compiler->nocache) = $this->closeTag($compiler, substr($tag, 0, -5));
+            // This tag does create output
+            $compiler->has_output = true;
+            // compile code
+            if (!isset($parameter['modifier_list'])) {
+                $mod_pre = $mod_post ='';
+            } else {
+                $mod_pre = ' ob_start(); ';
+                $mod_post = 'echo '.$compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';';
+            }
+            $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post." } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+        }
+        return $output . "\n";
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php b/lib/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php
new file mode 100644
index 0000000..70e7643
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Function Plugin
+ *
+ * Compiles code for the execution of function plugin
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Function Plugin Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_CompileBase {
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array();
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
+
+    /**
+     * Compiles code for the execution of function plugin
+     *
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @param array $parameter array with compilation parameter
+     * @param string $tag name of function plugin
+     * @param string $function PHP function name
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter, $tag, $function)
+    {
+        // This tag does create output
+        $compiler->has_output = true;
+
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr['nocache'] === true) {
+            $compiler->tag_nocache = true;
+        }
+        unset($_attr['nocache']);
+        // convert attributes into parameter array string
+        $_paramsArray = array();
+        foreach ($_attr as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
+            }
+        }
+        $_params = 'array(' . implode(",", $_paramsArray) . ')';
+        // compile code
+        $output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n";
+        return $output;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_private_modifier.php b/lib/smarty/sysplugins/smarty_internal_compile_private_modifier.php
new file mode 100644
index 0000000..ca4d907
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_private_modifier.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Compile Modifier
+ *
+ * Compiles code for modifier execution
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Modifier Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for modifier execution
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $output = $parameter['value'];
+        // loop over list of modifiers
+        foreach ($parameter['modifierlist'] as $single_modifier) {
+            $modifier = $single_modifier[0];
+            $single_modifier[0] = $output;
+            $params = implode(',', $single_modifier);
+            // check for registered modifier
+            if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$modifier])) {
+                $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$modifier][0];
+                if (!is_array($function)) {
+                    $output = "{$function}({$params})";
+                } else {
+                    if (is_object($function[0])) {
+                        $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' . $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
+                    } else {
+                        $output = $function[0] . '::' . $function[1] . '(' . $params . ')';
+                    }
+                }
+            } else if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIERCOMPILER][$modifier][0])) {
+                $output = call_user_func($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIERCOMPILER][$modifier][0], $single_modifier, $compiler->smarty);
+                // check for plugin modifiercompiler
+            } else if ($compiler->smarty->loadPlugin('smarty_modifiercompiler_' . $modifier)) {
+                // check if modifier allowed
+                if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) {
+                    $plugin = 'smarty_modifiercompiler_' . $modifier;
+                    $output = $plugin($single_modifier, $compiler);
+                }
+                // check for plugin modifier
+            } else if ($function = $compiler->getPlugin($modifier, Smarty::PLUGIN_MODIFIER)) {
+                // check if modifier allowed
+                if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) {
+                    $output = "{$function}({$params})";
+                }
+                // check if trusted PHP function
+            } else if (is_callable($modifier)) {
+                // check if modifier allowed
+                if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)) {
+                    $output = "{$modifier}({$params})";
+                }
+            } else {
+                $compiler->trigger_template_error("unknown modifier \"" . $modifier . "\"", $compiler->lex->taglineno);
+            }
+        }
+        return $output;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php b/lib/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php
new file mode 100644
index 0000000..cca924d
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Object Block Function
+ *
+ * Compiles code for registered objects as block function
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Object Block Function Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Internal_CompileBase {
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
+
+    /**
+     * Compiles code for the execution of block plugin
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     * @param string $tag       name of block object
+     * @param string $method    name of method to call
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter, $tag, $method)
+    {
+        if (!isset($tag[5]) || substr($tag, -5) != 'close') {
+            // opening tag of block plugin
+            // check and get attributes
+            $_attr = $this->getAttributes($compiler, $args);
+            if ($_attr['nocache'] === true) {
+                $compiler->tag_nocache = true;
+            }
+            unset($_attr['nocache']);
+            // convert attributes into parameter array string
+            $_paramsArray = array();
+            foreach ($_attr as $_key => $_value) {
+                if (is_int($_key)) {
+                    $_paramsArray[] = "$_key=>$_value";
+                } else {
+                    $_paramsArray[] = "'$_key'=>$_value";
+                }
+            }
+            $_params = 'array(' . implode(",", $_paramsArray) . ')';
+
+            $this->openTag($compiler, $tag . '->' . $method, array($_params, $compiler->nocache));
+            // maybe nocache because of nocache variables or nocache plugin
+            $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+            // compile code
+            $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}->{$method}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+        } else {
+            $base_tag = substr($tag, 0, -5);
+            // must endblock be nocache?
+            if ($compiler->nocache) {
+                $compiler->tag_nocache = true;
+            }
+            // closing tag of block plugin, restore nocache
+            list($_params, $compiler->nocache) = $this->closeTag($compiler, $base_tag . '->' . $method);
+            // This tag does create output
+            $compiler->has_output = true;
+            // compile code
+            if (!isset($parameter['modifier_list'])) {
+                $mod_pre = $mod_post = '';
+            } else {
+                $mod_pre = ' ob_start(); ';
+                $mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'], 'value' => 'ob_get_clean()')) . ';';
+            }
+            $output = "<?php \$_block_content = ob_get_contents(); ob_end_clean(); \$_block_repeat=false;" . $mod_pre . " echo \$_smarty_tpl->smarty->registered_objects['{$base_tag}'][0]->{$method}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . "  } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+        }
+        return $output . "\n";
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_private_object_function.php b/lib/smarty/sysplugins/smarty_internal_compile_private_object_function.php
new file mode 100644
index 0000000..f649084
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_private_object_function.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Object Funtion
+ *
+ * Compiles code for registered objects as function
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Object Function Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_CompileBase {
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
+
+    /**
+     * Compiles code for the execution of function plugin
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     * @param string $tag       name of function
+     * @param string $method    name of method to call
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter, $tag, $method)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr['nocache'] === true) {
+            $compiler->tag_nocache = true;
+        }
+        unset($_attr['nocache']);
+        $_assign = null;
+        if (isset($_attr['assign'])) {
+            $_assign = $_attr['assign'];
+            unset($_attr['assign']);
+        }
+        // convert attributes into parameter array string
+        if ($compiler->smarty->registered_objects[$tag][2]) {
+            $_paramsArray = array();
+            foreach ($_attr as $_key => $_value) {
+                if (is_int($_key)) {
+                    $_paramsArray[] = "$_key=>$_value";
+                } else {
+                    $_paramsArray[] = "'$_key'=>$_value";
+                }
+            }
+            $_params = 'array(' . implode(",", $_paramsArray) . ')';
+            $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params},\$_smarty_tpl)";
+        } else {
+            $_params = implode(",", $_attr);
+            $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})";
+        }
+        if (empty($_assign)) {
+            // This tag does create output
+            $compiler->has_output = true;
+            $output = "<?php echo {$return};?>\n";
+        } else {
+            $output = "<?php \$_smarty_tpl->assign({$_assign},{$return});?>\n";
+        }
+        return $output;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php b/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
new file mode 100644
index 0000000..a371195
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
@@ -0,0 +1,156 @@
+<?php
+/**
+* Smarty Internal Plugin Compile Print Expression
+*
+* Compiles any tag which will output an expression or variable
+*
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+
+/**
+* Smarty Internal Plugin Compile Print Expression Class
+*
+* @package Smarty
+* @subpackage Compiler
+*/
+class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_CompileBase {
+
+    /**
+    * Attribute definition: Overwrites base class.
+    *
+    * @var array
+    * @see Smarty_Internal_CompileBase
+    */
+    public $optional_attributes = array('assign');
+    /**
+    * Attribute definition: Overwrites base class.
+    *
+    * @var array
+    * @see Smarty_Internal_CompileBase
+    */
+    public $option_flags = array('nocache', 'nofilter');
+
+    /**
+    * Compiles code for gererting output from any expression
+    *
+    * @param array  $args      array with attributes from parser
+    * @param object $compiler  compiler object
+    * @param array  $parameter array with compilation parameter
+    * @return string compiled code
+    */
+    public function compile($args, $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        // nocache option
+        if ($_attr['nocache'] === true) {
+            $compiler->tag_nocache = true;
+        }
+        // filter handling
+        if ($_attr['nofilter'] === true) {
+            $_filter = 'false';
+        } else {
+            $_filter = 'true';
+        }
+        if (isset($_attr['assign'])) {
+            // assign output to variable
+            $output = "<?php \$_smarty_tpl->assign({$_attr['assign']},{$parameter['value']});?>";
+        } else {
+            // display value
+            $output = $parameter['value'];
+            // tag modifier
+            if (!empty($parameter['modifierlist'])) {
+                $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifierlist'], 'value' => $output));
+            }
+            if (!$_attr['nofilter']) {
+                // default modifier
+                if (!empty($compiler->smarty->default_modifiers)) {
+                    if (empty($compiler->default_modifier_list)) {
+                        $modifierlist = array();
+                        foreach ($compiler->smarty->default_modifiers as $key => $single_default_modifier) {
+                            preg_match_all('/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/', $single_default_modifier, $mod_array);
+                            for ($i = 0, $count = count($mod_array[0]);$i < $count;$i++) {
+                                if ($mod_array[0][$i] != ':') {
+                                    $modifierlist[$key][] = $mod_array[0][$i];
+                                }
+                            }
+                        }
+                        $compiler->default_modifier_list  = $modifierlist;
+                    }
+                    $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $compiler->default_modifier_list, 'value' => $output));
+                }
+                // autoescape html
+                if ($compiler->template->smarty->escape_html) {
+                    $output = "htmlspecialchars({$output}, ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')";
+                }
+                // loop over registerd filters
+                if (!empty($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE])) {
+                    foreach ($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE] as $key => $function) {
+                        if (!is_array($function)) {
+                            $output = "{$function}({$output},\$_smarty_tpl)";
+                        } else if (is_object($function[0])) {
+                            $output = "\$_smarty_tpl->smarty->registered_filters[Smarty::FILTER_VARIABLE][{$key}][0]->{$function[1]}({$output},\$_smarty_tpl)";
+                        } else {
+                            $output = "{$function[0]}::{$function[1]}({$output},\$_smarty_tpl)";
+                        }
+                    }
+                }
+                // auto loaded filters
+                if (isset($compiler->smarty->autoload_filters[Smarty::FILTER_VARIABLE])) {
+                    foreach ((array)$compiler->template->smarty->autoload_filters[Smarty::FILTER_VARIABLE] as $name) {
+                        $result = $this->compile_output_filter($compiler, $name, $output);
+                        if ($result !== false) {
+                            $output = $result;
+                        } else {
+                            // not found, throw exception
+                            throw new SmartyException("Unable to load filter '{$name}'");
+                        }
+                    }
+                }
+                if (isset($compiler->template->variable_filters)) {
+                    foreach ($compiler->template->variable_filters as $filter) {
+                        if (count($filter) == 1 && ($result = $this->compile_output_filter($compiler, $filter[0], $output)) !== false) {
+                            $output = $result;
+                        } else {
+                            $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => array($filter), 'value' => $output));
+                        }
+                    }
+                }
+            }
+
+            $compiler->has_output = true;
+            $output = "<?php echo {$output};?>";
+        }
+        return $output;
+    }
+
+    /**
+    * @param object $compiler compiler object
+    * @param string $name     name of variable filter
+    * @param type   $output   embedded output
+    * @return string
+    */
+    private function compile_output_filter($compiler, $name, $output)
+    {
+        $plugin_name = "smarty_variablefilter_{$name}";
+        $path = $compiler->smarty->loadPlugin($plugin_name, false);
+        if ($path) {
+            if ($compiler->template->caching) {
+                $compiler->template->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
+                $compiler->template->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
+            } else {
+                $compiler->template->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
+                $compiler->template->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
+            }
+        } else {
+            // not found
+            return false;
+        }
+        return "{$plugin_name}({$output},\$_smarty_tpl)";
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_private_registered_block.php b/lib/smarty/sysplugins/smarty_internal_compile_private_registered_block.php
new file mode 100644
index 0000000..9fed36c
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_private_registered_block.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Registered Block
+ *
+ * Compiles code for the execution of a registered block function
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Registered Block Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_CompileBase {
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
+
+    /**
+     * Compiles code for the execution of a block function
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     * @param string $tag       name of block function
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter, $tag)
+    {
+        if (!isset($tag[5]) || substr($tag,-5) != 'close') {
+            // opening tag of block plugin
+            // check and get attributes
+            $_attr = $this->getAttributes($compiler, $args);
+            if ($_attr['nocache']) {
+                $compiler->tag_nocache = true;
+            }
+               unset($_attr['nocache']);
+               if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag])) {
+                   $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag];
+               } else {
+                   $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$tag];
+               }
+            // convert attributes into parameter array string
+            $_paramsArray = array();
+            foreach ($_attr as $_key => $_value) {
+                if (is_int($_key)) {
+                    $_paramsArray[] = "$_key=>$_value";
+                } elseif ($compiler->template->caching && in_array($_key,$tag_info[2])) {
+                    $_value = str_replace("'","^#^",$_value);
+                    $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
+                } else {
+                    $_paramsArray[] = "'$_key'=>$_value";
+                }
+            }
+            $_params = 'array(' . implode(",", $_paramsArray) . ')';
+
+            $this->openTag($compiler, $tag, array($_params, $compiler->nocache));
+            // maybe nocache because of nocache variables or nocache plugin
+            $compiler->nocache = !$tag_info[1] | $compiler->nocache | $compiler->tag_nocache;
+            $function = $tag_info[0];
+            // compile code
+            if (!is_array($function)) {
+                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+            } else if (is_object($function[0])) {
+                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]->{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+            } else {
+                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function[0]}::{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
+            }
+        } else {
+            // must endblock be nocache?
+            if ($compiler->nocache) {
+                $compiler->tag_nocache = true;
+            }
+            $base_tag = substr($tag, 0, -5);
+            // closing tag of block plugin, restore nocache
+            list($_params, $compiler->nocache) = $this->closeTag($compiler, $base_tag);
+            // This tag does create output
+            $compiler->has_output = true;
+               if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) {
+                   $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0];
+               } else {
+                   $function = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0];
+               }
+            // compile code
+            if (!isset($parameter['modifier_list'])) {
+                $mod_pre = $mod_post ='';
+            } else {
+                $mod_pre = ' ob_start(); ';
+                $mod_post = 'echo '.$compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';';
+            }
+            if (!is_array($function)) {
+                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat);".$mod_post." } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+            } else if (is_object($function[0])) {
+                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo \$_smarty_tpl->smarty->registered_plugins['block']['{$base_tag}'][0][0]->{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+            } else {
+                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function[0]}::{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+            }
+        }
+        return $output . "\n";
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_private_registered_function.php b/lib/smarty/sysplugins/smarty_internal_compile_private_registered_function.php
new file mode 100644
index 0000000..5058bfb
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_private_registered_function.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Registered Function
+ *
+ * Compiles code for the execution of a registered function
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Registered Function Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Internal_CompileBase {
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
+
+    /**
+     * Compiles code for the execution of a registered function
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     * @param string $tag       name of function
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter, $tag)
+    {
+        // This tag does create output
+        $compiler->has_output = true;
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr['nocache']) {
+            $compiler->tag_nocache = true;
+        }
+        unset($_attr['nocache']);
+               if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag])) {
+                   $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag];
+               } else {
+                   $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_FUNCTION][$tag];
+               }
+        // not cachable?
+        $compiler->tag_nocache =  $compiler->tag_nocache || !$tag_info[1];
+        // convert attributes into parameter array string
+        $_paramsArray = array();
+        foreach ($_attr as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } elseif ($compiler->template->caching && in_array($_key,$tag_info[2])) {
+                $_value = str_replace("'","^#^",$_value);
+                $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
+            }
+        }
+        $_params = 'array(' . implode(",", $_paramsArray) . ')';
+        $function = $tag_info[0];
+        // compile code
+        if (!is_array($function)) {
+            $output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n";
+        } else if (is_object($function[0])) {
+            $output = "<?php echo \$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION]['{$tag}'][0][0]->{$function[1]}({$_params},\$_smarty_tpl);?>\n";
+        } else {
+            $output = "<?php echo {$function[0]}::{$function[1]}({$_params},\$_smarty_tpl);?>\n";
+        }
+        return $output;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php b/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
new file mode 100644
index 0000000..f9adcec
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Special Smarty Variable
+ *
+ * Compiles the special $smarty variables
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile special Smarty Variable Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for the speical $smarty variables
+     *
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $_index = preg_split("/\]\[/",substr($parameter, 1, strlen($parameter)-2));
+        $compiled_ref = ' ';
+        $variable = trim($_index[0], "'");
+        switch ($variable) {
+            case 'foreach':
+                return "\$_smarty_tpl->getVariable('smarty')->value$parameter";
+            case 'section':
+                return "\$_smarty_tpl->getVariable('smarty')->value$parameter";
+            case 'capture':
+                return "Smarty::\$_smarty_vars$parameter";
+            case 'now':
+                return 'time()';
+            case 'cookies':
+                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) {
+                    $compiler->trigger_template_error("(secure mode) super globals not permitted");
+                    break;
+                }
+                $compiled_ref = '$_COOKIE';
+                break;
+
+            case 'get':
+            case 'post':
+            case 'env':
+            case 'server':
+            case 'session':
+            case 'request':
+                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) {
+                    $compiler->trigger_template_error("(secure mode) super globals not permitted");
+                    break;
+                }
+                $compiled_ref = '$_'.strtoupper($variable);
+                break;
+
+            case 'template':
+                return 'basename($_smarty_tpl->source->filepath)';
+
+            case 'current_dir':
+                return 'dirname($_smarty_tpl->source->filepath)';
+
+            case 'version':
+                $_version = Smarty::SMARTY_VERSION;
+                return "'$_version'";
+
+            case 'const':
+                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_constants) {
+                    $compiler->trigger_template_error("(secure mode) constants not permitted");
+                    break;
+                }
+                return '@' . trim($_index[1], "'");
+
+            case 'config':
+                return "\$_smarty_tpl->getConfigVariable($_index[1])";
+            case 'ldelim':
+                $_ldelim = $compiler->smarty->left_delimiter;
+                return "'$_ldelim'";
+
+            case 'rdelim':
+                $_rdelim = $compiler->smarty->right_delimiter;
+                return "'$_rdelim'";
+
+            default:
+                $compiler->trigger_template_error('$smarty.' . trim($_index[0], "'") . ' is invalid');
+                break;
+        }
+        if (isset($_index[1])) {
+            array_shift($_index);
+            foreach ($_index as $_ind) {
+                $compiled_ref = $compiled_ref . "[$_ind]";
+            }
+        }
+        return $compiled_ref;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_rdelim.php b/lib/smarty/sysplugins/smarty_internal_compile_rdelim.php
new file mode 100644
index 0000000..807c7e2
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_rdelim.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Rdelim
+ *
+ * Compiles the {rdelim} tag
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Rdelim Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for the {rdelim} tag
+     *
+     * This tag does output the right delimiter.
+     *
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr['nocache'] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
+        }
+        // this tag does not return compiled code
+        $compiler->has_code = true;
+        return $compiler->smarty->right_delimiter;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_section.php b/lib/smarty/sysplugins/smarty_internal_compile_section.php
new file mode 100644
index 0000000..ccb7673
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_section.php
@@ -0,0 +1,203 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Section
+ *
+ * Compiles the {section} {sectionelse} {/section} tags
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Section Class
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('name', 'loop');
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('name', 'loop');
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('start', 'step', 'max', 'show');
+
+    /**
+     * Compiles code for the {section} tag
+     *
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+
+        $this->openTag($compiler, 'section', array('section', $compiler->nocache));
+        // maybe nocache because of nocache variables
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+
+        $output = "<?php ";
+
+        $section_name = $_attr['name'];
+
+        $output .= "if (isset(\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name])) unset(\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]);\n";
+        $section_props = "\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]";
+
+        foreach ($_attr as $attr_name => $attr_value) {
+            switch ($attr_name) {
+                case 'loop':
+                    $output .= "{$section_props}['loop'] = is_array(\$_loop=$attr_value) ? count(\$_loop) : max(0, (int)\$_loop); unset(\$_loop);\n";
+                    break;
+
+                case 'show':
+                    if (is_bool($attr_value))
+                        $show_attr_value = $attr_value ? 'true' : 'false';
+                    else
+                        $show_attr_value = "(bool)$attr_value";
+                    $output .= "{$section_props}['show'] = $show_attr_value;\n";
+                    break;
+
+                case 'name':
+                    $output .= "{$section_props}['$attr_name'] = $attr_value;\n";
+                    break;
+
+                case 'max':
+                case 'start':
+                    $output .= "{$section_props}['$attr_name'] = (int)$attr_value;\n";
+                    break;
+
+                case 'step':
+                    $output .= "{$section_props}['$attr_name'] = ((int)$attr_value) == 0 ? 1 : (int)$attr_value;\n";
+                    break;
+            }
+        }
+
+        if (!isset($_attr['show']))
+            $output .= "{$section_props}['show'] = true;\n";
+
+        if (!isset($_attr['loop']))
+            $output .= "{$section_props}['loop'] = 1;\n";
+
+        if (!isset($_attr['max']))
+            $output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
+        else
+            $output .= "if ({$section_props}['max'] < 0)\n" . "    {$section_props}['max'] = {$section_props}['loop'];\n";
+
+        if (!isset($_attr['step']))
+            $output .= "{$section_props}['step'] = 1;\n";
+
+        if (!isset($_attr['start']))
+            $output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
+        else {
+            $output .= "if ({$section_props}['start'] < 0)\n" . "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" . "else\n" . "    {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
+        }
+
+        $output .= "if ({$section_props}['show']) {\n";
+        if (!isset($_attr['start']) && !isset($_attr['step']) && !isset($_attr['max'])) {
+            $output .= "    {$section_props}['total'] = {$section_props}['loop'];\n";
+        } else {
+            $output .= "    {$section_props}['total'] = min(ceil(({$section_props}['step'] > 0 ? {$section_props}['loop'] - {$section_props}['start'] : {$section_props}['start']+1)/abs({$section_props}['step'])), {$section_props}['max']);\n";
+        }
+        $output .= "    if ({$section_props}['total'] == 0)\n" . "        {$section_props}['show'] = false;\n" . "} else\n" . "    {$section_props}['total'] = 0;\n";
+
+        $output .= "if ({$section_props}['show']):\n";
+        $output .= "
+            for ({$section_props}['index'] = {$section_props}['start'], {$section_props}['iteration'] = 1;
+                 {$section_props}['iteration'] <= {$section_props}['total'];
+                 {$section_props}['index'] += {$section_props}['step'], {$section_props}['iteration']++):\n";
+        $output .= "{$section_props}['rownum'] = {$section_props}['iteration'];\n";
+        $output .= "{$section_props}['index_prev'] = {$section_props}['index'] - {$section_props}['step'];\n";
+        $output .= "{$section_props}['index_next'] = {$section_props}['index'] + {$section_props}['step'];\n";
+        $output .= "{$section_props}['first']      = ({$section_props}['iteration'] == 1);\n";
+        $output .= "{$section_props}['last']       = ({$section_props}['iteration'] == {$section_props}['total']);\n";
+
+        $output .= "?>";
+        return $output;
+    }
+
+}
+
+/**
+ * Smarty Internal Plugin Compile Sectionelse Class
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for the {sectionelse} tag
+     *
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+
+        list($openTag, $nocache) = $this->closeTag($compiler, array('section'));
+        $this->openTag($compiler, 'sectionelse', array('sectionelse', $nocache));
+
+        return "<?php endfor; else: ?>";
+    }
+
+}
+
+/**
+ * Smarty Internal Plugin Compile Sectionclose Class
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for the {/section} tag
+     *
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+
+        // must endblock be nocache?
+        if ($compiler->nocache) {
+            $compiler->tag_nocache = true;
+        }
+
+        list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('section', 'sectionelse'));
+
+        if ($openTag == 'sectionelse') {
+            return "<?php endif; ?>";
+        } else {
+            return "<?php endfor; endif; ?>";
+        }
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_setfilter.php b/lib/smarty/sysplugins/smarty_internal_compile_setfilter.php
new file mode 100644
index 0000000..d1dd90c
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_setfilter.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Setfilter
+ *
+ * Compiles code for setfilter tag
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Setfilter Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for setfilter tag
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $compiler->variable_filter_stack[] = $compiler->template->variable_filters;
+        $compiler->template->variable_filters = $parameter['modifier_list'];
+        // this tag does not return compiled code
+        $compiler->has_code = false;
+        return true;
+    }
+
+}
+
+/**
+ * Smarty Internal Plugin Compile Setfilterclose Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for the {/setfilter} tag
+     *
+     * This tag does not generate compiled output. It resets variable filter.
+     *
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        $_attr = $this->getAttributes($compiler, $args);
+        // reset variable filter to previous state
+        if (count($compiler->variable_filter_stack)) {
+            $compiler->template->variable_filters = array_pop($compiler->variable_filter_stack);
+        } else {
+            $compiler->template->variable_filters = array();
+        }
+        // this tag does not return compiled code
+        $compiler->has_code = false;
+        return true;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compile_while.php b/lib/smarty/sysplugins/smarty_internal_compile_while.php
new file mode 100644
index 0000000..d7d986c
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compile_while.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile While
+ *
+ * Compiles the {while} tag
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile While Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for the {while} tag
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $this->openTag($compiler, 'while', $compiler->nocache);
+
+        if (!array_key_exists("if condition",$parameter)) {
+            $compiler->trigger_template_error("missing while condition", $compiler->lex->taglineno);
+        }
+
+        // maybe nocache because of nocache variables
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        if (is_array($parameter['if condition'])) {
+            if ($compiler->nocache) {
+                $_nocache = ',true';
+                // create nocache var to make it know for further compiling
+                if (is_array($parameter['if condition']['var'])) {
+                    $compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
+                } else {
+                    $compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
+                }
+            } else {
+                $_nocache = '';
+            }
+            if (is_array($parameter['if condition']['var'])) {
+                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
+                $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>";
+            } else {
+                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
+                $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . "){?>";
+            }
+            return $_output;
+        } else {
+            return "<?php while ({$parameter['if condition']}){?>";
+        }
+    }
+
+}
+
+/**
+ * Smarty Internal Plugin Compile Whileclose Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase {
+
+    /**
+     * Compiles code for the {/while} tag
+     *
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        // must endblock be nocache?
+        if ($compiler->nocache) {
+            $compiler->tag_nocache = true;
+        }
+        $compiler->nocache = $this->closeTag($compiler, array('while'));
+        return "<?php }?>";
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_compilebase.php b/lib/smarty/sysplugins/smarty_internal_compilebase.php
new file mode 100644
index 0000000..5fb56f3
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_compilebase.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * Smarty Internal Plugin CompileBase
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * This class does extend all internal compile plugins
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+abstract class Smarty_Internal_CompileBase {
+
+    /**
+     * Array of names of required attribute required by tag
+     *
+     * @var array
+     */
+    public $required_attributes = array();
+    /**
+     * Array of names of optional attribute required by tag
+     * use array('_any') if there is no restriction of attributes names
+     *
+     * @var array
+     */
+    public $optional_attributes = array();
+    /**
+     * Shorttag attribute order defined by its names
+     *
+     * @var array
+     */
+    public $shorttag_order = array();
+    /**
+     * Array of names of valid option flags
+     *
+     * @var array
+     */
+    public $option_flags = array('nocache');
+
+    /**
+     * This function checks if the attributes passed are valid
+     *
+     * The attributes passed for the tag to compile are checked against the list of required and
+     * optional attributes. Required attributes must be present. Optional attributes are check against
+     * the corresponding list. The keyword '_any' specifies that any attribute will be accepted
+     * as valid
+     *
+     * @param object $compiler   compiler object
+     * @param array  $attributes attributes applied to the tag
+     * @return array of mapped attributes for further processing
+     */
+    public function getAttributes($compiler, $attributes)
+    {
+        $_indexed_attr = array();
+        // loop over attributes
+        foreach ($attributes as $key => $mixed) {
+            // shorthand ?
+            if (!is_array($mixed)) {
+                // option flag ?
+                if (in_array(trim($mixed, '\'"'), $this->option_flags)) {
+                    $_indexed_attr[trim($mixed, '\'"')] = true;
+                    // shorthand attribute ?
+                } else if (isset($this->shorttag_order[$key])) {
+                    $_indexed_attr[$this->shorttag_order[$key]] = $mixed;
+                } else {
+                    // too many shorthands
+                    $compiler->trigger_template_error('too many shorthand attributes', $compiler->lex->taglineno);
+                }
+                // named attribute
+            } else {
+                $kv = each($mixed);
+                // option flag?
+                if (in_array($kv['key'], $this->option_flags)) {
+                    if (is_bool($kv['value'])) {
+                        $_indexed_attr[$kv['key']] = $kv['value'];
+                    } else if (is_string($kv['value']) && in_array(trim($kv['value'], '\'"'), array('true', 'false'))) {
+                        if (trim($kv['value']) == 'true') {
+                            $_indexed_attr[$kv['key']] = true;
+                        } else {
+                            $_indexed_attr[$kv['key']] = false;
+                        }
+                    } else if (is_numeric($kv['value']) && in_array($kv['value'], array(0, 1))) {
+                        if ($kv['value'] == 1) {
+                            $_indexed_attr[$kv['key']] = true;
+                        } else {
+                            $_indexed_attr[$kv['key']] = false;
+                        }
+                    } else {
+                        $compiler->trigger_template_error("illegal value of option flag \"{$kv['key']}\"", $compiler->lex->taglineno);
+                    }
+                    // must be named attribute
+                } else {
+                    reset($mixed);
+                    $_indexed_attr[key($mixed)] = $mixed[key($mixed)];
+                }
+            }
+        }
+        // check if all required attributes present
+        foreach ($this->required_attributes as $attr) {
+            if (!array_key_exists($attr, $_indexed_attr)) {
+                $compiler->trigger_template_error("missing \"" . $attr . "\" attribute", $compiler->lex->taglineno);
+            }
+        }
+        // check for unallowed attributes
+        if ($this->optional_attributes != array('_any')) {
+            $tmp_array = array_merge($this->required_attributes, $this->optional_attributes, $this->option_flags);
+            foreach ($_indexed_attr as $key => $dummy) {
+                if (!in_array($key, $tmp_array) && $key !== 0) {
+                    $compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", $compiler->lex->taglineno);
+                }
+            }
+        }
+        // default 'false' for all option flags not set
+        foreach ($this->option_flags as $flag) {
+            if (!isset($_indexed_attr[$flag])) {
+                $_indexed_attr[$flag] = false;
+            }
+        }
+
+        return $_indexed_attr;
+    }
+
+    /**
+     * Push opening tag name on stack
+     *
+     * Optionally additional data can be saved on stack
+     *
+     * @param object    $compiler   compiler object
+     * @param string    $openTag    the opening tag's name
+     * @param mixed     $data       optional data saved
+     */
+    public function openTag($compiler, $openTag, $data = null)
+    {
+        array_push($compiler->_tag_stack, array($openTag, $data));
+    }
+
+    /**
+     * Pop closing tag
+     *
+     * Raise an error if this stack-top doesn't match with expected opening tags
+     *
+     * @param object       $compiler    compiler object
+     * @param array|string $expectedTag the expected opening tag names
+     * @return mixed any type the opening tag's name or saved data
+     */
+    public function closeTag($compiler, $expectedTag)
+    {
+        if (count($compiler->_tag_stack) > 0) {
+            // get stacked info
+            list($_openTag, $_data) = array_pop($compiler->_tag_stack);
+            // open tag must match with the expected ones
+            if (in_array($_openTag, (array) $expectedTag)) {
+                if (is_null($_data)) {
+                    // return opening tag
+                    return $_openTag;
+                } else {
+                    // return restored data
+                    return $_data;
+                }
+            }
+            // wrong nesting of tags
+            $compiler->trigger_template_error("unclosed {" . $_openTag . "} tag");
+            return;
+        }
+        // wrong nesting of tags
+        $compiler->trigger_template_error("unexpected closing tag", $compiler->lex->taglineno);
+        return;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_config.php b/lib/smarty/sysplugins/smarty_internal_config.php
new file mode 100644
index 0000000..a309ec9
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_config.php
@@ -0,0 +1,303 @@
+<?php
+/**
+ * Smarty Internal Plugin Config
+ *
+ * @package Smarty
+ * @subpackage Config
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Config
+ *
+ * Main class for config variables
+ *
+ * @package Smarty
+ * @subpackage Config
+ *
+ * @property Smarty_Config_Source   $source
+ * @property Smarty_Config_Compiled $compiled
+ * @ignore
+ */
+class Smarty_Internal_Config {
+
+    /**
+     * Samrty instance
+     *
+     * @var Smarty object
+     */
+    public $smarty = null;
+    /**
+     * Object of config var storage
+     *
+     * @var object
+     */
+    public $data = null;
+    /**
+     * Config resource
+     * @var string
+     */
+    public $config_resource = null;
+    /**
+     * Compiled config file
+     *
+     * @var string
+     */
+    public $compiled_config = null;
+    /**
+     * filepath of compiled config file
+     *
+     * @var string
+     */
+    public $compiled_filepath = null;
+    /**
+     * Filemtime of compiled config Filemtime
+     *
+     * @var int
+     */
+    public $compiled_timestamp = null;
+    /**
+     * flag if compiled config file is invalid and must be (re)compiled
+     * @var bool
+     */
+    public $mustCompile = null;
+    /**
+     * Config file compiler object
+     *
+     * @var Smarty_Internal_Config_File_Compiler object
+     */
+    public $compiler_object = null;
+
+    /**
+     * Constructor of config file object
+     *
+     * @param string $config_resource config file resource name
+     * @param Smarty $smarty Smarty instance
+     * @param object $data object for config vars storage
+     */
+    public function __construct($config_resource, $smarty, $data = null)
+    {
+        $this->data = $data;
+        $this->smarty = $smarty;
+        $this->config_resource = $config_resource;
+    }
+
+    /**
+     * Returns the compiled  filepath
+     *
+     * @return string the compiled filepath
+     */
+    public function getCompiledFilepath()
+    {
+        return $this->compiled_filepath === null ?
+                ($this->compiled_filepath = $this->buildCompiledFilepath()) :
+                $this->compiled_filepath;
+    }
+
+    /**
+     * Get file path.
+     *
+     * @return string
+     */
+    public function buildCompiledFilepath()
+    {
+        $_compile_id = isset($this->smarty->compile_id) ? preg_replace('![^\w\|]+!', '_', $this->smarty->compile_id) : null;
+        $_flag = (int) $this->smarty->config_read_hidden + (int) $this->smarty->config_booleanize * 2
+                + (int) $this->smarty->config_overwrite * 4;
+        $_filepath = sha1($this->source->name . $_flag);
+        // if use_sub_dirs, break file into directories
+        if ($this->smarty->use_sub_dirs) {
+            $_filepath = substr($_filepath, 0, 2) . DS
+                    . substr($_filepath, 2, 2) . DS
+                    . substr($_filepath, 4, 2) . DS
+                    . $_filepath;
+        }
+        $_compile_dir_sep = $this->smarty->use_sub_dirs ? DS : '^';
+        if (isset($_compile_id)) {
+            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
+        }
+        $_compile_dir = $this->smarty->getCompileDir();
+        return $_compile_dir . $_filepath . '.' . basename($this->source->name) . '.config' . '.php';
+    }
+
+    /**
+     * Returns the timpestamp of the compiled file
+     *
+     * @return integer the file timestamp
+     */
+    public function getCompiledTimestamp()
+    {
+        return $this->compiled_timestamp === null
+            ? ($this->compiled_timestamp = (file_exists($this->getCompiledFilepath())) ? filemtime($this->getCompiledFilepath()) : false)
+            : $this->compiled_timestamp;
+    }
+
+    /**
+     * Returns if the current config file must be compiled
+     *
+     * It does compare the timestamps of config source and the compiled config and checks the force compile configuration
+     *
+     * @return boolean true if the file must be compiled
+     */
+    public function mustCompile()
+    {
+        return $this->mustCompile === null ?
+            $this->mustCompile = ($this->smarty->force_compile || $this->getCompiledTimestamp () === false || $this->smarty->compile_check && $this->getCompiledTimestamp () < $this->source->timestamp):
+            $this->mustCompile;
+    }
+
+    /**
+     * Returns the compiled config file
+     *
+     * It checks if the config file must be compiled or just read the compiled version
+     *
+     * @return string the compiled config file
+     */
+    public function getCompiledConfig()
+    {
+        if ($this->compiled_config === null) {
+            // see if template needs compiling.
+            if ($this->mustCompile()) {
+                $this->compileConfigSource();
+            } else {
+                $this->compiled_config = file_get_contents($this->getCompiledFilepath());
+            }
+        }
+        return $this->compiled_config;
+    }
+
+    /**
+     * Compiles the config files
+     *
+     * @throws Exception
+     */
+    public function compileConfigSource()
+    {
+        // compile template
+        if (!is_object($this->compiler_object)) {
+            // load compiler
+            $this->compiler_object = new Smarty_Internal_Config_File_Compiler($this->smarty);
+        }
+        // compile locking
+        if ($this->smarty->compile_locking) {
+            if ($saved_timestamp = $this->getCompiledTimestamp()) {
+                touch($this->getCompiledFilepath());
+            }
+        }
+        // call compiler
+        try {
+            $this->compiler_object->compileSource($this);
+        } catch (Exception $e) {
+            // restore old timestamp in case of error
+            if ($this->smarty->compile_locking && $saved_timestamp) {
+                touch($this->getCompiledFilepath(), $saved_timestamp);
+            }
+            throw $e;
+        }
+        // compiling succeded
+        // write compiled template
+        Smarty_Internal_Write_File::writeFile($this->getCompiledFilepath(), $this->getCompiledConfig(), $this->smarty);
+    }
+
+    /**
+     * load config variables
+     *
+     * @param mixed $sections array of section names, single section or null
+     * @param object $scope global,parent or local
+     */
+    public function loadConfigVars($sections = null, $scope = 'local')
+    {
+        if ($this->data instanceof Smarty_Internal_Template) {
+            $this->data->properties['file_dependency'][sha1($this->source->filepath)] = array($this->source->filepath, $this->source->timestamp, 'file');
+        }
+        if ($this->mustCompile()) {
+            $this->compileConfigSource();
+        }
+        // pointer to scope
+        if ($scope == 'local') {
+            $scope_ptr = $this->data;
+        } elseif ($scope == 'parent') {
+            if (isset($this->data->parent)) {
+                $scope_ptr = $this->data->parent;
+            } else {
+                $scope_ptr = $this->data;
+            }
+        } elseif ($scope == 'root' || $scope == 'global') {
+            $scope_ptr = $this->data;
+            while (isset($scope_ptr->parent)) {
+                $scope_ptr = $scope_ptr->parent;
+            }
+        }
+        $_config_vars = array();
+        include($this->getCompiledFilepath());
+        // copy global config vars
+        foreach ($_config_vars['vars'] as $variable => $value) {
+            if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
+                $scope_ptr->config_vars[$variable] = $value;
+            } else {
+                $scope_ptr->config_vars[$variable] = array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);
+            }
+        }
+        // scan sections
+        if (!empty($sections)) {
+            $sections = array_flip((array) $sections);
+            foreach ($_config_vars['sections'] as $this_section => $dummy) {
+                if (isset($sections[$this_section])) {
+                    foreach ($_config_vars['sections'][$this_section]['vars'] as $variable => $value) {
+                        if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
+                            $scope_ptr->config_vars[$variable] = $value;
+                        } else {
+                            $scope_ptr->config_vars[$variable] = array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * set Smarty property in template context
+     *
+     * @param string $property_name property name
+     * @param mixed  $value         value
+     * @throws SmartyException if $property_name is not valid
+     */
+    public function __set($property_name, $value)
+    {
+        switch ($property_name) {
+            case 'source':
+            case 'compiled':
+                $this->$property_name = $value;
+                return;
+        }
+
+        throw new SmartyException("invalid config property '$property_name'.");
+    }
+
+    /**
+     * get Smarty property in template context
+     *
+     * @param string $property_name property name
+     * @throws SmartyException if $property_name is not valid
+     */
+    public function __get($property_name)
+    {
+        switch ($property_name) {
+            case 'source':
+                if (empty($this->config_resource)) {
+                    throw new SmartyException("Unable to parse resource name \"{$this->config_resource}\"");
+                }
+                $this->source = Smarty_Resource::config($this);
+                return $this->source;
+
+            case 'compiled':
+                $this->compiled = $this->source->getCompiled($this);
+                return $this->compiled;
+        }
+
+        throw new SmartyException("config attribute '$property_name' does not exist.");
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php b/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php
new file mode 100644
index 0000000..b16a694
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Smarty Internal Plugin Config File Compiler
+ *
+ * This is the config file compiler class. It calls the lexer and parser to
+ * perform the compiling.
+ *
+ * @package Smarty
+ * @subpackage Config
+ * @author Uwe Tews
+ */
+
+/**
+ * Main config file compiler class
+ *
+ * @package Smarty
+ * @subpackage Config
+ */
+class Smarty_Internal_Config_File_Compiler {
+
+    /**
+     * Lexer object
+     *
+     * @var object
+     */
+    public $lex;
+
+    /**
+     * Parser object
+     *
+     * @var object
+     */
+    public $parser;
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty object
+     */
+    public $smarty;
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty_Internal_Config object
+     */
+    public $config;
+
+    /**
+     * Compiled config data sections and variables
+     *
+     * @var array
+     */
+    public $config_data = array();
+
+    /**
+     * Initialize compiler
+     *
+     * @param Smarty $smarty base instance
+     */
+    public function __construct($smarty)
+    {
+        $this->smarty = $smarty;
+        $this->config_data['sections'] = array();
+        $this->config_data['vars'] = array();
+    }
+
+    /**
+     * Method to compile a Smarty template.
+     *
+     * @param  Smarty_Internal_Config $config config object
+     * @return bool true if compiling succeeded, false if it failed
+     */
+    public function compileSource(Smarty_Internal_Config $config)
+    {
+        /* here is where the compiling takes place. Smarty
+          tags in the templates are replaces with PHP code,
+          then written to compiled files. */
+        $this->config = $config;
+        // get config file source
+        $_content = $config->source->content . "\n";
+        // on empty template just return
+        if ($_content == '') {
+            return true;
+        }
+        // init the lexer/parser to compile the config file
+        $lex = new Smarty_Internal_Configfilelexer($_content, $this->smarty);
+        $parser = new Smarty_Internal_Configfileparser($lex, $this);
+        if ($this->smarty->_parserdebug) $parser->PrintTrace();
+        // get tokens from lexer and parse them
+        while ($lex->yylex()) {
+            if ($this->smarty->_parserdebug) echo "<br>Parsing  {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n";
+            $parser->doParse($lex->token, $lex->value);
+        }
+        // finish parsing process
+        $parser->doParse(0, 0);
+        $config->compiled_config = '<?php $_config_vars = ' . var_export($this->config_data, true) . '; ?>';
+    }
+
+    /**
+     * display compiler error messages without dying
+     *
+     * If parameter $args is empty it is a parser detected syntax error.
+     * In this case the parser is called to obtain information about exspected tokens.
+     *
+     * If parameter $args contains a string this is used as error message
+     *
+     * @param string $args individual error message or null
+     */
+    public function trigger_config_file_error($args = null)
+    {
+        $this->lex = Smarty_Internal_Configfilelexer::instance();
+        $this->parser = Smarty_Internal_Configfileparser::instance();
+        // get template source line which has error
+        $line = $this->lex->line;
+        if (isset($args)) {
+            // $line--;
+        }
+        $match = preg_split("/\n/", $this->lex->data);
+        $error_text = "Syntax error in config file '{$this->config->source->filepath}' on line {$line} '{$match[$line-1]}' ";
+        if (isset($args)) {
+            // individual error message
+            $error_text .= $args;
+        } else {
+            // exspected token from parser
+            foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
+                $exp_token = $this->parser->yyTokenName[$token];
+                if (isset($this->lex->smarty_token_names[$exp_token])) {
+                    // token type from lexer
+                    $expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"';
+                } else {
+                    // otherwise internal token name
+                    $expect[] = $this->parser->yyTokenName[$token];
+                }
+            }
+            // output parser error message
+            $error_text .= ' - Unexpected "' . $this->lex->value . '", expected one of: ' . implode(' , ', $expect);
+        }
+        throw new SmartyCompilerException($error_text);
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_configfilelexer.php b/lib/smarty/sysplugins/smarty_internal_configfilelexer.php
new file mode 100644
index 0000000..326d8f9
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_configfilelexer.php
@@ -0,0 +1,612 @@
+<?php
+/**
+* Smarty Internal Plugin Configfilelexer
+*
+* This is the lexer to break the config file source into tokens
+* @package Smarty
+* @subpackage Config
+* @author Uwe Tews
+*/
+/**
+* Smarty Internal Plugin Configfilelexer
+*/
+class Smarty_Internal_Configfilelexer
+{
+
+    public $data;
+    public $counter;
+    public $token;
+    public $value;
+    public $node;
+    public $line;
+    private $state = 1;
+    public $smarty_token_names = array (		// Text for parser error messages
+   				);
+
+
+    function __construct($data, $smarty)
+    {
+        // set instance object
+        self::instance($this);
+        $this->data = $data . "\n"; //now all lines are \n-terminated
+        $this->counter = 0;
+        $this->line = 1;
+        $this->smarty = $smarty;
+        $this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
+    }
+    public static function &instance($new_instance = null)
+    {
+        static $instance = null;
+        if (isset($new_instance) && is_object($new_instance))
+            $instance = $new_instance;
+        return $instance;
+    }
+
+
+
+    private $_yy_state = 1;
+    private $_yy_stack = array();
+
+    function yylex()
+    {
+        return $this->{'yylex' . $this->_yy_state}();
+    }
+
+    function yypushstate($state)
+    {
+        array_push($this->_yy_stack, $this->_yy_state);
+        $this->_yy_state = $state;
+    }
+
+    function yypopstate()
+    {
+        $this->_yy_state = array_pop($this->_yy_stack);
+    }
+
+    function yybegin($state)
+    {
+        $this->_yy_state = $state;
+    }
+
+
+
+
+    function yylex1()
+    {
+        $tokenMap = array (
+              1 => 0,
+              2 => 0,
+              3 => 0,
+              4 => 0,
+              5 => 0,
+              6 => 0,
+              7 => 0,
+              8 => 0,
+            );
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/iS";
+
+        do {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state START');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const START = 1;
+    function yy_r1_1($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
+    $this->yypushstate(self::COMMENT);
+    }
+    function yy_r1_2($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
+    $this->yypushstate(self::SECTION);
+    }
+    function yy_r1_3($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
+    }
+    function yy_r1_4($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
+    $this->yypushstate(self::VALUE);
+    }
+    function yy_r1_5($yy_subpatterns)
+    {
+
+    return false;
+    }
+    function yy_r1_6($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+    }
+    function yy_r1_7($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_ID;
+    }
+    function yy_r1_8($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
+    }
+
+
+
+    function yylex2()
+    {
+        $tokenMap = array (
+              1 => 0,
+              2 => 0,
+              3 => 0,
+              4 => 0,
+              5 => 0,
+              6 => 0,
+              7 => 0,
+              8 => 0,
+              9 => 0,
+            );
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
+
+        do {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state VALUE');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r2_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const VALUE = 2;
+    function yy_r2_1($yy_subpatterns)
+    {
+
+    return false;
+    }
+    function yy_r2_2($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
+    $this->yypopstate();
+    }
+    function yy_r2_3($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_INT;
+    $this->yypopstate();
+    }
+    function yy_r2_4($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
+    $this->yypushstate(self::TRIPPLE);
+    }
+    function yy_r2_5($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
+    $this->yypopstate();
+    }
+    function yy_r2_6($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
+    $this->yypopstate();
+    }
+    function yy_r2_7($yy_subpatterns)
+    {
+
+    if (!$this->smarty->config_booleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no")) ) {
+        $this->yypopstate();
+        $this->yypushstate(self::NAKED_STRING_VALUE);
+        return true; //reprocess in new state
+    } else {
+        $this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
+        $this->yypopstate();
+    }
+    }
+    function yy_r2_8($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->yypopstate();
+    }
+    function yy_r2_9($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->value = "";
+    $this->yypopstate();
+    }
+
+
+
+    function yylex3()
+    {
+        $tokenMap = array (
+              1 => 0,
+            );
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/\G([^\n]+?(?=[ \t\r]*\n))/iS";
+
+        do {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state NAKED_STRING_VALUE');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r3_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const NAKED_STRING_VALUE = 3;
+    function yy_r3_1($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->yypopstate();
+    }
+
+
+
+    function yylex4()
+    {
+        $tokenMap = array (
+              1 => 0,
+              2 => 0,
+              3 => 0,
+            );
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
+
+        do {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state COMMENT');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r4_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const COMMENT = 4;
+    function yy_r4_1($yy_subpatterns)
+    {
+
+    return false;
+    }
+    function yy_r4_2($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    }
+    function yy_r4_3($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+    $this->yypopstate();
+    }
+
+
+
+    function yylex5()
+    {
+        $tokenMap = array (
+              1 => 0,
+              2 => 0,
+            );
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/iS";
+
+        do {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state SECTION');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r5_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const SECTION = 5;
+    function yy_r5_1($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
+    }
+    function yy_r5_2($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
+    $this->yypopstate();
+    }
+
+
+    function yylex6()
+    {
+        $tokenMap = array (
+              1 => 0,
+              2 => 0,
+            );
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/iS";
+
+        do {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state TRIPPLE');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r6_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const TRIPPLE = 6;
+    function yy_r6_1($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
+    $this->yypopstate();
+    $this->yypushstate(self::START);
+    }
+    function yy_r6_2($yy_subpatterns)
+    {
+
+  $to = strlen($this->data);
+  preg_match("/\"\"\"[ \t\r]*[\n#;]/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+  if (isset($match[0][1])) {
+    $to = $match[0][1];
+  }
+  $this->value = substr($this->data,$this->counter,$to-$this->counter);
+  $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
+    }
+
+
+}
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_configfileparser.php b/lib/smarty/sysplugins/smarty_internal_configfileparser.php
new file mode 100644
index 0000000..784bc68
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_configfileparser.php
@@ -0,0 +1,921 @@
+<?php
+/**
+* Smarty Internal Plugin Configfileparser
+*
+* This is the config file parser.
+* It is generated from the internal.configfileparser.y file
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+
+class TPC_yyToken implements ArrayAccess
+{
+    public $string = '';
+    public $metadata = array();
+
+    function __construct($s, $m = array())
+    {
+        if ($s instanceof TPC_yyToken) {
+            $this->string = $s->string;
+            $this->metadata = $s->metadata;
+        } else {
+            $this->string = (string) $s;
+            if ($m instanceof TPC_yyToken) {
+                $this->metadata = $m->metadata;
+            } elseif (is_array($m)) {
+                $this->metadata = $m;
+            }
+        }
+    }
+
+    function __toString()
+    {
+        return $this->_string;
+    }
+
+    function offsetExists($offset)
+    {
+        return isset($this->metadata[$offset]);
+    }
+
+    function offsetGet($offset)
+    {
+        return $this->metadata[$offset];
+    }
+
+    function offsetSet($offset, $value)
+    {
+        if ($offset === null) {
+            if (isset($value[0])) {
+                $x = ($value instanceof TPC_yyToken) ?
+                    $value->metadata : $value;
+                $this->metadata = array_merge($this->metadata, $x);
+                return;
+            }
+            $offset = count($this->metadata);
+        }
+        if ($value === null) {
+            return;
+        }
+        if ($value instanceof TPC_yyToken) {
+            if ($value->metadata) {
+                $this->metadata[$offset] = $value->metadata;
+            }
+        } elseif ($value) {
+            $this->metadata[$offset] = $value;
+        }
+    }
+
+    function offsetUnset($offset)
+    {
+        unset($this->metadata[$offset]);
+    }
+}
+
+class TPC_yyStackEntry
+{
+    public $stateno;       /* The state-number */
+    public $major;         /* The major token value.  This is the code
+                     ** number for the token at this stack level */
+    public $minor; /* The user-supplied minor token value.  This
+                     ** is the value of the token  */
+};
+
+
+#line 12 "smarty_internal_configfileparser.y"
+class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser.php"
+{
+#line 14 "smarty_internal_configfileparser.y"
+
+    // states whether the parse was successful or not
+    public $successful = true;
+    public $retvalue = 0;
+    private $lex;
+    private $internalError = false;
+
+    function __construct($lex, $compiler) {
+        // set instance object
+        self::instance($this);
+        $this->lex = $lex;
+        $this->smarty = $compiler->smarty;
+        $this->compiler = $compiler;
+    }
+    public static function &instance($new_instance = null)
+    {
+        static $instance = null;
+        if (isset($new_instance) && is_object($new_instance))
+            $instance = $new_instance;
+        return $instance;
+    }
+
+    private function parse_bool($str) {
+        if (in_array(strtolower($str) ,array('on','yes','true'))) {
+            $res = true;
+        } else {
+            $res = false;
+        }
+        return $res;
+    }
+
+    private static $escapes_single = Array('\\' => '\\',
+                                          '\'' => '\'');
+    private static function parse_single_quoted_string($qstr) {
+        $escaped_string = substr($qstr, 1, strlen($qstr)-2); //remove outer quotes
+
+        $ss = preg_split('/(\\\\.)/', $escaped_string, -1, PREG_SPLIT_DELIM_CAPTURE);
+
+        $str = "";
+        foreach ($ss as $s) {
+            if (strlen($s) === 2 && $s[0] === '\\') {
+                if (isset(self::$escapes_single[$s[1]])) {
+                    $s = self::$escapes_single[$s[1]];
+                }
+             }
+
+             $str .= $s;
+        }
+
+        return $str;
+    }
+
+    private static function parse_double_quoted_string($qstr) {
+        $inner_str = substr($qstr, 1, strlen($qstr)-2);
+        return stripcslashes($inner_str);
+    }
+
+    private static function parse_tripple_double_quoted_string($qstr) {
+        return stripcslashes($qstr);
+    }
+
+    private function set_var(Array $var, Array &$target_array) {
+        $key = $var["key"];
+        $value = $var["value"];
+
+        if ($this->smarty->config_overwrite || !isset($target_array['vars'][$key])) {
+            $target_array['vars'][$key] = $value;
+        } else {
+            settype($target_array['vars'][$key], 'array');
+            $target_array['vars'][$key][] = $value;
+        }
+    }
+
+    private function add_global_vars(Array $vars) {
+        if (!isset($this->compiler->config_data['vars'])) {
+      $this->compiler->config_data['vars'] = Array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data);
+        }
+    }
+
+    private function add_section_vars($section_name, Array $vars) {
+        if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
+            $this->compiler->config_data['sections'][$section_name]['vars'] = Array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
+        }
+    }
+#line 173 "smarty_internal_configfileparser.php"
+
+    const TPC_OPENB                          =  1;
+    const TPC_SECTION                        =  2;
+    const TPC_CLOSEB                         =  3;
+    const TPC_DOT                            =  4;
+    const TPC_ID                             =  5;
+    const TPC_EQUAL                          =  6;
+    const TPC_FLOAT                          =  7;
+    const TPC_INT                            =  8;
+    const TPC_BOOL                           =  9;
+    const TPC_SINGLE_QUOTED_STRING           = 10;
+    const TPC_DOUBLE_QUOTED_STRING           = 11;
+    const TPC_TRIPPLE_QUOTES                 = 12;
+    const TPC_TRIPPLE_TEXT                   = 13;
+    const TPC_TRIPPLE_QUOTES_END             = 14;
+    const TPC_NAKED_STRING                   = 15;
+    const TPC_OTHER                          = 16;
+    const TPC_NEWLINE                        = 17;
+    const TPC_COMMENTSTART                   = 18;
+    const YY_NO_ACTION = 60;
+    const YY_ACCEPT_ACTION = 59;
+    const YY_ERROR_ACTION = 58;
+
+    const YY_SZ_ACTTAB = 38;
+static public $yy_action = array(
+ /*     0 */    29,   30,   34,   33,   24,   13,   19,   25,   35,   21,
+ /*    10 */    59,    8,    3,    1,   20,   12,   14,   31,   20,   12,
+ /*    20 */    15,   17,   23,   18,   27,   26,    4,    5,    6,   32,
+ /*    30 */     2,   11,   28,   22,   16,    9,    7,   10,
+    );
+    static public $yy_lookahead = array(
+ /*     0 */     7,    8,    9,   10,   11,   12,    5,   27,   15,   16,
+ /*    10 */    20,   21,   23,   23,   17,   18,   13,   14,   17,   18,
+ /*    20 */    15,    2,   17,    4,   25,   26,    6,    3,    3,   14,
+ /*    30 */    23,    1,   24,   17,    2,   25,   22,   25,
+);
+    const YY_SHIFT_USE_DFLT = -8;
+    const YY_SHIFT_MAX = 19;
+    static public $yy_shift_ofst = array(
+ /*     0 */    -8,    1,    1,    1,   -7,   -3,   -3,   30,   -8,   -8,
+ /*    10 */    -8,   19,    5,    3,   15,   16,   24,   25,   32,   20,
+);
+    const YY_REDUCE_USE_DFLT = -21;
+    const YY_REDUCE_MAX = 10;
+    static public $yy_reduce_ofst = array(
+ /*     0 */   -10,   -1,   -1,   -1,  -20,   10,   12,    8,   14,    7,
+ /*    10 */   -11,
+);
+    static public $yyExpectedTokens = array(
+        /* 0 */ array(),
+        /* 1 */ array(5, 17, 18, ),
+        /* 2 */ array(5, 17, 18, ),
+        /* 3 */ array(5, 17, 18, ),
+        /* 4 */ array(7, 8, 9, 10, 11, 12, 15, 16, ),
+        /* 5 */ array(17, 18, ),
+        /* 6 */ array(17, 18, ),
+        /* 7 */ array(1, ),
+        /* 8 */ array(),
+        /* 9 */ array(),
+        /* 10 */ array(),
+        /* 11 */ array(2, 4, ),
+        /* 12 */ array(15, 17, ),
+        /* 13 */ array(13, 14, ),
+        /* 14 */ array(14, ),
+        /* 15 */ array(17, ),
+        /* 16 */ array(3, ),
+        /* 17 */ array(3, ),
+        /* 18 */ array(2, ),
+        /* 19 */ array(6, ),
+        /* 20 */ array(),
+        /* 21 */ array(),
+        /* 22 */ array(),
+        /* 23 */ array(),
+        /* 24 */ array(),
+        /* 25 */ array(),
+        /* 26 */ array(),
+        /* 27 */ array(),
+        /* 28 */ array(),
+        /* 29 */ array(),
+        /* 30 */ array(),
+        /* 31 */ array(),
+        /* 32 */ array(),
+        /* 33 */ array(),
+        /* 34 */ array(),
+        /* 35 */ array(),
+);
+    static public $yy_default = array(
+ /*     0 */    44,   37,   41,   40,   58,   58,   58,   36,   39,   44,
+ /*    10 */    44,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+ /*    20 */    55,   54,   57,   56,   50,   45,   43,   42,   38,   46,
+ /*    30 */    47,   52,   51,   49,   48,   53,
+);
+    const YYNOCODE = 29;
+    const YYSTACKDEPTH = 100;
+    const YYNSTATE = 36;
+    const YYNRULE = 22;
+    const YYERRORSYMBOL = 19;
+    const YYERRSYMDT = 'yy0';
+    const YYFALLBACK = 0;
+    static public $yyFallback = array(
+    );
+    static function Trace($TraceFILE, $zTracePrompt)
+    {
+        if (!$TraceFILE) {
+            $zTracePrompt = 0;
+        } elseif (!$zTracePrompt) {
+            $TraceFILE = 0;
+        }
+        self::$yyTraceFILE = $TraceFILE;
+        self::$yyTracePrompt = $zTracePrompt;
+    }
+
+    static function PrintTrace()
+    {
+        self::$yyTraceFILE = fopen('php://output', 'w');
+        self::$yyTracePrompt = '<br>';
+    }
+
+    static public $yyTraceFILE;
+    static public $yyTracePrompt;
+    public $yyidx;                    /* Index of top element in stack */
+    public $yyerrcnt;                 /* Shifts left before out of the error */
+    public $yystack = array();  /* The parser's stack */
+
+    public $yyTokenName = array(
+  '$',             'OPENB',         'SECTION',       'CLOSEB',
+  'DOT',           'ID',            'EQUAL',         'FLOAT',
+  'INT',           'BOOL',          'SINGLE_QUOTED_STRING',  'DOUBLE_QUOTED_STRING',
+  'TRIPPLE_QUOTES',  'TRIPPLE_TEXT',  'TRIPPLE_QUOTES_END',  'NAKED_STRING',
+  'OTHER',         'NEWLINE',       'COMMENTSTART',  'error',
+  'start',         'global_vars',   'sections',      'var_list',
+  'section',       'newline',       'var',           'value',
+    );
+
+    static public $yyRuleName = array(
+ /*   0 */ "start ::= global_vars sections",
+ /*   1 */ "global_vars ::= var_list",
+ /*   2 */ "sections ::= sections section",
+ /*   3 */ "sections ::=",
+ /*   4 */ "section ::= OPENB SECTION CLOSEB newline var_list",
+ /*   5 */ "section ::= OPENB DOT SECTION CLOSEB newline var_list",
+ /*   6 */ "var_list ::= var_list newline",
+ /*   7 */ "var_list ::= var_list var",
+ /*   8 */ "var_list ::=",
+ /*   9 */ "var ::= ID EQUAL value",
+ /*  10 */ "value ::= FLOAT",
+ /*  11 */ "value ::= INT",
+ /*  12 */ "value ::= BOOL",
+ /*  13 */ "value ::= SINGLE_QUOTED_STRING",
+ /*  14 */ "value ::= DOUBLE_QUOTED_STRING",
+ /*  15 */ "value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END",
+ /*  16 */ "value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END",
+ /*  17 */ "value ::= NAKED_STRING",
+ /*  18 */ "value ::= OTHER",
+ /*  19 */ "newline ::= NEWLINE",
+ /*  20 */ "newline ::= COMMENTSTART NEWLINE",
+ /*  21 */ "newline ::= COMMENTSTART NAKED_STRING NEWLINE",
+    );
+
+    function tokenName($tokenType)
+    {
+        if ($tokenType === 0) {
+            return 'End of Input';
+        }
+        if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
+            return $this->yyTokenName[$tokenType];
+        } else {
+            return "Unknown";
+        }
+    }
+
+    static function yy_destructor($yymajor, $yypminor)
+    {
+        switch ($yymajor) {
+            default:  break;   /* If no destructor action specified: do nothing */
+        }
+    }
+
+    function yy_pop_parser_stack()
+    {
+        if (!count($this->yystack)) {
+            return;
+        }
+        $yytos = array_pop($this->yystack);
+        if (self::$yyTraceFILE && $this->yyidx >= 0) {
+            fwrite(self::$yyTraceFILE,
+                self::$yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
+                    "\n");
+        }
+        $yymajor = $yytos->major;
+        self::yy_destructor($yymajor, $yytos->minor);
+        $this->yyidx--;
+        return $yymajor;
+    }
+
+    function __destruct()
+    {
+        while ($this->yystack !== Array()) {
+            $this->yy_pop_parser_stack();
+        }
+        if (is_resource(self::$yyTraceFILE)) {
+            fclose(self::$yyTraceFILE);
+        }
+    }
+
+    function yy_get_expected_tokens($token)
+    {
+        $state = $this->yystack[$this->yyidx]->stateno;
+        $expected = self::$yyExpectedTokens[$state];
+        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
+            return $expected;
+        }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ == 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return array_unique($expected);
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno]['lhs']);
+                    if (isset(self::$yyExpectedTokens[$nextstate])) {
+		        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
+                            if (in_array($token,
+                                  self::$yyExpectedTokens[$nextstate], true)) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return array_unique($expected);
+                        }
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = new TPC_yyStackEntry;
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return array_unique($expected);
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return $expected;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+	$this->yyidx = $yyidx;
+	$this->yystack = $stack;
+        return array_unique($expected);
+    }
+
+    function yy_is_expected_token($token)
+    {
+        if ($token === 0) {
+            return true; // 0 is not part of this
+        }
+        $state = $this->yystack[$this->yyidx]->stateno;
+        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
+            return true;
+        }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ == 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return true;
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno]['lhs']);
+                    if (isset(self::$yyExpectedTokens[$nextstate]) &&
+                          in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        return true;
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = new TPC_yyStackEntry;
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        if (!$token) {
+                            // end of input: this is valid
+                            return true;
+                        }
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return false;
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return true;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
+        return true;
+    }
+
+   function yy_find_shift_action($iLookAhead)
+    {
+        $stateno = $this->yystack[$this->yyidx]->stateno;
+
+        /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
+        if (!isset(self::$yy_shift_ofst[$stateno])) {
+            // no shift actions
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_shift_ofst[$stateno];
+        if ($i === self::YY_SHIFT_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead == self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
+                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
+                if (self::$yyTraceFILE) {
+                    fwrite(self::$yyTraceFILE, self::$yyTracePrompt . "FALLBACK " .
+                        $this->yyTokenName[$iLookAhead] . " => " .
+                        $this->yyTokenName[$iFallback] . "\n");
+                }
+                return $this->yy_find_shift_action($iFallback);
+            }
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    function yy_find_reduce_action($stateno, $iLookAhead)
+    {
+        /* $stateno = $this->yystack[$this->yyidx]->stateno; */
+
+        if (!isset(self::$yy_reduce_ofst[$stateno])) {
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_reduce_ofst[$stateno];
+        if ($i == self::YY_REDUCE_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead == self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    function yy_shift($yyNewState, $yyMajor, $yypMinor)
+    {
+        $this->yyidx++;
+        if ($this->yyidx >= self::YYSTACKDEPTH) {
+            $this->yyidx--;
+            if (self::$yyTraceFILE) {
+                fprintf(self::$yyTraceFILE, "%sStack Overflow!\n", self::$yyTracePrompt);
+            }
+            while ($this->yyidx >= 0) {
+                $this->yy_pop_parser_stack();
+            }
+#line 125 "smarty_internal_configfileparser.y"
+
+    $this->internalError = true;
+    $this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
+#line 593 "smarty_internal_configfileparser.php"
+            return;
+        }
+        $yytos = new TPC_yyStackEntry;
+        $yytos->stateno = $yyNewState;
+        $yytos->major = $yyMajor;
+        $yytos->minor = $yypMinor;
+        array_push($this->yystack, $yytos);
+        if (self::$yyTraceFILE && $this->yyidx > 0) {
+            fprintf(self::$yyTraceFILE, "%sShift %d\n", self::$yyTracePrompt,
+                $yyNewState);
+            fprintf(self::$yyTraceFILE, "%sStack:", self::$yyTracePrompt);
+            for($i = 1; $i <= $this->yyidx; $i++) {
+                fprintf(self::$yyTraceFILE, " %s",
+                    $this->yyTokenName[$this->yystack[$i]->major]);
+            }
+            fwrite(self::$yyTraceFILE,"\n");
+        }
+    }
+
+    static public $yyRuleInfo = array(
+  array( 'lhs' => 20, 'rhs' => 2 ),
+  array( 'lhs' => 21, 'rhs' => 1 ),
+  array( 'lhs' => 22, 'rhs' => 2 ),
+  array( 'lhs' => 22, 'rhs' => 0 ),
+  array( 'lhs' => 24, 'rhs' => 5 ),
+  array( 'lhs' => 24, 'rhs' => 6 ),
+  array( 'lhs' => 23, 'rhs' => 2 ),
+  array( 'lhs' => 23, 'rhs' => 2 ),
+  array( 'lhs' => 23, 'rhs' => 0 ),
+  array( 'lhs' => 26, 'rhs' => 3 ),
+  array( 'lhs' => 27, 'rhs' => 1 ),
+  array( 'lhs' => 27, 'rhs' => 1 ),
+  array( 'lhs' => 27, 'rhs' => 1 ),
+  array( 'lhs' => 27, 'rhs' => 1 ),
+  array( 'lhs' => 27, 'rhs' => 1 ),
+  array( 'lhs' => 27, 'rhs' => 3 ),
+  array( 'lhs' => 27, 'rhs' => 2 ),
+  array( 'lhs' => 27, 'rhs' => 1 ),
+  array( 'lhs' => 27, 'rhs' => 1 ),
+  array( 'lhs' => 25, 'rhs' => 1 ),
+  array( 'lhs' => 25, 'rhs' => 2 ),
+  array( 'lhs' => 25, 'rhs' => 3 ),
+    );
+
+    static public $yyReduceMap = array(
+        0 => 0,
+        2 => 0,
+        3 => 0,
+        19 => 0,
+        20 => 0,
+        21 => 0,
+        1 => 1,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        10 => 10,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+        14 => 14,
+        15 => 15,
+        16 => 16,
+        17 => 17,
+        18 => 17,
+    );
+#line 131 "smarty_internal_configfileparser.y"
+    function yy_r0(){
+    $this->_retvalue = null;
+    }
+#line 666 "smarty_internal_configfileparser.php"
+#line 136 "smarty_internal_configfileparser.y"
+    function yy_r1(){
+    $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = null;
+    }
+#line 671 "smarty_internal_configfileparser.php"
+#line 149 "smarty_internal_configfileparser.y"
+    function yy_r4(){
+    $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
+    $this->_retvalue = null;
+    }
+#line 677 "smarty_internal_configfileparser.php"
+#line 154 "smarty_internal_configfileparser.y"
+    function yy_r5(){
+    if ($this->smarty->config_read_hidden) {
+        $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
+    }
+    $this->_retvalue = null;
+    }
+#line 685 "smarty_internal_configfileparser.php"
+#line 162 "smarty_internal_configfileparser.y"
+    function yy_r6(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    }
+#line 690 "smarty_internal_configfileparser.php"
+#line 166 "smarty_internal_configfileparser.y"
+    function yy_r7(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, Array($this->yystack[$this->yyidx + 0]->minor));
+    }
+#line 695 "smarty_internal_configfileparser.php"
+#line 170 "smarty_internal_configfileparser.y"
+    function yy_r8(){
+    $this->_retvalue = Array();
+    }
+#line 700 "smarty_internal_configfileparser.php"
+#line 176 "smarty_internal_configfileparser.y"
+    function yy_r9(){
+    $this->_retvalue = Array("key" => $this->yystack[$this->yyidx + -2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor);
+    }
+#line 705 "smarty_internal_configfileparser.php"
+#line 181 "smarty_internal_configfileparser.y"
+    function yy_r10(){
+    $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 710 "smarty_internal_configfileparser.php"
+#line 185 "smarty_internal_configfileparser.y"
+    function yy_r11(){
+    $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 715 "smarty_internal_configfileparser.php"
+#line 189 "smarty_internal_configfileparser.y"
+    function yy_r12(){
+    $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
+    }
+#line 720 "smarty_internal_configfileparser.php"
+#line 193 "smarty_internal_configfileparser.y"
+    function yy_r13(){
+    $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
+    }
+#line 725 "smarty_internal_configfileparser.php"
+#line 197 "smarty_internal_configfileparser.y"
+    function yy_r14(){
+    $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
+    }
+#line 730 "smarty_internal_configfileparser.php"
+#line 201 "smarty_internal_configfileparser.y"
+    function yy_r15(){
+    $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor);
+    }
+#line 735 "smarty_internal_configfileparser.php"
+#line 205 "smarty_internal_configfileparser.y"
+    function yy_r16(){
+    $this->_retvalue = '';
+    }
+#line 740 "smarty_internal_configfileparser.php"
+#line 209 "smarty_internal_configfileparser.y"
+    function yy_r17(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 745 "smarty_internal_configfileparser.php"
+
+    private $_retvalue;
+
+    function yy_reduce($yyruleno)
+    {
+        $yymsp = $this->yystack[$this->yyidx];
+        if (self::$yyTraceFILE && $yyruleno >= 0
+              && $yyruleno < count(self::$yyRuleName)) {
+            fprintf(self::$yyTraceFILE, "%sReduce (%d) [%s].\n",
+                self::$yyTracePrompt, $yyruleno,
+                self::$yyRuleName[$yyruleno]);
+        }
+
+        $this->_retvalue = $yy_lefthand_side = null;
+        if (array_key_exists($yyruleno, self::$yyReduceMap)) {
+            // call the action
+            $this->_retvalue = null;
+            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
+            $yy_lefthand_side = $this->_retvalue;
+        }
+        $yygoto = self::$yyRuleInfo[$yyruleno]['lhs'];
+        $yysize = self::$yyRuleInfo[$yyruleno]['rhs'];
+        $this->yyidx -= $yysize;
+        for($i = $yysize; $i; $i--) {
+            // pop all of the right-hand side parameters
+            array_pop($this->yystack);
+        }
+        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
+        if ($yyact < self::YYNSTATE) {
+            if (!self::$yyTraceFILE && $yysize) {
+                $this->yyidx++;
+                $x = new TPC_yyStackEntry;
+                $x->stateno = $yyact;
+                $x->major = $yygoto;
+                $x->minor = $yy_lefthand_side;
+                $this->yystack[$this->yyidx] = $x;
+            } else {
+                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
+            }
+        } elseif ($yyact == self::YYNSTATE + self::YYNRULE + 1) {
+            $this->yy_accept();
+        }
+    }
+
+    function yy_parse_failed()
+    {
+        if (self::$yyTraceFILE) {
+            fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt);
+        }
+        while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
+    }
+
+    function yy_syntax_error($yymajor, $TOKEN)
+    {
+#line 118 "smarty_internal_configfileparser.y"
+
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_config_file_error();
+#line 808 "smarty_internal_configfileparser.php"
+    }
+
+    function yy_accept()
+    {
+        if (self::$yyTraceFILE) {
+            fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt);
+        }
+        while ($this->yyidx >= 0) {
+            $stack = $this->yy_pop_parser_stack();
+        }
+#line 110 "smarty_internal_configfileparser.y"
+
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
+    //echo $this->retvalue."\n\n";
+#line 826 "smarty_internal_configfileparser.php"
+    }
+
+    function doParse($yymajor, $yytokenvalue)
+    {
+        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
+
+        if ($this->yyidx === null || $this->yyidx < 0) {
+            $this->yyidx = 0;
+            $this->yyerrcnt = -1;
+            $x = new TPC_yyStackEntry;
+            $x->stateno = 0;
+            $x->major = 0;
+            $this->yystack = array();
+            array_push($this->yystack, $x);
+        }
+        $yyendofinput = ($yymajor==0);
+
+        if (self::$yyTraceFILE) {
+            fprintf(self::$yyTraceFILE, "%sInput %s\n",
+                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+        }
+
+        do {
+            $yyact = $this->yy_find_shift_action($yymajor);
+            if ($yymajor < self::YYERRORSYMBOL &&
+                  !$this->yy_is_expected_token($yymajor)) {
+                // force a syntax error
+                $yyact = self::YY_ERROR_ACTION;
+            }
+            if ($yyact < self::YYNSTATE) {
+                $this->yy_shift($yyact, $yymajor, $yytokenvalue);
+                $this->yyerrcnt--;
+                if ($yyendofinput && $this->yyidx >= 0) {
+                    $yymajor = 0;
+                } else {
+                    $yymajor = self::YYNOCODE;
+                }
+            } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
+                $this->yy_reduce($yyact - self::YYNSTATE);
+            } elseif ($yyact == self::YY_ERROR_ACTION) {
+                if (self::$yyTraceFILE) {
+                    fprintf(self::$yyTraceFILE, "%sSyntax Error!\n",
+                        self::$yyTracePrompt);
+                }
+                if (self::YYERRORSYMBOL) {
+                    if ($this->yyerrcnt < 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $yymx = $this->yystack[$this->yyidx]->major;
+                    if ($yymx == self::YYERRORSYMBOL || $yyerrorhit ){
+                        if (self::$yyTraceFILE) {
+                            fprintf(self::$yyTraceFILE, "%sDiscard input token %s\n",
+                                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+                        }
+                        $this->yy_destructor($yymajor, $yytokenvalue);
+                        $yymajor = self::YYNOCODE;
+                    } else {
+                        while ($this->yyidx >= 0 &&
+                                 $yymx != self::YYERRORSYMBOL &&
+        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
+                              ){
+                            $this->yy_pop_parser_stack();
+                        }
+                        if ($this->yyidx < 0 || $yymajor==0) {
+                            $this->yy_destructor($yymajor, $yytokenvalue);
+                            $this->yy_parse_failed();
+                            $yymajor = self::YYNOCODE;
+                        } elseif ($yymx != self::YYERRORSYMBOL) {
+                            $u2 = 0;
+                            $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
+                        }
+                    }
+                    $this->yyerrcnt = 3;
+                    $yyerrorhit = 1;
+                } else {
+                    if ($this->yyerrcnt <= 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $this->yyerrcnt = 3;
+                    $this->yy_destructor($yymajor, $yytokenvalue);
+                    if ($yyendofinput) {
+                        $this->yy_parse_failed();
+                    }
+                    $yymajor = self::YYNOCODE;
+                }
+            } else {
+                $this->yy_accept();
+                $yymajor = self::YYNOCODE;
+            }
+        } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
+    }
+}
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_data.php b/lib/smarty/sysplugins/smarty_internal_data.php
new file mode 100644
index 0000000..5baf3b7
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_data.php
@@ -0,0 +1,551 @@
+<?php
+/**
+ * Smarty Internal Plugin Data
+ *
+ * This file contains the basic classes and methodes for template and variable creation
+ *
+ * @package Smarty
+ * @subpackage Template
+ * @author Uwe Tews
+ */
+
+/**
+ * Base class with template and variable methodes
+ *
+ * @package Smarty
+ * @subpackage Template
+ */
+class Smarty_Internal_Data {
+
+    /**
+     * name of class used for templates
+     *
+     * @var string
+     */
+    public $template_class = 'Smarty_Internal_Template';
+    /**
+     * template variables
+     *
+     * @var array
+     */
+    public $tpl_vars = array();
+    /**
+     * parent template (if any)
+     *
+     * @var Smarty_Internal_Template
+     */
+    public $parent = null;
+    /**
+     * configuration settings
+     *
+     * @var array
+     */
+    public $config_vars = array();
+
+    /**
+     * assigns a Smarty variable
+     *
+     * @param array|string $tpl_var the template variable name(s)
+     * @param mixed        $value   the value to assign
+     * @param boolean      $nocache if true any output of this variable will be not cached
+     * @param boolean $scope the scope the variable will have  (local,parent or root)
+     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     */
+    public function assign($tpl_var, $value = null, $nocache = false)
+    {
+        if (is_array($tpl_var)) {
+            foreach ($tpl_var as $_key => $_val) {
+                if ($_key != '') {
+                    $this->tpl_vars[$_key] = new Smarty_variable($_val, $nocache);
+                }
+            }
+        } else {
+            if ($tpl_var != '') {
+                $this->tpl_vars[$tpl_var] = new Smarty_variable($value, $nocache);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * assigns a global Smarty variable
+     *
+     * @param string $varname the global variable name
+     * @param mixed  $value   the value to assign
+     * @param boolean $nocache if true any output of this variable will be not cached
+     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     */
+    public function assignGlobal($varname, $value = null, $nocache = false)
+    {
+        if ($varname != '') {
+            Smarty::$global_tpl_vars[$varname] = new Smarty_variable($value, $nocache);
+        }
+
+        return $this;
+    }
+    /**
+     * assigns values to template variables by reference
+     *
+     * @param string $tpl_var the template variable name
+     * @param mixed $ &$value the referenced value to assign
+     * @param boolean $nocache if true any output of this variable will be not cached
+     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     */
+    public function assignByRef($tpl_var, &$value, $nocache = false)
+    {
+        if ($tpl_var != '') {
+            $this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache);
+            $this->tpl_vars[$tpl_var]->value = &$value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * appends values to template variables
+     *
+     * @param array|string $tpl_var the template variable name(s)
+     * @param mixed        $value   the value to append
+     * @param boolean      $merge   flag if array elements shall be merged
+     * @param boolean $nocache if true any output of this variable will be not cached
+     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     */
+    public function append($tpl_var, $value = null, $merge = false, $nocache = false)
+    {
+        if (is_array($tpl_var)) {
+            // $tpl_var is an array, ignore $value
+            foreach ($tpl_var as $_key => $_val) {
+                if ($_key != '') {
+                    if (!isset($this->tpl_vars[$_key])) {
+                        $tpl_var_inst = $this->getVariable($_key, null, true, false);
+                        if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
+                            $this->tpl_vars[$_key] = new Smarty_variable(null, $nocache);
+                        } else {
+                            $this->tpl_vars[$_key] = clone $tpl_var_inst;
+                        }
+                    }
+                    if (!(is_array($this->tpl_vars[$_key]->value) || $this->tpl_vars[$_key]->value instanceof ArrayAccess)) {
+                        settype($this->tpl_vars[$_key]->value, 'array');
+                    }
+                    if ($merge && is_array($_val)) {
+                        foreach($_val as $_mkey => $_mval) {
+                            $this->tpl_vars[$_key]->value[$_mkey] = $_mval;
+                        }
+                    } else {
+                        $this->tpl_vars[$_key]->value[] = $_val;
+                    }
+                }
+            }
+        } else {
+            if ($tpl_var != '' && isset($value)) {
+                if (!isset($this->tpl_vars[$tpl_var])) {
+                    $tpl_var_inst = $this->getVariable($tpl_var, null, true, false);
+                    if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
+                        $this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache);
+                    } else {
+                        $this->tpl_vars[$tpl_var] = clone $tpl_var_inst;
+                    }
+                }
+                if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) {
+                    settype($this->tpl_vars[$tpl_var]->value, 'array');
+                }
+                if ($merge && is_array($value)) {
+                    foreach($value as $_mkey => $_mval) {
+                        $this->tpl_vars[$tpl_var]->value[$_mkey] = $_mval;
+                    }
+                } else {
+                    $this->tpl_vars[$tpl_var]->value[] = $value;
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * appends values to template variables by reference
+     *
+     * @param string $tpl_var the template variable name
+     * @param mixed  &$value  the referenced value to append
+     * @param boolean $merge  flag if array elements shall be merged
+     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     */
+    public function appendByRef($tpl_var, &$value, $merge = false)
+    {
+        if ($tpl_var != '' && isset($value)) {
+            if (!isset($this->tpl_vars[$tpl_var])) {
+                $this->tpl_vars[$tpl_var] = new Smarty_variable();
+            }
+            if (!is_array($this->tpl_vars[$tpl_var]->value)) {
+                settype($this->tpl_vars[$tpl_var]->value, 'array');
+            }
+            if ($merge && is_array($value)) {
+                foreach($value as $_key => $_val) {
+                    $this->tpl_vars[$tpl_var]->value[$_key] = &$value[$_key];
+                }
+            } else {
+                $this->tpl_vars[$tpl_var]->value[] = &$value;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns a single or all template variables
+     *
+     * @param string  $varname        variable name or null
+     * @param string  $_ptr           optional pointer to data object
+     * @param boolean $search_parents include parent templates?
+     * @return string variable value or or array of variables
+     */
+    public function getTemplateVars($varname = null, $_ptr = null, $search_parents = true)
+    {
+        if (isset($varname)) {
+            $_var = $this->getVariable($varname, $_ptr, $search_parents, false);
+            if (is_object($_var)) {
+                return $_var->value;
+            } else {
+                return null;
+            }
+        } else {
+            $_result = array();
+            if ($_ptr === null) {
+                $_ptr = $this;
+            } while ($_ptr !== null) {
+                foreach ($_ptr->tpl_vars AS $key => $var) {
+                    if (!array_key_exists($key, $_result)) {
+                        $_result[$key] = $var->value;
+                    }
+                }
+                // not found, try at parent
+                if ($search_parents) {
+                    $_ptr = $_ptr->parent;
+                } else {
+                    $_ptr = null;
+                }
+            }
+            if ($search_parents && isset(Smarty::$global_tpl_vars)) {
+                foreach (Smarty::$global_tpl_vars AS $key => $var) {
+                    if (!array_key_exists($key, $_result)) {
+                        $_result[$key] = $var->value;
+                    }
+                }
+            }
+            return $_result;
+        }
+    }
+
+    /**
+     * clear the given assigned template variable.
+     *
+     * @param string|array $tpl_var the template variable(s) to clear
+     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     */
+    public function clearAssign($tpl_var)
+    {
+        if (is_array($tpl_var)) {
+            foreach ($tpl_var as $curr_var) {
+                unset($this->tpl_vars[$curr_var]);
+            }
+        } else {
+            unset($this->tpl_vars[$tpl_var]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * clear all the assigned template variables.
+     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     */
+    public function clearAllAssign()
+    {
+        $this->tpl_vars = array();
+        return $this;
+    }
+
+    /**
+     * load a config file, optionally load just selected sections
+     *
+     * @param string $config_file filename
+     * @param mixed  $sections    array of section names, single section or null
+     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     */
+    public function configLoad($config_file, $sections = null)
+    {
+        // load Config class
+        $config = new Smarty_Internal_Config($config_file, $this->smarty, $this);
+        $config->loadConfigVars($sections);
+        return $this;
+    }
+
+    /**
+     * gets the object of a Smarty variable
+     *
+     * @param string  $variable the name of the Smarty variable
+     * @param object  $_ptr     optional pointer to data object
+     * @param boolean $search_parents search also in parent data
+     * @return object the object of the variable
+     */
+    public function getVariable($variable, $_ptr = null, $search_parents = true, $error_enable = true)
+    {
+        if ($_ptr === null) {
+            $_ptr = $this;
+        } while ($_ptr !== null) {
+            if (isset($_ptr->tpl_vars[$variable])) {
+                // found it, return it
+                return $_ptr->tpl_vars[$variable];
+            }
+            // not found, try at parent
+            if ($search_parents) {
+                $_ptr = $_ptr->parent;
+            } else {
+                $_ptr = null;
+            }
+        }
+        if (isset(Smarty::$global_tpl_vars[$variable])) {
+            // found it, return it
+            return Smarty::$global_tpl_vars[$variable];
+        }
+        if ($this->smarty->error_unassigned && $error_enable) {
+            // force a notice
+            $x = $$variable;
+        }
+        return new Undefined_Smarty_Variable;
+    }
+
+    /**
+     * gets  a config variable
+     *
+     * @param string $variable the name of the config variable
+     * @return mixed the value of the config variable
+     */
+    public function getConfigVariable($variable, $error_enable = true)
+    {
+        $_ptr = $this;
+        while ($_ptr !== null) {
+            if (isset($_ptr->config_vars[$variable])) {
+                // found it, return it
+                return $_ptr->config_vars[$variable];
+            }
+            // not found, try at parent
+            $_ptr = $_ptr->parent;
+        }
+        if ($this->smarty->error_unassigned && $error_enable) {
+            // force a notice
+            $x = $$variable;
+        }
+        return null;
+    }
+
+    /**
+     * gets  a stream variable
+     *
+     * @param string $variable the stream of the variable
+     * @return mixed the value of the stream variable
+     */
+    public function getStreamVariable($variable)
+    {
+        $_result = '';
+        $fp = fopen($variable, 'r+');
+        if ($fp) {
+            while (!feof($fp) && ($current_line = fgets($fp)) !== false ) {
+                $_result .= $current_line;
+            }
+            fclose($fp);
+            return $_result;
+        }
+
+        if ($this->smarty->error_unassigned) {
+            throw new SmartyException('Undefined stream variable "' . $variable . '"');
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Returns a single or all config variables
+     *
+     * @param string $varname variable name or null
+     * @return string variable value or or array of variables
+     */
+    public function getConfigVars($varname = null, $search_parents = true)
+    {
+        $_ptr = $this;
+        $var_array = array();
+        while ($_ptr !== null) {
+            if (isset($varname)) {
+                if (isset($_ptr->config_vars[$varname])) {
+                    return $_ptr->config_vars[$varname];
+                }
+            } else {
+                $var_array = array_merge($_ptr->config_vars, $var_array);
+            }
+             // not found, try at parent
+            if ($search_parents) {
+                $_ptr = $_ptr->parent;
+            } else {
+                $_ptr = null;
+            }
+        }
+        if (isset($varname)) {
+            return '';
+        } else {
+            return $var_array;
+        }
+    }
+
+    /**
+     * Deassigns a single or all config variables
+     *
+     * @param string $varname variable name or null
+     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
+     */
+    public function clearConfig($varname = null)
+    {
+        if (isset($varname)) {
+            unset($this->config_vars[$varname]);
+        } else {
+            $this->config_vars = array();
+        }
+        return $this;
+    }
+
+}
+
+/**
+ * class for the Smarty data object
+ *
+ * The Smarty data object will hold Smarty variables in the current scope
+ *
+ * @package Smarty
+ * @subpackage Template
+ */
+class Smarty_Data extends Smarty_Internal_Data {
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * create Smarty data object
+     *
+     * @param Smarty|array $_parent  parent template
+     * @param Smarty       $smarty   global smarty instance
+     */
+    public function __construct ($_parent = null, $smarty = null)
+    {
+        $this->smarty = $smarty;
+        if (is_object($_parent)) {
+            // when object set up back pointer
+            $this->parent = $_parent;
+        } elseif (is_array($_parent)) {
+            // set up variable values
+            foreach ($_parent as $_key => $_val) {
+                $this->tpl_vars[$_key] = new Smarty_variable($_val);
+            }
+        } elseif ($_parent != null) {
+            throw new SmartyException("Wrong type for template variables");
+        }
+    }
+
+}
+
+/**
+ * class for the Smarty variable object
+ *
+ * This class defines the Smarty variable object
+ *
+ * @package Smarty
+ * @subpackage Template
+ */
+class Smarty_Variable {
+
+    /**
+     * template variable
+     *
+     * @var mixed
+     */
+    public $value = null;
+    /**
+     * if true any output of this variable will be not cached
+     *
+     * @var boolean
+     */
+    public $nocache = false;
+    /**
+     * the scope the variable will have  (local,parent or root)
+     *
+     * @var int
+     */
+    public $scope = Smarty::SCOPE_LOCAL;
+
+    /**
+     * create Smarty variable object
+     *
+     * @param mixed   $value   the value to assign
+     * @param boolean $nocache if true any output of this variable will be not cached
+     * @param int     $scope   the scope the variable will have  (local,parent or root)
+     */
+    public function __construct($value = null, $nocache = false, $scope = Smarty::SCOPE_LOCAL)
+    {
+        $this->value = $value;
+        $this->nocache = $nocache;
+        $this->scope = $scope;
+    }
+
+    /**
+     * <<magic>> String conversion
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return (string) $this->value;
+    }
+
+}
+
+/**
+ * class for undefined variable object
+ *
+ * This class defines an object for undefined variable handling
+ *
+ * @package Smarty
+ * @subpackage Template
+ */
+class Undefined_Smarty_Variable {
+
+    /**
+     * Returns FALSE for 'nocache' and NULL otherwise.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function __get($name)
+    {
+        if ($name == 'nocache') {
+            return false;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Always returns an empty string.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return "";
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_debug.php b/lib/smarty/sysplugins/smarty_internal_debug.php
new file mode 100644
index 0000000..2aea13f
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_debug.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * Smarty Internal Plugin Debug
+ *
+ * Class to collect data for the Smarty Debugging Consol
+ *
+ * @package Smarty
+ * @subpackage Debug
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Debug Class
+ *
+ * @package Smarty
+ * @subpackage Debug
+ */
+class Smarty_Internal_Debug extends Smarty_Internal_Data {
+
+    /**
+     * template data
+     *
+     * @var array
+     */
+    public static $template_data = array();
+
+    /**
+     * Start logging of compile time
+     *
+     * @param object $template
+     */
+    public static function start_compile($template)
+    {
+        $key = self::get_key($template);
+        self::$template_data[$key]['start_time'] = microtime(true);
+    }
+
+    /**
+     * End logging of compile time
+     *
+     * @param object $template
+     */
+    public static function end_compile($template)
+    {
+        $key = self::get_key($template);
+        self::$template_data[$key]['compile_time'] += microtime(true) - self::$template_data[$key]['start_time'];
+    }
+
+    /**
+     * Start logging of render time
+     *
+     * @param object $template
+     */
+    public static function start_render($template)
+    {
+        $key = self::get_key($template);
+        self::$template_data[$key]['start_time'] = microtime(true);
+    }
+
+    /**
+     * End logging of compile time
+     *
+     * @param object $template
+     */
+    public static function end_render($template)
+    {
+        $key = self::get_key($template);
+        self::$template_data[$key]['render_time'] += microtime(true) - self::$template_data[$key]['start_time'];
+    }
+
+    /**
+     * Start logging of cache time
+     *
+     * @param object $template cached template
+     */
+    public static function start_cache($template)
+    {
+        $key = self::get_key($template);
+        self::$template_data[$key]['start_time'] = microtime(true);
+    }
+
+    /**
+     * End logging of cache time
+     *
+     * @param object $template cached template
+     */
+    public static function end_cache($template)
+    {
+        $key = self::get_key($template);
+        self::$template_data[$key]['cache_time'] += microtime(true) - self::$template_data[$key]['start_time'];
+    }
+
+    /**
+     * Opens a window for the Smarty Debugging Consol and display the data
+     *
+     * @param Smarty_Internal_Template|Smarty $obj object to debug
+     */
+    public static function display_debug($obj)
+    {
+        // prepare information of assigned variables
+        $ptr = self::get_debug_vars($obj);
+        if ($obj instanceof Smarty) {
+            $smarty = clone $obj;
+        } else {
+            $smarty = clone $obj->smarty;
+        }
+        $_assigned_vars = $ptr->tpl_vars;
+        ksort($_assigned_vars);
+        $_config_vars = $ptr->config_vars;
+        ksort($_config_vars);
+        $smarty->registered_filters = array();
+        $smarty->autoload_filters = array();
+        $smarty->default_modifiers = array();
+        $smarty->force_compile = false;
+        $smarty->left_delimiter = '{';
+        $smarty->right_delimiter = '}';
+        $smarty->debugging = false;
+        $smarty->force_compile = false;
+        $_template = new Smarty_Internal_Template($smarty->debug_tpl, $smarty);
+        $_template->caching = false;
+        $_template->disableSecurity();
+        $_template->cache_id = null;
+        $_template->compile_id = null;
+        if ($obj instanceof Smarty_Internal_Template) {
+            $_template->assign('template_name', $obj->source->type . ':' . $obj->source->name);
+        }
+        if ($obj instanceof Smarty) {
+            $_template->assign('template_data', self::$template_data);
+        } else {
+            $_template->assign('template_data', null);
+        }
+        $_template->assign('assigned_vars', $_assigned_vars);
+        $_template->assign('config_vars', $_config_vars);
+        $_template->assign('execution_time', microtime(true) - $smarty->start_time);
+        echo $_template->fetch();
+    }
+
+    /**
+     * Recursively gets variables from all template/data scopes
+     *
+     * @param Smarty_Internal_Template|Smarty_Data $obj object to debug
+     * @return StdClass
+     */
+    public static function get_debug_vars($obj)
+    {
+        $config_vars = $obj->config_vars;
+        $tpl_vars = array();
+        foreach ($obj->tpl_vars as $key => $var) {
+            $tpl_vars[$key] = clone $var;
+            if ($obj instanceof Smarty_Internal_Template) {
+                $tpl_vars[$key]->scope = $obj->source->type . ':' . $obj->source->name;
+            } elseif ($obj instanceof Smarty_Data) {
+                $tpl_vars[$key]->scope = 'Data object';
+            } else {
+                $tpl_vars[$key]->scope = 'Smarty root';
+            }
+        }
+
+        if (isset($obj->parent)) {
+            $parent = self::get_debug_vars($obj->parent);
+            $tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
+            $config_vars = array_merge($parent->config_vars, $config_vars);
+        } else {
+            foreach (Smarty::$global_tpl_vars as $name => $var) {
+                if (!array_key_exists($name, $tpl_vars)) {
+                    $clone = clone $var;
+                    $clone->scope = 'Global';
+                    $tpl_vars[$name] = $clone;
+                }
+            }
+        }
+        return (object) array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars);
+    }
+
+    /**
+     * Return key into $template_data for template
+     *
+     * @param object $template  template object
+     * @return string   key into $template_data
+     */
+    private static function get_key($template)
+    {
+        static $_is_stringy = array('string' => true, 'eval' => true);
+        // calculate Uid if not already done
+        if ($template->source->uid == '') {
+            $template->source->filepath;
+        }
+        $key = $template->source->uid;
+        if (isset(self::$template_data[$key])) {
+            return $key;
+        } else {
+            if (isset($_is_stringy[$template->source->type])) {
+                self::$template_data[$key]['name'] = '\''.substr($template->source->name,0,25).'...\'';
+            } else {
+                self::$template_data[$key]['name'] = $template->source->filepath;
+            }
+            self::$template_data[$key]['compile_time'] = 0;
+            self::$template_data[$key]['render_time'] = 0;
+            self::$template_data[$key]['cache_time'] = 0;
+            return $key;
+        }
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_filter_handler.php b/lib/smarty/sysplugins/smarty_internal_filter_handler.php
new file mode 100644
index 0000000..c9370e1
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_filter_handler.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Smarty Internal Plugin Filter Handler
+ *
+ * Smarty filter handler class
+ *
+ * @package Smarty
+ * @subpackage PluginsInternal
+ * @author Uwe Tews
+ */
+
+/**
+ * Class for filter processing
+ *
+ * @package Smarty
+ * @subpackage PluginsInternal
+ */
+class Smarty_Internal_Filter_Handler {
+
+    /**
+     * Run filters over content
+     *
+     * The filters will be lazy loaded if required
+     * class name format: Smarty_FilterType_FilterName
+     * plugin filename format: filtertype.filtername.php
+     * Smarty2 filter plugins could be used
+     *
+     * @param string                   $type     the type of filter ('pre','post','output') which shall run
+     * @param string                   $content  the content which shall be processed by the filters
+     * @param Smarty_Internal_Template $template template object
+     * @return string the filtered content
+     */
+    public static function runFilter($type, $content, Smarty_Internal_Template $template)
+    {
+        $output = $content;
+        // loop over autoload filters of specified type
+        if (!empty($template->smarty->autoload_filters[$type])) {
+            foreach ((array)$template->smarty->autoload_filters[$type] as $name) {
+                $plugin_name = "Smarty_{$type}filter_{$name}";
+                if ($template->smarty->loadPlugin($plugin_name)) {
+                    if (function_exists($plugin_name)) {
+                        // use loaded Smarty2 style plugin
+                        $output = $plugin_name($output, $template);
+                    } elseif (class_exists($plugin_name, false)) {
+                        // loaded class of filter plugin
+                        $output = call_user_func(array($plugin_name, 'execute'), $output, $template);
+                    }
+                } else {
+                    // nothing found, throw exception
+                    throw new SmartyException("Unable to load filter {$plugin_name}");
+                }
+            }
+        }
+        // loop over registerd filters of specified type
+        if (!empty($template->smarty->registered_filters[$type])) {
+            foreach ($template->smarty->registered_filters[$type] as $key => $name) {
+                if (is_array($template->smarty->registered_filters[$type][$key])) {
+                    $output = call_user_func($template->smarty->registered_filters[$type][$key], $output, $template);
+                } else {
+                    $output = $template->smarty->registered_filters[$type][$key]($output, $template);
+                }
+            }
+        }
+        // return filtered output
+        return $output;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_function_call_handler.php b/lib/smarty/sysplugins/smarty_internal_function_call_handler.php
new file mode 100644
index 0000000..010d635
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_function_call_handler.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Smarty Internal Plugin Function Call Handler
+ *
+ * @package Smarty
+ * @subpackage PluginsInternal
+ * @author Uwe Tews
+ */
+
+/**
+ * This class does call function defined with the {function} tag
+ *
+ * @package Smarty
+ * @subpackage PluginsInternal
+ */
+class Smarty_Internal_Function_Call_Handler {
+
+    /**
+     * This function handles calls to template functions defined by {function}
+     * It does create a PHP function at the first call
+     *
+     * @param string                   $_name       template function name
+     * @param Smarty_Internal_Template $_template   template object
+     * @param array                    $_params     Smarty variables passed as call parameter
+     * @param string                   $_hash       nocache hash value
+     * @param bool                     $_nocache    nocache flag
+     */
+    public static function call($_name, Smarty_Internal_Template $_template, $_params, $_hash, $_nocache)
+    {
+        if ($_nocache) {
+            $_function = "smarty_template_function_{$_name}_nocache";
+        } else {
+            $_function = "smarty_template_function_{$_hash}_{$_name}";
+        }
+        if (!is_callable($_function)) {
+            $_code = "function {$_function}(\$_smarty_tpl,\$params) {
+    \$saved_tpl_vars = \$_smarty_tpl->tpl_vars;
+    foreach (\$_smarty_tpl->smarty->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);};
+    foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
+            if ($_nocache) {
+                $_code .= preg_replace(array("!<\?php echo \\'/\*%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/|/\*/%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/\\';\?>!",
+                        "!\\\'!"), array('', "'"), $_template->smarty->template_functions[$_name]['compiled']);
+                $_template->smarty->template_functions[$_name]['called_nocache'] = true;
+            } else {
+                $_code .= preg_replace("/{$_template->smarty->template_functions[$_name]['nocache_hash']}/", $_template->properties['nocache_hash'], $_template->smarty->template_functions[$_name]['compiled']);
+            }
+            $_code .= "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;}";
+            eval($_code);
+        }
+        $_function($_template, $_params);
+    }
+
+}
+
+?>
diff --git a/lib/smarty/sysplugins/smarty_internal_get_include_path.php b/lib/smarty/sysplugins/smarty_internal_get_include_path.php
new file mode 100644
index 0000000..7a9739e
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_get_include_path.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Smarty read include path plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsInternal
+ * @author Monte Ohrt
+ */
+
+/**
+ * Smarty Internal Read Include Path Class
+ *
+ * @package Smarty
+ * @subpackage PluginsInternal
+ */
+class Smarty_Internal_Get_Include_Path {
+
+    /**
+     * Return full file path from PHP include_path
+     *
+     * @param string $filepath filepath
+     * @return string|boolean full filepath or false
+     */
+    public static function getIncludePath($filepath)
+    {
+        static $_include_path = null;
+
+        if ($_path_array === null) {
+            $_include_path = explode(PATH_SEPARATOR, get_include_path());
+        }
+
+        foreach ($_include_path as $_path) {
+            if (file_exists($_path . DS . $filepath)) {
+                return $_path . DS . $filepath;
+            }
+        }
+        
+        return false;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_nocache_insert.php b/lib/smarty/sysplugins/smarty_internal_nocache_insert.php
new file mode 100644
index 0000000..faae49a
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_nocache_insert.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Smarty Internal Plugin Nocache Insert
+ *
+ * Compiles the {insert} tag into the cache file
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Insert Class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Nocache_Insert {
+
+    /**
+     * Compiles code for the {insert} tag into cache file
+     *
+     * @param string                   $_function insert function name
+     * @param array                    $_attr     array with parameter
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $_script   script name to load or 'null'
+     * @param string                   $_assign   optional variable name
+     * @return string compiled code
+     */
+    public static function compile($_function, $_attr, $_template, $_script, $_assign = null)
+    {
+        $_output = '<?php ';
+        if ($_script != 'null') {
+            // script which must be included
+            // code for script file loading
+            $_output .= "require_once '{$_script}';";
+        }
+        // call insert
+        if (isset($_assign)) {
+            $_output .= "\$_smarty_tpl->assign('{$_assign}' , {$_function} (" . var_export($_attr, true) . ",\$_smarty_tpl), true);?>";
+        } else {
+            $_output .= "echo {$_function}(" . var_export($_attr, true) . ",\$_smarty_tpl);?>";
+        }
+        $_tpl = $_template;
+        while ($_tpl->parent instanceof Smarty_Internal_Template) {
+            $_tpl = $_tpl->parent;
+        }
+        return "/*%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/" . $_output . "/*/%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/";
+    }
+
+}
+
+?>
diff --git a/lib/smarty/sysplugins/smarty_internal_parsetree.php b/lib/smarty/sysplugins/smarty_internal_parsetree.php
new file mode 100644
index 0000000..c9fb1f7
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_parsetree.php
@@ -0,0 +1,395 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parsetrees
+ *
+ * These are classes to build parsetrees in the template parser
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Thue Kristensen
+ * @author Uwe Tews
+ */
+
+/**
+ * @package Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+abstract class _smarty_parsetree {
+
+    /**
+     * Parser object
+     * @var object
+     */
+    public $parser;
+    /**
+     * Buffer content
+     * @var mixed
+     */
+    public $data;
+
+    /**
+     * Return buffer
+     *
+     * @return string  buffer content
+     */
+    abstract public function to_smarty_php();
+
+}
+
+/**
+ * A complete smarty tag.
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class _smarty_tag extends _smarty_parsetree {
+
+    /**
+     * Saved block nesting level
+     * @var int
+     */
+    public $saved_block_nesting;
+
+    /**
+     * Create parse tree buffer for Smarty tag
+     *
+     * @param object $parser    parser object
+     * @param string $data      content
+     */
+    public function __construct($parser, $data)
+    {
+        $this->parser = $parser;
+        $this->data = $data;
+        $this->saved_block_nesting = $parser->block_nesting_level;
+    }
+
+    /**
+     * Return buffer content
+     *
+     * @return string  content
+     */
+    public function to_smarty_php()
+    {
+        return $this->data;
+    }
+
+    /**
+     * Return complied code that loads the evaluated outout of buffer content into a temporary variable
+     *
+     * @return string template code
+     */
+    public function assign_to_var()
+    {
+        $var = sprintf('$_tmp%d', ++$this->parser->prefix_number);
+        $this->parser->compiler->prefix_code[] = sprintf('<?php ob_start();?>%s<?php %s=ob_get_clean();?>', $this->data, $var);
+        return $var;
+    }
+
+}
+
+/**
+ * Code fragment inside a tag.
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class _smarty_code extends _smarty_parsetree {
+
+
+    /**
+     * Create parse tree buffer for code fragment
+     *
+     * @param object $parser    parser object
+     * @param string $data      content
+     */
+    public function __construct($parser, $data)
+    {
+        $this->parser = $parser;
+        $this->data = $data;
+    }
+
+    /**
+     * Return buffer content in parentheses
+     *
+     * @return string  content
+     */
+    public function to_smarty_php()
+    {
+        return sprintf("(%s)", $this->data);
+    }
+
+}
+
+/**
+ * Double quoted string inside a tag.
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class _smarty_doublequoted extends _smarty_parsetree {
+
+    /**
+     * Create parse tree buffer for double quoted string subtrees
+     *
+     * @param object $parser    parser object
+     * @param _smarty_parsetree $subtree    parsetree buffer
+     */
+    public function __construct($parser, _smarty_parsetree $subtree)
+    {
+        $this->parser = $parser;
+        $this->subtrees[] = $subtree;
+        if ($subtree instanceof _smarty_tag) {
+            $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
+        }
+    }
+
+    /**
+     * Append buffer to subtree
+     *
+     * @param _smarty_parsetree $subtree  parsetree buffer
+     */
+    public function append_subtree(_smarty_parsetree $subtree)
+    {
+        $last_subtree = count($this->subtrees) - 1;
+        if ($last_subtree >= 0 && $this->subtrees[$last_subtree] instanceof _smarty_tag && $this->subtrees[$last_subtree]->saved_block_nesting < $this->parser->block_nesting_level) {
+            if ($subtree instanceof _smarty_code) {
+                $this->subtrees[$last_subtree]->data .= '<?php echo ' . $subtree->data . ';?>';
+            } elseif ($subtree instanceof _smarty_dq_content) {
+                $this->subtrees[$last_subtree]->data .= '<?php echo "' . $subtree->data . '";?>';
+            } else {
+                $this->subtrees[$last_subtree]->data .= $subtree->data;
+            }
+        } else {
+            $this->subtrees[] = $subtree;
+        }
+        if ($subtree instanceof _smarty_tag) {
+            $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
+        }
+    }
+
+    /**
+     * Merge subtree buffer content together
+     *
+     * @return string  compiled template code
+     */
+    public function to_smarty_php()
+    {
+        $code = '';
+        foreach ($this->subtrees as $subtree) {
+            if ($code !== "") {
+                $code .= ".";
+            }
+            if ($subtree instanceof _smarty_tag) {
+                $more_php = $subtree->assign_to_var();
+            } else {
+                $more_php = $subtree->to_smarty_php();
+            }
+
+            $code .= $more_php;
+
+            if (!$subtree instanceof _smarty_dq_content) {
+                $this->parser->compiler->has_variable_string = true;
+            }
+        }
+        return $code;
+    }
+
+}
+
+/**
+ * Raw chars as part of a double quoted string.
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class _smarty_dq_content extends _smarty_parsetree {
+
+
+    /**
+     * Create parse tree buffer with string content
+     *
+     * @param object $parser  parser object
+     * @param string $data    string section
+     */
+    public function __construct($parser, $data)
+    {
+        $this->parser = $parser;
+        $this->data = $data;
+    }
+
+    /**
+     * Return content as double quoted string
+     *
+     * @return string doubled quoted string
+     */
+    public function to_smarty_php()
+    {
+        return '"' . $this->data . '"';
+    }
+
+}
+
+/**
+ * Template element
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class _smarty_template_buffer extends _smarty_parsetree {
+
+    /**
+     * Array of template elements
+     *
+     * @var array
+     */
+    public $subtrees = Array();
+
+    /**
+     * Create root of parse tree for template elements
+     *
+     * @param object $parser    parse object
+     */
+    public function __construct($parser)
+    {
+        $this->parser = $parser;
+    }
+
+    /**
+     * Append buffer to subtree
+     *
+     * @param _smarty_parsetree $subtree
+     */
+    public function append_subtree(_smarty_parsetree $subtree)
+    {
+        $this->subtrees[] = $subtree;
+    }
+
+    /**
+     * Sanitize and merge subtree buffers together
+     *
+     * @return string template code content
+     */
+    public function to_smarty_php()
+    {
+        $code = '';
+        for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
+            if ($key + 2 < $cnt) {
+                if ($this->subtrees[$key] instanceof _smarty_linebreak && $this->subtrees[$key + 1] instanceof _smarty_tag && $this->subtrees[$key + 1]->data == '' && $this->subtrees[$key + 2] instanceof _smarty_linebreak) {
+                    $key = $key + 1;
+                    continue;
+                }
+                if (substr($this->subtrees[$key]->data, -1) == '<' && $this->subtrees[$key + 1]->data == '' && substr($this->subtrees[$key + 2]->data, -1) == '?') {
+                    $key = $key + 2;
+                    continue;
+                }
+            }
+            if (substr($code, -1) == '<') {
+                $subtree = $this->subtrees[$key]->to_smarty_php();
+                if (substr($subtree, 0, 1) == '?') {
+                    $code = substr($code, 0, strlen($code) - 1) . '<<?php ?>?' . substr($subtree, 1);
+                } elseif ($this->parser->asp_tags && substr($subtree, 0, 1) == '%') {
+                    $code = substr($code, 0, strlen($code) - 1) . '<<?php ?>%' . substr($subtree, 1);
+                } else {
+                    $code .= $subtree;
+                }
+                continue;
+            }
+            if ($this->parser->asp_tags && substr($code, -1) == '%') {
+                $subtree = $this->subtrees[$key]->to_smarty_php();
+                if (substr($subtree, 0, 1) == '>') {
+                    $code = substr($code, 0, strlen($code) - 1) . '%<?php ?>>' . substr($subtree, 1);
+                } else {
+                    $code .= $subtree;
+                }
+                continue;
+            }
+            if (substr($code, -1) == '?') {
+                $subtree = $this->subtrees[$key]->to_smarty_php();
+                if (substr($subtree, 0, 1) == '>') {
+                    $code = substr($code, 0, strlen($code) - 1) . '?<?php ?>>' . substr($subtree, 1);
+                } else {
+                    $code .= $subtree;
+                }
+                continue;
+            }
+            $code .= $this->subtrees[$key]->to_smarty_php();
+        }
+        return $code;
+    }
+
+}
+
+/**
+ * template text
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class _smarty_text extends _smarty_parsetree {
+
+
+    /**
+     * Create template text buffer
+     *
+     * @param object $parser    parser object
+     * @param string $data      text
+     */
+    public function __construct($parser, $data)
+    {
+        $this->parser = $parser;
+        $this->data = $data;
+    }
+
+    /**
+     * Return buffer content
+     *
+     * @return strint text
+     */
+    public function to_smarty_php()
+    {
+        return $this->data;
+    }
+
+}
+
+/**
+ * template linebreaks
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class _smarty_linebreak extends _smarty_parsetree {
+
+    /**
+     * Create buffer with linebreak content
+     *
+     * @param object $parser    parser object
+     * @param string  $data     linebreak string
+     */
+    public function __construct($parser, $data)
+    {
+        $this->parser = $parser;
+        $this->data = $data;
+    }
+
+    /**
+     * Return linebrak
+     *
+     * @return string linebreak
+     */
+    public function to_smarty_php()
+    {
+        return $this->data;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_resource_eval.php b/lib/smarty/sysplugins/smarty_internal_resource_eval.php
new file mode 100644
index 0000000..cf2ec3e
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_resource_eval.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Smarty Internal Plugin Resource Eval
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Uwe Tews
+ * @author Rodney Rehm
+ */
+
+/**
+ * Smarty Internal Plugin Resource Eval
+ *
+ * Implements the strings as resource for Smarty template
+ *
+ * {@internal unlike string-resources the compiled state of eval-resources is NOT saved for subsequent access}}
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ */
+class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled {
+
+    /**
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     * @return void
+     */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    {
+        $source->uid = $source->filepath = sha1($source->name);
+        $source->timestamp = false;
+        $source->exists = true;
+    }
+
+    /**
+     * Load template's source from $resource_name into current template object
+     *
+     * @uses decode() to decode base64 and urlencoded template_resources
+     * @param Smarty_Template_Source $source source object
+     * @return string template source
+     */
+    public function getContent(Smarty_Template_Source $source)
+    {
+        return $this->decode($source->name);
+    }
+    
+    /**
+     * decode base64 and urlencode
+     *
+     * @param string $string template_resource to decode
+     * @return string decoded template_resource
+     */
+    protected function decode($string)
+    {
+        // decode if specified
+        if (($pos = strpos($string, ':')) !== false) {
+            if (!strncmp($string, 'base64', 6)) {
+                return base64_decode(substr($string, 7));
+            } elseif (!strncmp($string, 'urlencode', 9)) {
+                return urldecode(substr($string, 10));
+            }
+        }
+        
+        return $string;
+    }
+    
+    /**
+     * modify resource_name according to resource handlers specifications
+     *
+     * @param Smarty $smarty        Smarty instance
+     * @param string $resource_name resource_name to make unique
+     * @return string unique resource name
+     */
+    protected function buildUniqueResourceName(Smarty $smarty, $resource_name)
+    {
+        return get_class($this) . '#' .$this->decode($resource_name);
+    }
+
+    /**
+     * Determine basename for compiled filename
+     *
+     * @param Smarty_Template_Source $source source object
+     * @return string resource's basename
+     */
+    protected function getBasename(Smarty_Template_Source $source)
+    {
+        return '';
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_resource_extends.php b/lib/smarty/sysplugins/smarty_internal_resource_extends.php
new file mode 100644
index 0000000..53ea3eb
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_resource_extends.php
@@ -0,0 +1,148 @@
+<?php
+/**
+* Smarty Internal Plugin Resource Extends
+*
+* @package Smarty
+* @subpackage TemplateResources
+* @author Uwe Tews
+* @author Rodney Rehm
+*/
+
+/**
+* Smarty Internal Plugin Resource Extends
+*
+* Implements the file system as resource for Smarty which {extend}s a chain of template files templates
+*
+* @package Smarty
+* @subpackage TemplateResources
+*/
+class Smarty_Internal_Resource_Extends extends Smarty_Resource {
+
+    /**
+    * populate Source Object with meta data from Resource
+    *
+    * @param Smarty_Template_Source   $source    source object
+    * @param Smarty_Internal_Template $_template template object
+    */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    {
+        $uid = '';
+        $sources = array();
+        $components = explode('|', $source->name);
+        $exists = true;
+        foreach ($components as $component) {
+            $s = Smarty_Resource::source(null, $source->smarty, $component);
+            if ($s->type == 'php') {
+                throw new SmartyException("Resource type {$s->type} cannot be used with the extends resource type");
+            }
+            $sources[$s->uid] = $s;
+            $uid .= $s->filepath;
+            if ($_template && $_template->smarty->compile_check) {
+                $exists == $exists && $s->exists;
+            }
+        }
+        $source->components = $sources;
+        $source->filepath = $s->filepath;
+        $source->uid = sha1($uid);
+        if ($_template && $_template->smarty->compile_check) {
+            $source->timestamp = $s->timestamp;
+            $source->exists = $exists;
+        }
+        // need the template at getContent()
+        $source->template = $_template;
+    }
+
+    /**
+    * populate Source Object with timestamp and exists from Resource
+    *
+    * @param Smarty_Template_Source $source source object
+    */
+    public function populateTimestamp(Smarty_Template_Source $source)
+    {
+        $source->exists = true;
+        foreach ($source->components as $s) {
+            $source->exists == $source->exists && $s->exists;
+        }
+        $source->timestamp = $s->timestamp;
+    }
+
+    /**
+    * Load template's source from files into current template object
+    *
+    * @param Smarty_Template_Source $source source object
+    * @return string template source
+    * @throws SmartyException if source cannot be loaded
+    */
+    public function getContent(Smarty_Template_Source $source)
+    {
+        if (!$source->exists) {
+            throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
+        }
+
+        $_rdl = preg_quote($source->smarty->right_delimiter);
+        $_ldl = preg_quote($source->smarty->left_delimiter);
+        $_components = array_reverse($source->components);
+        $_first = reset($_components);
+        $_last = end($_components);
+
+        foreach ($_components as $_component) {
+            // register dependency
+            if ($_component != $_first) {
+                $source->template->properties['file_dependency'][$_component->uid] = array($_component->filepath, $_component->timestamp, $_component->type);
+            }
+
+            // read content
+            $source->filepath = $_component->filepath;
+            $_content = $_component->content;
+
+            // extend sources
+            if ($_component != $_last) {
+                if (preg_match_all("!({$_ldl}block\s(.+?){$_rdl})!", $_content, $_open) !=
+                preg_match_all("!({$_ldl}/block{$_rdl})!", $_content, $_close)) {
+                    throw new SmartyException("unmatched {block} {/block} pairs in template {$_component->type} '{$_component->name}'");
+                }
+                preg_match_all("!{$_ldl}block\s(.+?){$_rdl}|{$_ldl}/block{$_rdl}|{$_ldl}\*([\S\s]*?)\*{$_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
+                $_result_count = count($_result[0]);
+                $_start = 0;
+                while ($_start+1 < $_result_count) {
+                    $_end = 0;
+                    $_level = 1;
+                    if (substr($_result[0][$_start][0],0,strlen($source->smarty->left_delimiter)+1) == $source->smarty->left_delimiter.'*') {
+                        $_start++;
+                        continue;
+                    }
+                    while ($_level != 0) {
+                        $_end++;
+                        if (substr($_result[0][$_start + $_end][0],0,strlen($source->smarty->left_delimiter)+1) == $source->smarty->left_delimiter.'*') {
+                            continue;
+                        }
+                        if (!strpos($_result[0][$_start + $_end][0], '/')) {
+                            $_level++;
+                        } else {
+                            $_level--;
+                        }
+                    }
+                    $_block_content = str_replace($source->smarty->left_delimiter . '$smarty.block.parent' . $source->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%', substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0])));
+                    Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $source->template, $_component->filepath);
+                    $_start = $_start + $_end + 1;
+                }
+            } else {
+                return $_content;
+            }
+        }
+    }
+
+    /**
+    * Determine basename for compiled filename
+    *
+    * @param Smarty_Template_Source $source source object
+    * @return string resource's basename
+    */
+    public function getBasename(Smarty_Template_Source $source)
+    {
+        return str_replace(':', '.', basename($source->filepath));
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_resource_file.php b/lib/smarty/sysplugins/smarty_internal_resource_file.php
new file mode 100644
index 0000000..48b391d
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_resource_file.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Smarty Internal Plugin Resource File
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Uwe Tews
+ * @author Rodney Rehm
+ */
+
+/**
+ * Smarty Internal Plugin Resource File
+ *
+ * Implements the file system as resource for Smarty templates
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ */
+class Smarty_Internal_Resource_File extends Smarty_Resource {
+
+    /**
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    {
+        $source->filepath = $this->buildFilepath($source, $_template);
+
+        if ($source->filepath !== false) {
+            if (is_object($source->smarty->security_policy)) {
+                $source->smarty->security_policy->isTrustedResourceDir($source->filepath);
+            }
+
+            $source->uid = sha1($source->filepath);
+            if ($source->smarty->compile_check && !isset($source->timestamp)) {
+                $source->timestamp = @filemtime($source->filepath);
+                $source->exists = !!$source->timestamp;
+            }
+        }
+    }
+
+    /**
+     * populate Source Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Source $source source object
+     */
+    public function populateTimestamp(Smarty_Template_Source $source)
+    {
+        $source->timestamp = @filemtime($source->filepath);
+        $source->exists = !!$source->timestamp;
+    }
+
+    /**
+     * Load template's source from file into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     * @return string template source
+     * @throws SmartyException if source cannot be loaded
+     */
+    public function getContent(Smarty_Template_Source $source)
+    {
+        if ($source->timestamp) {
+            return file_get_contents($source->filepath);
+        }
+        if ($source instanceof Smarty_Config_Source) {
+            throw new SmartyException("Unable to read config {$source->type} '{$source->name}'");
+        }
+        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
+    }
+
+    /**
+     * Determine basename for compiled filename
+     *
+     * @param Smarty_Template_Source $source source object
+     * @return string resource's basename
+     */
+    public function getBasename(Smarty_Template_Source $source)
+    {
+        $_file = $source->name;
+        if (($_pos = strpos($_file, ']')) !== false) {
+            $_file = substr($_file, $_pos + 1);
+        }
+        return basename($_file);
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_resource_php.php b/lib/smarty/sysplugins/smarty_internal_resource_php.php
new file mode 100644
index 0000000..7cd8bae
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_resource_php.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Resource PHP
+ *
+ * Implements the file system as resource for PHP templates
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Uwe Tews
+ * @author Rodney Rehm
+ */
+class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled {
+    /**
+     * container for short_open_tag directive's value before executing PHP templates
+     * @var string
+     */
+    protected $short_open_tag;
+
+    /**
+     * Create a new PHP Resource
+     *
+     */
+    public function __construct()
+    {
+        $this->short_open_tag = ini_get( 'short_open_tag' );
+    }
+
+    /**
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source $source source object
+     * @param Smarty_Internal_Template $_template template object
+     * @return void
+     */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    {
+        $source->filepath = $this->buildFilepath($source, $_template);
+
+        if ($source->filepath !== false) {
+            if (is_object($source->smarty->security_policy)) {
+                $source->smarty->security_policy->isTrustedResourceDir($source->filepath);
+            }
+
+            $source->uid = sha1($source->filepath);
+            if ($source->smarty->compile_check) {
+                $source->timestamp = @filemtime($source->filepath);
+                $source->exists = !!$source->timestamp;
+            }
+        }
+    }
+
+    /**
+     * populate Source Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Source $source source object
+     * @return void
+     */
+    public function populateTimestamp(Smarty_Template_Source $source)
+    {
+        $source->timestamp = @filemtime($source->filepath);
+        $source->exists = !!$source->timestamp;
+    }
+
+    /**
+     * Load template's source from file into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     * @return string template source
+     * @throws SmartyException if source cannot be loaded
+     */
+    public function getContent(Smarty_Template_Source $source)
+    {
+        if ($source->timestamp) {
+            return '';
+        }
+        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
+    }
+
+    /**
+     * Render and output the template (without using the compiler)
+     *
+     * @param Smarty_Template_Source $source source object
+     * @param Smarty_Internal_Template $_template template object
+     * @return void
+     * @throws SmartyException if template cannot be loaded or allow_php_templates is disabled
+     */
+    public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template)
+    {
+        $_smarty_template = $_template;
+
+        if (!$source->smarty->allow_php_templates) {
+            throw new SmartyException("PHP templates are disabled");
+        }
+        if (!$source->exists) {
+            if ($_template->parent instanceof Smarty_Internal_Template) {
+                $parent_resource = " in '{$_template->parent->template_resource}'";
+            } else {
+                $parent_resource = '';
+            }
+            throw new SmartyException("Unable to load template {$source->type} '{$source->name}'{$parent_resource}");
+        }
+
+        // prepare variables
+        extract($_template->getTemplateVars());
+
+        // include PHP template with short open tags enabled
+        ini_set( 'short_open_tag', '1' );
+        include($source->filepath);
+        ini_set( 'short_open_tag', $this->short_open_tag );
+    }
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_resource_registered.php b/lib/smarty/sysplugins/smarty_internal_resource_registered.php
new file mode 100644
index 0000000..44497b9
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_resource_registered.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Smarty Internal Plugin Resource Registered
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Uwe Tews
+ * @author Rodney Rehm
+ */
+
+/**
+ * Smarty Internal Plugin Resource Registered
+ *
+ * Implements the registered resource for Smarty template
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @deprecated
+ */
+class Smarty_Internal_Resource_Registered extends Smarty_Resource {
+
+    /**
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     * @return void
+     */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    {
+        $source->filepath = $source->type . ':' . $source->name;
+        $source->uid = sha1($source->filepath);
+        if ($source->smarty->compile_check) {
+            $source->timestamp = $this->getTemplateTimestamp($source);
+            $source->exists = !!$source->timestamp;
+        }
+    }
+
+    /**
+     * populate Source Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Source $source source object
+     * @return void
+     */
+    public function populateTimestamp(Smarty_Template_Source $source)
+    {
+        $source->timestamp = $this->getTemplateTimestamp($source);
+        $source->exists = !!$source->timestamp;
+    }
+
+    /**
+     * Get timestamp (epoch) the template source was modified
+     *
+     * @param Smarty_Template_Source $source source object
+     * @return integer|boolean timestamp (epoch) the template was modified, false if resources has no timestamp
+     */
+    public function getTemplateTimestamp(Smarty_Template_Source $source)
+    {
+        // return timestamp
+        $time_stamp = false;
+        call_user_func_array($source->smarty->registered_resources[$source->type][0][1], array($source->name, &$time_stamp, $source->smarty));
+        return is_numeric($time_stamp) ? (int) $time_stamp : $time_stamp;
+    }
+
+    /**
+     * Load template's source by invoking the registered callback into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     * @return string template source
+     * @throws SmartyException if source cannot be loaded
+     */
+    public function getContent(Smarty_Template_Source $source)
+    {
+        // return template string
+        $t = call_user_func_array($source->smarty->registered_resources[$source->type][0][0], array($source->name, &$source->content, $source->smarty));
+        if (is_bool($t) && !$t) {
+            throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
+        }
+        return $source->content;
+    }
+
+    /**
+     * Determine basename for compiled filename
+     *
+     * @param Smarty_Template_Source $source source object
+     * @return string resource's basename
+     */
+    protected function getBasename(Smarty_Template_Source $source)
+    {
+        return basename($source->name);
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_resource_stream.php b/lib/smarty/sysplugins/smarty_internal_resource_stream.php
new file mode 100644
index 0000000..85698c2
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_resource_stream.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Smarty Internal Plugin Resource Stream
+ *
+ * Implements the streams as resource for Smarty template
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Uwe Tews
+ * @author Rodney Rehm
+ */
+
+/**
+ * Smarty Internal Plugin Resource Stream
+ *
+ * Implements the streams as resource for Smarty template
+ *
+ * @link http://php.net/streams
+ * @package Smarty
+ * @subpackage TemplateResources
+ */
+class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled {
+
+    /**
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     * @return void
+     */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    {
+        $source->filepath = str_replace(':', '://', $source->resource);
+        $source->uid = false;
+        $source->content = $this->getContent($source);
+        $source->timestamp = false;
+        $source->exists = !!$source->content;
+    }
+
+    /**
+     * Load template's source from stream into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     * @return string template source
+     * @throws SmartyException if source cannot be loaded
+     */
+    public function getContent(Smarty_Template_Source $source)
+    {
+        $t = '';
+        // the availability of the stream has already been checked in Smarty_Resource::fetch()
+        $fp = fopen($source->filepath, 'r+');
+        if ($fp) {
+            while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
+                $t .= $current_line;
+            }
+            fclose($fp);
+            return $t;
+        } else {
+            return false;
+        }
+    }
+    
+    /**
+     * modify resource_name according to resource handlers specifications
+     *
+     * @param Smarty $smarty        Smarty instance
+     * @param string $resource_name resource_name to make unique
+     * @return string unique resource name
+     */
+    protected function buildUniqueResourceName(Smarty $smarty, $resource_name)
+    {
+        return get_class($this) . '#' . $resource_name;
+    }
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_resource_string.php b/lib/smarty/sysplugins/smarty_internal_resource_string.php
new file mode 100644
index 0000000..9571337
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_resource_string.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Smarty Internal Plugin Resource String
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Uwe Tews
+ * @author Rodney Rehm
+ */
+
+/**
+ * Smarty Internal Plugin Resource String
+ *
+ * Implements the strings as resource for Smarty template
+ *
+ * {@internal unlike eval-resources the compiled state of string-resources is saved for subsequent access}}
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ */
+class Smarty_Internal_Resource_String extends Smarty_Resource {
+
+    /**
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     * @return void
+     */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    {
+        $source->uid = $source->filepath = sha1($source->name);
+        $source->timestamp = 0;
+        $source->exists = true;
+    }
+
+    /**
+     * Load template's source from $resource_name into current template object
+     *
+     * @uses decode() to decode base64 and urlencoded template_resources
+     * @param Smarty_Template_Source $source source object
+     * @return string template source
+     */
+    public function getContent(Smarty_Template_Source $source)
+    {
+        return $this->decode($source->name);
+    }
+    
+    /**
+     * decode base64 and urlencode
+     *
+     * @param string $string template_resource to decode
+     * @return string decoded template_resource
+     */
+    protected function decode($string)
+    {
+        // decode if specified
+        if (($pos = strpos($string, ':')) !== false) {
+            if (!strncmp($string, 'base64', 6)) {
+                return base64_decode(substr($string, 7));
+            } elseif (!strncmp($string, 'urlencode', 9)) {
+                return urldecode(substr($string, 10));
+            }
+        }
+        
+        return $string;
+    }
+    
+    /**
+     * modify resource_name according to resource handlers specifications
+     *
+     * @param Smarty $smarty        Smarty instance
+     * @param string $resource_name resource_name to make unique
+     * @return string unique resource name
+     */
+    protected function buildUniqueResourceName(Smarty $smarty, $resource_name)
+    {
+        return get_class($this) . '#' .$this->decode($resource_name);
+    }
+
+    /**
+     * Determine basename for compiled filename
+     *
+     * Always returns an empty string.
+     *
+     * @param Smarty_Template_Source $source source object
+     * @return string resource's basename
+     */
+    protected function getBasename(Smarty_Template_Source $source)
+    {
+        return '';
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php b/lib/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php
new file mode 100644
index 0000000..1ec1aa4
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Smarty Internal Plugin Smarty Template Compiler Base
+ *
+ * This file contains the basic classes and methodes for compiling Smarty templates with lexer/parser
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * @ignore
+ */
+include ("smarty_internal_parsetree.php");
+
+/**
+ * Class SmartyTemplateCompiler
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCompilerBase {
+
+    /**
+     * Lexer class name
+     *
+     * @var string
+     */
+    public $lexer_class;
+
+    /**
+     * Parser class name
+     *
+     * @var string
+     */
+    public $parser_class;
+
+    /**
+     * Lexer object
+     *
+     * @var object
+     */
+    public $lex;
+
+    /**
+     * Parser object
+     *
+     * @var object
+     */
+    public $parser;
+
+    /**
+     * Smarty object
+     *
+     * @var object
+     */
+    public $smarty;
+
+    /**
+     * array of vars which can be compiled in local scope
+     *
+     * @var array
+     */
+    public $local_var = array();
+
+    /**
+     * Initialize compiler
+     *
+     * @param string $lexer_class  class name
+     * @param string $parser_class class name
+     * @param Smarty $smarty       global instance
+     */
+    public function __construct($lexer_class, $parser_class, $smarty)
+    {
+        $this->smarty = $smarty;
+        parent::__construct();
+        // get required plugins
+        $this->lexer_class = $lexer_class;
+        $this->parser_class = $parser_class;
+    }
+
+    /**
+     * Methode to compile a Smarty template
+     *
+     * @param  mixed $_content template source
+     * @return bool true if compiling succeeded, false if it failed
+     */
+    protected function doCompile($_content)
+    {
+        /* here is where the compiling takes place. Smarty
+          tags in the templates are replaces with PHP code,
+          then written to compiled files. */
+        // init the lexer/parser to compile the template
+        $this->lex = new $this->lexer_class($_content, $this);
+        $this->parser = new $this->parser_class($this->lex, $this);
+        if ($this->smarty->_parserdebug)
+            $this->parser->PrintTrace();
+        // get tokens from lexer and parse them
+        while ($this->lex->yylex() && !$this->abort_and_recompile) {
+            if ($this->smarty->_parserdebug) {
+                echo "<pre>Line {$this->lex->line} Parsing  {$this->parser->yyTokenName[$this->lex->token]} Token " .
+                    htmlentities($this->lex->value) . "</pre>";
+            }
+            $this->parser->doParse($this->lex->token, $this->lex->value);
+        }
+
+        if ($this->abort_and_recompile) {
+            // exit here on abort
+            return false;
+        }
+        // finish parsing process
+        $this->parser->doParse(0, 0);
+        // check for unclosed tags
+        if (count($this->_tag_stack) > 0) {
+            // get stacked info
+            list($openTag, $_data) = array_pop($this->_tag_stack);
+            $this->trigger_template_error("unclosed {" . $openTag . "} tag");
+        }
+        // return compiled code
+        // return str_replace(array("? >\n<?php","? ><?php"), array('',''), $this->parser->retvalue);
+        return $this->parser->retvalue;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_template.php b/lib/smarty/sysplugins/smarty_internal_template.php
new file mode 100644
index 0000000..94b27b9
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_template.php
@@ -0,0 +1,684 @@
+<?php
+/**
+ * Smarty Internal Plugin Template
+ *
+ * This file contains the Smarty template engine
+ *
+ * @package Smarty
+ * @subpackage Template
+ * @author Uwe Tews
+ */
+
+/**
+ * Main class with template data structures and methods
+ *
+ * @package Smarty
+ * @subpackage Template
+ *
+ * @property Smarty_Template_Source   $source
+ * @property Smarty_Template_Compiled $compiled
+ * @property Smarty_Template_Cached   $cached
+ */
+class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
+
+    /**
+     * cache_id
+     * @var string
+     */
+    public $cache_id = null;
+    /**
+     * $compile_id
+     * @var string
+     */
+    public $compile_id = null;
+    /**
+     * caching enabled
+     * @var boolean
+     */
+    public $caching = null;
+    /**
+     * cache lifetime in seconds
+     * @var integer
+     */
+    public $cache_lifetime = null;
+    /**
+     * Template resource
+     * @var string
+     */
+    public $template_resource = null;
+    /**
+     * flag if compiled template is invalid and must be (re)compiled
+     * @var bool
+     */
+    public $mustCompile = null;
+    /**
+     * flag if template does contain nocache code sections
+     * @var bool
+     */
+    public $has_nocache_code = false;
+    /**
+     * special compiled and cached template properties
+     * @var array
+     */
+    public $properties = array('file_dependency' => array(),
+        'nocache_hash' => '',
+        'function' => array());
+    /**
+     * required plugins
+     * @var array
+     */
+    public $required_plugins = array('compiled' => array(), 'nocache' => array());
+    /**
+     * Global smarty instance
+     * @var Smarty
+     */
+    public $smarty = null;
+    /**
+     * blocks for template inheritance
+     * @var array
+     */
+    public $block_data = array();
+    /**
+     * variable filters
+     * @var array
+     */
+    public $variable_filters = array();
+    /**
+     * optional log of tag/attributes
+     * @var array
+     */
+    public $used_tags = array();
+    /**
+     * internal flag to allow relative path in child template blocks
+     * @var bool
+     */
+    public $allow_relative_path = false;
+    /**
+     * internal capture runtime stack
+     * @var array
+     */
+    public $_capture_stack = array(0 => array());
+
+    /**
+     * Create template data object
+     *
+     * Some of the global Smarty settings copied to template scope
+     * It load the required template resources and cacher plugins
+     *
+     * @param string                   $template_resource template resource string
+     * @param Smarty                   $smarty            Smarty instance
+     * @param Smarty_Internal_Template $_parent           back pointer to parent object with variables or null
+     * @param mixed                    $_cache_id cache   id or null
+     * @param mixed                    $_compile_id       compile id or null
+     * @param bool                     $_caching          use caching?
+     * @param int                      $_cache_lifetime   cache life-time in seconds
+     */
+    public function __construct($template_resource, $smarty, $_parent = null, $_cache_id = null, $_compile_id = null, $_caching = null, $_cache_lifetime = null)
+    {
+        $this->smarty = &$smarty;
+        // Smarty parameter
+        $this->cache_id = $_cache_id === null ? $this->smarty->cache_id : $_cache_id;
+        $this->compile_id = $_compile_id === null ? $this->smarty->compile_id : $_compile_id;
+        $this->caching = $_caching === null ? $this->smarty->caching : $_caching;
+        if ($this->caching === true)
+            $this->caching = Smarty::CACHING_LIFETIME_CURRENT;
+        $this->cache_lifetime = $_cache_lifetime === null ? $this->smarty->cache_lifetime : $_cache_lifetime;
+        $this->parent = $_parent;
+        // Template resource
+        $this->template_resource = $template_resource;
+        // copy block data of template inheritance
+        if ($this->parent instanceof Smarty_Internal_Template) {
+            $this->block_data = $this->parent->block_data;
+        }
+    }
+
+    /**
+     * Returns if the current template must be compiled by the Smarty compiler
+     *
+     * It does compare the timestamps of template source and the compiled templates and checks the force compile configuration
+     *
+     * @return boolean true if the template must be compiled
+     */
+    public function mustCompile()
+    {
+        if (!$this->source->exists) {
+            if ($this->parent instanceof Smarty_Internal_Template) {
+                $parent_resource = " in '$this->parent->template_resource}'";
+            } else {
+                $parent_resource = '';
+            }
+            throw new SmartyException("Unable to load template {$this->source->type} '{$this->source->name}'{$parent_resource}");
+        }
+        if ($this->mustCompile === null) {
+            $this->mustCompile = (!$this->source->uncompiled && ($this->smarty->force_compile || $this->source->recompiled || $this->compiled->timestamp === false ||
+                    ($this->smarty->compile_check && $this->compiled->timestamp < $this->source->timestamp)));
+        }
+        return $this->mustCompile;
+    }
+
+    /**
+     * Compiles the template
+     *
+     * If the template is not evaluated the compiled template is saved on disk
+     */
+    public function compileTemplateSource()
+    {
+        if (!$this->source->recompiled) {
+            $this->properties['file_dependency'] = array();
+            if ($this->source->components) {
+                // uses real resource for file dependency
+                $source = end($this->source->components);
+                $this->properties['file_dependency'][$this->source->uid] = array($this->source->filepath, $this->source->timestamp, $source->type);
+            } else {
+                $this->properties['file_dependency'][$this->source->uid] = array($this->source->filepath, $this->source->timestamp, $this->source->type);
+            }
+        }
+        if ($this->smarty->debugging) {
+            Smarty_Internal_Debug::start_compile($this);
+        }
+        // compile locking
+        if ($this->smarty->compile_locking && !$this->source->recompiled) {
+            if ($saved_timestamp = $this->compiled->timestamp) {
+                touch($this->compiled->filepath);
+            }
+        }
+        // call compiler
+        try {
+            $code = $this->compiler->compileTemplate($this);
+        } catch (Exception $e) {
+            // restore old timestamp in case of error
+            if ($this->smarty->compile_locking && !$this->source->recompiled && $saved_timestamp) {
+                touch($this->compiled->filepath, $saved_timestamp);
+            }
+            throw $e;
+        }
+        // compiling succeded
+        if (!$this->source->recompiled && $this->compiler->write_compiled_code) {
+            // write compiled template
+            $_filepath = $this->compiled->filepath;
+            if ($_filepath === false)
+                throw new SmartyException('getCompiledFilepath() did not return a destination to save the compiled template to');
+            Smarty_Internal_Write_File::writeFile($_filepath, $code, $this->smarty);
+            $this->compiled->exists = true;
+            $this->compiled->isCompiled = true;
+        }
+        if ($this->smarty->debugging) {
+            Smarty_Internal_Debug::end_compile($this);
+        }
+        // release compiler object to free memory
+        unset($this->compiler);
+    }
+
+    /**
+     * Writes the cached template output
+     *
+     * @return bool
+     */
+    public function writeCachedContent($content)
+    {
+        if ($this->source->recompiled || !($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED)) {
+            // don't write cache file
+            return false;
+        }
+        $this->properties['cache_lifetime'] = $this->cache_lifetime;
+        $this->properties['unifunc'] = 'content_' . uniqid('', false);
+        $content = $this->createTemplateCodeFrame($content, true);
+        $_smarty_tpl = $this;
+        eval("?>" . $content);
+        $this->cached->valid = true;
+        $this->cached->processed = true;
+        return $this->cached->write($this, $content);
+    }
+
+    /**
+     * Template code runtime function to get subtemplate content
+     *
+     * @param string  $template       the resource handle of the template file
+     * @param mixed   $cache_id       cache id to be used with this template
+     * @param mixed   $compile_id     compile id to be used with this template
+     * @param integer $caching        cache mode
+     * @param integer $cache_lifetime life time of cache data
+     * @param array   $vars optional  variables to assign
+     * @param int     $parent_scope   scope in which {include} should execute
+     * @returns string template content
+     */
+    public function getSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope)
+    {
+        // already in template cache?
+        if ($this->smarty->allow_ambiguous_resources) {
+            $_templateId = Smarty_Resource::getUniqueTemplateName($this->smarty, $template) . $cache_id . $compile_id;
+        } else {
+            $_templateId = $this->smarty->joined_template_dir . '#' . $template . $cache_id . $compile_id;
+        }
+
+        if (isset($_templateId[150])) {
+            $_templateId = sha1($_templateId);
+        }
+        if (isset($this->smarty->template_objects[$_templateId])) {
+            // clone cached template object because of possible recursive call
+            $tpl = clone $this->smarty->template_objects[$_templateId];
+            $tpl->parent = $this;
+            $tpl->caching = $caching;
+            $tpl->cache_lifetime = $cache_lifetime;
+        } else {
+            $tpl = new $this->smarty->template_class($template, $this->smarty, $this, $cache_id, $compile_id, $caching, $cache_lifetime);
+        }
+        // get variables from calling scope
+        if ($parent_scope == Smarty::SCOPE_LOCAL) {
+            $tpl->tpl_vars = $this->tpl_vars;
+        } elseif ($parent_scope == Smarty::SCOPE_PARENT) {
+            $tpl->tpl_vars = &$this->tpl_vars;
+        } elseif ($parent_scope == Smarty::SCOPE_GLOBAL) {
+            $tpl->tpl_vars = &Smarty::$global_tpl_vars;
+        } elseif (($scope_ptr = $this->getScopePointer($parent_scope)) == null) {
+            $tpl->tpl_vars = &$this->tpl_vars;
+        } else {
+            $tpl->tpl_vars = &$scope_ptr->tpl_vars;
+        }
+        $tpl->config_vars = $this->config_vars;
+        if (!empty($data)) {
+            // set up variable values
+            foreach ($data as $_key => $_val) {
+                $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
+            }
+        }
+        return $tpl->fetch(null, null, null, null, false, false, true);
+    }
+
+    /**
+     * Template code runtime function to set up an inline subtemplate
+     *
+     * @param string  $template       the resource handle of the template file
+     * @param mixed   $cache_id       cache id to be used with this template
+     * @param mixed   $compile_id     compile id to be used with this template
+     * @param integer $caching        cache mode
+     * @param integer $cache_lifetime life time of cache data
+     * @param array   $vars optional  variables to assign
+     * @param int     $parent_scope   scope in which {include} should execute
+     * @param string  $hash           nocache hash code
+     * @returns string template content
+     */
+    public function setupInlineSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope, $hash)
+    {
+        $tpl = new $this->smarty->template_class($template, $this->smarty, $this, $cache_id, $compile_id, $caching, $cache_lifetime);
+        $tpl->properties['nocache_hash']  = $hash;
+        // get variables from calling scope
+        if ($parent_scope == Smarty::SCOPE_LOCAL ) {
+            $tpl->tpl_vars = $this->tpl_vars;
+        } elseif ($parent_scope == Smarty::SCOPE_PARENT) {
+            $tpl->tpl_vars = &$this->tpl_vars;
+        } elseif ($parent_scope == Smarty::SCOPE_GLOBAL) {
+            $tpl->tpl_vars = &Smarty::$global_tpl_vars;
+        } elseif (($scope_ptr = $this->getScopePointer($parent_scope)) == null) {
+            $tpl->tpl_vars = &$this->tpl_vars;
+        } else {
+            $tpl->tpl_vars = &$scope_ptr->tpl_vars;
+        }
+        $tpl->config_vars = $this->config_vars;
+        if (!empty($data)) {
+            // set up variable values
+            foreach ($data as $_key => $_val) {
+                $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
+            }
+        }
+        return $tpl;
+    }
+
+
+    /**
+     * Create code frame for compiled and cached templates
+     *
+     * @param string $content   optional template content
+     * @param bool   $cache     flag for cache file
+     * @return string
+     */
+    public function createTemplateCodeFrame($content = '', $cache = false)
+    {
+        $plugins_string = '';
+        // include code for plugins
+        if (!$cache) {
+            if (!empty($this->required_plugins['compiled'])) {
+                $plugins_string = '<?php ';
+                foreach ($this->required_plugins['compiled'] as $tmp) {
+                    foreach ($tmp as $data) {
+                        $file = addslashes($data['file']);
+                        $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$file}';\n";
+                    }
+                }
+                $plugins_string .= '?>';
+            }
+            if (!empty($this->required_plugins['nocache'])) {
+                $this->has_nocache_code = true;
+                $plugins_string .= "<?php echo '/*%%SmartyNocache:{$this->properties['nocache_hash']}%%*/<?php \$_smarty = \$_smarty_tpl->smarty; ";
+                foreach ($this->required_plugins['nocache'] as $tmp) {
+                    foreach ($tmp as $data) {
+                        $file = addslashes($data['file']);
+                        $plugins_string .= addslashes("if (!is_callable('{$data['function']}')) include '{$file}';\n");
+                    }
+                }
+                $plugins_string .= "?>/*/%%SmartyNocache:{$this->properties['nocache_hash']}%%*/';?>\n";
+            }
+        }
+        // build property code
+        $this->properties['has_nocache_code'] = $this->has_nocache_code;
+        $output = '';
+        if (!$this->source->recompiled) {
+            $output = "<?php /*%%SmartyHeaderCode:{$this->properties['nocache_hash']}%%*/";
+            if ($this->smarty->direct_access_security) {
+                $output .= "if(!defined('SMARTY_DIR')) exit('no direct access allowed');\n";
+            }
+        }
+        if ($cache) {
+            // remove compiled code of{function} definition
+            unset($this->properties['function']);
+            if (!empty($this->smarty->template_functions)) {
+                // copy code of {function} tags called in nocache mode
+                foreach ($this->smarty->template_functions as $name => $function_data) {
+                    if (isset($function_data['called_nocache'])) {
+                        foreach ($function_data['called_functions'] as $func_name) {
+                            $this->smarty->template_functions[$func_name]['called_nocache'] = true;
+                        }
+                    }
+                }
+                 foreach ($this->smarty->template_functions as $name => $function_data) {
+                    if (isset($function_data['called_nocache'])) {
+                        unset($function_data['called_nocache'], $function_data['called_functions'], $this->smarty->template_functions[$name]['called_nocache']);
+                        $this->properties['function'][$name] = $function_data;
+                    }
+                }
+            }
+        }
+        $this->properties['version'] = Smarty::SMARTY_VERSION;
+        if (!isset($this->properties['unifunc'])) {
+            $this->properties['unifunc'] = 'content_' . uniqid('', false);
+        }
+        if (!$this->source->recompiled) {
+            $output .= "\$_valid = \$_smarty_tpl->decodeProperties(" . var_export($this->properties, true) . ',' . ($cache ? 'true' : 'false') . "); /*/%%SmartyHeaderCode%%*/?>\n";
+        }
+        if (!$this->source->recompiled) {
+            $output .= '<?php if ($_valid && !is_callable(\'' . $this->properties['unifunc'] . '\')) {function ' . $this->properties['unifunc'] . '($_smarty_tpl) {?>';
+        }
+        $output .= $plugins_string;
+        $output .= $content;
+        if (!$this->source->recompiled) {
+            $output .= '<?php }} ?>';
+        }
+        return $output;
+    }
+
+    /**
+     * This function is executed automatically when a compiled or cached template file is included
+     *
+     * - Decode saved properties from compiled template and cache files
+     * - Check if compiled or cache file is valid
+     *
+     * @param array $properties     special template properties
+     * @param bool  $cache          flag if called from cache file
+     * @return bool                 flag if compiled or cache file is valid
+     */
+    public function decodeProperties($properties, $cache = false)
+    {
+        $this->has_nocache_code = $properties['has_nocache_code'];
+        $this->properties['nocache_hash'] = $properties['nocache_hash'];
+        if (isset($properties['cache_lifetime'])) {
+            $this->properties['cache_lifetime'] = $properties['cache_lifetime'];
+        }
+        if (isset($properties['file_dependency'])) {
+            $this->properties['file_dependency'] = array_merge($this->properties['file_dependency'], $properties['file_dependency']);
+        }
+        if (!empty($properties['function'])) {
+            $this->properties['function'] = array_merge($this->properties['function'], $properties['function']);
+            $this->smarty->template_functions = array_merge($this->smarty->template_functions, $properties['function']);
+        }
+        $this->properties['version'] = (isset($properties['version'])) ? $properties['version'] : '';
+        $this->properties['unifunc'] = $properties['unifunc'];
+        // check file dependencies at compiled code
+        $is_valid = true;
+        if ($this->properties['version'] != Smarty::SMARTY_VERSION) {
+            $is_valid = false;
+        } else if (((!$cache && $this->smarty->compile_check && empty($this->compiled->_properties) && !$this->compiled->isCompiled) || $cache && ($this->smarty->compile_check === true || $this->smarty->compile_check === Smarty::COMPILECHECK_ON)) && !empty($this->properties['file_dependency'])) {
+            foreach ($this->properties['file_dependency'] as $_file_to_check) {
+                if ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'php') {
+                    if ($this->source->filepath == $_file_to_check[0] && isset($this->source->timestamp)) {
+                        // do not recheck current template
+                        $mtime = $this->source->timestamp;
+                    } else {
+                        // file and php types can be checked without loading the respective resource handlers
+                        $mtime = filemtime($_file_to_check[0]);
+                    }
+                } elseif ($_file_to_check[2] == 'string') {
+                    continue;
+                } else {
+                    $source = Smarty_Resource::source(null, $this->smarty, $_file_to_check[0]);
+                    $mtime = $source->timestamp;
+                }
+                if ($mtime > $_file_to_check[1]) {
+                    $is_valid = false;
+                    break;
+                }
+            }
+        }
+        if ($cache) {
+            $this->cached->valid = $is_valid;
+        } else {
+            $this->mustCompile = !$is_valid;
+        }
+        // store data in reusable Smarty_Template_Compiled
+        if (!$cache) {
+            $this->compiled->_properties = $properties;
+        }
+        return $is_valid;
+    }
+
+    /**
+     * Template code runtime function to create a local Smarty variable for array assignments
+     *
+     * @param string $tpl_var   tempate variable name
+     * @param bool   $nocache   cache mode of variable
+     * @param int    $scope     scope of variable
+     */
+    public function createLocalArrayVariable($tpl_var, $nocache = false, $scope = Smarty::SCOPE_LOCAL)
+    {
+        if (!isset($this->tpl_vars[$tpl_var])) {
+            $this->tpl_vars[$tpl_var] = new Smarty_variable(array(), $nocache, $scope);
+        } else {
+            $this->tpl_vars[$tpl_var] = clone $this->tpl_vars[$tpl_var];
+            if ($scope != Smarty::SCOPE_LOCAL) {
+                $this->tpl_vars[$tpl_var]->scope = $scope;
+            }
+            if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) {
+                settype($this->tpl_vars[$tpl_var]->value, 'array');
+            }
+        }
+    }
+
+    /**
+     * Template code runtime function to get pointer to template variable array of requested scope
+     *
+     * @param int $scope    requested variable scope
+     * @return array        array of template variables
+     */
+    public function &getScope($scope)
+    {
+        if ($scope == Smarty::SCOPE_PARENT && !empty($this->parent)) {
+            return $this->parent->tpl_vars;
+        } elseif ($scope == Smarty::SCOPE_ROOT && !empty($this->parent)) {
+            $ptr = $this->parent;
+            while (!empty($ptr->parent)) {
+                $ptr = $ptr->parent;
+            }
+            return $ptr->tpl_vars;
+        } elseif ($scope == Smarty::SCOPE_GLOBAL) {
+            return Smarty::$global_tpl_vars;
+        }
+        $null = null;
+        return $null;
+    }
+
+    /**
+     * Get parent or root of template parent chain
+     *
+     * @param int $scope    pqrent or root scope
+     * @return mixed object
+     */
+    public function getScopePointer($scope)
+    {
+        if ($scope == Smarty::SCOPE_PARENT && !empty($this->parent)) {
+            return $this->parent;
+        } elseif ($scope == Smarty::SCOPE_ROOT && !empty($this->parent)) {
+            $ptr = $this->parent;
+            while (!empty($ptr->parent)) {
+                $ptr = $ptr->parent;
+            }
+            return $ptr;
+        }
+        return null;
+    }
+
+    /**
+     * [util function] counts an array, arrayaccess/traversable or PDOStatement object
+     *
+     * @param mixed $value
+     * @return int the count for arrays and objects that implement countable, 1 for other objects that don't, and 0 for empty elements
+     */
+    public function _count($value)
+    {
+        if (is_array($value) === true || $value instanceof Countable) {
+            return count($value);
+        } elseif ($value instanceof IteratorAggregate) {
+            // Note: getIterator() returns a Traversable, not an Iterator
+            // thus rewind() and valid() methods may not be present
+            return iterator_count($value->getIterator());
+        } elseif ($value instanceof Iterator) {
+            return iterator_count($value);
+        } elseif ($value instanceof PDOStatement) {
+            return $value->rowCount();
+        } elseif ($value instanceof Traversable) {
+            return iterator_count($value);
+        } elseif ($value instanceof ArrayAccess) {
+            if ($value->offsetExists(0)) {
+                return 1;
+            }
+        } elseif (is_object($value)) {
+            return count($value);
+        }
+        return 0;
+    }
+
+    /**
+     * runtime error not matching capture tags
+     *
+     */
+    public function capture_error()
+    {
+        throw new SmartyException("Not matching {capture} open/close in \"{$this->template_resource}\"");
+    }
+
+    /**
+    * Empty cache for this template
+    *
+    * @param integer $exp_time      expiration time
+    * @return integer number of cache files deleted
+    */
+    public function clearCache($exp_time=null)
+    {
+        Smarty_CacheResource::invalidLoadedCache($this->smarty);
+        return $this->cached->handler->clear($this->smarty, $this->template_name, $this->cache_id, $this->compile_id, $exp_time);
+    }
+
+     /**
+     * set Smarty property in template context
+     *
+     * @param string $property_name property name
+     * @param mixed  $value         value
+     */
+    public function __set($property_name, $value)
+    {
+        switch ($property_name) {
+            case 'source':
+            case 'compiled':
+            case 'cached':
+            case 'compiler':
+                $this->$property_name = $value;
+                return;
+
+            // FIXME: routing of template -> smarty attributes
+            default:
+                if (property_exists($this->smarty, $property_name)) {
+                    $this->smarty->$property_name = $value;
+                    return;
+                }
+        }
+
+        throw new SmartyException("invalid template property '$property_name'.");
+    }
+
+    /**
+     * get Smarty property in template context
+     *
+     * @param string $property_name property name
+     */
+    public function __get($property_name)
+    {
+        switch ($property_name) {
+            case 'source':
+                if (empty($this->template_resource)) {
+                    throw new SmartyException("Unable to parse resource name \"{$this->template_resource}\"");
+                }
+                $this->source = Smarty_Resource::source($this);
+                // cache template object under a unique ID
+                // do not cache eval resources
+                if ($this->source->type != 'eval') {
+                    if ($this->smarty->allow_ambiguous_resources) {
+                        $_templateId = $this->source->unique_resource . $this->cache_id . $this->compile_id;
+                    } else {
+                        $_templateId = $this->smarty->joined_template_dir . '#' . $this->template_resource . $this->cache_id . $this->compile_id;
+                    }
+
+                    if (isset($_templateId[150])) {
+                        $_templateId = sha1($_templateId);
+                    }
+                    $this->smarty->template_objects[$_templateId] = $this;
+                }
+                return $this->source;
+
+            case 'compiled':
+                $this->compiled = $this->source->getCompiled($this);
+                return $this->compiled;
+
+            case 'cached':
+                if (!class_exists('Smarty_Template_Cached')) {
+                    include SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
+                }
+                $this->cached = new Smarty_Template_Cached($this);
+                return $this->cached;
+
+            case 'compiler':
+                $this->smarty->loadPlugin($this->source->compiler_class);
+                $this->compiler = new $this->source->compiler_class($this->source->template_lexer_class, $this->source->template_parser_class, $this->smarty);
+                return $this->compiler;
+
+            // FIXME: routing of template -> smarty attributes
+            default:
+                if (property_exists($this->smarty, $property_name)) {
+                    return $this->smarty->$property_name;
+                }
+        }
+
+        throw new SmartyException("template property '$property_name' does not exist.");
+    }
+
+    /**
+     * Template data object destrutor
+     *
+     */
+    public function __destruct()
+    {
+        if ($this->smarty->cache_locking && isset($this->cached) && $this->cached->is_locked) {
+            $this->cached->handler->releaseLock($this->smarty, $this->cached);
+        }
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_templatebase.php b/lib/smarty/sysplugins/smarty_internal_templatebase.php
new file mode 100644
index 0000000..83209d2
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_templatebase.php
@@ -0,0 +1,811 @@
+<?php
+/**
+ * Smarty Internal Plugin Smarty Template  Base
+ *
+ * This file contains the basic shared methodes for template handling
+ *
+ * @package Smarty
+ * @subpackage Template
+ * @author Uwe Tews
+ */
+
+/**
+ * Class with shared template methodes
+ *
+ * @package Smarty
+ * @subpackage Template
+ */
+abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data {
+
+    /**
+     * fetches a rendered Smarty template
+     *
+     * @param string $template          the resource handle of the template file or template object
+     * @param mixed  $cache_id          cache id to be used with this template
+     * @param mixed  $compile_id        compile id to be used with this template
+     * @param object $parent            next higher level of Smarty variables
+     * @param bool   $display           true: display, false: fetch
+     * @param bool   $merge_tpl_vars    if true parent template variables merged in to local scope
+     * @param bool   $no_output_filter  if true do not run output filter
+     * @return string rendered template output
+     */
+    public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null, $display = false, $merge_tpl_vars = true, $no_output_filter = false)
+    {
+        if ($template === null && $this instanceof $this->template_class) {
+            $template = $this;
+        }
+        if (!empty($cache_id) && is_object($cache_id)) {
+            $parent = $cache_id;
+            $cache_id = null;
+        }
+        if ($parent === null && ($this instanceof Smarty || is_string($template))) {
+            $parent = $this;
+        }
+        // create template object if necessary
+        $_template = ($template instanceof $this->template_class)
+        ? $template
+        : $this->smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);
+        // if called by Smarty object make sure we use current caching status
+        if ($this instanceof Smarty) {
+            $_template->caching = $this->caching;
+        }
+        // merge all variable scopes into template
+        if ($merge_tpl_vars) {
+            // save local variables
+            $save_tpl_vars = $_template->tpl_vars;
+            $save_config_vars = $_template->config_vars;
+            $ptr_array = array($_template);
+            $ptr = $_template;
+            while (isset($ptr->parent)) {
+                $ptr_array[] = $ptr = $ptr->parent;
+            }
+            $ptr_array = array_reverse($ptr_array);
+            $parent_ptr = reset($ptr_array);
+            $tpl_vars = $parent_ptr->tpl_vars;
+            $config_vars = $parent_ptr->config_vars;
+            while ($parent_ptr = next($ptr_array)) {
+                if (!empty($parent_ptr->tpl_vars)) {
+                    $tpl_vars = array_merge($tpl_vars, $parent_ptr->tpl_vars);
+                }
+                if (!empty($parent_ptr->config_vars)) {
+                    $config_vars = array_merge($config_vars, $parent_ptr->config_vars);
+                }
+            }
+            if (!empty(Smarty::$global_tpl_vars)) {
+                $tpl_vars = array_merge(Smarty::$global_tpl_vars, $tpl_vars);
+            }
+            $_template->tpl_vars = $tpl_vars;
+            $_template->config_vars = $config_vars;
+        }
+        // dummy local smarty variable
+        if (!isset($_template->tpl_vars['smarty'])) {
+            $_template->tpl_vars['smarty'] = new Smarty_Variable;
+        }
+        if (isset($this->smarty->error_reporting)) {
+            $_smarty_old_error_level = error_reporting($this->smarty->error_reporting);
+        }
+        // check URL debugging control
+        if (!$this->smarty->debugging && $this->smarty->debugging_ctrl == 'URL') {
+            if (isset($_SERVER['QUERY_STRING'])) {
+                $_query_string = $_SERVER['QUERY_STRING'];
+            } else {
+                $_query_string = '';
+            }
+            if (false !== strpos($_query_string, $this->smarty->smarty_debug_id)) {
+                if (false !== strpos($_query_string, $this->smarty->smarty_debug_id . '=on')) {
+                    // enable debugging for this browser session
+                    setcookie('SMARTY_DEBUG', true);
+                    $this->smarty->debugging = true;
+                } elseif (false !== strpos($_query_string, $this->smarty->smarty_debug_id . '=off')) {
+                    // disable debugging for this browser session
+                    setcookie('SMARTY_DEBUG', false);
+                    $this->smarty->debugging = false;
+                } else {
+                    // enable debugging for this page
+                    $this->smarty->debugging = true;
+                }
+            } else {
+                if (isset($_COOKIE['SMARTY_DEBUG'])) {
+                    $this->smarty->debugging = true;
+                }
+            }
+        }
+        // must reset merge template date
+        $_template->smarty->merged_templates_func = array();
+        // get rendered template
+        // disable caching for evaluated code
+        if ($_template->source->recompiled) {
+            $_template->caching = false;
+        }
+        // checks if template exists
+        if (!$_template->source->exists) {
+            if ($_template->parent instanceof Smarty_Internal_Template) {
+                $parent_resource = " in '{$_template->parent->template_resource}'";
+            } else {
+                $parent_resource = '';
+            }
+            throw new SmartyException("Unable to load template {$_template->source->type} '{$_template->source->name}'{$parent_resource}");
+        }
+        // read from cache or render
+        if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || !$_template->cached->valid) {
+            // render template (not loaded and not in cache)
+            if (!$_template->source->uncompiled) {
+                $_smarty_tpl = $_template;
+                if ($_template->source->recompiled) {
+                    if ($this->smarty->debugging) {
+                        Smarty_Internal_Debug::start_compile($_template);
+                    }
+                    $code = $_template->compiler->compileTemplate($_template);
+                    if ($this->smarty->debugging) {
+                        Smarty_Internal_Debug::end_compile($_template);
+                    }
+                    if ($this->smarty->debugging) {
+                        Smarty_Internal_Debug::start_render($_template);
+                    }
+                    try {
+                        ob_start();
+                        eval("?>" . $code);
+                        unset($code);
+                    } catch (Exception $e) {
+                        ob_get_clean();
+                        throw $e;
+                    }
+                } else {
+                    if (!$_template->compiled->exists || ($_template->smarty->force_compile && !$_template->compiled->isCompiled)) {
+                        $_template->compileTemplateSource();
+                    }
+                    if ($this->smarty->debugging) {
+                        Smarty_Internal_Debug::start_render($_template);
+                    }
+                    if (!$_template->compiled->loaded) {
+                        include($_template->compiled->filepath);
+                        if ($_template->mustCompile) {
+                            // recompile and load again
+                            $_template->compileTemplateSource();
+                            include($_template->compiled->filepath);
+                        }
+                        $_template->compiled->loaded = true;
+                    } else {
+                        $_template->decodeProperties($_template->compiled->_properties, false);
+                    }
+                    try {
+                        ob_start();
+                        if (empty($_template->properties['unifunc']) || !is_callable($_template->properties['unifunc'])) {
+                            throw new SmartyException("Invalid compiled template for '{$_template->template_resource}'");
+                        }
+                        array_unshift($_template->_capture_stack,array());
+                        //
+                        // render compiled template
+                        //
+                        $_template->properties['unifunc']($_template);
+                        // any unclosed {capture} tags ?
+                        if (isset($_template->_capture_stack[0][0])) {
+                            $_template->capture_error();
+                        }
+                        array_shift($_template->_capture_stack);
+                    } catch (Exception $e) {
+                        ob_get_clean();
+                        throw $e;
+                    }
+                }
+            } else {
+                if ($_template->source->uncompiled) {
+                    if ($this->smarty->debugging) {
+                        Smarty_Internal_Debug::start_render($_template);
+                    }
+                    try {
+                        ob_start();
+                        $_template->source->renderUncompiled($_template);
+                    } catch (Exception $e) {
+                        ob_get_clean();
+                        throw $e;
+                    }
+                } else {
+                    throw new SmartyException("Resource '$_template->source->type' must have 'renderUncompiled' method");
+                }
+            }
+            $_output = ob_get_clean();
+            if (!$_template->source->recompiled && empty($_template->properties['file_dependency'][$_template->source->uid])) {
+                $_template->properties['file_dependency'][$_template->source->uid] = array($_template->source->filepath, $_template->source->timestamp, $_template->source->type);
+            }
+            if ($_template->parent instanceof Smarty_Internal_Template) {
+                $_template->parent->properties['file_dependency'] = array_merge($_template->parent->properties['file_dependency'], $_template->properties['file_dependency']);
+                foreach ($_template->required_plugins as $code => $tmp1) {
+                    foreach ($tmp1 as $name => $tmp) {
+                        foreach ($tmp as $type => $data) {
+                            $_template->parent->required_plugins[$code][$name][$type] = $data;
+                        }
+                    }
+                }
+            }
+            if ($this->smarty->debugging) {
+                Smarty_Internal_Debug::end_render($_template);
+            }
+            // write to cache when nessecary
+            if (!$_template->source->recompiled && ($_template->caching == Smarty::CACHING_LIFETIME_SAVED || $_template->caching == Smarty::CACHING_LIFETIME_CURRENT)) {
+                if ($this->smarty->debugging) {
+                    Smarty_Internal_Debug::start_cache($_template);
+                }
+                $_template->properties['has_nocache_code'] = false;
+                // get text between non-cached items
+                $cache_split = preg_split("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $_output);
+                // get non-cached items
+                preg_match_all("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $_output, $cache_parts);
+                $output = '';
+                // loop over items, stitch back together
+                foreach ($cache_split as $curr_idx => $curr_split) {
+                    // escape PHP tags in template content
+                    $output .= preg_replace('/(<%|%>|<\?php|<\?|\?>)/', '<?php echo \'$1\'; ?>', $curr_split);
+                    if (isset($cache_parts[0][$curr_idx])) {
+                        $_template->properties['has_nocache_code'] = true;
+                        // remove nocache tags from cache output
+                        $output .= preg_replace("!/\*/?%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!", '', $cache_parts[0][$curr_idx]);
+                    }
+                }
+                if (!$no_output_filter && (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))) {
+                    $output = Smarty_Internal_Filter_Handler::runFilter('output', $output, $_template);
+                }
+                // rendering (must be done before writing cache file because of {function} nocache handling)
+                $_smarty_tpl = $_template;
+                try {
+                    ob_start();
+                    eval("?>" . $output);
+                    $_output = ob_get_clean();
+                } catch (Exception $e) {
+                    ob_get_clean();
+                    throw $e;
+                }
+                // write cache file content
+                $_template->writeCachedContent($output);
+                if ($this->smarty->debugging) {
+                    Smarty_Internal_Debug::end_cache($_template);
+                }
+            } else {
+                // var_dump('renderTemplate', $_template->has_nocache_code, $_template->template_resource, $_template->properties['nocache_hash'], $_template->parent->properties['nocache_hash'], $_output);
+                if (!empty($_template->properties['nocache_hash']) && !empty($_template->parent->properties['nocache_hash'])) {
+                    // replace nocache_hash
+                    $_output = preg_replace("/{$_template->properties['nocache_hash']}/", $_template->parent->properties['nocache_hash'], $_output);
+                    $_template->parent->has_nocache_code = $_template->parent->has_nocache_code || $_template->has_nocache_code;
+                }
+            }
+        } else {
+            if ($this->smarty->debugging) {
+                Smarty_Internal_Debug::start_cache($_template);
+            }
+            try {
+                ob_start();
+                array_unshift($_template->_capture_stack,array());
+                //
+                // render cached template
+                //
+                $_template->properties['unifunc']($_template);
+                // any unclosed {capture} tags ?
+                if (isset($_template->_capture_stack[0][0])) {
+                    $_template->capture_error();
+                }
+                array_shift($_template->_capture_stack);
+                $_output = ob_get_clean();
+            } catch (Exception $e) {
+                ob_get_clean();
+                throw $e;
+            }
+            if ($this->smarty->debugging) {
+                Smarty_Internal_Debug::end_cache($_template);
+            }
+        }
+        if ((!$this->caching || $_template->source->recompiled) && !$no_output_filter && (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))) {
+            $_output = Smarty_Internal_Filter_Handler::runFilter('output', $_output, $_template);
+        }
+        if (isset($this->error_reporting)) {
+            error_reporting($_smarty_old_error_level);
+        }
+        // display or fetch
+        if ($display) {
+            if ($this->caching && $this->cache_modified_check) {
+                $_isCached = $_template->isCached() && !$_template->has_nocache_code;
+                $_last_modified_date = @substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
+                if ($_isCached && $_template->cached->timestamp <= strtotime($_last_modified_date)) {
+                    switch (PHP_SAPI) {
+                        case 'cgi':         // php-cgi < 5.3
+                        case 'cgi-fcgi':    // php-cgi >= 5.3
+                        case 'fpm-fcgi':    // php-fpm >= 5.3.3
+                        header('Status: 304 Not Modified');
+                        break;
+
+                        case 'cli':
+                        if (/* ^phpunit */!empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS'])/* phpunit$ */) {
+                            $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified';
+                        }
+                        break;
+
+                        default:
+                        header('HTTP/1.1 304 Not Modified');
+                        break;
+                    }
+                } else {
+                    switch (PHP_SAPI) {
+                        case 'cli':
+                        if (/* ^phpunit */!empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS'])/* phpunit$ */) {
+                            $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = 'Last-Modified: ' . gmdate('D, d M Y H:i:s', $_template->cached->timestamp) . ' GMT';
+                        }
+                        break;
+
+                        default:
+                        header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $_template->cached->timestamp) . ' GMT');
+                        break;
+                    }
+                    echo $_output;
+                }
+            } else {
+                echo $_output;
+            }
+            // debug output
+            if ($this->smarty->debugging) {
+                Smarty_Internal_Debug::display_debug($this);
+            }
+            if ($merge_tpl_vars) {
+                // restore local variables
+                $_template->tpl_vars = $save_tpl_vars;
+                $_template->config_vars =  $save_config_vars;
+            }
+            return;
+        } else {
+            if ($merge_tpl_vars) {
+                // restore local variables
+                $_template->tpl_vars = $save_tpl_vars;
+                $_template->config_vars =  $save_config_vars;
+            }
+            // return fetched content
+            return $_output;
+        }
+    }
+
+    /**
+     * displays a Smarty template
+     *
+     * @param string $template   the resource handle of the template file or template object
+     * @param mixed  $cache_id   cache id to be used with this template
+     * @param mixed  $compile_id compile id to be used with this template
+     * @param object $parent     next higher level of Smarty variables
+     */
+    public function display($template = null, $cache_id = null, $compile_id = null, $parent = null)
+    {
+        // display template
+        $this->fetch($template, $cache_id, $compile_id, $parent, true);
+    }
+
+    /**
+     * test if cache is valid
+     *
+     * @param string|object $template   the resource handle of the template file or template object
+     * @param mixed         $cache_id   cache id to be used with this template
+     * @param mixed         $compile_id compile id to be used with this template
+     * @param object        $parent     next higher level of Smarty variables
+     * @return boolean cache status
+     */
+    public function isCached($template = null, $cache_id = null, $compile_id = null, $parent = null)
+    {
+        if ($template === null && $this instanceof $this->template_class) {
+            return $this->cached->valid;
+        }
+        if (!($template instanceof $this->template_class)) {
+            if ($parent === null) {
+                $parent = $this;
+            }
+            $template = $this->smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);
+        }
+        // return cache status of template
+        return $template->cached->valid;
+    }
+
+    /**
+     * creates a data object
+     *
+     * @param object $parent next higher level of Smarty variables
+     * @returns Smarty_Data data object
+     */
+    public function createData($parent = null)
+    {
+        return new Smarty_Data($parent, $this);
+    }
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @param string   $type       plugin type
+     * @param string   $tag        name of template tag
+     * @param callback $callback   PHP callback to register
+     * @param boolean  $cacheable  if true (default) this fuction is cachable
+     * @param array    $cache_attr caching attributes if any
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @throws SmartyException when the plugin tag is invalid
+     */
+    public function registerPlugin($type, $tag, $callback, $cacheable = true, $cache_attr = null)
+    {
+        if (isset($this->smarty->registered_plugins[$type][$tag])) {
+            throw new SmartyException("Plugin tag \"{$tag}\" already registered");
+        } elseif (!is_callable($callback)) {
+            throw new SmartyException("Plugin \"{$tag}\" not callable");
+        } else {
+            $this->smarty->registered_plugins[$type][$tag] = array($callback, (bool) $cacheable, (array) $cache_attr);
+        }
+        
+        return $this;
+    }
+
+    /**
+     * Unregister Plugin
+     *
+     * @param string $type of plugin
+     * @param string $tag name of plugin
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     */
+    public function unregisterPlugin($type, $tag)
+    {
+        if (isset($this->smarty->registered_plugins[$type][$tag])) {
+            unset($this->smarty->registered_plugins[$type][$tag]);
+        }
+        
+        return $this;
+    }
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @param string $type name of resource type
+     * @param Smarty_Resource|array $callback or instance of Smarty_Resource, or array of callbacks to handle resource (deprecated)
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     */
+    public function registerResource($type, $callback)
+    {
+        $this->smarty->registered_resources[$type] = $callback instanceof Smarty_Resource ? $callback : array($callback, false);
+        return $this;
+    }
+
+    /**
+     * Unregisters a resource
+     *
+     * @param string $type name of resource type
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     */
+    public function unregisterResource($type)
+    {
+        if (isset($this->smarty->registered_resources[$type])) {
+            unset($this->smarty->registered_resources[$type]);
+        }
+        
+        return $this;
+    }
+
+    /**
+     * Registers a cache resource to cache a template's output
+     *
+     * @param string               $type     name of cache resource type
+     * @param Smarty_CacheResource $callback instance of Smarty_CacheResource to handle output caching
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     */
+    public function registerCacheResource($type, Smarty_CacheResource $callback)
+    {
+        $this->smarty->registered_cache_resources[$type] = $callback;
+        return $this;
+    }
+
+    /**
+     * Unregisters a cache resource
+     *
+     * @param string $type name of cache resource type
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     */
+    public function unregisterCacheResource($type)
+    {
+        if (isset($this->smarty->registered_cache_resources[$type])) {
+            unset($this->smarty->registered_cache_resources[$type]);
+        }
+        
+        return $this;
+    }
+
+    /**
+     * Registers object to be used in templates
+     *
+     * @param string  $object        name of template object
+     * @param object  $object_impl   the referenced PHP object to register
+     * @param array   $allowed       list of allowed methods (empty = all)
+     * @param boolean $smarty_args   smarty argument format, else traditional
+     * @param array   $block_methods list of block-methods
+     * @param array $block_functs list of methods that are block format
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @throws SmartyException if any of the methods in $allowed or $block_methods are invalid
+     */
+    public function registerObject($object_name, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
+    {
+        // test if allowed methodes callable
+        if (!empty($allowed)) {
+            foreach ((array) $allowed as $method) {
+                if (!is_callable(array($object_impl, $method))) {
+                    throw new SmartyException("Undefined method '$method' in registered object");
+                }
+            }
+        }
+        // test if block methodes callable
+        if (!empty($block_methods)) {
+            foreach ((array) $block_methods as $method) {
+                if (!is_callable(array($object_impl, $method))) {
+                    throw new SmartyException("Undefined method '$method' in registered object");
+                }
+            }
+        }
+        // register the object
+        $this->smarty->registered_objects[$object_name] =
+        array($object_impl, (array) $allowed, (boolean) $smarty_args, (array) $block_methods);
+        return $this;
+    }
+
+    /**
+     * return a reference to a registered object
+     *
+     * @param string $name object name
+     * @return object
+     * @throws SmartyException if no such object is found
+     */
+    public function getRegisteredObject($name)
+    {
+        if (!isset($this->smarty->registered_objects[$name])) {
+            throw new SmartyException("'$name' is not a registered object");
+        }
+        if (!is_object($this->smarty->registered_objects[$name][0])) {
+            throw new SmartyException("registered '$name' is not an object");
+        }
+        return $this->smarty->registered_objects[$name][0];
+    }
+
+    /**
+     * unregister an object
+     *
+     * @param string $name object name
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     */
+    public function unregisterObject($name)
+    {
+        if (isset($this->smarty->registered_objects[$name])) {
+            unset($this->smarty->registered_objects[$name]);
+        }
+        
+        return $this;
+    }
+
+    /**
+     * Registers static classes to be used in templates
+     *
+     * @param string $class name of template class
+     * @param string $class_impl the referenced PHP class to register
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @throws SmartyException if $class_impl does not refer to an existing class
+     */
+    public function registerClass($class_name, $class_impl)
+    {
+        // test if exists
+        if (!class_exists($class_impl)) {
+            throw new SmartyException("Undefined class '$class_impl' in register template class");
+        }
+        // register the class
+        $this->smarty->registered_classes[$class_name] = $class_impl;
+        return $this;
+    }
+
+    /**
+     * Registers a default plugin handler
+     *
+     * @param callable $callback class/method name
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @throws SmartyException if $callback is not callable
+     */
+    public function registerDefaultPluginHandler($callback)
+    {
+        if (is_callable($callback)) {
+            $this->smarty->default_plugin_handler_func = $callback;
+        } else {
+            throw new SmartyException("Default plugin handler '$callback' not callable");
+        }
+        
+        return $this;
+    }
+
+    /**
+     * Registers a default template handler
+     *
+     * @param callable $callback class/method name
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @throws SmartyException if $callback is not callable
+     */
+    public function registerDefaultTemplateHandler($callback)
+    {
+        if (is_callable($callback)) {
+            $this->smarty->default_template_handler_func = $callback;
+        } else {
+            throw new SmartyException("Default template handler '$callback' not callable");
+        }
+        
+        return $this;
+    }
+
+    /**
+     * Registers a default template handler
+     *
+     * @param callable $callback class/method name
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     * @throws SmartyException if $callback is not callable
+     */
+    public function registerDefaultConfigHandler($callback)
+    {
+        if (is_callable($callback)) {
+            $this->smarty->default_config_handler_func = $callback;
+        } else {
+            throw new SmartyException("Default config handler '$callback' not callable");
+        }
+        
+        return $this;
+    }
+
+    /**
+     * Registers a filter function
+     *
+     * @param string $type filter type
+     * @param callback $callback
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     */
+    public function registerFilter($type, $callback)
+    {
+        $this->smarty->registered_filters[$type][$this->_get_filter_name($callback)] = $callback;
+        return $this;
+    }
+
+    /**
+     * Unregisters a filter function
+     *
+     * @param string $type filter type
+     * @param callback $callback
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     */
+    public function unregisterFilter($type, $callback)
+    {
+        $name = $this->_get_filter_name($callback);
+        if (isset($this->smarty->registered_filters[$type][$name])) {
+            unset($this->smarty->registered_filters[$type][$name]);
+        }
+        
+        return $this;
+    }
+
+    /**
+     * Return internal filter name
+     *
+     * @param callback $function_name
+     * @return string internal filter name
+     */
+    public function _get_filter_name($function_name)
+    {
+        if (is_array($function_name)) {
+            $_class_name = (is_object($function_name[0]) ?
+            get_class($function_name[0]) : $function_name[0]);
+            return $_class_name . '_' . $function_name[1];
+        } else {
+            return $function_name;
+        }
+    }
+
+    /**
+     * load a filter of specified type and name
+     *
+     * @param string $type filter type
+     * @param string $name filter name
+     * @throws SmartyException if filter could not be loaded
+     */
+    public function loadFilter($type, $name)
+    {
+        $_plugin = "smarty_{$type}filter_{$name}";
+        $_filter_name = $_plugin;
+        if ($this->smarty->loadPlugin($_plugin)) {
+            if (class_exists($_plugin, false)) {
+                $_plugin = array($_plugin, 'execute');
+            }
+            if (is_callable($_plugin)) {
+                $this->smarty->registered_filters[$type][$_filter_name] = $_plugin;
+                return true;
+            }
+        }
+        throw new SmartyException("{$type}filter \"{$name}\" not callable");
+    }
+
+    /**
+     * unload a filter of specified type and name
+     *
+     * @param string $type filter type
+     * @param string $name filter name
+     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
+     */
+    public function unloadFilter($type, $name)
+    {
+        $_filter_name = "smarty_{$type}filter_{$name}";
+        if (isset($this->smarty->registered_filters[$type][$_filter_name])) {
+            unset ($this->smarty->registered_filters[$type][$_filter_name]);
+        }
+        
+        return $this;
+    }
+
+    /**
+     * preg_replace callback to convert camelcase getter/setter to underscore property names
+     *
+     * @param string $match match string
+     * @return string replacemant
+     */
+    private function replaceCamelcase($match) {
+        return "_" . strtolower($match[1]);
+    }
+
+    /**
+     * Handle unknown class methods
+     *
+     * @param string $name unknown method-name
+     * @param array  $args argument array
+     */
+    public function __call($name, $args)
+    {
+        static $_prefixes = array('set' => true, 'get' => true);
+        static $_resolved_property_name = array();
+        static $_resolved_property_source = array();
+
+        // method of Smarty object?
+        if (method_exists($this->smarty, $name)) {
+            return call_user_func_array(array($this->smarty, $name), $args);
+        }
+        // see if this is a set/get for a property
+        $first3 = strtolower(substr($name, 0, 3));
+        if (isset($_prefixes[$first3]) && isset($name[3]) && $name[3] !== '_') {
+            if (isset($_resolved_property_name[$name])) {
+                $property_name = $_resolved_property_name[$name];
+            } else {
+                // try to keep case correct for future PHP 6.0 case-sensitive class methods
+                // lcfirst() not available < PHP 5.3.0, so improvise
+                $property_name = strtolower(substr($name, 3, 1)) . substr($name, 4);
+                // convert camel case to underscored name
+                $property_name = preg_replace_callback('/([A-Z])/', array($this,'replaceCamelcase'), $property_name);
+                $_resolved_property_name[$name] = $property_name;
+            }
+            if (isset($_resolved_property_source[$property_name])) {
+                $_is_this = $_resolved_property_source[$property_name];
+            } else {
+                $_is_this = null;
+                if (property_exists($this, $property_name)) {
+                    $_is_this = true;
+                } else if (property_exists($this->smarty, $property_name)) {
+                    $_is_this = false;
+                }
+                $_resolved_property_source[$property_name] = $_is_this;
+            }
+            if ($_is_this) {
+                if ($first3 == 'get')
+                return $this->$property_name;
+                else
+                return $this->$property_name = $args[0];
+            } else if ($_is_this === false) {
+                if ($first3 == 'get')
+                return $this->smarty->$property_name;
+                else
+                return $this->smarty->$property_name = $args[0];
+            } else {
+                throw new SmartyException("property '$property_name' does not exist.");
+                return false;
+            }
+        }
+        if ($name == 'Smarty') {
+            throw new SmartyException("PHP5 requires you to call __construct() instead of Smarty()");
+        }
+        // must be unknown
+        throw new SmartyException("Call of unknown method '$name'.");
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php b/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
new file mode 100644
index 0000000..1f50be7
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
@@ -0,0 +1,626 @@
+<?php
+/**
+ * Smarty Internal Plugin Smarty Template Compiler Base
+ *
+ * This file contains the basic classes and methodes for compiling Smarty templates with lexer/parser
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews
+ */
+
+/**
+ * Main abstract compiler class
+ *
+ * @package Smarty
+ * @subpackage Compiler
+ */
+abstract class Smarty_Internal_TemplateCompilerBase {
+
+    /**
+     * hash for nocache sections
+     *
+     * @var mixed
+     */
+    private $nocache_hash = null;
+    /**
+     * suppress generation of nocache code
+     *
+     * @var bool
+     */
+    public $suppressNocacheProcessing = false;
+    /**
+     * suppress generation of merged template code
+     *
+     * @var bool
+     */
+    public $suppressMergedTemplates = false;
+    /**
+     * compile tag objects
+     *
+     * @var array
+     */
+    public static $_tag_objects = array();
+    /**
+     * tag stack
+     *
+     * @var array
+     */
+    public $_tag_stack = array();
+    /**
+     * current template
+     *
+     * @var Smarty_Internal_Template
+     */
+    public $template = null;
+    /**
+     * merged templates
+     *
+     * @var array
+     */
+    public $merged_templates = array();
+    /**
+     * flag when compiling {block}
+     *
+     * @var bool
+     */
+    public $inheritance = false;
+    /**
+     * plugins loaded by default plugin handler
+     *
+     * @var array
+     */
+    public $default_handler_plugins = array();
+    /**
+     * saved preprocessed modifier list
+     *
+     * @var mixed
+     */
+    public $default_modifier_list = null;
+    /**
+     * force compilation of complete template as nocache
+     * @var boolean
+     */
+    public $forceNocache = false;
+    /**
+     * suppress Smarty header code in compiled template
+     * @var bool
+     */
+    public $suppressHeader = false;
+    /**
+     * suppress template property header code in compiled template
+     * @var bool
+     */
+    public $suppressTemplatePropertyHeader = false;
+    /**
+     * flag if compiled template file shall we written
+     * @var bool
+     */
+    public $write_compiled_code = true;
+    /**
+     * flag if currently a template function is compiled
+     * @var bool
+     */
+    public $compiles_template_function = false;
+    /**
+     * called subfuntions from template function
+     * @var array
+     */
+    public $called_functions = array();
+    /**
+     * flags for used modifier plugins
+     * @var array
+     */
+    public $modifier_plugins = array();
+
+    /**
+     * Initialize compiler
+     */
+    public function __construct()
+    {
+        $this->nocache_hash = str_replace('.', '-', uniqid(rand(), true));
+    }
+
+    /**
+     * Method to compile a Smarty template
+     *
+     * @param  Smarty_Internal_Template $template template object to compile
+     * @return bool true if compiling succeeded, false if it failed
+     */
+    public function compileTemplate(Smarty_Internal_Template $template)
+    {
+        if (empty($template->properties['nocache_hash'])) {
+            $template->properties['nocache_hash'] = $this->nocache_hash;
+        } else {
+            $this->nocache_hash = $template->properties['nocache_hash'];
+        }
+        // flag for nochache sections
+        $this->nocache = false;
+        $this->tag_nocache = false;
+        // save template object in compiler class
+        $this->template = $template;
+        // reset has noche code flag
+        $this->template->has_nocache_code = false;
+        $this->smarty->_current_file = $saved_filepath = $this->template->source->filepath;
+        // template header code
+        $template_header = '';
+        if (!$this->suppressHeader) {
+            $template_header .= "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") . "\n";
+            $template_header .= "         compiled from \"" . $this->template->source->filepath . "\" */ ?>\n";
+        }
+
+        do {
+            // flag for aborting current and start recompile
+            $this->abort_and_recompile = false;
+            // get template source
+            $_content = $template->source->content;
+            // run prefilter if required
+            if (isset($this->smarty->autoload_filters['pre']) || isset($this->smarty->registered_filters['pre'])) {
+                $template->source->content = $_content = Smarty_Internal_Filter_Handler::runFilter('pre', $_content, $template);
+            }
+            // on empty template just return header
+            if ($_content == '') {
+                if ($this->suppressTemplatePropertyHeader) {
+                    $code = '';
+                } else {
+                    $code = $template_header . $template->createTemplateCodeFrame();
+                }
+                return $code;
+            }
+            // call compiler
+            $_compiled_code = $this->doCompile($_content);
+        } while ($this->abort_and_recompile);
+        $this->template->source->filepath = $saved_filepath;
+        // free memory
+        unset($this->parser->root_buffer, $this->parser->current_buffer, $this->parser, $this->lex, $this->template);
+        self::$_tag_objects = array();
+        // return compiled code to template object
+        $merged_code = '';
+        if (!$this->suppressMergedTemplates) {
+            foreach ($this->merged_templates as $code) {
+                $merged_code .= $code;
+            }
+        }
+        if ($this->suppressTemplatePropertyHeader) {
+            $code = $_compiled_code . $merged_code;
+        } else {
+            $code = $template_header . $template->createTemplateCodeFrame($_compiled_code) . $merged_code;
+        }
+        // run postfilter if required
+        if (isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) {
+            $code = Smarty_Internal_Filter_Handler::runFilter('post', $code, $template);
+        }
+        return $code;
+    }
+
+    /**
+     * Compile Tag
+     *
+     * This is a call back from the lexer/parser
+     * It executes the required compile plugin for the Smarty tag
+     *
+     * @param string $tag       tag name
+     * @param array  $args      array with tag attributes
+     * @param array  $parameter array with compilation parameter
+     * @return string compiled code
+     */
+    public function compileTag($tag, $args, $parameter = array())
+    {
+        // $args contains the attributes parsed and compiled by the lexer/parser
+        // assume that tag does compile into code, but creates no HTML output
+        $this->has_code = true;
+        $this->has_output = false;
+        // log tag/attributes
+        if (isset($this->smarty->get_used_tags) && $this->smarty->get_used_tags) {
+            $this->template->used_tags[] = array($tag, $args);
+        }
+        // check nocache option flag
+        if (in_array("'nocache'",$args) || in_array(array('nocache'=>'true'),$args)
+        || in_array(array('nocache'=>'"true"'),$args) || in_array(array('nocache'=>"'true'"),$args)) {
+            $this->tag_nocache = true;
+        }
+        // compile the smarty tag (required compile classes to compile the tag are autoloaded)
+        if (($_output = $this->callTagCompiler($tag, $args, $parameter)) === false) {
+            if (isset($this->smarty->template_functions[$tag])) {
+                // template defined by {template} tag
+                $args['_attr']['name'] = "'" . $tag . "'";
+                $_output = $this->callTagCompiler('call', $args, $parameter);
+            }
+        }
+        if ($_output !== false) {
+            if ($_output !== true) {
+                // did we get compiled code
+                if ($this->has_code) {
+                    // Does it create output?
+                    if ($this->has_output) {
+                        $_output .= "\n";
+                    }
+                    // return compiled code
+                    return $_output;
+                }
+            }
+            // tag did not produce compiled code
+            return '';
+        } else {
+            // map_named attributes
+            if (isset($args['_attr'])) {
+                foreach ($args['_attr'] as $key => $attribute) {
+                    if (is_array($attribute)) {
+                        $args = array_merge($args, $attribute);
+                    }
+                }
+            }
+            // not an internal compiler tag
+            if (strlen($tag) < 6 || substr($tag, -5) != 'close') {
+                // check if tag is a registered object
+                if (isset($this->smarty->registered_objects[$tag]) && isset($parameter['object_methode'])) {
+                    $methode = $parameter['object_methode'];
+                    if (!in_array($methode, $this->smarty->registered_objects[$tag][3]) &&
+                    (empty($this->smarty->registered_objects[$tag][1]) || in_array($methode, $this->smarty->registered_objects[$tag][1]))) {
+                        return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $methode);
+                    } elseif (in_array($methode, $this->smarty->registered_objects[$tag][3])) {
+                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $methode);
+                    } else {
+                        return $this->trigger_template_error ('unallowed methode "' . $methode . '" in registered object "' . $tag . '"', $this->lex->taglineno);
+                    }
+                }
+                // check if tag is registered
+                foreach (array(Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK) as $plugin_type) {
+                    if (isset($this->smarty->registered_plugins[$plugin_type][$tag])) {
+                        // if compiler function plugin call it now
+                        if ($plugin_type == Smarty::PLUGIN_COMPILER) {
+                            $new_args = array();
+                            foreach ($args as $key => $mixed) {
+                            	if (is_array($mixed)) {
+                                	$new_args = array_merge($new_args, $mixed);
+                                } else {
+                                	$new_args[$key] = $mixed;
+                                }
+                            }
+                            if (!$this->smarty->registered_plugins[$plugin_type][$tag][1]) {
+                                $this->tag_nocache = true;
+                            }
+                            $function = $this->smarty->registered_plugins[$plugin_type][$tag][0];
+                            if (!is_array($function)) {
+                                return $function($new_args, $this);
+                            } else if (is_object($function[0])) {
+                                return $this->smarty->registered_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args, $this);
+                            } else {
+                                return call_user_func_array($function, array($new_args, $this));
+                            }
+                        }
+                        // compile registered function or block function
+                        if ($plugin_type == Smarty::PLUGIN_FUNCTION || $plugin_type == Smarty::PLUGIN_BLOCK) {
+                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter, $tag);
+                        }
+
+                    }
+                }
+                // check plugins from plugins folder
+                foreach ($this->smarty->plugin_search_order as $plugin_type) {
+                    if ($plugin_type == Smarty::PLUGIN_BLOCK && $this->smarty->loadPlugin('smarty_compiler_' . $tag) && (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))) {
+                        $plugin = 'smarty_compiler_' . $tag;
+                        if (is_callable($plugin)) {
+                            // convert arguments format for old compiler plugins
+                            $new_args = array();
+                            foreach ($args as $key => $mixed) {
+                            	if (is_array($mixed)) {
+                                	$new_args = array_merge($new_args, $mixed);
+                                } else {
+                                	$new_args[$key] = $mixed;
+                                }
+                            }
+                            return $plugin($new_args, $this->smarty);
+                        }
+                        if (class_exists($plugin, false)) {
+                            $plugin_object = new $plugin;
+                            if (method_exists($plugin_object, 'compile')) {
+                                return $plugin_object->compile($args, $this);
+                            }
+                        }
+                        throw new SmartyException("Plugin \"{$tag}\" not callable");
+                    } else {
+                        if ($function = $this->getPlugin($tag, $plugin_type)) {
+                            if(!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) {
+                                return $this->callTagCompiler('private_' . $plugin_type . '_plugin', $args, $parameter, $tag, $function);
+                            }
+                        }
+                    }
+                }
+                if (is_callable($this->smarty->default_plugin_handler_func)) {
+                    $found = false;
+                    // look for already resolved tags
+                    foreach ($this->smarty->plugin_search_order as $plugin_type) {
+                        if (isset($this->default_handler_plugins[$plugin_type][$tag])) {
+                            $found = true;
+                            break;
+                        }
+                    }
+                    if (!$found) {
+                        // call default handler
+                        foreach ($this->smarty->plugin_search_order as $plugin_type) {
+                            if ($this->getPluginFromDefaultHandler($tag, $plugin_type)) {
+                                $found = true;
+                                break;
+                            }
+                        }
+                    }
+                    if ($found) {
+                        // if compiler function plugin call it now
+                        if ($plugin_type == Smarty::PLUGIN_COMPILER) {
+                            $new_args = array();
+                            foreach ($args as $mixed) {
+                                $new_args = array_merge($new_args, $mixed);
+                            }
+                            $function = $this->default_handler_plugins[$plugin_type][$tag][0];
+                            if (!is_array($function)) {
+                                return $function($new_args, $this);
+                            } else if (is_object($function[0])) {
+                                return $this->default_handler_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args, $this);
+                            } else {
+                                return call_user_func_array($function, array($new_args, $this));
+                            }
+                        } else {
+                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter, $tag);
+                        }
+                    }
+                }
+            } else {
+                // compile closing tag of block function
+                $base_tag = substr($tag, 0, -5);
+                // check if closing tag is a registered object
+                if (isset($this->smarty->registered_objects[$base_tag]) && isset($parameter['object_methode'])) {
+                    $methode = $parameter['object_methode'];
+                    if (in_array($methode, $this->smarty->registered_objects[$base_tag][3])) {
+                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $methode);
+                    } else {
+                        return $this->trigger_template_error ('unallowed closing tag methode "' . $methode . '" in registered object "' . $base_tag . '"', $this->lex->taglineno);
+                    }
+                }
+                // registered block tag ?
+                if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag]) || isset($this->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) {
+                    return $this->callTagCompiler('private_registered_block', $args, $parameter, $tag);
+                }
+                // block plugin?
+                if ($function = $this->getPlugin($base_tag, Smarty::PLUGIN_BLOCK)) {
+                    return $this->callTagCompiler('private_block_plugin', $args, $parameter, $tag, $function);
+                }
+                if ($this->smarty->loadPlugin('smarty_compiler_' . $tag)) {
+                    $plugin = 'smarty_compiler_' . $tag;
+                    if (is_callable($plugin)) {
+                        return $plugin($args, $this->smarty);
+                    }
+                    if (class_exists($plugin, false)) {
+                        $plugin_object = new $plugin;
+                        if (method_exists($plugin_object, 'compile')) {
+                            return $plugin_object->compile($args, $this);
+                        }
+                    }
+                    throw new SmartyException("Plugin \"{$tag}\" not callable");
+                }
+            }
+            $this->trigger_template_error ("unknown tag \"" . $tag . "\"", $this->lex->taglineno);
+        }
+    }
+
+    /**
+     * lazy loads internal compile plugin for tag and calls the compile methode
+     *
+     * compile objects cached for reuse.
+     * class name format:  Smarty_Internal_Compile_TagName
+     * plugin filename format: Smarty_Internal_Tagname.php
+     *
+     * @param string $tag   tag name
+     * @param array $args   list of tag attributes
+     * @param mixed $param1 optional parameter
+     * @param mixed $param2 optional parameter
+     * @param mixed $param3 optional parameter
+     * @return string compiled code
+     */
+    public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null)
+    {
+        // re-use object if already exists
+        if (isset(self::$_tag_objects[$tag])) {
+            // compile this tag
+            return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
+        }
+        // lazy load internal compiler plugin
+        $class_name = 'Smarty_Internal_Compile_' . $tag;
+        if ($this->smarty->loadPlugin($class_name)) {
+            // check if tag allowed by security
+            if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) {
+            // use plugin if found
+            self::$_tag_objects[$tag] = new $class_name;
+            // compile this tag
+            return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
+            }
+        }
+        // no internal compile plugin for this tag
+        return false;
+    }
+
+    /**
+     * Check for plugins and return function name
+     *
+     * @param string $pugin_name  name of plugin or function
+     * @param string $plugin_type type of plugin
+     * @return string call name of function
+     */
+    public function getPlugin($plugin_name, $plugin_type)
+    {
+        $function = null;
+        if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
+            if (isset($this->template->required_plugins['nocache'][$plugin_name][$plugin_type])) {
+                $function = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
+            } else if (isset($this->template->required_plugins['compiled'][$plugin_name][$plugin_type])) {
+                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type] = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type];
+                $function = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
+            }
+        } else {
+            if (isset($this->template->required_plugins['compiled'][$plugin_name][$plugin_type])) {
+                $function = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
+            } else if (isset($this->template->required_plugins['nocache'][$plugin_name][$plugin_type])) {
+                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type] = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type];
+                $function = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
+            }
+        }
+        if (isset($function)) {
+            if ($plugin_type == 'modifier') {
+                $this->modifier_plugins[$plugin_name] = true;
+            }
+            return $function;
+        }
+        // loop through plugin dirs and find the plugin
+        $function = 'smarty_' . $plugin_type . '_' . $plugin_name;
+        $file = $this->smarty->loadPlugin($function, false);
+
+        if (is_string($file)) {
+            if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
+                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['file'] = $file;
+                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'] = $function;
+            } else {
+                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['file'] = $file;
+                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'] = $function;
+            }
+            if ($plugin_type == 'modifier') {
+                $this->modifier_plugins[$plugin_name] = true;
+            }
+            return $function;
+        }
+        if (is_callable($function)) {
+            // plugin function is defined in the script
+            return $function;
+        }
+        return false;
+    }
+
+    /**
+     * Check for plugins by default plugin handler
+     *
+     * @param string $tag         name of tag
+     * @param string $plugin_type type of plugin
+     * @return boolean true if found
+     */
+    public function getPluginFromDefaultHandler($tag, $plugin_type)
+    {
+        $callback = null;
+        $script = null;
+        $result = call_user_func_array(
+            $this->smarty->default_plugin_handler_func,
+            array($tag, $plugin_type, $this->template, &$callback, &$script)
+        );
+        if ($result) {
+            if ($script !== null) {
+                if (is_file($script)) {
+                    if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
+                        $this->template->required_plugins['nocache'][$tag][$plugin_type]['file'] = $script;
+                        $this->template->required_plugins['nocache'][$tag][$plugin_type]['function'] = $callback;
+                    } else {
+                        $this->template->required_plugins['compiled'][$tag][$plugin_type]['file'] = $script;
+                        $this->template->required_plugins['compiled'][$tag][$plugin_type]['function'] = $callback;
+                    }
+                    include_once $script;
+                }  else {
+                    $this->trigger_template_error("Default plugin handler: Returned script file \"{$script}\" for \"{$tag}\" not found");
+                }
+            }
+            if (!is_string($callback) && !(is_array($callback) && is_string($callback[0]) && is_string($callback[1]))) {
+                $this->trigger_template_error("Default plugin handler: Returned callback for \"{$tag}\" must be a static function name or array of class and function name");
+            }
+            if (is_callable($callback)) {
+                $this->default_handler_plugins[$plugin_type][$tag] = array($callback, true, array());
+                return true;
+            } else {
+                $this->trigger_template_error("Default plugin handler: Returned callback for \"{$tag}\" not callable");
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Inject inline code for nocache template sections
+     *
+     * This method gets the content of each template element from the parser.
+     * If the content is compiled code and it should be not cached the code is injected
+     * into the rendered output.
+     *
+     * @param string  $content content of template element
+     * @param boolean $is_code true if content is compiled code
+     * @return string content
+     */
+    public function processNocacheCode($content, $is_code)
+    {
+        // If the template is not evaluated and we have a nocache section and or a nocache tag
+        if ($is_code && !empty($content)) {
+            // generate replacement code
+            if ((!($this->template->source->recompiled) || $this->forceNocache) && $this->template->caching && !$this->suppressNocacheProcessing &&
+            ($this->nocache || $this->tag_nocache || $this->forceNocache == 2)) {
+                $this->template->has_nocache_code = true;
+                $_output = str_replace("'", "\'", $content);
+                $_output = str_replace('\\\\', '\\\\\\\\', $_output);
+                $_output = str_replace("^#^", "'", $_output);
+                $_output = "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/" . $_output . "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n";
+                // make sure we include modifer plugins for nocache code
+                foreach ($this->modifier_plugins as $plugin_name => $dummy) {
+                    if (isset($this->template->required_plugins['compiled'][$plugin_name]['modifier'])) {
+                        $this->template->required_plugins['nocache'][$plugin_name]['modifier'] = $this->template->required_plugins['compiled'][$plugin_name]['modifier'];
+                    }
+                }
+            } else {
+                $_output = $content;
+            }
+        } else {
+            $_output = $content;
+        }
+        $this->modifier_plugins = array();
+        $this->suppressNocacheProcessing = false;
+        $this->tag_nocache = false;
+        return $_output;
+    }
+
+    /**
+     * display compiler error messages without dying
+     *
+     * If parameter $args is empty it is a parser detected syntax error.
+     * In this case the parser is called to obtain information about expected tokens.
+     *
+     * If parameter $args contains a string this is used as error message
+     *
+     * @param string $args individual error message or null
+     * @param string $line line-number
+     * @throws SmartyCompilerException when an unexpected token is found
+     */
+    public function trigger_template_error($args = null, $line = null)
+    {
+        // get template source line which has error
+        if (!isset($line)) {
+            $line = $this->lex->line;
+        }
+        $match = preg_split("/\n/", $this->lex->data);
+        $error_text = 'Syntax Error in template "' . $this->template->source->filepath . '"  on line ' . $line . ' "' . htmlspecialchars(trim(preg_replace('![\t\r\n]+!',' ',$match[$line-1]))) . '" ';
+        if (isset($args)) {
+            // individual error message
+            $error_text .= $args;
+        } else {
+            // expected token from parser
+            $error_text .= ' - Unexpected "' . $this->lex->value.'"';
+            if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4 ) {
+                foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
+                    $exp_token = $this->parser->yyTokenName[$token];
+                    if (isset($this->lex->smarty_token_names[$exp_token])) {
+                        // token type from lexer
+                        $expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"';
+                    } else {
+                        // otherwise internal token name
+                        $expect[] = $this->parser->yyTokenName[$token];
+                    }
+                }
+                $error_text .= ', expected one of: ' . implode(' , ', $expect);
+            }
+        }
+        throw new SmartyCompilerException($error_text);
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_templatelexer.php b/lib/smarty/sysplugins/smarty_internal_templatelexer.php
new file mode 100644
index 0000000..fde9b7d
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_templatelexer.php
@@ -0,0 +1,1161 @@
+<?php
+/**
+* Smarty Internal Plugin Templatelexer
+*
+* This is the lexer to break the template source into tokens
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+/**
+* Smarty Internal Plugin Templatelexer
+*/
+class Smarty_Internal_Templatelexer
+{
+    public $data;
+    public $counter;
+    public $token;
+    public $value;
+    public $node;
+    public $line;
+    public $taglineno;
+    public $state = 1;
+    private $heredoc_id_stack = Array();
+    public $smarty_token_names = array (		// Text for parser error messages
+    				'IDENTITY'	=> '===',
+    				'NONEIDENTITY'	=> '!==',
+    				'EQUALS'	=> '==',
+    				'NOTEQUALS'	=> '!=',
+    				'GREATEREQUAL' => '(>=,ge)',
+    				'LESSEQUAL' => '(<=,le)',
+    				'GREATERTHAN' => '(>,gt)',
+    				'LESSTHAN' => '(<,lt)',
+    				'MOD' => '(%,mod)',
+    				'NOT'			=> '(!,not)',
+    				'LAND'		=> '(&&,and)',
+    				'LOR'			=> '(||,or)',
+    				'LXOR'			=> 'xor',
+    				'OPENP'		=> '(',
+    				'CLOSEP'	=> ')',
+    				'OPENB'		=> '[',
+    				'CLOSEB'	=> ']',
+    				'PTR'			=> '->',
+    				'APTR'		=> '=>',
+    				'EQUAL'		=> '=',
+    				'NUMBER'	=> 'number',
+    				'UNIMATH'	=> '+" , "-',
+    				'MATH'		=> '*" , "/" , "%',
+    				'INCDEC'	=> '++" , "--',
+    				'SPACE'		=> ' ',
+    				'DOLLAR'	=> '$',
+    				'SEMICOLON' => ';',
+    				'COLON'		=> ':',
+    				'DOUBLECOLON'		=> '::',
+    				'AT'		=> '@',
+    				'HATCH'		=> '#',
+    				'QUOTE'		=> '"',
+    				'BACKTICK'		=> '`',
+    				'VERT'		=> '|',
+    				'DOT'			=> '.',
+    				'COMMA'		=> '","',
+    				'ANDSYM'		=> '"&"',
+    				'QMARK'		=> '"?"',
+    				'ID'			=> 'identifier',
+    				'TEXT'		=> 'text',
+     				'FAKEPHPSTARTTAG'	=> 'Fake PHP start tag',
+     				'PHPSTARTTAG'	=> 'PHP start tag',
+     				'PHPENDTAG'	=> 'PHP end tag',
+ 						'LITERALSTART'  => 'Literal start',
+ 						'LITERALEND'    => 'Literal end',
+    				'LDELSLASH' => 'closing tag',
+    				'COMMENT' => 'comment',
+    				'AS' => 'as',
+    				'TO' => 'to',
+    				);
+
+
+    function __construct($data,$compiler)
+    {
+//        $this->data = preg_replace("/(\r\n|\r|\n)/", "\n", $data);
+        $this->data = $data;
+        $this->counter = 0;
+        $this->line = 1;
+        $this->smarty = $compiler->smarty;
+        $this->compiler = $compiler;
+        $this->ldel = preg_quote($this->smarty->left_delimiter,'/');
+        $this->ldel_length = strlen($this->smarty->left_delimiter);
+        $this->rdel = preg_quote($this->smarty->right_delimiter,'/');
+        $this->smarty_token_names['LDEL'] =	$this->smarty->left_delimiter;
+        $this->smarty_token_names['RDEL'] =	$this->smarty->right_delimiter;
+        $this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
+     }
+
+
+    private $_yy_state = 1;
+    private $_yy_stack = array();
+
+    function yylex()
+    {
+        return $this->{'yylex' . $this->_yy_state}();
+    }
+
+    function yypushstate($state)
+    {
+        array_push($this->_yy_stack, $this->_yy_state);
+        $this->_yy_state = $state;
+    }
+
+    function yypopstate()
+    {
+        $this->_yy_state = array_pop($this->_yy_stack);
+    }
+
+    function yybegin($state)
+    {
+        $this->_yy_state = $state;
+    }
+
+
+
+    function yylex1()
+    {
+        $tokenMap = array (
+              1 => 0,
+              2 => 0,
+              3 => 1,
+              5 => 0,
+              6 => 0,
+              7 => 0,
+              8 => 0,
+              9 => 0,
+              10 => 0,
+              11 => 1,
+              13 => 0,
+              14 => 0,
+              15 => 0,
+              16 => 0,
+              17 => 0,
+              18 => 0,
+              19 => 0,
+              20 => 0,
+              21 => 0,
+              22 => 0,
+              23 => 0,
+            );
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/\G(".$this->ldel."[$]smarty\\.block\\.child".$this->rdel.")|\G(\\{\\})|\G(".$this->ldel."\\*([\S\s]*?)\\*".$this->rdel.")|\G(".$this->ldel."strip".$this->rdel.")|\G(".$this->ldel."\\s{1,}strip\\s{1,}".$this->rdel.")|\G(".$this->ldel."\/strip".$this->rdel.")|\G(".$this->ldel."\\s{1,}\/strip\\s{1,}".$this->rdel.")|\G(".$this->ldel."\\s*literal\\s*".$this->rdel.")|\G(".$this->ldel."\\s{1,}\/)|\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s*setfilter\\s+)|\G(".$this->ldel."\\s{1,})|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(<%)|\G(%>)|\G([\S\s])/iS";
+
+        do {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state TEXT');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const TEXT = 1;
+    function yy_r1_1($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILD;
+    }
+    function yy_r1_2($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+    }
+    function yy_r1_3($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_COMMENT;
+    }
+    function yy_r1_5($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Templateparser::TP_STRIPON;
+    }
+    function yy_r1_6($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal) {
+    $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+  } else {
+    $this->token = Smarty_Internal_Templateparser::TP_STRIPON;
+  }
+    }
+    function yy_r1_7($yy_subpatterns)
+    {
+
+    $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
+    }
+    function yy_r1_8($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal) {
+     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+  } else {
+    $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
+  }
+    }
+    function yy_r1_9($yy_subpatterns)
+    {
+
+   $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
+   $this->yypushstate(self::LITERAL);
+    }
+    function yy_r1_10($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal) {
+     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r1_11($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
+     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r1_13($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
+     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r1_14($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
+     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r1_15($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
+     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r1_16($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal) {
+     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r1_17($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+    }
+    function yy_r1_18($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+    }
+    function yy_r1_19($yy_subpatterns)
+    {
+
+  if (in_array($this->value, Array('<?', '<?=', '<?php'))) {
+    $this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG;
+  } elseif ($this->value == '<?xml') {
+      $this->token = Smarty_Internal_Templateparser::TP_XMLTAG;
+  } else {
+    $this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG;
+    $this->value = substr($this->value, 0, 2);
+  }
+     }
+    function yy_r1_20($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
+    }
+    function yy_r1_21($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
+    }
+    function yy_r1_22($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
+    }
+    function yy_r1_23($yy_subpatterns)
+    {
+
+  $to = strlen($this->data);
+  preg_match("/{$this->ldel}|<\?|\?>|<%|%>/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+  if (isset($match[0][1])) {
+    $to = $match[0][1];
+  }
+  $this->value = substr($this->data,$this->counter,$to-$this->counter);
+  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+    }
+
+
+    function yylex2()
+    {
+        $tokenMap = array (
+              1 => 0,
+              2 => 0,
+              3 => 1,
+              5 => 0,
+              6 => 0,
+              7 => 0,
+              8 => 0,
+              9 => 0,
+              10 => 0,
+              11 => 0,
+              12 => 0,
+              13 => 0,
+              14 => 0,
+              15 => 0,
+              16 => 0,
+              17 => 0,
+              18 => 0,
+              19 => 0,
+              20 => 1,
+              22 => 1,
+              24 => 1,
+              26 => 0,
+              27 => 0,
+              28 => 0,
+              29 => 0,
+              30 => 0,
+              31 => 0,
+              32 => 0,
+              33 => 0,
+              34 => 0,
+              35 => 0,
+              36 => 0,
+              37 => 0,
+              38 => 0,
+              39 => 0,
+              40 => 0,
+              41 => 0,
+              42 => 0,
+              43 => 3,
+              47 => 0,
+              48 => 0,
+              49 => 0,
+              50 => 0,
+              51 => 0,
+              52 => 0,
+              53 => 0,
+              54 => 0,
+              55 => 1,
+              57 => 1,
+              59 => 0,
+              60 => 0,
+              61 => 0,
+              62 => 0,
+              63 => 0,
+              64 => 0,
+              65 => 0,
+              66 => 0,
+              67 => 0,
+              68 => 0,
+              69 => 0,
+              70 => 0,
+              71 => 0,
+              72 => 0,
+              73 => 0,
+              74 => 0,
+              75 => 0,
+              76 => 0,
+            );
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G(".$this->ldel."\\s{1,}\/)|\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s{1,})|\G(\\s{1,}".$this->rdel.")|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(".$this->rdel.")|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*===\\s*)|\G(\\s*!==\\s*)|\G(\\s*==\\s*|\\s+eq\\s+)|\G(\\s*!=\\s*|\\s*<>\\s*|\\s+(ne|neq)\\s+)|\G(\\s*>=\\s*|\\s+(ge|gte)\\s+)|\G(\\s*<=\\s*|\\s+(le|lte)\\s+)|\G(\\s*>\\s*|\\s+gt\\s+)|\G(\\s*<\\s*|\\s+lt\\s+)|\G(\\s+mod\\s+)|\G(!\\s*|not\\s+)|\G(\\s*&&\\s*|\\s*and\\s+)|\G(\\s*\\|\\|\\s*|\\s*or\\s+)|\G(\\s*xor\\s+)|\G(\\s+is\\s+odd\\s+by\\s+)|\G(\\s+is\\s+not\\s+odd\\s+by\\s+)|\G(\\s+is\\s+odd)|\G(\\s+is\\s+not\\s+odd)|\G(\\s+is\\s+even\\s+by\\s+)|\G(\\s+is\\s+not\\s+even\\s+by\\s+)|\G(\\s+is\\s+even)|\G(\\s+is\\s+not\\s+even)|\G(\\s+is\\s+div\\s+by\\s+)|\G(\\s+is\\s+not\\s+div\\s+by\\s+)|\G(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\)\\s*)|\G(\\s*\\(\\s*)|\G(\\s*\\))|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*->\\s*)|\G(\\s*=>\\s*)|\G(\\s*=\\s*)|\G(\\+\\+|--)|\G(\\s*(\\+|-)\\s*)|\G(\\s*(\\*|\/|%)\\s*)|\G(\\$)|\G(\\s*;)|\G(::)|\G(\\s*:\\s*)|\G(@)|\G(#)|\G(\")|\G(`)|\G(\\|)|\G(\\.)|\G(\\s*,\\s*)|\G(\\s*&\\s*)|\G(\\s*\\?\\s*)|\G(0[xX][0-9a-fA-F]+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G(\\s+)|\G([\S\s])/iS";
+
+        do {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state SMARTY');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r2_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const SMARTY = 2;
+    function yy_r2_1($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+    }
+    function yy_r2_2($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal) {
+     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r2_3($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
+     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r2_5($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
+     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r2_6($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
+     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r2_7($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal) {
+     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r2_8($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+  $this->yypopstate();
+    }
+    function yy_r2_9($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+    }
+    function yy_r2_10($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+    }
+    function yy_r2_11($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+     $this->yypopstate();
+    }
+    function yy_r2_12($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISIN;
+    }
+    function yy_r2_13($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_AS;
+    }
+    function yy_r2_14($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_TO;
+    }
+    function yy_r2_15($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_STEP;
+    }
+    function yy_r2_16($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+    }
+    function yy_r2_17($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_IDENTITY;
+    }
+    function yy_r2_18($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_NONEIDENTITY;
+    }
+    function yy_r2_19($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_EQUALS;
+    }
+    function yy_r2_20($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_NOTEQUALS;
+    }
+    function yy_r2_22($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_GREATEREQUAL;
+    }
+    function yy_r2_24($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LESSEQUAL;
+    }
+    function yy_r2_26($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_GREATERTHAN;
+    }
+    function yy_r2_27($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LESSTHAN;
+    }
+    function yy_r2_28($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_MOD;
+    }
+    function yy_r2_29($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_NOT;
+    }
+    function yy_r2_30($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LAND;
+    }
+    function yy_r2_31($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LOR;
+    }
+    function yy_r2_32($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LXOR;
+    }
+    function yy_r2_33($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISODDBY;
+    }
+    function yy_r2_34($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISNOTODDBY;
+    }
+    function yy_r2_35($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISODD;
+    }
+    function yy_r2_36($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISNOTODD;
+    }
+    function yy_r2_37($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISEVENBY;
+    }
+    function yy_r2_38($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVENBY;
+    }
+    function yy_r2_39($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISEVEN;
+    }
+    function yy_r2_40($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVEN;
+    }
+    function yy_r2_41($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISDIVBY;
+    }
+    function yy_r2_42($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ISNOTDIVBY;
+    }
+    function yy_r2_43($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
+    }
+    function yy_r2_47($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_OPENP;
+    }
+    function yy_r2_48($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
+    }
+    function yy_r2_49($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_OPENB;
+    }
+    function yy_r2_50($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
+    }
+    function yy_r2_51($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_PTR;
+    }
+    function yy_r2_52($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_APTR;
+    }
+    function yy_r2_53($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
+    }
+    function yy_r2_54($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
+    }
+    function yy_r2_55($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
+    }
+    function yy_r2_57($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_MATH;
+    }
+    function yy_r2_59($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+    }
+    function yy_r2_60($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
+    }
+    function yy_r2_61($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
+    }
+    function yy_r2_62($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_COLON;
+    }
+    function yy_r2_63($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_AT;
+    }
+    function yy_r2_64($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_HATCH;
+    }
+    function yy_r2_65($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+  $this->yypushstate(self::DOUBLEQUOTEDSTRING);
+    }
+    function yy_r2_66($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+  $this->yypopstate();
+    }
+    function yy_r2_67($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_VERT;
+    }
+    function yy_r2_68($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_DOT;
+    }
+    function yy_r2_69($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_COMMA;
+    }
+    function yy_r2_70($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ANDSYM;
+    }
+    function yy_r2_71($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_QMARK;
+    }
+    function yy_r2_72($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_HEX;
+    }
+    function yy_r2_73($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ID;
+    }
+    function yy_r2_74($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+    }
+    function yy_r2_75($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+    }
+    function yy_r2_76($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+    }
+
+
+
+    function yylex3()
+    {
+        $tokenMap = array (
+              1 => 0,
+              2 => 0,
+              3 => 0,
+              4 => 0,
+              5 => 0,
+              6 => 0,
+              7 => 0,
+            );
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/\G(".$this->ldel."\\s*literal\\s*".$this->rdel.")|\G(".$this->ldel."\\s*\/literal\\s*".$this->rdel.")|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(<%)|\G(%>)|\G([\S\s])/iS";
+
+        do {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state LITERAL');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r3_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const LITERAL = 3;
+    function yy_r3_1($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
+  $this->yypushstate(self::LITERAL);
+    }
+    function yy_r3_2($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+  $this->yypopstate();
+    }
+    function yy_r3_3($yy_subpatterns)
+    {
+
+  if (in_array($this->value, Array('<?', '<?=', '<?php'))) {
+    $this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG;
+   } else {
+    $this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG;
+    $this->value = substr($this->value, 0, 2);
+   }
+    }
+    function yy_r3_4($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
+    }
+    function yy_r3_5($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
+    }
+    function yy_r3_6($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
+    }
+    function yy_r3_7($yy_subpatterns)
+    {
+
+  $to = strlen($this->data);
+  preg_match("/{$this->ldel}\/?literal{$this->rdel}|<\?|<%|\?>|%>/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+  if (isset($match[0][1])) {
+    $to = $match[0][1];
+  } else {
+    $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
+  }
+
+  $this->value = substr($this->data,$this->counter,$to-$this->counter);
+  $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+    }
+
+
+    function yylex4()
+    {
+        $tokenMap = array (
+              1 => 0,
+              2 => 1,
+              4 => 0,
+              5 => 0,
+              6 => 0,
+              7 => 0,
+              8 => 0,
+              9 => 0,
+              10 => 0,
+              11 => 0,
+              12 => 0,
+              13 => 3,
+              17 => 0,
+            );
+        if ($this->counter >= strlen($this->data)) {
+            return false; // end of input
+        }
+        $yy_global_pattern = "/\G(".$this->ldel."\\s{1,}\/)|\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s{1,})|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(".$this->ldel."|\\$|`\\$|\")))|\G([\S\s])/iS";
+
+        do {
+            if ($this->mbstring_overload ? preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
+                $yysubmatches = $yymatches;
+                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                if (!count($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                if ($tokenMap[$this->token]) {
+                    // extract sub-patterns for passing to lex function
+                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
+                        $tokenMap[$this->token]);
+                } else {
+                    $yysubmatches = array();
+                }
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r4_' . $this->token}($yysubmatches);
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= strlen($this->data)) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const DOUBLEQUOTEDSTRING = 4;
+    function yy_r4_1($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal) {
+     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r4_2($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
+     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r4_4($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
+     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r4_5($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
+     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r4_6($yy_subpatterns)
+    {
+
+  if ($this->smarty->auto_literal) {
+     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
+    }
+    function yy_r4_7($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+    }
+    function yy_r4_8($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+    }
+    function yy_r4_9($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+  $this->yypopstate();
+    }
+    function yy_r4_10($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+  $this->value = substr($this->value,0,-1);
+  $this->yypushstate(self::SMARTY);
+  $this->taglineno = $this->line;
+    }
+    function yy_r4_11($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+    }
+    function yy_r4_12($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+    }
+    function yy_r4_13($yy_subpatterns)
+    {
+
+  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+    }
+    function yy_r4_17($yy_subpatterns)
+    {
+
+  $to = strlen($this->data);
+  $this->value = substr($this->data,$this->counter,$to-$this->counter);
+  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+    }
+
+}
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_templateparser.php b/lib/smarty/sysplugins/smarty_internal_templateparser.php
new file mode 100644
index 0000000..e32461b
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_templateparser.php
@@ -0,0 +1,3265 @@
+<?php
+/**
+* Smarty Internal Plugin Templateparser
+*
+* This is the template parser.
+* It is generated from the internal.templateparser.y file
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+
+class TP_yyToken implements ArrayAccess
+{
+    public $string = '';
+    public $metadata = array();
+
+    function __construct($s, $m = array())
+    {
+        if ($s instanceof TP_yyToken) {
+            $this->string = $s->string;
+            $this->metadata = $s->metadata;
+        } else {
+            $this->string = (string) $s;
+            if ($m instanceof TP_yyToken) {
+                $this->metadata = $m->metadata;
+            } elseif (is_array($m)) {
+                $this->metadata = $m;
+            }
+        }
+    }
+
+    function __toString()
+    {
+        return $this->_string;
+    }
+
+    function offsetExists($offset)
+    {
+        return isset($this->metadata[$offset]);
+    }
+
+    function offsetGet($offset)
+    {
+        return $this->metadata[$offset];
+    }
+
+    function offsetSet($offset, $value)
+    {
+        if ($offset === null) {
+            if (isset($value[0])) {
+                $x = ($value instanceof TP_yyToken) ?
+                    $value->metadata : $value;
+                $this->metadata = array_merge($this->metadata, $x);
+                return;
+            }
+            $offset = count($this->metadata);
+        }
+        if ($value === null) {
+            return;
+        }
+        if ($value instanceof TP_yyToken) {
+            if ($value->metadata) {
+                $this->metadata[$offset] = $value->metadata;
+            }
+        } elseif ($value) {
+            $this->metadata[$offset] = $value;
+        }
+    }
+
+    function offsetUnset($offset)
+    {
+        unset($this->metadata[$offset]);
+    }
+}
+
+class TP_yyStackEntry
+{
+    public $stateno;       /* The state-number */
+    public $major;         /* The major token value.  This is the code
+                     ** number for the token at this stack level */
+    public $minor; /* The user-supplied minor token value.  This
+                     ** is the value of the token  */
+};
+
+
+#line 12 "smarty_internal_templateparser.y"
+class Smarty_Internal_Templateparser#line 79 "smarty_internal_templateparser.php"
+{
+#line 14 "smarty_internal_templateparser.y"
+
+    const Err1 = "Security error: Call to private object member not allowed";
+    const Err2 = "Security error: Call to dynamic object member not allowed";
+    const Err3 = "PHP in template not allowed. Use SmartyBC to enable it";
+    // states whether the parse was successful or not
+    public $successful = true;
+    public $retvalue = 0;
+    private $lex;
+    private $internalError = false;
+    private $strip = false;
+
+    function __construct($lex, $compiler) {
+        $this->lex = $lex;
+        $this->compiler = $compiler;
+        $this->smarty = $this->compiler->smarty;
+        $this->template = $this->compiler->template;
+        $this->compiler->has_variable_string = false;
+        $this->compiler->prefix_code = array();
+        $this->prefix_number = 0;
+        $this->block_nesting_level = 0;
+        if ($this->security = isset($this->smarty->security_policy)) {
+            $this->php_handling = $this->smarty->security_policy->php_handling;
+        } else {
+            $this->php_handling = $this->smarty->php_handling;
+        }
+        $this->is_xml = false;
+        $this->asp_tags = (ini_get('asp_tags') != '0');
+        $this->current_buffer = $this->root_buffer = new _smarty_template_buffer($this);
+    }
+
+    public static function escape_start_tag($tag_text) {
+        $tag = preg_replace('/\A<\?(.*)\z/', '<<?php ?>?\1', $tag_text, -1 , $count); //Escape tag
+        return $tag;
+    }
+
+    public static function escape_end_tag($tag_text) {
+        return '?<?php ?>>';
+    }
+
+    public function compileVariable($variable) {
+        if (strpos($variable,'(') == 0) {
+            // not a variable variable
+            $var = trim($variable,'\'');
+            $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable($var, null, true, false)->nocache;
+            $this->template->properties['variables'][$var] = $this->compiler->tag_nocache|$this->compiler->nocache;
+        }
+//       return '(isset($_smarty_tpl->tpl_vars['. $variable .'])?$_smarty_tpl->tpl_vars['. $variable .']->value:$_smarty_tpl->getVariable('. $variable .')->value)';
+        return '$_smarty_tpl->tpl_vars['. $variable .']->value';
+    }
+#line 132 "smarty_internal_templateparser.php"
+
+    const TP_VERT                           =  1;
+    const TP_COLON                          =  2;
+    const TP_COMMENT                        =  3;
+    const TP_PHPSTARTTAG                    =  4;
+    const TP_PHPENDTAG                      =  5;
+    const TP_ASPSTARTTAG                    =  6;
+    const TP_ASPENDTAG                      =  7;
+    const TP_FAKEPHPSTARTTAG                =  8;
+    const TP_XMLTAG                         =  9;
+    const TP_TEXT                           = 10;
+    const TP_STRIPON                        = 11;
+    const TP_STRIPOFF                       = 12;
+    const TP_LITERALSTART                   = 13;
+    const TP_LITERALEND                     = 14;
+    const TP_LITERAL                        = 15;
+    const TP_LDEL                           = 16;
+    const TP_RDEL                           = 17;
+    const TP_DOLLAR                         = 18;
+    const TP_ID                             = 19;
+    const TP_EQUAL                          = 20;
+    const TP_PTR                            = 21;
+    const TP_LDELIF                         = 22;
+    const TP_LDELFOR                        = 23;
+    const TP_SEMICOLON                      = 24;
+    const TP_INCDEC                         = 25;
+    const TP_TO                             = 26;
+    const TP_STEP                           = 27;
+    const TP_LDELFOREACH                    = 28;
+    const TP_SPACE                          = 29;
+    const TP_AS                             = 30;
+    const TP_APTR                           = 31;
+    const TP_LDELSETFILTER                  = 32;
+    const TP_SMARTYBLOCKCHILD               = 33;
+    const TP_LDELSLASH                      = 34;
+    const TP_INTEGER                        = 35;
+    const TP_COMMA                          = 36;
+    const TP_OPENP                          = 37;
+    const TP_CLOSEP                         = 38;
+    const TP_MATH                           = 39;
+    const TP_UNIMATH                        = 40;
+    const TP_ANDSYM                         = 41;
+    const TP_ISIN                           = 42;
+    const TP_ISDIVBY                        = 43;
+    const TP_ISNOTDIVBY                     = 44;
+    const TP_ISEVEN                         = 45;
+    const TP_ISNOTEVEN                      = 46;
+    const TP_ISEVENBY                       = 47;
+    const TP_ISNOTEVENBY                    = 48;
+    const TP_ISODD                          = 49;
+    const TP_ISNOTODD                       = 50;
+    const TP_ISODDBY                        = 51;
+    const TP_ISNOTODDBY                     = 52;
+    const TP_INSTANCEOF                     = 53;
+    const TP_QMARK                          = 54;
+    const TP_NOT                            = 55;
+    const TP_TYPECAST                       = 56;
+    const TP_HEX                            = 57;
+    const TP_DOT                            = 58;
+    const TP_SINGLEQUOTESTRING              = 59;
+    const TP_DOUBLECOLON                    = 60;
+    const TP_AT                             = 61;
+    const TP_HATCH                          = 62;
+    const TP_OPENB                          = 63;
+    const TP_CLOSEB                         = 64;
+    const TP_EQUALS                         = 65;
+    const TP_NOTEQUALS                      = 66;
+    const TP_GREATERTHAN                    = 67;
+    const TP_LESSTHAN                       = 68;
+    const TP_GREATEREQUAL                   = 69;
+    const TP_LESSEQUAL                      = 70;
+    const TP_IDENTITY                       = 71;
+    const TP_NONEIDENTITY                   = 72;
+    const TP_MOD                            = 73;
+    const TP_LAND                           = 74;
+    const TP_LOR                            = 75;
+    const TP_LXOR                           = 76;
+    const TP_QUOTE                          = 77;
+    const TP_BACKTICK                       = 78;
+    const TP_DOLLARID                       = 79;
+    const YY_NO_ACTION = 592;
+    const YY_ACCEPT_ACTION = 591;
+    const YY_ERROR_ACTION = 590;
+
+    const YY_SZ_ACTTAB = 2562;
+static public $yy_action = array(
+ /*     0 */   218,  317,  318,  320,  319,  316,  315,  311,  310,  312,
+ /*    10 */   313,  314,  321,  322,  197,  193,  187,   43,  591,   95,
+ /*    20 */   255,  318,  320,    6,  107,  292,   38,   11,   42,  154,
+ /*    30 */   283,   13,  181,  245,  295,  241,  262,  284,   51,   50,
+ /*    40 */    52,   44,   23,   28,  367,  374,   33,   32,  375,  383,
+ /*    50 */    21,   31,  328,  323,  325,  326,  324,    9,   36,  353,
+ /*    60 */   265,  197,  331,  329,  384,  385,  386,  382,  381,  377,
+ /*    70 */   376,  378,  379,  282,  380,  362,  218,  344,    4,  106,
+ /*    80 */   175,  120,    7,   11,   82,  129,  283,   12,  456,  292,
+ /*    90 */   453,   27,  291,  301,  361,  109,  387,  236,  368,  365,
+ /*   100 */   456,  343,  453,  243,   42,  136,  200,   37,    7,  267,
+ /*   110 */     7,  219,  256,    7,   51,   50,   52,   44,   23,   28,
+ /*   120 */   367,  374,   33,   32,  375,  383,   21,   31,  239,   99,
+ /*   130 */   171,  136,   36,  136,  261,   26,  136,  123,  373,  292,
+ /*   140 */   384,  385,  386,  382,  381,  377,  376,  378,  379,  282,
+ /*   150 */   380,  362,  218,  344,  369,  218,  200,  132,  158,  184,
+ /*   160 */    68,  119,  235,   11,   11,  153,  283,  283,  337,  301,
+ /*   170 */   361,  458,  306,  236,  368,  365,   42,  343,  252,  284,
+ /*   180 */    42,  191,  218,  458,  250,   11,  200,  287,  283,   12,
+ /*   190 */    51,   50,   52,   44,   23,   28,  367,  374,   33,   32,
+ /*   200 */   375,  383,   21,   31,  302,  108,  168,   49,  200,  232,
+ /*   210 */    11,  218,   35,  283,  240,  292,  384,  385,  386,  382,
+ /*   220 */   381,  377,  376,  378,  379,  282,  380,  362,  218,  344,
+ /*   230 */   207,  218,  200,  132,   49,    8,   54,  119,  142,   11,
+ /*   240 */    14,  158,  283,  110,  342,  301,  361,  455,  152,  236,
+ /*   250 */   368,  365,   42,  343,  231,  239,   42,  350,  103,  455,
+ /*   260 */   248,  199,  339,   49,  343,  345,   51,   50,   52,   44,
+ /*   270 */    23,   28,  367,  374,   33,   32,  375,  383,   21,   31,
+ /*   280 */   128,  183,  174,   49,  370,  163,  198,  339,   15,  158,
+ /*   290 */   292,  292,  384,  385,  386,  382,  381,  377,  376,  378,
+ /*   300 */   379,  282,  380,  362,  218,  344,  192,  218,  201,  120,
+ /*   310 */   344,  272,   82,  129,  156,  164,  270,  218,  129,  158,
+ /*   320 */   273,  301,  361,  458,  292,  236,  368,  365,  128,  343,
+ /*   330 */   236,  368,  365,  296,  343,  458,  284,  244,  130,  227,
+ /*   340 */   260,  330,   51,   50,   52,   44,   23,   28,  367,  374,
+ /*   350 */    33,   32,  375,  383,   21,   31,  207,  196,  339,   49,
+ /*   360 */    41,    8,  127,  162,  251,  229,  212,  242,  384,  385,
+ /*   370 */   386,  382,  381,  377,  376,  378,  379,  282,  380,  362,
+ /*   380 */   218,  344,  101,  218,  176,  132,  344,  140,   78,  129,
+ /*   390 */   148,  166,  249,  292,  129,  186,  278,  301,  361,  327,
+ /*   400 */   292,  236,  368,  365,  292,  343,  236,  368,  365,    5,
+ /*   410 */   343,   42,  211,   36,  121,  281,  284,  201,   51,   50,
+ /*   420 */    52,   44,   23,   28,  367,  374,   33,   32,  375,  383,
+ /*   430 */    21,   31,  218,  178,    7,   49,  179,  275,  225,  185,
+ /*   440 */    11,  284,  292,  283,  384,  385,  386,  382,  381,  377,
+ /*   450 */   376,  378,  379,  282,  380,  362,   17,  136,   11,  201,
+ /*   460 */   170,  226,  173,  200,  284,  141,  247,  223,  335,  292,
+ /*   470 */    51,   50,   52,   44,   23,   28,  367,  374,   33,   32,
+ /*   480 */   375,  383,   21,   31,  135,  218,  201,  359,   11,   11,
+ /*   490 */    11,  238,  213,  234,  188,  302,  384,  385,  386,  382,
+ /*   500 */   381,  377,  376,  378,  379,  282,  380,  362,  195,  351,
+ /*   510 */   189,  366,  251,  235,  218,  251,  264,  333,  146,  332,
+ /*   520 */   305,  200,  143,   51,   50,   52,   44,   23,   28,  367,
+ /*   530 */   374,   33,   32,  375,  383,   21,   31,  218,  203,  137,
+ /*   540 */    15,  297,   42,  271,  194,   19,   98,  116,  102,  384,
+ /*   550 */   385,  386,  382,  381,  377,  376,  378,  379,  282,  380,
+ /*   560 */   362,  372,  372,  372,  300,   34,  224,  138,   39,  139,
+ /*   570 */   225,  146,  131,  133,  159,   51,   50,   52,   44,   23,
+ /*   580 */    28,  367,  374,   33,   32,  375,  383,   21,   31,  372,
+ /*   590 */   172,  334,   94,  299,  276,  302,    2,  371,    4,  292,
+ /*   600 */   125,  384,  385,  386,  382,  381,  377,  376,  378,  379,
+ /*   610 */   282,  380,  362,  218,  344,  372,  218,  308,  132,  344,
+ /*   620 */   287,   78,  129,  150,  370,  201,  161,  129,  160,  204,
+ /*   630 */   301,  361,  341,   29,  236,  368,  365,  292,  343,  236,
+ /*   640 */   368,  365,  218,  343,  284,  216,   42,   20,  277,  284,
+ /*   650 */   263,   51,   50,   52,   44,   23,   28,  367,  374,   33,
+ /*   660 */    32,  375,  383,   21,   31,  218,  228,   45,   49,   16,
+ /*   670 */   326,  249,  104,  326,  326,  118,  105,  384,  385,  386,
+ /*   680 */   382,  381,  377,  376,  378,  379,  282,  380,  362,  340,
+ /*   690 */   372,  372,  326,  326,  326,  326,  326,  326,  326,  326,
+ /*   700 */   326,   42,  237,   51,   50,   52,   44,   23,   28,  367,
+ /*   710 */   374,   33,   32,  375,  383,   21,   31,  218,  326,  326,
+ /*   720 */   326,  326,  326,  326,  326,  326,  114,  326,  218,  384,
+ /*   730 */   385,  386,  382,  381,  377,  376,  378,  379,  282,  380,
+ /*   740 */   362,  372,  353,  326,  307,  326,  326,  326,  326,  326,
+ /*   750 */   326,  326,  326,  326,  268,   51,   50,   52,   44,   23,
+ /*   760 */    28,  367,  374,   33,   32,  375,  383,   21,   31,  218,
+ /*   770 */   326,  326,  326,  326,  326,  326,  326,  326,   97,  355,
+ /*   780 */   112,  384,  385,  386,  382,  381,  377,  376,  378,  379,
+ /*   790 */   282,  380,  362,  372,  326,  372,  326,   42,  326,  326,
+ /*   800 */   326,  326,  326,  326,  326,  326,  158,   51,   50,   52,
+ /*   810 */    44,   23,   28,  367,  374,   33,   32,  375,  383,   21,
+ /*   820 */    31,  218,  326,  326,  326,  326,  326,  326,  326,  326,
+ /*   830 */   326,  326,  326,  384,  385,  386,  382,  381,  377,  376,
+ /*   840 */   378,  379,  282,  380,  362,  128,  326,  326,  326,  326,
+ /*   850 */   326,  326,  326,  326,  326,  326,  326,  326,  326,   51,
+ /*   860 */    50,   52,   44,   23,   28,  367,  374,   33,   32,  375,
+ /*   870 */   383,   21,   31,  326,  326,  326,  326,  326,  326,  326,
+ /*   880 */   326,  326,  326,  326,  266,  384,  385,  386,  382,  381,
+ /*   890 */   377,  376,  378,  379,  282,  380,  362,  218,  326,  326,
+ /*   900 */   326,  326,  190,  344,  326,  326,   11,  145,  354,  283,
+ /*   910 */   288,  129,  218,  202,   18,   24,   22,  218,   45,   42,
+ /*   920 */     6,  107,   42,  236,  368,  365,  154,  343,  286,  200,
+ /*   930 */   245,  295,  241,  285,  326,   51,   50,   52,   44,   23,
+ /*   940 */    28,  367,  374,   33,   32,  375,  383,   21,   31,  218,
+ /*   950 */    10,  326,  326,  326,  326,  326,  326,  326,  326,  326,
+ /*   960 */   326,  384,  385,  386,  382,  381,  377,  376,  378,  379,
+ /*   970 */   282,  380,  362,  326,  326,  356,   40,  352,  326,  326,
+ /*   980 */   326,  326,  326,  326,  326,  326,  326,   51,   50,   52,
+ /*   990 */    44,   23,   28,  367,  374,   33,   32,  375,  383,   21,
+ /*  1000 */    31,  218,  326,  326,  326,  326,  326,  326,  326,  326,
+ /*  1010 */   326,  326,  326,  384,  385,  386,  382,  381,  377,  376,
+ /*  1020 */   378,  379,  282,  380,  362,  326,  326,  326,  326,  326,
+ /*  1030 */   326,  326,  326,  326,  326,  326,  326,  326,  326,   51,
+ /*  1040 */    50,   52,   44,   23,   28,  367,  374,   33,   32,  375,
+ /*  1050 */   383,   21,   31,  326,  326,  326,  326,  326,  326,  326,
+ /*  1060 */   326,  326,  326,  326,  326,  384,  385,  386,  382,  381,
+ /*  1070 */   377,  376,  378,  379,  282,  380,  362,  218,  218,   51,
+ /*  1080 */    50,   52,   44,   23,   28,  367,  374,   33,   32,  375,
+ /*  1090 */   383,   21,   31,  303,  304,  326,  326,  326,  326,  326,
+ /*  1100 */   326,  326,  326,  326,  326,  384,  385,  386,  382,  381,
+ /*  1110 */   377,  376,  378,  379,  282,  380,  362,  218,  326,  218,
+ /*  1120 */   326,  326,   43,  326,  134,  208,  326,  326,    6,  107,
+ /*  1130 */   326,  326,  253,  348,  154,  452,  354,  230,  245,  295,
+ /*  1140 */   241,  246,   18,   30,   42,   42,   48,   42,    6,  107,
+ /*  1150 */   326,  326,  326,    7,  154,  326,  326,  326,  245,  295,
+ /*  1160 */   241,   47,   46,  298,  233,  363,  326,  344,  101,    1,
+ /*  1170 */   269,  155,  326,  326,  326,  129,  136,  326,   43,  326,
+ /*  1180 */   134,  220,  326,   96,    6,  107,  358,  236,  368,  365,
+ /*  1190 */   154,  343,  326,  326,  245,  295,  241,  246,   42,   30,
+ /*  1200 */   326,  254,   48,  360,   40,  352,  326,  344,  326,  326,
+ /*  1210 */   326,  151,  326,   42,  349,  129,  326,   47,   46,  298,
+ /*  1220 */   233,  363,  326,  274,  101,    1,   42,  236,  368,  365,
+ /*  1230 */   326,  343,  336,  357,   43,   42,  144,  220,  326,   96,
+ /*  1240 */     6,  107,  289,  326,   42,   42,  154,  258,  326,  294,
+ /*  1250 */   245,  295,  241,  246,   42,    3,  326,  338,   48,   42,
+ /*  1260 */   259,   42,  326,  344,  326,  326,  326,  149,  326,   42,
+ /*  1270 */   279,  129,   42,   47,   46,  298,  233,  363,  326,  293,
+ /*  1280 */   101,    1,   42,  236,  368,  365,  326,  343,  309,  347,
+ /*  1290 */    43,   42,  126,  220,  326,   96,    6,  107,  290,  326,
+ /*  1300 */    42,   42,  154,  346,  326,  257,  245,  295,  241,  246,
+ /*  1310 */    42,   30,  326,  326,   48,   42,  326,   42,  326,  326,
+ /*  1320 */   326,  326,  326,  326,  326,  326,  326,  326,  326,   47,
+ /*  1330 */    46,  298,  233,  363,  326,  326,  101,    1,  326,  326,
+ /*  1340 */   326,  326,  326,  326,  326,  326,   43,  326,  130,  220,
+ /*  1350 */   326,   96,    6,  107,  326,  326,  326,  326,  154,  326,
+ /*  1360 */   326,  326,  245,  295,  241,  246,  326,   25,  326,  326,
+ /*  1370 */    48,  326,  326,  326,  326,  326,  326,  326,  326,  326,
+ /*  1380 */   326,  326,  326,  326,  326,   47,   46,  298,  233,  363,
+ /*  1390 */   326,  326,  101,    1,  326,  326,  326,  326,  326,  326,
+ /*  1400 */   326,  326,   43,  326,  134,  210,  326,   96,    6,  107,
+ /*  1410 */   326,  326,  326,  326,  154,  326,  326,  326,  245,  295,
+ /*  1420 */   241,  246,  326,   30,  326,  326,   48,  326,  326,  326,
+ /*  1430 */   326,  326,  326,  326,  326,  326,  326,  326,  326,  326,
+ /*  1440 */   326,   47,   46,  298,  233,  363,  326,  326,  101,    1,
+ /*  1450 */   326,  326,  326,  326,  326,  326,  326,  326,   43,  326,
+ /*  1460 */   124,   92,  326,   96,    6,  107,  326,  326,  326,  326,
+ /*  1470 */   154,  326,  326,  326,  245,  295,  241,  246,  326,   30,
+ /*  1480 */   326,  326,   48,  326,  326,  326,  326,  326,  326,  326,
+ /*  1490 */   326,  326,  326,  326,  326,  326,  326,   47,   46,  298,
+ /*  1500 */   233,  363,  326,  326,  101,    1,  326,  326,  326,  326,
+ /*  1510 */   326,  326,  326,  326,   43,  326,  134,  206,  326,   96,
+ /*  1520 */     6,  107,  326,  326,  326,  326,  154,  326,  326,  326,
+ /*  1530 */   245,  295,  241,  222,  326,   30,  326,  326,   48,  326,
+ /*  1540 */   326,  326,  326,  326,  326,  326,  326,  326,  326,  326,
+ /*  1550 */   326,  326,  326,   47,   46,  298,  233,  363,  326,  326,
+ /*  1560 */   101,    1,  326,  326,  326,  326,  326,  326,  326,  326,
+ /*  1570 */    43,  326,  134,  205,  326,   96,    6,  107,  326,  326,
+ /*  1580 */   326,  326,  154,  326,  326,  326,  245,  295,  241,  246,
+ /*  1590 */   326,   30,  326,  326,   48,  326,  326,  326,  326,  326,
+ /*  1600 */   326,  326,  326,  326,  326,  326,  326,  326,  326,   47,
+ /*  1610 */    46,  298,  233,  363,  326,  326,  101,    1,  326,  326,
+ /*  1620 */   326,  326,  326,  326,  326,  326,   43,  326,  134,  209,
+ /*  1630 */   326,   96,    6,  107,  326,  326,  326,  326,  154,  326,
+ /*  1640 */   326,  326,  245,  295,  241,  246,  326,   30,  326,  326,
+ /*  1650 */    48,  326,  326,  326,  326,  326,  326,  326,  326,  326,
+ /*  1660 */   326,  326,  326,  326,  326,   47,   46,  298,  233,  363,
+ /*  1670 */   326,  326,  101,    1,  326,  326,  326,  326,  326,  326,
+ /*  1680 */   326,  326,   43,  326,  130,  220,  326,   96,    6,  107,
+ /*  1690 */   326,  326,  326,  326,  154,  326,  326,  326,  245,  295,
+ /*  1700 */   241,  246,  326,   25,  326,  326,   48,  326,  326,  326,
+ /*  1710 */   326,  326,  326,  326,  326,  326,  326,  326,  326,  190,
+ /*  1720 */   165,   47,   46,  298,  233,  363,  326,  326,  101,  292,
+ /*  1730 */   326,  326,   24,   22,  326,  326,  326,  326,   43,  326,
+ /*  1740 */   130,  221,  326,   96,    6,  107,  200,  326,  326,  326,
+ /*  1750 */   154,  326,  326,  326,  245,  295,  241,  246,  326,   25,
+ /*  1760 */   326,  326,   48,  326,  326,  326,  326,  326,  326,  326,
+ /*  1770 */   326,  326,  326,  326,  326,  326,  326,   47,   46,  298,
+ /*  1780 */   233,  363,  326,  326,  101,  326,  326,  326,  326,  326,
+ /*  1790 */   326,  326,  326,  326,  326,  501,  190,  180,  326,   96,
+ /*  1800 */   326,  326,  501,  326,  501,  501,  292,  501,  501,   24,
+ /*  1810 */    22,  326,  326,  344,  501,    7,  501,  132,  326,  326,
+ /*  1820 */    78,  129,  326,  200,  326,  326,  326,  326,  326,  301,
+ /*  1830 */   361,  501,  326,  236,  368,  365,  326,  343,  136,  326,
+ /*  1840 */   326,  344,  501,  326,  217,   93,  326,  326,   59,  117,
+ /*  1850 */   326,  326,  326,  326,  326,  326,  501,  301,  361,  326,
+ /*  1860 */   326,  236,  368,  365,  344,  343,  326,  326,  132,  326,
+ /*  1870 */   326,   77,  129,  326,  326,  326,  326,  326,  326,  326,
+ /*  1880 */   301,  361,  326,  326,  236,  368,  365,  344,  343,  326,
+ /*  1890 */   326,  132,  326,  326,   84,  129,  326,  326,  344,  326,
+ /*  1900 */   326,  326,  115,  301,  361,   72,  129,  236,  368,  365,
+ /*  1910 */   326,  343,  326,  326,  301,  361,  326,  326,  236,  368,
+ /*  1920 */   365,  326,  343,  344,  326,  326,  326,  132,  326,  326,
+ /*  1930 */    64,  129,  326,  326,  344,  326,  326,  326,  132,  301,
+ /*  1940 */   361,   66,  129,  236,  368,  365,  326,  343,  326,  326,
+ /*  1950 */   301,  361,  326,  344,  236,  368,  365,  132,  343,  326,
+ /*  1960 */    68,  129,  326,  326,  326,  326,  326,  326,  326,  301,
+ /*  1970 */   361,  326,  344,  236,  368,  365,  132,  343,  326,   76,
+ /*  1980 */   129,  326,  326,  344,  326,  326,  326,  132,  301,  361,
+ /*  1990 */    80,  129,  236,  368,  365,  326,  343,  326,  326,  301,
+ /*  2000 */   361,  326,  326,  236,  368,  365,  326,  343,  344,  326,
+ /*  2010 */   326,  326,  132,  326,  326,   60,  129,  326,  326,  344,
+ /*  2020 */   326,  326,  326,  132,  301,  361,   73,  129,  236,  368,
+ /*  2030 */   365,  326,  343,  326,  326,  301,  361,  326,  344,  236,
+ /*  2040 */   368,  365,  132,  343,  326,   74,  129,  326,  326,  326,
+ /*  2050 */   326,  326,  326,  326,  301,  361,  326,  344,  236,  368,
+ /*  2060 */   365,  132,  343,  326,   90,  129,  326,  326,  344,  326,
+ /*  2070 */   326,  326,  132,  301,  361,   65,  129,  236,  368,  365,
+ /*  2080 */   326,  343,  326,  326,  301,  361,  326,  326,  236,  368,
+ /*  2090 */   365,  326,  343,  344,  326,  326,  326,  132,  326,  326,
+ /*  2100 */    83,  129,  326,  326,  344,  326,  326,  326,   93,  301,
+ /*  2110 */   361,   53,  117,  236,  368,  365,  326,  343,  326,  326,
+ /*  2120 */   301,  361,  326,  344,  215,  368,  365,  132,  343,  326,
+ /*  2130 */    87,  129,  326,  326,  326,  326,  326,  326,  326,  301,
+ /*  2140 */   361,  326,  344,  236,  368,  365,  132,  343,  326,   58,
+ /*  2150 */   129,  326,  326,  344,  326,  326,  326,  122,  301,  361,
+ /*  2160 */    55,  129,  236,  368,  365,  326,  343,  326,  326,  301,
+ /*  2170 */   361,  326,  326,  236,  368,  365,  326,  343,  344,  326,
+ /*  2180 */   326,  326,  132,  326,  326,   70,  129,  326,  326,  344,
+ /*  2190 */   326,  326,  326,  132,  301,  361,   91,  129,  236,  368,
+ /*  2200 */   365,  326,  343,  326,  326,  301,  361,  326,  344,  236,
+ /*  2210 */   368,  365,  111,  343,  326,   63,  129,  326,  326,  326,
+ /*  2220 */   326,  326,  326,  326,  301,  361,  326,  344,  236,  368,
+ /*  2230 */   365,  132,  343,  326,   86,  129,  326,  326,  344,  326,
+ /*  2240 */   326,  326,  132,  301,  361,   79,  129,  236,  368,  365,
+ /*  2250 */   326,  343,  326,  326,  301,  361,  326,  326,  236,  368,
+ /*  2260 */   365,  326,  343,  344,  326,  326,  326,  132,  326,  326,
+ /*  2270 */    75,  129,  326,  326,  344,  326,  326,  326,  132,  301,
+ /*  2280 */   361,   88,  129,  236,  368,  365,  326,  343,  326,  326,
+ /*  2290 */   301,  361,  326,  344,  236,  368,  365,  132,  343,  326,
+ /*  2300 */    62,  129,  326,  326,  326,  326,  326,  326,  326,  301,
+ /*  2310 */   361,  326,  344,  236,  368,  365,  132,  343,  326,   61,
+ /*  2320 */   129,  326,  326,  344,  326,  326,  326,  132,  301,  361,
+ /*  2330 */    69,  129,  236,  368,  365,  326,  343,  326,  326,  301,
+ /*  2340 */   361,  326,  326,  236,  368,  365,  326,  343,  344,  326,
+ /*  2350 */   326,  326,  132,  326,  326,   57,  129,  326,  326,  344,
+ /*  2360 */   326,  326,  326,  132,  301,  361,   89,  129,  236,  368,
+ /*  2370 */   365,  326,  343,  326,  326,  301,  361,  326,  344,  236,
+ /*  2380 */   368,  365,  132,  343,  326,   81,  129,  326,  326,  326,
+ /*  2390 */   326,  326,  326,  326,  301,  361,  326,  344,  236,  368,
+ /*  2400 */   365,  113,  343,  326,   85,  129,  326,  326,  344,  326,
+ /*  2410 */   326,  326,  132,  301,  361,   71,  129,  236,  368,  365,
+ /*  2420 */   326,  343,  326,  326,  301,  361,  326,  326,  236,  368,
+ /*  2430 */   365,  326,  343,  344,  326,  326,  326,  132,  326,  326,
+ /*  2440 */    67,  129,  326,  326,  344,  326,  326,  326,  132,  301,
+ /*  2450 */   361,   56,  129,  214,  368,  365,  326,  343,  326,  326,
+ /*  2460 */   301,  361,  326,  344,  236,  368,  365,  147,  343,  326,
+ /*  2470 */   326,  129,  326,  326,  326,  326,  326,  326,  326,  326,
+ /*  2480 */   364,  326,  344,  236,  368,  365,  157,  343,  326,  326,
+ /*  2490 */   129,  326,  326,  326,  326,  100,  177,  326,  326,  280,
+ /*  2500 */   326,  326,  236,  368,  365,  292,  343,  326,   24,   22,
+ /*  2510 */   326,  190,  167,  326,  326,  326,  326,  326,  190,  182,
+ /*  2520 */   326,  292,  200,  326,   24,   22,  326,  326,  292,  326,
+ /*  2530 */   326,   24,   22,  326,  190,  169,  326,  326,  200,  326,
+ /*  2540 */   326,  326,  326,  326,  292,  200,  326,   24,   22,  326,
+ /*  2550 */   326,  326,  326,  326,  326,  326,  326,  326,  326,  326,
+ /*  2560 */   326,  200,
+    );
+    static public $yy_lookahead = array(
+ /*     0 */     1,   83,   84,   85,    3,    4,    5,    6,    7,    8,
+ /*    10 */     9,   10,   11,   12,   13,   98,   90,   16,   81,   82,
+ /*    20 */    83,   84,   85,   22,   23,   99,   27,   16,   29,   28,
+ /*    30 */    19,   20,  109,   32,   33,   34,   25,  111,   39,   40,
+ /*    40 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
+ /*    50 */    51,   52,    4,    5,    6,    7,    8,   16,   36,   84,
+ /*    60 */    38,   13,   14,   15,   65,   66,   67,   68,   69,   70,
+ /*    70 */    71,   72,   73,   74,   75,   76,    1,   84,   37,   89,
+ /*    80 */    90,   88,   37,   16,   91,   92,   19,   20,   17,   99,
+ /*    90 */    17,   20,   17,  100,  101,  120,  121,  104,  105,  106,
+ /*   100 */    29,  108,   29,   58,   29,   60,  116,   31,   37,   64,
+ /*   110 */    37,  118,  119,   37,   39,   40,   41,   42,   43,   44,
+ /*   120 */    45,   46,   47,   48,   49,   50,   51,   52,   61,   89,
+ /*   130 */    90,   60,   36,   60,   38,   16,   60,   18,   19,   99,
+ /*   140 */    65,   66,   67,   68,   69,   70,   71,   72,   73,   74,
+ /*   150 */    75,   76,    1,   84,   35,    1,  116,   88,   21,   89,
+ /*   160 */    91,   92,   93,   16,   16,   97,   19,   19,   17,  100,
+ /*   170 */   101,   17,   19,  104,  105,  106,   29,  108,   31,  111,
+ /*   180 */    29,   89,    1,   29,   30,   16,  116,  117,   19,   20,
+ /*   190 */    39,   40,   41,   42,   43,   44,   45,   46,   47,   48,
+ /*   200 */    49,   50,   51,   52,   25,   89,   90,   53,  116,   61,
+ /*   210 */    16,    1,   31,   19,   61,   99,   65,   66,   67,   68,
+ /*   220 */    69,   70,   71,   72,   73,   74,   75,   76,    1,   84,
+ /*   230 */    58,    1,  116,   88,   53,   63,   91,   92,   93,   16,
+ /*   240 */    20,   21,   19,   86,   17,  100,  101,   17,   92,  104,
+ /*   250 */   105,  106,   29,  108,   31,   61,   29,   78,   98,   29,
+ /*   260 */   104,  112,  113,   53,  108,  113,   39,   40,   41,   42,
+ /*   270 */    43,   44,   45,   46,   47,   48,   49,   50,   51,   52,
+ /*   280 */    60,   90,   90,   53,  110,  109,  112,  113,   20,   21,
+ /*   290 */    99,   99,   65,   66,   67,   68,   69,   70,   71,   72,
+ /*   300 */    73,   74,   75,   76,    1,   84,   98,    1,  116,   88,
+ /*   310 */    84,   62,   91,   92,   88,   90,   64,    1,   92,   21,
+ /*   320 */    17,  100,  101,   17,   99,  104,  105,  106,   60,  108,
+ /*   330 */   104,  105,  106,   17,  108,   29,  111,   21,   18,   19,
+ /*   340 */   119,   14,   39,   40,   41,   42,   43,   44,   45,   46,
+ /*   350 */    47,   48,   49,   50,   51,   52,   58,  112,  113,   53,
+ /*   360 */    16,   63,   18,   19,   92,   93,   94,   19,   65,   66,
+ /*   370 */    67,   68,   69,   70,   71,   72,   73,   74,   75,   76,
+ /*   380 */     1,   84,   62,    1,   90,   88,   84,   19,   91,   92,
+ /*   390 */    88,   90,   58,   99,   92,   90,   17,  100,  101,   17,
+ /*   400 */    99,  104,  105,  106,   99,  108,  104,  105,  106,   36,
+ /*   410 */   108,   29,  115,   36,   19,   38,  111,  116,   39,   40,
+ /*   420 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
+ /*   430 */    51,   52,    1,   90,   37,   53,   89,   64,    2,  109,
+ /*   440 */    16,  111,   99,   19,   65,   66,   67,   68,   69,   70,
+ /*   450 */    71,   72,   73,   74,   75,   76,   20,   60,   16,  116,
+ /*   460 */    90,   19,  109,  116,  111,   18,   18,   19,   19,   99,
+ /*   470 */    39,   40,   41,   42,   43,   44,   45,   46,   47,   48,
+ /*   480 */    49,   50,   51,   52,   37,    1,  116,   17,   16,   16,
+ /*   490 */    16,   19,   19,   19,   89,   25,   65,   66,   67,   68,
+ /*   500 */    69,   70,   71,   72,   73,   74,   75,   76,   24,   78,
+ /*   510 */    24,  107,   92,   93,    1,   92,   93,   85,  114,   87,
+ /*   520 */    19,  116,   36,   39,   40,   41,   42,   43,   44,   45,
+ /*   530 */    46,   47,   48,   49,   50,   51,   52,    1,   19,   18,
+ /*   540 */    20,   35,   29,   62,   19,    2,   96,   96,   96,   65,
+ /*   550 */    66,   67,   68,   69,   70,   71,   72,   73,   74,   75,
+ /*   560 */    76,  111,  111,  111,  107,   54,   30,   18,   26,   18,
+ /*   570 */     2,  114,   18,   18,   96,   39,   40,   41,   42,   43,
+ /*   580 */    44,   45,   46,   47,   48,   49,   50,   51,   52,  111,
+ /*   590 */    90,   19,   19,   35,   38,   25,   37,   19,   37,   99,
+ /*   600 */    96,   65,   66,   67,   68,   69,   70,   71,   72,   73,
+ /*   610 */    74,   75,   76,    1,   84,  111,    1,   99,   88,   84,
+ /*   620 */   117,   91,   92,   88,  110,  116,  109,   92,   90,   17,
+ /*   630 */   100,  101,   17,   20,  104,  105,  106,   99,  108,  104,
+ /*   640 */   105,  106,    1,  108,  111,  115,   29,   29,  114,  111,
+ /*   650 */    29,   39,   40,   41,   42,   43,   44,   45,   46,   47,
+ /*   660 */    48,   49,   50,   51,   52,    1,   95,    2,   53,   95,
+ /*   670 */   122,   58,  109,  122,  122,   96,   96,   65,   66,   67,
+ /*   680 */    68,   69,   70,   71,   72,   73,   74,   75,   76,   17,
+ /*   690 */   111,  111,  122,  122,  122,  122,  122,  122,  122,  122,
+ /*   700 */   122,   29,   38,   39,   40,   41,   42,   43,   44,   45,
+ /*   710 */    46,   47,   48,   49,   50,   51,   52,    1,  122,  122,
+ /*   720 */   122,  122,  122,  122,  122,  122,   96,  122,    1,   65,
+ /*   730 */    66,   67,   68,   69,   70,   71,   72,   73,   74,   75,
+ /*   740 */    76,  111,   84,  122,   17,  122,  122,  122,  122,  122,
+ /*   750 */   122,  122,  122,  122,   38,   39,   40,   41,   42,   43,
+ /*   760 */    44,   45,   46,   47,   48,   49,   50,   51,   52,    1,
+ /*   770 */   122,  122,  122,  122,  122,  122,  122,  122,   96,  121,
+ /*   780 */    96,   65,   66,   67,   68,   69,   70,   71,   72,   73,
+ /*   790 */    74,   75,   76,  111,  122,  111,  122,   29,  122,  122,
+ /*   800 */   122,  122,  122,  122,  122,  122,   21,   39,   40,   41,
+ /*   810 */    42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
+ /*   820 */    52,    1,  122,  122,  122,  122,  122,  122,  122,  122,
+ /*   830 */   122,  122,  122,   65,   66,   67,   68,   69,   70,   71,
+ /*   840 */    72,   73,   74,   75,   76,   60,  122,  122,  122,  122,
+ /*   850 */   122,  122,  122,  122,  122,  122,  122,  122,  122,   39,
+ /*   860 */    40,   41,   42,   43,   44,   45,   46,   47,   48,   49,
+ /*   870 */    50,   51,   52,  122,  122,  122,  122,  122,  122,  122,
+ /*   880 */   122,  122,  122,  122,   64,   65,   66,   67,   68,   69,
+ /*   890 */    70,   71,   72,   73,   74,   75,   76,    1,  122,  122,
+ /*   900 */   122,  122,   89,   84,  122,  122,   16,   88,   10,   19,
+ /*   910 */    17,   92,    1,   17,   16,  102,  103,    1,    2,   29,
+ /*   920 */    22,   23,   29,  104,  105,  106,   28,  108,   17,  116,
+ /*   930 */    32,   33,   34,   17,  122,   39,   40,   41,   42,   43,
+ /*   940 */    44,   45,   46,   47,   48,   49,   50,   51,   52,    1,
+ /*   950 */     2,  122,  122,  122,  122,  122,  122,  122,  122,  122,
+ /*   960 */   122,   65,   66,   67,   68,   69,   70,   71,   72,   73,
+ /*   970 */    74,   75,   76,  122,  122,   77,   78,   79,  122,  122,
+ /*   980 */   122,  122,  122,  122,  122,  122,  122,   39,   40,   41,
+ /*   990 */    42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
+ /*  1000 */    52,    1,  122,  122,  122,  122,  122,  122,  122,  122,
+ /*  1010 */   122,  122,  122,   65,   66,   67,   68,   69,   70,   71,
+ /*  1020 */    72,   73,   74,   75,   76,  122,  122,  122,  122,  122,
+ /*  1030 */   122,  122,  122,  122,  122,  122,  122,  122,  122,   39,
+ /*  1040 */    40,   41,   42,   43,   44,   45,   46,   47,   48,   49,
+ /*  1050 */    50,   51,   52,  122,  122,  122,  122,  122,  122,  122,
+ /*  1060 */   122,  122,  122,  122,  122,   65,   66,   67,   68,   69,
+ /*  1070 */    70,   71,   72,   73,   74,   75,   76,    1,    1,   39,
+ /*  1080 */    40,   41,   42,   43,   44,   45,   46,   47,   48,   49,
+ /*  1090 */    50,   51,   52,   17,   17,  122,  122,  122,  122,  122,
+ /*  1100 */   122,  122,  122,  122,  122,   65,   66,   67,   68,   69,
+ /*  1110 */    70,   71,   72,   73,   74,   75,   76,    1,  122,    1,
+ /*  1120 */   122,  122,   16,  122,   18,   19,  122,  122,   22,   23,
+ /*  1130 */   122,  122,   17,   17,   28,   17,   10,   21,   32,   33,
+ /*  1140 */    34,   35,   16,   37,   29,   29,   40,   29,   22,   23,
+ /*  1150 */   122,  122,  122,   37,   28,  122,  122,  122,   32,   33,
+ /*  1160 */    34,   55,   56,   57,   58,   59,  122,   84,   62,   63,
+ /*  1170 */    64,   88,  122,  122,  122,   92,   60,  122,   16,  122,
+ /*  1180 */    18,   19,  122,   77,   22,   23,   17,  104,  105,  106,
+ /*  1190 */    28,  108,  122,  122,   32,   33,   34,   35,   29,   37,
+ /*  1200 */   122,   17,   40,   77,   78,   79,  122,   84,  122,  122,
+ /*  1210 */   122,   88,  122,   29,   17,   92,  122,   55,   56,   57,
+ /*  1220 */    58,   59,  122,   17,   62,   63,   29,  104,  105,  106,
+ /*  1230 */   122,  108,   17,   17,   16,   29,   18,   19,  122,   77,
+ /*  1240 */    22,   23,   17,  122,   29,   29,   28,   17,  122,   17,
+ /*  1250 */    32,   33,   34,   35,   29,   37,  122,   17,   40,   29,
+ /*  1260 */    17,   29,  122,   84,  122,  122,  122,   88,  122,   29,
+ /*  1270 */    17,   92,   29,   55,   56,   57,   58,   59,  122,   17,
+ /*  1280 */    62,   63,   29,  104,  105,  106,  122,  108,   17,   17,
+ /*  1290 */    16,   29,   18,   19,  122,   77,   22,   23,   17,  122,
+ /*  1300 */    29,   29,   28,   17,  122,   17,   32,   33,   34,   35,
+ /*  1310 */    29,   37,  122,  122,   40,   29,  122,   29,  122,  122,
+ /*  1320 */   122,  122,  122,  122,  122,  122,  122,  122,  122,   55,
+ /*  1330 */    56,   57,   58,   59,  122,  122,   62,   63,  122,  122,
+ /*  1340 */   122,  122,  122,  122,  122,  122,   16,  122,   18,   19,
+ /*  1350 */   122,   77,   22,   23,  122,  122,  122,  122,   28,  122,
+ /*  1360 */   122,  122,   32,   33,   34,   35,  122,   37,  122,  122,
+ /*  1370 */    40,  122,  122,  122,  122,  122,  122,  122,  122,  122,
+ /*  1380 */   122,  122,  122,  122,  122,   55,   56,   57,   58,   59,
+ /*  1390 */   122,  122,   62,   63,  122,  122,  122,  122,  122,  122,
+ /*  1400 */   122,  122,   16,  122,   18,   19,  122,   77,   22,   23,
+ /*  1410 */   122,  122,  122,  122,   28,  122,  122,  122,   32,   33,
+ /*  1420 */    34,   35,  122,   37,  122,  122,   40,  122,  122,  122,
+ /*  1430 */   122,  122,  122,  122,  122,  122,  122,  122,  122,  122,
+ /*  1440 */   122,   55,   56,   57,   58,   59,  122,  122,   62,   63,
+ /*  1450 */   122,  122,  122,  122,  122,  122,  122,  122,   16,  122,
+ /*  1460 */    18,   19,  122,   77,   22,   23,  122,  122,  122,  122,
+ /*  1470 */    28,  122,  122,  122,   32,   33,   34,   35,  122,   37,
+ /*  1480 */   122,  122,   40,  122,  122,  122,  122,  122,  122,  122,
+ /*  1490 */   122,  122,  122,  122,  122,  122,  122,   55,   56,   57,
+ /*  1500 */    58,   59,  122,  122,   62,   63,  122,  122,  122,  122,
+ /*  1510 */   122,  122,  122,  122,   16,  122,   18,   19,  122,   77,
+ /*  1520 */    22,   23,  122,  122,  122,  122,   28,  122,  122,  122,
+ /*  1530 */    32,   33,   34,   35,  122,   37,  122,  122,   40,  122,
+ /*  1540 */   122,  122,  122,  122,  122,  122,  122,  122,  122,  122,
+ /*  1550 */   122,  122,  122,   55,   56,   57,   58,   59,  122,  122,
+ /*  1560 */    62,   63,  122,  122,  122,  122,  122,  122,  122,  122,
+ /*  1570 */    16,  122,   18,   19,  122,   77,   22,   23,  122,  122,
+ /*  1580 */   122,  122,   28,  122,  122,  122,   32,   33,   34,   35,
+ /*  1590 */   122,   37,  122,  122,   40,  122,  122,  122,  122,  122,
+ /*  1600 */   122,  122,  122,  122,  122,  122,  122,  122,  122,   55,
+ /*  1610 */    56,   57,   58,   59,  122,  122,   62,   63,  122,  122,
+ /*  1620 */   122,  122,  122,  122,  122,  122,   16,  122,   18,   19,
+ /*  1630 */   122,   77,   22,   23,  122,  122,  122,  122,   28,  122,
+ /*  1640 */   122,  122,   32,   33,   34,   35,  122,   37,  122,  122,
+ /*  1650 */    40,  122,  122,  122,  122,  122,  122,  122,  122,  122,
+ /*  1660 */   122,  122,  122,  122,  122,   55,   56,   57,   58,   59,
+ /*  1670 */   122,  122,   62,   63,  122,  122,  122,  122,  122,  122,
+ /*  1680 */   122,  122,   16,  122,   18,   19,  122,   77,   22,   23,
+ /*  1690 */   122,  122,  122,  122,   28,  122,  122,  122,   32,   33,
+ /*  1700 */    34,   35,  122,   37,  122,  122,   40,  122,  122,  122,
+ /*  1710 */   122,  122,  122,  122,  122,  122,  122,  122,  122,   89,
+ /*  1720 */    90,   55,   56,   57,   58,   59,  122,  122,   62,   99,
+ /*  1730 */   122,  122,  102,  103,  122,  122,  122,  122,   16,  122,
+ /*  1740 */    18,   19,  122,   77,   22,   23,  116,  122,  122,  122,
+ /*  1750 */    28,  122,  122,  122,   32,   33,   34,   35,  122,   37,
+ /*  1760 */   122,  122,   40,  122,  122,  122,  122,  122,  122,  122,
+ /*  1770 */   122,  122,  122,  122,  122,  122,  122,   55,   56,   57,
+ /*  1780 */    58,   59,  122,  122,   62,  122,  122,  122,  122,  122,
+ /*  1790 */   122,  122,  122,  122,  122,   17,   89,   90,  122,   77,
+ /*  1800 */   122,  122,   24,  122,   26,   27,   99,   29,   30,  102,
+ /*  1810 */   103,  122,  122,   84,   36,   37,   38,   88,  122,  122,
+ /*  1820 */    91,   92,  122,  116,  122,  122,  122,  122,  122,  100,
+ /*  1830 */   101,   53,  122,  104,  105,  106,  122,  108,   60,  122,
+ /*  1840 */   122,   84,   64,  122,  115,   88,  122,  122,   91,   92,
+ /*  1850 */   122,  122,  122,  122,  122,  122,   78,  100,  101,  122,
+ /*  1860 */   122,  104,  105,  106,   84,  108,  122,  122,   88,  122,
+ /*  1870 */   122,   91,   92,  122,  122,  122,  122,  122,  122,  122,
+ /*  1880 */   100,  101,  122,  122,  104,  105,  106,   84,  108,  122,
+ /*  1890 */   122,   88,  122,  122,   91,   92,  122,  122,   84,  122,
+ /*  1900 */   122,  122,   88,  100,  101,   91,   92,  104,  105,  106,
+ /*  1910 */   122,  108,  122,  122,  100,  101,  122,  122,  104,  105,
+ /*  1920 */   106,  122,  108,   84,  122,  122,  122,   88,  122,  122,
+ /*  1930 */    91,   92,  122,  122,   84,  122,  122,  122,   88,  100,
+ /*  1940 */   101,   91,   92,  104,  105,  106,  122,  108,  122,  122,
+ /*  1950 */   100,  101,  122,   84,  104,  105,  106,   88,  108,  122,
+ /*  1960 */    91,   92,  122,  122,  122,  122,  122,  122,  122,  100,
+ /*  1970 */   101,  122,   84,  104,  105,  106,   88,  108,  122,   91,
+ /*  1980 */    92,  122,  122,   84,  122,  122,  122,   88,  100,  101,
+ /*  1990 */    91,   92,  104,  105,  106,  122,  108,  122,  122,  100,
+ /*  2000 */   101,  122,  122,  104,  105,  106,  122,  108,   84,  122,
+ /*  2010 */   122,  122,   88,  122,  122,   91,   92,  122,  122,   84,
+ /*  2020 */   122,  122,  122,   88,  100,  101,   91,   92,  104,  105,
+ /*  2030 */   106,  122,  108,  122,  122,  100,  101,  122,   84,  104,
+ /*  2040 */   105,  106,   88,  108,  122,   91,   92,  122,  122,  122,
+ /*  2050 */   122,  122,  122,  122,  100,  101,  122,   84,  104,  105,
+ /*  2060 */   106,   88,  108,  122,   91,   92,  122,  122,   84,  122,
+ /*  2070 */   122,  122,   88,  100,  101,   91,   92,  104,  105,  106,
+ /*  2080 */   122,  108,  122,  122,  100,  101,  122,  122,  104,  105,
+ /*  2090 */   106,  122,  108,   84,  122,  122,  122,   88,  122,  122,
+ /*  2100 */    91,   92,  122,  122,   84,  122,  122,  122,   88,  100,
+ /*  2110 */   101,   91,   92,  104,  105,  106,  122,  108,  122,  122,
+ /*  2120 */   100,  101,  122,   84,  104,  105,  106,   88,  108,  122,
+ /*  2130 */    91,   92,  122,  122,  122,  122,  122,  122,  122,  100,
+ /*  2140 */   101,  122,   84,  104,  105,  106,   88,  108,  122,   91,
+ /*  2150 */    92,  122,  122,   84,  122,  122,  122,   88,  100,  101,
+ /*  2160 */    91,   92,  104,  105,  106,  122,  108,  122,  122,  100,
+ /*  2170 */   101,  122,  122,  104,  105,  106,  122,  108,   84,  122,
+ /*  2180 */   122,  122,   88,  122,  122,   91,   92,  122,  122,   84,
+ /*  2190 */   122,  122,  122,   88,  100,  101,   91,   92,  104,  105,
+ /*  2200 */   106,  122,  108,  122,  122,  100,  101,  122,   84,  104,
+ /*  2210 */   105,  106,   88,  108,  122,   91,   92,  122,  122,  122,
+ /*  2220 */   122,  122,  122,  122,  100,  101,  122,   84,  104,  105,
+ /*  2230 */   106,   88,  108,  122,   91,   92,  122,  122,   84,  122,
+ /*  2240 */   122,  122,   88,  100,  101,   91,   92,  104,  105,  106,
+ /*  2250 */   122,  108,  122,  122,  100,  101,  122,  122,  104,  105,
+ /*  2260 */   106,  122,  108,   84,  122,  122,  122,   88,  122,  122,
+ /*  2270 */    91,   92,  122,  122,   84,  122,  122,  122,   88,  100,
+ /*  2280 */   101,   91,   92,  104,  105,  106,  122,  108,  122,  122,
+ /*  2290 */   100,  101,  122,   84,  104,  105,  106,   88,  108,  122,
+ /*  2300 */    91,   92,  122,  122,  122,  122,  122,  122,  122,  100,
+ /*  2310 */   101,  122,   84,  104,  105,  106,   88,  108,  122,   91,
+ /*  2320 */    92,  122,  122,   84,  122,  122,  122,   88,  100,  101,
+ /*  2330 */    91,   92,  104,  105,  106,  122,  108,  122,  122,  100,
+ /*  2340 */   101,  122,  122,  104,  105,  106,  122,  108,   84,  122,
+ /*  2350 */   122,  122,   88,  122,  122,   91,   92,  122,  122,   84,
+ /*  2360 */   122,  122,  122,   88,  100,  101,   91,   92,  104,  105,
+ /*  2370 */   106,  122,  108,  122,  122,  100,  101,  122,   84,  104,
+ /*  2380 */   105,  106,   88,  108,  122,   91,   92,  122,  122,  122,
+ /*  2390 */   122,  122,  122,  122,  100,  101,  122,   84,  104,  105,
+ /*  2400 */   106,   88,  108,  122,   91,   92,  122,  122,   84,  122,
+ /*  2410 */   122,  122,   88,  100,  101,   91,   92,  104,  105,  106,
+ /*  2420 */   122,  108,  122,  122,  100,  101,  122,  122,  104,  105,
+ /*  2430 */   106,  122,  108,   84,  122,  122,  122,   88,  122,  122,
+ /*  2440 */    91,   92,  122,  122,   84,  122,  122,  122,   88,  100,
+ /*  2450 */   101,   91,   92,  104,  105,  106,  122,  108,  122,  122,
+ /*  2460 */   100,  101,  122,   84,  104,  105,  106,   88,  108,  122,
+ /*  2470 */   122,   92,  122,  122,  122,  122,  122,  122,  122,  122,
+ /*  2480 */   101,  122,   84,  104,  105,  106,   88,  108,  122,  122,
+ /*  2490 */    92,  122,  122,  122,  122,   89,   90,  122,  122,  101,
+ /*  2500 */   122,  122,  104,  105,  106,   99,  108,  122,  102,  103,
+ /*  2510 */   122,   89,   90,  122,  122,  122,  122,  122,   89,   90,
+ /*  2520 */   122,   99,  116,  122,  102,  103,  122,  122,   99,  122,
+ /*  2530 */   122,  102,  103,  122,   89,   90,  122,  122,  116,  122,
+ /*  2540 */   122,  122,  122,  122,   99,  116,  122,  102,  103,  122,
+ /*  2550 */   122,  122,  122,  122,  122,  122,  122,  122,  122,  122,
+ /*  2560 */   122,  116,
+);
+    const YY_SHIFT_USE_DFLT = -2;
+    const YY_SHIFT_MAX = 252;
+    static public $yy_shift_ofst = array(
+ /*     0 */     1, 1386, 1162, 1218, 1162, 1386, 1218, 1162, 1106, 1162,
+ /*    10 */  1162, 1162, 1162, 1162, 1162, 1162, 1162, 1162, 1442, 1554,
+ /*    20 */  1498, 1162, 1162, 1162, 1162, 1162, 1162, 1610, 1162, 1162,
+ /*    30 */  1162, 1162, 1162, 1162, 1274, 1162, 1162, 1162, 1162, 1162,
+ /*    40 */  1162, 1162, 1498, 1442, 1330, 1330, 1666, 1666, 1666, 1722,
+ /*    50 */  1666, 1666, 1666,  227,   75,  151,   -1,  768,  768,  768,
+ /*    60 */   948,  896,  820,  536,  379,  716,  303,  431,  664,  612,
+ /*    70 */   484, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000,
+ /*    80 */  1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000,
+ /*    90 */  1040, 1040, 1116,  382,  513,    1, 1126,  147,  223, 1118,
+ /*   100 */  1118,  320,  890,  916,  298,  890,  513,  447,  513,  898,
+ /*   110 */    48,  154,   11,  306,   67,  230,  194,  220,  169,  268,
+ /*   120 */   181,  316,  615,  424,  473,  424,  472,  474,  448,  785,
+ /*   130 */   424,  424,  210,  424,  442,  447,  448,  424,  424,  424,
+ /*   140 */   727,  424, 1288,  447,  442,  641,  137,  641,  641,  641,
+ /*   150 */   641,  641,  137,  617,  618,  641,  641,   -2,  344,  148,
+ /*   160 */   893,  172,   41,  172, 1225, 1215, 1216, 1206, 1197, 1115,
+ /*   170 */  1169, 1184, 1230,  172, 1271,  672, 1262, 1272, 1286, 1077,
+ /*   180 */  1281,  172, 1240, 1232,  911,  172, 1253, 1243, 1076,  621,
+ /*   190 */   641,  641,  665,  665,  559,  621,  137,  327,  137,  137,
+ /*   200 */    -2,   -2,   -2,   -2,   -2, 1778,   71,  119,   45,   73,
+ /*   210 */    76,   96,  486,  436,  179,  470,   22,  377,  153,  373,
+ /*   220 */   397,  397,  613,  561,  554,  572,  568,  249,  549,  542,
+ /*   230 */   573,  555,  578,  558,  559,  556,  570,  511,  543,  449,
+ /*   240 */   501,  395,  252,  348,  368,  519,  334,  525,  481,  506,
+ /*   250 */   521,  520,  551,
+);
+    const YY_REDUCE_USE_DFLT = -84;
+    const YY_REDUCE_MAX = 204;
+    static public $yy_reduce_ofst = array(
+ /*     0 */   -63,   -7, 1729,   69,  297,  221,  145,  530, 2209, 2228,
+ /*    10 */  1973, 1850, 2190, 2039, 2058, 1899, 2094, 2069, 2020, 2105,
+ /*    20 */  2124, 2179, 2154, 2143, 2009, 1984, 1839, 1814, 1780, 1803,
+ /*    30 */  1869, 1888, 1954, 1935, 1924, 2275, 2324, 2294, 2264, 2360,
+ /*    40 */  2349, 2239, 2313, 1757, 2379, 2398,  226,  819,  302,  535,
+ /*    50 */  1179, 1123, 1083, 2406, 1707, 1630, 2422, 2445, 2429, 2406,
+ /*    60 */   813,  813,  813,  813,  813,  813,  813,  813,  813,  813,
+ /*    70 */   813,  813,  813,  813,  813,  813,  813,  813,  813,  813,
+ /*    80 */   813,  813,  813,  813,  813,  813,  813,  813,  813,  813,
+ /*    90 */   813,  813,  -10,   40,  116,  -82,  -25,  225,  -74,  192,
+ /*   100 */   343,  156,  305,   70,  174,  538,  370,  272,  301,  658,
+ /*   110 */   432,   92,   68,   92,  330,   92,  330,  245,  330,  245,
+ /*   120 */    92,  347,   92,  478,  451,  353,  451,  504,  404,  245,
+ /*   130 */   451,  450,   92,  452,  451,  420,  457,  682,  684,  580,
+ /*   140 */   405,  579,  500,  423,  630,   92,  149,   92,   92,   92,
+ /*   150 */    92,   92,  245,  294,  191,   92,   92,   92,  534,  533,
+ /*   160 */   518,  514,  517,  514,  518,  518,  518,  518,  518,  518,
+ /*   170 */   518,  518,  518,  514,  518,  518,  518,  518,  518,  509,
+ /*   180 */   518,  514,  518,  518,  509,  514,  518,  518,  509,  574,
+ /*   190 */   509,  509,  503,  503,  563,  571,  152,  157,  152,  152,
+ /*   200 */   -83,  208,  176,  160,  -77,
+);
+    static public $yyExpectedTokens = array(
+        /* 0 */ array(3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16, 22, 23, 28, 32, 33, 34, ),
+        /* 1 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 2 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 3 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 4 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 5 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 6 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 7 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 8 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 64, 77, ),
+        /* 9 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 10 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 11 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 12 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 13 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 14 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 15 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 16 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 17 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 18 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 19 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 20 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 21 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 22 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 23 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 24 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 25 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 26 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 27 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 28 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 29 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 30 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 31 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 32 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 33 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 34 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 35 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 36 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 37 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 38 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 39 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 40 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 41 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 42 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 43 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 44 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 45 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
+        /* 46 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ),
+        /* 47 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ),
+        /* 48 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ),
+        /* 49 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ),
+        /* 50 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ),
+        /* 51 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ),
+        /* 52 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ),
+        /* 53 */ array(1, 17, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 54 */ array(1, 17, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 55 */ array(1, 17, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 56 */ array(1, 27, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 57 */ array(1, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 58 */ array(1, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 59 */ array(1, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 60 */ array(1, 2, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 61 */ array(1, 17, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 62 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 63 */ array(1, 30, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 64 */ array(1, 17, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 65 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 66 */ array(1, 17, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 67 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 78, ),
+        /* 68 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 69 */ array(1, 17, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 70 */ array(1, 24, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 71 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 72 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 73 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 74 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 75 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 76 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 77 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 78 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 79 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 80 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 81 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 82 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 83 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 84 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 85 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 86 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 87 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 88 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 89 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 90 */ array(39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 91 */ array(39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
+        /* 92 */ array(1, 17, 21, 29, 37, 60, ),
+        /* 93 */ array(1, 17, 29, 53, ),
+        /* 94 */ array(1, 29, ),
+        /* 95 */ array(3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16, 22, 23, 28, 32, 33, 34, ),
+        /* 96 */ array(10, 16, 22, 23, 28, 32, 33, 34, 77, 78, 79, ),
+        /* 97 */ array(16, 19, 29, 31, ),
+        /* 98 */ array(16, 19, 29, 31, ),
+        /* 99 */ array(1, 17, 29, ),
+        /* 100 */ array(1, 17, 29, ),
+        /* 101 */ array(18, 19, 62, ),
+        /* 102 */ array(16, 19, 29, ),
+        /* 103 */ array(1, 2, 17, ),
+        /* 104 */ array(21, 58, 63, ),
+        /* 105 */ array(16, 19, 29, ),
+        /* 106 */ array(1, 29, ),
+        /* 107 */ array(18, 37, ),
+        /* 108 */ array(1, 29, ),
+        /* 109 */ array(10, 16, 22, 23, 28, 32, 33, 34, 77, 78, 79, ),
+        /* 110 */ array(4, 5, 6, 7, 8, 13, 14, 15, ),
+        /* 111 */ array(1, 17, 29, 30, 53, ),
+        /* 112 */ array(16, 19, 20, 25, ),
+        /* 113 */ array(1, 17, 29, 53, ),
+        /* 114 */ array(16, 19, 20, 61, ),
+        /* 115 */ array(1, 17, 29, 53, ),
+        /* 116 */ array(16, 19, 61, ),
+        /* 117 */ array(20, 21, 60, ),
+        /* 118 */ array(16, 19, 20, ),
+        /* 119 */ array(20, 21, 60, ),
+        /* 120 */ array(1, 31, 53, ),
+        /* 121 */ array(1, 17, 21, ),
+        /* 122 */ array(1, 17, 53, ),
+        /* 123 */ array(16, 19, ),
+        /* 124 */ array(16, 19, ),
+        /* 125 */ array(16, 19, ),
+        /* 126 */ array(16, 19, ),
+        /* 127 */ array(16, 19, ),
+        /* 128 */ array(18, 19, ),
+        /* 129 */ array(21, 60, ),
+        /* 130 */ array(16, 19, ),
+        /* 131 */ array(16, 19, ),
+        /* 132 */ array(1, 53, ),
+        /* 133 */ array(16, 19, ),
+        /* 134 */ array(16, 19, ),
+        /* 135 */ array(18, 37, ),
+        /* 136 */ array(18, 19, ),
+        /* 137 */ array(16, 19, ),
+        /* 138 */ array(16, 19, ),
+        /* 139 */ array(16, 19, ),
+        /* 140 */ array(1, 17, ),
+        /* 141 */ array(16, 19, ),
+        /* 142 */ array(17, 29, ),
+        /* 143 */ array(18, 37, ),
+        /* 144 */ array(16, 19, ),
+        /* 145 */ array(1, ),
+        /* 146 */ array(21, ),
+        /* 147 */ array(1, ),
+        /* 148 */ array(1, ),
+        /* 149 */ array(1, ),
+        /* 150 */ array(1, ),
+        /* 151 */ array(1, ),
+        /* 152 */ array(21, ),
+        /* 153 */ array(29, ),
+        /* 154 */ array(29, ),
+        /* 155 */ array(1, ),
+        /* 156 */ array(1, ),
+        /* 157 */ array(),
+        /* 158 */ array(16, 18, 19, ),
+        /* 159 */ array(16, 19, 61, ),
+        /* 160 */ array(17, 29, ),
+        /* 161 */ array(58, 63, ),
+        /* 162 */ array(16, 37, ),
+        /* 163 */ array(58, 63, ),
+        /* 164 */ array(17, 29, ),
+        /* 165 */ array(17, 29, ),
+        /* 166 */ array(17, 29, ),
+        /* 167 */ array(17, 29, ),
+        /* 168 */ array(17, 29, ),
+        /* 169 */ array(17, 29, ),
+        /* 170 */ array(17, 29, ),
+        /* 171 */ array(17, 29, ),
+        /* 172 */ array(17, 29, ),
+        /* 173 */ array(58, 63, ),
+        /* 174 */ array(17, 29, ),
+        /* 175 */ array(17, 29, ),
+        /* 176 */ array(17, 29, ),
+        /* 177 */ array(17, 29, ),
+        /* 178 */ array(17, 29, ),
+        /* 179 */ array(1, 17, ),
+        /* 180 */ array(17, 29, ),
+        /* 181 */ array(58, 63, ),
+        /* 182 */ array(17, 29, ),
+        /* 183 */ array(17, 29, ),
+        /* 184 */ array(1, 17, ),
+        /* 185 */ array(58, 63, ),
+        /* 186 */ array(17, 29, ),
+        /* 187 */ array(17, 29, ),
+        /* 188 */ array(1, 17, ),
+        /* 189 */ array(29, ),
+        /* 190 */ array(1, ),
+        /* 191 */ array(1, ),
+        /* 192 */ array(2, ),
+        /* 193 */ array(2, ),
+        /* 194 */ array(37, ),
+        /* 195 */ array(29, ),
+        /* 196 */ array(21, ),
+        /* 197 */ array(14, ),
+        /* 198 */ array(21, ),
+        /* 199 */ array(21, ),
+        /* 200 */ array(),
+        /* 201 */ array(),
+        /* 202 */ array(),
+        /* 203 */ array(),
+        /* 204 */ array(),
+        /* 205 */ array(17, 24, 26, 27, 29, 30, 36, 37, 38, 53, 60, 64, 78, ),
+        /* 206 */ array(17, 20, 29, 37, 60, ),
+        /* 207 */ array(16, 18, 19, 35, ),
+        /* 208 */ array(37, 58, 60, 64, ),
+        /* 209 */ array(17, 29, 37, 60, ),
+        /* 210 */ array(31, 37, 60, ),
+        /* 211 */ array(36, 38, ),
+        /* 212 */ array(24, 36, ),
+        /* 213 */ array(2, 20, ),
+        /* 214 */ array(25, 78, ),
+        /* 215 */ array(17, 25, ),
+        /* 216 */ array(36, 38, ),
+        /* 217 */ array(36, 38, ),
+        /* 218 */ array(19, 61, ),
+        /* 219 */ array(36, 64, ),
+        /* 220 */ array(37, 60, ),
+        /* 221 */ array(37, 60, ),
+        /* 222 */ array(20, 58, ),
+        /* 223 */ array(37, ),
+        /* 224 */ array(18, ),
+        /* 225 */ array(19, ),
+        /* 226 */ array(2, ),
+        /* 227 */ array(62, ),
+        /* 228 */ array(18, ),
+        /* 229 */ array(26, ),
+        /* 230 */ array(19, ),
+        /* 231 */ array(18, ),
+        /* 232 */ array(19, ),
+        /* 233 */ array(35, ),
+        /* 234 */ array(37, ),
+        /* 235 */ array(38, ),
+        /* 236 */ array(25, ),
+        /* 237 */ array(54, ),
+        /* 238 */ array(2, ),
+        /* 239 */ array(19, ),
+        /* 240 */ array(19, ),
+        /* 241 */ array(19, ),
+        /* 242 */ array(64, ),
+        /* 243 */ array(19, ),
+        /* 244 */ array(19, ),
+        /* 245 */ array(19, ),
+        /* 246 */ array(58, ),
+        /* 247 */ array(19, ),
+        /* 248 */ array(62, ),
+        /* 249 */ array(35, ),
+        /* 250 */ array(18, ),
+        /* 251 */ array(20, ),
+        /* 252 */ array(18, ),
+        /* 253 */ array(),
+        /* 254 */ array(),
+        /* 255 */ array(),
+        /* 256 */ array(),
+        /* 257 */ array(),
+        /* 258 */ array(),
+        /* 259 */ array(),
+        /* 260 */ array(),
+        /* 261 */ array(),
+        /* 262 */ array(),
+        /* 263 */ array(),
+        /* 264 */ array(),
+        /* 265 */ array(),
+        /* 266 */ array(),
+        /* 267 */ array(),
+        /* 268 */ array(),
+        /* 269 */ array(),
+        /* 270 */ array(),
+        /* 271 */ array(),
+        /* 272 */ array(),
+        /* 273 */ array(),
+        /* 274 */ array(),
+        /* 275 */ array(),
+        /* 276 */ array(),
+        /* 277 */ array(),
+        /* 278 */ array(),
+        /* 279 */ array(),
+        /* 280 */ array(),
+        /* 281 */ array(),
+        /* 282 */ array(),
+        /* 283 */ array(),
+        /* 284 */ array(),
+        /* 285 */ array(),
+        /* 286 */ array(),
+        /* 287 */ array(),
+        /* 288 */ array(),
+        /* 289 */ array(),
+        /* 290 */ array(),
+        /* 291 */ array(),
+        /* 292 */ array(),
+        /* 293 */ array(),
+        /* 294 */ array(),
+        /* 295 */ array(),
+        /* 296 */ array(),
+        /* 297 */ array(),
+        /* 298 */ array(),
+        /* 299 */ array(),
+        /* 300 */ array(),
+        /* 301 */ array(),
+        /* 302 */ array(),
+        /* 303 */ array(),
+        /* 304 */ array(),
+        /* 305 */ array(),
+        /* 306 */ array(),
+        /* 307 */ array(),
+        /* 308 */ array(),
+        /* 309 */ array(),
+        /* 310 */ array(),
+        /* 311 */ array(),
+        /* 312 */ array(),
+        /* 313 */ array(),
+        /* 314 */ array(),
+        /* 315 */ array(),
+        /* 316 */ array(),
+        /* 317 */ array(),
+        /* 318 */ array(),
+        /* 319 */ array(),
+        /* 320 */ array(),
+        /* 321 */ array(),
+        /* 322 */ array(),
+        /* 323 */ array(),
+        /* 324 */ array(),
+        /* 325 */ array(),
+        /* 326 */ array(),
+        /* 327 */ array(),
+        /* 328 */ array(),
+        /* 329 */ array(),
+        /* 330 */ array(),
+        /* 331 */ array(),
+        /* 332 */ array(),
+        /* 333 */ array(),
+        /* 334 */ array(),
+        /* 335 */ array(),
+        /* 336 */ array(),
+        /* 337 */ array(),
+        /* 338 */ array(),
+        /* 339 */ array(),
+        /* 340 */ array(),
+        /* 341 */ array(),
+        /* 342 */ array(),
+        /* 343 */ array(),
+        /* 344 */ array(),
+        /* 345 */ array(),
+        /* 346 */ array(),
+        /* 347 */ array(),
+        /* 348 */ array(),
+        /* 349 */ array(),
+        /* 350 */ array(),
+        /* 351 */ array(),
+        /* 352 */ array(),
+        /* 353 */ array(),
+        /* 354 */ array(),
+        /* 355 */ array(),
+        /* 356 */ array(),
+        /* 357 */ array(),
+        /* 358 */ array(),
+        /* 359 */ array(),
+        /* 360 */ array(),
+        /* 361 */ array(),
+        /* 362 */ array(),
+        /* 363 */ array(),
+        /* 364 */ array(),
+        /* 365 */ array(),
+        /* 366 */ array(),
+        /* 367 */ array(),
+        /* 368 */ array(),
+        /* 369 */ array(),
+        /* 370 */ array(),
+        /* 371 */ array(),
+        /* 372 */ array(),
+        /* 373 */ array(),
+        /* 374 */ array(),
+        /* 375 */ array(),
+        /* 376 */ array(),
+        /* 377 */ array(),
+        /* 378 */ array(),
+        /* 379 */ array(),
+        /* 380 */ array(),
+        /* 381 */ array(),
+        /* 382 */ array(),
+        /* 383 */ array(),
+        /* 384 */ array(),
+        /* 385 */ array(),
+        /* 386 */ array(),
+        /* 387 */ array(),
+);
+    static public $yy_default = array(
+ /*     0 */   391,  573,  544,  590,  544,  590,  590,  544,  590,  590,
+ /*    10 */   590,  590,  590,  590,  590,  590,  590,  590,  590,  590,
+ /*    20 */   590,  590,  590,  590,  590,  590,  590,  590,  590,  590,
+ /*    30 */   590,  590,  590,  590,  590,  590,  590,  590,  590,  590,
+ /*    40 */   590,  590,  590,  590,  590,  590,  590,  590,  590,  590,
+ /*    50 */   590,  590,  590,  590,  590,  590,  452,  452,  452,  452,
+ /*    60 */   590,  590,  590,  457,  590,  590,  590,  590,  590,  590,
+ /*    70 */   590,  542,  454,  481,  482,  485,  486,  478,  543,  476,
+ /*    80 */   463,  575,  576,  473,  459,  457,  477,  434,  462,  574,
+ /*    90 */   490,  489,  501,  465,  452,  388,  590,  452,  452,  509,
+ /*   100 */   472,  590,  452,  590,  556,  452,  452,  590,  452,  590,
+ /*   110 */   590,  465,  590,  465,  517,  465,  517,  510,  517,  510,
+ /*   120 */   465,  590,  465,  590,  590,  517,  590,  590,  590,  510,
+ /*   130 */   590,  590,  465,  590,  590,  590,  590,  590,  590,  590,
+ /*   140 */   590,  590,  590,  590,  590,  493,  553,  475,  492,  469,
+ /*   150 */   488,  468,  510,  452,  452,  470,  494,  551,  590,  518,
+ /*   160 */   590,  534,  517,  537,  590,  590,  590,  590,  590,  590,
+ /*   170 */   590,  590,  590,  535,  590,  590,  590,  590,  590,  590,
+ /*   180 */   590,  536,  590,  590,  590,  515,  590,  590,  590,  589,
+ /*   190 */   472,  509,  545,  546,  517,  589,  531,  407,  557,  554,
+ /*   200 */   550,  550,  517,  550,  517,  467,  501,  590,  501,  501,
+ /*   210 */   501,  590,  590,  529,  491,  491,  590,  590,  590,  590,
+ /*   220 */   501,  487,  497,  555,  590,  590,  529,  590,  590,  460,
+ /*   230 */   590,  590,  590,  590,  529,  590,  491,  503,  529,  590,
+ /*   240 */   590,  590,  590,  590,  590,  590,  497,  590,  590,  499,
+ /*   250 */   590,  590,  590,  437,  417,  389,  571,  431,  432,  441,
+ /*   260 */   572,  540,  435,  588,  461,  539,  525,  523,  503,  526,
+ /*   270 */   524,  514,  513,  530,  436,  570,  464,  538,  522,  442,
+ /*   280 */   552,  541,  567,  529,  528,  443,  444,  549,  440,  439,
+ /*   290 */   430,  429,  451,  433,  438,  445,  446,  498,  496,  500,
+ /*   300 */   506,  466,  495,  449,  447,  547,  548,  448,  450,  416,
+ /*   310 */   398,  397,  399,  400,  401,  396,  395,  390,  392,  393,
+ /*   320 */   394,  402,  403,  412,  411,  413,  414,  415,  410,  409,
+ /*   330 */   404,  405,  406,  408,  467,  511,  422,  421,  423,  532,
+ /*   340 */   424,  420,  585,  512,  508,  533,  418,  419,  425,  426,
+ /*   350 */   581,  582,  583,  586,  587,  579,  578,  428,  427,  584,
+ /*   360 */   577,  471,  569,  504,  474,  505,  507,  479,  502,  521,
+ /*   370 */   516,  519,  527,  520,  480,  483,  564,  563,  565,  566,
+ /*   380 */   568,  562,  561,  484,  558,  559,  560,  580,
+);
+    const YYNOCODE = 123;
+    const YYSTACKDEPTH = 100;
+    const YYNSTATE = 388;
+    const YYNRULE = 202;
+    const YYERRORSYMBOL = 80;
+    const YYERRSYMDT = 'yy0';
+    const YYFALLBACK = 0;
+    static public $yyFallback = array(
+    );
+    static function Trace($TraceFILE, $zTracePrompt)
+    {
+        if (!$TraceFILE) {
+            $zTracePrompt = 0;
+        } elseif (!$zTracePrompt) {
+            $TraceFILE = 0;
+        }
+        self::$yyTraceFILE = $TraceFILE;
+        self::$yyTracePrompt = $zTracePrompt;
+    }
+
+    static function PrintTrace()
+    {
+        self::$yyTraceFILE = fopen('php://output', 'w');
+        self::$yyTracePrompt = '<br>';
+    }
+
+    static public $yyTraceFILE;
+    static public $yyTracePrompt;
+    public $yyidx;                    /* Index of top element in stack */
+    public $yyerrcnt;                 /* Shifts left before out of the error */
+    public $yystack = array();  /* The parser's stack */
+
+    public $yyTokenName = array(
+  '$',             'VERT',          'COLON',         'COMMENT',
+  'PHPSTARTTAG',   'PHPENDTAG',     'ASPSTARTTAG',   'ASPENDTAG',
+  'FAKEPHPSTARTTAG',  'XMLTAG',        'TEXT',          'STRIPON',
+  'STRIPOFF',      'LITERALSTART',  'LITERALEND',    'LITERAL',
+  'LDEL',          'RDEL',          'DOLLAR',        'ID',
+  'EQUAL',         'PTR',           'LDELIF',        'LDELFOR',
+  'SEMICOLON',     'INCDEC',        'TO',            'STEP',
+  'LDELFOREACH',   'SPACE',         'AS',            'APTR',
+  'LDELSETFILTER',  'SMARTYBLOCKCHILD',  'LDELSLASH',     'INTEGER',
+  'COMMA',         'OPENP',         'CLOSEP',        'MATH',
+  'UNIMATH',       'ANDSYM',        'ISIN',          'ISDIVBY',
+  'ISNOTDIVBY',    'ISEVEN',        'ISNOTEVEN',     'ISEVENBY',
+  'ISNOTEVENBY',   'ISODD',         'ISNOTODD',      'ISODDBY',
+  'ISNOTODDBY',    'INSTANCEOF',    'QMARK',         'NOT',
+  'TYPECAST',      'HEX',           'DOT',           'SINGLEQUOTESTRING',
+  'DOUBLECOLON',   'AT',            'HATCH',         'OPENB',
+  'CLOSEB',        'EQUALS',        'NOTEQUALS',     'GREATERTHAN',
+  'LESSTHAN',      'GREATEREQUAL',  'LESSEQUAL',     'IDENTITY',
+  'NONEIDENTITY',  'MOD',           'LAND',          'LOR',
+  'LXOR',          'QUOTE',         'BACKTICK',      'DOLLARID',
+  'error',         'start',         'template',      'template_element',
+  'smartytag',     'literal',       'literal_elements',  'literal_element',
+  'value',         'modifierlist',  'attributes',    'expr',
+  'varindexed',    'statement',     'statements',    'optspace',
+  'varvar',        'foraction',     'modparameters',  'attribute',
+  'ternary',       'array',         'ifcond',        'lop',
+  'variable',      'function',      'doublequoted_with_quotes',  'static_class_access',
+  'object',        'arrayindex',    'indexdef',      'varvarele',
+  'objectchain',   'objectelement',  'method',        'params',
+  'modifier',      'modparameter',  'arrayelements',  'arrayelement',
+  'doublequoted',  'doublequotedcontent',
+    );
+
+    static public $yyRuleName = array(
+ /*   0 */ "start ::= template",
+ /*   1 */ "template ::= template_element",
+ /*   2 */ "template ::= template template_element",
+ /*   3 */ "template ::=",
+ /*   4 */ "template_element ::= smartytag",
+ /*   5 */ "template_element ::= COMMENT",
+ /*   6 */ "template_element ::= literal",
+ /*   7 */ "template_element ::= PHPSTARTTAG",
+ /*   8 */ "template_element ::= PHPENDTAG",
+ /*   9 */ "template_element ::= ASPSTARTTAG",
+ /*  10 */ "template_element ::= ASPENDTAG",
+ /*  11 */ "template_element ::= FAKEPHPSTARTTAG",
+ /*  12 */ "template_element ::= XMLTAG",
+ /*  13 */ "template_element ::= TEXT",
+ /*  14 */ "template_element ::= STRIPON",
+ /*  15 */ "template_element ::= STRIPOFF",
+ /*  16 */ "literal ::= LITERALSTART LITERALEND",
+ /*  17 */ "literal ::= LITERALSTART literal_elements LITERALEND",
+ /*  18 */ "literal_elements ::= literal_elements literal_element",
+ /*  19 */ "literal_elements ::=",
+ /*  20 */ "literal_element ::= literal",
+ /*  21 */ "literal_element ::= LITERAL",
+ /*  22 */ "literal_element ::= PHPSTARTTAG",
+ /*  23 */ "literal_element ::= FAKEPHPSTARTTAG",
+ /*  24 */ "literal_element ::= PHPENDTAG",
+ /*  25 */ "literal_element ::= ASPSTARTTAG",
+ /*  26 */ "literal_element ::= ASPENDTAG",
+ /*  27 */ "smartytag ::= LDEL value RDEL",
+ /*  28 */ "smartytag ::= LDEL value modifierlist attributes RDEL",
+ /*  29 */ "smartytag ::= LDEL value attributes RDEL",
+ /*  30 */ "smartytag ::= LDEL expr modifierlist attributes RDEL",
+ /*  31 */ "smartytag ::= LDEL expr attributes RDEL",
+ /*  32 */ "smartytag ::= LDEL DOLLAR ID EQUAL value RDEL",
+ /*  33 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr RDEL",
+ /*  34 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr attributes RDEL",
+ /*  35 */ "smartytag ::= LDEL varindexed EQUAL expr attributes RDEL",
+ /*  36 */ "smartytag ::= LDEL ID attributes RDEL",
+ /*  37 */ "smartytag ::= LDEL ID RDEL",
+ /*  38 */ "smartytag ::= LDEL ID PTR ID attributes RDEL",
+ /*  39 */ "smartytag ::= LDEL ID modifierlist attributes RDEL",
+ /*  40 */ "smartytag ::= LDEL ID PTR ID modifierlist attributes RDEL",
+ /*  41 */ "smartytag ::= LDELIF expr RDEL",
+ /*  42 */ "smartytag ::= LDELIF expr attributes RDEL",
+ /*  43 */ "smartytag ::= LDELIF statement RDEL",
+ /*  44 */ "smartytag ::= LDELIF statement attributes RDEL",
+ /*  45 */ "smartytag ::= LDELFOR statements SEMICOLON optspace expr SEMICOLON optspace DOLLAR varvar foraction attributes RDEL",
+ /*  46 */ "foraction ::= EQUAL expr",
+ /*  47 */ "foraction ::= INCDEC",
+ /*  48 */ "smartytag ::= LDELFOR statement TO expr attributes RDEL",
+ /*  49 */ "smartytag ::= LDELFOR statement TO expr STEP expr attributes RDEL",
+ /*  50 */ "smartytag ::= LDELFOREACH attributes RDEL",
+ /*  51 */ "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar attributes RDEL",
+ /*  52 */ "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar APTR DOLLAR varvar attributes RDEL",
+ /*  53 */ "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar attributes RDEL",
+ /*  54 */ "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar APTR DOLLAR varvar attributes RDEL",
+ /*  55 */ "smartytag ::= LDELSETFILTER ID modparameters RDEL",
+ /*  56 */ "smartytag ::= LDELSETFILTER ID modparameters modifierlist RDEL",
+ /*  57 */ "smartytag ::= SMARTYBLOCKCHILD",
+ /*  58 */ "smartytag ::= LDELSLASH ID RDEL",
+ /*  59 */ "smartytag ::= LDELSLASH ID modifierlist RDEL",
+ /*  60 */ "smartytag ::= LDELSLASH ID PTR ID RDEL",
+ /*  61 */ "smartytag ::= LDELSLASH ID PTR ID modifierlist RDEL",
+ /*  62 */ "attributes ::= attributes attribute",
+ /*  63 */ "attributes ::= attribute",
+ /*  64 */ "attributes ::=",
+ /*  65 */ "attribute ::= SPACE ID EQUAL ID",
+ /*  66 */ "attribute ::= SPACE ID EQUAL expr",
+ /*  67 */ "attribute ::= SPACE ID EQUAL value",
+ /*  68 */ "attribute ::= SPACE ID",
+ /*  69 */ "attribute ::= SPACE expr",
+ /*  70 */ "attribute ::= SPACE value",
+ /*  71 */ "attribute ::= SPACE INTEGER EQUAL expr",
+ /*  72 */ "statements ::= statement",
+ /*  73 */ "statements ::= statements COMMA statement",
+ /*  74 */ "statement ::= DOLLAR varvar EQUAL expr",
+ /*  75 */ "statement ::= varindexed EQUAL expr",
+ /*  76 */ "statement ::= OPENP statement CLOSEP",
+ /*  77 */ "expr ::= value",
+ /*  78 */ "expr ::= ternary",
+ /*  79 */ "expr ::= DOLLAR ID COLON ID",
+ /*  80 */ "expr ::= expr MATH value",
+ /*  81 */ "expr ::= expr UNIMATH value",
+ /*  82 */ "expr ::= expr ANDSYM value",
+ /*  83 */ "expr ::= array",
+ /*  84 */ "expr ::= expr modifierlist",
+ /*  85 */ "expr ::= expr ifcond expr",
+ /*  86 */ "expr ::= expr ISIN array",
+ /*  87 */ "expr ::= expr ISIN value",
+ /*  88 */ "expr ::= expr lop expr",
+ /*  89 */ "expr ::= expr ISDIVBY expr",
+ /*  90 */ "expr ::= expr ISNOTDIVBY expr",
+ /*  91 */ "expr ::= expr ISEVEN",
+ /*  92 */ "expr ::= expr ISNOTEVEN",
+ /*  93 */ "expr ::= expr ISEVENBY expr",
+ /*  94 */ "expr ::= expr ISNOTEVENBY expr",
+ /*  95 */ "expr ::= expr ISODD",
+ /*  96 */ "expr ::= expr ISNOTODD",
+ /*  97 */ "expr ::= expr ISODDBY expr",
+ /*  98 */ "expr ::= expr ISNOTODDBY expr",
+ /*  99 */ "expr ::= value INSTANCEOF ID",
+ /* 100 */ "expr ::= value INSTANCEOF value",
+ /* 101 */ "ternary ::= OPENP expr CLOSEP QMARK DOLLAR ID COLON expr",
+ /* 102 */ "ternary ::= OPENP expr CLOSEP QMARK expr COLON expr",
+ /* 103 */ "value ::= variable",
+ /* 104 */ "value ::= UNIMATH value",
+ /* 105 */ "value ::= NOT value",
+ /* 106 */ "value ::= TYPECAST value",
+ /* 107 */ "value ::= variable INCDEC",
+ /* 108 */ "value ::= HEX",
+ /* 109 */ "value ::= INTEGER",
+ /* 110 */ "value ::= INTEGER DOT INTEGER",
+ /* 111 */ "value ::= INTEGER DOT",
+ /* 112 */ "value ::= DOT INTEGER",
+ /* 113 */ "value ::= ID",
+ /* 114 */ "value ::= function",
+ /* 115 */ "value ::= OPENP expr CLOSEP",
+ /* 116 */ "value ::= SINGLEQUOTESTRING",
+ /* 117 */ "value ::= doublequoted_with_quotes",
+ /* 118 */ "value ::= ID DOUBLECOLON static_class_access",
+ /* 119 */ "value ::= varindexed DOUBLECOLON static_class_access",
+ /* 120 */ "value ::= smartytag",
+ /* 121 */ "value ::= value modifierlist",
+ /* 122 */ "variable ::= varindexed",
+ /* 123 */ "variable ::= DOLLAR varvar AT ID",
+ /* 124 */ "variable ::= object",
+ /* 125 */ "variable ::= HATCH ID HATCH",
+ /* 126 */ "variable ::= HATCH variable HATCH",
+ /* 127 */ "varindexed ::= DOLLAR varvar arrayindex",
+ /* 128 */ "arrayindex ::= arrayindex indexdef",
+ /* 129 */ "arrayindex ::=",
+ /* 130 */ "indexdef ::= DOT DOLLAR varvar",
+ /* 131 */ "indexdef ::= DOT DOLLAR varvar AT ID",
+ /* 132 */ "indexdef ::= DOT ID",
+ /* 133 */ "indexdef ::= DOT INTEGER",
+ /* 134 */ "indexdef ::= DOT LDEL expr RDEL",
+ /* 135 */ "indexdef ::= OPENB ID CLOSEB",
+ /* 136 */ "indexdef ::= OPENB ID DOT ID CLOSEB",
+ /* 137 */ "indexdef ::= OPENB expr CLOSEB",
+ /* 138 */ "indexdef ::= OPENB CLOSEB",
+ /* 139 */ "varvar ::= varvarele",
+ /* 140 */ "varvar ::= varvar varvarele",
+ /* 141 */ "varvarele ::= ID",
+ /* 142 */ "varvarele ::= LDEL expr RDEL",
+ /* 143 */ "object ::= varindexed objectchain",
+ /* 144 */ "objectchain ::= objectelement",
+ /* 145 */ "objectchain ::= objectchain objectelement",
+ /* 146 */ "objectelement ::= PTR ID arrayindex",
+ /* 147 */ "objectelement ::= PTR DOLLAR varvar arrayindex",
+ /* 148 */ "objectelement ::= PTR LDEL expr RDEL arrayindex",
+ /* 149 */ "objectelement ::= PTR ID LDEL expr RDEL arrayindex",
+ /* 150 */ "objectelement ::= PTR method",
+ /* 151 */ "function ::= ID OPENP params CLOSEP",
+ /* 152 */ "method ::= ID OPENP params CLOSEP",
+ /* 153 */ "method ::= DOLLAR ID OPENP params CLOSEP",
+ /* 154 */ "params ::= params COMMA expr",
+ /* 155 */ "params ::= expr",
+ /* 156 */ "params ::=",
+ /* 157 */ "modifierlist ::= modifierlist modifier modparameters",
+ /* 158 */ "modifierlist ::= modifier modparameters",
+ /* 159 */ "modifier ::= VERT AT ID",
+ /* 160 */ "modifier ::= VERT ID",
+ /* 161 */ "modparameters ::= modparameters modparameter",
+ /* 162 */ "modparameters ::=",
+ /* 163 */ "modparameter ::= COLON value",
+ /* 164 */ "modparameter ::= COLON array",
+ /* 165 */ "static_class_access ::= method",
+ /* 166 */ "static_class_access ::= method objectchain",
+ /* 167 */ "static_class_access ::= ID",
+ /* 168 */ "static_class_access ::= DOLLAR ID arrayindex",
+ /* 169 */ "static_class_access ::= DOLLAR ID arrayindex objectchain",
+ /* 170 */ "ifcond ::= EQUALS",
+ /* 171 */ "ifcond ::= NOTEQUALS",
+ /* 172 */ "ifcond ::= GREATERTHAN",
+ /* 173 */ "ifcond ::= LESSTHAN",
+ /* 174 */ "ifcond ::= GREATEREQUAL",
+ /* 175 */ "ifcond ::= LESSEQUAL",
+ /* 176 */ "ifcond ::= IDENTITY",
+ /* 177 */ "ifcond ::= NONEIDENTITY",
+ /* 178 */ "ifcond ::= MOD",
+ /* 179 */ "lop ::= LAND",
+ /* 180 */ "lop ::= LOR",
+ /* 181 */ "lop ::= LXOR",
+ /* 182 */ "array ::= OPENB arrayelements CLOSEB",
+ /* 183 */ "arrayelements ::= arrayelement",
+ /* 184 */ "arrayelements ::= arrayelements COMMA arrayelement",
+ /* 185 */ "arrayelements ::=",
+ /* 186 */ "arrayelement ::= value APTR expr",
+ /* 187 */ "arrayelement ::= ID APTR expr",
+ /* 188 */ "arrayelement ::= expr",
+ /* 189 */ "doublequoted_with_quotes ::= QUOTE QUOTE",
+ /* 190 */ "doublequoted_with_quotes ::= QUOTE doublequoted QUOTE",
+ /* 191 */ "doublequoted ::= doublequoted doublequotedcontent",
+ /* 192 */ "doublequoted ::= doublequotedcontent",
+ /* 193 */ "doublequotedcontent ::= BACKTICK variable BACKTICK",
+ /* 194 */ "doublequotedcontent ::= BACKTICK expr BACKTICK",
+ /* 195 */ "doublequotedcontent ::= DOLLARID",
+ /* 196 */ "doublequotedcontent ::= LDEL variable RDEL",
+ /* 197 */ "doublequotedcontent ::= LDEL expr RDEL",
+ /* 198 */ "doublequotedcontent ::= smartytag",
+ /* 199 */ "doublequotedcontent ::= TEXT",
+ /* 200 */ "optspace ::= SPACE",
+ /* 201 */ "optspace ::=",
+    );
+
+    function tokenName($tokenType)
+    {
+        if ($tokenType === 0) {
+            return 'End of Input';
+        }
+        if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
+            return $this->yyTokenName[$tokenType];
+        } else {
+            return "Unknown";
+        }
+    }
+
+    static function yy_destructor($yymajor, $yypminor)
+    {
+        switch ($yymajor) {
+            default:  break;   /* If no destructor action specified: do nothing */
+        }
+    }
+
+    function yy_pop_parser_stack()
+    {
+        if (!count($this->yystack)) {
+            return;
+        }
+        $yytos = array_pop($this->yystack);
+        if (self::$yyTraceFILE && $this->yyidx >= 0) {
+            fwrite(self::$yyTraceFILE,
+                self::$yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
+                    "\n");
+        }
+        $yymajor = $yytos->major;
+        self::yy_destructor($yymajor, $yytos->minor);
+        $this->yyidx--;
+        return $yymajor;
+    }
+
+    function __destruct()
+    {
+        while ($this->yystack !== Array()) {
+            $this->yy_pop_parser_stack();
+        }
+        if (is_resource(self::$yyTraceFILE)) {
+            fclose(self::$yyTraceFILE);
+        }
+    }
+
+    function yy_get_expected_tokens($token)
+    {
+        $state = $this->yystack[$this->yyidx]->stateno;
+        $expected = self::$yyExpectedTokens[$state];
+        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
+            return $expected;
+        }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ == 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return array_unique($expected);
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno]['lhs']);
+                    if (isset(self::$yyExpectedTokens[$nextstate])) {
+		        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
+                            if (in_array($token,
+                                  self::$yyExpectedTokens[$nextstate], true)) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return array_unique($expected);
+                        }
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = new TP_yyStackEntry;
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return array_unique($expected);
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return $expected;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+	$this->yyidx = $yyidx;
+	$this->yystack = $stack;
+        return array_unique($expected);
+    }
+
+    function yy_is_expected_token($token)
+    {
+        if ($token === 0) {
+            return true; // 0 is not part of this
+        }
+        $state = $this->yystack[$this->yyidx]->stateno;
+        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
+            return true;
+        }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ == 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return true;
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno]['lhs']);
+                    if (isset(self::$yyExpectedTokens[$nextstate]) &&
+                          in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        return true;
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = new TP_yyStackEntry;
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        if (!$token) {
+                            // end of input: this is valid
+                            return true;
+                        }
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return false;
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return true;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
+        return true;
+    }
+
+   function yy_find_shift_action($iLookAhead)
+    {
+        $stateno = $this->yystack[$this->yyidx]->stateno;
+
+        /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
+        if (!isset(self::$yy_shift_ofst[$stateno])) {
+            // no shift actions
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_shift_ofst[$stateno];
+        if ($i === self::YY_SHIFT_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead == self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
+                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
+                if (self::$yyTraceFILE) {
+                    fwrite(self::$yyTraceFILE, self::$yyTracePrompt . "FALLBACK " .
+                        $this->yyTokenName[$iLookAhead] . " => " .
+                        $this->yyTokenName[$iFallback] . "\n");
+                }
+                return $this->yy_find_shift_action($iFallback);
+            }
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    function yy_find_reduce_action($stateno, $iLookAhead)
+    {
+        /* $stateno = $this->yystack[$this->yyidx]->stateno; */
+
+        if (!isset(self::$yy_reduce_ofst[$stateno])) {
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_reduce_ofst[$stateno];
+        if ($i == self::YY_REDUCE_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead == self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    function yy_shift($yyNewState, $yyMajor, $yypMinor)
+    {
+        $this->yyidx++;
+        if ($this->yyidx >= self::YYSTACKDEPTH) {
+            $this->yyidx--;
+            if (self::$yyTraceFILE) {
+                fprintf(self::$yyTraceFILE, "%sStack Overflow!\n", self::$yyTracePrompt);
+            }
+            while ($this->yyidx >= 0) {
+                $this->yy_pop_parser_stack();
+            }
+#line 84 "smarty_internal_templateparser.y"
+
+    $this->internalError = true;
+    $this->compiler->trigger_template_error("Stack overflow in template parser");
+#line 1753 "smarty_internal_templateparser.php"
+            return;
+        }
+        $yytos = new TP_yyStackEntry;
+        $yytos->stateno = $yyNewState;
+        $yytos->major = $yyMajor;
+        $yytos->minor = $yypMinor;
+        array_push($this->yystack, $yytos);
+        if (self::$yyTraceFILE && $this->yyidx > 0) {
+            fprintf(self::$yyTraceFILE, "%sShift %d\n", self::$yyTracePrompt,
+                $yyNewState);
+            fprintf(self::$yyTraceFILE, "%sStack:", self::$yyTracePrompt);
+            for($i = 1; $i <= $this->yyidx; $i++) {
+                fprintf(self::$yyTraceFILE, " %s",
+                    $this->yyTokenName[$this->yystack[$i]->major]);
+            }
+            fwrite(self::$yyTraceFILE,"\n");
+        }
+    }
+
+    static public $yyRuleInfo = array(
+  array( 'lhs' => 81, 'rhs' => 1 ),
+  array( 'lhs' => 82, 'rhs' => 1 ),
+  array( 'lhs' => 82, 'rhs' => 2 ),
+  array( 'lhs' => 82, 'rhs' => 0 ),
+  array( 'lhs' => 83, 'rhs' => 1 ),
+  array( 'lhs' => 83, 'rhs' => 1 ),
+  array( 'lhs' => 83, 'rhs' => 1 ),
+  array( 'lhs' => 83, 'rhs' => 1 ),
+  array( 'lhs' => 83, 'rhs' => 1 ),
+  array( 'lhs' => 83, 'rhs' => 1 ),
+  array( 'lhs' => 83, 'rhs' => 1 ),
+  array( 'lhs' => 83, 'rhs' => 1 ),
+  array( 'lhs' => 83, 'rhs' => 1 ),
+  array( 'lhs' => 83, 'rhs' => 1 ),
+  array( 'lhs' => 83, 'rhs' => 1 ),
+  array( 'lhs' => 83, 'rhs' => 1 ),
+  array( 'lhs' => 85, 'rhs' => 2 ),
+  array( 'lhs' => 85, 'rhs' => 3 ),
+  array( 'lhs' => 86, 'rhs' => 2 ),
+  array( 'lhs' => 86, 'rhs' => 0 ),
+  array( 'lhs' => 87, 'rhs' => 1 ),
+  array( 'lhs' => 87, 'rhs' => 1 ),
+  array( 'lhs' => 87, 'rhs' => 1 ),
+  array( 'lhs' => 87, 'rhs' => 1 ),
+  array( 'lhs' => 87, 'rhs' => 1 ),
+  array( 'lhs' => 87, 'rhs' => 1 ),
+  array( 'lhs' => 87, 'rhs' => 1 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 5 ),
+  array( 'lhs' => 84, 'rhs' => 4 ),
+  array( 'lhs' => 84, 'rhs' => 5 ),
+  array( 'lhs' => 84, 'rhs' => 4 ),
+  array( 'lhs' => 84, 'rhs' => 6 ),
+  array( 'lhs' => 84, 'rhs' => 6 ),
+  array( 'lhs' => 84, 'rhs' => 7 ),
+  array( 'lhs' => 84, 'rhs' => 6 ),
+  array( 'lhs' => 84, 'rhs' => 4 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 6 ),
+  array( 'lhs' => 84, 'rhs' => 5 ),
+  array( 'lhs' => 84, 'rhs' => 7 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 4 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 4 ),
+  array( 'lhs' => 84, 'rhs' => 12 ),
+  array( 'lhs' => 97, 'rhs' => 2 ),
+  array( 'lhs' => 97, 'rhs' => 1 ),
+  array( 'lhs' => 84, 'rhs' => 6 ),
+  array( 'lhs' => 84, 'rhs' => 8 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 8 ),
+  array( 'lhs' => 84, 'rhs' => 11 ),
+  array( 'lhs' => 84, 'rhs' => 8 ),
+  array( 'lhs' => 84, 'rhs' => 11 ),
+  array( 'lhs' => 84, 'rhs' => 4 ),
+  array( 'lhs' => 84, 'rhs' => 5 ),
+  array( 'lhs' => 84, 'rhs' => 1 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 4 ),
+  array( 'lhs' => 84, 'rhs' => 5 ),
+  array( 'lhs' => 84, 'rhs' => 6 ),
+  array( 'lhs' => 90, 'rhs' => 2 ),
+  array( 'lhs' => 90, 'rhs' => 1 ),
+  array( 'lhs' => 90, 'rhs' => 0 ),
+  array( 'lhs' => 99, 'rhs' => 4 ),
+  array( 'lhs' => 99, 'rhs' => 4 ),
+  array( 'lhs' => 99, 'rhs' => 4 ),
+  array( 'lhs' => 99, 'rhs' => 2 ),
+  array( 'lhs' => 99, 'rhs' => 2 ),
+  array( 'lhs' => 99, 'rhs' => 2 ),
+  array( 'lhs' => 99, 'rhs' => 4 ),
+  array( 'lhs' => 94, 'rhs' => 1 ),
+  array( 'lhs' => 94, 'rhs' => 3 ),
+  array( 'lhs' => 93, 'rhs' => 4 ),
+  array( 'lhs' => 93, 'rhs' => 3 ),
+  array( 'lhs' => 93, 'rhs' => 3 ),
+  array( 'lhs' => 91, 'rhs' => 1 ),
+  array( 'lhs' => 91, 'rhs' => 1 ),
+  array( 'lhs' => 91, 'rhs' => 4 ),
+  array( 'lhs' => 91, 'rhs' => 3 ),
+  array( 'lhs' => 91, 'rhs' => 3 ),
+  array( 'lhs' => 91, 'rhs' => 3 ),
+  array( 'lhs' => 91, 'rhs' => 1 ),
+  array( 'lhs' => 91, 'rhs' => 2 ),
+  array( 'lhs' => 91, 'rhs' => 3 ),
+  array( 'lhs' => 91, 'rhs' => 3 ),
+  array( 'lhs' => 91, 'rhs' => 3 ),
+  array( 'lhs' => 91, 'rhs' => 3 ),
+  array( 'lhs' => 91, 'rhs' => 3 ),
+  array( 'lhs' => 91, 'rhs' => 3 ),
+  array( 'lhs' => 91, 'rhs' => 2 ),
+  array( 'lhs' => 91, 'rhs' => 2 ),
+  array( 'lhs' => 91, 'rhs' => 3 ),
+  array( 'lhs' => 91, 'rhs' => 3 ),
+  array( 'lhs' => 91, 'rhs' => 2 ),
+  array( 'lhs' => 91, 'rhs' => 2 ),
+  array( 'lhs' => 91, 'rhs' => 3 ),
+  array( 'lhs' => 91, 'rhs' => 3 ),
+  array( 'lhs' => 91, 'rhs' => 3 ),
+  array( 'lhs' => 91, 'rhs' => 3 ),
+  array( 'lhs' => 100, 'rhs' => 8 ),
+  array( 'lhs' => 100, 'rhs' => 7 ),
+  array( 'lhs' => 88, 'rhs' => 1 ),
+  array( 'lhs' => 88, 'rhs' => 2 ),
+  array( 'lhs' => 88, 'rhs' => 2 ),
+  array( 'lhs' => 88, 'rhs' => 2 ),
+  array( 'lhs' => 88, 'rhs' => 2 ),
+  array( 'lhs' => 88, 'rhs' => 1 ),
+  array( 'lhs' => 88, 'rhs' => 1 ),
+  array( 'lhs' => 88, 'rhs' => 3 ),
+  array( 'lhs' => 88, 'rhs' => 2 ),
+  array( 'lhs' => 88, 'rhs' => 2 ),
+  array( 'lhs' => 88, 'rhs' => 1 ),
+  array( 'lhs' => 88, 'rhs' => 1 ),
+  array( 'lhs' => 88, 'rhs' => 3 ),
+  array( 'lhs' => 88, 'rhs' => 1 ),
+  array( 'lhs' => 88, 'rhs' => 1 ),
+  array( 'lhs' => 88, 'rhs' => 3 ),
+  array( 'lhs' => 88, 'rhs' => 3 ),
+  array( 'lhs' => 88, 'rhs' => 1 ),
+  array( 'lhs' => 88, 'rhs' => 2 ),
+  array( 'lhs' => 104, 'rhs' => 1 ),
+  array( 'lhs' => 104, 'rhs' => 4 ),
+  array( 'lhs' => 104, 'rhs' => 1 ),
+  array( 'lhs' => 104, 'rhs' => 3 ),
+  array( 'lhs' => 104, 'rhs' => 3 ),
+  array( 'lhs' => 92, 'rhs' => 3 ),
+  array( 'lhs' => 109, 'rhs' => 2 ),
+  array( 'lhs' => 109, 'rhs' => 0 ),
+  array( 'lhs' => 110, 'rhs' => 3 ),
+  array( 'lhs' => 110, 'rhs' => 5 ),
+  array( 'lhs' => 110, 'rhs' => 2 ),
+  array( 'lhs' => 110, 'rhs' => 2 ),
+  array( 'lhs' => 110, 'rhs' => 4 ),
+  array( 'lhs' => 110, 'rhs' => 3 ),
+  array( 'lhs' => 110, 'rhs' => 5 ),
+  array( 'lhs' => 110, 'rhs' => 3 ),
+  array( 'lhs' => 110, 'rhs' => 2 ),
+  array( 'lhs' => 96, 'rhs' => 1 ),
+  array( 'lhs' => 96, 'rhs' => 2 ),
+  array( 'lhs' => 111, 'rhs' => 1 ),
+  array( 'lhs' => 111, 'rhs' => 3 ),
+  array( 'lhs' => 108, 'rhs' => 2 ),
+  array( 'lhs' => 112, 'rhs' => 1 ),
+  array( 'lhs' => 112, 'rhs' => 2 ),
+  array( 'lhs' => 113, 'rhs' => 3 ),
+  array( 'lhs' => 113, 'rhs' => 4 ),
+  array( 'lhs' => 113, 'rhs' => 5 ),
+  array( 'lhs' => 113, 'rhs' => 6 ),
+  array( 'lhs' => 113, 'rhs' => 2 ),
+  array( 'lhs' => 105, 'rhs' => 4 ),
+  array( 'lhs' => 114, 'rhs' => 4 ),
+  array( 'lhs' => 114, 'rhs' => 5 ),
+  array( 'lhs' => 115, 'rhs' => 3 ),
+  array( 'lhs' => 115, 'rhs' => 1 ),
+  array( 'lhs' => 115, 'rhs' => 0 ),
+  array( 'lhs' => 89, 'rhs' => 3 ),
+  array( 'lhs' => 89, 'rhs' => 2 ),
+  array( 'lhs' => 116, 'rhs' => 3 ),
+  array( 'lhs' => 116, 'rhs' => 2 ),
+  array( 'lhs' => 98, 'rhs' => 2 ),
+  array( 'lhs' => 98, 'rhs' => 0 ),
+  array( 'lhs' => 117, 'rhs' => 2 ),
+  array( 'lhs' => 117, 'rhs' => 2 ),
+  array( 'lhs' => 107, 'rhs' => 1 ),
+  array( 'lhs' => 107, 'rhs' => 2 ),
+  array( 'lhs' => 107, 'rhs' => 1 ),
+  array( 'lhs' => 107, 'rhs' => 3 ),
+  array( 'lhs' => 107, 'rhs' => 4 ),
+  array( 'lhs' => 102, 'rhs' => 1 ),
+  array( 'lhs' => 102, 'rhs' => 1 ),
+  array( 'lhs' => 102, 'rhs' => 1 ),
+  array( 'lhs' => 102, 'rhs' => 1 ),
+  array( 'lhs' => 102, 'rhs' => 1 ),
+  array( 'lhs' => 102, 'rhs' => 1 ),
+  array( 'lhs' => 102, 'rhs' => 1 ),
+  array( 'lhs' => 102, 'rhs' => 1 ),
+  array( 'lhs' => 102, 'rhs' => 1 ),
+  array( 'lhs' => 103, 'rhs' => 1 ),
+  array( 'lhs' => 103, 'rhs' => 1 ),
+  array( 'lhs' => 103, 'rhs' => 1 ),
+  array( 'lhs' => 101, 'rhs' => 3 ),
+  array( 'lhs' => 118, 'rhs' => 1 ),
+  array( 'lhs' => 118, 'rhs' => 3 ),
+  array( 'lhs' => 118, 'rhs' => 0 ),
+  array( 'lhs' => 119, 'rhs' => 3 ),
+  array( 'lhs' => 119, 'rhs' => 3 ),
+  array( 'lhs' => 119, 'rhs' => 1 ),
+  array( 'lhs' => 106, 'rhs' => 2 ),
+  array( 'lhs' => 106, 'rhs' => 3 ),
+  array( 'lhs' => 120, 'rhs' => 2 ),
+  array( 'lhs' => 120, 'rhs' => 1 ),
+  array( 'lhs' => 121, 'rhs' => 3 ),
+  array( 'lhs' => 121, 'rhs' => 3 ),
+  array( 'lhs' => 121, 'rhs' => 1 ),
+  array( 'lhs' => 121, 'rhs' => 3 ),
+  array( 'lhs' => 121, 'rhs' => 3 ),
+  array( 'lhs' => 121, 'rhs' => 1 ),
+  array( 'lhs' => 121, 'rhs' => 1 ),
+  array( 'lhs' => 95, 'rhs' => 1 ),
+  array( 'lhs' => 95, 'rhs' => 0 ),
+    );
+
+    static public $yyReduceMap = array(
+        0 => 0,
+        1 => 1,
+        2 => 1,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        10 => 10,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+        14 => 14,
+        15 => 15,
+        16 => 16,
+        19 => 16,
+        201 => 16,
+        17 => 17,
+        76 => 17,
+        18 => 18,
+        104 => 18,
+        106 => 18,
+        107 => 18,
+        128 => 18,
+        166 => 18,
+        20 => 20,
+        21 => 20,
+        47 => 20,
+        69 => 20,
+        70 => 20,
+        77 => 20,
+        78 => 20,
+        83 => 20,
+        103 => 20,
+        108 => 20,
+        109 => 20,
+        114 => 20,
+        116 => 20,
+        117 => 20,
+        124 => 20,
+        139 => 20,
+        165 => 20,
+        167 => 20,
+        183 => 20,
+        188 => 20,
+        200 => 20,
+        22 => 22,
+        23 => 22,
+        24 => 24,
+        25 => 25,
+        26 => 26,
+        27 => 27,
+        28 => 28,
+        29 => 29,
+        31 => 29,
+        30 => 30,
+        32 => 32,
+        33 => 32,
+        34 => 34,
+        35 => 35,
+        36 => 36,
+        37 => 37,
+        38 => 38,
+        39 => 39,
+        40 => 40,
+        41 => 41,
+        42 => 42,
+        44 => 42,
+        43 => 43,
+        45 => 45,
+        46 => 46,
+        48 => 48,
+        49 => 49,
+        50 => 50,
+        51 => 51,
+        52 => 52,
+        53 => 53,
+        54 => 54,
+        55 => 55,
+        56 => 56,
+        57 => 57,
+        58 => 58,
+        59 => 59,
+        60 => 60,
+        61 => 61,
+        62 => 62,
+        63 => 63,
+        72 => 63,
+        155 => 63,
+        159 => 63,
+        163 => 63,
+        164 => 63,
+        64 => 64,
+        156 => 64,
+        162 => 64,
+        65 => 65,
+        66 => 66,
+        67 => 66,
+        71 => 66,
+        68 => 68,
+        73 => 73,
+        74 => 74,
+        75 => 74,
+        79 => 79,
+        80 => 80,
+        81 => 80,
+        82 => 80,
+        84 => 84,
+        121 => 84,
+        85 => 85,
+        88 => 85,
+        99 => 85,
+        86 => 86,
+        87 => 87,
+        89 => 89,
+        90 => 90,
+        91 => 91,
+        96 => 91,
+        92 => 92,
+        95 => 92,
+        93 => 93,
+        98 => 93,
+        94 => 94,
+        97 => 94,
+        100 => 100,
+        101 => 101,
+        102 => 102,
+        105 => 105,
+        110 => 110,
+        111 => 111,
+        112 => 112,
+        113 => 113,
+        115 => 115,
+        118 => 118,
+        119 => 119,
+        120 => 120,
+        122 => 122,
+        123 => 123,
+        125 => 125,
+        126 => 126,
+        127 => 127,
+        129 => 129,
+        185 => 129,
+        130 => 130,
+        131 => 131,
+        132 => 132,
+        133 => 133,
+        134 => 134,
+        137 => 134,
+        135 => 135,
+        136 => 136,
+        138 => 138,
+        140 => 140,
+        141 => 141,
+        142 => 142,
+        143 => 143,
+        144 => 144,
+        145 => 145,
+        146 => 146,
+        147 => 147,
+        148 => 148,
+        149 => 149,
+        150 => 150,
+        151 => 151,
+        152 => 152,
+        153 => 153,
+        154 => 154,
+        157 => 157,
+        158 => 158,
+        160 => 160,
+        161 => 161,
+        168 => 168,
+        169 => 169,
+        170 => 170,
+        171 => 171,
+        172 => 172,
+        173 => 173,
+        174 => 174,
+        175 => 175,
+        176 => 176,
+        177 => 177,
+        178 => 178,
+        179 => 179,
+        180 => 180,
+        181 => 181,
+        182 => 182,
+        184 => 184,
+        186 => 186,
+        187 => 187,
+        189 => 189,
+        190 => 190,
+        191 => 191,
+        192 => 192,
+        193 => 193,
+        194 => 193,
+        196 => 193,
+        195 => 195,
+        197 => 197,
+        198 => 198,
+        199 => 199,
+    );
+#line 95 "smarty_internal_templateparser.y"
+    function yy_r0(){
+    $this->_retvalue = $this->root_buffer->to_smarty_php();
+    }
+#line 2185 "smarty_internal_templateparser.php"
+#line 103 "smarty_internal_templateparser.y"
+    function yy_r1(){
+    $this->current_buffer->append_subtree($this->yystack[$this->yyidx + 0]->minor);
+    }
+#line 2190 "smarty_internal_templateparser.php"
+#line 119 "smarty_internal_templateparser.y"
+    function yy_r4(){
+    if ($this->compiler->has_code) {
+        $tmp =''; foreach ($this->compiler->prefix_code as $code) {$tmp.=$code;} $this->compiler->prefix_code=array();
+        $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode($tmp.$this->yystack[$this->yyidx + 0]->minor,true));
+    } else {
+        $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + 0]->minor);
+    }
+    $this->compiler->has_variable_string = false;
+    $this->block_nesting_level = count($this->compiler->_tag_stack);
+    }
+#line 2202 "smarty_internal_templateparser.php"
+#line 131 "smarty_internal_templateparser.y"
+    function yy_r5(){
+    $this->_retvalue = new _smarty_tag($this, '');
+    }
+#line 2207 "smarty_internal_templateparser.php"
+#line 136 "smarty_internal_templateparser.y"
+    function yy_r6(){
+    $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
+    }
+#line 2212 "smarty_internal_templateparser.php"
+#line 141 "smarty_internal_templateparser.y"
+    function yy_r7(){
+    if ($this->php_handling == Smarty::PHP_PASSTHRU) {
+        $this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor));
+    } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
+        $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
+    } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
+        if (!($this->smarty instanceof SmartyBC)) {
+            $this->compiler->trigger_template_error (self::Err3);
+        }
+        $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<?php', true));
+    } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
+        $this->_retvalue = new _smarty_text($this, '');
+    }
+    }
+#line 2228 "smarty_internal_templateparser.php"
+#line 157 "smarty_internal_templateparser.y"
+    function yy_r8(){
+    if ($this->is_xml) {
+        $this->compiler->tag_nocache = true;
+        $this->is_xml = false;
+        $save = $this->template->has_nocache_code;
+        $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("<?php echo '?>';?>", $this->compiler, true));
+        $this->template->has_nocache_code = $save;
+    } elseif ($this->php_handling == Smarty::PHP_PASSTHRU) {
+        $this->_retvalue = new _smarty_text($this, '?<?php ?>>');
+    } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
+        $this->_retvalue = new _smarty_text($this, htmlspecialchars('?>', ENT_QUOTES));
+    } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
+        $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('?>', true));
+    } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
+        $this->_retvalue = new _smarty_text($this, '');
+    }
+    }
+#line 2247 "smarty_internal_templateparser.php"
+#line 176 "smarty_internal_templateparser.y"
+    function yy_r9(){
+    if ($this->php_handling == Smarty::PHP_PASSTHRU) {
+        $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
+    } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
+        $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
+    } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
+        if ($this->asp_tags) {
+            if (!($this->smarty instanceof SmartyBC)) {
+                $this->compiler->trigger_template_error (self::Err3);
+            }
+            $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<%', true));
+        } else {
+            $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
+        }
+    } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
+        if ($this->asp_tags) {
+            $this->_retvalue = new _smarty_text($this, '');
+        } else {
+            $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
+        }
+    }
+    }
+#line 2271 "smarty_internal_templateparser.php"
+#line 200 "smarty_internal_templateparser.y"
+    function yy_r10(){
+    if ($this->php_handling == Smarty::PHP_PASSTHRU) {
+        $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
+    } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
+        $this->_retvalue = new _smarty_text($this, htmlspecialchars('%>', ENT_QUOTES));
+    } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
+        if ($this->asp_tags) {
+            $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('%>', true));
+        } else {
+            $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
+        }
+    } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
+        if ($this->asp_tags) {
+            $this->_retvalue = new _smarty_text($this, '');
+        } else {
+            $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
+        }
+    }
+    }
+#line 2292 "smarty_internal_templateparser.php"
+#line 220 "smarty_internal_templateparser.y"
+    function yy_r11(){
+    if ($this->strip) {
+        $this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor)));
+    } else {
+        $this->_retvalue = new _smarty_text($this, self::escape_start_tag(�));
+    }
+    }
+#line 2301 "smarty_internal_templateparser.php"
+#line 229 "smarty_internal_templateparser.y"
+    function yy_r12(){
+    $this->compiler->tag_nocache = true;
+    $this->is_xml = true;
+    $save = $this->template->has_nocache_code;
+    $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("<?php echo '<?xml';?>", $this->compiler, true));
+    $this->template->has_nocache_code = $save;
+    }
+#line 2310 "smarty_internal_templateparser.php"
+#line 238 "smarty_internal_templateparser.y"
+    function yy_r13(){
+    if ($this->strip) {
+        $this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $this->yystack[$this->yyidx + 0]->minor));
+    } else {
+        $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
+    }
+    }
+#line 2319 "smarty_internal_templateparser.php"
+#line 247 "smarty_internal_templateparser.y"
+    function yy_r14(){
+    $this->strip = true;
+    $this->_retvalue = new _smarty_text($this, '');
+    }
+#line 2325 "smarty_internal_templateparser.php"
+#line 252 "smarty_internal_templateparser.y"
+    function yy_r15(){
+    $this->strip = false;
+    $this->_retvalue = new _smarty_text($this, '');
+    }
+#line 2331 "smarty_internal_templateparser.php"
+#line 258 "smarty_internal_templateparser.y"
+    function yy_r16(){
+    $this->_retvalue = '';
+    }
+#line 2336 "smarty_internal_templateparser.php"
+#line 262 "smarty_internal_templateparser.y"
+    function yy_r17(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    }
+#line 2341 "smarty_internal_templateparser.php"
+#line 266 "smarty_internal_templateparser.y"
+    function yy_r18(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 2346 "smarty_internal_templateparser.php"
+#line 274 "smarty_internal_templateparser.y"
+    function yy_r20(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 2351 "smarty_internal_templateparser.php"
+#line 282 "smarty_internal_templateparser.y"
+    function yy_r22(){
+    $this->_retvalue = self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor);
+    }
+#line 2356 "smarty_internal_templateparser.php"
+#line 290 "smarty_internal_templateparser.y"
+    function yy_r24(){
+    $this->_retvalue = self::escape_end_tag($this->yystack[$this->yyidx + 0]->minor);
+    }
+#line 2361 "smarty_internal_templateparser.php"
+#line 294 "smarty_internal_templateparser.y"
+    function yy_r25(){
+    $this->_retvalue = '<<?php ?>%';
+    }
+#line 2366 "smarty_internal_templateparser.php"
+#line 298 "smarty_internal_templateparser.y"
+    function yy_r26(){
+    $this->_retvalue = '%<?php ?>>';
+    }
+#line 2371 "smarty_internal_templateparser.php"
+#line 307 "smarty_internal_templateparser.y"
+    function yy_r27(){
+    $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor));
+    }
+#line 2376 "smarty_internal_templateparser.php"
+#line 311 "smarty_internal_templateparser.y"
+    function yy_r28(){
+    $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -3]->minor, 'modifierlist'=>$this->yystack[$this->yyidx + -2]->minor));
+    }
+#line 2381 "smarty_internal_templateparser.php"
+#line 315 "smarty_internal_templateparser.y"
+    function yy_r29(){
+    $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -2]->minor));
+    }
+#line 2386 "smarty_internal_templateparser.php"
+#line 319 "smarty_internal_templateparser.y"
+    function yy_r30(){
+    $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -3]->minor,'modifierlist'=>$this->yystack[$this->yyidx + -2]->minor));
+    }
+#line 2391 "smarty_internal_templateparser.php"
+#line 332 "smarty_internal_templateparser.y"
+    function yy_r32(){
+    $this->_retvalue = $this->compiler->compileTag('assign',array(array('value'=>$this->yystack[$this->yyidx + -1]->minor),array('var'=>"'".$this->yystack[$this->yyidx + -3]->minor."'")));
+    }
+#line 2396 "smarty_internal_templateparser.php"
+#line 340 "smarty_internal_templateparser.y"
+    function yy_r34(){
+    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -2]->minor),array('var'=>"'".$this->yystack[$this->yyidx + -4]->minor."'")),$this->yystack[$this->yyidx + -1]->minor));
+    }
+#line 2401 "smarty_internal_templateparser.php"
+#line 344 "smarty_internal_templateparser.y"
+    function yy_r35(){
+    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -2]->minor),array('var'=>$this->yystack[$this->yyidx + -4]->minor['var'])),$this->yystack[$this->yyidx + -1]->minor),array('smarty_internal_index'=>$this->yystack[$this->yyidx + -4]->minor['smarty_internal_index']));
+    }
+#line 2406 "smarty_internal_templateparser.php"
+#line 349 "smarty_internal_templateparser.y"
+    function yy_r36(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,$this->yystack[$this->yyidx + -1]->minor);
+    }
+#line 2411 "smarty_internal_templateparser.php"
+#line 353 "smarty_internal_templateparser.y"
+    function yy_r37(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,array());
+    }
+#line 2416 "smarty_internal_templateparser.php"
+#line 358 "smarty_internal_templateparser.y"
+    function yy_r38(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + -1]->minor,array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor));
+    }
+#line 2421 "smarty_internal_templateparser.php"
+#line 363 "smarty_internal_templateparser.y"
+    function yy_r39(){
+    $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor,$this->yystack[$this->yyidx + -1]->minor).'<?php echo ';
+    $this->_retvalue .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$this->yystack[$this->yyidx + -2]->minor,'value'=>'ob_get_clean()')).'?>';
+    }
+#line 2427 "smarty_internal_templateparser.php"
+#line 369 "smarty_internal_templateparser.y"
+    function yy_r40(){
+    $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -5]->minor,$this->yystack[$this->yyidx + -1]->minor,array('object_methode'=>$this->yystack[$this->yyidx + -3]->minor)).'<?php echo ';
+    $this->_retvalue .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$this->yystack[$this->yyidx + -2]->minor,'value'=>'ob_get_clean()')).'?>';
+    }
+#line 2433 "smarty_internal_templateparser.php"
+#line 375 "smarty_internal_templateparser.y"
+    function yy_r41(){
+    $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->lex->ldel_length));
+    $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + -1]->minor));
+    }
+#line 2439 "smarty_internal_templateparser.php"
+#line 380 "smarty_internal_templateparser.y"
+    function yy_r42(){
+    $tag = trim(substr($this->yystack[$this->yyidx + -3]->minor,$this->lex->ldel_length));
+    $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,$this->yystack[$this->yyidx + -1]->minor,array('if condition'=>$this->yystack[$this->yyidx + -2]->minor));
+    }
+#line 2445 "smarty_internal_templateparser.php"
+#line 385 "smarty_internal_templateparser.y"
+    function yy_r43(){
+    $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->lex->ldel_length));
+    $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + -1]->minor));
+    }
+#line 2451 "smarty_internal_templateparser.php"
+#line 396 "smarty_internal_templateparser.y"
+    function yy_r45(){
+    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -10]->minor),array('ifexp'=>$this->yystack[$this->yyidx + -7]->minor),array('var'=>$this->yystack[$this->yyidx + -3]->minor),array('step'=>$this->yystack[$this->yyidx + -2]->minor))),1);
+    }
+#line 2456 "smarty_internal_templateparser.php"
+#line 400 "smarty_internal_templateparser.y"
+    function yy_r46(){
+    $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 2461 "smarty_internal_templateparser.php"
+#line 408 "smarty_internal_templateparser.y"
+    function yy_r48(){
+    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -4]->minor),array('to'=>$this->yystack[$this->yyidx + -2]->minor))),0);
+    }
+#line 2466 "smarty_internal_templateparser.php"
+#line 412 "smarty_internal_templateparser.y"
+    function yy_r49(){
+    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -6]->minor),array('to'=>$this->yystack[$this->yyidx + -4]->minor),array('step'=>$this->yystack[$this->yyidx + -2]->minor))),0);
+    }
+#line 2471 "smarty_internal_templateparser.php"
+#line 417 "smarty_internal_templateparser.y"
+    function yy_r50(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',$this->yystack[$this->yyidx + -1]->minor);
+    }
+#line 2476 "smarty_internal_templateparser.php"
+#line 422 "smarty_internal_templateparser.y"
+    function yy_r51(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor))));
+    }
+#line 2481 "smarty_internal_templateparser.php"
+#line 426 "smarty_internal_templateparser.y"
+    function yy_r52(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -8]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor),array('key'=>$this->yystack[$this->yyidx + -5]->minor))));
+    }
+#line 2486 "smarty_internal_templateparser.php"
+#line 430 "smarty_internal_templateparser.y"
+    function yy_r53(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor))));
+    }
+#line 2491 "smarty_internal_templateparser.php"
+#line 434 "smarty_internal_templateparser.y"
+    function yy_r54(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -8]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor),array('key'=>$this->yystack[$this->yyidx + -5]->minor))));
+    }
+#line 2496 "smarty_internal_templateparser.php"
+#line 439 "smarty_internal_templateparser.y"
+    function yy_r55(){
+    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array(array_merge(array($this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor))));
+    }
+#line 2501 "smarty_internal_templateparser.php"
+#line 443 "smarty_internal_templateparser.y"
+    function yy_r56(){
+    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array($this->yystack[$this->yyidx + -3]->minor),$this->yystack[$this->yyidx + -2]->minor)),$this->yystack[$this->yyidx + -1]->minor)));
+    }
+#line 2506 "smarty_internal_templateparser.php"
+#line 448 "smarty_internal_templateparser.y"
+    function yy_r57(){
+    $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileChildBlock($this->compiler);
+    }
+#line 2511 "smarty_internal_templateparser.php"
+#line 454 "smarty_internal_templateparser.y"
+    function yy_r58(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',array());
+    }
+#line 2516 "smarty_internal_templateparser.php"
+#line 458 "smarty_internal_templateparser.y"
+    function yy_r59(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',array(),array('modifier_list'=>$this->yystack[$this->yyidx + -1]->minor));
+    }
+#line 2521 "smarty_internal_templateparser.php"
+#line 463 "smarty_internal_templateparser.y"
+    function yy_r60(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',array(),array('object_methode'=>$this->yystack[$this->yyidx + -1]->minor));
+    }
+#line 2526 "smarty_internal_templateparser.php"
+#line 467 "smarty_internal_templateparser.y"
+    function yy_r61(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor.'close',array(),array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor, 'modifier_list'=>$this->yystack[$this->yyidx + -1]->minor));
+    }
+#line 2531 "smarty_internal_templateparser.php"
+#line 475 "smarty_internal_templateparser.y"
+    function yy_r62(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 2537 "smarty_internal_templateparser.php"
+#line 481 "smarty_internal_templateparser.y"
+    function yy_r63(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
+    }
+#line 2542 "smarty_internal_templateparser.php"
+#line 486 "smarty_internal_templateparser.y"
+    function yy_r64(){
+    $this->_retvalue = array();
+    }
+#line 2547 "smarty_internal_templateparser.php"
+#line 491 "smarty_internal_templateparser.y"
+    function yy_r65(){
+    if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) {
+        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'true');
+    } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) {
+        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'false');
+    } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) {
+        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'null');
+    } else {
+        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>"'".$this->yystack[$this->yyidx + 0]->minor."'");
+    }
+    }
+#line 2560 "smarty_internal_templateparser.php"
+#line 503 "smarty_internal_templateparser.y"
+    function yy_r66(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+#line 2565 "smarty_internal_templateparser.php"
+#line 511 "smarty_internal_templateparser.y"
+    function yy_r68(){
+    $this->_retvalue = "'".$this->yystack[$this->yyidx + 0]->minor."'";
+    }
+#line 2570 "smarty_internal_templateparser.php"
+#line 536 "smarty_internal_templateparser.y"
+    function yy_r73(){
+    $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor;
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor;
+    }
+#line 2576 "smarty_internal_templateparser.php"
+#line 541 "smarty_internal_templateparser.y"
+    function yy_r74(){
+    $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+#line 2581 "smarty_internal_templateparser.php"
+#line 569 "smarty_internal_templateparser.y"
+    function yy_r79(){
+    $this->_retvalue = '$_smarty_tpl->getStreamVariable(\''. $this->yystack[$this->yyidx + -2]->minor .'://'. $this->yystack[$this->yyidx + 0]->minor . '\')';
+    }
+#line 2586 "smarty_internal_templateparser.php"
+#line 574 "smarty_internal_templateparser.y"
+    function yy_r80(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . trim($this->yystack[$this->yyidx + -1]->minor) . $this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 2591 "smarty_internal_templateparser.php"
+#line 593 "smarty_internal_templateparser.y"
+    function yy_r84(){
+    $this->_retvalue = $this->compiler->compileTag('private_modifier',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor,'modifierlist'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+#line 2596 "smarty_internal_templateparser.php"
+#line 599 "smarty_internal_templateparser.y"
+    function yy_r85(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 2601 "smarty_internal_templateparser.php"
+#line 603 "smarty_internal_templateparser.y"
+    function yy_r86(){
+    $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')';
+    }
+#line 2606 "smarty_internal_templateparser.php"
+#line 607 "smarty_internal_templateparser.y"
+    function yy_r87(){
+    $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')';
+    }
+#line 2611 "smarty_internal_templateparser.php"
+#line 615 "smarty_internal_templateparser.y"
+    function yy_r89(){
+    $this->_retvalue = '!('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';
+    }
+#line 2616 "smarty_internal_templateparser.php"
+#line 619 "smarty_internal_templateparser.y"
+    function yy_r90(){
+    $this->_retvalue = '('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';
+    }
+#line 2621 "smarty_internal_templateparser.php"
+#line 623 "smarty_internal_templateparser.y"
+    function yy_r91(){
+    $this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';
+    }
+#line 2626 "smarty_internal_templateparser.php"
+#line 627 "smarty_internal_templateparser.y"
+    function yy_r92(){
+    $this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';
+    }
+#line 2631 "smarty_internal_templateparser.php"
+#line 631 "smarty_internal_templateparser.y"
+    function yy_r93(){
+    $this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';
+    }
+#line 2636 "smarty_internal_templateparser.php"
+#line 635 "smarty_internal_templateparser.y"
+    function yy_r94(){
+    $this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';
+    }
+#line 2641 "smarty_internal_templateparser.php"
+#line 659 "smarty_internal_templateparser.y"
+    function yy_r100(){
+    $this->prefix_number++;
+    $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.$this->yystack[$this->yyidx + 0]->minor.';?>';
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.'$_tmp'.$this->prefix_number;
+    }
+#line 2648 "smarty_internal_templateparser.php"
+#line 668 "smarty_internal_templateparser.y"
+    function yy_r101(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -6]->minor.' ? '. $this->compileVariable("'".$this->yystack[$this->yyidx + -2]->minor."'") . ' : '.$this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 2653 "smarty_internal_templateparser.php"
+#line 672 "smarty_internal_templateparser.y"
+    function yy_r102(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 2658 "smarty_internal_templateparser.php"
+#line 687 "smarty_internal_templateparser.y"
+    function yy_r105(){
+    $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 2663 "smarty_internal_templateparser.php"
+#line 708 "smarty_internal_templateparser.y"
+    function yy_r110(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 2668 "smarty_internal_templateparser.php"
+#line 712 "smarty_internal_templateparser.y"
+    function yy_r111(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.';
+    }
+#line 2673 "smarty_internal_templateparser.php"
+#line 716 "smarty_internal_templateparser.y"
+    function yy_r112(){
+    $this->_retvalue = '.'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 2678 "smarty_internal_templateparser.php"
+#line 721 "smarty_internal_templateparser.y"
+    function yy_r113(){
+    if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) {
+        $this->_retvalue = 'true';
+    } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) {
+        $this->_retvalue = 'false';
+    } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) {
+        $this->_retvalue = 'null';
+    } else {
+        $this->_retvalue = "'".$this->yystack[$this->yyidx + 0]->minor."'";
+    }
+    }
+#line 2691 "smarty_internal_templateparser.php"
+#line 739 "smarty_internal_templateparser.y"
+    function yy_r115(){
+    $this->_retvalue = "(". $this->yystack[$this->yyidx + -1]->minor .")";
+    }
+#line 2696 "smarty_internal_templateparser.php"
+#line 754 "smarty_internal_templateparser.y"
+    function yy_r118(){
+    if (!$this->security || isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor]) || $this->smarty->security_policy->isTrustedStaticClass($this->yystack[$this->yyidx + -2]->minor, $this->compiler)) {
+        if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) {
+            $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor].'::'.$this->yystack[$this->yyidx + 0]->minor;
+        } else {
+            $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor;
+        }
+    } else {
+        $this->compiler->trigger_template_error ("static class '".$this->yystack[$this->yyidx + -2]->minor."' is undefined or not allowed by security setting");
+    }
+    }
+#line 2709 "smarty_internal_templateparser.php"
+#line 766 "smarty_internal_templateparser.y"
+    function yy_r119(){
+    if ($this->yystack[$this->yyidx + -2]->minor['var'] == '\'smarty\'') {
+        $this->_retvalue =  $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']).'::'.$this->yystack[$this->yyidx + 0]->minor;
+    } else {
+        $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + -2]->minor['var']).$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'].'::'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+    }
+#line 2718 "smarty_internal_templateparser.php"
+#line 775 "smarty_internal_templateparser.y"
+    function yy_r120(){
+    $this->prefix_number++;
+    $this->compiler->prefix_code[] = '<?php ob_start();?>'.$this->yystack[$this->yyidx + 0]->minor.'<?php $_tmp'.$this->prefix_number.'=ob_get_clean();?>';
+    $this->_retvalue = '$_tmp'.$this->prefix_number;
+    }
+#line 2725 "smarty_internal_templateparser.php"
+#line 790 "smarty_internal_templateparser.y"
+    function yy_r122(){
+    if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') {
+        $smarty_var = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
+        $this->_retvalue = $smarty_var;
+    } else {
+        // used for array reset,next,prev,end,current
+        $this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var'];
+        $this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
+        $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + 0]->minor['var']).$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
+    }
+    }
+#line 2738 "smarty_internal_templateparser.php"
+#line 803 "smarty_internal_templateparser.y"
+    function yy_r123(){
+    $this->_retvalue = '$_smarty_tpl->tpl_vars['. $this->yystack[$this->yyidx + -2]->minor .']->'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 2743 "smarty_internal_templateparser.php"
+#line 813 "smarty_internal_templateparser.y"
+    function yy_r125(){
+    $this->_retvalue = '$_smarty_tpl->getConfigVariable(\''. $this->yystack[$this->yyidx + -1]->minor .'\')';
+    }
+#line 2748 "smarty_internal_templateparser.php"
+#line 817 "smarty_internal_templateparser.y"
+    function yy_r126(){
+    $this->_retvalue = '$_smarty_tpl->getConfigVariable('. $this->yystack[$this->yyidx + -1]->minor .')';
+    }
+#line 2753 "smarty_internal_templateparser.php"
+#line 821 "smarty_internal_templateparser.y"
+    function yy_r127(){
+    $this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+#line 2758 "smarty_internal_templateparser.php"
+#line 834 "smarty_internal_templateparser.y"
+    function yy_r129(){
+    return;
+    }
+#line 2763 "smarty_internal_templateparser.php"
+#line 840 "smarty_internal_templateparser.y"
+    function yy_r130(){
+    $this->_retvalue = '['.$this->compileVariable($this->yystack[$this->yyidx + 0]->minor).']';
+    }
+#line 2768 "smarty_internal_templateparser.php"
+#line 844 "smarty_internal_templateparser.y"
+    function yy_r131(){
+    $this->_retvalue = '['.$this->compileVariable($this->yystack[$this->yyidx + -2]->minor).'->'.$this->yystack[$this->yyidx + 0]->minor.']';
+    }
+#line 2773 "smarty_internal_templateparser.php"
+#line 848 "smarty_internal_templateparser.y"
+    function yy_r132(){
+    $this->_retvalue = "['". $this->yystack[$this->yyidx + 0]->minor ."']";
+    }
+#line 2778 "smarty_internal_templateparser.php"
+#line 852 "smarty_internal_templateparser.y"
+    function yy_r133(){
+    $this->_retvalue = "[". $this->yystack[$this->yyidx + 0]->minor ."]";
+    }
+#line 2783 "smarty_internal_templateparser.php"
+#line 856 "smarty_internal_templateparser.y"
+    function yy_r134(){
+    $this->_retvalue = "[". $this->yystack[$this->yyidx + -1]->minor ."]";
+    }
+#line 2788 "smarty_internal_templateparser.php"
+#line 861 "smarty_internal_templateparser.y"
+    function yy_r135(){
+    $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']';
+    }
+#line 2793 "smarty_internal_templateparser.php"
+#line 865 "smarty_internal_templateparser.y"
+    function yy_r136(){
+    $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']';
+    }
+#line 2798 "smarty_internal_templateparser.php"
+#line 875 "smarty_internal_templateparser.y"
+    function yy_r138(){
+    $this->_retvalue = '[]';
+    }
+#line 2803 "smarty_internal_templateparser.php"
+#line 888 "smarty_internal_templateparser.y"
+    function yy_r140(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 2808 "smarty_internal_templateparser.php"
+#line 893 "smarty_internal_templateparser.y"
+    function yy_r141(){
+    $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';
+    }
+#line 2813 "smarty_internal_templateparser.php"
+#line 898 "smarty_internal_templateparser.y"
+    function yy_r142(){
+    $this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')';
+    }
+#line 2818 "smarty_internal_templateparser.php"
+#line 905 "smarty_internal_templateparser.y"
+    function yy_r143(){
+    if ($this->yystack[$this->yyidx + -1]->minor['var'] == '\'smarty\'') {
+        $this->_retvalue =  $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']).$this->yystack[$this->yyidx + 0]->minor;
+    } else {
+        $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + -1]->minor['var']).$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'].$this->yystack[$this->yyidx + 0]->minor;
+    }
+    }
+#line 2827 "smarty_internal_templateparser.php"
+#line 914 "smarty_internal_templateparser.y"
+    function yy_r144(){
+    $this->_retvalue  = $this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 2832 "smarty_internal_templateparser.php"
+#line 919 "smarty_internal_templateparser.y"
+    function yy_r145(){
+    $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 2837 "smarty_internal_templateparser.php"
+#line 924 "smarty_internal_templateparser.y"
+    function yy_r146(){
+    if ($this->security && substr($this->yystack[$this->yyidx + -1]->minor,0,1) == '_') {
+        $this->compiler->trigger_template_error (self::Err1);
+    }
+    $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 2845 "smarty_internal_templateparser.php"
+#line 931 "smarty_internal_templateparser.y"
+    function yy_r147(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::Err2);
+    }
+    $this->_retvalue = '->{'.$this->compileVariable($this->yystack[$this->yyidx + -1]->minor).$this->yystack[$this->yyidx + 0]->minor.'}';
+    }
+#line 2853 "smarty_internal_templateparser.php"
+#line 938 "smarty_internal_templateparser.y"
+    function yy_r148(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::Err2);
+    }
+    $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
+    }
+#line 2861 "smarty_internal_templateparser.php"
+#line 945 "smarty_internal_templateparser.y"
+    function yy_r149(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::Err2);
+    }
+    $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
+    }
+#line 2869 "smarty_internal_templateparser.php"
+#line 953 "smarty_internal_templateparser.y"
+    function yy_r150(){
+    $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 2874 "smarty_internal_templateparser.php"
+#line 961 "smarty_internal_templateparser.y"
+    function yy_r151(){
+    if (!$this->security || $this->smarty->security_policy->isTrustedPhpFunction($this->yystack[$this->yyidx + -3]->minor, $this->compiler)) {
+        if (strcasecmp($this->yystack[$this->yyidx + -3]->minor,'isset') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor,'empty') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor,'array') === 0 || is_callable($this->yystack[$this->yyidx + -3]->minor)) {
+            $func_name = strtolower($this->yystack[$this->yyidx + -3]->minor);
+            if ($func_name == 'isset') {
+                if (count($this->yystack[$this->yyidx + -1]->minor) == 0) {
+                    $this->compiler->trigger_template_error ('Illegal number of paramer in "isset()"');
+                }
+                $par = implode(',',$this->yystack[$this->yyidx + -1]->minor);
+                if (strncasecmp($par,'$_smarty_tpl->getConfigVariable',strlen('$_smarty_tpl->getConfigVariable')) === 0) {
+                    $this->prefix_number++;
+                    $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.str_replace(')',', false)',$par).';?>';
+                    $isset_par = '$_tmp'.$this->prefix_number;
+                } else {
+                    $isset_par=str_replace("')->value","',null,true,false)->value",$par);
+                }
+                $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". $isset_par .")";
+            } elseif (in_array($func_name,array('empty','reset','current','end','prev','next'))){
+                if (count($this->yystack[$this->yyidx + -1]->minor) != 1) {
+                    $this->compiler->trigger_template_error ('Illegal number of paramer in "empty()"');
+                }
+                if ($func_name == 'empty') {
+                    $this->_retvalue = $func_name.'('.str_replace("')->value","',null,true,false)->value",$this->yystack[$this->yyidx + -1]->minor[0]).')';
+                } else {
+                    $this->_retvalue = $func_name.'('.$this->yystack[$this->yyidx + -1]->minor[0].')';
+                }
+            } else {
+                $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")";
+            }
+        } else {
+            $this->compiler->trigger_template_error ("unknown function \"" . $this->yystack[$this->yyidx + -3]->minor . "\"");
+        }
+    }
+    }
+#line 2910 "smarty_internal_templateparser.php"
+#line 999 "smarty_internal_templateparser.y"
+    function yy_r152(){
+    if ($this->security && substr($this->yystack[$this->yyidx + -3]->minor,0,1) == '_') {
+        $this->compiler->trigger_template_error (self::Err1);
+    }
+    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")";
+    }
+#line 2918 "smarty_internal_templateparser.php"
+#line 1006 "smarty_internal_templateparser.y"
+    function yy_r153(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::Err2);
+    }
+    $this->prefix_number++;
+    $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.$this->compileVariable("'".$this->yystack[$this->yyidx + -3]->minor."'").';?>';
+    $this->_retvalue = '$_tmp'.$this->prefix_number.'('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')';
+    }
+#line 2928 "smarty_internal_templateparser.php"
+#line 1017 "smarty_internal_templateparser.y"
+    function yy_r154(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array($this->yystack[$this->yyidx + 0]->minor));
+    }
+#line 2933 "smarty_internal_templateparser.php"
+#line 1034 "smarty_internal_templateparser.y"
+    function yy_r157(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor)));
+    }
+#line 2938 "smarty_internal_templateparser.php"
+#line 1038 "smarty_internal_templateparser.y"
+    function yy_r158(){
+    $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor));
+    }
+#line 2943 "smarty_internal_templateparser.php"
+#line 1046 "smarty_internal_templateparser.y"
+    function yy_r160(){
+    $this->_retvalue =  array($this->yystack[$this->yyidx + 0]->minor);
+    }
+#line 2948 "smarty_internal_templateparser.php"
+#line 1054 "smarty_internal_templateparser.y"
+    function yy_r161(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
+    }
+#line 2953 "smarty_internal_templateparser.php"
+#line 1088 "smarty_internal_templateparser.y"
+    function yy_r168(){
+    $this->_retvalue = '$'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 2958 "smarty_internal_templateparser.php"
+#line 1093 "smarty_internal_templateparser.y"
+    function yy_r169(){
+    $this->_retvalue = '$'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 2963 "smarty_internal_templateparser.php"
+#line 1099 "smarty_internal_templateparser.y"
+    function yy_r170(){
+    $this->_retvalue = '==';
+    }
+#line 2968 "smarty_internal_templateparser.php"
+#line 1103 "smarty_internal_templateparser.y"
+    function yy_r171(){
+    $this->_retvalue = '!=';
+    }
+#line 2973 "smarty_internal_templateparser.php"
+#line 1107 "smarty_internal_templateparser.y"
+    function yy_r172(){
+    $this->_retvalue = '>';
+    }
+#line 2978 "smarty_internal_templateparser.php"
+#line 1111 "smarty_internal_templateparser.y"
+    function yy_r173(){
+    $this->_retvalue = '<';
+    }
+#line 2983 "smarty_internal_templateparser.php"
+#line 1115 "smarty_internal_templateparser.y"
+    function yy_r174(){
+    $this->_retvalue = '>=';
+    }
+#line 2988 "smarty_internal_templateparser.php"
+#line 1119 "smarty_internal_templateparser.y"
+    function yy_r175(){
+    $this->_retvalue = '<=';
+    }
+#line 2993 "smarty_internal_templateparser.php"
+#line 1123 "smarty_internal_templateparser.y"
+    function yy_r176(){
+    $this->_retvalue = '===';
+    }
+#line 2998 "smarty_internal_templateparser.php"
+#line 1127 "smarty_internal_templateparser.y"
+    function yy_r177(){
+    $this->_retvalue = '!==';
+    }
+#line 3003 "smarty_internal_templateparser.php"
+#line 1131 "smarty_internal_templateparser.y"
+    function yy_r178(){
+    $this->_retvalue = '%';
+    }
+#line 3008 "smarty_internal_templateparser.php"
+#line 1135 "smarty_internal_templateparser.y"
+    function yy_r179(){
+    $this->_retvalue = '&&';
+    }
+#line 3013 "smarty_internal_templateparser.php"
+#line 1139 "smarty_internal_templateparser.y"
+    function yy_r180(){
+    $this->_retvalue = '||';
+    }
+#line 3018 "smarty_internal_templateparser.php"
+#line 1143 "smarty_internal_templateparser.y"
+    function yy_r181(){
+    $this->_retvalue = ' XOR ';
+    }
+#line 3023 "smarty_internal_templateparser.php"
+#line 1150 "smarty_internal_templateparser.y"
+    function yy_r182(){
+    $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')';
+    }
+#line 3028 "smarty_internal_templateparser.php"
+#line 1158 "smarty_internal_templateparser.y"
+    function yy_r184(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 3033 "smarty_internal_templateparser.php"
+#line 1166 "smarty_internal_templateparser.y"
+    function yy_r186(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 3038 "smarty_internal_templateparser.php"
+#line 1170 "smarty_internal_templateparser.y"
+    function yy_r187(){
+    $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+#line 3043 "smarty_internal_templateparser.php"
+#line 1182 "smarty_internal_templateparser.y"
+    function yy_r189(){
+    $this->_retvalue = "''";
+    }
+#line 3048 "smarty_internal_templateparser.php"
+#line 1186 "smarty_internal_templateparser.y"
+    function yy_r190(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php();
+    }
+#line 3053 "smarty_internal_templateparser.php"
+#line 1191 "smarty_internal_templateparser.y"
+    function yy_r191(){
+    $this->yystack[$this->yyidx + -1]->minor->append_subtree($this->yystack[$this->yyidx + 0]->minor);
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    }
+#line 3059 "smarty_internal_templateparser.php"
+#line 1196 "smarty_internal_templateparser.y"
+    function yy_r192(){
+    $this->_retvalue = new _smarty_doublequoted($this, $this->yystack[$this->yyidx + 0]->minor);
+    }
+#line 3064 "smarty_internal_templateparser.php"
+#line 1200 "smarty_internal_templateparser.y"
+    function yy_r193(){
+    $this->_retvalue = new _smarty_code($this, $this->yystack[$this->yyidx + -1]->minor);
+    }
+#line 3069 "smarty_internal_templateparser.php"
+#line 1208 "smarty_internal_templateparser.y"
+    function yy_r195(){
+    $this->_retvalue = new _smarty_code($this, '$_smarty_tpl->tpl_vars[\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\']->value');
+    }
+#line 3074 "smarty_internal_templateparser.php"
+#line 1216 "smarty_internal_templateparser.y"
+    function yy_r197(){
+    $this->_retvalue = new _smarty_code($this, '('.$this->yystack[$this->yyidx + -1]->minor.')');
+    }
+#line 3079 "smarty_internal_templateparser.php"
+#line 1220 "smarty_internal_templateparser.y"
+    function yy_r198(){
+    $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + 0]->minor);
+    }
+#line 3084 "smarty_internal_templateparser.php"
+#line 1224 "smarty_internal_templateparser.y"
+    function yy_r199(){
+    $this->_retvalue = new _smarty_dq_content($this, $this->yystack[$this->yyidx + 0]->minor);
+    }
+#line 3089 "smarty_internal_templateparser.php"
+
+    private $_retvalue;
+
+    function yy_reduce($yyruleno)
+    {
+        $yymsp = $this->yystack[$this->yyidx];
+        if (self::$yyTraceFILE && $yyruleno >= 0
+              && $yyruleno < count(self::$yyRuleName)) {
+            fprintf(self::$yyTraceFILE, "%sReduce (%d) [%s].\n",
+                self::$yyTracePrompt, $yyruleno,
+                self::$yyRuleName[$yyruleno]);
+        }
+
+        $this->_retvalue = $yy_lefthand_side = null;
+        if (array_key_exists($yyruleno, self::$yyReduceMap)) {
+            // call the action
+            $this->_retvalue = null;
+            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
+            $yy_lefthand_side = $this->_retvalue;
+        }
+        $yygoto = self::$yyRuleInfo[$yyruleno]['lhs'];
+        $yysize = self::$yyRuleInfo[$yyruleno]['rhs'];
+        $this->yyidx -= $yysize;
+        for($i = $yysize; $i; $i--) {
+            // pop all of the right-hand side parameters
+            array_pop($this->yystack);
+        }
+        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
+        if ($yyact < self::YYNSTATE) {
+            if (!self::$yyTraceFILE && $yysize) {
+                $this->yyidx++;
+                $x = new TP_yyStackEntry;
+                $x->stateno = $yyact;
+                $x->major = $yygoto;
+                $x->minor = $yy_lefthand_side;
+                $this->yystack[$this->yyidx] = $x;
+            } else {
+                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
+            }
+        } elseif ($yyact == self::YYNSTATE + self::YYNRULE + 1) {
+            $this->yy_accept();
+        }
+    }
+
+    function yy_parse_failed()
+    {
+        if (self::$yyTraceFILE) {
+            fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt);
+        }
+        while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
+    }
+
+    function yy_syntax_error($yymajor, $TOKEN)
+    {
+#line 77 "smarty_internal_templateparser.y"
+
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_template_error();
+#line 3152 "smarty_internal_templateparser.php"
+    }
+
+    function yy_accept()
+    {
+        if (self::$yyTraceFILE) {
+            fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt);
+        }
+        while ($this->yyidx >= 0) {
+            $stack = $this->yy_pop_parser_stack();
+        }
+#line 69 "smarty_internal_templateparser.y"
+
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
+    //echo $this->retvalue."\n\n";
+#line 3170 "smarty_internal_templateparser.php"
+    }
+
+    function doParse($yymajor, $yytokenvalue)
+    {
+        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
+
+        if ($this->yyidx === null || $this->yyidx < 0) {
+            $this->yyidx = 0;
+            $this->yyerrcnt = -1;
+            $x = new TP_yyStackEntry;
+            $x->stateno = 0;
+            $x->major = 0;
+            $this->yystack = array();
+            array_push($this->yystack, $x);
+        }
+        $yyendofinput = ($yymajor==0);
+
+        if (self::$yyTraceFILE) {
+            fprintf(self::$yyTraceFILE, "%sInput %s\n",
+                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+        }
+
+        do {
+            $yyact = $this->yy_find_shift_action($yymajor);
+            if ($yymajor < self::YYERRORSYMBOL &&
+                  !$this->yy_is_expected_token($yymajor)) {
+                // force a syntax error
+                $yyact = self::YY_ERROR_ACTION;
+            }
+            if ($yyact < self::YYNSTATE) {
+                $this->yy_shift($yyact, $yymajor, $yytokenvalue);
+                $this->yyerrcnt--;
+                if ($yyendofinput && $this->yyidx >= 0) {
+                    $yymajor = 0;
+                } else {
+                    $yymajor = self::YYNOCODE;
+                }
+            } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
+                $this->yy_reduce($yyact - self::YYNSTATE);
+            } elseif ($yyact == self::YY_ERROR_ACTION) {
+                if (self::$yyTraceFILE) {
+                    fprintf(self::$yyTraceFILE, "%sSyntax Error!\n",
+                        self::$yyTracePrompt);
+                }
+                if (self::YYERRORSYMBOL) {
+                    if ($this->yyerrcnt < 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $yymx = $this->yystack[$this->yyidx]->major;
+                    if ($yymx == self::YYERRORSYMBOL || $yyerrorhit ){
+                        if (self::$yyTraceFILE) {
+                            fprintf(self::$yyTraceFILE, "%sDiscard input token %s\n",
+                                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
+                        }
+                        $this->yy_destructor($yymajor, $yytokenvalue);
+                        $yymajor = self::YYNOCODE;
+                    } else {
+                        while ($this->yyidx >= 0 &&
+                                 $yymx != self::YYERRORSYMBOL &&
+        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
+                              ){
+                            $this->yy_pop_parser_stack();
+                        }
+                        if ($this->yyidx < 0 || $yymajor==0) {
+                            $this->yy_destructor($yymajor, $yytokenvalue);
+                            $this->yy_parse_failed();
+                            $yymajor = self::YYNOCODE;
+                        } elseif ($yymx != self::YYERRORSYMBOL) {
+                            $u2 = 0;
+                            $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
+                        }
+                    }
+                    $this->yyerrcnt = 3;
+                    $yyerrorhit = 1;
+                } else {
+                    if ($this->yyerrcnt <= 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $this->yyerrcnt = 3;
+                    $this->yy_destructor($yymajor, $yytokenvalue);
+                    if ($yyendofinput) {
+                        $this->yy_parse_failed();
+                    }
+                    $yymajor = self::YYNOCODE;
+                }
+            } else {
+                $this->yy_accept();
+                $yymajor = self::YYNOCODE;
+            }
+        } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
+    }
+}
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_utility.php b/lib/smarty/sysplugins/smarty_internal_utility.php
new file mode 100644
index 0000000..3e3e85f
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_utility.php
@@ -0,0 +1,810 @@
+<?php
+/**
+ * Project:     Smarty: the PHP compiling template engine
+ * File:        smarty_internal_utility.php
+ * SVN:         $Id: $
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * For questions, help, comments, discussion, etc., please join the
+ * Smarty mailing list. Send a blank e-mail to
+ * smarty-discussion-subscribe@googlegroups.com
+ *
+ * @link http://www.smarty.net/
+ * @copyright 2008 New Digital Group, Inc.
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Uwe Tews
+ * @package Smarty
+ * @subpackage PluginsInternal
+ * @version 3-SVN$Rev: 3286 $
+ */
+
+
+/**
+ * Utility class
+ *
+ * @package Smarty
+ * @subpackage Security
+ */
+class Smarty_Internal_Utility {
+
+    /**
+     * private constructor to prevent calls creation of new instances
+     */
+    private final function __construct()
+    {
+        // intentionally left blank
+    }
+
+    /**
+     * Compile all template files
+     *
+     * @param string $extension     template file name extension
+     * @param bool   $force_compile force all to recompile
+     * @param int    $time_limit    set maximum execution time
+     * @param int    $max_errors    set maximum allowed errors
+     * @param Smarty $smarty        Smarty instance
+     * @return integer number of template files compiled
+     */
+    public static function compileAllTemplates($extention, $force_compile, $time_limit, $max_errors, Smarty $smarty)
+    {
+        // switch off time limit
+        if (function_exists('set_time_limit')) {
+            @set_time_limit($time_limit);
+        }
+        $smarty->force_compile = $force_compile;
+        $_count = 0;
+        $_error_count = 0;
+        // loop over array of template directories
+        foreach($smarty->getTemplateDir() as $_dir) {
+            $_compileDirs = new RecursiveDirectoryIterator($_dir);
+            $_compile = new RecursiveIteratorIterator($_compileDirs);
+            foreach ($_compile as $_fileinfo) {
+                if (substr($_fileinfo->getBasename(),0,1) == '.' || strpos($_fileinfo, '.svn') !== false) continue;
+                $_file = $_fileinfo->getFilename();
+                if (!substr_compare($_file, $extention, - strlen($extention)) == 0) continue;
+                if ($_fileinfo->getPath() == substr($_dir, 0, -1)) {
+                   $_template_file = $_file;
+                } else {
+                   $_template_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
+                }
+                echo '<br>', $_dir, '---', $_template_file;
+                flush();
+                $_start_time = microtime(true);
+                try {
+                    $_tpl = $smarty->createTemplate($_template_file,null,null,null,false);
+                    if ($_tpl->mustCompile()) {
+                        $_tpl->compileTemplateSource();
+                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
+                        flush();
+                    } else {
+                        echo ' is up to date';
+                        flush();
+                    }
+                }
+                catch (Exception $e) {
+                    echo 'Error: ', $e->getMessage(), "<br><br>";
+                    $_error_count++;
+                }
+                // free memory
+                $smarty->template_objects = array();
+                $_tpl->smarty->template_objects = array();
+                $_tpl = null;
+                if ($max_errors !== null && $_error_count == $max_errors) {
+                    echo '<br><br>too many errors';
+                    exit();
+                }
+            }
+        }
+        return $_count;
+    }
+
+    /**
+     * Compile all config files
+     *
+     * @param string $extension     config file name extension
+     * @param bool   $force_compile force all to recompile
+     * @param int    $time_limit    set maximum execution time
+     * @param int    $max_errors    set maximum allowed errors
+     * @param Smarty $smarty        Smarty instance
+     * @return integer number of config files compiled
+     */
+    public static function compileAllConfig($extention, $force_compile, $time_limit, $max_errors, Smarty $smarty)
+    {
+        // switch off time limit
+        if (function_exists('set_time_limit')) {
+            @set_time_limit($time_limit);
+        }
+        $smarty->force_compile = $force_compile;
+        $_count = 0;
+        $_error_count = 0;
+        // loop over array of template directories
+        foreach($smarty->getConfigDir() as $_dir) {
+            $_compileDirs = new RecursiveDirectoryIterator($_dir);
+            $_compile = new RecursiveIteratorIterator($_compileDirs);
+            foreach ($_compile as $_fileinfo) {
+                if (substr($_fileinfo->getBasename(),0,1) == '.' || strpos($_fileinfo, '.svn') !== false) continue;
+                $_file = $_fileinfo->getFilename();
+                if (!substr_compare($_file, $extention, - strlen($extention)) == 0) continue;
+                if ($_fileinfo->getPath() == substr($_dir, 0, -1)) {
+                    $_config_file = $_file;
+                } else {
+                    $_config_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
+                }
+                echo '<br>', $_dir, '---', $_config_file;
+                flush();
+                $_start_time = microtime(true);
+                try {
+                    $_config = new Smarty_Internal_Config($_config_file, $smarty);
+                    if ($_config->mustCompile()) {
+                        $_config->compileConfigSource();
+                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
+                        flush();
+                    } else {
+                        echo ' is up to date';
+                        flush();
+                    }
+                }
+                catch (Exception $e) {
+                    echo 'Error: ', $e->getMessage(), "<br><br>";
+                    $_error_count++;
+                }
+                if ($max_errors !== null && $_error_count == $max_errors) {
+                    echo '<br><br>too many errors';
+                    exit();
+                }
+            }
+        }
+        return $_count;
+    }
+
+    /**
+     * Delete compiled template file
+     *
+     * @param string  $resource_name template name
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time
+     * @param Smarty  $smarty        Smarty instance
+     * @return integer number of template files deleted
+     */
+    public static function clearCompiledTemplate($resource_name, $compile_id, $exp_time, Smarty $smarty)
+    {
+        $_compile_dir = $smarty->getCompileDir();
+        $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
+        $_dir_sep = $smarty->use_sub_dirs ? DS : '^';
+        if (isset($resource_name)) {
+            $_save_stat = $smarty->caching;
+            $smarty->caching = false;
+            $tpl = new $smarty->template_class($resource_name, $smarty);
+            $smarty->caching = $_save_stat;
+
+            // remove from template cache
+            $tpl->source; // have the template registered before unset()
+            if ($smarty->allow_ambiguous_resources) {
+                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
+            } else {
+                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
+            }
+            if (isset($_templateId[150])) {
+                $_templateId = sha1($_templateId);
+            }
+            unset($smarty->template_objects[$_templateId]);
+
+            if ($tpl->source->exists) {
+                 $_resource_part_1 = basename(str_replace('^', '/', $tpl->compiled->filepath));
+                 $_resource_part_1_length = strlen($_resource_part_1);
+            } else {
+                return 0;
+            }
+
+            $_resource_part_2 = str_replace('.php','.cache.php',$_resource_part_1);
+            $_resource_part_2_length = strlen($_resource_part_2);
+        } else {
+            $_resource_part = '';
+        }
+        $_dir = $_compile_dir;
+        if ($smarty->use_sub_dirs && isset($_compile_id)) {
+            $_dir .= $_compile_id . $_dir_sep;
+        }
+        if (isset($_compile_id)) {
+            $_compile_id_part = $_compile_dir . $_compile_id . $_dir_sep;
+            $_compile_id_part_length = strlen($_compile_id_part);
+        }
+        $_count = 0;
+        try {
+            $_compileDirs = new RecursiveDirectoryIterator($_dir);
+        // NOTE: UnexpectedValueException thrown for PHP >= 5.3
+        } catch (Exception $e) {
+            return 0;
+        }
+        $_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
+        foreach ($_compile as $_file) {
+            if (substr($_file->getBasename(), 0, 1) == '.' || strpos($_file, '.svn') !== false)
+                continue;
+
+            $_filepath = (string) $_file;
+
+            if ($_file->isDir()) {
+                if (!$_compile->isDot()) {
+                    // delete folder if empty
+                    @rmdir($_file->getPathname());
+                }
+            } else {
+                $unlink = false;
+                if ((!isset($_compile_id) || (isset($_filepath[$_compile_id_part_length]) && !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length)))
+                    && (!isset($resource_name)
+                        || (isset($_filepath[$_resource_part_1_length])
+                            && substr_compare($_filepath, $_resource_part_1, -$_resource_part_1_length, $_resource_part_1_length) == 0)
+                        || (isset($_filepath[$_resource_part_2_length])
+                            && substr_compare($_filepath, $_resource_part_2, -$_resource_part_2_length, $_resource_part_2_length) == 0))) {
+                    if (isset($exp_time)) {
+                        if (time() - @filemtime($_filepath) >= $exp_time) {
+                            $unlink = true;
+                        }
+                    } else {
+                        $unlink = true;
+                    }
+                }
+
+                if ($unlink && @unlink($_filepath)) {
+                    $_count++;
+                }
+            }
+        }
+        // clear compiled cache
+        Smarty_Resource::$sources = array();
+        Smarty_Resource::$compileds = array();
+        return $_count;
+    }
+
+    /**
+     * Return array of tag/attributes of all tags used by an template
+     *
+     * @param Smarty_Internal_Template $templae template object
+     * @return array of tag/attributes
+     */
+    public static function getTags(Smarty_Internal_Template $template)
+    {
+        $template->smarty->get_used_tags = true;
+        $template->compileTemplateSource();
+        return $template->used_tags;
+    }
+
+
+    /**
+     * diagnose Smarty setup
+     *
+     * If $errors is secified, the diagnostic report will be appended to the array, rather than being output.
+     *
+     * @param Smarty $smarty  Smarty instance to test
+     * @param array  $errors array to push results into rather than outputting them
+     * @return bool status, true if everything is fine, false else
+     */
+    public static function testInstall(Smarty $smarty, &$errors=null)
+    {
+        $status = true;
+
+        if ($errors === null) {
+            echo "<PRE>\n";
+            echo "Smarty Installation test...\n";
+            echo "Testing template directory...\n";
+        }
+
+        // test if all registered template_dir are accessible
+        foreach($smarty->getTemplateDir() as $template_dir) {
+            $_template_dir = $template_dir;
+            $template_dir = realpath($template_dir);
+            // resolve include_path or fail existance
+            if (!$template_dir) {
+                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_template_dir)) {
+                    // try PHP include_path
+                    if (($template_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_template_dir)) !== false) {
+                        if ($errors === null) {
+                            echo "$template_dir is OK.\n";
+                        }
+
+                        continue;
+                    } else {
+                        $status = false;
+                        $message = "FAILED: $_template_dir does not exist (and couldn't be found in include_path either)";
+                        if ($errors === null) {
+                            echo $message . ".\n";
+                        } else {
+                            $errors['template_dir'] = $message;
+                        }
+
+                        continue;
+                    }
+                } else {
+                    $status = false;
+                    $message = "FAILED: $_template_dir does not exist";
+                    if ($errors === null) {
+                        echo $message . ".\n";
+                    } else {
+                        $errors['template_dir'] = $message;
+                    }
+
+                    continue;
+                }
+            }
+
+            if (!is_dir($template_dir)) {
+                $status = false;
+                $message = "FAILED: $template_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors['template_dir'] = $message;
+                }
+            } elseif (!is_readable($template_dir)) {
+                $status = false;
+                $message = "FAILED: $template_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors['template_dir'] = $message;
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$template_dir is OK.\n";
+                }
+            }
+        }
+
+
+        if ($errors === null) {
+            echo "Testing compile directory...\n";
+        }
+
+        // test if registered compile_dir is accessible
+        $__compile_dir = $smarty->getCompileDir();
+        $_compile_dir = realpath($__compile_dir);
+        if (!$_compile_dir) {
+            $status = false;
+            $message = "FAILED: {$__compile_dir} does not exist";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors['compile_dir'] = $message;
+            }
+        } elseif (!is_dir($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not a directory";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors['compile_dir'] = $message;
+            }
+        } elseif (!is_readable($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not readable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors['compile_dir'] = $message;
+            }
+        } elseif (!is_writable($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not writable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors['compile_dir'] = $message;
+            }
+        } else {
+            if ($errors === null) {
+                echo "{$_compile_dir} is OK.\n";
+            }
+        }
+
+
+        if ($errors === null) {
+            echo "Testing plugins directory...\n";
+        }
+
+        // test if all registered plugins_dir are accessible
+        // and if core plugins directory is still registered
+        $_core_plugins_dir = realpath(dirname(__FILE__) .'/../plugins');
+        $_core_plugins_available = false;
+        foreach($smarty->getPluginsDir() as $plugin_dir) {
+            $_plugin_dir = $plugin_dir;
+            $plugin_dir = realpath($plugin_dir);
+            // resolve include_path or fail existance
+            if (!$plugin_dir) {
+                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
+                    // try PHP include_path
+                    if (($plugin_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_plugin_dir)) !== false) {
+                        if ($errors === null) {
+                            echo "$plugin_dir is OK.\n";
+                        }
+
+                        continue;
+                    } else {
+                        $status = false;
+                        $message = "FAILED: $_plugin_dir does not exist (and couldn't be found in include_path either)";
+                        if ($errors === null) {
+                            echo $message . ".\n";
+                        } else {
+                            $errors['plugins_dir'] = $message;
+                        }
+
+                        continue;
+                    }
+                } else {
+                    $status = false;
+                    $message = "FAILED: $_plugin_dir does not exist";
+                    if ($errors === null) {
+                        echo $message . ".\n";
+                    } else {
+                        $errors['plugins_dir'] = $message;
+                    }
+
+                    continue;
+                }
+            }
+
+            if (!is_dir($plugin_dir)) {
+                $status = false;
+                $message = "FAILED: $plugin_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors['plugins_dir'] = $message;
+                }
+            } elseif (!is_readable($plugin_dir)) {
+                $status = false;
+                $message = "FAILED: $plugin_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors['plugins_dir'] = $message;
+                }
+            } elseif ($_core_plugins_dir && $_core_plugins_dir == realpath($plugin_dir)) {
+                $_core_plugins_available = true;
+                if ($errors === null) {
+                    echo "$plugin_dir is OK.\n";
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$plugin_dir is OK.\n";
+                }
+            }
+        }
+        if (!$_core_plugins_available) {
+            $status = false;
+            $message = "WARNING: Smarty's own libs/plugins is not available";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } elseif (!isset($errors['plugins_dir'])) {
+                $errors['plugins_dir'] = $message;
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing cache directory...\n";
+        }
+
+
+        // test if all registered cache_dir is accessible
+        $__cache_dir = $smarty->getCacheDir();
+        $_cache_dir = realpath($__cache_dir);
+        if (!$_cache_dir) {
+            $status = false;
+            $message = "FAILED: {$__cache_dir} does not exist";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors['cache_dir'] = $message;
+            }
+        } elseif (!is_dir($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not a directory";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors['cache_dir'] = $message;
+            }
+        } elseif (!is_readable($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not readable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors['cache_dir'] = $message;
+            }
+        } elseif (!is_writable($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not writable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors['cache_dir'] = $message;
+            }
+        } else {
+            if ($errors === null) {
+                echo "{$_cache_dir} is OK.\n";
+            }
+        }
+
+
+        if ($errors === null) {
+            echo "Testing configs directory...\n";
+        }
+
+        // test if all registered config_dir are accessible
+        foreach($smarty->getConfigDir() as $config_dir) {
+            $_config_dir = $config_dir;
+            $config_dir = realpath($config_dir);
+            // resolve include_path or fail existance
+            if (!$config_dir) {
+                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_config_dir)) {
+                    // try PHP include_path
+                    if (($config_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_config_dir)) !== false) {
+                        if ($errors === null) {
+                            echo "$config_dir is OK.\n";
+                        }
+
+                        continue;
+                    } else {
+                        $status = false;
+                        $message = "FAILED: $_config_dir does not exist (and couldn't be found in include_path either)";
+                        if ($errors === null) {
+                            echo $message . ".\n";
+                        } else {
+                            $errors['config_dir'] = $message;
+                        }
+
+                        continue;
+                    }
+                } else {
+                    $status = false;
+                    $message = "FAILED: $_config_dir does not exist";
+                    if ($errors === null) {
+                        echo $message . ".\n";
+                    } else {
+                        $errors['config_dir'] = $message;
+                    }
+
+                    continue;
+                }
+            }
+
+            if (!is_dir($config_dir)) {
+                $status = false;
+                $message = "FAILED: $config_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors['config_dir'] = $message;
+                }
+            } elseif (!is_readable($config_dir)) {
+                $status = false;
+                $message = "FAILED: $config_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors['config_dir'] = $message;
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$config_dir is OK.\n";
+                }
+            }
+        }
+
+
+        if ($errors === null) {
+            echo "Testing sysplugin files...\n";
+        }
+        // test if sysplugins are available
+        $source = SMARTY_SYSPLUGINS_DIR;
+        if (is_dir($source)) {
+            $expected = array(
+                "smarty_cacheresource.php" => true,
+                "smarty_cacheresource_custom.php" => true,
+                "smarty_cacheresource_keyvaluestore.php" => true,
+                "smarty_config_source.php" => true,
+                "smarty_internal_cacheresource_file.php" => true,
+                "smarty_internal_compile_append.php" => true,
+                "smarty_internal_compile_assign.php" => true,
+                "smarty_internal_compile_block.php" => true,
+                "smarty_internal_compile_break.php" => true,
+                "smarty_internal_compile_call.php" => true,
+                "smarty_internal_compile_capture.php" => true,
+                "smarty_internal_compile_config_load.php" => true,
+                "smarty_internal_compile_continue.php" => true,
+                "smarty_internal_compile_debug.php" => true,
+                "smarty_internal_compile_eval.php" => true,
+                "smarty_internal_compile_extends.php" => true,
+                "smarty_internal_compile_for.php" => true,
+                "smarty_internal_compile_foreach.php" => true,
+                "smarty_internal_compile_function.php" => true,
+                "smarty_internal_compile_if.php" => true,
+                "smarty_internal_compile_include.php" => true,
+                "smarty_internal_compile_include_php.php" => true,
+                "smarty_internal_compile_insert.php" => true,
+                "smarty_internal_compile_ldelim.php" => true,
+                "smarty_internal_compile_nocache.php" => true,
+                "smarty_internal_compile_private_block_plugin.php" => true,
+                "smarty_internal_compile_private_function_plugin.php" => true,
+                "smarty_internal_compile_private_modifier.php" => true,
+                "smarty_internal_compile_private_object_block_function.php" => true,
+                "smarty_internal_compile_private_object_function.php" => true,
+                "smarty_internal_compile_private_print_expression.php" => true,
+                "smarty_internal_compile_private_registered_block.php" => true,
+                "smarty_internal_compile_private_registered_function.php" => true,
+                "smarty_internal_compile_private_special_variable.php" => true,
+                "smarty_internal_compile_rdelim.php" => true,
+                "smarty_internal_compile_section.php" => true,
+                "smarty_internal_compile_setfilter.php" => true,
+                "smarty_internal_compile_while.php" => true,
+                "smarty_internal_compilebase.php" => true,
+                "smarty_internal_config.php" => true,
+                "smarty_internal_config_file_compiler.php" => true,
+                "smarty_internal_configfilelexer.php" => true,
+                "smarty_internal_configfileparser.php" => true,
+                "smarty_internal_data.php" => true,
+                "smarty_internal_debug.php" => true,
+                "smarty_internal_filter_handler.php" => true,
+                "smarty_internal_function_call_handler.php" => true,
+                "smarty_internal_get_include_path.php" => true,
+                "smarty_internal_nocache_insert.php" => true,
+                "smarty_internal_parsetree.php" => true,
+                "smarty_internal_resource_eval.php" => true,
+                "smarty_internal_resource_extends.php" => true,
+                "smarty_internal_resource_file.php" => true,
+                "smarty_internal_resource_registered.php" => true,
+                "smarty_internal_resource_stream.php" => true,
+                "smarty_internal_resource_string.php" => true,
+                "smarty_internal_smartytemplatecompiler.php" => true,
+                "smarty_internal_template.php" => true,
+                "smarty_internal_templatebase.php" => true,
+                "smarty_internal_templatecompilerbase.php" => true,
+                "smarty_internal_templatelexer.php" => true,
+                "smarty_internal_templateparser.php" => true,
+                "smarty_internal_utility.php" => true,
+                "smarty_internal_write_file.php" => true,
+                "smarty_resource.php" => true,
+                "smarty_resource_custom.php" => true,
+                "smarty_resource_recompiled.php" => true,
+                "smarty_resource_uncompiled.php" => true,
+                "smarty_security.php" => true,
+            );
+            $iterator = new DirectoryIterator($source);
+            foreach ($iterator as $file) {
+                if (!$file->isDot()) {
+                    $filename = $file->getFilename();
+                    if (isset($expected[$filename])) {
+                        unset($expected[$filename]);
+                    }
+                }
+            }
+            if ($expected) {
+                $status = false;
+                $message = "FAILED: files missing from libs/sysplugins: ". join(', ', array_keys($expected));
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors['sysplugins'] = $message;
+                }
+            } elseif ($errors === null) {
+                echo "... OK\n";
+            }
+        } else {
+            $status = false;
+            $message = "FAILED: ". SMARTY_SYSPLUGINS_DIR .' is not a directory';
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors['sysplugins_dir_constant'] = $message;
+            }
+        }
+
+        if ($errors === null) {
+            echo "Testing plugin files...\n";
+        }
+        // test if core plugins are available
+        $source = SMARTY_PLUGINS_DIR;
+        if (is_dir($source)) {
+            $expected = array(
+                "block.textformat.php" => true,
+                "function.counter.php" => true,
+                "function.cycle.php" => true,
+                "function.fetch.php" => true,
+                "function.html_checkboxes.php" => true,
+                "function.html_image.php" => true,
+                "function.html_options.php" => true,
+                "function.html_radios.php" => true,
+                "function.html_select_date.php" => true,
+                "function.html_select_time.php" => true,
+                "function.html_table.php" => true,
+                "function.mailto.php" => true,
+                "function.math.php" => true,
+                "modifier.capitalize.php" => true,
+                "modifier.date_format.php" => true,
+                "modifier.debug_print_var.php" => true,
+                "modifier.escape.php" => true,
+                "modifier.regex_replace.php" => true,
+                "modifier.replace.php" => true,
+                "modifier.spacify.php" => true,
+                "modifier.truncate.php" => true,
+                "modifiercompiler.cat.php" => true,
+                "modifiercompiler.count_characters.php" => true,
+                "modifiercompiler.count_paragraphs.php" => true,
+                "modifiercompiler.count_sentences.php" => true,
+                "modifiercompiler.count_words.php" => true,
+                "modifiercompiler.default.php" => true,
+                "modifiercompiler.escape.php" => true,
+                "modifiercompiler.from_charset.php" => true,
+                "modifiercompiler.indent.php" => true,
+                "modifiercompiler.lower.php" => true,
+                "modifiercompiler.noprint.php" => true,
+                "modifiercompiler.string_format.php" => true,
+                "modifiercompiler.strip.php" => true,
+                "modifiercompiler.strip_tags.php" => true,
+                "modifiercompiler.to_charset.php" => true,
+                "modifiercompiler.unescape.php" => true,
+                "modifiercompiler.upper.php" => true,
+                "modifiercompiler.wordwrap.php" => true,
+                "outputfilter.trimwhitespace.php" => true,
+                "shared.escape_special_chars.php" => true,
+                "shared.literal_compiler_param.php" => true,
+                "shared.make_timestamp.php" => true,
+                "shared.mb_str_replace.php" => true,
+                "shared.mb_unicode.php" => true,
+                "shared.mb_wordwrap.php" => true,
+                "variablefilter.htmlspecialchars.php" => true,
+            );
+            $iterator = new DirectoryIterator($source);
+            foreach ($iterator as $file) {
+                if (!$file->isDot()) {
+                    $filename = $file->getFilename();
+                    if (isset($expected[$filename])) {
+                        unset($expected[$filename]);
+                    }
+                }
+            }
+            if ($expected) {
+                $status = false;
+                $message = "FAILED: files missing from libs/plugins: ". join(', ', array_keys($expected));
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors['plugins'] = $message;
+                }
+            } elseif ($errors === null) {
+                echo "... OK\n";
+            }
+        } else {
+            $status = false;
+            $message = "FAILED: ". SMARTY_PLUGINS_DIR .' is not a directory';
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors['plugins_dir_constant'] = $message;
+            }
+        }
+
+        if ($errors === null) {
+            echo "Tests complete.\n";
+            echo "</PRE>\n";
+        }
+
+        return $status;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_internal_write_file.php b/lib/smarty/sysplugins/smarty_internal_write_file.php
new file mode 100644
index 0000000..743503b
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_internal_write_file.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Smarty write file plugin
+ *
+ * @package Smarty
+ * @subpackage PluginsInternal
+ * @author Monte Ohrt
+ */
+
+/**
+ * Smarty Internal Write File Class
+ *
+ * @package Smarty
+ * @subpackage PluginsInternal
+ */
+class Smarty_Internal_Write_File {
+
+    /**
+     * Writes file in a safe way to disk
+     *
+     * @param string $_filepath complete filepath
+     * @param string $_contents file content
+     * @param Smarty $smarty    smarty instance
+     * @return boolean true
+     */
+    public static function writeFile($_filepath, $_contents, Smarty $smarty)
+    {
+        $_error_reporting = error_reporting();
+        error_reporting($_error_reporting & ~E_NOTICE & ~E_WARNING);
+        if ($smarty->_file_perms !== null) {
+            $old_umask = umask(0);
+        }
+
+        $_dirpath = dirname($_filepath);
+        // if subdirs, create dir structure
+        if ($_dirpath !== '.' && !file_exists($_dirpath)) {
+            mkdir($_dirpath, $smarty->_dir_perms === null ? 0777 : $smarty->_dir_perms, true);
+        }
+
+        // write to tmp file, then move to overt file lock race condition
+        $_tmp_file = $_dirpath . DS . uniqid('wrt');
+        if (!file_put_contents($_tmp_file, $_contents)) {
+            error_reporting($_error_reporting);
+            throw new SmartyException("unable to write file {$_tmp_file}");
+            return false;
+        }
+
+        // remove original file
+        @unlink($_filepath);
+
+        // rename tmp file
+        $success = rename($_tmp_file, $_filepath);
+        if (!$success) {
+            error_reporting($_error_reporting);
+            throw new SmartyException("unable to write file {$_filepath}");
+            return false;
+        }
+
+        if ($smarty->_file_perms !== null) {
+            // set file permissions
+            chmod($_filepath, $smarty->_file_perms);
+            umask($old_umask);
+        }
+        error_reporting($_error_reporting);
+        return true;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_resource.php b/lib/smarty/sysplugins/smarty_resource.php
new file mode 100644
index 0000000..f8285e6
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_resource.php
@@ -0,0 +1,822 @@
+<?php
+/**
+ * Smarty Resource Plugin
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Rodney Rehm
+ */
+
+/**
+ * Smarty Resource Plugin
+ *
+ * Base implementation for resource plugins
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ */
+abstract class Smarty_Resource {
+    /**
+     * cache for Smarty_Template_Source instances
+     * @var array
+     */
+    public static $sources = array();
+    /**
+     * cache for Smarty_Template_Compiled instances
+     * @var array
+     */
+    public static $compileds = array();
+    /**
+     * cache for Smarty_Resource instances
+     * @var array
+     */
+    public static $resources = array();
+    /**
+     * resource types provided by the core
+     * @var array
+     */
+    protected static $sysplugins = array(
+        'file' => true,
+        'string' => true,
+        'extends' => true,
+        'stream' => true,
+        'eval' => true,
+        'php' => true
+    );
+
+    /**
+     * Name of the Class to compile this resource's contents with
+     * @var string
+     */
+    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
+
+    /**
+     * Name of the Class to tokenize this resource's contents with
+     * @var string
+     */
+    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
+
+    /**
+     * Name of the Class to parse this resource's contents with
+     * @var string
+     */
+    public $template_parser_class = 'Smarty_Internal_Templateparser';
+
+    /**
+     * Load template's source into current template object
+     *
+     * {@internal The loaded source is assigned to $_template->source->content directly.}}
+     *
+     * @param Smarty_Template_Source $source source object
+     * @return string template source
+     * @throws SmartyException if source cannot be loaded
+     */
+    public abstract function getContent(Smarty_Template_Source $source);
+
+    /**
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source source object
+     * @param Smarty_Internal_Template $_template     template object
+     */
+    public abstract function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null);
+
+    /**
+     * populate Source Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Source $source source object
+     */
+    public function populateTimestamp(Smarty_Template_Source $source)
+    {
+        // intentionally left blank
+    }
+
+
+    /**
+     * modify resource_name according to resource handlers specifications
+     *
+     * @param Smarty $smarty        Smarty instance
+     * @param string $resource_name resource_name to make unique
+     * @return string unique resource name
+     */
+    protected function buildUniqueResourceName(Smarty $smarty, $resource_name)
+    {
+        return get_class($this) . '#' . $smarty->joined_template_dir . '#' . $resource_name;
+    }
+
+    /**
+     * populate Compiled Object with compiled filepath
+     *
+     * @param Smarty_Template_Compiled $compiled  compiled object
+     * @param Smarty_Internal_Template $_template template object
+     */
+    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
+    {
+        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
+        $_filepath = $compiled->source->uid;
+        // if use_sub_dirs, break file into directories
+        if ($_template->smarty->use_sub_dirs) {
+            $_filepath = substr($_filepath, 0, 2) . DS
+             . substr($_filepath, 2, 2) . DS
+             . substr($_filepath, 4, 2) . DS
+             . $_filepath;
+        }
+        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
+        if (isset($_compile_id)) {
+            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
+        }
+        // caching token
+        if ($_template->caching) {
+            $_cache = '.cache';
+        } else {
+            $_cache = '';
+        }
+        $_compile_dir = $_template->smarty->getCompileDir();
+        // set basename if not specified
+        $_basename = $this->getBasename($compiled->source);
+        if ($_basename === null) {
+            $_basename = basename( preg_replace('![^\w\/]+!', '_', $compiled->source->name) );
+        }
+        // separate (optional) basename by dot
+        if ($_basename) {
+            $_basename = '.' . $_basename;
+        }
+
+        $compiled->filepath = $_compile_dir . $_filepath . '.' . $compiled->source->type . $_basename . $_cache . '.php';
+    }
+
+    /**
+     * build template filepath by traversing the template_dir array
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     * @return string fully qualified filepath
+     * @throws SmartyException if default template handler is registered but not callable
+     */
+    protected function buildFilepath(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    {
+        $file = $source->name;
+        if ($source instanceof Smarty_Config_Source) {
+            $_directories = $source->smarty->getConfigDir();
+            $_default_handler = $source->smarty->default_config_handler_func;
+        } else {
+            $_directories = $source->smarty->getTemplateDir();
+            $_default_handler = $source->smarty->default_template_handler_func;
+        }
+
+        // go relative to a given template?
+        $_file_is_dotted = $file[0] == '.' && ($file[1] == '.' || $file[1] == '/' || $file[1] == "\\");
+        if ($_template && $_template->parent instanceof Smarty_Internal_Template && $_file_is_dotted) {
+            if ($_template->parent->source->type != 'file' && $_template->parent->source->type != 'extends' && !$_template->parent->allow_relative_path) {
+                throw new SmartyException("Template '{$file}' cannot be relative to template of resource type '{$_template->parent->source->type}'");
+            }
+            $file = dirname($_template->parent->source->filepath) . DS . $file;
+            $_file_exact_match = true;
+            if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
+                // the path gained from the parent template is relative to the current working directory
+                // as expansions (like include_path) have already been done
+                $file = getcwd() . DS . $file;
+            }
+        }
+
+        // resolve relative path
+        if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
+            $_was_relative_prefix = $file[0] == '.' ? substr($file, 0, strpos($file, '|')) : null;
+            $_path = DS . trim($file, '/\\');
+            $_was_relative = true;
+        } else {
+            $_path = $file;
+        }
+        // don't we all just love windows?
+        $_path = str_replace('\\', '/', $_path);
+        // resolve simples
+        $_path = preg_replace('#(/\./(\./)*)|/{2,}#', '/', $_path);
+        // resolve parents
+        while (true) {
+            $_parent = strpos($_path, '/../');
+            if ($_parent === false) {
+                break;
+            } else if ($_parent === 0) {
+                $_path = substr($_path, 3);
+                break;
+            }
+            $_pos = strrpos($_path, '/', $_parent - strlen($_path) - 1);
+            if ($_pos === false) {
+                // don't we all just love windows?
+                $_pos = $_parent;
+            }
+            $_path = substr_replace($_path, '', $_pos, $_parent + 3 - $_pos);
+        }
+        if (DS != '/') {
+            // don't we all just love windows?
+            $_path = str_replace('/', '\\', $_path);
+        }
+        // revert to relative
+        if (isset($_was_relative)) {
+            if (isset($_was_relative_prefix)){
+                $_path = $_was_relative_prefix . $_path;
+            } else {
+                $_path = substr($_path, 1);
+            }
+        }
+
+        // this is only required for directories
+        $file = rtrim($_path, '/\\');
+
+        // files relative to a template only get one shot
+        if (isset($_file_exact_match)) {
+            return $this->fileExists($source, $file) ? $file : false;
+        }
+
+        // template_dir index?
+        if (preg_match('#^\[(?P<key>[^\]]+)\](?P<file>.+)$#', $file, $match)) {
+            $_directory = null;
+            // try string indexes
+            if (isset($_directories[$match['key']])) {
+                $_directory = $_directories[$match['key']];
+            } else if (is_numeric($match['key'])) {
+                // try numeric index
+                $match['key'] = (int) $match['key'];
+                if (isset($_directories[$match['key']])) {
+                    $_directory = $_directories[$match['key']];
+                } else {
+                    // try at location index
+                    $keys = array_keys($_directories);
+                    $_directory = $_directories[$keys[$match['key']]];
+                }
+            }
+
+            if ($_directory) {
+                $_file = substr($file, strpos($file, ']') + 1);
+                $_filepath = $_directory . $_file;
+                if ($this->fileExists($source, $_filepath)) {
+                    return $_filepath;
+                }
+            }
+        }
+
+        // relative file name?
+        if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
+            foreach ($_directories as $_directory) {
+                $_filepath = $_directory . $file;
+                if ($this->fileExists($source, $_filepath)) {
+                    return $_filepath;
+                }
+                if ($source->smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_directory)) {
+                    // try PHP include_path
+                    if (($_filepath = Smarty_Internal_Get_Include_Path::getIncludePath($_filepath)) !== false) {
+                        if ($this->fileExists($source, $_filepath)) {
+                            return $_filepath;
+                        }
+                    }
+                }
+            }
+        }
+
+        // try absolute filepath
+        if ($this->fileExists($source, $file)) {
+            return $file;
+        }
+
+        // no tpl file found
+        if ($_default_handler) {
+            if (!is_callable($_default_handler)) {
+                if ($source instanceof Smarty_Config_Source) {
+                    throw new SmartyException("Default config handler not callable");
+                } else {
+                    throw new SmartyException("Default template handler not callable");
+                }
+            }
+            $_return = call_user_func_array($_default_handler,
+                array($source->type, $source->name, &$_content, &$_timestamp, $source->smarty));
+            if (is_string($_return)) {
+                $source->timestamp = @filemtime($_return);
+                $source->exists = !!$source->timestamp;
+                return $_return;
+            } elseif ($_return === true) {
+                $source->content = $_content;
+                $source->timestamp = $_timestamp;
+                $source->exists = true;
+                return $_filepath;
+            }
+        }
+
+        // give up
+        return false;
+    }
+
+    /**
+     * test is file exists and save timestamp
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param string $file file name
+     * @return bool  true if file exists
+     */
+    protected function fileExists(Smarty_Template_Source $source, $file)
+    {
+        $source->timestamp = @filemtime($file);
+        return $source->exists = !!$source->timestamp;
+
+    }
+
+    /**
+     * Determine basename for compiled filename
+     *
+     * @param Smarty_Template_Source $source source object
+     * @return string resource's basename
+     */
+    protected function getBasename(Smarty_Template_Source $source)
+    {
+        return null;
+    }
+
+    /**
+     * Load Resource Handler
+     *
+     * @param Smarty $smarty    smarty object
+     * @param string $type      name of the resource
+     * @return Smarty_Resource Resource Handler
+     */
+    public static function load(Smarty $smarty, $type)
+    {
+        // try smarty's cache
+        if (isset($smarty->_resource_handlers[$type])) {
+            return $smarty->_resource_handlers[$type];
+        }
+
+        // try registered resource
+        if (isset($smarty->registered_resources[$type])) {
+            if ($smarty->registered_resources[$type] instanceof Smarty_Resource) {
+                $smarty->_resource_handlers[$type] = $smarty->registered_resources[$type];
+                // note registered to smarty is not kept unique!
+                return $smarty->_resource_handlers[$type];
+            }
+
+            if (!isset(self::$resources['registered'])) {
+                self::$resources['registered'] = new Smarty_Internal_Resource_Registered();
+            }
+            if (!isset($smarty->_resource_handlers[$type])) {
+                $smarty->_resource_handlers[$type] = self::$resources['registered'];
+            }
+
+            return $smarty->_resource_handlers[$type];
+        }
+
+        // try sysplugins dir
+        if (isset(self::$sysplugins[$type])) {
+            if (!isset(self::$resources[$type])) {
+                $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type);
+                self::$resources[$type] = new $_resource_class();
+            }
+            return $smarty->_resource_handlers[$type] = self::$resources[$type];
+        }
+
+        // try plugins dir
+        $_resource_class = 'Smarty_Resource_' . ucfirst($type);
+        if ($smarty->loadPlugin($_resource_class)) {
+            if (isset(self::$resources[$type])) {
+                return $smarty->_resource_handlers[$type] = self::$resources[$type];
+            }
+
+            if (class_exists($_resource_class, false)) {
+                self::$resources[$type] = new $_resource_class();
+                return $smarty->_resource_handlers[$type] = self::$resources[$type];
+            } else {
+                $smarty->registerResource($type, array(
+                    "smarty_resource_{$type}_source",
+                    "smarty_resource_{$type}_timestamp",
+                    "smarty_resource_{$type}_secure",
+                    "smarty_resource_{$type}_trusted"
+                ));
+
+                // give it another try, now that the resource is registered properly
+                return self::load($smarty, $type);
+            }
+        }
+
+        // try streams
+        $_known_stream = stream_get_wrappers();
+        if (in_array($type, $_known_stream)) {
+            // is known stream
+            if (is_object($smarty->security_policy)) {
+                $smarty->security_policy->isTrustedStream($type);
+            }
+            if (!isset(self::$resources['stream'])) {
+                self::$resources['stream'] = new Smarty_Internal_Resource_Stream();
+            }
+            return $smarty->_resource_handlers[$type] = self::$resources['stream'];
+        }
+
+        // TODO: try default_(template|config)_handler
+
+        // give up
+        throw new SmartyException("Unkown resource type '{$type}'");
+    }
+
+    /**
+     * extract resource_type and resource_name from template_resource and config_resource
+     *
+     * @note "C:/foo.tpl" was forced to file resource up till Smarty 3.1.3 (including).
+     * @param string  $resource_name    template_resource or config_resource to parse
+     * @param string  $default_resource the default resource_type defined in $smarty
+     * @param string &$name             the parsed resource name
+     * @param string &$type             the parsed resource type
+     * @return void
+     */
+    protected static function parseResourceName($resource_name, $default_resource, &$name, &$type)
+    {
+        $parts = explode(':', $resource_name, 2);
+        if (!isset($parts[1]) || !isset($parts[0][1])) {
+            // no resource given, use default
+            // or single character before the colon is not a resource type, but part of the filepath
+            $type = $default_resource;
+            $name = $resource_name;
+        } else {
+            $type = $parts[0];
+            $name = $parts[1];
+        }
+    }
+
+
+    /**
+     * modify resource_name according to resource handlers specifications
+     *
+     * @param Smarty $smarty        Smarty instance
+     * @param string $resource_name resource_name to make unique
+     * @return string unique resource name
+     */
+
+    /**
+     * modify template_resource according to resource handlers specifications
+     *
+     * @param string $smarty            Smarty instance
+     * @param string $template_resource template_resource to extracate resource handler and name of
+     * @return string unique resource name
+     */
+    public static function getUniqueTemplateName($smarty, $template_resource)
+    {
+        self::parseResourceName($template_resource, $smarty->default_resource_type, $name, $type);
+        // TODO: optimize for Smarty's internal resource types
+        $resource = Smarty_Resource::load($smarty, $type);
+        return $resource->buildUniqueResourceName($smarty, $name);
+    }
+
+    /**
+     * initialize Source Object for given resource
+     *
+     * Either [$_template] or [$smarty, $template_resource] must be specified
+     *
+     * @param Smarty_Internal_Template $_template         template object
+     * @param Smarty                   $smarty            smarty object
+     * @param string                   $template_resource resource identifier
+     * @return Smarty_Template_Source Source Object
+     */
+    public static function source(Smarty_Internal_Template $_template=null, Smarty $smarty=null, $template_resource=null)
+    {
+        if ($_template) {
+            $smarty = $_template->smarty;
+            $template_resource = $_template->template_resource;
+        }
+
+        // parse resource_name, load resource handler, identify unique resource name
+        self::parseResourceName($template_resource, $smarty->default_resource_type, $name, $type);
+        $resource = Smarty_Resource::load($smarty, $type);
+        $unique_resource_name = $resource->buildUniqueResourceName($smarty, $name);
+
+        // check runtime cache
+        $_cache_key = 'template|' . $unique_resource_name;
+        if (isset(self::$sources[$_cache_key])) {
+            return self::$sources[$_cache_key];
+        }
+
+        // create source
+        $source = new Smarty_Template_Source($resource, $smarty, $template_resource, $type, $name, $unique_resource_name);
+        $resource->populate($source, $_template);
+
+        // runtime cache
+        self::$sources[$_cache_key] = $source;
+        return $source;
+    }
+
+    /**
+     * initialize Config Source Object for given resource
+     *
+     * @param Smarty_Internal_Config $_config config object
+     * @return Smarty_Config_Source Source Object
+     */
+    public static function config(Smarty_Internal_Config $_config)
+    {
+        static $_incompatible_resources = array('eval' => true, 'string' => true, 'extends' => true, 'php' => true);
+        $config_resource = $_config->config_resource;
+        $smarty = $_config->smarty;
+
+        // parse resource_name
+        self::parseResourceName($config_resource, $smarty->default_config_type, $name, $type);
+
+        // make sure configs are not loaded via anything smarty can't handle
+        if (isset($_incompatible_resources[$type])) {
+            throw new SmartyException ("Unable to use resource '{$type}' for config");
+        }
+
+        // load resource handler, identify unique resource name
+        $resource = Smarty_Resource::load($smarty, $type);
+        $unique_resource_name = $resource->buildUniqueResourceName($smarty, $name);
+
+        // check runtime cache
+        $_cache_key = 'config|' . $unique_resource_name;
+        if (isset(self::$sources[$_cache_key])) {
+            return self::$sources[$_cache_key];
+        }
+
+        // create source
+        $source = new Smarty_Config_Source($resource, $smarty, $config_resource, $type, $name, $unique_resource_name);
+        $resource->populate($source, null);
+
+        // runtime cache
+        self::$sources[$_cache_key] = $source;
+        return $source;
+    }
+
+}
+
+/**
+ * Smarty Resource Data Object
+ *
+ * Meta Data Container for Template Files
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Rodney Rehm
+ *
+ * @property integer $timestamp Source Timestamp
+ * @property boolean $exists    Source Existance
+ * @property boolean $template  Extended Template reference
+ * @property string  $content   Source Content
+ */
+class Smarty_Template_Source {
+
+    /**
+     * Name of the Class to compile this resource's contents with
+     * @var string
+     */
+    public $compiler_class = null;
+
+    /**
+     * Name of the Class to tokenize this resource's contents with
+     * @var string
+     */
+    public $template_lexer_class = null;
+
+    /**
+     * Name of the Class to parse this resource's contents with
+     * @var string
+     */
+    public $template_parser_class = null;
+
+    /**
+     * Unique Template ID
+     * @var string
+     */
+    public $uid = null;
+
+    /**
+     * Template Resource (Smarty_Internal_Template::$template_resource)
+     * @var string
+     */
+    public $resource = null;
+
+    /**
+     * Resource Type
+     * @var string
+     */
+    public $type = null;
+
+    /**
+     * Resource Name
+     * @var string
+     */
+    public $name = null;
+
+    /**
+     * Unique Resource Name
+     * @var string
+     */
+    public $unique_resource = null;
+
+    /**
+     * Source Filepath
+     * @var string
+     */
+    public $filepath = null;
+
+    /**
+     * Source is bypassing compiler
+     * @var boolean
+     */
+    public $uncompiled = null;
+
+    /**
+     * Source must be recompiled on every occasion
+     * @var boolean
+     */
+    public $recompiled = null;
+
+    /**
+     * The Components an extended template is made of
+     * @var array
+     */
+    public $components = null;
+
+    /**
+     * Resource Handler
+     * @var Smarty_Resource
+     */
+    public $handler = null;
+
+    /**
+     * Smarty instance
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * create Source Object container
+     *
+     * @param Smarty_Resource $handler          Resource Handler this source object communicates with
+     * @param Smarty          $smarty           Smarty instance this source object belongs to
+     * @param string          $resource         full template_resource
+     * @param string          $type             type of resource
+     * @param string          $name             resource name
+     * @param string          $unique_resource  unqiue resource name
+     */
+    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name, $unique_resource)
+    {
+        $this->handler = $handler; // Note: prone to circular references
+
+        $this->compiler_class = $handler->compiler_class;
+        $this->template_lexer_class = $handler->template_lexer_class;
+        $this->template_parser_class = $handler->template_parser_class;
+        $this->uncompiled = $this->handler instanceof Smarty_Resource_Uncompiled;
+        $this->recompiled = $this->handler instanceof Smarty_Resource_Recompiled;
+
+        $this->smarty = $smarty;
+        $this->resource = $resource;
+        $this->type = $type;
+        $this->name = $name;
+        $this->unique_resource = $unique_resource;
+    }
+
+    /**
+     * get a Compiled Object of this source
+     *
+     * @param Smarty_Internal_Template $_template template objet
+     * @return Smarty_Template_Compiled compiled object
+     */
+    public function getCompiled(Smarty_Internal_Template $_template)
+    {
+        // check runtime cache
+        $_cache_key = $this->unique_resource . '#' . $_template->compile_id;
+        if (isset(Smarty_Resource::$compileds[$_cache_key])) {
+            return Smarty_Resource::$compileds[$_cache_key];
+        }
+
+        $compiled = new Smarty_Template_Compiled($this);
+        $this->handler->populateCompiledFilepath($compiled, $_template);
+        $compiled->timestamp = @filemtime($compiled->filepath);
+        $compiled->exists = !!$compiled->timestamp;
+
+        // runtime cache
+        Smarty_Resource::$compileds[$_cache_key] = $compiled;
+
+        return $compiled;
+    }
+
+    /**
+     * render the uncompiled source
+     *
+     * @param Smarty_Internal_Template $_template template object
+     */
+    public function renderUncompiled(Smarty_Internal_Template $_template)
+    {
+        return $this->handler->renderUncompiled($this, $_template);
+    }
+
+    /**
+     * <<magic>> Generic Setter.
+     *
+     * @param string $property_name valid: timestamp, exists, content, template
+     * @param mixed  $value        new value (is not checked)
+     * @throws SmartyException if $property_name is not valid
+     */
+    public function __set($property_name, $value)
+    {
+        switch ($property_name) {
+            // regular attributes
+            case 'timestamp':
+            case 'exists':
+            case 'content':
+            // required for extends: only
+            case 'template':
+                $this->$property_name = $value;
+                break;
+
+            default:
+                throw new SmartyException("invalid source property '$property_name'.");
+        }
+    }
+
+    /**
+     * <<magic>> Generic getter.
+     *
+     * @param string $property_name valid: timestamp, exists, content
+     * @return mixed
+     * @throws SmartyException if $property_name is not valid
+     */
+    public function __get($property_name)
+    {
+        switch ($property_name) {
+            case 'timestamp':
+            case 'exists':
+                $this->handler->populateTimestamp($this);
+                return $this->$property_name;
+
+            case 'content':
+                return $this->content = $this->handler->getContent($this);
+
+            default:
+                throw new SmartyException("source property '$property_name' does not exist.");
+        }
+    }
+
+}
+
+/**
+ * Smarty Resource Data Object
+ *
+ * Meta Data Container for Template Files
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Rodney Rehm
+ *
+ * @property string $content compiled content
+ */
+class Smarty_Template_Compiled {
+
+    /**
+     * Compiled Filepath
+     * @var string
+     */
+    public $filepath = null;
+
+    /**
+     * Compiled Timestamp
+     * @var integer
+     */
+    public $timestamp = null;
+
+    /**
+     * Compiled Existance
+     * @var boolean
+     */
+    public $exists = false;
+
+    /**
+     * Compiled Content Loaded
+     * @var boolean
+     */
+    public $loaded = false;
+
+    /**
+     * Template was compiled
+     * @var boolean
+     */
+    public $isCompiled = false;
+
+    /**
+     * Source Object
+     * @var Smarty_Template_Source
+     */
+    public $source = null;
+
+    /**
+     * Metadata properties
+     *
+     * populated by Smarty_Internal_Template::decodeProperties()
+     * @var array
+     */
+    public $_properties = null;
+
+    /**
+     * create Compiled Object container
+     *
+     * @param Smarty_Template_Source $source source object this compiled object belongs to
+     */
+    public function __construct(Smarty_Template_Source $source)
+    {
+        $this->source = $source;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_resource_custom.php b/lib/smarty/sysplugins/smarty_resource_custom.php
new file mode 100644
index 0000000..9ec1f35
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_resource_custom.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Smarty Resource Plugin
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Rodney Rehm
+ */
+
+/**
+ * Smarty Resource Plugin
+ *
+ * Wrapper Implementation for custom resource plugins
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ */
+abstract class Smarty_Resource_Custom extends Smarty_Resource {
+
+    /**
+     * fetch template and its modification time from data source
+     *
+     * @param string  $name    template name
+     * @param string  &$source template source
+     * @param integer &$mtime  template modification timestamp (epoch)
+     */
+    protected abstract function fetch($name, &$source, &$mtime);
+
+    /**
+     * Fetch template's modification timestamp from data source
+     *
+     * {@internal implementing this method is optional.
+     *  Only implement it if modification times can be accessed faster than loading the complete template source.}}
+     *
+     * @param string $name template name
+     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
+     */
+    protected function fetchTimestamp($name)
+    {
+        return null;
+    }
+
+    /**
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
+    {
+        $source->filepath = strtolower($source->type . ':' . $source->name);
+        $source->uid = sha1($source->type . ':' . $source->name);
+
+        $mtime = $this->fetchTimestamp($source->name);
+        if ($mtime !== null) {
+            $source->timestamp = $mtime;
+        } else {
+            $this->fetch($source->name, $content, $timestamp);
+            $source->timestamp = isset($timestamp) ? $timestamp : false;
+            if( isset($content) )
+                $source->content = $content;
+        }
+        $source->exists = !!$source->timestamp;
+    }
+
+    /**
+     * Load template's source into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     * @return string template source
+     * @throws SmartyException if source cannot be loaded
+     */
+    public function getContent(Smarty_Template_Source $source)
+    {
+        $this->fetch($source->name, $content, $timestamp);
+        if (isset($content)) {
+            return $content;
+        }
+
+        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
+    }
+
+    /**
+     * Determine basename for compiled filename
+     *
+     * @param Smarty_Template_Source $source source object
+     * @return string resource's basename
+     */
+    protected function getBasename(Smarty_Template_Source $source)
+    {
+        return basename($source->name);
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_resource_recompiled.php b/lib/smarty/sysplugins/smarty_resource_recompiled.php
new file mode 100644
index 0000000..ab55b93
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_resource_recompiled.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Smarty Resource Plugin
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Rodney Rehm
+ */
+
+/**
+ * Smarty Resource Plugin
+ *
+ * Base implementation for resource plugins that don't compile cache
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ */
+abstract class Smarty_Resource_Recompiled extends Smarty_Resource {
+
+    /**
+     * populate Compiled Object with compiled filepath
+     *
+     * @param Smarty_Template_Compiled $compiled compiled object
+     * @param Smarty_Internal_Template $_template template object
+     * @return void
+     */
+    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
+    {
+        $compiled->filepath = false;
+        $compiled->timestamp = false;
+        $compiled->exists = false;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_resource_uncompiled.php b/lib/smarty/sysplugins/smarty_resource_uncompiled.php
new file mode 100644
index 0000000..ea80235
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_resource_uncompiled.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Smarty Resource Plugin
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ * @author Rodney Rehm
+ */
+
+/**
+ * Smarty Resource Plugin
+ *
+ * Base implementation for resource plugins that don't use the compiler
+ *
+ * @package Smarty
+ * @subpackage TemplateResources
+ */
+abstract class Smarty_Resource_Uncompiled extends Smarty_Resource {
+
+    /**
+     * Render and output the template (without using the compiler)
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     * @throws SmartyException on failure
+     */
+    public abstract function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template);
+
+    /**
+     * populate compiled object with compiled filepath
+     *
+     * @param Smarty_Template_Compiled $compiled  compiled object
+     * @param Smarty_Internal_Template $_template template object (is ignored)
+     */
+    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
+    {
+        $compiled->filepath = false;
+        $compiled->timestamp = false;
+        $compiled->exists = false;
+    }
+
+}
+
+?>
+\ No newline at end of file
diff --git a/lib/smarty/sysplugins/smarty_security.php b/lib/smarty/sysplugins/smarty_security.php
new file mode 100644
index 0000000..90b0e3e
--- /dev/null
+++ b/lib/smarty/sysplugins/smarty_security.php
@@ -0,0 +1,459 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package Smarty
+ * @subpackage Security
+ * @author Uwe Tews
+ */
+ 
+/*
+ * FIXME: Smarty_Security API
+ *      - getter and setter instead of public properties would allow cultivating an internal cache properly
+ *      - current implementation of isTrustedResourceDir() assumes that Smarty::$template_dir and Smarty::$config_dir are immutable
+ *        the cache is killed every time either of the variables change. That means that two distinct Smarty objects with differing
+ *        $template_dir or $config_dir should NOT share the same Smarty_Security instance, 
+ *        as this would lead to (severe) performance penalty! how should this be handled? 
+ */
+
+/**
+ * This class does contain the security settings
+ */
+class Smarty_Security {
+
+    /**
+     * This determines how Smarty handles "<?php ... ?>" tags in templates.
+     * possible values:
+     * <ul>
+     *   <li>Smarty::PHP_PASSTHRU -> echo PHP tags as they are</li>
+     *   <li>Smarty::PHP_QUOTE    -> escape tags as entities</li>
+     *   <li>Smarty::PHP_REMOVE   -> remove php tags</li>
+     *   <li>Smarty::PHP_ALLOW    -> execute php tags</li>
+     * </ul>
+     *
+     * @var integer
+     */
+    public $php_handling = Smarty::PHP_PASSTHRU;
+    /**
+     * This is the list of template directories that are considered secure.
+     * $template_dir is in this list implicitly.
+     *
+     * @var array
+     */
+    public $secure_dir = array();
+    /**
+     * This is an array of directories where trusted php scripts reside.
+     * {@link $security} is disabled during their inclusion/execution.
+     *
+     * @var array
+     */
+    public $trusted_dir = array();
+    /**
+     * List of regular expressions (PCRE) that include trusted URIs
+     *
+     * @var array
+     */
+    public $trusted_uri = array();
+    /**
+     * This is an array of trusted static classes.
+     *
+     * If empty access to all static classes is allowed.
+     * If set to 'none' none is allowed.
+     * @var array
+     */
+    public $static_classes = array();
+    /**
+     * This is an array of trusted PHP functions.
+     *
+     * If empty all functions are allowed.
+     * To disable all PHP functions set $php_functions = null.
+     * @var array
+     */
+    public $php_functions = array(
+        'isset', 'empty',
+        'count', 'sizeof',
+        'in_array', 'is_array',
+        'time',
+        'nl2br',
+    );
+    /**
+     * This is an array of trusted PHP modifers.
+     *
+     * If empty all modifiers are allowed.
+     * To disable all modifier set $modifiers = null.
+     * @var array
+     */
+    public $php_modifiers = array(
+        'escape',
+        'count'
+    );
+    /**
+     * This is an array of allowed tags.
+     *
+     * If empty no restriction by allowed_tags.
+     * @var array
+     */
+    public $allowed_tags = array();
+    /**
+     * This is an array of disabled tags.
+     *
+     * If empty no restriction by disabled_tags.
+     * @var array
+     */
+    public $disabled_tags = array();
+    /**
+     * This is an array of allowed modifier plugins.
+     *
+     * If empty no restriction by allowed_modifiers.
+     * @var array
+     */
+    public $allowed_modifiers = array();
+    /**
+     * This is an array of disabled modifier plugins.
+     *
+     * If empty no restriction by disabled_modifiers.
+     * @var array
+     */
+    public $disabled_modifiers = array();
+    /**
+     * This is an array of trusted streams.
+     *
+     * If empty all streams are allowed.
+     * To disable all streams set $streams = null.
+     * @var array
+     */
+    public $streams = array('file');
+    /**
+     * + flag if constants can be accessed from template
+     * @var boolean
+     */
+    public $allow_constants = true;
+    /**
+     * + flag if super globals can be accessed from template
+     * @var boolean
+     */
+    public $allow_super_globals = true;
+
+    /**
+     * Cache for $resource_dir lookups
+     * @var array
+     */
+    protected $_resource_dir = null;
+    /**
+     * Cache for $template_dir lookups
+     * @var array
+     */
+    protected $_template_dir = null;
+    /**
+     * Cache for $config_dir lookups
+     * @var array
+     */
+    protected $_config_dir = null;
+    /**
+     * Cache for $secure_dir lookups
+     * @var array
+     */
+    protected $_secure_dir = null;
+    /**
+     * Cache for $php_resource_dir lookups
+     * @var array
+     */
+    protected $_php_resource_dir = null;
+    /**
+     * Cache for $trusted_dir lookups
+     * @var array
+     */
+    protected $_trusted_dir = null;
+    
+    
+    /**
+     * @param Smarty $smarty
+     */
+    public function __construct($smarty)
+    {
+        $this->smarty = $smarty;
+    }
+    
+    /**
+     * Check if PHP function is trusted.
+     *
+     * @param string $function_name
+     * @param object $compiler compiler object
+     * @return boolean true if function is trusted
+     * @throws SmartyCompilerException if php function is not trusted
+     */
+    public function isTrustedPhpFunction($function_name, $compiler)
+    {
+        if (isset($this->php_functions) && (empty($this->php_functions) || in_array($function_name, $this->php_functions))) {
+            return true;
+        }
+
+        $compiler->trigger_template_error("PHP function '{$function_name}' not allowed by security setting");
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if static class is trusted.
+     *
+     * @param string $class_name
+     * @param object $compiler compiler object
+     * @return boolean true if class is trusted
+     * @throws SmartyCompilerException if static class is not trusted
+     */
+    public function isTrustedStaticClass($class_name, $compiler)
+    {
+        if (isset($this->static_classes) && (empty($this->static_classes) || in_array($class_name, $this->static_classes))) {
+            return true;
+        }
+
+        $compiler->trigger_template_error("access to static class '{$class_name}' not allowed by security setting");
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if PHP modifier is trusted.
+     *
+     * @param string $modifier_name
+     * @param object $compiler compiler object
+     * @return boolean true if modifier is trusted
+     * @throws SmartyCompilerException if modifier is not trusted
+     */
+    public function isTrustedPhpModifier($modifier_name, $compiler)
+    {
+        if (isset($this->php_modifiers) && (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))) {
+            return true;
+        }
+
+        $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting");
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if tag is trusted.
+     *
+     * @param string $tag_name
+     * @param object $compiler compiler object
+     * @return boolean true if tag is trusted
+     * @throws SmartyCompilerException if modifier is not trusted
+     */
+    public function isTrustedTag($tag_name, $compiler)
+    {
+        // check for internal always required tags
+        if (in_array($tag_name, array('assign', 'call', 'private_filter', 'private_block_plugin', 'private_function_plugin', 'private_object_block_function',
+                    'private_object_function', 'private_registered_function', 'private_registered_block', 'private_special_variable', 'private_print_expression', 'private_modifier'))) {
+            return true;
+        }
+        // check security settings
+        if (empty($this->allowed_tags)) {
+            if (empty($this->disabled_tags) || !in_array($tag_name, $this->disabled_tags)) {
+                return true;
+            } else {
+                $compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", $compiler->lex->taglineno);
+            }
+        } else if (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) {
+            return true;
+        } else {
+            $compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", $compiler->lex->taglineno);
+        }
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if modifier plugin is trusted.
+     *
+     * @param string $modifier_name
+     * @param object $compiler compiler object
+     * @return boolean true if tag is trusted
+     * @throws SmartyCompilerException if modifier is not trusted
+     */
+    public function isTrustedModifier($modifier_name, $compiler)
+    {
+        // check for internal always allowed modifier
+        if (in_array($modifier_name, array('default'))) {
+            return true;
+        }
+        // check security settings
+        if (empty($this->allowed_modifiers)) {
+            if (empty($this->disabled_modifiers) || !in_array($modifier_name, $this->disabled_modifiers)) {
+                return true;
+            } else {
+                $compiler->trigger_template_error("modifier '{$modifier_name}' disabled by security setting", $compiler->lex->taglineno);
+            }
+        } else if (in_array($modifier_name, $this->allowed_modifiers) && !in_array($modifier_name, $this->disabled_modifiers)) {
+            return true;
+        } else {
+            $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting", $compiler->lex->taglineno);
+        }
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if stream is trusted.
+     *
+     * @param string $stream_name
+     * @return boolean true if stream is trusted
+     * @throws SmartyException if stream is not trusted
+     */
+    public function isTrustedStream($stream_name)
+    {
+        if (isset($this->streams) && (empty($this->streams) || in_array($stream_name, $this->streams))) {
+            return true;
+        }
+
+        throw new SmartyException("stream '{$stream_name}' not allowed by security setting");
+    }
+
+    /**
+     * Check if directory of file resource is trusted.
+     *
+     * @param string $filepath
+     * @return boolean true if directory is trusted
+     * @throws SmartyException if directory is not trusted
+     */
+    public function isTrustedResourceDir($filepath)
+    {
+        $_template = false;
+        $_config = false;
+        $_secure = false;
+
+        $_template_dir = $this->smarty->getTemplateDir();
+        $_config_dir = $this->smarty->getConfigDir();
+
+        // check if index is outdated
+        if ((!$this->_template_dir || $this->_template_dir !== $_template_dir)
+                || (!$this->_config_dir || $this->_config_dir !== $_config_dir)
+                || (!empty($this->secure_dir) && (!$this->_secure_dir || $this->_secure_dir !== $this->secure_dir))
+        ) {
+            $this->_resource_dir = array();
+            $_template = true;
+            $_config = true;
+            $_secure = !empty($this->secure_dir);
+        }
+
+        // rebuild template dir index
+        if ($_template) {
+            $this->_template_dir = $_template_dir;
+            foreach ($_template_dir as $directory) {
+                $directory = realpath($directory);
+                $this->_resource_dir[$directory] = true;
+            }
+        }
+
+        // rebuild config dir index
+        if ($_config) {
+            $this->_config_dir = $_config_dir;
+            foreach ($_config_dir as $directory) {
+                $directory = realpath($directory);
+                $this->_resource_dir[$directory] = true;
+            }
+        }
+
+        // rebuild secure dir index
+        if ($_secure) {
+            $this->_secure_dir = $this->secure_dir;
+            foreach ((array) $this->secure_dir as $directory) {
+                $directory = realpath($directory);
+                $this->_resource_dir[$directory] = true;
+            }
+        }
+
+        $_filepath = realpath($filepath);
+        $directory = dirname($_filepath);
+        $_directory = array();
+        while (true) {
+            // remember the directory to add it to _resource_dir in case we're successful
+            $_directory[] = $directory;
+            // test if the directory is trusted
+            if (isset($this->_resource_dir[$directory])) {
+                // merge sub directories of current $directory into _resource_dir to speed up subsequent lookups
+                $this->_resource_dir = array_merge($this->_resource_dir, $_directory);
+                return true;
+            }
+            // abort if we've reached root
+            if (($pos = strrpos($directory, DS)) === false || !isset($directory[1])) {
+                break;
+            }
+            // bubble up one level
+            $directory = substr($directory, 0, $pos);
+        }
+
+        // give up
+        throw new SmartyException("directory '{$_filepath}' not allowed by security setting");
+    }
+    
+    /**
+     * Check if URI (e.g. {fetch} or {html_image}) is trusted
+     *
+     * To simplify things, isTrustedUri() resolves all input to "{$PROTOCOL}://{$HOSTNAME}".
+     * So "http://username:password@hello.world.example.org:8080/some-path?some=query-string"
+     * is reduced to "http://hello.world.example.org" prior to applying the patters from {@link $trusted_uri}.
+     * @param string $uri 
+     * @return boolean true if URI is trusted
+     * @throws SmartyException if URI is not trusted
+     * @uses $trusted_uri for list of patterns to match against $uri
+     */
+    public function isTrustedUri($uri)
+    {
+        $_uri = parse_url($uri);
+        if (!empty($_uri['scheme']) && !empty($_uri['host'])) {
+            $_uri = $_uri['scheme'] . '://' . $_uri['host'];
+            foreach ($this->trusted_uri as $pattern) {
+                if (preg_match($pattern, $_uri)) {
+                    return true;
+                }
+            }
+        }
+        
+        throw new SmartyException("URI '{$uri}' not allowed by security setting");
+    }
+    
+    /**
+     * Check if directory of file resource is trusted.
+     *
+     * @param string $filepath
+     * @return boolean true if directory is trusted
+     * @throws SmartyException if PHP directory is not trusted
+     */
+    public function isTrustedPHPDir($filepath)
+    {
+        if (empty($this->trusted_dir)) {
+            throw new SmartyException("directory '{$filepath}' not allowed by security setting (no trusted_dir specified)");
+        }
+
+        // check if index is outdated
+        if (!$this->_trusted_dir || $this->_trusted_dir !== $this->trusted_dir) {
+            $this->_php_resource_dir = array();
+
+            $this->_trusted_dir = $this->trusted_dir;
+            foreach ((array) $this->trusted_dir as $directory) {
+                $directory = realpath($directory);
+                $this->_php_resource_dir[$directory] = true;
+            }
+        }
+
+        $_filepath = realpath($filepath);
+        $directory = dirname($_filepath);
+        $_directory = array();
+        while (true) {
+            // remember the directory to add it to _resource_dir in case we're successful
+            $_directory[] = $directory;
+            // test if the directory is trusted
+            if (isset($this->_php_resource_dir[$directory])) {
+                // merge sub directories of current $directory into _resource_dir to speed up subsequent lookups
+                $this->_php_resource_dir = array_merge($this->_php_resource_dir, $_directory);
+                return true;
+            }
+            // abort if we've reached root
+            if (($pos = strrpos($directory, DS)) === false || !isset($directory[2])) {
+                break;
+            }
+            // bubble up one level
+            $directory = substr($directory, 0, $pos);
+        }
+
+        throw new SmartyException("directory '{$_filepath}' not allowed by security setting");
+    }
+
+}
+
+?>
+\ No newline at end of file
author	emkael <emkael@tlen.pl>	2016-10-11 14:01:29 +0200
committer	emkael <emkael@tlen.pl>	2016-10-11 14:01:29 +0200
commit	51609351f2c4b5082b7e6f0744cd3811c325303f (patch)
tree	739015e9ec69bc185ebe30db21369ae0b8b692ce /lib
parent	8d1b0dad63e3906efa9393ef01d08b77d83417b5 (diff)