dwoo-project / dwoo

lib/plugins/builtin/functions/math.php

Spacing +14 added lines, -16 removed lines

@@ -28,13 +28,12 @@ 
  * @date       2008-10-23
  * @package    Dwoo
  */
-function Dwoo_Plugin_math_compile(Dwoo_Compiler $compiler, $equation, $format='', $assign='', array $rest=array())
+function Dwoo_Plugin_math_compile(Dwoo_Compiler $compiler, $equation, $format = '', $assign = '', array $rest = array())
 {
 	/**
 	 * Holds the allowed function, characters, operators and constants
 	 */
-	$allowed = array
-	(
+	$allowed = array(
 		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
 		'+', '-', '/', '*', '.', ' ', '<<', '>>', '%', '&', '^', '|', '~',
 		'abs(', 'ceil(', 'floor(', 'exp(', 'log10(',
@@ -45,8 +44,7 @@ 
 	/**
 	 * Holds the functions that can accept multiple arguments
 	 */
-	$funcs = array
-	(
+	$funcs = array(
  		'round(', 'log(', 'pow(',
 		'max(', 'min(', 'rand(',
  	);
@@ -64,12 +62,12 @@ 
 		$substr = substr($equation, 0, $ptr);
 		if (array_search($substr, $allowed) !== false) {
 			// allowed string
-			$out.=$substr;
+			$out .= $substr;
 			$equation = substr($equation, $ptr);
 			$ptr = 0;
 		} elseif (array_search($substr, $funcs) !== false) {
 			// allowed func
-			$out.=$substr;
+			$out .= $substr;
 			$equation = substr($equation, $ptr);
 			$ptr = 0;
 			$allowcomma++;
@@ -78,7 +76,7 @@ 
 			}
 		} elseif (isset($rest[$substr])) {
 			// variable
-			$out.=$rest[$substr];
+			$out .= $rest[$substr];
 			$equation = substr($equation, $ptr);
 			$ptr = 0;
 		} elseif ($substr === $open) {
@@ -87,28 +85,28 @@ 
 			if (empty($m)) {
 				preg_match('#.*?'.str_replace('.', '\\.', $close).'#', substr($equation, 2), $m);
 			}
-			$out.=substr($m[0], 0, -2);
+			$out .= substr($m[0], 0, -2);
 			$equation = substr($equation, strlen($m[0])+2);
 			$ptr = 0;
-		} elseif ($substr==='(') {
+		} elseif ($substr === '(') {
 			// opening parenthesis
-			if ($allowcomma>0) {
+			if ($allowcomma > 0) {
 				$allowcomma++;
 			}
 
-			$out.=$substr;
+			$out .= $substr;
 			$equation = substr($equation, $ptr);
 			$ptr = 0;
-		} elseif ($substr===')') {
+		} elseif ($substr === ')') {
 			// closing parenthesis
-			if ($allowcomma>0) {
+			if ($allowcomma > 0) {
 				$allowcomma--;
-				if ($allowcomma===0) {
+				if ($allowcomma === 0) {
 					array_pop($allowed);
 				}
 			}
 
-			$out.=$substr;
+			$out .= $substr;
 			$equation = substr($equation, $ptr);
 			$ptr = 0;
 		} elseif ($ptr >= strlen($equation)) {

lib/plugins/builtin/functions/extends.php

Spacing +5 added lines, -5 removed lines

@@ -27,8 +27,8 @@ 
 	public static function compile(Dwoo_Compiler $compiler, $file)
 	{
 		list($l, $r) = $compiler->getDelimiters();
-		self::$l = preg_quote($l,'/');
-		self::$r = preg_quote($r,'/');
+		self::$l = preg_quote($l, '/');
+		self::$r = preg_quote($r, '/');
 		self::$regex = '/
 			'.self::$l.'block\s(["\']?)(.+?)\1'.self::$r.'(?:\r?\n?)
 			((?:
@@ -49,7 +49,7 @@ 
 			self::$r = '\s*'.self::$r;
 		}
 		$inheritanceTree = array(array('source'=>$compiler->getTemplateSource()));
-		$curPath = dirname($compiler->getDwoo()->getTemplate()->getResourceIdentifier()) . DIRECTORY_SEPARATOR;
+		$curPath = dirname($compiler->getDwoo()->getTemplate()->getResourceIdentifier()).DIRECTORY_SEPARATOR;
 		$curTpl = $compiler->getDwoo()->getTemplate();
 
 		while (!empty($file)) {
@@ -90,7 +90,7 @@ 
 			$inheritanceTree[] = $newParent;
 
 			if (preg_match('/^'.self::$l.'extends(?:\(?\s*|\s+)(?:file=)?\s*((["\']).+?\2|\S+?)\s*\)?\s*?'.self::$r.'/i', $parent->getSource(), $match)) {
-				$curPath = dirname($identifier) . DIRECTORY_SEPARATOR;
+				$curPath = dirname($identifier).DIRECTORY_SEPARATOR;
 				if (isset($match[2]) && $match[2] == '"') {
 					$file = '"'.str_replace('"', '\\"', substr($match[1], 1, -1)).'"';
 				} elseif (isset($match[2]) && $match[2] == "'") {
@@ -140,7 +140,7 @@ 
 		}
 
 		if (preg_match(self::$regex, $matches[3])) {
-			return preg_replace_callback(self::$regex, array('Dwoo_Plugin_extends', 'replaceBlock'), $matches[3] );
+			return preg_replace_callback(self::$regex, array('Dwoo_Plugin_extends', 'replaceBlock'), $matches[3]);
 		}
 
 		if (self::$lastReplacement) {

lib/plugins/builtin/functions/replace.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
  */
 function Dwoo_Plugin_replace_compile(Dwoo_Compiler $compiler, $value, $search, $replace, $case_sensitive = true)
 {
-	if ($case_sensitive == 'false' || (bool)$case_sensitive === false) {
+	if ($case_sensitive == 'false' || (bool) $case_sensitive === false) {
 		return 'str_ireplace('.$search.', '.$replace.', '.$value.')';
 	} else {
 		return 'str_replace('.$search.', '.$replace.', '.$value.')';

lib/plugins/builtin/functions/strip_tags.php

Spacing +2 added lines, -2 removed lines

@@ -17,9 +17,9 @@
  * @date       2008-10-23
  * @package    Dwoo
  */
-function Dwoo_Plugin_strip_tags_compile(Dwoo_Compiler $compiler, $value, $addspace=true)
+function Dwoo_Plugin_strip_tags_compile(Dwoo_Compiler $compiler, $value, $addspace = true)
 {
-	if ($addspace==='true') {
+	if ($addspace === 'true') {
 		return "preg_replace('#<[^>]*>#', ' ', $value)";
 	} else {
 		return "strip_tags($value)";

lib/plugins/builtin/functions/mailto.php

Spacing +7 added lines, -7 removed lines

@@ -24,7 +24,7 @@ 
  * @date       2009-07-18
  * @package    Dwoo
  */
-function Dwoo_Plugin_mailto(Dwoo_Core $dwoo, $address, $text=null, $subject=null, $encode=null, $cc=null, $bcc=null, $newsgroups=null, $followupto=null, $extra=null)
+function Dwoo_Plugin_mailto(Dwoo_Core $dwoo, $address, $text = null, $subject = null, $encode = null, $cc = null, $bcc = null, $newsgroups = null, $followupto = null, $extra = null)
 {
 	if (empty($address)) {
 		return '';
@@ -55,7 +55,7 @@ 
 	$address = rtrim($address, '?&');
 
 	// output
-	switch($encode)
+	switch ($encode)
 	{
 
 	case 'none':
@@ -68,7 +68,7 @@ 
 		$len = strlen($str);
 
 		$out = '';
-		for ($i=0; $i<$len; $i++) {
+		for ($i = 0; $i < $len; $i++) {
 			$out .= '%'.bin2hex($str[$i]);
 		}
 		return '<script type="text/javascript">eval(unescape(\''.$out.'\'));</script>';
@@ -82,10 +82,10 @@ 
 		$len = strlen($str);
 
 		$out = '<script type="text/javascript">'."\n<!--\ndocument.write(String.fromCharCode(";
-		for ($i=0; $i<$len; $i++) {
+		for ($i = 0; $i < $len; $i++) {
 			$out .= ord($str[$i]).',';
 		}
-		return rtrim($out, ',') . "));\n-->\n</script>\n";
+		return rtrim($out, ',')."));\n-->\n</script>\n";
 
 		break;
 
@@ -96,7 +96,7 @@ 
 
 		$out = '<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;';
 		$len = strlen($address);
-		for ($i=0; $i<$len; $i++) {
+		for ($i = 0; $i < $len; $i++) {
 			if (preg_match('#\w#', $address[$i])) {
 				$out .= '%'.bin2hex($address[$i]);
 			} else {
@@ -105,7 +105,7 @@ 
 		}
 		$out .= '" '.$extra.'>';
 		$len = strlen($text);
-		for ($i=0; $i<$len; $i++) {
+		for ($i = 0; $i < $len; $i++) {
 			$out .= '&#x'.bin2hex($text[$i]);
 		}
 		return $out.'</a>';

lib/plugins/builtin/functions/indent.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
  * @date       2008-10-23
  * @package    Dwoo
  */
-function Dwoo_Plugin_indent_compile(Dwoo_Compiler $compiler, $value, $by=4, $char=' ')
+function Dwoo_Plugin_indent_compile(Dwoo_Compiler $compiler, $value, $by = 4, $char = ' ')
 {
 	return "preg_replace('#^#m', '".str_repeat(substr($char, 1, -1), trim($by, '"\''))."', $value)";
 }

lib/Dwoo/Core.php

Spacing +65 added lines, -69 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (!defined('DWOO_DIRECTORY')) {
-	define('DWOO_DIRECTORY', dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR);
+	define('DWOO_DIRECTORY', dirname(dirname(__FILE__)).DIRECTORY_SEPARATOR);
 }
 /**
  * main dwoo class, allows communication between the compiler, template and data classes
@@ -162,15 +162,12 @@ 
      *
      * @var array
      */
-    protected $resources = array
-    (
-        'file'      =>  array
-        (
+    protected $resources = array(
+        'file'      =>  array(
             'class'     =>  'Dwoo_Template_File',
             'compiler'  =>  null
         ),
-        'string'    =>  array
-        (
+        'string'    =>  array(
             'class'     =>  'Dwoo_Template_String',
             'compiler'  =>  null
         )
@@ -437,8 +434,7 @@ 
      */
     protected function initGlobals()
     {
-        $this->globals = array
-        (
+        $this->globals = array(
             'version'   =>  self::VERSION,
             'ad'        =>  '<a href="http://dwoo.org/">Powered by Dwoo</a>',
             'now'       =>  $_SERVER['REQUEST_TIME'],
@@ -457,7 +453,7 @@ 
     protected function initRuntimeVars(Dwoo_ITemplate $tpl)
     {
         $this->runtimePlugins = array();
-        $this->scope =& $this->data;
+        $this->scope = & $this->data;
         $this->scopeTree = array();
         $this->stack = array();
         $this->curBlock = null;
@@ -487,7 +483,7 @@ 
             } else {
                 $this->plugins[$name] = array('type'=>self::CLASS_PLUGIN | $compilable, 'callback'=>$callback, 'class'=>(is_object($callback[0]) ? get_class($callback[0]) : $callback[0]), 'function'=>$callback[1]);
             }
-        } elseif(is_string($callback)) {
+        } elseif (is_string($callback)) {
 			if (class_exists($callback)) {
 				if (is_subclass_of($callback, 'Dwoo_Block_Plugin')) {
 					$this->plugins[$name] = array('type'=>self::BLOCK_PLUGIN | $compilable, 'callback'=>$callback, 'class'=>$callback);
@@ -499,7 +495,7 @@ 
 			} else {
 				throw new Dwoo_Exception('Callback could not be processed correctly, please check that the function/class you used exists');
 			}
-		} elseif($callback instanceof \Closure) {
+		} elseif ($callback instanceof \Closure) {
 			$this->plugins[$name] = array('type'=>self::FUNC_PLUGIN | $compilable, 'callback'=>$callback);
 		} else {
             throw new Dwoo_Exception('Callback could not be processed correctly, please check that the function/class you used exists');
@@ -566,8 +562,8 @@ 
             unset($this->filters[$index]);
         } elseif (($index = array_search($callback, $this->filters, true)) !== false) {
             unset($this->filters[$index]);
-        } else  {
-            $class = 'Dwoo_Filter_' . $callback;
+        } else {
+            $class = 'Dwoo_Filter_'.$callback;
             foreach ($this->filters as $index=>$filter) {
                 if (is_array($filter) && $filter[0] instanceof $class) {
                     unset($this->filters[$index]);
@@ -610,7 +606,7 @@ 
     public function removeResource($name)
     {
         unset($this->resources[$name]);
-        if ($name==='file') {
+        if ($name === 'file') {
             $this->resources['file'] = array('class'=>'Dwoo_Template_File', 'compiler'=>null);
         }
     }
@@ -862,7 +858,7 @@ 
 			new \RecursiveDirectoryIterator($this->getCompileDir()),
 			\RecursiveIteratorIterator::SELF_FIRST
 		);
-		$count    = 0;
+		$count = 0;
 		/** @var \SplFileInfo $file */
 		foreach ($iterator as $file) {
 			if ($file->isFile()) {
@@ -878,13 +874,13 @@ 
      * @param int $olderThan minimum time (in seconds) required for a cached template to be cleared
      * @return int the amount of templates cleared
      */
-    public function clearCache($olderThan=-1)
+    public function clearCache($olderThan = -1)
     {
 		$iterator = new \RecursiveIteratorIterator(
 			new \RecursiveDirectoryIterator($this->getCacheDir()),
 			\RecursiveIteratorIterator::SELF_FIRST
 		);
-        $expired = time() - $olderThan;
+        $expired = time()-$olderThan;
         $count = 0;
 		/** @var \SplFileInfo $file */
         foreach ($iterator as $file) {
@@ -924,7 +920,7 @@ 
      *                              and return true only if it's not empty
      * @return int|bool true if it's an array|arrayaccess (or the item count if $checkIsEmpty is true) or false if it's not an array|arrayaccess (or 0 if $checkIsEmpty is true)
      */
-    public function isArray($value, $checkIsEmpty=false)
+    public function isArray($value, $checkIsEmpty = false)
     {
         if (is_array($value) === true || $value instanceof ArrayAccess) {
             if ($checkIsEmpty === false) {
@@ -943,7 +939,7 @@ 
      *                              and return true only if it's not empty
      * @return int|bool true if it's an array|traversable (or the item count if $checkIsEmpty is true) or false if it's not an array|traversable (or 0 if $checkIsEmpty is true)
      */
-    public function isTraversable($value, $checkIsEmpty=false)
+    public function isTraversable($value, $checkIsEmpty = false)
     {
         if (is_array($value) === true) {
             if ($checkIsEmpty === false) {
@@ -993,7 +989,7 @@ 
      * @param string $message the error message
      * @param int $level the error level, one of the PHP's E_* constants
      */
-    public function triggerError($message, $level=E_USER_NOTICE)
+    public function triggerError($message, $level = E_USER_NOTICE)
     {
         if (!($tplIdentifier = $this->template->getResourceIdentifier())) {
             $tplIdentifier = $this->template->getResourceName();
@@ -1012,7 +1008,7 @@ 
      * @param array $args the arguments to be passed to the block's init() function
      * @return Dwoo_Block_Plugin the newly created block
      */
-    public function addStack($blockName, array $args=array())
+    public function addStack($blockName, array $args = array())
     {
         if (isset($this->plugins[$blockName])) {
             $class = $this->plugins[$blockName]['class'];
@@ -1031,18 +1027,18 @@ 
         $block = new $class($this);
 
         $cnt = count($args);
-        if ($cnt===0) {
+        if ($cnt === 0) {
             $block->init();
-        } elseif ($cnt===1) {
+        } elseif ($cnt === 1) {
             $block->init($args[0]);
-        } elseif ($cnt===2) {
+        } elseif ($cnt === 2) {
             $block->init($args[0], $args[1]);
-        } elseif ($cnt===3) {
+        } elseif ($cnt === 3) {
             $block->init($args[0], $args[1], $args[2]);
-        } elseif ($cnt===4) {
+        } elseif ($cnt === 4) {
             $block->init($args[0], $args[1], $args[2], $args[3]);
         } else {
-            call_user_func_array(array($block,'init'), $args);
+            call_user_func_array(array($block, 'init'), $args);
         }
 
         $this->stack[] = $this->curBlock = $block;
@@ -1063,15 +1059,15 @@ 
         ob_clean();
 
         $cnt = count($args);
-        if ($cnt===0) {
+        if ($cnt === 0) {
             $this->curBlock->end();
-        } elseif ($cnt===1) {
+        } elseif ($cnt === 1) {
             $this->curBlock->end($args[0]);
-        } elseif ($cnt===2) {
+        } elseif ($cnt === 2) {
             $this->curBlock->end($args[0], $args[1]);
-        } elseif ($cnt===3) {
+        } elseif ($cnt === 3) {
             $this->curBlock->end($args[0], $args[1], $args[2]);
-        } elseif ($cnt===4) {
+        } elseif ($cnt === 4) {
             $this->curBlock->end($args[0], $args[1], $args[2], $args[3]);
         } else {
             call_user_func_array(array($this->curBlock, 'end'), $args);
@@ -1083,7 +1079,7 @@ 
             $this->curBlock = end($this->stack);
             $this->curBlock->buffer($tmp->process());
         } else {
-            if($this->buffer !== '') {
+            if ($this->buffer !== '') {
                 echo $this->buffer;
                 $this->buffer = '';
             }
@@ -1164,15 +1160,15 @@ 
         $plugin = $this->getObjectPlugin($class);
 
         $cnt = count($params);
-        if ($cnt===0) {
+        if ($cnt === 0) {
             return $plugin->process();
-        } elseif ($cnt===1) {
+        } elseif ($cnt === 1) {
             return $plugin->process($params[0]);
-        } elseif ($cnt===2) {
+        } elseif ($cnt === 2) {
             return $plugin->process($params[0], $params[1]);
-        } elseif ($cnt===3) {
+        } elseif ($cnt === 3) {
             return $plugin->process($params[0], $params[1], $params[2]);
-        } elseif ($cnt===4) {
+        } elseif ($cnt === 4) {
             return $plugin->process($params[0], $params[1], $params[2], $params[3]);
         } else {
             return call_user_func_array(array($plugin, 'process'), $params);
@@ -1208,23 +1204,23 @@ 
 
                 if (is_string($callback) === false) {
                     while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array(1=>$items[$i]) + $params);
+                        $out[] = call_user_func_array($callback, array(1=>$items[$i])+$params);
                     }
-                } elseif ($cnt===1) {
+                } elseif ($cnt === 1) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($this, $items[$i]);
                     }
-                } elseif ($cnt===2) {
+                } elseif ($cnt === 2) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($this, $items[$i], $params[2]);
                     }
-                } elseif ($cnt===3) {
+                } elseif ($cnt === 3) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($this, $items[$i], $params[2], $params[3]);
                     }
                 } else {
                     while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array(1=>$items[$i]) + $params);
+                        $out[] = call_user_func_array($callback, array(1=>$items[$i])+$params);
                     }
                 }
             } else {
@@ -1233,27 +1229,27 @@ 
 
                 if (is_string($callback) === false) {
                     while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array($items[$i]) + $params);
+                        $out[] = call_user_func_array($callback, array($items[$i])+$params);
                     }
-                } elseif ($cnt===1) {
+                } elseif ($cnt === 1) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($items[$i]);
                     }
-                } elseif ($cnt===2) {
+                } elseif ($cnt === 2) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($items[$i], $params[1]);
                     }
-                } elseif ($cnt===3) {
+                } elseif ($cnt === 3) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($items[$i], $params[1], $params[2]);
                     }
-                } elseif ($cnt===4) {
+                } elseif ($cnt === 4) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($items[$i], $params[1], $params[2], $params[3]);
                     }
                 } else {
                     while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array($items[$i]) + $params);
+                        $out[] = call_user_func_array($callback, array($items[$i])+$params);
                     }
                 }
             }
@@ -1318,7 +1314,7 @@ 
         $tree = $this->scopeTree;
         $cur = $this->data;
 
-        while ($parentLevels--!==0) {
+        while ($parentLevels-- !== 0) {
             array_pop($tree);
         }
 
@@ -1330,7 +1326,7 @@ 
             }
         }
 
-        if ($varstr!==null) {
+        if ($varstr !== null) {
             return $this->readVarInto($varstr, $cur);
         } else {
             return $cur;
@@ -1345,14 +1341,14 @@ 
      */
     public function readVar($varstr)
     {
-        if (is_array($varstr)===true) {
+        if (is_array($varstr) === true) {
             $m = $varstr;
             unset($varstr);
         } else {
             if (strstr($varstr, '.') === false && strstr($varstr, '[') === false && strstr($varstr, '->') === false) {
                 if ($varstr === 'dwoo') {
                     return $this->globals;
-                } elseif ($varstr === '__' || $varstr === '_root' ) {
+                } elseif ($varstr === '__' || $varstr === '_root') {
                     return $this->data;
                 } elseif ($varstr === '_' || $varstr === '_parent') {
                     $varstr = '.'.$varstr;
@@ -1488,8 +1484,8 @@ 
      */
     public function assignInScope($value, $scope)
     {
-        $tree =& $this->scopeTree;
-        $data =& $this->data;
+        $tree = & $this->scopeTree;
+        $data = & $this->data;
 
         if (!is_string($scope)) {
             $this->triggerError('Assignments must be done into strings, ('.gettype($scope).') '.var_export($scope, true).' given', E_USER_ERROR);
@@ -1500,7 +1496,7 @@ 
             // TODO handle _root/_parent scopes ?
             preg_match_all('#(\[|->|\.)?([^.[\]-]+)\]?#i', $scope, $m);
 
-            $cur =& $this->scope;
+            $cur = & $this->scope;
             $last = array(array_pop($m[1]), array_pop($m[2]));
 
             while (list($k, $sep) = each($m[1])) {
@@ -1508,12 +1504,12 @@ 
                     if (is_array($cur) === false) {
                         $cur = array();
                     }
-                    $cur =& $cur[$m[2][$k]];
+                    $cur = & $cur[$m[2][$k]];
                 } elseif ($sep === '->') {
                     if (is_object($cur) === false) {
                         $cur = new stdClass;
                     }
-                    $cur =& $cur->$m[2][$k];
+                    $cur = & $cur->$m[2][$k];
                 } else {
                     return false;
                 }
@@ -1546,31 +1542,31 @@ 
     {
         $old = $this->scopeTree;
 
-        if (is_string($scope)===true) {
+        if (is_string($scope) === true) {
             $scope = explode('.', $scope);
         }
 
-        if ($absolute===true) {
-            $this->scope =& $this->data;
+        if ($absolute === true) {
+            $this->scope = & $this->data;
             $this->scopeTree = array();
         }
 
         while (($bit = array_shift($scope)) !== null) {
             if ($bit === '_' || $bit === '_parent') {
                 array_pop($this->scopeTree);
-                $this->scope =& $this->data;
+                $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->scope = & $this->data;
                 $this->scopeTree = array();
             } elseif (isset($this->scope[$bit])) {
-                if($this->scope instanceof ArrayAccess) {
+                if ($this->scope instanceof ArrayAccess) {
                     $tmp = $this->scope[$bit];
-                    $this->scope =& $tmp;
+                    $this->scope = & $tmp;
                 } else {
-                    $this->scope =& $this->scope[$bit];
+                    $this->scope = & $this->scope[$bit];
                 }
                 $this->scopeTree[] = $bit;
             } else {

lib/Dwoo/Smarty/Adapter.php

Spacing +20 added lines, -25 removed lines

@@ -5,10 +5,10 @@ 
 }
 
 if (!defined('SMARTY_PHP_PASSTHRU')) {
-	define('SMARTY_PHP_PASSTHRU',   0);
-	define('SMARTY_PHP_QUOTE',      1);
-	define('SMARTY_PHP_REMOVE',     2);
-	define('SMARTY_PHP_ALLOW',      3);
+	define('SMARTY_PHP_PASSTHRU', 0);
+	define('SMARTY_PHP_QUOTE', 1);
+	define('SMARTY_PHP_REMOVE', 2);
+	define('SMARTY_PHP_ALLOW', 3);
 }
 
 /**
@@ -32,11 +32,11 @@ 
 	// magic get/set/call functions that handle unsupported features
 	public function __set($p, $v)
 	{
-		if ($p==='scope') {
+		if ($p === 'scope') {
 			$this->scope = $v;
 			return;
 		}
-		if ($p==='data') {
+		if ($p === 'data') {
 			$this->data = $v;
 			return;
 		}
@@ -80,15 +80,12 @@ 
 	}
 
 	// list of unsupported properties and methods
-	protected $compat = array
-	(
-		'methods' => array
-		(
+	protected $compat = array(
+		'methods' => array(
 			'register_resource', 'unregister_resource', 'load_filter', 'clear_compiled_tpl',
 			'clear_config', 'get_config_vars', 'config_load'
 		),
-		'properties' => array
-		(
+		'properties' => array(
 			'cache_handler_func' => null,
 			'debugging' => false,
 			'error_reporting' => null,
@@ -115,11 +112,9 @@ 
 	public $trusted_dir = array();
 	public $secure_dir = array();
 	public $php_handling = SMARTY_PHP_PASSTHRU;
-	public $security_settings = array
-	(
+	public $security_settings = array(
 		'PHP_HANDLING'    => false,
-		'IF_FUNCS'        => array
-		(
+		'IF_FUNCS'        => array(
 			'list', 'empty', 'count', 'sizeof',
 			'in_array', 'is_array',
 		),
@@ -162,12 +157,12 @@ 
 		$this->compiler = new Dwoo_Compiler();
 	}
 
-	public function display($filename, $cacheId=null, $compileId=null)
+	public function display($filename, $cacheId = null, $compileId = null)
 	{
 		$this->fetch($filename, $cacheId, $compileId, true);
 	}
 
-	public function fetch($filename, $cacheId=null, $compileId=null, $display=false)
+	public function fetch($filename, $cacheId = null, $compileId = null, $display = false)
 	{
 		$this->setCacheDir($this->cache_dir);
 		$this->setCompileDir($this->compile_dir);
@@ -180,7 +175,7 @@ 
 			if ($this->security_settings['PHP_TAGS']) {
 				$phpTags = SMARTY_PHP_ALLOW;
 			}
-			switch($phpTags) {
+			switch ($phpTags) {
 				case SMARTY_PHP_ALLOW:
 				case SMARTY_PHP_PASSTHRU:
 					$phpTags = Dwoo_Security_Policy::PHP_ALLOW;
@@ -235,7 +230,7 @@ 
 
 		$this->compiler->setDelimiters($this->left_delimiter, $this->right_delimiter);
 
-		return $this->get($tpl, $this->dataProvider, $this->compiler, $display===true);
+		return $this->get($tpl, $this->dataProvider, $this->compiler, $display === true);
 	}
 
 	public function get($_tpl, $data = array(), $_compiler = null, $_output = false)
@@ -246,7 +241,7 @@ 
 		return parent::get($_tpl, $data, $_compiler, $_output);
 	}
 
-	public function register_function($name, $callback, $cacheable=true, $cache_attrs=null)
+	public function register_function($name, $callback, $cacheable = true, $cache_attrs = null)
 	{
 		if (isset($this->plugins[$name]) && $this->plugins[$name][0] !== self::SMARTY_FUNCTION) {
 			throw new Dwoo_Exception('Multiple plugins of different types can not share the same name');
@@ -259,7 +254,7 @@ 
 		unset($this->plugins[$name]);
 	}
 
-	public function register_block($name, $callback, $cacheable=true, $cache_attrs=null)
+	public function register_block($name, $callback, $cacheable = true, $cache_attrs = null)
 	{
 		if (isset($this->plugins[$name]) && $this->plugins[$name][0] !== self::SMARTY_BLOCK) {
 			throw new Dwoo_Exception('Multiple plugins of different types can not share the same name');
@@ -390,7 +385,7 @@ 
    		return $this->isCached($this->makeTemplate($tpl, $cacheId, $compileId));
    	}
 
-   	public function append_by_ref($var, &$value, $merge=false)
+   	public function append_by_ref($var, &$value, $merge = false)
    	{
    		$this->dataProvider->appendByRef($var, $value, $merge);
    	}
@@ -410,7 +405,7 @@ 
    		$this->dataProvider->clear();
    	}
 
-	public function get_template_vars($name=null)
+	public function get_template_vars($name = null)
 	{
 		if ($this->show_compat_errors) {
 			trigger_error('get_template_vars does not return values by reference, if you try to modify the data that way you should modify your code.', E_USER_NOTICE);
@@ -465,7 +460,7 @@ 
 		return self::$tplCache[$hash];
 	}
 
-	public function triggerError($message, $level=E_USER_NOTICE)
+	public function triggerError($message, $level = E_USER_NOTICE)
 	{
 		if (is_object($this->template)) {
 			return parent::triggerError($message, $level);

lib/Dwoo/Data.php

Spacing +6 added lines, -6 removed lines

@@ -92,7 +92,7 @@ 
 	{
 		if (is_array($name)) {
 			reset($name);
-			while (list($k,$v) = each($name))
+			while (list($k, $v) = each($name))
 				$this->data[$k] = $v;
 		} else {
 			$this->data[$name] = $val;
@@ -119,7 +119,7 @@ 
 	 */
 	public function assignByRef($name, &$val)
 	{
-		$this->data[$name] =& $val;
+		$this->data[$name] = & $val;
 	}
 
 	/**
@@ -140,7 +140,7 @@ 
 				}
 
 				if ($merge === true && is_array($val)) {
-					$this->data[$key] = $val + $this->data[$key];
+					$this->data[$key] = $val+$this->data[$key];
 				} else {
 					$this->data[$key][] = $val;
 				}
@@ -153,7 +153,7 @@ 
 			}
 
 			if ($merge === true && is_array($val)) {
-				$this->data[$name] = $val + $this->data[$name];
+				$this->data[$name] = $val+$this->data[$name];
 			} else {
 				$this->data[$name][] = $val;
 			}
@@ -176,10 +176,10 @@ 
 
    		if ($merge === true && is_array($val)) {
    			foreach ($val as $key => &$value) {
-   				$this->data[$name][$key] =& $value;
+   				$this->data[$name][$key] = & $value;
    			}
    		} else {
-   			$this->data[$name][] =& $val;
+   			$this->data[$name][] = & $val;
    		}
    	}