dwoo-project / dwoo

lib/Dwoo/Adapters/CodeIgniter/libraries/Dwootemplate.php

Doc Comments +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
      *
      * @param string $sTemplate
      * @param boolean $return
-     * @return mixed
+     * @return null|string
      */
     public function display($sTemplate, $return = FALSE) {
         // Start benchmark

Indentation +149 added lines, -149 removed lines

@@ -20,153 +20,153 @@
  * @uses the dwoo package from http://dwoo.org
  */
 class Dwootemplate extends Dwoo_Core {
-    protected $dwoo_data = array();
-
-    /**
-     * Constructor for the DwooTemplate engine
-     *
-     */
-    public function __construct() {
-        // Call parents constructor
-        parent::__construct();
-
-        // Set the config settings
-        $this->initialize();
-
-        // Assign some defaults to dwoo
-        $CI                         = get_instance();
-        $this->dwoo_data            = new Dwoo_Data();
-        $this->dwoo_data->js_files  = array();
-        $this->dwoo_data->css_files = array();
-        $this->dwoo_data->CI        = $CI;
-        $this->dwoo_data->site_url  = $CI->config->site_url(); // so we can get the full path to CI easily
-        $this->dwoo_data->uniqid    = uniqid();
-        $this->dwoo_data->timestamp = mktime();
-
-        log_message('debug', "Dwoo Template Class Initialized");
-    }
-
-
-    /**
-     * Assign data to dwoo data object
-     *
-     * @param string $key
-     * @param mixed $value
-     */
-    public function assign($key, $value) {
-        $this->dwoo_data->$key = $value;
-    }
-
-
-    /**
-     * Add Javascript files to template
-     *
-     * @param string $js
-     */
-    public function add_js($js) {
-        $current   = $this->dwoo_data->js_files;
-        $current[] = $js;
-        $this->dwoo_data->js_files = $current;
-    }
-
-
-    /**
-     * Add Css stylesheets to template
-     *
-     * @param string $css
-     */
-    public function add_css($css) {
-        $current   = $this->dwoo_data->css_files;
-        $current[] = $css;
-        $this->dwoo_data->css_files = $current;
-    }
-
-
-    /**
-     * Display or return the compiled template
-     * Since we assign the results to the standard CI output module
-     * you can also use the helper from CI in your templates!!
-     *
-     * @param string $sTemplate
-     * @param boolean $return
-     * @return mixed
-     */
-    public function display($sTemplate, $return = FALSE) {
-        // Start benchmark
-        $CI = get_instance();
-        $CI->benchmark->mark('dwoo_parse_start');
-
-        // Check if file exists
-        if ( !file_exists($this->template_dir . $sTemplate ) ) {
-            $message = sprintf('Template file \'%s\' not found.', $sTemplate);
-            show_error($message);
-            log_message('error', $message);
-        }
-
-        // Create new template
-        $tpl = new Dwoo_Template_File($this->template_dir . $sTemplate);
-
-        // render the template
-        $template = $this->get($tpl, $this->dwoo_data);
-
-        // Finish benchmark
-        $CI->benchmark->mark('dwoo_parse_end');
-
-        // Return results or not ?
-        if ($return == FALSE) {
-            $CI->output->final_output = $template;
-        } else {
-            return $template;
-        }
-    }
-
-
-    /**
-     * Toggle Codeigniter profiler on/off
-     *
-     */
-    public function enable_profiler($toggle = TRUE) {
-        $CI = get_instance();
-        $CI->output->enable_profiler($toggle);
-    }
-
-
-    /**
-     * Set http header
-     *
-     * @example $this->output->set_header("HTTP/1.1 200 OK");
-     * @example $this->output->set_header('Last-Modified: '.gmdate('D, d M Y H:i:s', $last_update).' GMT');
-     * @param string $header
-     */
-    public function set_header($header) {
-        $CI = get_instance();
-        $CI->output->set_header($header);
-    }
-
-
-    /**
-     * Set status header
-     *
-     * @example $this->output->set_status_header('401');
-     * @example // Sets the header as: Unauthorized
-     * @param string $header
-     */
-    public function set_status_header($header) {
-        $CI = get_instance();
-        $CI->output->set_status_header($header);
-    }
-
-
-    /**
-     * Assign the dwootemplate config items to the instance
-     *
-     */
-    private function initialize() {
-        $CI = get_instance();
-        $CI->config->load('dwootemplate', TRUE);
-        $config = $CI->config->item('dwootemplate');
-        foreach ($config as $key => $val) {
-                $this->$key = $val;
-        }
-    }
+	protected $dwoo_data = array();
+
+	/**
+	 * Constructor for the DwooTemplate engine
+	 *
+	 */
+	public function __construct() {
+		// Call parents constructor
+		parent::__construct();
+
+		// Set the config settings
+		$this->initialize();
+
+		// Assign some defaults to dwoo
+		$CI                         = get_instance();
+		$this->dwoo_data            = new Dwoo_Data();
+		$this->dwoo_data->js_files  = array();
+		$this->dwoo_data->css_files = array();
+		$this->dwoo_data->CI        = $CI;
+		$this->dwoo_data->site_url  = $CI->config->site_url(); // so we can get the full path to CI easily
+		$this->dwoo_data->uniqid    = uniqid();
+		$this->dwoo_data->timestamp = mktime();
+
+		log_message('debug', "Dwoo Template Class Initialized");
+	}
+
+
+	/**
+	 * Assign data to dwoo data object
+	 *
+	 * @param string $key
+	 * @param mixed $value
+	 */
+	public function assign($key, $value) {
+		$this->dwoo_data->$key = $value;
+	}
+
+
+	/**
+	 * Add Javascript files to template
+	 *
+	 * @param string $js
+	 */
+	public function add_js($js) {
+		$current   = $this->dwoo_data->js_files;
+		$current[] = $js;
+		$this->dwoo_data->js_files = $current;
+	}
+
+
+	/**
+	 * Add Css stylesheets to template
+	 *
+	 * @param string $css
+	 */
+	public function add_css($css) {
+		$current   = $this->dwoo_data->css_files;
+		$current[] = $css;
+		$this->dwoo_data->css_files = $current;
+	}
+
+
+	/**
+	 * Display or return the compiled template
+	 * Since we assign the results to the standard CI output module
+	 * you can also use the helper from CI in your templates!!
+	 *
+	 * @param string $sTemplate
+	 * @param boolean $return
+	 * @return mixed
+	 */
+	public function display($sTemplate, $return = FALSE) {
+		// Start benchmark
+		$CI = get_instance();
+		$CI->benchmark->mark('dwoo_parse_start');
+
+		// Check if file exists
+		if ( !file_exists($this->template_dir . $sTemplate ) ) {
+			$message = sprintf('Template file \'%s\' not found.', $sTemplate);
+			show_error($message);
+			log_message('error', $message);
+		}
+
+		// Create new template
+		$tpl = new Dwoo_Template_File($this->template_dir . $sTemplate);
+
+		// render the template
+		$template = $this->get($tpl, $this->dwoo_data);
+
+		// Finish benchmark
+		$CI->benchmark->mark('dwoo_parse_end');
+
+		// Return results or not ?
+		if ($return == FALSE) {
+			$CI->output->final_output = $template;
+		} else {
+			return $template;
+		}
+	}
+
+
+	/**
+	 * Toggle Codeigniter profiler on/off
+	 *
+	 */
+	public function enable_profiler($toggle = TRUE) {
+		$CI = get_instance();
+		$CI->output->enable_profiler($toggle);
+	}
+
+
+	/**
+	 * Set http header
+	 *
+	 * @example $this->output->set_header("HTTP/1.1 200 OK");
+	 * @example $this->output->set_header('Last-Modified: '.gmdate('D, d M Y H:i:s', $last_update).' GMT');
+	 * @param string $header
+	 */
+	public function set_header($header) {
+		$CI = get_instance();
+		$CI->output->set_header($header);
+	}
+
+
+	/**
+	 * Set status header
+	 *
+	 * @example $this->output->set_status_header('401');
+	 * @example // Sets the header as: Unauthorized
+	 * @param string $header
+	 */
+	public function set_status_header($header) {
+		$CI = get_instance();
+		$CI->output->set_status_header($header);
+	}
+
+
+	/**
+	 * Assign the dwootemplate config items to the instance
+	 *
+	 */
+	private function initialize() {
+		$CI = get_instance();
+		$CI->config->load('dwootemplate', TRUE);
+		$config = $CI->config->item('dwootemplate');
+		foreach ($config as $key => $val) {
+				$this->$key = $val;
+		}
+	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -97,14 +97,14 @@
         $CI->benchmark->mark('dwoo_parse_start');
 
         // Check if file exists
-        if ( !file_exists($this->template_dir . $sTemplate ) ) {
+        if (!file_exists($this->template_dir.$sTemplate)) {
             $message = sprintf('Template file \'%s\' not found.', $sTemplate);
             show_error($message);
             log_message('error', $message);
         }
 
         // Create new template
-        $tpl = new Dwoo_Template_File($this->template_dir . $sTemplate);
+        $tpl = new Dwoo_Template_File($this->template_dir.$sTemplate);
 
         // render the template
         $template = $this->get($tpl, $this->dwoo_data);

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if (!defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 
 require "dwoo/dwooAutoload.php";
 

lib/Dwoo/Adapters/ZendFramework/PluginProxy.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	/**
 	 * Dwoo_Adapters_ZendFramework_PluginProxy's constructor.
 	 *
-	 * @param Zend_View_Interface $view
+	 * @param Dwoo_Adapters_ZendFramework_View $view
 	 */
 	public function __construct(Zend_View_Interface $view) {
 		$this->view = $view;

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 	 * @return string
 	 */
 	public function getCode($name, $params) {
-		return '$this->getPluginProxy()->view->'. $name .'('.Dwoo_Compiler::implode_r($params).')';
+		return '$this->getPluginProxy()->view->'.$name.'('.Dwoo_Compiler::implode_r($params).')';
 	}
 
 	/**

lib/Dwoo/Adapters/ZendFramework/View.php

Doc Comments +3 added lines, -4 removed lines

@@ -87,7 +87,6 @@ 
 	 *  - type class name or object for engine, dataProvider or compiler
 	 *  - any set* method (compileDir for setCompileDir ...)
 	 *
-	 * @param  array $options
 	 * @return Dwoo_Adapters_ZendFramework_View
 	 */
 	public function setOptions(array $opt = array())
@@ -272,6 +271,7 @@ 
 	 * Sets Dwoo data object
 	 *
 	 * @param string|Dwoo_Data Object or name of the class
+	 * @param Dwoo_Data $data
 	 */
 	public function setDataProvider($data)
 	{
@@ -329,7 +329,7 @@ 
 	/**
 	 * Return the Dwoo compiler object
 	 *
-	 * @return Dwoo_Data
+	 * @return Dwoo_Compiler
 	 */
 	public function getCompiler()
 	{
@@ -404,7 +404,7 @@ 
 	 * Clears all variables assigned to Zend_View either via {@link assign()} or
 	 * property overloading ({@link __get()}/{@link __set()}).
 	 *
-	 * @return void
+	 * @return Dwoo_Adapters_ZendFramework_View
 	 * @return Dwoo_Adapters_ZendFramework_View
 	 */
 	public function clearVars()
@@ -431,7 +431,6 @@ 
 	 * Processes a view script and outputs it. Output is then
 	 * passed through filters.
 	 *
-	 * @param string $name The script script name to process.
 	 * @return string The script output.
 	 */
 	public function _run()

Spacing +8 added lines, -8 removed lines

@@ -97,26 +97,26 @@ 
 
 		// Setting options to Dwoo objects...
 		foreach ($opt as $type => $settings) {
-			if (!method_exists($this, 'set' . $type)) {
+			if (!method_exists($this, 'set'.$type)) {
 				throw new Dwoo_Exception("Unknown type $type");
 			}
 
 			if (is_string($settings) || is_object($settings)) {
-				call_user_func(array($this, 'set' . $type), $settings);
+				call_user_func(array($this, 'set'.$type), $settings);
 			} elseif (is_array($settings)) {
 				// Set requested class
 				if (array_key_exists('type', $settings)) {
-					call_user_func(array($this, 'set' . $type), $settings['type']);
+					call_user_func(array($this, 'set'.$type), $settings['type']);
 				}
 
 				if (in_array($type, $classes)) {
 					// Call get so that the class is initialized
-					$rel = call_user_func(array($this, 'get' . $type));
+					$rel = call_user_func(array($this, 'get'.$type));
 
 					// Call set*() methods so that all the settings are set.
 					foreach ($settings as $method => $value) {
-						if (method_exists($rel, 'set' . $method)) {
-							call_user_func(array($rel, 'set' . $method), $value);
+						if (method_exists($rel, 'set'.$method)) {
+							call_user_func(array($rel, 'set'.$method), $value);
 						}
 					}
 				} elseif ('templateFile' == $type) {
@@ -356,8 +356,8 @@ 
 		}
 
 		foreach ($this->_templateFileSettings as $method => $value) {
-			if (method_exists($dwooTemplateFile, 'set' . $method)) {
-				call_user_func(array($dwooTemplateFile, 'set' . $method), $value);
+			if (method_exists($dwooTemplateFile, 'set'.$method)) {
+				call_user_func(array($dwooTemplateFile, 'set'.$method), $value);
 			}
 		}
 

Braces +4 added lines, -8 removed lines

@@ -248,8 +248,7 @@ 
 		//
 		elseif (is_subclass_of($engine, 'Dwoo') || 'Dwoo' === $engine) {
 			$this->_engine = new $engine();
-		}
-		else {
+		} else {
 			throw new Dwoo_Exception("Custom engine must be a subclass of Dwoo");
 		}
 	}
@@ -277,11 +276,9 @@ 
 	{
 		if ($data instanceof Dwoo_IDataProvider) {
 			$this->_dataProvider = $data;
-		}
-		elseif (is_subclass_of($data, 'Dwoo_Data') || 'Dwoo_Data' == $data) {
+		} elseif (is_subclass_of($data, 'Dwoo_Data') || 'Dwoo_Data' == $data) {
 			$this->_dataProvider = new $data();
-		}
-		else {
+		} else {
 			throw new Dwoo_Exception("Custom data provider must be a subclass of Dwoo_Data or instance of Dwoo_IDataProvider");
 		}
 	}
@@ -320,8 +317,7 @@ 
 		// if param given as a string
 		elseif (is_subclass_of($compiler, 'Dwoo_Compiler') || 'Dwoo_Compiler' == $compiler) {
 			$this->_compiler = new $compiler;
-		}
-		else {
+		} else {
 			throw new Dwoo_Exception("Custom compiler must be a subclass of Dwoo_Compiler or instance of Dwoo_ICompiler");
 		}
 	}

lib/Dwoo/Compiler.php

Doc Comments +3 added lines, -4 removed lines

@@ -270,7 +270,7 @@ 
 	/**
 	 * returns the left and right template delimiters
 	 *
-	 * @return array containing the left and the right delimiters
+	 * @return string[] containing the left and the right delimiters
 	 */
 	public function getDelimiters()
 	{
@@ -358,7 +358,7 @@ 
 	 * adds a preprocessor to the compiler, it will be called
 	 * before the template is compiled
 	 *
-	 * @param mixed $callback either a valid callback to the preprocessor or a simple name if the autoload is set to true
+	 * @param string $callback either a valid callback to the preprocessor or a simple name if the autoload is set to true
 	 * @param bool $autoload if set to true, the preprocessor is auto-loaded from one of the plugin directories, else you must provide a valid callback
 	 */
 	public function addPreProcessor($callback, $autoload = false)
@@ -685,7 +685,6 @@ 
 	/**
 	 * compiles the provided string down to php code
 	 *
-	 * @param string $tpl the template to compile
 	 * @return string a compiled php string
 	 */
 	public function compile(Dwoo_Core $dwoo, Dwoo_ITemplate $template)
@@ -1215,7 +1214,7 @@ 
 	 * returns the token of each parameter out of the given parameter array
 	 *
 	 * @param array $params parameter array
-	 * @return array tokens
+	 * @return Dwoo_Compiler tokens
 	 */
 	public function getParamTokens(array $params)
 	{

Spacing +136 added lines, -136 removed lines

@@ -393,7 +393,7 @@ 
 		} elseif (($index = array_search('Dwoo_Processor_'.str_replace('Dwoo_Processor_', '', $callback), $this->processors['pre'], true)) !== false) {
 			unset($this->processors['pre'][$index]);
 		} else {
-			$class = 'Dwoo_Processor_' . str_replace('Dwoo_Processor_', '', $callback);
+			$class = 'Dwoo_Processor_'.str_replace('Dwoo_Processor_', '', $callback);
 			foreach ($this->processors['pre'] as $index=>$proc) {
 				if (is_array($proc) && ($proc[0] instanceof $class) || (isset($proc['class']) && $proc['class'] == $class)) {
 					unset($this->processors['pre'][$index]);
@@ -441,8 +441,8 @@ 
 			unset($this->processors['post'][$index]);
 		} elseif (($index = array_search('Dwoo_Processor_'.str_replace('Dwoo_Processor_', '', $callback), $this->processors['post'], true)) !== false) {
 			unset($this->processors['post'][$index]);
-		} else	{
-			$class = 'Dwoo_Processor_' . str_replace('Dwoo_Processor_', '', $callback);
+		} else {
+			$class = 'Dwoo_Processor_'.str_replace('Dwoo_Processor_', '', $callback);
 			foreach ($this->processors['post'] as $index=>$proc) {
 				if (is_array($proc) && ($proc[0] instanceof $class) || (isset($proc['class']) && $proc['class'] == $class)) {
 					unset($this->processors['post'][$index]);
@@ -648,7 +648,7 @@ 
 	public function setTemplateSource($newSource, $fromPointer = false)
 	{
 		if ($fromPointer === true) {
-			$this->templateSource = substr($this->templateSource, 0, $this->pointer) . $newSource;
+			$this->templateSource = substr($this->templateSource, 0, $this->pointer).$newSource;
 		} else {
 			$this->templateSource = $newSource;
 		}
@@ -695,16 +695,16 @@ 
 		$ptr = 0;
 		$this->dwoo = $dwoo;
 		$this->template = $template;
-		$this->templateSource =& $tpl;
-		$this->pointer =& $ptr;
+		$this->templateSource = & $tpl;
+		$this->pointer = & $ptr;
 
 		while (true) {
 			// if pointer is at the beginning, reset everything, that allows a plugin to externally reset the compiler if everything must be reparsed
-			if ($ptr===0) {
+			if ($ptr === 0) {
 				// resets variables
 				$this->usedPlugins = array();
 				$this->data = array();
-				$this->scope =& $this->data;
+				$this->scope = & $this->data;
 				$this->scopeTree = array();
 				$this->stack = array();
 				$this->line = 1;
@@ -739,7 +739,7 @@ 
 					if (ini_get('short_open_tags')) {
 						$search = array('{<\?.*?\?>}', '{<%.*?%>}');
 					}
-					switch($this->securityPolicy->getPhpHandling()) {
+					switch ($this->securityPolicy->getPhpHandling()) {
 
 					case Dwoo_Security_Policy::PHP_ALLOW:
 						break;
@@ -759,14 +759,14 @@ 
 				$this->push(substr($tpl, $ptr), 0);
 				break;
 			} elseif (substr($tpl, $pos-1, 1) === '\\' && substr($tpl, $pos-2, 1) !== '\\') {
-				$this->push(substr($tpl, $ptr, $pos-$ptr-1) . $this->ld);
+				$this->push(substr($tpl, $ptr, $pos-$ptr-1).$this->ld);
 				$ptr = $pos+strlen($this->ld);
-			} elseif (preg_match('/^'.$this->ldr . ($this->allowLooseOpenings ? '\s*' : '') . 'literal' . ($this->allowLooseOpenings ? '\s*' : '') . $this->rdr.'/s', substr($tpl, $pos), $litOpen)) {
-				if (!preg_match('/'.$this->ldr . ($this->allowLooseOpenings ? '\s*' : '') . '\/literal' . ($this->allowLooseOpenings ? '\s*' : '') . $this->rdr.'/s', $tpl, $litClose, PREG_OFFSET_CAPTURE, $pos)) {
+			} elseif (preg_match('/^'.$this->ldr.($this->allowLooseOpenings ? '\s*' : '').'literal'.($this->allowLooseOpenings ? '\s*' : '').$this->rdr.'/s', substr($tpl, $pos), $litOpen)) {
+				if (!preg_match('/'.$this->ldr.($this->allowLooseOpenings ? '\s*' : '').'\/literal'.($this->allowLooseOpenings ? '\s*' : '').$this->rdr.'/s', $tpl, $litClose, PREG_OFFSET_CAPTURE, $pos)) {
 					throw new Dwoo_Compilation_Exception($this, 'The {literal} blocks must be closed explicitly with {/literal}');
 				}
 				$endpos = $litClose[0][1];
-				$this->push(substr($tpl, $ptr, $pos-$ptr) . substr($tpl, $pos + strlen($litOpen[0]), $endpos-$pos-strlen($litOpen[0])));
+				$this->push(substr($tpl, $ptr, $pos-$ptr).substr($tpl, $pos+strlen($litOpen[0]), $endpos-$pos-strlen($litOpen[0])));
 				$ptr = $endpos+strlen($litClose[0][0]);
 			} else {
 				if (substr($tpl, $pos-2, 1) === '\\' && substr($tpl, $pos-1, 1) === '\\') {
@@ -780,7 +780,7 @@ 
 				$pos += strlen($this->ld);
 				if ($this->allowLooseOpenings) {
 					while (substr($tpl, $pos, 1) === ' ') {
-						$pos+=1;
+						$pos += 1;
 					}
 				} else {
 					if (substr($tpl, $pos, 1) === ' ' || substr($tpl, $pos, 1) === "\r" || substr($tpl, $pos, 1) === "\n" || substr($tpl, $pos, 1) === "\t") {
@@ -807,7 +807,7 @@ 
 						continue 2;
 					}
 
-					$len = $subptr - $ptr;
+					$len = $subptr-$ptr;
 					$this->push($parsed, substr_count(substr($tpl, $ptr, $len), "\n"));
 					$ptr += $len;
 
@@ -844,7 +844,7 @@ 
 				continue;
 			}
 
-			switch($type) {
+			switch ($type) {
 
 			case Dwoo_Core::BLOCK_PLUGIN:
 			case Dwoo_Core::CLASS_PLUGIN:
@@ -884,15 +884,15 @@ 
 
 		$output .= $compiled."\n?>";
 
-		$output = preg_replace('/(?<!;|\}|\*\/|\n|\{)(\s*'.preg_quote(self::PHP_CLOSE, '/') . preg_quote(self::PHP_OPEN, '/').')/', ";\n", $output);
-		$output = str_replace(self::PHP_CLOSE . self::PHP_OPEN, "\n", $output);
+		$output = preg_replace('/(?<!;|\}|\*\/|\n|\{)(\s*'.preg_quote(self::PHP_CLOSE, '/').preg_quote(self::PHP_OPEN, '/').')/', ";\n", $output);
+		$output = str_replace(self::PHP_CLOSE.self::PHP_OPEN, "\n", $output);
 
 		// handle <?xml tag at the beginning
 		$output = preg_replace('#(/\* template body \*/ \?>\s*)<\?xml#is', '$1<?php echo \'<?xml\'; ?>', $output);
 
 		// add another line break after PHP closing tags that have a line break following,
 		// as we do not know whether it's intended, and PHP will strip it otherwise
-		$output = preg_replace('/(?<!"|<\?xml)\s*\?>\n/', '$0' . "\n", $output);
+		$output = preg_replace('/(?<!"|<\?xml)\s*\?>\n/', '$0'."\n", $output);
 
 		if ($this->debug) {
 			echo '<hr><pre>';
@@ -967,17 +967,17 @@ 
 	{
 		$old = $this->scopeTree;
 
-		if ($scope===null) {
+		if ($scope === null) {
 			unset($this->scope);
 			$this->scope = null;
 		}
 
-		if (is_array($scope)===false) {
+		if (is_array($scope) === false) {
 			$scope = explode('.', $scope);
 		}
 
-		if ($absolute===true) {
-			$this->scope =& $this->data;
+		if ($absolute === true) {
+			$this->scope = & $this->data;
 			$this->scopeTree = array();
 		}
 
@@ -985,19 +985,19 @@ 
 			if ($bit === '_parent' || $bit === '_') {
 				array_pop($this->scopeTree);
 				reset($this->scopeTree);
-				$this->scope =& $this->data;
+				$this->scope = & $this->data;
 				$cnt = count($this->scopeTree);
-				for ($i=0;$i<$cnt;$i++)
-					$this->scope =& $this->scope[$this->scopeTree[$i]];
+				for ($i = 0; $i < $cnt; $i++)
+					$this->scope = & $this->scope[$this->scopeTree[$i]];
 			} elseif ($bit === '_root' || $bit === '__') {
-				$this->scope =& $this->data;
+				$this->scope = & $this->data;
 				$this->scopeTree = array();
 			} elseif (isset($this->scope[$bit])) {
-				$this->scope =& $this->scope[$bit];
+				$this->scope = & $this->scope[$bit];
 				$this->scopeTree[] = $bit;
 			} else {
 				$this->scope[$bit] = array();
-				$this->scope =& $this->scope[$bit];
+				$this->scope = & $this->scope[$bit];
 				$this->scopeTree[] = $bit;
 			}
 		}
@@ -1023,8 +1023,8 @@ 
 		$params = $this->mapParams($params, array($class, 'init'), $paramtype);
 
 		$this->stack[] = array('type' => $type, 'params' => $params, 'custom' => false, 'class' => $class, 'buffer' => null);
-		$this->curBlock =& $this->stack[count($this->stack)-1];
-		return call_user_func(array($class,'preProcessing'), $this, $params, '', '', $type);
+		$this->curBlock = & $this->stack[count($this->stack)-1];
+		return call_user_func(array($class, 'preProcessing'), $this, $params, '', '', $type);
 	}
 
 	/**
@@ -1047,8 +1047,8 @@ 
 		$params = $this->mapParams($params, array($class, 'init'), $paramtype);
 
 		$this->stack[] = array('type' => $type, 'params' => $params, 'custom' => true, 'class' => $class, 'buffer' => null);
-		$this->curBlock =& $this->stack[count($this->stack)-1];
-		return call_user_func(array($class,'preProcessing'), $this, $params, '', '', $type);
+		$this->curBlock = & $this->stack[count($this->stack)-1];
+		return call_user_func(array($class, 'preProcessing'), $this, $params, '', '', $type);
 	}
 
 	/**
@@ -1066,7 +1066,7 @@ 
 			$this->dwoo->getLoader()->loadPlugin($type);
 		}
 		$this->stack[] = array('type' => $type, 'params' => $params, 'custom' => false, 'class' => $class, 'buffer' => null);
-		$this->curBlock =& $this->stack[count($this->stack)-1];
+		$this->curBlock = & $this->stack[count($this->stack)-1];
 	}
 
 	/**
@@ -1092,11 +1092,11 @@ 
 					$class = 'Dwoo_Plugin_'.$top['type'];
 				}
 				if (count($this->stack)) {
-					$this->curBlock =& $this->stack[count($this->stack)-1];
+					$this->curBlock = & $this->stack[count($this->stack)-1];
 					$this->push(call_user_func(array($class, 'postProcessing'), $this, $top['params'], '', '', $top['buffer']), 0);
 				} else {
 					$null = null;
-					$this->curBlock =& $null;
+					$this->curBlock = & $null;
 					$output = call_user_func(array($class, 'postProcessing'), $this, $top['params'], '', '', $top['buffer']);
 				}
 
@@ -1126,9 +1126,9 @@ 
 	 */
 	public function &findBlock($type, $closeAlong = false)
 	{
-		if ($closeAlong===true) {
+		if ($closeAlong === true) {
 			while ($b = end($this->stack)) {
-				if ($b['type']===$type) {
+				if ($b['type'] === $type) {
 					return $this->stack[key($this->stack)];
 				}
 				$this->push($this->removeTopBlock(), 0);
@@ -1136,7 +1136,7 @@ 
 		} else {
 			end($this->stack);
 			while ($b = current($this->stack)) {
-				if ($b['type']===$type) {
+				if ($b['type'] === $type) {
 					return $this->stack[key($this->stack)];
 				}
 				prev($this->stack);
@@ -1174,7 +1174,7 @@ 
 			$class = 'Dwoo_Plugin_'.$o['type'];
 		}
 
-		$this->curBlock =& $this->stack[count($this->stack)-1];
+		$this->curBlock = & $this->stack[count($this->stack)-1];
 
 		return call_user_func(array($class, 'postProcessing'), $this, $o['params'], '', '', $o['buffer']);
 	}
@@ -1238,7 +1238,7 @@ 
 	 * @param mixed $pointer a reference to a pointer that will be increased by the amount of characters parsed, or null by default
 	 * @return string parsed values
 	 */
-	protected function parse($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
+	protected function parse($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
 	{
 		if ($to === null) {
 			$to = strlen($in);
@@ -1249,7 +1249,7 @@ 
 			throw new Dwoo_Compilation_Exception($this, 'Unexpected EOF, a template tag was not closed');
 		}
 
-		while ($first===" " || $first==="\n" || $first==="\t" || $first==="\r") {
+		while ($first === " " || $first === "\n" || $first === "\t" || $first === "\r") {
 			if ($curBlock === 'root' && substr($in, $from, strlen($this->rd)) === $this->rd) {
 				// end template tag
 				$pointer += strlen($this->rd);
@@ -1272,12 +1272,12 @@ 
 
 		$substr = substr($in, $from, $to-$from);
 
-		if ($this->debug) echo '<br />PARSE CALL : PARSING "<b>'.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').'</b>" @ '.$from.':'.$to.' in '.$curBlock.' : pointer='.$pointer.'<br/>';
+		if ($this->debug) echo '<br />PARSE CALL : PARSING "<b>'.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...' : '').'</b>" @ '.$from.':'.$to.' in '.$curBlock.' : pointer='.$pointer.'<br/>';
 		$parsed = "";
 
 		if ($curBlock === 'root' && $first === '*') {
 			$src = $this->getTemplateSource();
-			$startpos = $this->getPointer() - strlen($this->ld);
+			$startpos = $this->getPointer()-strlen($this->ld);
 			if (substr($src, $startpos, strlen($this->ld)) === $this->ld) {
 				if ($startpos > 0) {
 					do {
@@ -1293,7 +1293,7 @@ 
 				if (!isset($whitespaceStart)) {
 					$startpos = $this->getPointer();
 				} else {
-					$pointer -= $this->getPointer() - $startpos;
+					$pointer -= $this->getPointer()-$startpos;
 				}
 
 				if ($this->allowNestedComments && strpos($src, $this->ld.'*', $this->getPointer()) !== false) {
@@ -1301,7 +1301,7 @@ 
 					$comClose = '*'.$this->rd;
 					$level = 1;
 					$start = $startpos;
-					$ptr = $this->getPointer() + '*';
+					$ptr = $this->getPointer()+'*';
 
 					while ($level > 0 && $ptr < strlen($src)) {
 						$open = strpos($src, $comOpen, $ptr);
@@ -1309,49 +1309,49 @@ 
 
 						if ($open !== false && $close !== false) {
 							if ($open < $close) {
-								$ptr = $open + strlen($comOpen);
+								$ptr = $open+strlen($comOpen);
 								$level++;
 							} else {
-								$ptr = $close + strlen($comClose);
+								$ptr = $close+strlen($comClose);
 								$level--;
 							}
 						} elseif ($open !== false) {
-							$ptr = $open + strlen($comOpen);
+							$ptr = $open+strlen($comOpen);
 							$level++;
 						} elseif ($close !== false) {
-							$ptr = $close + strlen($comClose);
+							$ptr = $close+strlen($comClose);
 							$level--;
 						} else {
 							$ptr = strlen($src);
 						}
 					}
-					$endpos = $ptr - strlen('*'.$this->rd);
+					$endpos = $ptr-strlen('*'.$this->rd);
 				} else {
 					$endpos = strpos($src, '*'.$this->rd, $startpos);
 					if ($endpos == false) {
 						throw new Dwoo_Compilation_Exception($this, 'Un-ended comment');
 					}
 				}
-				$pointer += $endpos - $startpos + strlen('*'.$this->rd);
+				$pointer += $endpos-$startpos+strlen('*'.$this->rd);
 				if (isset($whitespaceStart) && preg_match('#^[\t ]*\r?\n#', substr($src, $endpos+strlen('*'.$this->rd)), $m)) {
 					$pointer += strlen($m[0]);
-					$this->curBlock['buffer'] = substr($this->curBlock['buffer'], 0, strlen($this->curBlock['buffer']) - ($this->getPointer() - $startpos - strlen($this->ld)));
+					$this->curBlock['buffer'] = substr($this->curBlock['buffer'], 0, strlen($this->curBlock['buffer'])-($this->getPointer()-$startpos-strlen($this->ld)));
 				}
 				return false;
 			}
 		}
 
-		if ($first==='$') {
+		if ($first === '$') {
 			// var
 			$out = $this->parseVar($in, $from, $to, $parsingParams, $curBlock, $pointer);
 			$parsed = 'var';
-		} elseif ($first==='%' && preg_match('#^%[a-z_]#i', $substr)) {
+		} elseif ($first === '%' && preg_match('#^%[a-z_]#i', $substr)) {
 			// const
 			$out = $this->parseConst($in, $from, $to, $parsingParams, $curBlock, $pointer);
-		} elseif (($first==='"' || $first==="'") && !(is_array($parsingParams) && preg_match('#^([\'"])[a-z0-9_]+\1\s*=>?(?:\s+|[^=])#i', $substr))) {
+		} elseif (($first === '"' || $first === "'") && !(is_array($parsingParams) && preg_match('#^([\'"])[a-z0-9_]+\1\s*=>?(?:\s+|[^=])#i', $substr))) {
 			// string
 			$out = $this->parseString($in, $from, $to, $parsingParams, $curBlock, $pointer);
-		} elseif (preg_match('/^\\\\?[a-z_](?:\\\\?[a-z0-9_]+)*(?:::[a-z_][a-z0-9_]*)?('.(is_array($parsingParams)||$curBlock!='root'?'':'\s+[^(]|').'\s*\(|\s*'.$this->rdr.'|\s*;)/i', $substr)) {
+		} elseif (preg_match('/^\\\\?[a-z_](?:\\\\?[a-z0-9_]+)*(?:::[a-z_][a-z0-9_]*)?('.(is_array($parsingParams) || $curBlock != 'root' ? '' : '\s+[^(]|').'\s*\(|\s*'.$this->rdr.'|\s*;)/i', $substr)) {
 			// func
 			$out = $this->parseFunction($in, $from, $to, $parsingParams, $curBlock, $pointer);
 			$parsed = 'func';
@@ -1388,11 +1388,11 @@ 
 			if ($this->debug) echo 'TAG PARSING ENDED<br />';
 			$pointer += strlen($this->rd);
 			return false;
-		} elseif (is_array($parsingParams) && preg_match('#^(([\'"]?)[a-z0-9_]+\2\s*='.($curBlock === 'array' ? '>?':'').')(?:\s+|[^=]).*#i', $substr, $match)) {
+		} elseif (is_array($parsingParams) && preg_match('#^(([\'"]?)[a-z0-9_]+\2\s*='.($curBlock === 'array' ? '>?' : '').')(?:\s+|[^=]).*#i', $substr, $match)) {
 			// named parameter
 			if ($this->debug) echo 'NAMED PARAM FOUND<br />';
 			$len = strlen($match[1]);
-			while (substr($in, $from+$len, 1)===' ') {
+			while (substr($in, $from+$len, 1) === ' ') {
 				$len++;
 			}
 			if ($pointer !== null) {
@@ -1413,7 +1413,7 @@ 
 				$out = $match[1];
 			}
 			$pointer += strlen($match[1]);
-		} elseif ($substr!=='' && (is_array($parsingParams) || $curBlock === 'namedparam' || $curBlock === 'condition' || $curBlock === 'expression')) {
+		} elseif ($substr !== '' && (is_array($parsingParams) || $curBlock === 'namedparam' || $curBlock === 'condition' || $curBlock === 'expression')) {
 			// unquoted string, bool or number
 			$out = $this->parseOthers($in, $from, $to, $parsingParams, $curBlock, $pointer);
 		} else {
@@ -1428,19 +1428,19 @@ 
 		$substr = substr($in, $pointer, $to-$pointer);
 
 		// var parsed, check if any var-extension applies
-		if ($parsed==='var') {
+		if ($parsed === 'var') {
 			if (preg_match('#^\s*([/%+*-])\s*([a-z0-9]|\$)#i', $substr, $match)) {
-				if($this->debug) echo 'PARSING POST-VAR EXPRESSION '.$substr.'<br />';
+				if ($this->debug) echo 'PARSING POST-VAR EXPRESSION '.$substr.'<br />';
 				// parse expressions
-				$pointer += strlen($match[0]) - 1;
+				$pointer += strlen($match[0])-1;
 				if (is_array($parsingParams)) {
 					if ($match[2] == '$') {
 						$expr = $this->parseVar($in, $pointer, $to, array(), $curBlock, $pointer);
 					} else {
 						$expr = $this->parse($in, $pointer, $to, array(), 'expression', $pointer);
 					}
-					$out[count($out)-1][0] .= $match[1] . $expr[0][0];
-					$out[count($out)-1][1] .= $match[1] . $expr[0][1];
+					$out[count($out)-1][0] .= $match[1].$expr[0][0];
+					$out[count($out)-1][1] .= $match[1].$expr[0][1];
 				} else {
 					if ($match[2] == '$') {
 						$expr = $this->parseVar($in, $pointer, $to, false, $curBlock, $pointer);
@@ -1448,19 +1448,19 @@ 
 						$expr = $this->parse($in, $pointer, $to, false, 'expression', $pointer);
 					}
 					if (is_array($out) && is_array($expr)) {
-						$out[0] .= $match[1] . $expr[0];
-						$out[1] .= $match[1] . $expr[1];
+						$out[0] .= $match[1].$expr[0];
+						$out[1] .= $match[1].$expr[1];
 					} elseif (is_array($out)) {
-						$out[0] .= $match[1] . $expr;
-						$out[1] .= $match[1] . $expr;
+						$out[0] .= $match[1].$expr;
+						$out[1] .= $match[1].$expr;
 					} elseif (is_array($expr)) {
-						$out .= $match[1] . $expr[0];
+						$out .= $match[1].$expr[0];
 					} else {
-						$out .= $match[1] . $expr;
+						$out .= $match[1].$expr;
 					}
 				}
 			} else if ($curBlock === 'root' && preg_match('#^(\s*(?:[+/*%-.]=|=|\+\+|--)\s*)(.*)#s', $substr, $match)) {
-				if($this->debug) echo 'PARSING POST-VAR ASSIGNMENT '.$substr.'<br />';
+				if ($this->debug) echo 'PARSING POST-VAR ASSIGNMENT '.$substr.'<br />';
 				// parse assignment
 				$value = $match[2];
 				$operator = trim($match[1]);
@@ -1499,7 +1499,7 @@ 
 				if ($this->autoEscape) {
 					$out = preg_replace('#\(is_string\(\$tmp=(.+?)\) \? htmlspecialchars\(\$tmp, ENT_QUOTES, \$this->charset\) : \$tmp\)#', '$1', $out);
 				}
-				$out = Dwoo_Compiler::PHP_OPEN. $echo . $out . $operator . implode(' ', $value) . Dwoo_Compiler::PHP_CLOSE;
+				$out = Dwoo_Compiler::PHP_OPEN.$echo.$out.$operator.implode(' ', $value).Dwoo_Compiler::PHP_CLOSE;
 			} else if ($curBlock === 'array' && is_array($parsingParams) && preg_match('#^(\s*=>?\s*)#', $substr, $match)) {
 				// parse namedparam with var as name (only for array)
 				if ($this->debug) echo 'VARIABLE NAMED PARAM (FOR ARRAY) FOUND<br />';
@@ -1520,14 +1520,14 @@ 
 			if (is_array($parsingParams)) {
 				$tmp = $this->replaceModifiers(array(null, null, $out[count($out)-1][0], $match[0]), $curBlock, $pointer);
 				$out[count($out)-1][0] = $tmp;
-				$out[count($out)-1][1] .= substr($substr, $srcPointer, $srcPointer - $pointer);
+				$out[count($out)-1][1] .= substr($substr, $srcPointer, $srcPointer-$pointer);
 			} else {
 				$out = $this->replaceModifiers(array(null, null, $out, $match[0]), $curBlock, $pointer);
 			}
 		}
 
 		// func parsed, check if any func-extension applies
-		if ($parsed==='func' && preg_match('#^->[a-z0-9_]+(\s*\(.+|->[a-z_].*)?#is', $substr, $match)) {
+		if ($parsed === 'func' && preg_match('#^->[a-z0-9_]+(\s*\(.+|->[a-z_].*)?#is', $substr, $match)) {
 			// parse method call or property read
 			$ptr = 0;
 
@@ -1544,7 +1544,7 @@ 
 		}
 
 		if ($curBlock === 'root' && substr($out, 0, strlen(self::PHP_OPEN)) !== self::PHP_OPEN) {
-			return self::PHP_OPEN .'echo '.$out.';'. self::PHP_CLOSE;
+			return self::PHP_OPEN.'echo '.$out.';'.self::PHP_CLOSE;
 		} else {
 			return $out;
 		}
@@ -1561,7 +1561,7 @@ 
 	 * @param mixed $pointer a reference to a pointer that will be increased by the amount of characters parsed, or null by default
 	 * @return string parsed values
 	 */
-	protected function parseFunction($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
+	protected function parseFunction($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
 	{
 		$cmdstr = substr($in, $from, $to-$from);
 		preg_match('/^(\\\\?[a-z_](?:\\\\?[a-z0-9_]+)*(?:::[a-z_][a-z0-9_]*)?)(\s*'.$this->rdr.'|\s*;)?/i', $cmdstr, $match);
@@ -1583,14 +1583,14 @@ 
 		if (is_array($parsingParams) || $curBlock != 'root') {
 			$paramspos = strpos($cmdstr, '(');
 			$paramsep = ')';
-		} elseif(preg_match_all('#^\s*[\\\\:a-z0-9_]+(\s*\(|\s+[^(])#i', $cmdstr, $match, PREG_OFFSET_CAPTURE)) {
+		} elseif (preg_match_all('#^\s*[\\\\:a-z0-9_]+(\s*\(|\s+[^(])#i', $cmdstr, $match, PREG_OFFSET_CAPTURE)) {
 			$paramspos = $match[1][0][1];
-			$paramsep = substr($match[1][0][0], -1) === '(' ? ')':'';
-			if($paramsep === ')') {
-				$paramspos += strlen($match[1][0][0]) - 1;
-				if(substr($cmdstr, 0, 2) === 'if' || substr($cmdstr, 0, 6) === 'elseif') {
+			$paramsep = substr($match[1][0][0], -1) === '(' ? ')' : '';
+			if ($paramsep === ')') {
+				$paramspos += strlen($match[1][0][0])-1;
+				if (substr($cmdstr, 0, 2) === 'if' || substr($cmdstr, 0, 6) === 'elseif') {
 					$paramsep = '';
-					if(strlen($match[1][0][0]) > 1) {
+					if (strlen($match[1][0][0]) > 1) {
 						$paramspos--;
 					}
 				}
@@ -1622,7 +1622,7 @@ 
 				$paramstr = substr($paramstr, 0, -1);
 			}
 
-			if (strlen($paramstr)===0) {
+			if (strlen($paramstr) === 0) {
 				$params = array();
 				$paramstr = '';
 			} else {
@@ -1692,8 +1692,8 @@ 
 		}
 
 		if ($pointer !== null) {
-			$pointer += (isset($paramstr) ? strlen($paramstr) : 0) + (')' === $paramsep ? 2 : ($paramspos === false ? 0 : 1)) + strlen($func) + (isset($whitespace) ? $whitespace : 0);
-			if ($this->debug) echo 'FUNC ADDS '.((isset($paramstr) ? strlen($paramstr) : 0) + (')' === $paramsep ? 2 : ($paramspos === false ? 0 : 1)) + strlen($func)).' TO POINTER<br/>';
+			$pointer += (isset($paramstr) ? strlen($paramstr) : 0)+(')' === $paramsep ? 2 : ($paramspos === false ? 0 : 1))+strlen($func)+(isset($whitespace) ? $whitespace : 0);
+			if ($this->debug) echo 'FUNC ADDS '.((isset($paramstr) ? strlen($paramstr) : 0)+(')' === $paramsep ? 2 : ($paramspos === false ? 0 : 1))+strlen($func)).' TO POINTER<br/>';
 		}
 
 		if ($curBlock === 'method' || $func === 'do' || strstr($func, '::') !== false) {
@@ -1926,12 +1926,12 @@ 
 	 * @param mixed $pointer a reference to a pointer that will be increased by the amount of characters parsed, or null by default
 	 * @return string parsed values
 	 */
-	protected function parseString($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
+	protected function parseString($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
 	{
 		$substr = substr($in, $from, $to-$from);
 		$first = $substr[0];
 
-		if ($this->debug) echo 'STRING FOUND (in '.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').')<br />';
+		if ($this->debug) echo 'STRING FOUND (in '.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...' : '').')<br />';
 		$strend = false;
 		$o = $from+1;
 		while ($strend === false) {
@@ -1993,7 +1993,7 @@ 
 	 * @param mixed $pointer a reference to a pointer that will be increased by the amount of characters parsed, or null by default
 	 * @return string parsed values
 	 */
-	protected function parseConst($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
+	protected function parseConst($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
 	{
 		$substr = substr($in, $from, $to-$from);
 
@@ -2054,14 +2054,14 @@ 
 	 * @param mixed $pointer a reference to a pointer that will be increased by the amount of characters parsed, or null by default
 	 * @return string parsed values
 	 */
-	protected function parseVar($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
+	protected function parseVar($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
 	{
 		$substr = substr($in, $from, $to-$from);
 
-		if (preg_match('#(\$?\.?[a-z0-9_:]*(?:(?:(?:\.|->)(?:[a-z0-9_:]+|(?R))|\[(?:[a-z0-9_:]+|(?R)|(["\'])[^\2]*?\2)\]))*)' . // var key
-			($curBlock==='root' || $curBlock==='function' || $curBlock==='namedparam' || $curBlock==='condition' || $curBlock==='variable' || $curBlock==='expression' || $curBlock==='delimited_string' ? '(\(.*)?' : '()') . // method call
-			($curBlock==='root' || $curBlock==='function' || $curBlock==='namedparam' || $curBlock==='condition' || $curBlock==='variable' || $curBlock==='delimited_string' ? '((?:(?:[+/*%=-])(?:(?<!=)=?-?[$%][a-z0-9.[\]>_:-]+(?:\([^)]*\))?|(?<!=)=?-?[0-9.,]*|[+-]))*)':'()') . // simple math expressions
-			($curBlock!=='modifier' ? '((?:\|(?:@?[a-z0-9_]+(?:(?::("|\').*?\5|:[^`]*))*))+)?':'(())') . // modifiers
+		if (preg_match('#(\$?\.?[a-z0-9_:]*(?:(?:(?:\.|->)(?:[a-z0-9_:]+|(?R))|\[(?:[a-z0-9_:]+|(?R)|(["\'])[^\2]*?\2)\]))*)'.// var key
+			($curBlock === 'root' || $curBlock === 'function' || $curBlock === 'namedparam' || $curBlock === 'condition' || $curBlock === 'variable' || $curBlock === 'expression' || $curBlock === 'delimited_string' ? '(\(.*)?' : '()').// method call
+			($curBlock === 'root' || $curBlock === 'function' || $curBlock === 'namedparam' || $curBlock === 'condition' || $curBlock === 'variable' || $curBlock === 'delimited_string' ? '((?:(?:[+/*%=-])(?:(?<!=)=?-?[$%][a-z0-9.[\]>_:-]+(?:\([^)]*\))?|(?<!=)=?-?[0-9.,]*|[+-]))*)' : '()').// simple math expressions
+			($curBlock !== 'modifier' ? '((?:\|(?:@?[a-z0-9_]+(?:(?::("|\').*?\5|:[^`]*))*))+)?' : '(())').// modifiers
 			'#i', $substr, $match)) {
 			$key = substr($match[1], 1);
 
@@ -2076,9 +2076,9 @@ 
 			}
 
 			if ($hasMethodCall) {
-				$matchedLength -= strlen($match[3]) + strlen(substr($match[1], strrpos($match[1], '->')));
+				$matchedLength -= strlen($match[3])+strlen(substr($match[1], strrpos($match[1], '->')));
 				$key = substr($match[1], 1, strrpos($match[1], '->')-1);
-				$methodCall = substr($match[1], strrpos($match[1], '->')) . $match[3];
+				$methodCall = substr($match[1], strrpos($match[1], '->')).$match[3];
 			}
 
 			if ($hasModifiers) {
@@ -2102,12 +2102,12 @@ 
 
 			$key = str_replace('"', '\\"', $key);
 
-			$cnt=substr_count($key, '$');
+			$cnt = substr_count($key, '$');
 			if ($cnt > 0) {
 				$uid = 0;
 				$parsed = array($uid => '');
-				$current =& $parsed;
-				$curTxt =& $parsed[$uid++];
+				$current = & $parsed;
+				$curTxt = & $parsed[$uid++];
 				$tree = array();
 				$chars = str_split($key, 1);
 				$inSplittedVar = false;
@@ -2118,31 +2118,31 @@ 
 						if (count($tree) > 0) {
 							$bracketCount++;
 						} else {
-							$tree[] =& $current;
+							$tree[] = & $current;
 							$current[$uid] = array($uid+1 => '');
-							$current =& $current[$uid++];
-							$curTxt =& $current[$uid++];
+							$current = & $current[$uid++];
+							$curTxt = & $current[$uid++];
 							continue;
 						}
 					} elseif ($char === ']') {
 						if ($bracketCount > 0) {
 							$bracketCount--;
 						} else {
-							$current =& $tree[count($tree)-1];
+							$current = & $tree[count($tree)-1];
 							array_pop($tree);
 							if (current($chars) !== '[' && current($chars) !== false && current($chars) !== ']') {
 								$current[$uid] = '';
-								$curTxt =& $current[$uid++];
+								$curTxt = & $current[$uid++];
 							}
 							continue;
 						}
 					} elseif ($char === '$') {
 						if (count($tree) == 0) {
-							$curTxt =& $current[$uid++];
+							$curTxt = & $current[$uid++];
 							$inSplittedVar = true;
 						}
 					} elseif (($char === '.' || $char === '-') && count($tree) == 0 && $inSplittedVar) {
-						$curTxt =& $current[$uid++];
+						$curTxt = & $current[$uid++];
 						$inSplittedVar = false;
 					}
 
@@ -2178,7 +2178,7 @@ 
 				preg_match_all('#(?:([+/*%=-])(=?-?[%$][a-z0-9.[\]>_:-]+(?:\([^)]*\))?|=?-?[0-9.,]+|\1))#i', $match[4], $expMatch);
 
 				foreach ($expMatch[1] as $k=>$operator) {
-					if (substr($expMatch[2][$k], 0, 1)==='=') {
+					if (substr($expMatch[2][$k], 0, 1) === '=') {
 						$assign = true;
 						if ($operator === '=') {
 							throw new Dwoo_Compilation_Exception($this, 'Invalid expression <em>'.$substr.'</em>, can not use "==" in expressions');
@@ -2190,11 +2190,11 @@ 
 						$expMatch[2][$k] = substr($expMatch[2][$k], 1);
 					}
 
-					if (substr($expMatch[2][$k], 0, 1)==='-' && strlen($expMatch[2][$k]) > 1) {
+					if (substr($expMatch[2][$k], 0, 1) === '-' && strlen($expMatch[2][$k]) > 1) {
 						$operator .= '-';
 						$expMatch[2][$k] = substr($expMatch[2][$k], 1);
 					}
-					if (($operator==='+'||$operator==='-') && $expMatch[2][$k]===$operator) {
+					if (($operator === '+' || $operator === '-') && $expMatch[2][$k] === $operator) {
 						$output = '('.$output.$operator.$operator.')';
 						break;
 					} elseif (substr($expMatch[2][$k], 0, 1) === '$') {
@@ -2270,7 +2270,7 @@ 
 				break;
 			}
 
-			if(!preg_match('/^([a-z0-9_]+)(\(.*?\))?/i', substr($methodCall, $ptr), $methMatch)) {
+			if (!preg_match('/^([a-z0-9_]+)(\(.*?\))?/i', substr($methodCall, $ptr), $methMatch)) {
 				break;
 			}
 
@@ -2286,7 +2286,7 @@ 
 				// method
 				if (substr($methMatch[2], 0, 2) === '()') {
 					$parsedCall = $methMatch[1].'()';
-					$ptr += strlen($methMatch[1]) + 2;
+					$ptr += strlen($methMatch[1])+2;
 				} else {
 					$parsedCall = $this->parseFunction($methodCall, $ptr, strlen($methodCall), false, 'method', $ptr);
 				}
@@ -2395,7 +2395,7 @@ 
 
 					while (count($m[1]) && $m[1][0] !== '->') {
 						$m[2][0] = preg_replace('/(^\\\([\'"])|\\\([\'"])$)/x', '$2$3', $m[2][0]);
-						if(substr($m[2][0], 0, 1) == '"' || substr($m[2][0], 0, 1) == "'") {
+						if (substr($m[2][0], 0, 1) == '"' || substr($m[2][0], 0, 1) == "'") {
 							$output .= '['.$m[2][0].']';
 						} else {
 							$output .= '["'.$m[2][0].'"]';
@@ -2411,7 +2411,7 @@ 
 
 				if (count($m[2])) {
 					unset($m[0]);
-					$output = '$this->readVarInto('.str_replace("\n", '', var_export($m, true)).', '.$output.', '.($curBlock == 'root' ? 'false': 'true').')';
+					$output = '$this->readVarInto('.str_replace("\n", '', var_export($m, true)).', '.$output.', '.($curBlock == 'root' ? 'false' : 'true').')';
 				}
 			}
 		} else {
@@ -2431,16 +2431,16 @@ 
 	 * @param bool $recursed leave that to false by default, it is only for internal use
 	 * @return string flattened tree
 	 */
-	protected function flattenVarTree(array $tree, $recursed=false)
+	protected function flattenVarTree(array $tree, $recursed = false)
 	{
-		$out = $recursed ?  '".$this->readVarInto(' : '';
+		$out = $recursed ? '".$this->readVarInto(' : '';
 		foreach ($tree as $bit) {
 			if (is_array($bit)) {
-				$out.='.'.$this->flattenVarTree($bit, false);
+				$out .= '.'.$this->flattenVarTree($bit, false);
 			} else {
 				$key = str_replace('"', '\\"', $bit);
 
-				if (substr($key, 0, 1)==='$') {
+				if (substr($key, 0, 1) === '$') {
 					$out .= '".'.$this->parseVar($key, 0, strlen($key), false, 'variable').'."';
 				} else {
 					$cnt = substr_count($key, '$');
@@ -2449,7 +2449,7 @@ 
 					if ($cnt > 0) {
 						while (--$cnt >= 0) {
 							if (isset($last)) {
-								$last = strrpos($key, '$', - (strlen($key) - $last + 1));
+								$last = strrpos($key, '$', - (strlen($key)-$last+1));
 							} else {
 								$last = strrpos($key, '$');
 							}
@@ -2504,7 +2504,7 @@ 
 	 * @param mixed $pointer a reference to a pointer that will be increased by the amount of characters parsed, or null by default
 	 * @return string parsed values
 	 */
-	protected function parseOthers($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
+	protected function parseOthers($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
 	{
 		$first = $in[$from];
 		$substr = substr($in, $from, $to-$from);
@@ -2522,7 +2522,7 @@ 
 		}
 
 		$breaker = false;
-		while (list($k,$char) = each($breakChars)) {
+		while (list($k, $char) = each($breakChars)) {
 			$test = strpos($substr, $char);
 			if ($test !== false && $test < $end) {
 				$end = $test;
@@ -2600,7 +2600,7 @@ 
 	 * @param string $curBlock the current parser-block being processed
 	 * @return string the original string with variables replaced
 	 */
-	protected function replaceStringVars($string, $first, $curBlock='')
+	protected function replaceStringVars($string, $first, $curBlock = '')
 	{
 		$pos = 0;
 		if ($this->debug) echo 'STRING VAR REPLACEMENT : '.$string.'<br>';
@@ -2612,16 +2612,16 @@ 
 				continue;
 			}
 
-			$var = $this->parse($string, $pos, null, false, ($curBlock === 'modifier' ? 'modifier' : ($prev === '`' ? 'delimited_string':'string')));
+			$var = $this->parse($string, $pos, null, false, ($curBlock === 'modifier' ? 'modifier' : ($prev === '`' ? 'delimited_string' : 'string')));
 			$len = $var[0];
-			$var = $this->parse(str_replace('\\'.$first, $first, $string), $pos, null, false, ($curBlock === 'modifier' ? 'modifier' : ($prev === '`' ? 'delimited_string':'string')));
+			$var = $this->parse(str_replace('\\'.$first, $first, $string), $pos, null, false, ($curBlock === 'modifier' ? 'modifier' : ($prev === '`' ? 'delimited_string' : 'string')));
 
 			if ($prev === '`' && substr($string, $pos+$len, 1) === '`') {
 				$string = substr_replace($string, $first.'.'.$var[1].'.'.$first, $pos-1, $len+2);
 			} else {
 				$string = substr_replace($string, $first.'.'.$var[1].'.'.$first, $pos, $len);
 			}
-			$pos += strlen($var[1]) + 2;
+			$pos += strlen($var[1])+2;
 			if ($this->debug) echo 'STRING VAR REPLACEMENT DONE : '.$string.'<br>';
 		}
 
@@ -2630,7 +2630,7 @@ 
 		$string = preg_replace_callback('#("|\')\.(.+?)\.\1((?:\|(?:@?[a-z0-9_]+(?:(?::("|\').+?\4|:[^`]*))*))+)#i', array($this, 'replaceModifiers'), $string);
 
 		// replace escaped dollar operators by unescaped ones if required
-		if ($first==="'") {
+		if ($first === "'") {
 			$string = str_replace('\\$', '$', $string);
 		}
 
@@ -2712,7 +2712,7 @@ 
 						if ($paramstr[$ptr] !== '|') {
 							$continue = false;
 							if ($pointer !== null) {
-								$pointer -= strlen($paramstr) - $ptr;
+								$pointer -= strlen($paramstr)-$ptr;
 							}
 						}
 						$ptr++;
@@ -2806,7 +2806,7 @@ 
 					if ($pluginType & Dwoo_Core::CLASS_PLUGIN) {
 						$callback = array($pluginName, ($pluginType & Dwoo_Core::COMPILABLE_PLUGIN) ? 'compile' : 'process');
 					} else {
-						$callback = $pluginName . (($pluginType & Dwoo_Core::COMPILABLE_PLUGIN) ? '_compile' : '');
+						$callback = $pluginName.(($pluginType & Dwoo_Core::COMPILABLE_PLUGIN) ? '_compile' : '');
 					}
 				}
 
@@ -2885,7 +2885,7 @@ 
 		} elseif ($curBlock === 'var' || $m[1] === null) {
 			return $output;
 		} elseif ($curBlock === 'string' || $curBlock === 'root') {
-			return $m[1].'.'.$output.'.'.$m[1].(isset($add)?$add:null);
+			return $m[1].'.'.$output.'.'.$m[1].(isset($add) ? $add : null);
 		}
 	}
 
@@ -2960,9 +2960,9 @@ 
 			} elseif (function_exists('smarty_block_'.$name) !== false) {
 				$pluginType = Dwoo_Core::SMARTY_BLOCK;
 			} else {
-				if ($pluginType===-1) {
+				if ($pluginType === -1) {
 					try {
-						$this->dwoo->getLoader()->loadPlugin($name, isset($phpFunc)===false);
+						$this->dwoo->getLoader()->loadPlugin($name, isset($phpFunc) === false);
 					} catch (Exception $e) {
 						if (isset($phpFunc)) {
 							$pluginType = Dwoo_Core::NATIVE_PLUGIN;
@@ -3019,7 +3019,7 @@ 
 	 * @param array $map the parameter map to use, if not provided it will be built from the callback
 	 * @return array parameters sorted in the correct order with missing optional parameters filled
 	 */
-	protected function mapParams(array $params, $callback, $callType=2, $map = null)
+	protected function mapParams(array $params, $callback, $callType = 2, $map = null)
 	{
 		if (!$map) {
 			$map = $this->getParamMap($callback);
@@ -3038,11 +3038,11 @@ 
 		}
 
 		// loops over the param map and assigns values from the template or default value for unset optional params
-		while (list($k,$v) = each($map)) {
+		while (list($k, $v) = each($map)) {
 			if ($v[0] === '*') {
 				// "rest" array parameter, fill every remaining params in it and then break
 				if (count($ps) === 0) {
-					if ($v[1]===false) {
+					if ($v[1] === false) {
 						throw new Dwoo_Compilation_Exception($this, 'Rest argument missing for '.str_replace(array('Dwoo_Plugin_', '_compile'), '', (is_array($callback) ? $callback[0] : $callback)));
 					} else {
 						break;
@@ -3068,11 +3068,11 @@ 
 				// parameter is defined as ordered param
 				$paramlist[$v[0]] = $ps[$k];
 				unset($ps[$k]);
-			} elseif ($v[1]===false) {
+			} elseif ($v[1] === false) {
 				// parameter is not defined and not optional, throw error
 				if (is_array($callback)) {
 					if (is_object($callback[0])) {
-						$name = get_class($callback[0]) . '::' . $callback[1];
+						$name = get_class($callback[0]).'::'.$callback[1];
 					} else {
 						$name = $callback[0];
 					}
@@ -3081,7 +3081,7 @@ 
 				}
 
 				throw new Dwoo_Compilation_Exception($this, 'Argument '.$k.'/'.$v[0].' missing for '.str_replace(array('Dwoo_Plugin_', '_compile'), '', $name));
-			} elseif ($v[2]===null) {
+			} elseif ($v[2] === null) {
 				// enforce lowercased null if default value is null (php outputs NULL with var export)
 				$paramlist[$v[0]] = array('null', null, self::T_NULL);
 			} else {

Braces +156 added lines, -57 removed lines

@@ -713,9 +713,13 @@ 
 				$compiled = $this->addBlock('topLevelBlock', array(), 0);
 				$this->stack[0]['buffer'] = '';
 
-				if ($this->debug) echo 'COMPILER INIT<br />';
+				if ($this->debug) {
+					echo 'COMPILER INIT<br />';
+				}
 
-				if ($this->debug) echo 'PROCESSING PREPROCESSORS ('.count($this->processors['pre']).')<br>';
+				if ($this->debug) {
+					echo 'PROCESSING PREPROCESSORS ('.count($this->processors['pre']).')<br>';
+				}
 
 				// runs preprocessors
 				foreach ($this->processors['pre'] as $preProc) {
@@ -731,7 +735,9 @@ 
 				unset($preProc);
 
 				// show template source if debug
-				if ($this->debug) echo '<pre>'.print_r(htmlentities($tpl), true).'</pre><hr />';
+				if ($this->debug) {
+					echo '<pre>'.print_r(htmlentities($tpl), true).'</pre><hr />';
+				}
 
 				// strips php tags if required by the security policy
 				if ($this->securityPolicy !== null) {
@@ -820,7 +826,9 @@ 
 
 		$compiled .= $this->removeBlock('topLevelBlock');
 
-		if ($this->debug) echo 'PROCESSING POSTPROCESSORS<br>';
+		if ($this->debug) {
+			echo 'PROCESSING POSTPROCESSORS<br>';
+		}
 
 		foreach ($this->processors['post'] as $postProc) {
 			if (is_array($postProc) && isset($postProc['autoload'])) {
@@ -834,7 +842,9 @@ 
 		}
 		unset($postProc);
 
-		if ($this->debug) echo 'COMPILATION COMPLETE : MEM USAGE : '.memory_get_usage().'<br>';
+		if ($this->debug) {
+			echo 'COMPILATION COMPLETE : MEM USAGE : '.memory_get_usage().'<br>';
+		}
 
 		$output = "<?php\n/* template head */\n";
 
@@ -902,7 +912,9 @@ 
 				echo ($i+1).'. '.$line."\r\n";
 			}
 		}
-		if ($this->debug) echo '<hr></pre></pre>';
+		if ($this->debug) {
+			echo '<hr></pre></pre>';
+		}
 
 		$this->template = $this->dwoo = null;
 		$tpl = null;
@@ -987,8 +999,9 @@ 
 				reset($this->scopeTree);
 				$this->scope =& $this->data;
 				$cnt = count($this->scopeTree);
-				for ($i=0;$i<$cnt;$i++)
-					$this->scope =& $this->scope[$this->scopeTree[$i]];
+				for ($i=0;$i<$cnt;$i++) {
+									$this->scope =& $this->scope[$this->scopeTree[$i]];
+				}
 			} elseif ($bit === '_root' || $bit === '__') {
 				$this->scope =& $this->data;
 				$this->scopeTree = array();
@@ -1253,7 +1266,9 @@ 
 			if ($curBlock === 'root' && substr($in, $from, strlen($this->rd)) === $this->rd) {
 				// end template tag
 				$pointer += strlen($this->rd);
-				if ($this->debug) echo 'TEMPLATE PARSING ENDED<br />';
+				if ($this->debug) {
+					echo 'TEMPLATE PARSING ENDED<br />';
+				}
 				return false;
 			}
 			$from++;
@@ -1272,7 +1287,9 @@ 
 
 		$substr = substr($in, $from, $to-$from);
 
-		if ($this->debug) echo '<br />PARSE CALL : PARSING "<b>'.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').'</b>" @ '.$from.':'.$to.' in '.$curBlock.' : pointer='.$pointer.'<br/>';
+		if ($this->debug) {
+			echo '<br />PARSE CALL : PARSING "<b>'.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').'</b>" @ '.$from.':'.$to.' in '.$curBlock.' : pointer='.$pointer.'<br/>';
+		}
 		$parsed = "";
 
 		if ($curBlock === 'root' && $first === '*') {
@@ -1357,7 +1374,9 @@ 
 			$parsed = 'func';
 		} elseif ($first === ';') {
 			// instruction end
-			if ($this->debug) echo 'END OF INSTRUCTION<br />';
+			if ($this->debug) {
+				echo 'END OF INSTRUCTION<br />';
+			}
 			if ($pointer !== null) {
 				$pointer++;
 			}
@@ -1377,20 +1396,28 @@ 
 				if ($this->curBlock['type'] == 'else' || $this->curBlock['type'] == 'elseif') {
 					$pointer -= strlen($match[0]);
 				}
-				if ($this->debug) echo 'TOP BLOCK CLOSED<br />';
+				if ($this->debug) {
+					echo 'TOP BLOCK CLOSED<br />';
+				}
 				return $this->removeTopBlock();
 			} else {
-				if ($this->debug) echo 'BLOCK OF TYPE '.$match[1].' CLOSED<br />';
+				if ($this->debug) {
+					echo 'BLOCK OF TYPE '.$match[1].' CLOSED<br />';
+				}
 				return $this->removeBlock($match[1]);
 			}
 		} elseif ($curBlock === 'root' && substr($substr, 0, strlen($this->rd)) === $this->rd) {
 			// end template tag
-			if ($this->debug) echo 'TAG PARSING ENDED<br />';
+			if ($this->debug) {
+				echo 'TAG PARSING ENDED<br />';
+			}
 			$pointer += strlen($this->rd);
 			return false;
 		} elseif (is_array($parsingParams) && preg_match('#^(([\'"]?)[a-z0-9_]+\2\s*='.($curBlock === 'array' ? '>?':'').')(?:\s+|[^=]).*#i', $substr, $match)) {
 			// named parameter
-			if ($this->debug) echo 'NAMED PARAM FOUND<br />';
+			if ($this->debug) {
+				echo 'NAMED PARAM FOUND<br />';
+			}
 			$len = strlen($match[1]);
 			while (substr($in, $from+$len, 1)===' ') {
 				$len++;
@@ -1430,7 +1457,9 @@ 
 		// var parsed, check if any var-extension applies
 		if ($parsed==='var') {
 			if (preg_match('#^\s*([/%+*-])\s*([a-z0-9]|\$)#i', $substr, $match)) {
-				if($this->debug) echo 'PARSING POST-VAR EXPRESSION '.$substr.'<br />';
+				if($this->debug) {
+					echo 'PARSING POST-VAR EXPRESSION '.$substr.'<br />';
+				}
 				// parse expressions
 				$pointer += strlen($match[0]) - 1;
 				if (is_array($parsingParams)) {
@@ -1460,7 +1489,9 @@ 
 					}
 				}
 			} else if ($curBlock === 'root' && preg_match('#^(\s*(?:[+/*%-.]=|=|\+\+|--)\s*)(.*)#s', $substr, $match)) {
-				if($this->debug) echo 'PARSING POST-VAR ASSIGNMENT '.$substr.'<br />';
+				if($this->debug) {
+					echo 'PARSING POST-VAR ASSIGNMENT '.$substr.'<br />';
+				}
 				// parse assignment
 				$value = $match[2];
 				$operator = trim($match[1]);
@@ -1502,7 +1533,9 @@ 
 				$out = Dwoo_Compiler::PHP_OPEN. $echo . $out . $operator . implode(' ', $value) . Dwoo_Compiler::PHP_CLOSE;
 			} else if ($curBlock === 'array' && is_array($parsingParams) && preg_match('#^(\s*=>?\s*)#', $substr, $match)) {
 				// parse namedparam with var as name (only for array)
-				if ($this->debug) echo 'VARIABLE NAMED PARAM (FOR ARRAY) FOUND<br />';
+				if ($this->debug) {
+					echo 'VARIABLE NAMED PARAM (FOR ARRAY) FOUND<br />';
+				}
 				$len = strlen($match[1]);
 				$var = $out[count($out)-1];
 				$pointer += $len;
@@ -1576,7 +1609,9 @@ 
 			$cmdstr = $match[1];
 		}
 
-		if ($this->debug) echo 'FUNC FOUND ('.$func.')<br />';
+		if ($this->debug) {
+			echo 'FUNC FOUND ('.$func.')<br />';
+		}
 
 		$paramsep = '';
 
@@ -1638,17 +1673,25 @@ 
 							}
 
 							if ($func !== 'if' && $func !== 'elseif' && $paramstr[$ptr] === ')') {
-								if ($this->debug) echo 'PARAM PARSING ENDED, ")" FOUND, POINTER AT '.$ptr.'<br/>';
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, ")" FOUND, POINTER AT '.$ptr.'<br/>';
+								}
 								break 2;
 							} elseif ($paramstr[$ptr] === ';') {
 								$ptr++;
-								if ($this->debug) echo 'PARAM PARSING ENDED, ";" FOUND, POINTER AT '.$ptr.'<br/>';
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, ";" FOUND, POINTER AT '.$ptr.'<br/>';
+								}
 								break 2;
 							} elseif ($func !== 'if' && $func !== 'elseif' && $paramstr[$ptr] === '/') {
-								if ($this->debug) echo 'PARAM PARSING ENDED, "/" FOUND, POINTER AT '.$ptr.'<br/>';
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, "/" FOUND, POINTER AT '.$ptr.'<br/>';
+								}
 								break 2;
 							} elseif (substr($paramstr, $ptr, strlen($this->rd)) === $this->rd) {
-								if ($this->debug) echo 'PARAM PARSING ENDED, RIGHT DELIMITER FOUND, POINTER AT '.$ptr.'<br/>';
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, RIGHT DELIMITER FOUND, POINTER AT '.$ptr.'<br/>';
+								}
 								break 2;
 							}
 
@@ -1659,7 +1702,9 @@ 
 							}
 						}
 
-						if ($this->debug) echo 'FUNC START PARAM PARSING WITH POINTER AT '.$ptr.'<br/>';
+						if ($this->debug) {
+							echo 'FUNC START PARAM PARSING WITH POINTER AT '.$ptr.'<br/>';
+						}
 
 						if ($func === 'if' || $func === 'elseif' || $func === 'tif') {
 							$params = $this->parse($paramstr, $ptr, strlen($paramstr), $params, 'condition', $ptr);
@@ -1669,7 +1714,9 @@ 
 							$params = $this->parse($paramstr, $ptr, strlen($paramstr), $params, 'function', $ptr);
 						}
 
-						if ($this->debug) echo 'PARAM PARSED, POINTER AT '.$ptr.' ('.substr($paramstr, $ptr-1, 3).')<br/>';
+						if ($this->debug) {
+							echo 'PARAM PARSED, POINTER AT '.$ptr.' ('.substr($paramstr, $ptr-1, 3).')<br/>';
+						}
 					}
 				}
 				$paramstr = substr($paramstr, 0, $ptr);
@@ -1693,7 +1740,9 @@ 
 
 		if ($pointer !== null) {
 			$pointer += (isset($paramstr) ? strlen($paramstr) : 0) + (')' === $paramsep ? 2 : ($paramspos === false ? 0 : 1)) + strlen($func) + (isset($whitespace) ? $whitespace : 0);
-			if ($this->debug) echo 'FUNC ADDS '.((isset($paramstr) ? strlen($paramstr) : 0) + (')' === $paramsep ? 2 : ($paramspos === false ? 0 : 1)) + strlen($func)).' TO POINTER<br/>';
+			if ($this->debug) {
+				echo 'FUNC ADDS '.((isset($paramstr) ? strlen($paramstr) : 0) + (')' === $paramsep ? 2 : ($paramspos === false ? 0 : 1)) + strlen($func)).' TO POINTER<br/>';
+			}
 		}
 
 		if ($curBlock === 'method' || $func === 'do' || strstr($func, '::') !== false) {
@@ -1931,7 +1980,9 @@ 
 		$substr = substr($in, $from, $to-$from);
 		$first = $substr[0];
 
-		if ($this->debug) echo 'STRING FOUND (in '.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').')<br />';
+		if ($this->debug) {
+			echo 'STRING FOUND (in '.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').')<br />';
+		}
 		$strend = false;
 		$o = $from+1;
 		while ($strend === false) {
@@ -1944,7 +1995,9 @@ 
 				$strend = false;
 			}
 		}
-		if ($this->debug) echo 'STRING DELIMITED: '.substr($in, $from, $strend+1-$from).'<br/>';
+		if ($this->debug) {
+			echo 'STRING DELIMITED: '.substr($in, $from, $strend+1-$from).'<br/>';
+		}
 
 		$srcOutput = substr($in, $from, $strend+1-$from);
 
@@ -2150,11 +2203,15 @@ 
 				}
 				unset($uid, $current, $curTxt, $tree, $chars);
 
-				if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT : '.$key.'<br>';
+				if ($this->debug) {
+					echo 'RECURSIVE VAR REPLACEMENT : '.$key.'<br>';
+				}
 
 				$key = $this->flattenVarTree($parsed);
 
-				if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key.'<br>';
+				if ($this->debug) {
+					echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key.'<br>';
+				}
 
 				$output = preg_replace('#(^""\.|""\.|\.""$|(\()""\.|\.""(\)))#', '$2$3', '$this->readVar("'.$key.'")');
 			} else {
@@ -2334,8 +2391,9 @@ 
 				$global = 'COOKIE';
 			}
 			$key = '$_'.$global;
-			foreach (explode('.', ltrim($m[2], '.')) as $part)
-				$key .= '['.var_export($part, true).']';
+			foreach (explode('.', ltrim($m[2], '.')) as $part) {
+							$key .= '['.var_export($part, true).']';
+			}
 			if ($curBlock === 'root') {
 				$output = $key;
 			} else {
@@ -2445,7 +2503,9 @@ 
 				} else {
 					$cnt = substr_count($key, '$');
 
-					if ($this->debug) echo 'PARSING SUBVARS IN : '.$key.'<br>';
+					if ($this->debug) {
+						echo 'PARSING SUBVARS IN : '.$key.'<br>';
+					}
 					if ($cnt > 0) {
 						while (--$cnt >= 0) {
 							if (isset($last)) {
@@ -2467,7 +2527,9 @@ 
 								$last,
 								$len
 							);
-							if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key.'<br>';
+							if ($this->debug) {
+								echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key.'<br>';
+							}
 						}
 						unset($last);
 
@@ -2548,15 +2610,21 @@ 
 		$substr = trim($substr);
 
 		if (strtolower($substr) === 'false' || strtolower($substr) === 'no' || strtolower($substr) === 'off') {
-			if ($this->debug) echo 'BOOLEAN(FALSE) PARSED<br />';
+			if ($this->debug) {
+				echo 'BOOLEAN(FALSE) PARSED<br />';
+			}
 			$substr = 'false';
 			$type = self::T_BOOL;
 		} elseif (strtolower($substr) === 'true' || strtolower($substr) === 'yes' || strtolower($substr) === 'on') {
-			if ($this->debug) echo 'BOOLEAN(TRUE) PARSED<br />';
+			if ($this->debug) {
+				echo 'BOOLEAN(TRUE) PARSED<br />';
+			}
 			$substr = 'true';
 			$type = self::T_BOOL;
 		} elseif ($substr === 'null' || $substr === 'NULL') {
-			if ($this->debug) echo 'NULL PARSED<br />';
+			if ($this->debug) {
+				echo 'NULL PARSED<br />';
+			}
 			$substr = 'null';
 			$type = self::T_NULL;
 		} elseif (is_numeric($substr)) {
@@ -2565,19 +2633,27 @@ 
 				$substr = (int) $substr;
 			}
 			$type = self::T_NUMERIC;
-			if ($this->debug) echo 'NUMBER ('.$substr.') PARSED<br />';
+			if ($this->debug) {
+				echo 'NUMBER ('.$substr.') PARSED<br />';
+			}
 		} elseif (preg_match('{^-?(\d+|\d*(\.\d+))\s*([/*%+-]\s*-?(\d+|\d*(\.\d+)))+$}', $substr)) {
-			if ($this->debug) echo 'SIMPLE MATH PARSED<br />';
+			if ($this->debug) {
+				echo 'SIMPLE MATH PARSED<br />';
+			}
 			$type = self::T_MATH;
 			$substr = '('.$substr.')';
 		} elseif ($curBlock === 'condition' && array_search($substr, $breakChars, true) !== false) {
-			if ($this->debug) echo 'BREAKCHAR ('.$substr.') PARSED<br />';
+			if ($this->debug) {
+				echo 'BREAKCHAR ('.$substr.') PARSED<br />';
+			}
 			$type = self::T_BREAKCHAR;
 			//$substr = '"'.$substr.'"';
 		} else {
 			$substr = $this->replaceStringVars('\''.str_replace('\'', '\\\'', $substr).'\'', '\'', $curBlock);
 			$type = self::T_UNQUOTED_STRING;
-			if ($this->debug) echo 'BLABBER ('.$substr.') CASTED AS STRING<br />';
+			if ($this->debug) {
+				echo 'BLABBER ('.$substr.') CASTED AS STRING<br />';
+			}
 		}
 
 		if (is_array($parsingParams)) {
@@ -2603,7 +2679,9 @@ 
 	protected function replaceStringVars($string, $first, $curBlock='')
 	{
 		$pos = 0;
-		if ($this->debug) echo 'STRING VAR REPLACEMENT : '.$string.'<br>';
+		if ($this->debug) {
+			echo 'STRING VAR REPLACEMENT : '.$string.'<br>';
+		}
 		// replace vars
 		while (($pos = strpos($string, '$', $pos)) !== false) {
 			$prev = substr($string, $pos-1, 1);
@@ -2622,7 +2700,9 @@ 
 				$string = substr_replace($string, $first.'.'.$var[1].'.'.$first, $pos, $len);
 			}
 			$pos += strlen($var[1]) + 2;
-			if ($this->debug) echo 'STRING VAR REPLACEMENT DONE : '.$string.'<br>';
+			if ($this->debug) {
+				echo 'STRING VAR REPLACEMENT DONE : '.$string.'<br>';
+			}
 		}
 
 		// handle modifiers
@@ -2646,7 +2726,9 @@ 
 	 */
 	protected function replaceModifiers(array $m, $curBlock = null, &$pointer = null)
 	{
-		if ($this->debug) echo 'PARSING MODIFIERS : '.$m[3].'<br />';
+		if ($this->debug) {
+			echo 'PARSING MODIFIERS : '.$m[3].'<br />';
+		}
 
 		if ($pointer !== null) {
 			$pointer += strlen($m[3]);
@@ -2668,7 +2750,9 @@ 
 				continue;
 			}
 			if ($cmdstrsrc[0] === ' ' || $cmdstrsrc[0] === ';' || substr($cmdstrsrc, 0, strlen($this->rd)) === $this->rd) {
-				if ($this->debug) echo 'MODIFIER PARSING ENDED, RIGHT DELIMITER or ";" FOUND<br/>';
+				if ($this->debug) {
+					echo 'MODIFIER PARSING ENDED, RIGHT DELIMITER or ";" FOUND<br/>';
+				}
 				$continue = false;
 				if ($pointer !== null) {
 					$pointer -= strlen($cmdstrsrc);
@@ -2687,7 +2771,9 @@ 
 			if ($paramspos === false) {
 				$cmdstrsrc = substr($cmdstrsrc, strlen($func));
 				$params = array();
-				if ($this->debug) echo 'MODIFIER ('.$func.') CALLED WITH NO PARAMS<br/>';
+				if ($this->debug) {
+					echo 'MODIFIER ('.$func.') CALLED WITH NO PARAMS<br/>';
+				}
 			} else {
 				$paramstr = substr($cmdstr, $paramspos+1);
 				if (substr($paramstr, -1, 1) === $paramsep) {
@@ -2697,18 +2783,28 @@ 
 				$ptr = 0;
 				$params = array();
 				while ($ptr < strlen($paramstr)) {
-					if ($this->debug) echo 'MODIFIER ('.$func.') START PARAM PARSING WITH POINTER AT '.$ptr.'<br/>';
-					if ($this->debug) echo $paramstr.'--'.$ptr.'--'.strlen($paramstr).'--modifier<br/>';
+					if ($this->debug) {
+						echo 'MODIFIER ('.$func.') START PARAM PARSING WITH POINTER AT '.$ptr.'<br/>';
+					}
+					if ($this->debug) {
+						echo $paramstr.'--'.$ptr.'--'.strlen($paramstr).'--modifier<br/>';
+					}
 					$params = $this->parse($paramstr, $ptr, strlen($paramstr), $params, 'modifier', $ptr);
-					if ($this->debug) echo 'PARAM PARSED, POINTER AT '.$ptr.'<br/>';
+					if ($this->debug) {
+						echo 'PARAM PARSED, POINTER AT '.$ptr.'<br/>';
+					}
 
 					if ($ptr >= strlen($paramstr)) {
-						if ($this->debug) echo 'PARAM PARSING ENDED, PARAM STRING CONSUMED<br/>';
+						if ($this->debug) {
+							echo 'PARAM PARSING ENDED, PARAM STRING CONSUMED<br/>';
+						}
 						break;
 					}
 
 					if ($paramstr[$ptr] === ' ' || $paramstr[$ptr] === '|' || $paramstr[$ptr] === ';' || substr($paramstr, $ptr, strlen($this->rd)) === $this->rd) {
-						if ($this->debug) echo 'PARAM PARSING ENDED, " ", "|", RIGHT DELIMITER or ";" FOUND, POINTER AT '.$ptr.'<br/>';
+						if ($this->debug) {
+							echo 'PARAM PARSING ENDED, " ", "|", RIGHT DELIMITER or ";" FOUND, POINTER AT '.$ptr.'<br/>';
+						}
 						if ($paramstr[$ptr] !== '|') {
 							$continue = false;
 							if ($pointer !== null) {
@@ -2769,8 +2865,9 @@ 
 				}
 			} elseif ($pluginType & Dwoo_Core::PROXY_PLUGIN) {
 				$params = $this->mapParams($params, $this->getDwoo()->getPluginProxy()->getCallback($func), $state);
-				foreach ($params as &$p)
-					$p = $p[0];
+				foreach ($params as &$p) {
+									$p = $p[0];
+				}
 				$output = call_user_func(array($this->dwoo->getPluginProxy(), 'getCode'), $func, $params);
 			} elseif ($pluginType & Dwoo_Core::SMARTY_MODIFIER) {
 				$params = $this->mapParams($params, null, $state);
@@ -2812,8 +2909,9 @@ 
 
 				$params = $this->mapParams($params, $callback, $state);
 
-				foreach ($params as &$p)
-					$p = $p[0];
+				foreach ($params as &$p) {
+									$p = $p[0];
+				}
 
 				if ($pluginType & Dwoo_Core::FUNC_PLUGIN) {
 					if ($pluginType & Dwoo_Core::COMPILABLE_PLUGIN) {
@@ -2904,8 +3002,9 @@ 
 		foreach ($params as $k=>$p) {
 			if (is_array($p)) {
 				$out2 = 'array(';
-				foreach ($p as $k2=>$v)
-					$out2 .= var_export($k2, true).' => '.(is_array($v) ? 'array('.self::implode_r($v, true).')' : $v).', ';
+				foreach ($p as $k2=>$v) {
+									$out2 .= var_export($k2, true).' => '.(is_array($v) ? 'array('.self::implode_r($v, true).')' : $v).', ';
+				}
 				$p = rtrim($out2, ', ').')';
 			}
 			if ($recursiveCall) {

lib/Dwoo/Core.php

Doc Comments +4 added lines, -4 removed lines

@@ -303,14 +303,14 @@ 
     /**
      * returns the given template rendered using the provided data and optional compiler
      *
-     * @param mixed $tpl template, can either be a Dwoo_ITemplate object (i.e. Dwoo_Template_File), a valid path to a template, or
+     * @param mixed $_tpl template, can either be a Dwoo_ITemplate object (i.e. Dwoo_Template_File), a valid path to a template, or
      *                   a template as a string it is recommended to provide a Dwoo_ITemplate as it will probably make things faster,
      *                   especially if you render a template multiple times
      * @param mixed $data the data to use, can either be a Dwoo_IDataProvider object (i.e. Dwoo_Data) or an associative array. if you're
      *                    rendering the template from cache, it can be left null
-     * @param Dwoo_ICompiler $compiler the compiler that must be used to compile the template, if left empty a default
+     * @param Dwoo_ICompiler $_compiler the compiler that must be used to compile the template, if left empty a default
      *                                Dwoo_Compiler will be used.
-     * @param bool $output flag that defines whether the function returns the output of the template (false, default) or echoes it directly (true)
+     * @param bool $_output flag that defines whether the function returns the output of the template (false, default) or echoes it directly (true)
      * @return string nothing or the template output if $output is false
      */
     public function get($_tpl, $data = array(), $_compiler = null, $_output = false)
@@ -1462,7 +1462,7 @@ 
      *
      * @param mixed $value the value to assign
      * @param string $scope the variable string, using dwoo variable syntax (i.e. "var.subvar[subsubvar]->property")
-     * @return bool true if assigned correctly or false if a problem occured while parsing the var string
+     * @return null|false true if assigned correctly or false if a problem occured while parsing the var string
      */
     public function assignInScope($value, $scope)
     {

Indentation +1530 added lines, -1530 removed lines

@@ -31,23 +31,23 @@ 
  */
 class Dwoo_Core
 {
-    /**
-     * current version number
-     *
-     * @var string
-     */
-    const VERSION = '1.2.2';
-
-    /**
-     * unique number of this dwoo release
-     *
-     * this can be used by templates classes to check whether the compiled template
-     * has been compiled before this release or not, so that old templates are
-     * recompiled automatically when Dwoo is updated
-     */
-    const RELEASE_TAG = 17;
-
-    /**#@+
+	/**
+	 * current version number
+	 *
+	 * @var string
+	 */
+	const VERSION = '1.2.2';
+
+	/**
+	 * unique number of this dwoo release
+	 *
+	 * this can be used by templates classes to check whether the compiled template
+	 * has been compiled before this release or not, so that old templates are
+	 * recompiled automatically when Dwoo is updated
+	 */
+	const RELEASE_TAG = 17;
+
+	/**#@+
      * constants that represents all plugin types
      *
      * these are bitwise-operation-safe values to allow multiple types
@@ -55,436 +55,436 @@ 
      *
      * @var int
      */
-    const CLASS_PLUGIN = 1;
-    const FUNC_PLUGIN = 2;
-    const NATIVE_PLUGIN = 4;
-    const BLOCK_PLUGIN = 8;
-    const COMPILABLE_PLUGIN = 16;
-    const CUSTOM_PLUGIN = 32;
-    const SMARTY_MODIFIER = 64;
-    const SMARTY_BLOCK = 128;
-    const SMARTY_FUNCTION = 256;
-    const PROXY_PLUGIN = 512;
-    const TEMPLATE_PLUGIN = 1024;
-    /**#@-*/
-
-    /**
-     * character set of the template, used by string manipulation plugins
-     *
-     * it must be lowercase, but setCharset() will take care of that
-     *
-     * @see setCharset
-     * @see getCharset
-     * @var string
-     */
-    protected $charset = 'utf-8';
-
-    /**
-     * global variables that are accessible through $dwoo.* in the templates
-     *
-     * default values include:
-     *
-     * $dwoo.version - current version number
-     * $dwoo.ad - a Powered by Dwoo link pointing to dwoo.org
-     * $dwoo.now - the current time
-     * $dwoo.template - the current template filename
-     * $dwoo.charset - the character set used by the template
-     *
-     * on top of that, foreach and other plugins can store special values in there,
-     * see their documentation for more details.
-     *
-     * @private
-     * @var array
-     */
-    public $globals;
-
-    /**
-     * directory where the compiled templates are stored
-     *
-     * defaults to DWOO_COMPILEDIR (= dwoo_dir/compiled by default)
-     *
-     * @var string
-     */
-    protected $compileDir;
-
-    /**
-     * directory where the cached templates are stored
-     *
-     * defaults to DWOO_CACHEDIR (= dwoo_dir/cache by default)
-     *
-     * @var string
-     */
-    protected $cacheDir;
-
-    /**
-     * defines how long (in seconds) the cached files must remain valid
-     *
-     * can be overriden on a per-template basis
-     *
-     * -1 = never delete
-     * 0 = disabled
-     * >0 = duration in seconds
-     *
-     * @var int
-     */
-    protected $cacheTime = 0;
-
-    /**
-     * security policy object
-     *
-     * @var Dwoo_Security_Policy
-     */
-    protected $securityPolicy = null;
-
-    /**
-     * stores the custom plugins callbacks
-     *
-     * @see addPlugin
-     * @see removePlugin
-     * @var array
-     */
-    protected $plugins = array();
-
-    /**
-     * stores the filter callbacks
-     *
-     * @see addFilter
-     * @see removeFilter
-     * @var array
-     */
-    protected $filters = array();
-
-    /**
-     * stores the resource types and associated
-     * classes / compiler classes
-     *
-     * @var array
-     */
-    protected $resources = array
-    (
-        'file'      =>  array
-        (
-            'class'     =>  'Dwoo_Template_File',
-            'compiler'  =>  null
-        ),
-        'string'    =>  array
-        (
-            'class'     =>  'Dwoo_Template_String',
-            'compiler'  =>  null
-        )
-    );
-
-    /**
-     * the dwoo loader object used to load plugins by this dwoo instance
-     *
-     * @var Dwoo_ILoader
-     */
-    protected $loader = null;
-
-    /**
-     * currently rendered template, set to null when not-rendering
-     *
-     * @var Dwoo_ITemplate
-     */
-    protected $template = null;
-
-    /**
-     * stores the instances of the class plugins during template runtime
-     *
-     * @var array
-     */
-    protected $runtimePlugins;
-
-    /**
-     * stores the returned values during template runtime
-     *
-     * @var array
-     */
-    protected $returnData;
-
-    /**
-     * stores the data during template runtime
-     *
-     * @var array
-     * @private
-     */
-    public $data;
-
-    /**
-     * stores the current scope during template runtime
-     *
-     * this should ideally not be accessed directly from outside template code
-     *
-     * @var mixed
-     * @private
-     */
-    public $scope;
-
-    /**
-     * stores the scope tree during template runtime
-     *
-     * @var array
-     */
-    protected $scopeTree;
+	const CLASS_PLUGIN = 1;
+	const FUNC_PLUGIN = 2;
+	const NATIVE_PLUGIN = 4;
+	const BLOCK_PLUGIN = 8;
+	const COMPILABLE_PLUGIN = 16;
+	const CUSTOM_PLUGIN = 32;
+	const SMARTY_MODIFIER = 64;
+	const SMARTY_BLOCK = 128;
+	const SMARTY_FUNCTION = 256;
+	const PROXY_PLUGIN = 512;
+	const TEMPLATE_PLUGIN = 1024;
+	/**#@-*/
+
+	/**
+	 * character set of the template, used by string manipulation plugins
+	 *
+	 * it must be lowercase, but setCharset() will take care of that
+	 *
+	 * @see setCharset
+	 * @see getCharset
+	 * @var string
+	 */
+	protected $charset = 'utf-8';
+
+	/**
+	 * global variables that are accessible through $dwoo.* in the templates
+	 *
+	 * default values include:
+	 *
+	 * $dwoo.version - current version number
+	 * $dwoo.ad - a Powered by Dwoo link pointing to dwoo.org
+	 * $dwoo.now - the current time
+	 * $dwoo.template - the current template filename
+	 * $dwoo.charset - the character set used by the template
+	 *
+	 * on top of that, foreach and other plugins can store special values in there,
+	 * see their documentation for more details.
+	 *
+	 * @private
+	 * @var array
+	 */
+	public $globals;
+
+	/**
+	 * directory where the compiled templates are stored
+	 *
+	 * defaults to DWOO_COMPILEDIR (= dwoo_dir/compiled by default)
+	 *
+	 * @var string
+	 */
+	protected $compileDir;
+
+	/**
+	 * directory where the cached templates are stored
+	 *
+	 * defaults to DWOO_CACHEDIR (= dwoo_dir/cache by default)
+	 *
+	 * @var string
+	 */
+	protected $cacheDir;
+
+	/**
+	 * defines how long (in seconds) the cached files must remain valid
+	 *
+	 * can be overriden on a per-template basis
+	 *
+	 * -1 = never delete
+	 * 0 = disabled
+	 * >0 = duration in seconds
+	 *
+	 * @var int
+	 */
+	protected $cacheTime = 0;
+
+	/**
+	 * security policy object
+	 *
+	 * @var Dwoo_Security_Policy
+	 */
+	protected $securityPolicy = null;
+
+	/**
+	 * stores the custom plugins callbacks
+	 *
+	 * @see addPlugin
+	 * @see removePlugin
+	 * @var array
+	 */
+	protected $plugins = array();
+
+	/**
+	 * stores the filter callbacks
+	 *
+	 * @see addFilter
+	 * @see removeFilter
+	 * @var array
+	 */
+	protected $filters = array();
+
+	/**
+	 * stores the resource types and associated
+	 * classes / compiler classes
+	 *
+	 * @var array
+	 */
+	protected $resources = array
+	(
+		'file'      =>  array
+		(
+			'class'     =>  'Dwoo_Template_File',
+			'compiler'  =>  null
+		),
+		'string'    =>  array
+		(
+			'class'     =>  'Dwoo_Template_String',
+			'compiler'  =>  null
+		)
+	);
+
+	/**
+	 * the dwoo loader object used to load plugins by this dwoo instance
+	 *
+	 * @var Dwoo_ILoader
+	 */
+	protected $loader = null;
+
+	/**
+	 * currently rendered template, set to null when not-rendering
+	 *
+	 * @var Dwoo_ITemplate
+	 */
+	protected $template = null;
+
+	/**
+	 * stores the instances of the class plugins during template runtime
+	 *
+	 * @var array
+	 */
+	protected $runtimePlugins;
+
+	/**
+	 * stores the returned values during template runtime
+	 *
+	 * @var array
+	 */
+	protected $returnData;
+
+	/**
+	 * stores the data during template runtime
+	 *
+	 * @var array
+	 * @private
+	 */
+	public $data;
+
+	/**
+	 * stores the current scope during template runtime
+	 *
+	 * this should ideally not be accessed directly from outside template code
+	 *
+	 * @var mixed
+	 * @private
+	 */
+	public $scope;
+
+	/**
+	 * stores the scope tree during template runtime
+	 *
+	 * @var array
+	 */
+	protected $scopeTree;
+
+	/**
+	 * stores the block plugins stack during template runtime
+	 *
+	 * @var array
+	 */
+	protected $stack;
+
+	/**
+	 * stores the current block plugin at the top of the stack during template runtime
+	 *
+	 * @var Dwoo_Block_Plugin
+	 */
+	protected $curBlock;
+
+	/**
+	 * stores the output buffer during template runtime
+	 *
+	 * @var string
+	 */
+	protected $buffer;
+
+	/**
+	 * stores plugin proxy
+	 *
+	 * @var Dwoo_IPluginProxy
+	 */
+	protected $pluginProxy;
+
+	/**
+	 * constructor, sets the cache and compile dir to the default values if not provided
+	 *
+	 * @param string $compileDir path to the compiled directory, defaults to lib/compiled
+	 * @param string $cacheDir path to the cache directory, defaults to lib/cache
+	 */
+	public function __construct($compileDir = null, $cacheDir = null)
+	{
+		if ($compileDir !== null) {
+			$this->setCompileDir($compileDir);
+		}
+		if ($cacheDir !== null) {
+			$this->setCacheDir($cacheDir);
+		}
+		$this->initGlobals();
+	}
+
+	/**
+	 * resets some runtime variables to allow a cloned object to be used to render sub-templates
+	 */
+	public function __clone()
+	{
+		$this->template = null;
+		unset($this->data);
+		unset($this->returnData);
+	}
+
+	/**
+	 * outputs the template instead of returning it, this is basically a shortcut for get(*, *, *, true)
+	 *
+	 * @see get
+	 * @param mixed $tpl template, can either be a Dwoo_ITemplate object (i.e. Dwoo_Template_File), a valid path to a template, or
+	 *                   a template as a string it is recommended to provide a Dwoo_ITemplate as it will probably make things faster,
+	 *                   especially if you render a template multiple times
+	 * @param mixed $data the data to use, can either be a Dwoo_IDataProvider object (i.e. Dwoo_Data) or an associative array. if you're
+	 *                    rendering the template from cache, it can be left null
+	 * @param Dwoo_ICompiler $compiler the compiler that must be used to compile the template, if left empty a default
+	 *                                Dwoo_Compiler will be used.
+	 * @return string nothing or the template output if $output is true
+	 */
+	public function output($tpl, $data = array(), Dwoo_ICompiler $compiler = null)
+	{
+		return $this->get($tpl, $data, $compiler, true);
+	}
+
+	/**
+	 * returns the given template rendered using the provided data and optional compiler
+	 *
+	 * @param mixed $tpl template, can either be a Dwoo_ITemplate object (i.e. Dwoo_Template_File), a valid path to a template, or
+	 *                   a template as a string it is recommended to provide a Dwoo_ITemplate as it will probably make things faster,
+	 *                   especially if you render a template multiple times
+	 * @param mixed $data the data to use, can either be a Dwoo_IDataProvider object (i.e. Dwoo_Data) or an associative array. if you're
+	 *                    rendering the template from cache, it can be left null
+	 * @param Dwoo_ICompiler $compiler the compiler that must be used to compile the template, if left empty a default
+	 *                                Dwoo_Compiler will be used.
+	 * @param bool $output flag that defines whether the function returns the output of the template (false, default) or echoes it directly (true)
+	 * @return string nothing or the template output if $output is false
+	 */
+	public function get($_tpl, $data = array(), $_compiler = null, $_output = false)
+	{
+		// a render call came from within a template, so we need a new dwoo instance in order to avoid breaking this one
+		if ($this->template instanceof Dwoo_ITemplate) {
+			$clone = clone $this;
+			return $clone->get($_tpl, $data, $_compiler, $_output);
+		}
+
+		// auto-create template if required
+		if ($_tpl instanceof Dwoo_ITemplate) {
+			// valid, skip
+		} elseif (is_string($_tpl) && file_exists($_tpl)) {
+			$_tpl = new Dwoo_Template_File($_tpl);
+		} else {
+			throw new Dwoo_Exception('Dwoo->get/Dwoo->output\'s first argument must be a Dwoo_ITemplate (i.e. Dwoo_Template_File) or a valid path to a template file', E_USER_NOTICE);
+		}
+
+		// save the current template, enters render mode at the same time
+		// if another rendering is requested it will be proxied to a new Dwoo_Core(instance
+		$this->template = $_tpl;
+
+		// load data
+		if ($data instanceof Dwoo_IDataProvider) {
+			$this->data = $data->getData();
+		} elseif (is_array($data)) {
+			$this->data = $data;
+		} elseif ($data instanceof ArrayAccess) {
+			$this->data = $data;
+		} else {
+			throw new Dwoo_Exception('Dwoo->get/Dwoo->output\'s data argument must be a Dwoo_IDataProvider object (i.e. Dwoo_Data) or an associative array', E_USER_NOTICE);
+		}
+
+		$this->globals['template'] = $_tpl->getName();
+		$this->initRuntimeVars($_tpl);
+
+		// try to get cached template
+		$file = $_tpl->getCachedTemplate($this);
+		$doCache = $file === true;
+		$cacheLoaded = is_string($file);
+
+		if ($cacheLoaded === true) {
+			// cache is present, run it
+			if ($_output === true) {
+				include $file;
+				$this->template = null;
+			} else {
+				ob_start();
+				include $file;
+				$this->template = null;
+				return ob_get_clean();
+			}
+		} else {
+			// no cache present
+			if ($doCache === true) {
+				$dynamicId = uniqid();
+			}
 
-    /**
-     * stores the block plugins stack during template runtime
-     *
-     * @var array
-     */
-    protected $stack;
+			// render template
+			$compiledTemplate = $_tpl->getCompiledTemplate($this, $_compiler);
+			$out = include $compiledTemplate;
 
-    /**
-     * stores the current block plugin at the top of the stack during template runtime
-     *
-     * @var Dwoo_Block_Plugin
-     */
-    protected $curBlock;
+			// template returned false so it needs to be recompiled
+			if ($out === false) {
+				$_tpl->forceCompilation();
+				$compiledTemplate = $_tpl->getCompiledTemplate($this, $_compiler);
+				$out = include $compiledTemplate;
+			}
 
-    /**
-     * stores the output buffer during template runtime
-     *
-     * @var string
-     */
-    protected $buffer;
+			if ($doCache === true) {
+				$out = preg_replace('/(<%|%>|<\?php|<\?|\?>)/', '<?php /*'.$dynamicId.'*/ echo \'$1\'; ?>', $out);
+				if (!class_exists('Dwoo_plugin_dynamic', false)) {
+					$this->getLoader()->loadPlugin('dynamic');
+				}
+				$out = Dwoo_Plugin_dynamic::unescape($out, $dynamicId, $compiledTemplate);
+			}
 
-    /**
-     * stores plugin proxy
-     *
-     * @var Dwoo_IPluginProxy
-     */
-    protected $pluginProxy;
+			// process filters
+			foreach ($this->filters as $filter) {
+				if (is_array($filter) && $filter[0] instanceof Dwoo_Filter) {
+					$out = call_user_func($filter, $out);
+				} else {
+					$out = call_user_func($filter, $this, $out);
+				}
+			}
 
-    /**
-     * constructor, sets the cache and compile dir to the default values if not provided
-     *
-     * @param string $compileDir path to the compiled directory, defaults to lib/compiled
-     * @param string $cacheDir path to the cache directory, defaults to lib/cache
-     */
-    public function __construct($compileDir = null, $cacheDir = null)
-    {
-        if ($compileDir !== null) {
-            $this->setCompileDir($compileDir);
-        }
-        if ($cacheDir !== null) {
-            $this->setCacheDir($cacheDir);
-        }
-        $this->initGlobals();
-    }
-
-    /**
-     * resets some runtime variables to allow a cloned object to be used to render sub-templates
-     */
-    public function __clone()
-    {
-        $this->template = null;
-        unset($this->data);
-        unset($this->returnData);
-    }
-
-    /**
-     * outputs the template instead of returning it, this is basically a shortcut for get(*, *, *, true)
-     *
-     * @see get
-     * @param mixed $tpl template, can either be a Dwoo_ITemplate object (i.e. Dwoo_Template_File), a valid path to a template, or
-     *                   a template as a string it is recommended to provide a Dwoo_ITemplate as it will probably make things faster,
-     *                   especially if you render a template multiple times
-     * @param mixed $data the data to use, can either be a Dwoo_IDataProvider object (i.e. Dwoo_Data) or an associative array. if you're
-     *                    rendering the template from cache, it can be left null
-     * @param Dwoo_ICompiler $compiler the compiler that must be used to compile the template, if left empty a default
-     *                                Dwoo_Compiler will be used.
-     * @return string nothing or the template output if $output is true
-     */
-    public function output($tpl, $data = array(), Dwoo_ICompiler $compiler = null)
-    {
-        return $this->get($tpl, $data, $compiler, true);
-    }
+			if ($doCache === true) {
+				// building cache
+				$file = $_tpl->cache($this, $out);
 
-    /**
-     * returns the given template rendered using the provided data and optional compiler
-     *
-     * @param mixed $tpl template, can either be a Dwoo_ITemplate object (i.e. Dwoo_Template_File), a valid path to a template, or
-     *                   a template as a string it is recommended to provide a Dwoo_ITemplate as it will probably make things faster,
-     *                   especially if you render a template multiple times
-     * @param mixed $data the data to use, can either be a Dwoo_IDataProvider object (i.e. Dwoo_Data) or an associative array. if you're
-     *                    rendering the template from cache, it can be left null
-     * @param Dwoo_ICompiler $compiler the compiler that must be used to compile the template, if left empty a default
-     *                                Dwoo_Compiler will be used.
-     * @param bool $output flag that defines whether the function returns the output of the template (false, default) or echoes it directly (true)
-     * @return string nothing or the template output if $output is false
-     */
-    public function get($_tpl, $data = array(), $_compiler = null, $_output = false)
-    {
-        // a render call came from within a template, so we need a new dwoo instance in order to avoid breaking this one
-        if ($this->template instanceof Dwoo_ITemplate) {
-            $clone = clone $this;
-            return $clone->get($_tpl, $data, $_compiler, $_output);
-        }
-
-        // auto-create template if required
-        if ($_tpl instanceof Dwoo_ITemplate) {
-            // valid, skip
-        } elseif (is_string($_tpl) && file_exists($_tpl)) {
-            $_tpl = new Dwoo_Template_File($_tpl);
-        } else {
-            throw new Dwoo_Exception('Dwoo->get/Dwoo->output\'s first argument must be a Dwoo_ITemplate (i.e. Dwoo_Template_File) or a valid path to a template file', E_USER_NOTICE);
-        }
-
-        // save the current template, enters render mode at the same time
-        // if another rendering is requested it will be proxied to a new Dwoo_Core(instance
-        $this->template = $_tpl;
-
-        // load data
-        if ($data instanceof Dwoo_IDataProvider) {
-            $this->data = $data->getData();
-        } elseif (is_array($data)) {
-            $this->data = $data;
-        } elseif ($data instanceof ArrayAccess) {
-            $this->data = $data;
-        } else {
-            throw new Dwoo_Exception('Dwoo->get/Dwoo->output\'s data argument must be a Dwoo_IDataProvider object (i.e. Dwoo_Data) or an associative array', E_USER_NOTICE);
-        }
-
-        $this->globals['template'] = $_tpl->getName();
-        $this->initRuntimeVars($_tpl);
-
-        // try to get cached template
-        $file = $_tpl->getCachedTemplate($this);
-        $doCache = $file === true;
-        $cacheLoaded = is_string($file);
-
-        if ($cacheLoaded === true) {
-            // cache is present, run it
-            if ($_output === true) {
-                include $file;
-                $this->template = null;
-            } else {
-                ob_start();
-                include $file;
-                $this->template = null;
-                return ob_get_clean();
-            }
-        } else {
-            // no cache present
-            if ($doCache === true) {
-                $dynamicId = uniqid();
-            }
-
-            // render template
-            $compiledTemplate = $_tpl->getCompiledTemplate($this, $_compiler);
-            $out = include $compiledTemplate;
-
-            // template returned false so it needs to be recompiled
-            if ($out === false) {
-                $_tpl->forceCompilation();
-                $compiledTemplate = $_tpl->getCompiledTemplate($this, $_compiler);
-                $out = include $compiledTemplate;
-            }
-
-            if ($doCache === true) {
-                $out = preg_replace('/(<%|%>|<\?php|<\?|\?>)/', '<?php /*'.$dynamicId.'*/ echo \'$1\'; ?>', $out);
-                if (!class_exists('Dwoo_plugin_dynamic', false)) {
-                    $this->getLoader()->loadPlugin('dynamic');
-                }
-                $out = Dwoo_Plugin_dynamic::unescape($out, $dynamicId, $compiledTemplate);
-            }
-
-            // process filters
-            foreach ($this->filters as $filter) {
-                if (is_array($filter) && $filter[0] instanceof Dwoo_Filter) {
-                    $out = call_user_func($filter, $out);
-                } else {
-                    $out = call_user_func($filter, $this, $out);
-                }
-            }
-
-            if ($doCache === true) {
-                // building cache
-                $file = $_tpl->cache($this, $out);
-
-                // run it from the cache to be sure dynamics are rendered
-                if ($_output === true) {
-                    include $file;
-                    // exit render mode
-                    $this->template = null;
-                } else {
-                    ob_start();
-                    include $file;
-                    // exit render mode
-                    $this->template = null;
-                    return ob_get_clean();
-                }
-            } else {
-                // no need to build cache
-                // exit render mode
-                $this->template = null;
-                // output
-                if ($_output === true) {
-                    echo $out;
-                }
-                return $out;
-            }
-        }
-    }
-
-    /**
-     * re-initializes the globals array before each template run
-     *
-     * this method is only callede once when the Dwoo object is created
-     */
-    protected function initGlobals()
-    {
-        $this->globals = array
-        (
-            'version'   =>  self::VERSION,
-            'ad'        =>  '<a href="http://dwoo.org/">Powered by Dwoo</a>',
-            'now'       =>  $_SERVER['REQUEST_TIME'],
-            'charset'   =>  $this->charset,
-        );
-    }
-
-    /**
-     * re-initializes the runtime variables before each template run
-     *
-     * override this method to inject data in the globals array if needed, this
-     * method is called before each template execution
-     *
-     * @param Dwoo_ITemplate $tpl the template that is going to be rendered
-     */
-    protected function initRuntimeVars(Dwoo_ITemplate $tpl)
-    {
-        $this->runtimePlugins = array();
-        $this->scope =& $this->data;
-        $this->scopeTree = array();
-        $this->stack = array();
-        $this->curBlock = null;
-        $this->buffer = '';
-        $this->returnData = array();
-    }
-
-    /*
+				// run it from the cache to be sure dynamics are rendered
+				if ($_output === true) {
+					include $file;
+					// exit render mode
+					$this->template = null;
+				} else {
+					ob_start();
+					include $file;
+					// exit render mode
+					$this->template = null;
+					return ob_get_clean();
+				}
+			} else {
+				// no need to build cache
+				// exit render mode
+				$this->template = null;
+				// output
+				if ($_output === true) {
+					echo $out;
+				}
+				return $out;
+			}
+		}
+	}
+
+	/**
+	 * re-initializes the globals array before each template run
+	 *
+	 * this method is only callede once when the Dwoo object is created
+	 */
+	protected function initGlobals()
+	{
+		$this->globals = array
+		(
+			'version'   =>  self::VERSION,
+			'ad'        =>  '<a href="http://dwoo.org/">Powered by Dwoo</a>',
+			'now'       =>  $_SERVER['REQUEST_TIME'],
+			'charset'   =>  $this->charset,
+		);
+	}
+
+	/**
+	 * re-initializes the runtime variables before each template run
+	 *
+	 * override this method to inject data in the globals array if needed, this
+	 * method is called before each template execution
+	 *
+	 * @param Dwoo_ITemplate $tpl the template that is going to be rendered
+	 */
+	protected function initRuntimeVars(Dwoo_ITemplate $tpl)
+	{
+		$this->runtimePlugins = array();
+		$this->scope =& $this->data;
+		$this->scopeTree = array();
+		$this->stack = array();
+		$this->curBlock = null;
+		$this->buffer = '';
+		$this->returnData = array();
+	}
+
+	/*
      * --------- settings functions ---------
      */
 
-    /**
-     * adds a custom plugin that is not in one of the plugin directories
-     *
-     * @param string $name the plugin name to be used in the templates
-     * @param callback $callback the plugin callback, either a function name,
-     *                           a class name or an array containing an object
-     *                           or class name and a method name
-     * @param bool $compilable if set to true, the plugin is assumed to be compilable
-     */
-    public function addPlugin($name, $callback, $compilable = false)
-    {
-        $compilable = $compilable ? self::COMPILABLE_PLUGIN : 0;
-        if (is_array($callback)) {
-            if (is_subclass_of(is_object($callback[0]) ? get_class($callback[0]) : $callback[0], 'Dwoo_Block_Plugin')) {
-                $this->plugins[$name] = array('type'=>self::BLOCK_PLUGIN | $compilable, 'callback'=>$callback, 'class'=>(is_object($callback[0]) ? get_class($callback[0]) : $callback[0]));
-            } else {
-                $this->plugins[$name] = array('type'=>self::CLASS_PLUGIN | $compilable, 'callback'=>$callback, 'class'=>(is_object($callback[0]) ? get_class($callback[0]) : $callback[0]), 'function'=>$callback[1]);
-            }
-        } elseif(is_string($callback)) {
+	/**
+	 * adds a custom plugin that is not in one of the plugin directories
+	 *
+	 * @param string $name the plugin name to be used in the templates
+	 * @param callback $callback the plugin callback, either a function name,
+	 *                           a class name or an array containing an object
+	 *                           or class name and a method name
+	 * @param bool $compilable if set to true, the plugin is assumed to be compilable
+	 */
+	public function addPlugin($name, $callback, $compilable = false)
+	{
+		$compilable = $compilable ? self::COMPILABLE_PLUGIN : 0;
+		if (is_array($callback)) {
+			if (is_subclass_of(is_object($callback[0]) ? get_class($callback[0]) : $callback[0], 'Dwoo_Block_Plugin')) {
+				$this->plugins[$name] = array('type'=>self::BLOCK_PLUGIN | $compilable, 'callback'=>$callback, 'class'=>(is_object($callback[0]) ? get_class($callback[0]) : $callback[0]));
+			} else {
+				$this->plugins[$name] = array('type'=>self::CLASS_PLUGIN | $compilable, 'callback'=>$callback, 'class'=>(is_object($callback[0]) ? get_class($callback[0]) : $callback[0]), 'function'=>$callback[1]);
+			}
+		} elseif(is_string($callback)) {
 			if (class_exists($callback, false)) {
 				if (is_subclass_of($callback, 'Dwoo_Block_Plugin')) {
 					$this->plugins[$name] = array('type'=>self::BLOCK_PLUGIN | $compilable, 'callback'=>$callback, 'class'=>$callback);
@@ -499,1120 +499,1120 @@ 
 		} elseif(is_callable($callback)) {
 			$this->plugins[$name] = array('type'=>self::FUNC_PLUGIN | $compilable, 'callback'=>$callback);
 		} else {
-            throw new Dwoo_Exception('Callback could not be processed correctly, please check that the function/class you used exists');
-        }
-    }
-
-    /**
-     * removes a custom plugin
-     *
-     * @param string $name the plugin name
-     */
-    public function removePlugin($name)
-    {
-        if (isset($this->plugins[$name])) {
-            unset($this->plugins[$name]);
-        }
-    }
-
-    /**
-     * adds a filter to this Dwoo instance, it will be used to filter the output of all the templates rendered by this instance
-     *
-     * @param mixed $callback a callback or a filter name if it is autoloaded from a plugin directory
-     * @param bool $autoload if true, the first parameter must be a filter name from one of the plugin directories
-     */
-    public function addFilter($callback, $autoload = false)
-    {
-        if ($autoload) {
-            $class = 'Dwoo_Filter_'.$callback;
-
-            if (!class_exists($class, false) && !function_exists($class)) {
-                try {
-                    $this->getLoader()->loadPlugin($callback);
-                } catch (Dwoo_Exception $e) {
-                    if (strstr($callback, 'Dwoo_Filter_')) {
-                        throw new Dwoo_Exception('Wrong filter name : '.$callback.', the "Dwoo_Filter_" prefix should not be used, please only use "'.str_replace('Dwoo_Filter_', '', $callback).'"');
-                    } else {
-                        throw new Dwoo_Exception('Wrong filter name : '.$callback.', when using autoload the filter must be in one of your plugin dir as "name.php" containg a class or function named "Dwoo_Filter_name"');
-                    }
-                }
-            }
-
-            if (class_exists($class, false)) {
-                $callback = array(new $class($this), 'process');
-            } elseif (function_exists($class)) {
-                $callback = $class;
-            } else {
-                throw new Dwoo_Exception('Wrong filter name : '.$callback.', when using autoload the filter must be in one of your plugin dir as "name.php" containg a class or function named "Dwoo_Filter_name"');
-            }
-
-            $this->filters[] = $callback;
-        } else {
-            $this->filters[] = $callback;
-        }
-    }
-
-    /**
-     * removes a filter
-     *
-     * @param mixed $callback callback or filter name if it was autoloaded
-     */
-    public function removeFilter($callback)
-    {
-        if (($index = array_search('Dwoo_Filter_'.$callback, $this->filters, true)) !== false) {
-            unset($this->filters[$index]);
-        } elseif (($index = array_search($callback, $this->filters, true)) !== false) {
-            unset($this->filters[$index]);
-        } else  {
-            $class = 'Dwoo_Filter_' . $callback;
-            foreach ($this->filters as $index=>$filter) {
-                if (is_array($filter) && $filter[0] instanceof $class) {
-                    unset($this->filters[$index]);
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * adds a resource or overrides a default one
-     *
-     * @param string $name the resource name
-     * @param string $class the resource class (which must implement Dwoo_ITemplate)
-     * @param callback $compilerFactory the compiler factory callback, a function that must return a compiler instance used to compile this resource, if none is provided. by default it will produce a Dwoo_Compiler object
-     */
-    public function addResource($name, $class, $compilerFactory = null)
-    {
-        if (strlen($name) < 2) {
-            throw new Dwoo_Exception('Resource names must be at least two-character long to avoid conflicts with Windows paths');
-        }
-
-        if (!class_exists($class)) {
-            throw new Dwoo_Exception('Resource class does not exist');
-        }
-
-        $interfaces = class_implements($class);
-        if (in_array('Dwoo_ITemplate', $interfaces) === false) {
-            throw new Dwoo_Exception('Resource class must implement Dwoo_ITemplate');
-        }
-
-        $this->resources[$name] = array('class'=>$class, 'compiler'=>$compilerFactory);
-    }
-
-    /**
-     * removes a custom resource
-     *
-     * @param string $name the resource name
-     */
-    public function removeResource($name)
-    {
-        unset($this->resources[$name]);
-        if ($name==='file') {
-            $this->resources['file'] = array('class'=>'Dwoo_Template_File', 'compiler'=>null);
-        }
-    }
-
-    /*
-     * --------- getters and setters ---------
-     */
-
-    /**
-     * sets the loader object to use to load plugins
-     *
-     * @param Dwoo_ILoader $loader loader object
-     */
-    public function setLoader(Dwoo_ILoader $loader)
-    {
-        $this->loader = $loader;
-    }
-
-    /**
-     * returns the current loader object or a default one if none is currently found
-     *
-     * @param Dwoo_ILoader
-     */
-    public function getLoader()
-    {
-        if ($this->loader === null) {
-            $this->loader = new Dwoo_Loader($this->getCompileDir());
-        }
-
-        return $this->loader;
-    }
-
-    /**
-     * returns the custom plugins loaded
-     *
-     * used by the Dwoo_ITemplate classes to pass the custom plugins to their Dwoo_ICompiler instance
-     *
-     * @return array
-     */
-    public function getCustomPlugins()
-    {
-        return $this->plugins;
-    }
-
-    /**
-     * returns the cache directory with a trailing DIRECTORY_SEPARATOR
-     *
-     * @return string
-     */
-    public function getCacheDir()
-    {
-        if ($this->cacheDir === null) {
-            $this->setCacheDir(DWOO_DIRECTORY.'cache'.DIRECTORY_SEPARATOR);
-        }
+			throw new Dwoo_Exception('Callback could not be processed correctly, please check that the function/class you used exists');
+		}
+	}
+
+	/**
+	 * removes a custom plugin
+	 *
+	 * @param string $name the plugin name
+	 */
+	public function removePlugin($name)
+	{
+		if (isset($this->plugins[$name])) {
+			unset($this->plugins[$name]);
+		}
+	}
+
+	/**
+	 * adds a filter to this Dwoo instance, it will be used to filter the output of all the templates rendered by this instance
+	 *
+	 * @param mixed $callback a callback or a filter name if it is autoloaded from a plugin directory
+	 * @param bool $autoload if true, the first parameter must be a filter name from one of the plugin directories
+	 */
+	public function addFilter($callback, $autoload = false)
+	{
+		if ($autoload) {
+			$class = 'Dwoo_Filter_'.$callback;
+
+			if (!class_exists($class, false) && !function_exists($class)) {
+				try {
+					$this->getLoader()->loadPlugin($callback);
+				} catch (Dwoo_Exception $e) {
+					if (strstr($callback, 'Dwoo_Filter_')) {
+						throw new Dwoo_Exception('Wrong filter name : '.$callback.', the "Dwoo_Filter_" prefix should not be used, please only use "'.str_replace('Dwoo_Filter_', '', $callback).'"');
+					} else {
+						throw new Dwoo_Exception('Wrong filter name : '.$callback.', when using autoload the filter must be in one of your plugin dir as "name.php" containg a class or function named "Dwoo_Filter_name"');
+					}
+				}
+			}
 
-        return $this->cacheDir;
-    }
+			if (class_exists($class, false)) {
+				$callback = array(new $class($this), 'process');
+			} elseif (function_exists($class)) {
+				$callback = $class;
+			} else {
+				throw new Dwoo_Exception('Wrong filter name : '.$callback.', when using autoload the filter must be in one of your plugin dir as "name.php" containg a class or function named "Dwoo_Filter_name"');
+			}
 
-    /**
-     * sets the cache directory and automatically appends a DIRECTORY_SEPARATOR
-     *
-     * @param string $dir the cache directory
-     */
-    public function setCacheDir($dir)
-    {
-        $this->cacheDir = rtrim($dir, '/\\').DIRECTORY_SEPARATOR;
-        if (is_writable($this->cacheDir) === false) {
-            throw new Dwoo_Exception('The cache directory must be writable, chmod "'.$this->cacheDir.'" to make it writable');
-        }
-    }
-
-    /**
-     * returns the compile directory with a trailing DIRECTORY_SEPARATOR
-     *
-     * @return string
+			$this->filters[] = $callback;
+		} else {
+			$this->filters[] = $callback;
+		}
+	}
+
+	/**
+	 * removes a filter
+	 *
+	 * @param mixed $callback callback or filter name if it was autoloaded
+	 */
+	public function removeFilter($callback)
+	{
+		if (($index = array_search('Dwoo_Filter_'.$callback, $this->filters, true)) !== false) {
+			unset($this->filters[$index]);
+		} elseif (($index = array_search($callback, $this->filters, true)) !== false) {
+			unset($this->filters[$index]);
+		} else  {
+			$class = 'Dwoo_Filter_' . $callback;
+			foreach ($this->filters as $index=>$filter) {
+				if (is_array($filter) && $filter[0] instanceof $class) {
+					unset($this->filters[$index]);
+					break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * adds a resource or overrides a default one
+	 *
+	 * @param string $name the resource name
+	 * @param string $class the resource class (which must implement Dwoo_ITemplate)
+	 * @param callback $compilerFactory the compiler factory callback, a function that must return a compiler instance used to compile this resource, if none is provided. by default it will produce a Dwoo_Compiler object
+	 */
+	public function addResource($name, $class, $compilerFactory = null)
+	{
+		if (strlen($name) < 2) {
+			throw new Dwoo_Exception('Resource names must be at least two-character long to avoid conflicts with Windows paths');
+		}
+
+		if (!class_exists($class)) {
+			throw new Dwoo_Exception('Resource class does not exist');
+		}
+
+		$interfaces = class_implements($class);
+		if (in_array('Dwoo_ITemplate', $interfaces) === false) {
+			throw new Dwoo_Exception('Resource class must implement Dwoo_ITemplate');
+		}
+
+		$this->resources[$name] = array('class'=>$class, 'compiler'=>$compilerFactory);
+	}
+
+	/**
+	 * removes a custom resource
+	 *
+	 * @param string $name the resource name
+	 */
+	public function removeResource($name)
+	{
+		unset($this->resources[$name]);
+		if ($name==='file') {
+			$this->resources['file'] = array('class'=>'Dwoo_Template_File', 'compiler'=>null);
+		}
+	}
+
+	/*
+     * --------- getters and setters ---------
      */
-    public function getCompileDir()
-    {
-        if ($this->compileDir === null) {
-            $this->setCompileDir(DWOO_DIRECTORY.'compiled'.DIRECTORY_SEPARATOR);
-        }
-
-        return $this->compileDir;
-    }
 
-    /**
-     * sets the compile directory and automatically appends a DIRECTORY_SEPARATOR
-     *
-     * @param string $dir the compile directory
-     */
-    public function setCompileDir($dir)
-    {
-        $this->compileDir = rtrim($dir, '/\\').DIRECTORY_SEPARATOR;
-        if (is_writable($this->compileDir) === false) {
-            throw new Dwoo_Exception('The compile directory must be writable, chmod "'.$this->compileDir.'" to make it writable');
-        }
-    }
-
-    /**
-     * returns the default cache time that is used with templates that do not have a cache time set
-     *
-     * @return int the duration in seconds
+	/**
+	 * sets the loader object to use to load plugins
+	 *
+	 * @param Dwoo_ILoader $loader loader object
+	 */
+	public function setLoader(Dwoo_ILoader $loader)
+	{
+		$this->loader = $loader;
+	}
+
+	/**
+	 * returns the current loader object or a default one if none is currently found
+	 *
+	 * @param Dwoo_ILoader
+	 */
+	public function getLoader()
+	{
+		if ($this->loader === null) {
+			$this->loader = new Dwoo_Loader($this->getCompileDir());
+		}
+
+		return $this->loader;
+	}
+
+	/**
+	 * returns the custom plugins loaded
+	 *
+	 * used by the Dwoo_ITemplate classes to pass the custom plugins to their Dwoo_ICompiler instance
+	 *
+	 * @return array
+	 */
+	public function getCustomPlugins()
+	{
+		return $this->plugins;
+	}
+
+	/**
+	 * returns the cache directory with a trailing DIRECTORY_SEPARATOR
+	 *
+	 * @return string
+	 */
+	public function getCacheDir()
+	{
+		if ($this->cacheDir === null) {
+			$this->setCacheDir(DWOO_DIRECTORY.'cache'.DIRECTORY_SEPARATOR);
+		}
+
+		return $this->cacheDir;
+	}
+
+	/**
+	 * sets the cache directory and automatically appends a DIRECTORY_SEPARATOR
+	 *
+	 * @param string $dir the cache directory
+	 */
+	public function setCacheDir($dir)
+	{
+		$this->cacheDir = rtrim($dir, '/\\').DIRECTORY_SEPARATOR;
+		if (is_writable($this->cacheDir) === false) {
+			throw new Dwoo_Exception('The cache directory must be writable, chmod "'.$this->cacheDir.'" to make it writable');
+		}
+	}
+
+	/**
+	 * returns the compile directory with a trailing DIRECTORY_SEPARATOR
+	 *
+	 * @return string
+	 */
+	public function getCompileDir()
+	{
+		if ($this->compileDir === null) {
+			$this->setCompileDir(DWOO_DIRECTORY.'compiled'.DIRECTORY_SEPARATOR);
+		}
+
+		return $this->compileDir;
+	}
+
+	/**
+	 * sets the compile directory and automatically appends a DIRECTORY_SEPARATOR
+	 *
+	 * @param string $dir the compile directory
+	 */
+	public function setCompileDir($dir)
+	{
+		$this->compileDir = rtrim($dir, '/\\').DIRECTORY_SEPARATOR;
+		if (is_writable($this->compileDir) === false) {
+			throw new Dwoo_Exception('The compile directory must be writable, chmod "'.$this->compileDir.'" to make it writable');
+		}
+	}
+
+	/**
+	 * returns the default cache time that is used with templates that do not have a cache time set
+	 *
+	 * @return int the duration in seconds
+	 */
+	public function getCacheTime()
+	{
+		return $this->cacheTime;
+	}
+
+	/**
+	 * sets the default cache time to use with templates that do not have a cache time set
+	 *
+	 * @param int $seconds the duration in seconds
+	 */
+	public function setCacheTime($seconds)
+	{
+		$this->cacheTime = (int) $seconds;
+	}
+
+	/**
+	 * returns the character set used by the string manipulation plugins
+	 *
+	 * the charset is automatically lowercased
+	 *
+	 * @return string
+	 */
+	public function getCharset()
+	{
+		return $this->charset;
+	}
+
+	/**
+	 * sets the character set used by the string manipulation plugins
+	 *
+	 * the charset will be automatically lowercased
+	 *
+	 * @param string $charset the character set
+	 */
+	public function setCharset($charset)
+	{
+		$this->charset = strtolower((string) $charset);
+	}
+
+	/**
+	 * returns the current template being rendered, when applicable, or null
+	 *
+	 * @return Dwoo_ITemplate|null
+	 */
+	public function getTemplate()
+	{
+		return $this->template;
+	}
+
+	/**
+	 * sets the current template being rendered
+	 *
+	 * @param Dwoo_ITemplate $tpl template object
+	 */
+	public function setTemplate(Dwoo_ITemplate $tpl)
+	{
+		$this->template = $tpl;
+	}
+
+	/**
+	 * sets the default compiler factory function for the given resource name
+	 *
+	 * a compiler factory must return a Dwoo_ICompiler object pre-configured to fit your needs
+	 *
+	 * @param string $resourceName the resource name (i.e. file, string)
+	 * @param callback $compilerFactory the compiler factory callback
+	 */
+	public function setDefaultCompilerFactory($resourceName, $compilerFactory)
+	{
+		$this->resources[$resourceName]['compiler'] = $compilerFactory;
+	}
+
+	/**
+	 * returns the default compiler factory function for the given resource name
+	 *
+	 * @param string $resourceName the resource name
+	 * @return callback the compiler factory callback
+	 */
+	public function getDefaultCompilerFactory($resourceName)
+	{
+		return $this->resources[$resourceName]['compiler'];
+	}
+
+	/**
+	 * sets the security policy object to enforce some php security settings
+	 *
+	 * use this if untrusted persons can modify templates
+	 *
+	 * @param Dwoo_Security_Policy $policy the security policy object
+	 */
+	public function setSecurityPolicy(Dwoo_Security_Policy $policy = null)
+	{
+		$this->securityPolicy = $policy;
+	}
+
+	/**
+	 * returns the current security policy object or null by default
+	 *
+	 * @return Dwoo_Security_Policy|null the security policy object if any
+	 */
+	public function getSecurityPolicy()
+	{
+		return $this->securityPolicy;
+	}
+
+	/**
+	 * sets the object that must be used as a plugin proxy when plugin can't be found
+	 * by dwoo's loader
+	 *
+	 * @param Dwoo_IPluginProxy $pluginProxy the proxy object
+	 */
+	public function setPluginProxy(Dwoo_IPluginProxy $pluginProxy) {
+		$this->pluginProxy = $pluginProxy;
+	}
+
+	/**
+	 * returns the current plugin proxy object or null by default
+	 *
+	 * @param Dwoo_IPluginProxy|null the proxy object if any
+	 */
+	public function getPluginProxy() {
+		return $this->pluginProxy;
+	}
+
+	/*
+     * --------- util functions ---------
      */
-    public function getCacheTime()
-    {
-        return $this->cacheTime;
-    }
 
-    /**
-     * sets the default cache time to use with templates that do not have a cache time set
-     *
-     * @param int $seconds the duration in seconds
+	/**
+	 * [util function] checks whether the given template is cached or not
+	 *
+	 * @param Dwoo_ITemplate $tpl the template object
+	 * @return bool
+	 */
+	public function isCached(Dwoo_ITemplate $tpl)
+	{
+		return is_string($tpl->getCachedTemplate($this));
+	}
+
+	/**
+	 * [util function] clears the cached templates if they are older than the given time
+	 *
+	 * @param int $olderThan minimum time (in seconds) required for a cached template to be cleared
+	 * @return int the amount of templates cleared
+	 */
+	public function clearCache($olderThan=-1)
+	{
+		$cacheDirs = new RecursiveDirectoryIterator($this->getCacheDir());
+		$cache = new RecursiveIteratorIterator($cacheDirs);
+		$expired = time() - $olderThan;
+		$count = 0;
+		foreach ($cache as $file) {
+			if ($cache->isDot() || $cache->isDir() || substr($file, -5) !== '.html') {
+				continue;
+			}
+			if ($cache->getCTime() < $expired) {
+				$count += unlink((string) $file) ? 1 : 0;
+			}
+		}
+		return $count;
+	}
+
+	/**
+	 * [util function] fetches a template object of the given resource
+	 *
+	 * @param string $resourceName the resource name (i.e. file, string)
+	 * @param string $resourceId the resource identifier (i.e. file path)
+	 * @param int $cacheTime the cache time setting for this resource
+	 * @param string $cacheId the unique cache identifier
+	 * @param string $compileId the unique compiler identifier
+	 * @return Dwoo_ITemplate
+	 */
+	public function templateFactory($resourceName, $resourceId, $cacheTime = null, $cacheId = null, $compileId = null, Dwoo_ITemplate $parentTemplate = null)
+	{
+		if (isset($this->resources[$resourceName])) {
+			// TODO could be changed to $this->resources[$resourceName]['class']::templateFactory(..) in 5.3 maybe
+			return call_user_func(array($this->resources[$resourceName]['class'], 'templateFactory'), $this, $resourceId, $cacheTime, $cacheId, $compileId, $parentTemplate);
+		} else {
+			throw new Dwoo_Exception('Unknown resource type : '.$resourceName);
+		}
+	}
+
+	/**
+	 * [util function] checks if the input is an array or arrayaccess object, optionally it can also check if it's empty
+	 *
+	 * @param mixed $value the variable to check
+	 * @param bool $checkIsEmpty if true, the function will also check if the array|arrayaccess is empty,
+	 *                              and return true only if it's not empty
+	 * @return int|bool true if it's an array|arrayaccess (or the item count if $checkIsEmpty is true) or false if it's not an array|arrayaccess (or 0 if $checkIsEmpty is true)
+	 */
+	public function isArray($value, $checkIsEmpty=false)
+	{
+		if (is_array($value) === true || $value instanceof ArrayAccess) {
+			if ($checkIsEmpty === false) {
+				return true;
+			} else {
+				return $this->count($value);
+			}
+		}
+	}
+
+	/**
+	 * [util function] checks if the input is an array or a traversable object, optionally it can also check if it's empty
+	 *
+	 * @param mixed $value the variable to check
+	 * @param bool $checkIsEmpty if true, the function will also check if the array|traversable is empty,
+	 *                              and return true only if it's not empty
+	 * @return int|bool true if it's an array|traversable (or the item count if $checkIsEmpty is true) or false if it's not an array|traversable (or 0 if $checkIsEmpty is true)
+	 */
+	public function isTraversable($value, $checkIsEmpty=false)
+	{
+		if (is_array($value) === true) {
+			if ($checkIsEmpty === false) {
+				return true;
+			} else {
+				return count($value) > 0;
+			}
+		} elseif ($value instanceof Traversable) {
+			if ($checkIsEmpty === false) {
+				return true;
+			} else {
+				return $this->count($value);
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * [util function] counts an array or arrayaccess/traversable object
+	 * @param mixed $value
+	 * @return int|bool the count for arrays and objects that implement countable, true for other objects that don't, and 0 for empty elements
+	 */
+	public function count($value)
+	{
+		if (is_array($value) === true || $value instanceof Countable) {
+			return count($value);
+		} elseif ($value instanceof ArrayAccess) {
+			if ($value->offsetExists(0)) {
+				return true;
+			}
+		} elseif ($value instanceof Iterator) {
+			$value->rewind();
+			if ($value->valid()) {
+				return true;
+			}
+		} elseif ($value instanceof Traversable) {
+			foreach ($value as $dummy) {
+				return true;
+			}
+		}
+		return 0;
+	}
+
+	/**
+	 * [util function] triggers a dwoo error
+	 *
+	 * @param string $message the error message
+	 * @param int $level the error level, one of the PHP's E_* constants
+	 */
+	public function triggerError($message, $level=E_USER_NOTICE)
+	{
+		if (!($tplIdentifier = $this->template->getResourceIdentifier())) {
+			$tplIdentifier = $this->template->getResourceName();
+		}
+		trigger_error('Dwoo error (in '.$tplIdentifier.') : '.$message, $level);
+	}
+
+	/*
+     * --------- runtime functions ---------
      */
-    public function setCacheTime($seconds)
-    {
-        $this->cacheTime = (int) $seconds;
-    }
 
-    /**
-     * returns the character set used by the string manipulation plugins
-     *
-     * the charset is automatically lowercased
-     *
-     * @return string
-     */
-    public function getCharset()
-    {
-        return $this->charset;
-    }
+	/**
+	 * [runtime function] adds a block to the block stack
+	 *
+	 * @param string $blockName the block name (without Dwoo_Plugin_ prefix)
+	 * @param array $args the arguments to be passed to the block's init() function
+	 * @return Dwoo_Block_Plugin the newly created block
+	 */
+	public function addStack($blockName, array $args=array())
+	{
+		if (isset($this->plugins[$blockName])) {
+			$class = $this->plugins[$blockName]['class'];
+		} else {
+			$class = 'Dwoo_Plugin_'.$blockName;
+		}
 
-    /**
-     * sets the character set used by the string manipulation plugins
-     *
-     * the charset will be automatically lowercased
-     *
-     * @param string $charset the character set
-     */
-    public function setCharset($charset)
-    {
-        $this->charset = strtolower((string) $charset);
-    }
+		if ($this->curBlock !== null) {
+			$this->curBlock->buffer(ob_get_contents());
+			ob_clean();
+		} else {
+			$this->buffer .= ob_get_contents();
+			ob_clean();
+		}
+
+		$block = new $class($this);
+
+		$cnt = count($args);
+		if ($cnt===0) {
+			$block->init();
+		} elseif ($cnt===1) {
+			$block->init($args[0]);
+		} elseif ($cnt===2) {
+			$block->init($args[0], $args[1]);
+		} elseif ($cnt===3) {
+			$block->init($args[0], $args[1], $args[2]);
+		} elseif ($cnt===4) {
+			$block->init($args[0], $args[1], $args[2], $args[3]);
+		} else {
+			call_user_func_array(array($block,'init'), $args);
+		}
+
+		$this->stack[] = $this->curBlock = $block;
+		return $block;
+	}
+
+	/**
+	 * [runtime function] removes the plugin at the top of the block stack
+	 *
+	 * calls the block buffer() function, followed by a call to end()
+	 * and finally a call to process()
+	 */
+	public function delStack()
+	{
+		$args = func_get_args();
+
+		$this->curBlock->buffer(ob_get_contents());
+		ob_clean();
+
+		$cnt = count($args);
+		if ($cnt===0) {
+			$this->curBlock->end();
+		} elseif ($cnt===1) {
+			$this->curBlock->end($args[0]);
+		} elseif ($cnt===2) {
+			$this->curBlock->end($args[0], $args[1]);
+		} elseif ($cnt===3) {
+			$this->curBlock->end($args[0], $args[1], $args[2]);
+		} elseif ($cnt===4) {
+			$this->curBlock->end($args[0], $args[1], $args[2], $args[3]);
+		} else {
+			call_user_func_array(array($this->curBlock, 'end'), $args);
+		}
 
-    /**
-     * returns the current template being rendered, when applicable, or null
-     *
-     * @return Dwoo_ITemplate|null
-     */
-    public function getTemplate()
-    {
-        return $this->template;
-    }
+		$tmp = array_pop($this->stack);
 
-    /**
-     * sets the current template being rendered
-     *
-     * @param Dwoo_ITemplate $tpl template object
-     */
-    public function setTemplate(Dwoo_ITemplate $tpl)
-    {
-        $this->template = $tpl;
-    }
+		if (count($this->stack) > 0) {
+			$this->curBlock = end($this->stack);
+			$this->curBlock->buffer($tmp->process());
+		} else {
+			if($this->buffer !== '') {
+				echo $this->buffer;
+				$this->buffer = '';
+			}
+			$this->curBlock = null;
+			echo $tmp->process();
+		}
+
+		unset($tmp);
+	}
+
+	/**
+	 * [runtime function] returns the parent block of the given block
+	 *
+	 * @param Dwoo_Block_Plugin $block
+	 * @return Dwoo_Block_Plugin or false if the given block isn't in the stack
+	 */
+	public function getParentBlock(Dwoo_Block_Plugin $block)
+	{
+		$index = array_search($block, $this->stack, true);
+		if ($index !== false && $index > 0) {
+			return $this->stack[$index-1];
+		}
+		return false;
+	}
+
+	/**
+	 * [runtime function] finds the closest block of the given type, starting at the top of the stack
+	 *
+	 * @param string $type the type of plugin you want to find
+	 * @return Dwoo_Block_Plugin or false if no plugin of such type is in the stack
+	 */
+	public function findBlock($type)
+	{
+		if (isset($this->plugins[$type])) {
+			$type = $this->plugins[$type]['class'];
+		} else {
+			$type = 'Dwoo_Plugin_'.str_replace('Dwoo_Plugin_', '', $type);
+		}
 
-    /**
-     * sets the default compiler factory function for the given resource name
-     *
-     * a compiler factory must return a Dwoo_ICompiler object pre-configured to fit your needs
-     *
-     * @param string $resourceName the resource name (i.e. file, string)
-     * @param callback $compilerFactory the compiler factory callback
-     */
-    public function setDefaultCompilerFactory($resourceName, $compilerFactory)
-    {
-        $this->resources[$resourceName]['compiler'] = $compilerFactory;
-    }
+		$keys = array_keys($this->stack);
+		while (($key = array_pop($keys)) !== false) {
+			if ($this->stack[$key] instanceof $type) {
+				return $this->stack[$key];
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * [runtime function] returns a Dwoo_Plugin of the given class
+	 *
+	 * this is so a single instance of every class plugin is created at each template run,
+	 * allowing class plugins to have "per-template-run" static variables
+	 *
+	 * @private
+	 * @param string $class the class name
+	 * @return mixed an object of the given class
+	 */
+	public function getObjectPlugin($class)
+	{
+		if (isset($this->runtimePlugins[$class])) {
+			return $this->runtimePlugins[$class];
+		}
+		return $this->runtimePlugins[$class] = new $class($this);
+	}
+
+	/**
+	 * [runtime function] calls the process() method of the given class-plugin name
+	 *
+	 * @param string $plugName the class plugin name (without Dwoo_Plugin_ prefix)
+	 * @param array $params an array of parameters to send to the process() method
+	 * @return string the process() return value
+	 */
+	public function classCall($plugName, array $params = array())
+	{
+		$class = 'Dwoo_Plugin_'.$plugName;
+
+		$plugin = $this->getObjectPlugin($class);
+
+		$cnt = count($params);
+		if ($cnt===0) {
+			return $plugin->process();
+		} elseif ($cnt===1) {
+			return $plugin->process($params[0]);
+		} elseif ($cnt===2) {
+			return $plugin->process($params[0], $params[1]);
+		} elseif ($cnt===3) {
+			return $plugin->process($params[0], $params[1], $params[2]);
+		} elseif ($cnt===4) {
+			return $plugin->process($params[0], $params[1], $params[2], $params[3]);
+		} else {
+			return call_user_func_array(array($plugin, 'process'), $params);
+		}
+	}
+
+	/**
+	 * [runtime function] calls a php function
+	 *
+	 * @param string $callback the function to call
+	 * @param array $params an array of parameters to send to the function
+	 * @return mixed the return value of the called function
+	 */
+	public function arrayMap($callback, array $params)
+	{
+		if ($params[0] === $this) {
+			$addThis = true;
+			array_shift($params);
+		}
+		if ((is_array($params[0]) || ($params[0] instanceof Iterator && $params[0] instanceof ArrayAccess))) {
+			if (empty($params[0])) {
+				return $params[0];
+			}
 
-    /**
-     * returns the default compiler factory function for the given resource name
-     *
-     * @param string $resourceName the resource name
-     * @return callback the compiler factory callback
-     */
-    public function getDefaultCompilerFactory($resourceName)
-    {
-        return $this->resources[$resourceName]['compiler'];
-    }
+			// array map
+			$out = array();
+			$cnt = count($params);
+
+			if (isset($addThis)) {
+				array_unshift($params, $this);
+				$items = $params[1];
+				$keys = array_keys($items);
+
+				if (is_string($callback) === false) {
+					while (($i = array_shift($keys)) !== null) {
+						$out[] = call_user_func_array($callback, array(1=>$items[$i]) + $params);
+					}
+				} elseif ($cnt===1) {
+					while (($i = array_shift($keys)) !== null) {
+						$out[] = $callback($this, $items[$i]);
+					}
+				} elseif ($cnt===2) {
+					while (($i = array_shift($keys)) !== null) {
+						$out[] = $callback($this, $items[$i], $params[2]);
+					}
+				} elseif ($cnt===3) {
+					while (($i = array_shift($keys)) !== null) {
+						$out[] = $callback($this, $items[$i], $params[2], $params[3]);
+					}
+				} else {
+					while (($i = array_shift($keys)) !== null) {
+						$out[] = call_user_func_array($callback, array(1=>$items[$i]) + $params);
+					}
+				}
+			} else {
+				$items = $params[0];
+				$keys = array_keys($items);
+
+				if (is_string($callback) === false) {
+					while (($i = array_shift($keys)) !== null) {
+						$out[] = call_user_func_array($callback, array($items[$i]) + $params);
+					}
+				} elseif ($cnt===1) {
+					while (($i = array_shift($keys)) !== null) {
+						$out[] = $callback($items[$i]);
+					}
+				} elseif ($cnt===2) {
+					while (($i = array_shift($keys)) !== null) {
+						$out[] = $callback($items[$i], $params[1]);
+					}
+				} elseif ($cnt===3) {
+					while (($i = array_shift($keys)) !== null) {
+						$out[] = $callback($items[$i], $params[1], $params[2]);
+					}
+				} elseif ($cnt===4) {
+					while (($i = array_shift($keys)) !== null) {
+						$out[] = $callback($items[$i], $params[1], $params[2], $params[3]);
+					}
+				} else {
+					while (($i = array_shift($keys)) !== null) {
+						$out[] = call_user_func_array($callback, array($items[$i]) + $params);
+					}
+				}
+			}
+			return $out;
+		} else {
+			return $params[0];
+		}
+	}
+
+	/**
+	 * [runtime function] reads a variable into the given data array
+	 *
+	 * @param string $varstr the variable string, using dwoo variable syntax (i.e. "var.subvar[subsubvar]->property")
+	 * @param mixed $data the data array or object to read from
+	 * @param bool $safeRead if true, the function will check whether the index exists to prevent any notices from being output
+	 * @return mixed
+	 */
+	public function readVarInto($varstr, $data, $safeRead = false)
+	{
+		if ($data === null) {
+			return null;
+		}
+
+		if (is_array($varstr) === false) {
+			preg_match_all('#(\[|->|\.)?((?:[^.[\]-]|-(?!>))+)\]?#i', $varstr, $m);
+		} else {
+			$m = $varstr;
+		}
+		unset($varstr);
 
-    /**
-     * sets the security policy object to enforce some php security settings
-     *
-     * use this if untrusted persons can modify templates
-     *
-     * @param Dwoo_Security_Policy $policy the security policy object
-     */
-    public function setSecurityPolicy(Dwoo_Security_Policy $policy = null)
-    {
-        $this->securityPolicy = $policy;
-    }
+		while (list($k, $sep) = each($m[1])) {
+			if ($sep === '.' || $sep === '[' || $sep === '') {
+				// strip enclosing quotes if present
+				$m[2][$k] = preg_replace('#^(["\']?)(.*?)\1$#', '$2', $m[2][$k]);
 
-    /**
-     * returns the current security policy object or null by default
-     *
-     * @return Dwoo_Security_Policy|null the security policy object if any
-     */
-    public function getSecurityPolicy()
-    {
-        return $this->securityPolicy;
-    }
-
-    /**
-     * sets the object that must be used as a plugin proxy when plugin can't be found
-     * by dwoo's loader
-     *
-     * @param Dwoo_IPluginProxy $pluginProxy the proxy object
-     */
-    public function setPluginProxy(Dwoo_IPluginProxy $pluginProxy) {
-        $this->pluginProxy = $pluginProxy;
-    }
+				if ((is_array($data) || $data instanceof ArrayAccess) && ($safeRead === false || isset($data[$m[2][$k]]))) {
+					$data = $data[$m[2][$k]];
+				} else {
+					return null;
+				}
+			} else {
+				if (is_object($data) && ($safeRead === false || isset($data->$m[2][$k]))) {
+					$data = $data->$m[2][$k];
+				} else {
+					return null;
+				}
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * [runtime function] reads a variable into the parent scope
+	 *
+	 * @param int $parentLevels the amount of parent levels to go from the current scope
+	 * @param string $varstr the variable string, using dwoo variable syntax (i.e. "var.subvar[subsubvar]->property")
+	 * @return mixed
+	 */
+	public function readParentVar($parentLevels, $varstr = null)
+	{
+		$tree = $this->scopeTree;
+		$cur = $this->data;
+
+		while ($parentLevels--!==0) {
+			array_pop($tree);
+		}
+
+		while (($i = array_shift($tree)) !== null) {
+			if (is_object($cur)) {
+				$cur = $cur->$i;
+			} else {
+				$cur = $cur[$i];
+			}
+		}
 
-    /**
-     * returns the current plugin proxy object or null by default
-     *
-     * @param Dwoo_IPluginProxy|null the proxy object if any
-     */
-    public function getPluginProxy() {
-        return $this->pluginProxy;
-    }
+		if ($varstr!==null) {
+			return $this->readVarInto($varstr, $cur);
+		} else {
+			return $cur;
+		}
+	}
+
+	/**
+	 * [runtime function] reads a variable into the current scope
+	 *
+	 * @param string $varstr the variable string, using dwoo variable syntax (i.e. "var.subvar[subsubvar]->property")
+	 * @return mixed
+	 */
+	public function readVar($varstr)
+	{
+		if (is_array($varstr)===true) {
+			$m = $varstr;
+			unset($varstr);
+		} else {
+			if (strstr($varstr, '.') === false && strstr($varstr, '[') === false && strstr($varstr, '->') === false) {
+				if ($varstr === 'dwoo') {
+					return $this->globals;
+				} elseif ($varstr === '__' || $varstr === '_root' ) {
+					return $this->data;
+					$varstr = substr($varstr, 6);
+				} elseif ($varstr === '_' || $varstr === '_parent') {
+					$varstr = '.'.$varstr;
+					$tree = $this->scopeTree;
+					$cur = $this->data;
+					array_pop($tree);
+
+					while (($i = array_shift($tree)) !== null) {
+						if (is_object($cur)) {
+							$cur = $cur->$i;
+						} else {
+							$cur = $cur[$i];
+						}
+					}
+
+					return $cur;
+				}
 
-    /*
-     * --------- util functions ---------
-     */
+				$cur = $this->scope;
 
-    /**
-     * [util function] checks whether the given template is cached or not
-     *
-     * @param Dwoo_ITemplate $tpl the template object
-     * @return bool
-     */
-    public function isCached(Dwoo_ITemplate $tpl)
-    {
-        return is_string($tpl->getCachedTemplate($this));
-    }
+				if (isset($cur[$varstr])) {
+					return $cur[$varstr];
+				} else {
+					return null;
+				}
+			}
 
-    /**
-     * [util function] clears the cached templates if they are older than the given time
-     *
-     * @param int $olderThan minimum time (in seconds) required for a cached template to be cleared
-     * @return int the amount of templates cleared
-     */
-    public function clearCache($olderThan=-1)
-    {
-        $cacheDirs = new RecursiveDirectoryIterator($this->getCacheDir());
-        $cache = new RecursiveIteratorIterator($cacheDirs);
-        $expired = time() - $olderThan;
-        $count = 0;
-        foreach ($cache as $file) {
-            if ($cache->isDot() || $cache->isDir() || substr($file, -5) !== '.html') {
-                continue;
-            }
-            if ($cache->getCTime() < $expired) {
-                $count += unlink((string) $file) ? 1 : 0;
-            }
-        }
-        return $count;
-    }
-
-    /**
-     * [util function] fetches a template object of the given resource
-     *
-     * @param string $resourceName the resource name (i.e. file, string)
-     * @param string $resourceId the resource identifier (i.e. file path)
-     * @param int $cacheTime the cache time setting for this resource
-     * @param string $cacheId the unique cache identifier
-     * @param string $compileId the unique compiler identifier
-     * @return Dwoo_ITemplate
-     */
-    public function templateFactory($resourceName, $resourceId, $cacheTime = null, $cacheId = null, $compileId = null, Dwoo_ITemplate $parentTemplate = null)
-    {
-        if (isset($this->resources[$resourceName])) {
-            // TODO could be changed to $this->resources[$resourceName]['class']::templateFactory(..) in 5.3 maybe
-            return call_user_func(array($this->resources[$resourceName]['class'], 'templateFactory'), $this, $resourceId, $cacheTime, $cacheId, $compileId, $parentTemplate);
-        } else {
-            throw new Dwoo_Exception('Unknown resource type : '.$resourceName);
-        }
-    }
-
-    /**
-     * [util function] checks if the input is an array or arrayaccess object, optionally it can also check if it's empty
-     *
-     * @param mixed $value the variable to check
-     * @param bool $checkIsEmpty if true, the function will also check if the array|arrayaccess is empty,
-     *                              and return true only if it's not empty
-     * @return int|bool true if it's an array|arrayaccess (or the item count if $checkIsEmpty is true) or false if it's not an array|arrayaccess (or 0 if $checkIsEmpty is true)
-     */
-    public function isArray($value, $checkIsEmpty=false)
-    {
-        if (is_array($value) === true || $value instanceof ArrayAccess) {
-            if ($checkIsEmpty === false) {
-                return true;
-            } else {
-                return $this->count($value);
-            }
-        }
-    }
-
-    /**
-     * [util function] checks if the input is an array or a traversable object, optionally it can also check if it's empty
-     *
-     * @param mixed $value the variable to check
-     * @param bool $checkIsEmpty if true, the function will also check if the array|traversable is empty,
-     *                              and return true only if it's not empty
-     * @return int|bool true if it's an array|traversable (or the item count if $checkIsEmpty is true) or false if it's not an array|traversable (or 0 if $checkIsEmpty is true)
-     */
-    public function isTraversable($value, $checkIsEmpty=false)
-    {
-        if (is_array($value) === true) {
-            if ($checkIsEmpty === false) {
-                return true;
-            } else {
-                return count($value) > 0;
-            }
-        } elseif ($value instanceof Traversable) {
-            if ($checkIsEmpty === false) {
-                return true;
-            } else {
-                return $this->count($value);
-            }
-        }
-        return false;
-    }
-
-    /**
-     * [util function] counts an array or arrayaccess/traversable object
-     * @param mixed $value
-     * @return int|bool the count for arrays and objects that implement countable, true for other objects that don't, and 0 for empty elements
-     */
-    public function count($value)
-    {
-        if (is_array($value) === true || $value instanceof Countable) {
-            return count($value);
-        } elseif ($value instanceof ArrayAccess) {
-            if ($value->offsetExists(0)) {
-                return true;
-            }
-        } elseif ($value instanceof Iterator) {
-            $value->rewind();
-            if ($value->valid()) {
-                return true;
-            }
-        } elseif ($value instanceof Traversable) {
-            foreach ($value as $dummy) {
-                return true;
-            }
-        }
-        return 0;
-    }
-
-    /**
-     * [util function] triggers a dwoo error
-     *
-     * @param string $message the error message
-     * @param int $level the error level, one of the PHP's E_* constants
-     */
-    public function triggerError($message, $level=E_USER_NOTICE)
-    {
-        if (!($tplIdentifier = $this->template->getResourceIdentifier())) {
-            $tplIdentifier = $this->template->getResourceName();
-        }
-        trigger_error('Dwoo error (in '.$tplIdentifier.') : '.$message, $level);
-    }
-
-    /*
-     * --------- runtime functions ---------
-     */
+			if (substr($varstr, 0, 1) === '.') {
+				$varstr = 'dwoo'.$varstr;
+			}
 
-    /**
-     * [runtime function] adds a block to the block stack
-     *
-     * @param string $blockName the block name (without Dwoo_Plugin_ prefix)
-     * @param array $args the arguments to be passed to the block's init() function
-     * @return Dwoo_Block_Plugin the newly created block
-     */
-    public function addStack($blockName, array $args=array())
-    {
-        if (isset($this->plugins[$blockName])) {
-            $class = $this->plugins[$blockName]['class'];
-        } else {
-            $class = 'Dwoo_Plugin_'.$blockName;
-        }
-
-        if ($this->curBlock !== null) {
-            $this->curBlock->buffer(ob_get_contents());
-            ob_clean();
-        } else {
-            $this->buffer .= ob_get_contents();
-            ob_clean();
-        }
-
-        $block = new $class($this);
-
-        $cnt = count($args);
-        if ($cnt===0) {
-            $block->init();
-        } elseif ($cnt===1) {
-            $block->init($args[0]);
-        } elseif ($cnt===2) {
-            $block->init($args[0], $args[1]);
-        } elseif ($cnt===3) {
-            $block->init($args[0], $args[1], $args[2]);
-        } elseif ($cnt===4) {
-            $block->init($args[0], $args[1], $args[2], $args[3]);
-        } else {
-            call_user_func_array(array($block,'init'), $args);
-        }
-
-        $this->stack[] = $this->curBlock = $block;
-        return $block;
-    }
-
-    /**
-     * [runtime function] removes the plugin at the top of the block stack
-     *
-     * calls the block buffer() function, followed by a call to end()
-     * and finally a call to process()
-     */
-    public function delStack()
-    {
-        $args = func_get_args();
-
-        $this->curBlock->buffer(ob_get_contents());
-        ob_clean();
-
-        $cnt = count($args);
-        if ($cnt===0) {
-            $this->curBlock->end();
-        } elseif ($cnt===1) {
-            $this->curBlock->end($args[0]);
-        } elseif ($cnt===2) {
-            $this->curBlock->end($args[0], $args[1]);
-        } elseif ($cnt===3) {
-            $this->curBlock->end($args[0], $args[1], $args[2]);
-        } elseif ($cnt===4) {
-            $this->curBlock->end($args[0], $args[1], $args[2], $args[3]);
-        } else {
-            call_user_func_array(array($this->curBlock, 'end'), $args);
-        }
-
-        $tmp = array_pop($this->stack);
-
-        if (count($this->stack) > 0) {
-            $this->curBlock = end($this->stack);
-            $this->curBlock->buffer($tmp->process());
-        } else {
-            if($this->buffer !== '') {
-                echo $this->buffer;
-                $this->buffer = '';
-            }
-            $this->curBlock = null;
-            echo $tmp->process();
-        }
-
-        unset($tmp);
-    }
-
-    /**
-     * [runtime function] returns the parent block of the given block
-     *
-     * @param Dwoo_Block_Plugin $block
-     * @return Dwoo_Block_Plugin or false if the given block isn't in the stack
-     */
-    public function getParentBlock(Dwoo_Block_Plugin $block)
-    {
-        $index = array_search($block, $this->stack, true);
-        if ($index !== false && $index > 0) {
-            return $this->stack[$index-1];
-        }
-        return false;
-    }
-
-    /**
-     * [runtime function] finds the closest block of the given type, starting at the top of the stack
-     *
-     * @param string $type the type of plugin you want to find
-     * @return Dwoo_Block_Plugin or false if no plugin of such type is in the stack
-     */
-    public function findBlock($type)
-    {
-        if (isset($this->plugins[$type])) {
-            $type = $this->plugins[$type]['class'];
-        } else {
-            $type = 'Dwoo_Plugin_'.str_replace('Dwoo_Plugin_', '', $type);
-        }
-
-        $keys = array_keys($this->stack);
-        while (($key = array_pop($keys)) !== false) {
-            if ($this->stack[$key] instanceof $type) {
-                return $this->stack[$key];
-            }
-        }
-        return false;
-    }
-
-    /**
-     * [runtime function] returns a Dwoo_Plugin of the given class
-     *
-     * this is so a single instance of every class plugin is created at each template run,
-     * allowing class plugins to have "per-template-run" static variables
-     *
-     * @private
-     * @param string $class the class name
-     * @return mixed an object of the given class
-     */
-    public function getObjectPlugin($class)
-    {
-        if (isset($this->runtimePlugins[$class])) {
-            return $this->runtimePlugins[$class];
-        }
-        return $this->runtimePlugins[$class] = new $class($this);
-    }
-
-    /**
-     * [runtime function] calls the process() method of the given class-plugin name
-     *
-     * @param string $plugName the class plugin name (without Dwoo_Plugin_ prefix)
-     * @param array $params an array of parameters to send to the process() method
-     * @return string the process() return value
-     */
-    public function classCall($plugName, array $params = array())
-    {
-        $class = 'Dwoo_Plugin_'.$plugName;
-
-        $plugin = $this->getObjectPlugin($class);
-
-        $cnt = count($params);
-        if ($cnt===0) {
-            return $plugin->process();
-        } elseif ($cnt===1) {
-            return $plugin->process($params[0]);
-        } elseif ($cnt===2) {
-            return $plugin->process($params[0], $params[1]);
-        } elseif ($cnt===3) {
-            return $plugin->process($params[0], $params[1], $params[2]);
-        } elseif ($cnt===4) {
-            return $plugin->process($params[0], $params[1], $params[2], $params[3]);
-        } else {
-            return call_user_func_array(array($plugin, 'process'), $params);
-        }
-    }
-
-    /**
-     * [runtime function] calls a php function
-     *
-     * @param string $callback the function to call
-     * @param array $params an array of parameters to send to the function
-     * @return mixed the return value of the called function
-     */
-    public function arrayMap($callback, array $params)
-    {
-        if ($params[0] === $this) {
-            $addThis = true;
-            array_shift($params);
-        }
-        if ((is_array($params[0]) || ($params[0] instanceof Iterator && $params[0] instanceof ArrayAccess))) {
-            if (empty($params[0])) {
-                return $params[0];
-            }
-
-            // array map
-            $out = array();
-            $cnt = count($params);
-
-            if (isset($addThis)) {
-                array_unshift($params, $this);
-                $items = $params[1];
-                $keys = array_keys($items);
-
-                if (is_string($callback) === false) {
-                    while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array(1=>$items[$i]) + $params);
-                    }
-                } elseif ($cnt===1) {
-                    while (($i = array_shift($keys)) !== null) {
-                        $out[] = $callback($this, $items[$i]);
-                    }
-                } elseif ($cnt===2) {
-                    while (($i = array_shift($keys)) !== null) {
-                        $out[] = $callback($this, $items[$i], $params[2]);
-                    }
-                } elseif ($cnt===3) {
-                    while (($i = array_shift($keys)) !== null) {
-                        $out[] = $callback($this, $items[$i], $params[2], $params[3]);
-                    }
-                } else {
-                    while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array(1=>$items[$i]) + $params);
-                    }
-                }
-            } else {
-                $items = $params[0];
-                $keys = array_keys($items);
-
-                if (is_string($callback) === false) {
-                    while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array($items[$i]) + $params);
-                    }
-                } elseif ($cnt===1) {
-                    while (($i = array_shift($keys)) !== null) {
-                        $out[] = $callback($items[$i]);
-                    }
-                } elseif ($cnt===2) {
-                    while (($i = array_shift($keys)) !== null) {
-                        $out[] = $callback($items[$i], $params[1]);
-                    }
-                } elseif ($cnt===3) {
-                    while (($i = array_shift($keys)) !== null) {
-                        $out[] = $callback($items[$i], $params[1], $params[2]);
-                    }
-                } elseif ($cnt===4) {
-                    while (($i = array_shift($keys)) !== null) {
-                        $out[] = $callback($items[$i], $params[1], $params[2], $params[3]);
-                    }
-                } else {
-                    while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array($items[$i]) + $params);
-                    }
-                }
-            }
-            return $out;
-        } else {
-            return $params[0];
-        }
-    }
-
-    /**
-     * [runtime function] reads a variable into the given data array
-     *
-     * @param string $varstr the variable string, using dwoo variable syntax (i.e. "var.subvar[subsubvar]->property")
-     * @param mixed $data the data array or object to read from
-     * @param bool $safeRead if true, the function will check whether the index exists to prevent any notices from being output
-     * @return mixed
-     */
-    public function readVarInto($varstr, $data, $safeRead = false)
-    {
-        if ($data === null) {
-            return null;
-        }
-
-        if (is_array($varstr) === false) {
-            preg_match_all('#(\[|->|\.)?((?:[^.[\]-]|-(?!>))+)\]?#i', $varstr, $m);
-        } else {
-            $m = $varstr;
-        }
-        unset($varstr);
-
-        while (list($k, $sep) = each($m[1])) {
-            if ($sep === '.' || $sep === '[' || $sep === '') {
-                // strip enclosing quotes if present
-                $m[2][$k] = preg_replace('#^(["\']?)(.*?)\1$#', '$2', $m[2][$k]);
-
-                if ((is_array($data) || $data instanceof ArrayAccess) && ($safeRead === false || isset($data[$m[2][$k]]))) {
-                    $data = $data[$m[2][$k]];
-                } else {
-                    return null;
-                }
-            } else {
-                if (is_object($data) && ($safeRead === false || isset($data->$m[2][$k]))) {
-                    $data = $data->$m[2][$k];
-                } else {
-                    return null;
-                }
-            }
-        }
-
-        return $data;
-    }
-
-    /**
-     * [runtime function] reads a variable into the parent scope
-     *
-     * @param int $parentLevels the amount of parent levels to go from the current scope
-     * @param string $varstr the variable string, using dwoo variable syntax (i.e. "var.subvar[subsubvar]->property")
-     * @return mixed
-     */
-    public function readParentVar($parentLevels, $varstr = null)
-    {
-        $tree = $this->scopeTree;
-        $cur = $this->data;
-
-        while ($parentLevels--!==0) {
-            array_pop($tree);
-        }
-
-        while (($i = array_shift($tree)) !== null) {
-            if (is_object($cur)) {
-                $cur = $cur->$i;
-            } else {
-                $cur = $cur[$i];
-            }
-        }
-
-        if ($varstr!==null) {
-            return $this->readVarInto($varstr, $cur);
-        } else {
-            return $cur;
-        }
-    }
-
-    /**
-     * [runtime function] reads a variable into the current scope
-     *
-     * @param string $varstr the variable string, using dwoo variable syntax (i.e. "var.subvar[subsubvar]->property")
-     * @return mixed
-     */
-    public function readVar($varstr)
-    {
-        if (is_array($varstr)===true) {
-            $m = $varstr;
-            unset($varstr);
-        } else {
-            if (strstr($varstr, '.') === false && strstr($varstr, '[') === false && strstr($varstr, '->') === false) {
-                if ($varstr === 'dwoo') {
-                    return $this->globals;
-                } elseif ($varstr === '__' || $varstr === '_root' ) {
-                    return $this->data;
-                    $varstr = substr($varstr, 6);
-                } elseif ($varstr === '_' || $varstr === '_parent') {
-                    $varstr = '.'.$varstr;
-                    $tree = $this->scopeTree;
-                    $cur = $this->data;
-                    array_pop($tree);
-
-                    while (($i = array_shift($tree)) !== null) {
-                        if (is_object($cur)) {
-                            $cur = $cur->$i;
-                        } else {
-                            $cur = $cur[$i];
-                        }
-                    }
-
-                    return $cur;
-                }
-
-                $cur = $this->scope;
-
-                if (isset($cur[$varstr])) {
-                    return $cur[$varstr];
-                } else {
-                    return null;
-                }
-            }
-
-            if (substr($varstr, 0, 1) === '.') {
-                $varstr = 'dwoo'.$varstr;
-            }
-
-            preg_match_all('#(\[|->|\.)?((?:[^.[\]-]|-(?!>))+)\]?#i', $varstr, $m);
-        }
-
-        $i = $m[2][0];
-        if ($i === 'dwoo') {
-            $cur = $this->globals;
-            array_shift($m[2]);
-            array_shift($m[1]);
-            switch ($m[2][0]) {
-
-            case 'get':
-                $cur = $_GET;
-                break;
-            case 'post':
-                $cur = $_POST;
-                break;
-            case 'session':
-                $cur = $_SESSION;
-                break;
-            case 'cookies':
-            case 'cookie':
-                $cur = $_COOKIE;
-                break;
-            case 'server':
-                $cur = $_SERVER;
-                break;
-            case 'env':
-                $cur = $_ENV;
-                break;
-            case 'request':
-                $cur = $_REQUEST;
-                break;
-            case 'const':
-                array_shift($m[2]);
-                if (defined($m[2][0])) {
-                    return constant($m[2][0]);
-                } else {
-                    return null;
-                }
-
-            }
-            if ($cur !== $this->globals) {
-                array_shift($m[2]);
-                array_shift($m[1]);
-            }
-        } elseif ($i === '__' || $i === '_root') {
-            $cur = $this->data;
-            array_shift($m[2]);
-            array_shift($m[1]);
-        } elseif ($i === '_' || $i === '_parent') {
-            $tree = $this->scopeTree;
-            $cur = $this->data;
-
-            while (true) {
-                array_pop($tree);
-                array_shift($m[2]);
-                array_shift($m[1]);
-                if (current($m[2]) === '_' || current($m[2]) === '_parent') {
-                    continue;
-                }
-
-                while (($i = array_shift($tree)) !== null) {
-                    if (is_object($cur)) {
-                        $cur = $cur->$i;
-                    } else {
-                        $cur = $cur[$i];
-                    }
-                }
-                break;
-            }
-        } else {
-            $cur = $this->scope;
-        }
-
-        while (list($k, $sep) = each($m[1])) {
-            if ($sep === '.' || $sep === '[' || $sep === '') {
-                if ((is_array($cur) || $cur instanceof ArrayAccess) && isset($cur[$m[2][$k]])) {
-                    $cur = $cur[$m[2][$k]];
-                } else {
-                    return null;
-                }
-            } elseif ($sep === '->') {
-                if (is_object($cur)) {
-                    $cur = $cur->$m[2][$k];
-                } else {
-                    return null;
-                }
-            } else {
-                return null;
-            }
-        }
-
-        return $cur;
-    }
-
-    /**
-     * [runtime function] assign the value to the given variable
-     *
-     * @param mixed $value the value to assign
-     * @param string $scope the variable string, using dwoo variable syntax (i.e. "var.subvar[subsubvar]->property")
-     * @return bool true if assigned correctly or false if a problem occured while parsing the var string
-     */
-    public function assignInScope($value, $scope)
-    {
-        $tree =& $this->scopeTree;
-        $data =& $this->data;
-
-        if (!is_string($scope)) {
-            return $this->triggerError('Assignments must be done into strings, ('.gettype($scope).') '.var_export($scope, true).' given', E_USER_ERROR);
-        }
-        if (strstr($scope, '.') === false && strstr($scope, '->') === false) {
-            $this->scope[$scope] = $value;
-        } else {
-            // TODO handle _root/_parent scopes ?
-            preg_match_all('#(\[|->|\.)?([^.[\]-]+)\]?#i', $scope, $m);
-
-            $cur =& $this->scope;
-            $last = array(array_pop($m[1]), array_pop($m[2]));
-
-            while (list($k, $sep) = each($m[1])) {
-                if ($sep === '.' || $sep === '[' || $sep === '') {
-                    if (is_array($cur) === false) {
-                        $cur = array();
-                    }
-                    $cur =& $cur[$m[2][$k]];
-                } elseif ($sep === '->') {
-                    if (is_object($cur) === false) {
-                        $cur = new stdClass;
-                    }
-                    $cur =& $cur->$m[2][$k];
-                } else {
-                    return false;
-                }
-            }
-
-            if ($last[0] === '.' || $last[0] === '[' || $last[0] === '') {
-                if (is_array($cur) === false) {
-                    $cur = array();
-                }
-                $cur[$last[1]] = $value;
-            } elseif ($last[0] === '->') {
-                if (is_object($cur) === false) {
-                    $cur = new stdClass;
-                }
-                $cur->$last[1] = $value;
-            } else {
-                return false;
-            }
-        }
-    }
-
-    /**
-     * [runtime function] sets the scope to the given scope string or array
-     *
-     * @param mixed $scope a string i.e. "level1.level2" or an array i.e. array("level1", "level2")
-     * @param bool $absolute if true, the scope is set from the top level scope and not from the current scope
-     * @return array the current scope tree
-     */
-    public function setScope($scope, $absolute = false)
-    {
-        $old = $this->scopeTree;
-
-        if (is_string($scope)===true) {
-            $scope = explode('.', $scope);
-        }
-
-        if ($absolute===true) {
-            $this->scope =& $this->data;
-            $this->scopeTree = array();
-        }
-
-        while (($bit = array_shift($scope)) !== null) {
-            if ($bit === '_' || $bit === '_parent') {
-                array_pop($this->scopeTree);
-                $this->scope =& $this->data;
-                $cnt = count($this->scopeTree);
-                for ($i=0;$i<$cnt;$i++)
-                    $this->scope =& $this->scope[$this->scopeTree[$i]];
-            } elseif ($bit === '__' || $bit === '_root') {
-                $this->scope =& $this->data;
-                $this->scopeTree = array();
-            } elseif (isset($this->scope[$bit])) {
-                if($this->scope instanceof ArrayAccess) {
-                    $tmp = $this->scope[$bit];
-                    $this->scope =& $tmp;
-                } else {
-                    $this->scope =& $this->scope[$bit];
-                }
-                $this->scopeTree[] = $bit;
-            } else {
-                unset($this->scope);
-                $this->scope = null;
-            }
-        }
-
-        return $old;
-    }
-
-    /**
-     * [runtime function] returns the entire data array
-     *
-     * @return array
-     */
-    public function getData()
-    {
-        return $this->data;
-    }
+			preg_match_all('#(\[|->|\.)?((?:[^.[\]-]|-(?!>))+)\]?#i', $varstr, $m);
+		}
+
+		$i = $m[2][0];
+		if ($i === 'dwoo') {
+			$cur = $this->globals;
+			array_shift($m[2]);
+			array_shift($m[1]);
+			switch ($m[2][0]) {
+
+			case 'get':
+				$cur = $_GET;
+				break;
+			case 'post':
+				$cur = $_POST;
+				break;
+			case 'session':
+				$cur = $_SESSION;
+				break;
+			case 'cookies':
+			case 'cookie':
+				$cur = $_COOKIE;
+				break;
+			case 'server':
+				$cur = $_SERVER;
+				break;
+			case 'env':
+				$cur = $_ENV;
+				break;
+			case 'request':
+				$cur = $_REQUEST;
+				break;
+			case 'const':
+				array_shift($m[2]);
+				if (defined($m[2][0])) {
+					return constant($m[2][0]);
+				} else {
+					return null;
+				}
 
-    /**
-     * [runtime function] sets a return value for the currently running template
-     *
-     * @param string $name var name
-     * @param mixed $value var value
-     */
-    public function setReturnValue($name, $value)
-    {
-        $this->returnData[$name] = $value;
-    }
+			}
+			if ($cur !== $this->globals) {
+				array_shift($m[2]);
+				array_shift($m[1]);
+			}
+		} elseif ($i === '__' || $i === '_root') {
+			$cur = $this->data;
+			array_shift($m[2]);
+			array_shift($m[1]);
+		} elseif ($i === '_' || $i === '_parent') {
+			$tree = $this->scopeTree;
+			$cur = $this->data;
+
+			while (true) {
+				array_pop($tree);
+				array_shift($m[2]);
+				array_shift($m[1]);
+				if (current($m[2]) === '_' || current($m[2]) === '_parent') {
+					continue;
+				}
 
-    /**
-     * [runtime function] retrieves the return values set by the template
-     *
-     * @return array
-     */
-    public function getReturnValues()
-    {
-        return $this->returnData;
-    }
+				while (($i = array_shift($tree)) !== null) {
+					if (is_object($cur)) {
+						$cur = $cur->$i;
+					} else {
+						$cur = $cur[$i];
+					}
+				}
+				break;
+			}
+		} else {
+			$cur = $this->scope;
+		}
 
-    /**
-     * [runtime function] returns a reference to the current scope
-     *
-     * @return &mixed
-     */
-    public function &getScope()
-    {
-        return $this->scope;
-    }
+		while (list($k, $sep) = each($m[1])) {
+			if ($sep === '.' || $sep === '[' || $sep === '') {
+				if ((is_array($cur) || $cur instanceof ArrayAccess) && isset($cur[$m[2][$k]])) {
+					$cur = $cur[$m[2][$k]];
+				} else {
+					return null;
+				}
+			} elseif ($sep === '->') {
+				if (is_object($cur)) {
+					$cur = $cur->$m[2][$k];
+				} else {
+					return null;
+				}
+			} else {
+				return null;
+			}
+		}
+
+		return $cur;
+	}
+
+	/**
+	 * [runtime function] assign the value to the given variable
+	 *
+	 * @param mixed $value the value to assign
+	 * @param string $scope the variable string, using dwoo variable syntax (i.e. "var.subvar[subsubvar]->property")
+	 * @return bool true if assigned correctly or false if a problem occured while parsing the var string
+	 */
+	public function assignInScope($value, $scope)
+	{
+		$tree =& $this->scopeTree;
+		$data =& $this->data;
+
+		if (!is_string($scope)) {
+			return $this->triggerError('Assignments must be done into strings, ('.gettype($scope).') '.var_export($scope, true).' given', E_USER_ERROR);
+		}
+		if (strstr($scope, '.') === false && strstr($scope, '->') === false) {
+			$this->scope[$scope] = $value;
+		} else {
+			// TODO handle _root/_parent scopes ?
+			preg_match_all('#(\[|->|\.)?([^.[\]-]+)\]?#i', $scope, $m);
+
+			$cur =& $this->scope;
+			$last = array(array_pop($m[1]), array_pop($m[2]));
+
+			while (list($k, $sep) = each($m[1])) {
+				if ($sep === '.' || $sep === '[' || $sep === '') {
+					if (is_array($cur) === false) {
+						$cur = array();
+					}
+					$cur =& $cur[$m[2][$k]];
+				} elseif ($sep === '->') {
+					if (is_object($cur) === false) {
+						$cur = new stdClass;
+					}
+					$cur =& $cur->$m[2][$k];
+				} else {
+					return false;
+				}
+			}
 
-    /**
-     * Redirects all calls to unexisting to plugin proxy.
-     *
-     * @param string Method name
-     * @param array  List of arguments
-     * @return mixed
-     */
-    public function __call($method, $args) {
-        $proxy = $this->getPluginProxy();
-        if (!$proxy) {
-            throw new Dwoo_Exception('Call to undefined method '.__CLASS__.'::'.$method.'()');
-        }
-        return call_user_func_array($proxy->getCallback($method), $args);
-    }
+			if ($last[0] === '.' || $last[0] === '[' || $last[0] === '') {
+				if (is_array($cur) === false) {
+					$cur = array();
+				}
+				$cur[$last[1]] = $value;
+			} elseif ($last[0] === '->') {
+				if (is_object($cur) === false) {
+					$cur = new stdClass;
+				}
+				$cur->$last[1] = $value;
+			} else {
+				return false;
+			}
+		}
+	}
+
+	/**
+	 * [runtime function] sets the scope to the given scope string or array
+	 *
+	 * @param mixed $scope a string i.e. "level1.level2" or an array i.e. array("level1", "level2")
+	 * @param bool $absolute if true, the scope is set from the top level scope and not from the current scope
+	 * @return array the current scope tree
+	 */
+	public function setScope($scope, $absolute = false)
+	{
+		$old = $this->scopeTree;
+
+		if (is_string($scope)===true) {
+			$scope = explode('.', $scope);
+		}
+
+		if ($absolute===true) {
+			$this->scope =& $this->data;
+			$this->scopeTree = array();
+		}
+
+		while (($bit = array_shift($scope)) !== null) {
+			if ($bit === '_' || $bit === '_parent') {
+				array_pop($this->scopeTree);
+				$this->scope =& $this->data;
+				$cnt = count($this->scopeTree);
+				for ($i=0;$i<$cnt;$i++)
+					$this->scope =& $this->scope[$this->scopeTree[$i]];
+			} elseif ($bit === '__' || $bit === '_root') {
+				$this->scope =& $this->data;
+				$this->scopeTree = array();
+			} elseif (isset($this->scope[$bit])) {
+				if($this->scope instanceof ArrayAccess) {
+					$tmp = $this->scope[$bit];
+					$this->scope =& $tmp;
+				} else {
+					$this->scope =& $this->scope[$bit];
+				}
+				$this->scopeTree[] = $bit;
+			} else {
+				unset($this->scope);
+				$this->scope = null;
+			}
+		}
+
+		return $old;
+	}
+
+	/**
+	 * [runtime function] returns the entire data array
+	 *
+	 * @return array
+	 */
+	public function getData()
+	{
+		return $this->data;
+	}
+
+	/**
+	 * [runtime function] sets a return value for the currently running template
+	 *
+	 * @param string $name var name
+	 * @param mixed $value var value
+	 */
+	public function setReturnValue($name, $value)
+	{
+		$this->returnData[$name] = $value;
+	}
+
+	/**
+	 * [runtime function] retrieves the return values set by the template
+	 *
+	 * @return array
+	 */
+	public function getReturnValues()
+	{
+		return $this->returnData;
+	}
+
+	/**
+	 * [runtime function] returns a reference to the current scope
+	 *
+	 * @return &mixed
+	 */
+	public function &getScope()
+	{
+		return $this->scope;
+	}
+
+	/**
+	 * Redirects all calls to unexisting to plugin proxy.
+	 *
+	 * @param string Method name
+	 * @param array  List of arguments
+	 * @return mixed
+	 */
+	public function __call($method, $args) {
+		$proxy = $this->getPluginProxy();
+		if (!$proxy) {
+			throw new Dwoo_Exception('Call to undefined method '.__CLASS__.'::'.$method.'()');
+		}
+		return call_user_func_array($proxy->getCallback($method), $args);
+	}
 }

Spacing +64 added lines, -68 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (!defined('DWOO_DIRECTORY')) {
-	define('DWOO_DIRECTORY', dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR);
+	define('DWOO_DIRECTORY', dirname(dirname(__FILE__)).DIRECTORY_SEPARATOR);
 }
 /**
  * main dwoo class, allows communication between the compiler, template and data classes
@@ -160,15 +160,12 @@ 
      *
      * @var array
      */
-    protected $resources = array
-    (
-        'file'      =>  array
-        (
+    protected $resources = array(
+        'file'      =>  array(
             'class'     =>  'Dwoo_Template_File',
             'compiler'  =>  null
         ),
-        'string'    =>  array
-        (
+        'string'    =>  array(
             'class'     =>  'Dwoo_Template_String',
             'compiler'  =>  null
         )
@@ -434,8 +431,7 @@ 
      */
     protected function initGlobals()
     {
-        $this->globals = array
-        (
+        $this->globals = array(
             'version'   =>  self::VERSION,
             'ad'        =>  '<a href="http://dwoo.org/">Powered by Dwoo</a>',
             'now'       =>  $_SERVER['REQUEST_TIME'],
@@ -454,7 +450,7 @@ 
     protected function initRuntimeVars(Dwoo_ITemplate $tpl)
     {
         $this->runtimePlugins = array();
-        $this->scope =& $this->data;
+        $this->scope = & $this->data;
         $this->scopeTree = array();
         $this->stack = array();
         $this->curBlock = null;
@@ -484,7 +480,7 @@ 
             } else {
                 $this->plugins[$name] = array('type'=>self::CLASS_PLUGIN | $compilable, 'callback'=>$callback, 'class'=>(is_object($callback[0]) ? get_class($callback[0]) : $callback[0]), 'function'=>$callback[1]);
             }
-        } elseif(is_string($callback)) {
+        } elseif (is_string($callback)) {
 			if (class_exists($callback, false)) {
 				if (is_subclass_of($callback, 'Dwoo_Block_Plugin')) {
 					$this->plugins[$name] = array('type'=>self::BLOCK_PLUGIN | $compilable, 'callback'=>$callback, 'class'=>$callback);
@@ -496,7 +492,7 @@ 
 			} else {
 				throw new Dwoo_Exception('Callback could not be processed correctly, please check that the function/class you used exists');
 			}
-		} elseif(is_callable($callback)) {
+		} elseif (is_callable($callback)) {
 			$this->plugins[$name] = array('type'=>self::FUNC_PLUGIN | $compilable, 'callback'=>$callback);
 		} else {
             throw new Dwoo_Exception('Callback could not be processed correctly, please check that the function/class you used exists');
@@ -563,8 +559,8 @@ 
             unset($this->filters[$index]);
         } elseif (($index = array_search($callback, $this->filters, true)) !== false) {
             unset($this->filters[$index]);
-        } else  {
-            $class = 'Dwoo_Filter_' . $callback;
+        } else {
+            $class = 'Dwoo_Filter_'.$callback;
             foreach ($this->filters as $index=>$filter) {
                 if (is_array($filter) && $filter[0] instanceof $class) {
                     unset($this->filters[$index]);
@@ -607,7 +603,7 @@ 
     public function removeResource($name)
     {
         unset($this->resources[$name]);
-        if ($name==='file') {
+        if ($name === 'file') {
             $this->resources['file'] = array('class'=>'Dwoo_Template_File', 'compiler'=>null);
         }
     }
@@ -856,11 +852,11 @@ 
      * @param int $olderThan minimum time (in seconds) required for a cached template to be cleared
      * @return int the amount of templates cleared
      */
-    public function clearCache($olderThan=-1)
+    public function clearCache($olderThan = -1)
     {
         $cacheDirs = new RecursiveDirectoryIterator($this->getCacheDir());
         $cache = new RecursiveIteratorIterator($cacheDirs);
-        $expired = time() - $olderThan;
+        $expired = time()-$olderThan;
         $count = 0;
         foreach ($cache as $file) {
             if ($cache->isDot() || $cache->isDir() || substr($file, -5) !== '.html') {
@@ -901,7 +897,7 @@ 
      *                              and return true only if it's not empty
      * @return int|bool true if it's an array|arrayaccess (or the item count if $checkIsEmpty is true) or false if it's not an array|arrayaccess (or 0 if $checkIsEmpty is true)
      */
-    public function isArray($value, $checkIsEmpty=false)
+    public function isArray($value, $checkIsEmpty = false)
     {
         if (is_array($value) === true || $value instanceof ArrayAccess) {
             if ($checkIsEmpty === false) {
@@ -920,7 +916,7 @@ 
      *                              and return true only if it's not empty
      * @return int|bool true if it's an array|traversable (or the item count if $checkIsEmpty is true) or false if it's not an array|traversable (or 0 if $checkIsEmpty is true)
      */
-    public function isTraversable($value, $checkIsEmpty=false)
+    public function isTraversable($value, $checkIsEmpty = false)
     {
         if (is_array($value) === true) {
             if ($checkIsEmpty === false) {
@@ -970,7 +966,7 @@ 
      * @param string $message the error message
      * @param int $level the error level, one of the PHP's E_* constants
      */
-    public function triggerError($message, $level=E_USER_NOTICE)
+    public function triggerError($message, $level = E_USER_NOTICE)
     {
         if (!($tplIdentifier = $this->template->getResourceIdentifier())) {
             $tplIdentifier = $this->template->getResourceName();
@@ -989,7 +985,7 @@ 
      * @param array $args the arguments to be passed to the block's init() function
      * @return Dwoo_Block_Plugin the newly created block
      */
-    public function addStack($blockName, array $args=array())
+    public function addStack($blockName, array $args = array())
     {
         if (isset($this->plugins[$blockName])) {
             $class = $this->plugins[$blockName]['class'];
@@ -1008,18 +1004,18 @@ 
         $block = new $class($this);
 
         $cnt = count($args);
-        if ($cnt===0) {
+        if ($cnt === 0) {
             $block->init();
-        } elseif ($cnt===1) {
+        } elseif ($cnt === 1) {
             $block->init($args[0]);
-        } elseif ($cnt===2) {
+        } elseif ($cnt === 2) {
             $block->init($args[0], $args[1]);
-        } elseif ($cnt===3) {
+        } elseif ($cnt === 3) {
             $block->init($args[0], $args[1], $args[2]);
-        } elseif ($cnt===4) {
+        } elseif ($cnt === 4) {
             $block->init($args[0], $args[1], $args[2], $args[3]);
         } else {
-            call_user_func_array(array($block,'init'), $args);
+            call_user_func_array(array($block, 'init'), $args);
         }
 
         $this->stack[] = $this->curBlock = $block;
@@ -1040,15 +1036,15 @@ 
         ob_clean();
 
         $cnt = count($args);
-        if ($cnt===0) {
+        if ($cnt === 0) {
             $this->curBlock->end();
-        } elseif ($cnt===1) {
+        } elseif ($cnt === 1) {
             $this->curBlock->end($args[0]);
-        } elseif ($cnt===2) {
+        } elseif ($cnt === 2) {
             $this->curBlock->end($args[0], $args[1]);
-        } elseif ($cnt===3) {
+        } elseif ($cnt === 3) {
             $this->curBlock->end($args[0], $args[1], $args[2]);
-        } elseif ($cnt===4) {
+        } elseif ($cnt === 4) {
             $this->curBlock->end($args[0], $args[1], $args[2], $args[3]);
         } else {
             call_user_func_array(array($this->curBlock, 'end'), $args);
@@ -1060,7 +1056,7 @@ 
             $this->curBlock = end($this->stack);
             $this->curBlock->buffer($tmp->process());
         } else {
-            if($this->buffer !== '') {
+            if ($this->buffer !== '') {
                 echo $this->buffer;
                 $this->buffer = '';
             }
@@ -1141,15 +1137,15 @@ 
         $plugin = $this->getObjectPlugin($class);
 
         $cnt = count($params);
-        if ($cnt===0) {
+        if ($cnt === 0) {
             return $plugin->process();
-        } elseif ($cnt===1) {
+        } elseif ($cnt === 1) {
             return $plugin->process($params[0]);
-        } elseif ($cnt===2) {
+        } elseif ($cnt === 2) {
             return $plugin->process($params[0], $params[1]);
-        } elseif ($cnt===3) {
+        } elseif ($cnt === 3) {
             return $plugin->process($params[0], $params[1], $params[2]);
-        } elseif ($cnt===4) {
+        } elseif ($cnt === 4) {
             return $plugin->process($params[0], $params[1], $params[2], $params[3]);
         } else {
             return call_user_func_array(array($plugin, 'process'), $params);
@@ -1185,23 +1181,23 @@ 
 
                 if (is_string($callback) === false) {
                     while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array(1=>$items[$i]) + $params);
+                        $out[] = call_user_func_array($callback, array(1=>$items[$i])+$params);
                     }
-                } elseif ($cnt===1) {
+                } elseif ($cnt === 1) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($this, $items[$i]);
                     }
-                } elseif ($cnt===2) {
+                } elseif ($cnt === 2) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($this, $items[$i], $params[2]);
                     }
-                } elseif ($cnt===3) {
+                } elseif ($cnt === 3) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($this, $items[$i], $params[2], $params[3]);
                     }
                 } else {
                     while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array(1=>$items[$i]) + $params);
+                        $out[] = call_user_func_array($callback, array(1=>$items[$i])+$params);
                     }
                 }
             } else {
@@ -1210,27 +1206,27 @@ 
 
                 if (is_string($callback) === false) {
                     while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array($items[$i]) + $params);
+                        $out[] = call_user_func_array($callback, array($items[$i])+$params);
                     }
-                } elseif ($cnt===1) {
+                } elseif ($cnt === 1) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($items[$i]);
                     }
-                } elseif ($cnt===2) {
+                } elseif ($cnt === 2) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($items[$i], $params[1]);
                     }
-                } elseif ($cnt===3) {
+                } elseif ($cnt === 3) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($items[$i], $params[1], $params[2]);
                     }
-                } elseif ($cnt===4) {
+                } elseif ($cnt === 4) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($items[$i], $params[1], $params[2], $params[3]);
                     }
                 } else {
                     while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array($items[$i]) + $params);
+                        $out[] = call_user_func_array($callback, array($items[$i])+$params);
                     }
                 }
             }
@@ -1295,7 +1291,7 @@ 
         $tree = $this->scopeTree;
         $cur = $this->data;
 
-        while ($parentLevels--!==0) {
+        while ($parentLevels-- !== 0) {
             array_pop($tree);
         }
 
@@ -1307,7 +1303,7 @@ 
             }
         }
 
-        if ($varstr!==null) {
+        if ($varstr !== null) {
             return $this->readVarInto($varstr, $cur);
         } else {
             return $cur;
@@ -1322,14 +1318,14 @@ 
      */
     public function readVar($varstr)
     {
-        if (is_array($varstr)===true) {
+        if (is_array($varstr) === true) {
             $m = $varstr;
             unset($varstr);
         } else {
             if (strstr($varstr, '.') === false && strstr($varstr, '[') === false && strstr($varstr, '->') === false) {
                 if ($varstr === 'dwoo') {
                     return $this->globals;
-                } elseif ($varstr === '__' || $varstr === '_root' ) {
+                } elseif ($varstr === '__' || $varstr === '_root') {
                     return $this->data;
                     $varstr = substr($varstr, 6);
                 } elseif ($varstr === '_' || $varstr === '_parent') {
@@ -1466,8 +1462,8 @@ 
      */
     public function assignInScope($value, $scope)
     {
-        $tree =& $this->scopeTree;
-        $data =& $this->data;
+        $tree = & $this->scopeTree;
+        $data = & $this->data;
 
         if (!is_string($scope)) {
             return $this->triggerError('Assignments must be done into strings, ('.gettype($scope).') '.var_export($scope, true).' given', E_USER_ERROR);
@@ -1478,7 +1474,7 @@ 
             // TODO handle _root/_parent scopes ?
             preg_match_all('#(\[|->|\.)?([^.[\]-]+)\]?#i', $scope, $m);
 
-            $cur =& $this->scope;
+            $cur = & $this->scope;
             $last = array(array_pop($m[1]), array_pop($m[2]));
 
             while (list($k, $sep) = each($m[1])) {
@@ -1486,12 +1482,12 @@ 
                     if (is_array($cur) === false) {
                         $cur = array();
                     }
-                    $cur =& $cur[$m[2][$k]];
+                    $cur = & $cur[$m[2][$k]];
                 } elseif ($sep === '->') {
                     if (is_object($cur) === false) {
                         $cur = new stdClass;
                     }
-                    $cur =& $cur->$m[2][$k];
+                    $cur = & $cur->$m[2][$k];
                 } else {
                     return false;
                 }
@@ -1524,31 +1520,31 @@ 
     {
         $old = $this->scopeTree;
 
-        if (is_string($scope)===true) {
+        if (is_string($scope) === true) {
             $scope = explode('.', $scope);
         }
 
-        if ($absolute===true) {
-            $this->scope =& $this->data;
+        if ($absolute === true) {
+            $this->scope = & $this->data;
             $this->scopeTree = array();
         }
 
         while (($bit = array_shift($scope)) !== null) {
             if ($bit === '_' || $bit === '_parent') {
                 array_pop($this->scopeTree);
-                $this->scope =& $this->data;
+                $this->scope = & $this->data;
                 $cnt = count($this->scopeTree);
-                for ($i=0;$i<$cnt;$i++)
-                    $this->scope =& $this->scope[$this->scopeTree[$i]];
+                for ($i = 0; $i < $cnt; $i++)
+                    $this->scope = & $this->scope[$this->scopeTree[$i]];
             } elseif ($bit === '__' || $bit === '_root') {
-                $this->scope =& $this->data;
+                $this->scope = & $this->data;
                 $this->scopeTree = array();
             } elseif (isset($this->scope[$bit])) {
-                if($this->scope instanceof ArrayAccess) {
+                if ($this->scope instanceof ArrayAccess) {
                     $tmp = $this->scope[$bit];
-                    $this->scope =& $tmp;
+                    $this->scope = & $tmp;
                 } else {
-                    $this->scope =& $this->scope[$bit];
+                    $this->scope = & $this->scope[$bit];
                 }
                 $this->scopeTree[] = $bit;
             } else {

Braces +3 added lines, -2 removed lines

@@ -1538,8 +1538,9 @@
                 array_pop($this->scopeTree);
                 $this->scope =& $this->data;
                 $cnt = count($this->scopeTree);
-                for ($i=0;$i<$cnt;$i++)
-                    $this->scope =& $this->scope[$this->scopeTree[$i]];
+                for ($i=0;$i<$cnt;$i++) {
+                                    $this->scope =& $this->scope[$this->scopeTree[$i]];
+                }
             } elseif ($bit === '__' || $bit === '_root') {
                 $this->scope =& $this->data;
                 $this->scopeTree = array();

lib/Dwoo/Data.php

Doc Comments -1 removed lines

@@ -66,7 +66,6 @@
 	 * merges the given array(s) with the current data with array_merge
 	 *
 	 * @param array $data the array to merge
-	 * @param array $data2 $data3 ... other arrays to merge, optional, etc.
 	 */
 	public function mergeData(array $data)
 	{

Spacing +6 added lines, -6 removed lines

@@ -90,7 +90,7 @@ 
 	{
 		if (is_array($name)) {
 			reset($name);
-			while (list($k,$v) = each($name))
+			while (list($k, $v) = each($name))
 				$this->data[$k] = $v;
 		} else {
 			$this->data[$name] = $val;
@@ -117,7 +117,7 @@ 
 	 */
 	public function assignByRef($name, &$val)
 	{
-		$this->data[$name] =& $val;
+		$this->data[$name] = & $val;
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 				}
 
 				if ($merge === true && is_array($val)) {
-					$this->data[$key] = $val + $this->data[$key];
+					$this->data[$key] = $val+$this->data[$key];
 				} else {
 					$this->data[$key][] = $val;
 				}
@@ -151,7 +151,7 @@ 
 			}
 
 			if ($merge === true && is_array($val)) {
-				$this->data[$name] = $val + $this->data[$name];
+				$this->data[$name] = $val+$this->data[$name];
 			} else {
 				$this->data[$name][] = $val;
 			}
@@ -174,10 +174,10 @@ 
 
    		if ($merge === true && is_array($val)) {
    			foreach ($val as $key => &$val) {
-   				$this->data[$name][$key] =& $val;
+   				$this->data[$name][$key] = & $val;
    			}
    		} else {
-   			$this->data[$name][] =& $val;
+   			$this->data[$name][] = & $val;
    		}
    	}
    	

Braces +6 added lines, -4 removed lines

@@ -45,8 +45,9 @@ 
 		if ($name === null) {
 			$this->data = array();
 		} elseif (is_array($name)) {
-			foreach ($name as $index)
-				unset($this->data[$index]);
+			foreach ($name as $index) {
+							unset($this->data[$index]);
+			}
 		} else {
 			unset($this->data[$name]);
 		}
@@ -90,8 +91,9 @@ 
 	{
 		if (is_array($name)) {
 			reset($name);
-			while (list($k,$v) = each($name))
-				$this->data[$k] = $v;
+			while (list($k,$v) = each($name)) {
+							$this->data[$k] = $v;
+			}
 		} else {
 			$this->data[$name] = $val;
 		}

lib/Dwoo/ICompiler.php

Doc Comments +3 added lines, -1 removed lines

@@ -24,7 +24,7 @@ 
 	/**
 	 * compiles the provided string down to php code
 	 *
-	 * @param string $templateStr the template to compile
+	 * @param string $template the template to compile
 	 * @return string a compiled php code string
 	 */
 	public function compile(Dwoo_Core $dwoo, Dwoo_ITemplate $template);
@@ -34,6 +34,7 @@ 
 	 *
 	 * @see Dwoo_Core::addPlugin
 	 * @param array $customPlugins an array of custom plugins
+	 * @return void
 	 */
 	public function setCustomPlugins(array $customPlugins);
 
@@ -44,6 +45,7 @@ 
 	 * set it on the Dwoo object as it will be passed onto the compiler automatically
 	 *
 	 * @param Dwoo_Security_Policy $policy the security policy object
+	 * @return void
 	 */
 	public function setSecurityPolicy(Dwoo_Security_Policy $policy = null);
 }

lib/Dwoo/Loader.php

Doc Comments +3 added lines

@@ -42,6 +42,9 @@
 
 	protected $corePluginDir;
 
+	/**
+	 * @param string $cacheDir
+	 */
 	public function __construct($cacheDir)
 	{
 		$this->corePluginDir = DWOO_DIRECTORY . 'plugins';

Spacing +10 added lines, -10 removed lines

@@ -44,14 +44,14 @@ 
 
 	public function __construct($cacheDir)
 	{
-		$this->corePluginDir = DWOO_DIRECTORY . 'plugins';
-		$this->cacheDir = rtrim($cacheDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+		$this->corePluginDir = DWOO_DIRECTORY.'plugins';
+		$this->cacheDir = rtrim($cacheDir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 
 		// include class paths or rebuild paths if the cache file isn't there
 		$cacheFile = $this->cacheDir.'classpath.cache.d'.Dwoo_Core::RELEASE_TAG.'.php';
 		if (file_exists($cacheFile)) {
 			$classpath = file_get_contents($cacheFile);
-			$this->classPath = unserialize($classpath) + $this->classPath;
+			$this->classPath = unserialize($classpath)+$this->classPath;
 		} else {
 			$this->rebuildClassPathCache($this->corePluginDir, $cacheFile);
 		}
@@ -65,25 +65,25 @@ 
 	 */
 	protected function rebuildClassPathCache($path, $cacheFile)
 	{
-		if ($cacheFile!==false) {
+		if ($cacheFile !== false) {
 			$tmp = $this->classPath;
 			$this->classPath = array();
 		}
 
 		// iterates over all files/folders
-		$list = glob(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . '*');
+		$list = glob(rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.'*');
 		if (is_array($list)) {
 			foreach ($list as $f) {
 				if (is_dir($f)) {
 					$this->rebuildClassPathCache($f, false);
 				} else {
-					$this->classPath[str_replace(array('function.','block.','modifier.','outputfilter.','filter.','prefilter.','postfilter.','pre.','post.','output.','shared.','helper.'), '', basename($f, '.php'))] = $f;
+					$this->classPath[str_replace(array('function.', 'block.', 'modifier.', 'outputfilter.', 'filter.', 'prefilter.', 'postfilter.', 'pre.', 'post.', 'output.', 'shared.', 'helper.'), '', basename($f, '.php'))] = $f;
 				}
 			}
 		}
 
 		// save in file if it's the first call (not recursed)
-		if ($cacheFile!==false) {
+		if ($cacheFile !== false) {
 			if (!file_put_contents($cacheFile, serialize($this->classPath))) {
 				throw new Dwoo_Exception('Could not write into '.$cacheFile.', either because the folder is not there (create it) or because of the chmod configuration (please ensure this directory is writable by php), alternatively you can change the directory used with $dwoo->setCompileDir() or provide a custom loader object with $dwoo->setLoader()');
 			}
@@ -109,7 +109,7 @@ 
 			!(include $this->classPath[$class]))
 		{
 			if ($forceRehash) {
-				$this->rebuildClassPathCache($this->corePluginDir, $this->cacheDir . 'classpath.cache.d'.Dwoo_Core::RELEASE_TAG.'.php');
+				$this->rebuildClassPathCache($this->corePluginDir, $this->cacheDir.'classpath.cache.d'.Dwoo_Core::RELEASE_TAG.'.php');
 				foreach ($this->paths as $path=>$file) {
 					$this->rebuildClassPathCache($path, $file);
 				}
@@ -142,11 +142,11 @@ 
 		if (!$pluginDir) {
 			throw new Dwoo_Exception('Plugin directory does not exist or can not be read : '.$pluginDirectory);
 		}
-		$cacheFile = $this->cacheDir . 'classpath-'.substr(strtr($pluginDir, '/\\:'.PATH_SEPARATOR, '----'), strlen($pluginDir) > 80 ? -80 : 0).'.d'.Dwoo_Core::RELEASE_TAG.'.php';
+		$cacheFile = $this->cacheDir.'classpath-'.substr(strtr($pluginDir, '/\\:'.PATH_SEPARATOR, '----'), strlen($pluginDir) > 80 ? -80 : 0).'.d'.Dwoo_Core::RELEASE_TAG.'.php';
 		$this->paths[$pluginDir] = $cacheFile;
 		if (file_exists($cacheFile)) {
 			$classpath = file_get_contents($cacheFile);
-			$this->classPath = unserialize($classpath) + $this->classPath;
+			$this->classPath = unserialize($classpath)+$this->classPath;
 		} else {
 			$this->rebuildClassPathCache($pluginDir, $cacheFile);
 		}

lib/Dwoo/Processor.php

Doc Comments -1 removed lines

@@ -27,7 +27,6 @@
 	 * constructor, if you override it, call parent::__construct($dwoo); or assign
 	 * the dwoo instance yourself if you need it
 	 *
-	 * @param Dwoo_Core $dwoo the dwoo instance that runs this plugin
 	 */
 	public function __construct(Dwoo_Compiler $compiler)
 	{