dwoo-project / dwoo

lib/Dwoo/Security/Policy.php

Indentation +271 added lines, -271 removed lines

@@ -25,298 +25,298 @@
  */
 class Policy
 {
-    /**
-     * Php handling constants, defaults to PHP_REMOVE
-     * PHP_ENCODE : run htmlentities over them
-     * PHP_REMOVE : remove all <?php ?> (+ short tags if your short tags option is on) from the input template
-     * PHP_ALLOW : leave them as they are
-     *
-     * @var int
-     */
-    const PHP_ENCODE = 1;
-    const PHP_REMOVE = 2;
-    const PHP_ALLOW  = 3;
+	/**
+	 * Php handling constants, defaults to PHP_REMOVE
+	 * PHP_ENCODE : run htmlentities over them
+	 * PHP_REMOVE : remove all <?php ?> (+ short tags if your short tags option is on) from the input template
+	 * PHP_ALLOW : leave them as they are
+	 *
+	 * @var int
+	 */
+	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;
+	/**
+	 * 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;
 
-    /**
-     * 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 self::PHP_REMOVE
-     *
-     * @var int
-     */
-    protected $phpHandling = self::PHP_REMOVE;
+	/**
+	 * Stores the php handling level.
+	 * defaults to self::PHP_REMOVE
+	 *
+	 * @var int
+	 */
+	protected $phpHandling = self::PHP_REMOVE;
 
-    /**
-     * Stores the constant handling level.
-     * defaults to self::CONST_DISALLOW
-     *
-     * @var bool
-     */
-    protected $constHandling = self::CONST_DISALLOW;
+	/**
+	 * Stores the constant handling level.
+	 * defaults to self::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 safe list.
-     *
-     * @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 safe list.
+	 *
+	 * @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 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(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 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(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;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -290,7 +290,7 @@
                 return call_user_func_array(array($obj, $method), $args);
             }
         }
-        $dwoo->triggerError('The current security policy prevents you from calling ' . get_class($obj) . '::' . $method . '()');
+        $dwoo->triggerError('The current security policy prevents you from calling '.get_class($obj).'::'.$method.'()');
 
         return null;
     }

lib/Dwoo/Smarty/Filter/Adapter.php

Indentation +17 added lines, -17 removed lines

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

lib/Dwoo/Template/Str.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +505 added lines, -505 removed lines

@@ -29,509 +29,509 @@
  */
 class String implements ITemplate
 {
-    /**
-     * Template name.
-     *
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * Template compilation id.
-     *
-     * @var string
-     */
-    protected $compileId;
-
-    /**
-     * Template cache id, if not provided in the constructor, it is set to
-     * the md4 hash of the request_uri. it is however highly recommended to
-     * provide one that will fit your needs.
-     * in all cases, the compilation id is prepended to the cache id to separate
-     * templates with similar cache ids from one another
-     *
-     * @var string
-     */
-    protected $cacheId;
-
-    /**
-     * Validity duration of the generated cache file (in seconds).
-     * set to -1 for infinite cache, 0 to disable and null to inherit the Dwoo instance's cache time
-     *
-     * @var int
-     */
-    protected $cacheTime;
-
-    /**
-     * Boolean flag that defines whether the compilation should be enforced (once) or
-     * not use this if you have issues with the compiled templates not being updated
-     * but if you do need this it's most likely that you should file a bug report.
-     *
-     * @var bool
-     */
-    protected $compilationEnforced;
-
-    /**
-     * Caches the results of the file checks to save some time when the same
-     * templates is rendered several times.
-     *
-     * @var array
-     */
-    protected static $cache = array(
-        'cached'   => array(),
-        'compiled' => array()
-    );
-
-    /**
-     * Holds the compiler that built this template.
-     *
-     * @var ICompiler
-     */
-    protected $compiler;
-
-    /**
-     * Chmod value for all files written (cached or compiled ones).
-     * set to null if you don't want any chmod operation to happen
-     *
-     * @var int
-     */
-    protected $chmod = 0777;
-
-    /**
-     * Containing template string.
-     *
-     * @var string
-     */
-    protected $template;
-
-    /**
-     * Creates a template from a string.
-     *
-     * @param string $templateString the template to use
-     * @param int    $cacheTime      duration of the cache validity for this template,
-     *                               if null it defaults to the Dwoo instance that will
-     *                               render this template, set to -1 for infinite cache or 0 to disable
-     * @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 md4 hash of the template
-     */
-    public function __construct($templateString, $cacheTime = null, $cacheId = null, $compileId = null)
-    {
-        $this->template  = $templateString;
-        $this->name      = hash('md4', $templateString);
-        $this->cacheTime = $cacheTime;
-
-        if ($compileId !== null) {
-            $this->compileId = str_replace('../', '__', strtr($compileId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
-        }
-
-        if ($cacheId !== null) {
-            $this->cacheId = str_replace('../', '__', strtr($cacheId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
-        }
-    }
-
-    /**
-     * Returns the cache duration for this template.
-     * defaults to null if it was not provided
-     *
-     * @return int|null
-     */
-    public function getCacheTime()
-    {
-        return $this->cacheTime;
-    }
-
-    /**
-     * 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)
-    {
-        $this->cacheTime = $seconds;
-    }
-
-    /**
-     * Returns the chmod value for all files written (cached or compiled ones).
-     * defaults to 0777
-     *
-     * @return int|null
-     */
-    public function getChmod()
-    {
-        return $this->chmod;
-    }
-
-    /**
-     * Set the chmod value for all files written (cached or compiled ones).
-     * set to null if you don't want to do any chmod() operation
-     *
-     * @param int $mask new bitmask to use for all files
-     */
-    public function setChmod($mask = null)
-    {
-        $this->chmod = $mask;
-    }
-
-    /**
-     * Returns the template name.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Returns the resource name for this template class.
-     *
-     * @return string
-     */
-    public function getResourceName()
-    {
-        return 'string';
-    }
-
-    /**
-     * Returns the resource identifier for this template, false here as strings don't have identifiers.
-     *
-     * @return false
-     */
-    public function getResourceIdentifier()
-    {
-        return false;
-    }
-
-    /**
-     * Returns the template source of this template.
-     *
-     * @return string
-     */
-    public function getSource()
-    {
-        return $this->template;
-    }
-
-    /**
-     * Returns an unique value identifying the current version of this template,
-     * in this case it's the md4 hash of the content.
-     *
-     * @return string
-     */
-    public function getUid()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Returns the compiler used by this template, if it was just compiled, or null.
-     *
-     * @return ICompiler
-     */
-    public function getCompiler()
-    {
-        return $this->compiler;
-    }
-
-    /**
-     * Marks this template as compile-forced, which means it will be recompiled even if it
-     * was already saved and wasn't modified since the last compilation. do not use this in production,
-     * it's only meant to be used in development (and the development of dwoo particularly).
-     */
-    public function forceCompilation()
-    {
-        $this->compilationEnforced = true;
-    }
-
-    /**
-     * Returns the cached template output file name, true if it's cache-able but not cached
-     * or false if it's not cached.
-     *
-     * @param Core $core the dwoo instance that requests it
-     *
-     * @return string|bool
-     */
-    public function getCachedTemplate(Core $core)
-    {
-        if ($this->cacheTime !== null) {
-            $cacheLength = $this->cacheTime;
-        } else {
-            $cacheLength = $core->getCacheTime();
-        }
-
-        // file is not cacheable
-        if ($cacheLength == 0) {
-            return false;
-        }
-
-        $cachedFile = $this->getCacheFilename($core);
-
-        if (isset(self::$cache['cached'][$this->cacheId]) === true && file_exists($cachedFile)) {
-            // already checked, return cache file
-            return $cachedFile;
-        } elseif ($this->compilationEnforced !== true && file_exists($cachedFile) && ($cacheLength === - 1 || filemtime($cachedFile) > ($_SERVER['REQUEST_TIME'] - $cacheLength)) && $this->isValidCompiledFile($this->getCompiledFilename($core))) {
-            // cache is still valid and can be loaded
-            self::$cache['cached'][$this->cacheId] = true;
-
-            return $cachedFile;
-        } else {
-            // file is cacheable
-            return true;
-        }
-    }
-
-    /**
-     * Caches the provided output into the cache file.
-     *
-     * @param Core   $core   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(Core $core, $output)
-    {
-        $cacheDir   = $core->getCacheDir();
-        $cachedFile = $this->getCacheFilename($core);
-
-        // the code below is courtesy of Rasmus Schultz,
-        // thanks for his help on avoiding concurency issues
-        $temp = tempnam($cacheDir, 'temp');
-        if (!($file = @fopen($temp, 'wb'))) {
-            $temp = $cacheDir . uniqid('temp');
-            if (!($file = @fopen($temp, 'wb'))) {
-                trigger_error('Error writing temporary file \'' . $temp . '\'', E_USER_WARNING);
-
-                return false;
-            }
-        }
-
-        fwrite($file, $output);
-        fclose($file);
-
-        $this->makeDirectory(dirname($cachedFile), $cacheDir);
-        if (!@rename($temp, $cachedFile)) {
-            @unlink($cachedFile);
-            @rename($temp, $cachedFile);
-        }
-
-        if ($this->chmod !== null) {
-            chmod($cachedFile, $this->chmod);
-        }
-
-        self::$cache['cached'][$this->cacheId] = true;
-
-        return $cachedFile;
-    }
-
-    /**
-     * Clears the cached template if it's older than the given time.
-     *
-     * @param Core $core      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(Core $core, $olderThan = - 1)
-    {
-        $cachedFile = $this->getCacheFilename($core);
-
-        return !file_exists($cachedFile) || (filectime($cachedFile) < (time() - $olderThan) && unlink($cachedFile));
-    }
-
-    /**
-     * Returns the compiled template file name.
-     *
-     * @param Core      $core     the dwoo instance that requests it
-     * @param ICompiler $compiler the compiler that must be used
-     *
-     * @return string
-     */
-    public function getCompiledTemplate(Core $core, ICompiler $compiler = null)
-    {
-        $compiledFile = $this->getCompiledFilename($core);
-
-        if ($this->compilationEnforced !== true && isset(self::$cache['compiled'][$this->compileId]) === true) {
-            // already checked, return compiled file
-        } elseif ($this->compilationEnforced !== true && $this->isValidCompiledFile($compiledFile)) {
-            // template is compiled
-            self::$cache['compiled'][$this->compileId] = true;
-        } else {
-            // compiles the template
-            $this->compilationEnforced = false;
-
-            if ($compiler === null) {
-                $compiler = $core->getDefaultCompilerFactory($this->getResourceName());
-
-                if ($compiler === null || $compiler === array('Dwoo\Compiler', 'compilerFactory')) {
-                    $compiler = Compiler::compilerFactory();
-                } else {
-                    $compiler = call_user_func($compiler);
-                }
-            }
-
-            $this->compiler = $compiler;
-
-            $compiler->setCustomPlugins($core->getCustomPlugins());
-            $compiler->setSecurityPolicy($core->getSecurityPolicy());
-            $this->makeDirectory(dirname($compiledFile), $core->getCompileDir());
-            file_put_contents($compiledFile, $compiler->compile($core, $this));
-            if ($this->chmod !== null) {
-                chmod($compiledFile, $this->chmod);
-            }
-
-            if (extension_loaded('Zend OPcache')) {
-                opcache_invalidate($compiledFile);
-            } elseif (extension_loaded('apc') && ini_get('apc.enabled')) {
-                apc_delete_file($compiledFile);
-            }
-
-            self::$cache['compiled'][$this->compileId] = true;
-        }
-
-        return $compiledFile;
-    }
-
-    /**
-     * Checks if compiled file is valid (it exists).
-     *
-     * @param string $file
-     *
-     * @return bool True cache file existance
-     */
-    protected function isValidCompiledFile($file)
-    {
-        return file_exists($file);
-    }
-
-    /**
-     * Returns a new template string object with the resource id being the template source code.
-     *
-     * @param Core      $core           the dwoo instance requiring it
-     * @param mixed     $resourceId     the filename (relative to this template's dir) of the template to include
-     * @param int       $cacheTime      duration of the cache validity for this template, if null it defaults to the
-     *                                  Dwoo instance that will render this template 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 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 template from
-     *                                  others, if null it defaults to the filename+bits of the path
-     * @param ITemplate $parentTemplate the template that is requesting a new template object (through an include,
-     *                                  extends or any other plugin) an include, extends or any other plugin)
-     *
-     * @return $this
-     */
-    public static function templateFactory(Core $core, $resourceId, $cacheTime = null, $cacheId = null, $compileId = null, ITemplate $parentTemplate = null)
-    {
-        return new self($resourceId, $cacheTime, $cacheId, $compileId);
-    }
-
-    /**
-     * Returns the full compiled file name and assigns a default value to it if
-     * required.
-     *
-     * @param Core $core the dwoo instance that requests the file name
-     *
-     * @return string the full path to the compiled file
-     */
-    protected function getCompiledFilename(Core $core)
-    {
-        // no compile id was provided, set default
-        if ($this->compileId === null) {
-            $this->compileId = $this->name;
-        }
-
-        return $core->getCompileDir() . $this->compileId . '.d' . Core::RELEASE_TAG . '.php';
-    }
-
-    /**
-     * Returns the full cached file name and assigns a default value to it if
-     * required.
-     *
-     * @param Core $core the dwoo instance that requests the file name
-     *
-     * @return string the full path to the cached file
-     */
-    protected function getCacheFilename(Core $core)
-    {
-        // no cache id provided, use request_uri as default
-        if ($this->cacheId === null) {
-            if (isset($_SERVER['REQUEST_URI']) === true) {
-                $cacheId = $_SERVER['REQUEST_URI'];
-            } elseif (isset($_SERVER['SCRIPT_FILENAME']) && isset($_SERVER['argv'])) {
-                $cacheId = $_SERVER['SCRIPT_FILENAME'] . '-' . implode('-', $_SERVER['argv']);
-            } else {
-                $cacheId = '';
-            }
-            // force compiled id generation
-            $this->getCompiledFilename($core);
-
-            $this->cacheId = str_replace('../', '__', $this->compileId . strtr($cacheId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
-        }
-
-        return $core->getCacheDir() . $this->cacheId . '.html';
-    }
-
-    /**
-     * Returns some php code that will check if this template has been modified or not.
-     * if the function returns null, the template will be instanciated and then the Uid checked
-     *
-     * @return string
-     */
-    public function getIsModifiedCode()
-    {
-        return null;
-    }
-
-    /**
-     * Ensures the given path exists.
-     *
-     * @param string $path    any path
-     * @param string $baseDir the base directory where the directory is created
-     *                        ($path must still contain the full path, $baseDir
-     *                        is only used for unix permissions)
-     *
-     * @throws Exception
-     */
-    protected function makeDirectory($path, $baseDir = null)
-    {
-        if (is_dir($path) === true) {
-            return;
-        }
-
-        if ($this->chmod === null) {
-            $chmod = 0777;
-        } else {
-            $chmod = $this->chmod;
-        }
-
-        $retries = 3;
-        while ($retries --) {
-            @mkdir($path, $chmod, true);
-            if (is_dir($path)) {
-                break;
-            }
-            usleep(20);
-        }
-
-        // enforce the correct mode for all directories created
-        if (strpos(PHP_OS, 'WIN') !== 0 && $baseDir !== null) {
-            $path    = strtr(str_replace($baseDir, '', $path), '\\', '/');
-            $folders = explode('/', trim($path, '/'));
-            foreach ($folders as $folder) {
-                $baseDir .= $folder . DIRECTORY_SEPARATOR;
-                if (!chmod($baseDir, $chmod)) {
-                    throw new Exception('Unable to chmod ' . "$baseDir to $chmod: " . print_r(error_get_last(), true));
-                }
-            }
-        }
-    }
+	/**
+	 * Template name.
+	 *
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * Template compilation id.
+	 *
+	 * @var string
+	 */
+	protected $compileId;
+
+	/**
+	 * Template cache id, if not provided in the constructor, it is set to
+	 * the md4 hash of the request_uri. it is however highly recommended to
+	 * provide one that will fit your needs.
+	 * in all cases, the compilation id is prepended to the cache id to separate
+	 * templates with similar cache ids from one another
+	 *
+	 * @var string
+	 */
+	protected $cacheId;
+
+	/**
+	 * Validity duration of the generated cache file (in seconds).
+	 * set to -1 for infinite cache, 0 to disable and null to inherit the Dwoo instance's cache time
+	 *
+	 * @var int
+	 */
+	protected $cacheTime;
+
+	/**
+	 * Boolean flag that defines whether the compilation should be enforced (once) or
+	 * not use this if you have issues with the compiled templates not being updated
+	 * but if you do need this it's most likely that you should file a bug report.
+	 *
+	 * @var bool
+	 */
+	protected $compilationEnforced;
+
+	/**
+	 * Caches the results of the file checks to save some time when the same
+	 * templates is rendered several times.
+	 *
+	 * @var array
+	 */
+	protected static $cache = array(
+		'cached'   => array(),
+		'compiled' => array()
+	);
+
+	/**
+	 * Holds the compiler that built this template.
+	 *
+	 * @var ICompiler
+	 */
+	protected $compiler;
+
+	/**
+	 * Chmod value for all files written (cached or compiled ones).
+	 * set to null if you don't want any chmod operation to happen
+	 *
+	 * @var int
+	 */
+	protected $chmod = 0777;
+
+	/**
+	 * Containing template string.
+	 *
+	 * @var string
+	 */
+	protected $template;
+
+	/**
+	 * Creates a template from a string.
+	 *
+	 * @param string $templateString the template to use
+	 * @param int    $cacheTime      duration of the cache validity for this template,
+	 *                               if null it defaults to the Dwoo instance that will
+	 *                               render this template, set to -1 for infinite cache or 0 to disable
+	 * @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 md4 hash of the template
+	 */
+	public function __construct($templateString, $cacheTime = null, $cacheId = null, $compileId = null)
+	{
+		$this->template  = $templateString;
+		$this->name      = hash('md4', $templateString);
+		$this->cacheTime = $cacheTime;
+
+		if ($compileId !== null) {
+			$this->compileId = str_replace('../', '__', strtr($compileId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
+		}
+
+		if ($cacheId !== null) {
+			$this->cacheId = str_replace('../', '__', strtr($cacheId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
+		}
+	}
+
+	/**
+	 * Returns the cache duration for this template.
+	 * defaults to null if it was not provided
+	 *
+	 * @return int|null
+	 */
+	public function getCacheTime()
+	{
+		return $this->cacheTime;
+	}
+
+	/**
+	 * 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)
+	{
+		$this->cacheTime = $seconds;
+	}
+
+	/**
+	 * Returns the chmod value for all files written (cached or compiled ones).
+	 * defaults to 0777
+	 *
+	 * @return int|null
+	 */
+	public function getChmod()
+	{
+		return $this->chmod;
+	}
+
+	/**
+	 * Set the chmod value for all files written (cached or compiled ones).
+	 * set to null if you don't want to do any chmod() operation
+	 *
+	 * @param int $mask new bitmask to use for all files
+	 */
+	public function setChmod($mask = null)
+	{
+		$this->chmod = $mask;
+	}
+
+	/**
+	 * Returns the template name.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * Returns the resource name for this template class.
+	 *
+	 * @return string
+	 */
+	public function getResourceName()
+	{
+		return 'string';
+	}
+
+	/**
+	 * Returns the resource identifier for this template, false here as strings don't have identifiers.
+	 *
+	 * @return false
+	 */
+	public function getResourceIdentifier()
+	{
+		return false;
+	}
+
+	/**
+	 * Returns the template source of this template.
+	 *
+	 * @return string
+	 */
+	public function getSource()
+	{
+		return $this->template;
+	}
+
+	/**
+	 * Returns an unique value identifying the current version of this template,
+	 * in this case it's the md4 hash of the content.
+	 *
+	 * @return string
+	 */
+	public function getUid()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * Returns the compiler used by this template, if it was just compiled, or null.
+	 *
+	 * @return ICompiler
+	 */
+	public function getCompiler()
+	{
+		return $this->compiler;
+	}
+
+	/**
+	 * Marks this template as compile-forced, which means it will be recompiled even if it
+	 * was already saved and wasn't modified since the last compilation. do not use this in production,
+	 * it's only meant to be used in development (and the development of dwoo particularly).
+	 */
+	public function forceCompilation()
+	{
+		$this->compilationEnforced = true;
+	}
+
+	/**
+	 * Returns the cached template output file name, true if it's cache-able but not cached
+	 * or false if it's not cached.
+	 *
+	 * @param Core $core the dwoo instance that requests it
+	 *
+	 * @return string|bool
+	 */
+	public function getCachedTemplate(Core $core)
+	{
+		if ($this->cacheTime !== null) {
+			$cacheLength = $this->cacheTime;
+		} else {
+			$cacheLength = $core->getCacheTime();
+		}
+
+		// file is not cacheable
+		if ($cacheLength == 0) {
+			return false;
+		}
+
+		$cachedFile = $this->getCacheFilename($core);
+
+		if (isset(self::$cache['cached'][$this->cacheId]) === true && file_exists($cachedFile)) {
+			// already checked, return cache file
+			return $cachedFile;
+		} elseif ($this->compilationEnforced !== true && file_exists($cachedFile) && ($cacheLength === - 1 || filemtime($cachedFile) > ($_SERVER['REQUEST_TIME'] - $cacheLength)) && $this->isValidCompiledFile($this->getCompiledFilename($core))) {
+			// cache is still valid and can be loaded
+			self::$cache['cached'][$this->cacheId] = true;
+
+			return $cachedFile;
+		} else {
+			// file is cacheable
+			return true;
+		}
+	}
+
+	/**
+	 * Caches the provided output into the cache file.
+	 *
+	 * @param Core   $core   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(Core $core, $output)
+	{
+		$cacheDir   = $core->getCacheDir();
+		$cachedFile = $this->getCacheFilename($core);
+
+		// the code below is courtesy of Rasmus Schultz,
+		// thanks for his help on avoiding concurency issues
+		$temp = tempnam($cacheDir, 'temp');
+		if (!($file = @fopen($temp, 'wb'))) {
+			$temp = $cacheDir . uniqid('temp');
+			if (!($file = @fopen($temp, 'wb'))) {
+				trigger_error('Error writing temporary file \'' . $temp . '\'', E_USER_WARNING);
+
+				return false;
+			}
+		}
+
+		fwrite($file, $output);
+		fclose($file);
+
+		$this->makeDirectory(dirname($cachedFile), $cacheDir);
+		if (!@rename($temp, $cachedFile)) {
+			@unlink($cachedFile);
+			@rename($temp, $cachedFile);
+		}
+
+		if ($this->chmod !== null) {
+			chmod($cachedFile, $this->chmod);
+		}
+
+		self::$cache['cached'][$this->cacheId] = true;
+
+		return $cachedFile;
+	}
+
+	/**
+	 * Clears the cached template if it's older than the given time.
+	 *
+	 * @param Core $core      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(Core $core, $olderThan = - 1)
+	{
+		$cachedFile = $this->getCacheFilename($core);
+
+		return !file_exists($cachedFile) || (filectime($cachedFile) < (time() - $olderThan) && unlink($cachedFile));
+	}
+
+	/**
+	 * Returns the compiled template file name.
+	 *
+	 * @param Core      $core     the dwoo instance that requests it
+	 * @param ICompiler $compiler the compiler that must be used
+	 *
+	 * @return string
+	 */
+	public function getCompiledTemplate(Core $core, ICompiler $compiler = null)
+	{
+		$compiledFile = $this->getCompiledFilename($core);
+
+		if ($this->compilationEnforced !== true && isset(self::$cache['compiled'][$this->compileId]) === true) {
+			// already checked, return compiled file
+		} elseif ($this->compilationEnforced !== true && $this->isValidCompiledFile($compiledFile)) {
+			// template is compiled
+			self::$cache['compiled'][$this->compileId] = true;
+		} else {
+			// compiles the template
+			$this->compilationEnforced = false;
+
+			if ($compiler === null) {
+				$compiler = $core->getDefaultCompilerFactory($this->getResourceName());
+
+				if ($compiler === null || $compiler === array('Dwoo\Compiler', 'compilerFactory')) {
+					$compiler = Compiler::compilerFactory();
+				} else {
+					$compiler = call_user_func($compiler);
+				}
+			}
+
+			$this->compiler = $compiler;
+
+			$compiler->setCustomPlugins($core->getCustomPlugins());
+			$compiler->setSecurityPolicy($core->getSecurityPolicy());
+			$this->makeDirectory(dirname($compiledFile), $core->getCompileDir());
+			file_put_contents($compiledFile, $compiler->compile($core, $this));
+			if ($this->chmod !== null) {
+				chmod($compiledFile, $this->chmod);
+			}
+
+			if (extension_loaded('Zend OPcache')) {
+				opcache_invalidate($compiledFile);
+			} elseif (extension_loaded('apc') && ini_get('apc.enabled')) {
+				apc_delete_file($compiledFile);
+			}
+
+			self::$cache['compiled'][$this->compileId] = true;
+		}
+
+		return $compiledFile;
+	}
+
+	/**
+	 * Checks if compiled file is valid (it exists).
+	 *
+	 * @param string $file
+	 *
+	 * @return bool True cache file existance
+	 */
+	protected function isValidCompiledFile($file)
+	{
+		return file_exists($file);
+	}
+
+	/**
+	 * Returns a new template string object with the resource id being the template source code.
+	 *
+	 * @param Core      $core           the dwoo instance requiring it
+	 * @param mixed     $resourceId     the filename (relative to this template's dir) of the template to include
+	 * @param int       $cacheTime      duration of the cache validity for this template, if null it defaults to the
+	 *                                  Dwoo instance that will render this template 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 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 template from
+	 *                                  others, if null it defaults to the filename+bits of the path
+	 * @param ITemplate $parentTemplate the template that is requesting a new template object (through an include,
+	 *                                  extends or any other plugin) an include, extends or any other plugin)
+	 *
+	 * @return $this
+	 */
+	public static function templateFactory(Core $core, $resourceId, $cacheTime = null, $cacheId = null, $compileId = null, ITemplate $parentTemplate = null)
+	{
+		return new self($resourceId, $cacheTime, $cacheId, $compileId);
+	}
+
+	/**
+	 * Returns the full compiled file name and assigns a default value to it if
+	 * required.
+	 *
+	 * @param Core $core the dwoo instance that requests the file name
+	 *
+	 * @return string the full path to the compiled file
+	 */
+	protected function getCompiledFilename(Core $core)
+	{
+		// no compile id was provided, set default
+		if ($this->compileId === null) {
+			$this->compileId = $this->name;
+		}
+
+		return $core->getCompileDir() . $this->compileId . '.d' . Core::RELEASE_TAG . '.php';
+	}
+
+	/**
+	 * Returns the full cached file name and assigns a default value to it if
+	 * required.
+	 *
+	 * @param Core $core the dwoo instance that requests the file name
+	 *
+	 * @return string the full path to the cached file
+	 */
+	protected function getCacheFilename(Core $core)
+	{
+		// no cache id provided, use request_uri as default
+		if ($this->cacheId === null) {
+			if (isset($_SERVER['REQUEST_URI']) === true) {
+				$cacheId = $_SERVER['REQUEST_URI'];
+			} elseif (isset($_SERVER['SCRIPT_FILENAME']) && isset($_SERVER['argv'])) {
+				$cacheId = $_SERVER['SCRIPT_FILENAME'] . '-' . implode('-', $_SERVER['argv']);
+			} else {
+				$cacheId = '';
+			}
+			// force compiled id generation
+			$this->getCompiledFilename($core);
+
+			$this->cacheId = str_replace('../', '__', $this->compileId . strtr($cacheId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
+		}
+
+		return $core->getCacheDir() . $this->cacheId . '.html';
+	}
+
+	/**
+	 * Returns some php code that will check if this template has been modified or not.
+	 * if the function returns null, the template will be instanciated and then the Uid checked
+	 *
+	 * @return string
+	 */
+	public function getIsModifiedCode()
+	{
+		return null;
+	}
+
+	/**
+	 * Ensures the given path exists.
+	 *
+	 * @param string $path    any path
+	 * @param string $baseDir the base directory where the directory is created
+	 *                        ($path must still contain the full path, $baseDir
+	 *                        is only used for unix permissions)
+	 *
+	 * @throws Exception
+	 */
+	protected function makeDirectory($path, $baseDir = null)
+	{
+		if (is_dir($path) === true) {
+			return;
+		}
+
+		if ($this->chmod === null) {
+			$chmod = 0777;
+		} else {
+			$chmod = $this->chmod;
+		}
+
+		$retries = 3;
+		while ($retries --) {
+			@mkdir($path, $chmod, true);
+			if (is_dir($path)) {
+				break;
+			}
+			usleep(20);
+		}
+
+		// enforce the correct mode for all directories created
+		if (strpos(PHP_OS, 'WIN') !== 0 && $baseDir !== null) {
+			$path    = strtr(str_replace($baseDir, '', $path), '\\', '/');
+			$folders = explode('/', trim($path, '/'));
+			foreach ($folders as $folder) {
+				$baseDir .= $folder . DIRECTORY_SEPARATOR;
+				if (!chmod($baseDir, $chmod)) {
+					throw new Exception('Unable to chmod ' . "$baseDir to $chmod: " . print_r(error_get_last(), true));
+				}
+			}
+		}
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -124,11 +124,11 @@ 
         $this->cacheTime = $cacheTime;
 
         if ($compileId !== null) {
-            $this->compileId = str_replace('../', '__', strtr($compileId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
+            $this->compileId = str_replace('../', '__', strtr($compileId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
         }
 
         if ($cacheId !== null) {
-            $this->cacheId = str_replace('../', '__', strtr($cacheId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
+            $this->cacheId = str_replace('../', '__', strtr($cacheId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
         }
     }
 
@@ -276,7 +276,7 @@ 
         if (isset(self::$cache['cached'][$this->cacheId]) === true && file_exists($cachedFile)) {
             // already checked, return cache file
             return $cachedFile;
-        } elseif ($this->compilationEnforced !== true && file_exists($cachedFile) && ($cacheLength === - 1 || filemtime($cachedFile) > ($_SERVER['REQUEST_TIME'] - $cacheLength)) && $this->isValidCompiledFile($this->getCompiledFilename($core))) {
+        } elseif ($this->compilationEnforced !== true && file_exists($cachedFile) && ($cacheLength === - 1 || filemtime($cachedFile) > ($_SERVER['REQUEST_TIME']-$cacheLength)) && $this->isValidCompiledFile($this->getCompiledFilename($core))) {
             // cache is still valid and can be loaded
             self::$cache['cached'][$this->cacheId] = true;
 
@@ -304,9 +304,9 @@ 
         // thanks for his help on avoiding concurency issues
         $temp = tempnam($cacheDir, 'temp');
         if (!($file = @fopen($temp, 'wb'))) {
-            $temp = $cacheDir . uniqid('temp');
+            $temp = $cacheDir.uniqid('temp');
             if (!($file = @fopen($temp, 'wb'))) {
-                trigger_error('Error writing temporary file \'' . $temp . '\'', E_USER_WARNING);
+                trigger_error('Error writing temporary file \''.$temp.'\'', E_USER_WARNING);
 
                 return false;
             }
@@ -342,7 +342,7 @@ 
     {
         $cachedFile = $this->getCacheFilename($core);
 
-        return !file_exists($cachedFile) || (filectime($cachedFile) < (time() - $olderThan) && unlink($cachedFile));
+        return !file_exists($cachedFile) || (filectime($cachedFile) < (time()-$olderThan) && unlink($cachedFile));
     }
 
     /**
@@ -449,7 +449,7 @@ 
             $this->compileId = $this->name;
         }
 
-        return $core->getCompileDir() . $this->compileId . '.d' . Core::RELEASE_TAG . '.php';
+        return $core->getCompileDir().$this->compileId.'.d'.Core::RELEASE_TAG.'.php';
     }
 
     /**
@@ -467,17 +467,17 @@ 
             if (isset($_SERVER['REQUEST_URI']) === true) {
                 $cacheId = $_SERVER['REQUEST_URI'];
             } elseif (isset($_SERVER['SCRIPT_FILENAME']) && isset($_SERVER['argv'])) {
-                $cacheId = $_SERVER['SCRIPT_FILENAME'] . '-' . implode('-', $_SERVER['argv']);
+                $cacheId = $_SERVER['SCRIPT_FILENAME'].'-'.implode('-', $_SERVER['argv']);
             } else {
                 $cacheId = '';
             }
             // force compiled id generation
             $this->getCompiledFilename($core);
 
-            $this->cacheId = str_replace('../', '__', $this->compileId . strtr($cacheId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
+            $this->cacheId = str_replace('../', '__', $this->compileId.strtr($cacheId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
         }
 
-        return $core->getCacheDir() . $this->cacheId . '.html';
+        return $core->getCacheDir().$this->cacheId.'.html';
     }
 
     /**
@@ -514,7 +514,7 @@ 
         }
 
         $retries = 3;
-        while ($retries --) {
+        while ($retries--) {
             @mkdir($path, $chmod, true);
             if (is_dir($path)) {
                 break;
@@ -527,9 +527,9 @@ 
             $path    = strtr(str_replace($baseDir, '', $path), '\\', '/');
             $folders = explode('/', trim($path, '/'));
             foreach ($folders as $folder) {
-                $baseDir .= $folder . DIRECTORY_SEPARATOR;
+                $baseDir .= $folder.DIRECTORY_SEPARATOR;
                 if (!chmod($baseDir, $chmod)) {
-                    throw new Exception('Unable to chmod ' . "$baseDir to $chmod: " . print_r(error_get_last(), true));
+                    throw new Exception('Unable to chmod '."$baseDir to $chmod: ".print_r(error_get_last(), true));
                 }
             }
         }

lib/Dwoo/Plugins/Functions/PluginMailto.php

Indentation +89 added lines, -89 removed lines

@@ -36,93 +36,93 @@
  */
 function PluginMailto(Core $dwoo, $address, $text = null, $subject = null, $encode = null, $cc = null, $bcc = null, $newsgroups = null, $followupto = null, $extra = null)
 {
-    if (empty($address)) {
-        return '';
-    }
-    if (empty($text)) {
-        $text = $address;
-    }
-
-    // build address string
-    $address .= '?';
-
-    if (!empty($subject)) {
-        $address .= 'subject=' . rawurlencode($subject) . '&';
-    }
-    if (!empty($cc)) {
-        $address .= 'cc=' . rawurlencode($cc) . '&';
-    }
-    if (!empty($bcc)) {
-        $address .= 'bcc=' . rawurlencode($bcc) . '&';
-    }
-    if (!empty($newsgroups)) {
-        $address .= 'newsgroups=' . rawurlencode($newsgroups) . '&';
-    }
-    if (!empty($followupto)) {
-        $address .= 'followupto=' . rawurlencode($followupto) . '&';
-    }
-
-    $address = rtrim($address, '?&');
-
-    // output
-    switch ($encode) {
-
-        case 'none':
-        case null:
-            return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-
-        case 'js':
-        case 'javascript':
-            $str = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
-            $len = strlen($str);
-
-            $out = '';
-            for ($i = 0; $i < $len; ++ $i) {
-                $out .= '%' . bin2hex($str[$i]);
-            }
-
-            return '<script type="text/javascript">eval(unescape(\'' . $out . '\'));</script>';
-
-            break;
-        case 'javascript_charcode':
-        case 'js_charcode':
-        case 'jscharcode':
-        case 'jschar':
-            $str = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-            $len = strlen($str);
-
-            $out = '<script type="text/javascript">' . "\n<!--\ndocument.write(Str.fromCharCode(";
-            for ($i = 0; $i < $len; ++ $i) {
-                $out .= ord($str[$i]) . ',';
-            }
-
-            return rtrim($out, ',') . "));\n-->\n</script>\n";
-
-            break;
-
-        case 'hex':
-            if (strpos($address, '?') !== false) {
-                $dwoo->triggerError('Mailto: Hex encoding is not possible with extra attributes, use one of : <em>js, jscharcode or none</em>.', E_USER_WARNING);
-            }
-
-            $out = '<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;';
-            $len = strlen($address);
-            for ($i = 0; $i < $len; ++ $i) {
-                if (preg_match('#\w#', $address[$i])) {
-                    $out .= '%' . bin2hex($address[$i]);
-                } else {
-                    $out .= $address[$i];
-                }
-            }
-            $out .= '" ' . $extra . '>';
-            $len = strlen($text);
-            for ($i = 0; $i < $len; ++ $i) {
-                $out .= '&#x' . bin2hex($text[$i]);
-            }
-
-            return $out . '</a>';
-
-        default:
-            $dwoo->triggerError('Mailto: <em>encode</em> argument is invalid, it must be one of : <em>none (= no value), js, js_charcode or hex</em>', E_USER_WARNING);
-    }
+	if (empty($address)) {
+		return '';
+	}
+	if (empty($text)) {
+		$text = $address;
+	}
+
+	// build address string
+	$address .= '?';
+
+	if (!empty($subject)) {
+		$address .= 'subject=' . rawurlencode($subject) . '&';
+	}
+	if (!empty($cc)) {
+		$address .= 'cc=' . rawurlencode($cc) . '&';
+	}
+	if (!empty($bcc)) {
+		$address .= 'bcc=' . rawurlencode($bcc) . '&';
+	}
+	if (!empty($newsgroups)) {
+		$address .= 'newsgroups=' . rawurlencode($newsgroups) . '&';
+	}
+	if (!empty($followupto)) {
+		$address .= 'followupto=' . rawurlencode($followupto) . '&';
+	}
+
+	$address = rtrim($address, '?&');
+
+	// output
+	switch ($encode) {
+
+		case 'none':
+		case null:
+			return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+
+		case 'js':
+		case 'javascript':
+			$str = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
+			$len = strlen($str);
+
+			$out = '';
+			for ($i = 0; $i < $len; ++ $i) {
+				$out .= '%' . bin2hex($str[$i]);
+			}
+
+			return '<script type="text/javascript">eval(unescape(\'' . $out . '\'));</script>';
+
+			break;
+		case 'javascript_charcode':
+		case 'js_charcode':
+		case 'jscharcode':
+		case 'jschar':
+			$str = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+			$len = strlen($str);
+
+			$out = '<script type="text/javascript">' . "\n<!--\ndocument.write(Str.fromCharCode(";
+			for ($i = 0; $i < $len; ++ $i) {
+				$out .= ord($str[$i]) . ',';
+			}
+
+			return rtrim($out, ',') . "));\n-->\n</script>\n";
+
+			break;
+
+		case 'hex':
+			if (strpos($address, '?') !== false) {
+				$dwoo->triggerError('Mailto: Hex encoding is not possible with extra attributes, use one of : <em>js, jscharcode or none</em>.', E_USER_WARNING);
+			}
+
+			$out = '<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;';
+			$len = strlen($address);
+			for ($i = 0; $i < $len; ++ $i) {
+				if (preg_match('#\w#', $address[$i])) {
+					$out .= '%' . bin2hex($address[$i]);
+				} else {
+					$out .= $address[$i];
+				}
+			}
+			$out .= '" ' . $extra . '>';
+			$len = strlen($text);
+			for ($i = 0; $i < $len; ++ $i) {
+				$out .= '&#x' . bin2hex($text[$i]);
+			}
+
+			return $out . '</a>';
+
+		default:
+			$dwoo->triggerError('Mailto: <em>encode</em> argument is invalid, it must be one of : <em>none (= no value), js, js_charcode or hex</em>', E_USER_WARNING);
+	}
 }

Switch Indentation +54 added lines, -54 removed lines

@@ -67,62 +67,62 @@
     // output
     switch ($encode) {
 
-        case 'none':
-        case null:
-            return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-
-        case 'js':
-        case 'javascript':
-            $str = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
-            $len = strlen($str);
-
-            $out = '';
-            for ($i = 0; $i < $len; ++ $i) {
-                $out .= '%' . bin2hex($str[$i]);
+    case 'none':
+    case null:
+        return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+
+    case 'js':
+    case 'javascript':
+        $str = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
+        $len = strlen($str);
+
+        $out = '';
+        for ($i = 0; $i < $len; ++ $i) {
+            $out .= '%' . bin2hex($str[$i]);
+        }
+
+        return '<script type="text/javascript">eval(unescape(\'' . $out . '\'));</script>';
+
+        break;
+    case 'javascript_charcode':
+    case 'js_charcode':
+    case 'jscharcode':
+    case 'jschar':
+        $str = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+        $len = strlen($str);
+
+        $out = '<script type="text/javascript">' . "\n<!--\ndocument.write(Str.fromCharCode(";
+        for ($i = 0; $i < $len; ++ $i) {
+            $out .= ord($str[$i]) . ',';
+        }
+
+        return rtrim($out, ',') . "));\n-->\n</script>\n";
+
+        break;
+
+    case 'hex':
+        if (strpos($address, '?') !== false) {
+            $dwoo->triggerError('Mailto: Hex encoding is not possible with extra attributes, use one of : <em>js, jscharcode or none</em>.', E_USER_WARNING);
+        }
+
+        $out = '<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;';
+        $len = strlen($address);
+        for ($i = 0; $i < $len; ++ $i) {
+            if (preg_match('#\w#', $address[$i])) {
+                $out .= '%' . bin2hex($address[$i]);
+            } else {
+                $out .= $address[$i];
             }
+        }
+        $out .= '" ' . $extra . '>';
+        $len = strlen($text);
+        for ($i = 0; $i < $len; ++ $i) {
+            $out .= '&#x' . bin2hex($text[$i]);
+        }
 
-            return '<script type="text/javascript">eval(unescape(\'' . $out . '\'));</script>';
+        return $out . '</a>';
 
-            break;
-        case 'javascript_charcode':
-        case 'js_charcode':
-        case 'jscharcode':
-        case 'jschar':
-            $str = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-            $len = strlen($str);
-
-            $out = '<script type="text/javascript">' . "\n<!--\ndocument.write(Str.fromCharCode(";
-            for ($i = 0; $i < $len; ++ $i) {
-                $out .= ord($str[$i]) . ',';
-            }
-
-            return rtrim($out, ',') . "));\n-->\n</script>\n";
-
-            break;
-
-        case 'hex':
-            if (strpos($address, '?') !== false) {
-                $dwoo->triggerError('Mailto: Hex encoding is not possible with extra attributes, use one of : <em>js, jscharcode or none</em>.', E_USER_WARNING);
-            }
-
-            $out = '<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;';
-            $len = strlen($address);
-            for ($i = 0; $i < $len; ++ $i) {
-                if (preg_match('#\w#', $address[$i])) {
-                    $out .= '%' . bin2hex($address[$i]);
-                } else {
-                    $out .= $address[$i];
-                }
-            }
-            $out .= '" ' . $extra . '>';
-            $len = strlen($text);
-            for ($i = 0; $i < $len; ++ $i) {
-                $out .= '&#x' . bin2hex($text[$i]);
-            }
-
-            return $out . '</a>';
-
-        default:
-            $dwoo->triggerError('Mailto: <em>encode</em> argument is invalid, it must be one of : <em>none (= no value), js, js_charcode or hex</em>', E_USER_WARNING);
+    default:
+        $dwoo->triggerError('Mailto: <em>encode</em> argument is invalid, it must be one of : <em>none (= no value), js, js_charcode or hex</em>', E_USER_WARNING);
     }
 }

Spacing +17 added lines, -17 removed lines

@@ -47,19 +47,19 @@ 
     $address .= '?';
 
     if (!empty($subject)) {
-        $address .= 'subject=' . rawurlencode($subject) . '&';
+        $address .= 'subject='.rawurlencode($subject).'&';
     }
     if (!empty($cc)) {
-        $address .= 'cc=' . rawurlencode($cc) . '&';
+        $address .= 'cc='.rawurlencode($cc).'&';
     }
     if (!empty($bcc)) {
-        $address .= 'bcc=' . rawurlencode($bcc) . '&';
+        $address .= 'bcc='.rawurlencode($bcc).'&';
     }
     if (!empty($newsgroups)) {
-        $address .= 'newsgroups=' . rawurlencode($newsgroups) . '&';
+        $address .= 'newsgroups='.rawurlencode($newsgroups).'&';
     }
     if (!empty($followupto)) {
-        $address .= 'followupto=' . rawurlencode($followupto) . '&';
+        $address .= 'followupto='.rawurlencode($followupto).'&';
     }
 
     $address = rtrim($address, '?&');
@@ -69,34 +69,34 @@ 
 
         case 'none':
         case null:
-            return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+            return '<a href="mailto:'.$address.'" '.$extra.'>'.$text.'</a>';
 
         case 'js':
         case 'javascript':
-            $str = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
+            $str = 'document.write(\'<a href="mailto:'.$address.'" '.$extra.'>'.$text.'</a>\');';
             $len = strlen($str);
 
             $out = '';
             for ($i = 0; $i < $len; ++ $i) {
-                $out .= '%' . bin2hex($str[$i]);
+                $out .= '%'.bin2hex($str[$i]);
             }
 
-            return '<script type="text/javascript">eval(unescape(\'' . $out . '\'));</script>';
+            return '<script type="text/javascript">eval(unescape(\''.$out.'\'));</script>';
 
             break;
         case 'javascript_charcode':
         case 'js_charcode':
         case 'jscharcode':
         case 'jschar':
-            $str = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
+            $str = '<a href="mailto:'.$address.'" '.$extra.'>'.$text.'</a>';
             $len = strlen($str);
 
-            $out = '<script type="text/javascript">' . "\n<!--\ndocument.write(Str.fromCharCode(";
+            $out = '<script type="text/javascript">'."\n<!--\ndocument.write(Str.fromCharCode(";
             for ($i = 0; $i < $len; ++ $i) {
-                $out .= ord($str[$i]) . ',';
+                $out .= ord($str[$i]).',';
             }
 
-            return rtrim($out, ',') . "));\n-->\n</script>\n";
+            return rtrim($out, ',')."));\n-->\n</script>\n";
 
             break;
 
@@ -109,18 +109,18 @@ 
             $len = strlen($address);
             for ($i = 0; $i < $len; ++ $i) {
                 if (preg_match('#\w#', $address[$i])) {
-                    $out .= '%' . bin2hex($address[$i]);
+                    $out .= '%'.bin2hex($address[$i]);
                 } else {
                     $out .= $address[$i];
                 }
             }
-            $out .= '" ' . $extra . '>';
+            $out .= '" '.$extra.'>';
             $len = strlen($text);
             for ($i = 0; $i < $len; ++ $i) {
-                $out .= '&#x' . bin2hex($text[$i]);
+                $out .= '&#x'.bin2hex($text[$i]);
             }
 
-            return $out . '</a>';
+            return $out.'</a>';
 
         default:
             $dwoo->triggerError('Mailto: <em>encode</em> argument is invalid, it must be one of : <em>none (= no value), js, js_charcode or hex</em>', E_USER_WARNING);

lib/Dwoo/Template/File.php

Indentation +238 added lines, -238 removed lines

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

Spacing +10 added lines, -10 removed lines

@@ -109,7 +109,7 @@ 
      */
     protected function isValidCompiledFile($file)
     {
-        return parent::isValidCompiledFile($file) && (int)$this->getUid() <= filemtime($file);
+        return parent::isValidCompiledFile($file) && (int) $this->getUid() <= filemtime($file);
     }
 
     /**
@@ -147,12 +147,12 @@ 
         } else {
             foreach ($this->getIncludePath() as $path) {
                 $path = rtrim($path, DIRECTORY_SEPARATOR);
-                if (file_exists($path . DIRECTORY_SEPARATOR . $this->file) === true) {
-                    return $this->resolvedPath = $path . DIRECTORY_SEPARATOR . $this->file;
+                if (file_exists($path.DIRECTORY_SEPARATOR.$this->file) === true) {
+                    return $this->resolvedPath = $path.DIRECTORY_SEPARATOR.$this->file;
                 }
             }
 
-            throw new DwooException('Template "' . $this->file . '" could not be found in any of your include path(s)');
+            throw new DwooException('Template "'.$this->file.'" could not be found in any of your include path(s)');
         }
     }
 
@@ -164,7 +164,7 @@ 
      */
     public function getUid()
     {
-        return (string)filemtime($this->getResourceIdentifier());
+        return (string) filemtime($this->getResourceIdentifier());
     }
 
     /**
@@ -223,7 +223,7 @@ 
                         throw new DwooException('When using an include path you can not reference a template into a parent directory (using ../)');
                     }
                 } else {
-                    $resourceId = dirname($parentTemplate->getResourceIdentifier()) . DIRECTORY_SEPARATOR . $resourceId;
+                    $resourceId = dirname($parentTemplate->getResourceIdentifier()).DIRECTORY_SEPARATOR.$resourceId;
                     if (file_exists($resourceId) === false) {
                         return null;
                     }
@@ -236,7 +236,7 @@ 
         if ($policy = $core->getSecurityPolicy()) {
             while (true) {
                 if (preg_match('{^([a-z]+?)://}i', $resourceId)) {
-                    throw new SecurityException('The security policy prevents you to read files from external sources : <em>' . $resourceId . '</em>.');
+                    throw new SecurityException('The security policy prevents you to read files from external sources : <em>'.$resourceId.'</em>.');
                 }
 
                 if ($includePath) {
@@ -250,7 +250,7 @@ 
                         break 2;
                     }
                 }
-                throw new SecurityException('The security policy prevents you to read <em>' . $resourceId . '</em>');
+                throw new SecurityException('The security policy prevents you to read <em>'.$resourceId.'</em>');
             }
         }
 
@@ -277,7 +277,7 @@ 
             $this->compileId = str_replace('../', '__', strtr($this->getResourceIdentifier(), '\\:', '/-'));
         }
 
-        return $this->compileId . '.d' . Core::RELEASE_TAG . '.php';
+        return $this->compileId.'.d'.Core::RELEASE_TAG.'.php';
     }
 
     /**
@@ -288,6 +288,6 @@ 
      */
     public function getIsModifiedCode()
     {
-        return '"' . $this->getUid() . '" == filemtime(' . var_export($this->getResourceIdentifier(), true) . ')';
+        return '"'.$this->getUid().'" == filemtime('.var_export($this->getResourceIdentifier(), true).')';
     }
 }