dwoo-project / dwoo

lib/plugins/builtin/blocks/loop.php

Spacing +17 added lines, -17 removed lines

@@ -40,16 +40,16 @@ 
  */
 class Dwoo_Plugin_loop extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block, Dwoo_IElseable
 {
-	public static $cnt=0;
+	public static $cnt = 0;
 
-	public function init($from, $name='default')
+	public function init($from, $name = 'default')
 	{
 	}
 
 	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 = & $compiler->getCurrentBlock();
 		$currentBlock['params']['tplPointer'] = $compiler->getPointer();
 
 		return '';
@@ -83,17 +83,17 @@ 
 		$cnt = self::$cnt++;
 
 		// builds pre processing output
-		$pre = Dwoo_Compiler::PHP_OPEN . "\n".'$_loop'.$cnt.'_data = '.$src.';';
+		$pre = Dwoo_Compiler::PHP_OPEN."\n".'$_loop'.$cnt.'_data = '.$src.';';
 		// 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),';
-			$pre.="\n);\n".'$_loop'.$cnt.'_glob =& $this->globals["loop"]['.$name.'];';
+			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
 		$pre .= "\n".'if ($this->isTraversable($_loop'.$cnt.'_data'.(isset($params['hasElse']) ? ', true' : '').') == true)'."\n{";
@@ -106,23 +106,23 @@ 
 		if ($usesLast) {
 			$pre .= "\n\t\t".'$_loop'.$cnt.'_glob["last"] = (string) ($_loop'.$cnt.'_glob["iteration"] === $_loop'.$cnt.'_glob["total"]);';
 		}
-		$pre .= "\n\t\t".'$_loop'.$cnt.'_scope = $this->setScope(array("-loop-"));' . "\n/* -- loop start output */\n".Dwoo_Compiler::PHP_CLOSE;
+		$pre .= "\n\t\t".'$_loop'.$cnt.'_scope = $this->setScope(array("-loop-"));'."\n/* -- loop start output */\n".Dwoo_Compiler::PHP_CLOSE;
 
 		// build post processing output and cache it
-		$post = Dwoo_Compiler::PHP_OPEN . "\n".'/* -- loop end output */'."\n\t\t".'$this->setScope($_loop'.$cnt.'_scope, true);';
+		$post = Dwoo_Compiler::PHP_OPEN."\n".'/* -- loop end output */'."\n\t\t".'$this->setScope($_loop'.$cnt.'_scope, true);';
 		// update properties
 		if ($usesIndex) {
-			$post.="\n\t\t".'$_loop'.$cnt.'_glob["index"]+=1;';
+			$post .= "\n\t\t".'$_loop'.$cnt.'_glob["index"]+=1;';
 		}
 		if ($usesIteration) {
-			$post.="\n\t\t".'$_loop'.$cnt.'_glob["iteration"]+=1;';
+			$post .= "\n\t\t".'$_loop'.$cnt.'_glob["iteration"]+=1;';
 		}
 		// end loop
-		$post .= "\n\t}\n}\n" . Dwoo_Compiler::PHP_CLOSE;
+		$post .= "\n\t}\n}\n".Dwoo_Compiler::PHP_CLOSE;
 		if (isset($params['hasElse'])) {
 			$post .= $params['hasElse'];
 		}
 
-		return $pre . $content . $post;
+		return $pre.$content.$post;
 	}
 }

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/blocks/withelse.php

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
 
 	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
 	{
-		$with =& $compiler->findBlock('with', true);
+		$with = & $compiler->findBlock('with', true);
 
 		$params['initialized'] = true;
 		$compiler->injectBlock($type, $params);
@@ -36,8 +36,8 @@ 
 			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 '';
 	}
 }

lib/plugins/builtin/helper.array.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
  * @date       2008-10-23
  * @package    Dwoo
  */
-function Dwoo_Plugin_array_compile(Dwoo_Compiler $compiler, array $rest=array())
+function Dwoo_Plugin_array_compile(Dwoo_Compiler $compiler, array $rest = array())
 {
 	$out = array();
 	foreach ($rest as $key => $value) {

lib/plugins/builtin/processors/pre.smarty_compat.php

Spacing +4 added lines, -6 removed lines

@@ -21,14 +21,13 @@ 
 	{
 		list($l, $r) = $this->compiler->getDelimiters();
 
-		$rl = preg_quote($l,'/');
-		$rr = preg_quote($r,'/');
+		$rl = preg_quote($l, '/');
+		$rr = preg_quote($r, '/');
 		$sectionParam = '(?:(name|loop|start|step|max|show)\s*=\s*(\S+))?\s*';
 		$input = preg_replace_callback('/'.$rl.'\s*section '.str_repeat($sectionParam, 6).'\s*'.$rr.'(.+?)(?:'.$rl.'\s*sectionelse\s*'.$rr.'(.+?))?'.$rl.'\s*\/section\s*'.$rr.'/is', array($this, 'convertSection'), $input);
 		$input = str_replace('$smarty.section.', '$smarty.for.', $input);
 
-		$smarty = array
-		(
+		$smarty = array(
 			'/'.$rl.'\s*ldelim\s*'.$rr.'/',
 			'/'.$rl.'\s*rdelim\s*'.$rr.'/',
 			'/'.$rl.'\s*\$smarty\.ldelim\s*'.$rr.'/',
@@ -40,8 +39,7 @@ 
 			'/'.$rl.'\s*sectionelse\s*'.$rr.'/',
 		);
 
-		$dwoo = array
-		(
+		$dwoo = array(
 			'\\'.$l,
 			$r,
 			'\\'.$l,

lib/plugins/builtin/functions/date_format.php

Spacing +4 added lines, -4 removed lines

@@ -18,16 +18,16 @@ 
  * @date       2008-12-24
  * @package    Dwoo
  */
-function Dwoo_Plugin_date_format(Dwoo_Core $dwoo, $value, $format='%b %e, %Y', $default=null)
+function Dwoo_Plugin_date_format(Dwoo_Core $dwoo, $value, $format = '%b %e, %Y', $default = null)
 {
 	if (!empty($value)) {
 		// convert if it's not a valid unix timestamp
-		if (preg_match('#^-?\d{1,10}$#', $value)===0) {
+		if (preg_match('#^-?\d{1,10}$#', $value) === 0) {
 			$value = strtotime($value);
 		}
 	} elseif (!empty($default)) {
 		// convert if it's not a valid unix timestamp
-		if (preg_match('#^-?\d{1,10}$#', $default)===0) {
+		if (preg_match('#^-?\d{1,10}$#', $default) === 0) {
 			$value = strtotime($default);
 		} else {
 			$value = $default;
@@ -38,7 +38,7 @@ 
 
 	// Credits for that windows compat block to Monte Ohrt who made smarty's date_format plugin
 	if (DIRECTORY_SEPARATOR == '\\') {
-		$_win_from = array('%D',       '%h', '%n', '%r',          '%R',    '%t', '%T');
+		$_win_from = array('%D', '%h', '%n', '%r', '%R', '%t', '%T');
 		$_win_to   = array('%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S');
 		if (strpos($format, '%e') !== false) {
 			$_win_from[] = '%e';

lib/plugins/builtin/functions/dump.php

Spacing +11 added lines, -11 removed lines

@@ -52,7 +52,7 @@ 
 
 		$out .= $this->export($var, $scope);
 
-		return $out .'</div></div>';
+		return $out.'</div></div>';
 	}
 
 	protected function export($var, $scope)
@@ -60,8 +60,8 @@ 
 		$out = '';
 		foreach ($var as $i=>$v) {
 			if (is_array($v) || (is_object($v) && $v instanceof Iterator)) {
-				$out .= $i.' ('.(is_array($v) ? 'array':'object: '.get_class($v)).')';
-				if ($v===$scope) {
+				$out .= $i.' ('.(is_array($v) ? 'array' : 'object: '.get_class($v)).')';
+				if ($v === $scope) {
 					$out .= ' (current scope):<div style="background:#ccc;padding-left:20px;">'.$this->export($v, $scope).'</div>';
 				} else {
 					$out .= ':<div style="padding-left:20px;">'.$this->export($v, $scope).'</div>';
@@ -91,14 +91,14 @@ 
 	protected function exportObj($i, $obj)
 	{
 		if (array_search($obj, $this->outputObjects, true) !== false) {
-			return $i . ' [recursion, skipped]<br />';
+			return $i.' [recursion, skipped]<br />';
 		}
 
 		$this->outputObjects[] = $obj;
 
 		$list = (array) $obj;
 
-		$protectedLength = strlen(get_class($obj)) + 2;
+		$protectedLength = strlen(get_class($obj))+2;
 
 		$out = array();
 
@@ -116,17 +116,17 @@ 
 
 				$params = array();
 				foreach ($method->getParameters() as $param) {
-					$params[] = ($param->isPassedByReference() ? '&':'') . '$'.$param->getName() . ($param->isOptional() ? ' = '.var_export($param->getDefaultValue(), true) : '');
+					$params[] = ($param->isPassedByReference() ? '&' : '').'$'.$param->getName().($param->isOptional() ? ' = '.var_export($param->getDefaultValue(), true) : '');
 				}
 
-				$out['method'] .= '(method) ' . $method->getName() .'('.implode(', ', $params).')<br />';
+				$out['method'] .= '(method) '.$method->getName().'('.implode(', ', $params).')<br />';
 			}
 		}
 
 		foreach ($list as $attributeName => $attributeValue) {
-			if(property_exists($obj, $attributeName)) {
+			if (property_exists($obj, $attributeName)) {
 				$key = 'public';
-			} elseif(substr($attributeName, 0, 3) === "\0*\0") {
+			} elseif (substr($attributeName, 0, 3) === "\0*\0") {
 				$key = 'protected';
 				$attributeName = substr($attributeName, 3);
 			} else {
@@ -150,7 +150,7 @@ 
 			}
 		}
 
-		$return = $i . '<br /><div style="padding-left:20px;">';
+		$return = $i.'<br /><div style="padding-left:20px;">';
 
 		if (!empty($out['method'])) {
 			$return .= $out['method'];
@@ -168,6 +168,6 @@ 
 			$return .= $out['private'];
 		}
 
-		return $return . '</div>';
+		return $return.'</div>';
 	}
 }
\ No newline at end of file

lib/plugins/builtin/functions/spacify.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
  * @date       2008-10-23
  * @package    Dwoo
  */
-function Dwoo_Plugin_spacify_compile(Dwoo_Compiler $compiler, $value, $space_char=' ')
+function Dwoo_Plugin_spacify_compile(Dwoo_Compiler $compiler, $value, $space_char = ' ')
 {
 	return 'implode('.$space_char.', str_split('.$value.', 1))';
 }

lib/plugins/builtin/functions/escape.php

Spacing +7 added lines, -7 removed lines

@@ -18,13 +18,13 @@ 
  * @date       2008-10-23
  * @package    Dwoo
  */
-function Dwoo_Plugin_escape(Dwoo_Core $dwoo, $value='', $format='html', $charset=null)
+function Dwoo_Plugin_escape(Dwoo_Core $dwoo, $value = '', $format = 'html', $charset = null)
 {
 	if ($charset === null) {
 		$charset = $dwoo->getCharset();
 	}
 
-	switch($format)
+	switch ($format)
 	{
 
 	case 'html':
@@ -40,18 +40,18 @@ 
 	case 'hex':
 		$out = '';
 		$cnt = strlen((string) $value);
-		for ($i=0; $i < $cnt; $i++) {
-			$out .= '%' . bin2hex((string) $value[$i]);
+		for ($i = 0; $i < $cnt; $i++) {
+			$out .= '%'.bin2hex((string) $value[$i]);
 		}
 		return $out;
 	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','</'=>'<\/'));
+		return strtr((string) $value, array('\\'=>'\\\\', "'"=>"\\'", '"'=>'\\"', "\r"=>'\\r', "\n"=>'\\n', '</'=>'<\/'));
 	case 'mail':
 		return str_replace(array('@', '.'), array('&nbsp;(AT)&nbsp;', '&nbsp;(DOT)&nbsp;'), (string) $value);
 	default:

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/plugins/builtin/functions/counter.php

Spacing +8 added lines, -9 removed lines

@@ -29,13 +29,12 @@ 
 	{
 		// init counter
 		if (!isset($this->counters[$name])) {
-			$this->counters[$name] = array
-			(
-				'count'		=>	$start===null ? 1 : (int) $start,
-				'skip'		=>	$skip===null ? 1 : (int) $skip,
-				'print'		=>	$print===null ? true : (bool) $print,
-				'assign'	=>	$assign===null ? null : (string) $assign,
-				'direction'	=>	strtolower($direction)==='down' ? -1 : 1,
+			$this->counters[$name] = array(
+				'count'		=>	$start === null ? 1 : (int) $start,
+				'skip'		=>	$skip === null ? 1 : (int) $skip,
+				'print'		=>	$print === null ? true : (bool) $print,
+				'assign'	=>	$assign === null ? null : (string) $assign,
+				'direction'	=>	strtolower($direction) === 'down' ? -1 : 1,
 			);
 		}
 		// increment
@@ -47,7 +46,7 @@ 
 			}
 
 			if ($direction !== null) {
-				$this->counters[$name]['direction'] = strtolower($direction)==='down' ? -1 : 1;
+				$this->counters[$name]['direction'] = strtolower($direction) === 'down' ? -1 : 1;
 			}
 
 			if ($print !== null) {
@@ -61,7 +60,7 @@ 
 			if ($start !== null) {
 				$this->counters[$name]['count'] = (int) $start;
 			} else {
-				$this->counters[$name]['count'] += ($this->counters[$name]['skip'] * $this->counters[$name]['direction']);
+				$this->counters[$name]['count'] += ($this->counters[$name]['skip']*$this->counters[$name]['direction']);
 			}
 		}