dwoo-project / dwoo

lib/plugins/builtin/blocks/loop.php

Braces +18 added lines, -6 removed lines

@@ -87,12 +87,24 @@
 		// adds foreach properties
 		if ($usesAny) {
 			$pre .= "\n".'$this->globals["loop"]['.$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->isTraversable($_loop'.$cnt.'_data, true),';
-			if ($usesTotal) $pre .="\n\t".'"total"		=> $this->count($_loop'.$cnt.'_data),';
+			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->isTraversable($_loop'.$cnt.'_data, true),';
+			}
+			if ($usesTotal) {
+				$pre .="\n\t".'"total"		=> $this->count($_loop'.$cnt.'_data),';
+			}
 			$pre.="\n);\n".'$_loop'.$cnt.'_glob =& $this->globals["loop"]['.$name.'];';
 		}
 		// checks if the loop must be looped

lib/plugins/builtin/functions/escape.php

Braces +3 added lines, -2 removed lines

@@ -47,8 +47,9 @@
 	case 'hexentity':
 		$out = '';
 		$cnt = strlen((string) $value);
-		for ($i=0; $i < $cnt; $i++)
-			$out .= '&#x' . bin2hex((string) $value[$i]) . ';';
+		for ($i=0; $i < $cnt; $i++) {
+					$out .= '&#x' . bin2hex((string) $value[$i]) . ';';
+		}
 		return $out;
 	case 'javascript':
 		return strtr((string) $value, array('\\'=>'\\\\',"'"=>"\\'",'"'=>'\\"',"\r"=>'\\r',"\n"=>'\\n','</'=>'<\/'));

lib/Dwoo/Compiler.php

Braces +169 added lines, -63 removed lines

@@ -722,7 +722,9 @@ 
 					echo 'COMPILER INIT' . "\n";
 				}
 
-				if ($this->debug) echo 'PROCESSING PREPROCESSORS ('.count($this->processors['pre']).')' . "\n";
+				if ($this->debug) {
+					echo 'PROCESSING PREPROCESSORS ('.count($this->processors['pre']).')' . "\n";
+				}
 
 				// runs preprocessors
 				foreach ($this->processors['pre'] as $preProc) {
@@ -738,7 +740,9 @@ 
 				unset($preProc);
 
 				// show template source if debug
-				if ($this->debug) echo '<pre>'.print_r(htmlentities($tpl), true).'</pre>' . "\n";
+				if ($this->debug) {
+					echo '<pre>'.print_r(htmlentities($tpl), true).'</pre>' . "\n";
+				}
 
 				// strips php tags if required by the security policy
 				if ($this->securityPolicy !== null) {
@@ -827,7 +831,9 @@ 
 
 		$compiled .= $this->removeBlock('topLevelBlock');
 
-		if ($this->debug) echo 'PROCESSING POSTPROCESSORS' . "\n";
+		if ($this->debug) {
+			echo 'PROCESSING POSTPROCESSORS' . "\n";
+		}
 
 		foreach ($this->processors['post'] as $postProc) {
 			if (is_array($postProc) && isset($postProc['autoload'])) {
@@ -841,7 +847,9 @@ 
 		}
 		unset($postProc);
 
-		if ($this->debug) echo 'COMPILATION COMPLETE : MEM USAGE : '.memory_get_usage() . "\n";
+		if ($this->debug) {
+			echo 'COMPILATION COMPLETE : MEM USAGE : '.memory_get_usage() . "\n";
+		}
 
 		$output = "<?php\n/* template head */\n";
 
@@ -924,7 +932,9 @@ 
 	 */
 	protected function resolveSubTemplateDependencies($function)
 	{
-		if ($this->debug) echo 'Compiler::'.__FUNCTION__."\n";
+		if ($this->debug) {
+			echo 'Compiler::'.__FUNCTION__."\n";
+		}
 
 		$body = $this->templatePlugins[$function]['body'];
 		foreach ($this->templatePlugins as $func => $attr) {
@@ -996,8 +1006,9 @@ 
 				reset($this->scopeTree);
 				$this->scope =& $this->data;
 				$cnt = count($this->scopeTree);
-				for ($i=0;$i<$cnt;$i++)
-					$this->scope =& $this->scope[$this->scopeTree[$i]];
+				for ($i=0;$i<$cnt;$i++) {
+									$this->scope =& $this->scope[$this->scopeTree[$i]];
+				}
 			} elseif ($bit === '_root' || $bit === '__') {
 				$this->scope =& $this->data;
 				$this->scopeTree = array();
@@ -1024,7 +1035,9 @@ 
 	 */
 	public function addBlock($type, array $params, $paramtype)
 	{
-		if ($this->debug) echo 'Compiler::'.__FUNCTION__."\n";
+		if ($this->debug) {
+			echo 'Compiler::'.__FUNCTION__."\n";
+		}
 
 		$class = 'Dwoo_Plugin_'.$type;
 		if (class_exists($class) === false) {
@@ -1071,7 +1084,9 @@ 
 	 */
 	public function injectBlock($type, array $params)
 	{
-		if ($this->debug) echo 'Compiler::'.__FUNCTION__."\n";
+		if ($this->debug) {
+			echo 'Compiler::'.__FUNCTION__."\n";
+		}
 
 		$class = 'Dwoo_Plugin_'.$type;
 		if (class_exists($class) === false) {
@@ -1090,7 +1105,9 @@ 
 	 */
 	public function removeBlock($type)
 	{
-		if ($this->debug) echo 'Compiler::'.__FUNCTION__."\n";
+		if ($this->debug) {
+			echo 'Compiler::'.__FUNCTION__."\n";
+		}
 
 		$output = '';
 
@@ -1177,7 +1194,9 @@ 
 	 */
 	public function removeTopBlock()
 	{
-		if ($this->debug) echo 'Compiler::'.__FUNCTION__."\n";
+		if ($this->debug) {
+			echo 'Compiler::'.__FUNCTION__."\n";
+		}
 
 		$o = array_pop($this->stack);
 		if ($o === null) {
@@ -1255,7 +1274,9 @@ 
 	 */
 	protected function parse($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
 	{
-		if ($this->debug) echo 'Compiler::'.__FUNCTION__."\n";
+		if ($this->debug) {
+			echo 'Compiler::'.__FUNCTION__."\n";
+		}
 
 		if ($to === null) {
 			$to = strlen($in);
@@ -1270,7 +1291,9 @@ 
 			if ($curBlock === 'root' && substr($in, $from, strlen($this->rd)) === $this->rd) {
 				// end template tag
 				$pointer += strlen($this->rd);
-				if ($this->debug) echo 'TEMPLATE PARSING ENDED' . "\n";
+				if ($this->debug) {
+					echo 'TEMPLATE PARSING ENDED' . "\n";
+				}
 				return false;
 			}
 			$from++;
@@ -1289,7 +1312,9 @@ 
 
 		$substr = substr($in, $from, $to-$from);
 
-		if ($this->debug) echo 'PARSE CALL : PARSING "<b>'.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').'</b>" @ '.$from.':'.$to.' in '.$curBlock.' : pointer='.$pointer. "\n";
+		if ($this->debug) {
+			echo 'PARSE CALL : PARSING "<b>'.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').'</b>" @ '.$from.':'.$to.' in '.$curBlock.' : pointer='.$pointer. "\n";
+		}
 		$parsed = "";
 
 		if ($curBlock === 'root' && $first === '*') {
@@ -1373,7 +1398,9 @@ 
 			$parsed = 'func';
 		} elseif ($first === ';') {
 			// instruction end
-			if ($this->debug) echo 'END OF INSTRUCTION' . "\n";
+			if ($this->debug) {
+				echo 'END OF INSTRUCTION' . "\n";
+			}
 			if ($pointer !== null) {
 				$pointer++;
 			}
@@ -1393,20 +1420,28 @@ 
 				if ($this->curBlock['type'] == 'else' || $this->curBlock['type'] == 'elseif') {
 					$pointer -= strlen($match[0]);
 				}
-				if ($this->debug) echo 'TOP BLOCK CLOSED' . "\n";
+				if ($this->debug) {
+					echo 'TOP BLOCK CLOSED' . "\n";
+				}
 				return $this->removeTopBlock();
 			} else {
-				if ($this->debug) echo 'BLOCK OF TYPE '.$match[1].' CLOSED' . "\n";
+				if ($this->debug) {
+					echo 'BLOCK OF TYPE '.$match[1].' CLOSED' . "\n";
+				}
 				return $this->removeBlock($match[1]);
 			}
 		} elseif ($curBlock === 'root' && substr($substr, 0, strlen($this->rd)) === $this->rd) {
 			// end template tag
-			if ($this->debug) echo 'TAG PARSING ENDED' . "\n";
+			if ($this->debug) {
+				echo 'TAG PARSING ENDED' . "\n";
+			}
 			$pointer += strlen($this->rd);
 			return false;
 		} elseif (is_array($parsingParams) && preg_match('#^(([\'"]?)[a-z0-9_]+\2\s*='.($curBlock === 'array' ? '>?':'').')(?:\s+|[^=]).*#i', $substr, $match)) {
 			// named parameter
-			if ($this->debug) echo 'NAMED PARAM FOUND' . "\n";
+			if ($this->debug) {
+				echo 'NAMED PARAM FOUND' . "\n";
+			}
 			$len = strlen($match[1]);
 			while (substr($in, $from+$len, 1)===' ') {
 				$len++;
@@ -1446,7 +1481,9 @@ 
 		// var parsed, check if any var-extension applies
 		if ($parsed==='var') {
 			if (preg_match('#^\s*([/%+*-])\s*([a-z0-9]|\$)#i', $substr, $match)) {
-				if($this->debug) echo 'PARSING POST-VAR EXPRESSION '.$substr . "\n";
+				if($this->debug) {
+					echo 'PARSING POST-VAR EXPRESSION '.$substr . "\n";
+				}
 				// parse expressions
 				$pointer += strlen($match[0]) - 1;
 				if (is_array($parsingParams)) {
@@ -1476,7 +1513,9 @@ 
 					}
 				}
 			} else if ($curBlock === 'root' && preg_match('#^(\s*(?:[+/*%-.]=|=|\+\+|--)\s*)(.*)#s', $substr, $match)) {
-				if($this->debug) echo 'PARSING POST-VAR ASSIGNMENT '.$substr . "\n";
+				if($this->debug) {
+					echo 'PARSING POST-VAR ASSIGNMENT '.$substr . "\n";
+				}
 				// parse assignment
 				$value = $match[2];
 				$operator = trim($match[1]);
@@ -1518,7 +1557,9 @@ 
 				$out = Dwoo_Compiler::PHP_OPEN. $echo . $out . $operator . implode(' ', $value) . Dwoo_Compiler::PHP_CLOSE;
 			} else if ($curBlock === 'array' && is_array($parsingParams) && preg_match('#^(\s*=>?\s*)#', $substr, $match)) {
 				// parse namedparam with var as name (only for array)
-				if ($this->debug) echo 'VARIABLE NAMED PARAM (FOR ARRAY) FOUND' . "\n";
+				if ($this->debug) {
+					echo 'VARIABLE NAMED PARAM (FOR ARRAY) FOUND' . "\n";
+				}
 				$len = strlen($match[1]);
 				$var = $out[count($out)-1];
 				$pointer += $len;
@@ -1594,7 +1635,9 @@ 
 			$cmdstr = $match[1];
 		}
 
-		if ($this->debug) echo 'FUNC FOUND ('.$func.')' . "\n";
+		if ($this->debug) {
+			echo 'FUNC FOUND ('.$func.')' . "\n";
+		}
 
 		$paramsep = '';
 
@@ -1656,17 +1699,25 @@ 
 							}
 
 							if ($func !== 'if' && $func !== 'elseif' && $paramstr[$ptr] === ')') {
-								if ($this->debug) echo 'PARAM PARSING ENDED, ")" FOUND, POINTER AT '.$ptr . "\n";
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, ")" FOUND, POINTER AT '.$ptr . "\n";
+								}
 								break 2;
 							} elseif ($paramstr[$ptr] === ';') {
 								$ptr++;
-								if ($this->debug) echo 'PARAM PARSING ENDED, ";" FOUND, POINTER AT '.$ptr . "\n";
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, ";" FOUND, POINTER AT '.$ptr . "\n";
+								}
 								break 2;
 							} elseif ($func !== 'if' && $func !== 'elseif' && $paramstr[$ptr] === '/') {
-								if ($this->debug) echo 'PARAM PARSING ENDED, "/" FOUND, POINTER AT '.$ptr . "\n";
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, "/" FOUND, POINTER AT '.$ptr . "\n";
+								}
 								break 2;
 							} elseif (substr($paramstr, $ptr, strlen($this->rd)) === $this->rd) {
-								if ($this->debug) echo 'PARAM PARSING ENDED, RIGHT DELIMITER FOUND, POINTER AT '.$ptr . "\n";
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, RIGHT DELIMITER FOUND, POINTER AT '.$ptr . "\n";
+								}
 								break 2;
 							}
 
@@ -1677,7 +1728,9 @@ 
 							}
 						}
 
-						if ($this->debug) echo 'FUNC START PARAM PARSING WITH POINTER AT '.$ptr . "\n";
+						if ($this->debug) {
+							echo 'FUNC START PARAM PARSING WITH POINTER AT '.$ptr . "\n";
+						}
 
 						if ($func === 'if' || $func === 'elseif' || $func === 'tif') {
 							$params = $this->parse($paramstr, $ptr, strlen($paramstr), $params, 'condition', $ptr);
@@ -1687,7 +1740,9 @@ 
 							$params = $this->parse($paramstr, $ptr, strlen($paramstr), $params, 'function', $ptr);
 						}
 
-						if ($this->debug) echo 'PARAM PARSED, POINTER AT '.$ptr.' ('.substr($paramstr, $ptr-1, 3).')' . "\n";
+						if ($this->debug) {
+							echo 'PARAM PARSED, POINTER AT '.$ptr.' ('.substr($paramstr, $ptr-1, 3).')' . "\n";
+						}
 					}
 				}
 				$paramstr = substr($paramstr, 0, $ptr);
@@ -1711,7 +1766,9 @@ 
 
 		if ($pointer !== null) {
 			$pointer += (isset($paramstr) ? strlen($paramstr) : 0) + (')' === $paramsep ? 2 : ($paramspos === false ? 0 : 1)) + strlen($func) + (isset($whitespace) ? $whitespace : 0);
-			if ($this->debug) echo 'FUNC ADDS '.((isset($paramstr) ? strlen($paramstr) : 0) + (')' === $paramsep ? 2 : ($paramspos === false ? 0 : 1)) + strlen($func)).' TO POINTER' . "\n";
+			if ($this->debug) {
+				echo 'FUNC ADDS '.((isset($paramstr) ? strlen($paramstr) : 0) + (')' === $paramsep ? 2 : ($paramspos === false ? 0 : 1)) + strlen($func)).' TO POINTER' . "\n";
+			}
 		}
 
 		if ($curBlock === 'method' || $func === 'do' || strstr($func, '::') !== false) {
@@ -1836,8 +1893,7 @@ 
 					if ($callback instanceof \Closure) {
 						array_unshift($params, $this->getDwoo());
 						$output = call_user_func_array($callback, $params);
-					}
-					else {
+					} else {
 						array_unshift($params, '$this');
 						$params = self::implode_r($params);
 						$output = 'call_user_func(\'' . $callback . '\', ' . $params . ')';
@@ -1952,7 +2008,9 @@ 
 		$substr = substr($in, $from, $to-$from);
 		$first = $substr[0];
 
-		if ($this->debug) echo 'STRING FOUND (in '.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').')' . "\n";
+		if ($this->debug) {
+			echo 'STRING FOUND (in '.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').')' . "\n";
+		}
 		$strend = false;
 		$o = $from+1;
 		while ($strend === false) {
@@ -1965,7 +2023,9 @@ 
 				$strend = false;
 			}
 		}
-		if ($this->debug) echo 'STRING DELIMITED: '.substr($in, $from, $strend+1-$from) . "\n";
+		if ($this->debug) {
+			echo 'STRING DELIMITED: '.substr($in, $from, $strend+1-$from) . "\n";
+		}
 
 		$srcOutput = substr($in, $from, $strend+1-$from);
 
@@ -2171,11 +2231,15 @@ 
 				}
 				unset($uid, $current, $curTxt, $tree, $chars);
 
-				if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT : '.$key . "\n";
+				if ($this->debug) {
+					echo 'RECURSIVE VAR REPLACEMENT : '.$key . "\n";
+				}
 
 				$key = $this->flattenVarTree($parsed);
 
-				if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key . "\n";
+				if ($this->debug) {
+					echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key . "\n";
+				}
 
 				$output = preg_replace('#(^""\.|""\.|\.""$|(\()""\.|\.""(\)))#', '$2$3', '$this->readVar("'.$key.'")');
 			} else {
@@ -2355,8 +2419,9 @@ 
 				$global = 'COOKIE';
 			}
 			$key = '$_'.$global;
-			foreach (explode('.', ltrim($m[2], '.')) as $part)
-				$key .= '['.var_export($part, true).']';
+			foreach (explode('.', ltrim($m[2], '.')) as $part) {
+							$key .= '['.var_export($part, true).']';
+			}
 			if ($curBlock === 'root') {
 				$output = $key;
 			} else {
@@ -2466,7 +2531,9 @@ 
 				} else {
 					$cnt = substr_count($key, '$');
 
-					if ($this->debug) echo 'PARSING SUBVARS IN : '.$key . "\n";
+					if ($this->debug) {
+						echo 'PARSING SUBVARS IN : '.$key . "\n";
+					}
 					if ($cnt > 0) {
 						while (--$cnt >= 0) {
 							if (isset($last)) {
@@ -2488,7 +2555,9 @@ 
 								$last,
 								$len
 							);
-							if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key . "\n";
+							if ($this->debug) {
+								echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key . "\n";
+							}
 						}
 						unset($last);
 
@@ -2569,15 +2638,21 @@ 
 		$substr = trim($substr);
 
 		if (strtolower($substr) === 'false' || strtolower($substr) === 'no' || strtolower($substr) === 'off') {
-			if ($this->debug) echo 'BOOLEAN(FALSE) PARSED' . "\n";
+			if ($this->debug) {
+				echo 'BOOLEAN(FALSE) PARSED' . "\n";
+			}
 			$substr = 'false';
 			$type = self::T_BOOL;
 		} elseif (strtolower($substr) === 'true' || strtolower($substr) === 'yes' || strtolower($substr) === 'on') {
-			if ($this->debug) echo 'BOOLEAN(TRUE) PARSED' . "\n";
+			if ($this->debug) {
+				echo 'BOOLEAN(TRUE) PARSED' . "\n";
+			}
 			$substr = 'true';
 			$type = self::T_BOOL;
 		} elseif ($substr === 'null' || $substr === 'NULL') {
-			if ($this->debug) echo 'NULL PARSED' . "\n";
+			if ($this->debug) {
+				echo 'NULL PARSED' . "\n";
+			}
 			$substr = 'null';
 			$type = self::T_NULL;
 		} elseif (is_numeric($substr)) {
@@ -2586,19 +2661,27 @@ 
 				$substr = (int) $substr;
 			}
 			$type = self::T_NUMERIC;
-			if ($this->debug) echo 'NUMBER ('.$substr.') PARSED' . "\n";
+			if ($this->debug) {
+				echo 'NUMBER ('.$substr.') PARSED' . "\n";
+			}
 		} elseif (preg_match('{^-?(\d+|\d*(\.\d+))\s*([/*%+-]\s*-?(\d+|\d*(\.\d+)))+$}', $substr)) {
-			if ($this->debug) echo 'SIMPLE MATH PARSED . "\n"';
+			if ($this->debug) {
+				echo 'SIMPLE MATH PARSED . "\n"';
+			}
 			$type = self::T_MATH;
 			$substr = '('.$substr.')';
 		} elseif ($curBlock === 'condition' && array_search($substr, $breakChars, true) !== false) {
-			if ($this->debug) echo 'BREAKCHAR ('.$substr.') PARSED' . "\n";
+			if ($this->debug) {
+				echo 'BREAKCHAR ('.$substr.') PARSED' . "\n";
+			}
 			$type = self::T_BREAKCHAR;
 			//$substr = '"'.$substr.'"';
 		} else {
 			$substr = $this->replaceStringVars('\''.str_replace('\'', '\\\'', $substr).'\'', '\'', $curBlock);
 			$type = self::T_UNQUOTED_STRING;
-			if ($this->debug) echo 'BLABBER ('.$substr.') CASTED AS STRING' . "\n";
+			if ($this->debug) {
+				echo 'BLABBER ('.$substr.') CASTED AS STRING' . "\n";
+			}
 		}
 
 		if (is_array($parsingParams)) {
@@ -2624,7 +2707,9 @@ 
 	protected function replaceStringVars($string, $first, $curBlock='')
 	{
 		$pos = 0;
-		if ($this->debug) echo 'STRING VAR REPLACEMENT : '.$string . "\n";
+		if ($this->debug) {
+			echo 'STRING VAR REPLACEMENT : '.$string . "\n";
+		}
 		// replace vars
 		while (($pos = strpos($string, '$', $pos)) !== false) {
 			$prev = substr($string, $pos-1, 1);
@@ -2643,7 +2728,9 @@ 
 				$string = substr_replace($string, $first.'.'.$var[1].'.'.$first, $pos, $len);
 			}
 			$pos += strlen($var[1]) + 2;
-			if ($this->debug) echo 'STRING VAR REPLACEMENT DONE : '.$string . "\n";
+			if ($this->debug) {
+				echo 'STRING VAR REPLACEMENT DONE : '.$string . "\n";
+			}
 		}
 
 		// handle modifiers
@@ -2669,7 +2756,9 @@ 
 	 */
 	protected function replaceModifiers(array $m, $curBlock = null, &$pointer = null)
 	{
-		if ($this->debug) echo 'PARSING MODIFIERS : '.$m[3] . "\n";
+		if ($this->debug) {
+			echo 'PARSING MODIFIERS : '.$m[3] . "\n";
+		}
 
 		if ($pointer !== null) {
 			$pointer += strlen($m[3]);
@@ -2691,7 +2780,9 @@ 
 				continue;
 			}
 			if ($cmdstrsrc[0] === ' ' || $cmdstrsrc[0] === ';' || substr($cmdstrsrc, 0, strlen($this->rd)) === $this->rd) {
-				if ($this->debug) echo 'MODIFIER PARSING ENDED, RIGHT DELIMITER or ";" FOUND' . "\n";
+				if ($this->debug) {
+					echo 'MODIFIER PARSING ENDED, RIGHT DELIMITER or ";" FOUND' . "\n";
+				}
 				$continue = false;
 				if ($pointer !== null) {
 					$pointer -= strlen($cmdstrsrc);
@@ -2710,7 +2801,9 @@ 
 			if ($paramspos === false) {
 				$cmdstrsrc = substr($cmdstrsrc, strlen($func));
 				$params = array();
-				if ($this->debug) echo 'MODIFIER ('.$func.') CALLED WITH NO PARAMS' . "\n";
+				if ($this->debug) {
+					echo 'MODIFIER ('.$func.') CALLED WITH NO PARAMS' . "\n";
+				}
 			} else {
 				$paramstr = substr($cmdstr, $paramspos+1);
 				if (substr($paramstr, -1, 1) === $paramsep) {
@@ -2720,18 +2813,28 @@ 
 				$ptr = 0;
 				$params = array();
 				while ($ptr < strlen($paramstr)) {
-					if ($this->debug) echo 'MODIFIER ('.$func.') START PARAM PARSING WITH POINTER AT '.$ptr . "\n";
-					if ($this->debug) echo $paramstr.'--'.$ptr.'--'.strlen($paramstr).'--modifier' . "\n";
+					if ($this->debug) {
+						echo 'MODIFIER ('.$func.') START PARAM PARSING WITH POINTER AT '.$ptr . "\n";
+					}
+					if ($this->debug) {
+						echo $paramstr.'--'.$ptr.'--'.strlen($paramstr).'--modifier' . "\n";
+					}
 					$params = $this->parse($paramstr, $ptr, strlen($paramstr), $params, 'modifier', $ptr);
-					if ($this->debug) echo 'PARAM PARSED, POINTER AT '.$ptr . "\n";
+					if ($this->debug) {
+						echo 'PARAM PARSED, POINTER AT '.$ptr . "\n";
+					}
 
 					if ($ptr >= strlen($paramstr)) {
-						if ($this->debug) echo 'PARAM PARSING ENDED, PARAM STRING CONSUMED' . "\n";
+						if ($this->debug) {
+							echo 'PARAM PARSING ENDED, PARAM STRING CONSUMED' . "\n";
+						}
 						break;
 					}
 
 					if ($paramstr[$ptr] === ' ' || $paramstr[$ptr] === '|' || $paramstr[$ptr] === ';' || substr($paramstr, $ptr, strlen($this->rd)) === $this->rd) {
-						if ($this->debug) echo 'PARAM PARSING ENDED, " ", "|", RIGHT DELIMITER or ";" FOUND, POINTER AT '.$ptr . "\n";
+						if ($this->debug) {
+							echo 'PARAM PARSING ENDED, " ", "|", RIGHT DELIMITER or ";" FOUND, POINTER AT '.$ptr . "\n";
+						}
 						if ($paramstr[$ptr] !== '|') {
 							$continue = false;
 							if ($pointer !== null) {
@@ -2792,8 +2895,9 @@ 
 				}
 			} elseif ($pluginType & Dwoo_Core::PROXY_PLUGIN) {
 				$params = $this->mapParams($params, $this->getDwoo()->getPluginProxy()->getCallback($func), $state);
-				foreach ($params as &$p)
-					$p = $p[0];
+				foreach ($params as &$p) {
+									$p = $p[0];
+				}
 				$output = call_user_func(array($this->dwoo->getPluginProxy(), 'getCode'), $func, $params);
 			} elseif ($pluginType & Dwoo_Core::SMARTY_MODIFIER) {
 				$params = $this->mapParams($params, null, $state);
@@ -2835,8 +2939,9 @@ 
 
 				$params = $this->mapParams($params, $callback, $state);
 
-				foreach ($params as &$p)
-					$p = $p[0];
+				foreach ($params as &$p) {
+									$p = $p[0];
+				}
 
 				if ($pluginType & Dwoo_Core::FUNC_PLUGIN) {
 					if ($pluginType & Dwoo_Core::COMPILABLE_PLUGIN) {
@@ -2929,8 +3034,9 @@ 
 		foreach ($params as $k=>$p) {
 			if (is_array($p)) {
 				$out2 = 'array(';
-				foreach ($p as $k2=>$v)
-					$out2 .= var_export($k2, true).' => '.(is_array($v) ? 'array('.self::implode_r($v, true).')' : $v).', ';
+				foreach ($p as $k2=>$v) {
+									$out2 .= var_export($k2, true).' => '.(is_array($v) ? 'array('.self::implode_r($v, true).')' : $v).', ';
+				}
 				$p = rtrim($out2, ', ').')';
 			}
 			if ($recursiveCall) {