dwoo-project / dwoo

lib/Dwoo/Adapters/Agavi/DwooRenderer.php

Indentation +153 added lines, -153 removed lines

@@ -48,157 +48,157 @@
  */
 class DwooRenderer extends AgaviRenderer implements AgaviIReusableRenderer
 {
-    /**
-     * @constant   string The directory inside the cache dir where templates will
-     *                    be stored in compiled form.
-     */
-    const COMPILE_DIR = 'templates';
-
-    /**
-     * @constant   string The subdirectory inside the compile dir where templates
-     *                    will be stored in compiled form.
-     */
-    const COMPILE_SUBDIR = 'dwoo';
-
-    /**
-     * @constant   string The directory inside the cache dir where cached content
-     *                    will be stored.
-     */
-    const CACHE_DIR = 'dwoo';
-
-    /**
-     * @var Dwoo Dwoo template engine
-     */
-    protected $dwoo = null;
-
-    /**
-     * @var string A string with the default template file extension,
-     *             including the dot
-     */
-    protected $defaultExtension = '.html';
-
-    /**
-     * stores the (optional) plugin directories to add to the Dwoo_Loader.
-     */
-    protected $plugin_dir = null;
-
-    /**
-     * Pre-serialization callback.
-     *
-     * Excludes the Dwoo instance to prevent excessive serialization load.
-     */
-    public function __sleep()
-    {
-        $keys = parent::__sleep();
-        unset($keys[array_search('dwoo', $keys)]);
-
-        return $keys;
-    }
-
-    /**
-     * Initialize this Renderer.
-     *
-     * @param      AgaviContext The current application context
-     * @param      array        An associative array of initialization parameters
-     */
-    public function initialize(AgaviContext $context, array $parameters = array())
-    {
-        parent::initialize($context, $parameters);
-
-        $this->plugin_dir = $this->getParameter('plugin_dir', $this->plugin_dir);
-    }
-
-    /**
-     * provides a custom compiler to the dwoo renderer with optional settings
-     * you can set in the agavi output_types.xml config file.
-     *
-     * @return Dwoo_Compiler
-     */
-    public function compilerFactory()
-    {
-        $compiler = Dwoo_Compiler::compilerFactory();
-        $compiler->setAutoEscape((bool) $this->getParameter('auto_escape', false));
-
-        return $compiler;
-    }
-
-    /**
-     * Grab a cleaned up dwoo instance.
-     *
-     * @return Dwoo A Dwoo instance
-     */
-    protected function getEngine()
-    {
-        if ($this->dwoo) {
-            return $this->dwoo;
-        }
-
-        // this triggers Agavi autoload
-        if (!class_exists('Dwoo')) {
-            if (file_exists(dirname(__FILE__).'/../../../dwooAutoload.php')) {
-                // file was dropped with the entire dwoo package
-                require dirname(__FILE__).'/../../../dwooAutoload.php';
-            } else {
-                // assume the dwoo package is in the include path
-                require 'dwooAutoload.php';
-            }
-        }
-
-        $parentMode = fileperms(AgaviConfig::get('core.cache_dir'));
-
-        $compileDir = AgaviConfig::get('core.cache_dir').DIRECTORY_SEPARATOR.self::COMPILE_DIR.DIRECTORY_SEPARATOR.self::COMPILE_SUBDIR;
-        AgaviToolkit::mkdir($compileDir, $parentMode, true);
-
-        $cacheDir = AgaviConfig::get('core.cache_dir').DIRECTORY_SEPARATOR.self::CACHE_DIR;
-        AgaviToolkit::mkdir($cacheDir, $parentMode, true);
-
-        $this->dwoo = new Dwoo_Core($compileDir, $cacheDir);
-
-        if (!empty($this->plugin_dir)) {
-            foreach ((array) $this->plugin_dir as $dir) {
-                $this->dwoo->getLoader()->addDirectory($dir);
-            }
-        }
-
-        $this->dwoo->setDefaultCompilerFactory('file', array($this, 'compilerFactory'));
-
-        return $this->dwoo;
-    }
-
-    /**
-     * Render the presentation and return the result.
-     *
-     * @param      AgaviTemplateLayer The template layer to render
-     * @param      array              The template variables
-     * @param      array              The slots
-     * @param      array              Associative array of additional assigns
-     *
-     * @return string A rendered result
-     */
-    public function render(AgaviTemplateLayer $layer, array &$attributes = array(), array &$slots = array(), array &$moreAssigns = array())
-    {
-        $engine = $this->getEngine();
-
-        $data = array();
-        if ($this->extractVars) {
-            $data = $attributes;
-        } else {
-            $data[$this->varName] = &$attributes;
-        }
-
-        $data[$this->slotsVarName] = &$slots;
-
-        foreach ($this->assigns as $key => $getter) {
-            $data[$key] = $this->getContext()->$getter();
-        }
-
-        foreach ($moreAssigns as $key => &$value) {
-            if (isset($this->moreAssignNames[$key])) {
-                $key = $this->moreAssignNames[$key];
-            }
-            $data[$key] = &$value;
-        }
-
-        return $engine->get($layer->getResourceStreamIdentifier(), $data);
-    }
+	/**
+	 * @constant   string The directory inside the cache dir where templates will
+	 *                    be stored in compiled form.
+	 */
+	const COMPILE_DIR = 'templates';
+
+	/**
+	 * @constant   string The subdirectory inside the compile dir where templates
+	 *                    will be stored in compiled form.
+	 */
+	const COMPILE_SUBDIR = 'dwoo';
+
+	/**
+	 * @constant   string The directory inside the cache dir where cached content
+	 *                    will be stored.
+	 */
+	const CACHE_DIR = 'dwoo';
+
+	/**
+	 * @var Dwoo Dwoo template engine
+	 */
+	protected $dwoo = null;
+
+	/**
+	 * @var string A string with the default template file extension,
+	 *             including the dot
+	 */
+	protected $defaultExtension = '.html';
+
+	/**
+	 * stores the (optional) plugin directories to add to the Dwoo_Loader.
+	 */
+	protected $plugin_dir = null;
+
+	/**
+	 * Pre-serialization callback.
+	 *
+	 * Excludes the Dwoo instance to prevent excessive serialization load.
+	 */
+	public function __sleep()
+	{
+		$keys = parent::__sleep();
+		unset($keys[array_search('dwoo', $keys)]);
+
+		return $keys;
+	}
+
+	/**
+	 * Initialize this Renderer.
+	 *
+	 * @param      AgaviContext The current application context
+	 * @param      array        An associative array of initialization parameters
+	 */
+	public function initialize(AgaviContext $context, array $parameters = array())
+	{
+		parent::initialize($context, $parameters);
+
+		$this->plugin_dir = $this->getParameter('plugin_dir', $this->plugin_dir);
+	}
+
+	/**
+	 * provides a custom compiler to the dwoo renderer with optional settings
+	 * you can set in the agavi output_types.xml config file.
+	 *
+	 * @return Dwoo_Compiler
+	 */
+	public function compilerFactory()
+	{
+		$compiler = Dwoo_Compiler::compilerFactory();
+		$compiler->setAutoEscape((bool) $this->getParameter('auto_escape', false));
+
+		return $compiler;
+	}
+
+	/**
+	 * Grab a cleaned up dwoo instance.
+	 *
+	 * @return Dwoo A Dwoo instance
+	 */
+	protected function getEngine()
+	{
+		if ($this->dwoo) {
+			return $this->dwoo;
+		}
+
+		// this triggers Agavi autoload
+		if (!class_exists('Dwoo')) {
+			if (file_exists(dirname(__FILE__).'/../../../dwooAutoload.php')) {
+				// file was dropped with the entire dwoo package
+				require dirname(__FILE__).'/../../../dwooAutoload.php';
+			} else {
+				// assume the dwoo package is in the include path
+				require 'dwooAutoload.php';
+			}
+		}
+
+		$parentMode = fileperms(AgaviConfig::get('core.cache_dir'));
+
+		$compileDir = AgaviConfig::get('core.cache_dir').DIRECTORY_SEPARATOR.self::COMPILE_DIR.DIRECTORY_SEPARATOR.self::COMPILE_SUBDIR;
+		AgaviToolkit::mkdir($compileDir, $parentMode, true);
+
+		$cacheDir = AgaviConfig::get('core.cache_dir').DIRECTORY_SEPARATOR.self::CACHE_DIR;
+		AgaviToolkit::mkdir($cacheDir, $parentMode, true);
+
+		$this->dwoo = new Dwoo_Core($compileDir, $cacheDir);
+
+		if (!empty($this->plugin_dir)) {
+			foreach ((array) $this->plugin_dir as $dir) {
+				$this->dwoo->getLoader()->addDirectory($dir);
+			}
+		}
+
+		$this->dwoo->setDefaultCompilerFactory('file', array($this, 'compilerFactory'));
+
+		return $this->dwoo;
+	}
+
+	/**
+	 * Render the presentation and return the result.
+	 *
+	 * @param      AgaviTemplateLayer The template layer to render
+	 * @param      array              The template variables
+	 * @param      array              The slots
+	 * @param      array              Associative array of additional assigns
+	 *
+	 * @return string A rendered result
+	 */
+	public function render(AgaviTemplateLayer $layer, array &$attributes = array(), array &$slots = array(), array &$moreAssigns = array())
+	{
+		$engine = $this->getEngine();
+
+		$data = array();
+		if ($this->extractVars) {
+			$data = $attributes;
+		} else {
+			$data[$this->varName] = &$attributes;
+		}
+
+		$data[$this->slotsVarName] = &$slots;
+
+		foreach ($this->assigns as $key => $getter) {
+			$data[$key] = $this->getContext()->$getter();
+		}
+
+		foreach ($moreAssigns as $key => &$value) {
+			if (isset($this->moreAssignNames[$key])) {
+				$key = $this->moreAssignNames[$key];
+			}
+			$data[$key] = &$value;
+		}
+
+		return $engine->get($layer->getResourceStreamIdentifier(), $data);
+	}
 }

lib/Dwoo/Adapters/CodeIgniter/config/dwootemplate.php

Indentation +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
  if (!defined('BASEPATH')) {
-     exit('No direct script access allowed');
+	 exit('No direct script access allowed');
  }
 
 // The name of the directory where templates are located.

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

Indentation +151 added lines, -151 removed lines

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

lib/Dwoo/Data.php

Indentation +221 added lines, -221 removed lines

@@ -20,243 +20,243 @@
  */
 class Dwoo_Data implements Dwoo_IDataProvider
 {
-    /**
-     * data array.
-     *
-     * @var array
-     */
-    protected $data = array();
+	/**
+	 * data array.
+	 *
+	 * @var array
+	 */
+	protected $data = array();
 
-    /**
-     * returns the data array.
-     *
-     * @return array
-     */
-    public function getData()
-    {
-        return $this->data;
-    }
+	/**
+	 * returns the data array.
+	 *
+	 * @return array
+	 */
+	public function getData()
+	{
+		return $this->data;
+	}
 
-    /**
-     * clears a the entire data or only the given key.
-     *
-     * @param array|string $name clears only one value if you give a name, multiple values if
-     *                           you give an array of names, or the entire data if left null
-     */
-    public function clear($name = null)
-    {
-        if ($name === null) {
-            $this->data = array();
-        } elseif (is_array($name)) {
-            foreach ($name as $index) {
-                unset($this->data[$index]);
-            }
-        } else {
-            unset($this->data[$name]);
-        }
-    }
+	/**
+	 * clears a the entire data or only the given key.
+	 *
+	 * @param array|string $name clears only one value if you give a name, multiple values if
+	 *                           you give an array of names, or the entire data if left null
+	 */
+	public function clear($name = null)
+	{
+		if ($name === null) {
+			$this->data = array();
+		} elseif (is_array($name)) {
+			foreach ($name as $index) {
+				unset($this->data[$index]);
+			}
+		} else {
+			unset($this->data[$name]);
+		}
+	}
 
-    /**
-     * overwrites the entire data with the given array.
-     *
-     * @param array $data the new data array to use
-     */
-    public function setData(array $data)
-    {
-        $this->data = $data;
-    }
+	/**
+	 * overwrites the entire data with the given array.
+	 *
+	 * @param array $data the new data array to use
+	 */
+	public function setData(array $data)
+	{
+		$this->data = $data;
+	}
 
-    /**
-     * merges the given array(s) with the current data with array_merge.
-     *
-     * @param array $data  the array to merge
-     * @param array $data2 $data3 ... other arrays to merge, optional, etc
-     */
-    public function mergeData(array $data)
-    {
-        $args = func_get_args();
-        while (list(, $v) = each($args)) {
-            if (is_array($v)) {
-                $this->data = array_merge($this->data, $v);
-            }
-        }
-    }
+	/**
+	 * merges the given array(s) with the current data with array_merge.
+	 *
+	 * @param array $data  the array to merge
+	 * @param array $data2 $data3 ... other arrays to merge, optional, etc
+	 */
+	public function mergeData(array $data)
+	{
+		$args = func_get_args();
+		while (list(, $v) = each($args)) {
+			if (is_array($v)) {
+				$this->data = array_merge($this->data, $v);
+			}
+		}
+	}
 
-    /**
-     * assigns a value or an array of values to the data object.
-     *
-     * @param array|string $name an associative array of multiple (index=>value) or a string
-     *                           that is the index to use, i.e. a value assigned to "foo" will be
-     *                           accessible in the template through {$foo}
-     * @param mixed        $val  the value to assign, or null if $name was an array
-     */
-    public function assign($name, $val = null)
-    {
-        if (is_array($name)) {
-            reset($name);
-            while (list($k, $v) = each($name)) {
-                $this->data[$k] = $v;
-            }
-        } else {
-            $this->data[$name] = $val;
-        }
-    }
+	/**
+	 * assigns a value or an array of values to the data object.
+	 *
+	 * @param array|string $name an associative array of multiple (index=>value) or a string
+	 *                           that is the index to use, i.e. a value assigned to "foo" will be
+	 *                           accessible in the template through {$foo}
+	 * @param mixed        $val  the value to assign, or null if $name was an array
+	 */
+	public function assign($name, $val = null)
+	{
+		if (is_array($name)) {
+			reset($name);
+			while (list($k, $v) = each($name)) {
+				$this->data[$k] = $v;
+			}
+		} else {
+			$this->data[$name] = $val;
+		}
+	}
 
-    /**
-     * allows to assign variables using the object syntax.
-     *
-     * @param string $name  the variable name
-     * @param string $value the value to assign to it
-     */
-    public function __set($name, $value)
-    {
-        $this->assign($name, $value);
-    }
+	/**
+	 * allows to assign variables using the object syntax.
+	 *
+	 * @param string $name  the variable name
+	 * @param string $value the value to assign to it
+	 */
+	public function __set($name, $value)
+	{
+		$this->assign($name, $value);
+	}
 
-    /**
-     * assigns a value by reference to the data object.
-     *
-     * @param string $name the index to use, i.e. a value assigned to "foo" will be
-     *                     accessible in the template through {$foo}
-     * @param mixed  $val  the value to assign by reference
-     */
-    public function assignByRef($name, &$val)
-    {
-        $this->data[$name] = &$val;
-    }
+	/**
+	 * assigns a value by reference to the data object.
+	 *
+	 * @param string $name the index to use, i.e. a value assigned to "foo" will be
+	 *                     accessible in the template through {$foo}
+	 * @param mixed  $val  the value to assign by reference
+	 */
+	public function assignByRef($name, &$val)
+	{
+		$this->data[$name] = &$val;
+	}
 
-    /**
-     * appends values or an array of values to the data object.
-     *
-     * @param array|string $name  an associative array of multiple (index=>value) or a string
-     *                            that is the index to use, i.e. a value assigned to "foo" will be
-     *                            accessible in the template through {$foo}
-     * @param mixed        $val   the value to assign, or null if $name was an array
-     * @param bool         $merge true to merge data or false to append, defaults to false
-     */
-    public function append($name, $val = null, $merge = false)
-    {
-        if (is_array($name)) {
-            foreach ($name as $key => $val) {
-                if (isset($this->data[$key]) && !is_array($this->data[$key])) {
-                    settype($this->data[$key], 'array');
-                }
+	/**
+	 * appends values or an array of values to the data object.
+	 *
+	 * @param array|string $name  an associative array of multiple (index=>value) or a string
+	 *                            that is the index to use, i.e. a value assigned to "foo" will be
+	 *                            accessible in the template through {$foo}
+	 * @param mixed        $val   the value to assign, or null if $name was an array
+	 * @param bool         $merge true to merge data or false to append, defaults to false
+	 */
+	public function append($name, $val = null, $merge = false)
+	{
+		if (is_array($name)) {
+			foreach ($name as $key => $val) {
+				if (isset($this->data[$key]) && !is_array($this->data[$key])) {
+					settype($this->data[$key], 'array');
+				}
 
-                if ($merge === true && is_array($val)) {
-                    $this->data[$key] = $val + $this->data[$key];
-                } else {
-                    $this->data[$key][] = $val;
-                }
-            }
-        } elseif ($val !== null) {
-            if (isset($this->data[$name]) && !is_array($this->data[$name])) {
-                settype($this->data[$name], 'array');
-            } elseif (!isset($this->data[$name])) {
-                $this->data[$name] = array();
-            }
+				if ($merge === true && is_array($val)) {
+					$this->data[$key] = $val + $this->data[$key];
+				} else {
+					$this->data[$key][] = $val;
+				}
+			}
+		} elseif ($val !== null) {
+			if (isset($this->data[$name]) && !is_array($this->data[$name])) {
+				settype($this->data[$name], 'array');
+			} elseif (!isset($this->data[$name])) {
+				$this->data[$name] = array();
+			}
 
-            if ($merge === true && is_array($val)) {
-                $this->data[$name] = $val + $this->data[$name];
-            } else {
-                $this->data[$name][] = $val;
-            }
-        }
-    }
+			if ($merge === true && is_array($val)) {
+				$this->data[$name] = $val + $this->data[$name];
+			} else {
+				$this->data[$name][] = $val;
+			}
+		}
+	}
 
-    /**
-     * appends a value by reference to the data object.
-     *
-     * @param string $name  the index to use, i.e. a value assigned to "foo" will be
-     *                      accessible in the template through {$foo}
-     * @param mixed  $val   the value to append by reference
-     * @param bool   $merge true to merge data or false to append, defaults to false
-     */
-    public function appendByRef($name, &$val, $merge = false)
-    {
-        if (isset($this->data[$name]) && !is_array($this->data[$name])) {
-            settype($this->data[$name], 'array');
-        }
+	/**
+	 * appends a value by reference to the data object.
+	 *
+	 * @param string $name  the index to use, i.e. a value assigned to "foo" will be
+	 *                      accessible in the template through {$foo}
+	 * @param mixed  $val   the value to append by reference
+	 * @param bool   $merge true to merge data or false to append, defaults to false
+	 */
+	public function appendByRef($name, &$val, $merge = false)
+	{
+		if (isset($this->data[$name]) && !is_array($this->data[$name])) {
+			settype($this->data[$name], 'array');
+		}
 
-        if ($merge === true && is_array($val)) {
-            foreach ($val as $key => &$value) {
-                $this->data[$name][$key] = &$value;
-            }
-        } else {
-            $this->data[$name][] = &$val;
-        }
-    }
+		if ($merge === true && is_array($val)) {
+			foreach ($val as $key => &$value) {
+				$this->data[$name][$key] = &$value;
+			}
+		} else {
+			$this->data[$name][] = &$val;
+		}
+	}
 
-    /**
-     * returns true if the variable has been assigned already, false otherwise.
-     *
-     * @param string $name the variable name
-     *
-     * @return bool
-     */
-    public function isAssigned($name)
-    {
-        return isset($this->data[$name]);
-    }
+	/**
+	 * returns true if the variable has been assigned already, false otherwise.
+	 *
+	 * @param string $name the variable name
+	 *
+	 * @return bool
+	 */
+	public function isAssigned($name)
+	{
+		return isset($this->data[$name]);
+	}
 
-    /**
-     * supports calls to isset($dwooData->var).
-     *
-     * @param string $name the variable name
-     *
-     * @return bool
-     */
-    public function __isset($name)
-    {
-        return isset($this->data[$name]);
-    }
+	/**
+	 * supports calls to isset($dwooData->var).
+	 *
+	 * @param string $name the variable name
+	 *
+	 * @return bool
+	 */
+	public function __isset($name)
+	{
+		return isset($this->data[$name]);
+	}
 
-    /**
-     * unassigns/removes a variable.
-     *
-     * @param string $name the variable name
-     */
-    public function unassign($name)
-    {
-        unset($this->data[$name]);
-    }
+	/**
+	 * unassigns/removes a variable.
+	 *
+	 * @param string $name the variable name
+	 */
+	public function unassign($name)
+	{
+		unset($this->data[$name]);
+	}
 
-    /**
-     * supports unsetting variables using the object syntax.
-     *
-     * @param string $name the variable name
-     */
-    public function __unset($name)
-    {
-        unset($this->data[$name]);
-    }
+	/**
+	 * supports unsetting variables using the object syntax.
+	 *
+	 * @param string $name the variable name
+	 */
+	public function __unset($name)
+	{
+		unset($this->data[$name]);
+	}
 
-    /**
-     * returns a variable if it was assigned.
-     *
-     * @param string $name the variable name
-     *
-     * @return mixed
-     */
-    public function get($name)
-    {
-        return $this->__get($name);
-    }
+	/**
+	 * returns a variable if it was assigned.
+	 *
+	 * @param string $name the variable name
+	 *
+	 * @return mixed
+	 */
+	public function get($name)
+	{
+		return $this->__get($name);
+	}
 
-    /**
-     * allows to read variables using the object syntax.
-     *
-     * @param string $name the variable name
-     *
-     * @return mixed
-     *
-     * @throws Dwoo_Exception
-     */
-    public function __get($name)
-    {
-        if (isset($this->data[$name])) {
-            return $this->data[$name];
-        } else {
-            throw new Dwoo_Exception('Tried to read a value that was not assigned yet : "'.$name.'"');
-        }
-    }
+	/**
+	 * allows to read variables using the object syntax.
+	 *
+	 * @param string $name the variable name
+	 *
+	 * @return mixed
+	 *
+	 * @throws Dwoo_Exception
+	 */
+	public function __get($name)
+	{
+		if (isset($this->data[$name])) {
+			return $this->data[$name];
+		} else {
+			throw new Dwoo_Exception('Tried to read a value that was not assigned yet : "'.$name.'"');
+		}
+	}
 }

lib/Dwoo/Processor.php

Indentation +24 added lines, -24 removed lines

@@ -18,30 +18,30 @@
  */
 abstract class Dwoo_Processor
 {
-    /**
-     * The compiler instance that runs this processor.
-     *
-     * @var Dwoo
-     */
-    protected $compiler;
+	/**
+	 * The compiler instance that runs this processor.
+	 *
+	 * @var Dwoo
+	 */
+	protected $compiler;
 
-    /**
-     * Constructor, if you override it, call parent::__construct($dwoo); or assign
-     * the dwoo instance yourself if you need it.
-     *
-     * @param Dwoo_Compiler $compiler the compiler class
-     */
-    public function __construct(Dwoo_Compiler $compiler)
-    {
-        $this->compiler = $compiler;
-    }
+	/**
+	 * Constructor, if you override it, call parent::__construct($dwoo); or assign
+	 * the dwoo instance yourself if you need it.
+	 *
+	 * @param Dwoo_Compiler $compiler the compiler class
+	 */
+	public function __construct(Dwoo_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/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
+	{
+	}
 }

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/ICompiler.php

Indentation +25 added lines, -25 removed lines

@@ -24,31 +24,31 @@
  */
 interface Dwoo_ICompiler
 {
-    /**
-     * compiles the provided string down to php code.
-     *
-     * @param string $templateStr the template to compile
-     *
-     * @return string a compiled php code string
-     */
-    public function compile(Dwoo_Core $dwoo, Dwoo_ITemplate $template);
+	/**
+	 * compiles the provided string down to php code.
+	 *
+	 * @param string $templateStr the template to compile
+	 *
+	 * @return string a compiled php code string
+	 */
+	public function compile(Dwoo_Core $dwoo, Dwoo_ITemplate $template);
 
-    /**
-     * adds the custom plugins loaded into Dwoo to the compiler so it can load them.
-     *
-     * @see Dwoo_Core::addPlugin
-     *
-     * @param array $customPlugins an array of custom plugins
-     */
-    public function setCustomPlugins(array $customPlugins);
+	/**
+	 * adds the custom plugins loaded into Dwoo to the compiler so it can load them.
+	 *
+	 * @see Dwoo_Core::addPlugin
+	 *
+	 * @param array $customPlugins an array of custom plugins
+	 */
+	public function setCustomPlugins(array $customPlugins);
 
-    /**
-     * sets the security policy object to enforce some php security settings.
-     *
-     * use this if untrusted persons can modify templates,
-     * set it on the Dwoo object as it will be passed onto the compiler automatically
-     *
-     * @param Dwoo_Security_Policy $policy the security policy object
-     */
-    public function setSecurityPolicy(Dwoo_Security_Policy $policy = null);
+	/**
+	 * sets the security policy object to enforce some php security settings.
+	 *
+	 * use this if untrusted persons can modify templates,
+	 * set it on the Dwoo object as it will be passed onto the compiler automatically
+	 *
+	 * @param Dwoo_Security_Policy $policy the security policy object
+	 */
+	public function setSecurityPolicy(Dwoo_Security_Policy $policy = null);
 }

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