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/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)
 	{

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;
 		}

Spacing +6 added lines, -6 removed lines

@@ -92,7 +92,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;
@@ -119,7 +119,7 @@ 
 	 */
 	public function assignByRef($name, &$val)
 	{
-		$this->data[$name] =& $val;
+		$this->data[$name] = & $val;
 	}
 
 	/**
@@ -140,7 +140,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;
 				}
@@ -153,7 +153,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;
 			}
@@ -176,10 +176,10 @@ 
 
    		if ($merge === true && is_array($val)) {
    			foreach ($val as $key => &$value) {
-   				$this->data[$name][$key] =& $value;
+   				$this->data[$name][$key] = & $value;
    			}
    		} else {
-   			$this->data[$name][] =& $val;
+   			$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/Template/String.php

Doc Comments +1 added lines, -1 removed lines

@@ -278,7 +278,7 @@
 	 *
 	 * @param Dwoo_Core $dwoo the dwoo instance that requests it
 	 * @param string $output the template output
-	 * @return mixed full path of the cached file or false upon failure
+	 * @return false|string full path of the cached file or false upon failure
 	 */
 	public function cache(Dwoo_Core $dwoo, $output)
 	{

Spacing +8 added lines, -8 removed lines

@@ -267,7 +267,7 @@ 
 		if (isset(self::$cache['cached'][$this->cacheId]) === true && file_exists($cachedFile)) {
 			// already checked, return cache file
 			return $cachedFile;
-		} elseif ($this->compilationEnforced !== true && file_exists($cachedFile) && ($cacheLength === -1 || filemtime($cachedFile) > ($_SERVER['REQUEST_TIME'] - $cacheLength)) && $this->isValidCompiledFile($this->getCompiledFilename($dwoo))) {
+		} elseif ($this->compilationEnforced !== true && file_exists($cachedFile) && ($cacheLength === -1 || filemtime($cachedFile) > ($_SERVER['REQUEST_TIME']-$cacheLength)) && $this->isValidCompiledFile($this->getCompiledFilename($dwoo))) {
 			// cache is still valid and can be loaded
 			self::$cache['cached'][$this->cacheId] = true;
 			return $cachedFile;
@@ -293,7 +293,7 @@ 
 		// thanks for his help on avoiding concurency issues
 		$temp = tempnam($cacheDir, 'temp');
 		if (!($file = @fopen($temp, 'wb'))) {
-			$temp = $cacheDir . uniqid('temp');
+			$temp = $cacheDir.uniqid('temp');
 			if (!($file = @fopen($temp, 'wb'))) {
 				trigger_error('Error writing temporary file \''.$temp.'\'', E_USER_WARNING);
 				return false;
@@ -329,7 +329,7 @@ 
 	{
 		$cachedFile = $this->getCacheFilename($dwoo);
 
-		return !file_exists($cachedFile) || (filectime($cachedFile) < (time() - $olderThan) && unlink($cachedFile));
+		return !file_exists($cachedFile) || (filectime($cachedFile) < (time()-$olderThan) && unlink($cachedFile));
 	}
 
 	/**
@@ -426,10 +426,10 @@ 
 	protected function getCompiledFilename(Dwoo_Core $dwoo)
 	{
 		// no compile id was provided, set default
-		if ($this->compileId===null) {
+		if ($this->compileId === null) {
 			$this->compileId = $this->name;
 		}
-		return $dwoo->getCompileDir() . $this->compileId.'.d'.Dwoo_Core::RELEASE_TAG.'.php';
+		return $dwoo->getCompileDir().$this->compileId.'.d'.Dwoo_Core::RELEASE_TAG.'.php';
 	}
 
 	/**
@@ -453,9 +453,9 @@ 
 			// force compiled id generation
 			$this->getCompiledFilename($dwoo);
 
-			$this->cacheId = str_replace('../', '__', $this->compileId . strtr($cacheId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
+			$this->cacheId = str_replace('../', '__', $this->compileId.strtr($cacheId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
 		}
-		return $dwoo->getCacheDir() . $this->cacheId.'.html';
+		return $dwoo->getCacheDir().$this->cacheId.'.html';
 	}
 
 	/**
@@ -504,7 +504,7 @@ 
 			$path = strtr(str_replace($baseDir, '', $path), '\\', '/');
 			$folders = explode('/', trim($path, '/'));
 			foreach ($folders as $folder) {
-				$baseDir .= $folder . DIRECTORY_SEPARATOR;
+				$baseDir .= $folder.DIRECTORY_SEPARATOR;
 				if (!chmod($baseDir, $chmod))
 				{
 					throw new Exception("Unable to chmod ".

lib/plugins/builtin/blocks/dynamic.php

Doc Comments +4 added lines

@@ -53,6 +53,10 @@
 		return $output;
 	}
 
+	/**
+	 * @param string $dynamicId
+	 * @param string $compiledFile
+	 */
 	public static function unescape($output, $dynamicId, $compiledFile)
 	{
 		$output = preg_replace_callback('/<dwoo:dynamic_('.$dynamicId.')>(.+?)<\/dwoo:dynamic_'.$dynamicId.'>/s', array('self', 'unescapePhp'), $output, -1, $count);

Spacing +6 added lines, -6 removed lines

@@ -32,23 +32,23 @@
 			return $content;
 		} catch (Dwoo_Compilation_Exception $e) {
 		}
-		$output = Dwoo_Compiler::PHP_OPEN .
+		$output = Dwoo_Compiler::PHP_OPEN.
 			'if($doCache) {'."\n\t".
 				'echo \'<dwoo:dynamic_\'.$dynamicId.\'>'.
-				str_replace('\'', '\\\'', $content) .
+				str_replace('\'', '\\\'', $content).
 				'</dwoo:dynamic_\'.$dynamicId.\'>\';'.
 			"\n} else {\n\t";
-				if(substr($content, 0, strlen(Dwoo_Compiler::PHP_OPEN)) == Dwoo_Compiler::PHP_OPEN) {
+				if (substr($content, 0, strlen(Dwoo_Compiler::PHP_OPEN)) == Dwoo_Compiler::PHP_OPEN) {
 					$output .= substr($content, strlen(Dwoo_Compiler::PHP_OPEN));
 				} else {
-					$output .= Dwoo_Compiler::PHP_CLOSE . $content;
+					$output .= Dwoo_Compiler::PHP_CLOSE.$content;
 				}
-				if(substr($output, -strlen(Dwoo_Compiler::PHP_CLOSE)) == Dwoo_Compiler::PHP_CLOSE) {
+				if (substr($output, -strlen(Dwoo_Compiler::PHP_CLOSE)) == Dwoo_Compiler::PHP_CLOSE) {
 					$output = substr($output, 0, -strlen(Dwoo_Compiler::PHP_CLOSE));
 				} else {
 					$output .= Dwoo_Compiler::PHP_OPEN;
 				}
-			$output .= "\n}". Dwoo_Compiler::PHP_CLOSE;
+			$output .= "\n}".Dwoo_Compiler::PHP_CLOSE;
 
 		return $output;
 	}

lib/Dwoo/Template/File.php

Spacing +4 added lines, -4 removed lines

@@ -107,7 +107,7 @@ 
 	 * @return boolean True cache file existance and it's modification time
 	 */
 	protected function isValidCompiledFile($file) {
-		return parent::isValidCompiledFile($file) && (int)$this->getUid() <= filemtime($file);
+		return parent::isValidCompiledFile($file) && (int) $this->getUid() <= filemtime($file);
 	}
 
 	/**
@@ -145,7 +145,7 @@ 
 			foreach ($this->includePath as $path) {
 				$path = rtrim($path, DIRECTORY_SEPARATOR);
 				if (file_exists($path.DIRECTORY_SEPARATOR.$this->file) === true) {
-					$this->resolvedPath = $path . DIRECTORY_SEPARATOR . $this->file;
+					$this->resolvedPath = $path.DIRECTORY_SEPARATOR.$this->file;
 					return $this->resolvedPath;
 				}
 			}
@@ -250,10 +250,10 @@ 
 	protected function getCompiledFilename(Dwoo_Core $dwoo)
 	{
 		// no compile id was provided, set default
-		if ($this->compileId===null) {
+		if ($this->compileId === null) {
 			$this->compileId = str_replace('../', '__', strtr($this->getResourceIdentifier(), '\\:', '/-'));
 		}
-		return $dwoo->getCompileDir() . $this->compileId.'.d'.Dwoo_Core::RELEASE_TAG.'.php';
+		return $dwoo->getCompileDir().$this->compileId.'.d'.Dwoo_Core::RELEASE_TAG.'.php';
 	}
 
 	/**

lib/Dwoo/Core.php

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();

Doc Comments +1 added lines, -1 removed lines

@@ -1484,7 +1484,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 +1413 added lines, -1413 removed lines

@@ -33,23 +33,23 @@ 
  */
 class Dwoo_Core
 {
-    /**
-     * current version number
-     *
-     * @var string
-     */
-    const VERSION = '1.2.3';
+	/**
+	 * current version number
+	 *
+	 * @var string
+	 */
+	const VERSION = '1.2.3';
 
-    /**
-     * 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;
+	/**
+	 * 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
@@ -57,251 +57,251 @@ 
      *
      * @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';
+	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;
+	/**#@-*/
 
-    /**
-     * 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;
+	/**
+	 * 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';
 
-    /**
-     * directory where the compiled templates are stored
-     *
-     * defaults to DWOO_COMPILEDIR (= dwoo_dir/compiled by default)
-     *
-     * @var string
-     */
-    protected $compileDir;
+	/**
+	 * 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 cached templates are stored
-     *
-     * defaults to DWOO_CACHEDIR (= dwoo_dir/cache by default)
-     *
-     * @var string
-     */
-    protected $cacheDir;
+	/**
+	 * directory where the compiled templates are stored
+	 *
+	 * defaults to DWOO_COMPILEDIR (= dwoo_dir/compiled by default)
+	 *
+	 * @var string
+	 */
+	protected $compileDir;
 
-    /**
-     * 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;
+	/**
+	 * directory where the cached templates are stored
+	 *
+	 * defaults to DWOO_CACHEDIR (= dwoo_dir/cache by default)
+	 *
+	 * @var string
+	 */
+	protected $cacheDir;
 
-    /**
-     * security policy object
-     *
-     * @var Dwoo_Security_Policy
-     */
-    protected $securityPolicy = null;
+	/**
+	 * 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;
 
-    /**
-     * stores the custom plugins callbacks
-     *
-     * @see addPlugin
-     * @see removePlugin
-     * @var array
-     */
-    protected $plugins = array();
+	/**
+	 * security policy object
+	 *
+	 * @var Dwoo_Security_Policy
+	 */
+	protected $securityPolicy = null;
 
-    /**
-     * stores the filter callbacks
-     *
-     * @see addFilter
-     * @see removeFilter
-     * @var array
-     */
-    protected $filters = array();
+	/**
+	 * stores the custom plugins callbacks
+	 *
+	 * @see addPlugin
+	 * @see removePlugin
+	 * @var array
+	 */
+	protected $plugins = 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;
+	/**
+	 * stores the filter callbacks
+	 *
+	 * @see addFilter
+	 * @see removeFilter
+	 * @var array
+	 */
+	protected $filters = array();
 
-    /**
-     * currently rendered template, set to null when not-rendering
-     *
-     * @var Dwoo_ITemplate
-     */
-    protected $template = null;
+	/**
+	 * 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
+		)
+	);
 
-    /**
-     * stores the instances of the class plugins during template runtime
-     *
-     * @var array
-     */
-    protected $runtimePlugins;
+	/**
+	 * the dwoo loader object used to load plugins by this dwoo instance
+	 *
+	 * @var Dwoo_ILoader
+	 */
+	protected $loader = null;
 
-    /**
-     * stores the returned values during template runtime
-     *
-     * @var array
-     */
-    protected $returnData;
+	/**
+	 * currently rendered template, set to null when not-rendering
+	 *
+	 * @var Dwoo_ITemplate
+	 */
+	protected $template = null;
 
-    /**
-     * stores the data during template runtime
-     *
-     * @var array
-     * @private
-     */
-    public $data;
+	/**
+	 * stores the instances of the class plugins during template runtime
+	 *
+	 * @var array
+	 */
+	protected $runtimePlugins;
 
-    /**
-     * 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 returned values during template runtime
+	 *
+	 * @var array
+	 */
+	protected $returnData;
 
-    /**
-     * stores the scope tree during template runtime
-     *
-     * @var array
-     */
-    protected $scopeTree;
+	/**
+	 * stores the data during template runtime
+	 *
+	 * @var array
+	 * @private
+	 */
+	public $data;
 
-    /**
-     * stores the block plugins stack during template runtime
-     *
-     * @var array
-     */
-    protected $stack;
+	/**
+	 * 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 current block plugin at the top of the stack during template runtime
-     *
-     * @var Dwoo_Block_Plugin
-     */
-    protected $curBlock;
+	/**
+	 * stores the scope tree during template runtime
+	 *
+	 * @var array
+	 */
+	protected $scopeTree;
 
-    /**
-     * stores the output buffer during template runtime
-     *
-     * @var string
-     */
-    protected $buffer;
+	/**
+	 * stores the block plugins stack during template runtime
+	 *
+	 * @var array
+	 */
+	protected $stack;
 
-    /**
-     * stores plugin proxy
-     *
-     * @var Dwoo_IPluginProxy
-     */
-    protected $pluginProxy;
+	/**
+	 * stores the current block plugin at the top of the stack during template runtime
+	 *
+	 * @var Dwoo_Block_Plugin
+	 */
+	protected $curBlock;
 
-    /**
-     * 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
+	/**
+	 * 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
 	 * @deprecated 1.2.3. will be deleted in 1.3.0.
-     */
-    public function output($tpl, $data = array(), Dwoo_ICompiler $compiler = null)
-    {
-        return $this->get($tpl, $data, $compiler, 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
@@ -316,156 +316,156 @@ 
 	 *                                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)
 	 */
-    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 {
+	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 {
 			$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')) {
-                    $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;
-            }
-        }
-
-        return '';
-    }
-
-    /**
-     * 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();
-    }
-
-    /*
+			// 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')) {
+					$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;
+			}
+		}
+
+		return '';
+	}
+
+	/**
+	 * 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 ---------
      */
 
@@ -478,16 +478,16 @@ 
 	 * @param bool     $compilable if set to true, the plugin is assumed to be compilable
 	 * @throws Dwoo_Exception
 	 */
-    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)) {
+	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)) {
 				if (is_subclass_of($callback, 'Dwoo_Block_Plugin')) {
 					$this->plugins[$name] = array('type'=>self::BLOCK_PLUGIN | $compilable, 'callback'=>$callback, 'class'=>$callback);
@@ -502,21 +502,21 @@ 
 		} elseif($callback instanceof \Closure) {
 			$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');
-        }
-    }
+			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]);
-        }
-    }
+	/**
+	 * 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
@@ -524,58 +524,58 @@ 
 	 * @param bool  $autoload if true, the first parameter must be a filter name from one of the plugin directories
 	 * @throws Dwoo_Exception
 	 */
-    public function addFilter($callback, $autoload = false)
-    {
-        if ($autoload) {
-            $class = 'Dwoo_Filter_'.$callback;
-
-            if (!class_exists($class) && !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)) {
-                $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;
-                }
-            }
-        }
-    }
+	public function addFilter($callback, $autoload = false)
+	{
+		if ($autoload) {
+			$class = 'Dwoo_Filter_'.$callback;
+
+			if (!class_exists($class) && !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)) {
+				$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
@@ -584,274 +584,274 @@ 
 	 * @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
 	 * @throws Dwoo_Exception
 	 */
-    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');
-        }
+	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');
-        }
+		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');
-        }
+		$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);
-    }
+		$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);
-        }
-    }
-
-    /*
+	/**
+	 * 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;
-    }
+	/**
+	 * 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
 	 * @return Dwoo_ILoader|Dwoo_Loader
 	 */
-    public function getLoader()
-    {
-        if ($this->loader === null) {
-            $this->loader = new Dwoo_Loader($this->getCompileDir());
-        }
+	public function getLoader()
+	{
+		if ($this->loader === null) {
+			$this->loader = new Dwoo_Loader($this->getCompileDir());
+		}
 
-        return $this->loader;
-    }
+		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 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);
-        }
+	/**
+	 * 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;
-    }
+		return $this->cacheDir;
+	}
 
 	/**
 	 * sets the cache directory and automatically appends a DIRECTORY_SEPARATOR
 	 * @param string $dir the cache directory
 	 * @throws Dwoo_Exception
 	 */
-    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');
-        }
-    }
+	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);
-        }
+	/**
+	 * 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;
-    }
+		return $this->compileDir;
+	}
 
 	/**
 	 * sets the compile directory and automatically appends a DIRECTORY_SEPARATOR
 	 * @param string $dir the compile directory
 	 * @throws Dwoo_Exception
 	 */
-    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;
-    }
+	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');
+		}
+	}
 
-    /**
-     * 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 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;
+	}
 
-    /**
-     * 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 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;
+	}
 
-    /**
-     * 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 character set used by the string manipulation plugins
+	 *
+	 * the charset is automatically lowercased
+	 *
+	 * @return string
+	 */
+	public function getCharset()
+	{
+		return $this->charset;
+	}
 
-    /**
-     * returns the current template being rendered, when applicable, or null
-     *
-     * @return Dwoo_ITemplate|null
-     */
-    public function getTemplate()
-    {
-        return $this->template;
-    }
+	/**
+	 * 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);
+	}
 
-    /**
-     * sets the current template being rendered
-     *
-     * @param Dwoo_ITemplate $tpl template object
-     */
-    public function setTemplate(Dwoo_ITemplate $tpl)
-    {
-        $this->template = $tpl;
-    }
+	/**
+	 * returns the current template being rendered, when applicable, or null
+	 *
+	 * @return Dwoo_ITemplate|null
+	 */
+	public function getTemplate()
+	{
+		return $this->template;
+	}
 
-    /**
-     * 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;
-    }
+	/**
+	 * sets the current template being rendered
+	 *
+	 * @param Dwoo_ITemplate $tpl template object
+	 */
+	public function setTemplate(Dwoo_ITemplate $tpl)
+	{
+		$this->template = $tpl;
+	}
 
-    /**
-     * 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 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;
+	}
 
-    /**
-     * 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 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'];
+	}
 
-    /**
-     * 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;
-    }
+	/**
+	 * 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
 	 * @return Dwoo_IPluginProxy
 	 */
-    public function getPluginProxy() {
-        return $this->pluginProxy;
-    }
+	public function getPluginProxy() {
+		return $this->pluginProxy;
+	}
 
-    /*
+	/*
      * --------- util functions ---------
      */
 
-    /**
-     * [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] 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));
+	}
 
 	/**
 	 * Clear templates inside the compiled directory.
@@ -872,28 +872,28 @@ 
 		return $count;
 	}
 
-    /**
-     * [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)
-    {
+	/**
+	 * [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)
+	{
 		$iterator = new \RecursiveIteratorIterator(
 			new \RecursiveDirectoryIterator($this->getCacheDir()),
 			\RecursiveIteratorIterator::SELF_FIRST
 		);
-        $expired = time() - $olderThan;
-        $count = 0;
+		$expired = time() - $olderThan;
+		$count = 0;
 		/** @var \SplFileInfo $file */
-        foreach ($iterator as $file) {
+		foreach ($iterator as $file) {
 			if ($file->isFile() && $file->getCTime() < $expired) {
 				$count += unlink((string) $file) ? 1 : 0;
 			}
-        }
-        return $count;
-    }
+		}
+		return $count;
+	}
 
 	/**
 	 * [util function] fetches a template object of the given resource
@@ -906,722 +906,722 @@ 
 	 * @return Dwoo_ITemplate
 	 * @throws Dwoo_Exception
 	 */
-    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);
-    }
-
-    /*
+	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 ---------
      */
 
-    /**
-     * [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|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|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;
-                } 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)) {
-            $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;
-    }
+	/**
+	 * [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;
+		}
 
-    /**
-     * [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 ($this->curBlock !== null) {
+			$this->curBlock->buffer(ob_get_contents());
+			ob_clean();
+		} else {
+			$this->buffer .= ob_get_contents();
+			ob_clean();
+		}
 
-    /**
-     * [runtime function] retrieves the return values set by the template
-     *
-     * @return array
-     */
-    public function getReturnValues()
-    {
-        return $this->returnData;
-    }
+		$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);
+		}
 
-    /**
-     * [runtime function] returns a reference to the current scope
-     *
-     * @return &mixed
-     */
-    public function &getScope()
-    {
-        return $this->scope;
-    }
+		$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|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|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;
+				} 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)) {
+			$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;
+	}
+
+	/**
+	 * [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.
@@ -1630,11 +1630,11 @@ 
 	 * @return mixed
 	 * @throws Dwoo_Exception
 	 */
-    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);
-    }
+	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 +65 added lines, -69 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
@@ -162,15 +162,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
         )
@@ -437,8 +434,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'],
@@ -457,7 +453,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;
@@ -487,7 +483,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)) {
 				if (is_subclass_of($callback, 'Dwoo_Block_Plugin')) {
 					$this->plugins[$name] = array('type'=>self::BLOCK_PLUGIN | $compilable, 'callback'=>$callback, 'class'=>$callback);
@@ -499,7 +495,7 @@ 
 			} else {
 				throw new Dwoo_Exception('Callback could not be processed correctly, please check that the function/class you used exists');
 			}
-		} elseif($callback instanceof \Closure) {
+		} elseif ($callback instanceof \Closure) {
 			$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');
@@ -566,8 +562,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]);
@@ -610,7 +606,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);
         }
     }
@@ -862,7 +858,7 @@ 
 			new \RecursiveDirectoryIterator($this->getCompileDir()),
 			\RecursiveIteratorIterator::SELF_FIRST
 		);
-		$count    = 0;
+		$count = 0;
 		/** @var \SplFileInfo $file */
 		foreach ($iterator as $file) {
 			if ($file->isFile()) {
@@ -878,13 +874,13 @@ 
      * @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)
     {
 		$iterator = new \RecursiveIteratorIterator(
 			new \RecursiveDirectoryIterator($this->getCacheDir()),
 			\RecursiveIteratorIterator::SELF_FIRST
 		);
-        $expired = time() - $olderThan;
+        $expired = time()-$olderThan;
         $count = 0;
 		/** @var \SplFileInfo $file */
         foreach ($iterator as $file) {
@@ -924,7 +920,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) {
@@ -943,7 +939,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) {
@@ -993,7 +989,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();
@@ -1012,7 +1008,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'];
@@ -1031,18 +1027,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;
@@ -1063,15 +1059,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);
@@ -1083,7 +1079,7 @@ 
             $this->curBlock = end($this->stack);
             $this->curBlock->buffer($tmp->process());
         } else {
-            if($this->buffer !== '') {
+            if ($this->buffer !== '') {
                 echo $this->buffer;
                 $this->buffer = '';
             }
@@ -1164,15 +1160,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);
@@ -1208,23 +1204,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 {
@@ -1233,27 +1229,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);
                     }
                 }
             }
@@ -1318,7 +1314,7 @@ 
         $tree = $this->scopeTree;
         $cur = $this->data;
 
-        while ($parentLevels--!==0) {
+        while ($parentLevels-- !== 0) {
             array_pop($tree);
         }
 
@@ -1330,7 +1326,7 @@ 
             }
         }
 
-        if ($varstr!==null) {
+        if ($varstr !== null) {
             return $this->readVarInto($varstr, $cur);
         } else {
             return $cur;
@@ -1345,14 +1341,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;
                 } elseif ($varstr === '_' || $varstr === '_parent') {
                     $varstr = '.'.$varstr;
@@ -1488,8 +1484,8 @@ 
      */
     public function assignInScope($value, $scope)
     {
-        $tree =& $this->scopeTree;
-        $data =& $this->data;
+        $tree = & $this->scopeTree;
+        $data = & $this->data;
 
         if (!is_string($scope)) {
             $this->triggerError('Assignments must be done into strings, ('.gettype($scope).') '.var_export($scope, true).' given', E_USER_ERROR);
@@ -1500,7 +1496,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])) {
@@ -1508,12 +1504,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;
                 }
@@ -1546,31 +1542,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 {