- allow block tags inside double quoted string

change_log.txt

@@ -1,3 +1,6 @@
+27/02/2010
+- allow block tags inside double quoted string 
+
 26/02/2010
 - cache modified check implemented
 - support of access to a class constant from an object (since PHP 5.3)

libs/sysplugins/smarty_internal_parsetree.php

@@ -0,0 +1,121 @@
+<?php
+
+abstract class _smarty_parsetree {
+  abstract public function to_smarty_php();
+}
+
+/* A complete smarty tag. */
+
+class _smarty_tag extends _smarty_parsetree {
+    public $parser;
+    public $data;
+    public $saved_block_nesting;
+    function __construct($parser, $data)
+    {
+        $this->parser = $parser;
+        $this->data = $data;
+        $this->saved_block_nesting = $parser->block_nesting_level;
+    } 
+
+    public function to_smarty_php()
+    {
+        return $this->data;
+    } 
+
+    public function assign_to_var()
+    {
+        $var = sprintf('$_tmp%d', ++$this->parser->prefix_number);
+        $this->parser->compiler->prefix_code[] = sprintf('<?php ob_start();?>%s<?php %s=ob_get_clean();?>',
+            $this->data, $var);
+        return $var;
+    } 
+} 
+
+/* Code fragment inside a tag. */
+class _smarty_code extends _smarty_parsetree {
+    public $parser;
+    public $data;
+    function __construct($parser, $data)
+    {
+        $this->parser = $parser;
+        $this->data = $data;
+    } 
+
+    public function to_smarty_php()
+    {
+        return sprintf("(%s)", $this->data);
+    } 
+} 
+
+/* Double quoted string inside a tag. */
+class _smarty_doublequoted extends _smarty_parsetree {
+    public $parser;
+    public $subtrees = Array();
+    function __construct($parser, _smarty_parsetree $subtree)
+    {
+        $this->parser = $parser;
+        $this->subtrees[] = $subtree;
+        if ($subtree instanceof _smarty_tag) {
+            $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
+        } 
+    } 
+
+    function append_subtree(_smarty_parsetree $subtree)
+    {
+        $last_subtree = count($this->subtrees)-1;
+        if ($last_subtree >= 0 && $this->subtrees[$last_subtree] instanceof _smarty_tag && $this->subtrees[$last_subtree]->saved_block_nesting < $this->parser->block_nesting_level) {
+            if ($subtree instanceof _smarty_code) {
+                $this->subtrees[$last_subtree]->data .= '<?php echo ' . $subtree->data . ';?>';
+            } else {
+                $this->subtrees[$last_subtree]->data .= $subtree->data;
+            } 
+        } else {
+            $this->subtrees[] = $subtree;
+        } 
+        if ($subtree instanceof _smarty_tag) {
+            $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
+        } 
+    } 
+
+    public function to_smarty_php()
+    {
+        $code = '';
+        foreach ($this->subtrees as $subtree) {
+            if ($code !== "") {
+                $code .= ".";
+            } 
+            if ($subtree instanceof _smarty_tag) {
+                $more_php = $subtree->assign_to_var();
+            } else {
+                $more_php = $subtree->to_smarty_php();
+            } 
+
+            $code .= $more_php;
+
+            if (!$subtree instanceof _smarty_dq_content) {
+                $this->parser->compiler->has_variable_string = true;
+            } 
+        } 
+
+        $code = sprintf("(%s)", $code);
+        return $code;
+    } 
+} 
+
+/* Raw chars as part of a double quoted string. */
+class _smarty_dq_content extends _smarty_parsetree {
+    public $data;
+    function __construct($parser, $data)
+    {
+        $this->parser = $parser;
+        $this->data = $data;
+    } 
+
+    public function to_smarty_php()
+    {
+        return '"' . $this->data . '"';
+    } 
+} 
+
+
+?>

libs/sysplugins/smarty_internal_smartytemplatecompiler.php

@@ -9,6 +9,7 @@
 * @subpackage Compiler
 * @author Uwe Tews 
 */
+require_once("smarty_internal_parsetree.php");
 /**
 * Class SmartyTemplateCompiler
 */
@@ -70,4 +71,4 @@ class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCom
     } 
 } 
 
-?>
+?>

libs/sysplugins/smarty_internal_template.php

@@ -651,7 +651,7 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     * @param string $resource_type return resource type
     * @param string $resource_name return resource name
     */
-    private function getResourceTypeName ($template_resource, &$resource_type, &$resource_name)
+    protected function getResourceTypeName ($template_resource, &$resource_type, &$resource_name)
     {
         if (strpos($template_resource, ':') === false) {
             // no resource given, use default
@@ -676,7 +676,7 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
     * @param string $resource_type template resource type
     * @return object resource handler object
     */
-    private function loadTemplateResourceHandler ($resource_type)
+    protected function loadTemplateResourceHandler ($resource_type)
     { 
         // try registered resource
         if (isset($this->smarty->_plugins['resource'][$resource_type])) {
@@ -817,4 +817,4 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
 class Smarty_Template extends Smarty_Internal_Template {
 } 
 
-?>
+?>

libs/sysplugins/smarty_internal_templatelexer.php

@@ -1678,7 +1678,7 @@ class Smarty_Internal_Templatelexer
         if ($this->counter >= strlen($this->data)) {
             return false; // end of input
         }
-        $yy_global_pattern = "/^(".$this->ldel."\\s{1,}\/)|^(".$this->ldel."\\s{1,})|^(".$this->ldel."\/)|^(".$this->ldel.")|^(\")|^(`\\$)|^(\\$\\w+)|^(\\$)|^(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(".$this->ldel."|\\$|`\\$|\")))|^([\S\s]+)/";
+        $yy_global_pattern = "/^(".$this->ldel."\\s{1,}\/)|^(".$this->ldel."\\s{1,})|^(".$this->ldel."\/)|^(".$this->ldel.")|^(\")|^(`\\$)|^(\\$[0-9]*[a-zA-Z_]\\w*)|^(\\$)|^(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(".$this->ldel."|\\$|`\\$|\")))|^([\S\s]+)/";
 
         do {
             if (preg_match($yy_global_pattern, substr($this->data, $this->counter), $yymatches)) {