dwoo-project / dwoo

lib/Dwoo/Core.php

Braces +3 added lines, -2 removed lines

@@ -1538,8 +1538,9 @@
                 array_pop($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 === '__' || $bit === '_root') {
                 $this->scope =& $this->data;
                 $this->scopeTree = array();

lib/Dwoo/Smarty/Adapter.php

Switch Indentation +11 added lines, -11 removed lines

@@ -183,17 +183,17 @@
 				$phpTags = SMARTY_PHP_ALLOW;
 			}
 			switch($phpTags) {
-				case SMARTY_PHP_ALLOW:
-				case SMARTY_PHP_PASSTHRU:
-					$phpTags = Dwoo_Security_Policy::PHP_ALLOW;
-					break;
-				case SMARTY_PHP_QUOTE:
-					$phpTags = Dwoo_Security_Policy::PHP_ENCODE;
-					break;
-				case SMARTY_PHP_REMOVE:
-				default:
-					$phpTags = Dwoo_Security_Policy::PHP_REMOVE;
-					break;
+			case SMARTY_PHP_ALLOW:
+			case SMARTY_PHP_PASSTHRU:
+				$phpTags = Dwoo_Security_Policy::PHP_ALLOW;
+				break;
+			case SMARTY_PHP_QUOTE:
+				$phpTags = Dwoo_Security_Policy::PHP_ENCODE;
+				break;
+			case SMARTY_PHP_REMOVE:
+			default:
+				$phpTags = Dwoo_Security_Policy::PHP_REMOVE;
+				break;
 			}
 			$policy->setPhpHandling($phpTags);
 

Braces +18 added lines, -14 removed lines

@@ -297,9 +297,10 @@ 
 
 	public function unregister_prefilter($callback)
 	{
-		foreach ($this->_filters['pre'] as $index => $processor)
-			if ($processor->callback === $callback) {
+		foreach ($this->_filters['pre'] as $index => $processor) {
+					if ($processor->callback === $callback) {
 				$this->compiler->removePostProcessor($processor);
+		}
 				unset($this->_filters['pre'][$index]);
 			}
 	}
@@ -314,9 +315,10 @@ 
 
 	public function unregister_postfilter($callback)
 	{
-		foreach ($this->_filters['post'] as $index => $processor)
-			if ($processor->callback === $callback) {
+		foreach ($this->_filters['post'] as $index => $processor) {
+					if ($processor->callback === $callback) {
 				$this->compiler->removePostProcessor($processor);
+		}
 				unset($this->_filters['post'][$index]);
 			}
 	}
@@ -331,9 +333,10 @@ 
 
 	public function unregister_outputfilter($callback)
 	{
-		foreach ($this->_filters['output'] as $index => $filter)
-			if ($filter->callback === $callback) {
+		foreach ($this->_filters['output'] as $index => $filter) {
+					if ($filter->callback === $callback) {
 				$this->removeOutputFilter($filter);
+		}
 				unset($this->_filters['output'][$index]);
 			}
 	}
@@ -419,10 +422,11 @@ 
 		}
 
 		$data = $this->dataProvider->getData();
-   		if ($name === null)
-   			return $data;
-   		elseif (isset($data[$name]))
-   			return $data[$name];
+   		if ($name === null) {
+   		   			return $data;
+   		} elseif (isset($data[$name])) {
+   		   			return $data[$name];
+   		}
    		return null;
    	}
 
@@ -450,8 +454,9 @@ 
 
 	protected function makeTemplate($file, $cacheId, $compileId)
 	{
-   		if ($compileId === null)
-   			$compileId = $this->compile_id;
+   		if ($compileId === null) {
+   		   			$compileId = $this->compile_id;
+   		}
 
 		$hash = bin2hex(md5($file.$cacheId.$compileId, true));
 		if (!isset(self::$tplCache[$hash])) {
@@ -511,8 +516,7 @@ 
 {
 	interface Smarty {}
 	class Dwoo_Smarty_Adapter extends Dwoo_Smarty__Adapter implements Smarty {}
-}
-else
+} else
 {
 	class Dwoo_Smarty_Adapter extends Dwoo_Smarty__Adapter {}
 }

lib/Dwoo/Security/Policy.php

Braces +30 added lines, -24 removed lines

@@ -100,11 +100,12 @@ 
 	 */
 	public function allowPhpFunction($func)
 	{
-		if (is_array($func))
-			foreach ($func as $fname)
+		if (is_array($func)) {
+					foreach ($func as $fname)
 				$this->allowedPhpFunctions[strtolower($fname)] = true;
-		else
-			$this->allowedPhpFunctions[strtolower($func)] = true;
+		} else {
+					$this->allowedPhpFunctions[strtolower($func)] = true;
+		}
 	}
 
 	/**
@@ -114,11 +115,12 @@ 
 	 */
 	public function disallowPhpFunction($func)
 	{
-		if (is_array($func))
-			foreach ($func as $fname)
+		if (is_array($func)) {
+					foreach ($func as $fname)
 				unset($this->allowedPhpFunctions[strtolower($fname)]);
-		else
-			unset($this->allowedPhpFunctions[strtolower($func)]);
+		} else {
+					unset($this->allowedPhpFunctions[strtolower($func)]);
+		}
 	}
 
 	/**
@@ -142,11 +144,12 @@ 
 	 */
 	public function allowMethod($class, $method = null)
 	{
-		if (is_array($class))
-			foreach ($class as $elem)
+		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;
+		} else {
+					$this->allowedMethods[strtolower($class)][strtolower($method)] = true;
+		}
 	}
 
 	/**
@@ -157,11 +160,12 @@ 
 	 */
 	public function disallowMethod($class, $method = null)
 	{
-		if (is_array($class))
-			foreach ($class as $elem)
+		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)]);
+		} else {
+					unset($this->allowedMethods[strtolower($class)][strtolower($method)]);
+		}
 	}
 
 	/**
@@ -185,11 +189,12 @@ 
 	 */
 	public function allowDirectory($path)
 	{
-		if (is_array($path))
-			foreach ($path as $dir)
+		if (is_array($path)) {
+					foreach ($path as $dir)
 				$this->allowedDirectories[realpath($dir)] = true;
-		else
-			$this->allowedDirectories[realpath($path)] = true;
+		} else {
+					$this->allowedDirectories[realpath($path)] = true;
+		}
 	}
 
 	/**
@@ -199,11 +204,12 @@ 
 	 */
 	public function disallowDirectory($path)
 	{
-		if (is_array($path))
-			foreach ($path as $dir)
+		if (is_array($path)) {
+					foreach ($path as $dir)
 				unset($this->allowedDirectories[realpath($dir)]);
-		else
-			unset($this->allowedDirectories[realpath($path)]);
+		} else {
+					unset($this->allowedDirectories[realpath($path)]);
+		}
 	}
 
 	/**

lib/Dwoo/Compiler.php

Braces +156 added lines, -57 removed lines

@@ -713,9 +713,13 @@ 
 				$compiled = $this->addBlock('topLevelBlock', array(), 0);
 				$this->stack[0]['buffer'] = '';
 
-				if ($this->debug) echo 'COMPILER INIT<br />';
+				if ($this->debug) {
+					echo 'COMPILER INIT<br />';
+				}
 
-				if ($this->debug) echo 'PROCESSING PREPROCESSORS ('.count($this->processors['pre']).')<br>';
+				if ($this->debug) {
+					echo 'PROCESSING PREPROCESSORS ('.count($this->processors['pre']).')<br>';
+				}
 
 				// runs preprocessors
 				foreach ($this->processors['pre'] as $preProc) {
@@ -731,7 +735,9 @@ 
 				unset($preProc);
 
 				// show template source if debug
-				if ($this->debug) echo '<pre>'.print_r(htmlentities($tpl), true).'</pre><hr />';
+				if ($this->debug) {
+					echo '<pre>'.print_r(htmlentities($tpl), true).'</pre><hr />';
+				}
 
 				// strips php tags if required by the security policy
 				if ($this->securityPolicy !== null) {
@@ -820,7 +826,9 @@ 
 
 		$compiled .= $this->removeBlock('topLevelBlock');
 
-		if ($this->debug) echo 'PROCESSING POSTPROCESSORS<br>';
+		if ($this->debug) {
+			echo 'PROCESSING POSTPROCESSORS<br>';
+		}
 
 		foreach ($this->processors['post'] as $postProc) {
 			if (is_array($postProc) && isset($postProc['autoload'])) {
@@ -834,7 +842,9 @@ 
 		}
 		unset($postProc);
 
-		if ($this->debug) echo 'COMPILATION COMPLETE : MEM USAGE : '.memory_get_usage().'<br>';
+		if ($this->debug) {
+			echo 'COMPILATION COMPLETE : MEM USAGE : '.memory_get_usage().'<br>';
+		}
 
 		$output = "<?php\n/* template head */\n";
 
@@ -902,7 +912,9 @@ 
 				echo ($i+1).'. '.$line."\r\n";
 			}
 		}
-		if ($this->debug) echo '<hr></pre></pre>';
+		if ($this->debug) {
+			echo '<hr></pre></pre>';
+		}
 
 		$this->template = $this->dwoo = null;
 		$tpl = null;
@@ -987,8 +999,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();
@@ -1253,7 +1266,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<br />';
+				if ($this->debug) {
+					echo 'TEMPLATE PARSING ENDED<br />';
+				}
 				return false;
 			}
 			$from++;
@@ -1272,7 +1287,9 @@ 
 
 		$substr = substr($in, $from, $to-$from);
 
-		if ($this->debug) echo '<br />PARSE CALL : PARSING "<b>'.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').'</b>" @ '.$from.':'.$to.' in '.$curBlock.' : pointer='.$pointer.'<br/>';
+		if ($this->debug) {
+			echo '<br />PARSE CALL : PARSING "<b>'.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').'</b>" @ '.$from.':'.$to.' in '.$curBlock.' : pointer='.$pointer.'<br/>';
+		}
 		$parsed = "";
 
 		if ($curBlock === 'root' && $first === '*') {
@@ -1357,7 +1374,9 @@ 
 			$parsed = 'func';
 		} elseif ($first === ';') {
 			// instruction end
-			if ($this->debug) echo 'END OF INSTRUCTION<br />';
+			if ($this->debug) {
+				echo 'END OF INSTRUCTION<br />';
+			}
 			if ($pointer !== null) {
 				$pointer++;
 			}
@@ -1377,20 +1396,28 @@ 
 				if ($this->curBlock['type'] == 'else' || $this->curBlock['type'] == 'elseif') {
 					$pointer -= strlen($match[0]);
 				}
-				if ($this->debug) echo 'TOP BLOCK CLOSED<br />';
+				if ($this->debug) {
+					echo 'TOP BLOCK CLOSED<br />';
+				}
 				return $this->removeTopBlock();
 			} else {
-				if ($this->debug) echo 'BLOCK OF TYPE '.$match[1].' CLOSED<br />';
+				if ($this->debug) {
+					echo 'BLOCK OF TYPE '.$match[1].' CLOSED<br />';
+				}
 				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<br />';
+			if ($this->debug) {
+				echo 'TAG PARSING ENDED<br />';
+			}
 			$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<br />';
+			if ($this->debug) {
+				echo 'NAMED PARAM FOUND<br />';
+			}
 			$len = strlen($match[1]);
 			while (substr($in, $from+$len, 1)===' ') {
 				$len++;
@@ -1430,7 +1457,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.'<br />';
+				if($this->debug) {
+					echo 'PARSING POST-VAR EXPRESSION '.$substr.'<br />';
+				}
 				// parse expressions
 				$pointer += strlen($match[0]) - 1;
 				if (is_array($parsingParams)) {
@@ -1460,7 +1489,9 @@ 
 					}
 				}
 			} else if ($curBlock === 'root' && preg_match('#^(\s*(?:[+/*%-.]=|=|\+\+|--)\s*)(.*)#s', $substr, $match)) {
-				if($this->debug) echo 'PARSING POST-VAR ASSIGNMENT '.$substr.'<br />';
+				if($this->debug) {
+					echo 'PARSING POST-VAR ASSIGNMENT '.$substr.'<br />';
+				}
 				// parse assignment
 				$value = $match[2];
 				$operator = trim($match[1]);
@@ -1502,7 +1533,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<br />';
+				if ($this->debug) {
+					echo 'VARIABLE NAMED PARAM (FOR ARRAY) FOUND<br />';
+				}
 				$len = strlen($match[1]);
 				$var = $out[count($out)-1];
 				$pointer += $len;
@@ -1576,7 +1609,9 @@ 
 			$cmdstr = $match[1];
 		}
 
-		if ($this->debug) echo 'FUNC FOUND ('.$func.')<br />';
+		if ($this->debug) {
+			echo 'FUNC FOUND ('.$func.')<br />';
+		}
 
 		$paramsep = '';
 
@@ -1638,17 +1673,25 @@ 
 							}
 
 							if ($func !== 'if' && $func !== 'elseif' && $paramstr[$ptr] === ')') {
-								if ($this->debug) echo 'PARAM PARSING ENDED, ")" FOUND, POINTER AT '.$ptr.'<br/>';
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, ")" FOUND, POINTER AT '.$ptr.'<br/>';
+								}
 								break 2;
 							} elseif ($paramstr[$ptr] === ';') {
 								$ptr++;
-								if ($this->debug) echo 'PARAM PARSING ENDED, ";" FOUND, POINTER AT '.$ptr.'<br/>';
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, ";" FOUND, POINTER AT '.$ptr.'<br/>';
+								}
 								break 2;
 							} elseif ($func !== 'if' && $func !== 'elseif' && $paramstr[$ptr] === '/') {
-								if ($this->debug) echo 'PARAM PARSING ENDED, "/" FOUND, POINTER AT '.$ptr.'<br/>';
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, "/" FOUND, POINTER AT '.$ptr.'<br/>';
+								}
 								break 2;
 							} elseif (substr($paramstr, $ptr, strlen($this->rd)) === $this->rd) {
-								if ($this->debug) echo 'PARAM PARSING ENDED, RIGHT DELIMITER FOUND, POINTER AT '.$ptr.'<br/>';
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, RIGHT DELIMITER FOUND, POINTER AT '.$ptr.'<br/>';
+								}
 								break 2;
 							}
 
@@ -1659,7 +1702,9 @@ 
 							}
 						}
 
-						if ($this->debug) echo 'FUNC START PARAM PARSING WITH POINTER AT '.$ptr.'<br/>';
+						if ($this->debug) {
+							echo 'FUNC START PARAM PARSING WITH POINTER AT '.$ptr.'<br/>';
+						}
 
 						if ($func === 'if' || $func === 'elseif' || $func === 'tif') {
 							$params = $this->parse($paramstr, $ptr, strlen($paramstr), $params, 'condition', $ptr);
@@ -1669,7 +1714,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).')<br/>';
+						if ($this->debug) {
+							echo 'PARAM PARSED, POINTER AT '.$ptr.' ('.substr($paramstr, $ptr-1, 3).')<br/>';
+						}
 					}
 				}
 				$paramstr = substr($paramstr, 0, $ptr);
@@ -1693,7 +1740,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<br/>';
+			if ($this->debug) {
+				echo 'FUNC ADDS '.((isset($paramstr) ? strlen($paramstr) : 0) + (')' === $paramsep ? 2 : ($paramspos === false ? 0 : 1)) + strlen($func)).' TO POINTER<br/>';
+			}
 		}
 
 		if ($curBlock === 'method' || $func === 'do' || strstr($func, '::') !== false) {
@@ -1931,7 +1980,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 ? '...':'').')<br />';
+		if ($this->debug) {
+			echo 'STRING FOUND (in '.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').')<br />';
+		}
 		$strend = false;
 		$o = $from+1;
 		while ($strend === false) {
@@ -1944,7 +1995,9 @@ 
 				$strend = false;
 			}
 		}
-		if ($this->debug) echo 'STRING DELIMITED: '.substr($in, $from, $strend+1-$from).'<br/>';
+		if ($this->debug) {
+			echo 'STRING DELIMITED: '.substr($in, $from, $strend+1-$from).'<br/>';
+		}
 
 		$srcOutput = substr($in, $from, $strend+1-$from);
 
@@ -2150,11 +2203,15 @@ 
 				}
 				unset($uid, $current, $curTxt, $tree, $chars);
 
-				if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT : '.$key.'<br>';
+				if ($this->debug) {
+					echo 'RECURSIVE VAR REPLACEMENT : '.$key.'<br>';
+				}
 
 				$key = $this->flattenVarTree($parsed);
 
-				if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key.'<br>';
+				if ($this->debug) {
+					echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key.'<br>';
+				}
 
 				$output = preg_replace('#(^""\.|""\.|\.""$|(\()""\.|\.""(\)))#', '$2$3', '$this->readVar("'.$key.'")');
 			} else {
@@ -2334,8 +2391,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 {
@@ -2445,7 +2503,9 @@ 
 				} else {
 					$cnt = substr_count($key, '$');
 
-					if ($this->debug) echo 'PARSING SUBVARS IN : '.$key.'<br>';
+					if ($this->debug) {
+						echo 'PARSING SUBVARS IN : '.$key.'<br>';
+					}
 					if ($cnt > 0) {
 						while (--$cnt >= 0) {
 							if (isset($last)) {
@@ -2467,7 +2527,9 @@ 
 								$last,
 								$len
 							);
-							if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key.'<br>';
+							if ($this->debug) {
+								echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key.'<br>';
+							}
 						}
 						unset($last);
 
@@ -2548,15 +2610,21 @@ 
 		$substr = trim($substr);
 
 		if (strtolower($substr) === 'false' || strtolower($substr) === 'no' || strtolower($substr) === 'off') {
-			if ($this->debug) echo 'BOOLEAN(FALSE) PARSED<br />';
+			if ($this->debug) {
+				echo 'BOOLEAN(FALSE) PARSED<br />';
+			}
 			$substr = 'false';
 			$type = self::T_BOOL;
 		} elseif (strtolower($substr) === 'true' || strtolower($substr) === 'yes' || strtolower($substr) === 'on') {
-			if ($this->debug) echo 'BOOLEAN(TRUE) PARSED<br />';
+			if ($this->debug) {
+				echo 'BOOLEAN(TRUE) PARSED<br />';
+			}
 			$substr = 'true';
 			$type = self::T_BOOL;
 		} elseif ($substr === 'null' || $substr === 'NULL') {
-			if ($this->debug) echo 'NULL PARSED<br />';
+			if ($this->debug) {
+				echo 'NULL PARSED<br />';
+			}
 			$substr = 'null';
 			$type = self::T_NULL;
 		} elseif (is_numeric($substr)) {
@@ -2565,19 +2633,27 @@ 
 				$substr = (int) $substr;
 			}
 			$type = self::T_NUMERIC;
-			if ($this->debug) echo 'NUMBER ('.$substr.') PARSED<br />';
+			if ($this->debug) {
+				echo 'NUMBER ('.$substr.') PARSED<br />';
+			}
 		} elseif (preg_match('{^-?(\d+|\d*(\.\d+))\s*([/*%+-]\s*-?(\d+|\d*(\.\d+)))+$}', $substr)) {
-			if ($this->debug) echo 'SIMPLE MATH PARSED<br />';
+			if ($this->debug) {
+				echo 'SIMPLE MATH PARSED<br />';
+			}
 			$type = self::T_MATH;
 			$substr = '('.$substr.')';
 		} elseif ($curBlock === 'condition' && array_search($substr, $breakChars, true) !== false) {
-			if ($this->debug) echo 'BREAKCHAR ('.$substr.') PARSED<br />';
+			if ($this->debug) {
+				echo 'BREAKCHAR ('.$substr.') PARSED<br />';
+			}
 			$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<br />';
+			if ($this->debug) {
+				echo 'BLABBER ('.$substr.') CASTED AS STRING<br />';
+			}
 		}
 
 		if (is_array($parsingParams)) {
@@ -2603,7 +2679,9 @@ 
 	protected function replaceStringVars($string, $first, $curBlock='')
 	{
 		$pos = 0;
-		if ($this->debug) echo 'STRING VAR REPLACEMENT : '.$string.'<br>';
+		if ($this->debug) {
+			echo 'STRING VAR REPLACEMENT : '.$string.'<br>';
+		}
 		// replace vars
 		while (($pos = strpos($string, '$', $pos)) !== false) {
 			$prev = substr($string, $pos-1, 1);
@@ -2622,7 +2700,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.'<br>';
+			if ($this->debug) {
+				echo 'STRING VAR REPLACEMENT DONE : '.$string.'<br>';
+			}
 		}
 
 		// handle modifiers
@@ -2646,7 +2726,9 @@ 
 	 */
 	protected function replaceModifiers(array $m, $curBlock = null, &$pointer = null)
 	{
-		if ($this->debug) echo 'PARSING MODIFIERS : '.$m[3].'<br />';
+		if ($this->debug) {
+			echo 'PARSING MODIFIERS : '.$m[3].'<br />';
+		}
 
 		if ($pointer !== null) {
 			$pointer += strlen($m[3]);
@@ -2668,7 +2750,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<br/>';
+				if ($this->debug) {
+					echo 'MODIFIER PARSING ENDED, RIGHT DELIMITER or ";" FOUND<br/>';
+				}
 				$continue = false;
 				if ($pointer !== null) {
 					$pointer -= strlen($cmdstrsrc);
@@ -2687,7 +2771,9 @@ 
 			if ($paramspos === false) {
 				$cmdstrsrc = substr($cmdstrsrc, strlen($func));
 				$params = array();
-				if ($this->debug) echo 'MODIFIER ('.$func.') CALLED WITH NO PARAMS<br/>';
+				if ($this->debug) {
+					echo 'MODIFIER ('.$func.') CALLED WITH NO PARAMS<br/>';
+				}
 			} else {
 				$paramstr = substr($cmdstr, $paramspos+1);
 				if (substr($paramstr, -1, 1) === $paramsep) {
@@ -2697,18 +2783,28 @@ 
 				$ptr = 0;
 				$params = array();
 				while ($ptr < strlen($paramstr)) {
-					if ($this->debug) echo 'MODIFIER ('.$func.') START PARAM PARSING WITH POINTER AT '.$ptr.'<br/>';
-					if ($this->debug) echo $paramstr.'--'.$ptr.'--'.strlen($paramstr).'--modifier<br/>';
+					if ($this->debug) {
+						echo 'MODIFIER ('.$func.') START PARAM PARSING WITH POINTER AT '.$ptr.'<br/>';
+					}
+					if ($this->debug) {
+						echo $paramstr.'--'.$ptr.'--'.strlen($paramstr).'--modifier<br/>';
+					}
 					$params = $this->parse($paramstr, $ptr, strlen($paramstr), $params, 'modifier', $ptr);
-					if ($this->debug) echo 'PARAM PARSED, POINTER AT '.$ptr.'<br/>';
+					if ($this->debug) {
+						echo 'PARAM PARSED, POINTER AT '.$ptr.'<br/>';
+					}
 
 					if ($ptr >= strlen($paramstr)) {
-						if ($this->debug) echo 'PARAM PARSING ENDED, PARAM STRING CONSUMED<br/>';
+						if ($this->debug) {
+							echo 'PARAM PARSING ENDED, PARAM STRING CONSUMED<br/>';
+						}
 						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.'<br/>';
+						if ($this->debug) {
+							echo 'PARAM PARSING ENDED, " ", "|", RIGHT DELIMITER or ";" FOUND, POINTER AT '.$ptr.'<br/>';
+						}
 						if ($paramstr[$ptr] !== '|') {
 							$continue = false;
 							if ($pointer !== null) {
@@ -2769,8 +2865,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);
@@ -2812,8 +2909,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) {
@@ -2904,8 +3002,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) {

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

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if (!defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 
 require "dwoo/dwooAutoload.php";
 

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

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if (!defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 
 // The name of the directory where templates are located.
 $config['template_dir'] = dirname(FCPATH) . '/../application/views/';

lib/Dwoo/Adapters/ZendFramework/View.php

Braces +4 added lines, -8 removed lines

@@ -248,8 +248,7 @@ 
 		//
 		elseif (is_subclass_of($engine, 'Dwoo') || 'Dwoo' === $engine) {
 			$this->_engine = new $engine();
-		}
-		else {
+		} else {
 			throw new Dwoo_Exception("Custom engine must be a subclass of Dwoo");
 		}
 	}
@@ -277,11 +276,9 @@ 
 	{
 		if ($data instanceof Dwoo_IDataProvider) {
 			$this->_dataProvider = $data;
-		}
-		elseif (is_subclass_of($data, 'Dwoo_Data') || 'Dwoo_Data' == $data) {
+		} elseif (is_subclass_of($data, 'Dwoo_Data') || 'Dwoo_Data' == $data) {
 			$this->_dataProvider = new $data();
-		}
-		else {
+		} else {
 			throw new Dwoo_Exception("Custom data provider must be a subclass of Dwoo_Data or instance of Dwoo_IDataProvider");
 		}
 	}
@@ -320,8 +317,7 @@ 
 		// if param given as a string
 		elseif (is_subclass_of($compiler, 'Dwoo_Compiler') || 'Dwoo_Compiler' == $compiler) {
 			$this->_compiler = new $compiler;
-		}
-		else {
+		} else {
 			throw new Dwoo_Exception("Custom compiler must be a subclass of Dwoo_Compiler or instance of Dwoo_ICompiler");
 		}
 	}

lib/Dwoo/Data.php

Braces +6 added lines, -4 removed lines

@@ -45,8 +45,9 @@ 
 		if ($name === null) {
 			$this->data = array();
 		} elseif (is_array($name)) {
-			foreach ($name as $index)
-				unset($this->data[$index]);
+			foreach ($name as $index) {
+							unset($this->data[$index]);
+			}
 		} else {
 			unset($this->data[$name]);
 		}
@@ -90,8 +91,9 @@ 
 	{
 		if (is_array($name)) {
 			reset($name);
-			while (list($k,$v) = each($name))
-				$this->data[$k] = $v;
+			while (list($k,$v) = each($name)) {
+							$this->data[$k] = $v;
+			}
 		} else {
 			$this->data[$name] = $val;
 		}

lib/plugins/builtin/blocks/strip.php

Switch Indentation +5 added lines, -5 removed lines

@@ -35,12 +35,12 @@
 
 		$mode = trim($params['mode'], '"\'');
 		switch ($mode) {
-			case 'js':
-			case 'javascript':
-				$content = preg_replace('#(?<!:)//\s[^\r\n]*|/\*.*?\*/#s','', $content);
+		case 'js':
+		case 'javascript':
+			$content = preg_replace('#(?<!:)//\s[^\r\n]*|/\*.*?\*/#s','', $content);
 
-			case 'default':
-			default:
+		case 'default':
+		default:
 		}
 
 		$content = preg_replace(array("/\n/","/\r/",'/(<\?(?:php)?|<%)\s*/'), array('','','$1 '), preg_replace('#^\s*(.+?)\s*$#m', '$1', $content));