dwoo-project / dwoo

lib/Dwoo/Plugins/Blocks/PluginAutoEscape.php

Indentation +56 added lines, -56 removed lines

@@ -32,67 +32,67 @@
  */
 class PluginAutoEscape extends BlockPlugin implements ICompilableBlock
 {
-    protected static $stack = array();
+	protected static $stack = array();
 
-    /**
-     * @param $enabled
-     */
-    public function init($enabled)
-    {
-    }
+	/**
+	 * @param $enabled
+	 */
+	public function init($enabled)
+	{
+	}
 
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $type
-     *
-     * @return string
-     * @throws CompilationException
-     */
-    public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        $params = $compiler->getCompiledParams($params);
-        switch (strtolower(trim((string)$params['enabled'], '"\''))) {
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $type
+	 *
+	 * @return string
+	 * @throws CompilationException
+	 */
+	public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		$params = $compiler->getCompiledParams($params);
+		switch (strtolower(trim((string)$params['enabled'], '"\''))) {
 
-            case 'on':
-            case 'true':
-            case 'enabled':
-            case 'enable':
-            case '1':
-                $enable = true;
-                break;
-            case 'off':
-            case 'false':
-            case 'disabled':
-            case 'disable':
-            case '0':
-                $enable = false;
-                break;
-            default:
-                throw new CompilationException($compiler, 'Auto_Escape : Invalid parameter (' . $params['enabled'] . '), valid parameters are "enable"/true or "disable"/false');
-        }
+			case 'on':
+			case 'true':
+			case 'enabled':
+			case 'enable':
+			case '1':
+				$enable = true;
+				break;
+			case 'off':
+			case 'false':
+			case 'disabled':
+			case 'disable':
+			case '0':
+				$enable = false;
+				break;
+			default:
+				throw new CompilationException($compiler, 'Auto_Escape : Invalid parameter (' . $params['enabled'] . '), valid parameters are "enable"/true or "disable"/false');
+		}
 
-        self::$stack[] = $compiler->getAutoEscape();
-        $compiler->setAutoEscape($enable);
+		self::$stack[] = $compiler->getAutoEscape();
+		$compiler->setAutoEscape($enable);
 
-        return '';
-    }
+		return '';
+	}
 
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $content
-     *
-     * @return string
-     */
-    public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        $compiler->setAutoEscape(array_pop(self::$stack));
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $content
+	 *
+	 * @return string
+	 */
+	public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		$compiler->setAutoEscape(array_pop(self::$stack));
 
-        return $content;
-    }
+		return $content;
+	}
 }

lib/Dwoo/Plugins/Blocks/PluginElse.php

Indentation +49 added lines, -49 removed lines

@@ -38,59 +38,59 @@
  */
 class PluginElse extends BlockPlugin implements ICompilableBlock
 {
-    public function init()
-    {
-    }
+	public function init()
+	{
+	}
 
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $type
-     *
-     * @return string
-     * @throws CompilationException
-     */
-    public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        $preContent = '';
-        while (true) {
-            $preContent .= $compiler->removeTopBlock();
-            $block = &$compiler->getCurrentBlock();
-            if (!$block) {
-                throw new CompilationException($compiler, 'An else block was found but it was not preceded by an if or other else-able construct');
-            }
-            $interfaces = class_implements($block['class']);
-            if (in_array('Dwoo\IElseable', $interfaces) !== false) {
-                break;
-            }
-        }
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $type
+	 *
+	 * @return string
+	 * @throws CompilationException
+	 */
+	public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		$preContent = '';
+		while (true) {
+			$preContent .= $compiler->removeTopBlock();
+			$block = &$compiler->getCurrentBlock();
+			if (!$block) {
+				throw new CompilationException($compiler, 'An else block was found but it was not preceded by an if or other else-able construct');
+			}
+			$interfaces = class_implements($block['class']);
+			if (in_array('Dwoo\IElseable', $interfaces) !== false) {
+				break;
+			}
+		}
 
-        $params['initialized'] = true;
-        $compiler->injectBlock($type, $params);
+		$params['initialized'] = true;
+		$compiler->injectBlock($type, $params);
 
-        return $preContent;
-    }
+		return $preContent;
+	}
 
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $content
-     *
-     * @return string
-     */
-    public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        if (!isset($params['initialized'])) {
-            return '';
-        }
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $content
+	 *
+	 * @return string
+	 */
+	public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		if (!isset($params['initialized'])) {
+			return '';
+		}
 
-        $block                      = &$compiler->getCurrentBlock();
-        $block['params']['hasElse'] = Compiler::PHP_OPEN . "else {\n" . Compiler::PHP_CLOSE . $content . Compiler::PHP_OPEN . "\n}" . Compiler::PHP_CLOSE;
+		$block                      = &$compiler->getCurrentBlock();
+		$block['params']['hasElse'] = Compiler::PHP_OPEN . "else {\n" . Compiler::PHP_CLOSE . $content . Compiler::PHP_OPEN . "\n}" . Compiler::PHP_CLOSE;
 
-        return '';
-    }
+		return '';
+	}
 }

lib/Dwoo/Plugins/Blocks/PluginSection.php

Indentation +117 added lines, -117 removed lines

@@ -28,98 +28,98 @@ 
  */
 class PluginSection extends BlockPlugin implements ICompilableBlock, IElseable
 {
-    public static $cnt = 0;
-
-    /**
-     * @param      $name
-     * @param      $loop
-     * @param null $start
-     * @param null $step
-     * @param null $max
-     * @param bool $show
-     */
-    public function init($name, $loop, $start = null, $step = null, $max = null, $show = true)
-    {
-    }
-
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $type
-     *
-     * @return string
-     */
-    public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        return '';
-    }
-
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $content
-     *
-     * @return string
-     */
-    public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        $output = Compiler::PHP_OPEN;
-        $params = $compiler->getCompiledParams($params);
-
-        // assigns params
-        $loop  = $params['loop'];
-        $start = $params['start'];
-        $max   = $params['max'];
-        $name  = $params['name'];
-        $step  = $params['step'];
-        $show  = $params['show'];
-
-        // gets unique id
-        $cnt = self::$cnt ++;
-
-        $output .= '$this->globals[\'section\'][' . $name . '] = array();' . "\n" . '$_section' . $cnt . ' =& $this->globals[\'section\'][' . $name . '];' . "\n";
-
-        if ($loop !== 'null') {
-            $output .= '$_section' . $cnt . '[\'loop\'] = is_array($tmp = ' . $loop . ') ? count($tmp) : max(0, (int) $tmp);' . "\n";
-        } else {
-            $output .= '$_section' . $cnt . '[\'loop\'] = 1;' . "\n";
-        }
-
-        if ($show !== 'null') {
-            $output .= '$_section' . $cnt . '[\'show\'] = ' . $show . ";\n";
-        } else {
-            $output .= '$_section' . $cnt . '[\'show\'] = true;' . "\n";
-        }
-
-        if ($name !== 'null') {
-            $output .= '$_section' . $cnt . '[\'name\'] = ' . $name . ";\n";
-        } else {
-            $output .= '$_section' . $cnt . '[\'name\'] = true;' . "\n";
-        }
-
-        if ($max !== 'null') {
-            $output .= '$_section' . $cnt . '[\'max\'] = (int)' . $max . ";\n" . 'if($_section' . $cnt . '[\'max\'] < 0) { $_section' . $cnt . '[\'max\'] = $_section' . $cnt . '[\'loop\']; }' . "\n";
-        } else {
-            $output .= '$_section' . $cnt . '[\'max\'] = $_section' . $cnt . '[\'loop\'];' . "\n";
-        }
-
-        if ($step !== 'null') {
-            $output .= '$_section' . $cnt . '[\'step\'] = (int)' . $step . ' == 0 ? 1 : (int) ' . $step . ";\n";
-        } else {
-            $output .= '$_section' . $cnt . '[\'step\'] = 1;' . "\n";
-        }
-
-        if ($start !== 'null') {
-            $output .= '$_section' . $cnt . '[\'start\'] = (int)' . $start . ";\n";
-        } else {
-            $output .= '$_section' . $cnt . '[\'start\'] = $_section' . $cnt . '[\'step\'] > 0 ? 0 : $_section' . $cnt . '[\'loop\'] - 1;' . "\n" . 'if ($_section' . $cnt . '[\'start\'] < 0) { $_section' . $cnt . '[\'start\'] = max($_section' . $cnt . '[\'step\'] > 0 ? 0 : -1, $_section' . $cnt . '[\'loop\'] + $_section' . $cnt . '[\'start\']); } ' . "\n" . 'else { $_section' . $cnt . '[\'start\'] = min($_section' . $cnt . '[\'start\'], $_section' . $cnt . '[\'step\'] > 0 ? $_section' . $cnt . '[\'loop\'] : $_section' . $cnt . '[\'loop\'] -1); }' . "\n";
-        }
-
-        /*		if ($usesAny) {
+	public static $cnt = 0;
+
+	/**
+	 * @param      $name
+	 * @param      $loop
+	 * @param null $start
+	 * @param null $step
+	 * @param null $max
+	 * @param bool $show
+	 */
+	public function init($name, $loop, $start = null, $step = null, $max = null, $show = true)
+	{
+	}
+
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $type
+	 *
+	 * @return string
+	 */
+	public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		return '';
+	}
+
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $content
+	 *
+	 * @return string
+	 */
+	public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		$output = Compiler::PHP_OPEN;
+		$params = $compiler->getCompiledParams($params);
+
+		// assigns params
+		$loop  = $params['loop'];
+		$start = $params['start'];
+		$max   = $params['max'];
+		$name  = $params['name'];
+		$step  = $params['step'];
+		$show  = $params['show'];
+
+		// gets unique id
+		$cnt = self::$cnt ++;
+
+		$output .= '$this->globals[\'section\'][' . $name . '] = array();' . "\n" . '$_section' . $cnt . ' =& $this->globals[\'section\'][' . $name . '];' . "\n";
+
+		if ($loop !== 'null') {
+			$output .= '$_section' . $cnt . '[\'loop\'] = is_array($tmp = ' . $loop . ') ? count($tmp) : max(0, (int) $tmp);' . "\n";
+		} else {
+			$output .= '$_section' . $cnt . '[\'loop\'] = 1;' . "\n";
+		}
+
+		if ($show !== 'null') {
+			$output .= '$_section' . $cnt . '[\'show\'] = ' . $show . ";\n";
+		} else {
+			$output .= '$_section' . $cnt . '[\'show\'] = true;' . "\n";
+		}
+
+		if ($name !== 'null') {
+			$output .= '$_section' . $cnt . '[\'name\'] = ' . $name . ";\n";
+		} else {
+			$output .= '$_section' . $cnt . '[\'name\'] = true;' . "\n";
+		}
+
+		if ($max !== 'null') {
+			$output .= '$_section' . $cnt . '[\'max\'] = (int)' . $max . ";\n" . 'if($_section' . $cnt . '[\'max\'] < 0) { $_section' . $cnt . '[\'max\'] = $_section' . $cnt . '[\'loop\']; }' . "\n";
+		} else {
+			$output .= '$_section' . $cnt . '[\'max\'] = $_section' . $cnt . '[\'loop\'];' . "\n";
+		}
+
+		if ($step !== 'null') {
+			$output .= '$_section' . $cnt . '[\'step\'] = (int)' . $step . ' == 0 ? 1 : (int) ' . $step . ";\n";
+		} else {
+			$output .= '$_section' . $cnt . '[\'step\'] = 1;' . "\n";
+		}
+
+		if ($start !== 'null') {
+			$output .= '$_section' . $cnt . '[\'start\'] = (int)' . $start . ";\n";
+		} else {
+			$output .= '$_section' . $cnt . '[\'start\'] = $_section' . $cnt . '[\'step\'] > 0 ? 0 : $_section' . $cnt . '[\'loop\'] - 1;' . "\n" . 'if ($_section' . $cnt . '[\'start\'] < 0) { $_section' . $cnt . '[\'start\'] = max($_section' . $cnt . '[\'step\'] > 0 ? 0 : -1, $_section' . $cnt . '[\'loop\'] + $_section' . $cnt . '[\'start\']); } ' . "\n" . 'else { $_section' . $cnt . '[\'start\'] = min($_section' . $cnt . '[\'start\'], $_section' . $cnt . '[\'step\'] > 0 ? $_section' . $cnt . '[\'loop\'] : $_section' . $cnt . '[\'loop\'] -1); }' . "\n";
+		}
+
+		/*		if ($usesAny) {
                     $output .= "\n".'$this->globals["section"]['.$name.'] = array'."\n(";
                     if ($usesIndex) $output .="\n\t".'"index"		=> 0,';
                     if ($usesIteration) $output .="\n\t".'"iteration"		=> 1,';
@@ -131,29 +131,29 @@ 
                 }
         */
 
-        $output .= 'if ($_section' . $cnt . '[\'show\']) {' . "\n";
-        if ($start === 'null' && $step === 'null' && $max === 'null') {
-            $output .= '	$_section' . $cnt . '[\'total\'] = $_section' . $cnt . '[\'loop\'];' . "\n";
-        } else {
-            $output .= '	$_section' . $cnt . '[\'total\'] = min(ceil(($_section' . $cnt . '[\'step\'] > 0 ? $_section' . $cnt . '[\'loop\'] - $_section' . $cnt . '[\'start\'] : $_section' . $cnt . '[\'start\'] + 1) / abs($_section' . $cnt . '[\'step\'])), $_section' . $cnt . '[\'max\']);' . "\n";
-        }
-        $output .= '	if ($_section' . $cnt . '[\'total\'] == 0) {' . "\n" . '		$_section' . $cnt . '[\'show\'] = false;' . "\n" . '	}' . "\n" . '} else {' . "\n" . '	$_section' . $cnt . '[\'total\'] = 0;' . "\n}\n";
-        $output .= 'if ($_section' . $cnt . '[\'show\']) {' . "\n";
-        $output .= "\t" . 'for ($this->scope[' . $name . '] = $_section' . $cnt . '[\'start\'], $_section' . $cnt . '[\'iteration\'] = 1; ' . '$_section' . $cnt . '[\'iteration\'] <= $_section' . $cnt . '[\'total\']; ' . '$this->scope[' . $name . '] += $_section' . $cnt . '[\'step\'], $_section' . $cnt . '[\'iteration\']++) {' . "\n";
-        $output .= "\t\t" . '$_section' . $cnt . '[\'rownum\'] = $_section' . $cnt . '[\'iteration\'];' . "\n";
-        $output .= "\t\t" . '$_section' . $cnt . '[\'index_prev\'] = $this->scope[' . $name . '] - $_section' . $cnt . '[\'step\'];' . "\n";
-        $output .= "\t\t" . '$_section' . $cnt . '[\'index_next\'] = $this->scope[' . $name . '] + $_section' . $cnt . '[\'step\'];' . "\n";
-        $output .= "\t\t" . '$_section' . $cnt . '[\'first\']      = ($_section' . $cnt . '[\'iteration\'] == 1);' . "\n";
-        $output .= "\t\t" . '$_section' . $cnt . '[\'last\']       = ($_section' . $cnt . '[\'iteration\'] == $_section' . $cnt . '[\'total\']);' . "\n";
-
-        $output .= Compiler::PHP_CLOSE . $content . Compiler::PHP_OPEN;
-
-        $output .= "\n\t}\n} " . Compiler::PHP_CLOSE;
-
-        if (isset($params['hasElse'])) {
-            $output .= $params['hasElse'];
-        }
-
-        return $output;
-    }
+		$output .= 'if ($_section' . $cnt . '[\'show\']) {' . "\n";
+		if ($start === 'null' && $step === 'null' && $max === 'null') {
+			$output .= '	$_section' . $cnt . '[\'total\'] = $_section' . $cnt . '[\'loop\'];' . "\n";
+		} else {
+			$output .= '	$_section' . $cnt . '[\'total\'] = min(ceil(($_section' . $cnt . '[\'step\'] > 0 ? $_section' . $cnt . '[\'loop\'] - $_section' . $cnt . '[\'start\'] : $_section' . $cnt . '[\'start\'] + 1) / abs($_section' . $cnt . '[\'step\'])), $_section' . $cnt . '[\'max\']);' . "\n";
+		}
+		$output .= '	if ($_section' . $cnt . '[\'total\'] == 0) {' . "\n" . '		$_section' . $cnt . '[\'show\'] = false;' . "\n" . '	}' . "\n" . '} else {' . "\n" . '	$_section' . $cnt . '[\'total\'] = 0;' . "\n}\n";
+		$output .= 'if ($_section' . $cnt . '[\'show\']) {' . "\n";
+		$output .= "\t" . 'for ($this->scope[' . $name . '] = $_section' . $cnt . '[\'start\'], $_section' . $cnt . '[\'iteration\'] = 1; ' . '$_section' . $cnt . '[\'iteration\'] <= $_section' . $cnt . '[\'total\']; ' . '$this->scope[' . $name . '] += $_section' . $cnt . '[\'step\'], $_section' . $cnt . '[\'iteration\']++) {' . "\n";
+		$output .= "\t\t" . '$_section' . $cnt . '[\'rownum\'] = $_section' . $cnt . '[\'iteration\'];' . "\n";
+		$output .= "\t\t" . '$_section' . $cnt . '[\'index_prev\'] = $this->scope[' . $name . '] - $_section' . $cnt . '[\'step\'];' . "\n";
+		$output .= "\t\t" . '$_section' . $cnt . '[\'index_next\'] = $this->scope[' . $name . '] + $_section' . $cnt . '[\'step\'];' . "\n";
+		$output .= "\t\t" . '$_section' . $cnt . '[\'first\']      = ($_section' . $cnt . '[\'iteration\'] == 1);' . "\n";
+		$output .= "\t\t" . '$_section' . $cnt . '[\'last\']       = ($_section' . $cnt . '[\'iteration\'] == $_section' . $cnt . '[\'total\']);' . "\n";
+
+		$output .= Compiler::PHP_CLOSE . $content . Compiler::PHP_OPEN;
+
+		$output .= "\n\t}\n} " . Compiler::PHP_CLOSE;
+
+		if (isset($params['hasElse'])) {
+			$output .= $params['hasElse'];
+		}
+
+		return $output;
+	}
 }

lib/Dwoo/Plugins/Blocks/PluginFor.php

Indentation +146 added lines, -146 removed lines

@@ -35,158 +35,158 @@
  */
 class PluginFor extends BlockPlugin implements ICompilableBlock, IElseable
 {
-    public static $cnt = 0;
-
-    /**
-     * @param      $name
-     * @param      $from
-     * @param null $to
-     * @param int  $step
-     * @param int  $skip
-     */
-    public function init($name, $from, $to = null, $step = 1, $skip = 0)
-    {
-    }
-
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $type
-     *
-     * @return string
-     */
-    public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        // get block params and save the current template pointer to use it in the postProcessing method
-        $currentBlock                         = &$compiler->getCurrentBlock();
-        $currentBlock['params']['tplPointer'] = $compiler->getPointer();
-
-        return '';
-    }
-
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $content
-     *
-     * @return string
-     */
-    public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        $params = $compiler->getCompiledParams($params);
-        $tpl    = $compiler->getTemplateSource($params['tplPointer']);
-
-        // assigns params
-        $from = $params['from'];
-        $name = $params['name'];
-        $step = $params['step'];
-        $to   = $params['to'];
-
-        // evaluates which global variables have to be computed
-        $varName       = '$dwoo.for.' . trim($name, '"\'') . '.';
-        $shortVarName  = '$.for.' . trim($name, '"\'') . '.';
-        $usesAny       = strpos($tpl, $varName) !== false || strpos($tpl, $shortVarName) !== false;
-        $usesFirst     = strpos($tpl, $varName . 'first') !== false || strpos($tpl, $shortVarName . 'first') !== false;
-        $usesLast      = strpos($tpl, $varName . 'last') !== false || strpos($tpl, $shortVarName . 'last') !== false;
-        $usesIndex     = strpos($tpl, $varName . 'index') !== false || strpos($tpl, $shortVarName . 'index') !== false;
-        $usesIteration = $usesFirst || $usesLast || strpos($tpl, $varName . 'iteration') !== false || strpos($tpl, $shortVarName . 'iteration') !== false;
-        $usesShow      = strpos($tpl, $varName . 'show') !== false || strpos($tpl, $shortVarName . 'show') !== false;
-        $usesTotal     = $usesLast || strpos($tpl, $varName . 'total') !== false || strpos($tpl, $shortVarName . 'total') !== false;
-
-        if (strpos($name, '$this->scope[') !== false) {
-            $usesAny = $usesFirst = $usesLast = $usesIndex = $usesIteration = $usesShow = $usesTotal = true;
-        }
-
-        // gets foreach id
-        $cnt = self::$cnt ++;
-
-        // builds pre processing output for
-        $out = Compiler::PHP_OPEN . "\n" . '$_for' . $cnt . '_from = ' . $from . ';' . "\n" . '$_for' . $cnt . '_to = ' . $to . ';' . "\n" . '$_for' . $cnt . '_step = abs(' . $step . ');' . "\n" . 'if (is_numeric($_for' . $cnt . '_from) && !is_numeric($_for' . $cnt . '_to)) { $this->triggerError(\'For requires the <em>to</em> parameter when using a numerical <em>from</em>\'); }' . "\n" . '$tmp_shows = $this->isArray($_for' . $cnt . '_from, true) || (is_numeric($_for' . $cnt . '_from) && (abs(($_for' . $cnt . '_from - $_for' . $cnt . '_to)/$_for' . $cnt . '_step) !== 0 || $_for' . $cnt . '_from == $_for' . $cnt . '_to));';
-        // adds for properties
-        if ($usesAny) {
-            $out .= "\n" . '$this->globals["for"][' . $name . '] = array' . "\n(";
-            if ($usesIndex) {
-                $out .= "\n\t" . '"index"		=> 0,';
-            }
-            if ($usesIteration) {
-                $out .= "\n\t" . '"iteration"		=> 1,';
-            }
-            if ($usesFirst) {
-                $out .= "\n\t" . '"first"		=> null,';
-            }
-            if ($usesLast) {
-                $out .= "\n\t" . '"last"		=> null,';
-            }
-            if ($usesShow) {
-                $out .= "\n\t" . '"show"		=> $tmp_shows,';
-            }
-            if ($usesTotal) {
-                $out .= "\n\t" . '"total"		=> $this->isArray($_for' . $cnt . '_from) ? floor($this->count($_for' . $cnt . '_from) / $_for' . $cnt . '_step) : (is_numeric($_for' . $cnt . '_from) ? abs(($_for' . $cnt . '_to + 1 - $_for' . $cnt . '_from)/$_for' . $cnt . '_step) : 0),';
-            }
-            $out .= "\n);\n" . '$_for' . $cnt . '_glob =& $this->globals["for"][' . $name . '];';
-        }
-        // checks if for must be looped
-        $out .= "\n" . 'if ($tmp_shows)' . "\n{";
-        // set from/to to correct values if an array was given
-        $out .= "\n\t" . 'if ($this->isArray($_for' . $cnt . '_from' . (isset($params['hasElse']) ? ', true' : '') . ') == true) {
+	public static $cnt = 0;
+
+	/**
+	 * @param      $name
+	 * @param      $from
+	 * @param null $to
+	 * @param int  $step
+	 * @param int  $skip
+	 */
+	public function init($name, $from, $to = null, $step = 1, $skip = 0)
+	{
+	}
+
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $type
+	 *
+	 * @return string
+	 */
+	public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		// get block params and save the current template pointer to use it in the postProcessing method
+		$currentBlock                         = &$compiler->getCurrentBlock();
+		$currentBlock['params']['tplPointer'] = $compiler->getPointer();
+
+		return '';
+	}
+
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $content
+	 *
+	 * @return string
+	 */
+	public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		$params = $compiler->getCompiledParams($params);
+		$tpl    = $compiler->getTemplateSource($params['tplPointer']);
+
+		// assigns params
+		$from = $params['from'];
+		$name = $params['name'];
+		$step = $params['step'];
+		$to   = $params['to'];
+
+		// evaluates which global variables have to be computed
+		$varName       = '$dwoo.for.' . trim($name, '"\'') . '.';
+		$shortVarName  = '$.for.' . trim($name, '"\'') . '.';
+		$usesAny       = strpos($tpl, $varName) !== false || strpos($tpl, $shortVarName) !== false;
+		$usesFirst     = strpos($tpl, $varName . 'first') !== false || strpos($tpl, $shortVarName . 'first') !== false;
+		$usesLast      = strpos($tpl, $varName . 'last') !== false || strpos($tpl, $shortVarName . 'last') !== false;
+		$usesIndex     = strpos($tpl, $varName . 'index') !== false || strpos($tpl, $shortVarName . 'index') !== false;
+		$usesIteration = $usesFirst || $usesLast || strpos($tpl, $varName . 'iteration') !== false || strpos($tpl, $shortVarName . 'iteration') !== false;
+		$usesShow      = strpos($tpl, $varName . 'show') !== false || strpos($tpl, $shortVarName . 'show') !== false;
+		$usesTotal     = $usesLast || strpos($tpl, $varName . 'total') !== false || strpos($tpl, $shortVarName . 'total') !== false;
+
+		if (strpos($name, '$this->scope[') !== false) {
+			$usesAny = $usesFirst = $usesLast = $usesIndex = $usesIteration = $usesShow = $usesTotal = true;
+		}
+
+		// gets foreach id
+		$cnt = self::$cnt ++;
+
+		// builds pre processing output for
+		$out = Compiler::PHP_OPEN . "\n" . '$_for' . $cnt . '_from = ' . $from . ';' . "\n" . '$_for' . $cnt . '_to = ' . $to . ';' . "\n" . '$_for' . $cnt . '_step = abs(' . $step . ');' . "\n" . 'if (is_numeric($_for' . $cnt . '_from) && !is_numeric($_for' . $cnt . '_to)) { $this->triggerError(\'For requires the <em>to</em> parameter when using a numerical <em>from</em>\'); }' . "\n" . '$tmp_shows = $this->isArray($_for' . $cnt . '_from, true) || (is_numeric($_for' . $cnt . '_from) && (abs(($_for' . $cnt . '_from - $_for' . $cnt . '_to)/$_for' . $cnt . '_step) !== 0 || $_for' . $cnt . '_from == $_for' . $cnt . '_to));';
+		// adds for properties
+		if ($usesAny) {
+			$out .= "\n" . '$this->globals["for"][' . $name . '] = array' . "\n(";
+			if ($usesIndex) {
+				$out .= "\n\t" . '"index"		=> 0,';
+			}
+			if ($usesIteration) {
+				$out .= "\n\t" . '"iteration"		=> 1,';
+			}
+			if ($usesFirst) {
+				$out .= "\n\t" . '"first"		=> null,';
+			}
+			if ($usesLast) {
+				$out .= "\n\t" . '"last"		=> null,';
+			}
+			if ($usesShow) {
+				$out .= "\n\t" . '"show"		=> $tmp_shows,';
+			}
+			if ($usesTotal) {
+				$out .= "\n\t" . '"total"		=> $this->isArray($_for' . $cnt . '_from) ? floor($this->count($_for' . $cnt . '_from) / $_for' . $cnt . '_step) : (is_numeric($_for' . $cnt . '_from) ? abs(($_for' . $cnt . '_to + 1 - $_for' . $cnt . '_from)/$_for' . $cnt . '_step) : 0),';
+			}
+			$out .= "\n);\n" . '$_for' . $cnt . '_glob =& $this->globals["for"][' . $name . '];';
+		}
+		// checks if for must be looped
+		$out .= "\n" . 'if ($tmp_shows)' . "\n{";
+		// set from/to to correct values if an array was given
+		$out .= "\n\t" . 'if ($this->isArray($_for' . $cnt . '_from' . (isset($params['hasElse']) ? ', true' : '') . ') == true) {
 		$_for' . $cnt . '_to = is_numeric($_for' . $cnt . '_to) ? $_for' . $cnt . '_to - $_for' . $cnt . '_step : $this->count($_for' . $cnt . '_from) - 1;
 		$_for' . $cnt . '_from = 0;
 	}';
 
-        // if input are pure numbers it shouldn't reorder them, if it's variables it gets too messy though so in that case a counter should be used
-        $reverse     = false;
-        $condition   = '<=';
-        $incrementer = '+';
-
-        if (preg_match('{^(["\']?)([0-9]+)\1$}', $from, $mN1) && preg_match('{^(["\']?)([0-9]+)\1$}', $to, $mN2)) {
-            $from = (int)$mN1[2];
-            $to   = (int)$mN2[2];
-            if ($from > $to) {
-                $reverse     = true;
-                $condition   = '>=';
-                $incrementer = '-';
-            }
-        }
-
-        // reverse from and to if needed
-        if (!$reverse) {
-            $out .= "\n\t" . 'if ($_for' . $cnt . '_from > $_for' . $cnt . '_to) {
+		// if input are pure numbers it shouldn't reorder them, if it's variables it gets too messy though so in that case a counter should be used
+		$reverse     = false;
+		$condition   = '<=';
+		$incrementer = '+';
+
+		if (preg_match('{^(["\']?)([0-9]+)\1$}', $from, $mN1) && preg_match('{^(["\']?)([0-9]+)\1$}', $to, $mN2)) {
+			$from = (int)$mN1[2];
+			$to   = (int)$mN2[2];
+			if ($from > $to) {
+				$reverse     = true;
+				$condition   = '>=';
+				$incrementer = '-';
+			}
+		}
+
+		// reverse from and to if needed
+		if (!$reverse) {
+			$out .= "\n\t" . 'if ($_for' . $cnt . '_from > $_for' . $cnt . '_to) {
 				$tmp = $_for' . $cnt . '_from;
 				$_for' . $cnt . '_from = $_for' . $cnt . '_to;
 				$_for' . $cnt . '_to = $tmp;
 			}';
-        }
-
-        $out .= "\n\t" . 'for ($this->scope[' . $name . '] = $_for' . $cnt . '_from; $this->scope[' . $name . '] ' . $condition . ' $_for' . $cnt . '_to; $this->scope[' . $name . '] ' . $incrementer . '= $_for' . $cnt . '_step)' . "\n\t{";
-        // updates properties
-        if ($usesIndex) {
-            $out .= "\n\t\t" . '$_for' . $cnt . '_glob["index"] = $this->scope[' . $name . '];';
-        }
-        if ($usesFirst) {
-            $out .= "\n\t\t" . '$_for' . $cnt . '_glob["first"] = (string) ($_for' . $cnt . '_glob["iteration"] === 1);';
-        }
-        if ($usesLast) {
-            $out .= "\n\t\t" . '$_for' . $cnt . '_glob["last"] = (string) ($_for' . $cnt . '_glob["iteration"] === $_for' . $cnt . '_glob["total"]);';
-        }
-        $out .= "\n/* -- for start output */\n" . Compiler::PHP_CLOSE;
-
-        // build post processing output and cache it
-        $postOut = Compiler::PHP_OPEN . '/* -- for end output */';
-        // update properties
-        if ($usesIteration) {
-            $postOut .= "\n\t\t" . '$_for' . $cnt . '_glob["iteration"]+=1;';
-        }
-        // end loop
-        $postOut .= "\n\t}\n}\n" . Compiler::PHP_CLOSE;
-
-        if (isset($params['hasElse'])) {
-            $postOut .= $params['hasElse'];
-        }
-
-        return $out . $content . $postOut;
-    }
+		}
+
+		$out .= "\n\t" . 'for ($this->scope[' . $name . '] = $_for' . $cnt . '_from; $this->scope[' . $name . '] ' . $condition . ' $_for' . $cnt . '_to; $this->scope[' . $name . '] ' . $incrementer . '= $_for' . $cnt . '_step)' . "\n\t{";
+		// updates properties
+		if ($usesIndex) {
+			$out .= "\n\t\t" . '$_for' . $cnt . '_glob["index"] = $this->scope[' . $name . '];';
+		}
+		if ($usesFirst) {
+			$out .= "\n\t\t" . '$_for' . $cnt . '_glob["first"] = (string) ($_for' . $cnt . '_glob["iteration"] === 1);';
+		}
+		if ($usesLast) {
+			$out .= "\n\t\t" . '$_for' . $cnt . '_glob["last"] = (string) ($_for' . $cnt . '_glob["iteration"] === $_for' . $cnt . '_glob["total"]);';
+		}
+		$out .= "\n/* -- for start output */\n" . Compiler::PHP_CLOSE;
+
+		// build post processing output and cache it
+		$postOut = Compiler::PHP_OPEN . '/* -- for end output */';
+		// update properties
+		if ($usesIteration) {
+			$postOut .= "\n\t\t" . '$_for' . $cnt . '_glob["iteration"]+=1;';
+		}
+		// end loop
+		$postOut .= "\n\t}\n}\n" . Compiler::PHP_CLOSE;
+
+		if (isset($params['hasElse'])) {
+			$postOut .= $params['hasElse'];
+		}
+
+		return $out . $content . $postOut;
+	}
 }

lib/Dwoo/Plugins/Blocks/PluginTopLevelBlock.php

Indentation +29 added lines, -29 removed lines

@@ -26,35 +26,35 @@
  */
 final class PluginTopLevelBlock extends BlockPlugin implements ICompilableBlock
 {
-    public function init()
-    {
-    }
+	public function init()
+	{
+	}
 
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $type
-     *
-     * @return string
-     */
-    public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        return '/* end template head */ ob_start(); /* template body */ ' . Compiler::PHP_CLOSE;
-    }
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $type
+	 *
+	 * @return string
+	 */
+	public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		return '/* end template head */ ob_start(); /* template body */ ' . Compiler::PHP_CLOSE;
+	}
 
-    /**
-     * @param Compiler $compiler
-     * @param array    $params
-     * @param string   $prepend
-     * @param string   $append
-     * @param string   $content
-     *
-     * @return string
-     */
-    public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        return $content . Compiler::PHP_OPEN . ' /* end template body */' . "\n" . 'return $this->buffer . ob_get_clean();';
-    }
+	/**
+	 * @param Compiler $compiler
+	 * @param array    $params
+	 * @param string   $prepend
+	 * @param string   $append
+	 * @param string   $content
+	 *
+	 * @return string
+	 */
+	public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		return $content . Compiler::PHP_OPEN . ' /* end template body */' . "\n" . 'return $this->buffer . ob_get_clean();';
+	}
 }

lib/Dwoo/Plugins/Filters/PluginHtmlFormat.php

Indentation +157 added lines, -157 removed lines

@@ -30,161 +30,161 @@
  */
 class PluginHtmlFormat extends Filter
 {
-    /**
-     * tab count to auto-indent the source.
-     *
-     * @var int
-     */
-    protected static $tabCount = - 1;
-
-    /**
-     * stores the additional data (following a tag) of the last call to open/close/singleTag.
-     *
-     * @var string
-     */
-    protected static $lastCallAdd = '';
-
-    /**
-     * formats the input using the singleTag/closeTag/openTag functions.
-     * It is auto indenting the whole code, excluding <textarea>, <code> and <pre> tags that must be kept intact.
-     * Those tags must however contain only htmlentities-escaped text for everything to work properly.
-     * Inline tags are presented on a single line with their content
-     *
-     * @param string $input the xhtml to format
-     *
-     * @return string formatted xhtml
-     */
-    public function process($input)
-    {
-        self::$tabCount = - 1;
-
-        // auto indent all but textareas & pre (or we have weird tabs inside)
-        $input = preg_replace_callback("#(<[^>]+>)(\s*)([^<]*)#", array(
-            'self',
-            'tagDispatcher'
-        ), $input);
-
-        return $input;
-    }
-
-    /**
-     * helper function for format()'s preg_replace call.
-     *
-     * @param array $input array of matches (1=>tag, 2=>whitespace(optional), 3=>additional non-html content)
-     *
-     * @return string the indented tag
-     */
-    protected static function tagDispatcher($input)
-    {
-        // textarea, pre, code tags and comments are to be left alone to avoid any non-wanted whitespace inside them so it just outputs them as they were
-        if (substr($input[1], 0, 9) == '<textarea' || substr($input[1], 0, 4) == '<pre' || substr($input[1], 0, 5) == '<code' || substr($input[1], 0, 4) == '<!--' || substr($input[1], 0, 9) == '<![CDATA[') {
-            return $input[1] . $input[3];
-        }
-        // closing textarea, code and pre tags and self-closed tags (i.e. <br />) are printed as singleTags because we didn't use openTag for the formers and the latter is a single tag
-        if (substr($input[1], 0, 10) == '</textarea' || substr($input[1], 0, 5) == '</pre' || substr($input[1], 0, 6) == '</code' || substr($input[1], - 2) == '/>') {
-            return self::singleTag($input[1], $input[3], $input[2]);
-        }
-        // it's the closing tag
-        if ($input[0][1] == '/') {
-            return self::closeTag($input[1], $input[3], $input[2]);
-        }
-
-        // opening tag
-        return self::openTag($input[1], $input[3], $input[2]);
-    }
-
-    /**
-     * returns an open tag and adds a tab into the auto indenting.
-     *
-     * @param string $tag        content of the tag
-     * @param string $add        additional data (anything before the following tag)
-     * @param string $whitespace white space between the tag and the additional data
-     *
-     * @return string
-     */
-    protected static function openTag($tag, $add, $whitespace)
-    {
-        $tabs = str_pad('', self::$tabCount ++, "\t");
-
-        if (preg_match('#^<(a|label|option|textarea|h1|h2|h3|h4|h5|h6|strong|b|em|i|abbr|acronym|cite|span|sub|sup|u|s|title)(?: [^>]*|)>#', $tag)) {
-            // if it's one of those tag it's inline so it does not require a leading line break
-            $result = $tag . $whitespace . str_replace("\n", "\n" . $tabs, $add);
-        } elseif (substr($tag, 0, 9) == '<!DOCTYPE') {
-            // it's the doctype declaration so no line break here either
-            $result = $tabs . $tag;
-        } else {
-            // normal block tag
-            $result = "\n" . $tabs . $tag;
-
-            if (!empty($add)) {
-                $result .= "\n" . $tabs . "\t" . str_replace("\n", "\n\t" . $tabs, $add);
-            }
-        }
-
-        self::$lastCallAdd = $add;
-
-        return $result;
-    }
-
-    /**
-     * returns a closing tag and removes a tab from the auto indenting.
-     *
-     * @param string $tag        content of the tag
-     * @param string $add        additional data (anything before the following tag)
-     * @param string $whitespace white space between the tag and the additional data
-     *
-     * @return string
-     */
-    protected static function closeTag($tag, $add, $whitespace)
-    {
-        $tabs = str_pad('', -- self::$tabCount, "\t");
-
-        // if it's one of those tag it's inline so it does not require a leading line break
-        if (preg_match('#^</(a|label|option|textarea|h1|h2|h3|h4|h5|h6|strong|b|em|i|abbr|acronym|cite|span|sub|sup|u|s|title)>#', $tag)) {
-            $result = $tag . $whitespace . str_replace("\n", "\n" . $tabs, $add);
-        } else {
-            $result = "\n" . $tabs . $tag;
-
-            if (!empty($add)) {
-                $result .= "\n" . $tabs . "\t" . str_replace("\n", "\n\t" . $tabs, $add);
-            }
-        }
-
-        self::$lastCallAdd = $add;
-
-        return $result;
-    }
-
-    /**
-     * returns a single tag with auto indenting.
-     *
-     * @param string $tag content of the tag
-     * @param string $add additional data (anything before the following tag)
-     *
-     * @return string
-     */
-    protected static function singleTag($tag, $add, $whitespace)
-    {
-        $tabs = str_pad('', self::$tabCount, "\t");
-
-        // if it's img, br it's inline so it does not require a leading line break
-        // if it's a closing textarea, code or pre tag, it does not require a leading line break either or it creates whitespace at the end of those blocks
-        if (preg_match('#^<(img|br|/textarea|/pre|/code)(?: [^>]*|)>#', $tag)) {
-            $result = $tag . $whitespace;
-
-            if (!empty($add)) {
-                $result .= str_replace("\n", "\n" . $tabs, $add);
-            }
-        } else {
-            $result = "\n" . $tabs . $tag;
-
-            if (!empty($add)) {
-                $result .= "\n" . $tabs . str_replace("\n", "\n" . $tabs, $add);
-            }
-        }
-
-        self::$lastCallAdd = $add;
-
-        return $result;
-    }
+	/**
+	 * tab count to auto-indent the source.
+	 *
+	 * @var int
+	 */
+	protected static $tabCount = - 1;
+
+	/**
+	 * stores the additional data (following a tag) of the last call to open/close/singleTag.
+	 *
+	 * @var string
+	 */
+	protected static $lastCallAdd = '';
+
+	/**
+	 * formats the input using the singleTag/closeTag/openTag functions.
+	 * It is auto indenting the whole code, excluding <textarea>, <code> and <pre> tags that must be kept intact.
+	 * Those tags must however contain only htmlentities-escaped text for everything to work properly.
+	 * Inline tags are presented on a single line with their content
+	 *
+	 * @param string $input the xhtml to format
+	 *
+	 * @return string formatted xhtml
+	 */
+	public function process($input)
+	{
+		self::$tabCount = - 1;
+
+		// auto indent all but textareas & pre (or we have weird tabs inside)
+		$input = preg_replace_callback("#(<[^>]+>)(\s*)([^<]*)#", array(
+			'self',
+			'tagDispatcher'
+		), $input);
+
+		return $input;
+	}
+
+	/**
+	 * helper function for format()'s preg_replace call.
+	 *
+	 * @param array $input array of matches (1=>tag, 2=>whitespace(optional), 3=>additional non-html content)
+	 *
+	 * @return string the indented tag
+	 */
+	protected static function tagDispatcher($input)
+	{
+		// textarea, pre, code tags and comments are to be left alone to avoid any non-wanted whitespace inside them so it just outputs them as they were
+		if (substr($input[1], 0, 9) == '<textarea' || substr($input[1], 0, 4) == '<pre' || substr($input[1], 0, 5) == '<code' || substr($input[1], 0, 4) == '<!--' || substr($input[1], 0, 9) == '<![CDATA[') {
+			return $input[1] . $input[3];
+		}
+		// closing textarea, code and pre tags and self-closed tags (i.e. <br />) are printed as singleTags because we didn't use openTag for the formers and the latter is a single tag
+		if (substr($input[1], 0, 10) == '</textarea' || substr($input[1], 0, 5) == '</pre' || substr($input[1], 0, 6) == '</code' || substr($input[1], - 2) == '/>') {
+			return self::singleTag($input[1], $input[3], $input[2]);
+		}
+		// it's the closing tag
+		if ($input[0][1] == '/') {
+			return self::closeTag($input[1], $input[3], $input[2]);
+		}
+
+		// opening tag
+		return self::openTag($input[1], $input[3], $input[2]);
+	}
+
+	/**
+	 * returns an open tag and adds a tab into the auto indenting.
+	 *
+	 * @param string $tag        content of the tag
+	 * @param string $add        additional data (anything before the following tag)
+	 * @param string $whitespace white space between the tag and the additional data
+	 *
+	 * @return string
+	 */
+	protected static function openTag($tag, $add, $whitespace)
+	{
+		$tabs = str_pad('', self::$tabCount ++, "\t");
+
+		if (preg_match('#^<(a|label|option|textarea|h1|h2|h3|h4|h5|h6|strong|b|em|i|abbr|acronym|cite|span|sub|sup|u|s|title)(?: [^>]*|)>#', $tag)) {
+			// if it's one of those tag it's inline so it does not require a leading line break
+			$result = $tag . $whitespace . str_replace("\n", "\n" . $tabs, $add);
+		} elseif (substr($tag, 0, 9) == '<!DOCTYPE') {
+			// it's the doctype declaration so no line break here either
+			$result = $tabs . $tag;
+		} else {
+			// normal block tag
+			$result = "\n" . $tabs . $tag;
+
+			if (!empty($add)) {
+				$result .= "\n" . $tabs . "\t" . str_replace("\n", "\n\t" . $tabs, $add);
+			}
+		}
+
+		self::$lastCallAdd = $add;
+
+		return $result;
+	}
+
+	/**
+	 * returns a closing tag and removes a tab from the auto indenting.
+	 *
+	 * @param string $tag        content of the tag
+	 * @param string $add        additional data (anything before the following tag)
+	 * @param string $whitespace white space between the tag and the additional data
+	 *
+	 * @return string
+	 */
+	protected static function closeTag($tag, $add, $whitespace)
+	{
+		$tabs = str_pad('', -- self::$tabCount, "\t");
+
+		// if it's one of those tag it's inline so it does not require a leading line break
+		if (preg_match('#^</(a|label|option|textarea|h1|h2|h3|h4|h5|h6|strong|b|em|i|abbr|acronym|cite|span|sub|sup|u|s|title)>#', $tag)) {
+			$result = $tag . $whitespace . str_replace("\n", "\n" . $tabs, $add);
+		} else {
+			$result = "\n" . $tabs . $tag;
+
+			if (!empty($add)) {
+				$result .= "\n" . $tabs . "\t" . str_replace("\n", "\n\t" . $tabs, $add);
+			}
+		}
+
+		self::$lastCallAdd = $add;
+
+		return $result;
+	}
+
+	/**
+	 * returns a single tag with auto indenting.
+	 *
+	 * @param string $tag content of the tag
+	 * @param string $add additional data (anything before the following tag)
+	 *
+	 * @return string
+	 */
+	protected static function singleTag($tag, $add, $whitespace)
+	{
+		$tabs = str_pad('', self::$tabCount, "\t");
+
+		// if it's img, br it's inline so it does not require a leading line break
+		// if it's a closing textarea, code or pre tag, it does not require a leading line break either or it creates whitespace at the end of those blocks
+		if (preg_match('#^<(img|br|/textarea|/pre|/code)(?: [^>]*|)>#', $tag)) {
+			$result = $tag . $whitespace;
+
+			if (!empty($add)) {
+				$result .= str_replace("\n", "\n" . $tabs, $add);
+			}
+		} else {
+			$result = "\n" . $tabs . $tag;
+
+			if (!empty($add)) {
+				$result .= "\n" . $tabs . str_replace("\n", "\n" . $tabs, $add);
+			}
+		}
+
+		self::$lastCallAdd = $add;
+
+		return $result;
+	}
 }

lib/Dwoo/Loader.php

Indentation +162 added lines, -162 removed lines

@@ -23,176 +23,176 @@
  */
 class Loader implements ILoader
 {
-    /**
-     * Stores the plugin directories.
-     *
-     * @see addDirectory
-     * @var array
-     */
-    protected $paths = array();
+	/**
+	 * Stores the plugin directories.
+	 *
+	 * @see addDirectory
+	 * @var array
+	 */
+	protected $paths = array();
 
-    /**
-     * Stores the plugins names/paths relationships
-     * don't edit this on your own, use addDirectory.
-     *
-     * @see addDirectory
-     * @var array
-     */
-    protected $classPath = array();
+	/**
+	 * Stores the plugins names/paths relationships
+	 * don't edit this on your own, use addDirectory.
+	 *
+	 * @see addDirectory
+	 * @var array
+	 */
+	protected $classPath = array();
 
-    /**
-     * Path where class paths cache files are written.
-     *
-     * @var string
-     */
-    protected $cacheDir;
+	/**
+	 * Path where class paths cache files are written.
+	 *
+	 * @var string
+	 */
+	protected $cacheDir;
 
-    /**
-     * Path where builtin plugins are stored.
-     *
-     * @var string
-     */
-    protected $corePluginDir;
+	/**
+	 * Path where builtin plugins are stored.
+	 *
+	 * @var string
+	 */
+	protected $corePluginDir;
 
-    /**
-     * Loader constructor.
-     *
-     * @param $cacheDir
-     */
-    public function __construct($cacheDir)
-    {
-        $this->corePluginDir = __DIR__ . DIRECTORY_SEPARATOR . 'Plugins';
-        $this->cacheDir      = rtrim($cacheDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+	/**
+	 * Loader constructor.
+	 *
+	 * @param $cacheDir
+	 */
+	public function __construct($cacheDir)
+	{
+		$this->corePluginDir = __DIR__ . DIRECTORY_SEPARATOR . 'Plugins';
+		$this->cacheDir      = rtrim($cacheDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
 
-        // include class paths or rebuild paths if the cache file isn't there
-        $cacheFile = $this->cacheDir . 'classpath.cache.d' . Core::RELEASE_TAG . '.php';
-        if (file_exists($cacheFile)) {
-            $classpath       = file_get_contents($cacheFile);
-            $this->classPath = unserialize($classpath) + $this->classPath;
-        } else {
-            $this->rebuildClassPathCache($this->corePluginDir, $cacheFile);
-        }
-    }
+		// include class paths or rebuild paths if the cache file isn't there
+		$cacheFile = $this->cacheDir . 'classpath.cache.d' . Core::RELEASE_TAG . '.php';
+		if (file_exists($cacheFile)) {
+			$classpath       = file_get_contents($cacheFile);
+			$this->classPath = unserialize($classpath) + $this->classPath;
+		} else {
+			$this->rebuildClassPathCache($this->corePluginDir, $cacheFile);
+		}
+	}
 
-    /**
-     * Rebuilds class paths, scans the given directory recursively and saves all paths in the given file.
-     *
-     * @param string $path      the plugin path to scan
-     * @param string $cacheFile the file where to store the plugin paths cache, it will be overwritten
-     *
-     * @throws Exception
-     */
-    protected function rebuildClassPathCache($path, $cacheFile)
-    {
-        if ($cacheFile !== false) {
-            $tmp             = $this->classPath;
-            $this->classPath = array();
-        }
+	/**
+	 * Rebuilds class paths, scans the given directory recursively and saves all paths in the given file.
+	 *
+	 * @param string $path      the plugin path to scan
+	 * @param string $cacheFile the file where to store the plugin paths cache, it will be overwritten
+	 *
+	 * @throws Exception
+	 */
+	protected function rebuildClassPathCache($path, $cacheFile)
+	{
+		if ($cacheFile !== false) {
+			$tmp             = $this->classPath;
+			$this->classPath = array();
+		}
 
-        // iterates over all files/folders
-        $list = glob(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . '*');
-        if (is_array($list)) {
-            foreach ($list as $f) {
-                if (is_dir($f)) {
-                    $this->rebuildClassPathCache($f, false);
-                } else {
-                    // TODO: is it still valid now?
-                    $this->classPath[str_replace(array(
-                        'function.',
-                        'block.',
-                        'modifier.',
-                        'outputfilter.',
-                        'filter.',
-                        'prefilter.',
-                        'postfilter.',
-                        'pre.',
-                        'post.',
-                        'output.',
-                        'shared.',
-                        'helper.'
-                    ), '', basename($f, '.php'))] = $f;
-                }
-            }
-        }
+		// iterates over all files/folders
+		$list = glob(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . '*');
+		if (is_array($list)) {
+			foreach ($list as $f) {
+				if (is_dir($f)) {
+					$this->rebuildClassPathCache($f, false);
+				} else {
+					// TODO: is it still valid now?
+					$this->classPath[str_replace(array(
+						'function.',
+						'block.',
+						'modifier.',
+						'outputfilter.',
+						'filter.',
+						'prefilter.',
+						'postfilter.',
+						'pre.',
+						'post.',
+						'output.',
+						'shared.',
+						'helper.'
+					), '', basename($f, '.php'))] = $f;
+				}
+			}
+		}
 
-        // save in file if it's the first call (not recursed)
-        if ($cacheFile !== false) {
-            if (!file_put_contents($cacheFile, serialize($this->classPath))) {
-                throw new Exception('Could not write into ' . $cacheFile .
-                    ', either because the folder is not there (create it) or because of the chmod configuration (please ensure this directory is writable by php), alternatively you can change the directory used with $dwoo->setCompileDir() or provide a custom loader object with $dwoo->setLoader()');
-            }
-            $this->classPath += $tmp;
-        }
-    }
+		// save in file if it's the first call (not recursed)
+		if ($cacheFile !== false) {
+			if (!file_put_contents($cacheFile, serialize($this->classPath))) {
+				throw new Exception('Could not write into ' . $cacheFile .
+					', either because the folder is not there (create it) or because of the chmod configuration (please ensure this directory is writable by php), alternatively you can change the directory used with $dwoo->setCompileDir() or provide a custom loader object with $dwoo->setLoader()');
+			}
+			$this->classPath += $tmp;
+		}
+	}
 
-    /**
-     * Loads a plugin file.
-     *
-     * @param string $class       the plugin name, without the `Plugin` prefix
-     * @param bool   $forceRehash if true, the class path caches will be rebuilt if the plugin is not found, in case it
-     *                            has just been added, defaults to true
-     *
-     * @throws Exception
-     */
-    public function loadPlugin($class, $forceRehash = true)
-    {
-        /**
-         * An unknown class was requested (maybe newly added) or the
-         * include failed so we rebuild the cache. include() will fail
-         * with an uncatchable error if the file doesn't exist, which
-         * usually means that the cache is stale and must be rebuilt,
-         * so we check for that before trying to include() the plugin.
-         */
-        if ((!isset($this->classPath[$class]) || !is_readable($this->classPath[$class])) || (!isset
-                ($this->classPath[$class . 'Compile']) || !is_readable($this->classPath[$class . 'Compile']))) {
-            if ($forceRehash) {
-                $this->rebuildClassPathCache($this->corePluginDir, $this->cacheDir . 'classpath.cache.d' .
-                    Core::RELEASE_TAG . '.php');
-                foreach ($this->paths as $path => $file) {
-                    $this->rebuildClassPathCache($path, $file);
-                }
-                if (isset($this->classPath[$class])) {
-                    include_once $this->classPath[$class];
-                } elseif (isset($this->classPath[$class . 'Compile'])) {
-                    include_once $this->classPath[$class . 'Compile'];
-                } else {
-                    throw new Exception('Plugin "' . $class .
-                        '" can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
-                }
-            } else {
-                throw new Exception('Plugin "' . $class .
-                    '" can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
-            }
-        }
-    }
+	/**
+	 * Loads a plugin file.
+	 *
+	 * @param string $class       the plugin name, without the `Plugin` prefix
+	 * @param bool   $forceRehash if true, the class path caches will be rebuilt if the plugin is not found, in case it
+	 *                            has just been added, defaults to true
+	 *
+	 * @throws Exception
+	 */
+	public function loadPlugin($class, $forceRehash = true)
+	{
+		/**
+		 * An unknown class was requested (maybe newly added) or the
+		 * include failed so we rebuild the cache. include() will fail
+		 * with an uncatchable error if the file doesn't exist, which
+		 * usually means that the cache is stale and must be rebuilt,
+		 * so we check for that before trying to include() the plugin.
+		 */
+		if ((!isset($this->classPath[$class]) || !is_readable($this->classPath[$class])) || (!isset
+				($this->classPath[$class . 'Compile']) || !is_readable($this->classPath[$class . 'Compile']))) {
+			if ($forceRehash) {
+				$this->rebuildClassPathCache($this->corePluginDir, $this->cacheDir . 'classpath.cache.d' .
+					Core::RELEASE_TAG . '.php');
+				foreach ($this->paths as $path => $file) {
+					$this->rebuildClassPathCache($path, $file);
+				}
+				if (isset($this->classPath[$class])) {
+					include_once $this->classPath[$class];
+				} elseif (isset($this->classPath[$class . 'Compile'])) {
+					include_once $this->classPath[$class . 'Compile'];
+				} else {
+					throw new Exception('Plugin "' . $class .
+						'" can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
+				}
+			} else {
+				throw new Exception('Plugin "' . $class .
+					'" can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
+			}
+		}
+	}
 
-    /**
-     * Adds a plugin directory, the plugins found in the new plugin directory
-     * will take precedence over the other directories (including the default
-     * dwoo plugin directory), you can use this for example to override plugins
-     * in a specific directory for a specific application while keeping all your
-     * usual plugins in the same place for all applications.
-     * TOCOM don't forget that php functions overrides are not rehashed so you
-     * need to clear the classpath caches by hand when adding those.
-     *
-     * @param string $pluginDirectory the plugin path to scan
-     *
-     * @throws Exception
-     */
-    public function addDirectory($pluginDirectory)
-    {
-        $pluginDir = realpath($pluginDirectory);
-        if (!$pluginDir) {
-            throw new Exception('Plugin directory does not exist or can not be read : ' . $pluginDirectory);
-        }
-        $cacheFile = $this->cacheDir . 'classpath-' . substr(strtr($pluginDir, '/\\:' . PATH_SEPARATOR, '----'),
-                strlen($pluginDir) > 80 ? - 80 : 0) . '.d' . Core::RELEASE_TAG . '.php';
-        $this->paths[$pluginDir] = $cacheFile;
-        if (file_exists($cacheFile)) {
-            $classpath       = file_get_contents($cacheFile);
-            $this->classPath = unserialize($classpath) + $this->classPath;
-        } else {
-            $this->rebuildClassPathCache($pluginDir, $cacheFile);
-        }
-    }
+	/**
+	 * Adds a plugin directory, the plugins found in the new plugin directory
+	 * will take precedence over the other directories (including the default
+	 * dwoo plugin directory), you can use this for example to override plugins
+	 * in a specific directory for a specific application while keeping all your
+	 * usual plugins in the same place for all applications.
+	 * TOCOM don't forget that php functions overrides are not rehashed so you
+	 * need to clear the classpath caches by hand when adding those.
+	 *
+	 * @param string $pluginDirectory the plugin path to scan
+	 *
+	 * @throws Exception
+	 */
+	public function addDirectory($pluginDirectory)
+	{
+		$pluginDir = realpath($pluginDirectory);
+		if (!$pluginDir) {
+			throw new Exception('Plugin directory does not exist or can not be read : ' . $pluginDirectory);
+		}
+		$cacheFile = $this->cacheDir . 'classpath-' . substr(strtr($pluginDir, '/\\:' . PATH_SEPARATOR, '----'),
+				strlen($pluginDir) > 80 ? - 80 : 0) . '.d' . Core::RELEASE_TAG . '.php';
+		$this->paths[$pluginDir] = $cacheFile;
+		if (file_exists($cacheFile)) {
+			$classpath       = file_get_contents($cacheFile);
+			$this->classPath = unserialize($classpath) + $this->classPath;
+		} else {
+			$this->rebuildClassPathCache($pluginDir, $cacheFile);
+		}
+	}
 }

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

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