dwoo-project / dwoo

lib/plugins/builtin/blocks/section.php

Indentation +99 added lines, -99 removed lines

@@ -19,74 +19,74 @@ 
  */
 class Dwoo_Plugin_section extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block, Dwoo_IElseable
 {
-    public static $cnt = 0;
-
-    public function init($name, $loop, $start = null, $step = null, $max = null, $show = true)
-    {
-    }
-
-    public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        return '';
-    }
-
-    public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        $output = Dwoo_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";
-        }
+	public static $cnt = 0;
+
+	public function init($name, $loop, $start = null, $step = null, $max = null, $show = true)
+	{
+	}
+
+	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		return '';
+	}
+
+	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		$output = Dwoo_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(";
@@ -100,35 +100,35 @@ 
         }
 */
 
-        $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 .= Dwoo_Compiler::PHP_CLOSE.$content.Dwoo_Compiler::PHP_OPEN;
-
-        $output .= "\n\t}\n} ".Dwoo_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 .= Dwoo_Compiler::PHP_CLOSE.$content.Dwoo_Compiler::PHP_OPEN;
+
+		$output .= "\n\t}\n} ".Dwoo_Compiler::PHP_CLOSE;
+
+		if (isset($params['hasElse'])) {
+			$output .= $params['hasElse'];
+		}
+
+		return $output;
+	}
 }

lib/plugins/builtin/blocks/else.php

Indentation +30 added lines, -30 removed lines

@@ -32,40 +32,40 @@
  */
 class Dwoo_Plugin_else extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block
 {
-    public function init()
-    {
-    }
+	public function init()
+	{
+	}
 
-    public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        $preContent = '';
-        while (true) {
-            $preContent .= $compiler->removeTopBlock();
-            $block = &$compiler->getCurrentBlock();
-            if (!$block) {
-                throw new Dwoo_Compilation_Exception($compiler, 'An else block was found but it was not preceded by an if or other else-able construct');
-            }
-            $interfaces = class_implements($block['class'], false);
-            if (in_array('Dwoo_IElseable', $interfaces) !== false) {
-                break;
-            }
-        }
+	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		$preContent = '';
+		while (true) {
+			$preContent .= $compiler->removeTopBlock();
+			$block = &$compiler->getCurrentBlock();
+			if (!$block) {
+				throw new Dwoo_Compilation_Exception($compiler, 'An else block was found but it was not preceded by an if or other else-able construct');
+			}
+			$interfaces = class_implements($block['class'], false);
+			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;
+	}
 
-    public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        if (!isset($params['initialized'])) {
-            return '';
-        }
+	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		if (!isset($params['initialized'])) {
+			return '';
+		}
 
-        $block = &$compiler->getCurrentBlock();
-        $block['params']['hasElse'] = Dwoo_Compiler::PHP_OPEN."else {\n".Dwoo_Compiler::PHP_CLOSE.$content.Dwoo_Compiler::PHP_OPEN."\n}".Dwoo_Compiler::PHP_CLOSE;
+		$block = &$compiler->getCurrentBlock();
+		$block['params']['hasElse'] = Dwoo_Compiler::PHP_OPEN."else {\n".Dwoo_Compiler::PHP_CLOSE.$content.Dwoo_Compiler::PHP_OPEN."\n}".Dwoo_Compiler::PHP_CLOSE;
 
-        return '';
-    }
+		return '';
+	}
 }

lib/plugins/builtin/blocks/a.php

Indentation +24 added lines, -24 removed lines

@@ -37,34 +37,34 @@
  */
 class Dwoo_Plugin_a extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block
 {
-    public function init($href, array $rest = array())
-    {
-    }
+	public function init($href, array $rest = array())
+	{
+	}
 
-    public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        $p = $compiler->getCompiledParams($params);
+	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		$p = $compiler->getCompiledParams($params);
 
-        $out = Dwoo_Compiler::PHP_OPEN.'echo \'<a '.self::paramsToAttributes($p, "'", $compiler);
+		$out = Dwoo_Compiler::PHP_OPEN.'echo \'<a '.self::paramsToAttributes($p, "'", $compiler);
 
-        return $out.'>\';'.Dwoo_Compiler::PHP_CLOSE;
-    }
+		return $out.'>\';'.Dwoo_Compiler::PHP_CLOSE;
+	}
 
-    public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        $p = $compiler->getCompiledParams($params);
+	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		$p = $compiler->getCompiledParams($params);
 
-        // no content was provided so use the url as display text
-        if ($content == '') {
-            // merge </a> into the href if href is a string
-            if (substr($p['href'], -1) === '"' || substr($p['href'], -1) === '\'') {
-                return Dwoo_Compiler::PHP_OPEN.'echo '.substr($p['href'], 0, -1).'</a>'.substr($p['href'], -1).';'.Dwoo_Compiler::PHP_CLOSE;
-            }
-            // otherwise append
-            return Dwoo_Compiler::PHP_OPEN.'echo '.$p['href'].'.\'</a>\';'.Dwoo_Compiler::PHP_CLOSE;
-        }
+		// no content was provided so use the url as display text
+		if ($content == '') {
+			// merge </a> into the href if href is a string
+			if (substr($p['href'], -1) === '"' || substr($p['href'], -1) === '\'') {
+				return Dwoo_Compiler::PHP_OPEN.'echo '.substr($p['href'], 0, -1).'</a>'.substr($p['href'], -1).';'.Dwoo_Compiler::PHP_CLOSE;
+			}
+			// otherwise append
+			return Dwoo_Compiler::PHP_OPEN.'echo '.$p['href'].'.\'</a>\';'.Dwoo_Compiler::PHP_CLOSE;
+		}
 
-        // return content
-        return $content.'</a>';
-    }
+		// return content
+		return $content.'</a>';
+	}
 }

lib/plugins/builtin/blocks/for.php

Indentation +125 added lines, -125 removed lines

@@ -24,137 +24,137 @@
  */
 class Dwoo_Plugin_for extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block, Dwoo_IElseable
 {
-    public static $cnt = 0;
-
-    public function init($name, $from, $to = null, $step = 1, $skip = 0)
-    {
-    }
-
-    public static function preProcessing(Dwoo_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 '';
-    }
-
-    public static function postProcessing(Dwoo_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 = Dwoo_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;
+
+	public function init($name, $from, $to = null, $step = 1, $skip = 0)
+	{
+	}
+
+	public static function preProcessing(Dwoo_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 '';
+	}
+
+	public static function postProcessing(Dwoo_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 = Dwoo_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".Dwoo_Compiler::PHP_CLOSE;
-
-        // build post processing output and cache it
-        $postOut = Dwoo_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".Dwoo_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".Dwoo_Compiler::PHP_CLOSE;
+
+		// build post processing output and cache it
+		$postOut = Dwoo_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".Dwoo_Compiler::PHP_CLOSE;
+
+		if (isset($params['hasElse'])) {
+			$postOut .= $params['hasElse'];
+		}
+
+		return $out.$content.$postOut;
+	}
 }

lib/plugins/builtin/blocks/strip.php

Indentation +21 added lines, -21 removed lines

@@ -23,30 +23,30 @@
  */
 class Dwoo_Plugin_strip extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block
 {
-    public function init($mode = 'default')
-    {
-    }
+	public function init($mode = 'default')
+	{
+	}
 
-    public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        return '';
-    }
+	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		return '';
+	}
 
-    public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        $params = $compiler->getCompiledParams($params);
+	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		$params = $compiler->getCompiledParams($params);
 
-        $mode = trim($params['mode'], '"\'');
-        switch ($mode) {
-            case 'js':
-            case 'javascript':
-                $content = preg_replace('#(?<!:)//\s[^\r\n]*|/\*.*?\*/#s', '', $content);
+		$mode = trim($params['mode'], '"\'');
+		switch ($mode) {
+			case 'js':
+			case 'javascript':
+				$content = preg_replace('#(?<!:)//\s[^\r\n]*|/\*.*?\*/#s', '', $content);
 
-            case 'default':
-            default:
-        }
-        $content = preg_replace(array("/\n/", "/\r/", '/(<\?(?:php)?|<%)\s*/'), array('', '', '$1 '), preg_replace('#^\s*(.+?)\s*$#m', '$1', $content));
+			case 'default':
+			default:
+		}
+		$content = preg_replace(array("/\n/", "/\r/", '/(<\?(?:php)?|<%)\s*/'), array('', '', '$1 '), preg_replace('#^\s*(.+?)\s*$#m', '$1', $content));
 
-        return $content;
-    }
+		return $content;
+	}
 }

lib/plugins/builtin/blocks/foreach.php

Indentation +130 added lines, -130 removed lines

@@ -34,134 +34,134 @@
  */
 class Dwoo_Plugin_foreach extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block, Dwoo_IElseable
 {
-    public static $cnt = 0;
-
-    public function init($from, $key = null, $item = null, $name = 'default', $implode = null)
-    {
-    }
-
-    public static function preProcessing(Dwoo_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 '';
-    }
-
-    public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        $params = $compiler->getCompiledParams($params);
-        $tpl = $compiler->getTemplateSource($params['tplPointer']);
-
-        // assigns params
-        $src = $params['from'];
-
-        if ($params['item'] !== 'null') {
-            if ($params['key'] !== 'null') {
-                $key = $params['key'];
-            }
-            $val = $params['item'];
-        } elseif ($params['key'] !== 'null') {
-            $val = $params['key'];
-        } else {
-            throw new Dwoo_Compilation_Exception($compiler, 'Foreach <em>item</em> parameter missing');
-        }
-        $name = $params['name'];
-
-        if (substr($val, 0, 1) !== '"' && substr($val, 0, 1) !== '\'') {
-            throw new Dwoo_Compilation_Exception($compiler, 'Foreach <em>item</em> parameter must be of type string');
-        }
-        if (isset($key) && substr($val, 0, 1) !== '"' && substr($val, 0, 1) !== '\'') {
-            throw new Dwoo_Compilation_Exception($compiler, 'Foreach <em>key</em> parameter must be of type string');
-        }
-
-        // evaluates which global variables have to be computed
-        $varName = '$dwoo.foreach.'.trim($name, '"\'').'.';
-        $shortVarName = '$.foreach.'.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 = $usesFirst || strpos($tpl, $varName.'index') !== false || strpos($tpl, $shortVarName.'index') !== false;
-        $usesIteration = $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;
-        }
-
-        // override globals vars if implode is used
-        if ($params['implode'] !== 'null') {
-            $implode = $params['implode'];
-            $usesAny = true;
-            $usesLast = true;
-            $usesIteration = true;
-            $usesTotal = true;
-        }
-
-        // gets foreach id
-        $cnt = self::$cnt++;
-
-        // build pre content output
-        $pre = Dwoo_Compiler::PHP_OPEN."\n".'$_fh'.$cnt.'_data = '.$src.';';
-        // adds foreach properties
-        if ($usesAny) {
-            $pre .= "\n".'$this->globals["foreach"]['.$name.'] = array'."\n(";
-            if ($usesIndex) {
-                $pre .= "\n\t".'"index"		=> 0,';
-            }
-            if ($usesIteration) {
-                $pre .= "\n\t".'"iteration"		=> 1,';
-            }
-            if ($usesFirst) {
-                $pre .= "\n\t".'"first"		=> null,';
-            }
-            if ($usesLast) {
-                $pre .= "\n\t".'"last"		=> null,';
-            }
-            if ($usesShow) {
-                $pre .= "\n\t".'"show"		=> $this->isArray($_fh'.$cnt.'_data, true),';
-            }
-            if ($usesTotal) {
-                $pre .= "\n\t".'"total"		=> $this->count($_fh'.$cnt.'_data),';
-            }
-            $pre .= "\n);\n".'$_fh'.$cnt.'_glob =& $this->globals["foreach"]['.$name.'];';
-        }
-        // checks if foreach must be looped
-        $pre .= "\n".'if ($this->isTraversable($_fh'.$cnt.'_data'.(isset($params['hasElse']) ? ', true' : '').') == true)'."\n{";
-        // iterates over keys
-        $pre .= "\n\t".'foreach ($_fh'.$cnt.'_data as '.(isset($key) ? '$this->scope['.$key.']=>' : '').'$this->scope['.$val.'])'."\n\t{";
-        // updates properties
-        if ($usesFirst) {
-            $pre .= "\n\t\t".'$_fh'.$cnt.'_glob["first"] = (string) ($_fh'.$cnt.'_glob["index"] === 0);';
-        }
-        if ($usesLast) {
-            $pre .= "\n\t\t".'$_fh'.$cnt.'_glob["last"] = (string) ($_fh'.$cnt.'_glob["iteration"] === $_fh'.$cnt.'_glob["total"]);';
-        }
-        $pre .= "\n/* -- foreach start output */\n".Dwoo_Compiler::PHP_CLOSE;
-
-        // build post content output
-        $post = Dwoo_Compiler::PHP_OPEN."\n";
-
-        if (isset($implode)) {
-            $post .= '/* -- implode */'."\n".'if (!$_fh'.$cnt.'_glob["last"]) {'.
-                "\n\t".'echo '.$implode.";\n}\n";
-        }
-        $post .= '/* -- foreach end output */';
-        // update properties
-        if ($usesIndex) {
-            $post .= "\n\t\t".'$_fh'.$cnt.'_glob["index"]+=1;';
-        }
-        if ($usesIteration) {
-            $post .= "\n\t\t".'$_fh'.$cnt.'_glob["iteration"]+=1;';
-        }
-        // end loop
-        $post .= "\n\t}\n}".Dwoo_Compiler::PHP_CLOSE;
-        if (isset($params['hasElse'])) {
-            $post .= $params['hasElse'];
-        }
-
-        return $pre.$content.$post;
-    }
+	public static $cnt = 0;
+
+	public function init($from, $key = null, $item = null, $name = 'default', $implode = null)
+	{
+	}
+
+	public static function preProcessing(Dwoo_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 '';
+	}
+
+	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		$params = $compiler->getCompiledParams($params);
+		$tpl = $compiler->getTemplateSource($params['tplPointer']);
+
+		// assigns params
+		$src = $params['from'];
+
+		if ($params['item'] !== 'null') {
+			if ($params['key'] !== 'null') {
+				$key = $params['key'];
+			}
+			$val = $params['item'];
+		} elseif ($params['key'] !== 'null') {
+			$val = $params['key'];
+		} else {
+			throw new Dwoo_Compilation_Exception($compiler, 'Foreach <em>item</em> parameter missing');
+		}
+		$name = $params['name'];
+
+		if (substr($val, 0, 1) !== '"' && substr($val, 0, 1) !== '\'') {
+			throw new Dwoo_Compilation_Exception($compiler, 'Foreach <em>item</em> parameter must be of type string');
+		}
+		if (isset($key) && substr($val, 0, 1) !== '"' && substr($val, 0, 1) !== '\'') {
+			throw new Dwoo_Compilation_Exception($compiler, 'Foreach <em>key</em> parameter must be of type string');
+		}
+
+		// evaluates which global variables have to be computed
+		$varName = '$dwoo.foreach.'.trim($name, '"\'').'.';
+		$shortVarName = '$.foreach.'.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 = $usesFirst || strpos($tpl, $varName.'index') !== false || strpos($tpl, $shortVarName.'index') !== false;
+		$usesIteration = $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;
+		}
+
+		// override globals vars if implode is used
+		if ($params['implode'] !== 'null') {
+			$implode = $params['implode'];
+			$usesAny = true;
+			$usesLast = true;
+			$usesIteration = true;
+			$usesTotal = true;
+		}
+
+		// gets foreach id
+		$cnt = self::$cnt++;
+
+		// build pre content output
+		$pre = Dwoo_Compiler::PHP_OPEN."\n".'$_fh'.$cnt.'_data = '.$src.';';
+		// adds foreach properties
+		if ($usesAny) {
+			$pre .= "\n".'$this->globals["foreach"]['.$name.'] = array'."\n(";
+			if ($usesIndex) {
+				$pre .= "\n\t".'"index"		=> 0,';
+			}
+			if ($usesIteration) {
+				$pre .= "\n\t".'"iteration"		=> 1,';
+			}
+			if ($usesFirst) {
+				$pre .= "\n\t".'"first"		=> null,';
+			}
+			if ($usesLast) {
+				$pre .= "\n\t".'"last"		=> null,';
+			}
+			if ($usesShow) {
+				$pre .= "\n\t".'"show"		=> $this->isArray($_fh'.$cnt.'_data, true),';
+			}
+			if ($usesTotal) {
+				$pre .= "\n\t".'"total"		=> $this->count($_fh'.$cnt.'_data),';
+			}
+			$pre .= "\n);\n".'$_fh'.$cnt.'_glob =& $this->globals["foreach"]['.$name.'];';
+		}
+		// checks if foreach must be looped
+		$pre .= "\n".'if ($this->isTraversable($_fh'.$cnt.'_data'.(isset($params['hasElse']) ? ', true' : '').') == true)'."\n{";
+		// iterates over keys
+		$pre .= "\n\t".'foreach ($_fh'.$cnt.'_data as '.(isset($key) ? '$this->scope['.$key.']=>' : '').'$this->scope['.$val.'])'."\n\t{";
+		// updates properties
+		if ($usesFirst) {
+			$pre .= "\n\t\t".'$_fh'.$cnt.'_glob["first"] = (string) ($_fh'.$cnt.'_glob["index"] === 0);';
+		}
+		if ($usesLast) {
+			$pre .= "\n\t\t".'$_fh'.$cnt.'_glob["last"] = (string) ($_fh'.$cnt.'_glob["iteration"] === $_fh'.$cnt.'_glob["total"]);';
+		}
+		$pre .= "\n/* -- foreach start output */\n".Dwoo_Compiler::PHP_CLOSE;
+
+		// build post content output
+		$post = Dwoo_Compiler::PHP_OPEN."\n";
+
+		if (isset($implode)) {
+			$post .= '/* -- implode */'."\n".'if (!$_fh'.$cnt.'_glob["last"]) {'.
+				"\n\t".'echo '.$implode.";\n}\n";
+		}
+		$post .= '/* -- foreach end output */';
+		// update properties
+		if ($usesIndex) {
+			$post .= "\n\t\t".'$_fh'.$cnt.'_glob["index"]+=1;';
+		}
+		if ($usesIteration) {
+			$post .= "\n\t\t".'$_fh'.$cnt.'_glob["iteration"]+=1;';
+		}
+		// end loop
+		$post .= "\n\t}\n}".Dwoo_Compiler::PHP_CLOSE;
+		if (isset($params['hasElse'])) {
+			$post .= $params['hasElse'];
+		}
+
+		return $pre.$content.$post;
+	}
 }

lib/plugins/builtin/blocks/textformat.php

Indentation +55 added lines, -55 removed lines

@@ -29,69 +29,69 @@
  */
 class Dwoo_Plugin_textformat extends Dwoo_Block_Plugin
 {
-    protected $wrap;
-    protected $wrapChar;
-    protected $wrapCut;
-    protected $indent;
-    protected $indChar;
-    protected $indFirst;
-    protected $assign;
+	protected $wrap;
+	protected $wrapChar;
+	protected $wrapCut;
+	protected $indent;
+	protected $indChar;
+	protected $indFirst;
+	protected $assign;
 
-    public function init($wrap = 80, $wrap_char = "\r\n", $wrap_cut = false, $indent = 0, $indent_char = ' ', $indent_first = 0, $style = '', $assign = '')
-    {
-        if ($indent_char === 'tab') {
-            $indent_char = "\t";
-        }
+	public function init($wrap = 80, $wrap_char = "\r\n", $wrap_cut = false, $indent = 0, $indent_char = ' ', $indent_first = 0, $style = '', $assign = '')
+	{
+		if ($indent_char === 'tab') {
+			$indent_char = "\t";
+		}
 
-        switch ($style) {
+		switch ($style) {
 
-        case 'email':
-            $wrap = 72;
-            $indent_first = 0;
-            break;
-        case 'html':
-            $wrap_char = '<br />';
-            $indent_char = $indent_char == "\t" ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '&nbsp;';
-            break;
+		case 'email':
+			$wrap = 72;
+			$indent_first = 0;
+			break;
+		case 'html':
+			$wrap_char = '<br />';
+			$indent_char = $indent_char == "\t" ? '&nbsp;&nbsp;&nbsp;&nbsp;' : '&nbsp;';
+			break;
 
-        }
+		}
 
-        $this->wrap = (int) $wrap;
-        $this->wrapChar = (string) $wrap_char;
-        $this->wrapCut = (bool) $wrap_cut;
-        $this->indent = (int) $indent;
-        $this->indChar = (string) $indent_char;
-        $this->indFirst = (int) $indent_first + $this->indent;
-        $this->assign = (string) $assign;
-    }
+		$this->wrap = (int) $wrap;
+		$this->wrapChar = (string) $wrap_char;
+		$this->wrapCut = (bool) $wrap_cut;
+		$this->indent = (int) $indent;
+		$this->indChar = (string) $indent_char;
+		$this->indFirst = (int) $indent_first + $this->indent;
+		$this->assign = (string) $assign;
+	}
 
-    public function process()
-    {
-        // gets paragraphs
-        $pgs = explode("\n", str_replace(array("\r\n", "\r"), "\n", $this->buffer));
+	public function process()
+	{
+		// gets paragraphs
+		$pgs = explode("\n", str_replace(array("\r\n", "\r"), "\n", $this->buffer));
 
-        while (list($i) = each($pgs)) {
-            if (empty($pgs[$i])) {
-                continue;
-            }
+		while (list($i) = each($pgs)) {
+			if (empty($pgs[$i])) {
+				continue;
+			}
 
-            // removes line breaks and extensive white space
-            $pgs[$i] = preg_replace(array('#\s+#', '#^\s*(.+?)\s*$#m'), array(' ', '$1'), str_replace("\n", '', $pgs[$i]));
+			// removes line breaks and extensive white space
+			$pgs[$i] = preg_replace(array('#\s+#', '#^\s*(.+?)\s*$#m'), array(' ', '$1'), str_replace("\n", '', $pgs[$i]));
 
-            // wordwraps + indents lines
-            $pgs[$i] = str_repeat($this->indChar, $this->indFirst).
-                    wordwrap(
-                            $pgs[$i],
-                            max($this->wrap - $this->indent, 1),
-                            $this->wrapChar.str_repeat($this->indChar, $this->indent),
-                            $this->wrapCut
-                    );
-        }
+			// wordwraps + indents lines
+			$pgs[$i] = str_repeat($this->indChar, $this->indFirst).
+					wordwrap(
+							$pgs[$i],
+							max($this->wrap - $this->indent, 1),
+							$this->wrapChar.str_repeat($this->indChar, $this->indent),
+							$this->wrapCut
+					);
+		}
 
-        if ($this->assign !== '') {
-            $this->dwoo->assignInScope(implode($this->wrapChar.$this->wrapChar, $pgs), $this->assign);
-        } else {
-            return implode($this->wrapChar.$this->wrapChar, $pgs);
-        }
-    }
+		if ($this->assign !== '') {
+			$this->dwoo->assignInScope(implode($this->wrapChar.$this->wrapChar, $pgs), $this->assign);
+		} else {
+			return implode($this->wrapChar.$this->wrapChar, $pgs);
+		}
+	}
 }

lib/plugins/builtin/blocks/elseif.php

Indentation +34 added lines, -34 removed lines

@@ -20,47 +20,47 @@
  */
 class Dwoo_Plugin_elseif extends Dwoo_Plugin_if implements Dwoo_ICompilable_Block, Dwoo_IElseable
 {
-    public function init(array $rest)
-    {
-    }
+	public function init(array $rest)
+	{
+	}
 
-    public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        $preContent = '';
-        while (true) {
-            $preContent .= $compiler->removeTopBlock();
-            $block = &$compiler->getCurrentBlock();
-            $interfaces = class_implements($block['class'], false);
-            if (in_array('Dwoo_IElseable', $interfaces) !== false) {
-                break;
-            }
-        }
+	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		$preContent = '';
+		while (true) {
+			$preContent .= $compiler->removeTopBlock();
+			$block = &$compiler->getCurrentBlock();
+			$interfaces = class_implements($block['class'], false);
+			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;
+	}
 
-    public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        if (!isset($params['initialized'])) {
-            return '';
-        }
+	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		if (!isset($params['initialized'])) {
+			return '';
+		}
 
-        $tokens = $compiler->getParamTokens($params);
-        $params = $compiler->getCompiledParams($params);
+		$tokens = $compiler->getParamTokens($params);
+		$params = $compiler->getCompiledParams($params);
 
-        $pre = Dwoo_Compiler::PHP_OPEN.'elseif ('.implode(' ', self::replaceKeywords($params['*'], $tokens['*'], $compiler)).") {\n".Dwoo_Compiler::PHP_CLOSE;
-        $post = Dwoo_Compiler::PHP_OPEN."\n}".Dwoo_Compiler::PHP_CLOSE;
+		$pre = Dwoo_Compiler::PHP_OPEN.'elseif ('.implode(' ', self::replaceKeywords($params['*'], $tokens['*'], $compiler)).") {\n".Dwoo_Compiler::PHP_CLOSE;
+		$post = Dwoo_Compiler::PHP_OPEN."\n}".Dwoo_Compiler::PHP_CLOSE;
 
-        if (isset($params['hasElse'])) {
-            $post .= $params['hasElse'];
-        }
+		if (isset($params['hasElse'])) {
+			$post .= $params['hasElse'];
+		}
 
-        $block = &$compiler->getCurrentBlock();
-        $block['params']['hasElse'] = $pre.$content.$post;
+		$block = &$compiler->getCurrentBlock();
+		$block['params']['hasElse'] = $pre.$content.$post;
 
-        return '';
-    }
+		return '';
+	}
 }

lib/plugins/builtin/blocks/capture.php

Indentation +22 added lines, -22 removed lines

@@ -36,30 +36,30 @@
  */
 class Dwoo_Plugin_capture extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block
 {
-    public function init($name = 'default', $assign = null, $cat = false, $trim = false)
-    {
-    }
+	public function init($name = 'default', $assign = null, $cat = false, $trim = false)
+	{
+	}
 
-    public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
-    {
-        return Dwoo_Compiler::PHP_OPEN.$prepend.'ob_start();'.$append.Dwoo_Compiler::PHP_CLOSE;
-    }
+	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
+	{
+		return Dwoo_Compiler::PHP_OPEN.$prepend.'ob_start();'.$append.Dwoo_Compiler::PHP_CLOSE;
+	}
 
-    public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
-    {
-        $params = $compiler->getCompiledParams($params);
+	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
+	{
+		$params = $compiler->getCompiledParams($params);
 
-        $out = $content.Dwoo_Compiler::PHP_OPEN.$prepend."\n".'$tmp = ob_get_clean();';
-        if ($params['trim'] !== 'false' && $params['trim'] !== 0) {
-            $out .= "\n".'$tmp = trim($tmp);';
-        }
-        if ($params['cat'] === 'true' || $params['cat'] === 1) {
-            $out .= "\n".'$tmp = $this->readVar(\'dwoo.capture.\'.'.$params['name'].') . $tmp;';
-        }
-        if ($params['assign'] !== 'null') {
-            $out .= "\n".'$this->scope['.$params['assign'].'] = $tmp;';
-        }
+		$out = $content.Dwoo_Compiler::PHP_OPEN.$prepend."\n".'$tmp = ob_get_clean();';
+		if ($params['trim'] !== 'false' && $params['trim'] !== 0) {
+			$out .= "\n".'$tmp = trim($tmp);';
+		}
+		if ($params['cat'] === 'true' || $params['cat'] === 1) {
+			$out .= "\n".'$tmp = $this->readVar(\'dwoo.capture.\'.'.$params['name'].') . $tmp;';
+		}
+		if ($params['assign'] !== 'null') {
+			$out .= "\n".'$this->scope['.$params['assign'].'] = $tmp;';
+		}
 
-        return $out."\n".'$this->globals[\'capture\']['.$params['name'].'] = $tmp;'.$append.Dwoo_Compiler::PHP_CLOSE;
-    }
+		return $out."\n".'$this->globals[\'capture\']['.$params['name'].'] = $tmp;'.$append.Dwoo_Compiler::PHP_CLOSE;
+	}
 }