- bugfix allow array definitions as modifier parameter

- bugfix observe compile_check property when loading config files
- added the template object as third filter parameter

libs/sysplugins/smarty_internal_config_file_compiler.php

@@ -1,23 +1,23 @@
 <?php
 
 /**
-* Smarty Internal Plugin Config File Compiler
-* 
-* This is the config file compiler class. It calls the lexer and parser to
-* perform the compiling.
-* 
-* @package Smarty
-* @subpackage Config
-* @author Uwe Tews 
-*/
+ * Smarty Internal Plugin Config File Compiler
+ * 
+ * This is the config file compiler class. It calls the lexer and parser to
+ * perform the compiling.
+ * 
+ * @package Smarty
+ * @subpackage Config
+ * @author Uwe Tews 
+ */
 /**
-* Main config file compiler class
-*/
+ * Main config file compiler class
+ */
 class Smarty_Internal_Config_File_Compiler {
-   public $compile_error= false;
-   /**
-    * Initialize compiler
-    */
+    public $compile_error = false;
+    /**
+     * Initialize compiler
+     */
     public function __construct($smarty)
     {
         $this->smarty = $smarty; 
@@ -29,19 +29,19 @@ class Smarty_Internal_Config_File_Compiler {
     } 
 
     /**
-    * Methode to compile a Smarty template
-    * 
-    * @param  $template template object to compile
-    * @return bool true if compiling succeeded, false if it failed
-    */
+     * Methode to compile a Smarty template
+     * 
+     * @param  $template template object to compile
+     * @return bool true if compiling succeeded, false if it failed
+     */
     public function compileSource($config)
     {
         /* here is where the compiling takes place. Smarty
        tags in the templates are replaces with PHP code,
-       then written to compiled files. */ 
-       $this->config = $config; 
-       // get config file source
-        $_content = $config->getConfigSource()."\n";
+       then written to compiled files. */
+        $this->config = $config; 
+        // get config file source
+        $_content = $config->getConfigSource() . "\n"; 
         // on empty template just return
         if ($_content == '') {
             return true;
@@ -49,10 +49,10 @@ class Smarty_Internal_Config_File_Compiler {
         // init the lexer/parser to compile the config file
         $lex = new Smarty_Internal_Configfilelexer($_content, $this->smarty);
         $parser = new Smarty_Internal_Configfileparser($lex, $this); 
-        // $parser->PrintTrace();
+        if (isset($this->smarty->_parserdebug)) $parser->PrintTrace();
         // get tokens from lexer and parse them
         while ($lex->yylex()) {
-            // echo "<br>Parsing  {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n";
+            if (isset($this->smarty->_parserdebug)) echo "<br>Parsing  {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n";
             $parser->doParse($lex->token, $lex->value);
         } 
         // finish parsing process
@@ -67,16 +67,16 @@ class Smarty_Internal_Config_File_Compiler {
         } 
     } 
     /**
-    * display compiler error messages without dying
-    * 
-    * If parameter $args is empty it is a parser detected syntax error.
-    * In this case the parser is called to obtain information about exspected tokens.
-    * 
-    * If parameter $args contains a string this is used as error message
-    * 
-    * @todo output exact position of parse error in source line
-    * @param  $args string individual error message or null
-    */
+     * display compiler error messages without dying
+     * 
+     * If parameter $args is empty it is a parser detected syntax error.
+     * In this case the parser is called to obtain information about exspected tokens.
+     * 
+     * If parameter $args contains a string this is used as error message
+     * 
+     * @todo output exact position of parse error in source line
+     * @param  $args string individual error message or null
+     */
     public function trigger_config_file_error($args = null)
     {
         $this->lex = Smarty_Internal_Configfilelexer::instance();
@@ -84,7 +84,7 @@ class Smarty_Internal_Config_File_Compiler {
         // get template source line which has error
         $line = $this->lex->line;
         if (isset($args)) {
-//            $line--;
+            // $line--;
         } 
         $match = preg_split("/\n/", $this->lex->data);
         $error_text = "Syntax error in config file '{$this->config->getConfigFilepath()}' on line {$line} '{$match[$line-1]}' ";
@@ -106,11 +106,10 @@ class Smarty_Internal_Config_File_Compiler {
             // output parser error message
             $error_text .= ' - Unexpected "' . $this->lex->value . '", expected one of: ' . implode(' , ', $expect);
         } 
-        throw new Exception($error_text);
+        throw new Exception($error_text); 
         // set error flag
         $this->compile_error = true;
     } 
-
 } 
 
-?>
+?>