Updating Smarty

1 files changed, 117 insertions, 77 deletions

diff --git a/lib/smarty/sysplugins/smarty_internal_compile_break.php b/lib/smarty/sysplugins/smarty_internal_compile_break.php
index 259c66e..1ee8d75 100644
--- a/lib/smarty/sysplugins/smarty_internal_compile_break.php
+++ b/lib/smarty/sysplugins/smarty_internal_compile_break.php
@@ -1,77 +1,117 @@
-<?php

-/**

- * Smarty Internal Plugin Compile Break

- *

- * Compiles the {break} tag

- *

- * @package Smarty

- * @subpackage Compiler

- * @author Uwe Tews

- */

-/**

- * Smarty Internal Plugin Compile Break Class

- *

- * @package Smarty

- * @subpackage Compiler

- */

-class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase {

-

-    /**

-     * Attribute definition: Overwrites base class.

-     *

-     * @var array

-     * @see Smarty_Internal_CompileBase

-     */

-    public $optional_attributes = array('levels');

-    /**

-     * Attribute definition: Overwrites base class.

-     *

-     * @var array

-     * @see Smarty_Internal_CompileBase

-     */

-    public $shorttag_order = array('levels');

-

-    /**

-     * Compiles code for the {break} tag

-     *

-     * @param array  $args array with attributes from parser

-     * @param object $compiler   compiler object

-     * @param array  $parameter  array with compilation parameter

-     * @return string compiled code

-     */

-    public function compile($args, $compiler, $parameter)

-    {

-        static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);

-        // check and get attributes

-        $_attr = $this->getAttributes($compiler, $args);

-

-        if ($_attr['nocache'] === true) {

-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);

-        }

-

-        if (isset($_attr['levels'])) {

-            if (!is_numeric($_attr['levels'])) {

-                $compiler->trigger_template_error('level attribute must be a numeric constant', $compiler->lex->taglineno);

-            }

-            $_levels = $_attr['levels'];

-        } else {

-            $_levels = 1;

-        }

-        $level_count = $_levels;

-        $stack_count = count($compiler->_tag_stack) - 1;

-        while ($level_count > 0 && $stack_count >= 0) {

-            if (isset($_is_loopy[$compiler->_tag_stack[$stack_count][0]])) {

-                $level_count--;

-            }

-            $stack_count--;

-        }

-        if ($level_count != 0) {

-            $compiler->trigger_template_error("cannot break {$_levels} level(s)", $compiler->lex->taglineno);

-        }

-        $compiler->has_code = true;

-        return "<?php break {$_levels}?>";

-    }

-

-}

-

-?>
\ No newline at end of file
+<?php
+/**
+ * Smarty Internal Plugin Compile Break
+ * Compiles the {break} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Break Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('levels');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('levels');
+
+    /**
+     * Tag name may be overloaded by Smarty_Internal_Compile_Continue
+     *
+     * @var string
+     */
+    public $tag = 'break';
+
+    /**
+     * Compiles code for the {break} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        list($levels, $foreachLevels) = $this->checkLevels($args, $compiler);
+        $output = "<?php ";
+        if ($foreachLevels > 0 && $this->tag === 'continue') {
+            $foreachLevels--;
+        }
+        if ($foreachLevels > 0) {
+            /* @var Smarty_Internal_Compile_Foreach $foreachCompiler */
+            $foreachCompiler = $compiler->getTagCompiler('foreach');
+            $output .= $foreachCompiler->compileRestore($foreachLevels);
+        }
+        $output .= "{$this->tag} {$levels};?>";
+        return $output;
+    }
+
+    /**
+     * check attributes and return array of break and foreach levels
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return array
+     * @throws \SmartyCompilerException
+     */
+    public function checkLevels($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr[ 'nocache' ] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
+        }
+        if (isset($_attr[ 'levels' ])) {
+            if (!is_numeric($_attr[ 'levels' ])) {
+                $compiler->trigger_template_error('level attribute must be a numeric constant', null, true);
+            }
+            $levels = $_attr[ 'levels' ];
+        } else {
+            $levels = 1;
+        }
+        $level_count = $levels;
+        $stack_count = count($compiler->_tag_stack) - 1;
+        $foreachLevels = 0;
+        $lastTag = '';
+        while ($level_count > 0 && $stack_count >= 0) {
+            if (isset($_is_loopy[ $compiler->_tag_stack[ $stack_count ][ 0 ] ])) {
+                $lastTag = $compiler->_tag_stack[ $stack_count ][ 0 ];
+                if ($level_count === 0) {
+                    break;
+                }
+                $level_count--;
+                if ($compiler->_tag_stack[ $stack_count ][ 0 ] === 'foreach') {
+                    $foreachLevels++;
+                }
+            }
+            $stack_count--;
+        }
+        if ($level_count !== 0) {
+            $compiler->trigger_template_error("cannot {$this->tag} {$levels} level(s)", null, true);
+        }
+        if ($lastTag === 'foreach' && $this->tag === 'break' && $foreachLevels > 0) {
+            $foreachLevels--;
+        }
+        return array($levels, $foreachLevels);
+    }
+}