dwoo-project / dwoo

lib/Dwoo/Template/String.php

Spacing +9 added lines, -9 removed lines

@@ -263,7 +263,7 @@ 
 		if (isset(self::$cache['cached'][$this->cacheId]) === true && file_exists($cachedFile)) {
 			// already checked, return cache file
 			return $cachedFile;
-		} elseif ($this->compilationEnforced !== true && file_exists($cachedFile) && ($cacheLength === -1 || filemtime($cachedFile) > ($_SERVER['REQUEST_TIME'] - $cacheLength)) && $this->isValidCompiledFile($this->getCompiledFilename($dwoo))) {
+		} elseif ($this->compilationEnforced !== true && file_exists($cachedFile) && ($cacheLength === -1 || filemtime($cachedFile) > ($_SERVER['REQUEST_TIME']-$cacheLength)) && $this->isValidCompiledFile($this->getCompiledFilename($dwoo))) {
 			// cache is still valid and can be loaded
 			self::$cache['cached'][$this->cacheId] = true;
 			return $cachedFile;
@@ -289,7 +289,7 @@ 
 		// thanks for his help on avoiding concurency issues
 		$temp = tempnam($cacheDir, 'temp');
 		if (!($file = @fopen($temp, 'wb'))) {
-			$temp = $cacheDir . uniqid('temp');
+			$temp = $cacheDir.uniqid('temp');
 			if (!($file = @fopen($temp, 'wb'))) {
 				trigger_error('Error writing temporary file \''.$temp.'\'', E_USER_WARNING);
 				return false;
@@ -325,7 +325,7 @@ 
 	{
 		$cachedFile = $this->getCacheFilename($dwoo);
 
-		return !file_exists($cachedFile) || (filectime($cachedFile) < (time() - $olderThan) && unlink($cachedFile));
+		return !file_exists($cachedFile) || (filectime($cachedFile) < (time()-$olderThan) && unlink($cachedFile));
 	}
 
 	/**
@@ -353,7 +353,7 @@ 
 
 				if ($compiler === null || $compiler === array('Dwoo_Compiler', 'compilerFactory')) {
 					if (class_exists('Dwoo_Compiler', false) === false) {
-						include DWOO_DIRECTORY . 'Dwoo/Compiler.php';
+						include DWOO_DIRECTORY.'Dwoo/Compiler.php';
 					}
 					$compiler = Dwoo_Compiler::compilerFactory();
 				} else {
@@ -425,10 +425,10 @@ 
 	protected function getCompiledFilename(Dwoo_Core $dwoo)
 	{
 		// no compile id was provided, set default
-		if ($this->compileId===null) {
+		if ($this->compileId === null) {
 			$this->compileId = $this->name;
 		}
-		return $dwoo->getCompileDir() . $this->compileId.'.d'.Dwoo_Core::RELEASE_TAG.'.php';
+		return $dwoo->getCompileDir().$this->compileId.'.d'.Dwoo_Core::RELEASE_TAG.'.php';
 	}
 
 	/**
@@ -452,9 +452,9 @@ 
 			// force compiled id generation
 			$this->getCompiledFilename($dwoo);
 
-			$this->cacheId = str_replace('../', '__', $this->compileId . strtr($cacheId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
+			$this->cacheId = str_replace('../', '__', $this->compileId.strtr($cacheId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
 		}
-		return $dwoo->getCacheDir() . $this->cacheId.'.html';
+		return $dwoo->getCacheDir().$this->cacheId.'.html';
 	}
 
 	/**
@@ -503,7 +503,7 @@ 
 			$path = strtr(str_replace($baseDir, '', $path), '\\', '/');
 			$folders = explode('/', trim($path, '/'));
 			foreach ($folders as $folder) {
-				$baseDir .= $folder . DIRECTORY_SEPARATOR;
+				$baseDir .= $folder.DIRECTORY_SEPARATOR;
 				if (!chmod($baseDir, $chmod))
 				{
 					throw new Exception("Unable to chmod ".

lib/Dwoo/Template/File.php

Spacing +4 added lines, -4 removed lines

@@ -107,7 +107,7 @@ 
 	 * @return boolean True cache file existance and it's modification time
 	 */
 	protected function isValidCompiledFile($file) {
-		return parent::isValidCompiledFile($file) && (int)$this->getUid() <= filemtime($file);
+		return parent::isValidCompiledFile($file) && (int) $this->getUid() <= filemtime($file);
 	}
 
 	/**
@@ -145,7 +145,7 @@ 
 			foreach ($this->includePath as $path) {
 				$path = rtrim($path, DIRECTORY_SEPARATOR);
 				if (file_exists($path.DIRECTORY_SEPARATOR.$this->file) === true) {
-					$this->resolvedPath = $path . DIRECTORY_SEPARATOR . $this->file;
+					$this->resolvedPath = $path.DIRECTORY_SEPARATOR.$this->file;
 					return $this->resolvedPath;
 				}
 			}
@@ -250,10 +250,10 @@ 
 	protected function getCompiledFilename(Dwoo_Core $dwoo)
 	{
 		// no compile id was provided, set default
-		if ($this->compileId===null) {
+		if ($this->compileId === null) {
 			$this->compileId = str_replace('../', '__', strtr($this->getResourceIdentifier(), '\\:', '/-'));
 		}
-		return $dwoo->getCompileDir() . $this->compileId.'.d'.Dwoo_Core::RELEASE_TAG.'.php';
+		return $dwoo->getCompileDir().$this->compileId.'.d'.Dwoo_Core::RELEASE_TAG.'.php';
 	}
 
 	/**

lib/Dwoo/Core.php

Spacing +64 added lines, -68 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
@@ -160,15 +160,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
         )
@@ -434,8 +431,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'],
@@ -454,7 +450,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;
@@ -484,7 +480,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, false)) {
 				if (is_subclass_of($callback, 'Dwoo_Block_Plugin')) {
 					$this->plugins[$name] = array('type'=>self::BLOCK_PLUGIN | $compilable, 'callback'=>$callback, 'class'=>$callback);
@@ -496,7 +492,7 @@ 
 			} else {
 				throw new Dwoo_Exception('Callback could not be processed correctly, please check that the function/class you used exists');
 			}
-		} elseif(is_callable($callback)) {
+		} elseif (is_callable($callback)) {
 			$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');
@@ -563,8 +559,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]);
@@ -607,7 +603,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);
         }
     }
@@ -856,11 +852,11 @@ 
      * @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)
     {
         $cacheDirs = new RecursiveDirectoryIterator($this->getCacheDir());
         $cache = new RecursiveIteratorIterator($cacheDirs);
-        $expired = time() - $olderThan;
+        $expired = time()-$olderThan;
         $count = 0;
         foreach ($cache as $file) {
             if ($cache->isDot() || $cache->isDir() || substr($file, -5) !== '.html') {
@@ -901,7 +897,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) {
@@ -920,7 +916,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) {
@@ -970,7 +966,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();
@@ -989,7 +985,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'];
@@ -1008,18 +1004,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;
@@ -1040,15 +1036,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);
@@ -1060,7 +1056,7 @@ 
             $this->curBlock = end($this->stack);
             $this->curBlock->buffer($tmp->process());
         } else {
-            if($this->buffer !== '') {
+            if ($this->buffer !== '') {
                 echo $this->buffer;
                 $this->buffer = '';
             }
@@ -1141,15 +1137,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);
@@ -1185,23 +1181,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 {
@@ -1210,27 +1206,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);
                     }
                 }
             }
@@ -1295,7 +1291,7 @@ 
         $tree = $this->scopeTree;
         $cur = $this->data;
 
-        while ($parentLevels--!==0) {
+        while ($parentLevels-- !== 0) {
             array_pop($tree);
         }
 
@@ -1307,7 +1303,7 @@ 
             }
         }
 
-        if ($varstr!==null) {
+        if ($varstr !== null) {
             return $this->readVarInto($varstr, $cur);
         } else {
             return $cur;
@@ -1322,14 +1318,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;
                     $varstr = substr($varstr, 6);
                 } elseif ($varstr === '_' || $varstr === '_parent') {
@@ -1466,8 +1462,8 @@ 
      */
     public function assignInScope($value, $scope)
     {
-        $tree =& $this->scopeTree;
-        $data =& $this->data;
+        $tree = & $this->scopeTree;
+        $data = & $this->data;
 
         if (!is_string($scope)) {
             return $this->triggerError('Assignments must be done into strings, ('.gettype($scope).') '.var_export($scope, true).' given', E_USER_ERROR);
@@ -1478,7 +1474,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])) {
@@ -1486,12 +1482,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;
                 }
@@ -1524,31 +1520,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/Block/Plugin.php

Spacing +1 added lines, -1 removed lines

@@ -98,6 +98,6 @@
 	 */
 	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
 	{
-		return $content . Dwoo_Compiler::PHP_OPEN.$prepend.'$this->delStack();'.$append.Dwoo_Compiler::PHP_CLOSE;
+		return $content.Dwoo_Compiler::PHP_OPEN.$prepend.'$this->delStack();'.$append.Dwoo_Compiler::PHP_CLOSE;
 	}
 }

lib/Dwoo/Loader.php

Spacing +10 added lines, -10 removed lines

@@ -44,14 +44,14 @@ 
 
 	public function __construct($cacheDir)
 	{
-		$this->corePluginDir = DWOO_DIRECTORY . 'plugins';
-		$this->cacheDir = rtrim($cacheDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+		$this->corePluginDir = DWOO_DIRECTORY.'plugins';
+		$this->cacheDir = rtrim($cacheDir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 
 		// include class paths or rebuild paths if the cache file isn't there
 		$cacheFile = $this->cacheDir.'classpath.cache.d'.Dwoo_Core::RELEASE_TAG.'.php';
 		if (file_exists($cacheFile)) {
 			$classpath = file_get_contents($cacheFile);
-			$this->classPath = unserialize($classpath) + $this->classPath;
+			$this->classPath = unserialize($classpath)+$this->classPath;
 		} else {
 			$this->rebuildClassPathCache($this->corePluginDir, $cacheFile);
 		}
@@ -65,25 +65,25 @@ 
 	 */
 	protected function rebuildClassPathCache($path, $cacheFile)
 	{
-		if ($cacheFile!==false) {
+		if ($cacheFile !== false) {
 			$tmp = $this->classPath;
 			$this->classPath = array();
 		}
 
 		// iterates over all files/folders
-		$list = glob(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . '*');
+		$list = glob(rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.'*');
 		if (is_array($list)) {
 			foreach ($list as $f) {
 				if (is_dir($f)) {
 					$this->rebuildClassPathCache($f, false);
 				} else {
-					$this->classPath[str_replace(array('function.','block.','modifier.','outputfilter.','filter.','prefilter.','postfilter.','pre.','post.','output.','shared.','helper.'), '', basename($f, '.php'))] = $f;
+					$this->classPath[str_replace(array('function.', 'block.', 'modifier.', 'outputfilter.', 'filter.', 'prefilter.', 'postfilter.', 'pre.', 'post.', 'output.', 'shared.', 'helper.'), '', basename($f, '.php'))] = $f;
 				}
 			}
 		}
 
 		// save in file if it's the first call (not recursed)
-		if ($cacheFile!==false) {
+		if ($cacheFile !== false) {
 			if (!file_put_contents($cacheFile, serialize($this->classPath))) {
 				throw new Dwoo_Exception('Could not write into '.$cacheFile.', either because the folder is not there (create it) or because of the chmod configuration (please ensure this directory is writable by php), alternatively you can change the directory used with $dwoo->setCompileDir() or provide a custom loader object with $dwoo->setLoader()');
 			}
@@ -109,7 +109,7 @@ 
 			!(include $this->classPath[$class]))
 		{
 			if ($forceRehash) {
-				$this->rebuildClassPathCache($this->corePluginDir, $this->cacheDir . 'classpath.cache.d'.Dwoo_Core::RELEASE_TAG.'.php');
+				$this->rebuildClassPathCache($this->corePluginDir, $this->cacheDir.'classpath.cache.d'.Dwoo_Core::RELEASE_TAG.'.php');
 				foreach ($this->paths as $path=>$file) {
 					$this->rebuildClassPathCache($path, $file);
 				}
@@ -142,11 +142,11 @@ 
 		if (!$pluginDir) {
 			throw new Dwoo_Exception('Plugin directory does not exist or can not be read : '.$pluginDirectory);
 		}
-		$cacheFile = $this->cacheDir . 'classpath-'.substr(strtr($pluginDir, '/\\:'.PATH_SEPARATOR, '----'), strlen($pluginDir) > 80 ? -80 : 0).'.d'.Dwoo_Core::RELEASE_TAG.'.php';
+		$cacheFile = $this->cacheDir.'classpath-'.substr(strtr($pluginDir, '/\\:'.PATH_SEPARATOR, '----'), strlen($pluginDir) > 80 ? -80 : 0).'.d'.Dwoo_Core::RELEASE_TAG.'.php';
 		$this->paths[$pluginDir] = $cacheFile;
 		if (file_exists($cacheFile)) {
 			$classpath = file_get_contents($cacheFile);
-			$this->classPath = unserialize($classpath) + $this->classPath;
+			$this->classPath = unserialize($classpath)+$this->classPath;
 		} else {
 			$this->rebuildClassPathCache($pluginDir, $cacheFile);
 		}

lib/Dwoo/Smarty/Adapter.php

Spacing +21 added lines, -26 removed lines

@@ -5,14 +5,14 @@ 
 }
 
 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);
 }
 
 if (class_exists('Dwoo_Compiler', false) === false) {
-	require dirname(dirname(__FILE__)) . '/Compiler.php';
+	require dirname(dirname(__FILE__)).'/Compiler.php';
 }
 
 /**
@@ -34,11 +34,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;
 		}
@@ -82,15 +82,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,
@@ -117,11 +114,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',
 		),
@@ -164,12 +159,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);
@@ -182,7 +177,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;
@@ -237,7 +232,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)
@@ -248,7 +243,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');
@@ -261,7 +256,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');
@@ -392,7 +387,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);
    	}
@@ -412,7 +407,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);
@@ -467,7 +462,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/Plugin.php

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
 		$out = '';
 		foreach ($params as $attr=>$val) {
 			$out .= ' '.$attr.'=';
-			if (trim($val, '"\'')=='' || $val=='null') {
+			if (trim($val, '"\'') == '' || $val == 'null') {
 				$out .= str_replace($delim, '\\'.$delim, '""');
 			} elseif (substr($val, 0, 1) === $delim && substr($val, -1) === $delim) {
 				$out .= str_replace($delim, '\\'.$delim, '"'.substr($val, 1, -1).'"');
@@ -88,8 +88,8 @@ 
 					$escapedVal = '.'.$val.'.';
 				}
 
-				$out .= str_replace($delim, '\\'.$delim, '"') .
-					$delim . $escapedVal . $delim .
+				$out .= str_replace($delim, '\\'.$delim, '"').
+					$delim.$escapedVal.$delim.
 					str_replace($delim, '\\'.$delim, '"');
 			}
 		}

lib/Dwoo/Security/Policy.php

Spacing +1 added lines, -2 removed lines

@@ -45,8 +45,7 @@
 	 *
 	 * @var array
 	 */
-	protected $allowedPhpFunctions = array
-	(
+	protected $allowedPhpFunctions = array(
 		'str_repeat' => true,
 		'number_format' => true,
 		'htmlentities' => true,

lib/Dwoo/Compiler.php

Spacing +136 added lines, -136 removed lines

@@ -393,7 +393,7 @@ 
 		} elseif (($index = array_search('Dwoo_Processor_'.str_replace('Dwoo_Processor_', '', $callback), $this->processors['pre'], true)) !== false) {
 			unset($this->processors['pre'][$index]);
 		} else {
-			$class = 'Dwoo_Processor_' . str_replace('Dwoo_Processor_', '', $callback);
+			$class = 'Dwoo_Processor_'.str_replace('Dwoo_Processor_', '', $callback);
 			foreach ($this->processors['pre'] as $index=>$proc) {
 				if (is_array($proc) && ($proc[0] instanceof $class) || (isset($proc['class']) && $proc['class'] == $class)) {
 					unset($this->processors['pre'][$index]);
@@ -441,8 +441,8 @@ 
 			unset($this->processors['post'][$index]);
 		} elseif (($index = array_search('Dwoo_Processor_'.str_replace('Dwoo_Processor_', '', $callback), $this->processors['post'], true)) !== false) {
 			unset($this->processors['post'][$index]);
-		} else	{
-			$class = 'Dwoo_Processor_' . str_replace('Dwoo_Processor_', '', $callback);
+		} else {
+			$class = 'Dwoo_Processor_'.str_replace('Dwoo_Processor_', '', $callback);
 			foreach ($this->processors['post'] as $index=>$proc) {
 				if (is_array($proc) && ($proc[0] instanceof $class) || (isset($proc['class']) && $proc['class'] == $class)) {
 					unset($this->processors['post'][$index]);
@@ -648,7 +648,7 @@ 
 	public function setTemplateSource($newSource, $fromPointer = false)
 	{
 		if ($fromPointer === true) {
-			$this->templateSource = substr($this->templateSource, 0, $this->pointer) . $newSource;
+			$this->templateSource = substr($this->templateSource, 0, $this->pointer).$newSource;
 		} else {
 			$this->templateSource = $newSource;
 		}
@@ -695,16 +695,16 @@ 
 		$ptr = 0;
 		$this->dwoo = $dwoo;
 		$this->template = $template;
-		$this->templateSource =& $tpl;
-		$this->pointer =& $ptr;
+		$this->templateSource = & $tpl;
+		$this->pointer = & $ptr;
 
 		while (true) {
 			// if pointer is at the beginning, reset everything, that allows a plugin to externally reset the compiler if everything must be reparsed
-			if ($ptr===0) {
+			if ($ptr === 0) {
 				// resets variables
 				$this->usedPlugins = array();
 				$this->data = array();
-				$this->scope =& $this->data;
+				$this->scope = & $this->data;
 				$this->scopeTree = array();
 				$this->stack = array();
 				$this->line = 1;
@@ -739,7 +739,7 @@ 
 					if (ini_get('short_open_tags')) {
 						$search = array('{<\?.*?\?>}', '{<%.*?%>}');
 					}
-					switch($this->securityPolicy->getPhpHandling()) {
+					switch ($this->securityPolicy->getPhpHandling()) {
 
 					case Dwoo_Security_Policy::PHP_ALLOW:
 						break;
@@ -759,14 +759,14 @@ 
 				$this->push(substr($tpl, $ptr), 0);
 				break;
 			} elseif (substr($tpl, $pos-1, 1) === '\\' && substr($tpl, $pos-2, 1) !== '\\') {
-				$this->push(substr($tpl, $ptr, $pos-$ptr-1) . $this->ld);
+				$this->push(substr($tpl, $ptr, $pos-$ptr-1).$this->ld);
 				$ptr = $pos+strlen($this->ld);
-			} elseif (preg_match('/^'.$this->ldr . ($this->allowLooseOpenings ? '\s*' : '') . 'literal' . ($this->allowLooseOpenings ? '\s*' : '') . $this->rdr.'/s', substr($tpl, $pos), $litOpen)) {
-				if (!preg_match('/'.$this->ldr . ($this->allowLooseOpenings ? '\s*' : '') . '\/literal' . ($this->allowLooseOpenings ? '\s*' : '') . $this->rdr.'/s', $tpl, $litClose, PREG_OFFSET_CAPTURE, $pos)) {
+			} elseif (preg_match('/^'.$this->ldr.($this->allowLooseOpenings ? '\s*' : '').'literal'.($this->allowLooseOpenings ? '\s*' : '').$this->rdr.'/s', substr($tpl, $pos), $litOpen)) {
+				if (!preg_match('/'.$this->ldr.($this->allowLooseOpenings ? '\s*' : '').'\/literal'.($this->allowLooseOpenings ? '\s*' : '').$this->rdr.'/s', $tpl, $litClose, PREG_OFFSET_CAPTURE, $pos)) {
 					throw new Dwoo_Compilation_Exception($this, 'The {literal} blocks must be closed explicitly with {/literal}');
 				}
 				$endpos = $litClose[0][1];
-				$this->push(substr($tpl, $ptr, $pos-$ptr) . substr($tpl, $pos + strlen($litOpen[0]), $endpos-$pos-strlen($litOpen[0])));
+				$this->push(substr($tpl, $ptr, $pos-$ptr).substr($tpl, $pos+strlen($litOpen[0]), $endpos-$pos-strlen($litOpen[0])));
 				$ptr = $endpos+strlen($litClose[0][0]);
 			} else {
 				if (substr($tpl, $pos-2, 1) === '\\' && substr($tpl, $pos-1, 1) === '\\') {
@@ -780,7 +780,7 @@ 
 				$pos += strlen($this->ld);
 				if ($this->allowLooseOpenings) {
 					while (substr($tpl, $pos, 1) === ' ') {
-						$pos+=1;
+						$pos += 1;
 					}
 				} else {
 					if (substr($tpl, $pos, 1) === ' ' || substr($tpl, $pos, 1) === "\r" || substr($tpl, $pos, 1) === "\n" || substr($tpl, $pos, 1) === "\t") {
@@ -807,7 +807,7 @@ 
 						continue 2;
 					}
 
-					$len = $subptr - $ptr;
+					$len = $subptr-$ptr;
 					$this->push($parsed, substr_count(substr($tpl, $ptr, $len), "\n"));
 					$ptr += $len;
 
@@ -844,7 +844,7 @@ 
 				continue;
 			}
 
-			switch($type) {
+			switch ($type) {
 
 			case Dwoo_Core::BLOCK_PLUGIN:
 			case Dwoo_Core::CLASS_PLUGIN:
@@ -884,15 +884,15 @@ 
 
 		$output .= $compiled."\n?>";
 
-		$output = preg_replace('/(?<!;|\}|\*\/|\n|\{)(\s*'.preg_quote(self::PHP_CLOSE, '/') . preg_quote(self::PHP_OPEN, '/').')/', ";\n", $output);
-		$output = str_replace(self::PHP_CLOSE . self::PHP_OPEN, "\n", $output);
+		$output = preg_replace('/(?<!;|\}|\*\/|\n|\{)(\s*'.preg_quote(self::PHP_CLOSE, '/').preg_quote(self::PHP_OPEN, '/').')/', ";\n", $output);
+		$output = str_replace(self::PHP_CLOSE.self::PHP_OPEN, "\n", $output);
 
 		// handle <?xml tag at the beginning
 		$output = preg_replace('#(/\* template body \*/ \?>\s*)<\?xml#is', '$1<?php echo \'<?xml\'; ?>', $output);
 
 		// add another line break after PHP closing tags that have a line break following,
 		// as we do not know whether it's intended, and PHP will strip it otherwise
-		$output = preg_replace('/(?<!"|<\?xml)\s*\?>\n/', '$0' . "\n", $output);
+		$output = preg_replace('/(?<!"|<\?xml)\s*\?>\n/', '$0'."\n", $output);
 
 		if ($this->debug) {
 			echo '<hr><pre>';
@@ -967,17 +967,17 @@ 
 	{
 		$old = $this->scopeTree;
 
-		if ($scope===null) {
+		if ($scope === null) {
 			unset($this->scope);
 			$this->scope = null;
 		}
 
-		if (is_array($scope)===false) {
+		if (is_array($scope) === false) {
 			$scope = explode('.', $scope);
 		}
 
-		if ($absolute===true) {
-			$this->scope =& $this->data;
+		if ($absolute === true) {
+			$this->scope = & $this->data;
 			$this->scopeTree = array();
 		}
 
@@ -985,19 +985,19 @@ 
 			if ($bit === '_parent' || $bit === '_') {
 				array_pop($this->scopeTree);
 				reset($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 === '_root' || $bit === '__') {
-				$this->scope =& $this->data;
+				$this->scope = & $this->data;
 				$this->scopeTree = array();
 			} elseif (isset($this->scope[$bit])) {
-				$this->scope =& $this->scope[$bit];
+				$this->scope = & $this->scope[$bit];
 				$this->scopeTree[] = $bit;
 			} else {
 				$this->scope[$bit] = array();
-				$this->scope =& $this->scope[$bit];
+				$this->scope = & $this->scope[$bit];
 				$this->scopeTree[] = $bit;
 			}
 		}
@@ -1023,8 +1023,8 @@ 
 		$params = $this->mapParams($params, array($class, 'init'), $paramtype);
 
 		$this->stack[] = array('type' => $type, 'params' => $params, 'custom' => false, 'class' => $class, 'buffer' => null);
-		$this->curBlock =& $this->stack[count($this->stack)-1];
-		return call_user_func(array($class,'preProcessing'), $this, $params, '', '', $type);
+		$this->curBlock = & $this->stack[count($this->stack)-1];
+		return call_user_func(array($class, 'preProcessing'), $this, $params, '', '', $type);
 	}
 
 	/**
@@ -1047,8 +1047,8 @@ 
 		$params = $this->mapParams($params, array($class, 'init'), $paramtype);
 
 		$this->stack[] = array('type' => $type, 'params' => $params, 'custom' => true, 'class' => $class, 'buffer' => null);
-		$this->curBlock =& $this->stack[count($this->stack)-1];
-		return call_user_func(array($class,'preProcessing'), $this, $params, '', '', $type);
+		$this->curBlock = & $this->stack[count($this->stack)-1];
+		return call_user_func(array($class, 'preProcessing'), $this, $params, '', '', $type);
 	}
 
 	/**
@@ -1066,7 +1066,7 @@ 
 			$this->dwoo->getLoader()->loadPlugin($type);
 		}
 		$this->stack[] = array('type' => $type, 'params' => $params, 'custom' => false, 'class' => $class, 'buffer' => null);
-		$this->curBlock =& $this->stack[count($this->stack)-1];
+		$this->curBlock = & $this->stack[count($this->stack)-1];
 	}
 
 	/**
@@ -1092,11 +1092,11 @@ 
 					$class = 'Dwoo_Plugin_'.$top['type'];
 				}
 				if (count($this->stack)) {
-					$this->curBlock =& $this->stack[count($this->stack)-1];
+					$this->curBlock = & $this->stack[count($this->stack)-1];
 					$this->push(call_user_func(array($class, 'postProcessing'), $this, $top['params'], '', '', $top['buffer']), 0);
 				} else {
 					$null = null;
-					$this->curBlock =& $null;
+					$this->curBlock = & $null;
 					$output = call_user_func(array($class, 'postProcessing'), $this, $top['params'], '', '', $top['buffer']);
 				}
 
@@ -1126,9 +1126,9 @@ 
 	 */
 	public function &findBlock($type, $closeAlong = false)
 	{
-		if ($closeAlong===true) {
+		if ($closeAlong === true) {
 			while ($b = end($this->stack)) {
-				if ($b['type']===$type) {
+				if ($b['type'] === $type) {
 					return $this->stack[key($this->stack)];
 				}
 				$this->push($this->removeTopBlock(), 0);
@@ -1136,7 +1136,7 @@ 
 		} else {
 			end($this->stack);
 			while ($b = current($this->stack)) {
-				if ($b['type']===$type) {
+				if ($b['type'] === $type) {
 					return $this->stack[key($this->stack)];
 				}
 				prev($this->stack);
@@ -1174,7 +1174,7 @@ 
 			$class = 'Dwoo_Plugin_'.$o['type'];
 		}
 
-		$this->curBlock =& $this->stack[count($this->stack)-1];
+		$this->curBlock = & $this->stack[count($this->stack)-1];
 
 		return call_user_func(array($class, 'postProcessing'), $this, $o['params'], '', '', $o['buffer']);
 	}
@@ -1238,7 +1238,7 @@ 
 	 * @param mixed $pointer a reference to a pointer that will be increased by the amount of characters parsed, or null by default
 	 * @return string parsed values
 	 */
-	protected function parse($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
+	protected function parse($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
 	{
 		if ($to === null) {
 			$to = strlen($in);
@@ -1249,7 +1249,7 @@ 
 			throw new Dwoo_Compilation_Exception($this, 'Unexpected EOF, a template tag was not closed');
 		}
 
-		while ($first===" " || $first==="\n" || $first==="\t" || $first==="\r") {
+		while ($first === " " || $first === "\n" || $first === "\t" || $first === "\r") {
 			if ($curBlock === 'root' && substr($in, $from, strlen($this->rd)) === $this->rd) {
 				// end template tag
 				$pointer += strlen($this->rd);
@@ -1272,12 +1272,12 @@ 
 
 		$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 === '*') {
 			$src = $this->getTemplateSource();
-			$startpos = $this->getPointer() - strlen($this->ld);
+			$startpos = $this->getPointer()-strlen($this->ld);
 			if (substr($src, $startpos, strlen($this->ld)) === $this->ld) {
 				if ($startpos > 0) {
 					do {
@@ -1293,7 +1293,7 @@ 
 				if (!isset($whitespaceStart)) {
 					$startpos = $this->getPointer();
 				} else {
-					$pointer -= $this->getPointer() - $startpos;
+					$pointer -= $this->getPointer()-$startpos;
 				}
 
 				if ($this->allowNestedComments && strpos($src, $this->ld.'*', $this->getPointer()) !== false) {
@@ -1301,7 +1301,7 @@ 
 					$comClose = '*'.$this->rd;
 					$level = 1;
 					$start = $startpos;
-					$ptr = $this->getPointer() + '*';
+					$ptr = $this->getPointer()+'*';
 
 					while ($level > 0 && $ptr < strlen($src)) {
 						$open = strpos($src, $comOpen, $ptr);
@@ -1309,49 +1309,49 @@ 
 
 						if ($open !== false && $close !== false) {
 							if ($open < $close) {
-								$ptr = $open + strlen($comOpen);
+								$ptr = $open+strlen($comOpen);
 								$level++;
 							} else {
-								$ptr = $close + strlen($comClose);
+								$ptr = $close+strlen($comClose);
 								$level--;
 							}
 						} elseif ($open !== false) {
-							$ptr = $open + strlen($comOpen);
+							$ptr = $open+strlen($comOpen);
 							$level++;
 						} elseif ($close !== false) {
-							$ptr = $close + strlen($comClose);
+							$ptr = $close+strlen($comClose);
 							$level--;
 						} else {
 							$ptr = strlen($src);
 						}
 					}
-					$endpos = $ptr - strlen('*'.$this->rd);
+					$endpos = $ptr-strlen('*'.$this->rd);
 				} else {
 					$endpos = strpos($src, '*'.$this->rd, $startpos);
 					if ($endpos == false) {
 						throw new Dwoo_Compilation_Exception($this, 'Un-ended comment');
 					}
 				}
-				$pointer += $endpos - $startpos + strlen('*'.$this->rd);
+				$pointer += $endpos-$startpos+strlen('*'.$this->rd);
 				if (isset($whitespaceStart) && preg_match('#^[\t ]*\r?\n#', substr($src, $endpos+strlen('*'.$this->rd)), $m)) {
 					$pointer += strlen($m[0]);
-					$this->curBlock['buffer'] = substr($this->curBlock['buffer'], 0, strlen($this->curBlock['buffer']) - ($this->getPointer() - $startpos - strlen($this->ld)));
+					$this->curBlock['buffer'] = substr($this->curBlock['buffer'], 0, strlen($this->curBlock['buffer'])-($this->getPointer()-$startpos-strlen($this->ld)));
 				}
 				return false;
 			}
 		}
 
-		if ($first==='$') {
+		if ($first === '$') {
 			// var
 			$out = $this->parseVar($in, $from, $to, $parsingParams, $curBlock, $pointer);
 			$parsed = 'var';
-		} elseif ($first==='%' && preg_match('#^%[a-z_]#i', $substr)) {
+		} elseif ($first === '%' && preg_match('#^%[a-z_]#i', $substr)) {
 			// const
 			$out = $this->parseConst($in, $from, $to, $parsingParams, $curBlock, $pointer);
-		} elseif (($first==='"' || $first==="'") && !(is_array($parsingParams) && preg_match('#^([\'"])[a-z0-9_]+\1\s*=>?(?:\s+|[^=])#i', $substr))) {
+		} elseif (($first === '"' || $first === "'") && !(is_array($parsingParams) && preg_match('#^([\'"])[a-z0-9_]+\1\s*=>?(?:\s+|[^=])#i', $substr))) {
 			// string
 			$out = $this->parseString($in, $from, $to, $parsingParams, $curBlock, $pointer);
-		} elseif (preg_match('/^\\\\?[a-z_](?:\\\\?[a-z0-9_]+)*(?:::[a-z_][a-z0-9_]*)?('.(is_array($parsingParams)||$curBlock!='root'?'':'\s+[^(]|').'\s*\(|\s*'.$this->rdr.'|\s*;)/i', $substr)) {
+		} elseif (preg_match('/^\\\\?[a-z_](?:\\\\?[a-z0-9_]+)*(?:::[a-z_][a-z0-9_]*)?('.(is_array($parsingParams) || $curBlock != 'root' ? '' : '\s+[^(]|').'\s*\(|\s*'.$this->rdr.'|\s*;)/i', $substr)) {
 			// func
 			$out = $this->parseFunction($in, $from, $to, $parsingParams, $curBlock, $pointer);
 			$parsed = 'func';
@@ -1388,11 +1388,11 @@ 
 			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)) {
+		} 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 />';
 			$len = strlen($match[1]);
-			while (substr($in, $from+$len, 1)===' ') {
+			while (substr($in, $from+$len, 1) === ' ') {
 				$len++;
 			}
 			if ($pointer !== null) {
@@ -1413,7 +1413,7 @@ 
 				$out = $match[1];
 			}
 			$pointer += strlen($match[1]);
-		} elseif ($substr!=='' && (is_array($parsingParams) || $curBlock === 'namedparam' || $curBlock === 'condition' || $curBlock === 'expression')) {
+		} elseif ($substr !== '' && (is_array($parsingParams) || $curBlock === 'namedparam' || $curBlock === 'condition' || $curBlock === 'expression')) {
 			// unquoted string, bool or number
 			$out = $this->parseOthers($in, $from, $to, $parsingParams, $curBlock, $pointer);
 		} else {
@@ -1428,19 +1428,19 @@ 
 		$substr = substr($in, $pointer, $to-$pointer);
 
 		// var parsed, check if any var-extension applies
-		if ($parsed==='var') {
+		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;
+				$pointer += strlen($match[0])-1;
 				if (is_array($parsingParams)) {
 					if ($match[2] == '$') {
 						$expr = $this->parseVar($in, $pointer, $to, array(), $curBlock, $pointer);
 					} else {
 						$expr = $this->parse($in, $pointer, $to, array(), 'expression', $pointer);
 					}
-					$out[count($out)-1][0] .= $match[1] . $expr[0][0];
-					$out[count($out)-1][1] .= $match[1] . $expr[0][1];
+					$out[count($out)-1][0] .= $match[1].$expr[0][0];
+					$out[count($out)-1][1] .= $match[1].$expr[0][1];
 				} else {
 					if ($match[2] == '$') {
 						$expr = $this->parseVar($in, $pointer, $to, false, $curBlock, $pointer);
@@ -1448,19 +1448,19 @@ 
 						$expr = $this->parse($in, $pointer, $to, false, 'expression', $pointer);
 					}
 					if (is_array($out) && is_array($expr)) {
-						$out[0] .= $match[1] . $expr[0];
-						$out[1] .= $match[1] . $expr[1];
+						$out[0] .= $match[1].$expr[0];
+						$out[1] .= $match[1].$expr[1];
 					} elseif (is_array($out)) {
-						$out[0] .= $match[1] . $expr;
-						$out[1] .= $match[1] . $expr;
+						$out[0] .= $match[1].$expr;
+						$out[1] .= $match[1].$expr;
 					} elseif (is_array($expr)) {
-						$out .= $match[1] . $expr[0];
+						$out .= $match[1].$expr[0];
 					} else {
-						$out .= $match[1] . $expr;
+						$out .= $match[1].$expr;
 					}
 				}
 			} 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]);
@@ -1499,7 +1499,7 @@ 
 				if ($this->autoEscape) {
 					$out = preg_replace('#\(is_string\(\$tmp=(.+?)\) \? htmlspecialchars\(\$tmp, ENT_QUOTES, \$this->charset\) : \$tmp\)#', '$1', $out);
 				}
-				$out = Dwoo_Compiler::PHP_OPEN. $echo . $out . $operator . implode(' ', $value) . Dwoo_Compiler::PHP_CLOSE;
+				$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 />';
@@ -1520,14 +1520,14 @@ 
 			if (is_array($parsingParams)) {
 				$tmp = $this->replaceModifiers(array(null, null, $out[count($out)-1][0], $match[0]), $curBlock, $pointer);
 				$out[count($out)-1][0] = $tmp;
-				$out[count($out)-1][1] .= substr($substr, $srcPointer, $srcPointer - $pointer);
+				$out[count($out)-1][1] .= substr($substr, $srcPointer, $srcPointer-$pointer);
 			} else {
 				$out = $this->replaceModifiers(array(null, null, $out, $match[0]), $curBlock, $pointer);
 			}
 		}
 
 		// func parsed, check if any func-extension applies
-		if ($parsed==='func' && preg_match('#^->[a-z0-9_]+(\s*\(.+|->[a-z_].*)?#is', $substr, $match)) {
+		if ($parsed === 'func' && preg_match('#^->[a-z0-9_]+(\s*\(.+|->[a-z_].*)?#is', $substr, $match)) {
 			// parse method call or property read
 			$ptr = 0;
 
@@ -1544,7 +1544,7 @@ 
 		}
 
 		if ($curBlock === 'root' && substr($out, 0, strlen(self::PHP_OPEN)) !== self::PHP_OPEN) {
-			return self::PHP_OPEN .'echo '.$out.';'. self::PHP_CLOSE;
+			return self::PHP_OPEN.'echo '.$out.';'.self::PHP_CLOSE;
 		} else {
 			return $out;
 		}
@@ -1561,7 +1561,7 @@ 
 	 * @param mixed $pointer a reference to a pointer that will be increased by the amount of characters parsed, or null by default
 	 * @return string parsed values
 	 */
-	protected function parseFunction($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
+	protected function parseFunction($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
 	{
 		$cmdstr = substr($in, $from, $to-$from);
 		preg_match('/^(\\\\?[a-z_](?:\\\\?[a-z0-9_]+)*(?:::[a-z_][a-z0-9_]*)?)(\s*'.$this->rdr.'|\s*;)?/i', $cmdstr, $match);
@@ -1583,14 +1583,14 @@ 
 		if (is_array($parsingParams) || $curBlock != 'root') {
 			$paramspos = strpos($cmdstr, '(');
 			$paramsep = ')';
-		} elseif(preg_match_all('#^\s*[\\\\:a-z0-9_]+(\s*\(|\s+[^(])#i', $cmdstr, $match, PREG_OFFSET_CAPTURE)) {
+		} elseif (preg_match_all('#^\s*[\\\\:a-z0-9_]+(\s*\(|\s+[^(])#i', $cmdstr, $match, PREG_OFFSET_CAPTURE)) {
 			$paramspos = $match[1][0][1];
-			$paramsep = substr($match[1][0][0], -1) === '(' ? ')':'';
-			if($paramsep === ')') {
-				$paramspos += strlen($match[1][0][0]) - 1;
-				if(substr($cmdstr, 0, 2) === 'if' || substr($cmdstr, 0, 6) === 'elseif') {
+			$paramsep = substr($match[1][0][0], -1) === '(' ? ')' : '';
+			if ($paramsep === ')') {
+				$paramspos += strlen($match[1][0][0])-1;
+				if (substr($cmdstr, 0, 2) === 'if' || substr($cmdstr, 0, 6) === 'elseif') {
 					$paramsep = '';
-					if(strlen($match[1][0][0]) > 1) {
+					if (strlen($match[1][0][0]) > 1) {
 						$paramspos--;
 					}
 				}
@@ -1622,7 +1622,7 @@ 
 				$paramstr = substr($paramstr, 0, -1);
 			}
 
-			if (strlen($paramstr)===0) {
+			if (strlen($paramstr) === 0) {
 				$params = array();
 				$paramstr = '';
 			} else {
@@ -1692,8 +1692,8 @@ 
 		}
 
 		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/>';
+			$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 ($curBlock === 'method' || $func === 'do' || strstr($func, '::') !== false) {
@@ -1926,12 +1926,12 @@ 
 	 * @param mixed $pointer a reference to a pointer that will be increased by the amount of characters parsed, or null by default
 	 * @return string parsed values
 	 */
-	protected function parseString($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
+	protected function parseString($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
 	{
 		$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) {
@@ -1993,7 +1993,7 @@ 
 	 * @param mixed $pointer a reference to a pointer that will be increased by the amount of characters parsed, or null by default
 	 * @return string parsed values
 	 */
-	protected function parseConst($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
+	protected function parseConst($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
 	{
 		$substr = substr($in, $from, $to-$from);
 
@@ -2054,14 +2054,14 @@ 
 	 * @param mixed $pointer a reference to a pointer that will be increased by the amount of characters parsed, or null by default
 	 * @return string parsed values
 	 */
-	protected function parseVar($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
+	protected function parseVar($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
 	{
 		$substr = substr($in, $from, $to-$from);
 
-		if (preg_match('#(\$?\.?[a-z0-9_:]*(?:(?:(?:\.|->)(?:[a-z0-9_:]+|(?R))|\[(?:[a-z0-9_:]+|(?R)|(["\'])[^\2]*?\2)\]))*)' . // var key
-			($curBlock==='root' || $curBlock==='function' || $curBlock==='namedparam' || $curBlock==='condition' || $curBlock==='variable' || $curBlock==='expression' || $curBlock==='delimited_string' ? '(\(.*)?' : '()') . // method call
-			($curBlock==='root' || $curBlock==='function' || $curBlock==='namedparam' || $curBlock==='condition' || $curBlock==='variable' || $curBlock==='delimited_string' ? '((?:(?:[+/*%=-])(?:(?<!=)=?-?[$%][a-z0-9.[\]>_:-]+(?:\([^)]*\))?|(?<!=)=?-?[0-9.,]*|[+-]))*)':'()') . // simple math expressions
-			($curBlock!=='modifier' ? '((?:\|(?:@?[a-z0-9_]+(?:(?::("|\').*?\5|:[^`]*))*))+)?':'(())') . // modifiers
+		if (preg_match('#(\$?\.?[a-z0-9_:]*(?:(?:(?:\.|->)(?:[a-z0-9_:]+|(?R))|\[(?:[a-z0-9_:]+|(?R)|(["\'])[^\2]*?\2)\]))*)'.// var key
+			($curBlock === 'root' || $curBlock === 'function' || $curBlock === 'namedparam' || $curBlock === 'condition' || $curBlock === 'variable' || $curBlock === 'expression' || $curBlock === 'delimited_string' ? '(\(.*)?' : '()').// method call
+			($curBlock === 'root' || $curBlock === 'function' || $curBlock === 'namedparam' || $curBlock === 'condition' || $curBlock === 'variable' || $curBlock === 'delimited_string' ? '((?:(?:[+/*%=-])(?:(?<!=)=?-?[$%][a-z0-9.[\]>_:-]+(?:\([^)]*\))?|(?<!=)=?-?[0-9.,]*|[+-]))*)' : '()').// simple math expressions
+			($curBlock !== 'modifier' ? '((?:\|(?:@?[a-z0-9_]+(?:(?::("|\').*?\5|:[^`]*))*))+)?' : '(())').// modifiers
 			'#i', $substr, $match)) {
 			$key = substr($match[1], 1);
 
@@ -2076,9 +2076,9 @@ 
 			}
 
 			if ($hasMethodCall) {
-				$matchedLength -= strlen($match[3]) + strlen(substr($match[1], strrpos($match[1], '->')));
+				$matchedLength -= strlen($match[3])+strlen(substr($match[1], strrpos($match[1], '->')));
 				$key = substr($match[1], 1, strrpos($match[1], '->')-1);
-				$methodCall = substr($match[1], strrpos($match[1], '->')) . $match[3];
+				$methodCall = substr($match[1], strrpos($match[1], '->')).$match[3];
 			}
 
 			if ($hasModifiers) {
@@ -2102,12 +2102,12 @@ 
 
 			$key = str_replace('"', '\\"', $key);
 
-			$cnt=substr_count($key, '$');
+			$cnt = substr_count($key, '$');
 			if ($cnt > 0) {
 				$uid = 0;
 				$parsed = array($uid => '');
-				$current =& $parsed;
-				$curTxt =& $parsed[$uid++];
+				$current = & $parsed;
+				$curTxt = & $parsed[$uid++];
 				$tree = array();
 				$chars = str_split($key, 1);
 				$inSplittedVar = false;
@@ -2118,31 +2118,31 @@ 
 						if (count($tree) > 0) {
 							$bracketCount++;
 						} else {
-							$tree[] =& $current;
+							$tree[] = & $current;
 							$current[$uid] = array($uid+1 => '');
-							$current =& $current[$uid++];
-							$curTxt =& $current[$uid++];
+							$current = & $current[$uid++];
+							$curTxt = & $current[$uid++];
 							continue;
 						}
 					} elseif ($char === ']') {
 						if ($bracketCount > 0) {
 							$bracketCount--;
 						} else {
-							$current =& $tree[count($tree)-1];
+							$current = & $tree[count($tree)-1];
 							array_pop($tree);
 							if (current($chars) !== '[' && current($chars) !== false && current($chars) !== ']') {
 								$current[$uid] = '';
-								$curTxt =& $current[$uid++];
+								$curTxt = & $current[$uid++];
 							}
 							continue;
 						}
 					} elseif ($char === '$') {
 						if (count($tree) == 0) {
-							$curTxt =& $current[$uid++];
+							$curTxt = & $current[$uid++];
 							$inSplittedVar = true;
 						}
 					} elseif (($char === '.' || $char === '-') && count($tree) == 0 && $inSplittedVar) {
-						$curTxt =& $current[$uid++];
+						$curTxt = & $current[$uid++];
 						$inSplittedVar = false;
 					}
 
@@ -2178,7 +2178,7 @@ 
 				preg_match_all('#(?:([+/*%=-])(=?-?[%$][a-z0-9.[\]>_:-]+(?:\([^)]*\))?|=?-?[0-9.,]+|\1))#i', $match[4], $expMatch);
 
 				foreach ($expMatch[1] as $k=>$operator) {
-					if (substr($expMatch[2][$k], 0, 1)==='=') {
+					if (substr($expMatch[2][$k], 0, 1) === '=') {
 						$assign = true;
 						if ($operator === '=') {
 							throw new Dwoo_Compilation_Exception($this, 'Invalid expression <em>'.$substr.'</em>, can not use "==" in expressions');
@@ -2190,11 +2190,11 @@ 
 						$expMatch[2][$k] = substr($expMatch[2][$k], 1);
 					}
 
-					if (substr($expMatch[2][$k], 0, 1)==='-' && strlen($expMatch[2][$k]) > 1) {
+					if (substr($expMatch[2][$k], 0, 1) === '-' && strlen($expMatch[2][$k]) > 1) {
 						$operator .= '-';
 						$expMatch[2][$k] = substr($expMatch[2][$k], 1);
 					}
-					if (($operator==='+'||$operator==='-') && $expMatch[2][$k]===$operator) {
+					if (($operator === '+' || $operator === '-') && $expMatch[2][$k] === $operator) {
 						$output = '('.$output.$operator.$operator.')';
 						break;
 					} elseif (substr($expMatch[2][$k], 0, 1) === '$') {
@@ -2270,7 +2270,7 @@ 
 				break;
 			}
 
-			if(!preg_match('/^([a-z0-9_]+)(\(.*?\))?/i', substr($methodCall, $ptr), $methMatch)) {
+			if (!preg_match('/^([a-z0-9_]+)(\(.*?\))?/i', substr($methodCall, $ptr), $methMatch)) {
 				break;
 			}
 
@@ -2286,7 +2286,7 @@ 
 				// method
 				if (substr($methMatch[2], 0, 2) === '()') {
 					$parsedCall = $methMatch[1].'()';
-					$ptr += strlen($methMatch[1]) + 2;
+					$ptr += strlen($methMatch[1])+2;
 				} else {
 					$parsedCall = $this->parseFunction($methodCall, $ptr, strlen($methodCall), false, 'method', $ptr);
 				}
@@ -2395,7 +2395,7 @@ 
 
 					while (count($m[1]) && $m[1][0] !== '->') {
 						$m[2][0] = preg_replace('/(^\\\([\'"])|\\\([\'"])$)/x', '$2$3', $m[2][0]);
-						if(substr($m[2][0], 0, 1) == '"' || substr($m[2][0], 0, 1) == "'") {
+						if (substr($m[2][0], 0, 1) == '"' || substr($m[2][0], 0, 1) == "'") {
 							$output .= '['.$m[2][0].']';
 						} else {
 							$output .= '["'.$m[2][0].'"]';
@@ -2411,7 +2411,7 @@ 
 
 				if (count($m[2])) {
 					unset($m[0]);
-					$output = '$this->readVarInto('.str_replace("\n", '', var_export($m, true)).', '.$output.', '.($curBlock == 'root' ? 'false': 'true').')';
+					$output = '$this->readVarInto('.str_replace("\n", '', var_export($m, true)).', '.$output.', '.($curBlock == 'root' ? 'false' : 'true').')';
 				}
 			}
 		} else {
@@ -2431,16 +2431,16 @@ 
 	 * @param bool $recursed leave that to false by default, it is only for internal use
 	 * @return string flattened tree
 	 */
-	protected function flattenVarTree(array $tree, $recursed=false)
+	protected function flattenVarTree(array $tree, $recursed = false)
 	{
-		$out = $recursed ?  '".$this->readVarInto(' : '';
+		$out = $recursed ? '".$this->readVarInto(' : '';
 		foreach ($tree as $bit) {
 			if (is_array($bit)) {
-				$out.='.'.$this->flattenVarTree($bit, false);
+				$out .= '.'.$this->flattenVarTree($bit, false);
 			} else {
 				$key = str_replace('"', '\\"', $bit);
 
-				if (substr($key, 0, 1)==='$') {
+				if (substr($key, 0, 1) === '$') {
 					$out .= '".'.$this->parseVar($key, 0, strlen($key), false, 'variable').'."';
 				} else {
 					$cnt = substr_count($key, '$');
@@ -2449,7 +2449,7 @@ 
 					if ($cnt > 0) {
 						while (--$cnt >= 0) {
 							if (isset($last)) {
-								$last = strrpos($key, '$', - (strlen($key) - $last + 1));
+								$last = strrpos($key, '$', - (strlen($key)-$last+1));
 							} else {
 								$last = strrpos($key, '$');
 							}
@@ -2504,7 +2504,7 @@ 
 	 * @param mixed $pointer a reference to a pointer that will be increased by the amount of characters parsed, or null by default
 	 * @return string parsed values
 	 */
-	protected function parseOthers($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
+	protected function parseOthers($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
 	{
 		$first = $in[$from];
 		$substr = substr($in, $from, $to-$from);
@@ -2522,7 +2522,7 @@ 
 		}
 
 		$breaker = false;
-		while (list($k,$char) = each($breakChars)) {
+		while (list($k, $char) = each($breakChars)) {
 			$test = strpos($substr, $char);
 			if ($test !== false && $test < $end) {
 				$end = $test;
@@ -2600,7 +2600,7 @@ 
 	 * @param string $curBlock the current parser-block being processed
 	 * @return string the original string with variables replaced
 	 */
-	protected function replaceStringVars($string, $first, $curBlock='')
+	protected function replaceStringVars($string, $first, $curBlock = '')
 	{
 		$pos = 0;
 		if ($this->debug) echo 'STRING VAR REPLACEMENT : '.$string.'<br>';
@@ -2612,16 +2612,16 @@ 
 				continue;
 			}
 
-			$var = $this->parse($string, $pos, null, false, ($curBlock === 'modifier' ? 'modifier' : ($prev === '`' ? 'delimited_string':'string')));
+			$var = $this->parse($string, $pos, null, false, ($curBlock === 'modifier' ? 'modifier' : ($prev === '`' ? 'delimited_string' : 'string')));
 			$len = $var[0];
-			$var = $this->parse(str_replace('\\'.$first, $first, $string), $pos, null, false, ($curBlock === 'modifier' ? 'modifier' : ($prev === '`' ? 'delimited_string':'string')));
+			$var = $this->parse(str_replace('\\'.$first, $first, $string), $pos, null, false, ($curBlock === 'modifier' ? 'modifier' : ($prev === '`' ? 'delimited_string' : 'string')));
 
 			if ($prev === '`' && substr($string, $pos+$len, 1) === '`') {
 				$string = substr_replace($string, $first.'.'.$var[1].'.'.$first, $pos-1, $len+2);
 			} else {
 				$string = substr_replace($string, $first.'.'.$var[1].'.'.$first, $pos, $len);
 			}
-			$pos += strlen($var[1]) + 2;
+			$pos += strlen($var[1])+2;
 			if ($this->debug) echo 'STRING VAR REPLACEMENT DONE : '.$string.'<br>';
 		}
 
@@ -2630,7 +2630,7 @@ 
 		$string = preg_replace_callback('#("|\')\.(.+?)\.\1((?:\|(?:@?[a-z0-9_]+(?:(?::("|\').+?\4|:[^`]*))*))+)#i', array($this, 'replaceModifiers'), $string);
 
 		// replace escaped dollar operators by unescaped ones if required
-		if ($first==="'") {
+		if ($first === "'") {
 			$string = str_replace('\\$', '$', $string);
 		}
 
@@ -2712,7 +2712,7 @@ 
 						if ($paramstr[$ptr] !== '|') {
 							$continue = false;
 							if ($pointer !== null) {
-								$pointer -= strlen($paramstr) - $ptr;
+								$pointer -= strlen($paramstr)-$ptr;
 							}
 						}
 						$ptr++;
@@ -2806,7 +2806,7 @@ 
 					if ($pluginType & Dwoo_Core::CLASS_PLUGIN) {
 						$callback = array($pluginName, ($pluginType & Dwoo_Core::COMPILABLE_PLUGIN) ? 'compile' : 'process');
 					} else {
-						$callback = $pluginName . (($pluginType & Dwoo_Core::COMPILABLE_PLUGIN) ? '_compile' : '');
+						$callback = $pluginName.(($pluginType & Dwoo_Core::COMPILABLE_PLUGIN) ? '_compile' : '');
 					}
 				}
 
@@ -2885,7 +2885,7 @@ 
 		} elseif ($curBlock === 'var' || $m[1] === null) {
 			return $output;
 		} elseif ($curBlock === 'string' || $curBlock === 'root') {
-			return $m[1].'.'.$output.'.'.$m[1].(isset($add)?$add:null);
+			return $m[1].'.'.$output.'.'.$m[1].(isset($add) ? $add : null);
 		}
 	}
 
@@ -2960,9 +2960,9 @@ 
 			} elseif (function_exists('smarty_block_'.$name) !== false) {
 				$pluginType = Dwoo_Core::SMARTY_BLOCK;
 			} else {
-				if ($pluginType===-1) {
+				if ($pluginType === -1) {
 					try {
-						$this->dwoo->getLoader()->loadPlugin($name, isset($phpFunc)===false);
+						$this->dwoo->getLoader()->loadPlugin($name, isset($phpFunc) === false);
 					} catch (Exception $e) {
 						if (isset($phpFunc)) {
 							$pluginType = Dwoo_Core::NATIVE_PLUGIN;
@@ -3019,7 +3019,7 @@ 
 	 * @param array $map the parameter map to use, if not provided it will be built from the callback
 	 * @return array parameters sorted in the correct order with missing optional parameters filled
 	 */
-	protected function mapParams(array $params, $callback, $callType=2, $map = null)
+	protected function mapParams(array $params, $callback, $callType = 2, $map = null)
 	{
 		if (!$map) {
 			$map = $this->getParamMap($callback);
@@ -3038,11 +3038,11 @@ 
 		}
 
 		// loops over the param map and assigns values from the template or default value for unset optional params
-		while (list($k,$v) = each($map)) {
+		while (list($k, $v) = each($map)) {
 			if ($v[0] === '*') {
 				// "rest" array parameter, fill every remaining params in it and then break
 				if (count($ps) === 0) {
-					if ($v[1]===false) {
+					if ($v[1] === false) {
 						throw new Dwoo_Compilation_Exception($this, 'Rest argument missing for '.str_replace(array('Dwoo_Plugin_', '_compile'), '', (is_array($callback) ? $callback[0] : $callback)));
 					} else {
 						break;
@@ -3068,11 +3068,11 @@ 
 				// parameter is defined as ordered param
 				$paramlist[$v[0]] = $ps[$k];
 				unset($ps[$k]);
-			} elseif ($v[1]===false) {
+			} elseif ($v[1] === false) {
 				// parameter is not defined and not optional, throw error
 				if (is_array($callback)) {
 					if (is_object($callback[0])) {
-						$name = get_class($callback[0]) . '::' . $callback[1];
+						$name = get_class($callback[0]).'::'.$callback[1];
 					} else {
 						$name = $callback[0];
 					}
@@ -3081,7 +3081,7 @@ 
 				}
 
 				throw new Dwoo_Compilation_Exception($this, 'Argument '.$k.'/'.$v[0].' missing for '.str_replace(array('Dwoo_Plugin_', '_compile'), '', $name));
-			} elseif ($v[2]===null) {
+			} elseif ($v[2] === null) {
 				// enforce lowercased null if default value is null (php outputs NULL with var export)
 				$paramlist[$v[0]] = array('null', null, self::T_NULL);
 			} else {