dwoo-project / dwoo

lib/Dwoo/Smarty/Adapter.php

Indentation +657 added lines, -657 removed lines

@@ -26,14 +26,14 @@ 
 use Dwoo\Smarty\Processor\Adapter as ProcessorAdapter;
 
 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);
 }
 
 /**
@@ -43,656 +43,656 @@ 
  */
 class Adapter extends Core
 {
-    /**
-     * Magic get/set/call functions that handle unsupported features
-     *
-     * @param string $p
-     * @param string $v
-     */
-    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);
-            }
-        }
-    }
-
-    /**
-     * @param $p
-     *
-     * @return mixed
-     */
-    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);
-            }
-        }
-    }
-
-    /**
-     * @param string $m
-     * @param array  $a
-     *
-     * @return mixed|void
-     */
-    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;
-
-    /**
-     * Adapter constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->charset      = 'iso-8859-1';
-        $this->dataProvider = new Data();
-        $this->compiler     = new Compiler();
-    }
-
-    /**
-     * @param      $filename
-     * @param null $cacheId
-     * @param null $compileId
-     */
-    public function display($filename, $cacheId = null, $compileId = null)
-    {
-        $this->fetch($filename, $cacheId, $compileId, true);
-    }
-
-    /**
-     * @param      $filename
-     * @param null $cacheId
-     * @param null $compileId
-     * @param bool $display
-     *
-     * @return string|void
-     */
-    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 SecurityPolicy();
-            $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 = SecurityPolicy::PHP_ALLOW;
-                break;
-            case SMARTY_PHP_QUOTE:
-                $phpTags = SecurityPolicy::PHP_ENCODE;
-                break;
-            case SMARTY_PHP_REMOVE:
-            default:
-                $phpTags = SecurityPolicy::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('PluginSmartyCompatible', true);
-            $this->compiler->setLooseOpeningHandling(true);
-        }
-
-        $this->compiler->setDelimiters($this->left_delimiter, $this->right_delimiter);
-
-        return $this->get($tpl, $this->dataProvider, $this->compiler, $display === true);
-    }
-
-    /**
-     * @param mixed $_tpl
-     * @param array $data
-     * @param null  $_compiler
-     * @param bool  $_output
-     *
-     * @return string|void
-     */
-    public function get($_tpl, $data = array(), $_compiler = null, $_output = false)
-    {
-        if ($_compiler === null) {
-            $_compiler = $this->compiler;
-        }
-
-        return parent::get($_tpl, $data, $_compiler, $_output);
-    }
-
-    /**
-     * @param      $name
-     * @param      $callback
-     * @param bool $cacheable
-     * @param null $cache_attrs
-     *
-     * @throws Exception
-     */
-    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 Exception('Multiple plugins of different types can not share the same name');
-        }
-        $this->plugins[$name] = array(
-            'type'     => self::SMARTY_FUNCTION,
-            'callback' => $callback
-        );
-    }
-
-    /**
-     * @param $name
-     */
-    public function unregister_function($name)
-    {
-        unset($this->plugins[$name]);
-    }
-
-    /**
-     * @param      $name
-     * @param      $callback
-     * @param bool $cacheable
-     * @param null $cache_attrs
-     *
-     * @throws Exception
-     */
-    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 Exception('Multiple plugins of different types can not share the same name');
-        }
-        $this->plugins[$name] = array(
-            'type'     => self::SMARTY_BLOCK,
-            'callback' => $callback
-        );
-    }
-
-    /**
-     * @param $name
-     */
-    public function unregister_block($name)
-    {
-        unset($this->plugins[$name]);
-    }
-
-    /**
-     * @param $name
-     * @param $callback
-     *
-     * @throws Exception
-     */
-    public function register_modifier($name, $callback)
-    {
-        if (isset($this->plugins[$name]) && $this->plugins[$name][0] !== self::SMARTY_MODIFIER) {
-            throw new Exception('Multiple plugins of different types can not share the same name');
-        }
-        $this->plugins[$name] = array(
-            'type'     => self::SMARTY_MODIFIER,
-            'callback' => $callback
-        );
-    }
-
-    /**
-     * @param $name
-     */
-    public function unregister_modifier($name)
-    {
-        unset($this->plugins[$name]);
-    }
-
-    /**
-     * @param $callback
-     */
-    public function register_prefilter($callback)
-    {
-        $processor = new ProcessorAdapter($this->compiler);
-        $processor->registerCallback($callback);
-        $this->_filters['pre'][] = $processor;
-        $this->compiler->addPreProcessor($processor);
-    }
-
-    /**
-     * @param $callback
-     */
-    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]);
-            }
-        }
-    }
-
-    /**
-     * @param $callback
-     */
-    public function register_postfilter($callback)
-    {
-        $processor = new ProcessorAdapter($this->compiler);
-        $processor->registerCallback($callback);
-        $this->_filters['post'][] = $processor;
-        $this->compiler->addPostProcessor($processor);
-    }
-
-    /**
-     * @param $callback
-     */
-    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]);
-            }
-        }
-    }
-
-    /**
-     * @param $callback
-     */
-    public function register_outputfilter($callback)
-    {
-        $filter = new FilterAdapter($this);
-        $filter->registerCallback($callback);
-        $this->_filters['output'][] = $filter;
-        $this->addFilter($filter);
-    }
-
-    /**
-     * @param $callback
-     */
-    public function unregister_outputfilter($callback)
-    {
-        foreach ($this->_filters['output'] as $index => $filter) {
-            if ($filter->callback === $callback) {
-                $this->removeOutputFilter($filter);
-                unset($this->_filters['output'][$index]);
-            }
-        }
-    }
-
-    /**
-     * @param       $object
-     * @param       $object_impl
-     * @param array $allowed
-     * @param bool  $smarty_args
-     * @param array $block_methods
-     */
-    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);
-    }
-
-    /**
-     * @param $object
-     */
-    public function unregister_object($object)
-    {
-        $this->dataProvider->clear($object);
-    }
-
-    /**
-     * @param $name
-     *
-     * @return mixed
-     */
-    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);
-        }
-    }
-
-    /**
-     * @param $filename
-     *
-     * @return bool
-     */
-    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;
-        }
-    }
-
-    /**
-     * @param      $tpl
-     * @param null $cacheId
-     * @param null $compileId
-     *
-     * @return bool
-     */
-    public function is_cached($tpl, $cacheId = null, $compileId = null)
-    {
-        return $this->isCached($this->makeTemplate($tpl, $cacheId, $compileId));
-    }
-
-    /**
-     * @param      $var
-     * @param      $value
-     * @param bool $merge
-     */
-    public function append_by_ref($var, &$value, $merge = false)
-    {
-        $this->dataProvider->appendByRef($var, $value, $merge);
-    }
-
-    /**
-     * @param $name
-     * @param $val
-     */
-    public function assign_by_ref($name, &$val)
-    {
-        $this->dataProvider->assignByRef($name, $val);
-    }
-
-    /**
-     * @param $var
-     */
-    public function clear_assign($var)
-    {
-        $this->dataProvider->clear($var);
-    }
-
-    /**
-     *
-     */
-    public function clear_all_assign()
-    {
-        $this->dataProvider->clear();
-    }
-
-    /**
-     * @param null $name
-     *
-     * @return array|null
-     */
-    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;
-    }
-
-    /**
-     * @param int $olderThan
-     */
-    public function clear_all_cache($olderThan = 0)
-    {
-        $this->clearCache($olderThan);
-    }
-
-    /**
-     * @param      $template
-     * @param null $cacheId
-     * @param null $compileId
-     * @param int  $olderThan
-     */
-    public function clear_cache($template, $cacheId = null, $compileId = null, $olderThan = 0)
-    {
-        $this->makeTemplate($template, $cacheId, $compileId)->clearCache($olderThan);
-    }
-
-    /**
-     * @param     $error_msg
-     * @param int $error_type
-     */
-    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'] = '}';
-    }
-
-    /**
-     * @param $file
-     * @param $cacheId
-     * @param $compileId
-     *
-     * @return mixed
-     * @throws Exception
-     */
-    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 TemplateFile($file, null, $cacheId, $compileId);
-            } elseif (is_string($this->template_dir) || is_array($this->template_dir)) {
-                self::$tplCache[$hash] = new TemplateFile($file, null, $cacheId, $compileId, $this->template_dir);
-            } else {
-                throw new Exception('Unable to load "' . $file . '", check the template_dir');
-            }
-        }
-
-        return self::$tplCache[$hash];
-    }
-
-    /**
-     * @param string $message
-     * @param int    $level
-     */
-    public function triggerError($message, $level = E_USER_NOTICE)
-    {
-        if (is_object($this->template)) {
-            parent::triggerError($message, $level);
-        }
-        trigger_error('Dwoo error : ' . $message, $level);
-    }
+	/**
+	 * Magic get/set/call functions that handle unsupported features
+	 *
+	 * @param string $p
+	 * @param string $v
+	 */
+	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);
+			}
+		}
+	}
+
+	/**
+	 * @param $p
+	 *
+	 * @return mixed
+	 */
+	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);
+			}
+		}
+	}
+
+	/**
+	 * @param string $m
+	 * @param array  $a
+	 *
+	 * @return mixed|void
+	 */
+	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;
+
+	/**
+	 * Adapter constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->charset      = 'iso-8859-1';
+		$this->dataProvider = new Data();
+		$this->compiler     = new Compiler();
+	}
+
+	/**
+	 * @param      $filename
+	 * @param null $cacheId
+	 * @param null $compileId
+	 */
+	public function display($filename, $cacheId = null, $compileId = null)
+	{
+		$this->fetch($filename, $cacheId, $compileId, true);
+	}
+
+	/**
+	 * @param      $filename
+	 * @param null $cacheId
+	 * @param null $compileId
+	 * @param bool $display
+	 *
+	 * @return string|void
+	 */
+	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 SecurityPolicy();
+			$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 = SecurityPolicy::PHP_ALLOW;
+				break;
+			case SMARTY_PHP_QUOTE:
+				$phpTags = SecurityPolicy::PHP_ENCODE;
+				break;
+			case SMARTY_PHP_REMOVE:
+			default:
+				$phpTags = SecurityPolicy::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('PluginSmartyCompatible', true);
+			$this->compiler->setLooseOpeningHandling(true);
+		}
+
+		$this->compiler->setDelimiters($this->left_delimiter, $this->right_delimiter);
+
+		return $this->get($tpl, $this->dataProvider, $this->compiler, $display === true);
+	}
+
+	/**
+	 * @param mixed $_tpl
+	 * @param array $data
+	 * @param null  $_compiler
+	 * @param bool  $_output
+	 *
+	 * @return string|void
+	 */
+	public function get($_tpl, $data = array(), $_compiler = null, $_output = false)
+	{
+		if ($_compiler === null) {
+			$_compiler = $this->compiler;
+		}
+
+		return parent::get($_tpl, $data, $_compiler, $_output);
+	}
+
+	/**
+	 * @param      $name
+	 * @param      $callback
+	 * @param bool $cacheable
+	 * @param null $cache_attrs
+	 *
+	 * @throws Exception
+	 */
+	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 Exception('Multiple plugins of different types can not share the same name');
+		}
+		$this->plugins[$name] = array(
+			'type'     => self::SMARTY_FUNCTION,
+			'callback' => $callback
+		);
+	}
+
+	/**
+	 * @param $name
+	 */
+	public function unregister_function($name)
+	{
+		unset($this->plugins[$name]);
+	}
+
+	/**
+	 * @param      $name
+	 * @param      $callback
+	 * @param bool $cacheable
+	 * @param null $cache_attrs
+	 *
+	 * @throws Exception
+	 */
+	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 Exception('Multiple plugins of different types can not share the same name');
+		}
+		$this->plugins[$name] = array(
+			'type'     => self::SMARTY_BLOCK,
+			'callback' => $callback
+		);
+	}
+
+	/**
+	 * @param $name
+	 */
+	public function unregister_block($name)
+	{
+		unset($this->plugins[$name]);
+	}
+
+	/**
+	 * @param $name
+	 * @param $callback
+	 *
+	 * @throws Exception
+	 */
+	public function register_modifier($name, $callback)
+	{
+		if (isset($this->plugins[$name]) && $this->plugins[$name][0] !== self::SMARTY_MODIFIER) {
+			throw new Exception('Multiple plugins of different types can not share the same name');
+		}
+		$this->plugins[$name] = array(
+			'type'     => self::SMARTY_MODIFIER,
+			'callback' => $callback
+		);
+	}
+
+	/**
+	 * @param $name
+	 */
+	public function unregister_modifier($name)
+	{
+		unset($this->plugins[$name]);
+	}
+
+	/**
+	 * @param $callback
+	 */
+	public function register_prefilter($callback)
+	{
+		$processor = new ProcessorAdapter($this->compiler);
+		$processor->registerCallback($callback);
+		$this->_filters['pre'][] = $processor;
+		$this->compiler->addPreProcessor($processor);
+	}
+
+	/**
+	 * @param $callback
+	 */
+	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]);
+			}
+		}
+	}
+
+	/**
+	 * @param $callback
+	 */
+	public function register_postfilter($callback)
+	{
+		$processor = new ProcessorAdapter($this->compiler);
+		$processor->registerCallback($callback);
+		$this->_filters['post'][] = $processor;
+		$this->compiler->addPostProcessor($processor);
+	}
+
+	/**
+	 * @param $callback
+	 */
+	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]);
+			}
+		}
+	}
+
+	/**
+	 * @param $callback
+	 */
+	public function register_outputfilter($callback)
+	{
+		$filter = new FilterAdapter($this);
+		$filter->registerCallback($callback);
+		$this->_filters['output'][] = $filter;
+		$this->addFilter($filter);
+	}
+
+	/**
+	 * @param $callback
+	 */
+	public function unregister_outputfilter($callback)
+	{
+		foreach ($this->_filters['output'] as $index => $filter) {
+			if ($filter->callback === $callback) {
+				$this->removeOutputFilter($filter);
+				unset($this->_filters['output'][$index]);
+			}
+		}
+	}
+
+	/**
+	 * @param       $object
+	 * @param       $object_impl
+	 * @param array $allowed
+	 * @param bool  $smarty_args
+	 * @param array $block_methods
+	 */
+	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);
+	}
+
+	/**
+	 * @param $object
+	 */
+	public function unregister_object($object)
+	{
+		$this->dataProvider->clear($object);
+	}
+
+	/**
+	 * @param $name
+	 *
+	 * @return mixed
+	 */
+	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);
+		}
+	}
+
+	/**
+	 * @param $filename
+	 *
+	 * @return bool
+	 */
+	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;
+		}
+	}
+
+	/**
+	 * @param      $tpl
+	 * @param null $cacheId
+	 * @param null $compileId
+	 *
+	 * @return bool
+	 */
+	public function is_cached($tpl, $cacheId = null, $compileId = null)
+	{
+		return $this->isCached($this->makeTemplate($tpl, $cacheId, $compileId));
+	}
+
+	/**
+	 * @param      $var
+	 * @param      $value
+	 * @param bool $merge
+	 */
+	public function append_by_ref($var, &$value, $merge = false)
+	{
+		$this->dataProvider->appendByRef($var, $value, $merge);
+	}
+
+	/**
+	 * @param $name
+	 * @param $val
+	 */
+	public function assign_by_ref($name, &$val)
+	{
+		$this->dataProvider->assignByRef($name, $val);
+	}
+
+	/**
+	 * @param $var
+	 */
+	public function clear_assign($var)
+	{
+		$this->dataProvider->clear($var);
+	}
+
+	/**
+	 *
+	 */
+	public function clear_all_assign()
+	{
+		$this->dataProvider->clear();
+	}
+
+	/**
+	 * @param null $name
+	 *
+	 * @return array|null
+	 */
+	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;
+	}
+
+	/**
+	 * @param int $olderThan
+	 */
+	public function clear_all_cache($olderThan = 0)
+	{
+		$this->clearCache($olderThan);
+	}
+
+	/**
+	 * @param      $template
+	 * @param null $cacheId
+	 * @param null $compileId
+	 * @param int  $olderThan
+	 */
+	public function clear_cache($template, $cacheId = null, $compileId = null, $olderThan = 0)
+	{
+		$this->makeTemplate($template, $cacheId, $compileId)->clearCache($olderThan);
+	}
+
+	/**
+	 * @param     $error_msg
+	 * @param int $error_type
+	 */
+	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'] = '}';
+	}
+
+	/**
+	 * @param $file
+	 * @param $cacheId
+	 * @param $compileId
+	 *
+	 * @return mixed
+	 * @throws Exception
+	 */
+	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 TemplateFile($file, null, $cacheId, $compileId);
+			} elseif (is_string($this->template_dir) || is_array($this->template_dir)) {
+				self::$tplCache[$hash] = new TemplateFile($file, null, $cacheId, $compileId, $this->template_dir);
+			} else {
+				throw new Exception('Unable to load "' . $file . '", check the template_dir');
+			}
+		}
+
+		return self::$tplCache[$hash];
+	}
+
+	/**
+	 * @param string $message
+	 * @param int    $level
+	 */
+	public function triggerError($message, $level = E_USER_NOTICE)
+	{
+		if (is_object($this->template)) {
+			parent::triggerError($message, $level);
+		}
+		trigger_error('Dwoo error : ' . $message, $level);
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -63,12 +63,12 @@ 
         }
         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->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);
+                $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);
             }
         }
     }
@@ -82,13 +82,13 @@ 
     {
         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->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);
+                $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);
             }
         }
     }
@@ -110,9 +110,9 @@ 
             );
         } 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);
+                $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);
+                $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);
             }
         }
     }
@@ -525,7 +525,7 @@ 
         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);
+            trigger_error('Dwoo_Compiler: object "'.$name.'" was not registered or is not an object', E_USER_ERROR);
         }
     }
 
@@ -537,10 +537,10 @@ 
     public function template_exists($filename)
     {
         if (!is_array($this->template_dir)) {
-            return file_exists($this->template_dir . DIRECTORY_SEPARATOR . $filename);
+            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)) {
+                if (file_exists($tpl_dir.DIRECTORY_SEPARATOR.$filename)) {
                     return true;
                 }
             }
@@ -669,7 +669,7 @@ 
             $compileId = $this->compile_id;
         }
 
-        $hash = bin2hex(md5($file . $cacheId . $compileId, true));
+        $hash = bin2hex(md5($file.$cacheId.$compileId, true));
         if (!isset(self::$tplCache[$hash])) {
             // abs path
             if (substr($file, 0, 1) === '/' || substr($file, 1, 1) === ':') {
@@ -677,7 +677,7 @@ 
             } elseif (is_string($this->template_dir) || is_array($this->template_dir)) {
                 self::$tplCache[$hash] = new TemplateFile($file, null, $cacheId, $compileId, $this->template_dir);
             } else {
-                throw new Exception('Unable to load "' . $file . '", check the template_dir');
+                throw new Exception('Unable to load "'.$file.'", check the template_dir');
             }
         }
 
@@ -693,6 +693,6 @@ 
         if (is_object($this->template)) {
             parent::triggerError($message, $level);
         }
-        trigger_error('Dwoo error : ' . $message, $level);
+        trigger_error('Dwoo error : '.$message, $level);
     }
 }

lib/Dwoo/Smarty/Filter/Adapter.php

Indentation +17 added lines, -17 removed lines

@@ -23,23 +23,23 @@
  */
 class Adapter extends Filter
 {
-    public $callback;
+	public $callback;
 
-    /**
-     * @param string $input
-     *
-     * @return mixed
-     */
-    public function process($input)
-    {
-        return call_user_func($this->callback, $input);
-    }
+	/**
+	 * @param string $input
+	 *
+	 * @return mixed
+	 */
+	public function process($input)
+	{
+		return call_user_func($this->callback, $input);
+	}
 
-    /**
-     * @param $callback
-     */
-    public function registerCallback($callback)
-    {
-        $this->callback = $callback;
-    }
+	/**
+	 * @param $callback
+	 */
+	public function registerCallback($callback)
+	{
+		$this->callback = $callback;
+	}
 }
\ No newline at end of file

lib/Dwoo/Smarty/Processor/Adapter.php

Indentation +17 added lines, -17 removed lines

@@ -23,23 +23,23 @@
  */
 class Adapter extends Processor
 {
-    public $callback;
+	public $callback;
 
-    /**
-     * @param string $input
-     *
-     * @return mixed
-     */
-    public function process($input)
-    {
-        return call_user_func($this->callback, $input);
-    }
+	/**
+	 * @param string $input
+	 *
+	 * @return mixed
+	 */
+	public function process($input)
+	{
+		return call_user_func($this->callback, $input);
+	}
 
-    /**
-     * @param $callback
-     */
-    public function registerCallback($callback)
-    {
-        $this->callback = $callback;
-    }
+	/**
+	 * @param $callback
+	 */
+	public function registerCallback($callback)
+	{
+		$this->callback = $callback;
+	}
 }
\ No newline at end of file

lib/Dwoo/IPluginProxy.php

Indentation +45 added lines, -45 removed lines

@@ -23,52 +23,52 @@
  */
 interface 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/Filter.php

Indentation +24 added lines, -24 removed lines

@@ -23,30 +23,30 @@
  */
 abstract class Filter
 {
-    /**
-     * The dwoo instance that runs this filter.
-     *
-     * @var Core
-     */
-    protected $dwoo;
+	/**
+	 * The dwoo instance that runs this filter.
+	 *
+	 * @var Core
+	 */
+	protected $dwoo;
 
-    /**
-     * Constructor, if you override it, call parent::__construct($dwoo); or assign
-     * the dwoo instance yourself if you need it.
-     *
-     * @param Core $dwoo the dwoo instance that runs this plugin
-     */
-    public function __construct(Core $dwoo)
-    {
-        $this->dwoo = $dwoo;
-    }
+	/**
+	 * Constructor, if you override it, call parent::__construct($dwoo); or assign
+	 * the dwoo instance yourself if you need it.
+	 *
+	 * @param Core $dwoo the dwoo instance that runs this plugin
+	 */
+	public function __construct(Core $dwoo)
+	{
+		$this->dwoo = $dwoo;
+	}
 
-    /**
-     * Processes the input and returns it filtered.
-     *
-     * @param string $input the template to process
-     *
-     * @return string
-     */
-    abstract public function process($input);
+	/**
+	 * Processes the input and returns it filtered.
+	 *
+	 * @param string $input the template to process
+	 *
+	 * @return string
+	 */
+	abstract public function process($input);
 }

lib/Dwoo/ILoader.php

Indentation +11 added lines, -11 removed lines

@@ -23,15 +23,15 @@
  */
 interface ILoader
 {
-    /**
-     * Loads a plugin file.
-     * the second parameter is used to avoid permanent rehashing when using php functions,
-     * however this means that if you have add a plugin that overrides a php function you have
-     * to delete the classpath.cache file(s) by hand to force a rehash of the plugins
-     *
-     * @param string $class       the plugin name, without the `Plugin` prefix
-     * @param bool   $forceRehash if true, the class path caches will be rebuilt if the plugin is not found, in case it
-     *                            has just been added, defaults to true
-     */
-    public function loadPlugin($class, $forceRehash = true);
+	/**
+	 * Loads a plugin file.
+	 * the second parameter is used to avoid permanent rehashing when using php functions,
+	 * however this means that if you have add a plugin that overrides a php function you have
+	 * to delete the classpath.cache file(s) by hand to force a rehash of the plugins
+	 *
+	 * @param string $class       the plugin name, without the `Plugin` prefix
+	 * @param bool   $forceRehash if true, the class path caches will be rebuilt if the plugin is not found, in case it
+	 *                            has just been added, defaults to true
+	 */
+	public function loadPlugin($class, $forceRehash = true);
 }

lib/Dwoo/ICompilable.php

Indentation +2 added lines, -2 removed lines

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

lib/Dwoo/Processor.php

Indentation +24 added lines, -24 removed lines

@@ -23,30 +23,30 @@
  */
 abstract class Processor
 {
-    /**
-     * The compiler instance that runs this processor.
-     *
-     * @var Core
-     */
-    protected $compiler;
+	/**
+	 * The compiler instance that runs this processor.
+	 *
+	 * @var Core
+	 */
+	protected $compiler;
 
-    /**
-     * Constructor, if you override it, call parent::__construct($compiler); or assign
-     * the dwoo instance yourself if you need it.
-     *
-     * @param Compiler $compiler the compiler class
-     */
-    public function __construct(Compiler $compiler)
-    {
-        $this->compiler = $compiler;
-    }
+	/**
+	 * Constructor, if you override it, call parent::__construct($compiler); or assign
+	 * the dwoo instance yourself if you need it.
+	 *
+	 * @param Compiler $compiler the compiler class
+	 */
+	public function __construct(Compiler $compiler)
+	{
+		$this->compiler = $compiler;
+	}
 
-    /**
-     * Processes the input and returns it filtered.
-     *
-     * @param string $input the template to process
-     *
-     * @return string
-     */
-    abstract public function process($input);
+	/**
+	 * Processes the input and returns it filtered.
+	 *
+	 * @param string $input the template to process
+	 *
+	 * @return string
+	 */
+	abstract public function process($input);
 }

lib/Dwoo/Plugin.php

Indentation +70 added lines, -70 removed lines

@@ -25,81 +25,81 @@
  */
 abstract class Plugin
 {
-    /**
-     * The dwoo instance that runs this plugin.
-     *
-     * @var Core
-     */
-    protected $core;
+	/**
+	 * The dwoo instance that runs this plugin.
+	 *
+	 * @var Core
+	 */
+	protected $core;
 
-    /**
-     * Constructor, if you override it, call parent::__construct($core); or assign
-     * the dwoo instance yourself if you need it.
-     *
-     * @param Core $core the dwoo instance that runs this plugin
-     */
-    public function __construct(Core $core)
-    {
-        $this->core = $core;
-    }
+	/**
+	 * Constructor, if you override it, call parent::__construct($core); or assign
+	 * the dwoo instance yourself if you need it.
+	 *
+	 * @param Core $core the dwoo instance that runs this plugin
+	 */
+	public function __construct(Core $core)
+	{
+		$this->core = $core;
+	}
 
-    // plugins should always implement :
-    // public function process($arg, $arg, ...)
-    // or for block plugins :
-    // public function init($arg, $arg, ...)
+	// plugins should always implement :
+	// public function process($arg, $arg, ...)
+	// or for block plugins :
+	// public function init($arg, $arg, ...)
 
-    // this could be enforced with :
-    // abstract public function process(...);
-    // if my feature request gets enough interest one day
-    // see => http://bugs.php.net/bug.php?id=44043
+	// this could be enforced with :
+	// abstract public function process(...);
+	// if my feature request gets enough interest one day
+	// see => http://bugs.php.net/bug.php?id=44043
 
-    /**
-     * Utility function that converts an array of compiled parameters (or rest array) to a string of xml/html tag
-     * attributes. this is to be used in preProcessing or postProcessing functions, example :
-     *  $p = $compiler->getCompiledParams($params);
-     *  // get only the rest array as attributes
-     *  $attributes = Plugin::paramsToAttributes($p['*']);
-     *  // get all the parameters as attributes (if there is a rest array, it will be included)
-     *  $attributes = Plugin::paramsToAttributes($p);
-     *
-     * @param array    $params   an array of attributeName=>value items that will be compiled to be ready for inclusion in a php string
-     *                                inclusion in a php string
-     * @param string   $delim    the string delimiter you want to use (defaults to ')
-     * @param Compiler $compiler the compiler instance (optional for BC, but recommended to pass it for proper escaping behavior)
-     *                                escaping behavior)
-     *
-     * @return string
-     */
-    public static function paramsToAttributes(array $params, $delim = '\'', Compiler $compiler = null)
-    {
-        if (isset($params['*'])) {
-            $params = array_merge($params, $params['*']);
-            unset($params['*']);
-        }
+	/**
+	 * Utility function that converts an array of compiled parameters (or rest array) to a string of xml/html tag
+	 * attributes. this is to be used in preProcessing or postProcessing functions, example :
+	 *  $p = $compiler->getCompiledParams($params);
+	 *  // get only the rest array as attributes
+	 *  $attributes = Plugin::paramsToAttributes($p['*']);
+	 *  // get all the parameters as attributes (if there is a rest array, it will be included)
+	 *  $attributes = Plugin::paramsToAttributes($p);
+	 *
+	 * @param array    $params   an array of attributeName=>value items that will be compiled to be ready for inclusion in a php string
+	 *                                inclusion in a php string
+	 * @param string   $delim    the string delimiter you want to use (defaults to ')
+	 * @param Compiler $compiler the compiler instance (optional for BC, but recommended to pass it for proper escaping behavior)
+	 *                                escaping behavior)
+	 *
+	 * @return string
+	 */
+	public static function paramsToAttributes(array $params, $delim = '\'', Compiler $compiler = null)
+	{
+		if (isset($params['*'])) {
+			$params = array_merge($params, $params['*']);
+			unset($params['*']);
+		}
 
-        $out = '';
-        foreach ($params as $attr => $val) {
-            $out .= ' ' . $attr . '=';
-            if (trim($val, '"\'') == '' || $val == 'null') {
-                $out .= str_replace($delim, '\\' . $delim, '""');
-            } elseif (substr($val, 0, 1) === $delim && substr($val, - 1) === $delim) {
-                $out .= str_replace($delim, '\\' . $delim, '"' . substr($val, 1, - 1) . '"');
-            } else {
-                if (!$compiler) {
-                    // disable double encoding since it can not be determined if it was encoded
-                    $escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset, false) : $tmp2).';
-                } elseif (!$compiler->getAutoEscape() || false === strpos($val, 'isset($this->scope')) {
-                    // escape if auto escaping is disabled, or there was no variable in the string
-                    $escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset) : $tmp2).';
-                } else {
-                    // print as is
-                    $escapedVal = '.' . $val . '.';
-                }
+		$out = '';
+		foreach ($params as $attr => $val) {
+			$out .= ' ' . $attr . '=';
+			if (trim($val, '"\'') == '' || $val == 'null') {
+				$out .= str_replace($delim, '\\' . $delim, '""');
+			} elseif (substr($val, 0, 1) === $delim && substr($val, - 1) === $delim) {
+				$out .= str_replace($delim, '\\' . $delim, '"' . substr($val, 1, - 1) . '"');
+			} else {
+				if (!$compiler) {
+					// disable double encoding since it can not be determined if it was encoded
+					$escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset, false) : $tmp2).';
+				} elseif (!$compiler->getAutoEscape() || false === strpos($val, 'isset($this->scope')) {
+					// escape if auto escaping is disabled, or there was no variable in the string
+					$escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset) : $tmp2).';
+				} else {
+					// print as is
+					$escapedVal = '.' . $val . '.';
+				}
 
-                $out .= str_replace($delim, '\\' . $delim, '"') . $delim . $escapedVal . $delim . str_replace($delim, '\\' . $delim, '"');
-            }
-        }
+				$out .= str_replace($delim, '\\' . $delim, '"') . $delim . $escapedVal . $delim . str_replace($delim, '\\' . $delim, '"');
+			}
+		}
 
-        return ltrim($out);
-    }
+		return ltrim($out);
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -79,24 +79,24 @@
 
         $out = '';
         foreach ($params as $attr => $val) {
-            $out .= ' ' . $attr . '=';
+            $out .= ' '.$attr.'=';
             if (trim($val, '"\'') == '' || $val == 'null') {
-                $out .= str_replace($delim, '\\' . $delim, '""');
+                $out .= str_replace($delim, '\\'.$delim, '""');
             } elseif (substr($val, 0, 1) === $delim && substr($val, - 1) === $delim) {
-                $out .= str_replace($delim, '\\' . $delim, '"' . substr($val, 1, - 1) . '"');
+                $out .= str_replace($delim, '\\'.$delim, '"'.substr($val, 1, - 1).'"');
             } else {
                 if (!$compiler) {
                     // disable double encoding since it can not be determined if it was encoded
-                    $escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset, false) : $tmp2).';
+                    $escapedVal = '.(is_string($tmp2='.$val.') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset, false) : $tmp2).';
                 } elseif (!$compiler->getAutoEscape() || false === strpos($val, 'isset($this->scope')) {
                     // escape if auto escaping is disabled, or there was no variable in the string
-                    $escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset) : $tmp2).';
+                    $escapedVal = '.(is_string($tmp2='.$val.') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset) : $tmp2).';
                 } else {
                     // print as is
-                    $escapedVal = '.' . $val . '.';
+                    $escapedVal = '.'.$val.'.';
                 }
 
-                $out .= str_replace($delim, '\\' . $delim, '"') . $delim . $escapedVal . $delim . str_replace($delim, '\\' . $delim, '"');
+                $out .= str_replace($delim, '\\'.$delim, '"').$delim.$escapedVal.$delim.str_replace($delim, '\\'.$delim, '"');
             }
         }