YetiForceCompany / YetiForceCRM

libraries/Smarty/libs/sysplugins/smarty_internal_compile_block.php

Doc Comments +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
      * @param  \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
      * @param  array                                 $parameter array with compilation parameter
      *
-     * @return bool true
+     * @return boolean|null true
      */
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
@@ -158,7 +158,7 @@ 
      * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
      * @param  array                                $parameter array with compilation parameter
      *
-     * @return bool true
+     * @return string true
      */
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {

Indentation +208 added lines, -208 removed lines

@@ -15,134 +15,134 @@ 
  */
 class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inheritance
 {
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $required_attributes = array('name');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $shorttag_order = array('name');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $option_flags = array('hide', 'nocache');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $option_flags = array('hide', 'nocache');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('assign');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $optional_attributes = array('assign');
 
-    /**
-     * nesting level of block tags
-     *
-     * @var int
-     */
-    public static $blockTagNestingLevel = 0;
+	/**
+	 * nesting level of block tags
+	 *
+	 * @var int
+	 */
+	public static $blockTagNestingLevel = 0;
 
-    /**
-     * Saved compiler object
-     *
-     * @var Smarty_Internal_TemplateCompilerBase
-     */
-    public $compiler = null;
+	/**
+	 * Saved compiler object
+	 *
+	 * @var Smarty_Internal_TemplateCompilerBase
+	 */
+	public $compiler = null;
 
-    /**
-     * Compiles code for the {block} tag
-     *
-     * @param  array                                 $args      array with attributes from parser
-     * @param  \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                 $parameter array with compilation parameter
-     *
-     * @return bool true
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        if (!isset($compiler->_cache[ 'blockNesting' ])) {
-            $compiler->_cache[ 'blockNesting' ] = 0;
-        }
-        if ($compiler->_cache[ 'blockNesting' ] == 0) {
-            // make sure that inheritance gets initialized in template code
-            $this->registerInit($compiler);
-            $this->option_flags = array('hide', 'nocache', 'append', 'prepend');
-        } else {
-            $this->option_flags = array('hide', 'nocache');
-        }
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $compiler->_cache[ 'blockNesting' ] ++;
-        $compiler->_cache[ 'blockName' ][ $compiler->_cache[ 'blockNesting' ] ] = $_attr[ 'name' ];
-        $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ] = array();
-        $this->openTag($compiler, 'block', array($_attr, $compiler->nocache, $compiler->parser->current_buffer,
-                                                 $compiler->template->compiled->has_nocache_code,
-                                                 $compiler->template->caching));
-        // must whole block be nocache ?
-        if ($compiler->tag_nocache) {
-            $i = 0;
-        }
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        if ($_attr[ 'nocache' ] === true) {
+	/**
+	 * Compiles code for the {block} tag
+	 *
+	 * @param  array                                 $args      array with attributes from parser
+	 * @param  \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+	 * @param  array                                 $parameter array with compilation parameter
+	 *
+	 * @return bool true
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+	{
+		if (!isset($compiler->_cache[ 'blockNesting' ])) {
+			$compiler->_cache[ 'blockNesting' ] = 0;
+		}
+		if ($compiler->_cache[ 'blockNesting' ] == 0) {
+			// make sure that inheritance gets initialized in template code
+			$this->registerInit($compiler);
+			$this->option_flags = array('hide', 'nocache', 'append', 'prepend');
+		} else {
+			$this->option_flags = array('hide', 'nocache');
+		}
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		$compiler->_cache[ 'blockNesting' ] ++;
+		$compiler->_cache[ 'blockName' ][ $compiler->_cache[ 'blockNesting' ] ] = $_attr[ 'name' ];
+		$compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ] = array();
+		$this->openTag($compiler, 'block', array($_attr, $compiler->nocache, $compiler->parser->current_buffer,
+												 $compiler->template->compiled->has_nocache_code,
+												 $compiler->template->caching));
+		// must whole block be nocache ?
+		if ($compiler->tag_nocache) {
+			$i = 0;
+		}
+		$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+		if ($_attr[ 'nocache' ] === true) {
 
-        }
-        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
-        $compiler->template->compiled->has_nocache_code = false;
-        $compiler->suppressNocacheProcessing = true;
-    }
+		}
+		$compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+		$compiler->template->compiled->has_nocache_code = false;
+		$compiler->suppressNocacheProcessing = true;
+	}
 
-    /**
-     * Compile saved child block source
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase compiler object
-     * @param string                                $_name   optional name of child block
-     *
-     * @return string   compiled code of child block
-     */
-    static function compileChildBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
-    {
-        if (!isset($compiler->_cache[ 'blockNesting' ])) {
-            $compiler->trigger_template_error(' tag {$smarty.block.child} used outside {block} tags ',
-                                              $compiler->parser->lex->taglineno);
-        }
-        $compiler->has_code = true;
-        $compiler->suppressNocacheProcessing = true;
-        $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ][ 'callsChild' ] = 'true';
-        $output = "<?php \n\$_smarty_tpl->inheritance->callChild(\$_smarty_tpl, \$this);\n?>\n";
-        return $output;
-    }
+	/**
+	 * Compile saved child block source
+	 *
+	 * @param \Smarty_Internal_TemplateCompilerBase compiler object
+	 * @param string                                $_name   optional name of child block
+	 *
+	 * @return string   compiled code of child block
+	 */
+	static function compileChildBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
+	{
+		if (!isset($compiler->_cache[ 'blockNesting' ])) {
+			$compiler->trigger_template_error(' tag {$smarty.block.child} used outside {block} tags ',
+											  $compiler->parser->lex->taglineno);
+		}
+		$compiler->has_code = true;
+		$compiler->suppressNocacheProcessing = true;
+		$compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ][ 'callsChild' ] = 'true';
+		$output = "<?php \n\$_smarty_tpl->inheritance->callChild(\$_smarty_tpl, \$this);\n?>\n";
+		return $output;
+	}
 
-    /**
-     * Compile $smarty.block.parent
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     * @param string                                $_name    optional name of child block
-     *
-     * @return string   compiled code of child block
-     */
-    static function compileParentBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
-    {
-        if (!isset($compiler->_cache[ 'blockNesting' ])) {
-            $compiler->trigger_template_error(' tag {$smarty.block.parent} used outside {block} tags ',
-                                              $compiler->parser->lex->taglineno);
-        }
-        $compiler->suppressNocacheProcessing = true;
-        $compiler->has_code = true;
-        $output = "<?php \n\$_smarty_tpl->inheritance->callParent(\$_smarty_tpl, \$this);\n?>\n";
-        return $output;
-    }
+	/**
+	 * Compile $smarty.block.parent
+	 *
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+	 * @param string                                $_name    optional name of child block
+	 *
+	 * @return string   compiled code of child block
+	 */
+	static function compileParentBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
+	{
+		if (!isset($compiler->_cache[ 'blockNesting' ])) {
+			$compiler->trigger_template_error(' tag {$smarty.block.parent} used outside {block} tags ',
+											  $compiler->parser->lex->taglineno);
+		}
+		$compiler->suppressNocacheProcessing = true;
+		$compiler->has_code = true;
+		$output = "<?php \n\$_smarty_tpl->inheritance->callParent(\$_smarty_tpl, \$this);\n?>\n";
+		return $output;
+	}
 }
 
 /**
@@ -151,95 +151,95 @@ 
  */
 class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_Inheritance
 {
-    /**
-     * Compiles code for the {/block} tag
-     *
-     * @param  array                                $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                $parameter array with compilation parameter
-     *
-     * @return bool true
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        list($_attr, $_nocache, $_buffer, $_has_nocache_code, $_caching) = $this->closeTag($compiler, array('block'));
-        // init block parameter
-        $_block = $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ];
-        unset($compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ]);
-        $_name = $_attr[ 'name' ];
-        $_assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : null;
-        unset($_attr[ 'assign' ], $_attr[ 'name' ]);
-        foreach ($_attr as $name => $stat) {
-            if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat != 'false')) {
-                $_block[ $name ] = 'true';
-            }
-        }
-        $_className = 'Block_' . preg_replace('![^\w]+!', '_', uniqid(rand(), true));
-        // get compiled block code
-        $_functionCode = $compiler->parser->current_buffer;
-        // setup buffer for template function code
-        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+	/**
+	 * Compiles code for the {/block} tag
+	 *
+	 * @param  array                                $args      array with attributes from parser
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+	 * @param  array                                $parameter array with compilation parameter
+	 *
+	 * @return bool true
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+	{
+		list($_attr, $_nocache, $_buffer, $_has_nocache_code, $_caching) = $this->closeTag($compiler, array('block'));
+		// init block parameter
+		$_block = $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ];
+		unset($compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ]);
+		$_name = $_attr[ 'name' ];
+		$_assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : null;
+		unset($_attr[ 'assign' ], $_attr[ 'name' ]);
+		foreach ($_attr as $name => $stat) {
+			if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat != 'false')) {
+				$_block[ $name ] = 'true';
+			}
+		}
+		$_className = 'Block_' . preg_replace('![^\w]+!', '_', uniqid(rand(), true));
+		// get compiled block code
+		$_functionCode = $compiler->parser->current_buffer;
+		// setup buffer for template function code
+		$compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
 
-        $output = "<?php\n";
-        $output .= "/* {block {$_name}} */\n";
-        $output .= "class {$_className} extends Smarty_Internal_Block\n";
-        $output .= "{\n";
-        foreach ($_block as $property => $value) {
-            $output .= "public \${$property} = {$value};\n";
-        }
-        $output .= "public function callBlock(Smarty_Internal_Template \$_smarty_tpl) {\n";
-        if ($compiler->template->compiled->has_nocache_code) {
-            $output .= "\$_smarty_tpl->cached->hashes['{$compiler->template->compiled->nocache_hash}'] = true;\n";
-        }
-        if (isset($_assign)) {
-            $output .= "ob_start();\n";
-        }
-        $output .= "?>\n";
-        $compiler->parser->current_buffer->append_subtree($compiler->parser,
-                                                          new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                            $output));
-        $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
-        $output = "<?php\n";
-        if (isset($_assign)) {
-            $output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
-        }
-        $output .= "}\n";
-        $output .= "}\n";
-        $output .= "/* {/block {$_name}} */\n\n";
-        $output .= "?>\n";
-        $compiler->parser->current_buffer->append_subtree($compiler->parser,
-                                                          new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                            $output));
-        $compiler->blockOrFunctionCode .= $f = $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
-        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
-        // nocache plugins must be copied
-        if (!empty($compiler->template->compiled->required_plugins[ 'nocache' ])) {
-            foreach ($compiler->template->compiled->required_plugins[ 'nocache' ] as $plugin => $tmp) {
-                foreach ($tmp as $type => $data) {
-                    $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin ][ $type ] =
-                        $data;
-                }
-            }
-        }
+		$output = "<?php\n";
+		$output .= "/* {block {$_name}} */\n";
+		$output .= "class {$_className} extends Smarty_Internal_Block\n";
+		$output .= "{\n";
+		foreach ($_block as $property => $value) {
+			$output .= "public \${$property} = {$value};\n";
+		}
+		$output .= "public function callBlock(Smarty_Internal_Template \$_smarty_tpl) {\n";
+		if ($compiler->template->compiled->has_nocache_code) {
+			$output .= "\$_smarty_tpl->cached->hashes['{$compiler->template->compiled->nocache_hash}'] = true;\n";
+		}
+		if (isset($_assign)) {
+			$output .= "ob_start();\n";
+		}
+		$output .= "?>\n";
+		$compiler->parser->current_buffer->append_subtree($compiler->parser,
+														  new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																							$output));
+		$compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+		$output = "<?php\n";
+		if (isset($_assign)) {
+			$output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+		}
+		$output .= "}\n";
+		$output .= "}\n";
+		$output .= "/* {/block {$_name}} */\n\n";
+		$output .= "?>\n";
+		$compiler->parser->current_buffer->append_subtree($compiler->parser,
+														  new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																							$output));
+		$compiler->blockOrFunctionCode .= $f = $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+		$compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+		// nocache plugins must be copied
+		if (!empty($compiler->template->compiled->required_plugins[ 'nocache' ])) {
+			foreach ($compiler->template->compiled->required_plugins[ 'nocache' ] as $plugin => $tmp) {
+				foreach ($tmp as $type => $data) {
+					$compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin ][ $type ] =
+						$data;
+				}
+			}
+		}
 
-        // restore old status
-        $compiler->template->compiled->has_nocache_code = $_has_nocache_code;
-        $compiler->tag_nocache = $compiler->nocache;
-        $compiler->nocache = $_nocache;
-        $compiler->parser->current_buffer = $_buffer;
-        $output = "<?php \n";
-        if ($compiler->_cache[ 'blockNesting' ] == 1) {
-            $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name);\n";
-        } else {
-            $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name, \$this->tplIndex);\n";
-        }
-        $output .= "?>\n";
-        $compiler->_cache[ 'blockNesting' ] --;
-        if ($compiler->_cache[ 'blockNesting' ] == 0) {
-            unset($compiler->_cache[ 'blockNesting' ]);
-        }
-        $compiler->has_code = true;
-        $compiler->suppressNocacheProcessing = true;
-        return $output;
-    }
+		// restore old status
+		$compiler->template->compiled->has_nocache_code = $_has_nocache_code;
+		$compiler->tag_nocache = $compiler->nocache;
+		$compiler->nocache = $_nocache;
+		$compiler->parser->current_buffer = $_buffer;
+		$output = "<?php \n";
+		if ($compiler->_cache[ 'blockNesting' ] == 1) {
+			$output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name);\n";
+		} else {
+			$output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name, \$this->tplIndex);\n";
+		}
+		$output .= "?>\n";
+		$compiler->_cache[ 'blockNesting' ] --;
+		if ($compiler->_cache[ 'blockNesting' ] == 0) {
+			unset($compiler->_cache[ 'blockNesting' ]);
+		}
+		$compiler->has_code = true;
+		$compiler->suppressNocacheProcessing = true;
+		return $output;
+	}
 }

Spacing +23 added lines, -23 removed lines

@@ -72,10 +72,10 @@ 
      */
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        if (!isset($compiler->_cache[ 'blockNesting' ])) {
-            $compiler->_cache[ 'blockNesting' ] = 0;
+        if (!isset($compiler->_cache['blockNesting'])) {
+            $compiler->_cache['blockNesting'] = 0;
         }
-        if ($compiler->_cache[ 'blockNesting' ] == 0) {
+        if ($compiler->_cache['blockNesting'] == 0) {
             // make sure that inheritance gets initialized in template code
             $this->registerInit($compiler);
             $this->option_flags = array('hide', 'nocache', 'append', 'prepend');
@@ -84,9 +84,9 @@ 
         }
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-        $compiler->_cache[ 'blockNesting' ] ++;
-        $compiler->_cache[ 'blockName' ][ $compiler->_cache[ 'blockNesting' ] ] = $_attr[ 'name' ];
-        $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ] = array();
+        $compiler->_cache['blockNesting']++;
+        $compiler->_cache['blockName'][$compiler->_cache['blockNesting']] = $_attr['name'];
+        $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']] = array();
         $this->openTag($compiler, 'block', array($_attr, $compiler->nocache, $compiler->parser->current_buffer,
                                                  $compiler->template->compiled->has_nocache_code,
                                                  $compiler->template->caching));
@@ -95,7 +95,7 @@ 
             $i = 0;
         }
         $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        if ($_attr[ 'nocache' ] === true) {
+        if ($_attr['nocache'] === true) {
 
         }
         $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
@@ -113,13 +113,13 @@ 
      */
     static function compileChildBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
     {
-        if (!isset($compiler->_cache[ 'blockNesting' ])) {
+        if (!isset($compiler->_cache['blockNesting'])) {
             $compiler->trigger_template_error(' tag {$smarty.block.child} used outside {block} tags ',
                                               $compiler->parser->lex->taglineno);
         }
         $compiler->has_code = true;
         $compiler->suppressNocacheProcessing = true;
-        $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ][ 'callsChild' ] = 'true';
+        $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']]['callsChild'] = 'true';
         $output = "<?php \n\$_smarty_tpl->inheritance->callChild(\$_smarty_tpl, \$this);\n?>\n";
         return $output;
     }
@@ -134,7 +134,7 @@ 
      */
     static function compileParentBlock(Smarty_Internal_TemplateCompilerBase $compiler, $_name = null)
     {
-        if (!isset($compiler->_cache[ 'blockNesting' ])) {
+        if (!isset($compiler->_cache['blockNesting'])) {
             $compiler->trigger_template_error(' tag {$smarty.block.parent} used outside {block} tags ',
                                               $compiler->parser->lex->taglineno);
         }
@@ -164,14 +164,14 @@ 
     {
         list($_attr, $_nocache, $_buffer, $_has_nocache_code, $_caching) = $this->closeTag($compiler, array('block'));
         // init block parameter
-        $_block = $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ];
-        unset($compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ]);
-        $_name = $_attr[ 'name' ];
-        $_assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : null;
-        unset($_attr[ 'assign' ], $_attr[ 'name' ]);
+        $_block = $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']];
+        unset($compiler->_cache['blockParams'][$compiler->_cache['blockNesting']]);
+        $_name = $_attr['name'];
+        $_assign = isset($_attr['assign']) ? $_attr['assign'] : null;
+        unset($_attr['assign'], $_attr['name']);
         foreach ($_attr as $name => $stat) {
             if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat != 'false')) {
-                $_block[ $name ] = 'true';
+                $_block[$name] = 'true';
             }
         }
         $_className = 'Block_' . preg_replace('![^\w]+!', '_', uniqid(rand(), true));
@@ -213,10 +213,10 @@ 
         $compiler->blockOrFunctionCode .= $f = $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
         $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
         // nocache plugins must be copied
-        if (!empty($compiler->template->compiled->required_plugins[ 'nocache' ])) {
-            foreach ($compiler->template->compiled->required_plugins[ 'nocache' ] as $plugin => $tmp) {
+        if (!empty($compiler->template->compiled->required_plugins['nocache'])) {
+            foreach ($compiler->template->compiled->required_plugins['nocache'] as $plugin => $tmp) {
                 foreach ($tmp as $type => $data) {
-                    $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin ][ $type ] =
+                    $compiler->parent_compiler->template->compiled->required_plugins['compiled'][$plugin][$type] =
                         $data;
                 }
             }
@@ -228,15 +228,15 @@ 
         $compiler->nocache = $_nocache;
         $compiler->parser->current_buffer = $_buffer;
         $output = "<?php \n";
-        if ($compiler->_cache[ 'blockNesting' ] == 1) {
+        if ($compiler->_cache['blockNesting'] == 1) {
             $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name);\n";
         } else {
             $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name, \$this->tplIndex);\n";
         }
         $output .= "?>\n";
-        $compiler->_cache[ 'blockNesting' ] --;
-        if ($compiler->_cache[ 'blockNesting' ] == 0) {
-            unset($compiler->_cache[ 'blockNesting' ]);
+        $compiler->_cache['blockNesting']--;
+        if ($compiler->_cache['blockNesting'] == 0) {
+            unset($compiler->_cache['blockNesting']);
         }
         $compiler->has_code = true;
         $compiler->suppressNocacheProcessing = true;

libraries/Smarty/libs/sysplugins/smarty_internal_compile_extends.php

Doc Comments +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
     /**
      * Create source code for {extends} from source components array
      *
-     * @param []\Smarty_Internal_Template_Source $components
+     * @param Smarty_Template_Source[] $components
      *
      * @return string
      */

Indentation +108 added lines, -108 removed lines

@@ -17,118 +17,118 @@
  */
 class Smarty_Internal_Compile_Extends extends Smarty_Internal_Compile_Shared_Inheritance
 {
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('file');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $required_attributes = array('file');
 
-    /**
-     * Array of names of optional attribute required by tag
-     * use array('_any') if there is no restriction of attributes names
-     *
-     * @var array
-     */
-    public $optional_attributes = array('extends_resource');
+	/**
+	 * Array of names of optional attribute required by tag
+	 * use array('_any') if there is no restriction of attributes names
+	 *
+	 * @var array
+	 */
+	public $optional_attributes = array('extends_resource');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('file');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $shorttag_order = array('file');
 
-    /**
-     * Compiles code for the {extends} tag extends: resource
-     *
-     * @param array                                 $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     * @throws \SmartyCompilerException
-     * @throws \SmartyException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr[ 'nocache' ] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->parser->lex->line - 1);
-        }
-        if (strpos($_attr[ 'file' ], '$_tmp') !== false) {
-            $compiler->trigger_template_error('illegal value for file attribute', $compiler->parser->lex->line - 1);
-        }
-        // add code to initialize inheritance
-        $this->registerInit($compiler, true);
-        $file = trim($_attr[ 'file' ], '\'"');
-        if (strlen($file) > 8 && substr($file, 0, 8) == 'extends:') {
-            // generate code for each template
-            $files = array_reverse(explode('|', substr($file, 8)));
-            $i = 0;
-            foreach ($files as $file) {
-                if ($file[ 0 ] == '"') {
-                    $file = trim($file, '".');
-                } else {
-                    $file = "'{$file}'";
-                }
-                $i ++;
-                if ($i == count($files) && isset($_attr[ 'extends_resource' ])) {
-                    $this->compileEndChild($compiler);
-                }
-                $this->compileInclude($compiler, $file);
-            }
-            if (!isset($_attr[ 'extends_resource' ])) {
-                $this->compileEndChild($compiler);
-            }
-        } else {
-            $this->compileEndChild($compiler);
-            $this->compileInclude($compiler, $_attr[ 'file' ]);
-        }
-        $compiler->has_code = false;
-        return '';
-    }
+	/**
+	 * Compiles code for the {extends} tag extends: resource
+	 *
+	 * @param array                                 $args     array with attributes from parser
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \SmartyCompilerException
+	 * @throws \SmartyException
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		if ($_attr[ 'nocache' ] === true) {
+			$compiler->trigger_template_error('nocache option not allowed', $compiler->parser->lex->line - 1);
+		}
+		if (strpos($_attr[ 'file' ], '$_tmp') !== false) {
+			$compiler->trigger_template_error('illegal value for file attribute', $compiler->parser->lex->line - 1);
+		}
+		// add code to initialize inheritance
+		$this->registerInit($compiler, true);
+		$file = trim($_attr[ 'file' ], '\'"');
+		if (strlen($file) > 8 && substr($file, 0, 8) == 'extends:') {
+			// generate code for each template
+			$files = array_reverse(explode('|', substr($file, 8)));
+			$i = 0;
+			foreach ($files as $file) {
+				if ($file[ 0 ] == '"') {
+					$file = trim($file, '".');
+				} else {
+					$file = "'{$file}'";
+				}
+				$i ++;
+				if ($i == count($files) && isset($_attr[ 'extends_resource' ])) {
+					$this->compileEndChild($compiler);
+				}
+				$this->compileInclude($compiler, $file);
+			}
+			if (!isset($_attr[ 'extends_resource' ])) {
+				$this->compileEndChild($compiler);
+			}
+		} else {
+			$this->compileEndChild($compiler);
+			$this->compileInclude($compiler, $_attr[ 'file' ]);
+		}
+		$compiler->has_code = false;
+		return '';
+	}
 
-    /**
-     * Add code for inheritance endChild() method to end of template
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     */
-    private function compileEndChild(Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                  "<?php \$_smarty_tpl->inheritance->endChild();\n?>\n");
-    }
+	/**
+	 * Add code for inheritance endChild() method to end of template
+	 *
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler
+	 */
+	private function compileEndChild(Smarty_Internal_TemplateCompilerBase $compiler)
+	{
+		$compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																				  "<?php \$_smarty_tpl->inheritance->endChild();\n?>\n");
+	}
 
-    /**
-     * Add code for including subtemplate to end of template
-     *
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler
-     * @param  string                               $file subtemplate name
-     */
-    private function compileInclude(Smarty_Internal_TemplateCompilerBase $compiler, $file)
-    {
-        $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                  $compiler->compileTag('include',
-                                                                                                        array($file,
-                                                                                                              array('scope' => 'parent'))));
-    }
+	/**
+	 * Add code for including subtemplate to end of template
+	 *
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler
+	 * @param  string                               $file subtemplate name
+	 */
+	private function compileInclude(Smarty_Internal_TemplateCompilerBase $compiler, $file)
+	{
+		$compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																				  $compiler->compileTag('include',
+																										array($file,
+																											  array('scope' => 'parent'))));
+	}
 
-    /**
-     * Create source code for {extends} from source components array
-     *
-     * @param []\Smarty_Internal_Template_Source $components
-     *
-     * @return string
-     */
-    public static function extendsSourceArrayCode($components)
-    {
-        $resources = array();
-        foreach ($components as $source) {
-            $resources[] = $source->resource;
-        }
-        return '{extends file=\'extends:' . join('|', $resources) . '\' extends_resource=true}';
-    }
+	/**
+	 * Create source code for {extends} from source components array
+	 *
+	 * @param []\Smarty_Internal_Template_Source $components
+	 *
+	 * @return string
+	 */
+	public static function extendsSourceArrayCode($components)
+	{
+		$resources = array();
+		foreach ($components as $source) {
+			$resources[] = $source->resource;
+		}
+		return '{extends file=\'extends:' . join('|', $resources) . '\' extends_resource=true}';
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -55,37 +55,37 @@
     {
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr[ 'nocache' ] === true) {
+        if ($_attr['nocache'] === true) {
             $compiler->trigger_template_error('nocache option not allowed', $compiler->parser->lex->line - 1);
         }
-        if (strpos($_attr[ 'file' ], '$_tmp') !== false) {
+        if (strpos($_attr['file'], '$_tmp') !== false) {
             $compiler->trigger_template_error('illegal value for file attribute', $compiler->parser->lex->line - 1);
         }
         // add code to initialize inheritance
         $this->registerInit($compiler, true);
-        $file = trim($_attr[ 'file' ], '\'"');
+        $file = trim($_attr['file'], '\'"');
         if (strlen($file) > 8 && substr($file, 0, 8) == 'extends:') {
             // generate code for each template
             $files = array_reverse(explode('|', substr($file, 8)));
             $i = 0;
             foreach ($files as $file) {
-                if ($file[ 0 ] == '"') {
+                if ($file[0] == '"') {
                     $file = trim($file, '".');
                 } else {
                     $file = "'{$file}'";
                 }
-                $i ++;
-                if ($i == count($files) && isset($_attr[ 'extends_resource' ])) {
+                $i++;
+                if ($i == count($files) && isset($_attr['extends_resource'])) {
                     $this->compileEndChild($compiler);
                 }
                 $this->compileInclude($compiler, $file);
             }
-            if (!isset($_attr[ 'extends_resource' ])) {
+            if (!isset($_attr['extends_resource'])) {
                 $this->compileEndChild($compiler);
             }
         } else {
             $this->compileEndChild($compiler);
-            $this->compileInclude($compiler, $_attr[ 'file' ]);
+            $this->compileInclude($compiler, $_attr['file']);
         }
         $compiler->has_code = false;
         return '';

libraries/Smarty/libs/sysplugins/smarty_internal_compile_function.php

Doc Comments +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
      * Compiles code for the {/function} tag
      *
      * @param  array                                       $args      array with attributes from parser
-     * @param object|\Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param Smarty_Internal_TemplateCompilerBase $compiler  compiler object
      * @param  array                                       $parameter array with compilation parameter
      *
      * @return bool true

Spacing +18 added lines, -18 removed lines

@@ -56,12 +56,12 @@ 
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
 
-        if ($_attr[ 'nocache' ] === true) {
+        if ($_attr['nocache'] === true) {
             $compiler->trigger_template_error('nocache option not allowed', null, true);
         }
-        unset($_attr[ 'nocache' ]);
-        $_name = trim($_attr[ 'name' ], "'\"");
-        $compiler->parent_compiler->tpl_function[ $_name ] = array();
+        unset($_attr['nocache']);
+        $_name = trim($_attr['name'], "'\"");
+        $compiler->parent_compiler->tpl_function[$_name] = array();
         $save = array($_attr, $compiler->parser->current_buffer, $compiler->template->compiled->has_nocache_code,
                       $compiler->template->caching);
         $this->openTag($compiler, 'function', $save);
@@ -101,13 +101,13 @@ 
     {
         $this->compiler = $compiler;
         $saved_data = $this->closeTag($compiler, array('function'));
-        $_attr = $saved_data[ 0 ];
-        $_name = trim($_attr[ 'name' ], "'\"");
-        $compiler->parent_compiler->tpl_function[ $_name ][ 'compiled_filepath' ] =
+        $_attr = $saved_data[0];
+        $_name = trim($_attr['name'], "'\"");
+        $compiler->parent_compiler->tpl_function[$_name]['compiled_filepath'] =
             $compiler->parent_compiler->template->compiled->filepath;
-        $compiler->parent_compiler->tpl_function[ $_name ][ 'uid' ] = $compiler->template->source->uid;
+        $compiler->parent_compiler->tpl_function[$_name]['uid'] = $compiler->template->source->uid;
         $_parameter = $_attr;
-        unset($_parameter[ 'name' ]);
+        unset($_parameter['name']);
         // default parameter
         $_paramsArray = array();
         foreach ($_parameter as $_key => $_value) {
@@ -130,7 +130,7 @@ 
         $_funcName = "smarty_template_function_{$_name}_{$compiler->template->compiled->nocache_hash}";
         $_funcNameCaching = $_funcName . '_nocache';
         if ($compiler->template->compiled->has_nocache_code) {
-            $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name_caching' ] = $_funcNameCaching;
+            $compiler->parent_compiler->tpl_function[$_name]['call_name_caching'] = $_funcNameCaching;
             $output = "<?php\n";
             $output .= "/* {$_funcNameCaching} */\n";
             $output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
@@ -162,7 +162,7 @@ 
                                                                                      array($this, 'removeNocache'),
                                                                                      $_functionCode->to_smarty_php($compiler->parser)));
         }
-        $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name' ] = $_funcName;
+        $compiler->parent_compiler->tpl_function[$_name]['call_name'] = $_funcName;
         $output = "<?php\n";
         $output .= "/* {$_funcName} */\n";
         $output .= "if (!function_exists('{$_funcName}')) {\n";
@@ -181,20 +181,20 @@ 
                                                                                             $output));
         $compiler->parent_compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
         // nocache plugins must be copied
-        if (!empty($compiler->template->compiled->required_plugins[ 'nocache' ])) {
-            foreach ($compiler->template->compiled->required_plugins[ 'nocache' ] as $plugin => $tmp) {
+        if (!empty($compiler->template->compiled->required_plugins['nocache'])) {
+            foreach ($compiler->template->compiled->required_plugins['nocache'] as $plugin => $tmp) {
                 foreach ($tmp as $type => $data) {
-                    $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin ][ $type ] =
+                    $compiler->parent_compiler->template->compiled->required_plugins['compiled'][$plugin][$type] =
                         $data;
                 }
             }
         }
         // restore old buffer
 
-        $compiler->parser->current_buffer = $saved_data[ 1 ];
+        $compiler->parser->current_buffer = $saved_data[1];
         // restore old status
-        $compiler->template->compiled->has_nocache_code = $saved_data[ 2 ];
-        $compiler->template->caching = $saved_data[ 3 ];
+        $compiler->template->compiled->has_nocache_code = $saved_data[2];
+        $compiler->template->caching = $saved_data[3];
         return true;
     }
 
@@ -209,7 +209,7 @@ 
     {
         $code =
             preg_replace("/((<\?php )?echo '\/\*%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/)|(\/\*\/%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
-                         '', $match[ 0 ]);
+                         '', $match[0]);
         $code = str_replace(array('\\\'', '\\\\\''), array('\'', '\\\''), $code);
         return $code;
     }

Indentation +177 added lines, -177 removed lines

@@ -17,59 +17,59 @@ 
 class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
 {
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $required_attributes = array('name');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $shorttag_order = array('name');
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $optional_attributes = array('_any');
 
-    /**
-     * Compiles code for the {function} tag
-     *
-     * @param  array                                $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                $parameter array with compilation parameter
-     *
-     * @return bool true
-     * @throws \SmartyCompilerException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
+	/**
+	 * Compiles code for the {function} tag
+	 *
+	 * @param  array                                $args      array with attributes from parser
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+	 * @param  array                                $parameter array with compilation parameter
+	 *
+	 * @return bool true
+	 * @throws \SmartyCompilerException
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
 
-        if ($_attr[ 'nocache' ] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', null, true);
-        }
-        unset($_attr[ 'nocache' ]);
-        $_name = trim($_attr[ 'name' ], "'\"");
-        $compiler->parent_compiler->tpl_function[ $_name ] = array();
-        $save = array($_attr, $compiler->parser->current_buffer, $compiler->template->compiled->has_nocache_code,
-                      $compiler->template->caching);
-        $this->openTag($compiler, 'function', $save);
-        // Init temporary context
-        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
-        $compiler->template->compiled->has_nocache_code = false;
-        return true;
-    }
+		if ($_attr[ 'nocache' ] === true) {
+			$compiler->trigger_template_error('nocache option not allowed', null, true);
+		}
+		unset($_attr[ 'nocache' ]);
+		$_name = trim($_attr[ 'name' ], "'\"");
+		$compiler->parent_compiler->tpl_function[ $_name ] = array();
+		$save = array($_attr, $compiler->parser->current_buffer, $compiler->template->compiled->has_nocache_code,
+					  $compiler->template->caching);
+		$this->openTag($compiler, 'function', $save);
+		// Init temporary context
+		$compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+		$compiler->template->compiled->has_nocache_code = false;
+		return true;
+	}
 }
 
 /**
@@ -81,136 +81,136 @@ 
 class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
 {
 
-    /**
-     * Compiler object
-     *
-     * @var object
-     */
-    private $compiler = null;
+	/**
+	 * Compiler object
+	 *
+	 * @var object
+	 */
+	private $compiler = null;
 
-    /**
-     * Compiles code for the {/function} tag
-     *
-     * @param  array                                       $args      array with attributes from parser
-     * @param object|\Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                       $parameter array with compilation parameter
-     *
-     * @return bool true
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        $this->compiler = $compiler;
-        $saved_data = $this->closeTag($compiler, array('function'));
-        $_attr = $saved_data[ 0 ];
-        $_name = trim($_attr[ 'name' ], "'\"");
-        $compiler->parent_compiler->tpl_function[ $_name ][ 'compiled_filepath' ] =
-            $compiler->parent_compiler->template->compiled->filepath;
-        $compiler->parent_compiler->tpl_function[ $_name ][ 'uid' ] = $compiler->template->source->uid;
-        $_parameter = $_attr;
-        unset($_parameter[ 'name' ]);
-        // default parameter
-        $_paramsArray = array();
-        foreach ($_parameter as $_key => $_value) {
-            if (is_int($_key)) {
-                $_paramsArray[] = "$_key=>$_value";
-            } else {
-                $_paramsArray[] = "'$_key'=>$_value";
-            }
-        }
-        if (!empty($_paramsArray)) {
-            $_params = 'array(' . implode(",", $_paramsArray) . ')';
-            $_paramsCode = "\$params = array_merge($_params, \$params);\n";
-        } else {
-            $_paramsCode = '';
-        }
-        $_functionCode = $compiler->parser->current_buffer;
-        // setup buffer for template function code
-        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+	/**
+	 * Compiles code for the {/function} tag
+	 *
+	 * @param  array                                       $args      array with attributes from parser
+	 * @param object|\Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+	 * @param  array                                       $parameter array with compilation parameter
+	 *
+	 * @return bool true
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+	{
+		$this->compiler = $compiler;
+		$saved_data = $this->closeTag($compiler, array('function'));
+		$_attr = $saved_data[ 0 ];
+		$_name = trim($_attr[ 'name' ], "'\"");
+		$compiler->parent_compiler->tpl_function[ $_name ][ 'compiled_filepath' ] =
+			$compiler->parent_compiler->template->compiled->filepath;
+		$compiler->parent_compiler->tpl_function[ $_name ][ 'uid' ] = $compiler->template->source->uid;
+		$_parameter = $_attr;
+		unset($_parameter[ 'name' ]);
+		// default parameter
+		$_paramsArray = array();
+		foreach ($_parameter as $_key => $_value) {
+			if (is_int($_key)) {
+				$_paramsArray[] = "$_key=>$_value";
+			} else {
+				$_paramsArray[] = "'$_key'=>$_value";
+			}
+		}
+		if (!empty($_paramsArray)) {
+			$_params = 'array(' . implode(",", $_paramsArray) . ')';
+			$_paramsCode = "\$params = array_merge($_params, \$params);\n";
+		} else {
+			$_paramsCode = '';
+		}
+		$_functionCode = $compiler->parser->current_buffer;
+		// setup buffer for template function code
+		$compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
 
-        $_funcName = "smarty_template_function_{$_name}_{$compiler->template->compiled->nocache_hash}";
-        $_funcNameCaching = $_funcName . '_nocache';
-        if ($compiler->template->compiled->has_nocache_code) {
-            $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name_caching' ] = $_funcNameCaching;
-            $output = "<?php\n";
-            $output .= "/* {$_funcNameCaching} */\n";
-            $output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
-            $output .= "function {$_funcNameCaching} (\$_smarty_tpl,\$params) {\n";
-            $output .= "ob_start();\n";
-            $output .= "\$_smarty_tpl->compiled->has_nocache_code = true;\n";
-            $output .= $_paramsCode;
-            $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}";
-            $output .= "\$params = var_export(\$params, true);\n";
-            $output .= "echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
-            $output .= "\\\$_smarty_tpl->ext->_tplFunction->saveTemplateVariables(\\\$_smarty_tpl, '{$_name}');\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->tpl_vars[\\\$key] = new Smarty_Variable(\\\$value, \\\$_smarty_tpl->isRenderingCache);\n}\n?>";
-            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\n\";?>";
-            $compiler->parser->current_buffer->append_subtree($compiler->parser,
-                                                              new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                                $output));
-            $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
-            $output = "<?php echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
-            $output .= "\\\$_smarty_tpl->ext->_tplFunction->restoreTemplateVariables(\\\$_smarty_tpl, '{$_name}');?>\n";
-            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";\n?>";
-            $output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash, ob_get_clean());\n";
-            $output .= "}\n}\n";
-            $output .= "/*/ {$_funcName}_nocache */\n\n";
-            $output .= "?>\n";
-            $compiler->parser->current_buffer->append_subtree($compiler->parser,
-                                                              new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                                $output));
-            $_functionCode = new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                               preg_replace_callback("/((<\?php )?echo '\/\*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/([\S\s]*?)\/\*\/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
-                                                                                     array($this, 'removeNocache'),
-                                                                                     $_functionCode->to_smarty_php($compiler->parser)));
-        }
-        $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name' ] = $_funcName;
-        $output = "<?php\n";
-        $output .= "/* {$_funcName} */\n";
-        $output .= "if (!function_exists('{$_funcName}')) {\n";
-        $output .= "function {$_funcName}(\$_smarty_tpl,\$params) {\n";
-        $output .= $_paramsCode;
-        $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}?>";
-        $compiler->parser->current_buffer->append_subtree($compiler->parser,
-                                                          new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                            $output));
-        $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
-        $output = "<?php\n}}\n";
-        $output .= "/*/ {$_funcName} */\n\n";
-        $output .= "?>\n";
-        $compiler->parser->current_buffer->append_subtree($compiler->parser,
-                                                          new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                            $output));
-        $compiler->parent_compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
-        // nocache plugins must be copied
-        if (!empty($compiler->template->compiled->required_plugins[ 'nocache' ])) {
-            foreach ($compiler->template->compiled->required_plugins[ 'nocache' ] as $plugin => $tmp) {
-                foreach ($tmp as $type => $data) {
-                    $compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin ][ $type ] =
-                        $data;
-                }
-            }
-        }
-        // restore old buffer
+		$_funcName = "smarty_template_function_{$_name}_{$compiler->template->compiled->nocache_hash}";
+		$_funcNameCaching = $_funcName . '_nocache';
+		if ($compiler->template->compiled->has_nocache_code) {
+			$compiler->parent_compiler->tpl_function[ $_name ][ 'call_name_caching' ] = $_funcNameCaching;
+			$output = "<?php\n";
+			$output .= "/* {$_funcNameCaching} */\n";
+			$output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
+			$output .= "function {$_funcNameCaching} (\$_smarty_tpl,\$params) {\n";
+			$output .= "ob_start();\n";
+			$output .= "\$_smarty_tpl->compiled->has_nocache_code = true;\n";
+			$output .= $_paramsCode;
+			$output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}";
+			$output .= "\$params = var_export(\$params, true);\n";
+			$output .= "echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
+			$output .= "\\\$_smarty_tpl->ext->_tplFunction->saveTemplateVariables(\\\$_smarty_tpl, '{$_name}');\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->tpl_vars[\\\$key] = new Smarty_Variable(\\\$value, \\\$_smarty_tpl->isRenderingCache);\n}\n?>";
+			$output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\n\";?>";
+			$compiler->parser->current_buffer->append_subtree($compiler->parser,
+															  new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																								$output));
+			$compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+			$output = "<?php echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
+			$output .= "\\\$_smarty_tpl->ext->_tplFunction->restoreTemplateVariables(\\\$_smarty_tpl, '{$_name}');?>\n";
+			$output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";\n?>";
+			$output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash, ob_get_clean());\n";
+			$output .= "}\n}\n";
+			$output .= "/*/ {$_funcName}_nocache */\n\n";
+			$output .= "?>\n";
+			$compiler->parser->current_buffer->append_subtree($compiler->parser,
+															  new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																								$output));
+			$_functionCode = new Smarty_Internal_ParseTree_Tag($compiler->parser,
+															   preg_replace_callback("/((<\?php )?echo '\/\*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/([\S\s]*?)\/\*\/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
+																					 array($this, 'removeNocache'),
+																					 $_functionCode->to_smarty_php($compiler->parser)));
+		}
+		$compiler->parent_compiler->tpl_function[ $_name ][ 'call_name' ] = $_funcName;
+		$output = "<?php\n";
+		$output .= "/* {$_funcName} */\n";
+		$output .= "if (!function_exists('{$_funcName}')) {\n";
+		$output .= "function {$_funcName}(\$_smarty_tpl,\$params) {\n";
+		$output .= $_paramsCode;
+		$output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}?>";
+		$compiler->parser->current_buffer->append_subtree($compiler->parser,
+														  new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																							$output));
+		$compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+		$output = "<?php\n}}\n";
+		$output .= "/*/ {$_funcName} */\n\n";
+		$output .= "?>\n";
+		$compiler->parser->current_buffer->append_subtree($compiler->parser,
+														  new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																							$output));
+		$compiler->parent_compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+		// nocache plugins must be copied
+		if (!empty($compiler->template->compiled->required_plugins[ 'nocache' ])) {
+			foreach ($compiler->template->compiled->required_plugins[ 'nocache' ] as $plugin => $tmp) {
+				foreach ($tmp as $type => $data) {
+					$compiler->parent_compiler->template->compiled->required_plugins[ 'compiled' ][ $plugin ][ $type ] =
+						$data;
+				}
+			}
+		}
+		// restore old buffer
 
-        $compiler->parser->current_buffer = $saved_data[ 1 ];
-        // restore old status
-        $compiler->template->compiled->has_nocache_code = $saved_data[ 2 ];
-        $compiler->template->caching = $saved_data[ 3 ];
-        return true;
-    }
+		$compiler->parser->current_buffer = $saved_data[ 1 ];
+		// restore old status
+		$compiler->template->compiled->has_nocache_code = $saved_data[ 2 ];
+		$compiler->template->caching = $saved_data[ 3 ];
+		return true;
+	}
 
-    /**
-     * Remove nocache code
-     * 
-     * @param $match
-     *
-     * @return string
-     */
-    public function removeNocache($match)
-    {
-        $code =
-            preg_replace("/((<\?php )?echo '\/\*%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/)|(\/\*\/%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
-                         '', $match[ 0 ]);
-        $code = str_replace(array('\\\'', '\\\\\''), array('\'', '\\\''), $code);
-        return $code;
-    }
+	/**
+	 * Remove nocache code
+	 * 
+	 * @param $match
+	 *
+	 * @return string
+	 */
+	public function removeNocache($match)
+	{
+		$code =
+			preg_replace("/((<\?php )?echo '\/\*%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/)|(\/\*\/%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
+						 '', $match[ 0 ]);
+		$code = str_replace(array('\\\'', '\\\\\''), array('\'', '\\\''), $code);
+		return $code;
+	}
 }

libraries/Smarty/libs/sysplugins/smarty_internal_compile_private_php.php

Doc Comments +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
      *
      * This code has been moved from lexer here fo easier debugging and maintenance
      *
-     * @param $lex
+     * @param Smarty_Internal_Templatelexer $lex
      */
     public function parsePhp($lex)
     {

Indentation +194 added lines, -194 removed lines

@@ -17,204 +17,204 @@
 class Smarty_Internal_Compile_Private_Php extends Smarty_Internal_CompileBase
 {
 
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('code', 'type');
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $required_attributes = array('code', 'type');
 
-    /**
-     * Compiles code for generating output from any expression
-     *
-     * @param array                                 $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param array                                 $parameter array with compilation parameter
-     *
-     * @return string
-     * @throws \SmartyException
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $compiler->has_code = false;
-        if ($_attr[ 'type' ] == 'xml') {
-            $compiler->tag_nocache = true;
-            $save = $compiler->template->compiled->has_nocache_code;
-            $output = addcslashes($_attr[ 'code' ], "'\\");
-            $compiler->parser->current_buffer->append_subtree($compiler->parser,
-                                                              new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                                $compiler->processNocacheCode("<?php echo '" .
-                                                                                                                              $output .
-                                                                                                                              "';?>",
-                                                                                                                              true)));
-            $compiler->template->compiled->has_nocache_code = $save;
-            return '';
-        }
-        if ($_attr[ 'type' ] != 'tag') {
-            if ($compiler->php_handling == Smarty::PHP_REMOVE) {
-                return '';
-            } elseif ($compiler->php_handling == Smarty::PHP_QUOTE) {
-                $output =
-                    preg_replace_callback('#(<\?(?:php|=)?)|(<%)|(<script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*>)|(\?>)|(%>)|(<\/script>)#i',
-                                          array($this, 'quote'), $_attr[ 'code' ]);
-                $compiler->parser->current_buffer->append_subtree($compiler->parser,
-                                                                  new Smarty_Internal_ParseTree_Text($output));
-                return '';
-            } elseif ($compiler->php_handling == Smarty::PHP_PASSTHRU || $_attr[ 'type' ] == 'unmatched') {
-                $compiler->tag_nocache = true;
-                $save = $compiler->template->compiled->has_nocache_code;
-                $output = addcslashes($_attr[ 'code' ], "'\\");
-                $compiler->parser->current_buffer->append_subtree($compiler->parser,
-                                                                  new Smarty_Internal_ParseTree_Tag($compiler->parser,
-                                                                                                    $compiler->processNocacheCode("<?php echo '" .
-                                                                                                                                  $output .
-                                                                                                                                  "';?>",
-                                                                                                                                  true)));
-                $compiler->template->compiled->has_nocache_code = $save;
-                return '';
-            } elseif ($compiler->php_handling == Smarty::PHP_ALLOW) {
-                if (!($compiler->smarty instanceof SmartyBC)) {
-                    $compiler->trigger_template_error('$smarty->php_handling PHP_ALLOW not allowed. Use SmartyBC to enable it',
-                                                      null, true);
-                }
-                $compiler->has_code = true;
-                return $_attr[ 'code' ];
-            } else {
-                $compiler->trigger_template_error('Illegal $smarty->php_handling value', null, true);
-            }
-        } else {
-            $compiler->has_code = true;
-            if (!($compiler->smarty instanceof SmartyBC)) {
-                $compiler->trigger_template_error('{php}{/php} tags not allowed. Use SmartyBC to enable them', null,
-                                                  true);
-            }
-            $ldel = preg_quote($compiler->smarty->left_delimiter, '#');
-            $rdel = preg_quote($compiler->smarty->right_delimiter, '#');
-            preg_match("#^({$ldel}php\\s*)((.)*?)({$rdel})#", $_attr[ 'code' ], $match);
-            if (!empty($match[ 2 ])) {
-                if ('nocache' == trim($match[ 2 ])) {
-                    $compiler->tag_nocache = true;
-                } else {
-                    $compiler->trigger_template_error("illegal value of option flag \"{$match[2]}\"", null, true);
-                }
-            }
-            return preg_replace(array("#^{$ldel}\\s*php\\s*(.)*?{$rdel}#", "#{$ldel}\\s*/\\s*php\\s*{$rdel}$#"),
-                                array('<?php ', '?>'), $_attr[ 'code' ]);
-        }
-    }
+	/**
+	 * Compiles code for generating output from any expression
+	 *
+	 * @param array                                 $args      array with attributes from parser
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+	 * @param array                                 $parameter array with compilation parameter
+	 *
+	 * @return string
+	 * @throws \SmartyException
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		$compiler->has_code = false;
+		if ($_attr[ 'type' ] == 'xml') {
+			$compiler->tag_nocache = true;
+			$save = $compiler->template->compiled->has_nocache_code;
+			$output = addcslashes($_attr[ 'code' ], "'\\");
+			$compiler->parser->current_buffer->append_subtree($compiler->parser,
+															  new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																								$compiler->processNocacheCode("<?php echo '" .
+																															  $output .
+																															  "';?>",
+																															  true)));
+			$compiler->template->compiled->has_nocache_code = $save;
+			return '';
+		}
+		if ($_attr[ 'type' ] != 'tag') {
+			if ($compiler->php_handling == Smarty::PHP_REMOVE) {
+				return '';
+			} elseif ($compiler->php_handling == Smarty::PHP_QUOTE) {
+				$output =
+					preg_replace_callback('#(<\?(?:php|=)?)|(<%)|(<script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*>)|(\?>)|(%>)|(<\/script>)#i',
+										  array($this, 'quote'), $_attr[ 'code' ]);
+				$compiler->parser->current_buffer->append_subtree($compiler->parser,
+																  new Smarty_Internal_ParseTree_Text($output));
+				return '';
+			} elseif ($compiler->php_handling == Smarty::PHP_PASSTHRU || $_attr[ 'type' ] == 'unmatched') {
+				$compiler->tag_nocache = true;
+				$save = $compiler->template->compiled->has_nocache_code;
+				$output = addcslashes($_attr[ 'code' ], "'\\");
+				$compiler->parser->current_buffer->append_subtree($compiler->parser,
+																  new Smarty_Internal_ParseTree_Tag($compiler->parser,
+																									$compiler->processNocacheCode("<?php echo '" .
+																																  $output .
+																																  "';?>",
+																																  true)));
+				$compiler->template->compiled->has_nocache_code = $save;
+				return '';
+			} elseif ($compiler->php_handling == Smarty::PHP_ALLOW) {
+				if (!($compiler->smarty instanceof SmartyBC)) {
+					$compiler->trigger_template_error('$smarty->php_handling PHP_ALLOW not allowed. Use SmartyBC to enable it',
+													  null, true);
+				}
+				$compiler->has_code = true;
+				return $_attr[ 'code' ];
+			} else {
+				$compiler->trigger_template_error('Illegal $smarty->php_handling value', null, true);
+			}
+		} else {
+			$compiler->has_code = true;
+			if (!($compiler->smarty instanceof SmartyBC)) {
+				$compiler->trigger_template_error('{php}{/php} tags not allowed. Use SmartyBC to enable them', null,
+												  true);
+			}
+			$ldel = preg_quote($compiler->smarty->left_delimiter, '#');
+			$rdel = preg_quote($compiler->smarty->right_delimiter, '#');
+			preg_match("#^({$ldel}php\\s*)((.)*?)({$rdel})#", $_attr[ 'code' ], $match);
+			if (!empty($match[ 2 ])) {
+				if ('nocache' == trim($match[ 2 ])) {
+					$compiler->tag_nocache = true;
+				} else {
+					$compiler->trigger_template_error("illegal value of option flag \"{$match[2]}\"", null, true);
+				}
+			}
+			return preg_replace(array("#^{$ldel}\\s*php\\s*(.)*?{$rdel}#", "#{$ldel}\\s*/\\s*php\\s*{$rdel}$#"),
+								array('<?php ', '?>'), $_attr[ 'code' ]);
+		}
+	}
 
-    /**
-     * Lexer code for PHP tags
-     *
-     * This code has been moved from lexer here fo easier debugging and maintenance
-     *
-     * @param $lex
-     */
-    public function parsePhp($lex)
-    {
-        $lex->token = Smarty_Internal_Templateparser::TP_PHP;
-        $close = 0;
-        $lex->taglineno = $lex->line;
-        $closeTag = '?>';
-        if (strpos($lex->value, '<?xml') === 0) {
-            $lex->is_xml = true;
-            $lex->token = Smarty_Internal_Templateparser::TP_NOCACHE;
-            return;
-        } elseif (strpos($lex->value, '<?') === 0) {
-            $lex->phpType = 'php';
-        } elseif (strpos($lex->value, '<%') === 0) {
-            $lex->phpType = 'asp';
-            $closeTag = '%>';
-        } elseif (strpos($lex->value, '%>') === 0) {
-            $lex->phpType = 'unmatched';
-        } elseif (strpos($lex->value, '?>') === 0) {
-            if ($lex->is_xml) {
-                $lex->is_xml = false;
-                $lex->token = Smarty_Internal_Templateparser::TP_NOCACHE;
-                return;
-            }
-            $lex->phpType = 'unmatched';
-        } elseif (strpos($lex->value, '<s') === 0) {
-            $lex->phpType = 'script';
-            $closeTag = '</script>';
-        } elseif (strpos($lex->value, $lex->smarty->left_delimiter) === 0) {
-            if ($lex->isAutoLiteral()) {
-                $lex->token = Smarty_Internal_Templateparser::TP_TEXT;
-                return;
-            }
-            $closeTag = "{$lex->smarty->left_delimiter}/php{$lex->smarty->right_delimiter}";
-            if ($lex->value == $closeTag) {
-                $lex->compiler->trigger_template_error("unexpected closing tag '{$closeTag}'");
-            }
-            $lex->phpType = 'tag';
-        }
-        if ($lex->phpType == 'unmatched') {
-            return;
-        }
-        if (($lex->phpType == 'php' || $lex->phpType == 'asp') &&
-            ($lex->compiler->php_handling == Smarty::PHP_PASSTHRU || $lex->compiler->php_handling == Smarty::PHP_QUOTE)
-        ) {
-            return;
-        }
-        $start = $lex->counter + strlen($lex->value);
-        $body = true;
-        if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
-            $close = $match[ 0 ][ 1 ];
-        } else {
-            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
-        }
-        while ($body) {
-            if (preg_match('~([/][*])|([/][/][^\n]*)|(\'[^\'\\\\]*(?:\\.[^\'\\\\]*)*\')|("[^"\\\\]*(?:\\.[^"\\\\]*)*")~',
-                           $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
-                $value = $match[ 0 ][ 0 ];
-                $from = $pos = $match[ 0 ][ 1 ];
-                if ($pos > $close) {
-                    $body = false;
-                } else {
-                    $start = $pos + strlen($value);
-                    $phpCommentStart = $value == '/*';
-                    if ($phpCommentStart) {
-                        $phpCommentEnd = preg_match('~([*][/])~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start);
-                        if ($phpCommentEnd) {
-                            $pos2 = $match[ 0 ][ 1 ];
-                            $start = $pos2 + strlen($match[ 0 ][ 0 ]);
-                        }
-                    }
-                    while ($close > $pos && $close < $start) {
-                        if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE,
-                                       $from)) {
-                            $close = $match[ 0 ][ 1 ];
-                            $from = $close + strlen($match[ 0 ][ 0 ]);
-                        } else {
-                            $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
-                        }
-                    }
-                    if ($phpCommentStart && (!$phpCommentEnd || $pos2 > $close)) {
-                        $lex->taglineno = $lex->line + substr_count(substr($lex->data, $lex->counter, $start), "\n");
-                        $lex->compiler->trigger_template_error("missing PHP comment closing tag '*/'");
-                    }
-                }
-            } else {
-                $body = false;
-            }
-        }
-        $lex->value = substr($lex->data, $lex->counter, $close + strlen($closeTag) - $lex->counter);
-    }
+	/**
+	 * Lexer code for PHP tags
+	 *
+	 * This code has been moved from lexer here fo easier debugging and maintenance
+	 *
+	 * @param $lex
+	 */
+	public function parsePhp($lex)
+	{
+		$lex->token = Smarty_Internal_Templateparser::TP_PHP;
+		$close = 0;
+		$lex->taglineno = $lex->line;
+		$closeTag = '?>';
+		if (strpos($lex->value, '<?xml') === 0) {
+			$lex->is_xml = true;
+			$lex->token = Smarty_Internal_Templateparser::TP_NOCACHE;
+			return;
+		} elseif (strpos($lex->value, '<?') === 0) {
+			$lex->phpType = 'php';
+		} elseif (strpos($lex->value, '<%') === 0) {
+			$lex->phpType = 'asp';
+			$closeTag = '%>';
+		} elseif (strpos($lex->value, '%>') === 0) {
+			$lex->phpType = 'unmatched';
+		} elseif (strpos($lex->value, '?>') === 0) {
+			if ($lex->is_xml) {
+				$lex->is_xml = false;
+				$lex->token = Smarty_Internal_Templateparser::TP_NOCACHE;
+				return;
+			}
+			$lex->phpType = 'unmatched';
+		} elseif (strpos($lex->value, '<s') === 0) {
+			$lex->phpType = 'script';
+			$closeTag = '</script>';
+		} elseif (strpos($lex->value, $lex->smarty->left_delimiter) === 0) {
+			if ($lex->isAutoLiteral()) {
+				$lex->token = Smarty_Internal_Templateparser::TP_TEXT;
+				return;
+			}
+			$closeTag = "{$lex->smarty->left_delimiter}/php{$lex->smarty->right_delimiter}";
+			if ($lex->value == $closeTag) {
+				$lex->compiler->trigger_template_error("unexpected closing tag '{$closeTag}'");
+			}
+			$lex->phpType = 'tag';
+		}
+		if ($lex->phpType == 'unmatched') {
+			return;
+		}
+		if (($lex->phpType == 'php' || $lex->phpType == 'asp') &&
+			($lex->compiler->php_handling == Smarty::PHP_PASSTHRU || $lex->compiler->php_handling == Smarty::PHP_QUOTE)
+		) {
+			return;
+		}
+		$start = $lex->counter + strlen($lex->value);
+		$body = true;
+		if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
+			$close = $match[ 0 ][ 1 ];
+		} else {
+			$lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
+		}
+		while ($body) {
+			if (preg_match('~([/][*])|([/][/][^\n]*)|(\'[^\'\\\\]*(?:\\.[^\'\\\\]*)*\')|("[^"\\\\]*(?:\\.[^"\\\\]*)*")~',
+						   $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
+				$value = $match[ 0 ][ 0 ];
+				$from = $pos = $match[ 0 ][ 1 ];
+				if ($pos > $close) {
+					$body = false;
+				} else {
+					$start = $pos + strlen($value);
+					$phpCommentStart = $value == '/*';
+					if ($phpCommentStart) {
+						$phpCommentEnd = preg_match('~([*][/])~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start);
+						if ($phpCommentEnd) {
+							$pos2 = $match[ 0 ][ 1 ];
+							$start = $pos2 + strlen($match[ 0 ][ 0 ]);
+						}
+					}
+					while ($close > $pos && $close < $start) {
+						if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE,
+									   $from)) {
+							$close = $match[ 0 ][ 1 ];
+							$from = $close + strlen($match[ 0 ][ 0 ]);
+						} else {
+							$lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
+						}
+					}
+					if ($phpCommentStart && (!$phpCommentEnd || $pos2 > $close)) {
+						$lex->taglineno = $lex->line + substr_count(substr($lex->data, $lex->counter, $start), "\n");
+						$lex->compiler->trigger_template_error("missing PHP comment closing tag '*/'");
+					}
+				}
+			} else {
+				$body = false;
+			}
+		}
+		$lex->value = substr($lex->data, $lex->counter, $close + strlen($closeTag) - $lex->counter);
+	}
 
-    /*
+	/*
      * Call back function for $php_handling = PHP_QUOTE
      *
      */
-    /**
-     * @param $match
-     *
-     * @return string
-     */
-    private function quote($match)
-    {
-        return htmlspecialchars($match[ 0 ], ENT_QUOTES);
-    }
+	/**
+	 * @param $match
+	 *
+	 * @return string
+	 */
+	private function quote($match)
+	{
+		return htmlspecialchars($match[ 0 ], ENT_QUOTES);
+	}
 }

Spacing +19 added lines, -19 removed lines

@@ -40,10 +40,10 @@ 
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
         $compiler->has_code = false;
-        if ($_attr[ 'type' ] == 'xml') {
+        if ($_attr['type'] == 'xml') {
             $compiler->tag_nocache = true;
             $save = $compiler->template->compiled->has_nocache_code;
-            $output = addcslashes($_attr[ 'code' ], "'\\");
+            $output = addcslashes($_attr['code'], "'\\");
             $compiler->parser->current_buffer->append_subtree($compiler->parser,
                                                               new Smarty_Internal_ParseTree_Tag($compiler->parser,
                                                                                                 $compiler->processNocacheCode("<?php echo '" .
@@ -53,20 +53,20 @@ 
             $compiler->template->compiled->has_nocache_code = $save;
             return '';
         }
-        if ($_attr[ 'type' ] != 'tag') {
+        if ($_attr['type'] != 'tag') {
             if ($compiler->php_handling == Smarty::PHP_REMOVE) {
                 return '';
             } elseif ($compiler->php_handling == Smarty::PHP_QUOTE) {
                 $output =
                     preg_replace_callback('#(<\?(?:php|=)?)|(<%)|(<script\s+language\s*=\s*["\']?\s*php\s*["\']?\s*>)|(\?>)|(%>)|(<\/script>)#i',
-                                          array($this, 'quote'), $_attr[ 'code' ]);
+                                          array($this, 'quote'), $_attr['code']);
                 $compiler->parser->current_buffer->append_subtree($compiler->parser,
                                                                   new Smarty_Internal_ParseTree_Text($output));
                 return '';
-            } elseif ($compiler->php_handling == Smarty::PHP_PASSTHRU || $_attr[ 'type' ] == 'unmatched') {
+            } elseif ($compiler->php_handling == Smarty::PHP_PASSTHRU || $_attr['type'] == 'unmatched') {
                 $compiler->tag_nocache = true;
                 $save = $compiler->template->compiled->has_nocache_code;
-                $output = addcslashes($_attr[ 'code' ], "'\\");
+                $output = addcslashes($_attr['code'], "'\\");
                 $compiler->parser->current_buffer->append_subtree($compiler->parser,
                                                                   new Smarty_Internal_ParseTree_Tag($compiler->parser,
                                                                                                     $compiler->processNocacheCode("<?php echo '" .
@@ -81,7 +81,7 @@ 
                                                       null, true);
                 }
                 $compiler->has_code = true;
-                return $_attr[ 'code' ];
+                return $_attr['code'];
             } else {
                 $compiler->trigger_template_error('Illegal $smarty->php_handling value', null, true);
             }
@@ -93,16 +93,16 @@ 
             }
             $ldel = preg_quote($compiler->smarty->left_delimiter, '#');
             $rdel = preg_quote($compiler->smarty->right_delimiter, '#');
-            preg_match("#^({$ldel}php\\s*)((.)*?)({$rdel})#", $_attr[ 'code' ], $match);
-            if (!empty($match[ 2 ])) {
-                if ('nocache' == trim($match[ 2 ])) {
+            preg_match("#^({$ldel}php\\s*)((.)*?)({$rdel})#", $_attr['code'], $match);
+            if (!empty($match[2])) {
+                if ('nocache' == trim($match[2])) {
                     $compiler->tag_nocache = true;
                 } else {
                     $compiler->trigger_template_error("illegal value of option flag \"{$match[2]}\"", null, true);
                 }
             }
             return preg_replace(array("#^{$ldel}\\s*php\\s*(.)*?{$rdel}#", "#{$ldel}\\s*/\\s*php\\s*{$rdel}$#"),
-                                array('<?php ', '?>'), $_attr[ 'code' ]);
+                                array('<?php ', '?>'), $_attr['code']);
         }
     }
 
@@ -162,15 +162,15 @@ 
         $start = $lex->counter + strlen($lex->value);
         $body = true;
         if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
-            $close = $match[ 0 ][ 1 ];
+            $close = $match[0][1];
         } else {
             $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
         }
         while ($body) {
             if (preg_match('~([/][*])|([/][/][^\n]*)|(\'[^\'\\\\]*(?:\\.[^\'\\\\]*)*\')|("[^"\\\\]*(?:\\.[^"\\\\]*)*")~',
                            $lex->data, $match, PREG_OFFSET_CAPTURE, $start)) {
-                $value = $match[ 0 ][ 0 ];
-                $from = $pos = $match[ 0 ][ 1 ];
+                $value = $match[0][0];
+                $from = $pos = $match[0][1];
                 if ($pos > $close) {
                     $body = false;
                 } else {
@@ -179,15 +179,15 @@ 
                     if ($phpCommentStart) {
                         $phpCommentEnd = preg_match('~([*][/])~', $lex->data, $match, PREG_OFFSET_CAPTURE, $start);
                         if ($phpCommentEnd) {
-                            $pos2 = $match[ 0 ][ 1 ];
-                            $start = $pos2 + strlen($match[ 0 ][ 0 ]);
+                            $pos2 = $match[0][1];
+                            $start = $pos2 + strlen($match[0][0]);
                         }
                     }
                     while ($close > $pos && $close < $start) {
                         if (preg_match('~' . preg_quote($closeTag, '~') . '~i', $lex->data, $match, PREG_OFFSET_CAPTURE,
                                        $from)) {
-                            $close = $match[ 0 ][ 1 ];
-                            $from = $close + strlen($match[ 0 ][ 0 ]);
+                            $close = $match[0][1];
+                            $from = $close + strlen($match[0][0]);
                         } else {
                             $lex->compiler->trigger_template_error("missing closing tag '{$closeTag}'");
                         }
@@ -215,6 +215,6 @@ 
      */
     private function quote($match)
     {
-        return htmlspecialchars($match[ 0 ], ENT_QUOTES);
+        return htmlspecialchars($match[0], ENT_QUOTES);
     }
 }

libraries/Smarty/libs/sysplugins/smarty_internal_compile_setfilter.php

Doc Comments +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
      * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
      * @param  array                                $parameter array with compilation parameter
      *
-     * @return string compiled code
+     * @return boolean compiled code
      */
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
@@ -51,7 +51,7 @@ 
      * @param  array                                $args     array with attributes from parser
      * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
      *
-     * @return string compiled code
+     * @return boolean compiled code
      */
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
     {

Indentation +39 added lines, -39 removed lines

@@ -16,24 +16,24 @@ 
  */
 class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase
 {
-    /**
-     * Compiles code for setfilter tag
-     *
-     * @param  array                                $args      array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
-     * @param  array                                $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
-    {
-        $compiler->variable_filter_stack[] = $compiler->variable_filters;
-        $compiler->variable_filters = $parameter[ 'modifier_list' ];
-        // this tag does not return compiled code
-        $compiler->has_code = false;
+	/**
+	 * Compiles code for setfilter tag
+	 *
+	 * @param  array                                $args      array with attributes from parser
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+	 * @param  array                                $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+	{
+		$compiler->variable_filter_stack[] = $compiler->variable_filters;
+		$compiler->variable_filters = $parameter[ 'modifier_list' ];
+		// this tag does not return compiled code
+		$compiler->has_code = false;
 
-        return true;
-    }
+		return true;
+	}
 }
 
 /**
@@ -44,27 +44,27 @@ 
  */
 class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase
 {
-    /**
-     * Compiles code for the {/setfilter} tag
-     * This tag does not generate compiled output. It resets variable filter.
-     *
-     * @param  array                                $args     array with attributes from parser
-     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        // reset variable filter to previous state
-        if (count($compiler->variable_filter_stack)) {
-            $compiler->variable_filters = array_pop($compiler->variable_filter_stack);
-        } else {
-            $compiler->variable_filters = array();
-        }
-        // this tag does not return compiled code
-        $compiler->has_code = false;
+	/**
+	 * Compiles code for the {/setfilter} tag
+	 * This tag does not generate compiled output. It resets variable filter.
+	 *
+	 * @param  array                                $args     array with attributes from parser
+	 * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+	{
+		$_attr = $this->getAttributes($compiler, $args);
+		// reset variable filter to previous state
+		if (count($compiler->variable_filter_stack)) {
+			$compiler->variable_filters = array_pop($compiler->variable_filter_stack);
+		} else {
+			$compiler->variable_filters = array();
+		}
+		// this tag does not return compiled code
+		$compiler->has_code = false;
 
-        return true;
-    }
+		return true;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         $compiler->variable_filter_stack[] = $compiler->variable_filters;
-        $compiler->variable_filters = $parameter[ 'modifier_list' ];
+        $compiler->variable_filters = $parameter['modifier_list'];
         // this tag does not return compiled code
         $compiler->has_code = false;
 

libraries/Smarty/libs/sysplugins/smarty_internal_configfilelexer.php

Doc Comments +6 added lines

@@ -152,6 +152,9 @@ 
         $this->configBooleanize = $this->smarty->config_booleanize;
     }
 
+    /**
+     * @param Smarty_Internal_Configfilelexer $new_instance
+     */
     public static function &instance($new_instance = null)
     {
         static $instance = null;
@@ -176,6 +179,9 @@ 
         return $this->{'yylex' . $this->_yy_state}();
     }
 
+    /**
+     * @param integer $state
+     */
     public function yypushstate($state)
     {
         if ($this->yyTraceFILE) {

Spacing +20 added lines, -25 removed lines

@@ -144,7 +144,7 @@ 
         $this->data = $data . "\n"; //now all lines are \n-terminated
         $this->counter = 0;
         if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
-            $this->counter += strlen($match[ 0 ]);
+            $this->counter += strlen($match[0]);
         }
         $this->line = 1;
         $this->compiler = $compiler;
@@ -180,15 +180,13 @@ 
     {
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
+                    isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
         array_push($this->_yy_stack, $this->_yy_state);
         $this->_yy_state = $state;
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
+                    isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
     }
 
@@ -196,14 +194,12 @@ 
     {
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
+                    isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
         $this->_yy_state = array_pop($this->_yy_stack);
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
+                    isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
     }
 
@@ -212,8 +208,7 @@ 
         $this->_yy_state = $state;
         if ($this->yyTraceFILE) {
             fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
+                    isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
         }
     }
 
@@ -230,7 +225,7 @@ 
         do {
             if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
+                if (strlen($yysubmatches[0]) < 200) {
                     $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
                 } else {
                     $yymatches = array_filter($yymatches, 'strlen');
@@ -262,7 +257,7 @@ 
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         }
@@ -335,7 +330,7 @@ 
         do {
             if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
+                if (strlen($yysubmatches[0]) < 200) {
                     $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
                 } else {
                     $yymatches = array_filter($yymatches, 'strlen');
@@ -367,7 +362,7 @@ 
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         }
@@ -459,7 +454,7 @@ 
         do {
             if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
+                if (strlen($yysubmatches[0]) < 200) {
                     $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
                 } else {
                     $yymatches = array_filter($yymatches, 'strlen');
@@ -491,7 +486,7 @@ 
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         }
@@ -519,7 +514,7 @@ 
         do {
             if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
+                if (strlen($yysubmatches[0]) < 200) {
                     $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
                 } else {
                     $yymatches = array_filter($yymatches, 'strlen');
@@ -551,7 +546,7 @@ 
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         }
@@ -591,7 +586,7 @@ 
         do {
             if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
+                if (strlen($yysubmatches[0]) < 200) {
                     $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
                 } else {
                     $yymatches = array_filter($yymatches, 'strlen');
@@ -623,7 +618,7 @@ 
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         }
@@ -657,7 +652,7 @@ 
         do {
             if (preg_match($this->yy_global_pattern6, $this->data, $yymatches, null, $this->counter)) {
                 $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
+                if (strlen($yysubmatches[0]) < 200) {
                     $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
                 } else {
                     $yymatches = array_filter($yymatches, 'strlen');
@@ -689,7 +684,7 @@ 
                     continue;
                 }
             } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[$this->counter]);
             }
             break;
         }
@@ -711,8 +706,8 @@ 
 
         $to = strlen($this->data);
         preg_match("/\"\"\"[ \t\r]*[\n#;]/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[ 0 ][ 1 ])) {
-            $to = $match[ 0 ][ 1 ];
+        if (isset($match[0][1])) {
+            $to = $match[0][1];
         } else {
             $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
         }

Indentation +698 added lines, -698 removed lines

@@ -21,703 +21,703 @@
  */
 class Smarty_Internal_Configfilelexer
 {
-    /**
-     * Source
-     *
-     * @var string
-     */
-    public $data;
-
-    /**
-     * byte counter
-     *
-     * @var int
-     */
-    public $counter;
-
-    /**
-     * token number
-     *
-     * @var int
-     */
-    public $token;
-
-    /**
-     * token value
-     *
-     * @var string
-     */
-    public $value;
-
-    /**
-     * current line
-     *
-     * @var int
-     */
-    public $line;
-
-    /**
-     * state number
-     *
-     * @var int
-     */
-    public $state = 1;
-
-    /**
-     * Smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * compiler object
-     *
-     * @var Smarty_Internal_Config_File_Compiler
-     */
-    private $compiler = null;
-
-    /**
-     * copy of config_booleanize
-     *
-     * @var bool
-     */
-    private $configBooleanize = false;
-
-    /**
-     * trace file
-     *
-     * @var resource
-     */
-    public $yyTraceFILE;
-
-    /**
-     * trace prompt
-     *
-     * @var string
-     */
-    public $yyTracePrompt;
-
-    /**
-     * state names
-     *
-     * @var array
-     */
-    public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION',
-                               6 => 'TRIPPLE');
-
-    /**
-     * storage for assembled token patterns
-     *
-     * @var sring
-     */
-    private $yy_global_pattern1 = null;
-
-    private $yy_global_pattern2 = null;
-
-    private $yy_global_pattern3 = null;
-
-    private $yy_global_pattern4 = null;
-
-    private $yy_global_pattern5 = null;
-
-    private $yy_global_pattern6 = null;
-
-    /**
-     * token names
-     *
-     * @var array
-     */
-    public $smarty_token_names = array(        // Text for parser error messages
-    );
-
-    /**
-     * constructor
-     *
-     * @param   string                             $data template source
-     * @param Smarty_Internal_Config_File_Compiler $compiler
-     */
-    public function __construct($data, Smarty_Internal_Config_File_Compiler $compiler)
-    {
-        // set instance object
-        self::instance($this);
-        $this->data = $data . "\n"; //now all lines are \n-terminated
-        $this->counter = 0;
-        if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
-            $this->counter += strlen($match[ 0 ]);
-        }
-        $this->line = 1;
-        $this->compiler = $compiler;
-        $this->smarty = $compiler->smarty;
-        $this->configBooleanize = $this->smarty->config_booleanize;
-    }
-
-    public static function &instance($new_instance = null)
-    {
-        static $instance = null;
-        if (isset($new_instance) && is_object($new_instance)) {
-            $instance = $new_instance;
-        }
-        return $instance;
-    }
-
-    public function PrintTrace()
-    {
-        $this->yyTraceFILE = fopen('php://output', 'w');
-        $this->yyTracePrompt = '<br>';
-    }
-
-    private $_yy_state = 1;
-
-    private $_yy_stack = array();
-
-    public function yylex()
-    {
-        return $this->{'yylex' . $this->_yy_state}();
-    }
-
-    public function yypushstate($state)
-    {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
-        }
-        array_push($this->_yy_stack, $this->_yy_state);
-        $this->_yy_state = $state;
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
-        }
-    }
-
-    public function yypopstate()
-    {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
-        }
-        $this->_yy_state = array_pop($this->_yy_stack);
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
-        }
-    }
-
-    public function yybegin($state)
-    {
-        $this->_yy_state = $state;
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt,
-                    isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
-                        $this->_yy_state);
-        }
-    }
-
-    public function yylex1()
-    {
-        if (!isset($this->yy_global_pattern1)) {
-            $this->yy_global_pattern1 =
-                "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
-                                        substr($this->data, $this->counter, 5) . '... state START');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r1_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
-            }
-            break;
-        }
-        while (true);
-    } // end function
-
-    const START = 1;
-
-    public function yy_r1_1()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
-        $this->yypushstate(self::COMMENT);
-    }
-
-    public function yy_r1_2()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
-        $this->yypushstate(self::SECTION);
-    }
-
-    public function yy_r1_3()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
-    }
-
-    public function yy_r1_4()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
-        $this->yypushstate(self::VALUE);
-    }
-
-    public function yy_r1_5()
-    {
-
-        return false;
-    }
-
-    public function yy_r1_6()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
-    }
-
-    public function yy_r1_7()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_ID;
-    }
-
-    public function yy_r1_8()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
-    }
-
-    public function yylex2()
-    {
-        if (!isset($this->yy_global_pattern2)) {
-            $this->yy_global_pattern2 =
-                "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
-                                        substr($this->data, $this->counter, 5) . '... state VALUE');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r2_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
-            }
-            break;
-        }
-        while (true);
-    } // end function
-
-    const VALUE = 2;
-
-    public function yy_r2_1()
-    {
-
-        return false;
-    }
-
-    public function yy_r2_2()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
-        $this->yypopstate();
-    }
-
-    public function yy_r2_3()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_INT;
-        $this->yypopstate();
-    }
-
-    public function yy_r2_4()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
-        $this->yypushstate(self::TRIPPLE);
-    }
-
-    public function yy_r2_5()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
-        $this->yypopstate();
-    }
-
-    public function yy_r2_6()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
-        $this->yypopstate();
-    }
-
-    public function yy_r2_7()
-    {
-
-        if (!$this->configBooleanize ||
-            !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no"))
-        ) {
-            $this->yypopstate();
-            $this->yypushstate(self::NAKED_STRING_VALUE);
-            return true; //reprocess in new state
-        } else {
-            $this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
-            $this->yypopstate();
-        }
-    }
-
-    public function yy_r2_8()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-        $this->yypopstate();
-    }
-
-    public function yy_r2_9()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-        $this->value = "";
-        $this->yypopstate();
-    }
-
-    public function yylex3()
-    {
-        if (!isset($this->yy_global_pattern3)) {
-            $this->yy_global_pattern3 = "/\G([^\n]+?(?=[ \t\r]*\n))/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
-                                        substr($this->data, $this->counter, 5) . '... state NAKED_STRING_VALUE');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r3_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
-            }
-            break;
-        }
-        while (true);
-    } // end function
-
-    const NAKED_STRING_VALUE = 3;
-
-    public function yy_r3_1()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-        $this->yypopstate();
-    }
-
-    public function yylex4()
-    {
-        if (!isset($this->yy_global_pattern4)) {
-            $this->yy_global_pattern4 = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
-                                        substr($this->data, $this->counter, 5) . '... state COMMENT');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r4_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
-            }
-            break;
-        }
-        while (true);
-    } // end function
-
-    const COMMENT = 4;
-
-    public function yy_r4_1()
-    {
-
-        return false;
-    }
-
-    public function yy_r4_2()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    }
-
-    public function yy_r4_3()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
-        $this->yypopstate();
-    }
-
-    public function yylex5()
-    {
-        if (!isset($this->yy_global_pattern5)) {
-            $this->yy_global_pattern5 = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
-                                        substr($this->data, $this->counter, 5) . '... state SECTION');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r5_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
-            }
-            break;
-        }
-        while (true);
-    } // end function
-
-    const SECTION = 5;
-
-    public function yy_r5_1()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
-    }
-
-    public function yy_r5_2()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
-        $this->yypopstate();
-    }
-
-    public function yylex6()
-    {
-        if (!isset($this->yy_global_pattern6)) {
-            $this->yy_global_pattern6 = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/isS";
-        }
-        if ($this->counter >= strlen($this->data)) {
-            return false; // end of input
-        }
-
-        do {
-            if (preg_match($this->yy_global_pattern6, $this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                if (strlen($yysubmatches[ 0 ]) < 200) {
-                    $yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
-                } else {
-                    $yymatches = array_filter($yymatches, 'strlen');
-                }
-                if (empty($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
-                                        substr($this->data, $this->counter, 5) . '... state TRIPPLE');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r6_' . $this->token}();
-                if ($r === null) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += strlen($this->value);
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= strlen($this->data)) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }
-            } else {
-                throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
-            }
-            break;
-        }
-        while (true);
-    } // end function
-
-    const TRIPPLE = 6;
-
-    public function yy_r6_1()
-    {
-
-        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
-        $this->yypopstate();
-        $this->yypushstate(self::START);
-    }
-
-    public function yy_r6_2()
-    {
-
-        $to = strlen($this->data);
-        preg_match("/\"\"\"[ \t\r]*[\n#;]/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-        if (isset($match[ 0 ][ 1 ])) {
-            $to = $match[ 0 ][ 1 ];
-        } else {
-            $this->compiler->trigger_template_error("missing or misspelled literal closing tag");
-        }
-        $this->value = substr($this->data, $this->counter, $to - $this->counter);
-        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
-    }
+	/**
+	 * Source
+	 *
+	 * @var string
+	 */
+	public $data;
+
+	/**
+	 * byte counter
+	 *
+	 * @var int
+	 */
+	public $counter;
+
+	/**
+	 * token number
+	 *
+	 * @var int
+	 */
+	public $token;
+
+	/**
+	 * token value
+	 *
+	 * @var string
+	 */
+	public $value;
+
+	/**
+	 * current line
+	 *
+	 * @var int
+	 */
+	public $line;
+
+	/**
+	 * state number
+	 *
+	 * @var int
+	 */
+	public $state = 1;
+
+	/**
+	 * Smarty object
+	 *
+	 * @var Smarty
+	 */
+	public $smarty = null;
+
+	/**
+	 * compiler object
+	 *
+	 * @var Smarty_Internal_Config_File_Compiler
+	 */
+	private $compiler = null;
+
+	/**
+	 * copy of config_booleanize
+	 *
+	 * @var bool
+	 */
+	private $configBooleanize = false;
+
+	/**
+	 * trace file
+	 *
+	 * @var resource
+	 */
+	public $yyTraceFILE;
+
+	/**
+	 * trace prompt
+	 *
+	 * @var string
+	 */
+	public $yyTracePrompt;
+
+	/**
+	 * state names
+	 *
+	 * @var array
+	 */
+	public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION',
+							   6 => 'TRIPPLE');
+
+	/**
+	 * storage for assembled token patterns
+	 *
+	 * @var sring
+	 */
+	private $yy_global_pattern1 = null;
+
+	private $yy_global_pattern2 = null;
+
+	private $yy_global_pattern3 = null;
+
+	private $yy_global_pattern4 = null;
+
+	private $yy_global_pattern5 = null;
+
+	private $yy_global_pattern6 = null;
+
+	/**
+	 * token names
+	 *
+	 * @var array
+	 */
+	public $smarty_token_names = array(        // Text for parser error messages
+	);
+
+	/**
+	 * constructor
+	 *
+	 * @param   string                             $data template source
+	 * @param Smarty_Internal_Config_File_Compiler $compiler
+	 */
+	public function __construct($data, Smarty_Internal_Config_File_Compiler $compiler)
+	{
+		// set instance object
+		self::instance($this);
+		$this->data = $data . "\n"; //now all lines are \n-terminated
+		$this->counter = 0;
+		if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
+			$this->counter += strlen($match[ 0 ]);
+		}
+		$this->line = 1;
+		$this->compiler = $compiler;
+		$this->smarty = $compiler->smarty;
+		$this->configBooleanize = $this->smarty->config_booleanize;
+	}
+
+	public static function &instance($new_instance = null)
+	{
+		static $instance = null;
+		if (isset($new_instance) && is_object($new_instance)) {
+			$instance = $new_instance;
+		}
+		return $instance;
+	}
+
+	public function PrintTrace()
+	{
+		$this->yyTraceFILE = fopen('php://output', 'w');
+		$this->yyTracePrompt = '<br>';
+	}
+
+	private $_yy_state = 1;
+
+	private $_yy_stack = array();
+
+	public function yylex()
+	{
+		return $this->{'yylex' . $this->_yy_state}();
+	}
+
+	public function yypushstate($state)
+	{
+		if ($this->yyTraceFILE) {
+			fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt,
+					isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+						$this->_yy_state);
+		}
+		array_push($this->_yy_stack, $this->_yy_state);
+		$this->_yy_state = $state;
+		if ($this->yyTraceFILE) {
+			fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
+					isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+						$this->_yy_state);
+		}
+	}
+
+	public function yypopstate()
+	{
+		if ($this->yyTraceFILE) {
+			fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,
+					isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+						$this->_yy_state);
+		}
+		$this->_yy_state = array_pop($this->_yy_stack);
+		if ($this->yyTraceFILE) {
+			fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt,
+					isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+						$this->_yy_state);
+		}
+	}
+
+	public function yybegin($state)
+	{
+		$this->_yy_state = $state;
+		if ($this->yyTraceFILE) {
+			fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt,
+					isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] :
+						$this->_yy_state);
+		}
+	}
+
+	public function yylex1()
+	{
+		if (!isset($this->yy_global_pattern1)) {
+			$this->yy_global_pattern1 =
+				"/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/isS";
+		}
+		if ($this->counter >= strlen($this->data)) {
+			return false; // end of input
+		}
+
+		do {
+			if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, null, $this->counter)) {
+				$yysubmatches = $yymatches;
+				if (strlen($yysubmatches[ 0 ]) < 200) {
+					$yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+				} else {
+					$yymatches = array_filter($yymatches, 'strlen');
+				}
+				if (empty($yymatches)) {
+					throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+										substr($this->data, $this->counter, 5) . '... state START');
+				}
+				next($yymatches); // skip global match
+				$this->token = key($yymatches); // token number
+				$this->value = current($yymatches); // token value
+				$r = $this->{'yy_r1_' . $this->token}();
+				if ($r === null) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					// accept this token
+					return true;
+				} elseif ($r === true) {
+					// we have changed state
+					// process this token in the new state
+					return $this->yylex();
+				} elseif ($r === false) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					if ($this->counter >= strlen($this->data)) {
+						return false; // end of input
+					}
+					// skip this token
+					continue;
+				}
+			} else {
+				throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+			}
+			break;
+		}
+		while (true);
+	} // end function
+
+	const START = 1;
+
+	public function yy_r1_1()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
+		$this->yypushstate(self::COMMENT);
+	}
+
+	public function yy_r1_2()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
+		$this->yypushstate(self::SECTION);
+	}
+
+	public function yy_r1_3()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
+	}
+
+	public function yy_r1_4()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
+		$this->yypushstate(self::VALUE);
+	}
+
+	public function yy_r1_5()
+	{
+
+		return false;
+	}
+
+	public function yy_r1_6()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+	}
+
+	public function yy_r1_7()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_ID;
+	}
+
+	public function yy_r1_8()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
+	}
+
+	public function yylex2()
+	{
+		if (!isset($this->yy_global_pattern2)) {
+			$this->yy_global_pattern2 =
+				"/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS";
+		}
+		if ($this->counter >= strlen($this->data)) {
+			return false; // end of input
+		}
+
+		do {
+			if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, null, $this->counter)) {
+				$yysubmatches = $yymatches;
+				if (strlen($yysubmatches[ 0 ]) < 200) {
+					$yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+				} else {
+					$yymatches = array_filter($yymatches, 'strlen');
+				}
+				if (empty($yymatches)) {
+					throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+										substr($this->data, $this->counter, 5) . '... state VALUE');
+				}
+				next($yymatches); // skip global match
+				$this->token = key($yymatches); // token number
+				$this->value = current($yymatches); // token value
+				$r = $this->{'yy_r2_' . $this->token}();
+				if ($r === null) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					// accept this token
+					return true;
+				} elseif ($r === true) {
+					// we have changed state
+					// process this token in the new state
+					return $this->yylex();
+				} elseif ($r === false) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					if ($this->counter >= strlen($this->data)) {
+						return false; // end of input
+					}
+					// skip this token
+					continue;
+				}
+			} else {
+				throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+			}
+			break;
+		}
+		while (true);
+	} // end function
+
+	const VALUE = 2;
+
+	public function yy_r2_1()
+	{
+
+		return false;
+	}
+
+	public function yy_r2_2()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
+		$this->yypopstate();
+	}
+
+	public function yy_r2_3()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_INT;
+		$this->yypopstate();
+	}
+
+	public function yy_r2_4()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
+		$this->yypushstate(self::TRIPPLE);
+	}
+
+	public function yy_r2_5()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
+		$this->yypopstate();
+	}
+
+	public function yy_r2_6()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
+		$this->yypopstate();
+	}
+
+	public function yy_r2_7()
+	{
+
+		if (!$this->configBooleanize ||
+			!in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no"))
+		) {
+			$this->yypopstate();
+			$this->yypushstate(self::NAKED_STRING_VALUE);
+			return true; //reprocess in new state
+		} else {
+			$this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
+			$this->yypopstate();
+		}
+	}
+
+	public function yy_r2_8()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+		$this->yypopstate();
+	}
+
+	public function yy_r2_9()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+		$this->value = "";
+		$this->yypopstate();
+	}
+
+	public function yylex3()
+	{
+		if (!isset($this->yy_global_pattern3)) {
+			$this->yy_global_pattern3 = "/\G([^\n]+?(?=[ \t\r]*\n))/isS";
+		}
+		if ($this->counter >= strlen($this->data)) {
+			return false; // end of input
+		}
+
+		do {
+			if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, null, $this->counter)) {
+				$yysubmatches = $yymatches;
+				if (strlen($yysubmatches[ 0 ]) < 200) {
+					$yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+				} else {
+					$yymatches = array_filter($yymatches, 'strlen');
+				}
+				if (empty($yymatches)) {
+					throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+										substr($this->data, $this->counter, 5) . '... state NAKED_STRING_VALUE');
+				}
+				next($yymatches); // skip global match
+				$this->token = key($yymatches); // token number
+				$this->value = current($yymatches); // token value
+				$r = $this->{'yy_r3_' . $this->token}();
+				if ($r === null) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					// accept this token
+					return true;
+				} elseif ($r === true) {
+					// we have changed state
+					// process this token in the new state
+					return $this->yylex();
+				} elseif ($r === false) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					if ($this->counter >= strlen($this->data)) {
+						return false; // end of input
+					}
+					// skip this token
+					continue;
+				}
+			} else {
+				throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+			}
+			break;
+		}
+		while (true);
+	} // end function
+
+	const NAKED_STRING_VALUE = 3;
+
+	public function yy_r3_1()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+		$this->yypopstate();
+	}
+
+	public function yylex4()
+	{
+		if (!isset($this->yy_global_pattern4)) {
+			$this->yy_global_pattern4 = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS";
+		}
+		if ($this->counter >= strlen($this->data)) {
+			return false; // end of input
+		}
+
+		do {
+			if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, null, $this->counter)) {
+				$yysubmatches = $yymatches;
+				if (strlen($yysubmatches[ 0 ]) < 200) {
+					$yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+				} else {
+					$yymatches = array_filter($yymatches, 'strlen');
+				}
+				if (empty($yymatches)) {
+					throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+										substr($this->data, $this->counter, 5) . '... state COMMENT');
+				}
+				next($yymatches); // skip global match
+				$this->token = key($yymatches); // token number
+				$this->value = current($yymatches); // token value
+				$r = $this->{'yy_r4_' . $this->token}();
+				if ($r === null) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					// accept this token
+					return true;
+				} elseif ($r === true) {
+					// we have changed state
+					// process this token in the new state
+					return $this->yylex();
+				} elseif ($r === false) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					if ($this->counter >= strlen($this->data)) {
+						return false; // end of input
+					}
+					// skip this token
+					continue;
+				}
+			} else {
+				throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+			}
+			break;
+		}
+		while (true);
+	} // end function
+
+	const COMMENT = 4;
+
+	public function yy_r4_1()
+	{
+
+		return false;
+	}
+
+	public function yy_r4_2()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+	}
+
+	public function yy_r4_3()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+		$this->yypopstate();
+	}
+
+	public function yylex5()
+	{
+		if (!isset($this->yy_global_pattern5)) {
+			$this->yy_global_pattern5 = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/isS";
+		}
+		if ($this->counter >= strlen($this->data)) {
+			return false; // end of input
+		}
+
+		do {
+			if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, null, $this->counter)) {
+				$yysubmatches = $yymatches;
+				if (strlen($yysubmatches[ 0 ]) < 200) {
+					$yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+				} else {
+					$yymatches = array_filter($yymatches, 'strlen');
+				}
+				if (empty($yymatches)) {
+					throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+										substr($this->data, $this->counter, 5) . '... state SECTION');
+				}
+				next($yymatches); // skip global match
+				$this->token = key($yymatches); // token number
+				$this->value = current($yymatches); // token value
+				$r = $this->{'yy_r5_' . $this->token}();
+				if ($r === null) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					// accept this token
+					return true;
+				} elseif ($r === true) {
+					// we have changed state
+					// process this token in the new state
+					return $this->yylex();
+				} elseif ($r === false) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					if ($this->counter >= strlen($this->data)) {
+						return false; // end of input
+					}
+					// skip this token
+					continue;
+				}
+			} else {
+				throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+			}
+			break;
+		}
+		while (true);
+	} // end function
+
+	const SECTION = 5;
+
+	public function yy_r5_1()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_DOT;
+	}
+
+	public function yy_r5_2()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
+		$this->yypopstate();
+	}
+
+	public function yylex6()
+	{
+		if (!isset($this->yy_global_pattern6)) {
+			$this->yy_global_pattern6 = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/isS";
+		}
+		if ($this->counter >= strlen($this->data)) {
+			return false; // end of input
+		}
+
+		do {
+			if (preg_match($this->yy_global_pattern6, $this->data, $yymatches, null, $this->counter)) {
+				$yysubmatches = $yymatches;
+				if (strlen($yysubmatches[ 0 ]) < 200) {
+					$yymatches = preg_grep("/(.|\s)+/", $yysubmatches);
+				} else {
+					$yymatches = array_filter($yymatches, 'strlen');
+				}
+				if (empty($yymatches)) {
+					throw new Exception('Error: lexing failed because a rule matched' . ' an empty string.  Input "' .
+										substr($this->data, $this->counter, 5) . '... state TRIPPLE');
+				}
+				next($yymatches); // skip global match
+				$this->token = key($yymatches); // token number
+				$this->value = current($yymatches); // token value
+				$r = $this->{'yy_r6_' . $this->token}();
+				if ($r === null) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					// accept this token
+					return true;
+				} elseif ($r === true) {
+					// we have changed state
+					// process this token in the new state
+					return $this->yylex();
+				} elseif ($r === false) {
+					$this->counter += strlen($this->value);
+					$this->line += substr_count($this->value, "\n");
+					if ($this->counter >= strlen($this->data)) {
+						return false; // end of input
+					}
+					// skip this token
+					continue;
+				}
+			} else {
+				throw new Exception('Unexpected input at line' . $this->line . ': ' . $this->data[ $this->counter ]);
+			}
+			break;
+		}
+		while (true);
+	} // end function
+
+	const TRIPPLE = 6;
+
+	public function yy_r6_1()
+	{
+
+		$this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
+		$this->yypopstate();
+		$this->yypushstate(self::START);
+	}
+
+	public function yy_r6_2()
+	{
+
+		$to = strlen($this->data);
+		preg_match("/\"\"\"[ \t\r]*[\n#;]/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+		if (isset($match[ 0 ][ 1 ])) {
+			$to = $match[ 0 ][ 1 ];
+		} else {
+			$this->compiler->trigger_template_error("missing or misspelled literal closing tag");
+		}
+		$this->value = substr($this->data, $this->counter, $to - $this->counter);
+		$this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
+	}
 
 }

libraries/Smarty/libs/sysplugins/smarty_internal_configfileparser.php

Doc Comments +4 added lines, -1 removed lines

@@ -178,7 +178,7 @@ 
     }
 
     /**
-     * @param null $new_instance
+     * @param Smarty_Internal_Configfileparser $new_instance
      *
      * @return null
      */
@@ -949,6 +949,9 @@ 
         $this->retvalue = $this->_retvalue;
     }
 
+    /**
+     * @param integer $yymajor
+     */
     public function doParse($yymajor, $yytokenvalue)
     {
         $yyerrorhit = 0;   /* True if yymajor has invoked an error */

Spacing +115 added lines, -115 removed lines

@@ -28,18 +28,18 @@ 
 
     public function offsetExists($offset)
     {
-        return isset($this->metadata[ $offset ]);
+        return isset($this->metadata[$offset]);
     }
 
     public function offsetGet($offset)
     {
-        return $this->metadata[ $offset ];
+        return $this->metadata[$offset];
     }
 
     public function offsetSet($offset, $value)
     {
         if ($offset === null) {
-            if (isset($value[ 0 ])) {
+            if (isset($value[0])) {
                 $x = ($value instanceof TPC_yyToken) ? $value->metadata : $value;
                 $this->metadata = array_merge($this->metadata, $x);
 
@@ -52,23 +52,23 @@ 
         }
         if ($value instanceof TPC_yyToken) {
             if ($value->metadata) {
-                $this->metadata[ $offset ] = $value->metadata;
+                $this->metadata[$offset] = $value->metadata;
             }
         } elseif ($value) {
-            $this->metadata[ $offset ] = $value;
+            $this->metadata[$offset] = $value;
         }
     }
 
     public function offsetUnset($offset)
     {
-        unset($this->metadata[ $offset ]);
+        unset($this->metadata[$offset]);
     }
 }
 
 class TPC_yyStackEntry
 {
-    public $stateno;       /* The state-number */
-    public $major;         /* The major token value.  This is the code
+    public $stateno; /* The state-number */
+    public $major; /* The major token value.  This is the code
                      ** number for the token at this stack level */
     public $minor; /* The user-supplied minor token value.  This
                      ** is the value of the token  */
@@ -226,9 +226,9 @@ 
 
         $str = "";
         foreach ($ss as $s) {
-            if (strlen($s) === 2 && $s[ 0 ] === '\\') {
-                if (isset(self::$escapes_single[ $s[ 1 ] ])) {
-                    $s = self::$escapes_single[ $s[ 1 ] ];
+            if (strlen($s) === 2 && $s[0] === '\\') {
+                if (isset(self::$escapes_single[$s[1]])) {
+                    $s = self::$escapes_single[$s[1]];
                 }
             }
             $str .= $s;
@@ -269,14 +269,14 @@ 
      */
     private function set_var(Array $var, Array &$target_array)
     {
-        $key = $var[ "key" ];
-        $value = $var[ "value" ];
+        $key = $var["key"];
+        $value = $var["value"];
 
-        if ($this->configOverwrite || !isset($target_array[ 'vars' ][ $key ])) {
-            $target_array[ 'vars' ][ $key ] = $value;
+        if ($this->configOverwrite || !isset($target_array['vars'][$key])) {
+            $target_array['vars'][$key] = $value;
         } else {
-            settype($target_array[ 'vars' ][ $key ], 'array');
-            $target_array[ 'vars' ][ $key ][] = $value;
+            settype($target_array['vars'][$key], 'array');
+            $target_array['vars'][$key][] = $value;
         }
     }
 
@@ -287,8 +287,8 @@ 
      */
     private function add_global_vars(Array $vars)
     {
-        if (!isset($this->compiler->config_data[ 'vars' ])) {
-            $this->compiler->config_data[ 'vars' ] = Array();
+        if (!isset($this->compiler->config_data['vars'])) {
+            $this->compiler->config_data['vars'] = Array();
         }
         foreach ($vars as $var) {
             $this->set_var($var, $this->compiler->config_data);
@@ -303,11 +303,11 @@ 
      */
     private function add_section_vars($section_name, Array $vars)
     {
-        if (!isset($this->compiler->config_data[ 'sections' ][ $section_name ][ 'vars' ])) {
-            $this->compiler->config_data[ 'sections' ][ $section_name ][ 'vars' ] = Array();
+        if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
+            $this->compiler->config_data['sections'][$section_name]['vars'] = Array();
         }
         foreach ($vars as $var) {
-            $this->set_var($var, $this->compiler->config_data[ 'sections' ][ $section_name ]);
+            $this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
         }
     }
 
@@ -365,14 +365,14 @@ 
 
     const YY_SHIFT_MAX = 19;
 
-    static public $yy_shift_ofst = array(- 8, 1, 1, 1, - 7, - 3, - 3, 30, - 8, - 8, - 8, 19, 5, 3, 15, 16, 24, 25, 32,
+    static public $yy_shift_ofst = array(-8, 1, 1, 1, - 7, - 3, - 3, 30, - 8, - 8, - 8, 19, 5, 3, 15, 16, 24, 25, 32,
                                          20,);
 
     const YY_REDUCE_USE_DFLT = - 21;
 
     const YY_REDUCE_MAX = 10;
 
-    static public $yy_reduce_ofst = array(- 10, - 1, - 1, - 1, - 20, 10, 12, 8, 14, 7, - 11,);
+    static public $yy_reduce_ofst = array(-10, - 1, - 1, - 1, - 20, 10, 12, 8, 14, 7, - 11,);
 
     static public $yyExpectedTokens = array(array(), array(5, 17, 18,), array(5, 17, 18,), array(5, 17, 18,),
                                             array(7, 8, 9, 10, 11, 12, 15, 16,), array(17, 18,), array(17, 18,),
@@ -422,9 +422,9 @@ 
 
     public $yyTracePrompt;
 
-    public $yyidx;                    /* Index of top element in stack */
-    public $yyerrcnt;                 /* Shifts left before out of the error */
-    public $yystack = array();  /* The parser's stack */
+    public $yyidx; /* Index of top element in stack */
+    public $yyerrcnt; /* Shifts left before out of the error */
+    public $yystack = array(); /* The parser's stack */
 
     public $yyTokenName = array('$', 'OPENB', 'SECTION', 'CLOSEB', 'DOT', 'ID', 'EQUAL', 'FLOAT', 'INT', 'BOOL',
                                 'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING', 'TRIPPLE_QUOTES', 'TRIPPLE_TEXT',
@@ -449,7 +449,7 @@ 
             return 'End of Input';
         }
         if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
-            return $this->yyTokenName[ $tokenType ];
+            return $this->yyTokenName[$tokenType];
         } else {
             return "Unknown";
         }
@@ -459,7 +459,7 @@ 
     {
         switch ($yymajor) {
             default:
-                break;   /* If no destructor action specified: do nothing */
+                break; /* If no destructor action specified: do nothing */
         }
     }
 
@@ -470,11 +470,11 @@ 
         }
         $yytos = array_pop($this->yystack);
         if ($this->yyTraceFILE && $this->yyidx >= 0) {
-            fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[ $yytos->major ] . "\n");
+            fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] . "\n");
         }
         $yymajor = $yytos->major;
         self::yy_destructor($yymajor, $yytos->minor);
-        $this->yyidx --;
+        $this->yyidx--;
 
         return $yymajor;
     }
@@ -493,14 +493,14 @@ 
     {
         static $res3 = array();
         static $res4 = array();
-        $state = $this->yystack[ $this->yyidx ]->stateno;
-        $expected = self::$yyExpectedTokens[ $state ];
-        if (isset($res3[ $state ][ $token ])) {
-            if ($res3[ $state ][ $token ]) {
+        $state = $this->yystack[$this->yyidx]->stateno;
+        $expected = self::$yyExpectedTokens[$state];
+        if (isset($res3[$state][$token])) {
+            if ($res3[$state][$token]) {
                 return $expected;
             }
         } else {
-            if ($res3[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
+            if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
                 return $expected;
             }
         }
@@ -512,7 +512,7 @@ 
                 // reduce action
                 $done = 0;
                 do {
-                    if ($done ++ == 100) {
+                    if ($done++ == 100) {
                         $this->yyidx = $yyidx;
                         $this->yystack = $stack;
                         // too much recursion prevents proper detection
@@ -520,20 +520,20 @@ 
                         return array_unique($expected);
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
-                    $nextstate = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno,
-                                                              self::$yyRuleInfo[ $yyruleno ][ 0 ]);
-                    if (isset(self::$yyExpectedTokens[ $nextstate ])) {
-                        $expected = array_merge($expected, self::$yyExpectedTokens[ $nextstate ]);
-                        if (isset($res4[ $nextstate ][ $token ])) {
-                            if ($res4[ $nextstate ][ $token ]) {
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno,
+                                                              self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset(self::$yyExpectedTokens[$nextstate])) {
+                        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
+                        if (isset($res4[$nextstate][$token])) {
+                            if ($res4[$nextstate][$token]) {
                                 $this->yyidx = $yyidx;
                                 $this->yystack = $stack;
                                 return array_unique($expected);
                             }
                         } else {
-                            if ($res4[ $nextstate ][ $token ] =
-                                in_array($token, self::$yyExpectedTokens[ $nextstate ], true)
+                            if ($res4[$nextstate][$token] =
+                                in_array($token, self::$yyExpectedTokens[$nextstate], true)
                             ) {
                                 $this->yyidx = $yyidx;
                                 $this->yystack = $stack;
@@ -543,11 +543,11 @@ 
                     }
                     if ($nextstate < self::YYNSTATE) {
                         // we need to shift a non-terminal
-                        $this->yyidx ++;
+                        $this->yyidx++;
                         $x = new TPC_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
-                        $this->yystack[ $this->yyidx ] = $x;
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
+                        $this->yystack[$this->yyidx] = $x;
                         continue 2;
                     } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
                         $this->yyidx = $yyidx;
@@ -583,13 +583,13 @@ 
         if ($token === 0) {
             return true; // 0 is not part of this
         }
-        $state = $this->yystack[ $this->yyidx ]->stateno;
-        if (isset($res[ $state ][ $token ])) {
-            if ($res[ $state ][ $token ]) {
+        $state = $this->yystack[$this->yyidx]->stateno;
+        if (isset($res[$state][$token])) {
+            if ($res[$state][$token]) {
                 return true;
             }
         } else {
-            if ($res[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
+            if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
                 return true;
             }
         }
@@ -601,7 +601,7 @@ 
                 // reduce action
                 $done = 0;
                 do {
-                    if ($done ++ == 100) {
+                    if ($done++ == 100) {
                         $this->yyidx = $yyidx;
                         $this->yystack = $stack;
                         // too much recursion prevents proper detection
@@ -609,18 +609,18 @@ 
                         return true;
                     }
                     $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
-                    $nextstate = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno,
-                                                              self::$yyRuleInfo[ $yyruleno ][ 0 ]);
-                    if (isset($res2[ $nextstate ][ $token ])) {
-                        if ($res2[ $nextstate ][ $token ]) {
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno,
+                                                              self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset($res2[$nextstate][$token])) {
+                        if ($res2[$nextstate][$token]) {
                             $this->yyidx = $yyidx;
                             $this->yystack = $stack;
                             return true;
                         }
                     } else {
-                        if ($res2[ $nextstate ][ $token ] = (isset(self::$yyExpectedTokens[ $nextstate ]) &&
-                                                             in_array($token, self::$yyExpectedTokens[ $nextstate ],
+                        if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) &&
+                                                             in_array($token, self::$yyExpectedTokens[$nextstate],
                                                                       true))
                         ) {
                             $this->yyidx = $yyidx;
@@ -630,11 +630,11 @@ 
                     }
                     if ($nextstate < self::YYNSTATE) {
                         // we need to shift a non-terminal
-                        $this->yyidx ++;
+                        $this->yyidx++;
                         $x = new TPC_yyStackEntry;
                         $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
-                        $this->yystack[ $this->yyidx ] = $x;
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
+                        $this->yystack[$this->yyidx] = $x;
                         continue 2;
                     } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
                         $this->yyidx = $yyidx;
@@ -669,37 +669,37 @@ 
 
     public function yy_find_shift_action($iLookAhead)
     {
-        $stateno = $this->yystack[ $this->yyidx ]->stateno;
+        $stateno = $this->yystack[$this->yyidx]->stateno;
 
         /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
-        if (!isset(self::$yy_shift_ofst[ $stateno ])) {
+        if (!isset(self::$yy_shift_ofst[$stateno])) {
             // no shift actions
-            return self::$yy_default[ $stateno ];
+            return self::$yy_default[$stateno];
         }
-        $i = self::$yy_shift_ofst[ $stateno ];
+        $i = self::$yy_shift_ofst[$stateno];
         if ($i === self::YY_SHIFT_USE_DFLT) {
-            return self::$yy_default[ $stateno ];
+            return self::$yy_default[$stateno];
         }
         if ($iLookAhead == self::YYNOCODE) {
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[ $i ] != $iLookAhead) {
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[$i] != $iLookAhead) {
             if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback) &&
-                ($iFallback = self::$yyFallback[ $iLookAhead ]) != 0
+                ($iFallback = self::$yyFallback[$iLookAhead]) != 0
             ) {
                 if ($this->yyTraceFILE) {
                     fwrite($this->yyTraceFILE,
-                           $this->yyTracePrompt . "FALLBACK " . $this->yyTokenName[ $iLookAhead ] . " => " .
-                           $this->yyTokenName[ $iFallback ] . "\n");
+                           $this->yyTracePrompt . "FALLBACK " . $this->yyTokenName[$iLookAhead] . " => " .
+                           $this->yyTokenName[$iFallback] . "\n");
                 }
 
                 return $this->yy_find_shift_action($iFallback);
             }
 
-            return self::$yy_default[ $stateno ];
+            return self::$yy_default[$stateno];
         } else {
-            return self::$yy_action[ $i ];
+            return self::$yy_action[$i];
         }
     }
 
@@ -707,29 +707,29 @@ 
     {
         /* $stateno = $this->yystack[$this->yyidx]->stateno; */
 
-        if (!isset(self::$yy_reduce_ofst[ $stateno ])) {
-            return self::$yy_default[ $stateno ];
+        if (!isset(self::$yy_reduce_ofst[$stateno])) {
+            return self::$yy_default[$stateno];
         }
-        $i = self::$yy_reduce_ofst[ $stateno ];
+        $i = self::$yy_reduce_ofst[$stateno];
         if ($i == self::YY_REDUCE_USE_DFLT) {
-            return self::$yy_default[ $stateno ];
+            return self::$yy_default[$stateno];
         }
         if ($iLookAhead == self::YYNOCODE) {
             return self::YY_NO_ACTION;
         }
         $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[ $i ] != $iLookAhead) {
-            return self::$yy_default[ $stateno ];
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[$i] != $iLookAhead) {
+            return self::$yy_default[$stateno];
         } else {
-            return self::$yy_action[ $i ];
+            return self::$yy_action[$i];
         }
     }
 
     public function yy_shift($yyNewState, $yyMajor, $yypMinor)
     {
-        $this->yyidx ++;
+        $this->yyidx++;
         if ($this->yyidx >= self::YYSTACKDEPTH) {
-            $this->yyidx --;
+            $this->yyidx--;
             if ($this->yyTraceFILE) {
                 fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
             }
@@ -751,8 +751,8 @@ 
         if ($this->yyTraceFILE && $this->yyidx > 0) {
             fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, $yyNewState);
             fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
-            for ($i = 1; $i <= $this->yyidx; $i ++) {
-                fprintf($this->yyTraceFILE, " %s", $this->yyTokenName[ $this->yystack[ $i ]->major ]);
+            for ($i = 1; $i <= $this->yyidx; $i++) {
+                fprintf($this->yyTraceFILE, " %s", $this->yyTokenName[$this->yystack[$i]->major]);
             }
             fwrite($this->yyTraceFILE, "\n");
         }
@@ -780,14 +780,14 @@ 
     #line 266 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r1()
     {
-        $this->add_global_vars($this->yystack[ $this->yyidx + 0 ]->minor);
+        $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor);
         $this->_retvalue = null;
     }
 
     #line 280 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r4()
     {
-        $this->add_section_vars($this->yystack[ $this->yyidx + - 3 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor);
+        $this->add_section_vars($this->yystack[$this->yyidx + - 3]->minor, $this->yystack[$this->yyidx + 0]->minor);
         $this->_retvalue = null;
     }
 
@@ -795,8 +795,8 @@ 
     function yy_r5()
     {
         if ($this->configReadHidden) {
-            $this->add_section_vars($this->yystack[ $this->yyidx + - 3 ]->minor,
-                                    $this->yystack[ $this->yyidx + 0 ]->minor);
+            $this->add_section_vars($this->yystack[$this->yyidx + - 3]->minor,
+                                    $this->yystack[$this->yyidx + 0]->minor);
         }
         $this->_retvalue = null;
     }
@@ -804,14 +804,14 @@ 
     #line 293 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r6()
     {
-        $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor;
+        $this->_retvalue = $this->yystack[$this->yyidx + - 1]->minor;
     }
 
     #line 297 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r7()
     {
         $this->_retvalue =
-            array_merge($this->yystack[ $this->yyidx + - 1 ]->minor, Array($this->yystack[ $this->yyidx + 0 ]->minor));
+            array_merge($this->yystack[$this->yyidx + - 1]->minor, Array($this->yystack[$this->yyidx + 0]->minor));
     }
 
     #line 301 "../smarty/lexer/smarty_internal_configfileparser.y"
@@ -823,44 +823,44 @@ 
     #line 307 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r9()
     {
-        $this->_retvalue = Array("key" => $this->yystack[ $this->yyidx + - 2 ]->minor,
-                                 "value" => $this->yystack[ $this->yyidx + 0 ]->minor);
+        $this->_retvalue = Array("key" => $this->yystack[$this->yyidx + - 2]->minor,
+                                 "value" => $this->yystack[$this->yyidx + 0]->minor);
     }
 
     #line 312 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r10()
     {
-        $this->_retvalue = (float) $this->yystack[ $this->yyidx + 0 ]->minor;
+        $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
     }
 
     #line 316 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r11()
     {
-        $this->_retvalue = (int) $this->yystack[ $this->yyidx + 0 ]->minor;
+        $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
     }
 
     #line 320 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r12()
     {
-        $this->_retvalue = $this->parse_bool($this->yystack[ $this->yyidx + 0 ]->minor);
+        $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
     }
 
     #line 324 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r13()
     {
-        $this->_retvalue = self::parse_single_quoted_string($this->yystack[ $this->yyidx + 0 ]->minor);
+        $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
     }
 
     #line 328 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r14()
     {
-        $this->_retvalue = self::parse_double_quoted_string($this->yystack[ $this->yyidx + 0 ]->minor);
+        $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
     }
 
     #line 332 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r15()
     {
-        $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[ $this->yyidx + - 1 ]->minor);
+        $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + - 1]->minor);
     }
 
     #line 336 "../smarty/lexer/smarty_internal_configfileparser.y"
@@ -872,7 +872,7 @@ 
     #line 340 "../smarty/lexer/smarty_internal_configfileparser.y"
     function yy_r17()
     {
-        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
+        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
     }
 
     private $_retvalue;
@@ -881,32 +881,32 @@ 
     {
         if ($this->yyTraceFILE && $yyruleno >= 0 && $yyruleno < count(self::$yyRuleName)) {
             fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", $this->yyTracePrompt, $yyruleno,
-                    self::$yyRuleName[ $yyruleno ]);
+                    self::$yyRuleName[$yyruleno]);
         }
 
         $this->_retvalue = $yy_lefthand_side = null;
-        if (isset(self::$yyReduceMap[ $yyruleno ])) {
+        if (isset(self::$yyReduceMap[$yyruleno])) {
             // call the action
             $this->_retvalue = null;
-            $this->{'yy_r' . self::$yyReduceMap[ $yyruleno ]}();
+            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
             $yy_lefthand_side = $this->_retvalue;
         }
-        $yygoto = self::$yyRuleInfo[ $yyruleno ][ 0 ];
-        $yysize = self::$yyRuleInfo[ $yyruleno ][ 1 ];
+        $yygoto = self::$yyRuleInfo[$yyruleno][0];
+        $yysize = self::$yyRuleInfo[$yyruleno][1];
         $this->yyidx -= $yysize;
-        for ($i = $yysize; $i; $i --) {
+        for ($i = $yysize; $i; $i--) {
             // pop all of the right-hand side parameters
             array_pop($this->yystack);
         }
-        $yyact = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno, $yygoto);
+        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
         if ($yyact < self::YYNSTATE) {
             if (!$this->yyTraceFILE && $yysize) {
-                $this->yyidx ++;
+                $this->yyidx++;
                 $x = new TPC_yyStackEntry;
                 $x->stateno = $yyact;
                 $x->major = $yygoto;
                 $x->minor = $yy_lefthand_side;
-                $this->yystack[ $this->yyidx ] = $x;
+                $this->yystack[$this->yyidx] = $x;
             } else {
                 $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
             }
@@ -951,7 +951,7 @@ 
 
     public function doParse($yymajor, $yytokenvalue)
     {
-        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
+        $yyerrorhit = 0; /* True if yymajor has invoked an error */
 
         if ($this->yyidx === null || $this->yyidx < 0) {
             $this->yyidx = 0;
@@ -965,7 +965,7 @@ 
         $yyendofinput = ($yymajor == 0);
 
         if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sInput %s\n", $this->yyTracePrompt, $this->yyTokenName[ $yymajor ]);
+            fprintf($this->yyTraceFILE, "%sInput %s\n", $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
         }
 
         do {
@@ -976,7 +976,7 @@ 
             }
             if ($yyact < self::YYNSTATE) {
                 $this->yy_shift($yyact, $yymajor, $yytokenvalue);
-                $this->yyerrcnt --;
+                $this->yyerrcnt--;
                 if ($yyendofinput && $this->yyidx >= 0) {
                     $yymajor = 0;
                 } else {
@@ -992,11 +992,11 @@ 
                     if ($this->yyerrcnt < 0) {
                         $this->yy_syntax_error($yymajor, $yytokenvalue);
                     }
-                    $yymx = $this->yystack[ $this->yyidx ]->major;
+                    $yymx = $this->yystack[$this->yyidx]->major;
                     if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
                         if ($this->yyTraceFILE) {
                             fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", $this->yyTracePrompt,
-                                    $this->yyTokenName[ $yymajor ]);
+                                    $this->yyTokenName[$yymajor]);
                         }
                         $this->yy_destructor($yymajor, $yytokenvalue);
                         $yymajor = self::YYNOCODE;

Indentation +961 added lines, -961 removed lines

@@ -2,75 +2,75 @@ 
 
 class TPC_yyToken implements ArrayAccess
 {
-    public $string = '';
-
-    public $metadata = array();
-
-    public function __construct($s, $m = array())
-    {
-        if ($s instanceof TPC_yyToken) {
-            $this->string = $s->string;
-            $this->metadata = $s->metadata;
-        } else {
-            $this->string = (string) $s;
-            if ($m instanceof TPC_yyToken) {
-                $this->metadata = $m->metadata;
-            } elseif (is_array($m)) {
-                $this->metadata = $m;
-            }
-        }
-    }
-
-    public function __toString()
-    {
-        return $this->string;
-    }
-
-    public function offsetExists($offset)
-    {
-        return isset($this->metadata[ $offset ]);
-    }
-
-    public function offsetGet($offset)
-    {
-        return $this->metadata[ $offset ];
-    }
-
-    public function offsetSet($offset, $value)
-    {
-        if ($offset === null) {
-            if (isset($value[ 0 ])) {
-                $x = ($value instanceof TPC_yyToken) ? $value->metadata : $value;
-                $this->metadata = array_merge($this->metadata, $x);
-
-                return;
-            }
-            $offset = count($this->metadata);
-        }
-        if ($value === null) {
-            return;
-        }
-        if ($value instanceof TPC_yyToken) {
-            if ($value->metadata) {
-                $this->metadata[ $offset ] = $value->metadata;
-            }
-        } elseif ($value) {
-            $this->metadata[ $offset ] = $value;
-        }
-    }
-
-    public function offsetUnset($offset)
-    {
-        unset($this->metadata[ $offset ]);
-    }
+	public $string = '';
+
+	public $metadata = array();
+
+	public function __construct($s, $m = array())
+	{
+		if ($s instanceof TPC_yyToken) {
+			$this->string = $s->string;
+			$this->metadata = $s->metadata;
+		} else {
+			$this->string = (string) $s;
+			if ($m instanceof TPC_yyToken) {
+				$this->metadata = $m->metadata;
+			} elseif (is_array($m)) {
+				$this->metadata = $m;
+			}
+		}
+	}
+
+	public function __toString()
+	{
+		return $this->string;
+	}
+
+	public function offsetExists($offset)
+	{
+		return isset($this->metadata[ $offset ]);
+	}
+
+	public function offsetGet($offset)
+	{
+		return $this->metadata[ $offset ];
+	}
+
+	public function offsetSet($offset, $value)
+	{
+		if ($offset === null) {
+			if (isset($value[ 0 ])) {
+				$x = ($value instanceof TPC_yyToken) ? $value->metadata : $value;
+				$this->metadata = array_merge($this->metadata, $x);
+
+				return;
+			}
+			$offset = count($this->metadata);
+		}
+		if ($value === null) {
+			return;
+		}
+		if ($value instanceof TPC_yyToken) {
+			if ($value->metadata) {
+				$this->metadata[ $offset ] = $value->metadata;
+			}
+		} elseif ($value) {
+			$this->metadata[ $offset ] = $value;
+		}
+	}
+
+	public function offsetUnset($offset)
+	{
+		unset($this->metadata[ $offset ]);
+	}
 }
 
 class TPC_yyStackEntry
 {
-    public $stateno;       /* The state-number */
-    public $major;         /* The major token value.  This is the code
+	public $stateno;       /* The state-number */
+	public $major;         /* The major token value.  This is the code
                      ** number for the token at this stack level */
-    public $minor; /* The user-supplied minor token value.  This
+	public $minor; /* The user-supplied minor token value.  This
                      ** is the value of the token  */
 }
 
@@ -90,952 +90,952 @@ 
  */
 class Smarty_Internal_Configfileparser
 {
-    #line 25 "../smarty/lexer/smarty_internal_configfileparser.y"
-
-    /**
-     * result status
-     *
-     * @var bool
-     */
-    public $successful = true;
-
-    /**
-     * return value
-     *
-     * @var mixed
-     */
-    public $retvalue = 0;
-
-    /**
-     * @var
-     */
-    public $yymajor;
-
-    /**
-     * lexer object
-     *
-     * @var Smarty_Internal_Configfilelexer
-     */
-    private $lex;
-
-    /**
-     * internal error flag
-     *
-     * @var bool
-     */
-    private $internalError = false;
-
-    /**
-     * compiler object
-     *
-     * @var Smarty_Internal_Config_File_Compiler
-     */
-    public $compiler = null;
-
-    /**
-     * smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * copy of config_overwrite property
-     *
-     * @var bool
-     */
-    private $configOverwrite = false;
-
-    /**
-     * copy of config_read_hidden property
-     *
-     * @var bool
-     */
-    private $configReadHidden = false;
-
-    /**
-     * helper map
-     *
-     * @var array
-     */
-    private static $escapes_single = Array('\\' => '\\', '\'' => '\'');
-
-    /**
-     * constructor
-     *
-     * @param Smarty_Internal_Configfilelexer      $lex
-     * @param Smarty_Internal_Config_File_Compiler $compiler
-     */
-    public function __construct(Smarty_Internal_Configfilelexer $lex, Smarty_Internal_Config_File_Compiler $compiler)
-    {
-        // set instance object
-        self::instance($this);
-        $this->lex = $lex;
-        $this->smarty = $compiler->smarty;
-        $this->compiler = $compiler;
-        $this->configOverwrite = $this->smarty->config_overwrite;
-        $this->configReadHidden = $this->smarty->config_read_hidden;
-    }
-
-    /**
-     * @param null $new_instance
-     *
-     * @return null
-     */
-    public static function &instance($new_instance = null)
-    {
-        static $instance = null;
-        if (isset($new_instance) && is_object($new_instance)) {
-            $instance = $new_instance;
-        }
-        return $instance;
-    }
-
-    /**
-     * parse optional boolean keywords
-     *
-     * @param string $str
-     *
-     * @return bool
-     */
-    private function parse_bool($str)
-    {
-        $str = strtolower($str);
-        if (in_array($str, array('on', 'yes', 'true'))) {
-            $res = true;
-        } else {
-            $res = false;
-        }
-        return $res;
-    }
-
-    /**
-     * parse single quoted string
-     *  remove outer quotes
-     *  unescape inner quotes
-     *
-     * @param string $qstr
-     *
-     * @return string
-     */
-    private static function parse_single_quoted_string($qstr)
-    {
-        $escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
-
-        $ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE);
-
-        $str = "";
-        foreach ($ss as $s) {
-            if (strlen($s) === 2 && $s[ 0 ] === '\\') {
-                if (isset(self::$escapes_single[ $s[ 1 ] ])) {
-                    $s = self::$escapes_single[ $s[ 1 ] ];
-                }
-            }
-            $str .= $s;
-        }
-        return $str;
-    }
-
-    /**
-     * parse double quoted string
-     *
-     * @param string $qstr
-     *
-     * @return string
-     */
-    private static function parse_double_quoted_string($qstr)
-    {
-        $inner_str = substr($qstr, 1, strlen($qstr) - 2);
-        return stripcslashes($inner_str);
-    }
-
-    /**
-     * parse triple quoted string
-     *
-     * @param string $qstr
-     *
-     * @return string
-     */
-    private static function parse_tripple_double_quoted_string($qstr)
-    {
-        return stripcslashes($qstr);
-    }
-
-    /**
-     * set a config variable in target array
-     *
-     * @param array $var
-     * @param array $target_array
-     */
-    private function set_var(Array $var, Array &$target_array)
-    {
-        $key = $var[ "key" ];
-        $value = $var[ "value" ];
-
-        if ($this->configOverwrite || !isset($target_array[ 'vars' ][ $key ])) {
-            $target_array[ 'vars' ][ $key ] = $value;
-        } else {
-            settype($target_array[ 'vars' ][ $key ], 'array');
-            $target_array[ 'vars' ][ $key ][] = $value;
-        }
-    }
-
-    /**
-     * add config variable to global vars
-     *
-     * @param array $vars
-     */
-    private function add_global_vars(Array $vars)
-    {
-        if (!isset($this->compiler->config_data[ 'vars' ])) {
-            $this->compiler->config_data[ 'vars' ] = Array();
-        }
-        foreach ($vars as $var) {
-            $this->set_var($var, $this->compiler->config_data);
-        }
-    }
-
-    /**
-     * add config variable to section
-     *
-     * @param string $section_name
-     * @param array  $vars
-     */
-    private function add_section_vars($section_name, Array $vars)
-    {
-        if (!isset($this->compiler->config_data[ 'sections' ][ $section_name ][ 'vars' ])) {
-            $this->compiler->config_data[ 'sections' ][ $section_name ][ 'vars' ] = Array();
-        }
-        foreach ($vars as $var) {
-            $this->set_var($var, $this->compiler->config_data[ 'sections' ][ $section_name ]);
-        }
-    }
-
-    const TPC_OPENB = 1;
+	#line 25 "../smarty/lexer/smarty_internal_configfileparser.y"
+
+	/**
+	 * result status
+	 *
+	 * @var bool
+	 */
+	public $successful = true;
+
+	/**
+	 * return value
+	 *
+	 * @var mixed
+	 */
+	public $retvalue = 0;
+
+	/**
+	 * @var
+	 */
+	public $yymajor;
+
+	/**
+	 * lexer object
+	 *
+	 * @var Smarty_Internal_Configfilelexer
+	 */
+	private $lex;
+
+	/**
+	 * internal error flag
+	 *
+	 * @var bool
+	 */
+	private $internalError = false;
+
+	/**
+	 * compiler object
+	 *
+	 * @var Smarty_Internal_Config_File_Compiler
+	 */
+	public $compiler = null;
+
+	/**
+	 * smarty object
+	 *
+	 * @var Smarty
+	 */
+	public $smarty = null;
+
+	/**
+	 * copy of config_overwrite property
+	 *
+	 * @var bool
+	 */
+	private $configOverwrite = false;
+
+	/**
+	 * copy of config_read_hidden property
+	 *
+	 * @var bool
+	 */
+	private $configReadHidden = false;
+
+	/**
+	 * helper map
+	 *
+	 * @var array
+	 */
+	private static $escapes_single = Array('\\' => '\\', '\'' => '\'');
+
+	/**
+	 * constructor
+	 *
+	 * @param Smarty_Internal_Configfilelexer      $lex
+	 * @param Smarty_Internal_Config_File_Compiler $compiler
+	 */
+	public function __construct(Smarty_Internal_Configfilelexer $lex, Smarty_Internal_Config_File_Compiler $compiler)
+	{
+		// set instance object
+		self::instance($this);
+		$this->lex = $lex;
+		$this->smarty = $compiler->smarty;
+		$this->compiler = $compiler;
+		$this->configOverwrite = $this->smarty->config_overwrite;
+		$this->configReadHidden = $this->smarty->config_read_hidden;
+	}
+
+	/**
+	 * @param null $new_instance
+	 *
+	 * @return null
+	 */
+	public static function &instance($new_instance = null)
+	{
+		static $instance = null;
+		if (isset($new_instance) && is_object($new_instance)) {
+			$instance = $new_instance;
+		}
+		return $instance;
+	}
+
+	/**
+	 * parse optional boolean keywords
+	 *
+	 * @param string $str
+	 *
+	 * @return bool
+	 */
+	private function parse_bool($str)
+	{
+		$str = strtolower($str);
+		if (in_array($str, array('on', 'yes', 'true'))) {
+			$res = true;
+		} else {
+			$res = false;
+		}
+		return $res;
+	}
+
+	/**
+	 * parse single quoted string
+	 *  remove outer quotes
+	 *  unescape inner quotes
+	 *
+	 * @param string $qstr
+	 *
+	 * @return string
+	 */
+	private static function parse_single_quoted_string($qstr)
+	{
+		$escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
+
+		$ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE);
+
+		$str = "";
+		foreach ($ss as $s) {
+			if (strlen($s) === 2 && $s[ 0 ] === '\\') {
+				if (isset(self::$escapes_single[ $s[ 1 ] ])) {
+					$s = self::$escapes_single[ $s[ 1 ] ];
+				}
+			}
+			$str .= $s;
+		}
+		return $str;
+	}
+
+	/**
+	 * parse double quoted string
+	 *
+	 * @param string $qstr
+	 *
+	 * @return string
+	 */
+	private static function parse_double_quoted_string($qstr)
+	{
+		$inner_str = substr($qstr, 1, strlen($qstr) - 2);
+		return stripcslashes($inner_str);
+	}
+
+	/**
+	 * parse triple quoted string
+	 *
+	 * @param string $qstr
+	 *
+	 * @return string
+	 */
+	private static function parse_tripple_double_quoted_string($qstr)
+	{
+		return stripcslashes($qstr);
+	}
+
+	/**
+	 * set a config variable in target array
+	 *
+	 * @param array $var
+	 * @param array $target_array
+	 */
+	private function set_var(Array $var, Array &$target_array)
+	{
+		$key = $var[ "key" ];
+		$value = $var[ "value" ];
+
+		if ($this->configOverwrite || !isset($target_array[ 'vars' ][ $key ])) {
+			$target_array[ 'vars' ][ $key ] = $value;
+		} else {
+			settype($target_array[ 'vars' ][ $key ], 'array');
+			$target_array[ 'vars' ][ $key ][] = $value;
+		}
+	}
+
+	/**
+	 * add config variable to global vars
+	 *
+	 * @param array $vars
+	 */
+	private function add_global_vars(Array $vars)
+	{
+		if (!isset($this->compiler->config_data[ 'vars' ])) {
+			$this->compiler->config_data[ 'vars' ] = Array();
+		}
+		foreach ($vars as $var) {
+			$this->set_var($var, $this->compiler->config_data);
+		}
+	}
+
+	/**
+	 * add config variable to section
+	 *
+	 * @param string $section_name
+	 * @param array  $vars
+	 */
+	private function add_section_vars($section_name, Array $vars)
+	{
+		if (!isset($this->compiler->config_data[ 'sections' ][ $section_name ][ 'vars' ])) {
+			$this->compiler->config_data[ 'sections' ][ $section_name ][ 'vars' ] = Array();
+		}
+		foreach ($vars as $var) {
+			$this->set_var($var, $this->compiler->config_data[ 'sections' ][ $section_name ]);
+		}
+	}
+
+	const TPC_OPENB = 1;
 
-    const TPC_SECTION = 2;
+	const TPC_SECTION = 2;
 
-    const TPC_CLOSEB = 3;
+	const TPC_CLOSEB = 3;
 
-    const TPC_DOT = 4;
+	const TPC_DOT = 4;
 
-    const TPC_ID = 5;
+	const TPC_ID = 5;
 
-    const TPC_EQUAL = 6;
+	const TPC_EQUAL = 6;
 
-    const TPC_FLOAT = 7;
+	const TPC_FLOAT = 7;
 
-    const TPC_INT = 8;
+	const TPC_INT = 8;
 
-    const TPC_BOOL = 9;
+	const TPC_BOOL = 9;
 
-    const TPC_SINGLE_QUOTED_STRING = 10;
+	const TPC_SINGLE_QUOTED_STRING = 10;
 
-    const TPC_DOUBLE_QUOTED_STRING = 11;
+	const TPC_DOUBLE_QUOTED_STRING = 11;
 
-    const TPC_TRIPPLE_QUOTES = 12;
+	const TPC_TRIPPLE_QUOTES = 12;
 
-    const TPC_TRIPPLE_TEXT = 13;
+	const TPC_TRIPPLE_TEXT = 13;
 
-    const TPC_TRIPPLE_QUOTES_END = 14;
+	const TPC_TRIPPLE_QUOTES_END = 14;
 
-    const TPC_NAKED_STRING = 15;
+	const TPC_NAKED_STRING = 15;
 
-    const TPC_OTHER = 16;
+	const TPC_OTHER = 16;
 
-    const TPC_NEWLINE = 17;
+	const TPC_NEWLINE = 17;
 
-    const TPC_COMMENTSTART = 18;
+	const TPC_COMMENTSTART = 18;
 
-    const YY_NO_ACTION = 60;
+	const YY_NO_ACTION = 60;
 
-    const YY_ACCEPT_ACTION = 59;
+	const YY_ACCEPT_ACTION = 59;
 
-    const YY_ERROR_ACTION = 58;
+	const YY_ERROR_ACTION = 58;
 
-    const YY_SZ_ACTTAB = 38;
+	const YY_SZ_ACTTAB = 38;
 
-    static public $yy_action = array(29, 30, 34, 33, 24, 13, 19, 25, 35, 21, 59, 8, 3, 1, 20, 12, 14, 31, 20, 12, 15,
-                                     17, 23, 18, 27, 26, 4, 5, 6, 32, 2, 11, 28, 22, 16, 9, 7, 10,);
+	static public $yy_action = array(29, 30, 34, 33, 24, 13, 19, 25, 35, 21, 59, 8, 3, 1, 20, 12, 14, 31, 20, 12, 15,
+									 17, 23, 18, 27, 26, 4, 5, 6, 32, 2, 11, 28, 22, 16, 9, 7, 10,);
 
-    static public $yy_lookahead = array(7, 8, 9, 10, 11, 12, 5, 27, 15, 16, 20, 21, 23, 23, 17, 18, 13, 14, 17, 18, 15,
-                                        2, 17, 4, 25, 26, 6, 3, 3, 14, 23, 1, 24, 17, 2, 25, 22, 25,);
+	static public $yy_lookahead = array(7, 8, 9, 10, 11, 12, 5, 27, 15, 16, 20, 21, 23, 23, 17, 18, 13, 14, 17, 18, 15,
+										2, 17, 4, 25, 26, 6, 3, 3, 14, 23, 1, 24, 17, 2, 25, 22, 25,);
 
-    const YY_SHIFT_USE_DFLT = - 8;
+	const YY_SHIFT_USE_DFLT = - 8;
 
-    const YY_SHIFT_MAX = 19;
+	const YY_SHIFT_MAX = 19;
 
-    static public $yy_shift_ofst = array(- 8, 1, 1, 1, - 7, - 3, - 3, 30, - 8, - 8, - 8, 19, 5, 3, 15, 16, 24, 25, 32,
-                                         20,);
+	static public $yy_shift_ofst = array(- 8, 1, 1, 1, - 7, - 3, - 3, 30, - 8, - 8, - 8, 19, 5, 3, 15, 16, 24, 25, 32,
+										 20,);
 
-    const YY_REDUCE_USE_DFLT = - 21;
+	const YY_REDUCE_USE_DFLT = - 21;
 
-    const YY_REDUCE_MAX = 10;
+	const YY_REDUCE_MAX = 10;
 
-    static public $yy_reduce_ofst = array(- 10, - 1, - 1, - 1, - 20, 10, 12, 8, 14, 7, - 11,);
+	static public $yy_reduce_ofst = array(- 10, - 1, - 1, - 1, - 20, 10, 12, 8, 14, 7, - 11,);
 
-    static public $yyExpectedTokens = array(array(), array(5, 17, 18,), array(5, 17, 18,), array(5, 17, 18,),
-                                            array(7, 8, 9, 10, 11, 12, 15, 16,), array(17, 18,), array(17, 18,),
-                                            array(1,), array(), array(), array(), array(2, 4,), array(15, 17,),
-                                            array(13, 14,), array(14,), array(17,), array(3,), array(3,), array(2,),
-                                            array(6,), array(), array(), array(), array(), array(), array(), array(),
-                                            array(), array(), array(), array(), array(), array(), array(), array(),
-                                            array(),);
+	static public $yyExpectedTokens = array(array(), array(5, 17, 18,), array(5, 17, 18,), array(5, 17, 18,),
+											array(7, 8, 9, 10, 11, 12, 15, 16,), array(17, 18,), array(17, 18,),
+											array(1,), array(), array(), array(), array(2, 4,), array(15, 17,),
+											array(13, 14,), array(14,), array(17,), array(3,), array(3,), array(2,),
+											array(6,), array(), array(), array(), array(), array(), array(), array(),
+											array(), array(), array(), array(), array(), array(), array(), array(),
+											array(),);
 
-    static public $yy_default = array(44, 37, 41, 40, 58, 58, 58, 36, 39, 44, 44, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-                                      55, 54, 57, 56, 50, 45, 43, 42, 38, 46, 47, 52, 51, 49, 48, 53,);
+	static public $yy_default = array(44, 37, 41, 40, 58, 58, 58, 36, 39, 44, 44, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+									  55, 54, 57, 56, 50, 45, 43, 42, 38, 46, 47, 52, 51, 49, 48, 53,);
 
-    const YYNOCODE = 29;
+	const YYNOCODE = 29;
 
-    const YYSTACKDEPTH = 100;
+	const YYSTACKDEPTH = 100;
 
-    const YYNSTATE = 36;
+	const YYNSTATE = 36;
 
-    const YYNRULE = 22;
+	const YYNRULE = 22;
 
-    const YYERRORSYMBOL = 19;
+	const YYERRORSYMBOL = 19;
 
-    const YYERRSYMDT = 'yy0';
+	const YYERRSYMDT = 'yy0';
 
-    const YYFALLBACK = 0;
+	const YYFALLBACK = 0;
 
-    public static $yyFallback = array();
+	public static $yyFallback = array();
 
-    public function Trace($TraceFILE, $zTracePrompt)
-    {
-        if (!$TraceFILE) {
-            $zTracePrompt = 0;
-        } elseif (!$zTracePrompt) {
-            $TraceFILE = 0;
-        }
-        $this->yyTraceFILE = $TraceFILE;
-        $this->yyTracePrompt = $zTracePrompt;
-    }
+	public function Trace($TraceFILE, $zTracePrompt)
+	{
+		if (!$TraceFILE) {
+			$zTracePrompt = 0;
+		} elseif (!$zTracePrompt) {
+			$TraceFILE = 0;
+		}
+		$this->yyTraceFILE = $TraceFILE;
+		$this->yyTracePrompt = $zTracePrompt;
+	}
 
-    public function PrintTrace()
-    {
-        $this->yyTraceFILE = fopen('php://output', 'w');
-        $this->yyTracePrompt = '<br>';
-    }
+	public function PrintTrace()
+	{
+		$this->yyTraceFILE = fopen('php://output', 'w');
+		$this->yyTracePrompt = '<br>';
+	}
 
-    public $yyTraceFILE;
+	public $yyTraceFILE;
 
-    public $yyTracePrompt;
+	public $yyTracePrompt;
 
-    public $yyidx;                    /* Index of top element in stack */
-    public $yyerrcnt;                 /* Shifts left before out of the error */
-    public $yystack = array();  /* The parser's stack */
+	public $yyidx;                    /* Index of top element in stack */
+	public $yyerrcnt;                 /* Shifts left before out of the error */
+	public $yystack = array();  /* The parser's stack */
 
-    public $yyTokenName = array('$', 'OPENB', 'SECTION', 'CLOSEB', 'DOT', 'ID', 'EQUAL', 'FLOAT', 'INT', 'BOOL',
-                                'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING', 'TRIPPLE_QUOTES', 'TRIPPLE_TEXT',
-                                'TRIPPLE_QUOTES_END', 'NAKED_STRING', 'OTHER', 'NEWLINE', 'COMMENTSTART', 'error',
-                                'start', 'global_vars', 'sections', 'var_list', 'section', 'newline', 'var', 'value',);
+	public $yyTokenName = array('$', 'OPENB', 'SECTION', 'CLOSEB', 'DOT', 'ID', 'EQUAL', 'FLOAT', 'INT', 'BOOL',
+								'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING', 'TRIPPLE_QUOTES', 'TRIPPLE_TEXT',
+								'TRIPPLE_QUOTES_END', 'NAKED_STRING', 'OTHER', 'NEWLINE', 'COMMENTSTART', 'error',
+								'start', 'global_vars', 'sections', 'var_list', 'section', 'newline', 'var', 'value',);
 
-    public static $yyRuleName = array('start ::= global_vars sections', 'global_vars ::= var_list',
-                                      'sections ::= sections section', 'sections ::=',
-                                      'section ::= OPENB SECTION CLOSEB newline var_list',
-                                      'section ::= OPENB DOT SECTION CLOSEB newline var_list',
-                                      'var_list ::= var_list newline', 'var_list ::= var_list var', 'var_list ::=',
-                                      'var ::= ID EQUAL value', 'value ::= FLOAT', 'value ::= INT', 'value ::= BOOL',
-                                      'value ::= SINGLE_QUOTED_STRING', 'value ::= DOUBLE_QUOTED_STRING',
-                                      'value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END',
-                                      'value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END', 'value ::= NAKED_STRING',
-                                      'value ::= OTHER', 'newline ::= NEWLINE', 'newline ::= COMMENTSTART NEWLINE',
-                                      'newline ::= COMMENTSTART NAKED_STRING NEWLINE',);
+	public static $yyRuleName = array('start ::= global_vars sections', 'global_vars ::= var_list',
+									  'sections ::= sections section', 'sections ::=',
+									  'section ::= OPENB SECTION CLOSEB newline var_list',
+									  'section ::= OPENB DOT SECTION CLOSEB newline var_list',
+									  'var_list ::= var_list newline', 'var_list ::= var_list var', 'var_list ::=',
+									  'var ::= ID EQUAL value', 'value ::= FLOAT', 'value ::= INT', 'value ::= BOOL',
+									  'value ::= SINGLE_QUOTED_STRING', 'value ::= DOUBLE_QUOTED_STRING',
+									  'value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END',
+									  'value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END', 'value ::= NAKED_STRING',
+									  'value ::= OTHER', 'newline ::= NEWLINE', 'newline ::= COMMENTSTART NEWLINE',
+									  'newline ::= COMMENTSTART NAKED_STRING NEWLINE',);
 
-    public function tokenName($tokenType)
-    {
-        if ($tokenType === 0) {
-            return 'End of Input';
-        }
+	public function tokenName($tokenType)
+	{
+		if ($tokenType === 0) {
+			return 'End of Input';
+		}
 		$countYyTokenName = count($this->yyTokenName);
-        if ($tokenType > 0 && $tokenType < $countYyTokenName) {
-            return $this->yyTokenName[ $tokenType ];
-        } else {
-            return "Unknown";
-        }
-    }
-
-    public static function yy_destructor($yymajor, $yypminor)
-    {
-        switch ($yymajor) {
-            default:
-                break;   /* If no destructor action specified: do nothing */
-        }
-    }
-
-    public function yy_pop_parser_stack()
-    {
-        if (empty($this->yystack)) {
-            return;
-        }
-        $yytos = array_pop($this->yystack);
-        if ($this->yyTraceFILE && $this->yyidx >= 0) {
-            fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[ $yytos->major ] . "\n");
-        }
-        $yymajor = $yytos->major;
-        self::yy_destructor($yymajor, $yytos->minor);
-        $this->yyidx --;
-
-        return $yymajor;
-    }
-
-    public function __destruct()
-    {
-        while ($this->yystack !== Array()) {
-            $this->yy_pop_parser_stack();
-        }
-        if (is_resource($this->yyTraceFILE)) {
-            fclose($this->yyTraceFILE);
-        }
-    }
-
-    public function yy_get_expected_tokens($token)
-    {
-        static $res3 = array();
-        static $res4 = array();
-        $state = $this->yystack[ $this->yyidx ]->stateno;
-        $expected = self::$yyExpectedTokens[ $state ];
-        if (isset($res3[ $state ][ $token ])) {
-            if ($res3[ $state ][ $token ]) {
-                return $expected;
-            }
-        } else {
-            if ($res3[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
-                return $expected;
-            }
-        }
-        $stack = $this->yystack;
-        $yyidx = $this->yyidx;
-        do {
-            $yyact = $this->yy_find_shift_action($token);
-            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
-                // reduce action
-                $done = 0;
-                do {
-                    if ($done ++ == 100) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // too much recursion prevents proper detection
-                        // so give up
-                        return array_unique($expected);
-                    }
-                    $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
-                    $nextstate = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno,
-                                                              self::$yyRuleInfo[ $yyruleno ][ 0 ]);
-                    if (isset(self::$yyExpectedTokens[ $nextstate ])) {
-                        $expected = array_merge($expected, self::$yyExpectedTokens[ $nextstate ]);
-                        if (isset($res4[ $nextstate ][ $token ])) {
-                            if ($res4[ $nextstate ][ $token ]) {
-                                $this->yyidx = $yyidx;
-                                $this->yystack = $stack;
-                                return array_unique($expected);
-                            }
-                        } else {
-                            if ($res4[ $nextstate ][ $token ] =
-                                in_array($token, self::$yyExpectedTokens[ $nextstate ], true)
-                            ) {
-                                $this->yyidx = $yyidx;
-                                $this->yystack = $stack;
-                                return array_unique($expected);
-                            }
-                        }
-                    }
-                    if ($nextstate < self::YYNSTATE) {
-                        // we need to shift a non-terminal
-                        $this->yyidx ++;
-                        $x = new TPC_yyStackEntry;
-                        $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
-                        $this->yystack[ $this->yyidx ] = $x;
-                        continue 2;
-                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // the last token was just ignored, we can't accept
-                        // by ignoring input, this is in essence ignoring a
-                        // syntax error!
-                        return array_unique($expected);
-                    } elseif ($nextstate === self::YY_NO_ACTION) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // input accepted, but not shifted (I guess)
-                        return $expected;
-                    } else {
-                        $yyact = $nextstate;
-                    }
-                }
-                while (true);
-            }
-            break;
-        }
-        while (true);
-        $this->yyidx = $yyidx;
-        $this->yystack = $stack;
-
-        return array_unique($expected);
-    }
-
-    public function yy_is_expected_token($token)
-    {
-        static $res = array();
-        static $res2 = array();
-        if ($token === 0) {
-            return true; // 0 is not part of this
-        }
-        $state = $this->yystack[ $this->yyidx ]->stateno;
-        if (isset($res[ $state ][ $token ])) {
-            if ($res[ $state ][ $token ]) {
-                return true;
-            }
-        } else {
-            if ($res[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
-                return true;
-            }
-        }
-        $stack = $this->yystack;
-        $yyidx = $this->yyidx;
-        do {
-            $yyact = $this->yy_find_shift_action($token);
-            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
-                // reduce action
-                $done = 0;
-                do {
-                    if ($done ++ == 100) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // too much recursion prevents proper detection
-                        // so give up
-                        return true;
-                    }
-                    $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
-                    $nextstate = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno,
-                                                              self::$yyRuleInfo[ $yyruleno ][ 0 ]);
-                    if (isset($res2[ $nextstate ][ $token ])) {
-                        if ($res2[ $nextstate ][ $token ]) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-                            return true;
-                        }
-                    } else {
-                        if ($res2[ $nextstate ][ $token ] = (isset(self::$yyExpectedTokens[ $nextstate ]) &&
-                                                             in_array($token, self::$yyExpectedTokens[ $nextstate ],
-                                                                      true))
-                        ) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-                            return true;
-                        }
-                    }
-                    if ($nextstate < self::YYNSTATE) {
-                        // we need to shift a non-terminal
-                        $this->yyidx ++;
-                        $x = new TPC_yyStackEntry;
-                        $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
-                        $this->yystack[ $this->yyidx ] = $x;
-                        continue 2;
-                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        if (!$token) {
-                            // end of input: this is valid
-                            return true;
-                        }
-                        // the last token was just ignored, we can't accept
-                        // by ignoring input, this is in essence ignoring a
-                        // syntax error!
-                        return false;
-                    } elseif ($nextstate === self::YY_NO_ACTION) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // input accepted, but not shifted (I guess)
-                        return true;
-                    } else {
-                        $yyact = $nextstate;
-                    }
-                }
-                while (true);
-            }
-            break;
-        }
-        while (true);
-        $this->yyidx = $yyidx;
-        $this->yystack = $stack;
-
-        return true;
-    }
-
-    public function yy_find_shift_action($iLookAhead)
-    {
-        $stateno = $this->yystack[ $this->yyidx ]->stateno;
-
-        /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
-        if (!isset(self::$yy_shift_ofst[ $stateno ])) {
-            // no shift actions
-            return self::$yy_default[ $stateno ];
-        }
-        $i = self::$yy_shift_ofst[ $stateno ];
-        if ($i === self::YY_SHIFT_USE_DFLT) {
-            return self::$yy_default[ $stateno ];
-        }
-        if ($iLookAhead == self::YYNOCODE) {
-            return self::YY_NO_ACTION;
-        }
-        $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[ $i ] != $iLookAhead) {
+		if ($tokenType > 0 && $tokenType < $countYyTokenName) {
+			return $this->yyTokenName[ $tokenType ];
+		} else {
+			return "Unknown";
+		}
+	}
+
+	public static function yy_destructor($yymajor, $yypminor)
+	{
+		switch ($yymajor) {
+			default:
+				break;   /* If no destructor action specified: do nothing */
+		}
+	}
+
+	public function yy_pop_parser_stack()
+	{
+		if (empty($this->yystack)) {
+			return;
+		}
+		$yytos = array_pop($this->yystack);
+		if ($this->yyTraceFILE && $this->yyidx >= 0) {
+			fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[ $yytos->major ] . "\n");
+		}
+		$yymajor = $yytos->major;
+		self::yy_destructor($yymajor, $yytos->minor);
+		$this->yyidx --;
+
+		return $yymajor;
+	}
+
+	public function __destruct()
+	{
+		while ($this->yystack !== Array()) {
+			$this->yy_pop_parser_stack();
+		}
+		if (is_resource($this->yyTraceFILE)) {
+			fclose($this->yyTraceFILE);
+		}
+	}
+
+	public function yy_get_expected_tokens($token)
+	{
+		static $res3 = array();
+		static $res4 = array();
+		$state = $this->yystack[ $this->yyidx ]->stateno;
+		$expected = self::$yyExpectedTokens[ $state ];
+		if (isset($res3[ $state ][ $token ])) {
+			if ($res3[ $state ][ $token ]) {
+				return $expected;
+			}
+		} else {
+			if ($res3[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
+				return $expected;
+			}
+		}
+		$stack = $this->yystack;
+		$yyidx = $this->yyidx;
+		do {
+			$yyact = $this->yy_find_shift_action($token);
+			if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+				// reduce action
+				$done = 0;
+				do {
+					if ($done ++ == 100) {
+						$this->yyidx = $yyidx;
+						$this->yystack = $stack;
+						// too much recursion prevents proper detection
+						// so give up
+						return array_unique($expected);
+					}
+					$yyruleno = $yyact - self::YYNSTATE;
+					$this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
+					$nextstate = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno,
+															  self::$yyRuleInfo[ $yyruleno ][ 0 ]);
+					if (isset(self::$yyExpectedTokens[ $nextstate ])) {
+						$expected = array_merge($expected, self::$yyExpectedTokens[ $nextstate ]);
+						if (isset($res4[ $nextstate ][ $token ])) {
+							if ($res4[ $nextstate ][ $token ]) {
+								$this->yyidx = $yyidx;
+								$this->yystack = $stack;
+								return array_unique($expected);
+							}
+						} else {
+							if ($res4[ $nextstate ][ $token ] =
+								in_array($token, self::$yyExpectedTokens[ $nextstate ], true)
+							) {
+								$this->yyidx = $yyidx;
+								$this->yystack = $stack;
+								return array_unique($expected);
+							}
+						}
+					}
+					if ($nextstate < self::YYNSTATE) {
+						// we need to shift a non-terminal
+						$this->yyidx ++;
+						$x = new TPC_yyStackEntry;
+						$x->stateno = $nextstate;
+						$x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+						$this->yystack[ $this->yyidx ] = $x;
+						continue 2;
+					} elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
+						$this->yyidx = $yyidx;
+						$this->yystack = $stack;
+						// the last token was just ignored, we can't accept
+						// by ignoring input, this is in essence ignoring a
+						// syntax error!
+						return array_unique($expected);
+					} elseif ($nextstate === self::YY_NO_ACTION) {
+						$this->yyidx = $yyidx;
+						$this->yystack = $stack;
+						// input accepted, but not shifted (I guess)
+						return $expected;
+					} else {
+						$yyact = $nextstate;
+					}
+				}
+				while (true);
+			}
+			break;
+		}
+		while (true);
+		$this->yyidx = $yyidx;
+		$this->yystack = $stack;
+
+		return array_unique($expected);
+	}
+
+	public function yy_is_expected_token($token)
+	{
+		static $res = array();
+		static $res2 = array();
+		if ($token === 0) {
+			return true; // 0 is not part of this
+		}
+		$state = $this->yystack[ $this->yyidx ]->stateno;
+		if (isset($res[ $state ][ $token ])) {
+			if ($res[ $state ][ $token ]) {
+				return true;
+			}
+		} else {
+			if ($res[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
+				return true;
+			}
+		}
+		$stack = $this->yystack;
+		$yyidx = $this->yyidx;
+		do {
+			$yyact = $this->yy_find_shift_action($token);
+			if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+				// reduce action
+				$done = 0;
+				do {
+					if ($done ++ == 100) {
+						$this->yyidx = $yyidx;
+						$this->yystack = $stack;
+						// too much recursion prevents proper detection
+						// so give up
+						return true;
+					}
+					$yyruleno = $yyact - self::YYNSTATE;
+					$this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
+					$nextstate = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno,
+															  self::$yyRuleInfo[ $yyruleno ][ 0 ]);
+					if (isset($res2[ $nextstate ][ $token ])) {
+						if ($res2[ $nextstate ][ $token ]) {
+							$this->yyidx = $yyidx;
+							$this->yystack = $stack;
+							return true;
+						}
+					} else {
+						if ($res2[ $nextstate ][ $token ] = (isset(self::$yyExpectedTokens[ $nextstate ]) &&
+															 in_array($token, self::$yyExpectedTokens[ $nextstate ],
+																	  true))
+						) {
+							$this->yyidx = $yyidx;
+							$this->yystack = $stack;
+							return true;
+						}
+					}
+					if ($nextstate < self::YYNSTATE) {
+						// we need to shift a non-terminal
+						$this->yyidx ++;
+						$x = new TPC_yyStackEntry;
+						$x->stateno = $nextstate;
+						$x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+						$this->yystack[ $this->yyidx ] = $x;
+						continue 2;
+					} elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
+						$this->yyidx = $yyidx;
+						$this->yystack = $stack;
+						if (!$token) {
+							// end of input: this is valid
+							return true;
+						}
+						// the last token was just ignored, we can't accept
+						// by ignoring input, this is in essence ignoring a
+						// syntax error!
+						return false;
+					} elseif ($nextstate === self::YY_NO_ACTION) {
+						$this->yyidx = $yyidx;
+						$this->yystack = $stack;
+						// input accepted, but not shifted (I guess)
+						return true;
+					} else {
+						$yyact = $nextstate;
+					}
+				}
+				while (true);
+			}
+			break;
+		}
+		while (true);
+		$this->yyidx = $yyidx;
+		$this->yystack = $stack;
+
+		return true;
+	}
+
+	public function yy_find_shift_action($iLookAhead)
+	{
+		$stateno = $this->yystack[ $this->yyidx ]->stateno;
+
+		/* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
+		if (!isset(self::$yy_shift_ofst[ $stateno ])) {
+			// no shift actions
+			return self::$yy_default[ $stateno ];
+		}
+		$i = self::$yy_shift_ofst[ $stateno ];
+		if ($i === self::YY_SHIFT_USE_DFLT) {
+			return self::$yy_default[ $stateno ];
+		}
+		if ($iLookAhead == self::YYNOCODE) {
+			return self::YY_NO_ACTION;
+		}
+		$i += $iLookAhead;
+		if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[ $i ] != $iLookAhead) {
 			$countYyFallback = count(self::$yyFallback);
-            if (count(self::$yyFallback) && $iLookAhead < $countYyFallback &&
-                ($iFallback = self::$yyFallback[ $iLookAhead ]) != 0
-            ) {
-                if ($this->yyTraceFILE) {
-                    fwrite($this->yyTraceFILE,
-                           $this->yyTracePrompt . "FALLBACK " . $this->yyTokenName[ $iLookAhead ] . " => " .
-                           $this->yyTokenName[ $iFallback ] . "\n");
-                }
-
-                return $this->yy_find_shift_action($iFallback);
-            }
-
-            return self::$yy_default[ $stateno ];
-        } else {
-            return self::$yy_action[ $i ];
-        }
-    }
-
-    public function yy_find_reduce_action($stateno, $iLookAhead)
-    {
-        /* $stateno = $this->yystack[$this->yyidx]->stateno; */
-
-        if (!isset(self::$yy_reduce_ofst[ $stateno ])) {
-            return self::$yy_default[ $stateno ];
-        }
-        $i = self::$yy_reduce_ofst[ $stateno ];
-        if ($i == self::YY_REDUCE_USE_DFLT) {
-            return self::$yy_default[ $stateno ];
-        }
-        if ($iLookAhead == self::YYNOCODE) {
-            return self::YY_NO_ACTION;
-        }
-        $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[ $i ] != $iLookAhead) {
-            return self::$yy_default[ $stateno ];
-        } else {
-            return self::$yy_action[ $i ];
-        }
-    }
-
-    public function yy_shift($yyNewState, $yyMajor, $yypMinor)
-    {
-        $this->yyidx ++;
-        if ($this->yyidx >= self::YYSTACKDEPTH) {
-            $this->yyidx --;
-            if ($this->yyTraceFILE) {
-                fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
-            }
-            while ($this->yyidx >= 0) {
-                $this->yy_pop_parser_stack();
-            }
-            #line 255 "../smarty/lexer/smarty_internal_configfileparser.y"
-
-            $this->internalError = true;
-            $this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
-
-            return;
-        }
-        $yytos = new TPC_yyStackEntry;
-        $yytos->stateno = $yyNewState;
-        $yytos->major = $yyMajor;
-        $yytos->minor = $yypMinor;
-        $this->yystack[] = $yytos;
-        if ($this->yyTraceFILE && $this->yyidx > 0) {
-            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, $yyNewState);
-            fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
-            for ($i = 1; $i <= $this->yyidx; $i ++) {
-                fprintf($this->yyTraceFILE, " %s", $this->yyTokenName[ $this->yystack[ $i ]->major ]);
-            }
-            fwrite($this->yyTraceFILE, "\n");
-        }
-    }
-
-    public static $yyRuleInfo = array(array(0 => 20, 1 => 2), array(0 => 21, 1 => 1), array(0 => 22, 1 => 2),
-                                      array(0 => 22, 1 => 0), array(0 => 24, 1 => 5), array(0 => 24, 1 => 6),
-                                      array(0 => 23, 1 => 2), array(0 => 23, 1 => 2), array(0 => 23, 1 => 0),
-                                      array(0 => 26, 1 => 3), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1),
-                                      array(0 => 27, 1 => 1), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1),
-                                      array(0 => 27, 1 => 3), array(0 => 27, 1 => 2), array(0 => 27, 1 => 1),
-                                      array(0 => 27, 1 => 1), array(0 => 25, 1 => 1), array(0 => 25, 1 => 2),
-                                      array(0 => 25, 1 => 3),);
-
-    public static $yyReduceMap = array(0 => 0, 2 => 0, 3 => 0, 19 => 0, 20 => 0, 21 => 0, 1 => 1, 4 => 4, 5 => 5,
-                                       6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13, 14 => 14,
-                                       15 => 15, 16 => 16, 17 => 17, 18 => 17,);
-
-    #line 261 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r0()
-    {
-        $this->_retvalue = null;
-    }
-
-    #line 266 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r1()
-    {
-        $this->add_global_vars($this->yystack[ $this->yyidx + 0 ]->minor);
-        $this->_retvalue = null;
-    }
-
-    #line 280 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r4()
-    {
-        $this->add_section_vars($this->yystack[ $this->yyidx + - 3 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor);
-        $this->_retvalue = null;
-    }
-
-    #line 285 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r5()
-    {
-        if ($this->configReadHidden) {
-            $this->add_section_vars($this->yystack[ $this->yyidx + - 3 ]->minor,
-                                    $this->yystack[ $this->yyidx + 0 ]->minor);
-        }
-        $this->_retvalue = null;
-    }
-
-    #line 293 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r6()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor;
-    }
-
-    #line 297 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r7()
-    {
-        $this->_retvalue =
-            array_merge($this->yystack[ $this->yyidx + - 1 ]->minor, Array($this->yystack[ $this->yyidx + 0 ]->minor));
-    }
-
-    #line 301 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r8()
-    {
-        $this->_retvalue = Array();
-    }
-
-    #line 307 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r9()
-    {
-        $this->_retvalue = Array("key" => $this->yystack[ $this->yyidx + - 2 ]->minor,
-                                 "value" => $this->yystack[ $this->yyidx + 0 ]->minor);
-    }
-
-    #line 312 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r10()
-    {
-        $this->_retvalue = (float) $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    #line 316 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r11()
-    {
-        $this->_retvalue = (int) $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    #line 320 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r12()
-    {
-        $this->_retvalue = $this->parse_bool($this->yystack[ $this->yyidx + 0 ]->minor);
-    }
-
-    #line 324 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r13()
-    {
-        $this->_retvalue = self::parse_single_quoted_string($this->yystack[ $this->yyidx + 0 ]->minor);
-    }
-
-    #line 328 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r14()
-    {
-        $this->_retvalue = self::parse_double_quoted_string($this->yystack[ $this->yyidx + 0 ]->minor);
-    }
-
-    #line 332 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r15()
-    {
-        $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[ $this->yyidx + - 1 ]->minor);
-    }
-
-    #line 336 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r16()
-    {
-        $this->_retvalue = '';
-    }
-
-    #line 340 "../smarty/lexer/smarty_internal_configfileparser.y"
-    public function yy_r17()
-    {
-        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
-    }
-
-    private $_retvalue;
-
-    public function yy_reduce($yyruleno)
-    {
+			if (count(self::$yyFallback) && $iLookAhead < $countYyFallback &&
+				($iFallback = self::$yyFallback[ $iLookAhead ]) != 0
+			) {
+				if ($this->yyTraceFILE) {
+					fwrite($this->yyTraceFILE,
+						   $this->yyTracePrompt . "FALLBACK " . $this->yyTokenName[ $iLookAhead ] . " => " .
+						   $this->yyTokenName[ $iFallback ] . "\n");
+				}
+
+				return $this->yy_find_shift_action($iFallback);
+			}
+
+			return self::$yy_default[ $stateno ];
+		} else {
+			return self::$yy_action[ $i ];
+		}
+	}
+
+	public function yy_find_reduce_action($stateno, $iLookAhead)
+	{
+		/* $stateno = $this->yystack[$this->yyidx]->stateno; */
+
+		if (!isset(self::$yy_reduce_ofst[ $stateno ])) {
+			return self::$yy_default[ $stateno ];
+		}
+		$i = self::$yy_reduce_ofst[ $stateno ];
+		if ($i == self::YY_REDUCE_USE_DFLT) {
+			return self::$yy_default[ $stateno ];
+		}
+		if ($iLookAhead == self::YYNOCODE) {
+			return self::YY_NO_ACTION;
+		}
+		$i += $iLookAhead;
+		if ($i < 0 || $i >= self::YY_SZ_ACTTAB || self::$yy_lookahead[ $i ] != $iLookAhead) {
+			return self::$yy_default[ $stateno ];
+		} else {
+			return self::$yy_action[ $i ];
+		}
+	}
+
+	public function yy_shift($yyNewState, $yyMajor, $yypMinor)
+	{
+		$this->yyidx ++;
+		if ($this->yyidx >= self::YYSTACKDEPTH) {
+			$this->yyidx --;
+			if ($this->yyTraceFILE) {
+				fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
+			}
+			while ($this->yyidx >= 0) {
+				$this->yy_pop_parser_stack();
+			}
+			#line 255 "../smarty/lexer/smarty_internal_configfileparser.y"
+
+			$this->internalError = true;
+			$this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
+
+			return;
+		}
+		$yytos = new TPC_yyStackEntry;
+		$yytos->stateno = $yyNewState;
+		$yytos->major = $yyMajor;
+		$yytos->minor = $yypMinor;
+		$this->yystack[] = $yytos;
+		if ($this->yyTraceFILE && $this->yyidx > 0) {
+			fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt, $yyNewState);
+			fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
+			for ($i = 1; $i <= $this->yyidx; $i ++) {
+				fprintf($this->yyTraceFILE, " %s", $this->yyTokenName[ $this->yystack[ $i ]->major ]);
+			}
+			fwrite($this->yyTraceFILE, "\n");
+		}
+	}
+
+	public static $yyRuleInfo = array(array(0 => 20, 1 => 2), array(0 => 21, 1 => 1), array(0 => 22, 1 => 2),
+									  array(0 => 22, 1 => 0), array(0 => 24, 1 => 5), array(0 => 24, 1 => 6),
+									  array(0 => 23, 1 => 2), array(0 => 23, 1 => 2), array(0 => 23, 1 => 0),
+									  array(0 => 26, 1 => 3), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1),
+									  array(0 => 27, 1 => 1), array(0 => 27, 1 => 1), array(0 => 27, 1 => 1),
+									  array(0 => 27, 1 => 3), array(0 => 27, 1 => 2), array(0 => 27, 1 => 1),
+									  array(0 => 27, 1 => 1), array(0 => 25, 1 => 1), array(0 => 25, 1 => 2),
+									  array(0 => 25, 1 => 3),);
+
+	public static $yyReduceMap = array(0 => 0, 2 => 0, 3 => 0, 19 => 0, 20 => 0, 21 => 0, 1 => 1, 4 => 4, 5 => 5,
+									   6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13, 14 => 14,
+									   15 => 15, 16 => 16, 17 => 17, 18 => 17,);
+
+	#line 261 "../smarty/lexer/smarty_internal_configfileparser.y"
+	public function yy_r0()
+	{
+		$this->_retvalue = null;
+	}
+
+	#line 266 "../smarty/lexer/smarty_internal_configfileparser.y"
+	public function yy_r1()
+	{
+		$this->add_global_vars($this->yystack[ $this->yyidx + 0 ]->minor);
+		$this->_retvalue = null;
+	}
+
+	#line 280 "../smarty/lexer/smarty_internal_configfileparser.y"
+	public function yy_r4()
+	{
+		$this->add_section_vars($this->yystack[ $this->yyidx + - 3 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor);
+		$this->_retvalue = null;
+	}
+
+	#line 285 "../smarty/lexer/smarty_internal_configfileparser.y"
+	public function yy_r5()
+	{
+		if ($this->configReadHidden) {
+			$this->add_section_vars($this->yystack[ $this->yyidx + - 3 ]->minor,
+									$this->yystack[ $this->yyidx + 0 ]->minor);
+		}
+		$this->_retvalue = null;
+	}
+
+	#line 293 "../smarty/lexer/smarty_internal_configfileparser.y"
+	public function yy_r6()
+	{
+		$this->_retvalue = $this->yystack[ $this->yyidx + - 1 ]->minor;
+	}
+
+	#line 297 "../smarty/lexer/smarty_internal_configfileparser.y"
+	public function yy_r7()
+	{
+		$this->_retvalue =
+			array_merge($this->yystack[ $this->yyidx + - 1 ]->minor, Array($this->yystack[ $this->yyidx + 0 ]->minor));
+	}
+
+	#line 301 "../smarty/lexer/smarty_internal_configfileparser.y"
+	public function yy_r8()
+	{
+		$this->_retvalue = Array();
+	}
+
+	#line 307 "../smarty/lexer/smarty_internal_configfileparser.y"
+	public function yy_r9()
+	{
+		$this->_retvalue = Array("key" => $this->yystack[ $this->yyidx + - 2 ]->minor,
+								 "value" => $this->yystack[ $this->yyidx + 0 ]->minor);
+	}
+
+	#line 312 "../smarty/lexer/smarty_internal_configfileparser.y"
+	public function yy_r10()
+	{
+		$this->_retvalue = (float) $this->yystack[ $this->yyidx + 0 ]->minor;
+	}
+
+	#line 316 "../smarty/lexer/smarty_internal_configfileparser.y"
+	public function yy_r11()
+	{
+		$this->_retvalue = (int) $this->yystack[ $this->yyidx + 0 ]->minor;
+	}
+
+	#line 320 "../smarty/lexer/smarty_internal_configfileparser.y"
+	public function yy_r12()
+	{
+		$this->_retvalue = $this->parse_bool($this->yystack[ $this->yyidx + 0 ]->minor);
+	}
+
+	#line 324 "../smarty/lexer/smarty_internal_configfileparser.y"
+	public function yy_r13()
+	{
+		$this->_retvalue = self::parse_single_quoted_string($this->yystack[ $this->yyidx + 0 ]->minor);
+	}
+
+	#line 328 "../smarty/lexer/smarty_internal_configfileparser.y"
+	public function yy_r14()
+	{
+		$this->_retvalue = self::parse_double_quoted_string($this->yystack[ $this->yyidx + 0 ]->minor);
+	}
+
+	#line 332 "../smarty/lexer/smarty_internal_configfileparser.y"
+	public function yy_r15()
+	{
+		$this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[ $this->yyidx + - 1 ]->minor);
+	}
+
+	#line 336 "../smarty/lexer/smarty_internal_configfileparser.y"
+	public function yy_r16()
+	{
+		$this->_retvalue = '';
+	}
+
+	#line 340 "../smarty/lexer/smarty_internal_configfileparser.y"
+	public function yy_r17()
+	{
+		$this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
+	}
+
+	private $_retvalue;
+
+	public function yy_reduce($yyruleno)
+	{
 		$countYyRuleName = count(self::$yyRuleName);
-        if ($this->yyTraceFILE && $yyruleno >= 0 && $yyruleno < $countYyRuleName) {
-            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", $this->yyTracePrompt, $yyruleno,
-                    self::$yyRuleName[ $yyruleno ]);
-        }
-
-        $this->_retvalue = $yy_lefthand_side = null;
-        if (isset(self::$yyReduceMap[ $yyruleno ])) {
-            // call the action
-            $this->_retvalue = null;
-            $this->{'yy_r' . self::$yyReduceMap[ $yyruleno ]}();
-            $yy_lefthand_side = $this->_retvalue;
-        }
-        $yygoto = self::$yyRuleInfo[ $yyruleno ][ 0 ];
-        $yysize = self::$yyRuleInfo[ $yyruleno ][ 1 ];
-        $this->yyidx -= $yysize;
-        for ($i = $yysize; $i; $i --) {
-            // pop all of the right-hand side parameters
-            array_pop($this->yystack);
-        }
-        $yyact = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno, $yygoto);
-        if ($yyact < self::YYNSTATE) {
-            if (!$this->yyTraceFILE && $yysize) {
-                $this->yyidx ++;
-                $x = new TPC_yyStackEntry;
-                $x->stateno = $yyact;
-                $x->major = $yygoto;
-                $x->minor = $yy_lefthand_side;
-                $this->yystack[ $this->yyidx ] = $x;
-            } else {
-                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
-            }
-        } elseif ($yyact == self::YYNSTATE + self::YYNRULE + 1) {
-            $this->yy_accept();
-        }
-    }
-
-    public function yy_parse_failed()
-    {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
-        }
-        while ($this->yyidx >= 0) {
-            $this->yy_pop_parser_stack();
-        }
-    }
-
-    public function yy_syntax_error($yymajor, $TOKEN)
-    {
-        #line 248 "../smarty/lexer/smarty_internal_configfileparser.y"
-
-        $this->internalError = true;
-        $this->yymajor = $yymajor;
-        $this->compiler->trigger_config_file_error();
-    }
-
-    public function yy_accept()
-    {
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
-        }
-        while ($this->yyidx >= 0) {
-            $this->yy_pop_parser_stack();
-        }
-        #line 241 "../smarty/lexer/smarty_internal_configfileparser.y"
-
-        $this->successful = !$this->internalError;
-        $this->internalError = false;
-        $this->retvalue = $this->_retvalue;
-    }
-
-    public function doParse($yymajor, $yytokenvalue)
-    {
-        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
-
-        if ($this->yyidx === null || $this->yyidx < 0) {
-            $this->yyidx = 0;
-            $this->yyerrcnt = - 1;
-            $x = new TPC_yyStackEntry;
-            $x->stateno = 0;
-            $x->major = 0;
-            $this->yystack = array();
-            $this->yystack[] = $x;
-        }
-        $yyendofinput = ($yymajor == 0);
-
-        if ($this->yyTraceFILE) {
-            fprintf($this->yyTraceFILE, "%sInput %s\n", $this->yyTracePrompt, $this->yyTokenName[ $yymajor ]);
-        }
-
-        do {
-            $yyact = $this->yy_find_shift_action($yymajor);
-            if ($yymajor < self::YYERRORSYMBOL && !$this->yy_is_expected_token($yymajor)) {
-                // force a syntax error
-                $yyact = self::YY_ERROR_ACTION;
-            }
-            if ($yyact < self::YYNSTATE) {
-                $this->yy_shift($yyact, $yymajor, $yytokenvalue);
-                $this->yyerrcnt --;
-                if ($yyendofinput && $this->yyidx >= 0) {
-                    $yymajor = 0;
-                } else {
-                    $yymajor = self::YYNOCODE;
-                }
-            } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
-                $this->yy_reduce($yyact - self::YYNSTATE);
-            } elseif ($yyact == self::YY_ERROR_ACTION) {
-                if ($this->yyTraceFILE) {
-                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n", $this->yyTracePrompt);
-                }
-                if (self::YYERRORSYMBOL) {
-                    if ($this->yyerrcnt < 0) {
-                        $this->yy_syntax_error($yymajor, $yytokenvalue);
-                    }
-                    $yymx = $this->yystack[ $this->yyidx ]->major;
-                    if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
-                        if ($this->yyTraceFILE) {
-                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", $this->yyTracePrompt,
-                                    $this->yyTokenName[ $yymajor ]);
-                        }
-                        $this->yy_destructor($yymajor, $yytokenvalue);
-                        $yymajor = self::YYNOCODE;
-                    } else {
-                        while ($this->yyidx >= 0 && $yymx != self::YYERRORSYMBOL &&
-                               ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE) {
-                            $this->yy_pop_parser_stack();
-                        }
-                        if ($this->yyidx < 0 || $yymajor == 0) {
-                            $this->yy_destructor($yymajor, $yytokenvalue);
-                            $this->yy_parse_failed();
-                            $yymajor = self::YYNOCODE;
-                        } elseif ($yymx != self::YYERRORSYMBOL) {
-                            $u2 = 0;
-                            $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
-                        }
-                    }
-                    $this->yyerrcnt = 3;
-                    $yyerrorhit = 1;
-                } else {
-                    if ($this->yyerrcnt <= 0) {
-                        $this->yy_syntax_error($yymajor, $yytokenvalue);
-                    }
-                    $this->yyerrcnt = 3;
-                    $this->yy_destructor($yymajor, $yytokenvalue);
-                    if ($yyendofinput) {
-                        $this->yy_parse_failed();
-                    }
-                    $yymajor = self::YYNOCODE;
-                }
-            } else {
-                $this->yy_accept();
-                $yymajor = self::YYNOCODE;
-            }
-        }
-        while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
-    }
+		if ($this->yyTraceFILE && $yyruleno >= 0 && $yyruleno < $countYyRuleName) {
+			fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n", $this->yyTracePrompt, $yyruleno,
+					self::$yyRuleName[ $yyruleno ]);
+		}
+
+		$this->_retvalue = $yy_lefthand_side = null;
+		if (isset(self::$yyReduceMap[ $yyruleno ])) {
+			// call the action
+			$this->_retvalue = null;
+			$this->{'yy_r' . self::$yyReduceMap[ $yyruleno ]}();
+			$yy_lefthand_side = $this->_retvalue;
+		}
+		$yygoto = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+		$yysize = self::$yyRuleInfo[ $yyruleno ][ 1 ];
+		$this->yyidx -= $yysize;
+		for ($i = $yysize; $i; $i --) {
+			// pop all of the right-hand side parameters
+			array_pop($this->yystack);
+		}
+		$yyact = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno, $yygoto);
+		if ($yyact < self::YYNSTATE) {
+			if (!$this->yyTraceFILE && $yysize) {
+				$this->yyidx ++;
+				$x = new TPC_yyStackEntry;
+				$x->stateno = $yyact;
+				$x->major = $yygoto;
+				$x->minor = $yy_lefthand_side;
+				$this->yystack[ $this->yyidx ] = $x;
+			} else {
+				$this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
+			}
+		} elseif ($yyact == self::YYNSTATE + self::YYNRULE + 1) {
+			$this->yy_accept();
+		}
+	}
+
+	public function yy_parse_failed()
+	{
+		if ($this->yyTraceFILE) {
+			fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
+		}
+		while ($this->yyidx >= 0) {
+			$this->yy_pop_parser_stack();
+		}
+	}
+
+	public function yy_syntax_error($yymajor, $TOKEN)
+	{
+		#line 248 "../smarty/lexer/smarty_internal_configfileparser.y"
+
+		$this->internalError = true;
+		$this->yymajor = $yymajor;
+		$this->compiler->trigger_config_file_error();
+	}
+
+	public function yy_accept()
+	{
+		if ($this->yyTraceFILE) {
+			fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
+		}
+		while ($this->yyidx >= 0) {
+			$this->yy_pop_parser_stack();
+		}
+		#line 241 "../smarty/lexer/smarty_internal_configfileparser.y"
+
+		$this->successful = !$this->internalError;
+		$this->internalError = false;
+		$this->retvalue = $this->_retvalue;
+	}
+
+	public function doParse($yymajor, $yytokenvalue)
+	{
+		$yyerrorhit = 0;   /* True if yymajor has invoked an error */
+
+		if ($this->yyidx === null || $this->yyidx < 0) {
+			$this->yyidx = 0;
+			$this->yyerrcnt = - 1;
+			$x = new TPC_yyStackEntry;
+			$x->stateno = 0;
+			$x->major = 0;
+			$this->yystack = array();
+			$this->yystack[] = $x;
+		}
+		$yyendofinput = ($yymajor == 0);
+
+		if ($this->yyTraceFILE) {
+			fprintf($this->yyTraceFILE, "%sInput %s\n", $this->yyTracePrompt, $this->yyTokenName[ $yymajor ]);
+		}
+
+		do {
+			$yyact = $this->yy_find_shift_action($yymajor);
+			if ($yymajor < self::YYERRORSYMBOL && !$this->yy_is_expected_token($yymajor)) {
+				// force a syntax error
+				$yyact = self::YY_ERROR_ACTION;
+			}
+			if ($yyact < self::YYNSTATE) {
+				$this->yy_shift($yyact, $yymajor, $yytokenvalue);
+				$this->yyerrcnt --;
+				if ($yyendofinput && $this->yyidx >= 0) {
+					$yymajor = 0;
+				} else {
+					$yymajor = self::YYNOCODE;
+				}
+			} elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
+				$this->yy_reduce($yyact - self::YYNSTATE);
+			} elseif ($yyact == self::YY_ERROR_ACTION) {
+				if ($this->yyTraceFILE) {
+					fprintf($this->yyTraceFILE, "%sSyntax Error!\n", $this->yyTracePrompt);
+				}
+				if (self::YYERRORSYMBOL) {
+					if ($this->yyerrcnt < 0) {
+						$this->yy_syntax_error($yymajor, $yytokenvalue);
+					}
+					$yymx = $this->yystack[ $this->yyidx ]->major;
+					if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
+						if ($this->yyTraceFILE) {
+							fprintf($this->yyTraceFILE, "%sDiscard input token %s\n", $this->yyTracePrompt,
+									$this->yyTokenName[ $yymajor ]);
+						}
+						$this->yy_destructor($yymajor, $yytokenvalue);
+						$yymajor = self::YYNOCODE;
+					} else {
+						while ($this->yyidx >= 0 && $yymx != self::YYERRORSYMBOL &&
+							   ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE) {
+							$this->yy_pop_parser_stack();
+						}
+						if ($this->yyidx < 0 || $yymajor == 0) {
+							$this->yy_destructor($yymajor, $yytokenvalue);
+							$this->yy_parse_failed();
+							$yymajor = self::YYNOCODE;
+						} elseif ($yymx != self::YYERRORSYMBOL) {
+							$u2 = 0;
+							$this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
+						}
+					}
+					$this->yyerrcnt = 3;
+					$yyerrorhit = 1;
+				} else {
+					if ($this->yyerrcnt <= 0) {
+						$this->yy_syntax_error($yymajor, $yytokenvalue);
+					}
+					$this->yyerrcnt = 3;
+					$this->yy_destructor($yymajor, $yytokenvalue);
+					if ($yyendofinput) {
+						$this->yy_parse_failed();
+					}
+					$yymajor = self::YYNOCODE;
+				}
+			} else {
+				$this->yy_accept();
+				$yymajor = self::YYNOCODE;
+			}
+		}
+		while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
+	}
 }
 

libraries/Smarty/libs/sysplugins/smarty_internal_data.php

Doc Comments +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
      * @link http://www.smarty.net/docs/en/api.append.tpl
      *
      * @param  array|string $tpl_var                                           the template variable name(s)
-     * @param  mixed        $value                                             the value to append
+     * @param  string        $value                                             the value to append
      * @param  bool         $merge                                             flag if array elements shall be merged
      * @param  bool         $nocache                                           if true any output of this variable will
      *                                                                         be not cached

Indentation +212 added lines, -212 removed lines

@@ -28,216 +28,216 @@
  */
 class Smarty_Internal_Data
 {
-    /**
-     * This object type (Smarty = 1, template = 2, data = 4)
-     *
-     * @var int
-     */
-    public $_objType = 4;
-
-    /**
-     * name of class used for templates
-     *
-     * @var string
-     */
-    public $template_class = 'Smarty_Internal_Template';
-
-    /**
-     * template variables
-     *
-     * @var Smarty_Variable[]
-     */
-    public $tpl_vars = array();
-
-    /**
-     * parent template (if any)
-     *
-     * @var Smarty|Smarty_Internal_Template|Smarty_Internal_Data
-     */
-    public $parent = null;
-
-    /**
-     * configuration settings
-     *
-     * @var string[]
-     */
-    public $config_vars = array();
-
-    /**
-     * extension handler
-     *
-     * @var Smarty_Internal_Extension_Handler
-     */
-    public $ext = null;
-
-    /**
-     * Smarty_Internal_Data constructor.
-     *
-     * Install extension handler
-     */
-    public function __construct()
-    {
-        $this->ext = new Smarty_Internal_Extension_Handler();
-        $this->ext->objType = $this->_objType;
-    }
-
-    /**
-     * assigns a Smarty variable
-     *
-     * @param  array|string $tpl_var the template variable name(s)
-     * @param  mixed        $value   the value to assign
-     * @param  boolean      $nocache if true any output of this variable will be not cached
-     *
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for
-     *                              chaining
-     */
-    public function assign($tpl_var, $value = null, $nocache = false)
-    {
-        if (is_array($tpl_var)) {
-            foreach ($tpl_var as $_key => $_val) {
-                $this->assign($_key, $_val, $nocache);
-            }
-        } else {
-            if ($tpl_var != '') {
-                if ($this->_objType == 2) {
-                    /** @var  Smarty_Internal_Template $this */
-                    $this->_assignInScope($tpl_var, $value, $nocache);
-                } else {
-                    $this->tpl_vars[ $tpl_var ] = new Smarty_Variable($value, $nocache);
-                }
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * appends values to template variables
-     *
-     * @api  Smarty::append()
-     * @link http://www.smarty.net/docs/en/api.append.tpl
-     *
-     * @param  array|string $tpl_var                                           the template variable name(s)
-     * @param  mixed        $value                                             the value to append
-     * @param  bool         $merge                                             flag if array elements shall be merged
-     * @param  bool         $nocache                                           if true any output of this variable will
-     *                                                                         be not cached
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public function append($tpl_var, $value = null, $merge = false, $nocache = false)
-    {
-        return $this->ext->append->append($this, $tpl_var, $value, $merge, $nocache);
-    }
-
-    /**
-     * assigns a global Smarty variable
-     *
-     * @param  string  $varName the global variable name
-     * @param  mixed   $value   the value to assign
-     * @param  boolean $nocache if true any output of this variable will be not cached
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public function assignGlobal($varName, $value = null, $nocache = false)
-    {
-        return $this->ext->assignGlobal->assignGlobal($this, $varName, $value, $nocache);
-    }
-
-    /**
-     * appends values to template variables by reference
-     *
-     * @param  string  $tpl_var the template variable name
-     * @param  mixed   &$value  the referenced value to append
-     * @param  boolean $merge   flag if array elements shall be merged
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public function appendByRef($tpl_var, &$value, $merge = false)
-    {
-        return $this->ext->appendByRef->appendByRef($this, $tpl_var, $value, $merge);
-    }
-
-    /**
-     * assigns values to template variables by reference
-     *
-     * @param string   $tpl_var the template variable name
-     * @param          $value
-     * @param  boolean $nocache if true any output of this variable will be not cached
-     *
-     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
-     */
-    public function assignByRef($tpl_var, &$value, $nocache = false)
-    {
-        return $this->ext->assignByRef->assignByRef($this, $tpl_var, $value, $nocache);
-    }
-
-    /**
-     * Returns a single or all template variables
-     *
-     * @api  Smarty::getTemplateVars()
-     * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
-     *
-     * @param  string                                                 $varName       variable name or null
-     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
-     * @param  bool                                                   $searchParents include parent templates?
-     *
-     * @return mixed variable value or or array of variables
-     */
-    public function getTemplateVars($varName = null, Smarty_Internal_Data $_ptr = null, $searchParents = true)
-    {
-        return $this->ext->getTemplateVars->getTemplateVars($this, $varName, $_ptr, $searchParents);
-    }
-
-    /**
-     * gets the object of a Smarty variable
-     *
-     * @param  string               $variable      the name of the Smarty variable
-     * @param  Smarty_Internal_Data $_ptr          optional pointer to data object
-     * @param  boolean              $searchParents search also in parent data
-     * @param bool                  $error_enable
-     *
-     * @return Smarty_Variable|Smarty_Undefined_Variable the object of the variable
-     * @deprecated since 3.1.28 please use Smarty_Internal_Data::getTemplateVars() instead.
-     */
-    public function getVariable($variable = null, Smarty_Internal_Data $_ptr = null, $searchParents = true,
-                                $error_enable = true)
-    {
-        return $this->ext->getTemplateVars->_getVariable($this, $variable, $_ptr, $searchParents, $error_enable);
-    }
-
-    /**
-     * Follow the parent chain an merge template and config variables
-     *
-     * @param \Smarty_Internal_Data|null $data
-     */
-    public function _mergeVars(Smarty_Internal_Data $data = null)
-    {
-        if (isset($data)) {
-            if (!empty($this->tpl_vars)) {
-                $data->tpl_vars = array_merge($this->tpl_vars, $data->tpl_vars);
-            }
-            if (!empty($this->config_vars)) {
-                $data->config_vars = array_merge($this->config_vars, $data->config_vars);
-            }
-        } else {
-            $data = $this;
-        }
-        if (isset($this->parent)) {
-            $this->parent->_mergeVars($data);
-        }
-    }
-
-    /**
-     * Handle unknown class methods
-     *
-     * @param string $name unknown method-name
-     * @param array  $args argument array
-     *
-     * @return mixed
-     * @throws SmartyException
-     */
-    public function __call($name, $args)
-    {
-        return $this->ext->_callExternalMethod($this, $name, $args);
-    }
+	/**
+	 * This object type (Smarty = 1, template = 2, data = 4)
+	 *
+	 * @var int
+	 */
+	public $_objType = 4;
+
+	/**
+	 * name of class used for templates
+	 *
+	 * @var string
+	 */
+	public $template_class = 'Smarty_Internal_Template';
+
+	/**
+	 * template variables
+	 *
+	 * @var Smarty_Variable[]
+	 */
+	public $tpl_vars = array();
+
+	/**
+	 * parent template (if any)
+	 *
+	 * @var Smarty|Smarty_Internal_Template|Smarty_Internal_Data
+	 */
+	public $parent = null;
+
+	/**
+	 * configuration settings
+	 *
+	 * @var string[]
+	 */
+	public $config_vars = array();
+
+	/**
+	 * extension handler
+	 *
+	 * @var Smarty_Internal_Extension_Handler
+	 */
+	public $ext = null;
+
+	/**
+	 * Smarty_Internal_Data constructor.
+	 *
+	 * Install extension handler
+	 */
+	public function __construct()
+	{
+		$this->ext = new Smarty_Internal_Extension_Handler();
+		$this->ext->objType = $this->_objType;
+	}
+
+	/**
+	 * assigns a Smarty variable
+	 *
+	 * @param  array|string $tpl_var the template variable name(s)
+	 * @param  mixed        $value   the value to assign
+	 * @param  boolean      $nocache if true any output of this variable will be not cached
+	 *
+	 * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for
+	 *                              chaining
+	 */
+	public function assign($tpl_var, $value = null, $nocache = false)
+	{
+		if (is_array($tpl_var)) {
+			foreach ($tpl_var as $_key => $_val) {
+				$this->assign($_key, $_val, $nocache);
+			}
+		} else {
+			if ($tpl_var != '') {
+				if ($this->_objType == 2) {
+					/** @var  Smarty_Internal_Template $this */
+					$this->_assignInScope($tpl_var, $value, $nocache);
+				} else {
+					$this->tpl_vars[ $tpl_var ] = new Smarty_Variable($value, $nocache);
+				}
+			}
+		}
+		return $this;
+	}
+
+	/**
+	 * appends values to template variables
+	 *
+	 * @api  Smarty::append()
+	 * @link http://www.smarty.net/docs/en/api.append.tpl
+	 *
+	 * @param  array|string $tpl_var                                           the template variable name(s)
+	 * @param  mixed        $value                                             the value to append
+	 * @param  bool         $merge                                             flag if array elements shall be merged
+	 * @param  bool         $nocache                                           if true any output of this variable will
+	 *                                                                         be not cached
+	 *
+	 * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+	 */
+	public function append($tpl_var, $value = null, $merge = false, $nocache = false)
+	{
+		return $this->ext->append->append($this, $tpl_var, $value, $merge, $nocache);
+	}
+
+	/**
+	 * assigns a global Smarty variable
+	 *
+	 * @param  string  $varName the global variable name
+	 * @param  mixed   $value   the value to assign
+	 * @param  boolean $nocache if true any output of this variable will be not cached
+	 *
+	 * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+	 */
+	public function assignGlobal($varName, $value = null, $nocache = false)
+	{
+		return $this->ext->assignGlobal->assignGlobal($this, $varName, $value, $nocache);
+	}
+
+	/**
+	 * appends values to template variables by reference
+	 *
+	 * @param  string  $tpl_var the template variable name
+	 * @param  mixed   &$value  the referenced value to append
+	 * @param  boolean $merge   flag if array elements shall be merged
+	 *
+	 * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+	 */
+	public function appendByRef($tpl_var, &$value, $merge = false)
+	{
+		return $this->ext->appendByRef->appendByRef($this, $tpl_var, $value, $merge);
+	}
+
+	/**
+	 * assigns values to template variables by reference
+	 *
+	 * @param string   $tpl_var the template variable name
+	 * @param          $value
+	 * @param  boolean $nocache if true any output of this variable will be not cached
+	 *
+	 * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+	 */
+	public function assignByRef($tpl_var, &$value, $nocache = false)
+	{
+		return $this->ext->assignByRef->assignByRef($this, $tpl_var, $value, $nocache);
+	}
+
+	/**
+	 * Returns a single or all template variables
+	 *
+	 * @api  Smarty::getTemplateVars()
+	 * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
+	 *
+	 * @param  string                                                 $varName       variable name or null
+	 * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
+	 * @param  bool                                                   $searchParents include parent templates?
+	 *
+	 * @return mixed variable value or or array of variables
+	 */
+	public function getTemplateVars($varName = null, Smarty_Internal_Data $_ptr = null, $searchParents = true)
+	{
+		return $this->ext->getTemplateVars->getTemplateVars($this, $varName, $_ptr, $searchParents);
+	}
+
+	/**
+	 * gets the object of a Smarty variable
+	 *
+	 * @param  string               $variable      the name of the Smarty variable
+	 * @param  Smarty_Internal_Data $_ptr          optional pointer to data object
+	 * @param  boolean              $searchParents search also in parent data
+	 * @param bool                  $error_enable
+	 *
+	 * @return Smarty_Variable|Smarty_Undefined_Variable the object of the variable
+	 * @deprecated since 3.1.28 please use Smarty_Internal_Data::getTemplateVars() instead.
+	 */
+	public function getVariable($variable = null, Smarty_Internal_Data $_ptr = null, $searchParents = true,
+								$error_enable = true)
+	{
+		return $this->ext->getTemplateVars->_getVariable($this, $variable, $_ptr, $searchParents, $error_enable);
+	}
+
+	/**
+	 * Follow the parent chain an merge template and config variables
+	 *
+	 * @param \Smarty_Internal_Data|null $data
+	 */
+	public function _mergeVars(Smarty_Internal_Data $data = null)
+	{
+		if (isset($data)) {
+			if (!empty($this->tpl_vars)) {
+				$data->tpl_vars = array_merge($this->tpl_vars, $data->tpl_vars);
+			}
+			if (!empty($this->config_vars)) {
+				$data->config_vars = array_merge($this->config_vars, $data->config_vars);
+			}
+		} else {
+			$data = $this;
+		}
+		if (isset($this->parent)) {
+			$this->parent->_mergeVars($data);
+		}
+	}
+
+	/**
+	 * Handle unknown class methods
+	 *
+	 * @param string $name unknown method-name
+	 * @param array  $args argument array
+	 *
+	 * @return mixed
+	 * @throws SmartyException
+	 */
+	public function __call($name, $args)
+	{
+		return $this->ext->_callExternalMethod($this, $name, $args);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
                     /** @var  Smarty_Internal_Template $this */
                     $this->_assignInScope($tpl_var, $value, $nocache);
                 } else {
-                    $this->tpl_vars[ $tpl_var ] = new Smarty_Variable($value, $nocache);
+                    $this->tpl_vars[$tpl_var] = new Smarty_Variable($value, $nocache);
                 }
             }
         }

libraries/Smarty/libs/sysplugins/smarty_internal_debug.php

Doc Comments +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
      * Start logging template
      *
      * @param \Smarty_Internal_Template $template template
-     * @param null                      $mode     true: display   false: fetch  null: subtemplate
+     * @param null|boolean                      $mode     true: display   false: fetch  null: subtemplate
      */
     public function start_template(Smarty_Internal_Template $template, $mode = null)
     {
@@ -190,7 +190,7 @@ 
     /**
      * Opens a window for the Smarty Debugging Console and display the data
      *
-     * @param Smarty_Internal_Template|Smarty $obj object to debug
+     * @param Smarty_Internal_Template $obj object to debug
      * @param bool                            $full
      */
     public function display_debug($obj, $full = false)

Spacing +57 added lines, -57 removed lines

@@ -53,12 +53,12 @@ 
     public function start_template(Smarty_Internal_Template $template, $mode = null)
     {
         if (isset($mode)) {
-            $this->index ++;
-            $this->offset ++;
-            $this->template_data[ $this->index ] = null;
+            $this->index++;
+            $this->offset++;
+            $this->template_data[$this->index] = null;
         }
         $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'start_template_time' ] = microtime(true);
+        $this->template_data[$this->index][$key]['start_template_time'] = microtime(true);
     }
 
     /**
@@ -69,8 +69,8 @@ 
     public function end_template(Smarty_Internal_Template $template)
     {
         $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'total_time' ] +=
-            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_template_time' ];
+        $this->template_data[$this->index][$key]['total_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_template_time'];
     }
 
     /**
@@ -83,24 +83,24 @@ 
         static $_is_stringy = array('string' => true, 'eval' => true);
         if (!empty($template->compiler->trace_uid)) {
             $key = $template->compiler->trace_uid;
-            if (!isset($this->template_data[ $this->index ][ $key ])) {
-                if (isset($_is_stringy[ $template->source->type ])) {
-                    $this->template_data[ $this->index ][ $key ][ 'name' ] =
+            if (!isset($this->template_data[$this->index][$key])) {
+                if (isset($_is_stringy[$template->source->type])) {
+                    $this->template_data[$this->index][$key]['name'] =
                         '\'' . substr($template->source->name, 0, 25) . '...\'';
                 } else {
-                    $this->template_data[ $this->index ][ $key ][ 'name' ] = $template->source->filepath;
+                    $this->template_data[$this->index][$key]['name'] = $template->source->filepath;
                 }
-                $this->template_data[ $this->index ][ $key ][ 'compile_time' ] = 0;
-                $this->template_data[ $this->index ][ $key ][ 'render_time' ] = 0;
-                $this->template_data[ $this->index ][ $key ][ 'cache_time' ] = 0;
+                $this->template_data[$this->index][$key]['compile_time'] = 0;
+                $this->template_data[$this->index][$key]['render_time'] = 0;
+                $this->template_data[$this->index][$key]['cache_time'] = 0;
             }
         } else {
-            if (isset($this->ignore_uid[ $template->source->uid ])) {
+            if (isset($this->ignore_uid[$template->source->uid])) {
                 return;
             }
             $key = $this->get_key($template);
         }
-        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+        $this->template_data[$this->index][$key]['start_time'] = microtime(true);
     }
 
     /**
@@ -113,14 +113,14 @@ 
         if (!empty($template->compiler->trace_uid)) {
             $key = $template->compiler->trace_uid;
         } else {
-            if (isset($this->ignore_uid[ $template->source->uid ])) {
+            if (isset($this->ignore_uid[$template->source->uid])) {
                 return;
             }
 
             $key = $this->get_key($template);
         }
-        $this->template_data[ $this->index ][ $key ][ 'compile_time' ] +=
-            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+        $this->template_data[$this->index][$key]['compile_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_time'];
     }
 
     /**
@@ -131,7 +131,7 @@ 
     public function start_render(Smarty_Internal_Template $template)
     {
         $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+        $this->template_data[$this->index][$key]['start_time'] = microtime(true);
     }
 
     /**
@@ -142,8 +142,8 @@ 
     public function end_render(Smarty_Internal_Template $template)
     {
         $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'render_time' ] +=
-            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+        $this->template_data[$this->index][$key]['render_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_time'];
     }
 
     /**
@@ -154,7 +154,7 @@ 
     public function start_cache(Smarty_Internal_Template $template)
     {
         $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+        $this->template_data[$this->index][$key]['start_time'] = microtime(true);
     }
 
     /**
@@ -165,8 +165,8 @@ 
     public function end_cache(Smarty_Internal_Template $template)
     {
         $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'cache_time' ] +=
-            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+        $this->template_data[$this->index][$key]['cache_time'] +=
+            microtime(true) - $this->template_data[$this->index][$key]['start_time'];
     }
 
     /**
@@ -196,7 +196,7 @@ 
     public function display_debug($obj, $full = false)
     {
         if (!$full) {
-            $this->offset ++;
+            $this->offset++;
             $savedIndex = $this->index;
             $this->index = 9999;
         }
@@ -243,7 +243,7 @@ 
             $_template->assign('template_name', $obj->source->type . ':' . $obj->source->name);
         }
         if ($obj->_objType == 1 || $full) {
-            $_template->assign('template_data', $this->template_data[ $this->index ]);
+            $_template->assign('template_data', $this->template_data[$this->index]);
         } else {
             $_template->assign('template_data', null);
         }
@@ -254,7 +254,7 @@ 
         $_template->assign('offset', $this->offset * 50);
         echo $_template->fetch();
         if (isset($full)) {
-            $this->index --;
+            $this->index--;
         }
         if (!$full) {
             $this->index = $savedIndex;
@@ -272,53 +272,53 @@ 
     {
         $config_vars = array();
         foreach ($obj->config_vars as $key => $var) {
-            $config_vars[ $key ][ 'value' ] = $var;
+            $config_vars[$key]['value'] = $var;
             if ($obj->_objType == 2) {
-                $config_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
+                $config_vars[$key]['scope'] = $obj->source->type . ':' . $obj->source->name;
             } elseif ($obj->_objType == 4) {
-                $tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
+                $tpl_vars[$key]['scope'] = $obj->dataObjectName;
             } else {
-                $config_vars[ $key ][ 'scope' ] = 'Smarty object';
+                $config_vars[$key]['scope'] = 'Smarty object';
             }
         }
         $tpl_vars = array();
         foreach ($obj->tpl_vars as $key => $var) {
             foreach ($var as $varkey => $varvalue) {
                 if ($varkey == 'value') {
-                    $tpl_vars[ $key ][ $varkey ] = $varvalue;
+                    $tpl_vars[$key][$varkey] = $varvalue;
                 } else {
                     if ($varkey == 'nocache') {
                         if ($varvalue == true) {
-                            $tpl_vars[ $key ][ $varkey ] = $varvalue;
+                            $tpl_vars[$key][$varkey] = $varvalue;
                         }
                     } else {
                         if ($varkey != 'scope' || $varvalue !== 0) {
-                            $tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
+                            $tpl_vars[$key]['attributes'][$varkey] = $varvalue;
                         }
                     }
                 }
             }
             if ($obj->_objType == 2) {
-                $tpl_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
+                $tpl_vars[$key]['scope'] = $obj->source->type . ':' . $obj->source->name;
             } elseif ($obj->_objType == 4) {
-                $tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
+                $tpl_vars[$key]['scope'] = $obj->dataObjectName;
             } else {
-                $tpl_vars[ $key ][ 'scope' ] = 'Smarty object';
+                $tpl_vars[$key]['scope'] = 'Smarty object';
             }
         }
 
         if (isset($obj->parent)) {
             $parent = $this->get_debug_vars($obj->parent);
             foreach ($parent->tpl_vars as $name => $pvar) {
-                if (isset($tpl_vars[ $name ]) && $tpl_vars[ $name ][ 'value' ] === $pvar[ 'value' ]) {
-                    $tpl_vars[ $name ][ 'scope' ] = $pvar[ 'scope' ];
+                if (isset($tpl_vars[$name]) && $tpl_vars[$name]['value'] === $pvar['value']) {
+                    $tpl_vars[$name]['scope'] = $pvar['scope'];
                 }
             }
             $tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
 
             foreach ($parent->config_vars as $name => $pvar) {
-                if (isset($config_vars[ $name ]) && $config_vars[ $name ][ 'value' ] === $pvar[ 'value' ]) {
-                    $config_vars[ $name ][ 'scope' ] = $pvar[ 'scope' ];
+                if (isset($config_vars[$name]) && $config_vars[$name]['value'] === $pvar['value']) {
+                    $config_vars[$name]['scope'] = $pvar['scope'];
                 }
             }
             $config_vars = array_merge($parent->config_vars, $config_vars);
@@ -327,20 +327,20 @@ 
                 if (!array_key_exists($key, $tpl_vars)) {
                     foreach ($var as $varkey => $varvalue) {
                         if ($varkey == 'value') {
-                            $tpl_vars[ $key ][ $varkey ] = $varvalue;
+                            $tpl_vars[$key][$varkey] = $varvalue;
                         } else {
                             if ($varkey == 'nocache') {
                                 if ($varvalue == true) {
-                                    $tpl_vars[ $key ][ $varkey ] = $varvalue;
+                                    $tpl_vars[$key][$varkey] = $varvalue;
                                 }
                             } else {
                                 if ($varkey != 'scope' || $varvalue !== 0) {
-                                    $tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
+                                    $tpl_vars[$key]['attributes'][$varkey] = $varvalue;
                                 }
                             }
                         }
                     }
-                    $tpl_vars[ $key ][ 'scope' ] = 'Global';
+                    $tpl_vars[$key]['scope'] = 'Global';
                 }
             }
         }
@@ -363,19 +363,19 @@ 
             $template->source->filepath;
         }
         $key = $template->source->uid;
-        if (isset($this->template_data[ $this->index ][ $key ])) {
+        if (isset($this->template_data[$this->index][$key])) {
             return $key;
         } else {
-            if (isset($_is_stringy[ $template->source->type ])) {
-                $this->template_data[ $this->index ][ $key ][ 'name' ] =
+            if (isset($_is_stringy[$template->source->type])) {
+                $this->template_data[$this->index][$key]['name'] =
                     '\'' . substr($template->source->name, 0, 25) . '...\'';
             } else {
-                $this->template_data[ $this->index ][ $key ][ 'name' ] = $template->source->filepath;
+                $this->template_data[$this->index][$key]['name'] = $template->source->filepath;
             }
-            $this->template_data[ $this->index ][ $key ][ 'compile_time' ] = 0;
-            $this->template_data[ $this->index ][ $key ][ 'render_time' ] = 0;
-            $this->template_data[ $this->index ][ $key ][ 'cache_time' ] = 0;
-            $this->template_data[ $this->index ][ $key ][ 'total_time' ] = 0;
+            $this->template_data[$this->index][$key]['compile_time'] = 0;
+            $this->template_data[$this->index][$key]['render_time'] = 0;
+            $this->template_data[$this->index][$key]['cache_time'] = 0;
+            $this->template_data[$this->index][$key]['total_time'] = 0;
 
             return $key;
         }
@@ -392,7 +392,7 @@ 
         if ($template->source->uid == '') {
             $template->source->filepath;
         }
-        $this->ignore_uid[ $template->source->uid ] = true;
+        $this->ignore_uid[$template->source->uid] = true;
     }
 
     /**
@@ -402,8 +402,8 @@ 
      */
     public function debugUrl(Smarty $smarty)
     {
-        if (isset($_SERVER[ 'QUERY_STRING' ])) {
-            $_query_string = $_SERVER[ 'QUERY_STRING' ];
+        if (isset($_SERVER['QUERY_STRING'])) {
+            $_query_string = $_SERVER['QUERY_STRING'];
         } else {
             $_query_string = '';
         }
@@ -421,7 +421,7 @@ 
                 $smarty->debugging = true;
             }
         } else {
-            if (isset($_COOKIE[ 'SMARTY_DEBUG' ])) {
+            if (isset($_COOKIE['SMARTY_DEBUG'])) {
                 $smarty->debugging = true;
             }
         }

Indentation +386 added lines, -386 removed lines

@@ -16,414 +16,414 @@
  */
 class Smarty_Internal_Debug extends Smarty_Internal_Data
 {
-    /**
-     * template data
-     *
-     * @var array
-     */
-    public $template_data = array();
+	/**
+	 * template data
+	 *
+	 * @var array
+	 */
+	public $template_data = array();
 
-    /**
-     * List of uid's which shall be ignored
-     *
-     * @var array
-     */
-    public $ignore_uid = array();
+	/**
+	 * List of uid's which shall be ignored
+	 *
+	 * @var array
+	 */
+	public $ignore_uid = array();
 
-    /**
-     * Index of display() and fetch() calls
-     *
-     * @var int
-     */
-    public $index = 0;
+	/**
+	 * Index of display() and fetch() calls
+	 *
+	 * @var int
+	 */
+	public $index = 0;
 
-    /**
-     * Counter for window offset
-     *
-     * @var int
-     */
-    public $offset = 0;
+	/**
+	 * Counter for window offset
+	 *
+	 * @var int
+	 */
+	public $offset = 0;
 
-    /**
-     * Start logging template
-     *
-     * @param \Smarty_Internal_Template $template template
-     * @param null                      $mode     true: display   false: fetch  null: subtemplate
-     */
-    public function start_template(Smarty_Internal_Template $template, $mode = null)
-    {
-        if (isset($mode)) {
-            $this->index ++;
-            $this->offset ++;
-            $this->template_data[ $this->index ] = null;
-        }
-        $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'start_template_time' ] = microtime(true);
-    }
+	/**
+	 * Start logging template
+	 *
+	 * @param \Smarty_Internal_Template $template template
+	 * @param null                      $mode     true: display   false: fetch  null: subtemplate
+	 */
+	public function start_template(Smarty_Internal_Template $template, $mode = null)
+	{
+		if (isset($mode)) {
+			$this->index ++;
+			$this->offset ++;
+			$this->template_data[ $this->index ] = null;
+		}
+		$key = $this->get_key($template);
+		$this->template_data[ $this->index ][ $key ][ 'start_template_time' ] = microtime(true);
+	}
 
-    /**
-     * End logging of cache time
-     *
-     * @param \Smarty_Internal_Template $template cached template
-     */
-    public function end_template(Smarty_Internal_Template $template)
-    {
-        $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'total_time' ] +=
-            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_template_time' ];
-    }
+	/**
+	 * End logging of cache time
+	 *
+	 * @param \Smarty_Internal_Template $template cached template
+	 */
+	public function end_template(Smarty_Internal_Template $template)
+	{
+		$key = $this->get_key($template);
+		$this->template_data[ $this->index ][ $key ][ 'total_time' ] +=
+			microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_template_time' ];
+	}
 
-    /**
-     * Start logging of compile time
-     *
-     * @param \Smarty_Internal_Template $template
-     */
-    public function start_compile(Smarty_Internal_Template $template)
-    {
-        static $_is_stringy = array('string' => true, 'eval' => true);
-        if (!empty($template->compiler->trace_uid)) {
-            $key = $template->compiler->trace_uid;
-            if (!isset($this->template_data[ $this->index ][ $key ])) {
-                if (isset($_is_stringy[ $template->source->type ])) {
-                    $this->template_data[ $this->index ][ $key ][ 'name' ] =
-                        '\'' . substr($template->source->name, 0, 25) . '...\'';
-                } else {
-                    $this->template_data[ $this->index ][ $key ][ 'name' ] = $template->source->filepath;
-                }
-                $this->template_data[ $this->index ][ $key ][ 'compile_time' ] = 0;
-                $this->template_data[ $this->index ][ $key ][ 'render_time' ] = 0;
-                $this->template_data[ $this->index ][ $key ][ 'cache_time' ] = 0;
-            }
-        } else {
-            if (isset($this->ignore_uid[ $template->source->uid ])) {
-                return;
-            }
-            $key = $this->get_key($template);
-        }
-        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
-    }
+	/**
+	 * Start logging of compile time
+	 *
+	 * @param \Smarty_Internal_Template $template
+	 */
+	public function start_compile(Smarty_Internal_Template $template)
+	{
+		static $_is_stringy = array('string' => true, 'eval' => true);
+		if (!empty($template->compiler->trace_uid)) {
+			$key = $template->compiler->trace_uid;
+			if (!isset($this->template_data[ $this->index ][ $key ])) {
+				if (isset($_is_stringy[ $template->source->type ])) {
+					$this->template_data[ $this->index ][ $key ][ 'name' ] =
+						'\'' . substr($template->source->name, 0, 25) . '...\'';
+				} else {
+					$this->template_data[ $this->index ][ $key ][ 'name' ] = $template->source->filepath;
+				}
+				$this->template_data[ $this->index ][ $key ][ 'compile_time' ] = 0;
+				$this->template_data[ $this->index ][ $key ][ 'render_time' ] = 0;
+				$this->template_data[ $this->index ][ $key ][ 'cache_time' ] = 0;
+			}
+		} else {
+			if (isset($this->ignore_uid[ $template->source->uid ])) {
+				return;
+			}
+			$key = $this->get_key($template);
+		}
+		$this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+	}
 
-    /**
-     * End logging of compile time
-     *
-     * @param \Smarty_Internal_Template $template
-     */
-    public function end_compile(Smarty_Internal_Template $template)
-    {
-        if (!empty($template->compiler->trace_uid)) {
-            $key = $template->compiler->trace_uid;
-        } else {
-            if (isset($this->ignore_uid[ $template->source->uid ])) {
-                return;
-            }
+	/**
+	 * End logging of compile time
+	 *
+	 * @param \Smarty_Internal_Template $template
+	 */
+	public function end_compile(Smarty_Internal_Template $template)
+	{
+		if (!empty($template->compiler->trace_uid)) {
+			$key = $template->compiler->trace_uid;
+		} else {
+			if (isset($this->ignore_uid[ $template->source->uid ])) {
+				return;
+			}
 
-            $key = $this->get_key($template);
-        }
-        $this->template_data[ $this->index ][ $key ][ 'compile_time' ] +=
-            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
-    }
+			$key = $this->get_key($template);
+		}
+		$this->template_data[ $this->index ][ $key ][ 'compile_time' ] +=
+			microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+	}
 
-    /**
-     * Start logging of render time
-     *
-     * @param \Smarty_Internal_Template $template
-     */
-    public function start_render(Smarty_Internal_Template $template)
-    {
-        $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
-    }
+	/**
+	 * Start logging of render time
+	 *
+	 * @param \Smarty_Internal_Template $template
+	 */
+	public function start_render(Smarty_Internal_Template $template)
+	{
+		$key = $this->get_key($template);
+		$this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+	}
 
-    /**
-     * End logging of compile time
-     *
-     * @param \Smarty_Internal_Template $template
-     */
-    public function end_render(Smarty_Internal_Template $template)
-    {
-        $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'render_time' ] +=
-            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
-    }
+	/**
+	 * End logging of compile time
+	 *
+	 * @param \Smarty_Internal_Template $template
+	 */
+	public function end_render(Smarty_Internal_Template $template)
+	{
+		$key = $this->get_key($template);
+		$this->template_data[ $this->index ][ $key ][ 'render_time' ] +=
+			microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+	}
 
-    /**
-     * Start logging of cache time
-     *
-     * @param \Smarty_Internal_Template $template cached template
-     */
-    public function start_cache(Smarty_Internal_Template $template)
-    {
-        $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
-    }
+	/**
+	 * Start logging of cache time
+	 *
+	 * @param \Smarty_Internal_Template $template cached template
+	 */
+	public function start_cache(Smarty_Internal_Template $template)
+	{
+		$key = $this->get_key($template);
+		$this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+	}
 
-    /**
-     * End logging of cache time
-     *
-     * @param \Smarty_Internal_Template $template cached template
-     */
-    public function end_cache(Smarty_Internal_Template $template)
-    {
-        $key = $this->get_key($template);
-        $this->template_data[ $this->index ][ $key ][ 'cache_time' ] +=
-            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
-    }
+	/**
+	 * End logging of cache time
+	 *
+	 * @param \Smarty_Internal_Template $template cached template
+	 */
+	public function end_cache(Smarty_Internal_Template $template)
+	{
+		$key = $this->get_key($template);
+		$this->template_data[ $this->index ][ $key ][ 'cache_time' ] +=
+			microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+	}
 
-    /**
-     * Register template object
-     *
-     * @param \Smarty_Internal_Template $template cached template
-     */
-    public function register_template(Smarty_Internal_Template $template)
-    {
-    }
+	/**
+	 * Register template object
+	 *
+	 * @param \Smarty_Internal_Template $template cached template
+	 */
+	public function register_template(Smarty_Internal_Template $template)
+	{
+	}
 
-    /**
-     * Register data object
-     *
-     * @param \Smarty_Data $data data object
-     */
-    public static function register_data(Smarty_Data $data)
-    {
-    }
+	/**
+	 * Register data object
+	 *
+	 * @param \Smarty_Data $data data object
+	 */
+	public static function register_data(Smarty_Data $data)
+	{
+	}
 
-    /**
-     * Opens a window for the Smarty Debugging Console and display the data
-     *
-     * @param Smarty_Internal_Template|Smarty $obj object to debug
-     * @param bool                            $full
-     */
-    public function display_debug($obj, $full = false)
-    {
-        if (!$full) {
-            $this->offset ++;
-            $savedIndex = $this->index;
-            $this->index = 9999;
-        }
-        if ($obj->_objType == 1) {
-            $smarty = $obj;
-        } else {
-            $smarty = $obj->smarty;
-        }
-        // create fresh instance of smarty for displaying the debug console
-        // to avoid problems if the application did overload the Smarty class
-        $debObj = new Smarty();
-        // copy the working dirs from application
-        $debObj->setCompileDir($smarty->getCompileDir());
-        // init properties by hand as user may have edited the original Smarty class
-        $debObj->setPluginsDir(is_dir(__DIR__ . '/../plugins') ? __DIR__ . '/../plugins' : $smarty->getPluginsDir());
-        $debObj->force_compile = false;
-        $debObj->compile_check = true;
-        $debObj->left_delimiter = '{';
-        $debObj->right_delimiter = '}';
-        $debObj->security_policy = null;
-        $debObj->debugging = false;
-        $debObj->debugging_ctrl = 'NONE';
-        $debObj->error_reporting = E_ALL & ~E_NOTICE;
-        $debObj->debug_tpl = isset($smarty->debug_tpl) ? $smarty->debug_tpl : 'file:' . __DIR__ . '/../debug.tpl';
-        $debObj->registered_plugins = array();
-        $debObj->registered_resources = array();
-        $debObj->registered_filters = array();
-        $debObj->autoload_filters = array();
-        $debObj->default_modifiers = array();
-        $debObj->escape_html = true;
-        $debObj->caching = false;
-        $debObj->compile_id = null;
-        $debObj->cache_id = null;
-        // prepare information of assigned variables
-        $ptr = $this->get_debug_vars($obj);
-        $_assigned_vars = $ptr->tpl_vars;
-        ksort($_assigned_vars);
-        $_config_vars = $ptr->config_vars;
-        ksort($_config_vars);
-        $debugging = $smarty->debugging;
+	/**
+	 * Opens a window for the Smarty Debugging Console and display the data
+	 *
+	 * @param Smarty_Internal_Template|Smarty $obj object to debug
+	 * @param bool                            $full
+	 */
+	public function display_debug($obj, $full = false)
+	{
+		if (!$full) {
+			$this->offset ++;
+			$savedIndex = $this->index;
+			$this->index = 9999;
+		}
+		if ($obj->_objType == 1) {
+			$smarty = $obj;
+		} else {
+			$smarty = $obj->smarty;
+		}
+		// create fresh instance of smarty for displaying the debug console
+		// to avoid problems if the application did overload the Smarty class
+		$debObj = new Smarty();
+		// copy the working dirs from application
+		$debObj->setCompileDir($smarty->getCompileDir());
+		// init properties by hand as user may have edited the original Smarty class
+		$debObj->setPluginsDir(is_dir(__DIR__ . '/../plugins') ? __DIR__ . '/../plugins' : $smarty->getPluginsDir());
+		$debObj->force_compile = false;
+		$debObj->compile_check = true;
+		$debObj->left_delimiter = '{';
+		$debObj->right_delimiter = '}';
+		$debObj->security_policy = null;
+		$debObj->debugging = false;
+		$debObj->debugging_ctrl = 'NONE';
+		$debObj->error_reporting = E_ALL & ~E_NOTICE;
+		$debObj->debug_tpl = isset($smarty->debug_tpl) ? $smarty->debug_tpl : 'file:' . __DIR__ . '/../debug.tpl';
+		$debObj->registered_plugins = array();
+		$debObj->registered_resources = array();
+		$debObj->registered_filters = array();
+		$debObj->autoload_filters = array();
+		$debObj->default_modifiers = array();
+		$debObj->escape_html = true;
+		$debObj->caching = false;
+		$debObj->compile_id = null;
+		$debObj->cache_id = null;
+		// prepare information of assigned variables
+		$ptr = $this->get_debug_vars($obj);
+		$_assigned_vars = $ptr->tpl_vars;
+		ksort($_assigned_vars);
+		$_config_vars = $ptr->config_vars;
+		ksort($_config_vars);
+		$debugging = $smarty->debugging;
 
-        $_template = new Smarty_Internal_Template($debObj->debug_tpl, $debObj);
-        if ($obj->_objType == 2) {
-            $_template->assign('template_name', $obj->source->type . ':' . $obj->source->name);
-        }
-        if ($obj->_objType == 1 || $full) {
-            $_template->assign('template_data', $this->template_data[ $this->index ]);
-        } else {
-            $_template->assign('template_data', null);
-        }
-        $_template->assign('assigned_vars', $_assigned_vars);
-        $_template->assign('config_vars', $_config_vars);
-        $_template->assign('execution_time', microtime(true) - $smarty->start_time);
-        $_template->assign('display_mode', $debugging == 2 || !$full);
-        $_template->assign('offset', $this->offset * 50);
-        echo $_template->fetch();
-        if (isset($full)) {
-            $this->index --;
-        }
-        if (!$full) {
-            $this->index = $savedIndex;
-        }
-    }
+		$_template = new Smarty_Internal_Template($debObj->debug_tpl, $debObj);
+		if ($obj->_objType == 2) {
+			$_template->assign('template_name', $obj->source->type . ':' . $obj->source->name);
+		}
+		if ($obj->_objType == 1 || $full) {
+			$_template->assign('template_data', $this->template_data[ $this->index ]);
+		} else {
+			$_template->assign('template_data', null);
+		}
+		$_template->assign('assigned_vars', $_assigned_vars);
+		$_template->assign('config_vars', $_config_vars);
+		$_template->assign('execution_time', microtime(true) - $smarty->start_time);
+		$_template->assign('display_mode', $debugging == 2 || !$full);
+		$_template->assign('offset', $this->offset * 50);
+		echo $_template->fetch();
+		if (isset($full)) {
+			$this->index --;
+		}
+		if (!$full) {
+			$this->index = $savedIndex;
+		}
+	}
 
-    /**
-     * Recursively gets variables from all template/data scopes
-     *
-     * @param  Smarty_Internal_Template|Smarty_Data $obj object to debug
-     *
-     * @return StdClass
-     */
-    public function get_debug_vars($obj)
-    {
-        $config_vars = array();
-        foreach ($obj->config_vars as $key => $var) {
-            $config_vars[ $key ][ 'value' ] = $var;
-            if ($obj->_objType == 2) {
-                $config_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
-            } elseif ($obj->_objType == 4) {
-                $tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
-            } else {
-                $config_vars[ $key ][ 'scope' ] = 'Smarty object';
-            }
-        }
-        $tpl_vars = array();
-        foreach ($obj->tpl_vars as $key => $var) {
-            foreach ($var as $varkey => $varvalue) {
-                if ($varkey == 'value') {
-                    $tpl_vars[ $key ][ $varkey ] = $varvalue;
-                } else {
-                    if ($varkey == 'nocache') {
-                        if ($varvalue === true) {
-                            $tpl_vars[ $key ][ $varkey ] = $varvalue;
-                        }
-                    } else {
-                        if ($varkey != 'scope' || $varvalue !== 0) {
-                            $tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
-                        }
-                    }
-                }
-            }
-            if ($obj->_objType == 2) {
-                $tpl_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
-            } elseif ($obj->_objType == 4) {
-                $tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
-            } else {
-                $tpl_vars[ $key ][ 'scope' ] = 'Smarty object';
-            }
-        }
+	/**
+	 * Recursively gets variables from all template/data scopes
+	 *
+	 * @param  Smarty_Internal_Template|Smarty_Data $obj object to debug
+	 *
+	 * @return StdClass
+	 */
+	public function get_debug_vars($obj)
+	{
+		$config_vars = array();
+		foreach ($obj->config_vars as $key => $var) {
+			$config_vars[ $key ][ 'value' ] = $var;
+			if ($obj->_objType == 2) {
+				$config_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
+			} elseif ($obj->_objType == 4) {
+				$tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
+			} else {
+				$config_vars[ $key ][ 'scope' ] = 'Smarty object';
+			}
+		}
+		$tpl_vars = array();
+		foreach ($obj->tpl_vars as $key => $var) {
+			foreach ($var as $varkey => $varvalue) {
+				if ($varkey == 'value') {
+					$tpl_vars[ $key ][ $varkey ] = $varvalue;
+				} else {
+					if ($varkey == 'nocache') {
+						if ($varvalue === true) {
+							$tpl_vars[ $key ][ $varkey ] = $varvalue;
+						}
+					} else {
+						if ($varkey != 'scope' || $varvalue !== 0) {
+							$tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
+						}
+					}
+				}
+			}
+			if ($obj->_objType == 2) {
+				$tpl_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
+			} elseif ($obj->_objType == 4) {
+				$tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
+			} else {
+				$tpl_vars[ $key ][ 'scope' ] = 'Smarty object';
+			}
+		}
 
-        if (isset($obj->parent)) {
-            $parent = $this->get_debug_vars($obj->parent);
-            foreach ($parent->tpl_vars as $name => $pvar) {
-                if (isset($tpl_vars[ $name ]) && $tpl_vars[ $name ][ 'value' ] === $pvar[ 'value' ]) {
-                    $tpl_vars[ $name ][ 'scope' ] = $pvar[ 'scope' ];
-                }
-            }
-            $tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
+		if (isset($obj->parent)) {
+			$parent = $this->get_debug_vars($obj->parent);
+			foreach ($parent->tpl_vars as $name => $pvar) {
+				if (isset($tpl_vars[ $name ]) && $tpl_vars[ $name ][ 'value' ] === $pvar[ 'value' ]) {
+					$tpl_vars[ $name ][ 'scope' ] = $pvar[ 'scope' ];
+				}
+			}
+			$tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
 
-            foreach ($parent->config_vars as $name => $pvar) {
-                if (isset($config_vars[ $name ]) && $config_vars[ $name ][ 'value' ] === $pvar[ 'value' ]) {
-                    $config_vars[ $name ][ 'scope' ] = $pvar[ 'scope' ];
-                }
-            }
-            $config_vars = array_merge($parent->config_vars, $config_vars);
-        } else {
-            foreach (Smarty::$global_tpl_vars as $key => $var) {
-                if (!array_key_exists($key, $tpl_vars)) {
-                    foreach ($var as $varkey => $varvalue) {
-                        if ($varkey == 'value') {
-                            $tpl_vars[ $key ][ $varkey ] = $varvalue;
-                        } else {
-                            if ($varkey == 'nocache') {
-                                if ($varvalue === true) {
-                                    $tpl_vars[ $key ][ $varkey ] = $varvalue;
-                                }
-                            } else {
-                                if ($varkey != 'scope' || $varvalue !== 0) {
-                                    $tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
-                                }
-                            }
-                        }
-                    }
-                    $tpl_vars[ $key ][ 'scope' ] = 'Global';
-                }
-            }
-        }
+			foreach ($parent->config_vars as $name => $pvar) {
+				if (isset($config_vars[ $name ]) && $config_vars[ $name ][ 'value' ] === $pvar[ 'value' ]) {
+					$config_vars[ $name ][ 'scope' ] = $pvar[ 'scope' ];
+				}
+			}
+			$config_vars = array_merge($parent->config_vars, $config_vars);
+		} else {
+			foreach (Smarty::$global_tpl_vars as $key => $var) {
+				if (!array_key_exists($key, $tpl_vars)) {
+					foreach ($var as $varkey => $varvalue) {
+						if ($varkey == 'value') {
+							$tpl_vars[ $key ][ $varkey ] = $varvalue;
+						} else {
+							if ($varkey == 'nocache') {
+								if ($varvalue === true) {
+									$tpl_vars[ $key ][ $varkey ] = $varvalue;
+								}
+							} else {
+								if ($varkey != 'scope' || $varvalue !== 0) {
+									$tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
+								}
+							}
+						}
+					}
+					$tpl_vars[ $key ][ 'scope' ] = 'Global';
+				}
+			}
+		}
 
-        return (object) array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars);
-    }
+		return (object) array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars);
+	}
 
-    /**
-     * Return key into $template_data for template
-     *
-     * @param \Smarty_Internal_Template $template template object
-     *
-     * @return string key into $template_data
-     */
-    private function get_key(Smarty_Internal_Template $template)
-    {
-        static $_is_stringy = array('string' => true, 'eval' => true);
-        // calculate Uid if not already done
-        if ($template->source->uid == '') {
-            $template->source->filepath;
-        }
-        $key = $template->source->uid;
-        if (isset($this->template_data[ $this->index ][ $key ])) {
-            return $key;
-        } else {
-            if (isset($_is_stringy[ $template->source->type ])) {
-                $this->template_data[ $this->index ][ $key ][ 'name' ] =
-                    '\'' . substr($template->source->name, 0, 25) . '...\'';
-            } else {
-                $this->template_data[ $this->index ][ $key ][ 'name' ] = $template->source->filepath;
-            }
-            $this->template_data[ $this->index ][ $key ][ 'compile_time' ] = 0;
-            $this->template_data[ $this->index ][ $key ][ 'render_time' ] = 0;
-            $this->template_data[ $this->index ][ $key ][ 'cache_time' ] = 0;
-            $this->template_data[ $this->index ][ $key ][ 'total_time' ] = 0;
+	/**
+	 * Return key into $template_data for template
+	 *
+	 * @param \Smarty_Internal_Template $template template object
+	 *
+	 * @return string key into $template_data
+	 */
+	private function get_key(Smarty_Internal_Template $template)
+	{
+		static $_is_stringy = array('string' => true, 'eval' => true);
+		// calculate Uid if not already done
+		if ($template->source->uid == '') {
+			$template->source->filepath;
+		}
+		$key = $template->source->uid;
+		if (isset($this->template_data[ $this->index ][ $key ])) {
+			return $key;
+		} else {
+			if (isset($_is_stringy[ $template->source->type ])) {
+				$this->template_data[ $this->index ][ $key ][ 'name' ] =
+					'\'' . substr($template->source->name, 0, 25) . '...\'';
+			} else {
+				$this->template_data[ $this->index ][ $key ][ 'name' ] = $template->source->filepath;
+			}
+			$this->template_data[ $this->index ][ $key ][ 'compile_time' ] = 0;
+			$this->template_data[ $this->index ][ $key ][ 'render_time' ] = 0;
+			$this->template_data[ $this->index ][ $key ][ 'cache_time' ] = 0;
+			$this->template_data[ $this->index ][ $key ][ 'total_time' ] = 0;
 
-            return $key;
-        }
-    }
+			return $key;
+		}
+	}
 
-    /**
-     * Ignore template
-     *
-     * @param \Smarty_Internal_Template $template
-     */
-    public function ignore(Smarty_Internal_Template $template)
-    {
-        // calculate Uid if not already done
-        if ($template->source->uid == '') {
-            $template->source->filepath;
-        }
-        $this->ignore_uid[ $template->source->uid ] = true;
-    }
+	/**
+	 * Ignore template
+	 *
+	 * @param \Smarty_Internal_Template $template
+	 */
+	public function ignore(Smarty_Internal_Template $template)
+	{
+		// calculate Uid if not already done
+		if ($template->source->uid == '') {
+			$template->source->filepath;
+		}
+		$this->ignore_uid[ $template->source->uid ] = true;
+	}
 
-    /**
-     * handle 'URL' debugging mode
-     *
-     * @param Smarty $smarty
-     */
-    public function debugUrl(Smarty $smarty)
-    {
-        if (isset($_SERVER[ 'QUERY_STRING' ])) {
-            $_query_string = $_SERVER[ 'QUERY_STRING' ];
-        } else {
-            $_query_string = '';
-        }
-        if (false !== strpos($_query_string, $smarty->smarty_debug_id)) {
-            if (false !== strpos($_query_string, $smarty->smarty_debug_id . '=on')) {
-                // enable debugging for this browser session
-                setcookie('SMARTY_DEBUG', true);
-                $smarty->debugging = true;
-            } elseif (false !== strpos($_query_string, $smarty->smarty_debug_id . '=off')) {
-                // disable debugging for this browser session
-                setcookie('SMARTY_DEBUG', false);
-                $smarty->debugging = false;
-            } else {
-                // enable debugging for this page
-                $smarty->debugging = true;
-            }
-        } else {
-            if (isset($_COOKIE[ 'SMARTY_DEBUG' ])) {
-                $smarty->debugging = true;
-            }
-        }
-    }
+	/**
+	 * handle 'URL' debugging mode
+	 *
+	 * @param Smarty $smarty
+	 */
+	public function debugUrl(Smarty $smarty)
+	{
+		if (isset($_SERVER[ 'QUERY_STRING' ])) {
+			$_query_string = $_SERVER[ 'QUERY_STRING' ];
+		} else {
+			$_query_string = '';
+		}
+		if (false !== strpos($_query_string, $smarty->smarty_debug_id)) {
+			if (false !== strpos($_query_string, $smarty->smarty_debug_id . '=on')) {
+				// enable debugging for this browser session
+				setcookie('SMARTY_DEBUG', true);
+				$smarty->debugging = true;
+			} elseif (false !== strpos($_query_string, $smarty->smarty_debug_id . '=off')) {
+				// disable debugging for this browser session
+				setcookie('SMARTY_DEBUG', false);
+				$smarty->debugging = false;
+			} else {
+				// enable debugging for this page
+				$smarty->debugging = true;
+			}
+		} else {
+			if (isset($_COOKIE[ 'SMARTY_DEBUG' ])) {
+				$smarty->debugging = true;
+			}
+		}
+	}
 }