dwoo-project / dwoo

lib/Dwoo/Smarty/Adapter.php

Indentation +483 added lines, -483 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 
 if (!defined('DIR_SEP')) {
-    define('DIR_SEP', DIRECTORY_SEPARATOR);
+	define('DIR_SEP', DIRECTORY_SEPARATOR);
 }
 
 if (!defined('SMARTY_PHP_PASSTHRU')) {
-    define('SMARTY_PHP_PASSTHRU',   0);
-    define('SMARTY_PHP_QUOTE',      1);
-    define('SMARTY_PHP_REMOVE',     2);
-    define('SMARTY_PHP_ALLOW',      3);
+	define('SMARTY_PHP_PASSTHRU',   0);
+	define('SMARTY_PHP_QUOTE',      1);
+	define('SMARTY_PHP_REMOVE',     2);
+	define('SMARTY_PHP_ALLOW',      3);
 }
 
 /**
@@ -30,499 +30,499 @@ 
  */
 class Dwoo_Smarty__Adapter extends Dwoo_Core
 {
-    // magic get/set/call functions that handle unsupported features
-    public function __set($p, $v)
-    {
-        if ($p === 'scope') {
-            $this->scope = $v;
-
-            return;
-        }
-        if ($p === 'data') {
-            $this->data = $v;
-
-            return;
-        }
-        if (array_key_exists($p, $this->compat['properties']) !== false) {
-            if ($this->show_compat_errors) {
-                $this->triggerError('Property '.$p.' is not available in the Dwoo_Smarty_Adapter, however it might be implemented in the future, check out http://wiki.dwoo.org/index.php/SmartySupport for more details.', E_USER_NOTICE);
-            }
-            $this->compat['properties'][$p] = $v;
-        } else {
-            if ($this->show_compat_errors) {
-                $this->triggerError('Property '.$p.' is not available in the Dwoo_Smarty_Adapter, but it is not listed as such, so you might want to tell me about it at j.boggiano@seld.be', E_USER_NOTICE);
-            }
-        }
-    }
-
-    public function __get($p)
-    {
-        if (array_key_exists($p, $this->compat['properties']) !== false) {
-            if ($this->show_compat_errors) {
-                $this->triggerError('Property '.$p.' is not available in the Dwoo_Smarty_Adapter, however it might be implemented in the future, check out http://wiki.dwoo.org/index.php/SmartySupport for more details.', E_USER_NOTICE);
-            }
-
-            return $this->compat['properties'][$p];
-        } else {
-            if ($this->show_compat_errors) {
-                $this->triggerError('Property '.$p.' is not available in the Dwoo_Smarty_Adapter, but it is not listed as such, so you might want to tell me about it at j.boggiano@seld.be', E_USER_NOTICE);
-            }
-        }
-    }
-
-    public function __call($m, $a)
-    {
-        if (method_exists($this->dataProvider, $m)) {
-            call_user_func_array(array($this->dataProvider, $m), $a);
-        } elseif ($this->show_compat_errors) {
-            if (array_search($m, $this->compat['methods']) !== false) {
-                $this->triggerError('Method '.$m.' is not available in the Dwoo_Smarty_Adapter, however it might be implemented in the future, check out http://wiki.dwoo.org/index.php/SmartySupport for more details.', E_USER_NOTICE);
-            } else {
-                $this->triggerError('Method '.$m.' is not available in the Dwoo_Smarty_Adapter, but it is not listed as such, so you might want to tell me about it at j.boggiano@seld.be', E_USER_NOTICE);
-            }
-        }
-    }
-
-    // list of unsupported properties and methods
-    protected $compat = array(
-        'methods' => array(
-            'register_resource', 'unregister_resource', 'load_filter', 'clear_compiled_tpl',
-            'clear_config', 'get_config_vars', 'config_load',
-        ),
-        'properties' => array(
-            'cache_handler_func' => null,
-            'debugging' => false,
-            'error_reporting' => null,
-            'debugging_ctrl' => 'NONE',
-            'request_vars_order' => 'EGPCS',
-            'request_use_auto_globals' => true,
-            'use_sub_dirs' => false,
-            'autoload_filters' => array(),
-            'default_template_handler_func' => '',
-            'debug_tpl' => '',
-            'cache_modified_check' => false,
-            'default_modifiers' => array(),
-            'default_resource_type' => 'file',
-            'config_overwrite' => true,
-            'config_booleanize' => true,
-            'config_read_hidden' => false,
-            'config_fix_newlines' => true,
-            'config_class' => 'Config_File',
-        ),
-    );
-
-    // security vars
-    public $security = false;
-    public $trusted_dir = array();
-    public $secure_dir = array();
-    public $php_handling = SMARTY_PHP_PASSTHRU;
-    public $security_settings = array(
-        'PHP_HANDLING' => false,
-        'IF_FUNCS' => array(
-            'list', 'empty', 'count', 'sizeof',
-            'in_array', 'is_array',
-        ),
-        'INCLUDE_ANY' => false,
-        'PHP_TAGS' => false,
-        'MODIFIER_FUNCS' => array(),
-        'ALLOW_CONSTANTS' => false,
-    );
-
-    // paths
-    public $template_dir = 'templates';
-    public $compile_dir = 'templates_c';
-    public $config_dir = 'configs';
-    public $cache_dir = 'cache';
-    public $plugins_dir = array();
-
-    // misc options
-    public $left_delimiter = '{';
-    public $right_delimiter = '}';
-    public $compile_check = true;
-    public $force_compile = false;
-    public $caching = 0;
-    public $cache_lifetime = 3600;
-    public $compile_id = null;
-    public $compiler_file = null;
-    public $compiler_class = null;
-
-    // dwoo/smarty compat layer
-    public $show_compat_errors = false;
-    protected $dataProvider;
-    protected $_filters = array('pre' => array(), 'post' => array(), 'output' => array());
-    protected static $tplCache = array();
-    protected $compiler = null;
-
-    public function __construct()
-    {
-        parent::__construct();
-        $this->charset = 'iso-8859-1';
-        $this->dataProvider = new Dwoo_Data();
-        $this->compiler = new Dwoo_Compiler();
-    }
-
-    public function display($filename, $cacheId = null, $compileId = null)
-    {
-        $this->fetch($filename, $cacheId, $compileId, true);
-    }
-
-    public function fetch($filename, $cacheId = null, $compileId = null, $display = false)
-    {
-        $this->setCacheDir($this->cache_dir);
-        $this->setCompileDir($this->compile_dir);
-
-        if ($this->security) {
-            $policy = new Dwoo_Security_Policy();
-            $policy->addPhpFunction(array_merge($this->security_settings['IF_FUNCS'], $this->security_settings['MODIFIER_FUNCS']));
-
-            $phpTags = $this->security_settings['PHP_HANDLING'] ? SMARTY_PHP_ALLOW : $this->php_handling;
-            if ($this->security_settings['PHP_TAGS']) {
-                $phpTags = SMARTY_PHP_ALLOW;
-            }
-            switch ($phpTags) {
-                case SMARTY_PHP_ALLOW:
-                case SMARTY_PHP_PASSTHRU:
-                    $phpTags = Dwoo_Security_Policy::PHP_ALLOW;
-                    break;
-                case SMARTY_PHP_QUOTE:
-                    $phpTags = Dwoo_Security_Policy::PHP_ENCODE;
-                    break;
-                case SMARTY_PHP_REMOVE:
-                default:
-                    $phpTags = Dwoo_Security_Policy::PHP_REMOVE;
-                    break;
-            }
-            $policy->setPhpHandling($phpTags);
-
-            $policy->setConstantHandling($this->security_settings['ALLOW_CONSTANTS']);
-
-            if ($this->security_settings['INCLUDE_ANY']) {
-                $policy->allowDirectory(preg_replace('{^((?:[a-z]:)?[\\\\/]).*}i', '$1', __FILE__));
-            } else {
-                $policy->allowDirectory($this->secure_dir);
-            }
-
-            $this->setSecurityPolicy($policy);
-        }
-
-        if (!empty($this->plugins_dir)) {
-            foreach ($this->plugins_dir as $dir) {
-                $this->getLoader()->addDirectory(rtrim($dir, '\\/'));
-            }
-        }
-
-        $tpl = $this->makeTemplate($filename, $cacheId, $compileId);
-        if ($this->force_compile) {
-            $tpl->forceCompilation();
-        }
-
-        if ($this->caching > 0) {
-            $this->cacheTime = $this->cache_lifetime;
-        } else {
-            $this->cacheTime = 0;
-        }
-
-        if ($this->compiler_class !== null) {
-            if ($this->compiler_file !== null && !class_exists($this->compiler_class)) {
-                include $this->compiler_file;
-            }
-            $this->compiler = new $this->compiler_class();
-        } else {
-            $this->compiler->addPreProcessor('smarty_compat', true);
-            $this->compiler->setLooseOpeningHandling(true);
-        }
-
-        $this->compiler->setDelimiters($this->left_delimiter, $this->right_delimiter);
-
-        return $this->get($tpl, $this->dataProvider, $this->compiler, $display === true);
-    }
-
-    public function get($_tpl, $data = array(), $_compiler = null, $_output = false)
-    {
-        if ($_compiler === null) {
-            $_compiler = $this->compiler;
-        }
-
-        return parent::get($_tpl, $data, $_compiler, $_output);
-    }
-
-    public function register_function($name, $callback, $cacheable = true, $cache_attrs = null)
-    {
-        if (isset($this->plugins[$name]) && $this->plugins[$name][0] !== self::SMARTY_FUNCTION) {
-            throw new Dwoo_Exception('Multiple plugins of different types can not share the same name');
-        }
-        $this->plugins[$name] = array('type' => self::SMARTY_FUNCTION, 'callback' => $callback);
-    }
-
-    public function unregister_function($name)
-    {
-        unset($this->plugins[$name]);
-    }
-
-    public function register_block($name, $callback, $cacheable = true, $cache_attrs = null)
-    {
-        if (isset($this->plugins[$name]) && $this->plugins[$name][0] !== self::SMARTY_BLOCK) {
-            throw new Dwoo_Exception('Multiple plugins of different types can not share the same name');
-        }
-        $this->plugins[$name] = array('type' => self::SMARTY_BLOCK, 'callback' => $callback);
-    }
-
-    public function unregister_block($name)
-    {
-        unset($this->plugins[$name]);
-    }
-
-    public function register_modifier($name, $callback)
-    {
-        if (isset($this->plugins[$name]) && $this->plugins[$name][0] !== self::SMARTY_MODIFIER) {
-            throw new Dwoo_Exception('Multiple plugins of different types can not share the same name');
-        }
-        $this->plugins[$name] = array('type' => self::SMARTY_MODIFIER, 'callback' => $callback);
-    }
-
-    public function unregister_modifier($name)
-    {
-        unset($this->plugins[$name]);
-    }
-
-    public function register_prefilter($callback)
-    {
-        $processor = new Dwoo_SmartyProcessorAdapter($this->compiler);
-        $processor->registerCallback($callback);
-        $this->_filters['pre'][] = $processor;
-        $this->compiler->addPreProcessor($processor);
-    }
-
-    public function unregister_prefilter($callback)
-    {
-        foreach ($this->_filters['pre'] as $index => $processor) {
-            if ($processor->callback === $callback) {
-                $this->compiler->removePostProcessor($processor);
-                unset($this->_filters['pre'][$index]);
-            }
-        }
-    }
-
-    public function register_postfilter($callback)
-    {
-        $processor = new Dwoo_SmartyProcessorAdapter($this->compiler);
-        $processor->registerCallback($callback);
-        $this->_filters['post'][] = $processor;
-        $this->compiler->addPostProcessor($processor);
-    }
-
-    public function unregister_postfilter($callback)
-    {
-        foreach ($this->_filters['post'] as $index => $processor) {
-            if ($processor->callback === $callback) {
-                $this->compiler->removePostProcessor($processor);
-                unset($this->_filters['post'][$index]);
-            }
-        }
-    }
-
-    public function register_outputfilter($callback)
-    {
-        $filter = new Dwoo_SmartyFilterAdapter($this);
-        $filter->registerCallback($callback);
-        $this->_filters['output'][] = $filter;
-        $this->addFilter($filter);
-    }
-
-    public function unregister_outputfilter($callback)
-    {
-        foreach ($this->_filters['output'] as $index => $filter) {
-            if ($filter->callback === $callback) {
-                $this->removeOutputFilter($filter);
-                unset($this->_filters['output'][$index]);
-            }
-        }
-    }
-
-    public function register_object($object, $object_impl, $allowed = array(), $smarty_args = false, $block_methods = array())
-    {
-        settype($allowed, 'array');
-        settype($block_methods, 'array');
-        settype($smarty_args, 'boolean');
-
-        if (!empty($allowed) && $this->show_compat_errors) {
-            $this->triggerError('You can register objects but can not restrict the method/properties used, this is PHP5, you have proper OOP access restrictions so use them.', E_USER_NOTICE);
-        }
-
-        if ($smarty_args) {
-            $this->triggerError('You can register objects but methods will be called using method($arg1, $arg2, $arg3), not as an argument array like smarty did.', E_USER_NOTICE);
-        }
-
-        if (!empty($block_methods)) {
-            $this->triggerError('You can register objects but can not use methods as being block methods, you have to build a plugin for that.', E_USER_NOTICE);
-        }
-
-        $this->dataProvider->assign($object, $object_impl);
-    }
-
-    public function unregister_object($object)
-    {
-        $this->dataProvider->clear($object);
-    }
-
-    public function get_registered_object($name)
-    {
-        $data = $this->dataProvider->getData();
-        if (isset($data[$name]) && is_object($data[$name])) {
-            return $data[$name];
-        } else {
-            trigger_error('Dwoo_Compiler: object "'.$name.'" was not registered or is not an object', E_USER_ERROR);
-        }
-    }
-
-    public function template_exists($filename)
-    {
-        if (!is_array($this->template_dir)) {
-            return file_exists($this->template_dir.DIRECTORY_SEPARATOR.$filename);
-        } else {
-            foreach ($this->template_dir as $tpl_dir) {
-                if (file_exists($tpl_dir.DIRECTORY_SEPARATOR.$filename)) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-    }
-
-    public function is_cached($tpl, $cacheId = null, $compileId = null)
-    {
-        return $this->isCached($this->makeTemplate($tpl, $cacheId, $compileId));
-    }
-
-    public function append_by_ref($var, &$value, $merge = false)
-    {
-        $this->dataProvider->appendByRef($var, $value, $merge);
-    }
-
-    public function assign_by_ref($name, &$val)
-    {
-        $this->dataProvider->assignByRef($name, $val);
-    }
-
-    public function clear_assign($var)
-    {
-        $this->dataProvider->clear($var);
-    }
-
-    public function clear_all_assign()
-    {
-        $this->dataProvider->clear();
-    }
-
-    public function get_template_vars($name = null)
-    {
-        if ($this->show_compat_errors) {
-            trigger_error('get_template_vars does not return values by reference, if you try to modify the data that way you should modify your code.', E_USER_NOTICE);
-        }
-
-        $data = $this->dataProvider->getData();
-        if ($name === null) {
-            return $data;
-        } elseif (isset($data[$name])) {
-            return $data[$name];
-        }
-
-        return null;
-    }
-
-    public function clear_all_cache($olderThan = 0)
-    {
-        $this->clearCache($olderThan);
-    }
-
-    public function clear_cache($template, $cacheId = null, $compileId = null, $olderThan = 0)
-    {
-        $this->makeTemplate($template, $cacheId, $compileId)->clearCache($olderThan);
-    }
-
-    public function trigger_error($error_msg, $error_type = E_USER_WARNING)
-    {
-        $this->triggerError($error_msg, $error_type);
-    }
-
-    protected function initGlobals()
-    {
-        parent::initGlobals();
-        $this->globals['ldelim'] = '{';
-        $this->globals['rdelim'] = '}';
-    }
-
-    protected function makeTemplate($file, $cacheId, $compileId)
-    {
-        if ($compileId === null) {
-            $compileId = $this->compile_id;
-        }
-
-        $hash = bin2hex(md5($file.$cacheId.$compileId, true));
-        if (!isset(self::$tplCache[$hash])) {
-            // abs path
-            if (substr($file, 0, 1) === '/' || substr($file, 1, 1) === ':') {
-                self::$tplCache[$hash] = new Dwoo_Template_File($file, null, $cacheId, $compileId);
-            } elseif (is_string($this->template_dir) || is_array($this->template_dir)) {
-                self::$tplCache[$hash] = new Dwoo_Template_File($file, null, $cacheId, $compileId, $this->template_dir);
-            } else {
-                throw new Exception('Unable to load "'.$file.'", check the template_dir');
-            }
-        }
-
-        return self::$tplCache[$hash];
-    }
-
-    public function triggerError($message, $level = E_USER_NOTICE)
-    {
-        if (is_object($this->template)) {
-            return parent::triggerError($message, $level);
-        }
-        trigger_error('Dwoo error : '.$message, $level);
-    }
+	// magic get/set/call functions that handle unsupported features
+	public function __set($p, $v)
+	{
+		if ($p === 'scope') {
+			$this->scope = $v;
+
+			return;
+		}
+		if ($p === 'data') {
+			$this->data = $v;
+
+			return;
+		}
+		if (array_key_exists($p, $this->compat['properties']) !== false) {
+			if ($this->show_compat_errors) {
+				$this->triggerError('Property '.$p.' is not available in the Dwoo_Smarty_Adapter, however it might be implemented in the future, check out http://wiki.dwoo.org/index.php/SmartySupport for more details.', E_USER_NOTICE);
+			}
+			$this->compat['properties'][$p] = $v;
+		} else {
+			if ($this->show_compat_errors) {
+				$this->triggerError('Property '.$p.' is not available in the Dwoo_Smarty_Adapter, but it is not listed as such, so you might want to tell me about it at j.boggiano@seld.be', E_USER_NOTICE);
+			}
+		}
+	}
+
+	public function __get($p)
+	{
+		if (array_key_exists($p, $this->compat['properties']) !== false) {
+			if ($this->show_compat_errors) {
+				$this->triggerError('Property '.$p.' is not available in the Dwoo_Smarty_Adapter, however it might be implemented in the future, check out http://wiki.dwoo.org/index.php/SmartySupport for more details.', E_USER_NOTICE);
+			}
+
+			return $this->compat['properties'][$p];
+		} else {
+			if ($this->show_compat_errors) {
+				$this->triggerError('Property '.$p.' is not available in the Dwoo_Smarty_Adapter, but it is not listed as such, so you might want to tell me about it at j.boggiano@seld.be', E_USER_NOTICE);
+			}
+		}
+	}
+
+	public function __call($m, $a)
+	{
+		if (method_exists($this->dataProvider, $m)) {
+			call_user_func_array(array($this->dataProvider, $m), $a);
+		} elseif ($this->show_compat_errors) {
+			if (array_search($m, $this->compat['methods']) !== false) {
+				$this->triggerError('Method '.$m.' is not available in the Dwoo_Smarty_Adapter, however it might be implemented in the future, check out http://wiki.dwoo.org/index.php/SmartySupport for more details.', E_USER_NOTICE);
+			} else {
+				$this->triggerError('Method '.$m.' is not available in the Dwoo_Smarty_Adapter, but it is not listed as such, so you might want to tell me about it at j.boggiano@seld.be', E_USER_NOTICE);
+			}
+		}
+	}
+
+	// list of unsupported properties and methods
+	protected $compat = array(
+		'methods' => array(
+			'register_resource', 'unregister_resource', 'load_filter', 'clear_compiled_tpl',
+			'clear_config', 'get_config_vars', 'config_load',
+		),
+		'properties' => array(
+			'cache_handler_func' => null,
+			'debugging' => false,
+			'error_reporting' => null,
+			'debugging_ctrl' => 'NONE',
+			'request_vars_order' => 'EGPCS',
+			'request_use_auto_globals' => true,
+			'use_sub_dirs' => false,
+			'autoload_filters' => array(),
+			'default_template_handler_func' => '',
+			'debug_tpl' => '',
+			'cache_modified_check' => false,
+			'default_modifiers' => array(),
+			'default_resource_type' => 'file',
+			'config_overwrite' => true,
+			'config_booleanize' => true,
+			'config_read_hidden' => false,
+			'config_fix_newlines' => true,
+			'config_class' => 'Config_File',
+		),
+	);
+
+	// security vars
+	public $security = false;
+	public $trusted_dir = array();
+	public $secure_dir = array();
+	public $php_handling = SMARTY_PHP_PASSTHRU;
+	public $security_settings = array(
+		'PHP_HANDLING' => false,
+		'IF_FUNCS' => array(
+			'list', 'empty', 'count', 'sizeof',
+			'in_array', 'is_array',
+		),
+		'INCLUDE_ANY' => false,
+		'PHP_TAGS' => false,
+		'MODIFIER_FUNCS' => array(),
+		'ALLOW_CONSTANTS' => false,
+	);
+
+	// paths
+	public $template_dir = 'templates';
+	public $compile_dir = 'templates_c';
+	public $config_dir = 'configs';
+	public $cache_dir = 'cache';
+	public $plugins_dir = array();
+
+	// misc options
+	public $left_delimiter = '{';
+	public $right_delimiter = '}';
+	public $compile_check = true;
+	public $force_compile = false;
+	public $caching = 0;
+	public $cache_lifetime = 3600;
+	public $compile_id = null;
+	public $compiler_file = null;
+	public $compiler_class = null;
+
+	// dwoo/smarty compat layer
+	public $show_compat_errors = false;
+	protected $dataProvider;
+	protected $_filters = array('pre' => array(), 'post' => array(), 'output' => array());
+	protected static $tplCache = array();
+	protected $compiler = null;
+
+	public function __construct()
+	{
+		parent::__construct();
+		$this->charset = 'iso-8859-1';
+		$this->dataProvider = new Dwoo_Data();
+		$this->compiler = new Dwoo_Compiler();
+	}
+
+	public function display($filename, $cacheId = null, $compileId = null)
+	{
+		$this->fetch($filename, $cacheId, $compileId, true);
+	}
+
+	public function fetch($filename, $cacheId = null, $compileId = null, $display = false)
+	{
+		$this->setCacheDir($this->cache_dir);
+		$this->setCompileDir($this->compile_dir);
+
+		if ($this->security) {
+			$policy = new Dwoo_Security_Policy();
+			$policy->addPhpFunction(array_merge($this->security_settings['IF_FUNCS'], $this->security_settings['MODIFIER_FUNCS']));
+
+			$phpTags = $this->security_settings['PHP_HANDLING'] ? SMARTY_PHP_ALLOW : $this->php_handling;
+			if ($this->security_settings['PHP_TAGS']) {
+				$phpTags = SMARTY_PHP_ALLOW;
+			}
+			switch ($phpTags) {
+				case SMARTY_PHP_ALLOW:
+				case SMARTY_PHP_PASSTHRU:
+					$phpTags = Dwoo_Security_Policy::PHP_ALLOW;
+					break;
+				case SMARTY_PHP_QUOTE:
+					$phpTags = Dwoo_Security_Policy::PHP_ENCODE;
+					break;
+				case SMARTY_PHP_REMOVE:
+				default:
+					$phpTags = Dwoo_Security_Policy::PHP_REMOVE;
+					break;
+			}
+			$policy->setPhpHandling($phpTags);
+
+			$policy->setConstantHandling($this->security_settings['ALLOW_CONSTANTS']);
+
+			if ($this->security_settings['INCLUDE_ANY']) {
+				$policy->allowDirectory(preg_replace('{^((?:[a-z]:)?[\\\\/]).*}i', '$1', __FILE__));
+			} else {
+				$policy->allowDirectory($this->secure_dir);
+			}
+
+			$this->setSecurityPolicy($policy);
+		}
+
+		if (!empty($this->plugins_dir)) {
+			foreach ($this->plugins_dir as $dir) {
+				$this->getLoader()->addDirectory(rtrim($dir, '\\/'));
+			}
+		}
+
+		$tpl = $this->makeTemplate($filename, $cacheId, $compileId);
+		if ($this->force_compile) {
+			$tpl->forceCompilation();
+		}
+
+		if ($this->caching > 0) {
+			$this->cacheTime = $this->cache_lifetime;
+		} else {
+			$this->cacheTime = 0;
+		}
+
+		if ($this->compiler_class !== null) {
+			if ($this->compiler_file !== null && !class_exists($this->compiler_class)) {
+				include $this->compiler_file;
+			}
+			$this->compiler = new $this->compiler_class();
+		} else {
+			$this->compiler->addPreProcessor('smarty_compat', true);
+			$this->compiler->setLooseOpeningHandling(true);
+		}
+
+		$this->compiler->setDelimiters($this->left_delimiter, $this->right_delimiter);
+
+		return $this->get($tpl, $this->dataProvider, $this->compiler, $display === true);
+	}
+
+	public function get($_tpl, $data = array(), $_compiler = null, $_output = false)
+	{
+		if ($_compiler === null) {
+			$_compiler = $this->compiler;
+		}
+
+		return parent::get($_tpl, $data, $_compiler, $_output);
+	}
+
+	public function register_function($name, $callback, $cacheable = true, $cache_attrs = null)
+	{
+		if (isset($this->plugins[$name]) && $this->plugins[$name][0] !== self::SMARTY_FUNCTION) {
+			throw new Dwoo_Exception('Multiple plugins of different types can not share the same name');
+		}
+		$this->plugins[$name] = array('type' => self::SMARTY_FUNCTION, 'callback' => $callback);
+	}
+
+	public function unregister_function($name)
+	{
+		unset($this->plugins[$name]);
+	}
+
+	public function register_block($name, $callback, $cacheable = true, $cache_attrs = null)
+	{
+		if (isset($this->plugins[$name]) && $this->plugins[$name][0] !== self::SMARTY_BLOCK) {
+			throw new Dwoo_Exception('Multiple plugins of different types can not share the same name');
+		}
+		$this->plugins[$name] = array('type' => self::SMARTY_BLOCK, 'callback' => $callback);
+	}
+
+	public function unregister_block($name)
+	{
+		unset($this->plugins[$name]);
+	}
+
+	public function register_modifier($name, $callback)
+	{
+		if (isset($this->plugins[$name]) && $this->plugins[$name][0] !== self::SMARTY_MODIFIER) {
+			throw new Dwoo_Exception('Multiple plugins of different types can not share the same name');
+		}
+		$this->plugins[$name] = array('type' => self::SMARTY_MODIFIER, 'callback' => $callback);
+	}
+
+	public function unregister_modifier($name)
+	{
+		unset($this->plugins[$name]);
+	}
+
+	public function register_prefilter($callback)
+	{
+		$processor = new Dwoo_SmartyProcessorAdapter($this->compiler);
+		$processor->registerCallback($callback);
+		$this->_filters['pre'][] = $processor;
+		$this->compiler->addPreProcessor($processor);
+	}
+
+	public function unregister_prefilter($callback)
+	{
+		foreach ($this->_filters['pre'] as $index => $processor) {
+			if ($processor->callback === $callback) {
+				$this->compiler->removePostProcessor($processor);
+				unset($this->_filters['pre'][$index]);
+			}
+		}
+	}
+
+	public function register_postfilter($callback)
+	{
+		$processor = new Dwoo_SmartyProcessorAdapter($this->compiler);
+		$processor->registerCallback($callback);
+		$this->_filters['post'][] = $processor;
+		$this->compiler->addPostProcessor($processor);
+	}
+
+	public function unregister_postfilter($callback)
+	{
+		foreach ($this->_filters['post'] as $index => $processor) {
+			if ($processor->callback === $callback) {
+				$this->compiler->removePostProcessor($processor);
+				unset($this->_filters['post'][$index]);
+			}
+		}
+	}
+
+	public function register_outputfilter($callback)
+	{
+		$filter = new Dwoo_SmartyFilterAdapter($this);
+		$filter->registerCallback($callback);
+		$this->_filters['output'][] = $filter;
+		$this->addFilter($filter);
+	}
+
+	public function unregister_outputfilter($callback)
+	{
+		foreach ($this->_filters['output'] as $index => $filter) {
+			if ($filter->callback === $callback) {
+				$this->removeOutputFilter($filter);
+				unset($this->_filters['output'][$index]);
+			}
+		}
+	}
+
+	public function register_object($object, $object_impl, $allowed = array(), $smarty_args = false, $block_methods = array())
+	{
+		settype($allowed, 'array');
+		settype($block_methods, 'array');
+		settype($smarty_args, 'boolean');
+
+		if (!empty($allowed) && $this->show_compat_errors) {
+			$this->triggerError('You can register objects but can not restrict the method/properties used, this is PHP5, you have proper OOP access restrictions so use them.', E_USER_NOTICE);
+		}
+
+		if ($smarty_args) {
+			$this->triggerError('You can register objects but methods will be called using method($arg1, $arg2, $arg3), not as an argument array like smarty did.', E_USER_NOTICE);
+		}
+
+		if (!empty($block_methods)) {
+			$this->triggerError('You can register objects but can not use methods as being block methods, you have to build a plugin for that.', E_USER_NOTICE);
+		}
+
+		$this->dataProvider->assign($object, $object_impl);
+	}
+
+	public function unregister_object($object)
+	{
+		$this->dataProvider->clear($object);
+	}
+
+	public function get_registered_object($name)
+	{
+		$data = $this->dataProvider->getData();
+		if (isset($data[$name]) && is_object($data[$name])) {
+			return $data[$name];
+		} else {
+			trigger_error('Dwoo_Compiler: object "'.$name.'" was not registered or is not an object', E_USER_ERROR);
+		}
+	}
+
+	public function template_exists($filename)
+	{
+		if (!is_array($this->template_dir)) {
+			return file_exists($this->template_dir.DIRECTORY_SEPARATOR.$filename);
+		} else {
+			foreach ($this->template_dir as $tpl_dir) {
+				if (file_exists($tpl_dir.DIRECTORY_SEPARATOR.$filename)) {
+					return true;
+				}
+			}
+
+			return false;
+		}
+	}
+
+	public function is_cached($tpl, $cacheId = null, $compileId = null)
+	{
+		return $this->isCached($this->makeTemplate($tpl, $cacheId, $compileId));
+	}
+
+	public function append_by_ref($var, &$value, $merge = false)
+	{
+		$this->dataProvider->appendByRef($var, $value, $merge);
+	}
+
+	public function assign_by_ref($name, &$val)
+	{
+		$this->dataProvider->assignByRef($name, $val);
+	}
+
+	public function clear_assign($var)
+	{
+		$this->dataProvider->clear($var);
+	}
+
+	public function clear_all_assign()
+	{
+		$this->dataProvider->clear();
+	}
+
+	public function get_template_vars($name = null)
+	{
+		if ($this->show_compat_errors) {
+			trigger_error('get_template_vars does not return values by reference, if you try to modify the data that way you should modify your code.', E_USER_NOTICE);
+		}
+
+		$data = $this->dataProvider->getData();
+		if ($name === null) {
+			return $data;
+		} elseif (isset($data[$name])) {
+			return $data[$name];
+		}
+
+		return null;
+	}
+
+	public function clear_all_cache($olderThan = 0)
+	{
+		$this->clearCache($olderThan);
+	}
+
+	public function clear_cache($template, $cacheId = null, $compileId = null, $olderThan = 0)
+	{
+		$this->makeTemplate($template, $cacheId, $compileId)->clearCache($olderThan);
+	}
+
+	public function trigger_error($error_msg, $error_type = E_USER_WARNING)
+	{
+		$this->triggerError($error_msg, $error_type);
+	}
+
+	protected function initGlobals()
+	{
+		parent::initGlobals();
+		$this->globals['ldelim'] = '{';
+		$this->globals['rdelim'] = '}';
+	}
+
+	protected function makeTemplate($file, $cacheId, $compileId)
+	{
+		if ($compileId === null) {
+			$compileId = $this->compile_id;
+		}
+
+		$hash = bin2hex(md5($file.$cacheId.$compileId, true));
+		if (!isset(self::$tplCache[$hash])) {
+			// abs path
+			if (substr($file, 0, 1) === '/' || substr($file, 1, 1) === ':') {
+				self::$tplCache[$hash] = new Dwoo_Template_File($file, null, $cacheId, $compileId);
+			} elseif (is_string($this->template_dir) || is_array($this->template_dir)) {
+				self::$tplCache[$hash] = new Dwoo_Template_File($file, null, $cacheId, $compileId, $this->template_dir);
+			} else {
+				throw new Exception('Unable to load "'.$file.'", check the template_dir');
+			}
+		}
+
+		return self::$tplCache[$hash];
+	}
+
+	public function triggerError($message, $level = E_USER_NOTICE)
+	{
+		if (is_object($this->template)) {
+			return parent::triggerError($message, $level);
+		}
+		trigger_error('Dwoo error : '.$message, $level);
+	}
 }
 
 class Dwoo_Smarty_Filter_Adapter extends Dwoo_Filter
 {
-    public $callback;
+	public $callback;
 
-    public function process($input)
-    {
-        return call_user_func($this->callback, $input);
-    }
+	public function process($input)
+	{
+		return call_user_func($this->callback, $input);
+	}
 
-    public function registerCallback($callback)
-    {
-        $this->callback = $callback;
-    }
+	public function registerCallback($callback)
+	{
+		$this->callback = $callback;
+	}
 }
 
 class Dwoo_Smarty_Processor_Adapter extends Dwoo_Processor
 {
-    public $callback;
+	public $callback;
 
-    public function process($input)
-    {
-        return call_user_func($this->callback, $input);
-    }
+	public function process($input)
+	{
+		return call_user_func($this->callback, $input);
+	}
 
-    public function registerCallback($callback)
-    {
-        $this->callback = $callback;
-    }
+	public function registerCallback($callback)
+	{
+		$this->callback = $callback;
+	}
 }
 
 // cloaks the adapter if possible with the smarty name to fool type-hinted plugins
 if (class_exists('Smarty') === false) {
-    interface Smarty
-    {
-    }
-    class Dwoo_Smarty_Adapter extends Dwoo_Smarty__Adapter implements Smarty
-    {
-    }
+	interface Smarty
+	{
+	}
+	class Dwoo_Smarty_Adapter extends Dwoo_Smarty__Adapter implements Smarty
+	{
+	}
 } else {
-    class Dwoo_Smarty_Adapter extends Dwoo_Smarty__Adapter
-    {
-    }
+	class Dwoo_Smarty_Adapter extends Dwoo_Smarty__Adapter
+	{
+	}
 }

Switch Indentation +11 added lines, -11 removed lines

@@ -180,17 +180,17 @@
                 $phpTags = SMARTY_PHP_ALLOW;
             }
             switch ($phpTags) {
-                case SMARTY_PHP_ALLOW:
-                case SMARTY_PHP_PASSTHRU:
-                    $phpTags = Dwoo_Security_Policy::PHP_ALLOW;
-                    break;
-                case SMARTY_PHP_QUOTE:
-                    $phpTags = Dwoo_Security_Policy::PHP_ENCODE;
-                    break;
-                case SMARTY_PHP_REMOVE:
-                default:
-                    $phpTags = Dwoo_Security_Policy::PHP_REMOVE;
-                    break;
+            case SMARTY_PHP_ALLOW:
+            case SMARTY_PHP_PASSTHRU:
+                $phpTags = Dwoo_Security_Policy::PHP_ALLOW;
+                break;
+            case SMARTY_PHP_QUOTE:
+                $phpTags = Dwoo_Security_Policy::PHP_ENCODE;
+                break;
+            case SMARTY_PHP_REMOVE:
+            default:
+                $phpTags = Dwoo_Security_Policy::PHP_REMOVE;
+                break;
             }
             $policy->setPhpHandling($phpTags);
 

Spacing +4 added lines, -4 removed lines

@@ -5,10 +5,10 @@
 }
 
 if (!defined('SMARTY_PHP_PASSTHRU')) {
-    define('SMARTY_PHP_PASSTHRU',   0);
-    define('SMARTY_PHP_QUOTE',      1);
-    define('SMARTY_PHP_REMOVE',     2);
-    define('SMARTY_PHP_ALLOW',      3);
+    define('SMARTY_PHP_PASSTHRU', 0);
+    define('SMARTY_PHP_QUOTE', 1);
+    define('SMARTY_PHP_REMOVE', 2);
+    define('SMARTY_PHP_ALLOW', 3);
 }
 
 /**

lib/Dwoo/Security/Policy.php

Indentation +265 added lines, -265 removed lines

@@ -19,7 +19,7 @@ 
  */
 class Dwoo_Security_Policy
 {
-    /**#@+
+	/**#@+
      * php handling constants, defaults to PHP_REMOVE
      *
      * PHP_REMOVE : remove all <?php ?> (+ short tags if your short tags option is on) from the input template
@@ -28,296 +28,296 @@ 
      *
      * @var int
      */
-    const PHP_ENCODE = 1;
-    const PHP_REMOVE = 2;
-    const PHP_ALLOW = 3;
-    /**#@-*/
+	const PHP_ENCODE = 1;
+	const PHP_REMOVE = 2;
+	const PHP_ALLOW = 3;
+	/**#@-*/
 
-    /**#@+
+	/**#@+
      * constant handling constants, defaults to CONST_DISALLOW
      *
      * CONST_DISALLOW : throw an error if {$dwoo.const.*} is used in the template
      * CONST_ALLOW : allow {$dwoo.const.*} calls
      */
-    const CONST_DISALLOW = false;
-    const CONST_ALLOW = true;
-    /**#@-*/
+	const CONST_DISALLOW = false;
+	const CONST_ALLOW = true;
+	/**#@-*/
 
-    /**
-     * php functions that are allowed to be used within the template.
-     *
-     * @var array
-     */
-    protected $allowedPhpFunctions = array(
-        'str_repeat' => true,
-        'number_format' => true,
-        'htmlentities' => true,
-        'htmlspecialchars' => true,
-        'long2ip' => true,
-        'strlen' => true,
-        'list' => true,
-        'empty' => true,
-        'count' => true,
-        'sizeof' => true,
-        'in_array' => true,
-        'is_array' => true,
-    );
+	/**
+	 * php functions that are allowed to be used within the template.
+	 *
+	 * @var array
+	 */
+	protected $allowedPhpFunctions = array(
+		'str_repeat' => true,
+		'number_format' => true,
+		'htmlentities' => true,
+		'htmlspecialchars' => true,
+		'long2ip' => true,
+		'strlen' => true,
+		'list' => true,
+		'empty' => true,
+		'count' => true,
+		'sizeof' => true,
+		'in_array' => true,
+		'is_array' => true,
+	);
 
-    /**
-     * methods that are allowed to be used within the template.
-     *
-     * @var array
-     */
-    protected $allowedMethods = array();
+	/**
+	 * methods that are allowed to be used within the template.
+	 *
+	 * @var array
+	 */
+	protected $allowedMethods = array();
 
-    /**
-     * paths that are safe to use with include or other file-access plugins.
-     *
-     * @var array
-     */
-    protected $allowedDirectories = array();
+	/**
+	 * paths that are safe to use with include or other file-access plugins.
+	 *
+	 * @var array
+	 */
+	protected $allowedDirectories = array();
 
-    /**
-     * stores the php handling level.
-     *
-     * defaults to Dwoo_Security_Policy::PHP_REMOVE
-     *
-     * @var int
-     */
-    protected $phpHandling = self::PHP_REMOVE;
+	/**
+	 * stores the php handling level.
+	 *
+	 * defaults to Dwoo_Security_Policy::PHP_REMOVE
+	 *
+	 * @var int
+	 */
+	protected $phpHandling = self::PHP_REMOVE;
 
-    /**
-     * stores the constant handling level.
-     *
-     * defaults to Dwoo_Security_Policy::CONST_DISALLOW
-     *
-     * @var bool
-     */
-    protected $constHandling = self::CONST_DISALLOW;
+	/**
+	 * stores the constant handling level.
+	 *
+	 * defaults to Dwoo_Security_Policy::CONST_DISALLOW
+	 *
+	 * @var bool
+	 */
+	protected $constHandling = self::CONST_DISALLOW;
 
-    /**
-     * adds a php function to the allowed list.
-     *
-     * @param mixed $func function name or array of function names
-     */
-    public function allowPhpFunction($func)
-    {
-        if (is_array($func)) {
-            foreach ($func as $fname) {
-                $this->allowedPhpFunctions[strtolower($fname)] = true;
-            }
-        } else {
-            $this->allowedPhpFunctions[strtolower($func)] = true;
-        }
-    }
+	/**
+	 * adds a php function to the allowed list.
+	 *
+	 * @param mixed $func function name or array of function names
+	 */
+	public function allowPhpFunction($func)
+	{
+		if (is_array($func)) {
+			foreach ($func as $fname) {
+				$this->allowedPhpFunctions[strtolower($fname)] = true;
+			}
+		} else {
+			$this->allowedPhpFunctions[strtolower($func)] = true;
+		}
+	}
 
-    /**
-     * removes a php function from the allowed list.
-     *
-     * @param mixed $func function name or array of function names
-     */
-    public function disallowPhpFunction($func)
-    {
-        if (is_array($func)) {
-            foreach ($func as $fname) {
-                unset($this->allowedPhpFunctions[strtolower($fname)]);
-            }
-        } else {
-            unset($this->allowedPhpFunctions[strtolower($func)]);
-        }
-    }
+	/**
+	 * removes a php function from the allowed list.
+	 *
+	 * @param mixed $func function name or array of function names
+	 */
+	public function disallowPhpFunction($func)
+	{
+		if (is_array($func)) {
+			foreach ($func as $fname) {
+				unset($this->allowedPhpFunctions[strtolower($fname)]);
+			}
+		} else {
+			unset($this->allowedPhpFunctions[strtolower($func)]);
+		}
+	}
 
-    /**
-     * returns the list of php functions allowed to run, note that the function names
-     * are stored in the array keys and not values.
-     *
-     * @return array
-     */
-    public function getAllowedPhpFunctions()
-    {
-        return $this->allowedPhpFunctions;
-    }
+	/**
+	 * returns the list of php functions allowed to run, note that the function names
+	 * are stored in the array keys and not values.
+	 *
+	 * @return array
+	 */
+	public function getAllowedPhpFunctions()
+	{
+		return $this->allowedPhpFunctions;
+	}
 
-    /**
-     * adds a class method to the allowed list, this must be used for
-     * both static and non static method by providing the class name
-     * and method name to use.
-     *
-     * @param mixed  $class  class name or array of array('class', 'method') couples
-     * @param string $method method name
-     */
-    public function allowMethod($class, $method = null)
-    {
-        if (is_array($class)) {
-            foreach ($class as $elem) {
-                $this->allowedMethods[strtolower($elem[0])][strtolower($elem[1])] = true;
-            }
-        } else {
-            $this->allowedMethods[strtolower($class)][strtolower($method)] = true;
-        }
-    }
+	/**
+	 * adds a class method to the allowed list, this must be used for
+	 * both static and non static method by providing the class name
+	 * and method name to use.
+	 *
+	 * @param mixed  $class  class name or array of array('class', 'method') couples
+	 * @param string $method method name
+	 */
+	public function allowMethod($class, $method = null)
+	{
+		if (is_array($class)) {
+			foreach ($class as $elem) {
+				$this->allowedMethods[strtolower($elem[0])][strtolower($elem[1])] = true;
+			}
+		} else {
+			$this->allowedMethods[strtolower($class)][strtolower($method)] = true;
+		}
+	}
 
-    /**
-     * removes a class method from the allowed list.
-     *
-     * @param mixed  $class  class name or array of array('class', 'method') couples
-     * @param string $method method name
-     */
-    public function disallowMethod($class, $method = null)
-    {
-        if (is_array($class)) {
-            foreach ($class as $elem) {
-                unset($this->allowedMethods[strtolower($elem[0])][strtolower($elem[1])]);
-            }
-        } else {
-            unset($this->allowedMethods[strtolower($class)][strtolower($method)]);
-        }
-    }
+	/**
+	 * removes a class method from the allowed list.
+	 *
+	 * @param mixed  $class  class name or array of array('class', 'method') couples
+	 * @param string $method method name
+	 */
+	public function disallowMethod($class, $method = null)
+	{
+		if (is_array($class)) {
+			foreach ($class as $elem) {
+				unset($this->allowedMethods[strtolower($elem[0])][strtolower($elem[1])]);
+			}
+		} else {
+			unset($this->allowedMethods[strtolower($class)][strtolower($method)]);
+		}
+	}
 
-    /**
-     * returns the list of class methods allowed to run, note that the class names
-     * and method names are stored in the array keys and not values.
-     *
-     * @return array
-     */
-    public function getAllowedMethods()
-    {
-        return $this->allowedMethods;
-    }
+	/**
+	 * returns the list of class methods allowed to run, note that the class names
+	 * and method names are stored in the array keys and not values.
+	 *
+	 * @return array
+	 */
+	public function getAllowedMethods()
+	{
+		return $this->allowedMethods;
+	}
 
-    /**
-     * adds a directory to the safelist for includes and other file-access plugins.
-     *
-     * note that all the includePath directories you provide to the Dwoo_Template_File class
-     * are automatically marked as safe
-     *
-     * @param mixed $path a path name or an array of paths
-     */
-    public function allowDirectory($path)
-    {
-        if (is_array($path)) {
-            foreach ($path as $dir) {
-                $this->allowedDirectories[realpath($dir)] = true;
-            }
-        } else {
-            $this->allowedDirectories[realpath($path)] = true;
-        }
-    }
+	/**
+	 * adds a directory to the safelist for includes and other file-access plugins.
+	 *
+	 * note that all the includePath directories you provide to the Dwoo_Template_File class
+	 * are automatically marked as safe
+	 *
+	 * @param mixed $path a path name or an array of paths
+	 */
+	public function allowDirectory($path)
+	{
+		if (is_array($path)) {
+			foreach ($path as $dir) {
+				$this->allowedDirectories[realpath($dir)] = true;
+			}
+		} else {
+			$this->allowedDirectories[realpath($path)] = true;
+		}
+	}
 
-    /**
-     * removes a directory from the safelist.
-     *
-     * @param mixed $path a path name or an array of paths
-     */
-    public function disallowDirectory($path)
-    {
-        if (is_array($path)) {
-            foreach ($path as $dir) {
-                unset($this->allowedDirectories[realpath($dir)]);
-            }
-        } else {
-            unset($this->allowedDirectories[realpath($path)]);
-        }
-    }
+	/**
+	 * removes a directory from the safelist.
+	 *
+	 * @param mixed $path a path name or an array of paths
+	 */
+	public function disallowDirectory($path)
+	{
+		if (is_array($path)) {
+			foreach ($path as $dir) {
+				unset($this->allowedDirectories[realpath($dir)]);
+			}
+		} else {
+			unset($this->allowedDirectories[realpath($path)]);
+		}
+	}
 
-    /**
-     * returns the list of safe paths, note that the paths are stored in the array
-     * keys and not values.
-     *
-     * @return array
-     */
-    public function getAllowedDirectories()
-    {
-        return $this->allowedDirectories;
-    }
+	/**
+	 * returns the list of safe paths, note that the paths are stored in the array
+	 * keys and not values.
+	 *
+	 * @return array
+	 */
+	public function getAllowedDirectories()
+	{
+		return $this->allowedDirectories;
+	}
 
-    /**
-     * sets the php handling level, defaults to REMOVE.
-     *
-     * @param int $level one of the Dwoo_Security_Policy::PHP_* constants
-     */
-    public function setPhpHandling($level = self::PHP_REMOVE)
-    {
-        $this->phpHandling = $level;
-    }
+	/**
+	 * sets the php handling level, defaults to REMOVE.
+	 *
+	 * @param int $level one of the Dwoo_Security_Policy::PHP_* constants
+	 */
+	public function setPhpHandling($level = self::PHP_REMOVE)
+	{
+		$this->phpHandling = $level;
+	}
 
-    /**
-     * returns the php handling level.
-     *
-     * @return int the current level, one of the Dwoo_Security_Policy::PHP_* constants
-     */
-    public function getPhpHandling()
-    {
-        return $this->phpHandling;
-    }
+	/**
+	 * returns the php handling level.
+	 *
+	 * @return int the current level, one of the Dwoo_Security_Policy::PHP_* constants
+	 */
+	public function getPhpHandling()
+	{
+		return $this->phpHandling;
+	}
 
-    /**
-     * sets the constant handling level, defaults to CONST_DISALLOW.
-     *
-     * @param bool $level one of the Dwoo_Security_Policy::CONST_* constants
-     */
-    public function setConstantHandling($level = self::CONST_DISALLOW)
-    {
-        $this->constHandling = $level;
-    }
+	/**
+	 * sets the constant handling level, defaults to CONST_DISALLOW.
+	 *
+	 * @param bool $level one of the Dwoo_Security_Policy::CONST_* constants
+	 */
+	public function setConstantHandling($level = self::CONST_DISALLOW)
+	{
+		$this->constHandling = $level;
+	}
 
-    /**
-     * returns the constant handling level.
-     *
-     * @return bool the current level, one of the Dwoo_Security_Policy::CONST_* constants
-     */
-    public function getConstantHandling()
-    {
-        return $this->constHandling;
-    }
+	/**
+	 * returns the constant handling level.
+	 *
+	 * @return bool the current level, one of the Dwoo_Security_Policy::CONST_* constants
+	 */
+	public function getConstantHandling()
+	{
+		return $this->constHandling;
+	}
 
-    /**
-     * this is used at run time to check whether method calls are allowed or not.
-     *
-     * @param Dwoo_Core $dwoo   dwoo instance that calls this
-     * @param object    $obj    any object on which the method must be called
-     * @param string    $method lowercased method name
-     * @param array     $args   arguments array
-     *
-     * @return mixed result of method call or unll + E_USER_NOTICE if not allowed
-     */
-    public function callMethod(Dwoo_Core $dwoo, $obj, $method, $args)
-    {
-        foreach ($this->allowedMethods as $class => $methods) {
-            if (!isset($methods[$method])) {
-                continue;
-            }
-            if ($obj instanceof $class) {
-                return call_user_func_array(array($obj, $method), $args);
-            }
-        }
-        $dwoo->triggerError('The current security policy prevents you from calling '.get_class($obj).'::'.$method.'()');
+	/**
+	 * this is used at run time to check whether method calls are allowed or not.
+	 *
+	 * @param Dwoo_Core $dwoo   dwoo instance that calls this
+	 * @param object    $obj    any object on which the method must be called
+	 * @param string    $method lowercased method name
+	 * @param array     $args   arguments array
+	 *
+	 * @return mixed result of method call or unll + E_USER_NOTICE if not allowed
+	 */
+	public function callMethod(Dwoo_Core $dwoo, $obj, $method, $args)
+	{
+		foreach ($this->allowedMethods as $class => $methods) {
+			if (!isset($methods[$method])) {
+				continue;
+			}
+			if ($obj instanceof $class) {
+				return call_user_func_array(array($obj, $method), $args);
+			}
+		}
+		$dwoo->triggerError('The current security policy prevents you from calling '.get_class($obj).'::'.$method.'()');
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * this is used at compile time to check whether static method calls are allowed or not.
-     *
-     * @param mixed  $class  lowercased class name or array('class', 'method') couple
-     * @param string $method lowercased method name
-     *
-     * @return bool
-     */
-    public function isMethodAllowed($class, $method = null)
-    {
-        if (is_array($class)) {
-            list($class, $method) = $class;
-        }
-        foreach ($this->allowedMethods as $allowedClass => $methods) {
-            if (!isset($methods[$method])) {
-                continue;
-            }
-            if ($class === $allowedClass || is_subclass_of($class, $allowedClass)) {
-                return true;
-            }
-        }
+	/**
+	 * this is used at compile time to check whether static method calls are allowed or not.
+	 *
+	 * @param mixed  $class  lowercased class name or array('class', 'method') couple
+	 * @param string $method lowercased method name
+	 *
+	 * @return bool
+	 */
+	public function isMethodAllowed($class, $method = null)
+	{
+		if (is_array($class)) {
+			list($class, $method) = $class;
+		}
+		foreach ($this->allowedMethods as $allowedClass => $methods) {
+			if (!isset($methods[$method])) {
+				continue;
+			}
+			if ($class === $allowedClass || is_subclass_of($class, $allowedClass)) {
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 }

lib/Dwoo/ITemplate.php

Indentation +123 added lines, -123 removed lines

@@ -19,140 +19,140 @@
  */
 interface Dwoo_ITemplate
 {
-    /**
-     * returns the cache duration for this template.
-     *
-     * defaults to null if it was not provided
-     *
-     * @return int|null
-     */
-    public function getCacheTime();
+	/**
+	 * returns the cache duration for this template.
+	 *
+	 * defaults to null if it was not provided
+	 *
+	 * @return int|null
+	 */
+	public function getCacheTime();
 
-    /**
-     * sets the cache duration for this template.
-     *
-     * can be used to set it after the object is created if you did not provide
-     * it in the constructor
-     *
-     * @param int $seconds duration of the cache validity for this template, if
-     *                     null it defaults to the Dwoo instance's cache time. 0 = disable and
-     *                     -1 = infinite cache
-     */
-    public function setCacheTime($seconds = null);
+	/**
+	 * sets the cache duration for this template.
+	 *
+	 * can be used to set it after the object is created if you did not provide
+	 * it in the constructor
+	 *
+	 * @param int $seconds duration of the cache validity for this template, if
+	 *                     null it defaults to the Dwoo instance's cache time. 0 = disable and
+	 *                     -1 = infinite cache
+	 */
+	public function setCacheTime($seconds = null);
 
-    /**
-     * returns the cached template output file name, true if it's cache-able but not cached
-     * or false if it's not cached.
-     *
-     * @param Dwoo_Core $dwoo the dwoo instance that requests it
-     *
-     * @return string|bool
-     */
-    public function getCachedTemplate(Dwoo_Core $dwoo);
+	/**
+	 * returns the cached template output file name, true if it's cache-able but not cached
+	 * or false if it's not cached.
+	 *
+	 * @param Dwoo_Core $dwoo the dwoo instance that requests it
+	 *
+	 * @return string|bool
+	 */
+	public function getCachedTemplate(Dwoo_Core $dwoo);
 
-    /**
-     * caches the provided output into the cache file.
-     *
-     * @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
-     */
-    public function cache(Dwoo_Core $dwoo, $output);
+	/**
+	 * caches the provided output into the cache file.
+	 *
+	 * @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
+	 */
+	public function cache(Dwoo_Core $dwoo, $output);
 
-    /**
-     * clears the cached template if it's older than the given time.
-     *
-     * @param Dwoo_Core $dwoo      the dwoo instance that was used to cache that template
-     * @param int       $olderThan minimum time (in seconds) required for the cache to be cleared
-     *
-     * @return bool true if the cache was not present or if it was deleted, false if it remains there
-     */
-    public function clearCache(Dwoo_Core $dwoo, $olderThan = -1);
+	/**
+	 * clears the cached template if it's older than the given time.
+	 *
+	 * @param Dwoo_Core $dwoo      the dwoo instance that was used to cache that template
+	 * @param int       $olderThan minimum time (in seconds) required for the cache to be cleared
+	 *
+	 * @return bool true if the cache was not present or if it was deleted, false if it remains there
+	 */
+	public function clearCache(Dwoo_Core $dwoo, $olderThan = -1);
 
-    /**
-     * returns the compiled template file name.
-     *
-     * @param Dwoo_Core      $dwoo     the dwoo instance that requests it
-     * @param Dwoo_ICompiler $compiler the compiler that must be used
-     *
-     * @return string
-     */
-    public function getCompiledTemplate(Dwoo_Core $dwoo, Dwoo_ICompiler $compiler = null);
+	/**
+	 * returns the compiled template file name.
+	 *
+	 * @param Dwoo_Core      $dwoo     the dwoo instance that requests it
+	 * @param Dwoo_ICompiler $compiler the compiler that must be used
+	 *
+	 * @return string
+	 */
+	public function getCompiledTemplate(Dwoo_Core $dwoo, Dwoo_ICompiler $compiler = null);
 
-    /**
-     * returns the template name.
-     *
-     * @return string
-     */
-    public function getName();
+	/**
+	 * returns the template name.
+	 *
+	 * @return string
+	 */
+	public function getName();
 
-    /**
-     * returns the resource name for this template class.
-     *
-     * @return string
-     */
-    public function getResourceName();
+	/**
+	 * returns the resource name for this template class.
+	 *
+	 * @return string
+	 */
+	public function getResourceName();
 
-    /**
-     * returns the resource identifier for this template or false if it has no identifier.
-     *
-     * @return string|false
-     */
-    public function getResourceIdentifier();
+	/**
+	 * returns the resource identifier for this template or false if it has no identifier.
+	 *
+	 * @return string|false
+	 */
+	public function getResourceIdentifier();
 
-    /**
-     * returns the template source of this template.
-     *
-     * @return string
-     */
-    public function getSource();
+	/**
+	 * returns the template source of this template.
+	 *
+	 * @return string
+	 */
+	public function getSource();
 
-    /**
-     * returns an unique string identifying the current version of this template,
-     * for example a timestamp of the last modified date or a hash of the template source.
-     *
-     * @return string
-     */
-    public function getUid();
+	/**
+	 * returns an unique string identifying the current version of this template,
+	 * for example a timestamp of the last modified date or a hash of the template source.
+	 *
+	 * @return string
+	 */
+	public function getUid();
 
-    /**
-     * returns the compiler used by this template, if it was just compiled, or null.
-     *
-     * @return Dwoo_ICompiler
-     */
-    public function getCompiler();
+	/**
+	 * returns the compiler used by this template, if it was just compiled, or null.
+	 *
+	 * @return Dwoo_ICompiler
+	 */
+	public function getCompiler();
 
-    /**
-     * returns some php code that will check if this template has been modified or not.
-     *
-     * if the function returns null, the template will be instanciated and then the Uid checked
-     *
-     * @return string
-     */
-    public function getIsModifiedCode();
+	/**
+	 * returns some php code that will check if this template has been modified or not.
+	 *
+	 * if the function returns null, the template will be instanciated and then the Uid checked
+	 *
+	 * @return string
+	 */
+	public function getIsModifiedCode();
 
-    /**
-     * returns a new template object from the given resource identifier, null if no include is
-     * possible (resource not found), or false if include is not permitted by this resource type.
-     *
-     * this method should also check if $dwoo->getSecurityPolicy() is null or not and do the
-     * necessary permission checks if required, if the security policy prevents the template
-     * generation it should throw a new Dwoo_Security_Exception with a relevant message
-     *
-     * @param mixed          $resourceId     the resource identifier
-     * @param int            $cacheTime      duration of the cache validity for this template,
-     *                                       if null it defaults to the Dwoo instance that will
-     *                                       render this template
-     * @param string         $cacheId        the unique cache identifier of this page or anything else that
-     *                                       makes this template's content unique, if null it defaults
-     *                                       to the current url
-     * @param string         $compileId      the unique compiled identifier, which is used to distinguish this
-     *                                       template from others, if null it defaults to the filename+bits of the path
-     * @param Dwoo_ITemplate $parentTemplate the template that is requesting a new template object (through
-     *                                       an include, extends or any other plugin)
-     *
-     * @return Dwoo_ITemplate|null|false
-     */
-    public static function templateFactory(Dwoo_Core $dwoo, $resourceId, $cacheTime = null, $cacheId = null, $compileId = null, Dwoo_ITemplate $parentTemplate = null);
+	/**
+	 * returns a new template object from the given resource identifier, null if no include is
+	 * possible (resource not found), or false if include is not permitted by this resource type.
+	 *
+	 * this method should also check if $dwoo->getSecurityPolicy() is null or not and do the
+	 * necessary permission checks if required, if the security policy prevents the template
+	 * generation it should throw a new Dwoo_Security_Exception with a relevant message
+	 *
+	 * @param mixed          $resourceId     the resource identifier
+	 * @param int            $cacheTime      duration of the cache validity for this template,
+	 *                                       if null it defaults to the Dwoo instance that will
+	 *                                       render this template
+	 * @param string         $cacheId        the unique cache identifier of this page or anything else that
+	 *                                       makes this template's content unique, if null it defaults
+	 *                                       to the current url
+	 * @param string         $compileId      the unique compiled identifier, which is used to distinguish this
+	 *                                       template from others, if null it defaults to the filename+bits of the path
+	 * @param Dwoo_ITemplate $parentTemplate the template that is requesting a new template object (through
+	 *                                       an include, extends or any other plugin)
+	 *
+	 * @return Dwoo_ITemplate|null|false
+	 */
+	public static function templateFactory(Dwoo_Core $dwoo, $resourceId, $cacheTime = null, $cacheId = null, $compileId = null, Dwoo_ITemplate $parentTemplate = null);
 }

lib/Dwoo/Template/File.php

Indentation +236 added lines, -236 removed lines

@@ -19,267 +19,267 @@
  */
 class Dwoo_Template_File extends Dwoo_Template_String
 {
-    /**
-     * template filename.
-     *
-     * @var string
-     */
-    protected $file;
+	/**
+	 * template filename.
+	 *
+	 * @var string
+	 */
+	protected $file;
 
-    /**
-     * include path(s) to look into to find this template.
-     *
-     * @var array
-     */
-    protected $includePath = null;
+	/**
+	 * include path(s) to look into to find this template.
+	 *
+	 * @var array
+	 */
+	protected $includePath = null;
 
-    /**
-     * resolved path cache when looking for a file in multiple include paths.
-     *
-     * this is reset when the include path is changed
-     *
-     * @var string
-     */
-    protected $resolvedPath = null;
+	/**
+	 * resolved path cache when looking for a file in multiple include paths.
+	 *
+	 * this is reset when the include path is changed
+	 *
+	 * @var string
+	 */
+	protected $resolvedPath = null;
 
-    /**
-     * creates a template from a file.
-     *
-     * @param string $file        the path to the template file, make sure it exists
-     * @param int    $cacheTime   duration of the cache validity for this template,
-     *                            if null it defaults to the Dwoo instance that will
-     *                            render this template
-     * @param string $cacheId     the unique cache identifier of this page or anything else that
-     *                            makes this template's content unique, if null it defaults
-     *                            to the current url
-     * @param string $compileId   the unique compiled identifier, which is used to distinguish this
-     *                            template from others, if null it defaults to the filename+bits of the path
-     * @param mixed  $includePath a string for a single path to look into for the given file, or an array of paths
-     */
-    public function __construct($file, $cacheTime = null, $cacheId = null, $compileId = null, $includePath = null)
-    {
-        $this->file = $file;
-        $this->name = basename($file);
-        $this->cacheTime = $cacheTime;
+	/**
+	 * creates a template from a file.
+	 *
+	 * @param string $file        the path to the template file, make sure it exists
+	 * @param int    $cacheTime   duration of the cache validity for this template,
+	 *                            if null it defaults to the Dwoo instance that will
+	 *                            render this template
+	 * @param string $cacheId     the unique cache identifier of this page or anything else that
+	 *                            makes this template's content unique, if null it defaults
+	 *                            to the current url
+	 * @param string $compileId   the unique compiled identifier, which is used to distinguish this
+	 *                            template from others, if null it defaults to the filename+bits of the path
+	 * @param mixed  $includePath a string for a single path to look into for the given file, or an array of paths
+	 */
+	public function __construct($file, $cacheTime = null, $cacheId = null, $compileId = null, $includePath = null)
+	{
+		$this->file = $file;
+		$this->name = basename($file);
+		$this->cacheTime = $cacheTime;
 
-        if ($compileId !== null) {
-            $this->compileId = str_replace('../', '__', strtr($compileId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
-        }
+		if ($compileId !== null) {
+			$this->compileId = str_replace('../', '__', strtr($compileId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
+		}
 
-        if ($cacheId !== null) {
-            $this->cacheId = str_replace('../', '__', strtr($cacheId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
-        }
+		if ($cacheId !== null) {
+			$this->cacheId = str_replace('../', '__', strtr($cacheId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
+		}
 
-        if (is_string($includePath)) {
-            $this->includePath = array($includePath);
-        } elseif (is_array($includePath)) {
-            $this->includePath = $includePath;
-        }
-    }
+		if (is_string($includePath)) {
+			$this->includePath = array($includePath);
+		} elseif (is_array($includePath)) {
+			$this->includePath = $includePath;
+		}
+	}
 
-    /**
-     * sets the include path(s) to where the given template filename must be looked up.
-     *
-     * @param mixed $paths the path to look into, can be string for a single path or an array of paths
-     */
-    public function setIncludePath($paths)
-    {
-        if (is_array($paths) === false) {
-            $paths = array($paths);
-        }
+	/**
+	 * sets the include path(s) to where the given template filename must be looked up.
+	 *
+	 * @param mixed $paths the path to look into, can be string for a single path or an array of paths
+	 */
+	public function setIncludePath($paths)
+	{
+		if (is_array($paths) === false) {
+			$paths = array($paths);
+		}
 
-        $this->includePath = $paths;
-        $this->resolvedPath = null;
-    }
+		$this->includePath = $paths;
+		$this->resolvedPath = null;
+	}
 
-    /**
-     * return the current include path(s).
-     *
-     * @return array
-     */
-    public function getIncludePath()
-    {
-        return $this->includePath;
-    }
+	/**
+	 * return the current include path(s).
+	 *
+	 * @return array
+	 */
+	public function getIncludePath()
+	{
+		return $this->includePath;
+	}
 
-    /**
-     * Checks if compiled file is valid (exists and it's the modification is greater or
-     * equal to the modification time of the template file).
-     *
-     * @param string file
-     *
-     * @return bool True cache file existance and it's modification time
-     */
-    protected function isValidCompiledFile($file)
-    {
-        return parent::isValidCompiledFile($file) && (int) $this->getUid() <= filemtime($file);
-    }
+	/**
+	 * Checks if compiled file is valid (exists and it's the modification is greater or
+	 * equal to the modification time of the template file).
+	 *
+	 * @param string file
+	 *
+	 * @return bool True cache file existance and it's modification time
+	 */
+	protected function isValidCompiledFile($file)
+	{
+		return parent::isValidCompiledFile($file) && (int) $this->getUid() <= filemtime($file);
+	}
 
-    /**
-     * returns the template source of this template.
-     *
-     * @return string
-     */
-    public function getSource()
-    {
-        return file_get_contents($this->getResourceIdentifier());
-    }
+	/**
+	 * returns the template source of this template.
+	 *
+	 * @return string
+	 */
+	public function getSource()
+	{
+		return file_get_contents($this->getResourceIdentifier());
+	}
 
-    /**
-     * returns the resource name for this template class.
-     *
-     * @return string
-     */
-    public function getResourceName()
-    {
-        return 'file';
-    }
+	/**
+	 * returns the resource name for this template class.
+	 *
+	 * @return string
+	 */
+	public function getResourceName()
+	{
+		return 'file';
+	}
 
-    /**
-     * returns this template's source filename.
-     *
-     * @return string
-     *
-     * @throws Dwoo_Exception
-     */
-    public function getResourceIdentifier()
-    {
-        if ($this->resolvedPath !== null) {
-            return $this->resolvedPath;
-        } elseif ($this->includePath === null) {
-            return $this->file;
-        } else {
-            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;
+	/**
+	 * returns this template's source filename.
+	 *
+	 * @return string
+	 *
+	 * @throws Dwoo_Exception
+	 */
+	public function getResourceIdentifier()
+	{
+		if ($this->resolvedPath !== null) {
+			return $this->resolvedPath;
+		} elseif ($this->includePath === null) {
+			return $this->file;
+		} else {
+			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;
 
-                    return $this->resolvedPath;
-                }
-            }
+					return $this->resolvedPath;
+				}
+			}
 
-            throw new Dwoo_Exception('Template "'.$this->file.'" could not be found in any of your include path(s)');
-        }
-    }
+			throw new Dwoo_Exception('Template "'.$this->file.'" could not be found in any of your include path(s)');
+		}
+	}
 
-    /**
-     * returns an unique value identifying the current version of this template,
-     * in this case it's the unix timestamp of the last modification.
-     *
-     * @return string
-     */
-    public function getUid()
-    {
-        return (string) filemtime($this->getResourceIdentifier());
-    }
+	/**
+	 * returns an unique value identifying the current version of this template,
+	 * in this case it's the unix timestamp of the last modification.
+	 *
+	 * @return string
+	 */
+	public function getUid()
+	{
+		return (string) filemtime($this->getResourceIdentifier());
+	}
 
-    /**
-     * returns a new template object from the given include name, null if no include is
-     * possible (resource not found), or false if include is not permitted by this resource type.
-     *
-     * @param Dwoo_Core      $dwoo           the dwoo instance requiring it
-     * @param mixed          $resourceId     the filename (relative to this template's dir) of the template to include
-     * @param int            $cacheTime      duration of the cache validity for this template,
-     *                                       if null it defaults to the Dwoo instance that will
-     *                                       render this template
-     * @param string         $cacheId        the unique cache identifier of this page or anything else that
-     *                                       makes this template's content unique, if null it defaults
-     *                                       to the current url
-     * @param string         $compileId      the unique compiled identifier, which is used to distinguish this
-     *                                       template from others, if null it defaults to the filename+bits of the path
-     * @param Dwoo_ITemplate $parentTemplate the template that is requesting a new template object (through
-     *                                       an include, extends or any other plugin)
-     *
-     * @return Dwoo_Template_File|null
-     *
-     * @throws Dwoo_Exception
-     * @throws Dwoo_Security_Exception
-     */
-    public static function templateFactory(Dwoo_Core $dwoo, $resourceId, $cacheTime = null, $cacheId = null, $compileId = null, Dwoo_ITemplate $parentTemplate = null)
-    {
-        if (DIRECTORY_SEPARATOR === '\\') {
-            $resourceId = str_replace(array("\t", "\n", "\r", "\f", "\v"), array('\\t', '\\n', '\\r', '\\f', '\\v'), $resourceId);
-        }
-        $resourceId = strtr($resourceId, '\\', '/');
+	/**
+	 * returns a new template object from the given include name, null if no include is
+	 * possible (resource not found), or false if include is not permitted by this resource type.
+	 *
+	 * @param Dwoo_Core      $dwoo           the dwoo instance requiring it
+	 * @param mixed          $resourceId     the filename (relative to this template's dir) of the template to include
+	 * @param int            $cacheTime      duration of the cache validity for this template,
+	 *                                       if null it defaults to the Dwoo instance that will
+	 *                                       render this template
+	 * @param string         $cacheId        the unique cache identifier of this page or anything else that
+	 *                                       makes this template's content unique, if null it defaults
+	 *                                       to the current url
+	 * @param string         $compileId      the unique compiled identifier, which is used to distinguish this
+	 *                                       template from others, if null it defaults to the filename+bits of the path
+	 * @param Dwoo_ITemplate $parentTemplate the template that is requesting a new template object (through
+	 *                                       an include, extends or any other plugin)
+	 *
+	 * @return Dwoo_Template_File|null
+	 *
+	 * @throws Dwoo_Exception
+	 * @throws Dwoo_Security_Exception
+	 */
+	public static function templateFactory(Dwoo_Core $dwoo, $resourceId, $cacheTime = null, $cacheId = null, $compileId = null, Dwoo_ITemplate $parentTemplate = null)
+	{
+		if (DIRECTORY_SEPARATOR === '\\') {
+			$resourceId = str_replace(array("\t", "\n", "\r", "\f", "\v"), array('\\t', '\\n', '\\r', '\\f', '\\v'), $resourceId);
+		}
+		$resourceId = strtr($resourceId, '\\', '/');
 
-        $includePath = null;
+		$includePath = null;
 
-        if (file_exists($resourceId) === false) {
-            if ($parentTemplate === null) {
-                $parentTemplate = $dwoo->getTemplate();
-            }
-            if ($parentTemplate instanceof self) {
-                if ($includePath = $parentTemplate->getIncludePath()) {
-                    if (strstr($resourceId, '../')) {
-                        throw new Dwoo_Exception('When using an include path you can not reference a template into a parent directory (using ../)');
-                    }
-                } else {
-                    $resourceId = dirname($parentTemplate->getResourceIdentifier()).DIRECTORY_SEPARATOR.$resourceId;
-                    if (file_exists($resourceId) === false) {
-                        return null;
-                    }
-                }
-            } else {
-                return null;
-            }
-        }
+		if (file_exists($resourceId) === false) {
+			if ($parentTemplate === null) {
+				$parentTemplate = $dwoo->getTemplate();
+			}
+			if ($parentTemplate instanceof self) {
+				if ($includePath = $parentTemplate->getIncludePath()) {
+					if (strstr($resourceId, '../')) {
+						throw new Dwoo_Exception('When using an include path you can not reference a template into a parent directory (using ../)');
+					}
+				} else {
+					$resourceId = dirname($parentTemplate->getResourceIdentifier()).DIRECTORY_SEPARATOR.$resourceId;
+					if (file_exists($resourceId) === false) {
+						return null;
+					}
+				}
+			} else {
+				return null;
+			}
+		}
 
-        if ($policy = $dwoo->getSecurityPolicy()) {
-            while (true) {
-                if (preg_match('{^([a-z]+?)://}i', $resourceId)) {
-                    throw new Dwoo_Security_Exception('The security policy prevents you to read files from external sources : <em>'.$resourceId.'</em>.');
-                }
+		if ($policy = $dwoo->getSecurityPolicy()) {
+			while (true) {
+				if (preg_match('{^([a-z]+?)://}i', $resourceId)) {
+					throw new Dwoo_Security_Exception('The security policy prevents you to read files from external sources : <em>'.$resourceId.'</em>.');
+				}
 
-                if ($includePath) {
-                    break;
-                }
+				if ($includePath) {
+					break;
+				}
 
-                $resourceId = realpath($resourceId);
-                $dirs = $policy->getAllowedDirectories();
-                foreach ($dirs as $dir => $dummy) {
-                    if (strpos($resourceId, $dir) === 0) {
-                        break 2;
-                    }
-                }
-                throw new Dwoo_Security_Exception('The security policy prevents you to read <em>'.$resourceId.'</em>');
-            }
-        }
+				$resourceId = realpath($resourceId);
+				$dirs = $policy->getAllowedDirectories();
+				foreach ($dirs as $dir => $dummy) {
+					if (strpos($resourceId, $dir) === 0) {
+						break 2;
+					}
+				}
+				throw new Dwoo_Security_Exception('The security policy prevents you to read <em>'.$resourceId.'</em>');
+			}
+		}
 
-        $class = 'Dwoo_Template_File';
-        if ($parentTemplate) {
-            $class = get_class($parentTemplate);
-        }
+		$class = 'Dwoo_Template_File';
+		if ($parentTemplate) {
+			$class = get_class($parentTemplate);
+		}
 
-        return new $class($resourceId, $cacheTime, $cacheId, $compileId, $includePath);
-    }
+		return new $class($resourceId, $cacheTime, $cacheId, $compileId, $includePath);
+	}
 
-    /**
-     * returns the full compiled file name and assigns a default value to it if
-     * required.
-     *
-     * @param Dwoo_Core $dwoo the dwoo instance that requests the file name
-     *
-     * @return string the full path to the compiled file
-     */
-    protected function getCompiledFilename(Dwoo_Core $dwoo)
-    {
-        // no compile id was provided, set default
-        if ($this->compileId === null) {
-            $this->compileId = str_replace('../', '__', strtr($this->getResourceIdentifier(), '\\:', '/-'));
-        }
+	/**
+	 * returns the full compiled file name and assigns a default value to it if
+	 * required.
+	 *
+	 * @param Dwoo_Core $dwoo the dwoo instance that requests the file name
+	 *
+	 * @return string the full path to the compiled file
+	 */
+	protected function getCompiledFilename(Dwoo_Core $dwoo)
+	{
+		// no compile id was provided, set default
+		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';
+	}
 
-    /**
-     * returns some php code that will check if this template has been modified or not.
-     *
-     * if the function returns null, the template will be instanciated and then the Uid checked
-     *
-     * @return string
-     */
-    public function getIsModifiedCode()
-    {
-        return '"'.$this->getUid().'" == filemtime('.var_export($this->getResourceIdentifier(), true).')';
-    }
+	/**
+	 * returns some php code that will check if this template has been modified or not.
+	 *
+	 * if the function returns null, the template will be instanciated and then the Uid checked
+	 *
+	 * @return string
+	 */
+	public function getIsModifiedCode()
+	{
+		return '"'.$this->getUid().'" == filemtime('.var_export($this->getResourceIdentifier(), true).')';
+	}
 }

lib/Dwoo/Core.php

Indentation +1705 added lines, -1705 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);
 }
 
 /**
@@ -32,1708 +32,1708 @@ 
  */
 class Dwoo_Core
 {
-    /**
-     * 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;
-
-    /**
-     * Constants that represents all plugin types
-     * these are bitwise-operation-safe values to allow multiple types
-     * on a single plugin
-     *
-     * @var int
-     */
-    const CLASS_PLUGIN      = 1;
-    const FUNC_PLUGIN       = 2;
-    const NATIVE_PLUGIN     = 4;
-    const BLOCK_PLUGIN      = 8;
-    const COMPILABLE_PLUGIN = 16;
-    const CUSTOM_PLUGIN     = 32;
-    const SMARTY_MODIFIER   = 64;
-    const SMARTY_BLOCK      = 128;
-    const SMARTY_FUNCTION   = 256;
-    const PROXY_PLUGIN      = 512;
-    const TEMPLATE_PLUGIN   = 1024;
-
-    /**
-     * Character set of the template, used by string manipulation plugins.
-     * it must be lowercase, but setCharset() will take care of that
-     *
-     * @see setCharset
-     * @see getCharset
-     * @var string
-     */
-    protected $charset = 'utf-8';
-
-    /**
-     * Global variables that are accessible through $dwoo.* in the templates.
-     * default values include:
-     * $dwoo.version - current version number
-     * $dwoo.ad - a Powered by Dwoo link pointing to dwoo.org
-     * $dwoo.now - the current time
-     * $dwoo.template - the current template filename
-     * $dwoo.charset - the character set used by the template
-     * on top of that, foreach and other plugins can store special values in there,
-     * see their documentation for more details.
-     *
-     * @var array
-     */
-    public $globals;
-
-    /**
-     * Directory where the compiled templates are stored.
-     * defaults to DWOO_COMPILEDIR (= dwoo_dir/compiled by default)
-     *
-     * @var string
-     */
-    protected $compileDir;
-
-    /**
-     * Directory where the cached templates are stored.
-     * defaults to DWOO_CACHEDIR (= dwoo_dir/cache by default)
-     *
-     * @var string
-     */
-    protected $cacheDir;
-
-    /**
-     * Defines how long (in seconds) the cached files must remain valid.
-     * can be overriden on a per-template basis
-     * -1 = never delete
-     * 0 = disabled
-     * >0 = duration in seconds
-     *
-     * @var int
-     */
-    protected $cacheTime = 0;
-
-    /**
-     * Security policy object.
-     *
-     * @var Dwoo_Security_Policy
-     */
-    protected $securityPolicy = null;
-
-    /**
-     * Stores the custom plugins callbacks.
-     *
-     * @see addPlugin
-     * @see removePlugin
-     * @var array
-     */
-    protected $plugins = array();
-
-    /**
-     * Stores the filter callbacks.
-     *
-     * @see addFilter
-     * @see removeFilter
-     * @var array
-     */
-    protected $filters = array();
-
-    /**
-     * Stores the resource types and associated
-     * classes / compiler classes.
-     *
-     * @var array
-     */
-    protected $resources = array(
-        'file'   => array(
-            'class'    => 'Dwoo_Template_File',
-            'compiler' => null,
-        ),
-        'string' => array(
-            'class'    => 'Dwoo_Template_String',
-            'compiler' => null,
-        ),
-    );
-
-    /**
-     * The dwoo loader object used to load plugins by this dwoo instance.
-     *
-     * @var Dwoo_ILoader
-     */
-    protected $loader = null;
-
-    /**
-     * Currently rendered template, set to null when not-rendering.
-     *
-     * @var Dwoo_ITemplate
-     */
-    protected $template = null;
-
-    /**
-     * Stores the instances of the class plugins during template runtime.
-     *
-     * @var array
-     */
-    protected $runtimePlugins;
-
-    /**
-     * Stores the returned values during template runtime.
-     *
-     * @var array
-     */
-    protected $returnData;
-
-    /**
-     * Stores the data during template runtime.
-     *
-     * @var array
-     */
-    public $data;
-
-    /**
-     * Stores the current scope during template runtime.
-     * this should ideally not be accessed directly from outside template code
-     *
-     * @var mixed
-     */
-    public $scope;
-
-    /**
-     * Stores the scope tree during template runtime.
-     *
-     * @var array
-     */
-    protected $scopeTree;
-
-    /**
-     * Stores the block plugins stack during template runtime.
-     *
-     * @var array
-     */
-    protected $stack;
-
-    /**
-     * Stores the current block plugin at the top of the stack during template runtime.
-     *
-     * @var Dwoo_Block_Plugin
-     */
-    protected $curBlock;
-
-    /**
-     * Stores the output buffer during template runtime.
-     *
-     * @var string
-     */
-    protected $buffer;
-
-    /**
-     * Stores plugin proxy.
-     *
-     * @var Dwoo_IPluginProxy
-     */
-    protected $pluginProxy;
-
-    /**
-     * Constructor, sets the cache and compile dir to the default values if not provided.
-     *
-     * @param string $compileDir path to the compiled directory, defaults to lib/compiled
-     * @param string $cacheDir   path to the cache directory, defaults to lib/cache
-     */
-    public function __construct($compileDir = null, $cacheDir = null)
-    {
-        if ($compileDir !== null) {
-            $this->setCompileDir($compileDir);
-        }
-        if ($cacheDir !== null) {
-            $this->setCacheDir($cacheDir);
-        }
-        $this->initGlobals();
-    }
-
-    /**
-     * Resets some runtime variables to allow a cloned object to be used to render sub-templates.
-     *
-     * @return void
-     */
-    public function __clone()
-    {
-        $this->template = null;
-        unset($this->data);
-        unset($this->returnData);
-    }
-
-    /**
-     * Autputs the template instead of returning it, this is basically a shortcut for get(*, *, *, true).
-     *
-     * @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);
-    }
-
-    /**
-     * Returns the given template rendered using the provided data and optional compiler.
-     *
-     * @param mixed          $_tpl      template, can either be a Dwoo_ITemplate object (i.e. Dwoo_Template_File), a
-     *                                  valid path to a template, or a template as a string it is recommended to
-     *                                  provide a Dwoo_ITemplate as it will probably make things faster, especially if
-     *                                  you render a template multiple times
-     * @param mixed          $data      the data to use, can either be a Dwoo_IDataProvider object (i.e. Dwoo_Data) or
-     *                                  an associative array. if you're rendering the template from cache, it can be
-     *                                  left null
-     * @param Dwoo_ICompiler $_compiler the compiler that must be used to compile the template, if left empty a default
-     *                                  Dwoo_Compiler will be used
-     * @param bool           $_output   flag that defines whether the function returns the output of the template
-     *                                  (false, default) or echoes it directly (true)
-     *
-     * @return string|void or the template output if $output is false
-     * @throws Dwoo_Exception
-     */
-    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
-     *
-     * @return void
-     */
-    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
-     *
-     * @return void
-     */
-    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();
-    }
-
-    /**
-     * Adds a custom plugin that is not in one of the plugin directories.
-     *
-     * @param string   $name       the plugin name to be used in the templates
-     * @param callback $callback   the plugin callback, either a function name,
-     *                             a class name or an array containing an object
-     *                             or class name and a method name
-     * @param bool     $compilable if set to true, the plugin is assumed to be compilable
-     *
-     * @return void
-     * @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)) {
-            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
-                    );
-                } else {
-                    $this->plugins[$name] = array(
-                        'type'     => self::CLASS_PLUGIN | $compilable,
-                        'callback' => $callback,
-                        'class'    => $callback,
-                        'function' => ($compilable ? 'compile' : 'process')
-                    );
-                }
-            } elseif (function_exists($callback)) {
-                $this->plugins[$name] = array(
-                    'type'     => self::FUNC_PLUGIN | $compilable,
-                    'callback' => $callback
-                );
-            } else {
-                throw new Dwoo_Exception('Callback could not be processed correctly, please check that the function/class you used exists');
-            }
-        } 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');
-        }
-    }
-
-    /**
-     * Removes a custom plugin.
-     *
-     * @param string $name the plugin name
-     *
-     * @return void
-     */
-    public function removePlugin($name)
-    {
-        if (isset($this->plugins[$name])) {
-            unset($this->plugins[$name]);
-        }
-    }
-
-    /**
-     * Adds a filter to this Dwoo instance, it will be used to filter the output of all the templates rendered by this
-     * instance.
-     *
-     * @param mixed $callback a callback or a filter name if it is autoloaded from a plugin directory
-     * @param bool  $autoload if true, the first parameter must be a filter name from one of the plugin directories
-     *
-     * @return void
-     * @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
-     *
-     * @return void
-     */
-    public function removeFilter($callback)
-    {
-        if (($index = array_search('Dwoo_Filter_' . $callback, $this->filters, true)) !== false) {
-            unset($this->filters[$index]);
-        } elseif (($index = array_search($callback, $this->filters, true)) !== false) {
-            unset($this->filters[$index]);
-        } else {
-            $class = 'Dwoo_Filter_' . $callback;
-            foreach ($this->filters as $index => $filter) {
-                if (is_array($filter) && $filter[0] instanceof $class) {
-                    unset($this->filters[$index]);
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Adds a resource or overrides a default one.
-     *
-     * @param string   $name            the resource name
-     * @param string   $class           the resource class (which must implement Dwoo_ITemplate)
-     * @param callback $compilerFactory the compiler factory callback, a function that must return a compiler instance
-     *                                  used to compile this resource, if none is provided. by default it will produce
-     *                                  a Dwoo_Compiler object
-     *
-     * @return void
-     * @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');
-        }
-
-        if (!class_exists($class)) {
-            throw new Dwoo_Exception('Resource class does not exist');
-        }
-
-        $interfaces = class_implements($class);
-        if (in_array('Dwoo_ITemplate', $interfaces) === false) {
-            throw new Dwoo_Exception('Resource class must implement Dwoo_ITemplate');
-        }
-
-        $this->resources[$name] = array(
-            'class'    => $class,
-            'compiler' => $compilerFactory
-        );
-    }
-
-    /**
-     * Removes a custom resource.
-     *
-     * @param string $name the resource name
-     *
-     * @return void
-     */
-    public function removeResource($name)
-    {
-        unset($this->resources[$name]);
-        if ($name === 'file') {
-            $this->resources['file'] = array(
-                'class'    => 'Dwoo_Template_File',
-                'compiler' => null
-            );
-        }
-    }
-
-    /**
-     * Sets the loader object to use to load plugins.
-     *
-     * @param Dwoo_ILoader $loader loader
-     *
-     * @return void
-     */
-    public function setLoader(Dwoo_ILoader $loader)
-    {
-        $this->loader = $loader;
-    }
-
-    /**
-     * Returns the current loader object or a default one if none is currently found.
-     *
-     * @return Dwoo_ILoader|Dwoo_Loader
-     */
-    public function getLoader()
-    {
-        if ($this->loader === null) {
-            $this->loader = new Dwoo_Loader($this->getCompileDir());
-        }
-
-        return $this->loader;
-    }
-
-    /**
-     * Returns the custom plugins loaded.
-     * used by the Dwoo_ITemplate classes to pass the custom plugins to their Dwoo_ICompiler instance
-     *
-     * @return array
-     */
-    public function getCustomPlugins()
-    {
-        return $this->plugins;
-    }
-
-    /**
-     * Returns the cache directory with a trailing DIRECTORY_SEPARATOR.
-     *
-     * @return string
-     */
-    public function getCacheDir()
-    {
-        if ($this->cacheDir === null) {
-            $this->setCacheDir(DWOO_DIRECTORY . 'cache' . DIRECTORY_SEPARATOR);
-        }
-
-        return $this->cacheDir;
-    }
-
-    /**
-     * Sets the cache directory and automatically appends a DIRECTORY_SEPARATOR.
-     *
-     * @param string $dir the cache directory
-     *
-     * @return void
-     * @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');
-        }
-    }
-
-    /**
-     * Returns the compile directory with a trailing DIRECTORY_SEPARATOR.
-     *
-     * @return string
-     */
-    public function getCompileDir()
-    {
-        if ($this->compileDir === null) {
-            $this->setCompileDir(DWOO_DIRECTORY . 'compiled' . DIRECTORY_SEPARATOR);
-        }
-
-        return $this->compileDir;
-    }
-
-    /**
-     * Sets the compile directory and automatically appends a DIRECTORY_SEPARATOR.
-     *
-     * @param string $dir the compile directory
-     *
-     * @return void
-     * @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;
-    }
-
-    /**
-     * Sets the default cache time to use with templates that do not have a cache time set.
-     *
-     * @param int $seconds the duration in seconds
-     *
-     * @return void
-     */
-    public function setCacheTime($seconds)
-    {
-        $this->cacheTime = (int)$seconds;
-    }
-
-    /**
-     * Returns the character set used by the string manipulation plugins.
-     * the charset is automatically lowercased
-     *
-     * @return string
-     */
-    public function getCharset()
-    {
-        return $this->charset;
-    }
-
-    /**
-     * Sets the character set used by the string manipulation plugins.
-     * the charset will be automatically lowercased
-     *
-     * @param string $charset the character set
-     *
-     * @return void
-     */
-    public function setCharset($charset)
-    {
-        $this->charset = strtolower((string)$charset);
-    }
-
-    /**
-     * Returns the current template being rendered, when applicable, or null.
-     *
-     * @return Dwoo_ITemplate|null
-     */
-    public function getTemplate()
-    {
-        return $this->template;
-    }
-
-    /**
-     * Sets the current template being rendered.
-     *
-     * @param Dwoo_ITemplate $tpl template object
-     *
-     * @return void
-     */
-    public function setTemplate(Dwoo_ITemplate $tpl)
-    {
-        $this->template = $tpl;
-    }
-
-    /**
-     * Sets the default compiler factory function for the given resource name.
-     * a compiler factory must return a Dwoo_ICompiler object pre-configured to fit your needs
-     *
-     * @param string   $resourceName    the resource name (i.e. file, string)
-     * @param callback $compilerFactory the compiler factory callback
-     *
-     * @return void
-     */
-    public function setDefaultCompilerFactory($resourceName, $compilerFactory)
-    {
-        $this->resources[$resourceName]['compiler'] = $compilerFactory;
-    }
-
-    /**
-     * Returns the default compiler factory function for the given resource name.
-     *
-     * @param string $resourceName the resource name
-     *
-     * @return callback the compiler factory callback
-     */
-    public function getDefaultCompilerFactory($resourceName)
-    {
-        return $this->resources[$resourceName]['compiler'];
-    }
-
-    /**
-     * Sets the security policy object to enforce some php security settings.
-     * use this if untrusted persons can modify templates
-     *
-     * @param Dwoo_Security_Policy $policy the security policy object
-     *
-     * @return void
-     */
-    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
-     *
-     * @return void
-     */
-    public function setPluginProxy(Dwoo_IPluginProxy $pluginProxy)
-    {
-        $this->pluginProxy = $pluginProxy;
-    }
-
-    /**
-     * Returns the current plugin proxy object or null by default.
-     *
-     * @return Dwoo_IPluginProxy
-     */
-    public function getPluginProxy()
-    {
-        return $this->pluginProxy;
-    }
-
-    /**
-     * 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.
-     *
-     * @return int
-     */
-    public function clearCompiled()
-    {
-        $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->getCompileDir()), \RecursiveIteratorIterator::SELF_FIRST);
-        $count    = 0;
-        foreach ($iterator as $file) {
-            if ($file->isFile()) {
-                $count += unlink($file->__toString()) ? 1 : 0;
-            }
-        }
-
-        return $count;
-    }
-
-    /**
-     * 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;
-        foreach ($iterator as $file) {
-            if ($file->isFile() && $file->getCTime() < $expired) {
-                $count += unlink((string)$file) ? 1 : 0;
-            }
-        }
-
-        return $count;
-    }
-
-    /**
-     * Fetches a template object of the given resource.
-     *
-     * @param string         $resourceName   the resource name (i.e. file, string)
-     * @param string         $resourceId     the resource identifier (i.e. file path)
-     * @param int            $cacheTime      the cache time setting for this resource
-     * @param string         $cacheId        the unique cache identifier
-     * @param string         $compileId      the unique compiler identifier
-     * @param Dwoo_ITemplate $parentTemplate the parent template
-     *
-     * @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);
-        }
-
-        throw new Dwoo_Exception('Unknown resource type : ' . $resourceName);
-    }
-
-    /**
-     * 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;
-            }
-
-            return $this->count($value);
-        }
-
-        return false;
-    }
-
-    /**
-     * 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;
-    }
-
-    /**
-     * Counts an array or arrayaccess/traversable object.
-     *
-     * @param mixed $value the value to count
-     *
-     * @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;
-    }
-
-    /**
-     * Triggers a dwoo error.
-     *
-     * @param string $message the error message
-     * @param int    $level   the error level, one of the PHP's E_* constants
-     *
-     * @return void
-     */
-    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);
-    }
-
-    /**
-     * 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;
-    }
-
-    /**
-     * 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()
-     *
-     * @return void
-     */
-    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);
-    }
-
-    /**
-     * Returns the parent block of the given block.
-     *
-     * @param Dwoo_Block_Plugin $block the block class plugin
-     *
-     * @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;
-    }
-
-    /**
-     * 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;
-    }
-
-    /**
-     * 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
-     *
-     * @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);
-    }
-
-    /**
-     * 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);
-        }
-    }
-
-    /**
-     * 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];
-        }
-    }
-
-    /**
-     * 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;
-    }
-
-    /**
-     * 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;
-        }
-    }
-
-    /**
-     * 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;
-    }
-
-    /**
-     * 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;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * 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;
-    }
-
-    /**
-     * Returns the entire data array.
-     *
-     * @return array
-     */
-    public function getData()
-    {
-        return $this->data;
-    }
-
-    /**
-     * Sets a return value for the currently running template.
-     *
-     * @param string $name  var name
-     * @param mixed  $value var value
-     *
-     * @return void
-     */
-    public function setReturnValue($name, $value)
-    {
-        $this->returnData[$name] = $value;
-    }
-
-    /**
-     * Retrieves the return values set by the template.
-     *
-     * @return array
-     */
-    public function getReturnValues()
-    {
-        return $this->returnData;
-    }
-
-    /**
-     * Returns a reference to the current scope.
-     *
-     * @return mixed
-     */
-    public function &getScope()
-    {
-        return $this->scope;
-    }
-
-    /**
-     * Redirects all calls to unexisting to plugin proxy.
-     *
-     * @param string $method the method name
-     * @param array  $args   array of arguments
-     *
-     * @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);
-    }
+	/**
+	 * 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;
+
+	/**
+	 * Constants that represents all plugin types
+	 * these are bitwise-operation-safe values to allow multiple types
+	 * on a single plugin
+	 *
+	 * @var int
+	 */
+	const CLASS_PLUGIN      = 1;
+	const FUNC_PLUGIN       = 2;
+	const NATIVE_PLUGIN     = 4;
+	const BLOCK_PLUGIN      = 8;
+	const COMPILABLE_PLUGIN = 16;
+	const CUSTOM_PLUGIN     = 32;
+	const SMARTY_MODIFIER   = 64;
+	const SMARTY_BLOCK      = 128;
+	const SMARTY_FUNCTION   = 256;
+	const PROXY_PLUGIN      = 512;
+	const TEMPLATE_PLUGIN   = 1024;
+
+	/**
+	 * Character set of the template, used by string manipulation plugins.
+	 * it must be lowercase, but setCharset() will take care of that
+	 *
+	 * @see setCharset
+	 * @see getCharset
+	 * @var string
+	 */
+	protected $charset = 'utf-8';
+
+	/**
+	 * Global variables that are accessible through $dwoo.* in the templates.
+	 * default values include:
+	 * $dwoo.version - current version number
+	 * $dwoo.ad - a Powered by Dwoo link pointing to dwoo.org
+	 * $dwoo.now - the current time
+	 * $dwoo.template - the current template filename
+	 * $dwoo.charset - the character set used by the template
+	 * on top of that, foreach and other plugins can store special values in there,
+	 * see their documentation for more details.
+	 *
+	 * @var array
+	 */
+	public $globals;
+
+	/**
+	 * Directory where the compiled templates are stored.
+	 * defaults to DWOO_COMPILEDIR (= dwoo_dir/compiled by default)
+	 *
+	 * @var string
+	 */
+	protected $compileDir;
+
+	/**
+	 * Directory where the cached templates are stored.
+	 * defaults to DWOO_CACHEDIR (= dwoo_dir/cache by default)
+	 *
+	 * @var string
+	 */
+	protected $cacheDir;
+
+	/**
+	 * Defines how long (in seconds) the cached files must remain valid.
+	 * can be overriden on a per-template basis
+	 * -1 = never delete
+	 * 0 = disabled
+	 * >0 = duration in seconds
+	 *
+	 * @var int
+	 */
+	protected $cacheTime = 0;
+
+	/**
+	 * Security policy object.
+	 *
+	 * @var Dwoo_Security_Policy
+	 */
+	protected $securityPolicy = null;
+
+	/**
+	 * Stores the custom plugins callbacks.
+	 *
+	 * @see addPlugin
+	 * @see removePlugin
+	 * @var array
+	 */
+	protected $plugins = array();
+
+	/**
+	 * Stores the filter callbacks.
+	 *
+	 * @see addFilter
+	 * @see removeFilter
+	 * @var array
+	 */
+	protected $filters = array();
+
+	/**
+	 * Stores the resource types and associated
+	 * classes / compiler classes.
+	 *
+	 * @var array
+	 */
+	protected $resources = array(
+		'file'   => array(
+			'class'    => 'Dwoo_Template_File',
+			'compiler' => null,
+		),
+		'string' => array(
+			'class'    => 'Dwoo_Template_String',
+			'compiler' => null,
+		),
+	);
+
+	/**
+	 * The dwoo loader object used to load plugins by this dwoo instance.
+	 *
+	 * @var Dwoo_ILoader
+	 */
+	protected $loader = null;
+
+	/**
+	 * Currently rendered template, set to null when not-rendering.
+	 *
+	 * @var Dwoo_ITemplate
+	 */
+	protected $template = null;
+
+	/**
+	 * Stores the instances of the class plugins during template runtime.
+	 *
+	 * @var array
+	 */
+	protected $runtimePlugins;
+
+	/**
+	 * Stores the returned values during template runtime.
+	 *
+	 * @var array
+	 */
+	protected $returnData;
+
+	/**
+	 * Stores the data during template runtime.
+	 *
+	 * @var array
+	 */
+	public $data;
+
+	/**
+	 * Stores the current scope during template runtime.
+	 * this should ideally not be accessed directly from outside template code
+	 *
+	 * @var mixed
+	 */
+	public $scope;
+
+	/**
+	 * Stores the scope tree during template runtime.
+	 *
+	 * @var array
+	 */
+	protected $scopeTree;
+
+	/**
+	 * Stores the block plugins stack during template runtime.
+	 *
+	 * @var array
+	 */
+	protected $stack;
+
+	/**
+	 * Stores the current block plugin at the top of the stack during template runtime.
+	 *
+	 * @var Dwoo_Block_Plugin
+	 */
+	protected $curBlock;
+
+	/**
+	 * Stores the output buffer during template runtime.
+	 *
+	 * @var string
+	 */
+	protected $buffer;
+
+	/**
+	 * Stores plugin proxy.
+	 *
+	 * @var Dwoo_IPluginProxy
+	 */
+	protected $pluginProxy;
+
+	/**
+	 * Constructor, sets the cache and compile dir to the default values if not provided.
+	 *
+	 * @param string $compileDir path to the compiled directory, defaults to lib/compiled
+	 * @param string $cacheDir   path to the cache directory, defaults to lib/cache
+	 */
+	public function __construct($compileDir = null, $cacheDir = null)
+	{
+		if ($compileDir !== null) {
+			$this->setCompileDir($compileDir);
+		}
+		if ($cacheDir !== null) {
+			$this->setCacheDir($cacheDir);
+		}
+		$this->initGlobals();
+	}
+
+	/**
+	 * Resets some runtime variables to allow a cloned object to be used to render sub-templates.
+	 *
+	 * @return void
+	 */
+	public function __clone()
+	{
+		$this->template = null;
+		unset($this->data);
+		unset($this->returnData);
+	}
+
+	/**
+	 * Autputs the template instead of returning it, this is basically a shortcut for get(*, *, *, true).
+	 *
+	 * @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);
+	}
+
+	/**
+	 * Returns the given template rendered using the provided data and optional compiler.
+	 *
+	 * @param mixed          $_tpl      template, can either be a Dwoo_ITemplate object (i.e. Dwoo_Template_File), a
+	 *                                  valid path to a template, or a template as a string it is recommended to
+	 *                                  provide a Dwoo_ITemplate as it will probably make things faster, especially if
+	 *                                  you render a template multiple times
+	 * @param mixed          $data      the data to use, can either be a Dwoo_IDataProvider object (i.e. Dwoo_Data) or
+	 *                                  an associative array. if you're rendering the template from cache, it can be
+	 *                                  left null
+	 * @param Dwoo_ICompiler $_compiler the compiler that must be used to compile the template, if left empty a default
+	 *                                  Dwoo_Compiler will be used
+	 * @param bool           $_output   flag that defines whether the function returns the output of the template
+	 *                                  (false, default) or echoes it directly (true)
+	 *
+	 * @return string|void or the template output if $output is false
+	 * @throws Dwoo_Exception
+	 */
+	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
+	 *
+	 * @return void
+	 */
+	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
+	 *
+	 * @return void
+	 */
+	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();
+	}
+
+	/**
+	 * Adds a custom plugin that is not in one of the plugin directories.
+	 *
+	 * @param string   $name       the plugin name to be used in the templates
+	 * @param callback $callback   the plugin callback, either a function name,
+	 *                             a class name or an array containing an object
+	 *                             or class name and a method name
+	 * @param bool     $compilable if set to true, the plugin is assumed to be compilable
+	 *
+	 * @return void
+	 * @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)) {
+			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
+					);
+				} else {
+					$this->plugins[$name] = array(
+						'type'     => self::CLASS_PLUGIN | $compilable,
+						'callback' => $callback,
+						'class'    => $callback,
+						'function' => ($compilable ? 'compile' : 'process')
+					);
+				}
+			} elseif (function_exists($callback)) {
+				$this->plugins[$name] = array(
+					'type'     => self::FUNC_PLUGIN | $compilable,
+					'callback' => $callback
+				);
+			} else {
+				throw new Dwoo_Exception('Callback could not be processed correctly, please check that the function/class you used exists');
+			}
+		} 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');
+		}
+	}
+
+	/**
+	 * Removes a custom plugin.
+	 *
+	 * @param string $name the plugin name
+	 *
+	 * @return void
+	 */
+	public function removePlugin($name)
+	{
+		if (isset($this->plugins[$name])) {
+			unset($this->plugins[$name]);
+		}
+	}
+
+	/**
+	 * Adds a filter to this Dwoo instance, it will be used to filter the output of all the templates rendered by this
+	 * instance.
+	 *
+	 * @param mixed $callback a callback or a filter name if it is autoloaded from a plugin directory
+	 * @param bool  $autoload if true, the first parameter must be a filter name from one of the plugin directories
+	 *
+	 * @return void
+	 * @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
+	 *
+	 * @return void
+	 */
+	public function removeFilter($callback)
+	{
+		if (($index = array_search('Dwoo_Filter_' . $callback, $this->filters, true)) !== false) {
+			unset($this->filters[$index]);
+		} elseif (($index = array_search($callback, $this->filters, true)) !== false) {
+			unset($this->filters[$index]);
+		} else {
+			$class = 'Dwoo_Filter_' . $callback;
+			foreach ($this->filters as $index => $filter) {
+				if (is_array($filter) && $filter[0] instanceof $class) {
+					unset($this->filters[$index]);
+					break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Adds a resource or overrides a default one.
+	 *
+	 * @param string   $name            the resource name
+	 * @param string   $class           the resource class (which must implement Dwoo_ITemplate)
+	 * @param callback $compilerFactory the compiler factory callback, a function that must return a compiler instance
+	 *                                  used to compile this resource, if none is provided. by default it will produce
+	 *                                  a Dwoo_Compiler object
+	 *
+	 * @return void
+	 * @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');
+		}
+
+		if (!class_exists($class)) {
+			throw new Dwoo_Exception('Resource class does not exist');
+		}
+
+		$interfaces = class_implements($class);
+		if (in_array('Dwoo_ITemplate', $interfaces) === false) {
+			throw new Dwoo_Exception('Resource class must implement Dwoo_ITemplate');
+		}
+
+		$this->resources[$name] = array(
+			'class'    => $class,
+			'compiler' => $compilerFactory
+		);
+	}
+
+	/**
+	 * Removes a custom resource.
+	 *
+	 * @param string $name the resource name
+	 *
+	 * @return void
+	 */
+	public function removeResource($name)
+	{
+		unset($this->resources[$name]);
+		if ($name === 'file') {
+			$this->resources['file'] = array(
+				'class'    => 'Dwoo_Template_File',
+				'compiler' => null
+			);
+		}
+	}
+
+	/**
+	 * Sets the loader object to use to load plugins.
+	 *
+	 * @param Dwoo_ILoader $loader loader
+	 *
+	 * @return void
+	 */
+	public function setLoader(Dwoo_ILoader $loader)
+	{
+		$this->loader = $loader;
+	}
+
+	/**
+	 * Returns the current loader object or a default one if none is currently found.
+	 *
+	 * @return Dwoo_ILoader|Dwoo_Loader
+	 */
+	public function getLoader()
+	{
+		if ($this->loader === null) {
+			$this->loader = new Dwoo_Loader($this->getCompileDir());
+		}
+
+		return $this->loader;
+	}
+
+	/**
+	 * Returns the custom plugins loaded.
+	 * used by the Dwoo_ITemplate classes to pass the custom plugins to their Dwoo_ICompiler instance
+	 *
+	 * @return array
+	 */
+	public function getCustomPlugins()
+	{
+		return $this->plugins;
+	}
+
+	/**
+	 * Returns the cache directory with a trailing DIRECTORY_SEPARATOR.
+	 *
+	 * @return string
+	 */
+	public function getCacheDir()
+	{
+		if ($this->cacheDir === null) {
+			$this->setCacheDir(DWOO_DIRECTORY . 'cache' . DIRECTORY_SEPARATOR);
+		}
+
+		return $this->cacheDir;
+	}
+
+	/**
+	 * Sets the cache directory and automatically appends a DIRECTORY_SEPARATOR.
+	 *
+	 * @param string $dir the cache directory
+	 *
+	 * @return void
+	 * @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');
+		}
+	}
+
+	/**
+	 * Returns the compile directory with a trailing DIRECTORY_SEPARATOR.
+	 *
+	 * @return string
+	 */
+	public function getCompileDir()
+	{
+		if ($this->compileDir === null) {
+			$this->setCompileDir(DWOO_DIRECTORY . 'compiled' . DIRECTORY_SEPARATOR);
+		}
+
+		return $this->compileDir;
+	}
+
+	/**
+	 * Sets the compile directory and automatically appends a DIRECTORY_SEPARATOR.
+	 *
+	 * @param string $dir the compile directory
+	 *
+	 * @return void
+	 * @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;
+	}
+
+	/**
+	 * Sets the default cache time to use with templates that do not have a cache time set.
+	 *
+	 * @param int $seconds the duration in seconds
+	 *
+	 * @return void
+	 */
+	public function setCacheTime($seconds)
+	{
+		$this->cacheTime = (int)$seconds;
+	}
+
+	/**
+	 * Returns the character set used by the string manipulation plugins.
+	 * the charset is automatically lowercased
+	 *
+	 * @return string
+	 */
+	public function getCharset()
+	{
+		return $this->charset;
+	}
+
+	/**
+	 * Sets the character set used by the string manipulation plugins.
+	 * the charset will be automatically lowercased
+	 *
+	 * @param string $charset the character set
+	 *
+	 * @return void
+	 */
+	public function setCharset($charset)
+	{
+		$this->charset = strtolower((string)$charset);
+	}
+
+	/**
+	 * Returns the current template being rendered, when applicable, or null.
+	 *
+	 * @return Dwoo_ITemplate|null
+	 */
+	public function getTemplate()
+	{
+		return $this->template;
+	}
+
+	/**
+	 * Sets the current template being rendered.
+	 *
+	 * @param Dwoo_ITemplate $tpl template object
+	 *
+	 * @return void
+	 */
+	public function setTemplate(Dwoo_ITemplate $tpl)
+	{
+		$this->template = $tpl;
+	}
+
+	/**
+	 * Sets the default compiler factory function for the given resource name.
+	 * a compiler factory must return a Dwoo_ICompiler object pre-configured to fit your needs
+	 *
+	 * @param string   $resourceName    the resource name (i.e. file, string)
+	 * @param callback $compilerFactory the compiler factory callback
+	 *
+	 * @return void
+	 */
+	public function setDefaultCompilerFactory($resourceName, $compilerFactory)
+	{
+		$this->resources[$resourceName]['compiler'] = $compilerFactory;
+	}
+
+	/**
+	 * Returns the default compiler factory function for the given resource name.
+	 *
+	 * @param string $resourceName the resource name
+	 *
+	 * @return callback the compiler factory callback
+	 */
+	public function getDefaultCompilerFactory($resourceName)
+	{
+		return $this->resources[$resourceName]['compiler'];
+	}
+
+	/**
+	 * Sets the security policy object to enforce some php security settings.
+	 * use this if untrusted persons can modify templates
+	 *
+	 * @param Dwoo_Security_Policy $policy the security policy object
+	 *
+	 * @return void
+	 */
+	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
+	 *
+	 * @return void
+	 */
+	public function setPluginProxy(Dwoo_IPluginProxy $pluginProxy)
+	{
+		$this->pluginProxy = $pluginProxy;
+	}
+
+	/**
+	 * Returns the current plugin proxy object or null by default.
+	 *
+	 * @return Dwoo_IPluginProxy
+	 */
+	public function getPluginProxy()
+	{
+		return $this->pluginProxy;
+	}
+
+	/**
+	 * 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.
+	 *
+	 * @return int
+	 */
+	public function clearCompiled()
+	{
+		$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->getCompileDir()), \RecursiveIteratorIterator::SELF_FIRST);
+		$count    = 0;
+		foreach ($iterator as $file) {
+			if ($file->isFile()) {
+				$count += unlink($file->__toString()) ? 1 : 0;
+			}
+		}
+
+		return $count;
+	}
+
+	/**
+	 * 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;
+		foreach ($iterator as $file) {
+			if ($file->isFile() && $file->getCTime() < $expired) {
+				$count += unlink((string)$file) ? 1 : 0;
+			}
+		}
+
+		return $count;
+	}
+
+	/**
+	 * Fetches a template object of the given resource.
+	 *
+	 * @param string         $resourceName   the resource name (i.e. file, string)
+	 * @param string         $resourceId     the resource identifier (i.e. file path)
+	 * @param int            $cacheTime      the cache time setting for this resource
+	 * @param string         $cacheId        the unique cache identifier
+	 * @param string         $compileId      the unique compiler identifier
+	 * @param Dwoo_ITemplate $parentTemplate the parent template
+	 *
+	 * @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);
+		}
+
+		throw new Dwoo_Exception('Unknown resource type : ' . $resourceName);
+	}
+
+	/**
+	 * 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;
+			}
+
+			return $this->count($value);
+		}
+
+		return false;
+	}
+
+	/**
+	 * 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;
+	}
+
+	/**
+	 * Counts an array or arrayaccess/traversable object.
+	 *
+	 * @param mixed $value the value to count
+	 *
+	 * @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;
+	}
+
+	/**
+	 * Triggers a dwoo error.
+	 *
+	 * @param string $message the error message
+	 * @param int    $level   the error level, one of the PHP's E_* constants
+	 *
+	 * @return void
+	 */
+	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);
+	}
+
+	/**
+	 * 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;
+	}
+
+	/**
+	 * 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()
+	 *
+	 * @return void
+	 */
+	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);
+	}
+
+	/**
+	 * Returns the parent block of the given block.
+	 *
+	 * @param Dwoo_Block_Plugin $block the block class plugin
+	 *
+	 * @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;
+	}
+
+	/**
+	 * 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;
+	}
+
+	/**
+	 * 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
+	 *
+	 * @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);
+	}
+
+	/**
+	 * 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);
+		}
+	}
+
+	/**
+	 * 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];
+		}
+	}
+
+	/**
+	 * 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;
+	}
+
+	/**
+	 * 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;
+		}
+	}
+
+	/**
+	 * 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;
+	}
+
+	/**
+	 * 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;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * 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;
+	}
+
+	/**
+	 * Returns the entire data array.
+	 *
+	 * @return array
+	 */
+	public function getData()
+	{
+		return $this->data;
+	}
+
+	/**
+	 * Sets a return value for the currently running template.
+	 *
+	 * @param string $name  var name
+	 * @param mixed  $value var value
+	 *
+	 * @return void
+	 */
+	public function setReturnValue($name, $value)
+	{
+		$this->returnData[$name] = $value;
+	}
+
+	/**
+	 * Retrieves the return values set by the template.
+	 *
+	 * @return array
+	 */
+	public function getReturnValues()
+	{
+		return $this->returnData;
+	}
+
+	/**
+	 * Returns a reference to the current scope.
+	 *
+	 * @return mixed
+	 */
+	public function &getScope()
+	{
+		return $this->scope;
+	}
+
+	/**
+	 * Redirects all calls to unexisting to plugin proxy.
+	 *
+	 * @param string $method the method name
+	 * @param array  $args   array of arguments
+	 *
+	 * @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);
+	}
 }

Switch Indentation +29 added lines, -29 removed lines

@@ -1482,35 +1482,35 @@
             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;
-                    }
+            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]);

Spacing +33 added lines, -33 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);
 }
 
 /**
@@ -374,7 +374,7 @@ 
             }
 
             if ($doCache === true) {
-                $out = preg_replace('/(<%|%>|<\?php|<\?|\?>)/', '<?php /*' . $dynamicId . '*/ echo \'$1\'; ?>', $out);
+                $out = preg_replace('/(<%|%>|<\?php|<\?|\?>)/', '<?php /*'.$dynamicId.'*/ echo \'$1\'; ?>', $out);
                 if (!class_exists('Dwoo_plugin_dynamic')) {
                     $this->getLoader()->loadPlugin('dynamic');
                 }
@@ -550,7 +550,7 @@ 
     public function addFilter($callback, $autoload = false)
     {
         if ($autoload) {
-            $class = 'Dwoo_Filter_' . $callback;
+            $class = 'Dwoo_Filter_'.$callback;
 
             if (!class_exists($class) && !function_exists($class)) {
                 try {
@@ -558,9 +558,9 @@ 
                 }
                 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) . '"');
+                        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"');
+                        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"');
                     }
                 }
             }
@@ -573,7 +573,7 @@ 
             } 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"');
+                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;
@@ -591,12 +591,12 @@ 
      */
     public function removeFilter($callback)
     {
-        if (($index = array_search('Dwoo_Filter_' . $callback, $this->filters, true)) !== false) {
+        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;
+            $class = 'Dwoo_Filter_'.$callback;
             foreach ($this->filters as $index => $filter) {
                 if (is_array($filter) && $filter[0] instanceof $class) {
                     unset($this->filters[$index]);
@@ -702,7 +702,7 @@ 
     public function getCacheDir()
     {
         if ($this->cacheDir === null) {
-            $this->setCacheDir(DWOO_DIRECTORY . 'cache' . DIRECTORY_SEPARATOR);
+            $this->setCacheDir(DWOO_DIRECTORY.'cache'.DIRECTORY_SEPARATOR);
         }
 
         return $this->cacheDir;
@@ -718,9 +718,9 @@ 
      */
     public function setCacheDir($dir)
     {
-        $this->cacheDir = rtrim($dir, '/\\') . DIRECTORY_SEPARATOR;
+        $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');
+            throw new Dwoo_Exception('The cache directory must be writable, chmod "'.$this->cacheDir.'" to make it writable');
         }
     }
 
@@ -732,7 +732,7 @@ 
     public function getCompileDir()
     {
         if ($this->compileDir === null) {
-            $this->setCompileDir(DWOO_DIRECTORY . 'compiled' . DIRECTORY_SEPARATOR);
+            $this->setCompileDir(DWOO_DIRECTORY.'compiled'.DIRECTORY_SEPARATOR);
         }
 
         return $this->compileDir;
@@ -748,9 +748,9 @@ 
      */
     public function setCompileDir($dir)
     {
-        $this->compileDir = rtrim($dir, '/\\') . DIRECTORY_SEPARATOR;
+        $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');
+            throw new Dwoo_Exception('The compile directory must be writable, chmod "'.$this->compileDir.'" to make it writable');
         }
     }
 
@@ -773,7 +773,7 @@ 
      */
     public function setCacheTime($seconds)
     {
-        $this->cacheTime = (int)$seconds;
+        $this->cacheTime = (int) $seconds;
     }
 
     /**
@@ -797,7 +797,7 @@ 
      */
     public function setCharset($charset)
     {
-        $this->charset = strtolower((string)$charset);
+        $this->charset = strtolower((string) $charset);
     }
 
     /**
@@ -934,11 +934,11 @@ 
     public function clearCache($olderThan = - 1)
     {
         $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->getCacheDir()), \RecursiveIteratorIterator::SELF_FIRST);
-        $expired  = time() - $olderThan;
+        $expired  = time()-$olderThan;
         $count    = 0;
         foreach ($iterator as $file) {
             if ($file->isFile() && $file->getCTime() < $expired) {
-                $count += unlink((string)$file) ? 1 : 0;
+                $count += unlink((string) $file) ? 1 : 0;
             }
         }
 
@@ -968,7 +968,7 @@ 
             ), $this, $resourceId, $cacheTime, $cacheId, $compileId, $parentTemplate);
         }
 
-        throw new Dwoo_Exception('Unknown resource type : ' . $resourceName);
+        throw new Dwoo_Exception('Unknown resource type : '.$resourceName);
     }
 
     /**
@@ -1068,7 +1068,7 @@ 
         if (!($tplIdentifier = $this->template->getResourceIdentifier())) {
             $tplIdentifier = $this->template->getResourceName();
         }
-        trigger_error('Dwoo error (in ' . $tplIdentifier . ') : ' . $message, $level);
+        trigger_error('Dwoo error (in '.$tplIdentifier.') : '.$message, $level);
     }
 
     /**
@@ -1084,7 +1084,7 @@ 
         if (isset($this->plugins[$blockName])) {
             $class = $this->plugins[$blockName]['class'];
         } else {
-            $class = 'Dwoo_Plugin_' . $blockName;
+            $class = 'Dwoo_Plugin_'.$blockName;
         }
 
         if ($this->curBlock !== null) {
@@ -1179,7 +1179,7 @@ 
     {
         $index = array_search($block, $this->stack, true);
         if ($index !== false && $index > 0) {
-            return $this->stack[$index - 1];
+            return $this->stack[$index-1];
         }
 
         return false;
@@ -1197,7 +1197,7 @@ 
         if (isset($this->plugins[$type])) {
             $type = $this->plugins[$type]['class'];
         } else {
-            $type = 'Dwoo_Plugin_' . str_replace('Dwoo_Plugin_', '', $type);
+            $type = 'Dwoo_Plugin_'.str_replace('Dwoo_Plugin_', '', $type);
         }
 
         $keys = array_keys($this->stack);
@@ -1238,7 +1238,7 @@ 
      */
     public function classCall($plugName, array $params = array())
     {
-        $class = 'Dwoo_Plugin_' . $plugName;
+        $class = 'Dwoo_Plugin_'.$plugName;
 
         $plugin = $this->getObjectPlugin($class);
 
@@ -1291,7 +1291,7 @@ 
 
                 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) {
                     while (($i = array_shift($keys)) !== null) {
@@ -1307,7 +1307,7 @@ 
                     }
                 } 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 {
@@ -1316,7 +1316,7 @@ 
 
                 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) {
                     while (($i = array_shift($keys)) !== null) {
@@ -1336,7 +1336,7 @@ 
                     }
                 } 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);
                     }
                 }
             }
@@ -1406,7 +1406,7 @@ 
         $tree = $this->scopeTree;
         $cur  = $this->data;
 
-        while ($parentLevels -- !== 0) {
+        while ($parentLevels-- !== 0) {
             array_pop($tree);
         }
 
@@ -1444,7 +1444,7 @@ 
                 } elseif ($varstr === '__' || $varstr === '_root') {
                     return $this->data;
                 } elseif ($varstr === '_' || $varstr === '_parent') {
-                    $varstr = '.' . $varstr;
+                    $varstr = '.'.$varstr;
                     $tree   = $this->scopeTree;
                     $cur    = $this->data;
                     array_pop($tree);
@@ -1470,7 +1470,7 @@ 
             }
 
             if (substr($varstr, 0, 1) === '.') {
-                $varstr = 'dwoo' . $varstr;
+                $varstr = 'dwoo'.$varstr;
             }
 
             preg_match_all('#(\[|->|\.)?((?:[^.[\]-]|-(?!>))+)\]?#i', $varstr, $m);
@@ -1580,7 +1580,7 @@ 
         $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);
+            $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;
@@ -1731,7 +1731,7 @@ 
     {
         $proxy = $this->getPluginProxy();
         if (!$proxy) {
-            throw new Dwoo_Exception('Call to undefined method ' . __CLASS__ . '::' . $method . '()');
+            throw new Dwoo_Exception('Call to undefined method '.__CLASS__.'::'.$method.'()');
         }
 
         return call_user_func_array($proxy->getCallback($method), $args);

Braces +1 added lines, -2 removed lines

@@ -555,8 +555,7 @@
             if (!class_exists($class) && !function_exists($class)) {
                 try {
                     $this->getLoader()->loadPlugin($callback);
-                }
-                catch (Dwoo_Exception $e) {
+                } 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 {

lib/Dwoo/Compilation/Exception.php

Indentation +16 added lines, -16 removed lines

@@ -19,23 +19,23 @@
  */
 class Dwoo_Compilation_Exception extends Dwoo_Exception
 {
-    protected $compiler;
-    protected $template;
+	protected $compiler;
+	protected $template;
 
-    public function __construct(Dwoo_Compiler $compiler, $message)
-    {
-        $this->compiler = $compiler;
-        $this->template = $compiler->getDwoo()->getTemplate();
-        parent::__construct('Compilation error at line '.$compiler->getLine().' in "'.$this->template->getResourceName().':'.$this->template->getResourceIdentifier().'" : '.$message);
-    }
+	public function __construct(Dwoo_Compiler $compiler, $message)
+	{
+		$this->compiler = $compiler;
+		$this->template = $compiler->getDwoo()->getTemplate();
+		parent::__construct('Compilation error at line '.$compiler->getLine().' in "'.$this->template->getResourceName().':'.$this->template->getResourceIdentifier().'" : '.$message);
+	}
 
-    public function getCompiler()
-    {
-        return $this->compiler;
-    }
+	public function getCompiler()
+	{
+		return $this->compiler;
+	}
 
-    public function getTemplate()
-    {
-        return $this->template;
-    }
+	public function getTemplate()
+	{
+		return $this->template;
+	}
 }

lib/Dwoo/IPluginProxy.php

Indentation +46 added lines, -46 removed lines

@@ -20,53 +20,53 @@
  */
 interface Dwoo_IPluginProxy
 {
-    /**
-     * returns true or false to say whether the given plugin is handled by this proxy or not.
-     *
-     * @param string $name the plugin name
-     *
-     * @return bool true if the plugin is known and usable, otherwise false
-     */
-    public function handles($name);
+	/**
+	 * returns true or false to say whether the given plugin is handled by this proxy or not.
+	 *
+	 * @param string $name the plugin name
+	 *
+	 * @return bool true if the plugin is known and usable, otherwise false
+	 */
+	public function handles($name);
 
-    /**
-     * returns the code (as a string) to call the plugin
-     * (this will be executed at runtime inside the Dwoo class).
-     *
-     * @param string $name   the plugin name
-     * @param array  $params a parameter array, array key "*" is the rest array
-     *
-     * @return string
-     */
-    public function getCode($name, $params);
+	/**
+	 * returns the code (as a string) to call the plugin
+	 * (this will be executed at runtime inside the Dwoo class).
+	 *
+	 * @param string $name   the plugin name
+	 * @param array  $params a parameter array, array key "*" is the rest array
+	 *
+	 * @return string
+	 */
+	public function getCode($name, $params);
 
-    /**
-     * returns a callback to the plugin, this is used with the reflection API to
-     * find out about the plugin's parameter names etc.
-     *
-     * should you need a rest array without the possibility to edit the
-     * plugin's code, you can provide a callback to some
-     * other function with the correct parameter signature, i.e. :
-     * <code>
-     * return array($this, "callbackHelper");
-     * // and callbackHelper would be as such:
-     * public function callbackHelper(array $rest=array()){}
-     * </code>
-     *
-     * @param string $name the plugin name
-     *
-     * @return callback
-     */
-    public function getCallback($name);
+	/**
+	 * returns a callback to the plugin, this is used with the reflection API to
+	 * find out about the plugin's parameter names etc.
+	 *
+	 * should you need a rest array without the possibility to edit the
+	 * plugin's code, you can provide a callback to some
+	 * other function with the correct parameter signature, i.e. :
+	 * <code>
+	 * return array($this, "callbackHelper");
+	 * // and callbackHelper would be as such:
+	 * public function callbackHelper(array $rest=array()){}
+	 * </code>
+	 *
+	 * @param string $name the plugin name
+	 *
+	 * @return callback
+	 */
+	public function getCallback($name);
 
-    /**
-     * returns some code that will check if the plugin is loaded and if not load it
-     * this is optional, if your plugins are autoloaded or whatever, just return an
-     * empty string.
-     *
-     * @param string $name the plugin name
-     *
-     * @return string
-     */
-    public function getLoader($name);
+	/**
+	 * returns some code that will check if the plugin is loaded and if not load it
+	 * this is optional, if your plugins are autoloaded or whatever, just return an
+	 * empty string.
+	 *
+	 * @param string $name the plugin name
+	 *
+	 * @return string
+	 */
+	public function getLoader($name);
 }

lib/Dwoo/Block/Plugin.php

Indentation +78 added lines, -78 removed lines

@@ -22,88 +22,88 @@
  */
 abstract class Dwoo_Block_Plugin extends Dwoo_Plugin
 {
-    /**
-     * stores the contents of the block while it runs.
-     *
-     * @var string
-     */
-    protected $buffer = '';
+	/**
+	 * stores the contents of the block while it runs.
+	 *
+	 * @var string
+	 */
+	protected $buffer = '';
 
-    /**
-     * buffers input, override only if necessary.
-     *
-     * @var string the content that must be buffered
-     */
-    public function buffer($input)
-    {
-        $this->buffer .= $input;
-    }
+	/**
+	 * buffers input, override only if necessary.
+	 *
+	 * @var string the content that must be buffered
+	 */
+	public function buffer($input)
+	{
+		$this->buffer .= $input;
+	}
 
-    // initialization code, receives the parameters from {block param1 param2}
-    // public function init($arg, $arg, ...);
+	// initialization code, receives the parameters from {block param1 param2}
+	// public function init($arg, $arg, ...);
 
-    /**
-     * called when the block ends, this is most of the time followed right away by a call
-     * of <em>process()</em> but not always, so this should be used to do any shutdown operations on the
-     * block object, if required.
-     */
-    public function end()
-    {
-    }
+	/**
+	 * called when the block ends, this is most of the time followed right away by a call
+	 * of <em>process()</em> but not always, so this should be used to do any shutdown operations on the
+	 * block object, if required.
+	 */
+	public function end()
+	{
+	}
 
-    /**
-     * called when the block output is required by a parent block.
-     *
-     * this must read $this->buffer and return it processed
-     *
-     * @return string
-     */
-    public function process()
-    {
-        return $this->buffer;
-    }
+	/**
+	 * called when the block output is required by a parent block.
+	 *
+	 * this must read $this->buffer and return it processed
+	 *
+	 * @return string
+	 */
+	public function process()
+	{
+		return $this->buffer;
+	}
 
-    /**
-     * called at compile time to define what the block should output in the compiled template code, happens when the block is declared
-     * basically this will replace the {block arg arg arg} tag in the template.
-     *
-     * @param Dwoo_Compiler $compiler the compiler instance that calls this function
-     * @param array         $params   an array containing original and compiled parameters
-     * @param string        $prepend  that is just meant to allow a child class to call
-     *                                parent::postProcessing($compiler, $params, "foo();") to add a command before the
-     *                                default commands are executed
-     * @param string        $append   that is just meant to allow a child class to call
-     *                                parent::postProcessing($compiler, $params, null, "foo();") to add a command after the
-     *                                default commands are executed
-     * @param string        $type     the type is the plugin class name used
-     *
-     * @return string
-     */
-    public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        return Dwoo_Compiler::PHP_OPEN.$prepend.'$this->addStack("'.$type.'", array('.Dwoo_Compiler::implode_r($compiler->getCompiledParams($params)).'));'.$append.Dwoo_Compiler::PHP_CLOSE;
-    }
+	/**
+	 * called at compile time to define what the block should output in the compiled template code, happens when the block is declared
+	 * basically this will replace the {block arg arg arg} tag in the template.
+	 *
+	 * @param Dwoo_Compiler $compiler the compiler instance that calls this function
+	 * @param array         $params   an array containing original and compiled parameters
+	 * @param string        $prepend  that is just meant to allow a child class to call
+	 *                                parent::postProcessing($compiler, $params, "foo();") to add a command before the
+	 *                                default commands are executed
+	 * @param string        $append   that is just meant to allow a child class to call
+	 *                                parent::postProcessing($compiler, $params, null, "foo();") to add a command after the
+	 *                                default commands are executed
+	 * @param string        $type     the type is the plugin class name used
+	 *
+	 * @return string
+	 */
+	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		return Dwoo_Compiler::PHP_OPEN.$prepend.'$this->addStack("'.$type.'", array('.Dwoo_Compiler::implode_r($compiler->getCompiledParams($params)).'));'.$append.Dwoo_Compiler::PHP_CLOSE;
+	}
 
-    /**
-     * called at compile time to define what the block should output in the compiled template code, happens when the block is ended
-     * basically this will replace the {/block} tag in the template.
-     *
-     * @see preProcessing
-     *
-     * @param Dwoo_Compiler $compiler the compiler instance that calls this function
-     * @param array         $params   an array containing original and compiled parameters, see preProcessing() for more details
-     * @param string        $prepend  that is just meant to allow a child class to call
-     *                                parent::postProcessing($compiler, $params, "foo();") to add a command before the
-     *                                default commands are executed
-     * @param string        $append   that is just meant to allow a child class to call
-     *                                parent::postProcessing($compiler, $params, null, "foo();") to add a command after the
-     *                                default commands are executed
-     * @param string        $content  the entire content of the block being closed
-     *
-     * @return string
-     */
-    public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        return $content.Dwoo_Compiler::PHP_OPEN.$prepend.'$this->delStack();'.$append.Dwoo_Compiler::PHP_CLOSE;
-    }
+	/**
+	 * called at compile time to define what the block should output in the compiled template code, happens when the block is ended
+	 * basically this will replace the {/block} tag in the template.
+	 *
+	 * @see preProcessing
+	 *
+	 * @param Dwoo_Compiler $compiler the compiler instance that calls this function
+	 * @param array         $params   an array containing original and compiled parameters, see preProcessing() for more details
+	 * @param string        $prepend  that is just meant to allow a child class to call
+	 *                                parent::postProcessing($compiler, $params, "foo();") to add a command before the
+	 *                                default commands are executed
+	 * @param string        $append   that is just meant to allow a child class to call
+	 *                                parent::postProcessing($compiler, $params, null, "foo();") to add a command after the
+	 *                                default commands are executed
+	 * @param string        $content  the entire content of the block being closed
+	 *
+	 * @return string
+	 */
+	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		return $content.Dwoo_Compiler::PHP_OPEN.$prepend.'$this->delStack();'.$append.Dwoo_Compiler::PHP_CLOSE;
+	}
 }

lib/Dwoo/ICompilable.php

Indentation +2 added lines, -2 removed lines

@@ -24,6 +24,6 @@
  */
 interface Dwoo_ICompilable
 {
-    // this replaces the process function
-    //public static function compile(Dwoo_Compiler $compiler, $arg, $arg, ...);
+	// this replaces the process function
+	//public static function compile(Dwoo_Compiler $compiler, $arg, $arg, ...);
 }