From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Sat, 1 May 2010 17:48:30 +0000 (+0000)
Subject: Updated smarty to 3.0rc1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a7778a7d839e8bee003e6d3d63fbb142c688c38f;p=gosa.git

Updated smarty to 3.0rc1


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18013 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/include/smarty/Smarty.class.php b/gosa-core/include/smarty/Smarty.class.php
index 2d2ed357e..505f269fc 100644
--- a/gosa-core/include/smarty/Smarty.class.php
+++ b/gosa-core/include/smarty/Smarty.class.php
@@ -3,7 +3,7 @@
 /**
  * Project:     Smarty: the PHP compiling template engine
  * File:        Smarty.class.php
- * SVN:         $Id: Smarty.class.php 3508 2010-02-26 12:58:36Z Uwe.Tews $
+ * SVN:         $Id: Smarty.class.php 3557 2010-04-28 20:30:27Z Uwe.Tews $
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -108,7 +108,7 @@ if (SMARTY_SPL_AUTOLOAD && set_include_path(get_include_path() . PATH_SEPARATOR
  */
 class Smarty extends Smarty_Internal_Data {
     // smarty version
-    const SMARTY_VERSION = 'Smarty3-b8'; 
+    const SMARTY_VERSION = '3.0rc1'; // SVN Rev: 3286
     // auto literal on delimiters with whitspace
     public $auto_literal = true; 
     // display error on not assigned variables
@@ -129,6 +129,8 @@ class Smarty extends Smarty_Internal_Data {
     public $force_compile = false; 
     // check template for modifications?
     public $compile_check = true; 
+    // locking concurrent compiles
+    public $compile_locking = true; 
     // use sub dirs for compiled/cached files?
     public $use_sub_dirs = false; 
     // compile_error?
@@ -159,7 +161,7 @@ class Smarty extends Smarty_Internal_Data {
     public $direct_access_security = true; 
     // debug mode
     public $debugging = false;
-    public $debugging_ctrl = 'URL';
+    public $debugging_ctrl = 'NONE';
     public $smarty_debug_id = 'SMARTY_DEBUG';
     public $debug_tpl = null; 
     // When set, smarty does uses this value as error_reporting-level.
@@ -167,7 +169,7 @@ class Smarty extends Smarty_Internal_Data {
     // config var settings
     public $config_overwrite = true; //Controls whether variables with the same name overwrite each other.
     public $config_booleanize = true; //Controls whether config values of on/true/yes and off/false/no get converted to boolean
-    public $config_read_hidden = true; //Controls whether hidden config sections/vars are read from the file.                                                     
+    public $config_read_hidden = true; //Controls whether hidden config sections/vars are read from the file.                                                      
     // config vars
     public $config_vars = array(); 
     // assigned tpl vars
@@ -221,7 +223,8 @@ class Smarty extends Smarty_Internal_Data {
     // smarty object reference
     public $smarty = null; 
     // block data at template inheritance
-    public $block_data = array(); 
+    public $block_data = array();
+    public $block_data_stack = array(); 
     // block tag hierarchy
     public $_tag_stack = array(); 
     // plugins
@@ -310,6 +313,8 @@ class Smarty extends Smarty_Internal_Data {
             // get default Smarty data object
             $parent = $this;
         } 
+        array_push($this->block_data_stack, $this->block_data);
+        $this->block_data = array(); 
         // create template object if necessary
         ($template instanceof $this->template_class)? $_template = $template :
         $_template = $this->createTemplate ($template, $cache_id, $compile_id, $parent);
@@ -326,7 +331,7 @@ class Smarty extends Smarty_Internal_Data {
         } 
         // return redered template
         if (isset($this->autoload_filters['output']) || isset($this->registered_filters['output'])) {
-            $_output = Smarty_Internal_Filter_Handler::runFilter('output', $_template->getRenderedTemplate(), $this);
+            $_output = Smarty_Internal_Filter_Handler::runFilter('output', $_template->getRenderedTemplate(), $this, $_template);
         } else {
             $_output = $_template->getRenderedTemplate();
         } 
@@ -352,9 +357,11 @@ class Smarty extends Smarty_Internal_Data {
             if ($this->debugging) {
                 Smarty_Internal_Debug::display_debug($this);
             } 
+            $this->block_data = array_pop($this->block_data_stack);
             return;
         } else {
-	   // return fetched content
+            // return fetched content
+            $this->block_data = array_pop($this->block_data_stack);
             return $_output;
         } 
     } 
@@ -466,7 +473,7 @@ class Smarty extends Smarty_Internal_Data {
      */
     public function disableSecurity()
     {
-        $this->security = true;
+        $this->security = false;
     } 
 
     /**
@@ -707,7 +714,7 @@ class Smarty extends Smarty_Internal_Data {
             // Smarty 2 BC
             $this->_version = self::SMARTY_VERSION;
             return $this->_version;
-        }   	
+        } 
         return null;
     } 
 
@@ -751,21 +758,6 @@ class Smarty extends Smarty_Internal_Data {
             $this->wrapper = new Smarty_Internal_Wrapper($this);
         } 
         return $this->wrapper->convert($name, $args);
-
-        /*
-        $name = strtolower($name);
-        if ($name == 'smarty') {
-            throw new Exception('Please use parent::__construct() to call parent constuctor');
-        } 
-        $function_name = 'smarty_method_' . $name;
-        if (!is_callable($function_name)) {
-            if (!file_exists(SMARTY_SYSPLUGINS_DIR . $function_name . '.php')) {
-                throw new Exception('Undefined Smarty method "' . $name . '"');
-            } 
-            require_once(SMARTY_SYSPLUGINS_DIR . $function_name . '.php');
-        } 
-        return call_user_func_array($function_name, array_merge(array($this), $args));
-        */
     } 
 } 
 
diff --git a/gosa-core/include/smarty/plugins/function.html_options.php b/gosa-core/include/smarty/plugins/function.html_options.php
index 69f56e801..85b05f7dc 100644
--- a/gosa-core/include/smarty/plugins/function.html_options.php
+++ b/gosa-core/include/smarty/plugins/function.html_options.php
@@ -98,7 +98,7 @@ function smarty_function_html_options($params, $smarty, $template)
 function smarty_function_html_options_optoutput($key, $value, $selected)
 {
     if (!is_array($value)) {
-        $_html_result = '<option label="' . smarty_function_escape_special_chars($value) . '" value="' .
+        $_html_result = '<option value="' .
         smarty_function_escape_special_chars($key) . '"';
         if (in_array((string)$key, $selected))
             $_html_result .= ' selected="selected"';
diff --git a/gosa-core/include/smarty/plugins/function.math.php b/gosa-core/include/smarty/plugins/function.math.php
index d7ac9f8f0..257d2fee1 100644
--- a/gosa-core/include/smarty/plugins/function.math.php
+++ b/gosa-core/include/smarty/plugins/function.math.php
@@ -39,7 +39,7 @@ function smarty_function_math($params, $smarty, $template)
     }
 
     // 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);
+    preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!",$equation, $match);
     $allowed_funcs = array('int','abs','ceil','cos','exp','floor','log','log10',
                            'max','min','pi','pow','rand','round','sin','sqrt','srand','tan');
     
@@ -81,4 +81,4 @@ function smarty_function_math($params, $smarty, $template)
         }
     }
 }
-?>
+?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_cacheresource_file.php b/gosa-core/include/smarty/sysplugins/smarty_internal_cacheresource_file.php
index 57dcc00f6..6e451038d 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_cacheresource_file.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_cacheresource_file.php
@@ -1,30 +1,30 @@
 <?php
 
 /**
-* Smarty Internal Plugin CacheResource File
-* 
-* Implements the file system as resource for the HTML cache
-* Version ussing nocache inserts
-* 
-* @package Smarty
-* @subpackage Cacher
-* @author Uwe Tews 
-*/
+ * Smarty Internal Plugin CacheResource File
+ * 
+ * Implements the file system as resource for the HTML cache
+ * Version ussing nocache inserts
+ * 
+ * @package Smarty
+ * @subpackage Cacher
+ * @author Uwe Tews 
+ */
 
 /**
-* This class does contain all necessary methods for the HTML cache on file system
-*/
+ * This class does contain all necessary methods for the HTML cache on file system
+ */
 class Smarty_Internal_CacheResource_File {
     function __construct($smarty)
     {
         $this->smarty = $smarty;
     } 
     /**
-    * Returns the filepath of the cached template output
-    * 
-    * @param object $_template current template
-    * @return string the cache filepath
-    */
+     * Returns the filepath of the cached template output
+     * 
+     * @param object $_template current template
+     * @return string the cache filepath
+     */
     public function getCachedFilepath($_template)
     {
         $_source_file_path = str_replace(':', '.', $_template->getTemplateFilepath());
@@ -57,11 +57,11 @@ class Smarty_Internal_CacheResource_File {
     } 
 
     /**
-    * Returns the timpestamp of the cached template output
-    * 
-    * @param object $_template current template
-    * @return integer |booelan the template timestamp or false if the file does not exist
-    */
+     * Returns the timpestamp of the cached template output
+     * 
+     * @param object $_template current template
+     * @return integer |booelan the template timestamp or false if the file does not exist
+     */
     public function getCachedTimestamp($_template)
     { 
         // return @filemtime ($_template->getCachedFilepath());
@@ -69,11 +69,11 @@ class Smarty_Internal_CacheResource_File {
     } 
 
     /**
-    * Returns the cached template output
-    * 
-    * @param object $_template current template
-    * @return string |booelan the template content or false if the file does not exist
-    */
+     * Returns the cached template output
+     * 
+     * @param object $_template current template
+     * @return string |booelan the template content or false if the file does not exist
+     */
     public function getCachedContents($_template)
     {
         ob_start();
@@ -83,11 +83,11 @@ class Smarty_Internal_CacheResource_File {
     } 
 
     /**
-    * Writes the rendered template output to cache file
-    * 
-    * @param object $_template current template
-    * @return boolean status
-    */
+     * Writes the rendered template output to cache file
+     * 
+     * @param object $_template current template
+     * @return boolean status
+     */
     public function writeCachedContent($_template, $content)
     {
         if (!$_template->resource_object->isEvaluated) {
@@ -100,24 +100,24 @@ class Smarty_Internal_CacheResource_File {
     } 
 
     /**
-    * Empty cache folder
-    * 
-    * @param integer $exp_time expiration time
-    * @return integer number of cache files deleted
-    */
+     * Empty cache folder
+     * 
+     * @param integer $exp_time expiration time
+     * @return integer number of cache files deleted
+     */
     public function clearAll($exp_time = null)
     {
         return $this->clear(null, null, null, $exp_time);
     } 
     /**
-    * Empty cache for a specific template
-    * 
-    * @param string $resource_name template name
-    * @param string $cache_id cache id
-    * @param string $compile_id compile id
-    * @param integer $exp_time expiration time
-    * @return integer number of cache files deleted
-    */
+     * Empty cache for a specific template
+     * 
+     * @param string $resource_name template name
+     * @param string $cache_id cache id
+     * @param string $compile_id compile id
+     * @param integer $exp_time expiration time
+     * @return integer number of cache files deleted
+     */
     public function clear($resource_name, $cache_id, $compile_id, $exp_time)
     {
         $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
@@ -131,9 +131,14 @@ class Smarty_Internal_CacheResource_File {
             $_cache_id_parts_count = count($_cache_id_parts);
         } 
         if (isset($resource_name)) {
-            $tpl = $this->smarty->createTemplate($resource_name);
+            $_save_stat = $this->smarty->caching;
+            $this->smarty->caching = true;
+            $tpl = new $this->smarty->template_class($resource_name, $this->smarty); 
+            // remove from template cache
+            unset($this->smarty->template_objects[crc32($tpl->template_resource . $tpl->cache_id . $tpl->compile_id)]);
+            $this->smarty->caching = $_save_stat;
             if ($tpl->isExisting()) {
-                $_resourcename_parts = basename(str_replace('^','/',$tpl->getCachedFilepath()));
+                $_resourcename_parts = basename(str_replace('^', '/', $tpl->getCachedFilepath()));
             } else {
                 return 0;
             } 
@@ -176,7 +181,7 @@ class Smarty_Internal_CacheResource_File {
                 // expired ?
                 if (isset($exp_time) && time() - @filemtime($_file) < $exp_time) {
                     continue;
-                }
+                } 
                 $_count += @unlink((string) $_file) ? 1 : 0;
             } 
         } 
@@ -184,4 +189,4 @@ class Smarty_Internal_CacheResource_File {
     } 
 } 
 
-?>
+?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_extends.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_extends.php
index ed6ab4f1f..875e17b72 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_extends.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_extends.php
@@ -41,7 +41,7 @@ class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase {
                 preg_match_all("!({$this->_ldl}/block(.*?){$this->_rdl})!", $_content, $c)) {
             $this->compiler->trigger_template_error('unmatched {block} {/block} pairs');
         } 
-        preg_match_all("!{$this->_ldl}block(.+?){$this->_rdl}|{$this->_ldl}/block.*{$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
+        preg_match_all("!{$this->_ldl}block(.+?){$this->_rdl}|{$this->_ldl}/block(.*?){$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
         $_result_count = count($_result[0]);
         $_start = 0;
         while ($_start < $_result_count) {
diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_for.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_for.php
index 7b9889e24..a85a52f3b 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_for.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_for.php
@@ -1,35 +1,35 @@
 <?php
 /**
-* Smarty Internal Plugin Compile For
-* 
-* Compiles the {for} {forelse} {/for} tags
-* 
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews 
-*/
+ * Smarty Internal Plugin Compile For
+ * 
+ * Compiles the {for} {forelse} {/for} tags
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
 /**
-* Smarty Internal Plugin Compile For Class
-*/
+ * Smarty Internal Plugin Compile For Class
+ */
 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
-    * @return string compiled code
-    */
+     * 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
+     * @return string compiled code
+     */
     public function compile($args, $compiler)
     {
         $this->compiler = $compiler; 
@@ -52,11 +52,13 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase {
             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";
+                $compiler->local_var[$_statement['var']] = true;
             } 
             $output .= "  if ($_attr[ifexp]){ for (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$_attr[varloop]]->value$_attr[loop]){\n";
         } else {
             $_statement = $_attr['start'];
             $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;";
+            $compiler->local_var[$_statement['var']] = true;
             if (isset($_attr['step'])) {
                 $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = $_attr[step];";
             } else {
@@ -79,16 +81,16 @@ class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase {
 } 
 
 /**
-* Smarty Internal Plugin Compile Forelse Class
-*/
+ * Smarty Internal Plugin Compile Forelse Class
+ */
 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
-    * @return string compiled code
-    */
+     * Compiles code for the {forelse} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
     public function compile($args, $compiler)
     {
         $this->compiler = $compiler; 
@@ -102,16 +104,16 @@ class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase {
 } 
 
 /**
-* Smarty Internal Plugin Compile Forclose Class
-*/
+ * Smarty Internal Plugin Compile Forclose Class
+ */
 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
-    * @return string compiled code
-    */
+     * Compiles code for the {/for} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
     public function compile($args, $compiler)
     {
         $this->compiler = $compiler; 
@@ -130,4 +132,4 @@ class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase {
     } 
 } 
 
-?>
+?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_foreach.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_foreach.php
index 09801fda5..aac39f648 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_foreach.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_foreach.php
@@ -1,24 +1,24 @@
 <?php
 /**
-* Smarty Internal Plugin Compile Foreach
-* 
-* Compiles the {foreach} {foreachelse} {/foreach} tags
-* 
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews 
-*/
+ * Smarty Internal Plugin Compile Foreach
+ * 
+ * Compiles the {foreach} {foreachelse} {/foreach} tags
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
 /**
-* Smarty Internal Plugin Compile Foreach Class
-*/
+ * Smarty Internal Plugin Compile Foreach Class
+ */
 class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
     /**
-    * Compiles code for the {foreach} tag
-    * 
-    * @param array $args array with attributes from parser
-    * @param object $compiler compiler object
-    * @return string compiled code
-    */
+     * Compiles code for the {foreach} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
     public function compile($args, $compiler)
     {
         $this->compiler = $compiler;
@@ -28,9 +28,9 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
         // check and get attributes
         $_attr = $this->_get_attributes($args);
 
-        $this->_open_tag('foreach', array('foreach',$this->compiler->nocache));
-		// maybe nocache because of nocache variables
-		$this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache;
+        $this->_open_tag('foreach', array('foreach', $this->compiler->nocache)); 
+        // maybe nocache because of nocache variables
+        $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache;
 
         $from = $_attr['from'];
         $item = $_attr['item'];
@@ -44,12 +44,12 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
         if (isset($_attr['name'])) {
             $name = $_attr['name'];
             $has_name = true;
-            $SmartyVarName = '$smarty.foreach.' . trim($name,'\'"') . '.';
+            $SmartyVarName = '$smarty.foreach.' . trim($name, '\'"') . '.';
         } else {
             $name = null;
             $has_name = false;
         } 
-        $ItemVarName = '$' . trim($item,'\'"') . '@';
+        $ItemVarName = '$' . trim($item, '\'"') . '@'; 
         // evaluates which Smarty variables and properties have to be computed
         if ($has_name) {
             $usesSmartyFirst = strpos($tpl->template_source, $SmartyVarName . 'first') !== false;
@@ -62,7 +62,7 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
             $usesSmartyFirst = false;
             $usesSmartyLast = false;
             $usesSmartyTotal = false;
-        }
+        } 
 
         $usesPropFirst = $usesSmartyFirst || strpos($tpl->template_source, $ItemVarName . 'first') !== false;
         $usesPropLast = $usesSmartyLast || strpos($tpl->template_source, $ItemVarName . 'last') !== false;
@@ -73,8 +73,10 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
         // generate output code
         $output = "<?php ";
         $output .= " \$_smarty_tpl->tpl_vars[$item] = new Smarty_Variable;\n";
+        $compiler->local_var[$item] = true;
         if ($key != null) {
             $output .= " \$_smarty_tpl->tpl_vars[$key] = new Smarty_Variable;\n";
+            $compiler->local_var[$key] = true;
         } 
         $output .= " \$_from = $from; if (!is_array(\$_from) && !is_object(\$_from)) { settype(\$_from, 'array');}\n";
         if ($usesPropTotal) {
@@ -135,16 +137,16 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
 } 
 
 /**
-* Smarty Internal Plugin Compile Foreachelse Class
-*/ 
+ * Smarty Internal Plugin Compile Foreachelse Class
+ */
 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
-    * @return string compiled code
-    */
+     * Compiles code for the {foreachelse} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
     public function compile($args, $compiler)
     {
         $this->compiler = $compiler; 
@@ -152,33 +154,32 @@ class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase {
         $_attr = $this->_get_attributes($args);
 
         list($_open_tag, $nocache) = $this->_close_tag(array('foreach'));
-        $this->_open_tag('foreachelse',array('foreachelse', $nocache));
+        $this->_open_tag('foreachelse', array('foreachelse', $nocache));
 
         return "<?php }} else { ?>";
     } 
 } 
 
 /**
-* Smarty Internal Plugin Compile Foreachclose Class
-*/ 
+ * Smarty Internal Plugin Compile Foreachclose Class
+ */
 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
-    * @return string compiled code
-    */
+     * Compiles code for the {/foreach} tag
+     * 
+     * @param array $args array with attributes from parser
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
     public function compile($args, $compiler)
     {
         $this->compiler = $compiler; 
         // check and get attributes
-        $_attr = $this->_get_attributes($args);
-
-		// must endblock be nocache?
-		if ($this->compiler->nocache) {
-               $this->compiler->tag_nocache = true;
-        }
+        $_attr = $this->_get_attributes($args); 
+        // must endblock be nocache?
+        if ($this->compiler->nocache) {
+            $this->compiler->tag_nocache = true;
+        } 
 
         list($_open_tag, $this->compiler->nocache) = $this->_close_tag(array('foreach', 'foreachelse'));
 
@@ -187,6 +188,6 @@ class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase {
         else
             return "<?php }} ?>";
     } 
-}
+} 
 
-?>
+?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_function.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_function.php
index 56c586480..86363b2b8 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_function.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_function.php
@@ -37,7 +37,7 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase {
         // make function known for recursive calls
         $this->compiler->smarty->template_functions[$_name]['compiled'] = ''; 
         // Init temporay context
-        $compiler->template->required_plugins = array('compiled' => array(), 'cache' => array());
+        $compiler->template->required_plugins = array('compiled' => array(), 'nocache' => array());
         $compiler->template->extract_code = true;
         $compiler->template->extracted_compiled_code = '';
         $compiler->template->has_nocache_code = false;
@@ -75,11 +75,11 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
             } 
             $plugins_string .= '?>';
         } 
-        if (!empty($compiler->template->required_plugins['cache'])) {
+        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 .= "if (!is_callable(\'{$data['function']}\')) include \'{$data['file']}\';\n";
                 } 
             } 
             $plugins_string .= "?>/*/%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/';?>\n";
@@ -97,4 +97,4 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
     } 
 } 
 
-?>
+?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php
index 0656b77b6..436ba2472 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php
@@ -45,7 +45,7 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi
             $this->compiler->nocache = $this->compiler->nocache | $this->compiler->tag_nocache; 
             // compile code
             if (is_array($function)) {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; call_user_func(array('{$function[0]}','{$function[1]}'),{$_params}, null, \$_smarty_tpl->smarty, \$_block_repeat, \$_smarty_tpl);while (\$_block_repeat) { ob_start();?>";
+                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; call_user_func_array(array('{$function[0]}','{$function[1]}'),(array({$_params}, null, \$_smarty_tpl->smarty, &\$_block_repeat, \$_smarty_tpl));while (\$_block_repeat) { ob_start();?>";
             } else {
                 $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; {$function}({$_params}, null, \$_smarty_tpl->smarty, \$_block_repeat, \$_smarty_tpl);while (\$_block_repeat) { ob_start();?>";
             } 
@@ -60,7 +60,7 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi
             $this->compiler->has_output = true; 
             // compile code
             if (is_array($function)) {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false; echo call_user_func(array('{$function[0]}','{$function[1]}'),({$_params}, \$_block_content, \$_smarty_tpl->smarty, \$_block_repeat, \$_smarty_tpl); } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false; echo call_user_func_array(array('{$function[0]}','{$function[1]}'),(array({$_params}, \$_block_content, \$_smarty_tpl->smarty, &\$_block_repeat, \$_smarty_tpl)); } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
             } else {
                 $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false; echo {$function}({$_params}, \$_block_content, \$_smarty_tpl->smarty, \$_block_repeat, \$_smarty_tpl); } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
             } 
@@ -69,4 +69,4 @@ class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_Compi
     } 
 } 
 
-?>
\ No newline at end of file
+?>
diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_object_function.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_object_function.php
index 8e8ff9448..3cf90d8e9 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_object_function.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_object_function.php
@@ -1,36 +1,38 @@
 <?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 Funtion
+ * 
+ * Compiles code for registered objects as function
+ * 
+ * @package Smarty
+ * @subpackage Compiler
+ * @author Uwe Tews 
+ */
 /**
-* Smarty Internal Plugin Compile Object Function Class
-*/
+ * Smarty Internal Plugin Compile Object Function Class
+ */
 class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_CompileBase {
     /**
-    * Compiles code for the execution of function plugin
-    * 
-    * @param array $args array with attributes from parser
-    * @param string $tag name of function
-    * @param string $methode name of methode to call
-    * @param object $compiler compiler object
-    * @return string compiled code
-    */
+     * Compiles code for the execution of function plugin
+     * 
+     * @param array $args array with attributes from parser
+     * @param string $tag name of function
+     * @param string $methode name of methode to call
+     * @param object $compiler compiler object
+     * @return string compiled code
+     */
     public function compile($args, $compiler, $tag, $methode)
     {
-        $this->compiler = $compiler; 
-        // This tag does create output
-        $this->compiler->has_output = true;
-
+        $this->compiler = $compiler;
         $this->required_attributes = array();
         $this->optional_attributes = array('_any'); 
         // check and get attributes
-        $_attr = $this->_get_attributes($args); 
+        $_attr = $this->_get_attributes($args);
+        $_assign = null;
+        if (isset($_attr['assign'])) {
+            $_assign = $_attr['assign'];
+            unset($_attr['assign']);
+        } 
         // convert attributes into parameter array string
         if ($this->compiler->smarty->registered_objects[$tag][2]) {
             $_paramsArray = array();
@@ -42,13 +44,19 @@ class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_Co
                 } 
             } 
             $_params = 'array(' . implode(",", $_paramsArray) . ')';
-            $output = "<?php echo \$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$methode}({$_params},\$_smarty_tpl->smarty,\$_smarty_tpl);?>\n";
+            $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$methode}({$_params},\$_smarty_tpl->smarty,\$_smarty_tpl)";
         } else {
             $_params = implode(",", $_attr);
-            $output = "<?php echo \$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$methode}({$_params});?>\n";
+            $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$methode}({$_params})";
         } 
+        if (empty($_assign)) {
+            // This tag does create output
+            $this->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/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_print_expression.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
index 7cfe473d8..7f72a76d1 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
@@ -49,7 +49,7 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
             // display value
             $this->compiler->has_output = true;
             if (isset($this->compiler->smarty->registered_filters['variable'])) {
-                $output = '<?php echo Smarty_Internal_Filter_Handler::runFilter(\'variable\', ' . $_attr['value'] . ',$this->smarty, ' . $_attr['filter'] . ');?>';
+                $output = '<?php echo Smarty_Internal_Filter_Handler::runFilter(\'variable\', ' . $_attr['value'] . ',$_smarty_tpl->smarty, $_smarty_tpl, ' . $_attr['filter'] . ');?>';
             } else {
                 $output = '<?php echo ' . $_attr['value'] . ';?>';
             } 
@@ -58,4 +58,4 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
     } 
 } 
 
-?>
+?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_registered_block.php b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_registered_block.php
index 300764d9c..3ad4d2fab 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_registered_block.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_compile_private_registered_block.php
@@ -48,9 +48,9 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C
             if (!is_array($function)) {
                 $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; {$function}({$_params}, null, \$_smarty_tpl->smarty, \$_block_repeat, \$_smarty_tpl);while (\$_block_repeat) { ob_start();?>";
             } else if (is_object($function[0])) {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; call_user_func(\$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0],{$_params}, null, \$_smarty_tpl->smarty, \$_block_repeat, \$_smarty_tpl);while (\$_block_repeat) { ob_start();?>";
+                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; call_user_func_array(\$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0],array({$_params}, null, \$_smarty_tpl->smarty, &\$_block_repeat, \$_smarty_tpl));while (\$_block_repeat) { ob_start();?>";
             } else {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; call_user_func(array('{$function[0]}','{$function[1]}'),{$_params}, null, \$_smarty_tpl->smarty, \$_block_repeat, \$_smarty_tpl);while (\$_block_repeat) { ob_start();?>";
+                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; call_user_func_array(array('{$function[0]}','{$function[1]}'),array({$_params}, null, \$_smarty_tpl->smarty, &\$_block_repeat, \$_smarty_tpl));while (\$_block_repeat) { ob_start();?>";
             } 
         } else {
             // must endblock be nocache?
@@ -67,9 +67,9 @@ class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_C
             if (!is_array($function)) {
                 $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false; echo {$function}({$_params}, \$_block_content, \$_smarty_tpl->smarty, \$_block_repeat, \$_smarty_tpl); } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
             } else if (is_object($function[0])) {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false; echo call_user_func(\$_smarty_tpl->smarty->registered_plugins['block']['{$base_tag}'][0],{$_params}, \$_block_content, \$_smarty_tpl->smarty, \$_block_repeat, \$_smarty_tpl); } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false; echo call_user_func_array(\$_smarty_tpl->smarty->registered_plugins['block']['{$base_tag}'][0],array({$_params}, \$_block_content, \$_smarty_tpl->smarty, &\$_block_repeat, \$_smarty_tpl)); } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
             } else {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false; echo call_user_func(array('{$function[0]}','{$function[1]}'),{$_params}, \$_block_content, \$_smarty_tpl->smarty, \$_block_repeat, \$_smarty_tpl); } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
+                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false; echo call_user_func_array(array('{$function[0]}','{$function[1]}'),array({$_params}, \$_block_content, \$_smarty_tpl->smarty, &\$_block_repeat, \$_smarty_tpl)); } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
             } 
         } 
         return $output."\n";
diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_config.php b/gosa-core/include/smarty/sysplugins/smarty_internal_config.php
index 31b410857..3141e7931 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_config.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_config.php
@@ -1,14 +1,14 @@
 <?php
 /**
-* Smarty Internal Plugin Config
-* 
-* Main class for config variables
-* 
-* @ignore 
-* @package Smarty
-* @subpackage Config
-* @author Uwe Tews 
-*/
+ * Smarty Internal Plugin Config
+ * 
+ * Main class for config variables
+ * 
+ * @ignore 
+ * @package Smarty
+ * @subpackage Config
+ * @author Uwe Tews 
+ */
 class Smarty_Internal_Config {
     static $config_objects = array();
 
@@ -85,23 +85,23 @@ class Smarty_Internal_Config {
         } 
         // check for absolute path
         if (file_exists($this->config_resource_name))
-            return $this->config_resource_name;
+            return $this->config_resource_name; 
         // no tpl file found
         throw new Exception("Unable to load config file \"{$this->config_resource_name}\"");
         return false;
     } 
     /**
-    * Read config file source
-    * 
-    * @return string content of source file
-    */
+     * Read config file source
+     * 
+     * @return string content of source file
+     */
     /**
-    * Returns the template source code
-    * 
-    * The template source is being read by the actual resource handler
-    * 
-    * @return string the template source
-    */
+     * Returns the template source code
+     * 
+     * The template source is being read by the actual resource handler
+     * 
+     * @return string the template source
+     */
     public function getConfigSource ()
     {
         if ($this->config_source === null) {
@@ -123,10 +123,10 @@ class Smarty_Internal_Config {
     } 
 
     /**
-    * Returns the compiled  filepath
-    * 
-    * @return string the compiled filepath
-    */
+     * Returns the compiled  filepath
+     * 
+     * @return string the compiled filepath
+     */
     public function getCompiledFilepath ()
     {
         return $this->compiled_filepath === null ?
@@ -152,10 +152,10 @@ class Smarty_Internal_Config {
         return $_compile_dir . $_filepath . '.' . basename($this->config_resource_name) . '.config' . '.php';
     } 
     /**
-    * Returns the timpestamp of the compiled file
-    * 
-    * @return integer the file timestamp
-    */
+     * Returns the timpestamp of the compiled file
+     * 
+     * @return integer the file timestamp
+     */
     public function getCompiledTimestamp ()
     {
         return $this->compiled_timestamp === null ?
@@ -163,25 +163,25 @@ class Smarty_Internal_Config {
         $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
-    */
+     * 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 () !== $this->getTimestamp ()):
+        $this->mustCompile = ($this->smarty->force_compile || $this->smarty->compile_check && $this->getCompiledTimestamp () !== $this->getTimestamp ()):
         $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
-    */
+     * 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) {
@@ -196,8 +196,8 @@ class Smarty_Internal_Config {
     } 
 
     /**
-    * Compiles the config files
-    */
+     * Compiles the config files
+     */
     public function compileConfigSource ()
     { 
         // compile template
@@ -205,18 +205,26 @@ class Smarty_Internal_Config {
             // 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
-        if ($this->compiler_object->compileSource($this)) {
-            // compiling succeded
-            // write compiled template
-            Smarty_Internal_Write_File::writeFile($this->getCompiledFilepath(), $this->getCompiledConfig(), $this->smarty); 
-            // make template and compiled file timestamp match
-            touch($this->getCompiledFilepath(), $this->getTimestamp());
-        } else {
-            // error compiling template
-            throw new Exception("Error compiling template {$this->getConfigFilepath ()}");
-            return false;
+        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);
     } 
 
     /*
@@ -232,10 +240,12 @@ class Smarty_Internal_Config {
         } else {
             $this->smarty->properties['file_dependency'][sha1($this->getConfigFilepath())] = array($this->getConfigFilepath(), $this->getTimestamp());
         } 
-        $config_data = unserialize($this->getCompiledConfig()); 
-        // var_dump($config_data);
+        if ($this->mustCompile()) {
+            $this->compileConfigSource();
+        } 
+        include($this->getCompiledFilepath ());
         // copy global config vars
-        foreach ($config_data['vars'] as $variable => $value) {
+        foreach ($_config_vars['vars'] as $variable => $value) {
             if ($this->smarty->config_overwrite || !isset($scope->config_vars[$variable])) {
                 $scope->config_vars[$variable] = $value;
             } else {
@@ -243,9 +253,9 @@ class Smarty_Internal_Config {
             } 
         } 
         // scan sections
-        foreach ($config_data['sections'] as $this_section => $dummy) {
+        foreach ($_config_vars['sections'] as $this_section => $dummy) {
             if ($sections == null || in_array($this_section, (array)$sections)) {
-                foreach ($config_data['sections'][$this_section]['vars'] as $variable => $value) {
+                foreach ($_config_vars['sections'][$this_section]['vars'] as $variable => $value) {
                     if ($this->smarty->config_overwrite || !isset($scope->config_vars[$variable])) {
                         $scope->config_vars[$variable] = $value;
                     } else {
@@ -257,4 +267,4 @@ class Smarty_Internal_Config {
     } 
 } 
 
-?>
+?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_config_file_compiler.php b/gosa-core/include/smarty/sysplugins/smarty_internal_config_file_compiler.php
index 154791115..17cfc81ce 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_config_file_compiler.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_config_file_compiler.php
@@ -1,23 +1,22 @@
 <?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 
-*/
+ * 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
-*/
+ * Main config file compiler class
+ */
 class Smarty_Internal_Config_File_Compiler {
-   public $compile_error= false;
-   /**
-    * Initialize compiler
-    */
+    /**
+     * Initialize compiler
+     */
     public function __construct($smarty)
     {
         $this->smarty = $smarty; 
@@ -29,54 +28,47 @@ class Smarty_Internal_Config_File_Compiler {
     } 
 
     /**
-    * Methode to compile a Smarty template
-    * 
-    * @param  $template template object to compile
-    * @return bool true if compiling succeeded, false if it failed
-    */
+     * Methode to compile a Smarty template
+     * 
+     * @param  $template template object to compile
+     * @return bool true if compiling succeeded, false if it failed
+     */
     public function compileSource($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->getConfigSource()."\n";
+       then written to compiled files. */
+        $this->config = $config; 
+        // get config file source
+        $_content = $config->getConfigSource() . "\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); 
-        // $parser->PrintTrace();
+        $parser = new Smarty_Internal_Configfileparser($lex, $this);
+        if (isset($this->smarty->_parserdebug)) $parser->PrintTrace(); 
         // get tokens from lexer and parse them
         while ($lex->yylex()) {
-            // echo "<br>Parsing  {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n";
+            if (isset($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 = serialize($this->config_data);
-        if (!$this->compile_error) {
-            return true;
-        } else {
-            // compilation error
-            return false;
-        } 
+        $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
-    * 
-    * @todo output exact position of parse error in source line
-    * @param  $args string individual error message or null
-    */
+     * 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
+     * 
+     * @todo output exact position of parse error in source line
+     * @param  $args string individual error message or null
+     */
     public function trigger_config_file_error($args = null)
     {
         $this->lex = Smarty_Internal_Configfilelexer::instance();
@@ -84,7 +76,7 @@ class Smarty_Internal_Config_File_Compiler {
         // get template source line which has error
         $line = $this->lex->line;
         if (isset($args)) {
-//            $line--;
+            // $line--;
         } 
         $match = preg_split("/\n/", $this->lex->data);
         $error_text = "Syntax error in config file '{$this->config->getConfigFilepath()}' on line {$line} '{$match[$line-1]}' ";
@@ -107,10 +99,7 @@ class Smarty_Internal_Config_File_Compiler {
             $error_text .= ' - Unexpected "' . $this->lex->value . '", expected one of: ' . implode(' , ', $expect);
         } 
         throw new Exception($error_text);
-        // set error flag
-        $this->compile_error = true;
     } 
-
 } 
 
-?>
+?>
\ No newline at end of file
diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_filter_handler.php b/gosa-core/include/smarty/sysplugins/smarty_internal_filter_handler.php
index a8a43d48d..0ab058cbb 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_filter_handler.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_filter_handler.php
@@ -26,7 +26,7 @@ class Smarty_Internal_Filter_Handler {
      * @param string $content the content which shall be processed by the filters
      * @return string the filtered content
      */
-    static function runFilter($type, $content, $smarty, $flag = null)
+    static function runFilter($type, $content, $smarty, $template, $flag = null)
     {
         $output = $content;
         if ($type != 'variable' || ($smarty->variable_filter && $flag !== false) || $flag === true) {
@@ -40,7 +40,7 @@ class Smarty_Internal_Filter_Handler {
                             $output = $plugin_name($output, $smarty);
                         } elseif (class_exists($plugin_name, false)) {
                             // loaded class of filter plugin
-                            $output = call_user_func(array($plugin_name, 'execute'), $output, $smarty);
+                            $output = call_user_func(array($plugin_name, 'execute'), $output, $smarty, $template);
                         } 
                     } else {
                         // nothing found, throw exception
@@ -52,9 +52,9 @@ class Smarty_Internal_Filter_Handler {
             if (!empty($smarty->registered_filters[$type])) {
                 foreach ($smarty->registered_filters[$type] as $key => $name) {
                     if (is_array($smarty->registered_filters[$type][$key])) {
-                        $output = call_user_func($smarty->registered_filters[$type][$key], $output, $smarty);
+                        $output = call_user_func($smarty->registered_filters[$type][$key], $output, $smarty, $template);
                     } else {
-                        $output = $smarty->registered_filters[$type][$key]($output, $smarty);
+                        $output = $smarty->registered_filters[$type][$key]($output, $smarty, $template);
                     } 
                 } 
             } 
diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_register.php b/gosa-core/include/smarty/sysplugins/smarty_internal_register.php
index 67df19181..fb43d6fcf 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_register.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_register.php
@@ -108,9 +108,9 @@ class Smarty_Internal_Register {
     function modifier($modifier_name, $modifier_impl)
     {
         if (isset($this->smarty->registered_plugins['modifier'][$modifier_name])) {
-            throw new Exception("Plugin \"{$modifier}\" already registered");
+            throw new Exception("Plugin \"{$modifier_name}\" already registered");
         } elseif (!is_callable($modifier_impl)) {
-            throw new Exception("Plugin \"{$modifier}\" not callable");
+            throw new Exception("Plugin \"{$modifier_name}\" not callable");
         } else {
             $this->smarty->registered_plugins['modifier'][$modifier_name] =
             array($modifier_impl);
diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_resource_extends.php b/gosa-core/include/smarty/sysplugins/smarty_internal_resource_extends.php
index 64526346a..c4f588a66 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_resource_extends.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_resource_extends.php
@@ -102,7 +102,7 @@ class Smarty_Internal_Resource_Extends {
                         preg_match_all("!({$this->_ldl}/block(.*?){$this->_rdl})!", $_content, $_close)) {
                     $this->smarty->trigger_error("unmatched {block} {/block} pairs in file '$_filepath'");
                 } 
-                preg_match_all("!{$this->_ldl}block(.+?){$this->_rdl}|{$this->_ldl}/block.*{$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
+                preg_match_all("!{$this->_ldl}block(.+?){$this->_rdl}|{$this->_ldl}/block(.*?){$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
                 $_result_count = count($_result[0]);
                 $_start = 0;
                 while ($_start < $_result_count) {
diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php b/gosa-core/include/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php
index a6b7e7c3b..25e92d965 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php
@@ -1,22 +1,24 @@
 <?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 
-*/
+ * 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 
+ */
 require_once("smarty_internal_parsetree.php");
 /**
-* Class SmartyTemplateCompiler
-*/
+ * Class SmartyTemplateCompiler
+ */
 class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCompilerBase {
+    // array of vars which can be compiled in local scope
+    public $local_var = array();
     /**
-    * Initialize compiler
-    */
+     * Initialize compiler
+     */
     public function __construct($lexer_class, $parser_class, $smarty)
     {
         $this->smarty = $smarty;
@@ -27,11 +29,11 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
     } 
 
     /**
-    * Methode to compile a Smarty template
-    * 
-    * @param  $_content template source
-    * @return bool true if compiling succeeded, false if it failed
-    */
+     * Methode to compile a Smarty template
+     * 
+     * @param  $_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
@@ -39,11 +41,11 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
        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 (isset($this->smarty->_parserdebug)) $this->parser->PrintTrace();
+        $this->parser = new $this->parser_class($this->lex, $this);
+        if (isset($this->smarty->_parserdebug)) $this->parser->PrintTrace(); 
         // get tokens from lexer and parse them
         while ($this->lex->yylex() && !$this->abort_and_recompile) {
-            if (isset($this->smarty->_parserdebug)) echo "<pre>Line {$this->lex->line} Parsing  {$this->parser->yyTokenName[$this->lex->token]} Token ".htmlentities($this->lex->value)."</pre>";
+            if (isset($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);
         } 
 
@@ -59,15 +61,9 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
             list($_open_tag, $_data) = array_pop($this->_tag_stack);
             $this->trigger_template_error("unclosed {" . $_open_tag . "} tag");
         } 
-
-        if (!$this->compile_error) {
-            // return compiled code
-            // return str_replace(array("? >\n<?php","? ><?php"), array('',''), $this->parser->retvalue);
-            return $this->parser->retvalue;
-        } else {
-            // compilation error
-            return false;
-        } 
+        // return compiled code
+        // return str_replace(array("? >\n<?php","? ><?php"), array('',''), $this->parser->retvalue);
+        return $this->parser->retvalue;
     } 
 } 
 
diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_template.php b/gosa-core/include/smarty/sysplugins/smarty_internal_template.php
index 60bb8a982..3dfd3f317 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_template.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_template.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
-* Smarty Internal Plugin Template
-* 
-* This file contains the Smarty template engine
-* 
-* @package Smarty
-* @subpackage Templates
-* @author Uwe Tews 
-*/
+ * Smarty Internal Plugin Template
+ * 
+ * This file contains the Smarty template engine
+ * 
+ * @package Smarty
+ * @subpackage Templates
+ * @author Uwe Tews 
+ */
 
 /**
-* Main class with template data structures and methods
-*/
+ * Main class with template data structures and methods
+ */
 class Smarty_Internal_Template extends Smarty_Internal_Data {
     // object cache
     public $compiler_object = null;
@@ -65,22 +65,22 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     public $properties = array ('file_dependency' => array(),
         'nocache_hash' => '',
         'function' => array()); 
-    // storage for block data
-    public $block_data = array(); 
     // required plugins
     public $required_plugins = array('compiled' => array(), 'nocache' => array());
-
+    public $security = false;
+    public $saved_modifier = null;
+    public $smarty = null;
     /**
-    * 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 object $_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
-    */
+     * 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 object $_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
+     */
     public function __construct($template_resource, $smarty, $_parent = null, $_cache_id = null, $_compile_id = null, $_caching = null, $_cache_lifetime = null)
     {
         $this->smarty = &$smarty; 
@@ -109,12 +109,12 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Returns the template filepath
-    * 
-    * The template filepath is determined by the actual resource handler
-    * 
-    * @return string the template filepath
-    */
+     * Returns the template filepath
+     * 
+     * The template filepath is determined by the actual resource handler
+     * 
+     * @return string the template filepath
+     */
     public function getTemplateFilepath ()
     {
         return $this->template_filepath === null ?
@@ -123,12 +123,12 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Returns the timpestamp of the template source
-    * 
-    * The template timestamp is determined by the actual resource handler
-    * 
-    * @return integer the template timestamp
-    */
+     * Returns the timpestamp of the template source
+     * 
+     * The template timestamp is determined by the actual resource handler
+     * 
+     * @return integer the template timestamp
+     */
     public function getTemplateTimestamp ()
     {
         return $this->template_timestamp === null ?
@@ -137,12 +137,12 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Returns the template source code
-    * 
-    * The template source is being read by the actual resource handler
-    * 
-    * @return string the template source
-    */
+     * Returns the template source code
+     * 
+     * The template source is being read by the actual resource handler
+     * 
+     * @return string the template source
+     */
     public function getTemplateSource ()
     {
         if ($this->template_source === null) {
@@ -154,12 +154,12 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Returns if the  template is existing
-    * 
-    * The status is determined by the actual resource handler
-    * 
-    * @return boolean true if the template exists
-    */
+     * Returns if the  template is existing
+     * 
+     * The status is determined by the actual resource handler
+     * 
+     * @return boolean true if the template exists
+     */
     public function isExisting ($error = false)
     {
         if ($this->isExisting === null) {
@@ -172,12 +172,12 @@ class Smarty_Internal_Template extends Smarty_Internal_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
-    */
+     * 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 ()
     {
         $this->isExisting(true);
@@ -190,10 +190,10 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Returns the compiled template filepath
-    * 
-    * @return string the template filepath
-    */
+     * Returns the compiled template filepath
+     * 
+     * @return string the template filepath
+     */
     public function getCompiledFilepath ()
     {
         return $this->compiled_filepath === null ?
@@ -202,10 +202,10 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Returns the timpestamp of the compiled template
-    * 
-    * @return integer the template timestamp
-    */
+     * Returns the timpestamp of the compiled template
+     * 
+     * @return integer the template timestamp
+     */
     public function getCompiledTimestamp ()
     {
         return $this->compiled_timestamp === null ?
@@ -214,12 +214,12 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Returns the compiled template 
-    * 
-    * It checks if the template must be compiled or just read from the template resource
-    * 
-    * @return string the compiled template
-    */
+     * Returns the compiled template 
+     * 
+     * It checks if the template must be compiled or just read from the template resource
+     * 
+     * @return string the compiled template
+     */
     public function getCompiledTemplate ()
     {
         if ($this->compiled_template === null) {
@@ -236,10 +236,10 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Compiles the template
-    * 
-    * If the template is not evaluated the compiled template is saved on disk
-    */
+     * Compiles the template
+     * 
+     * If the template is not evaluated the compiled template is saved on disk
+     */
     public function compileTemplateSource ()
     {
         if (!$this->resource_object->isEvaluated) {
@@ -255,17 +255,27 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
             $this->smarty->loadPlugin($this->resource_object->compiler_class);
             $this->compiler_object = new $this->resource_object->compiler_class($this->resource_object->template_lexer_class, $this->resource_object->template_parser_class, $this->smarty);
         } 
+        // compile locking
+        if ($this->smarty->compile_locking && !$this->resource_object->isEvaluated) {
+            if ($saved_timestamp = $this->getCompiledTimestamp()) {
+                touch($this->getCompiledFilepath());
+            } 
+        } 
         // call compiler
-        if ($this->compiler_object->compileTemplate($this)) {
-            // compiling succeded
-            if (!$this->resource_object->isEvaluated) {
-                // write compiled template
-                Smarty_Internal_Write_File::writeFile($this->getCompiledFilepath(), $this->compiled_template, $this->smarty);
+        try {
+            $this->compiler_object->compileTemplate($this);
+        } 
+        catch (Exception $e) {
+            // restore old timestamp in case of error
+            if ($this->smarty->compile_locking && !$this->resource_object->isEvaluated && $saved_timestamp) {
+                touch($this->getCompiledFilepath(), $saved_timestamp);
             } 
-        } else {
-            // error compiling template
-            throw new Exception("Error compiling template {$this->getTemplateFilepath ()}");
-            return false;
+            throw $e;
+        }
+        // compiling succeded
+        if (!$this->resource_object->isEvaluated) {
+            // write compiled template
+            Smarty_Internal_Write_File::writeFile($this->getCompiledFilepath(), $this->compiled_template, $this->smarty);
         } 
         if ($this->smarty->debugging) {
             Smarty_Internal_Debug::end_compile($this);
@@ -273,12 +283,12 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Returns the filepath of the cached template output
-    * 
-    * The filepath is determined by the actual cache resource
-    * 
-    * @return string the cache filepath
-    */
+     * Returns the filepath of the cached template output
+     * 
+     * The filepath is determined by the actual cache resource
+     * 
+     * @return string the cache filepath
+     */
     public function getCachedFilepath ()
     {
         return $this->cached_filepath === null ?
@@ -287,12 +297,12 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Returns the timpestamp of the cached template output
-    * 
-    * The timestamp is determined by the actual cache resource
-    * 
-    * @return integer the template timestamp
-    */
+     * Returns the timpestamp of the cached template output
+     * 
+     * The timestamp is determined by the actual cache resource
+     * 
+     * @return integer the template timestamp
+     */
     public function getCachedTimestamp ()
     {
         return $this->cached_timestamp === null ?
@@ -301,10 +311,10 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Returns the cached template output
-    * 
-    * @return string |booelan the template content or false if the file does not exist
-    */
+     * Returns the cached template output
+     * 
+     * @return string |booelan the template content or false if the file does not exist
+     */
     public function getCachedContent ()
     {
         return $this->rendered_content === null ?
@@ -313,8 +323,8 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Writes the cached template output
-    */
+     * Writes the cached template output
+     */
     public function writeCachedContent ($content)
     {
         if ($this->resource_object->isEvaluated || !($this->caching == SMARTY_CACHING_LIFETIME_CURRENT || $this->caching == SMARTY_CACHING_LIFETIME_SAVED)) {
@@ -326,19 +336,19 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Checks of a valid version redered HTML output is in the cache
-    * 
-    * If the cache is valid the contents is stored in the template object
-    * 
-    * @return boolean true if cache is valid
-    */
+     * Checks of a valid version redered HTML output is in the cache
+     * 
+     * If the cache is valid the contents is stored in the template object
+     * 
+     * @return boolean true if cache is valid
+     */
     public function isCached ()
     {
         if ($this->isCached === null) {
             $this->isCached = false;
             if (($this->caching == SMARTY_CACHING_LIFETIME_CURRENT || $this->caching == SMARTY_CACHING_LIFETIME_SAVED) && !$this->resource_object->isEvaluated) {
                 if (!isset($this->cache_resource_object)) {
-                    $this->cache_resource_object = $this->smarty->loadCacheResource();
+                    $this->cache_resource_object = $this->smarty->cache->loadResource();
                 } 
                 $cachedTimestamp = $this->getCachedTimestamp();
                 if ($cachedTimestamp === false || $this->force_compile || $this->force_cache) {
@@ -357,7 +367,7 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
                         return $this->isCached;
                     } 
                     $this->cacheFileChecked = true;
-                    if ($this->caching === SMARTY_CACHING_LIFETIME_SAVED && $this->properties['cache_lifetime'] > 0 && (time() > ($this->getCachedTimestamp() + $this->properties['cache_lifetime']))) {
+                    if ($this->caching === SMARTY_CACHING_LIFETIME_SAVED && $this->properties['cache_lifetime'] >= 0 && (time() > ($this->getCachedTimestamp() + $this->properties['cache_lifetime']))) {
                         $this->rendered_content = null;
                         return $this->isCached;
                     } 
@@ -385,12 +395,12 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Render the output using the compiled template or the PHP template source
-    * 
-    * The rendering process is accomplished by just including the PHP files.
-    * The only exceptions are evaluated templates (string template). Their code has 
-    * to be evaluated
-    */
+     * Render the output using the compiled template or the PHP template source
+     * 
+     * The rendering process is accomplished by just including the PHP files.
+     * The only exceptions are evaluated templates (string template). Their code has 
+     * to be evaluated
+     */
     public function renderTemplate ()
     {
         if ($this->resource_object->usesCompiler) {
@@ -504,13 +514,13 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Returns the rendered HTML output 
-    * 
-    * If the cache is valid the cached content is used, otherwise
-    * the output is rendered from the compiled template or PHP template source
-    * 
-    * @return string rendered HTML output
-    */
+     * Returns the rendered HTML output 
+     * 
+     * If the cache is valid the cached content is used, otherwise
+     * the output is rendered from the compiled template or PHP template source
+     * 
+     * @return string rendered HTML output
+     */
     public function getRenderedTemplate ()
     { 
         // disable caching for evaluated code
@@ -530,14 +540,14 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Parse a template resource in its name and type
-    * Load required resource handler
-    * 
-    * @param string $template_resource template resource specification
-    * @param string $resource_type return resource type
-    * @param string $resource_name return resource name
-    * @param object $resource_handler return resource handler object
-    */
+     * Parse a template resource in its name and type
+     * Load required resource handler
+     * 
+     * @param string $template_resource template resource specification
+     * @param string $resource_type return resource type
+     * @param string $resource_name return resource name
+     * @param object $resource_handler return resource handler object
+     */
     public function parseResourceName($template_resource, &$resource_type, &$resource_name, &$resource_handler)
     {
         if (empty($template_resource))
@@ -554,8 +564,8 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * get system filepath to template
-    */
+     * get system filepath to template
+     */
     public function buildTemplateFilepath ($file = null)
     {
         if ($file == null) {
@@ -590,8 +600,8 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Update Smarty variables in other scopes
-    */
+     * Update Smarty variables in other scopes
+     */
     public function updateParentVariables ($scope = SMARTY_LOCAL_SCOPE)
     {
         $has_root = false;
@@ -645,12 +655,12 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Split a template resource in its name and type
-    * 
-    * @param string $template_resource template resource specification
-    * @param string $resource_type return resource type
-    * @param string $resource_name return resource name
-    */
+     * Split a template resource in its name and type
+     * 
+     * @param string $template_resource template resource specification
+     * @param string $resource_type return resource type
+     * @param string $resource_name return resource name
+     */
     protected function getResourceTypeName ($template_resource, &$resource_type, &$resource_name)
     {
         if (strpos($template_resource, ':') === false) {
@@ -671,11 +681,11 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Load template resource handler by type
-    * 
-    * @param string $resource_type template resource type
-    * @return object resource handler object
-    */
+     * Load template resource handler by type
+     * 
+     * @param string $resource_type template resource type
+     * @return object resource handler object
+     */
     protected function loadTemplateResourceHandler ($resource_type)
     { 
         // try registered resource
@@ -718,8 +728,8 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Create property header
-    */
+     * Create property header
+     */
     public function createPropertyHeader ($cache = false)
     {
         $plugins_string = ''; 
@@ -769,8 +779,8 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * Decode saved properties from compiled template and cache files
-    */
+     * Decode saved properties from compiled template and cache files
+     */
     public function decodeProperties ($properties)
     {
         $this->has_nocache_code = $properties['has_nocache_code'];
@@ -788,25 +798,76 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     } 
 
     /**
-    * wrapper for display
-    */
+     * wrapper for display
+     */
     public function display ()
     {
         return $this->smarty->display($this);
     } 
 
     /**
-    * wrapper for fetch
-    */
+     * wrapper for fetch
+     */
     public function fetch ()
     {
         return $this->smarty->fetch($this);
     } 
+
+    /**
+     * lazy loads (valid) property objects
+     * 
+     * @param string $name property name
+     */
+    public function __get($name)
+    {
+        if (in_array($name, array('register', 'unregister', 'utility', 'cache'))) {
+            $class = "Smarty_Internal_" . ucfirst($name);
+            $this->$name = new $class($this);
+            return $this->$name;
+        } else if ($name == '_version') {
+            // Smarty 2 BC
+            $this->_version = self::SMARTY_VERSION;
+            return $this->_version;
+        } 
+        return null;
+    } 
+
+    /**
+     * Takes unknown class methods and lazy loads sysplugin files for them
+     * class name format: Smarty_Method_MethodName
+     * plugin filename format: method.methodname.php
+     * 
+     * @param string $name unknown methode name
+     * @param array $args aurgument array
+     */
+    public function __call($name, $args)
+    {
+        static $camel_func;
+        if (!isset($camel_func))
+            $camel_func = create_function('$c', 'return "_" . strtolower($c[1]);'); 
+        // see if this is a set/get for a property
+        $first3 = strtolower(substr($name, 0, 3));
+        if (in_array($first3, array('set', 'get')) && substr($name, 3, 1) !== '_') {
+            // 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])/', $camel_func, $property_name);
+            if (!property_exists($this, $property_name)) {
+                throw new Exception("property '$property_name' does not exist.");
+                return false;
+            } 
+            if ($first3 == 'get')
+                return $this->$property_name;
+            else
+                return $this->$property_name = $args[0];
+        } 
+    } 
 } 
 
 /**
-* wrapper for template class
-*/
+ * wrapper for template class
+ */
 class Smarty_Template extends Smarty_Internal_Template {
 } 
 
diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_templatecompilerbase.php b/gosa-core/include/smarty/sysplugins/smarty_internal_templatecompilerbase.php
index 0b008903f..c41d7750a 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_templatecompilerbase.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_templatecompilerbase.php
@@ -50,8 +50,6 @@ class Smarty_Internal_TemplateCompilerBase {
         // flag for nochache sections
         $this->nocache = false;
         $this->tag_nocache = false; 
-        // assume successfull compiling
-        $this->compile_error = false; 
         // save template object in compiler class
         $this->template = $template;
         $this->smarty->_current_file = $this->template->getTemplateFilepath(); 
@@ -69,7 +67,7 @@ class Smarty_Internal_TemplateCompilerBase {
             $_content = $template->getTemplateSource(); 
             // run prefilter if required
             if (isset($this->smarty->autoload_filters['pre']) || isset($this->smarty->registered_filters['pre'])) {
-                $_content = Smarty_Internal_Filter_Handler::runFilter('pre', $_content, $this->smarty);
+                $_content = Smarty_Internal_Filter_Handler::runFilter('pre', $_content, $this->smarty, $template);
             } 
             // on empty template just return header
             if ($_content == '') {
@@ -82,22 +80,16 @@ class Smarty_Internal_TemplateCompilerBase {
             } 
             // call compiler
             $_compiled_code = $this->doCompile($_content);
-        } while ($this->abort_and_recompile);
-        if (!$this->compile_error) {
-            // return compiled code to template object
-            if ($template->suppressFileDependency) {
-                $template->compiled_template = $_compiled_code;
-            } else {
-                $template->compiled_template = $template_header . $template->createPropertyHeader() . $_compiled_code;
-            } 
-            // run postfilter if required
-            if (isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) {
-                $template->compiled_template = Smarty_Internal_Filter_Handler::runFilter('post', $template->compiled_template, $this->smarty);
-            } 
-            return true;
+        } while ($this->abort_and_recompile); 
+        // return compiled code to template object
+        if ($template->suppressFileDependency) {
+            $template->compiled_template = $_compiled_code;
         } else {
-            // compilation error
-            return false;
+            $template->compiled_template = $template_header . $template->createPropertyHeader() . $_compiled_code;
+        } 
+        // run postfilter if required
+        if (isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) {
+            $template->compiled_template = Smarty_Internal_Filter_Handler::runFilter('post', $template->compiled_template, $this->smarty, $template);
         } 
     } 
 
@@ -290,7 +282,7 @@ class Smarty_Internal_TemplateCompilerBase {
         } 
         if (isset($function)) {
             if ($type == 'modifier') {
-                $this->template->saved_modifer[$plugin_name] = true;
+                $this->template->saved_modifier[$plugin_name] = true;
             } 
             return $function;
         } 
@@ -306,7 +298,7 @@ class Smarty_Internal_TemplateCompilerBase {
          * } 
          * } 
          * if ($type == 'modifier') {
-         * $this->template->saved_modifer[$plugin_name] = true;
+         * $this->template->saved_modifier[$plugin_name] = true;
          * } 
          * return $this->template->required_plugins_call[$plugin_name][$type];
          * }
@@ -342,7 +334,7 @@ class Smarty_Internal_TemplateCompilerBase {
              * }
              */
             if ($type == 'modifier') {
-                $this->template->saved_modifer[$plugin_name] = true;
+                $this->template->saved_modifier[$plugin_name] = true;
             } 
             return $function;
         } 
@@ -376,13 +368,13 @@ class Smarty_Internal_TemplateCompilerBase {
                 $_output = str_replace("'", "\'", $content);
                 $_output = "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/" . $_output . "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>"; 
                 // make sure we include modifer plugins for nocache code
-                if (isset($this->template->saved_modifer)) {
-                    foreach ($this->template->saved_modifer as $plugin_name => $dummy) {
+                if (isset($this->template->saved_modifier)) {
+                    foreach ($this->template->saved_modifier 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'];
                         } 
                     } 
-                    unset($this->template->saved_modifer);
+                    $this->template->saved_modifier = null;
                 } 
             } else {
                 $_output = $content;
@@ -429,9 +421,7 @@ class Smarty_Internal_TemplateCompilerBase {
             // output parser error message
             $error_text .= ' - Unexpected "' . $this->lex->value . '", expected one of: ' . implode(' , ', $expect);
         } 
-        throw new Exception($error_text); 
-        // set error flag
-        $this->compile_error = true;
+        throw new Exception($error_text);
     } 
 } 
 
diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_templatelexer.php b/gosa-core/include/smarty/sysplugins/smarty_internal_templatelexer.php
index 4a9ab5788..e28e67191 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_templatelexer.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_templatelexer.php
@@ -73,8 +73,6 @@ class Smarty_Internal_Templatelexer
      				'LITERALEND' => 'literal close',
     				'AS' => 'as',
     				'TO' => 'to',
-    				'NULL' => 'null',
-    				'BOOLEAN' => 'boolean'
     				);
     				
     				
@@ -143,13 +141,14 @@ class Smarty_Internal_Templatelexer
               10 => 0,
               11 => 0,
               12 => 0,
-              13 => 2,
-              16 => 0,
+              13 => 0,
+              14 => 2,
+              17 => 0,
             );
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/^(\\{\\})|^(".$this->ldel."\\*([\S\s]*?)\\*".$this->rdel.")|^(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|^([\t ]*[\r\n]+[\t ]*)|^(".$this->ldel."strip".$this->rdel.")|^(".$this->ldel."\/strip".$this->rdel.")|^(".$this->ldel."literal".$this->rdel.")|^(".$this->ldel."\\s{1,}\/)|^(".$this->ldel."\\s{1,})|^(".$this->ldel."\/)|^(".$this->ldel.")|^(([\S\s]*?)(?=([\t ]*[\r\n]+[\t ]*|".$this->ldel."|<\\?)))|^([\S\s]+)/";
+        $yy_global_pattern = "/^(\\{\\})|^(".$this->ldel."\\*([\S\s]*?)\\*".$this->rdel.")|^(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|^(\\?>)|^([\t ]*[\r\n]+[\t ]*)|^(".$this->ldel."strip".$this->rdel.")|^(".$this->ldel."\/strip".$this->rdel.")|^(".$this->ldel."literal".$this->rdel.")|^(".$this->ldel."\\s{1,}\/)|^(".$this->ldel."\\s{1,})|^(".$this->ldel."\/)|^(".$this->ldel.")|^(([\S\s]*?)(?=([\t ]*[\r\n]+[\t ]*|".$this->ldel."|<\\?|\\?>)))|^([\S\s]+)/";
 
         do {
             if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
@@ -214,7 +213,6 @@ class Smarty_Internal_Templatelexer
 
   if (in_array($this->value, Array('<?', '<?=', '<?php'))) {
     $this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG;
-        $this->yypushstate(self::PHP);
   } elseif ($this->value == '<?xml') {
       $this->token = Smarty_Internal_Templateparser::TP_XMLTAG;
   } else {
@@ -225,31 +223,36 @@ class Smarty_Internal_Templatelexer
     function yy_r1_5($yy_subpatterns)
     {
 
+  $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
+    }
+    function yy_r1_6($yy_subpatterns)
+    {
+
   if ($this->strip) {
      return false;
   } else {
      $this->token = Smarty_Internal_Templateparser::TP_OTHER;
   }
     }
-    function yy_r1_6($yy_subpatterns)
+    function yy_r1_7($yy_subpatterns)
     {
 
   $this->strip = true;
   return false;
     }
-    function yy_r1_7($yy_subpatterns)
+    function yy_r1_8($yy_subpatterns)
     {
 
   $this->strip = false;
   return false;
     }
-    function yy_r1_8($yy_subpatterns)
+    function yy_r1_9($yy_subpatterns)
     {
 
    $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
    $this->yypushstate(self::LITERAL);
     }
-    function yy_r1_9($yy_subpatterns)
+    function yy_r1_10($yy_subpatterns)
     {
 
   if ($this->smarty->auto_literal) {
@@ -260,7 +263,7 @@ class Smarty_Internal_Templatelexer
      $this->taglineno = $this->line;
   }
     }
-    function yy_r1_10($yy_subpatterns)
+    function yy_r1_11($yy_subpatterns)
     {
 
   if ($this->smarty->auto_literal) {
@@ -271,26 +274,26 @@ class Smarty_Internal_Templatelexer
      $this->taglineno = $this->line;
   }
     }
-    function yy_r1_11($yy_subpatterns)
+    function yy_r1_12($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
      $this->yypushstate(self::SMARTY);
      $this->taglineno = $this->line;
     }
-    function yy_r1_12($yy_subpatterns)
+    function yy_r1_13($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_LDEL;
      $this->yypushstate(self::SMARTY);
      $this->taglineno = $this->line;
     }
-    function yy_r1_13($yy_subpatterns)
+    function yy_r1_14($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_OTHER;
     }
-    function yy_r1_16($yy_subpatterns)
+    function yy_r1_17($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_OTHER;
@@ -314,8 +317,7 @@ class Smarty_Internal_Templatelexer
               15 => 0,
               16 => 0,
               17 => 0,
-              18 => 0,
-              19 => 0,
+              18 => 1,
               20 => 1,
               22 => 1,
               24 => 1,
@@ -326,7 +328,8 @@ class Smarty_Internal_Templatelexer
               34 => 1,
               36 => 1,
               38 => 1,
-              40 => 1,
+              40 => 0,
+              41 => 0,
               42 => 0,
               43 => 0,
               44 => 0,
@@ -335,19 +338,19 @@ class Smarty_Internal_Templatelexer
               47 => 0,
               48 => 0,
               49 => 0,
-              50 => 0,
-              51 => 0,
-              52 => 3,
+              50 => 3,
+              54 => 0,
+              55 => 0,
               56 => 0,
               57 => 0,
               58 => 0,
               59 => 0,
               60 => 0,
-              61 => 0,
-              62 => 0,
+              61 => 1,
               63 => 1,
               65 => 1,
-              67 => 1,
+              67 => 0,
+              68 => 0,
               69 => 0,
               70 => 0,
               71 => 0,
@@ -359,20 +362,18 @@ class Smarty_Internal_Templatelexer
               77 => 0,
               78 => 0,
               79 => 0,
-              80 => 0,
-              81 => 0,
-              82 => 1,
+              80 => 1,
+              82 => 0,
+              83 => 0,
               84 => 0,
               85 => 0,
               86 => 0,
               87 => 0,
-              88 => 0,
-              89 => 0,
             );
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/^('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|^(".$this->ldel."\\s{1,}\/)|^(".$this->ldel."\\s{1,})|^(\\s{1,}".$this->rdel.")|^(".$this->ldel."\/)|^(".$this->ldel.")|^(".$this->rdel.")|^(\\s+is\\s+in\\s+)|^(\\s+(AS|as)\\s+)|^(\\s+(to)\\s+)|^(\\s+(step)\\s+)|^(\\s+instanceof\\s+)|^(true|TRUE|True|false|FALSE|False)|^(null|NULL|Null)|^(\\s*===\\s*)|^(\\s*!==\\s*)|^(\\s*==\\s*|\\s+(EQ|eq)\\s+)|^(\\s*!=\\s*|\\s*<>\\s*|\\s+(NE|NEQ|ne|neq)\\s+)|^(\\s*>=\\s*|\\s+(GE|GTE|ge|gte)\\s+)|^(\\s*<=\\s*|\\s+(LE|LTE|le|lte)\\s+)|^(\\s*>\\s*|\\s+(GT|gt)\\s+)|^(\\s*<\\s*|\\s+(LT|lt)\\s+)|^(\\s+(MOD|mod)\\s+)|^(!\\s*|(NOT|not)\\s+)|^(\\s*&&\\s*|\\s*(AND|and)\\s+)|^(\\s*\\|\\|\\s*|\\s*(OR|or)\\s+)|^(\\s*(XOR|xor)\\s+)|^(\\s+is\\s+odd\\s+by\\s+)|^(\\s+is\\s+not\\s+odd\\s+by\\s+)|^(\\s+is\\s+odd)|^(\\s+is\\s+not\\s+odd)|^(\\s+is\\s+even\\s+by\\s+)|^(\\s+is\\s+not\\s+even\\s+by\\s+)|^(\\s+is\\s+even)|^(\\s+is\\s+not\\s+even)|^(\\s+is\\s+div\\s+by\\s+)|^(\\s+is\\s+not\\s+div\\s+by\\s+)|^(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\))|^(\\(\\s*)|^(\\s*\\))|^(\\[\\s*)|^(\\s*\\])|^(\\s*->\\s*)|^(\\s*=>\\s*)|^(\\s*=\\s*)|^((\\+\\+|--)\\s*)|^(\\s*(\\+|-)\\s*)|^(\\s*(\\*|\/|%)\\s*)|^(\\$)|^(\\s*;)|^(::)|^(\\s*:\\s*)|^(@)|^(#)|^(\")|^(`)|^(\\|)|^(\\.)|^(\\s*,\\s*)|^(\\s*&\\s*)|^(\\s*\\?\\s*)|^((if|elseif|else if|while)(?![^\s]))|^(foreach(?![^\s]))|^(for(?![^\s]))|^([0-9]*[a-zA-Z_]\\w*)|^(\\d+)|^(\\s+)|^(.)/";
+        $yy_global_pattern = "/^('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|^(".$this->ldel."\\s{1,}\/)|^(".$this->ldel."\\s{1,})|^(\\s{1,}".$this->rdel.")|^(".$this->ldel."\/)|^(".$this->ldel.")|^(".$this->rdel.")|^(\\s+is\\s+in\\s+)|^(\\s+(AS|as)\\s+)|^(\\s+(to)\\s+)|^(\\s+(step)\\s+)|^(\\s+instanceof\\s+)|^(\\s*===\\s*)|^(\\s*!==\\s*)|^(\\s*==\\s*|\\s+(EQ|eq)\\s+)|^(\\s*!=\\s*|\\s*<>\\s*|\\s+(NE|NEQ|ne|neq)\\s+)|^(\\s*>=\\s*|\\s+(GE|GTE|ge|gte)\\s+)|^(\\s*<=\\s*|\\s+(LE|LTE|le|lte)\\s+)|^(\\s*>\\s*|\\s+(GT|gt)\\s+)|^(\\s*<\\s*|\\s+(LT|lt)\\s+)|^(\\s+(MOD|mod)\\s+)|^(!\\s*|(NOT|not)\\s+)|^(\\s*&&\\s*|\\s*(AND|and)\\s+)|^(\\s*\\|\\|\\s*|\\s*(OR|or)\\s+)|^(\\s*(XOR|xor)\\s+)|^(\\s+is\\s+odd\\s+by\\s+)|^(\\s+is\\s+not\\s+odd\\s+by\\s+)|^(\\s+is\\s+odd)|^(\\s+is\\s+not\\s+odd)|^(\\s+is\\s+even\\s+by\\s+)|^(\\s+is\\s+not\\s+even\\s+by\\s+)|^(\\s+is\\s+even)|^(\\s+is\\s+not\\s+even)|^(\\s+is\\s+div\\s+by\\s+)|^(\\s+is\\s+not\\s+div\\s+by\\s+)|^(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\))|^(\\(\\s*)|^(\\s*\\))|^(\\[\\s*)|^(\\s*\\])|^(\\s*->\\s*)|^(\\s*=>\\s*)|^(\\s*=\\s*)|^((\\+\\+|--)\\s*)|^(\\s*(\\+|-)\\s*)|^(\\s*(\\*|\/|%)\\s*)|^(\\$)|^(\\s*;)|^(::)|^(\\s*:\\s*)|^(@)|^(#)|^(\")|^(`)|^(\\|)|^(\\.)|^(\\s*,\\s*)|^(\\s*&\\s*)|^(\\s*\\?\\s*)|^((if|elseif|else if|while)(?![^\s]))|^(foreach(?![^\s]))|^(for(?![^\s]))|^([0-9]*[a-zA-Z_]\\w*)|^(\\d+)|^(\\s+)|^(.)/";
 
         do {
             if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
@@ -507,298 +508,292 @@ class Smarty_Internal_Templatelexer
     function yy_r2_16($yy_subpatterns)
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_BOOLEAN;
-    }
-    function yy_r2_17($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_NULL;
-    }
-    function yy_r2_18($yy_subpatterns)
-    {
-
   $this->token = Smarty_Internal_Templateparser::TP_IDENTITY;
     }
-    function yy_r2_19($yy_subpatterns)
+    function yy_r2_17($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_NONEIDENTITY;
     }
-    function yy_r2_20($yy_subpatterns)
+    function yy_r2_18($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_EQUALS;
     }
-    function yy_r2_22($yy_subpatterns)
+    function yy_r2_20($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_NOTEQUALS;
     }
-    function yy_r2_24($yy_subpatterns)
+    function yy_r2_22($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_GREATEREQUAL;
     }
-    function yy_r2_26($yy_subpatterns)
+    function yy_r2_24($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_LESSEQUAL;
     }
-    function yy_r2_28($yy_subpatterns)
+    function yy_r2_26($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_GREATERTHAN;
     }
-    function yy_r2_30($yy_subpatterns)
+    function yy_r2_28($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_LESSTHAN;
     }
-    function yy_r2_32($yy_subpatterns)
+    function yy_r2_30($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_MOD;
     }
-    function yy_r2_34($yy_subpatterns)
+    function yy_r2_32($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_NOT;
     }
-    function yy_r2_36($yy_subpatterns)
+    function yy_r2_34($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_LAND;
     }
-    function yy_r2_38($yy_subpatterns)
+    function yy_r2_36($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_LOR;
     }
-    function yy_r2_40($yy_subpatterns)
+    function yy_r2_38($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_LXOR;
     }
-    function yy_r2_42($yy_subpatterns)
+    function yy_r2_40($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_ISODDBY;
     }
-    function yy_r2_43($yy_subpatterns)
+    function yy_r2_41($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_ISNOTODDBY;
     }
-    function yy_r2_44($yy_subpatterns)
+    function yy_r2_42($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_ISODD;
     }
-    function yy_r2_45($yy_subpatterns)
+    function yy_r2_43($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_ISNOTODD;
     }
-    function yy_r2_46($yy_subpatterns)
+    function yy_r2_44($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_ISEVENBY;
     }
-    function yy_r2_47($yy_subpatterns)
+    function yy_r2_45($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVENBY;
     }
-    function yy_r2_48($yy_subpatterns)
+    function yy_r2_46($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_ISEVEN;
     }
-    function yy_r2_49($yy_subpatterns)
+    function yy_r2_47($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVEN;
     }
-    function yy_r2_50($yy_subpatterns)
+    function yy_r2_48($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_ISDIVBY;
     }
-    function yy_r2_51($yy_subpatterns)
+    function yy_r2_49($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_ISNOTDIVBY;
     }
-    function yy_r2_52($yy_subpatterns)
+    function yy_r2_50($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
     }
-    function yy_r2_56($yy_subpatterns)
+    function yy_r2_54($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_OPENP;
     }
-    function yy_r2_57($yy_subpatterns)
+    function yy_r2_55($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
     }
-    function yy_r2_58($yy_subpatterns)
+    function yy_r2_56($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_OPENB;
     }
-    function yy_r2_59($yy_subpatterns)
+    function yy_r2_57($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
     }
-    function yy_r2_60($yy_subpatterns)
+    function yy_r2_58($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_PTR; 
     }
-    function yy_r2_61($yy_subpatterns)
+    function yy_r2_59($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_APTR;
     }
-    function yy_r2_62($yy_subpatterns)
+    function yy_r2_60($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
     }
-    function yy_r2_63($yy_subpatterns)
+    function yy_r2_61($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
     }
-    function yy_r2_65($yy_subpatterns)
+    function yy_r2_63($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
     }
-    function yy_r2_67($yy_subpatterns)
+    function yy_r2_65($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_MATH;
     }
-    function yy_r2_69($yy_subpatterns)
+    function yy_r2_67($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
     }
-    function yy_r2_70($yy_subpatterns)
+    function yy_r2_68($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
     }
-    function yy_r2_71($yy_subpatterns)
+    function yy_r2_69($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
     }
-    function yy_r2_72($yy_subpatterns)
+    function yy_r2_70($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_COLON;
     }
-    function yy_r2_73($yy_subpatterns)
+    function yy_r2_71($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_AT;
     }
-    function yy_r2_74($yy_subpatterns)
+    function yy_r2_72($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_HATCH;
     }
-    function yy_r2_75($yy_subpatterns)
+    function yy_r2_73($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
   $this->yypushstate(self::DOUBLEQUOTEDSTRING);
     }
-    function yy_r2_76($yy_subpatterns)
+    function yy_r2_74($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
   $this->yypopstate();
     }
-    function yy_r2_77($yy_subpatterns)
+    function yy_r2_75($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_VERT;
     }
-    function yy_r2_78($yy_subpatterns)
+    function yy_r2_76($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_DOT;
     }
-    function yy_r2_79($yy_subpatterns)
+    function yy_r2_77($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_COMMA;
     }
-    function yy_r2_80($yy_subpatterns)
+    function yy_r2_78($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_ANDSYM;
     }
-    function yy_r2_81($yy_subpatterns)
+    function yy_r2_79($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_QMARK;
     }
-    function yy_r2_82($yy_subpatterns)
+    function yy_r2_80($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_IF;
     }
-    function yy_r2_84($yy_subpatterns)
+    function yy_r2_82($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_FOREACH;
     }
-    function yy_r2_85($yy_subpatterns)
+    function yy_r2_83($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_FOR;
     }
-    function yy_r2_86($yy_subpatterns)
+    function yy_r2_84($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_ID;
     }
-    function yy_r2_87($yy_subpatterns)
+    function yy_r2_85($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
     }
-    function yy_r2_88($yy_subpatterns)
+    function yy_r2_86($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_SPACE;
     }
-    function yy_r2_89($yy_subpatterns)
+    function yy_r2_87($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_OTHER;
     }
 
 
+
     function yylex3()
     {
         $tokenMap = array (
               1 => 0,
-              2 => 1,
+              2 => 0,
+              3 => 0,
               4 => 0,
+              5 => 2,
+              8 => 0,
             );
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/^(\\?>)|^([\s\S]+?(\\?>|\/\\*|'|\"|<<<\\s*'?\\w+'?\r?\n|\/\/|#))|^([\S\s]+)/";
+        $yy_global_pattern = "/^(".$this->ldel."literal".$this->rdel.")|^(".$this->ldel."\/literal".$this->rdel.")|^(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|^(\\?>)|^(([\S\s]*?)(?=(".$this->ldel."\/?literal".$this->rdel."|<\\?)))|^([\S\s]+)/";
 
         do {
             if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
@@ -807,7 +802,7 @@ class Smarty_Internal_Templatelexer
                 if (!count($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
                         'an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state PHP');
+                        $this->counter, 5) . '... state LITERAL');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -847,139 +842,64 @@ class Smarty_Internal_Templatelexer
     } // end function
 
 
-    const PHP = 3;
+    const LITERAL = 3;
     function yy_r3_1($yy_subpatterns)
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
-  $this->yypopstate();
+  $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
+  $this->yypushstate(self::LITERAL);
     }
     function yy_r3_2($yy_subpatterns)
     {
 
-   switch ($yy_subpatterns[0]) {
-   case '?>':
-      $this->token = Smarty_Internal_Templateparser::TP_PHP_CODE;
-      $this->value = substr($this->value, 0, -2);
-      break;
-   case "'":
-      $this->token = Smarty_Internal_Templateparser::TP_PHP_CODE;
-      $this->yypushstate(self::PHP_SINGLE_QUOTED_STRING);
-      break;
-   case '"':
-      $this->token = Smarty_Internal_Templateparser::TP_PHP_CODE_START_DOUBLEQUOTE;
-      $this->yypushstate(self::PHP_DOUBLE_QUOTED_STRING);
-      break;
-   case '/*':
-      $this->token = Smarty_Internal_Templateparser::TP_PHP_CODE;
-      $this->yypushstate(self::PHP_ML_COMMENT);
-      break;
-   case '//':
-   case '#':
-      $this->token = Smarty_Internal_Templateparser::TP_PHP_CODE;
-      $this->yypushstate(self::PHP_SL_COMMENT);
-      break;
-   default:
-      $res = preg_match('/\A<<<\s*\'?(\w+)(\'?)\r?\n\z/', $yy_subpatterns[0], $matches);
-      assert($res === 1);
-      $is_nowdoc = $matches[2] === "'";
-      $this->token = $is_nowdoc
-        ? Smarty_Internal_Templateparser::TP_PHP_NOWDOC_START
-        : Smarty_Internal_Templateparser::TP_PHP_HEREDOC_START;
-      $this->heredoc_id_stack[] = $matches[1];
-      $this->yypushstate($is_nowdoc ? self::PHP_NOWDOC : self::PHP_HEREDOC);
-      break;
-   }
+  $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+  $this->yypopstate();
     }
-    function yy_r3_4($yy_subpatterns)
+    function yy_r3_3($yy_subpatterns)
     {
 
-  $this->compiler->trigger_template_error ("missing PHP end tag");
+  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 yylex4()
+    function yy_r3_4($yy_subpatterns)
     {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-            );
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/^([\s\S]*\\*\/)|^([\S\s]+)/";
-
-        do {
-            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
-                $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 PHP_ML_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 PHP_ML_COMMENT = 4;
-    function yy_r4_1($yy_subpatterns)
+  $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+    }
+    function yy_r3_5($yy_subpatterns)
     {
 
-  $this->token = Smarty_Internal_Templateparser::TP_PHP_CODE;  
-  $this->yypopstate();
+  $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
     }
-    function yy_r4_2($yy_subpatterns)
+    function yy_r3_8($yy_subpatterns)
     {
 
-  $this->compiler->trigger_template_error("missing PHP comment end */");
+  $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
     }
 
 
-    function yylex5()
+    function yylex4()
     {
         $tokenMap = array (
               1 => 0,
               2 => 0,
+              3 => 0,
+              4 => 0,
+              5 => 0,
+              6 => 0,
+              7 => 0,
+              8 => 0,
+              9 => 3,
+              13 => 0,
             );
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/^(.+?(?=\\?>|\n))|^([\S\s]+)/";
+        $yy_global_pattern = "/^(".$this->ldel."\\s{1,}\/)|^(".$this->ldel."\\s{1,})|^(".$this->ldel."\/)|^(".$this->ldel.")|^(\")|^(`\\$)|^(\\$[0-9]*[a-zA-Z_]\\w*)|^(\\$)|^(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(".$this->ldel."|\\$|`\\$|\")))|^([\S\s]+)/";
 
         do {
             if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
@@ -988,7 +908,7 @@ class Smarty_Internal_Templatelexer
                 if (!count($yymatches)) {
                     throw new Exception('Error: lexing failed because a rule matched' .
                         'an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state PHP_SL_COMMENT');
+                        $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
                 }
                 next($yymatches); // skip global match
                 $this->token = key($yymatches); // token number
@@ -1000,7 +920,7 @@ class Smarty_Internal_Templatelexer
                     $yysubmatches = array();
                 }
                 $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r5_' . $this->token}($yysubmatches);
+                $r = $this->{'yy_r4_' . $this->token}($yysubmatches);
                 if ($r === null) {
                     $this->counter += strlen($this->value);
                     $this->line += substr_count($this->value, "\n");
@@ -1028,718 +948,19 @@ class Smarty_Internal_Templatelexer
     } // end function
 
 
-    const PHP_SL_COMMENT = 5;
-    function yy_r5_1($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PHP_CODE;  
-  $this->yypopstate();
-    }
-    function yy_r5_2($yy_subpatterns)
+    const DOUBLEQUOTEDSTRING = 4;
+    function yy_r4_1($yy_subpatterns)
     {
 
-  /* this can happen for "//?>" */
-  $this->yypopstate();
-  return true;
+  if ($this->smarty->auto_literal) {
+     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
+  } else {
+     $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+     $this->yypushstate(self::SMARTY);
+     $this->taglineno = $this->line;
+  }
     }
-
-
-    function yylex6()
-    {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-            );
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/^([^\n]*\n)|^([\S\s]+)/";
-
-        do {
-            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
-                $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 PHP_NOWDOC');
-                }
-                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 PHP_NOWDOC = 6;
-    function yy_r6_1($yy_subpatterns)
-    {
-
-  $heredoc_id = $this->heredoc_id_stack[sizeof($this->heredoc_id_stack)-1];
-  if (   $this->value === $heredoc_id."\n"
-      || $this->value === $heredoc_id."\r\n"
-      || $this->value === $heredoc_id.";\n"
-      || $this->value === $heredoc_id.";\r\n"
-     ) {
-    $this->token = Smarty_Internal_Templateparser::TP_PHP_NOWDOC_END;
-    array_pop($this->heredoc_id_stack);
-    $this->yypopstate();
-  } else {
-    $this->token = Smarty_Internal_Templateparser::TP_PHP_DQ_CONTENT;
-  }
-    }
-    function yy_r6_2($yy_subpatterns)
-    {
-
-  $this->compiler->trigger_template_error("missing PHP NOWDOC end");
-    }
-
-
-    function yylex7()
-    {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-            );
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/^(\\{\\$|\\{\\$)|^([^\n]*\n)|^([\S\s]+)/";
-
-        do {
-            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
-                $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 PHP_HEREDOC');
-                }
-                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_r7_' . $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 PHP_HEREDOC = 7;
-    function yy_r7_1($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PHP_DQ_EMBED_START;
-  $this->yypushstate(self::PHP_RETURNING_TO_HEREDOC_FROM_EMBEDDED);    
-  $this->yypushstate(self::PHP_DOUBLE_QUOTED_STRING_EMBEDDED);    
-    }
-    function yy_r7_2($yy_subpatterns)
-    {
-
-  $heredoc_id = $this->heredoc_id_stack[sizeof($this->heredoc_id_stack)-1];
-  if (   $this->value === $heredoc_id."\n"
-      || $this->value === $heredoc_id."\r\n"
-      || $this->value === $heredoc_id.";\n"
-      || $this->value === $heredoc_id.";\r\n"
-     ) {
-    $this->token = Smarty_Internal_Templateparser::TP_PHP_HEREDOC_END;
-    array_pop($this->heredoc_id_stack);
-    $this->yypopstate();
-  } else {
-    $this->token = Smarty_Internal_Templateparser::TP_PHP_DQ_CONTENT;
-    if (preg_match('/(.*?)(\{\$\|\$\{)/', $this->value, $matches)) {
-      $this->value = $matches[1];
-    }
-  }
-    }
-    function yy_r7_3($yy_subpatterns)
-    {
-
-  $this->compiler->trigger_template_error("missing PHP HEREDOC end");
-    }
-
-
-    function yylex8()
-    {
-        $tokenMap = array (
-              1 => 0,
-            );
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/^([^\n]*\n)/";
-
-        do {
-            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
-                $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 PHP_RETURNING_TO_HEREDOC_FROM_EMBEDDED');
-                }
-                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_r8_' . $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 PHP_RETURNING_TO_HEREDOC_FROM_EMBEDDED = 8;
-    function yy_r8_1($yy_subpatterns)
-    {
-
-  $this->yypopstate();
-  $heredoc_id = $this->heredoc_id_stack[sizeof($this->heredoc_id_stack)-1];
-  if (   $this->value === $heredoc_id."\n"
-      || $this->value === $heredoc_id."\r\n"
-      || $this->value === $heredoc_id.";\n"
-      || $this->value === $heredoc_id.";\r\n"
-     ) {
-    //Make sure it isn't interpreted as HEREDOC end.
-    $this->token = Smarty_Internal_Templateparser::TP_PHP_DQ_CONTENT;
-  } else {
-    return true; //retry in PHP_HEREDOC state
-  }
-    }
-
-
-    function yylex9()
-    {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-            );
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/^((?:[^\\\\']|\\\\.)*')|^([\S\s]+)/";
-
-        do {
-            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
-                $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 PHP_SINGLE_QUOTED_STRING');
-                }
-                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_r9_' . $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 PHP_SINGLE_QUOTED_STRING = 9;
-    function yy_r9_1($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PHP_CODE;  
-  $this->yypopstate();
-    }
-    function yy_r9_2($yy_subpatterns)
-    {
-
-  $this->compiler->trigger_template_error("missing PHP single quoted string end");
-    }
-
-
-    function yylex10()
-    {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-              4 => 0,
-            );
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/^(\\{\\$|\\{\\$)|^(\")|^((?:\\\\.|[^\"\\\\])+?(?=\"|\\{\\$|\\$\\{))|^([\S\s]+)/";
-
-        do {
-            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
-                $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 PHP_DOUBLE_QUOTED_STRING');
-                }
-                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_r10_' . $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 PHP_DOUBLE_QUOTED_STRING = 10;
-    function yy_r10_1($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PHP_DQ_EMBED_START;
-  $this->yypushstate(self::PHP_DOUBLE_QUOTED_STRING_EMBEDDED);
-    }
-    function yy_r10_2($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PHP_CODE_DOUBLEQUOTE;
-  $this->yypopstate();
-    }
-    function yy_r10_3($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PHP_DQ_CONTENT;
-    }
-    function yy_r10_4($yy_subpatterns)
-    {
-
-  $this->compiler->trigger_template_error("missing PHP double quoted string end");
-    }
-
-
-    function yylex11()
-    {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-              4 => 0,
-              5 => 0,
-              6 => 0,
-            );
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/^(\")|^(')|^(<<<\\s*\\w+\r?\n)|^(<<<\\s*'\\w+'\r?\n)|^(\\})|^([^'\"}]+?(?='|\"|\\}|<<<\\s*'?\\w+'?\r?\n))/";
-
-        do {
-            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
-                $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 PHP_DOUBLE_QUOTED_STRING_EMBEDDED');
-                }
-                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_r11_' . $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 PHP_DOUBLE_QUOTED_STRING_EMBEDDED = 11;
-    function yy_r11_1($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PHP_CODE_START_DOUBLEQUOTE;
-  $this->yypushstate(self::PHP_DOUBLE_QUOTED_STRING);
-    }
-    function yy_r11_2($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PHP_CODE;
-  $this->yypushstate(self::PHP_SINGLE_QUOTED_STRING);
-    }
-    function yy_r11_3($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PHP_HEREDOC_START;
-  $res = preg_match('/\A\<\<\<\s*(\w+)\r?\n\z/', $this->value, $matches);
-  assert($res === 1);
-  $this->heredoc_id_stack[] = $matches[1];
-  $this->yypushstate(self::PHP_HEREDOC);
-    }
-    function yy_r11_4($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PHP_NOWDOC_START;
-  $res = preg_match('/\A\<\<\<\s*\'(\w+)\'\r?\n\z/', $this->value, $matches);
-  assert($res === 1);
-  $this->heredoc_id_stack[] = $matches[1];
-  $this->yypushstate(self::PHP_NOWDOC);
-    }
-    function yy_r11_5($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PHP_DQ_EMBED_END;
-  $this->yypopstate();
-    }
-    function yy_r11_6($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PHP_CODE;
-    }
-
-
-
-    function yylex12()
-    {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-              4 => 0,
-              5 => 2,
-              8 => 0,
-            );
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/^(".$this->ldel."literal".$this->rdel.")|^(".$this->ldel."\/literal".$this->rdel.")|^(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|^(\\?>)|^(([\S\s]*?)(?=(".$this->ldel."\/?literal".$this->rdel."|<\\?)))|^([\S\s]+)/";
-
-        do {
-            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
-                $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_r12_' . $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 = 12;
-    function yy_r12_1($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
-  $this->yypushstate(self::LITERAL);
-    }
-    function yy_r12_2($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
-  $this->yypopstate();
-    }
-    function yy_r12_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_r12_4($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
-    }
-    function yy_r12_5($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
-    }
-    function yy_r12_8($yy_subpatterns)
-    {
-
-  $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
-    }
-
-
-    function yylex13()
-    {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-              4 => 0,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-              9 => 3,
-              13 => 0,
-            );
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/^(".$this->ldel."\\s{1,}\/)|^(".$this->ldel."\\s{1,})|^(".$this->ldel."\/)|^(".$this->ldel.")|^(\")|^(`\\$)|^(\\$[0-9]*[a-zA-Z_]\\w*)|^(\\$)|^(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(".$this->ldel."|\\$|`\\$|\")))|^([\S\s]+)/";
-
-        do {
-            if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {
-                $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_r13_' . $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 = 13;
-    function yy_r13_1($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_OTHER;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r13_2($yy_subpatterns)
+    function yy_r4_2($yy_subpatterns)
     {
 
   if ($this->smarty->auto_literal) {
@@ -1750,27 +971,27 @@ class Smarty_Internal_Templatelexer
      $this->taglineno = $this->line;
   }
     }
-    function yy_r13_3($yy_subpatterns)
+    function yy_r4_3($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
      $this->yypushstate(self::SMARTY);
      $this->taglineno = $this->line;
     }
-    function yy_r13_4($yy_subpatterns)
+    function yy_r4_4($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_LDEL;
      $this->yypushstate(self::SMARTY);
      $this->taglineno = $this->line;
     }
-    function yy_r13_5($yy_subpatterns)
+    function yy_r4_5($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
   $this->yypopstate();
     }
-    function yy_r13_6($yy_subpatterns)
+    function yy_r4_6($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
@@ -1778,22 +999,22 @@ class Smarty_Internal_Templatelexer
   $this->yypushstate(self::SMARTY);
   $this->taglineno = $this->line;
     }
-    function yy_r13_7($yy_subpatterns)
+    function yy_r4_7($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
     }
-    function yy_r13_8($yy_subpatterns)
+    function yy_r4_8($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_OTHER;
     }
-    function yy_r13_9($yy_subpatterns)
+    function yy_r4_9($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_OTHER;
     }
-    function yy_r13_13($yy_subpatterns)
+    function yy_r4_13($yy_subpatterns)
     {
 
   $this->token = Smarty_Internal_Templateparser::TP_OTHER;
diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_templateparser.php b/gosa-core/include/smarty/sysplugins/smarty_internal_templateparser.php
index 8e1531cf3..f42ffc330 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_templateparser.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_templateparser.php
@@ -110,6 +110,7 @@ class Smarty_Internal_Templateparser#line 79 "smarty_internal_templateparser.php
 				$this->compiler->prefix_code = array();
 				$this->prefix_number = 0;
 				$this->block_nesting_level = 0;
+				$this->is_xml = false;
     }
     public static function &instance($new_instance = null)
     {
@@ -131,7 +132,7 @@ class Smarty_Internal_Templateparser#line 79 "smarty_internal_templateparser.php
     }
 
     
-#line 127 "smarty_internal_templateparser.php"
+#line 128 "smarty_internal_templateparser.php"
 
     const TP_VERT                           =  1;
     const TP_COLON                          =  2;
@@ -141,791 +142,737 @@ class Smarty_Internal_Templateparser#line 79 "smarty_internal_templateparser.php
     const TP_FAKEPHPSTARTTAG                =  6;
     const TP_XMLTAG                         =  7;
     const TP_OTHER                          =  8;
-    const TP_PHP_CODE                       =  9;
-    const TP_PHP_CODE_START_DOUBLEQUOTE     = 10;
-    const TP_PHP_CODE_DOUBLEQUOTE           = 11;
-    const TP_PHP_HEREDOC_START              = 12;
-    const TP_PHP_HEREDOC_END                = 13;
-    const TP_PHP_NOWDOC_START               = 14;
-    const TP_PHP_NOWDOC_END                 = 15;
-    const TP_PHP_DQ_CONTENT                 = 16;
-    const TP_PHP_DQ_EMBED_START             = 17;
-    const TP_PHP_DQ_EMBED_END               = 18;
-    const TP_LITERALSTART                   = 19;
-    const TP_LITERALEND                     = 20;
-    const TP_LITERAL                        = 21;
-    const TP_LDEL                           = 22;
-    const TP_RDEL                           = 23;
-    const TP_DOLLAR                         = 24;
-    const TP_ID                             = 25;
-    const TP_EQUAL                          = 26;
-    const TP_FOREACH                        = 27;
-    const TP_PTR                            = 28;
-    const TP_IF                             = 29;
-    const TP_SPACE                          = 30;
-    const TP_FOR                            = 31;
-    const TP_SEMICOLON                      = 32;
-    const TP_INCDEC                         = 33;
-    const TP_TO                             = 34;
-    const TP_STEP                           = 35;
-    const TP_AS                             = 36;
-    const TP_APTR                           = 37;
-    const TP_LDELSLASH                      = 38;
-    const TP_INTEGER                        = 39;
-    const TP_COMMA                          = 40;
-    const TP_MATH                           = 41;
-    const TP_UNIMATH                        = 42;
-    const TP_ANDSYM                         = 43;
-    const TP_ISIN                           = 44;
-    const TP_ISDIVBY                        = 45;
-    const TP_ISNOTDIVBY                     = 46;
-    const TP_ISEVEN                         = 47;
-    const TP_ISNOTEVEN                      = 48;
-    const TP_ISEVENBY                       = 49;
-    const TP_ISNOTEVENBY                    = 50;
-    const TP_ISODD                          = 51;
-    const TP_ISNOTODD                       = 52;
-    const TP_ISODDBY                        = 53;
-    const TP_ISNOTODDBY                     = 54;
-    const TP_INSTANCEOF                     = 55;
-    const TP_OPENP                          = 56;
-    const TP_CLOSEP                         = 57;
-    const TP_QMARK                          = 58;
-    const TP_NOT                            = 59;
-    const TP_TYPECAST                       = 60;
-    const TP_DOT                            = 61;
-    const TP_BOOLEAN                        = 62;
-    const TP_NULL                           = 63;
-    const TP_SINGLEQUOTESTRING              = 64;
-    const TP_DOUBLECOLON                    = 65;
-    const TP_AT                             = 66;
-    const TP_HATCH                          = 67;
-    const TP_OPENB                          = 68;
-    const TP_CLOSEB                         = 69;
-    const TP_EQUALS                         = 70;
-    const TP_NOTEQUALS                      = 71;
-    const TP_GREATERTHAN                    = 72;
-    const TP_LESSTHAN                       = 73;
-    const TP_GREATEREQUAL                   = 74;
-    const TP_LESSEQUAL                      = 75;
-    const TP_IDENTITY                       = 76;
-    const TP_NONEIDENTITY                   = 77;
-    const TP_MOD                            = 78;
-    const TP_LAND                           = 79;
-    const TP_LOR                            = 80;
-    const TP_LXOR                           = 81;
-    const TP_QUOTE                          = 82;
-    const TP_BACKTICK                       = 83;
-    const TP_DOLLARID                       = 84;
-    const YY_NO_ACTION = 585;
-    const YY_ACCEPT_ACTION = 584;
-    const YY_ERROR_ACTION = 583;
+    const TP_LITERALSTART                   =  9;
+    const TP_LITERALEND                     = 10;
+    const TP_LITERAL                        = 11;
+    const TP_LDEL                           = 12;
+    const TP_RDEL                           = 13;
+    const TP_DOLLAR                         = 14;
+    const TP_ID                             = 15;
+    const TP_EQUAL                          = 16;
+    const TP_FOREACH                        = 17;
+    const TP_PTR                            = 18;
+    const TP_IF                             = 19;
+    const TP_SPACE                          = 20;
+    const TP_FOR                            = 21;
+    const TP_SEMICOLON                      = 22;
+    const TP_INCDEC                         = 23;
+    const TP_TO                             = 24;
+    const TP_STEP                           = 25;
+    const TP_AS                             = 26;
+    const TP_APTR                           = 27;
+    const TP_LDELSLASH                      = 28;
+    const TP_INTEGER                        = 29;
+    const TP_COMMA                          = 30;
+    const TP_MATH                           = 31;
+    const TP_UNIMATH                        = 32;
+    const TP_ANDSYM                         = 33;
+    const TP_ISIN                           = 34;
+    const TP_ISDIVBY                        = 35;
+    const TP_ISNOTDIVBY                     = 36;
+    const TP_ISEVEN                         = 37;
+    const TP_ISNOTEVEN                      = 38;
+    const TP_ISEVENBY                       = 39;
+    const TP_ISNOTEVENBY                    = 40;
+    const TP_ISODD                          = 41;
+    const TP_ISNOTODD                       = 42;
+    const TP_ISODDBY                        = 43;
+    const TP_ISNOTODDBY                     = 44;
+    const TP_INSTANCEOF                     = 45;
+    const TP_OPENP                          = 46;
+    const TP_CLOSEP                         = 47;
+    const TP_QMARK                          = 48;
+    const TP_NOT                            = 49;
+    const TP_TYPECAST                       = 50;
+    const TP_DOT                            = 51;
+    const TP_SINGLEQUOTESTRING              = 52;
+    const TP_DOUBLECOLON                    = 53;
+    const TP_AT                             = 54;
+    const TP_HATCH                          = 55;
+    const TP_OPENB                          = 56;
+    const TP_CLOSEB                         = 57;
+    const TP_EQUALS                         = 58;
+    const TP_NOTEQUALS                      = 59;
+    const TP_GREATERTHAN                    = 60;
+    const TP_LESSTHAN                       = 61;
+    const TP_GREATEREQUAL                   = 62;
+    const TP_LESSEQUAL                      = 63;
+    const TP_IDENTITY                       = 64;
+    const TP_NONEIDENTITY                   = 65;
+    const TP_MOD                            = 66;
+    const TP_LAND                           = 67;
+    const TP_LOR                            = 68;
+    const TP_LXOR                           = 69;
+    const TP_QUOTE                          = 70;
+    const TP_BACKTICK                       = 71;
+    const TP_DOLLARID                       = 72;
+    const YY_NO_ACTION = 548;
+    const YY_ACCEPT_ACTION = 547;
+    const YY_ERROR_ACTION = 546;
 
-    const YY_SZ_ACTTAB = 1995;
+    const YY_SZ_ACTTAB = 1810;
 static public $yy_action = array(
- /*     0 */   373,  584,   55,  252,  258,  280,    8,  196,  283,  115,
- /*    10 */    59,  107,  247,  119,  255,  112,  257,  122,   41,   43,
- /*    20 */    45,   40,   25,   27,  299,  298,   20,   28,  296,  297,
- /*    30 */    15,   14,    8,  330,   31,   17,  294,  239,  322,   35,
- /*    40 */   196,  112,  146,  294,  326,  337,  162,  312,  313,  314,
- /*    50 */   311,  310,  306,  307,  308,  309,  338,  339,  369,  196,
- /*    60 */   304,   23,   24,  202,   34,   37,   17,  360,    7,  322,
- /*    70 */    41,   43,   45,   40,   25,   27,  299,  298,   20,   28,
- /*    80 */   296,  297,   15,   14,  452,   17,  276,   17,  322,   36,
- /*    90 */   322,  452,  251,  258,  280,    2,  253,  109,  201,  312,
- /*   100 */   313,  314,  311,  310,  306,  307,  308,  309,  338,  339,
- /*   110 */   369,  133,  219,   17,  158,   42,  322,    8,   38,  213,
- /*   120 */   109,  154,  114,  365,   17,  351,  112,  322,  304,   22,
- /*   130 */   196,  227,   47,   46,  242,  315,  316,  317,  328,  243,
- /*   140 */    60,   41,   43,   45,   40,   25,   27,  299,  298,   20,
- /*   150 */    28,  296,  297,   15,   14,   56,   17,  231,   10,  322,
- /*   160 */    35,   54,    4,   60,   54,   32,   17,  117,  272,  241,
- /*   170 */   312,  313,  314,  311,  310,  306,  307,  308,  309,  338,
- /*   180 */   339,  369,  268,   41,   43,   45,   40,   25,   27,  299,
- /*   190 */   298,   20,   28,  296,  297,   15,   14,  139,  348,  282,
- /*   200 */   231,  209,  109,  218,  344,  273,  274,  185,   17,  358,
- /*   210 */   327,  322,  312,  313,  314,  311,  310,  306,  307,  308,
- /*   220 */   309,  338,  339,  369,  202,   41,   43,   45,   40,   25,
- /*   230 */    27,  299,  298,   20,   28,  296,  297,   15,   14,   97,
- /*   240 */   451,  324,  267,  180,  347,   60,  368,  196,  182,  265,
- /*   250 */   294,  207,  327,  196,  312,  313,  314,  311,  310,  306,
- /*   260 */   307,  308,  309,  338,  339,  369,   16,   41,   43,   45,
- /*   270 */    40,   25,   27,  299,  298,   20,   28,  296,  297,   15,
- /*   280 */    14,  149,   96,  261,   17,    8,  182,  199,  229,  116,
- /*   290 */   202,   54,  278,  101,  112,  304,  312,  313,  314,  311,
- /*   300 */   310,  306,  307,  308,  309,  338,  339,  369,  249,   41,
- /*   310 */    43,   45,   40,   25,   27,  299,  298,   20,   28,  296,
- /*   320 */   297,   15,   14,  156,  190,  224,   17,  321,  184,  322,
- /*   330 */   320,   13,  166,  347,  165,  347,  302,  304,  312,  313,
- /*   340 */   314,  311,  310,  306,  307,  308,  309,  338,  339,  369,
- /*   350 */   202,  287,   12,   41,   43,   45,   40,   25,   27,  299,
- /*   360 */   298,   20,   28,  296,  297,   15,   14,  202,  100,  244,
- /*   370 */   198,  362,  372,  381,  202,   19,  186,  222,  196,  114,
- /*   380 */   196,  327,  312,  313,  314,  311,  310,  306,  307,  308,
- /*   390 */   309,  338,  339,  369,  196,  328,    9,   23,   24,  240,
- /*   400 */    98,  271,   65,   21,   44,   41,   43,   45,   40,   25,
- /*   410 */    27,  299,  298,   20,   28,  296,  297,   15,   14,  145,
- /*   420 */   190,   44,  171,   64,  187,  367,  238,   13,   44,  353,
- /*   430 */   168,    5,  152,  304,  312,  313,  314,  311,  310,  306,
- /*   440 */   307,  308,  309,  338,  339,  369,  304,   41,   43,   45,
- /*   450 */    40,   25,   27,  299,  298,   20,   28,  296,  297,   15,
- /*   460 */    14,    8,  105,  236,   98,  342,  343,  380,  263,   98,
- /*   470 */   112,  183,  196,  196,  196,  327,  312,  313,  314,  311,
- /*   480 */   310,  306,  307,  308,  309,  338,  339,  369,  147,   41,
- /*   490 */    43,   45,   40,   25,   27,  299,  298,   20,   28,  296,
- /*   500 */   297,   15,   14,  332,  137,  329,  143,  281,  371,  288,
- /*   510 */   196,  267,  196,  279,  196,  196,  153,  327,  312,  313,
- /*   520 */   314,  311,  310,  306,  307,  308,  309,  338,  339,  369,
- /*   530 */   304,   41,   43,   45,   40,   25,   27,  299,  298,   20,
- /*   540 */    28,  296,  297,   15,   14,  148,  361,  293,  159,  341,
- /*   550 */   366,    6,  291,  196,  196,  270,  196,  196,  233,  304,
- /*   560 */   312,  313,  314,  311,  310,  306,  307,  308,  309,  338,
- /*   570 */   339,  369,  228,   41,   43,   45,   40,   25,   27,  299,
- /*   580 */   298,   20,   28,  296,  297,   15,   14,  349,  225,  305,
- /*   590 */   379,  174,  347,   63,  196,   26,  196,  196,   54,  110,
- /*   600 */   326,  178,  312,  313,  314,  311,  310,  306,  307,  308,
- /*   610 */   309,  338,  339,  369,   48,   41,   43,   45,   40,   25,
- /*   620 */    27,  299,  298,   20,   28,  296,  297,   15,   14,  202,
- /*   630 */   215,  333,  230,  116,  108,  209,  206,  116,  123,  221,
- /*   640 */   226,  246,  196,  262,  312,  313,  314,  311,  310,  306,
- /*   650 */   307,  308,  309,  338,  339,  369,  175,  128,  196,  303,
- /*   660 */   170,  289,  116,  250,    7,   41,   43,   45,   40,   25,
- /*   670 */    27,  299,  298,   20,   28,  296,  297,   15,   14,  144,
- /*   680 */   383,  275,  118,   26,  188,    5,  325,  113,  285,  211,
- /*   690 */   215,  334,  336,  304,  312,  313,  314,  311,  310,  306,
- /*   700 */   307,  308,  309,  338,  339,  369,  323,   41,   43,   45,
- /*   710 */    40,   25,   27,  299,  298,   20,   28,  296,  297,   15,
- /*   720 */    14,   18,  135,  245,  346,  277,  292,   62,  355,  335,
- /*   730 */   259,  126,  300,  242,  157,  327,  312,  313,  314,  311,
- /*   740 */   310,  306,  307,  308,  309,  338,  339,  369,  304,  354,
- /*   750 */   294,  382,  196,  111,   39,  217,  161,  350,  324,  295,
- /*   760 */    41,   43,   45,   40,   25,   27,  299,  298,   20,   28,
- /*   770 */   296,  297,   15,   14,  326,  131,   33,   11,   95,   61,
- /*   780 */    48,  254,  232,  256,  332,  332,  332,  332,  327,  312,
- /*   790 */   313,  314,  311,  310,  306,  307,  308,  309,  338,  339,
- /*   800 */   369,  202,   41,   43,   45,   40,   25,   27,  299,  298,
- /*   810 */    20,   28,  296,  297,   15,   14,  132,  332,  332,  332,
- /*   820 */   332,  332,  332,  378,  332,  332,  332,  332,  332,  327,
- /*   830 */   196,  312,  313,  314,  311,  310,  306,  307,  308,  309,
- /*   840 */   338,  339,  369,  332,  140,  332,  264,  332,  332,  136,
- /*   850 */   332,  332,  332,  332,    2,   44,  121,   57,  304,  125,
- /*   860 */     3,  223,  327,  235,    2,  142,  106,  191,  332,  163,
- /*   870 */   133,  219,  295,  332,   42,  332,  133,  332,  332,  304,
- /*   880 */   133,  219,  332,  304,   42,  332,  332,  332,   29,  332,
- /*   890 */   202,   47,   46,  295,  315,  316,  317,  295,   22,   60,
- /*   900 */     1,   47,   46,  332,  315,  316,  317,  332,  332,   60,
- /*   910 */     1,  269,  454,  332,   56,    2,  332,  106,  205,  454,
- /*   920 */   284,   30,  266,  332,   56,    2,  332,  109,  193,  332,
- /*   930 */   332,  133,  219,   17,  359,   42,  322,  332,  332,  332,
- /*   940 */   332,  133,  197,  332,   44,   42,  332,  332,  220,   22,
- /*   950 */   332,  332,   47,   46,  332,  315,  316,  317,  141,   22,
- /*   960 */    60,    1,   47,   46,  332,  315,  316,  317,  264,  332,
- /*   970 */    60,    1,  304,   23,   24,   56,    2,  332,  109,  201,
- /*   980 */   332,  332,    3,  332,  332,   56,    2,  332,  106,  205,
- /*   990 */   332,  332,  133,  219,  332,  332,   42,  332,  133,  332,
- /*  1000 */   332,  332,  133,  219,  332,  332,   42,  332,  332,  332,
- /*  1010 */    22,  332,  332,   47,   46,  332,  315,  316,  317,  151,
- /*  1020 */    29,   60,    1,   47,   46,  332,  315,  316,  317,  332,
- /*  1030 */   332,   60,    1,  304,   23,   24,   56,    2,  332,  106,
- /*  1040 */   194,  332,  290,   30,  266,  332,   56,    2,  332,  106,
- /*  1050 */   192,  332,  332,  133,  219,  332,  332,   42,  332,  332,
- /*  1060 */   332,  332,  332,  133,  219,  332,  332,   42,  332,  332,
- /*  1070 */   332,   22,  332,  332,   47,   46,  332,  315,  316,  317,
- /*  1080 */   332,   29,   60,    1,   47,   46,  332,  315,  316,  317,
- /*  1090 */   332,  332,   60,    1,  332,  332,  332,   56,    2,  332,
- /*  1100 */   120,  205,  332,  332,  332,  160,  332,   56,    2,  332,
- /*  1110 */   109,  204,  332,  332,  133,  219,  332,  332,   42,  304,
- /*  1120 */    23,   24,  332,  332,  133,  219,  332,  332,   42,  332,
- /*  1130 */   332,  332,   22,  332,  332,   47,   46,  332,  315,  316,
- /*  1140 */   317,  332,   22,   60,    1,   47,   46,  332,  315,  316,
- /*  1150 */   317,  332,  332,   60,  332,  332,  332,  319,   56,    2,
- /*  1160 */   332,  109,  203,  332,  332,  155,  332,  208,   56,  332,
- /*  1170 */   114,  332,  332,  332,  332,  133,  219,  332,  234,   42,
- /*  1180 */   332,  332,  332,  331,  318,  332,  328,  260,   99,  332,
- /*  1190 */   352,  356,  357,   22,  332,  332,   47,   46,  332,  315,
- /*  1200 */   316,  317,  332,  173,   60,  319,    2,  332,  332,  332,
- /*  1210 */   332,  332,  332,  138,  332,  208,   94,  332,  114,   56,
- /*  1220 */   332,  332,  133,  332,  332,  319,  370,  332,  332,  332,
- /*  1230 */   332,  331,  318,   58,  328,  104,   53,  129,  102,  332,
- /*  1240 */   332,  332,  332,  200,  364,  332,  370,  332,  319,  332,
- /*  1250 */   332,  331,  318,  332,  328,  319,   58,  332,  103,   51,
- /*  1260 */   129,  102,  332,  181,  332,  208,  332,  332,  114,  370,
- /*  1270 */   332,  332,  332,  332,  331,  318,  301,  328,  332,  332,
- /*  1280 */   332,  331,  318,  319,  328,  332,  332,  319,  332,  332,
- /*  1290 */   332,  150,  332,  208,   66,  134,  114,  208,   50,  127,
- /*  1300 */   114,  332,  332,  332,  370,  376,  374,  375,  370,  331,
- /*  1310 */   318,  332,  328,  331,  318,  319,  328,  332,  332,  210,
- /*  1320 */   173,  340,  377,  150,  332,  208,   66,  319,  114,  332,
- /*  1330 */   332,  332,  332,  332,  332,  150,  370,  208,   66,  332,
- /*  1340 */   114,  331,  318,  332,  328,  332,  332,  332,  370,  319,
- /*  1350 */   332,  216,  332,  331,  318,  332,  328,  138,  332,  208,
- /*  1360 */    94,  332,  114,  286,  332,  332,  332,  332,  332,  332,
- /*  1370 */   370,  332,  332,  319,  332,  331,  318,  332,  328,  332,
- /*  1380 */   332,  150,  332,  208,   66,  319,  114,  332,  363,  332,
- /*  1390 */   332,  332,  332,  130,  370,  208,   79,  248,  114,  331,
- /*  1400 */   318,  332,  328,  332,  332,  319,  370,  332,  332,  212,
- /*  1410 */   332,  331,  318,  150,  328,  208,   71,  319,  114,  332,
- /*  1420 */   332,  237,  332,  332,  332,  150,  370,  208,   52,  124,
- /*  1430 */   114,  331,  318,  332,  328,  332,  332,  332,  370,  319,
- /*  1440 */   332,  332,  332,  331,  318,  332,  328,  150,  332,  195,
- /*  1450 */    67,  332,  114,  332,  332,  332,  332,  332,  332,  332,
- /*  1460 */   370,  332,  332,  319,  332,  331,  318,  332,  328,  332,
- /*  1470 */   332,  150,  332,  208,   89,  319,  114,  332,  332,  332,
- /*  1480 */   332,  332,  332,  150,  370,  208,   92,  319,  114,  331,
- /*  1490 */   318,  332,  328,  332,  332,  150,  370,  208,   70,  319,
- /*  1500 */   114,  331,  318,  332,  328,  332,  332,  150,  370,  208,
- /*  1510 */    93,  319,  114,  331,  318,  332,  328,  332,  332,  150,
- /*  1520 */   370,  208,   88,  332,  114,  331,  318,  332,  328,  332,
- /*  1530 */   332,  332,  370,  319,  332,  332,  332,  331,  318,  332,
- /*  1540 */   328,  150,  319,  208,   78,  332,  114,  332,  332,  332,
- /*  1550 */   150,  332,  208,   81,  370,  114,  332,  332,  332,  331,
- /*  1560 */   318,  332,  328,  370,  319,  332,  332,  332,  331,  318,
- /*  1570 */   332,  328,  150,  319,  208,   82,  332,  114,  332,  332,
- /*  1580 */   332,  150,  332,  208,   73,  370,  114,  332,  332,  332,
- /*  1590 */   331,  318,  332,  328,  370,  332,  332,  319,  332,  331,
- /*  1600 */   318,  319,  328,  332,  332,  150,  332,  208,   86,  150,
- /*  1610 */   114,  208,   80,  332,  114,  332,  332,  332,  370,  332,
- /*  1620 */   332,  332,  370,  331,  318,  332,  328,  331,  318,  332,
- /*  1630 */   328,  319,  332,  332,  332,  332,  332,  332,  332,  150,
- /*  1640 */   319,  208,   76,  332,  114,  332,  332,  332,  150,  332,
- /*  1650 */   208,   90,  370,  114,  332,  332,  332,  331,  318,  332,
- /*  1660 */   328,  370,  319,  332,  332,  332,  331,  318,  332,  328,
- /*  1670 */   150,  319,  208,   83,  332,  114,  332,  332,  332,  150,
- /*  1680 */   332,  208,   84,  370,  114,  332,  332,  332,  331,  318,
- /*  1690 */   332,  328,  370,  332,  332,  319,  332,  331,  318,  319,
- /*  1700 */   328,  332,  332,  150,  332,  208,   75,  150,  114,  208,
- /*  1710 */    85,  332,  114,  332,  332,  332,  370,  332,  332,  332,
- /*  1720 */   370,  331,  318,  332,  328,  331,  318,  332,  328,  319,
- /*  1730 */   332,  332,  332,  332,  332,  332,  332,  150,  319,  208,
- /*  1740 */    49,  332,  114,  332,  332,  332,  150,  332,  208,   74,
- /*  1750 */   370,  114,  332,  332,  332,  331,  318,  332,  328,  370,
- /*  1760 */   319,  332,  332,  332,  331,  318,  332,  328,  150,  319,
- /*  1770 */   208,   72,  332,  114,  332,  332,  332,  150,  332,  208,
- /*  1780 */    68,  370,  114,  332,  332,  332,  331,  318,  332,  328,
- /*  1790 */   370,  332,  332,  319,  332,  331,  318,  319,  328,  332,
- /*  1800 */   332,  150,  332,  208,   91,  150,  114,  208,   77,  332,
- /*  1810 */   114,  332,  332,  332,  370,  332,  332,  332,  370,  331,
- /*  1820 */   318,  332,  328,  331,  318,  332,  328,  319,  332,  332,
- /*  1830 */   332,  332,  332,  332,  332,  150,  319,  208,   87,  332,
- /*  1840 */   114,  332,  332,  332,  150,  332,  208,   69,  370,  114,
- /*  1850 */   332,  332,  332,  331,  318,  332,  328,  370,  319,  202,
- /*  1860 */   332,  332,  331,  318,  332,  328,  172,  319,  208,  332,
- /*  1870 */   332,  114,  332,  332,  332,  177,  332,  208,  332,  332,
- /*  1880 */   114,  345,  332,  332,  331,  318,  214,  328,  196,  332,
- /*  1890 */   332,  319,  332,  331,  318,  319,  328,  332,  332,  189,
- /*  1900 */   332,  208,  332,  169,  114,  208,  332,  332,  114,  332,
- /*  1910 */   332,  332,  332,  332,    8,  332,  332,  331,  318,  332,
- /*  1920 */   328,  331,  318,  112,  328,  319,  332,  332,  332,  332,
- /*  1930 */   332,  332,  332,  179,  319,  208,  332,  332,  114,  332,
- /*  1940 */   332,  332,  176,  332,  208,  332,  332,  114,  332,  332,
- /*  1950 */   332,  331,  318,  332,  328,  332,  319,  332,  332,  332,
- /*  1960 */   331,  318,  332,  328,  167,  319,  208,  332,  332,  114,
- /*  1970 */   332,  332,  332,  164,  332,  208,  332,  332,  114,  332,
- /*  1980 */   332,  332,  331,  318,  332,  328,  332,  332,  332,  332,
- /*  1990 */   332,  331,  318,  332,  328,
+ /*     0 */   183,  280,    7,   38,  325,  217,  275,  199,   53,  119,
+ /*    10 */   104,  266,  317,  156,  323,  308,  305,  309,  335,  184,
+ /*    20 */   153,  298,  307,  283,  281,  193,  278,   32,  104,  319,
+ /*    30 */    47,   46,   45,   39,   16,   23,  341,  337,   21,   18,
+ /*    40 */   338,  339,   19,   20,  278,   43,  296,  293,  292,  288,
+ /*    50 */   289,  290,  153,  157,  323,    3,   24,  348,  355,  356,
+ /*    60 */   357,  358,  354,  353,  349,  350,  351,  352,  336,  183,
+ /*    70 */   280,  125,  183,  117,  100,   12,   99,   51,  121,  102,
+ /*    80 */   148,  322,  112,   26,  331,  168,    4,  335,  184,  191,
+ /*    90 */   333,  184,  283,  281,  286,  278,  459,  184,  316,   47,
+ /*   100 */    46,   45,   39,   16,   23,  341,  337,   21,   18,  338,
+ /*   110 */   339,   19,   20,  294,  295,  297,   12,   12,  547,   84,
+ /*   120 */   226,  295,  297,  112,  112,   36,  348,  355,  356,  357,
+ /*   130 */   358,  354,  353,  349,  350,  351,  352,  336,  183,  137,
+ /*   140 */    87,  280,  261,  240,  254,  182,  253,  199,   49,  118,
+ /*   150 */   104,   38,  123,  286,  275,   29,  172,  184,  335,   10,
+ /*   160 */   421,   13,   14,  283,  281,  277,  278,  421,   47,   46,
+ /*   170 */    45,   39,   16,   23,  341,  337,   21,   18,  338,  339,
+ /*   180 */    19,   20,  183,  318,   28,  280,  113,  133,  152,  282,
+ /*   190 */   184,  199,   43,  202,  104,  348,  355,  356,  357,  358,
+ /*   200 */   354,  353,  349,  350,  351,  352,  336,  283,  281,  306,
+ /*   210 */   278,  299,   47,   46,   45,   39,   16,   23,  341,  337,
+ /*   220 */    21,   18,  338,  339,   19,   20,   38,   89,   38,  275,
+ /*   230 */    29,  275,  271,  238,  122,  113,  195,    2,  244,  348,
+ /*   240 */   355,  356,  357,  358,  354,  353,  349,  350,  351,  352,
+ /*   250 */   336,  183,  280,  125,  183,  187,  174,   12,  199,   83,
+ /*   260 */   229,  104,  200,  163,  112,  419,  302,  274,  245,  335,
+ /*   270 */   202,  215,  419,  184,  283,  281,   89,  278,  204,  207,
+ /*   280 */   234,   47,   46,   45,   39,   16,   23,  341,  337,   21,
+ /*   290 */    18,  338,  339,   19,   20,  236,   17,  232,   12,  313,
+ /*   300 */     8,   38,   54,   54,  275,  112,  184,  340,  348,  355,
+ /*   310 */   356,  357,  358,  354,  353,  349,  350,  351,  352,  336,
+ /*   320 */   183,  280,   35,  165,  418,  100,  104,  101,   52,  121,
+ /*   330 */   102,  184,   38,  326,  271,  275,  172,  196,  335,  184,
+ /*   340 */    10,   13,  278,  283,  281,  359,  278,  218,  228,  183,
+ /*   350 */    47,   46,   45,   39,   16,   23,  341,  337,   21,   18,
+ /*   360 */   338,  339,   19,   20,  183,  344,   38,  280,  184,  211,
+ /*   370 */   265,  273,  184,  199,   26,  271,  104,  348,  355,  356,
+ /*   380 */   357,  358,  354,  353,  349,  350,  351,  352,  336,  283,
+ /*   390 */   281,  147,  278,  274,   47,   46,   45,   39,   16,   23,
+ /*   400 */   341,  337,   21,   18,  338,  339,   19,   20,  183,  208,
+ /*   410 */   230,   38,   38,  327,  275,  275,   33,   40,  107,  225,
+ /*   420 */   166,  348,  355,  356,  357,  358,  354,  353,  349,  350,
+ /*   430 */   351,  352,  336,  224,  267,  184,  158,  323,   47,   46,
+ /*   440 */    45,   39,   16,   23,  341,  337,   21,   18,  338,  339,
+ /*   450 */    19,   20,  183,  210,   38,  280,  332,  185,   92,  284,
+ /*   460 */   155,  199,  233,  184,  104,  348,  355,  356,  357,  358,
+ /*   470 */   354,  353,  349,  350,  351,  352,  336,  283,  281,  145,
+ /*   480 */   278,  201,   47,   46,   45,   39,   16,   23,  341,  337,
+ /*   490 */    21,   18,  338,  339,   19,   20,  183,  324,   95,  239,
+ /*   500 */   161,  323,  189,  178,  184,   43,  347,  150,  247,  348,
+ /*   510 */   355,  356,  357,  358,  354,  353,  349,  350,  351,  352,
+ /*   520 */   336,  286,  235,  115,  208,  268,   47,   46,   45,   39,
+ /*   530 */    16,   23,  341,  337,   21,   18,  338,  339,   19,   20,
+ /*   540 */   183,  312,  160,  280,  345,  203,  231,  272,  184,  199,
+ /*   550 */   154,  184,  104,  348,  355,  356,  357,  358,  354,  353,
+ /*   560 */   349,  350,  351,  352,  336,  283,  281,  279,  278,  188,
+ /*   570 */    47,   46,   45,   39,   16,   23,  341,  337,   21,   18,
+ /*   580 */   338,  339,   19,   20,  183,   37,  214,  280,  315,   93,
+ /*   590 */   114,  241,  108,  199,  194,  184,  104,  348,  355,  356,
+ /*   600 */   357,  358,  354,  353,  349,  350,  351,  352,  336,  283,
+ /*   610 */   281,   90,  278,  255,   47,   46,   45,   39,   16,   23,
+ /*   620 */   341,  337,   21,   18,  338,  339,   19,   20,  183,  300,
+ /*   630 */    12,  256,  310,  271,  198,  258,  184,  112,  184,  221,
+ /*   640 */   328,  348,  355,  356,  357,  358,  354,  353,  349,  350,
+ /*   650 */   351,  352,  336,  213,  109,  252,  216,   11,   47,   46,
+ /*   660 */    45,   39,   16,   23,  341,  337,   21,   18,  338,  339,
+ /*   670 */    19,   20,  183,  303,  243,  280,  334,    4,  184,  311,
+ /*   680 */   184,  199,   54,  184,  104,  348,  355,  356,  357,  358,
+ /*   690 */   354,  353,  349,  350,  351,  352,  336,  283,  281,   34,
+ /*   700 */   278,    9,   47,   46,   45,   39,   16,   23,  341,  337,
+ /*   710 */    21,   18,  338,  339,   19,   20,   38,  196,  304,  275,
+ /*   720 */    27,  262,  263,  233,  238,  184,  106,  250,    2,  348,
+ /*   730 */   355,  356,  357,  358,  354,  353,  349,  350,  351,  352,
+ /*   740 */   336,  183,  280,  301,  125,  291,  217,  201,  199,   64,
+ /*   750 */    43,  104,  134,   43,  212,   38,  329,  162,  275,  335,
+ /*   760 */   237,    6,  159,  266,  283,  281,  286,  278,   94,  135,
+ /*   770 */   220,   47,   46,   45,   39,   16,   23,  341,  337,   21,
+ /*   780 */    18,  338,  339,   19,   20,  183,  246,   17,  232,  330,
+ /*   790 */    88,  219,    5,  274,   41,   54,  184,  257,  348,  355,
+ /*   800 */   356,  357,  358,  354,  353,  349,  350,  351,  352,  336,
+ /*   810 */   111,  197,  139,  276,  248,   47,   46,   45,   39,   16,
+ /*   820 */    23,  341,  337,   21,   18,  338,  339,   19,   20,  183,
+ /*   830 */   287,  343,  314,   22,  144,   91,  270,  184,  184,  184,
+ /*   840 */   142,  227,  348,  355,  356,  357,  358,  354,  353,  349,
+ /*   850 */   350,  351,  352,  336,  286,   40,  249,  303,  303,   47,
+ /*   860 */    46,   45,   39,   16,   23,  341,  337,   21,   18,  338,
+ /*   870 */   339,   19,   20,  183,  264,  303,  280,  303,  303,  303,
+ /*   880 */   269,  116,  199,  303,  303,  104,  348,  355,  356,  357,
+ /*   890 */   358,  354,  353,  349,  350,  351,  352,  336,  283,  281,
+ /*   900 */   303,  278,  303,   47,   46,   45,   39,   16,   23,  341,
+ /*   910 */   337,   21,   18,  338,  339,   19,   20,  167,  303,  303,
+ /*   920 */   303,  303,  303,  303,  303,  303,  303,   31,   15,  303,
+ /*   930 */   348,  355,  356,  357,  358,  354,  353,  349,  350,  351,
+ /*   940 */   352,  336,  132,    3,  303,  105,   86,  167,  120,  303,
+ /*   950 */   222,    3,  205,  110,  169,  303,  286,   31,   15,  125,
+ /*   960 */   209,   98,  126,   48,  303,  131,  303,  125,  209,  129,
+ /*   970 */   164,   48,  303,  303,  277,  277,  303,   25,  303,  286,
+ /*   980 */    44,   42,  277,  285,  303,   30,   89,    1,   44,   42,
+ /*   990 */     3,  285,  110,  175,   89,    1,  242,  151,  143,  303,
+ /*  1000 */   303,   85,    3,  167,  110,  175,  125,  209,  303,   85,
+ /*  1010 */    48,  286,  286,   31,   15,  136,  303,  146,  125,  209,
+ /*  1020 */   303,  303,   48,  303,   30,  270,  303,   44,   42,  286,
+ /*  1030 */   285,  286,  303,   89,    1,    3,   25,  113,  175,   44,
+ /*  1040 */    42,  124,  285,  270,  128,   89,    1,    3,   85,  113,
+ /*  1050 */   170,  125,  209,   97,  277,   48,  303,  277,   96,  303,
+ /*  1060 */    85,  303,  303,  125,  179,  303,  277,   48,  303,   30,
+ /*  1070 */   303,  277,   44,   42,  149,  285,  127,  303,   89,    1,
+ /*  1080 */     3,   30,  110,  173,   44,   42,  303,  285,  286,  277,
+ /*  1090 */    89,    1,    3,   85,  103,  175,  125,  209,  303,  303,
+ /*  1100 */    48,  130,  270,  303,  303,   85,  303,  141,  125,  209,
+ /*  1110 */   303,  303,   48,  303,   30,  286,  303,   44,   42,  303,
+ /*  1120 */   285,  286,  303,   89,    1,    3,   30,  110,  171,   44,
+ /*  1130 */    42,  303,  285,  303,  303,   89,    1,    3,   85,  113,
+ /*  1140 */   175,  125,  209,  303,  303,   48,  303,  303,  303,  303,
+ /*  1150 */    85,  303,  303,  125,  209,  303,  303,   48,  303,   25,
+ /*  1160 */   303,  303,   44,   42,  303,  285,  303,  303,   89,    1,
+ /*  1170 */     3,   30,  113,  177,   44,   42,  303,  285,  303,  303,
+ /*  1180 */    89,  303,  303,   85,  303,  303,  125,  209,  303,  303,
+ /*  1190 */    48,  303,  280,  303,  303,   85,  176,  303,  199,   71,
+ /*  1200 */   303,  104,  303,  303,   30,  303,  303,   44,   42,  335,
+ /*  1210 */   285,  303,  303,   89,  283,  281,  280,  278,  303,  303,
+ /*  1220 */   217,  303,  199,   62,  303,  104,  180,  321,   85,  303,
+ /*  1230 */   303,  303,  303,  335,  303,  303,  303,  303,  283,  281,
+ /*  1240 */   280,  278,  303,  303,  217,  303,  199,   62,  206,  104,
+ /*  1250 */   303,  303,  280,  303,  303,  303,  217,  335,  199,   62,
+ /*  1260 */   303,  104,  283,  281,  280,  278,  303,  303,  176,  335,
+ /*  1270 */   199,   71,  223,  104,  283,  281,  303,  278,  303,  303,
+ /*  1280 */   303,  335,  303,  303,  251,  303,  283,  281,  280,  278,
+ /*  1290 */   303,  303,  217,  303,  199,   62,  303,  104,  303,  320,
+ /*  1300 */   280,  303,  303,  303,  217,  335,  199,   65,  303,  104,
+ /*  1310 */   283,  281,  303,  278,  303,  303,  303,  335,  303,  303,
+ /*  1320 */   190,  303,  283,  281,  280,  278,  303,  303,  217,  303,
+ /*  1330 */   199,   73,  303,  104,  303,  303,  280,  303,  303,  303,
+ /*  1340 */   217,  335,  199,   72,  303,  104,  283,  281,  280,  278,
+ /*  1350 */   303,  303,  217,  335,  199,   63,  303,  104,  283,  281,
+ /*  1360 */   303,  278,  303,  303,  303,  335,  303,  303,  303,  303,
+ /*  1370 */   283,  281,  280,  278,  303,  303,  217,  303,  199,   70,
+ /*  1380 */   303,  104,  303,  303,  280,  303,  303,  303,  217,  335,
+ /*  1390 */   199,   67,  303,  104,  283,  281,  303,  278,  303,  303,
+ /*  1400 */   303,  335,  303,  303,  303,  303,  283,  281,  280,  278,
+ /*  1410 */   303,  303,  217,  303,  199,   75,  303,  104,  303,  303,
+ /*  1420 */   280,  303,  303,  303,  217,  335,  199,   74,  303,  104,
+ /*  1430 */   283,  281,  280,  278,  303,  303,  217,  335,  199,   79,
+ /*  1440 */   303,  104,  283,  281,  303,  278,  303,  303,  303,  335,
+ /*  1450 */   303,  303,  303,  303,  283,  281,  280,  278,  303,  303,
+ /*  1460 */   217,  303,  199,   66,  303,  104,  303,  303,  280,  303,
+ /*  1470 */   303,  303,  217,  335,  199,   57,  303,  104,  283,  281,
+ /*  1480 */   303,  278,  303,  303,  303,  335,  303,  303,  303,  303,
+ /*  1490 */   283,  281,  280,  278,  303,  303,  217,  303,  199,   76,
+ /*  1500 */   303,  104,  303,  303,  280,  303,  303,  303,  217,  335,
+ /*  1510 */   199,   82,  303,  104,  283,  281,  280,  278,  303,  303,
+ /*  1520 */   217,  335,  181,   59,  303,  104,  283,  281,  303,  278,
+ /*  1530 */   303,  303,  303,  335,  303,  303,  303,  303,  283,  281,
+ /*  1540 */   280,  278,  303,  303,  217,  303,  199,   81,  303,  104,
+ /*  1550 */   303,  303,  280,  303,  303,  303,  217,  335,  199,   77,
+ /*  1560 */   303,  104,  283,  281,  303,  278,  303,  303,  303,  335,
+ /*  1570 */   303,  303,  303,  303,  283,  281,  280,  278,  303,  303,
+ /*  1580 */   217,  303,  199,   50,  303,  104,  303,  303,  280,  303,
+ /*  1590 */   303,  303,  217,  335,  199,   55,  303,  104,  283,  281,
+ /*  1600 */   280,  278,  303,  303,  217,  335,  199,   69,  303,  104,
+ /*  1610 */   283,  281,  303,  278,  303,  303,  303,  335,  303,  303,
+ /*  1620 */   303,  303,  283,  281,  280,  278,  303,  303,  217,  303,
+ /*  1630 */   199,   60,  303,  104,  303,  303,  280,  303,  303,  303,
+ /*  1640 */   217,  335,  199,   61,  303,  104,  283,  281,  303,  278,
+ /*  1650 */   303,  303,  303,  335,  303,  303,  303,  303,  283,  281,
+ /*  1660 */   280,  278,  303,  303,  217,  303,  199,   56,  303,  104,
+ /*  1670 */   303,  303,  280,  303,  303,  303,  217,  335,  199,   80,
+ /*  1680 */   303,  104,  283,  281,  280,  278,  303,  303,  217,  335,
+ /*  1690 */   199,   68,  303,  104,  283,  281,  303,  278,  303,  303,
+ /*  1700 */   303,  335,  303,  303,  303,  303,  283,  281,  280,  278,
+ /*  1710 */   303,  303,  217,  303,  199,   58,  303,  104,  303,  303,
+ /*  1720 */   280,  303,  303,  303,  217,  335,  199,   78,  303,  104,
+ /*  1730 */   283,  281,  303,  278,  303,  303,  303,  335,  303,  303,
+ /*  1740 */   303,  138,  283,  281,  280,  278,  167,  303,  192,  303,
+ /*  1750 */   199,  303,  303,  104,  280,  286,   31,   15,  342,  303,
+ /*  1760 */   199,  186,  303,  104,  303,  303,  283,  281,  303,  278,
+ /*  1770 */   303,  346,  303,  303,  303,  303,  283,  281,  303,  278,
+ /*  1780 */   140,  303,  303,  303,  280,  167,  303,  303,  259,  303,
+ /*  1790 */   199,  303,  303,  104,  286,   31,   15,  303,  303,  303,
+ /*  1800 */   303,  260,  303,  303,  303,  303,  283,  281,  303,  278,
     );
     static public $yy_lookahead = array(
- /*     0 */    23,   86,   87,   88,   89,   90,   56,   30,    9,   10,
- /*    10 */    25,   12,   27,   14,   29,   65,   31,   24,   41,   42,
- /*    20 */    43,   44,   45,   46,   47,   48,   49,   50,   51,   52,
- /*    30 */    53,   54,   56,   23,   22,   22,   33,   61,   25,   26,
- /*    40 */    30,   65,  119,   33,  121,   69,   98,   70,   71,   72,
- /*    50 */    73,   74,   75,   76,   77,   78,   79,   80,   81,   30,
- /*    60 */   112,  113,  114,    1,   35,   34,   22,   23,   56,   25,
- /*    70 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
- /*    80 */    51,   52,   53,   54,   23,   22,   83,   22,   25,   26,
- /*    90 */    25,   30,   88,   89,   90,   22,   33,   24,   25,   70,
- /*   100 */    71,   72,   73,   74,   75,   76,   77,   78,   79,   80,
- /*   110 */    81,   38,   39,   22,   98,   42,   25,   56,   22,   99,
- /*   120 */    24,   25,  102,   23,   22,   23,   65,   25,  112,   56,
- /*   130 */    30,   66,   59,   60,    2,   62,   63,   64,  118,   37,
- /*   140 */    67,   41,   42,   43,   44,   45,   46,   47,   48,   49,
- /*   150 */    50,   51,   52,   53,   54,   82,   22,   66,   26,   25,
- /*   160 */    26,   28,   26,   67,   28,   22,   22,   24,   25,   25,
- /*   170 */    70,   71,   72,   73,   74,   75,   76,   77,   78,   79,
- /*   180 */    80,   81,   39,   41,   42,   43,   44,   45,   46,   47,
- /*   190 */    48,   49,   50,   51,   52,   53,   54,  108,   90,   57,
- /*   200 */    66,   65,   24,   25,   96,   62,   63,   23,   22,   23,
- /*   210 */   121,   25,   70,   71,   72,   73,   74,   75,   76,   77,
- /*   220 */    78,   79,   80,   81,    1,   41,   42,   43,   44,   45,
- /*   230 */    46,   47,   48,   49,   50,   51,   52,   53,   54,  108,
- /*   240 */    23,  120,   89,  122,  123,   67,   23,   30,  103,   23,
- /*   250 */    33,   28,  121,   30,   70,   71,   72,   73,   74,   75,
- /*   260 */    76,   77,   78,   79,   80,   81,   37,   41,   42,   43,
- /*   270 */    44,   45,   46,   47,   48,   49,   50,   51,   52,   53,
- /*   280 */    54,   98,  129,  130,   22,   56,  103,   25,   93,   94,
- /*   290 */     1,   28,   16,   17,   65,  112,   70,   71,   72,   73,
- /*   300 */    74,   75,   76,   77,   78,   79,   80,   81,   13,   41,
- /*   310 */    42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
- /*   320 */    52,   53,   54,   98,   61,   36,   22,   25,  103,   25,
- /*   330 */   123,   68,  122,  123,  122,  123,   25,  112,   70,   71,
- /*   340 */    72,   73,   74,   75,   76,   77,   78,   79,   80,   81,
- /*   350 */     1,   83,   40,   41,   42,   43,   44,   45,   46,   47,
- /*   360 */    48,   49,   50,   51,   52,   53,   54,    1,  108,  105,
- /*   370 */   106,   23,   23,   23,    1,   58,   99,   66,   30,  102,
- /*   380 */    30,  121,   70,   71,   72,   73,   74,   75,   76,   77,
- /*   390 */    78,   79,   80,   81,   30,  118,   40,  113,  114,   91,
- /*   400 */    92,  124,  104,   37,   55,   41,   42,   43,   44,   45,
- /*   410 */    46,   47,   48,   49,   50,   51,   52,   53,   54,   98,
- /*   420 */    61,   55,   32,  104,  103,   69,   25,   68,   55,   23,
- /*   430 */    40,   26,   98,  112,   70,   71,   72,   73,   74,   75,
- /*   440 */    76,   77,   78,   79,   80,   81,  112,   41,   42,   43,
- /*   450 */    44,   45,   46,   47,   48,   49,   50,   51,   52,   53,
- /*   460 */    54,   56,  108,   91,   92,   23,   23,   23,   91,   92,
- /*   470 */    65,   23,   30,   30,   30,  121,   70,   71,   72,   73,
- /*   480 */    74,   75,   76,   77,   78,   79,   80,   81,  119,   41,
- /*   490 */    42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
- /*   500 */    52,   53,   54,   23,  108,   23,  119,   23,   23,   57,
- /*   510 */    30,   89,   30,   23,   30,   30,   98,  121,   70,   71,
- /*   520 */    72,   73,   74,   75,   76,   77,   78,   79,   80,   81,
- /*   530 */   112,   41,   42,   43,   44,   45,   46,   47,   48,   49,
- /*   540 */    50,   51,   52,   53,   54,   98,   23,   23,  119,   23,
- /*   550 */    23,   30,  130,   30,   30,   23,   30,   30,   25,  112,
- /*   560 */    70,   71,   72,   73,   74,   75,   76,   77,   78,   79,
- /*   570 */    80,   81,   39,   41,   42,   43,   44,   45,   46,   47,
- /*   580 */    48,   49,   50,   51,   52,   53,   54,   23,  109,   23,
- /*   590 */    23,  122,  123,  104,   30,   26,   30,   30,   28,   24,
- /*   600 */   121,  104,   70,   71,   72,   73,   74,   75,   76,   77,
- /*   610 */    78,   79,   80,   81,    2,   41,   42,   43,   44,   45,
- /*   620 */    46,   47,   48,   49,   50,   51,   52,   53,   54,    1,
- /*   630 */    61,  117,   93,   94,   24,   65,   93,   94,  124,   24,
- /*   640 */    25,   36,   30,   69,   70,   71,   72,   73,   74,   75,
- /*   650 */    76,   77,   78,   79,   80,   81,   32,   30,   30,   25,
- /*   660 */    25,   93,   94,   23,   56,   41,   42,   43,   44,   45,
- /*   670 */    46,   47,   48,   49,   50,   51,   52,   53,   54,   98,
- /*   680 */    15,   11,   24,   26,  103,   26,   25,   24,   57,   25,
- /*   690 */    61,   69,   67,  112,   70,   71,   72,   73,   74,   75,
- /*   700 */    76,   77,   78,   79,   80,   81,   25,   41,   42,   43,
- /*   710 */    44,   45,   46,   47,   48,   49,   50,   51,   52,   53,
- /*   720 */    54,    2,  108,   57,   25,    5,   23,   25,   18,   67,
- /*   730 */    23,   57,   39,    2,   98,  121,   70,   71,   72,   73,
- /*   740 */    74,   75,   76,   77,   78,   79,   80,   81,  112,   23,
- /*   750 */    33,  112,   30,   24,   30,  111,  119,   20,  120,  126,
- /*   760 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
- /*   770 */    51,   52,   53,   54,  121,  108,  107,   56,   95,  119,
- /*   780 */     2,   30,  107,  105,  131,  131,  131,  131,  121,   70,
- /*   790 */    71,   72,   73,   74,   75,   76,   77,   78,   79,   80,
- /*   800 */    81,    1,   41,   42,   43,   44,   45,   46,   47,   48,
- /*   810 */    49,   50,   51,   52,   53,   54,  108,  131,  131,  131,
- /*   820 */   131,  131,  131,   23,  131,  131,  131,  131,  131,  121,
- /*   830 */    30,   70,   71,   72,   73,   74,   75,   76,   77,   78,
- /*   840 */    79,   80,   81,  131,   98,  131,    8,  131,  131,  108,
- /*   850 */   131,  131,  131,  131,   22,   55,   24,   25,  112,   27,
- /*   860 */    22,   29,  121,   31,   22,   98,   24,   25,  131,   98,
- /*   870 */    38,   39,  126,  131,   42,  131,   38,  131,  131,  112,
- /*   880 */    38,   39,  131,  112,   42,  131,  131,  131,   56,  131,
- /*   890 */     1,   59,   60,  126,   62,   63,   64,  126,   56,   67,
- /*   900 */    68,   59,   60,  131,   62,   63,   64,  131,  131,   67,
- /*   910 */    68,   69,   23,  131,   82,   22,  131,   24,   25,   30,
- /*   920 */    82,   83,   84,  131,   82,   22,  131,   24,   25,  131,
- /*   930 */   131,   38,   39,   22,   23,   42,   25,  131,  131,  131,
- /*   940 */   131,   38,   39,  131,   55,   42,  131,  131,   37,   56,
- /*   950 */   131,  131,   59,   60,  131,   62,   63,   64,   98,   56,
- /*   960 */    67,   68,   59,   60,  131,   62,   63,   64,    8,  131,
- /*   970 */    67,   68,  112,  113,  114,   82,   22,  131,   24,   25,
- /*   980 */   131,  131,   22,  131,  131,   82,   22,  131,   24,   25,
- /*   990 */   131,  131,   38,   39,  131,  131,   42,  131,   38,  131,
- /*  1000 */   131,  131,   38,   39,  131,  131,   42,  131,  131,  131,
- /*  1010 */    56,  131,  131,   59,   60,  131,   62,   63,   64,   98,
- /*  1020 */    56,   67,   68,   59,   60,  131,   62,   63,   64,  131,
- /*  1030 */   131,   67,   68,  112,  113,  114,   82,   22,  131,   24,
- /*  1040 */    25,  131,   82,   83,   84,  131,   82,   22,  131,   24,
- /*  1050 */    25,  131,  131,   38,   39,  131,  131,   42,  131,  131,
- /*  1060 */   131,  131,  131,   38,   39,  131,  131,   42,  131,  131,
- /*  1070 */   131,   56,  131,  131,   59,   60,  131,   62,   63,   64,
- /*  1080 */   131,   56,   67,   68,   59,   60,  131,   62,   63,   64,
- /*  1090 */   131,  131,   67,   68,  131,  131,  131,   82,   22,  131,
- /*  1100 */    24,   25,  131,  131,  131,   98,  131,   82,   22,  131,
- /*  1110 */    24,   25,  131,  131,   38,   39,  131,  131,   42,  112,
- /*  1120 */   113,  114,  131,  131,   38,   39,  131,  131,   42,  131,
- /*  1130 */   131,  131,   56,  131,  131,   59,   60,  131,   62,   63,
- /*  1140 */    64,  131,   56,   67,   68,   59,   60,  131,   62,   63,
- /*  1150 */    64,  131,  131,   67,  131,  131,  131,   89,   82,   22,
- /*  1160 */   131,   24,   25,  131,  131,   97,  131,   99,   82,  131,
- /*  1170 */   102,  131,  131,  131,  131,   38,   39,  131,  110,   42,
- /*  1180 */   131,  131,  131,  115,  116,  131,  118,    3,    4,  131,
- /*  1190 */     6,    7,    8,   56,  131,  131,   59,   60,  131,   62,
- /*  1200 */    63,   64,  131,   19,   67,   89,   22,  131,  131,  131,
- /*  1210 */   131,  131,  131,   97,  131,   99,  100,  131,  102,   82,
- /*  1220 */   131,  131,   38,  131,  131,   89,  110,  131,  131,  131,
- /*  1230 */   131,  115,  116,   97,  118,   99,  100,  101,  102,  131,
- /*  1240 */   131,  131,  131,  127,  128,  131,  110,  131,   89,  131,
- /*  1250 */   131,  115,  116,  131,  118,   89,   97,  131,   99,  100,
- /*  1260 */   101,  102,  131,   97,  131,   99,  131,  131,  102,  110,
- /*  1270 */   131,  131,  131,  131,  115,  116,  110,  118,  131,  131,
- /*  1280 */   131,  115,  116,   89,  118,  131,  131,   89,  131,  131,
- /*  1290 */   131,   97,  131,   99,  100,   97,  102,   99,  100,  101,
- /*  1300 */   102,  131,  131,  131,  110,    4,    5,    6,  110,  115,
- /*  1310 */   116,  131,  118,  115,  116,   89,  118,  131,  131,  125,
- /*  1320 */    19,   20,   21,   97,  131,   99,  100,   89,  102,  131,
- /*  1330 */   131,  131,  131,  131,  131,   97,  110,   99,  100,  131,
- /*  1340 */   102,  115,  116,  131,  118,  131,  131,  131,  110,   89,
- /*  1350 */   131,  125,  131,  115,  116,  131,  118,   97,  131,   99,
- /*  1360 */   100,  131,  102,  125,  131,  131,  131,  131,  131,  131,
- /*  1370 */   110,  131,  131,   89,  131,  115,  116,  131,  118,  131,
- /*  1380 */   131,   97,  131,   99,  100,   89,  102,  131,  128,  131,
- /*  1390 */   131,  131,  131,   97,  110,   99,  100,  101,  102,  115,
- /*  1400 */   116,  131,  118,  131,  131,   89,  110,  131,  131,  125,
- /*  1410 */   131,  115,  116,   97,  118,   99,  100,   89,  102,  131,
- /*  1420 */   131,  105,  131,  131,  131,   97,  110,   99,  100,  101,
- /*  1430 */   102,  115,  116,  131,  118,  131,  131,  131,  110,   89,
- /*  1440 */   131,  131,  131,  115,  116,  131,  118,   97,  131,   99,
- /*  1450 */   100,  131,  102,  131,  131,  131,  131,  131,  131,  131,
- /*  1460 */   110,  131,  131,   89,  131,  115,  116,  131,  118,  131,
- /*  1470 */   131,   97,  131,   99,  100,   89,  102,  131,  131,  131,
- /*  1480 */   131,  131,  131,   97,  110,   99,  100,   89,  102,  115,
- /*  1490 */   116,  131,  118,  131,  131,   97,  110,   99,  100,   89,
- /*  1500 */   102,  115,  116,  131,  118,  131,  131,   97,  110,   99,
- /*  1510 */   100,   89,  102,  115,  116,  131,  118,  131,  131,   97,
- /*  1520 */   110,   99,  100,  131,  102,  115,  116,  131,  118,  131,
- /*  1530 */   131,  131,  110,   89,  131,  131,  131,  115,  116,  131,
- /*  1540 */   118,   97,   89,   99,  100,  131,  102,  131,  131,  131,
- /*  1550 */    97,  131,   99,  100,  110,  102,  131,  131,  131,  115,
- /*  1560 */   116,  131,  118,  110,   89,  131,  131,  131,  115,  116,
- /*  1570 */   131,  118,   97,   89,   99,  100,  131,  102,  131,  131,
- /*  1580 */   131,   97,  131,   99,  100,  110,  102,  131,  131,  131,
- /*  1590 */   115,  116,  131,  118,  110,  131,  131,   89,  131,  115,
- /*  1600 */   116,   89,  118,  131,  131,   97,  131,   99,  100,   97,
- /*  1610 */   102,   99,  100,  131,  102,  131,  131,  131,  110,  131,
- /*  1620 */   131,  131,  110,  115,  116,  131,  118,  115,  116,  131,
- /*  1630 */   118,   89,  131,  131,  131,  131,  131,  131,  131,   97,
- /*  1640 */    89,   99,  100,  131,  102,  131,  131,  131,   97,  131,
- /*  1650 */    99,  100,  110,  102,  131,  131,  131,  115,  116,  131,
- /*  1660 */   118,  110,   89,  131,  131,  131,  115,  116,  131,  118,
- /*  1670 */    97,   89,   99,  100,  131,  102,  131,  131,  131,   97,
- /*  1680 */   131,   99,  100,  110,  102,  131,  131,  131,  115,  116,
- /*  1690 */   131,  118,  110,  131,  131,   89,  131,  115,  116,   89,
- /*  1700 */   118,  131,  131,   97,  131,   99,  100,   97,  102,   99,
- /*  1710 */   100,  131,  102,  131,  131,  131,  110,  131,  131,  131,
- /*  1720 */   110,  115,  116,  131,  118,  115,  116,  131,  118,   89,
- /*  1730 */   131,  131,  131,  131,  131,  131,  131,   97,   89,   99,
- /*  1740 */   100,  131,  102,  131,  131,  131,   97,  131,   99,  100,
- /*  1750 */   110,  102,  131,  131,  131,  115,  116,  131,  118,  110,
- /*  1760 */    89,  131,  131,  131,  115,  116,  131,  118,   97,   89,
- /*  1770 */    99,  100,  131,  102,  131,  131,  131,   97,  131,   99,
- /*  1780 */   100,  110,  102,  131,  131,  131,  115,  116,  131,  118,
- /*  1790 */   110,  131,  131,   89,  131,  115,  116,   89,  118,  131,
- /*  1800 */   131,   97,  131,   99,  100,   97,  102,   99,  100,  131,
- /*  1810 */   102,  131,  131,  131,  110,  131,  131,  131,  110,  115,
- /*  1820 */   116,  131,  118,  115,  116,  131,  118,   89,  131,  131,
- /*  1830 */   131,  131,  131,  131,  131,   97,   89,   99,  100,  131,
- /*  1840 */   102,  131,  131,  131,   97,  131,   99,  100,  110,  102,
- /*  1850 */   131,  131,  131,  115,  116,  131,  118,  110,   89,    1,
- /*  1860 */   131,  131,  115,  116,  131,  118,   97,   89,   99,  131,
- /*  1870 */   131,  102,  131,  131,  131,   97,  131,   99,  131,  131,
- /*  1880 */   102,   23,  131,  131,  115,  116,   28,  118,   30,  131,
- /*  1890 */   131,   89,  131,  115,  116,   89,  118,  131,  131,   97,
- /*  1900 */   131,   99,  131,   97,  102,   99,  131,  131,  102,  131,
- /*  1910 */   131,  131,  131,  131,   56,  131,  131,  115,  116,  131,
- /*  1920 */   118,  115,  116,   65,  118,   89,  131,  131,  131,  131,
- /*  1930 */   131,  131,  131,   97,   89,   99,  131,  131,  102,  131,
- /*  1940 */   131,  131,   97,  131,   99,  131,  131,  102,  131,  131,
- /*  1950 */   131,  115,  116,  131,  118,  131,   89,  131,  131,  131,
- /*  1960 */   115,  116,  131,  118,   97,   89,   99,  131,  131,  102,
- /*  1970 */   131,  131,  131,   97,  131,   99,  131,  131,  102,  131,
- /*  1980 */   131,  131,  115,  116,  131,  118,  131,  131,  131,  131,
- /*  1990 */   131,  115,  116,  131,  118,
+ /*     0 */     1,   77,   30,   12,   13,   81,   15,   83,   84,   85,
+ /*    10 */    86,  104,   13,  106,  107,    4,    5,    6,   94,   20,
+ /*    20 */     9,   10,   11,   99,  100,   83,  102,   27,   86,   57,
+ /*    30 */    31,   32,   33,   34,   35,   36,   37,   38,   39,   40,
+ /*    40 */    41,   42,   43,   44,  102,   45,    3,    4,    5,    6,
+ /*    50 */     7,    8,    9,  106,  107,   12,   27,   58,   59,   60,
+ /*    60 */    61,   62,   63,   64,   65,   66,   67,   68,   69,    1,
+ /*    70 */    77,   28,    1,   20,   81,   46,   83,   84,   85,   86,
+ /*    80 */    82,   13,   53,   16,   13,   87,   16,   94,   20,   18,
+ /*    90 */    13,   20,   99,  100,   96,  102,   26,   20,   15,   31,
+ /*   100 */    32,   33,   34,   35,   36,   37,   38,   39,   40,   41,
+ /*   110 */    42,   43,   44,   76,   77,   78,   46,   46,   74,   75,
+ /*   120 */    76,   77,   78,   53,   53,   12,   58,   59,   60,   61,
+ /*   130 */    62,   63,   64,   65,   66,   67,   68,   69,    1,   82,
+ /*   140 */    15,   77,   17,   47,   19,   81,   21,   83,   84,   85,
+ /*   150 */    86,   12,   92,   96,   15,   16,   51,   20,   94,   46,
+ /*   160 */    13,   56,   25,   99,  100,  105,  102,   20,   31,   32,
+ /*   170 */    33,   34,   35,   36,   37,   38,   39,   40,   41,   42,
+ /*   180 */    43,   44,    1,   13,   12,   77,   14,   15,   15,   81,
+ /*   190 */    20,   83,   45,   54,   86,   58,   59,   60,   61,   62,
+ /*   200 */    63,   64,   65,   66,   67,   68,   69,   99,  100,   78,
+ /*   210 */   102,   80,   31,   32,   33,   34,   35,   36,   37,   38,
+ /*   220 */    39,   40,   41,   42,   43,   44,   12,   55,   12,   15,
+ /*   230 */    16,   15,   23,    8,   47,   14,   15,   12,   57,   58,
+ /*   240 */    59,   60,   61,   62,   63,   64,   65,   66,   67,   68,
+ /*   250 */    69,    1,   77,   28,    1,   93,   81,   46,   83,   84,
+ /*   260 */    85,   86,   51,   13,   53,   13,   13,  105,   57,   94,
+ /*   270 */    54,   18,   20,   20,   99,  100,   55,  102,   14,   15,
+ /*   280 */    71,   31,   32,   33,   34,   35,   36,   37,   38,   39,
+ /*   290 */    40,   41,   42,   43,   44,   70,   71,   72,   46,   13,
+ /*   300 */    16,   12,   18,   18,   15,   53,   20,   15,   58,   59,
+ /*   310 */    60,   61,   62,   63,   64,   65,   66,   67,   68,   69,
+ /*   320 */     1,   77,   48,   83,   13,   81,   86,   83,   84,   85,
+ /*   330 */    86,   20,   12,   13,   23,   15,   51,   53,   94,   20,
+ /*   340 */    46,   56,  102,   99,  100,   13,  102,   27,  108,    1,
+ /*   350 */    31,   32,   33,   34,   35,   36,   37,   38,   39,   40,
+ /*   360 */    41,   42,   43,   44,    1,   13,   12,   77,   20,   15,
+ /*   370 */    15,   81,   20,   83,   16,   23,   86,   58,   59,   60,
+ /*   380 */    61,   62,   63,   64,   65,   66,   67,   68,   69,   99,
+ /*   390 */   100,  103,  102,  105,   31,   32,   33,   34,   35,   36,
+ /*   400 */    37,   38,   39,   40,   41,   42,   43,   44,    1,   51,
+ /*   410 */    47,   12,   12,   13,   15,   15,   12,    2,   14,   15,
+ /*   420 */    13,   58,   59,   60,   61,   62,   63,   64,   65,   66,
+ /*   430 */    67,   68,   69,   29,   15,   20,  106,  107,   31,   32,
+ /*   440 */    33,   34,   35,   36,   37,   38,   39,   40,   41,   42,
+ /*   450 */    43,   44,    1,   54,   12,   77,   13,   15,   88,   81,
+ /*   460 */    88,   83,   77,   20,   86,   58,   59,   60,   61,   62,
+ /*   470 */    63,   64,   65,   66,   67,   68,   69,   99,  100,  103,
+ /*   480 */   102,    2,   31,   32,   33,   34,   35,   36,   37,   38,
+ /*   490 */    39,   40,   41,   42,   43,   44,    1,   13,  113,  114,
+ /*   500 */   106,  107,   89,   90,   20,   45,   15,   82,   13,   58,
+ /*   510 */    59,   60,   61,   62,   63,   64,   65,   66,   67,   68,
+ /*   520 */    69,   96,   71,   14,   51,   29,   31,   32,   33,   34,
+ /*   530 */    35,   36,   37,   38,   39,   40,   41,   42,   43,   44,
+ /*   540 */     1,   13,   22,   77,   13,   54,   13,   81,   20,   83,
+ /*   550 */    30,   20,   86,   58,   59,   60,   61,   62,   63,   64,
+ /*   560 */    65,   66,   67,   68,   69,   99,  100,   55,  102,   26,
+ /*   570 */    31,   32,   33,   34,   35,   36,   37,   38,   39,   40,
+ /*   580 */    41,   42,   43,   44,    1,    2,   47,   77,   13,   15,
+ /*   590 */    14,   81,   14,   83,   26,   20,   86,   58,   59,   60,
+ /*   600 */    61,   62,   63,   64,   65,   66,   67,   68,   69,   99,
+ /*   610 */   100,   88,  102,   13,   31,   32,   33,   34,   35,   36,
+ /*   620 */    37,   38,   39,   40,   41,   42,   43,   44,    1,   13,
+ /*   630 */    46,   13,   55,   23,   15,   47,   20,   53,   20,   15,
+ /*   640 */    13,   58,   59,   60,   61,   62,   63,   64,   65,   66,
+ /*   650 */    67,   68,   69,   29,   14,   13,   15,   20,   31,   32,
+ /*   660 */    33,   34,   35,   36,   37,   38,   39,   40,   41,   42,
+ /*   670 */    43,   44,    1,   13,   57,   77,   13,   16,   20,   81,
+ /*   680 */    20,   83,   18,   20,   86,   58,   59,   60,   61,   62,
+ /*   690 */    63,   64,   65,   66,   67,   68,   69,   99,  100,   24,
+ /*   700 */   102,   30,   31,   32,   33,   34,   35,   36,   37,   38,
+ /*   710 */    39,   40,   41,   42,   43,   44,   12,   53,   13,   15,
+ /*   720 */    16,   13,   15,   77,    8,   20,   14,   23,   12,   58,
+ /*   730 */    59,   60,   61,   62,   63,   64,   65,   66,   67,   68,
+ /*   740 */    69,    1,   77,   96,   28,   10,   81,    2,   83,   84,
+ /*   750 */    45,   86,   82,   45,   89,   12,   13,   87,   15,   94,
+ /*   760 */   114,   16,   22,  104,   99,  100,   96,  102,   79,  103,
+ /*   770 */    27,   31,   32,   33,   34,   35,   36,   37,   38,   39,
+ /*   780 */    40,   41,   42,   43,   44,    1,   70,   71,   72,   13,
+ /*   790 */   103,   95,   46,  105,   20,   18,   20,   13,   58,   59,
+ /*   800 */    60,   61,   62,   63,   64,   65,   66,   67,   68,   69,
+ /*   810 */    14,   91,  103,  107,   20,   31,   32,   33,   34,   35,
+ /*   820 */    36,   37,   38,   39,   40,   41,   42,   43,   44,    1,
+ /*   830 */    13,   13,   13,   91,  103,   88,  110,   20,   20,   20,
+ /*   840 */    82,   13,   58,   59,   60,   61,   62,   63,   64,   65,
+ /*   850 */    66,   67,   68,   69,   96,    2,   89,  115,  115,   31,
+ /*   860 */    32,   33,   34,   35,   36,   37,   38,   39,   40,   41,
+ /*   870 */    42,   43,   44,    1,  101,  115,   77,  115,  115,  115,
+ /*   880 */    81,  108,   83,  115,  115,   86,   58,   59,   60,   61,
+ /*   890 */    62,   63,   64,   65,   66,   67,   68,   69,   99,  100,
+ /*   900 */   115,  102,  115,   31,   32,   33,   34,   35,   36,   37,
+ /*   910 */    38,   39,   40,   41,   42,   43,   44,   87,  115,  115,
+ /*   920 */   115,  115,  115,  115,  115,  115,  115,   97,   98,  115,
+ /*   930 */    58,   59,   60,   61,   62,   63,   64,   65,   66,   67,
+ /*   940 */    68,   69,   82,   12,  115,   14,   15,   87,   17,  115,
+ /*   950 */    19,   12,   21,   14,   15,  115,   96,   97,   98,   28,
+ /*   960 */    29,   92,   92,   32,  115,   82,  115,   28,   29,   92,
+ /*   970 */    87,   32,  115,  115,  105,  105,  115,   46,  115,   96,
+ /*   980 */    49,   50,  105,   52,  115,   46,   55,   56,   49,   50,
+ /*   990 */    12,   52,   14,   15,   55,   56,   57,   82,   82,  115,
+ /*  1000 */   115,   70,   12,   87,   14,   15,   28,   29,  115,   70,
+ /*  1010 */    32,   96,   96,   97,   98,   82,  115,   82,   28,   29,
+ /*  1020 */   115,  115,   32,  115,   46,  110,  115,   49,   50,   96,
+ /*  1030 */    52,   96,  115,   55,   56,   12,   46,   14,   15,   49,
+ /*  1040 */    50,   92,   52,  110,   92,   55,   56,   12,   70,   14,
+ /*  1050 */    15,   28,   29,   92,  105,   32,  115,  105,   92,  115,
+ /*  1060 */    70,  115,  115,   28,   29,  115,  105,   32,  115,   46,
+ /*  1070 */   115,  105,   49,   50,   82,   52,   92,  115,   55,   56,
+ /*  1080 */    12,   46,   14,   15,   49,   50,  115,   52,   96,  105,
+ /*  1090 */    55,   56,   12,   70,   14,   15,   28,   29,  115,  115,
+ /*  1100 */    32,   82,  110,  115,  115,   70,  115,   82,   28,   29,
+ /*  1110 */   115,  115,   32,  115,   46,   96,  115,   49,   50,  115,
+ /*  1120 */    52,   96,  115,   55,   56,   12,   46,   14,   15,   49,
+ /*  1130 */    50,  115,   52,  115,  115,   55,   56,   12,   70,   14,
+ /*  1140 */    15,   28,   29,  115,  115,   32,  115,  115,  115,  115,
+ /*  1150 */    70,  115,  115,   28,   29,  115,  115,   32,  115,   46,
+ /*  1160 */   115,  115,   49,   50,  115,   52,  115,  115,   55,   56,
+ /*  1170 */    12,   46,   14,   15,   49,   50,  115,   52,  115,  115,
+ /*  1180 */    55,  115,  115,   70,  115,  115,   28,   29,  115,  115,
+ /*  1190 */    32,  115,   77,  115,  115,   70,   81,  115,   83,   84,
+ /*  1200 */   115,   86,  115,  115,   46,  115,  115,   49,   50,   94,
+ /*  1210 */    52,  115,  115,   55,   99,  100,   77,  102,  115,  115,
+ /*  1220 */    81,  115,   83,   84,  115,   86,  111,  112,   70,  115,
+ /*  1230 */   115,  115,  115,   94,  115,  115,  115,  115,   99,  100,
+ /*  1240 */    77,  102,  115,  115,   81,  115,   83,   84,  109,   86,
+ /*  1250 */   115,  115,   77,  115,  115,  115,   81,   94,   83,   84,
+ /*  1260 */   115,   86,   99,  100,   77,  102,  115,  115,   81,   94,
+ /*  1270 */    83,   84,  109,   86,   99,  100,  115,  102,  115,  115,
+ /*  1280 */   115,   94,  115,  115,  109,  115,   99,  100,   77,  102,
+ /*  1290 */   115,  115,   81,  115,   83,   84,  115,   86,  115,  112,
+ /*  1300 */    77,  115,  115,  115,   81,   94,   83,   84,  115,   86,
+ /*  1310 */    99,  100,  115,  102,  115,  115,  115,   94,  115,  115,
+ /*  1320 */   109,  115,   99,  100,   77,  102,  115,  115,   81,  115,
+ /*  1330 */    83,   84,  115,   86,  115,  115,   77,  115,  115,  115,
+ /*  1340 */    81,   94,   83,   84,  115,   86,   99,  100,   77,  102,
+ /*  1350 */   115,  115,   81,   94,   83,   84,  115,   86,   99,  100,
+ /*  1360 */   115,  102,  115,  115,  115,   94,  115,  115,  115,  115,
+ /*  1370 */    99,  100,   77,  102,  115,  115,   81,  115,   83,   84,
+ /*  1380 */   115,   86,  115,  115,   77,  115,  115,  115,   81,   94,
+ /*  1390 */    83,   84,  115,   86,   99,  100,  115,  102,  115,  115,
+ /*  1400 */   115,   94,  115,  115,  115,  115,   99,  100,   77,  102,
+ /*  1410 */   115,  115,   81,  115,   83,   84,  115,   86,  115,  115,
+ /*  1420 */    77,  115,  115,  115,   81,   94,   83,   84,  115,   86,
+ /*  1430 */    99,  100,   77,  102,  115,  115,   81,   94,   83,   84,
+ /*  1440 */   115,   86,   99,  100,  115,  102,  115,  115,  115,   94,
+ /*  1450 */   115,  115,  115,  115,   99,  100,   77,  102,  115,  115,
+ /*  1460 */    81,  115,   83,   84,  115,   86,  115,  115,   77,  115,
+ /*  1470 */   115,  115,   81,   94,   83,   84,  115,   86,   99,  100,
+ /*  1480 */   115,  102,  115,  115,  115,   94,  115,  115,  115,  115,
+ /*  1490 */    99,  100,   77,  102,  115,  115,   81,  115,   83,   84,
+ /*  1500 */   115,   86,  115,  115,   77,  115,  115,  115,   81,   94,
+ /*  1510 */    83,   84,  115,   86,   99,  100,   77,  102,  115,  115,
+ /*  1520 */    81,   94,   83,   84,  115,   86,   99,  100,  115,  102,
+ /*  1530 */   115,  115,  115,   94,  115,  115,  115,  115,   99,  100,
+ /*  1540 */    77,  102,  115,  115,   81,  115,   83,   84,  115,   86,
+ /*  1550 */   115,  115,   77,  115,  115,  115,   81,   94,   83,   84,
+ /*  1560 */   115,   86,   99,  100,  115,  102,  115,  115,  115,   94,
+ /*  1570 */   115,  115,  115,  115,   99,  100,   77,  102,  115,  115,
+ /*  1580 */    81,  115,   83,   84,  115,   86,  115,  115,   77,  115,
+ /*  1590 */   115,  115,   81,   94,   83,   84,  115,   86,   99,  100,
+ /*  1600 */    77,  102,  115,  115,   81,   94,   83,   84,  115,   86,
+ /*  1610 */    99,  100,  115,  102,  115,  115,  115,   94,  115,  115,
+ /*  1620 */   115,  115,   99,  100,   77,  102,  115,  115,   81,  115,
+ /*  1630 */    83,   84,  115,   86,  115,  115,   77,  115,  115,  115,
+ /*  1640 */    81,   94,   83,   84,  115,   86,   99,  100,  115,  102,
+ /*  1650 */   115,  115,  115,   94,  115,  115,  115,  115,   99,  100,
+ /*  1660 */    77,  102,  115,  115,   81,  115,   83,   84,  115,   86,
+ /*  1670 */   115,  115,   77,  115,  115,  115,   81,   94,   83,   84,
+ /*  1680 */   115,   86,   99,  100,   77,  102,  115,  115,   81,   94,
+ /*  1690 */    83,   84,  115,   86,   99,  100,  115,  102,  115,  115,
+ /*  1700 */   115,   94,  115,  115,  115,  115,   99,  100,   77,  102,
+ /*  1710 */   115,  115,   81,  115,   83,   84,  115,   86,  115,  115,
+ /*  1720 */    77,  115,  115,  115,   81,   94,   83,   84,  115,   86,
+ /*  1730 */    99,  100,  115,  102,  115,  115,  115,   94,  115,  115,
+ /*  1740 */   115,   82,   99,  100,   77,  102,   87,  115,   81,  115,
+ /*  1750 */    83,  115,  115,   86,   77,   96,   97,   98,   81,  115,
+ /*  1760 */    83,   94,  115,   86,  115,  115,   99,  100,  115,  102,
+ /*  1770 */   115,   94,  115,  115,  115,  115,   99,  100,  115,  102,
+ /*  1780 */    82,  115,  115,  115,   77,   87,  115,  115,   81,  115,
+ /*  1790 */    83,  115,  115,   86,   96,   97,   98,  115,  115,  115,
+ /*  1800 */   115,   94,  115,  115,  115,  115,   99,  100,  115,  102,
 );
-    const YY_SHIFT_USE_DFLT = -51;
-    const YY_SHIFT_MAX = 246;
+    const YY_SHIFT_USE_DFLT = -29;
+    const YY_SHIFT_MAX = 223;
     static public $yy_shift_ofst = array(
- /*     0 */  1184, 1015,  832,  832,  964, 1025, 1076,  893,  893, 1015,
- /*    10 */   964,  893,  893,  842,  893,  893,  893,  893,  893,  893,
- /*    20 */   893,  893,  893,  893,  893,  893,  893,  893,  893,  893,
- /*    30 */   893,  893,  893,  893,  893,  893,  893,  893,  893,  903,
- /*    40 */   954,   73,   73,   73, 1137,   73,   73,   73, 1086,   29,
- /*    50 */   -23,  100,  364,  364,   96, 1184,  838, 1858,  800,  223,
- /*    60 */   178,  263,  628,  612,  612,  612,  312,  268,  226,  184,
- /*    70 */   142,  406,  624,  574,  448,  490,  532,  666,  719,  761,
- /*    80 */   761,  761,  761,  761,  761,  761,  761,  761,  761,  761,
- /*    90 */   761,  761,  761,  761,  761, 1301,  960,  134,   -1,   -1,
- /*   100 */    63,   -1,  136,   10,  217,   91,  144,  276,  304,  304,
- /*   110 */   304,  304,  615,  304,  570,  276,  276,  304,  304,  276,
- /*   120 */   144,  262,  304,  133,  722,  724,  133,  722,  729,  722,
- /*   130 */   889,  911,  102,  -15,  349,   44,   13,  186,  366,   65,
- /*   140 */   566,  348,  526,  359,  524,  564,  359,  359,  523,  567,
- /*   150 */   373,  444,  443,  350,   12,  289,  485,  482,  527,  359,
- /*   160 */   484,  359,  480,  442,   62,  133,  133,   62,  729,   62,
- /*   170 */   721,  751,   62,  737,  133,  751,   62,   62,  778,   62,
- /*   180 */   133,   62,  -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,
- /*   190 */   143,  -24,   61,  405,  229,    3,  533,  569,  390,  132,
- /*   200 */   356,  -50,  311,  -50,  -50,  -50,  295,  401,  717,  699,
- /*   210 */   452,  622,  631,  625,  702,  693,  674,  707,  662,  629,
- /*   220 */   663,  635,  634,  521,  610,  640,  608,  661,  657,  665,
- /*   230 */   670,  681,  658,  659,  605,  627,  710,  726,  703,  664,
- /*   240 */   720,  731,  302,   -7,   31,  317,  575,
+ /*     0 */    43, 1068,  931,  931, 1113,  978,  990, 1068,  990,  978,
+ /*    10 */   978, 1080,  978,  939,  978,  978,  978,  978,  978,  978,
+ /*    20 */   978,  978,  978,  978,  978,  978,  978,  978,  978,  978,
+ /*    30 */   978,  978,  978,  978,  978,  978,  978,  978,  978, 1023,
+ /*    40 */  1023, 1035, 1125, 1158, 1125, 1125, 1125, 1125, 1125,   -1,
+ /*    50 */   137,   68,  319,  319,  172,  407,  250,  181,  363,  451,
+ /*    60 */   828,  784,  671,  740,  627,  583,  495,  539,  872,  872,
+ /*    70 */   872,  872,  872,  872,  872,  872,  872,  872,  872,  872,
+ /*    80 */   872,  872,  872,  872,   43,  716,   71,  253,  285,  221,
+ /*    90 */   415,  415,  415,  348,   11,  225,  704,  139,  216,  352,
+ /*   100 */   705,  311,  284,  354,  664,  442,  289,  289,  289,  289,
+ /*   110 */   354,  289,  264,  289,  289,  289,  777,  796,  658,  658,
+ /*   120 */   774,  658,  777,  743,  320,  125,  399,  400,   -9,  214,
+ /*   130 */   575,  484,  531,  113,  443,  105,   77,  170,  819,  105,
+ /*   140 */   286,  528,  818,  618,  105,  105,  616,  105,  660,  817,
+ /*   150 */   776,  663,  746,  735,  796,  853,  777,  777,  777,  794,
+ /*   160 */   794,  777,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  211,
+ /*   170 */    70,  252,  404,   29,  147,  584,    0,  584,  520,  358,
+ /*   180 */   -28,  209,  708,  491,  624,  745,  543,  642,  640,  675,
+ /*   190 */   588,  574,  568,  577,  712,  512,   83,  509,  617,  610,
+ /*   200 */   619,  707,  355,  292,  173,   53,   96,  294,  496,  473,
+ /*   210 */   419,  479,  332,   67,  274,  641,  533,  460,  576,  600,
+ /*   220 */   578,  661,  637,  187,
 );
-    const YY_REDUCE_USE_DFLT = -86;
-    const YY_REDUCE_MAX = 189;
+    const YY_REDUCE_USE_DFLT = -94;
+    const YY_REDUCE_MAX = 168;
     static public $yy_reduce_ofst = array(
- /*     0 */   -85, 1116, 1136, 1159, 1328, 1296, 1316, 1284, 1194, 1260,
- /*    10 */  1198, 1226, 1238, 1484, 1475, 1508, 1512, 1542, 1453, 1444,
- /*    20 */  1386, 1374, 1398, 1410, 1422, 1551, 1573, 1704, 1738, 1708,
- /*    30 */  1350, 1747, 1680, 1671, 1606, 1582, 1610, 1640, 1649, 1068,
- /*    40 */  1166, 1769, 1876, 1867, 1845, 1806, 1836, 1778, 1802, 1007,
- /*    50 */   921,  -52,  860,  -52,  277,    4,  153,  321,  183,  225,
- /*    60 */    20,  121,  581,  746,  767,  771,  284,  284,  284,  284,
- /*    70 */   284,  284,  284,  284,  284,  284,  284,  284,  284,  284,
- /*    80 */   284,  284,  284,  284,  284,  284,  284,  284,  284,  284,
- /*    90 */   284,  284,  284,  284,  284,  108,  422,  -77,  377,  308,
- /*   100 */   479,  372,  469,  636,  636,  -77,  354,  543,  708,  354,
- /*   110 */   667,  741,  514,  614,  469,  539,  568,   89,  260,  195,
- /*   120 */   131,  354,  396,  212,  447,  334,  210,  418,  264,   16,
- /*   130 */   145,  653,  653,  644,  145,  653,  653,  653,  145,  653,
- /*   140 */   639,  639,  639,  638,  639,  639,  638,  638,  639,  639,
- /*   150 */   145,  639,  639,  639,  637,  145,  639,  639,  639,  638,
- /*   160 */   639,  638,  639,  639,  145,  207,  207,  145,  678,  145,
- /*   170 */   660,  669,  145,  683,  207,  675,  145,  145,  633,  145,
- /*   180 */   207,  145,  497,  429,  489,  387,  369,  298,  319,  145,
+ /*     0 */    44, 1115,   -7,  244,  175, 1163,   64, 1187,  -76, 1175,
+ /*    10 */  1139,  665, 1211, 1391, 1379, 1415, 1427, 1439, 1355, 1343,
+ /*    20 */  1259, 1247, 1271, 1295, 1331, 1307, 1463, 1475, 1583, 1607,
+ /*    30 */  1631, 1643, 1595, 1559, 1499, 1223, 1511, 1523, 1547, 1677,
+ /*    40 */  1707, 1667,  799,  510,  290,  598,  378,  108,  466, 1698,
+ /*    50 */   916,  860,  860, 1659,  240,  830,  830,  830,  830,  830,
+ /*    60 */   830,  830,  830,  830,  830,  830,  830,  830,  830,  830,
+ /*    70 */   830,  830,  830,  830,  830,  830,  830,  830,  830,  830,
+ /*    80 */   830,  830,  830,  830,   37,  385,  883,   -2,  -93,  -58,
+ /*    90 */   915,  933,  992,  670,  131,  646,  162,  288,  288,  758,
+ /*   100 */   935,  758,  330,  961,  330,  869,   60,  870,  952,  949,
+ /*   110 */   869,  877,  773,  869,  984,  966,  394,  413, 1025, 1019,
+ /*   120 */   425,   57,  -53,  688,  688,  696,  688,  688,  688,  688,
+ /*   130 */   647,  647,  647,  709,  647,  659,  647,  647,  647,  659,
+ /*   140 */   647,  647,  647,  647,  659,  659,  647,  659,  647,  647,
+ /*   150 */   647,  647,  687,  689,  767,  726,  706,  706,  706,  720,
+ /*   160 */   742,  706,  747,  731,  523,  666,  376,  372,  370,
 );
     static public $yyExpectedTokens = array(
-        /* 0 */ array(3, 4, 6, 7, 8, 19, 22, 38, ),
-        /* 1 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 2 */ array(22, 24, 25, 27, 29, 31, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 3 */ array(22, 24, 25, 27, 29, 31, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 4 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 5 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 6 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 7 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 8 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 9 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 10 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 11 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 12 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 13 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 69, 82, ),
-        /* 14 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 15 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 16 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 17 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 18 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 19 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 20 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 21 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 22 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 23 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 24 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 25 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 26 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 27 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 28 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 29 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 30 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 31 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 32 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 33 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 34 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 35 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 36 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 37 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 38 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 39 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 40 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 68, 82, ),
-        /* 41 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 82, ),
-        /* 42 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 82, ),
-        /* 43 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 82, ),
-        /* 44 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 82, ),
-        /* 45 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 82, ),
-        /* 46 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 82, ),
-        /* 47 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 82, ),
-        /* 48 */ array(22, 24, 25, 38, 39, 42, 56, 59, 60, 62, 63, 64, 67, 82, ),
-        /* 49 */ array(30, 35, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 50 */ array(23, 30, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 51 */ array(23, 30, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 52 */ array(30, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 53 */ array(30, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 54 */ array(22, 24, 25, 67, ),
-        /* 55 */ array(3, 4, 6, 7, 8, 19, 22, 38, ),
-        /* 56 */ array(8, 22, 38, 82, 83, 84, ),
-        /* 57 */ array(1, 23, 28, 30, 56, 65, ),
-        /* 58 */ array(1, 23, 30, 55, ),
-        /* 59 */ array(1, 23, 28, 30, ),
-        /* 60 */ array(24, 25, 67, ),
-        /* 61 */ array(28, 61, 68, ),
-        /* 62 */ array(1, 30, ),
-        /* 63 */ array(2, 30, ),
-        /* 64 */ array(2, 30, ),
-        /* 65 */ array(2, 30, ),
-        /* 66 */ array(40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 67 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 83, ),
-        /* 68 */ array(23, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 69 */ array(23, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 70 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 57, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 71 */ array(23, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 72 */ array(32, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 73 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 74 */ array(23, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 75 */ array(23, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 76 */ array(23, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 77 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 57, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 78 */ array(2, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 79 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 80 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 81 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 82 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 83 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 84 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 85 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 86 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 87 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 88 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 89 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 90 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 91 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 92 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 93 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 94 */ array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, ),
-        /* 95 */ array(4, 5, 6, 19, 20, 21, ),
-        /* 96 */ array(8, 22, 38, 82, 83, 84, ),
-        /* 97 */ array(22, 25, 26, 66, ),
-        /* 98 */ array(9, 10, 12, 14, ),
-        /* 99 */ array(9, 10, 12, 14, ),
-        /* 100 */ array(22, 25, 26, 33, ),
-        /* 101 */ array(9, 10, 12, 14, ),
-        /* 102 */ array(26, 28, 65, ),
-        /* 103 */ array(23, 30, 33, ),
-        /* 104 */ array(23, 30, 33, ),
-        /* 105 */ array(22, 25, 66, ),
-        /* 106 */ array(22, 25, ),
-        /* 107 */ array(16, 17, ),
-        /* 108 */ array(22, 25, ),
-        /* 109 */ array(22, 25, ),
-        /* 110 */ array(22, 25, ),
-        /* 111 */ array(22, 25, ),
-        /* 112 */ array(24, 25, ),
-        /* 113 */ array(22, 25, ),
-        /* 114 */ array(28, 65, ),
-        /* 115 */ array(16, 17, ),
-        /* 116 */ array(16, 17, ),
-        /* 117 */ array(22, 25, ),
-        /* 118 */ array(22, 25, ),
-        /* 119 */ array(16, 17, ),
-        /* 120 */ array(22, 25, ),
-        /* 121 */ array(22, 25, ),
-        /* 122 */ array(22, 25, ),
-        /* 123 */ array(28, ),
-        /* 124 */ array(30, ),
-        /* 125 */ array(30, ),
-        /* 126 */ array(28, ),
-        /* 127 */ array(30, ),
-        /* 128 */ array(24, ),
-        /* 129 */ array(30, ),
-        /* 130 */ array(1, 23, 30, 55, ),
-        /* 131 */ array(22, 23, 25, 37, ),
-        /* 132 */ array(22, 23, 25, 37, ),
-        /* 133 */ array(25, 27, 29, 31, ),
-        /* 134 */ array(1, 23, 55, ),
-        /* 135 */ array(22, 23, 25, ),
-        /* 136 */ array(22, 25, 26, ),
-        /* 137 */ array(22, 23, 25, ),
-        /* 138 */ array(1, 37, 55, ),
-        /* 139 */ array(22, 25, 66, ),
-        /* 140 */ array(23, 30, ),
-        /* 141 */ array(23, 30, ),
-        /* 142 */ array(23, 30, ),
-        /* 143 */ array(61, 68, ),
-        /* 144 */ array(23, 30, ),
-        /* 145 */ array(23, 30, ),
-        /* 146 */ array(61, 68, ),
-        /* 147 */ array(61, 68, ),
-        /* 148 */ array(23, 30, ),
-        /* 149 */ array(23, 30, ),
-        /* 150 */ array(1, 55, ),
-        /* 151 */ array(23, 30, ),
-        /* 152 */ array(23, 30, ),
-        /* 153 */ array(23, 30, ),
-        /* 154 */ array(22, 56, ),
-        /* 155 */ array(1, 36, ),
-        /* 156 */ array(23, 30, ),
-        /* 157 */ array(23, 30, ),
-        /* 158 */ array(23, 30, ),
-        /* 159 */ array(61, 68, ),
-        /* 160 */ array(23, 30, ),
-        /* 161 */ array(61, 68, ),
-        /* 162 */ array(23, 30, ),
-        /* 163 */ array(23, 30, ),
-        /* 164 */ array(1, ),
-        /* 165 */ array(28, ),
-        /* 166 */ array(28, ),
-        /* 167 */ array(1, ),
-        /* 168 */ array(24, ),
-        /* 169 */ array(1, ),
-        /* 170 */ array(56, ),
-        /* 171 */ array(30, ),
-        /* 172 */ array(1, ),
-        /* 173 */ array(20, ),
-        /* 174 */ array(28, ),
-        /* 175 */ array(30, ),
-        /* 176 */ array(1, ),
-        /* 177 */ array(1, ),
-        /* 178 */ array(2, ),
-        /* 179 */ array(1, ),
-        /* 180 */ array(28, ),
-        /* 181 */ array(1, ),
-        /* 182 */ array(),
-        /* 183 */ array(),
-        /* 184 */ array(),
-        /* 185 */ array(),
-        /* 186 */ array(),
-        /* 187 */ array(),
-        /* 188 */ array(),
-        /* 189 */ array(),
-        /* 190 */ array(22, 24, 25, 39, 62, 63, ),
-        /* 191 */ array(56, 61, 65, 69, ),
-        /* 192 */ array(23, 30, 56, 65, ),
-        /* 193 */ array(26, 56, 65, ),
-        /* 194 */ array(37, 56, 65, ),
-        /* 195 */ array(33, 83, ),
-        /* 196 */ array(25, 39, ),
-        /* 197 */ array(26, 61, ),
-        /* 198 */ array(32, 40, ),
-        /* 199 */ array(2, 26, ),
-        /* 200 */ array(40, 69, ),
-        /* 201 */ array(56, 65, ),
-        /* 202 */ array(25, 66, ),
-        /* 203 */ array(56, 65, ),
-        /* 204 */ array(56, 65, ),
-        /* 205 */ array(56, 65, ),
-        /* 206 */ array(13, ),
-        /* 207 */ array(25, ),
-        /* 208 */ array(33, ),
-        /* 209 */ array(25, ),
-        /* 210 */ array(57, ),
-        /* 211 */ array(69, ),
-        /* 212 */ array(57, ),
-        /* 213 */ array(67, ),
-        /* 214 */ array(25, ),
-        /* 215 */ array(39, ),
-        /* 216 */ array(57, ),
-        /* 217 */ array(23, ),
-        /* 218 */ array(67, ),
-        /* 219 */ array(61, ),
-        /* 220 */ array(24, ),
-        /* 221 */ array(25, ),
-        /* 222 */ array(25, ),
-        /* 223 */ array(30, ),
-        /* 224 */ array(24, ),
-        /* 225 */ array(23, ),
-        /* 226 */ array(56, ),
-        /* 227 */ array(25, ),
-        /* 228 */ array(26, ),
-        /* 229 */ array(15, ),
-        /* 230 */ array(11, ),
-        /* 231 */ array(25, ),
-        /* 232 */ array(24, ),
-        /* 233 */ array(26, ),
-        /* 234 */ array(36, ),
-        /* 235 */ array(30, ),
-        /* 236 */ array(18, ),
-        /* 237 */ array(23, ),
-        /* 238 */ array(23, ),
-        /* 239 */ array(25, ),
-        /* 240 */ array(5, ),
-        /* 241 */ array(2, ),
-        /* 242 */ array(25, ),
-        /* 243 */ array(24, ),
-        /* 244 */ array(34, ),
-        /* 245 */ array(58, ),
-        /* 246 */ array(24, ),
+        /* 0 */ array(3, 4, 5, 6, 7, 8, 9, 12, 28, ),
+        /* 1 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 2 */ array(12, 14, 15, 17, 19, 21, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 3 */ array(12, 14, 15, 17, 19, 21, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 4 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 5 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 6 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 7 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 8 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 9 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 10 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 11 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 12 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 13 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 57, 70, ),
+        /* 14 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 15 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 16 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 17 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 18 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 19 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 20 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 21 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 22 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 23 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 24 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 25 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 26 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 27 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 28 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 29 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 30 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 31 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 32 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 33 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 34 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 35 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 36 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 37 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 38 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 39 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 40 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 41 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 56, 70, ),
+        /* 42 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 70, ),
+        /* 43 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 70, ),
+        /* 44 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 70, ),
+        /* 45 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 70, ),
+        /* 46 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 70, ),
+        /* 47 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 70, ),
+        /* 48 */ array(12, 14, 15, 28, 29, 32, 46, 49, 50, 52, 55, 70, ),
+        /* 49 */ array(1, 13, 20, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 50 */ array(1, 20, 25, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 51 */ array(1, 13, 20, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 52 */ array(1, 20, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 53 */ array(1, 20, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 54 */ array(12, 14, 15, 55, ),
+        /* 55 */ array(1, 13, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 56 */ array(1, 13, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 57 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 58 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 47, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 59 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 71, ),
+        /* 60 */ array(1, 13, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 61 */ array(1, 13, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 62 */ array(1, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 63 */ array(1, 22, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 64 */ array(1, 13, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 65 */ array(1, 2, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 66 */ array(1, 13, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 67 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 47, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 68 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 69 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 70 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 71 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 72 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 73 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 74 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 75 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 76 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 77 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 78 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 79 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 80 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 81 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 82 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 83 */ array(1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, ),
+        /* 84 */ array(3, 4, 5, 6, 7, 8, 9, 12, 28, ),
+        /* 85 */ array(8, 12, 28, 70, 71, 72, ),
+        /* 86 */ array(1, 13, 18, 20, 46, 53, ),
+        /* 87 */ array(1, 13, 18, 20, ),
+        /* 88 */ array(18, 51, 56, ),
+        /* 89 */ array(14, 15, 55, ),
+        /* 90 */ array(2, 20, ),
+        /* 91 */ array(2, 20, ),
+        /* 92 */ array(2, 20, ),
+        /* 93 */ array(1, 20, ),
+        /* 94 */ array(4, 5, 6, 9, 10, 11, ),
+        /* 95 */ array(8, 12, 28, 70, 71, 72, ),
+        /* 96 */ array(12, 15, 16, 23, ),
+        /* 97 */ array(12, 15, 16, 54, ),
+        /* 98 */ array(12, 15, 54, ),
+        /* 99 */ array(13, 20, 23, ),
+        /* 100 */ array(13, 20, 45, ),
+        /* 101 */ array(13, 20, 23, ),
+        /* 102 */ array(16, 18, 53, ),
+        /* 103 */ array(12, 15, ),
+        /* 104 */ array(18, 53, ),
+        /* 105 */ array(12, 15, ),
+        /* 106 */ array(12, 15, ),
+        /* 107 */ array(12, 15, ),
+        /* 108 */ array(12, 15, ),
+        /* 109 */ array(12, 15, ),
+        /* 110 */ array(12, 15, ),
+        /* 111 */ array(12, 15, ),
+        /* 112 */ array(14, 15, ),
+        /* 113 */ array(12, 15, ),
+        /* 114 */ array(12, 15, ),
+        /* 115 */ array(12, 15, ),
+        /* 116 */ array(18, ),
+        /* 117 */ array(14, ),
+        /* 118 */ array(20, ),
+        /* 119 */ array(20, ),
+        /* 120 */ array(20, ),
+        /* 121 */ array(20, ),
+        /* 122 */ array(18, ),
+        /* 123 */ array(12, 13, 15, 27, ),
+        /* 124 */ array(12, 13, 15, 27, ),
+        /* 125 */ array(15, 17, 19, 21, ),
+        /* 126 */ array(12, 15, 54, ),
+        /* 127 */ array(12, 13, 15, ),
+        /* 128 */ array(12, 13, 15, ),
+        /* 129 */ array(12, 15, 16, ),
+        /* 130 */ array(13, 20, ),
+        /* 131 */ array(13, 20, ),
+        /* 132 */ array(13, 20, ),
+        /* 133 */ array(12, 46, ),
+        /* 134 */ array(13, 20, ),
+        /* 135 */ array(51, 56, ),
+        /* 136 */ array(13, 20, ),
+        /* 137 */ array(13, 20, ),
+        /* 138 */ array(13, 20, ),
+        /* 139 */ array(51, 56, ),
+        /* 140 */ array(13, 20, ),
+        /* 141 */ array(13, 20, ),
+        /* 142 */ array(13, 20, ),
+        /* 143 */ array(13, 20, ),
+        /* 144 */ array(51, 56, ),
+        /* 145 */ array(51, 56, ),
+        /* 146 */ array(13, 20, ),
+        /* 147 */ array(51, 56, ),
+        /* 148 */ array(13, 20, ),
+        /* 149 */ array(13, 20, ),
+        /* 150 */ array(13, 20, ),
+        /* 151 */ array(13, 20, ),
+        /* 152 */ array(46, ),
+        /* 153 */ array(10, ),
+        /* 154 */ array(14, ),
+        /* 155 */ array(2, ),
+        /* 156 */ array(18, ),
+        /* 157 */ array(18, ),
+        /* 158 */ array(18, ),
+        /* 159 */ array(20, ),
+        /* 160 */ array(20, ),
+        /* 161 */ array(18, ),
+        /* 162 */ array(),
+        /* 163 */ array(),
+        /* 164 */ array(),
+        /* 165 */ array(),
+        /* 166 */ array(),
+        /* 167 */ array(),
+        /* 168 */ array(),
+        /* 169 */ array(46, 51, 53, 57, ),
+        /* 170 */ array(16, 26, 46, 53, ),
+        /* 171 */ array(13, 20, 46, 53, ),
+        /* 172 */ array(12, 14, 15, 29, ),
+        /* 173 */ array(27, 46, 53, ),
+        /* 174 */ array(13, 20, 45, ),
+        /* 175 */ array(46, 53, ),
+        /* 176 */ array(27, 45, ),
+        /* 177 */ array(46, 53, ),
+        /* 178 */ array(22, 30, ),
+        /* 179 */ array(16, 51, ),
+        /* 180 */ array(30, 57, ),
+        /* 181 */ array(23, 71, ),
+        /* 182 */ array(13, 45, ),
+        /* 183 */ array(15, 54, ),
+        /* 184 */ array(15, 29, ),
+        /* 185 */ array(2, 16, ),
+        /* 186 */ array(26, ),
+        /* 187 */ array(13, ),
+        /* 188 */ array(14, ),
+        /* 189 */ array(24, ),
+        /* 190 */ array(47, ),
+        /* 191 */ array(15, ),
+        /* 192 */ array(26, ),
+        /* 193 */ array(55, ),
+        /* 194 */ array(14, ),
+        /* 195 */ array(55, ),
+        /* 196 */ array(15, ),
+        /* 197 */ array(14, ),
+        /* 198 */ array(57, ),
+        /* 199 */ array(23, ),
+        /* 200 */ array(15, ),
+        /* 201 */ array(15, ),
+        /* 202 */ array(15, ),
+        /* 203 */ array(15, ),
+        /* 204 */ array(15, ),
+        /* 205 */ array(20, ),
+        /* 206 */ array(47, ),
+        /* 207 */ array(46, ),
+        /* 208 */ array(29, ),
+        /* 209 */ array(51, ),
+        /* 210 */ array(15, ),
+        /* 211 */ array(2, ),
+        /* 212 */ array(13, ),
+        /* 213 */ array(16, ),
+        /* 214 */ array(48, ),
+        /* 215 */ array(15, ),
+        /* 216 */ array(13, ),
+        /* 217 */ array(45, ),
+        /* 218 */ array(14, ),
+        /* 219 */ array(13, ),
+        /* 220 */ array(14, ),
+        /* 221 */ array(16, ),
+        /* 222 */ array(20, ),
+        /* 223 */ array(47, ),
+        /* 224 */ array(),
+        /* 225 */ array(),
+        /* 226 */ array(),
+        /* 227 */ array(),
+        /* 228 */ array(),
+        /* 229 */ array(),
+        /* 230 */ array(),
+        /* 231 */ array(),
+        /* 232 */ array(),
+        /* 233 */ array(),
+        /* 234 */ array(),
+        /* 235 */ array(),
+        /* 236 */ array(),
+        /* 237 */ array(),
+        /* 238 */ array(),
+        /* 239 */ array(),
+        /* 240 */ array(),
+        /* 241 */ array(),
+        /* 242 */ array(),
+        /* 243 */ array(),
+        /* 244 */ array(),
+        /* 245 */ array(),
+        /* 246 */ array(),
         /* 247 */ array(),
         /* 248 */ array(),
         /* 249 */ array(),
@@ -1039,77 +986,50 @@ static public $yy_action = 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(),
 );
     static public $yy_default = array(
- /*     0 */   583,  566,  583,  583,  583,  583,  583,  537,  537,  583,
- /*    10 */   583,  537,  537,  583,  583,  583,  583,  583,  583,  583,
- /*    20 */   583,  583,  583,  583,  583,  583,  583,  583,  583,  583,
- /*    30 */   583,  583,  583,  583,  583,  583,  583,  583,  583,  583,
- /*    40 */   583,  583,  583,  583,  583,  583,  583,  583,  583,  451,
- /*    50 */   583,  583,  451,  451,  583,  384,  583,  462,  461,  583,
- /*    60 */   583,  545,  451,  451,  451,  451,  536,  583,  583,  583,
- /*    70 */   583,  583,  583,  583,  583,  583,  583,  583,  583,  453,
- /*    80 */   568,  484,  481,  457,  460,  433,  480,  477,  471,  567,
- /*    90 */   472,  473,  476,  468,  569,  583,  583,  508,  395,  395,
- /*   100 */   583,  395,  501,  485,  485,  508,  583,  401,  583,  583,
- /*   110 */   583,  583,  583,  583,  501,  401,  401,  583,  583,  401,
- /*   120 */   583,  583,  583,  540,  451,  451,  541,  451,  583,  451,
- /*   130 */   461,  583,  583,  583,  461,  583,  583,  583,  461,  509,
- /*   140 */   583,  583,  583,  531,  583,  583,  506,  529,  583,  583,
- /*   150 */   461,  583,  583,  583,  508,  583,  583,  583,  583,  530,
- /*   160 */   583,  528,  583,  583,  486,  542,  543,  465,  583,  466,
- /*   170 */   508,  582,  464,  407,  524,  582,  483,  487,  500,  488,
- /*   180 */   546,  470,  548,  508,  548,  508,  508,  548,  548,  549,
- /*   190 */   583,  462,  462,  456,  462,  485,  583,  490,  583,  522,
- /*   200 */   583,  583,  583,  482,  550,  462,  583,  583,  485,  583,
- /*   210 */   583,  583,  583,  583,  583,  583,  583,  583,  583,  490,
- /*   220 */   583,  583,  583,  583,  583,  583,  544,  583,  583,  583,
- /*   230 */   583,  583,  583,  456,  583,  583,  583,  583,  583,  583,
- /*   240 */   583,  522,  583,  583,  458,  495,  583,  445,  455,  398,
- /*   250 */   432,  386,  385,  434,  581,  443,  459,  444,  387,  442,
- /*   260 */   388,  573,  518,  394,  580,  515,  576,  579,  514,  519,
- /*   270 */   523,  532,  511,  512,  513,  397,  574,  390,  402,  436,
- /*   280 */   389,  435,  495,  396,  570,  534,  535,  575,  533,  400,
- /*   290 */   571,  572,  448,  427,  489,  547,  478,  479,  475,  474,
- /*   300 */   491,  469,  539,  538,  450,  447,  556,  557,  558,  559,
- /*   310 */   555,  554,  551,  552,  553,  492,  493,  496,  497,  499,
- /*   320 */   527,  463,  522,  502,  507,  510,  521,  520,  503,  415,
- /*   330 */   577,  494,  416,  498,  517,  504,  505,  516,  560,  561,
- /*   340 */   405,  429,  428,  425,  406,  426,  525,  526,  408,  424,
- /*   350 */   404,  437,  391,  430,  431,  403,  392,  393,  438,  439,
- /*   360 */   440,  423,  422,  565,  564,  578,  417,  563,  441,  562,
- /*   370 */   467,  446,  418,  419,  412,  411,  410,  409,  413,  414,
- /*   380 */   420,  421,  449,  399,
+ /*     0 */   546,  529,  546,  546,  546,  500,  546,  546,  546,  500,
+ /*    10 */   500,  546,  500,  546,  546,  546,  546,  546,  546,  546,
+ /*    20 */   546,  546,  546,  546,  546,  546,  546,  546,  546,  546,
+ /*    30 */   546,  546,  546,  546,  546,  546,  546,  546,  546,  546,
+ /*    40 */   546,  546,  546,  546,  546,  546,  546,  546,  546,  546,
+ /*    50 */   418,  546,  418,  418,  546,  546,  546,  546,  546,  546,
+ /*    60 */   546,  546,  499,  546,  546,  546,  546,  546,  427,  451,
+ /*    70 */   440,  532,  448,  443,  447,  531,  438,  400,  435,  444,
+ /*    80 */   530,  424,  439,  420,  360,  546,  459,  546,  508,  546,
+ /*    90 */   418,  418,  418,  418,  546,  546,  546,  473,  473,  452,
+ /*   100 */   428,  452,  466,  546,  466,  546,  546,  546,  546,  546,
+ /*   110 */   546,  546,  546,  546,  546,  546,  503,  546,  418,  418,
+ /*   120 */   418,  418,  504,  546,  546,  546,  474,  546,  546,  546,
+ /*   130 */   546,  546,  546,  473,  546,  492,  546,  546,  546,  491,
+ /*   140 */   546,  546,  546,  546,  493,  494,  546,  471,  546,  546,
+ /*   150 */   546,  546,  473,  374,  546,  434,  509,  506,  487,  545,
+ /*   160 */   545,  505,  511,  473,  511,  473,  473,  511,  511,  459,
+ /*   170 */   423,  459,  546,  459,  428,  459,  428,  449,  546,  457,
+ /*   180 */   546,  452,  428,  546,  546,  485,  546,  546,  546,  425,
+ /*   190 */   546,  546,  546,  546,  546,  546,  546,  546,  546,  452,
+ /*   200 */   546,  546,  546,  546,  546,  546,  546,  507,  546,  457,
+ /*   210 */   546,  485,  546,  546,  461,  546,  546,  428,  546,  546,
+ /*   220 */   546,  423,  546,  546,  477,  476,  361,  486,  495,  422,
+ /*   230 */   461,  415,  539,  542,  537,  538,  534,  535,  543,  536,
+ /*   240 */   497,  450,  482,  480,  481,  479,  533,  403,  544,  426,
+ /*   250 */   401,  498,  399,  411,  410,  409,  402,  478,  496,  512,
+ /*   260 */   513,  412,  385,  429,  464,  467,  472,  475,  458,  455,
+ /*   270 */   510,  456,  453,  454,  484,  485,  490,  483,  468,  469,
+ /*   280 */   465,  463,  430,  460,  431,  462,  417,  414,  368,  369,
+ /*   290 */   370,  371,  367,  366,  362,  363,  364,  365,  372,  373,
+ /*   300 */   381,  416,  408,  413,  380,  379,  375,  376,  377,  378,
+ /*   310 */   470,  432,  388,  387,  389,  390,  488,  386,  384,  526,
+ /*   320 */   528,  527,  541,  489,  391,  405,  406,  407,  397,  404,
+ /*   330 */   392,  393,  394,  396,  395,  433,  525,  442,  445,  446,
+ /*   340 */   501,  441,  437,  382,  540,  383,  436,  502,  514,  521,
+ /*   350 */   522,  523,  524,  520,  519,  515,  516,  517,  518,  398,
 );
-    const YYNOCODE = 132;
+    const YYNOCODE = 116;
     const YYSTACKDEPTH = 100;
-    const YYNSTATE = 384;
-    const YYNRULE = 199;
-    const YYERRORSYMBOL = 85;
+    const YYNSTATE = 360;
+    const YYNRULE = 186;
+    const YYERRORSYMBOL = 73;
     const YYERRSYMDT = 'yy0';
     const YYFALLBACK = 0;
     static public $yyFallback = array(
@@ -1140,28 +1060,24 @@ static public $yy_action = array(
     public $yyTokenName = array( 
   '$',             'VERT',          'COLON',         'COMMENT',     
   'PHPSTARTTAG',   'PHPENDTAG',     'FAKEPHPSTARTTAG',  'XMLTAG',      
-  'OTHER',         'PHP_CODE',      'PHP_CODE_START_DOUBLEQUOTE',  'PHP_CODE_DOUBLEQUOTE',
-  'PHP_HEREDOC_START',  'PHP_HEREDOC_END',  'PHP_NOWDOC_START',  'PHP_NOWDOC_END',
-  'PHP_DQ_CONTENT',  'PHP_DQ_EMBED_START',  'PHP_DQ_EMBED_END',  'LITERALSTART',
-  'LITERALEND',    'LITERAL',       'LDEL',          'RDEL',        
-  'DOLLAR',        'ID',            'EQUAL',         'FOREACH',     
-  'PTR',           'IF',            'SPACE',         'FOR',         
-  'SEMICOLON',     'INCDEC',        'TO',            'STEP',        
-  'AS',            'APTR',          'LDELSLASH',     'INTEGER',     
-  'COMMA',         'MATH',          'UNIMATH',       'ANDSYM',      
-  'ISIN',          'ISDIVBY',       'ISNOTDIVBY',    'ISEVEN',      
-  'ISNOTEVEN',     'ISEVENBY',      'ISNOTEVENBY',   'ISODD',       
-  'ISNOTODD',      'ISODDBY',       'ISNOTODDBY',    'INSTANCEOF',  
-  'OPENP',         'CLOSEP',        'QMARK',         'NOT',         
-  'TYPECAST',      'DOT',           'BOOLEAN',       'NULL',        
+  'OTHER',         'LITERALSTART',  'LITERALEND',    'LITERAL',     
+  'LDEL',          'RDEL',          'DOLLAR',        'ID',          
+  'EQUAL',         'FOREACH',       'PTR',           'IF',          
+  'SPACE',         'FOR',           'SEMICOLON',     'INCDEC',      
+  'TO',            'STEP',          'AS',            'APTR',        
+  'LDELSLASH',     'INTEGER',       'COMMA',         'MATH',        
+  'UNIMATH',       'ANDSYM',        'ISIN',          'ISDIVBY',     
+  'ISNOTDIVBY',    'ISEVEN',        'ISNOTEVEN',     'ISEVENBY',    
+  'ISNOTEVENBY',   'ISODD',         'ISNOTODD',      'ISODDBY',     
+  'ISNOTODDBY',    'INSTANCEOF',    'OPENP',         'CLOSEP',      
+  'QMARK',         'NOT',           'TYPECAST',      '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',       'php_code',    
-  'php_code_element',  'php_dq_contents',  'php_dq_content',  'literal_elements',
+  'template_element',  'smartytag',     'literal',       'literal_elements',
   'literal_element',  'value',         'attributes',    'variable',    
   'expr',          'ternary',       'varindexed',    'modifier',    
   'modparameters',  'statement',     'statements',    'optspace',    
@@ -1180,199 +1096,186 @@ static public $yy_action = array(
  /*   3 */ "template_element ::= smartytag",
  /*   4 */ "template_element ::= COMMENT",
  /*   5 */ "template_element ::= literal",
- /*   6 */ "template_element ::= PHPSTARTTAG php_code PHPENDTAG",
- /*   7 */ "template_element ::= FAKEPHPSTARTTAG",
- /*   8 */ "template_element ::= XMLTAG",
- /*   9 */ "template_element ::= OTHER",
- /*  10 */ "php_code ::= php_code_element php_code",
- /*  11 */ "php_code ::=",
- /*  12 */ "php_code_element ::= PHP_CODE",
- /*  13 */ "php_code_element ::= PHP_CODE_START_DOUBLEQUOTE php_dq_contents PHP_CODE_DOUBLEQUOTE",
- /*  14 */ "php_code_element ::= PHP_HEREDOC_START php_dq_contents PHP_HEREDOC_END",
- /*  15 */ "php_code_element ::= PHP_NOWDOC_START php_dq_contents PHP_NOWDOC_END",
- /*  16 */ "php_dq_contents ::= php_dq_content php_dq_contents",
- /*  17 */ "php_dq_contents ::=",
- /*  18 */ "php_dq_content ::= PHP_DQ_CONTENT",
- /*  19 */ "php_dq_content ::= PHP_DQ_EMBED_START php_code PHP_DQ_EMBED_END",
- /*  20 */ "literal ::= LITERALSTART LITERALEND",
- /*  21 */ "literal ::= LITERALSTART literal_elements LITERALEND",
- /*  22 */ "literal_elements ::= literal_elements literal_element",
- /*  23 */ "literal_elements ::=",
- /*  24 */ "literal_element ::= literal",
- /*  25 */ "literal_element ::= LITERAL",
- /*  26 */ "literal_element ::= PHPSTARTTAG",
- /*  27 */ "literal_element ::= FAKEPHPSTARTTAG",
- /*  28 */ "literal_element ::= PHPENDTAG",
- /*  29 */ "smartytag ::= LDEL value RDEL",
- /*  30 */ "smartytag ::= LDEL value attributes RDEL",
- /*  31 */ "smartytag ::= LDEL variable attributes RDEL",
- /*  32 */ "smartytag ::= LDEL expr attributes RDEL",
- /*  33 */ "smartytag ::= LDEL ternary attributes RDEL",
- /*  34 */ "smartytag ::= LDEL DOLLAR ID EQUAL value RDEL",
- /*  35 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr RDEL",
- /*  36 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr attributes RDEL",
- /*  37 */ "smartytag ::= LDEL DOLLAR ID EQUAL ternary attributes RDEL",
- /*  38 */ "smartytag ::= LDEL varindexed EQUAL expr attributes RDEL",
- /*  39 */ "smartytag ::= LDEL varindexed EQUAL ternary attributes RDEL",
- /*  40 */ "smartytag ::= LDEL ID attributes RDEL",
- /*  41 */ "smartytag ::= LDEL FOREACH attributes RDEL",
- /*  42 */ "smartytag ::= LDEL ID RDEL",
- /*  43 */ "smartytag ::= LDEL ID PTR ID attributes RDEL",
- /*  44 */ "smartytag ::= LDEL ID modifier modparameters attributes RDEL",
- /*  45 */ "smartytag ::= LDEL ID PTR ID modifier modparameters attributes RDEL",
- /*  46 */ "smartytag ::= LDEL IF SPACE expr RDEL",
- /*  47 */ "smartytag ::= LDEL IF SPACE statement RDEL",
- /*  48 */ "smartytag ::= LDEL FOR SPACE statements SEMICOLON optspace expr SEMICOLON optspace DOLLAR varvar foraction RDEL",
- /*  49 */ "foraction ::= EQUAL expr",
- /*  50 */ "foraction ::= INCDEC",
- /*  51 */ "smartytag ::= LDEL FOR SPACE statement TO expr attributes RDEL",
- /*  52 */ "smartytag ::= LDEL FOR SPACE statement TO expr STEP expr RDEL",
- /*  53 */ "smartytag ::= LDEL FOREACH SPACE value AS DOLLAR varvar RDEL",
- /*  54 */ "smartytag ::= LDEL FOREACH SPACE value AS DOLLAR varvar APTR DOLLAR varvar RDEL",
- /*  55 */ "smartytag ::= LDEL FOREACH SPACE array AS DOLLAR varvar RDEL",
- /*  56 */ "smartytag ::= LDEL FOREACH SPACE array AS DOLLAR varvar APTR DOLLAR varvar RDEL",
- /*  57 */ "smartytag ::= LDELSLASH ID RDEL",
- /*  58 */ "smartytag ::= LDELSLASH specialclose RDEL",
- /*  59 */ "specialclose ::= IF",
- /*  60 */ "specialclose ::= FOR",
- /*  61 */ "specialclose ::= FOREACH",
- /*  62 */ "smartytag ::= LDELSLASH ID attributes RDEL",
- /*  63 */ "smartytag ::= LDELSLASH ID modifier modparameters attributes RDEL",
- /*  64 */ "smartytag ::= LDELSLASH ID PTR ID RDEL",
- /*  65 */ "attributes ::= attributes attribute",
- /*  66 */ "attributes ::= attribute",
- /*  67 */ "attributes ::=",
- /*  68 */ "attribute ::= SPACE ID EQUAL ID",
- /*  69 */ "attribute ::= SPACE ID EQUAL expr",
- /*  70 */ "attribute ::= SPACE ID EQUAL value",
- /*  71 */ "attribute ::= SPACE ID EQUAL ternary",
- /*  72 */ "attribute ::= SPACE ID",
- /*  73 */ "attribute ::= SPACE INTEGER EQUAL expr",
- /*  74 */ "statements ::= statement",
- /*  75 */ "statements ::= statements COMMA statement",
- /*  76 */ "statement ::= DOLLAR varvar EQUAL expr",
- /*  77 */ "expr ::= value",
- /*  78 */ "expr ::= ID",
- /*  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 ifcond expr",
- /*  85 */ "expr ::= expr ISIN array",
- /*  86 */ "expr ::= expr ISIN value",
- /*  87 */ "expr ::= expr lop expr",
- /*  88 */ "expr ::= expr ISDIVBY expr",
- /*  89 */ "expr ::= expr ISNOTDIVBY expr",
- /*  90 */ "expr ::= expr ISEVEN",
- /*  91 */ "expr ::= expr ISNOTEVEN",
- /*  92 */ "expr ::= expr ISEVENBY expr",
- /*  93 */ "expr ::= expr ISNOTEVENBY expr",
- /*  94 */ "expr ::= expr ISODD",
- /*  95 */ "expr ::= expr ISNOTODD",
- /*  96 */ "expr ::= expr ISODDBY expr",
- /*  97 */ "expr ::= expr ISNOTODDBY expr",
- /*  98 */ "expr ::= value INSTANCEOF ID",
- /*  99 */ "expr ::= value INSTANCEOF value",
- /* 100 */ "ternary ::= OPENP expr CLOSEP QMARK expr COLON expr",
- /* 101 */ "value ::= variable",
- /* 102 */ "value ::= UNIMATH value",
- /* 103 */ "value ::= NOT value",
- /* 104 */ "value ::= TYPECAST value",
- /* 105 */ "value ::= variable INCDEC",
- /* 106 */ "value ::= INTEGER",
- /* 107 */ "value ::= INTEGER DOT INTEGER",
- /* 108 */ "value ::= BOOLEAN",
- /* 109 */ "value ::= NULL",
- /* 110 */ "value ::= function",
- /* 111 */ "value ::= OPENP expr CLOSEP",
- /* 112 */ "value ::= SINGLEQUOTESTRING",
- /* 113 */ "value ::= doublequoted_with_quotes",
- /* 114 */ "value ::= ID DOUBLECOLON static_class_access",
- /* 115 */ "value ::= smartytag",
- /* 116 */ "value ::= value modifier modparameters",
- /* 117 */ "variable ::= varindexed",
- /* 118 */ "variable ::= DOLLAR varvar AT ID",
- /* 119 */ "variable ::= object",
- /* 120 */ "variable ::= HATCH ID HATCH",
- /* 121 */ "variable ::= HATCH variable HATCH",
- /* 122 */ "varindexed ::= DOLLAR varvar arrayindex",
- /* 123 */ "arrayindex ::= arrayindex indexdef",
- /* 124 */ "arrayindex ::=",
- /* 125 */ "indexdef ::= DOT DOLLAR varvar",
- /* 126 */ "indexdef ::= DOT DOLLAR varvar AT ID",
- /* 127 */ "indexdef ::= DOT ID",
- /* 128 */ "indexdef ::= DOT BOOLEAN",
- /* 129 */ "indexdef ::= DOT NULL",
- /* 130 */ "indexdef ::= DOT INTEGER",
- /* 131 */ "indexdef ::= DOT LDEL expr RDEL",
- /* 132 */ "indexdef ::= OPENB ID CLOSEB",
- /* 133 */ "indexdef ::= OPENB ID DOT ID CLOSEB",
- /* 134 */ "indexdef ::= OPENB expr CLOSEB",
- /* 135 */ "indexdef ::= OPENB CLOSEB",
- /* 136 */ "varvar ::= varvarele",
- /* 137 */ "varvar ::= varvar varvarele",
- /* 138 */ "varvarele ::= ID",
- /* 139 */ "varvarele ::= LDEL expr RDEL",
- /* 140 */ "object ::= varindexed objectchain",
- /* 141 */ "object ::= varindexed DOUBLECOLON ID",
- /* 142 */ "objectchain ::= objectelement",
- /* 143 */ "objectchain ::= objectchain objectelement",
- /* 144 */ "objectelement ::= PTR ID arrayindex",
- /* 145 */ "objectelement ::= PTR variable arrayindex",
- /* 146 */ "objectelement ::= PTR LDEL expr RDEL arrayindex",
- /* 147 */ "objectelement ::= PTR ID LDEL expr RDEL arrayindex",
- /* 148 */ "objectelement ::= PTR method",
- /* 149 */ "function ::= ID OPENP params CLOSEP",
- /* 150 */ "method ::= ID OPENP params CLOSEP",
- /* 151 */ "params ::= expr COMMA params",
- /* 152 */ "params ::= expr",
- /* 153 */ "params ::=",
- /* 154 */ "modifier ::= VERT AT ID",
- /* 155 */ "modifier ::= VERT ID",
- /* 156 */ "static_class_access ::= method",
- /* 157 */ "static_class_access ::= DOLLAR ID OPENP params CLOSEP",
- /* 158 */ "static_class_access ::= method objectchain",
- /* 159 */ "static_class_access ::= DOLLAR ID OPENP params CLOSEP objectchain",
- /* 160 */ "static_class_access ::= ID",
- /* 161 */ "static_class_access ::= DOLLAR ID arrayindex",
- /* 162 */ "static_class_access ::= DOLLAR ID arrayindex objectchain",
- /* 163 */ "modparameters ::= modparameters modparameter",
- /* 164 */ "modparameters ::=",
- /* 165 */ "modparameter ::= COLON value",
- /* 166 */ "modparameter ::= COLON ID",
- /* 167 */ "ifcond ::= EQUALS",
- /* 168 */ "ifcond ::= NOTEQUALS",
- /* 169 */ "ifcond ::= GREATERTHAN",
- /* 170 */ "ifcond ::= LESSTHAN",
- /* 171 */ "ifcond ::= GREATEREQUAL",
- /* 172 */ "ifcond ::= LESSEQUAL",
- /* 173 */ "ifcond ::= IDENTITY",
- /* 174 */ "ifcond ::= NONEIDENTITY",
- /* 175 */ "ifcond ::= MOD",
- /* 176 */ "lop ::= LAND",
- /* 177 */ "lop ::= LOR",
- /* 178 */ "lop ::= LXOR",
- /* 179 */ "array ::= OPENB arrayelements CLOSEB",
- /* 180 */ "arrayelements ::= arrayelement",
- /* 181 */ "arrayelements ::= arrayelements COMMA arrayelement",
- /* 182 */ "arrayelements ::=",
- /* 183 */ "arrayelement ::= value APTR expr",
- /* 184 */ "arrayelement ::= ID APTR expr",
- /* 185 */ "arrayelement ::= expr",
- /* 186 */ "doublequoted_with_quotes ::= QUOTE QUOTE",
- /* 187 */ "doublequoted_with_quotes ::= QUOTE doublequoted QUOTE",
- /* 188 */ "doublequoted ::= doublequoted doublequotedcontent",
- /* 189 */ "doublequoted ::= doublequotedcontent",
- /* 190 */ "doublequotedcontent ::= BACKTICK variable BACKTICK",
- /* 191 */ "doublequotedcontent ::= BACKTICK expr BACKTICK",
- /* 192 */ "doublequotedcontent ::= DOLLARID",
- /* 193 */ "doublequotedcontent ::= LDEL variable RDEL",
- /* 194 */ "doublequotedcontent ::= LDEL expr RDEL",
- /* 195 */ "doublequotedcontent ::= smartytag",
- /* 196 */ "doublequotedcontent ::= OTHER",
- /* 197 */ "optspace ::= SPACE",
- /* 198 */ "optspace ::=",
+ /*   6 */ "template_element ::= PHPSTARTTAG",
+ /*   7 */ "template_element ::= PHPENDTAG",
+ /*   8 */ "template_element ::= FAKEPHPSTARTTAG",
+ /*   9 */ "template_element ::= XMLTAG",
+ /*  10 */ "template_element ::= OTHER",
+ /*  11 */ "literal ::= LITERALSTART LITERALEND",
+ /*  12 */ "literal ::= LITERALSTART literal_elements LITERALEND",
+ /*  13 */ "literal_elements ::= literal_elements literal_element",
+ /*  14 */ "literal_elements ::=",
+ /*  15 */ "literal_element ::= literal",
+ /*  16 */ "literal_element ::= LITERAL",
+ /*  17 */ "literal_element ::= PHPSTARTTAG",
+ /*  18 */ "literal_element ::= FAKEPHPSTARTTAG",
+ /*  19 */ "literal_element ::= PHPENDTAG",
+ /*  20 */ "smartytag ::= LDEL value RDEL",
+ /*  21 */ "smartytag ::= LDEL value attributes RDEL",
+ /*  22 */ "smartytag ::= LDEL variable attributes RDEL",
+ /*  23 */ "smartytag ::= LDEL expr attributes RDEL",
+ /*  24 */ "smartytag ::= LDEL ternary attributes RDEL",
+ /*  25 */ "smartytag ::= LDEL DOLLAR ID EQUAL value RDEL",
+ /*  26 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr RDEL",
+ /*  27 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr attributes RDEL",
+ /*  28 */ "smartytag ::= LDEL DOLLAR ID EQUAL ternary attributes RDEL",
+ /*  29 */ "smartytag ::= LDEL varindexed EQUAL expr attributes RDEL",
+ /*  30 */ "smartytag ::= LDEL varindexed EQUAL ternary attributes RDEL",
+ /*  31 */ "smartytag ::= LDEL ID attributes RDEL",
+ /*  32 */ "smartytag ::= LDEL FOREACH attributes RDEL",
+ /*  33 */ "smartytag ::= LDEL ID RDEL",
+ /*  34 */ "smartytag ::= LDEL ID PTR ID attributes RDEL",
+ /*  35 */ "smartytag ::= LDEL ID modifier modparameters attributes RDEL",
+ /*  36 */ "smartytag ::= LDEL ID PTR ID modifier modparameters attributes RDEL",
+ /*  37 */ "smartytag ::= LDEL IF SPACE expr RDEL",
+ /*  38 */ "smartytag ::= LDEL IF SPACE statement RDEL",
+ /*  39 */ "smartytag ::= LDEL FOR SPACE statements SEMICOLON optspace expr SEMICOLON optspace DOLLAR varvar foraction RDEL",
+ /*  40 */ "foraction ::= EQUAL expr",
+ /*  41 */ "foraction ::= INCDEC",
+ /*  42 */ "smartytag ::= LDEL FOR SPACE statement TO expr attributes RDEL",
+ /*  43 */ "smartytag ::= LDEL FOR SPACE statement TO expr STEP expr RDEL",
+ /*  44 */ "smartytag ::= LDEL FOREACH SPACE value AS DOLLAR varvar RDEL",
+ /*  45 */ "smartytag ::= LDEL FOREACH SPACE value AS DOLLAR varvar APTR DOLLAR varvar RDEL",
+ /*  46 */ "smartytag ::= LDEL FOREACH SPACE array AS DOLLAR varvar RDEL",
+ /*  47 */ "smartytag ::= LDEL FOREACH SPACE array AS DOLLAR varvar APTR DOLLAR varvar RDEL",
+ /*  48 */ "smartytag ::= LDELSLASH ID RDEL",
+ /*  49 */ "smartytag ::= LDELSLASH specialclose RDEL",
+ /*  50 */ "specialclose ::= IF",
+ /*  51 */ "specialclose ::= FOR",
+ /*  52 */ "specialclose ::= FOREACH",
+ /*  53 */ "smartytag ::= LDELSLASH ID attributes RDEL",
+ /*  54 */ "smartytag ::= LDELSLASH ID modifier modparameters attributes RDEL",
+ /*  55 */ "smartytag ::= LDELSLASH ID PTR ID RDEL",
+ /*  56 */ "attributes ::= attributes attribute",
+ /*  57 */ "attributes ::= attribute",
+ /*  58 */ "attributes ::=",
+ /*  59 */ "attribute ::= SPACE ID EQUAL ID",
+ /*  60 */ "attribute ::= SPACE ID EQUAL expr",
+ /*  61 */ "attribute ::= SPACE ID EQUAL value",
+ /*  62 */ "attribute ::= SPACE ID EQUAL ternary",
+ /*  63 */ "attribute ::= SPACE ID",
+ /*  64 */ "attribute ::= SPACE INTEGER EQUAL expr",
+ /*  65 */ "statements ::= statement",
+ /*  66 */ "statements ::= statements COMMA statement",
+ /*  67 */ "statement ::= DOLLAR varvar EQUAL expr",
+ /*  68 */ "expr ::= value",
+ /*  69 */ "expr ::= DOLLAR ID COLON ID",
+ /*  70 */ "expr ::= expr MATH value",
+ /*  71 */ "expr ::= expr UNIMATH value",
+ /*  72 */ "expr ::= expr ANDSYM value",
+ /*  73 */ "expr ::= array",
+ /*  74 */ "expr ::= expr modifier modparameters",
+ /*  75 */ "expr ::= expr ifcond expr",
+ /*  76 */ "expr ::= expr ISIN array",
+ /*  77 */ "expr ::= expr ISIN value",
+ /*  78 */ "expr ::= expr lop expr",
+ /*  79 */ "expr ::= expr ISDIVBY expr",
+ /*  80 */ "expr ::= expr ISNOTDIVBY expr",
+ /*  81 */ "expr ::= expr ISEVEN",
+ /*  82 */ "expr ::= expr ISNOTEVEN",
+ /*  83 */ "expr ::= expr ISEVENBY expr",
+ /*  84 */ "expr ::= expr ISNOTEVENBY expr",
+ /*  85 */ "expr ::= expr ISODD",
+ /*  86 */ "expr ::= expr ISNOTODD",
+ /*  87 */ "expr ::= expr ISODDBY expr",
+ /*  88 */ "expr ::= expr ISNOTODDBY expr",
+ /*  89 */ "expr ::= value INSTANCEOF ID",
+ /*  90 */ "expr ::= value INSTANCEOF value",
+ /*  91 */ "ternary ::= OPENP expr CLOSEP QMARK expr COLON expr",
+ /*  92 */ "value ::= variable",
+ /*  93 */ "value ::= UNIMATH value",
+ /*  94 */ "value ::= NOT value",
+ /*  95 */ "value ::= TYPECAST value",
+ /*  96 */ "value ::= variable INCDEC",
+ /*  97 */ "value ::= INTEGER",
+ /*  98 */ "value ::= INTEGER DOT INTEGER",
+ /*  99 */ "value ::= ID",
+ /* 100 */ "value ::= function",
+ /* 101 */ "value ::= OPENP expr CLOSEP",
+ /* 102 */ "value ::= SINGLEQUOTESTRING",
+ /* 103 */ "value ::= doublequoted_with_quotes",
+ /* 104 */ "value ::= ID DOUBLECOLON static_class_access",
+ /* 105 */ "value ::= smartytag",
+ /* 106 */ "variable ::= varindexed",
+ /* 107 */ "variable ::= DOLLAR varvar AT ID",
+ /* 108 */ "variable ::= object",
+ /* 109 */ "variable ::= HATCH ID HATCH",
+ /* 110 */ "variable ::= HATCH variable HATCH",
+ /* 111 */ "varindexed ::= DOLLAR varvar arrayindex",
+ /* 112 */ "arrayindex ::= arrayindex indexdef",
+ /* 113 */ "arrayindex ::=",
+ /* 114 */ "indexdef ::= DOT DOLLAR varvar",
+ /* 115 */ "indexdef ::= DOT DOLLAR varvar AT ID",
+ /* 116 */ "indexdef ::= DOT ID",
+ /* 117 */ "indexdef ::= DOT INTEGER",
+ /* 118 */ "indexdef ::= DOT LDEL expr RDEL",
+ /* 119 */ "indexdef ::= OPENB ID CLOSEB",
+ /* 120 */ "indexdef ::= OPENB ID DOT ID CLOSEB",
+ /* 121 */ "indexdef ::= OPENB expr CLOSEB",
+ /* 122 */ "indexdef ::= OPENB CLOSEB",
+ /* 123 */ "varvar ::= varvarele",
+ /* 124 */ "varvar ::= varvar varvarele",
+ /* 125 */ "varvarele ::= ID",
+ /* 126 */ "varvarele ::= LDEL expr RDEL",
+ /* 127 */ "object ::= varindexed objectchain",
+ /* 128 */ "object ::= varindexed DOUBLECOLON ID",
+ /* 129 */ "objectchain ::= objectelement",
+ /* 130 */ "objectchain ::= objectchain objectelement",
+ /* 131 */ "objectelement ::= PTR ID arrayindex",
+ /* 132 */ "objectelement ::= PTR variable arrayindex",
+ /* 133 */ "objectelement ::= PTR LDEL expr RDEL arrayindex",
+ /* 134 */ "objectelement ::= PTR ID LDEL expr RDEL arrayindex",
+ /* 135 */ "objectelement ::= PTR method",
+ /* 136 */ "function ::= ID OPENP params CLOSEP",
+ /* 137 */ "method ::= ID OPENP params CLOSEP",
+ /* 138 */ "params ::= expr COMMA params",
+ /* 139 */ "params ::= expr",
+ /* 140 */ "params ::=",
+ /* 141 */ "modifier ::= VERT AT ID",
+ /* 142 */ "modifier ::= VERT ID",
+ /* 143 */ "static_class_access ::= method",
+ /* 144 */ "static_class_access ::= DOLLAR ID OPENP params CLOSEP",
+ /* 145 */ "static_class_access ::= method objectchain",
+ /* 146 */ "static_class_access ::= DOLLAR ID OPENP params CLOSEP objectchain",
+ /* 147 */ "static_class_access ::= ID",
+ /* 148 */ "static_class_access ::= DOLLAR ID arrayindex",
+ /* 149 */ "static_class_access ::= DOLLAR ID arrayindex objectchain",
+ /* 150 */ "modparameters ::= modparameters modparameter",
+ /* 151 */ "modparameters ::=",
+ /* 152 */ "modparameter ::= COLON value",
+ /* 153 */ "modparameter ::= COLON array",
+ /* 154 */ "ifcond ::= EQUALS",
+ /* 155 */ "ifcond ::= NOTEQUALS",
+ /* 156 */ "ifcond ::= GREATERTHAN",
+ /* 157 */ "ifcond ::= LESSTHAN",
+ /* 158 */ "ifcond ::= GREATEREQUAL",
+ /* 159 */ "ifcond ::= LESSEQUAL",
+ /* 160 */ "ifcond ::= IDENTITY",
+ /* 161 */ "ifcond ::= NONEIDENTITY",
+ /* 162 */ "ifcond ::= MOD",
+ /* 163 */ "lop ::= LAND",
+ /* 164 */ "lop ::= LOR",
+ /* 165 */ "lop ::= LXOR",
+ /* 166 */ "array ::= OPENB arrayelements CLOSEB",
+ /* 167 */ "arrayelements ::= arrayelement",
+ /* 168 */ "arrayelements ::= arrayelements COMMA arrayelement",
+ /* 169 */ "arrayelements ::=",
+ /* 170 */ "arrayelement ::= value APTR expr",
+ /* 171 */ "arrayelement ::= ID APTR expr",
+ /* 172 */ "arrayelement ::= expr",
+ /* 173 */ "doublequoted_with_quotes ::= QUOTE QUOTE",
+ /* 174 */ "doublequoted_with_quotes ::= QUOTE doublequoted QUOTE",
+ /* 175 */ "doublequoted ::= doublequoted doublequotedcontent",
+ /* 176 */ "doublequoted ::= doublequotedcontent",
+ /* 177 */ "doublequotedcontent ::= BACKTICK variable BACKTICK",
+ /* 178 */ "doublequotedcontent ::= BACKTICK expr BACKTICK",
+ /* 179 */ "doublequotedcontent ::= DOLLARID",
+ /* 180 */ "doublequotedcontent ::= LDEL variable RDEL",
+ /* 181 */ "doublequotedcontent ::= LDEL expr RDEL",
+ /* 182 */ "doublequotedcontent ::= smartytag",
+ /* 183 */ "doublequotedcontent ::= OTHER",
+ /* 184 */ "optspace ::= SPACE",
+ /* 185 */ "optspace ::=",
     );
 
     function tokenName($tokenType)
@@ -1646,228 +1549,211 @@ static public $yy_action = array(
     }
 
     static public $yyRuleInfo = array(
-  array( 'lhs' => 86, 'rhs' => 1 ),
-  array( 'lhs' => 87, 'rhs' => 1 ),
-  array( 'lhs' => 87, 'rhs' => 2 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  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' => 1 ),
-  array( 'lhs' => 91, 'rhs' => 2 ),
-  array( 'lhs' => 91, 'rhs' => 0 ),
-  array( 'lhs' => 92, 'rhs' => 1 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
+  array( 'lhs' => 74, 'rhs' => 1 ),
+  array( 'lhs' => 75, 'rhs' => 1 ),
+  array( 'lhs' => 75, 'rhs' => 2 ),
+  array( 'lhs' => 76, 'rhs' => 1 ),
+  array( 'lhs' => 76, 'rhs' => 1 ),
+  array( 'lhs' => 76, 'rhs' => 1 ),
+  array( 'lhs' => 76, 'rhs' => 1 ),
+  array( 'lhs' => 76, 'rhs' => 1 ),
+  array( 'lhs' => 76, 'rhs' => 1 ),
+  array( 'lhs' => 76, 'rhs' => 1 ),
+  array( 'lhs' => 76, 'rhs' => 1 ),
+  array( 'lhs' => 78, 'rhs' => 2 ),
+  array( 'lhs' => 78, 'rhs' => 3 ),
+  array( 'lhs' => 79, 'rhs' => 2 ),
+  array( 'lhs' => 79, 'rhs' => 0 ),
+  array( 'lhs' => 80, 'rhs' => 1 ),
+  array( 'lhs' => 80, 'rhs' => 1 ),
+  array( 'lhs' => 80, 'rhs' => 1 ),
+  array( 'lhs' => 80, 'rhs' => 1 ),
+  array( 'lhs' => 80, 'rhs' => 1 ),
+  array( 'lhs' => 77, 'rhs' => 3 ),
+  array( 'lhs' => 77, 'rhs' => 4 ),
+  array( 'lhs' => 77, 'rhs' => 4 ),
+  array( 'lhs' => 77, 'rhs' => 4 ),
+  array( 'lhs' => 77, 'rhs' => 4 ),
+  array( 'lhs' => 77, 'rhs' => 6 ),
+  array( 'lhs' => 77, 'rhs' => 6 ),
+  array( 'lhs' => 77, 'rhs' => 7 ),
+  array( 'lhs' => 77, 'rhs' => 7 ),
+  array( 'lhs' => 77, 'rhs' => 6 ),
+  array( 'lhs' => 77, 'rhs' => 6 ),
+  array( 'lhs' => 77, 'rhs' => 4 ),
+  array( 'lhs' => 77, 'rhs' => 4 ),
+  array( 'lhs' => 77, 'rhs' => 3 ),
+  array( 'lhs' => 77, 'rhs' => 6 ),
+  array( 'lhs' => 77, 'rhs' => 6 ),
+  array( 'lhs' => 77, 'rhs' => 8 ),
+  array( 'lhs' => 77, 'rhs' => 5 ),
+  array( 'lhs' => 77, 'rhs' => 5 ),
+  array( 'lhs' => 77, 'rhs' => 13 ),
   array( 'lhs' => 93, 'rhs' => 2 ),
-  array( 'lhs' => 93, 'rhs' => 0 ),
-  array( 'lhs' => 94, 'rhs' => 1 ),
-  array( 'lhs' => 94, 'rhs' => 3 ),
-  array( 'lhs' => 90, 'rhs' => 2 ),
+  array( 'lhs' => 93, 'rhs' => 1 ),
+  array( 'lhs' => 77, 'rhs' => 8 ),
+  array( 'lhs' => 77, 'rhs' => 9 ),
+  array( 'lhs' => 77, 'rhs' => 8 ),
+  array( 'lhs' => 77, 'rhs' => 11 ),
+  array( 'lhs' => 77, 'rhs' => 8 ),
+  array( 'lhs' => 77, 'rhs' => 11 ),
+  array( 'lhs' => 77, 'rhs' => 3 ),
+  array( 'lhs' => 77, 'rhs' => 3 ),
+  array( 'lhs' => 95, 'rhs' => 1 ),
+  array( 'lhs' => 95, 'rhs' => 1 ),
+  array( 'lhs' => 95, 'rhs' => 1 ),
+  array( 'lhs' => 77, 'rhs' => 4 ),
+  array( 'lhs' => 77, 'rhs' => 6 ),
+  array( 'lhs' => 77, 'rhs' => 5 ),
+  array( 'lhs' => 82, 'rhs' => 2 ),
+  array( 'lhs' => 82, 'rhs' => 1 ),
+  array( 'lhs' => 82, 'rhs' => 0 ),
+  array( 'lhs' => 96, 'rhs' => 4 ),
+  array( 'lhs' => 96, 'rhs' => 4 ),
+  array( 'lhs' => 96, 'rhs' => 4 ),
+  array( 'lhs' => 96, 'rhs' => 4 ),
+  array( 'lhs' => 96, 'rhs' => 2 ),
+  array( 'lhs' => 96, 'rhs' => 4 ),
+  array( 'lhs' => 90, 'rhs' => 1 ),
   array( 'lhs' => 90, 'rhs' => 3 ),
-  array( 'lhs' => 95, 'rhs' => 2 ),
-  array( 'lhs' => 95, 'rhs' => 0 ),
-  array( 'lhs' => 96, 'rhs' => 1 ),
-  array( 'lhs' => 96, 'rhs' => 1 ),
-  array( 'lhs' => 96, 'rhs' => 1 ),
-  array( 'lhs' => 96, 'rhs' => 1 ),
-  array( 'lhs' => 96, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 4 ),
-  array( 'lhs' => 89, 'rhs' => 4 ),
-  array( 'lhs' => 89, 'rhs' => 4 ),
   array( 'lhs' => 89, 'rhs' => 4 ),
-  array( 'lhs' => 89, 'rhs' => 6 ),
-  array( 'lhs' => 89, 'rhs' => 6 ),
-  array( 'lhs' => 89, 'rhs' => 7 ),
-  array( 'lhs' => 89, 'rhs' => 7 ),
-  array( 'lhs' => 89, 'rhs' => 6 ),
-  array( 'lhs' => 89, 'rhs' => 6 ),
-  array( 'lhs' => 89, 'rhs' => 4 ),
-  array( 'lhs' => 89, 'rhs' => 4 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 6 ),
-  array( 'lhs' => 89, 'rhs' => 6 ),
-  array( 'lhs' => 89, 'rhs' => 8 ),
-  array( 'lhs' => 89, 'rhs' => 5 ),
-  array( 'lhs' => 89, 'rhs' => 5 ),
-  array( 'lhs' => 89, 'rhs' => 13 ),
-  array( 'lhs' => 109, 'rhs' => 2 ),
-  array( 'lhs' => 109, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 8 ),
-  array( 'lhs' => 89, 'rhs' => 9 ),
-  array( 'lhs' => 89, 'rhs' => 8 ),
-  array( 'lhs' => 89, 'rhs' => 11 ),
-  array( 'lhs' => 89, 'rhs' => 8 ),
-  array( 'lhs' => 89, 'rhs' => 11 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 111, 'rhs' => 1 ),
-  array( 'lhs' => 111, 'rhs' => 1 ),
-  array( 'lhs' => 111, 'rhs' => 1 ),
-  array( 'lhs' => 89, 'rhs' => 4 ),
-  array( 'lhs' => 89, 'rhs' => 6 ),
-  array( 'lhs' => 89, 'rhs' => 5 ),
-  array( 'lhs' => 98, 'rhs' => 2 ),
-  array( 'lhs' => 98, 'rhs' => 1 ),
-  array( 'lhs' => 98, 'rhs' => 0 ),
-  array( 'lhs' => 112, 'rhs' => 4 ),
-  array( 'lhs' => 112, 'rhs' => 4 ),
-  array( 'lhs' => 112, 'rhs' => 4 ),
-  array( 'lhs' => 112, 'rhs' => 4 ),
-  array( 'lhs' => 112, 'rhs' => 2 ),
-  array( 'lhs' => 112, 'rhs' => 4 ),
+  array( 'lhs' => 84, 'rhs' => 1 ),
+  array( 'lhs' => 84, 'rhs' => 4 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 1 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 2 ),
+  array( 'lhs' => 84, 'rhs' => 2 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 2 ),
+  array( 'lhs' => 84, 'rhs' => 2 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 84, 'rhs' => 3 ),
+  array( 'lhs' => 85, 'rhs' => 7 ),
+  array( 'lhs' => 81, 'rhs' => 1 ),
+  array( 'lhs' => 81, 'rhs' => 2 ),
+  array( 'lhs' => 81, 'rhs' => 2 ),
+  array( 'lhs' => 81, 'rhs' => 2 ),
+  array( 'lhs' => 81, 'rhs' => 2 ),
+  array( 'lhs' => 81, 'rhs' => 1 ),
+  array( 'lhs' => 81, 'rhs' => 3 ),
+  array( 'lhs' => 81, 'rhs' => 1 ),
+  array( 'lhs' => 81, 'rhs' => 1 ),
+  array( 'lhs' => 81, 'rhs' => 3 ),
+  array( 'lhs' => 81, 'rhs' => 1 ),
+  array( 'lhs' => 81, 'rhs' => 1 ),
+  array( 'lhs' => 81, 'rhs' => 3 ),
+  array( 'lhs' => 81, 'rhs' => 1 ),
+  array( 'lhs' => 83, 'rhs' => 1 ),
+  array( 'lhs' => 83, 'rhs' => 4 ),
+  array( 'lhs' => 83, 'rhs' => 1 ),
+  array( 'lhs' => 83, 'rhs' => 3 ),
+  array( 'lhs' => 83, 'rhs' => 3 ),
+  array( 'lhs' => 86, 'rhs' => 3 ),
+  array( 'lhs' => 103, 'rhs' => 2 ),
+  array( 'lhs' => 103, 'rhs' => 0 ),
+  array( 'lhs' => 104, 'rhs' => 3 ),
+  array( 'lhs' => 104, 'rhs' => 5 ),
+  array( 'lhs' => 104, 'rhs' => 2 ),
+  array( 'lhs' => 104, 'rhs' => 2 ),
+  array( 'lhs' => 104, 'rhs' => 4 ),
+  array( 'lhs' => 104, 'rhs' => 3 ),
+  array( 'lhs' => 104, 'rhs' => 5 ),
+  array( 'lhs' => 104, 'rhs' => 3 ),
+  array( 'lhs' => 104, 'rhs' => 2 ),
+  array( 'lhs' => 92, 'rhs' => 1 ),
+  array( 'lhs' => 92, 'rhs' => 2 ),
+  array( 'lhs' => 105, 'rhs' => 1 ),
+  array( 'lhs' => 105, 'rhs' => 3 ),
+  array( 'lhs' => 102, 'rhs' => 2 ),
+  array( 'lhs' => 102, 'rhs' => 3 ),
   array( 'lhs' => 106, 'rhs' => 1 ),
-  array( 'lhs' => 106, 'rhs' => 3 ),
-  array( 'lhs' => 105, 'rhs' => 4 ),
-  array( 'lhs' => 100, 'rhs' => 1 ),
-  array( 'lhs' => 100, 'rhs' => 1 ),
-  array( 'lhs' => 100, 'rhs' => 4 ),
-  array( 'lhs' => 100, 'rhs' => 3 ),
-  array( 'lhs' => 100, 'rhs' => 3 ),
-  array( 'lhs' => 100, 'rhs' => 3 ),
-  array( 'lhs' => 100, 'rhs' => 1 ),
-  array( 'lhs' => 100, 'rhs' => 3 ),
-  array( 'lhs' => 100, 'rhs' => 3 ),
-  array( 'lhs' => 100, 'rhs' => 3 ),
-  array( 'lhs' => 100, 'rhs' => 3 ),
-  array( 'lhs' => 100, 'rhs' => 3 ),
-  array( 'lhs' => 100, 'rhs' => 3 ),
-  array( 'lhs' => 100, 'rhs' => 2 ),
-  array( 'lhs' => 100, 'rhs' => 2 ),
-  array( 'lhs' => 100, 'rhs' => 3 ),
-  array( 'lhs' => 100, 'rhs' => 3 ),
-  array( 'lhs' => 100, 'rhs' => 2 ),
-  array( 'lhs' => 100, 'rhs' => 2 ),
-  array( 'lhs' => 100, 'rhs' => 3 ),
-  array( 'lhs' => 100, 'rhs' => 3 ),
-  array( 'lhs' => 100, 'rhs' => 3 ),
-  array( 'lhs' => 100, 'rhs' => 3 ),
-  array( 'lhs' => 101, 'rhs' => 7 ),
+  array( 'lhs' => 106, 'rhs' => 2 ),
+  array( 'lhs' => 107, 'rhs' => 3 ),
+  array( 'lhs' => 107, 'rhs' => 3 ),
+  array( 'lhs' => 107, 'rhs' => 5 ),
+  array( 'lhs' => 107, 'rhs' => 6 ),
+  array( 'lhs' => 107, 'rhs' => 2 ),
+  array( 'lhs' => 99, 'rhs' => 4 ),
+  array( 'lhs' => 108, 'rhs' => 4 ),
+  array( 'lhs' => 109, 'rhs' => 3 ),
+  array( 'lhs' => 109, 'rhs' => 1 ),
+  array( 'lhs' => 109, 'rhs' => 0 ),
+  array( 'lhs' => 87, 'rhs' => 3 ),
+  array( 'lhs' => 87, 'rhs' => 2 ),
+  array( 'lhs' => 101, 'rhs' => 1 ),
+  array( 'lhs' => 101, 'rhs' => 5 ),
+  array( 'lhs' => 101, 'rhs' => 2 ),
+  array( 'lhs' => 101, 'rhs' => 6 ),
+  array( 'lhs' => 101, 'rhs' => 1 ),
+  array( 'lhs' => 101, 'rhs' => 3 ),
+  array( 'lhs' => 101, 'rhs' => 4 ),
+  array( 'lhs' => 88, 'rhs' => 2 ),
+  array( 'lhs' => 88, 'rhs' => 0 ),
+  array( 'lhs' => 110, 'rhs' => 2 ),
+  array( 'lhs' => 110, 'rhs' => 2 ),
   array( 'lhs' => 97, 'rhs' => 1 ),
-  array( 'lhs' => 97, 'rhs' => 2 ),
-  array( 'lhs' => 97, 'rhs' => 2 ),
-  array( 'lhs' => 97, 'rhs' => 2 ),
-  array( 'lhs' => 97, 'rhs' => 2 ),
   array( 'lhs' => 97, 'rhs' => 1 ),
-  array( 'lhs' => 97, 'rhs' => 3 ),
   array( 'lhs' => 97, 'rhs' => 1 ),
   array( 'lhs' => 97, 'rhs' => 1 ),
   array( 'lhs' => 97, 'rhs' => 1 ),
-  array( 'lhs' => 97, 'rhs' => 3 ),
   array( 'lhs' => 97, 'rhs' => 1 ),
   array( 'lhs' => 97, 'rhs' => 1 ),
-  array( 'lhs' => 97, 'rhs' => 3 ),
   array( 'lhs' => 97, 'rhs' => 1 ),
-  array( 'lhs' => 97, 'rhs' => 3 ),
-  array( 'lhs' => 99, 'rhs' => 1 ),
-  array( 'lhs' => 99, 'rhs' => 4 ),
-  array( 'lhs' => 99, 'rhs' => 1 ),
-  array( 'lhs' => 99, 'rhs' => 3 ),
-  array( 'lhs' => 99, 'rhs' => 3 ),
-  array( 'lhs' => 102, 'rhs' => 3 ),
-  array( 'lhs' => 119, 'rhs' => 2 ),
-  array( 'lhs' => 119, 'rhs' => 0 ),
-  array( 'lhs' => 120, 'rhs' => 3 ),
-  array( 'lhs' => 120, 'rhs' => 5 ),
-  array( 'lhs' => 120, 'rhs' => 2 ),
-  array( 'lhs' => 120, 'rhs' => 2 ),
-  array( 'lhs' => 120, 'rhs' => 2 ),
-  array( 'lhs' => 120, 'rhs' => 2 ),
-  array( 'lhs' => 120, 'rhs' => 4 ),
-  array( 'lhs' => 120, 'rhs' => 3 ),
-  array( 'lhs' => 120, 'rhs' => 5 ),
-  array( 'lhs' => 120, 'rhs' => 3 ),
-  array( 'lhs' => 120, 'rhs' => 2 ),
-  array( 'lhs' => 108, 'rhs' => 1 ),
-  array( 'lhs' => 108, 'rhs' => 2 ),
-  array( 'lhs' => 121, 'rhs' => 1 ),
-  array( 'lhs' => 121, 'rhs' => 3 ),
-  array( 'lhs' => 118, 'rhs' => 2 ),
-  array( 'lhs' => 118, 'rhs' => 3 ),
-  array( 'lhs' => 122, 'rhs' => 1 ),
-  array( 'lhs' => 122, 'rhs' => 2 ),
-  array( 'lhs' => 123, 'rhs' => 3 ),
-  array( 'lhs' => 123, 'rhs' => 3 ),
-  array( 'lhs' => 123, 'rhs' => 5 ),
-  array( 'lhs' => 123, 'rhs' => 6 ),
-  array( 'lhs' => 123, 'rhs' => 2 ),
-  array( 'lhs' => 115, 'rhs' => 4 ),
-  array( 'lhs' => 124, 'rhs' => 4 ),
-  array( 'lhs' => 125, 'rhs' => 3 ),
-  array( 'lhs' => 125, 'rhs' => 1 ),
-  array( 'lhs' => 125, 'rhs' => 0 ),
-  array( 'lhs' => 103, 'rhs' => 3 ),
-  array( 'lhs' => 103, 'rhs' => 2 ),
-  array( 'lhs' => 117, 'rhs' => 1 ),
-  array( 'lhs' => 117, 'rhs' => 5 ),
-  array( 'lhs' => 117, 'rhs' => 2 ),
-  array( 'lhs' => 117, 'rhs' => 6 ),
-  array( 'lhs' => 117, 'rhs' => 1 ),
-  array( 'lhs' => 117, 'rhs' => 3 ),
-  array( 'lhs' => 117, 'rhs' => 4 ),
-  array( 'lhs' => 104, 'rhs' => 2 ),
-  array( 'lhs' => 104, 'rhs' => 0 ),
-  array( 'lhs' => 126, 'rhs' => 2 ),
-  array( 'lhs' => 126, 'rhs' => 2 ),
-  array( 'lhs' => 113, 'rhs' => 1 ),
-  array( 'lhs' => 113, 'rhs' => 1 ),
-  array( 'lhs' => 113, 'rhs' => 1 ),
-  array( 'lhs' => 113, 'rhs' => 1 ),
-  array( 'lhs' => 113, 'rhs' => 1 ),
-  array( 'lhs' => 113, 'rhs' => 1 ),
-  array( 'lhs' => 113, 'rhs' => 1 ),
-  array( 'lhs' => 113, 'rhs' => 1 ),
+  array( 'lhs' => 97, 'rhs' => 1 ),
+  array( 'lhs' => 98, 'rhs' => 1 ),
+  array( 'lhs' => 98, 'rhs' => 1 ),
+  array( 'lhs' => 98, 'rhs' => 1 ),
+  array( 'lhs' => 94, 'rhs' => 3 ),
+  array( 'lhs' => 111, 'rhs' => 1 ),
+  array( 'lhs' => 111, 'rhs' => 3 ),
+  array( 'lhs' => 111, 'rhs' => 0 ),
+  array( 'lhs' => 112, 'rhs' => 3 ),
+  array( 'lhs' => 112, 'rhs' => 3 ),
+  array( 'lhs' => 112, 'rhs' => 1 ),
+  array( 'lhs' => 100, 'rhs' => 2 ),
+  array( 'lhs' => 100, 'rhs' => 3 ),
+  array( 'lhs' => 113, 'rhs' => 2 ),
   array( 'lhs' => 113, 'rhs' => 1 ),
+  array( 'lhs' => 114, 'rhs' => 3 ),
+  array( 'lhs' => 114, 'rhs' => 3 ),
   array( 'lhs' => 114, 'rhs' => 1 ),
+  array( 'lhs' => 114, 'rhs' => 3 ),
+  array( 'lhs' => 114, 'rhs' => 3 ),
   array( 'lhs' => 114, 'rhs' => 1 ),
   array( 'lhs' => 114, 'rhs' => 1 ),
-  array( 'lhs' => 110, 'rhs' => 3 ),
-  array( 'lhs' => 127, 'rhs' => 1 ),
-  array( 'lhs' => 127, 'rhs' => 3 ),
-  array( 'lhs' => 127, 'rhs' => 0 ),
-  array( 'lhs' => 128, 'rhs' => 3 ),
-  array( 'lhs' => 128, 'rhs' => 3 ),
-  array( 'lhs' => 128, 'rhs' => 1 ),
-  array( 'lhs' => 116, 'rhs' => 2 ),
-  array( 'lhs' => 116, 'rhs' => 3 ),
-  array( 'lhs' => 129, 'rhs' => 2 ),
-  array( 'lhs' => 129, 'rhs' => 1 ),
-  array( 'lhs' => 130, 'rhs' => 3 ),
-  array( 'lhs' => 130, 'rhs' => 3 ),
-  array( 'lhs' => 130, 'rhs' => 1 ),
-  array( 'lhs' => 130, 'rhs' => 3 ),
-  array( 'lhs' => 130, 'rhs' => 3 ),
-  array( 'lhs' => 130, 'rhs' => 1 ),
-  array( 'lhs' => 130, 'rhs' => 1 ),
-  array( 'lhs' => 107, 'rhs' => 1 ),
-  array( 'lhs' => 107, 'rhs' => 0 ),
+  array( 'lhs' => 91, 'rhs' => 1 ),
+  array( 'lhs' => 91, 'rhs' => 0 ),
     );
 
     static public $yyReduceMap = array(
         0 => 0,
         5 => 0,
-        12 => 0,
-        18 => 0,
-        24 => 0,
-        25 => 0,
-        59 => 0,
-        60 => 0,
-        61 => 0,
-        77 => 0,
-        101 => 0,
-        106 => 0,
+        15 => 0,
+        16 => 0,
+        50 => 0,
+        51 => 0,
+        52 => 0,
+        68 => 0,
+        92 => 0,
+        97 => 0,
+        100 => 0,
+        102 => 0,
+        103 => 0,
         108 => 0,
-        109 => 0,
-        110 => 0,
-        112 => 0,
-        113 => 0,
-        119 => 0,
-        156 => 0,
-        180 => 0,
+        143 => 0,
+        167 => 0,
         1 => 1,
         2 => 2,
         3 => 3,
@@ -1877,181 +1763,172 @@ static public $yy_action = array(
         8 => 8,
         9 => 9,
         10 => 10,
-        16 => 10,
-        22 => 10,
-        102 => 10,
-        104 => 10,
-        105 => 10,
-        158 => 10,
         11 => 11,
-        17 => 11,
-        20 => 11,
-        23 => 11,
+        14 => 11,
+        12 => 12,
         13 => 13,
-        14 => 13,
-        15 => 13,
-        19 => 13,
+        93 => 13,
+        95 => 13,
+        96 => 13,
+        145 => 13,
+        17 => 17,
+        18 => 17,
+        19 => 19,
+        20 => 20,
         21 => 21,
-        26 => 26,
-        27 => 26,
-        28 => 28,
+        22 => 21,
+        23 => 21,
+        24 => 21,
+        25 => 25,
+        26 => 25,
+        27 => 27,
+        28 => 27,
         29 => 29,
-        30 => 30,
-        31 => 30,
-        32 => 30,
-        33 => 30,
+        30 => 29,
+        31 => 31,
+        32 => 31,
+        33 => 33,
         34 => 34,
-        35 => 34,
+        35 => 35,
         36 => 36,
-        37 => 36,
-        38 => 38,
-        39 => 38,
+        37 => 37,
+        38 => 37,
+        39 => 39,
         40 => 40,
-        41 => 40,
+        41 => 41,
+        57 => 41,
+        139 => 41,
+        147 => 41,
+        172 => 41,
         42 => 42,
         43 => 43,
         44 => 44,
         45 => 45,
         46 => 46,
-        47 => 46,
+        47 => 47,
         48 => 48,
-        49 => 49,
-        50 => 50,
-        66 => 50,
-        152 => 50,
-        160 => 50,
-        185 => 50,
-        51 => 51,
-        52 => 52,
+        49 => 48,
         53 => 53,
         54 => 54,
         55 => 55,
         56 => 56,
-        57 => 57,
-        58 => 57,
-        62 => 62,
+        58 => 58,
+        59 => 59,
+        60 => 60,
+        61 => 60,
+        62 => 60,
+        64 => 60,
         63 => 63,
-        64 => 64,
         65 => 65,
+        66 => 66,
         67 => 67,
-        68 => 68,
         69 => 69,
-        70 => 69,
-        71 => 69,
-        73 => 69,
-        72 => 72,
+        70 => 70,
+        71 => 70,
+        72 => 70,
+        73 => 73,
+        123 => 73,
+        184 => 73,
         74 => 74,
         75 => 75,
+        78 => 75,
+        89 => 75,
         76 => 76,
-        78 => 78,
+        77 => 77,
         79 => 79,
         80 => 80,
-        81 => 80,
-        82 => 80,
+        81 => 81,
+        86 => 81,
+        82 => 82,
+        85 => 82,
         83 => 83,
-        136 => 83,
-        197 => 83,
+        88 => 83,
         84 => 84,
         87 => 84,
-        98 => 84,
-        85 => 85,
-        86 => 86,
-        88 => 88,
-        89 => 89,
         90 => 90,
-        95 => 90,
         91 => 91,
-        94 => 91,
-        92 => 92,
-        97 => 92,
-        93 => 93,
-        96 => 93,
+        94 => 94,
+        98 => 98,
         99 => 99,
-        100 => 100,
-        103 => 103,
+        101 => 101,
+        104 => 104,
+        105 => 105,
+        106 => 106,
         107 => 107,
+        109 => 109,
+        110 => 110,
         111 => 111,
+        112 => 112,
+        113 => 113,
+        151 => 113,
         114 => 114,
         115 => 115,
         116 => 116,
         117 => 117,
         118 => 118,
+        121 => 118,
+        119 => 119,
         120 => 120,
-        121 => 121,
         122 => 122,
-        123 => 123,
+        185 => 122,
         124 => 124,
-        164 => 124,
         125 => 125,
         126 => 126,
         127 => 127,
-        128 => 127,
-        129 => 127,
+        128 => 128,
+        129 => 129,
         130 => 130,
         131 => 131,
-        134 => 131,
         132 => 132,
         133 => 133,
+        134 => 134,
         135 => 135,
-        198 => 135,
+        136 => 136,
         137 => 137,
         138 => 138,
-        139 => 139,
         140 => 140,
         141 => 141,
-        142 => 142,
-        143 => 143,
+        142 => 141,
         144 => 144,
-        145 => 145,
         146 => 146,
-        147 => 147,
         148 => 148,
         149 => 149,
         150 => 150,
-        151 => 151,
-        153 => 153,
+        152 => 152,
+        153 => 152,
         154 => 154,
-        155 => 154,
+        155 => 155,
+        156 => 156,
         157 => 157,
+        158 => 158,
         159 => 159,
+        160 => 160,
         161 => 161,
         162 => 162,
         163 => 163,
+        164 => 164,
         165 => 165,
         166 => 166,
-        167 => 167,
         168 => 168,
         169 => 169,
         170 => 170,
         171 => 171,
-        172 => 172,
         173 => 173,
         174 => 174,
         175 => 175,
         176 => 176,
         177 => 177,
-        178 => 178,
+        178 => 177,
+        180 => 177,
         179 => 179,
         181 => 181,
         182 => 182,
         183 => 183,
-        184 => 184,
-        186 => 186,
-        187 => 187,
-        188 => 188,
-        189 => 189,
-        190 => 190,
-        191 => 190,
-        193 => 190,
-        192 => 192,
-        194 => 194,
-        195 => 195,
-        196 => 196,
     );
-#line 84 "smarty_internal_templateparser.y"
+#line 85 "smarty_internal_templateparser.y"
     function yy_r0(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;     }
-#line 2048 "smarty_internal_templateparser.php"
-#line 90 "smarty_internal_templateparser.y"
+#line 1925 "smarty_internal_templateparser.php"
+#line 91 "smarty_internal_templateparser.y"
     function yy_r1(){if ($this->template->extract_code == false) {
                                                   $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
                                                } else {
@@ -2059,8 +1936,8 @@ static public $yy_action = array(
                                                   $this->template->extracted_compiled_code .= $this->yystack[$this->yyidx + 0]->minor;
                                                } 
                                                  }
-#line 2057 "smarty_internal_templateparser.php"
-#line 98 "smarty_internal_templateparser.y"
+#line 1934 "smarty_internal_templateparser.php"
+#line 99 "smarty_internal_templateparser.y"
     function yy_r2(){if ($this->template->extract_code == false) {
                                                              $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
                                                            } else {
@@ -2069,8 +1946,8 @@ static public $yy_action = array(
                                                              $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
                                                            } 
                                                               }
-#line 2067 "smarty_internal_templateparser.php"
-#line 111 "smarty_internal_templateparser.y"
+#line 1944 "smarty_internal_templateparser.php"
+#line 112 "smarty_internal_templateparser.y"
     function yy_r3(){
                                           if ($this->compiler->has_code) {
                                             $tmp =''; foreach ($this->compiler->prefix_code as $code) {$tmp.=$code;} $this->compiler->prefix_code=array();
@@ -2081,441 +1958,479 @@ static public $yy_action = array(
                                          $this->compiler->has_variable_string = false;
                                          $this->block_nesting_level = count($this->compiler->_tag_stack);
                                             }
-#line 2079 "smarty_internal_templateparser.php"
-#line 123 "smarty_internal_templateparser.y"
+#line 1956 "smarty_internal_templateparser.php"
+#line 124 "smarty_internal_templateparser.y"
     function yy_r4(){ $this->_retvalue = '';    }
-#line 2082 "smarty_internal_templateparser.php"
-#line 129 "smarty_internal_templateparser.y"
+#line 1959 "smarty_internal_templateparser.php"
+#line 130 "smarty_internal_templateparser.y"
     function yy_r6(){
                                       if ($this->sec_obj->php_handling == SMARTY_PHP_PASSTHRU) {
-					                             $this->_retvalue = self::escape_start_tag($this->yystack[$this->yyidx + -2]->minor) . str_replace('<?','&lt;?',$this->yystack[$this->yyidx + -1]->minor) . '?<??>>';
+					                             $this->_retvalue = self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor);
+                                      } elseif ($this->sec_obj->php_handling == SMARTY_PHP_QUOTE) {
+                                       $this->_retvalue = $this->compiler->processNocacheCode(htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES),false);
+                                      }elseif ($this->sec_obj->php_handling == SMARTY_PHP_ALLOW) {
+                                       $this->_retvalue = $this->compiler->processNocacheCode('<?php', true);
+                                      }elseif ($this->sec_obj->php_handling == SMARTY_PHP_REMOVE) {
+                                       $this->_retvalue = '';
+                                      }
+                                         }
+#line 1972 "smarty_internal_templateparser.php"
+#line 142 "smarty_internal_templateparser.y"
+    function yy_r7(){if ($this->is_xml) {
+                                       $this->compiler->tag_nocache = true; 
+                                       $this->is_xml = true; 
+                                       $this->_retvalue = $this->compiler->processNocacheCode("<?php echo '?>';?>", $this->compiler, true);
+                                      }elseif ($this->sec_obj->php_handling == SMARTY_PHP_PASSTHRU) {
+					                             $this->_retvalue = '?<??>>';
                                       } elseif ($this->sec_obj->php_handling == SMARTY_PHP_QUOTE) {
-                                       $this->_retvalue = $this->compiler->processNocacheCode(htmlspecialchars($this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.'?>', ENT_QUOTES), false);
+                                       $this->_retvalue = $this->compiler->processNocacheCode(htmlspecialchars('?>', ENT_QUOTES), false);
                                       }elseif ($this->sec_obj->php_handling == SMARTY_PHP_ALLOW) {
-                                       $this->_retvalue = $this->compiler->processNocacheCode('<?php'.$this->yystack[$this->yyidx + -1]->minor.'?>', true);
+                                       $this->_retvalue = $this->compiler->processNocacheCode('?>', true);
                                       }elseif ($this->sec_obj->php_handling == SMARTY_PHP_REMOVE) {
                                        $this->_retvalue = '';
                                       }
                                          }
-#line 2095 "smarty_internal_templateparser.php"
-#line 141 "smarty_internal_templateparser.y"
-    function yy_r7(){if ($this->lex->strip) {
+#line 1988 "smarty_internal_templateparser.php"
+#line 157 "smarty_internal_templateparser.y"
+    function yy_r8(){if ($this->lex->strip) {
                                        $this->_retvalue = preg_replace('![\$this->yystack[$this->yyidx + 0]->minor ]*[\r\n]+[\$this->yystack[$this->yyidx + 0]->minor ]*!', '', self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor));	
                                      } else {
                                        $this->_retvalue = self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor);	
                                      }
                                         }
-#line 2103 "smarty_internal_templateparser.php"
-#line 149 "smarty_internal_templateparser.y"
-    function yy_r8(){ $this->compiler->tag_nocache = true; $this->_retvalue = $this->compiler->processNocacheCode("<?php echo '<?xml';?>", $this->compiler, true);    }
-#line 2106 "smarty_internal_templateparser.php"
-#line 152 "smarty_internal_templateparser.y"
-    function yy_r9(){if ($this->lex->strip) {
+#line 1996 "smarty_internal_templateparser.php"
+#line 165 "smarty_internal_templateparser.y"
+    function yy_r9(){ $this->compiler->tag_nocache = true; $this->is_xml = true; $this->_retvalue = $this->compiler->processNocacheCode("<?php echo '<?xml';?>", $this->compiler, true);    }
+#line 1999 "smarty_internal_templateparser.php"
+#line 168 "smarty_internal_templateparser.y"
+    function yy_r10(){if ($this->lex->strip) {
                                        $this->_retvalue = preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $this->yystack[$this->yyidx + 0]->minor);	
                                      } else {
                                        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;	
                                      }
                                         }
-#line 2114 "smarty_internal_templateparser.php"
-#line 160 "smarty_internal_templateparser.y"
-    function yy_r10(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;     }
-#line 2117 "smarty_internal_templateparser.php"
-#line 161 "smarty_internal_templateparser.y"
+#line 2007 "smarty_internal_templateparser.php"
+#line 176 "smarty_internal_templateparser.y"
     function yy_r11(){ $this->_retvalue = '';     }
-#line 2120 "smarty_internal_templateparser.php"
-#line 164 "smarty_internal_templateparser.y"
-    function yy_r13(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;     }
-#line 2123 "smarty_internal_templateparser.php"
+#line 2010 "smarty_internal_templateparser.php"
 #line 177 "smarty_internal_templateparser.y"
-    function yy_r21(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;     }
-#line 2126 "smarty_internal_templateparser.php"
+    function yy_r12(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;     }
+#line 2013 "smarty_internal_templateparser.php"
+#line 179 "smarty_internal_templateparser.y"
+    function yy_r13(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;     }
+#line 2016 "smarty_internal_templateparser.php"
 #line 184 "smarty_internal_templateparser.y"
-    function yy_r26(){ $this->_retvalue = self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor);     }
-#line 2129 "smarty_internal_templateparser.php"
+    function yy_r17(){ $this->_retvalue = self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor);     }
+#line 2019 "smarty_internal_templateparser.php"
 #line 186 "smarty_internal_templateparser.y"
-    function yy_r28(){ $this->_retvalue = self::escape_end_tag($this->yystack[$this->yyidx + 0]->minor);     }
-#line 2132 "smarty_internal_templateparser.php"
+    function yy_r19(){ $this->_retvalue = self::escape_end_tag($this->yystack[$this->yyidx + 0]->minor);     }
+#line 2022 "smarty_internal_templateparser.php"
 #line 194 "smarty_internal_templateparser.y"
-    function yy_r29(){ $this->_retvalue = $this->compiler->compileTag('private_print_expression',array('value'=>$this->yystack[$this->yyidx + -1]->minor));    }
-#line 2135 "smarty_internal_templateparser.php"
+    function yy_r20(){ $this->_retvalue = $this->compiler->compileTag('private_print_expression',array('value'=>$this->yystack[$this->yyidx + -1]->minor));    }
+#line 2025 "smarty_internal_templateparser.php"
 #line 195 "smarty_internal_templateparser.y"
-    function yy_r30(){ $this->_retvalue = $this->compiler->compileTag('private_print_expression',array_merge(array('value'=>$this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor));    }
-#line 2138 "smarty_internal_templateparser.php"
+    function yy_r21(){ $this->_retvalue = $this->compiler->compileTag('private_print_expression',array_merge(array('value'=>$this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor));    }
+#line 2028 "smarty_internal_templateparser.php"
 #line 206 "smarty_internal_templateparser.y"
-    function yy_r34(){ $this->_retvalue = $this->compiler->compileTag('assign',array('value'=>$this->yystack[$this->yyidx + -1]->minor,'var'=>"'".$this->yystack[$this->yyidx + -3]->minor."'"));    }
-#line 2141 "smarty_internal_templateparser.php"
+    function yy_r25(){ $this->_retvalue = $this->compiler->compileTag('assign',array('value'=>$this->yystack[$this->yyidx + -1]->minor,'var'=>"'".$this->yystack[$this->yyidx + -3]->minor."'"));    }
+#line 2031 "smarty_internal_templateparser.php"
 #line 208 "smarty_internal_templateparser.y"
-    function yy_r36(){ $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array('value'=>$this->yystack[$this->yyidx + -2]->minor,'var'=>"'".$this->yystack[$this->yyidx + -4]->minor."'"),$this->yystack[$this->yyidx + -1]->minor));    }
-#line 2144 "smarty_internal_templateparser.php"
+    function yy_r27(){ $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array('value'=>$this->yystack[$this->yyidx + -2]->minor,'var'=>"'".$this->yystack[$this->yyidx + -4]->minor."'"),$this->yystack[$this->yyidx + -1]->minor));    }
+#line 2034 "smarty_internal_templateparser.php"
 #line 210 "smarty_internal_templateparser.y"
-    function yy_r38(){ $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array('value'=>$this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + -1]->minor));    }
-#line 2147 "smarty_internal_templateparser.php"
+    function yy_r29(){ $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array('value'=>$this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + -1]->minor));    }
+#line 2037 "smarty_internal_templateparser.php"
 #line 213 "smarty_internal_templateparser.y"
-    function yy_r40(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,$this->yystack[$this->yyidx + -1]->minor);    }
-#line 2150 "smarty_internal_templateparser.php"
+    function yy_r31(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,$this->yystack[$this->yyidx + -1]->minor);    }
+#line 2040 "smarty_internal_templateparser.php"
 #line 215 "smarty_internal_templateparser.y"
-    function yy_r42(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,array());    }
-#line 2153 "smarty_internal_templateparser.php"
+    function yy_r33(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,array());    }
+#line 2043 "smarty_internal_templateparser.php"
 #line 217 "smarty_internal_templateparser.y"
-    function yy_r43(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,array_merge(array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor));    }
-#line 2156 "smarty_internal_templateparser.php"
+    function yy_r34(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,array_merge(array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor));    }
+#line 2046 "smarty_internal_templateparser.php"
 #line 219 "smarty_internal_templateparser.y"
-    function yy_r44(){  $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + -1]->minor).'<?php echo ';
+    function yy_r35(){  $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + -1]->minor).'<?php echo ';
                                                                                     $this->_retvalue .= $this->compiler->compileTag('private_modifier',array('modifier'=>$this->yystack[$this->yyidx + -3]->minor,'params'=>'ob_get_clean()'.$this->yystack[$this->yyidx + -2]->minor)).'?>';
                                                                                      }
-#line 2161 "smarty_internal_templateparser.php"
+#line 2051 "smarty_internal_templateparser.php"
 #line 223 "smarty_internal_templateparser.y"
-    function yy_r45(){  $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -6]->minor,array_merge(array('object_methode'=>$this->yystack[$this->yyidx + -4]->minor),$this->yystack[$this->yyidx + -1]->minor)).'<?php echo ';
+    function yy_r36(){  $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -6]->minor,array_merge(array('object_methode'=>$this->yystack[$this->yyidx + -4]->minor),$this->yystack[$this->yyidx + -1]->minor)).'<?php echo ';
                                                                                                $this->_retvalue .= $this->compiler->compileTag('private_modifier',array('modifier'=>$this->yystack[$this->yyidx + -3]->minor,'params'=>'ob_get_clean()'.$this->yystack[$this->yyidx + -2]->minor)).'?>';
                                                                                                 }
-#line 2166 "smarty_internal_templateparser.php"
+#line 2056 "smarty_internal_templateparser.php"
 #line 227 "smarty_internal_templateparser.y"
-    function yy_r46(){ $this->_retvalue = $this->compiler->compileTag(($this->yystack[$this->yyidx + -3]->minor == 'else if')? 'elseif' : $this->yystack[$this->yyidx + -3]->minor,array('if condition'=>$this->yystack[$this->yyidx + -1]->minor));    }
-#line 2169 "smarty_internal_templateparser.php"
+    function yy_r37(){ $this->_retvalue = $this->compiler->compileTag(($this->yystack[$this->yyidx + -3]->minor == 'else if')? 'elseif' : $this->yystack[$this->yyidx + -3]->minor,array('if condition'=>$this->yystack[$this->yyidx + -1]->minor));    }
+#line 2059 "smarty_internal_templateparser.php"
 #line 230 "smarty_internal_templateparser.y"
-    function yy_r48(){
+    function yy_r39(){
                                                              $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -11]->minor,array('start'=>$this->yystack[$this->yyidx + -9]->minor,'ifexp'=>$this->yystack[$this->yyidx + -6]->minor,'varloop'=>$this->yystack[$this->yyidx + -2]->minor,'loop'=>$this->yystack[$this->yyidx + -1]->minor));    }
-#line 2173 "smarty_internal_templateparser.php"
+#line 2063 "smarty_internal_templateparser.php"
 #line 233 "smarty_internal_templateparser.y"
-    function yy_r49(){ $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2176 "smarty_internal_templateparser.php"
+    function yy_r40(){ $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2066 "smarty_internal_templateparser.php"
 #line 234 "smarty_internal_templateparser.y"
-    function yy_r50(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;    }
-#line 2179 "smarty_internal_templateparser.php"
+    function yy_r41(){ $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;    }
+#line 2069 "smarty_internal_templateparser.php"
 #line 235 "smarty_internal_templateparser.y"
-    function yy_r51(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -6]->minor,array_merge(array('start'=>$this->yystack[$this->yyidx + -4]->minor,'to'=>$this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor));    }
-#line 2182 "smarty_internal_templateparser.php"
+    function yy_r42(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -6]->minor,array_merge(array('start'=>$this->yystack[$this->yyidx + -4]->minor,'to'=>$this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor));    }
+#line 2072 "smarty_internal_templateparser.php"
 #line 236 "smarty_internal_templateparser.y"
-    function yy_r52(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -7]->minor,array('start'=>$this->yystack[$this->yyidx + -5]->minor,'to'=>$this->yystack[$this->yyidx + -3]->minor,'step'=>$this->yystack[$this->yyidx + -1]->minor));    }
-#line 2185 "smarty_internal_templateparser.php"
+    function yy_r43(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -7]->minor,array('start'=>$this->yystack[$this->yyidx + -5]->minor,'to'=>$this->yystack[$this->yyidx + -3]->minor,'step'=>$this->yystack[$this->yyidx + -1]->minor));    }
+#line 2075 "smarty_internal_templateparser.php"
 #line 238 "smarty_internal_templateparser.y"
-    function yy_r53(){
+    function yy_r44(){
                                                             $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -6]->minor,array('from'=>$this->yystack[$this->yyidx + -4]->minor,'item'=>$this->yystack[$this->yyidx + -1]->minor));    }
-#line 2189 "smarty_internal_templateparser.php"
+#line 2079 "smarty_internal_templateparser.php"
 #line 240 "smarty_internal_templateparser.y"
-    function yy_r54(){
+    function yy_r45(){
                                                             $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -9]->minor,array('from'=>$this->yystack[$this->yyidx + -7]->minor,'item'=>$this->yystack[$this->yyidx + -1]->minor,'key'=>$this->yystack[$this->yyidx + -4]->minor));    }
-#line 2193 "smarty_internal_templateparser.php"
+#line 2083 "smarty_internal_templateparser.php"
 #line 242 "smarty_internal_templateparser.y"
-    function yy_r55(){ 
+    function yy_r46(){ 
                                                             $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -6]->minor,array('from'=>$this->yystack[$this->yyidx + -4]->minor,'item'=>$this->yystack[$this->yyidx + -1]->minor));    }
-#line 2197 "smarty_internal_templateparser.php"
+#line 2087 "smarty_internal_templateparser.php"
 #line 244 "smarty_internal_templateparser.y"
-    function yy_r56(){ 
+    function yy_r47(){ 
                                                             $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -9]->minor,array('from'=>$this->yystack[$this->yyidx + -7]->minor,'item'=>$this->yystack[$this->yyidx + -1]->minor,'key'=>$this->yystack[$this->yyidx + -4]->minor));    }
-#line 2201 "smarty_internal_templateparser.php"
+#line 2091 "smarty_internal_templateparser.php"
 #line 248 "smarty_internal_templateparser.y"
-    function yy_r57(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',array());    }
-#line 2204 "smarty_internal_templateparser.php"
+    function yy_r48(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',array());    }
+#line 2094 "smarty_internal_templateparser.php"
 #line 253 "smarty_internal_templateparser.y"
-    function yy_r62(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',$this->yystack[$this->yyidx + -1]->minor);    }
-#line 2207 "smarty_internal_templateparser.php"
+    function yy_r53(){ $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',$this->yystack[$this->yyidx + -1]->minor);    }
+#line 2097 "smarty_internal_templateparser.php"
 #line 254 "smarty_internal_templateparser.y"
-    function yy_r63(){  $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor.'close',$this->yystack[$this->yyidx + -1]->minor).'<?php echo ';
+    function yy_r54(){  $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor.'close',$this->yystack[$this->yyidx + -1]->minor).'<?php echo ';
                                                                                          $this->_retvalue .= $this->compiler->compileTag('private_modifier',array('modifier'=>$this->yystack[$this->yyidx + -3]->minor,'params'=>'ob_get_clean()'.$this->yystack[$this->yyidx + -2]->minor)).'?>';
                                                                                           }
-#line 2212 "smarty_internal_templateparser.php"
+#line 2102 "smarty_internal_templateparser.php"
 #line 258 "smarty_internal_templateparser.y"
-    function yy_r64(){  $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',array('object_methode'=>$this->yystack[$this->yyidx + -1]->minor));    }
-#line 2215 "smarty_internal_templateparser.php"
+    function yy_r55(){  $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',array('object_methode'=>$this->yystack[$this->yyidx + -1]->minor));    }
+#line 2105 "smarty_internal_templateparser.php"
 #line 265 "smarty_internal_templateparser.y"
-    function yy_r65(){ $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);    }
-#line 2218 "smarty_internal_templateparser.php"
+    function yy_r56(){ $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);    }
+#line 2108 "smarty_internal_templateparser.php"
 #line 269 "smarty_internal_templateparser.y"
-    function yy_r67(){ $this->_retvalue = array();    }
-#line 2221 "smarty_internal_templateparser.php"
+    function yy_r58(){ $this->_retvalue = array();    }
+#line 2111 "smarty_internal_templateparser.php"
 #line 272 "smarty_internal_templateparser.y"
-    function yy_r68(){ $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>"'".$this->yystack[$this->yyidx + 0]->minor."'");    }
-#line 2224 "smarty_internal_templateparser.php"
-#line 273 "smarty_internal_templateparser.y"
-    function yy_r69(){ $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);    }
-#line 2227 "smarty_internal_templateparser.php"
-#line 276 "smarty_internal_templateparser.y"
-    function yy_r72(){ $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor=>'true');    }
-#line 2230 "smarty_internal_templateparser.php"
+    function yy_r59(){ 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 2121 "smarty_internal_templateparser.php"
+#line 280 "smarty_internal_templateparser.y"
+    function yy_r60(){ $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);    }
+#line 2124 "smarty_internal_templateparser.php"
 #line 283 "smarty_internal_templateparser.y"
-    function yy_r74(){ $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);    }
-#line 2233 "smarty_internal_templateparser.php"
-#line 284 "smarty_internal_templateparser.y"
-    function yy_r75(){ $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor; $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor;    }
-#line 2236 "smarty_internal_templateparser.php"
-#line 286 "smarty_internal_templateparser.y"
-    function yy_r76(){ $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor);    }
-#line 2239 "smarty_internal_templateparser.php"
-#line 294 "smarty_internal_templateparser.y"
-    function yy_r78(){ $this->_retvalue = "'".$this->yystack[$this->yyidx + 0]->minor."'";     }
-#line 2242 "smarty_internal_templateparser.php"
-#line 296 "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 2245 "smarty_internal_templateparser.php"
-#line 298 "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 2248 "smarty_internal_templateparser.php"
+    function yy_r63(){ $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor=>'true');    }
+#line 2127 "smarty_internal_templateparser.php"
+#line 290 "smarty_internal_templateparser.y"
+    function yy_r65(){ $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);    }
+#line 2130 "smarty_internal_templateparser.php"
+#line 291 "smarty_internal_templateparser.y"
+    function yy_r66(){ $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor; $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor;    }
+#line 2133 "smarty_internal_templateparser.php"
+#line 293 "smarty_internal_templateparser.y"
+    function yy_r67(){ $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor);    }
+#line 2136 "smarty_internal_templateparser.php"
+#line 302 "smarty_internal_templateparser.y"
+    function yy_r69(){$this->_retvalue = '$_smarty_tpl->getStreamVariable(\''. $this->yystack[$this->yyidx + -2]->minor .'://'. $this->yystack[$this->yyidx + 0]->minor . '\')';    }
+#line 2139 "smarty_internal_templateparser.php"
 #line 304 "smarty_internal_templateparser.y"
-    function yy_r83(){$this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;    }
-#line 2251 "smarty_internal_templateparser.php"
-#line 308 "smarty_internal_templateparser.y"
-    function yy_r84(){$this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2254 "smarty_internal_templateparser.php"
-#line 309 "smarty_internal_templateparser.y"
-    function yy_r85(){$this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')';    }
-#line 2257 "smarty_internal_templateparser.php"
+    function yy_r70(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . trim($this->yystack[$this->yyidx + -1]->minor) . $this->yystack[$this->yyidx + 0]->minor;     }
+#line 2142 "smarty_internal_templateparser.php"
 #line 310 "smarty_internal_templateparser.y"
-    function yy_r86(){$this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')';    }
-#line 2260 "smarty_internal_templateparser.php"
-#line 312 "smarty_internal_templateparser.y"
-    function yy_r88(){$this->_retvalue = '!('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';    }
-#line 2263 "smarty_internal_templateparser.php"
+    function yy_r73(){$this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;    }
+#line 2145 "smarty_internal_templateparser.php"
 #line 313 "smarty_internal_templateparser.y"
-    function yy_r89(){$this->_retvalue = '('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';    }
-#line 2266 "smarty_internal_templateparser.php"
-#line 314 "smarty_internal_templateparser.y"
-    function yy_r90(){$this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';    }
-#line 2269 "smarty_internal_templateparser.php"
-#line 315 "smarty_internal_templateparser.y"
-    function yy_r91(){$this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';    }
-#line 2272 "smarty_internal_templateparser.php"
-#line 316 "smarty_internal_templateparser.y"
-    function yy_r92(){$this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';    }
-#line 2275 "smarty_internal_templateparser.php"
+    function yy_r74(){  $this->_retvalue = $this->compiler->compileTag('private_modifier',array('modifier'=>$this->yystack[$this->yyidx + -1]->minor,'params'=>$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor));     }
+#line 2148 "smarty_internal_templateparser.php"
 #line 317 "smarty_internal_templateparser.y"
-    function yy_r93(){$this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';    }
-#line 2278 "smarty_internal_templateparser.php"
+    function yy_r75(){$this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2151 "smarty_internal_templateparser.php"
+#line 318 "smarty_internal_templateparser.y"
+    function yy_r76(){$this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 2154 "smarty_internal_templateparser.php"
+#line 319 "smarty_internal_templateparser.y"
+    function yy_r77(){$this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 2157 "smarty_internal_templateparser.php"
+#line 321 "smarty_internal_templateparser.y"
+    function yy_r79(){$this->_retvalue = '!('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 2160 "smarty_internal_templateparser.php"
+#line 322 "smarty_internal_templateparser.y"
+    function yy_r80(){$this->_retvalue = '('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 2163 "smarty_internal_templateparser.php"
 #line 323 "smarty_internal_templateparser.y"
-    function yy_r99(){$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 2281 "smarty_internal_templateparser.php"
-#line 329 "smarty_internal_templateparser.y"
-    function yy_r100(){ $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2284 "smarty_internal_templateparser.php"
-#line 336 "smarty_internal_templateparser.y"
-    function yy_r103(){ $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor;     }
-#line 2287 "smarty_internal_templateparser.php"
-#line 341 "smarty_internal_templateparser.y"
-    function yy_r107(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;     }
-#line 2290 "smarty_internal_templateparser.php"
-#line 351 "smarty_internal_templateparser.y"
-    function yy_r111(){ $this->_retvalue = "(". $this->yystack[$this->yyidx + -1]->minor .")";     }
-#line 2293 "smarty_internal_templateparser.php"
-#line 357 "smarty_internal_templateparser.y"
-    function yy_r114(){if (!$this->template->security || $this->smarty->security_handler->isTrustedStaticClass($this->yystack[$this->yyidx + -2]->minor, $this->compiler)) {
+    function yy_r81(){$this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';    }
+#line 2166 "smarty_internal_templateparser.php"
+#line 324 "smarty_internal_templateparser.y"
+    function yy_r82(){$this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';    }
+#line 2169 "smarty_internal_templateparser.php"
+#line 325 "smarty_internal_templateparser.y"
+    function yy_r83(){$this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 2172 "smarty_internal_templateparser.php"
+#line 326 "smarty_internal_templateparser.y"
+    function yy_r84(){$this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';    }
+#line 2175 "smarty_internal_templateparser.php"
+#line 332 "smarty_internal_templateparser.y"
+    function yy_r90(){$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 2178 "smarty_internal_templateparser.php"
+#line 338 "smarty_internal_templateparser.y"
+    function yy_r91(){ $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2181 "smarty_internal_templateparser.php"
+#line 345 "smarty_internal_templateparser.y"
+    function yy_r94(){ $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor;     }
+#line 2184 "smarty_internal_templateparser.php"
+#line 350 "smarty_internal_templateparser.y"
+    function yy_r98(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;     }
+#line 2187 "smarty_internal_templateparser.php"
+#line 352 "smarty_internal_templateparser.y"
+    function yy_r99(){ 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 2197 "smarty_internal_templateparser.php"
+#line 363 "smarty_internal_templateparser.y"
+    function yy_r101(){ $this->_retvalue = "(". $this->yystack[$this->yyidx + -1]->minor .")";     }
+#line 2200 "smarty_internal_templateparser.php"
+#line 369 "smarty_internal_templateparser.y"
+    function yy_r104(){if (!$this->template->security || $this->smarty->security_handler->isTrustedStaticClass($this->yystack[$this->yyidx + -2]->minor, $this->compiler)) {
                                                                   $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor; 
                                                                 }    }
-#line 2298 "smarty_internal_templateparser.php"
-#line 361 "smarty_internal_templateparser.y"
-    function yy_r115(){ $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 2301 "smarty_internal_templateparser.php"
-#line 363 "smarty_internal_templateparser.y"
-    function yy_r116(){  $this->_retvalue = $this->compiler->compileTag('private_modifier',array('modifier'=>$this->yystack[$this->yyidx + -1]->minor,'params'=>$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor));     }
-#line 2304 "smarty_internal_templateparser.php"
-#line 372 "smarty_internal_templateparser.y"
-    function yy_r117(){if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') { $this->_retvalue =  $this->compiler->compileTag('private_special_variable',$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);} else {
-                                                         $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + 0]->minor['var'] .')->value'.$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + 0]->minor['var'],"'"), null, true, false)->nocache;}    }
-#line 2308 "smarty_internal_templateparser.php"
-#line 375 "smarty_internal_templateparser.y"
-    function yy_r118(){ $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor .')->'.$this->yystack[$this->yyidx + 0]->minor; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -2]->minor,"'"), null, true, false)->nocache;    }
-#line 2311 "smarty_internal_templateparser.php"
-#line 379 "smarty_internal_templateparser.y"
-    function yy_r120(){$this->_retvalue = '$_smarty_tpl->getConfigVariable(\''. $this->yystack[$this->yyidx + -1]->minor .'\')';    }
-#line 2314 "smarty_internal_templateparser.php"
-#line 380 "smarty_internal_templateparser.y"
-    function yy_r121(){$this->_retvalue = '$_smarty_tpl->getConfigVariable('. $this->yystack[$this->yyidx + -1]->minor .')';    }
-#line 2317 "smarty_internal_templateparser.php"
-#line 383 "smarty_internal_templateparser.y"
-    function yy_r122(){$this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);    }
-#line 2320 "smarty_internal_templateparser.php"
-#line 389 "smarty_internal_templateparser.y"
-    function yy_r123(){$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2323 "smarty_internal_templateparser.php"
+#line 2205 "smarty_internal_templateparser.php"
+#line 373 "smarty_internal_templateparser.y"
+    function yy_r105(){ $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 2208 "smarty_internal_templateparser.php"
+#line 382 "smarty_internal_templateparser.y"
+    function yy_r106(){if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') { $this->_retvalue =  $this->compiler->compileTag('private_special_variable',$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
+                                      } else {
+                                      if (isset($this->compiler->local_var[$this->yystack[$this->yyidx + 0]->minor['var']])) {
+                                          $this->_retvalue = '$_smarty_tpl->tpl_vars['. $this->yystack[$this->yyidx + 0]->minor['var'] .']->value'.$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
+                                         } else {
+                                          $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + 0]->minor['var'] .')->value'.$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
+                                         }
+                                       $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + 0]->minor['var'],"'"), null, true, false)->nocache;}    }
+#line 2218 "smarty_internal_templateparser.php"
 #line 391 "smarty_internal_templateparser.y"
-    function yy_r124(){return;    }
-#line 2326 "smarty_internal_templateparser.php"
-#line 395 "smarty_internal_templateparser.y"
-    function yy_r125(){ $this->_retvalue = '[$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + 0]->minor .')->value]'; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable('$this->yystack[$this->yyidx + 0]->minor', null, true, false)->nocache;    }
-#line 2329 "smarty_internal_templateparser.php"
-#line 396 "smarty_internal_templateparser.y"
-    function yy_r126(){ $this->_retvalue = '[$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor .')->'.$this->yystack[$this->yyidx + 0]->minor.']'; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -2]->minor,"'"), null, true, false)->nocache;    }
-#line 2332 "smarty_internal_templateparser.php"
-#line 397 "smarty_internal_templateparser.y"
-    function yy_r127(){ $this->_retvalue = "['". $this->yystack[$this->yyidx + 0]->minor ."']";    }
-#line 2335 "smarty_internal_templateparser.php"
+    function yy_r107(){if (isset($this->compiler->local_var[$this->yystack[$this->yyidx + -2]->minor])) {
+                                                  $this->_retvalue = '$_smarty_tpl->tpl_vars['. $this->yystack[$this->yyidx + -2]->minor .']->'.$this->yystack[$this->yyidx + 0]->minor;
+                                                 } else {
+                                                  $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor .')->'.$this->yystack[$this->yyidx + 0]->minor;
+                                                 }
+                                                  $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -2]->minor,"'"), null, true, false)->nocache;    }
+#line 2226 "smarty_internal_templateparser.php"
+#line 400 "smarty_internal_templateparser.y"
+    function yy_r109(){$this->_retvalue = '$_smarty_tpl->getConfigVariable(\''. $this->yystack[$this->yyidx + -1]->minor .'\')';    }
+#line 2229 "smarty_internal_templateparser.php"
 #line 401 "smarty_internal_templateparser.y"
-    function yy_r130(){ $this->_retvalue = "[". $this->yystack[$this->yyidx + 0]->minor ."]";    }
-#line 2338 "smarty_internal_templateparser.php"
-#line 402 "smarty_internal_templateparser.y"
-    function yy_r131(){ $this->_retvalue = "[". $this->yystack[$this->yyidx + -1]->minor ."]";    }
-#line 2341 "smarty_internal_templateparser.php"
+    function yy_r110(){$this->_retvalue = '$_smarty_tpl->getConfigVariable('. $this->yystack[$this->yyidx + -1]->minor .')';    }
+#line 2232 "smarty_internal_templateparser.php"
 #line 404 "smarty_internal_templateparser.y"
-    function yy_r132(){ $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable','[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']';    }
-#line 2344 "smarty_internal_templateparser.php"
-#line 405 "smarty_internal_templateparser.y"
-    function yy_r133(){ $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable','[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']';    }
-#line 2347 "smarty_internal_templateparser.php"
-#line 409 "smarty_internal_templateparser.y"
-    function yy_r135(){$this->_retvalue = '';    }
-#line 2350 "smarty_internal_templateparser.php"
+    function yy_r111(){$this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);    }
+#line 2235 "smarty_internal_templateparser.php"
+#line 410 "smarty_internal_templateparser.y"
+    function yy_r112(){$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2238 "smarty_internal_templateparser.php"
+#line 412 "smarty_internal_templateparser.y"
+    function yy_r113(){return;    }
+#line 2241 "smarty_internal_templateparser.php"
+#line 416 "smarty_internal_templateparser.y"
+    function yy_r114(){ $this->_retvalue = '[$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + 0]->minor .')->value]'; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable('$this->yystack[$this->yyidx + 0]->minor', null, true, false)->nocache;    }
+#line 2244 "smarty_internal_templateparser.php"
 #line 417 "smarty_internal_templateparser.y"
-    function yy_r137(){$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2353 "smarty_internal_templateparser.php"
+    function yy_r115(){ $this->_retvalue = '[$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor .')->'.$this->yystack[$this->yyidx + 0]->minor.']'; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -2]->minor,"'"), null, true, false)->nocache;    }
+#line 2247 "smarty_internal_templateparser.php"
+#line 418 "smarty_internal_templateparser.y"
+    function yy_r116(){ $this->_retvalue = "['". $this->yystack[$this->yyidx + 0]->minor ."']";    }
+#line 2250 "smarty_internal_templateparser.php"
 #line 419 "smarty_internal_templateparser.y"
-    function yy_r138(){$this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';    }
-#line 2356 "smarty_internal_templateparser.php"
+    function yy_r117(){ $this->_retvalue = "[". $this->yystack[$this->yyidx + 0]->minor ."]";    }
+#line 2253 "smarty_internal_templateparser.php"
+#line 420 "smarty_internal_templateparser.y"
+    function yy_r118(){ $this->_retvalue = "[". $this->yystack[$this->yyidx + -1]->minor ."]";    }
+#line 2256 "smarty_internal_templateparser.php"
 #line 422 "smarty_internal_templateparser.y"
-    function yy_r139(){$this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')';    }
-#line 2359 "smarty_internal_templateparser.php"
+    function yy_r119(){ $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable','[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']';    }
+#line 2259 "smarty_internal_templateparser.php"
+#line 423 "smarty_internal_templateparser.y"
+    function yy_r120(){ $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable','[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']';    }
+#line 2262 "smarty_internal_templateparser.php"
 #line 427 "smarty_internal_templateparser.y"
-    function yy_r140(){ if ($this->yystack[$this->yyidx + -1]->minor['var'] == '\'smarty\'') { $this->_retvalue =  $this->compiler->compileTag('private_special_variable',$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']).$this->yystack[$this->yyidx + 0]->minor;} else {
-                                                         $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -1]->minor['var'] .')->value'.$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'].$this->yystack[$this->yyidx + 0]->minor; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -1]->minor['var'],"'"), null, true, false)->nocache;}    }
-#line 2363 "smarty_internal_templateparser.php"
-#line 429 "smarty_internal_templateparser.y"
-    function yy_r141(){ if ($this->yystack[$this->yyidx + -2]->minor['var'] == '\'smarty\'') { $this->_retvalue =  $this->compiler->compileTag('private_special_variable',$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']).'::'.$this->yystack[$this->yyidx + 0]->minor;} else {
-                                                         $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor['var'] .')->value'.$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'].'::'.$this->yystack[$this->yyidx + 0]->minor; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -2]->minor['var'],"'"), null, true, false)->nocache;}    }
-#line 2367 "smarty_internal_templateparser.php"
-#line 432 "smarty_internal_templateparser.y"
-    function yy_r142(){$this->_retvalue  = $this->yystack[$this->yyidx + 0]->minor;     }
-#line 2370 "smarty_internal_templateparser.php"
-#line 434 "smarty_internal_templateparser.y"
-    function yy_r143(){$this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;     }
-#line 2373 "smarty_internal_templateparser.php"
-#line 436 "smarty_internal_templateparser.y"
-    function yy_r144(){ $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2376 "smarty_internal_templateparser.php"
+    function yy_r122(){$this->_retvalue = '';    }
+#line 2265 "smarty_internal_templateparser.php"
+#line 435 "smarty_internal_templateparser.y"
+    function yy_r124(){$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2268 "smarty_internal_templateparser.php"
 #line 437 "smarty_internal_templateparser.y"
-    function yy_r145(){ $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';    }
-#line 2379 "smarty_internal_templateparser.php"
-#line 438 "smarty_internal_templateparser.y"
-    function yy_r146(){ $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';    }
-#line 2382 "smarty_internal_templateparser.php"
+    function yy_r125(){$this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';    }
+#line 2271 "smarty_internal_templateparser.php"
 #line 439 "smarty_internal_templateparser.y"
-    function yy_r147(){ $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';    }
-#line 2385 "smarty_internal_templateparser.php"
-#line 441 "smarty_internal_templateparser.y"
-    function yy_r148(){ $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2388 "smarty_internal_templateparser.php"
-#line 447 "smarty_internal_templateparser.y"
-    function yy_r149(){if (!$this->template->security || $this->smarty->security_handler->isTrustedPhpFunction($this->yystack[$this->yyidx + -3]->minor, $this->compiler)) {
+    function yy_r126(){$this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')';    }
+#line 2274 "smarty_internal_templateparser.php"
+#line 444 "smarty_internal_templateparser.y"
+    function yy_r127(){ if ($this->yystack[$this->yyidx + -1]->minor['var'] == '\'smarty\'') { $this->_retvalue =  $this->compiler->compileTag('private_special_variable',$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']).$this->yystack[$this->yyidx + 0]->minor;} else {
+                                                         $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -1]->minor['var'] .')->value'.$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'].$this->yystack[$this->yyidx + 0]->minor; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -1]->minor['var'],"'"), null, true, false)->nocache;}    }
+#line 2278 "smarty_internal_templateparser.php"
+#line 446 "smarty_internal_templateparser.y"
+    function yy_r128(){ if ($this->yystack[$this->yyidx + -2]->minor['var'] == '\'smarty\'') { $this->_retvalue =  $this->compiler->compileTag('private_special_variable',$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']).'::'.$this->yystack[$this->yyidx + 0]->minor;} else {
+                                                         $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor['var'] .')->value'.$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'].'::'.$this->yystack[$this->yyidx + 0]->minor; $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable(trim($this->yystack[$this->yyidx + -2]->minor['var'],"'"), null, true, false)->nocache;}    }
+#line 2282 "smarty_internal_templateparser.php"
+#line 449 "smarty_internal_templateparser.y"
+    function yy_r129(){$this->_retvalue  = $this->yystack[$this->yyidx + 0]->minor;     }
+#line 2285 "smarty_internal_templateparser.php"
+#line 451 "smarty_internal_templateparser.y"
+    function yy_r130(){$this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;     }
+#line 2288 "smarty_internal_templateparser.php"
+#line 453 "smarty_internal_templateparser.y"
+    function yy_r131(){ $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2291 "smarty_internal_templateparser.php"
+#line 454 "smarty_internal_templateparser.y"
+    function yy_r132(){ $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';    }
+#line 2294 "smarty_internal_templateparser.php"
+#line 455 "smarty_internal_templateparser.y"
+    function yy_r133(){ $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';    }
+#line 2297 "smarty_internal_templateparser.php"
+#line 456 "smarty_internal_templateparser.y"
+    function yy_r134(){ $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';    }
+#line 2300 "smarty_internal_templateparser.php"
+#line 458 "smarty_internal_templateparser.y"
+    function yy_r135(){ $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2303 "smarty_internal_templateparser.php"
+#line 464 "smarty_internal_templateparser.y"
+    function yy_r136(){if (!$this->template->security || $this->smarty->security_handler->isTrustedPhpFunction($this->yystack[$this->yyidx + -3]->minor, $this->compiler)) {
 																					            if ($this->yystack[$this->yyidx + -3]->minor == 'isset' || $this->yystack[$this->yyidx + -3]->minor == 'empty' || $this->yystack[$this->yyidx + -3]->minor == 'array' || is_callable($this->yystack[$this->yyidx + -3]->minor)) {
 																					                $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". $this->yystack[$this->yyidx + -1]->minor .")";
 																					            } else {
                                                        $this->compiler->trigger_template_error ("unknown function \"" . $this->yystack[$this->yyidx + -3]->minor . "\"");
                                                       }
                                                     }    }
-#line 2397 "smarty_internal_templateparser.php"
-#line 458 "smarty_internal_templateparser.y"
-    function yy_r150(){ $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". $this->yystack[$this->yyidx + -1]->minor .")";    }
-#line 2400 "smarty_internal_templateparser.php"
-#line 462 "smarty_internal_templateparser.y"
-    function yy_r151(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.",".$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2403 "smarty_internal_templateparser.php"
-#line 466 "smarty_internal_templateparser.y"
-    function yy_r153(){ return;    }
-#line 2406 "smarty_internal_templateparser.php"
-#line 471 "smarty_internal_templateparser.y"
-    function yy_r154(){ $this->_retvalue =  $this->yystack[$this->yyidx + 0]->minor;    }
-#line 2409 "smarty_internal_templateparser.php"
-#line 476 "smarty_internal_templateparser.y"
-    function yy_r157(){ $this->prefix_number++; $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'=$_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + -3]->minor .'\')->value;?>'; $this->_retvalue = '$_tmp'.$this->prefix_number.'('. $this->yystack[$this->yyidx + -1]->minor .')';     }
-#line 2412 "smarty_internal_templateparser.php"
+#line 2312 "smarty_internal_templateparser.php"
+#line 475 "smarty_internal_templateparser.y"
+    function yy_r137(){ $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". $this->yystack[$this->yyidx + -1]->minor .")";    }
+#line 2315 "smarty_internal_templateparser.php"
 #line 479 "smarty_internal_templateparser.y"
-    function yy_r159(){ $this->prefix_number++; $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'=$_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + -4]->minor .'\')->value;?>'; $this->_retvalue = '$_tmp'.$this->prefix_number.'('. $this->yystack[$this->yyidx + -2]->minor .')'.$this->yystack[$this->yyidx + 0]->minor;     }
-#line 2415 "smarty_internal_templateparser.php"
+    function yy_r138(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.",".$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2318 "smarty_internal_templateparser.php"
 #line 483 "smarty_internal_templateparser.y"
-    function yy_r161(){ $this->_retvalue = '$'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2418 "smarty_internal_templateparser.php"
-#line 485 "smarty_internal_templateparser.y"
-    function yy_r162(){ $this->_retvalue = '$'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2421 "smarty_internal_templateparser.php"
+    function yy_r140(){ return;    }
+#line 2321 "smarty_internal_templateparser.php"
+#line 488 "smarty_internal_templateparser.y"
+    function yy_r141(){ $this->_retvalue =  $this->yystack[$this->yyidx + 0]->minor;    }
+#line 2324 "smarty_internal_templateparser.php"
+#line 493 "smarty_internal_templateparser.y"
+    function yy_r144(){ $this->prefix_number++; $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'=$_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + -3]->minor .'\')->value;?>'; $this->_retvalue = '$_tmp'.$this->prefix_number.'('. $this->yystack[$this->yyidx + -1]->minor .')';     }
+#line 2327 "smarty_internal_templateparser.php"
 #line 496 "smarty_internal_templateparser.y"
-    function yy_r163(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2424 "smarty_internal_templateparser.php"
+    function yy_r146(){ $this->prefix_number++; $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'=$_smarty_tpl->getVariable(\''. $this->yystack[$this->yyidx + -4]->minor .'\')->value;?>'; $this->_retvalue = '$_tmp'.$this->prefix_number.'('. $this->yystack[$this->yyidx + -2]->minor .')'.$this->yystack[$this->yyidx + 0]->minor;     }
+#line 2330 "smarty_internal_templateparser.php"
 #line 500 "smarty_internal_templateparser.y"
-    function yy_r165(){$this->_retvalue = ','.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2427 "smarty_internal_templateparser.php"
-#line 501 "smarty_internal_templateparser.y"
-    function yy_r166(){$this->_retvalue = ',\''.$this->yystack[$this->yyidx + 0]->minor.'\'';    }
-#line 2430 "smarty_internal_templateparser.php"
-#line 504 "smarty_internal_templateparser.y"
-    function yy_r167(){$this->_retvalue = '==';    }
-#line 2433 "smarty_internal_templateparser.php"
-#line 505 "smarty_internal_templateparser.y"
-    function yy_r168(){$this->_retvalue = '!=';    }
-#line 2436 "smarty_internal_templateparser.php"
-#line 506 "smarty_internal_templateparser.y"
-    function yy_r169(){$this->_retvalue = '>';    }
-#line 2439 "smarty_internal_templateparser.php"
-#line 507 "smarty_internal_templateparser.y"
-    function yy_r170(){$this->_retvalue = '<';    }
-#line 2442 "smarty_internal_templateparser.php"
-#line 508 "smarty_internal_templateparser.y"
-    function yy_r171(){$this->_retvalue = '>=';    }
-#line 2445 "smarty_internal_templateparser.php"
-#line 509 "smarty_internal_templateparser.y"
-    function yy_r172(){$this->_retvalue = '<=';    }
-#line 2448 "smarty_internal_templateparser.php"
-#line 510 "smarty_internal_templateparser.y"
-    function yy_r173(){$this->_retvalue = '===';    }
-#line 2451 "smarty_internal_templateparser.php"
-#line 511 "smarty_internal_templateparser.y"
-    function yy_r174(){$this->_retvalue = '!==';    }
-#line 2454 "smarty_internal_templateparser.php"
-#line 512 "smarty_internal_templateparser.y"
-    function yy_r175(){$this->_retvalue = '%';    }
-#line 2457 "smarty_internal_templateparser.php"
-#line 514 "smarty_internal_templateparser.y"
-    function yy_r176(){$this->_retvalue = '&&';    }
-#line 2460 "smarty_internal_templateparser.php"
-#line 515 "smarty_internal_templateparser.y"
-    function yy_r177(){$this->_retvalue = '||';    }
-#line 2463 "smarty_internal_templateparser.php"
-#line 516 "smarty_internal_templateparser.y"
-    function yy_r178(){$this->_retvalue = ' XOR ';    }
-#line 2466 "smarty_internal_templateparser.php"
+    function yy_r148(){ $this->_retvalue = '$'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2333 "smarty_internal_templateparser.php"
+#line 502 "smarty_internal_templateparser.y"
+    function yy_r149(){ $this->_retvalue = '$'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2336 "smarty_internal_templateparser.php"
+#line 513 "smarty_internal_templateparser.y"
+    function yy_r150(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2339 "smarty_internal_templateparser.php"
+#line 517 "smarty_internal_templateparser.y"
+    function yy_r152(){$this->_retvalue = ','.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2342 "smarty_internal_templateparser.php"
 #line 521 "smarty_internal_templateparser.y"
-    function yy_r179(){ $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')';    }
-#line 2469 "smarty_internal_templateparser.php"
+    function yy_r154(){$this->_retvalue = '==';    }
+#line 2345 "smarty_internal_templateparser.php"
+#line 522 "smarty_internal_templateparser.y"
+    function yy_r155(){$this->_retvalue = '!=';    }
+#line 2348 "smarty_internal_templateparser.php"
 #line 523 "smarty_internal_templateparser.y"
-    function yy_r181(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor;     }
-#line 2472 "smarty_internal_templateparser.php"
+    function yy_r156(){$this->_retvalue = '>';    }
+#line 2351 "smarty_internal_templateparser.php"
 #line 524 "smarty_internal_templateparser.y"
-    function yy_r182(){ return;     }
-#line 2475 "smarty_internal_templateparser.php"
+    function yy_r157(){$this->_retvalue = '<';    }
+#line 2354 "smarty_internal_templateparser.php"
 #line 525 "smarty_internal_templateparser.y"
-    function yy_r183(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2478 "smarty_internal_templateparser.php"
+    function yy_r158(){$this->_retvalue = '>=';    }
+#line 2357 "smarty_internal_templateparser.php"
 #line 526 "smarty_internal_templateparser.y"
-    function yy_r184(){ $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor;    }
-#line 2481 "smarty_internal_templateparser.php"
+    function yy_r159(){$this->_retvalue = '<=';    }
+#line 2360 "smarty_internal_templateparser.php"
+#line 527 "smarty_internal_templateparser.y"
+    function yy_r160(){$this->_retvalue = '===';    }
+#line 2363 "smarty_internal_templateparser.php"
+#line 528 "smarty_internal_templateparser.y"
+    function yy_r161(){$this->_retvalue = '!==';    }
+#line 2366 "smarty_internal_templateparser.php"
+#line 529 "smarty_internal_templateparser.y"
+    function yy_r162(){$this->_retvalue = '%';    }
+#line 2369 "smarty_internal_templateparser.php"
+#line 531 "smarty_internal_templateparser.y"
+    function yy_r163(){$this->_retvalue = '&&';    }
+#line 2372 "smarty_internal_templateparser.php"
+#line 532 "smarty_internal_templateparser.y"
+    function yy_r164(){$this->_retvalue = '||';    }
+#line 2375 "smarty_internal_templateparser.php"
 #line 533 "smarty_internal_templateparser.y"
-    function yy_r186(){ $this->_retvalue = "''";     }
-#line 2484 "smarty_internal_templateparser.php"
-#line 534 "smarty_internal_templateparser.y"
-    function yy_r187(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php();     }
-#line 2487 "smarty_internal_templateparser.php"
-#line 536 "smarty_internal_templateparser.y"
-    function yy_r188(){ $this->yystack[$this->yyidx + -1]->minor->append_subtree($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;     }
-#line 2490 "smarty_internal_templateparser.php"
-#line 537 "smarty_internal_templateparser.y"
-    function yy_r189(){ $this->_retvalue = new _smarty_doublequoted($this, $this->yystack[$this->yyidx + 0]->minor);     }
-#line 2493 "smarty_internal_templateparser.php"
-#line 539 "smarty_internal_templateparser.y"
-    function yy_r190(){ $this->_retvalue = new _smarty_code($this, $this->yystack[$this->yyidx + -1]->minor);     }
-#line 2496 "smarty_internal_templateparser.php"
+    function yy_r165(){$this->_retvalue = ' XOR ';    }
+#line 2378 "smarty_internal_templateparser.php"
+#line 538 "smarty_internal_templateparser.y"
+    function yy_r166(){ $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')';    }
+#line 2381 "smarty_internal_templateparser.php"
+#line 540 "smarty_internal_templateparser.y"
+    function yy_r168(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor;     }
+#line 2384 "smarty_internal_templateparser.php"
 #line 541 "smarty_internal_templateparser.y"
-    function yy_r192(){
-   $this->_retvalue = new _smarty_code($this, '$_smarty_tpl->getVariable(\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\')->value');
-   $this->compiler->tag_nocache = $this->compiler->tag_nocache | $this->template->getVariable(trim($this->yystack[$this->yyidx + 0]->minor,"'"), null, true, false)->nocache;
+    function yy_r169(){ return;     }
+#line 2387 "smarty_internal_templateparser.php"
+#line 542 "smarty_internal_templateparser.y"
+    function yy_r170(){ $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2390 "smarty_internal_templateparser.php"
+#line 543 "smarty_internal_templateparser.y"
+    function yy_r171(){ $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor;    }
+#line 2393 "smarty_internal_templateparser.php"
+#line 550 "smarty_internal_templateparser.y"
+    function yy_r173(){ $this->_retvalue = "''";     }
+#line 2396 "smarty_internal_templateparser.php"
+#line 551 "smarty_internal_templateparser.y"
+    function yy_r174(){ $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php();     }
+#line 2399 "smarty_internal_templateparser.php"
+#line 553 "smarty_internal_templateparser.y"
+    function yy_r175(){ $this->yystack[$this->yyidx + -1]->minor->append_subtree($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;     }
+#line 2402 "smarty_internal_templateparser.php"
+#line 554 "smarty_internal_templateparser.y"
+    function yy_r176(){ $this->_retvalue = new _smarty_doublequoted($this, $this->yystack[$this->yyidx + 0]->minor);     }
+#line 2405 "smarty_internal_templateparser.php"
+#line 556 "smarty_internal_templateparser.y"
+    function yy_r177(){ $this->_retvalue = new _smarty_code($this, $this->yystack[$this->yyidx + -1]->minor);     }
+#line 2408 "smarty_internal_templateparser.php"
+#line 558 "smarty_internal_templateparser.y"
+    function yy_r179(){if (isset($this->compiler->local_var["'".substr($this->yystack[$this->yyidx + 0]->minor,1)."'"])) {
+                                                       $this->_retvalue = new _smarty_code($this, '$_smarty_tpl->tpl_vars[\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\']->value');
+                                                      } else {
+                                                       $this->_retvalue = new _smarty_code($this, '$_smarty_tpl->getVariable(\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\')->value');
+                                                      }
+                                                      $this->compiler->tag_nocache = $this->compiler->tag_nocache | $this->template->getVariable(trim($this->yystack[$this->yyidx + 0]->minor,"'"), null, true, false)->nocache;
       }
-#line 2502 "smarty_internal_templateparser.php"
-#line 546 "smarty_internal_templateparser.y"
-    function yy_r194(){ $this->_retvalue = new _smarty_code($this, '('.$this->yystack[$this->yyidx + -1]->minor.')');     }
-#line 2505 "smarty_internal_templateparser.php"
-#line 547 "smarty_internal_templateparser.y"
-    function yy_r195(){
+#line 2417 "smarty_internal_templateparser.php"
+#line 566 "smarty_internal_templateparser.y"
+    function yy_r181(){ $this->_retvalue = new _smarty_code($this, '('.$this->yystack[$this->yyidx + -1]->minor.')');     }
+#line 2420 "smarty_internal_templateparser.php"
+#line 567 "smarty_internal_templateparser.y"
+    function yy_r182(){
    $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + 0]->minor);
       }
-#line 2510 "smarty_internal_templateparser.php"
-#line 550 "smarty_internal_templateparser.y"
-    function yy_r196(){ $this->_retvalue = new _smarty_dq_content($this, $this->yystack[$this->yyidx + 0]->minor);     }
-#line 2513 "smarty_internal_templateparser.php"
+#line 2425 "smarty_internal_templateparser.php"
+#line 570 "smarty_internal_templateparser.y"
+    function yy_r183(){ $this->_retvalue = new _smarty_dq_content($this, $this->yystack[$this->yyidx + 0]->minor);     }
+#line 2428 "smarty_internal_templateparser.php"
 
     private $_retvalue;
 
@@ -2572,12 +2487,12 @@ static public $yy_action = array(
 
     function yy_syntax_error($yymajor, $TOKEN)
     {
-#line 72 "smarty_internal_templateparser.y"
+#line 73 "smarty_internal_templateparser.y"
 
     $this->internalError = true;
     $this->yymajor = $yymajor;
     $this->compiler->trigger_template_error();
-#line 2576 "smarty_internal_templateparser.php"
+#line 2491 "smarty_internal_templateparser.php"
     }
 
     function yy_accept()
@@ -2588,13 +2503,13 @@ static public $yy_action = array(
         while ($this->yyidx >= 0) {
             $stack = $this->yy_pop_parser_stack();
         }
-#line 64 "smarty_internal_templateparser.y"
+#line 65 "smarty_internal_templateparser.y"
 
     $this->successful = !$this->internalError;
     $this->internalError = false;
     $this->retvalue = $this->_retvalue;
     //echo $this->retvalue."\n\n";
-#line 2594 "smarty_internal_templateparser.php"
+#line 2509 "smarty_internal_templateparser.php"
     }
 
     function doParse($yymajor, $yytokenvalue)
diff --git a/gosa-core/include/smarty/sysplugins/smarty_internal_utility.php b/gosa-core/include/smarty/sysplugins/smarty_internal_utility.php
index abf7e1b4e..9949e7a3c 100644
--- a/gosa-core/include/smarty/sysplugins/smarty_internal_utility.php
+++ b/gosa-core/include/smarty/sysplugins/smarty_internal_utility.php
@@ -1,66 +1,56 @@
 <?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 $
-*/
+ * 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 $
+ */
 
 class Smarty_Internal_Utility {
-  
     protected $smarty;
 
-    function __construct($smarty) {
-      $this->smarty = $smarty;
-    }
-    
+    function __construct($smarty)
+    {
+        $this->smarty = $smarty;
+    } 
+
     /**
-    * 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
-    */
+     * 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
+     */
     function compileAllTemplates($extention = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
-    {
-        function _get_time()
-        {
-            $_mtime = microtime();
-            $_mtime = explode(" ", $_mtime);
-            return (double)($_mtime[1]) + (double)($_mtime[0]);
-        } 
-        // set default directory
-        if ($dir_name === null) {
-            $dir_name = $this->smarty->template_dir;
-        } 
+    { 
         // switch off time limit
         if (function_exists('set_time_limit')) {
             @set_time_limit($time_limit);
@@ -79,20 +69,26 @@ class Smarty_Internal_Utility {
                 if ($_fileinfo->getPath() == substr($_dir, 0, -1)) {
                     $_template_file = $_file;
                 } else {
-                    $_template_file = substr($_fileinfo->getPath(), strlen($_dir)) . '\\' . $_file;
+                    $_template_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
                 } 
                 echo '<br>', $_dir, '---', $_template_file;
                 flush();
-                $_start_time = _get_time();
+                $_start_time = $this->_get_time();
                 try {
                     $_tpl = $this->smarty->createTemplate($_template_file);
-                    $_tpl->getCompiledTemplate();
+                    if ($_tpl->mustCompile()) {
+                        $_tpl->compileTemplateSource();
+                        echo ' compiled in  ', $this->_get_time() - $_start_time, ' seconds';
+                        flush();
+                    } else {
+                        echo ' is up to date';
+                        flush();
+                    } 
                 } 
                 catch (Exception $e) {
                     echo 'Error: ', $e->getMessage(), "<br><br>";
                     $_error_count++;
                 } 
-                echo ' done in  ', _get_time() - $_start_time, ' seconds';
                 if ($max_errors !== null && $_error_count == $max_errors) {
                     echo '<br><br>too many errors';
                     exit();
@@ -103,16 +99,74 @@ class Smarty_Internal_Utility {
     } 
 
     /**
-    * 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
-    */
+     * 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
+     */
+    function compileAllConfig($extention = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null)
+    { 
+        // switch off time limit
+        if (function_exists('set_time_limit')) {
+            @set_time_limit($time_limit);
+        } 
+        $this->smarty->force_compile = $force_compile;
+        $_count = 0;
+        $_error_count = 0; 
+        // loop over array of template directories
+        foreach((array)$this->smarty->config_dir as $_dir) {
+            $_compileDirs = new RecursiveDirectoryIterator($_dir);
+            $_compile = new RecursiveIteratorIterator($_compileDirs);
+            foreach ($_compile as $_fileinfo) {
+                if (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 = $this->_get_time();
+                try {
+                    $_config = new Smarty_Internal_Config($_config_file, $this->smarty);
+                    if ($_config->mustCompile()) {
+                        $_config->compileConfigSource();
+                        echo ' compiled in  ', $this->_get_time() - $_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
+     * @return integer number of template files deleted
+     */
     function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
     {
-        $_compile_id =  isset($compile_id) ? preg_replace('![^\w\|]+!','_',$compile_id) : null;
+        $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
         $_dir_sep = $this->smarty->use_sub_dirs ? DS : '^';
         if (isset($resource_name)) {
             $_resource_part_1 = $resource_name . '.php';
@@ -152,16 +206,16 @@ class Smarty_Internal_Utility {
             } 
         } 
         return $_count;
-    }
-    
+    } 
+
     function testInstall()
     {
         echo "<PRE>\n";
-    
+
         echo "Smarty Installation test...\n";
-    
+
         echo "Testing template directory...\n";
-    
+
         foreach((array)$this->smarty->template_dir as $template_dir) {
             if (!is_dir($template_dir))
                 echo "FAILED: $template_dir is not a directory.\n";
@@ -170,20 +224,20 @@ class Smarty_Internal_Utility {
             else
                 echo "$template_dir is OK.\n";
         } 
-    
+
         echo "Testing compile directory...\n";
-    
+
         if (!is_dir($this->smarty->compile_dir))
-            echo "FAILED: $this->smarty->compile_dir is not a directory.\n";
+            echo "FAILED: {$this->smarty->compile_dir} is not a directory.\n";
         elseif (!is_readable($this->smarty->compile_dir))
-            echo "FAILED: $this->smarty->compile_dir is not readable.\n";
+            echo "FAILED: {$this->smarty->compile_dir} is not readable.\n";
         elseif (!is_writable($this->smarty->compile_dir))
-            echo "FAILED: $this->smarty->compile_dir is not writable.\n";
+            echo "FAILED: {$this->smarty->compile_dir} is not writable.\n";
         else
             echo "{$this->smarty->compile_dir} is OK.\n";
-    
+
         echo "Testing plugins directory...\n";
-    
+
         foreach((array)$this->smarty->plugins_dir as $plugin_dir) {
             if (!is_dir($plugin_dir))
                 echo "FAILED: $plugin_dir is not a directory.\n";
@@ -192,32 +246,42 @@ class Smarty_Internal_Utility {
             else
                 echo "$plugin_dir is OK.\n";
         } 
-    
+
         echo "Testing cache directory...\n";
-    
+
         if (!is_dir($this->smarty->cache_dir))
-            echo "FAILED: $this->smarty->cache_dir is not a directory.\n";
+            echo "FAILED: {$this->smarty->cache_dir} is not a directory.\n";
         elseif (!is_readable($this->smarty->cache_dir))
-            echo "FAILED: $this->smarty->cache_dir is not readable.\n";
+            echo "FAILED: {$this->smarty->cache_dir} is not readable.\n";
         elseif (!is_writable($this->smarty->cache_dir))
-            echo "FAILED: $this->smarty->cache_dir is not writable.\n";
+            echo "FAILED: {$this->smarty->cache_dir} is not writable.\n";
         else
             echo "{$this->smarty->cache_dir} is OK.\n";
-    
+
         echo "Testing configs directory...\n";
-    
+
         if (!is_dir($this->smarty->config_dir))
-            echo "FAILED: $this->smarty->config_dir is not a directory.\n";
+            echo "FAILED: {$this->smarty->config_dir} is not a directory.\n";
         elseif (!is_readable($this->smarty->config_dir))
-            echo "FAILED: $this->smarty->config_dir is not readable.\n";
+            echo "FAILED: {$this->smarty->config_dir} is not readable.\n";
         else
             echo "{$this->smarty->config_dir} is OK.\n";
-    
+
         echo "Tests complete.\n";
-    
+
         echo "</PRE>\n";
-    
+
         return true;
     } 
-    
+    /**
+     * Get Micro Time
+     * 
+     * @return double micro time
+     */
+    function _get_time()
+    {
+        $_mtime = microtime();
+        $_mtime = explode(" ", $_mtime);
+        return (double)($_mtime[1]) + (double)($_mtime[0]);
+    } 
 }