dwoo-project / dwoo

lib/Dwoo/Template/String.php

Spacing +8 added lines, -8 removed lines

@@ -267,7 +267,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;
@@ -293,7 +293,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;
@@ -329,7 +329,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));
 	}
 
 	/**
@@ -426,10 +426,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';
 	}
 
 	/**
@@ -453,9 +453,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';
 	}
 
 	/**
@@ -504,7 +504,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/Adapters/Agavi/DwooRenderer.php

Spacing +10 added lines, -10 removed lines

@@ -126,12 +126,12 @@ 
 	 */
 	protected function getEngine()
 	{
-		if($this->dwoo) {
+		if ($this->dwoo) {
 			return $this->dwoo;
 		}
 
 		// this triggers Agavi autoload
-		if(!class_exists('Dwoo')) {
+		if (!class_exists('Dwoo')) {
 			if (file_exists(dirname(__FILE__).'/../../../dwooAutoload.php')) {
 				// file was dropped with the entire dwoo package
 				require dirname(__FILE__).'/../../../dwooAutoload.php';
@@ -143,10 +143,10 @@ 
 
 		$parentMode = fileperms(AgaviConfig::get('core.cache_dir'));
 
-		$compileDir = AgaviConfig::get('core.cache_dir') . DIRECTORY_SEPARATOR . self::COMPILE_DIR . DIRECTORY_SEPARATOR . self::COMPILE_SUBDIR;
+		$compileDir = AgaviConfig::get('core.cache_dir').DIRECTORY_SEPARATOR.self::COMPILE_DIR.DIRECTORY_SEPARATOR.self::COMPILE_SUBDIR;
 		AgaviToolkit::mkdir($compileDir, $parentMode, true);
 
-		$cacheDir = AgaviConfig::get('core.cache_dir') . DIRECTORY_SEPARATOR . self::CACHE_DIR;
+		$cacheDir = AgaviConfig::get('core.cache_dir').DIRECTORY_SEPARATOR.self::CACHE_DIR;
 		AgaviToolkit::mkdir($cacheDir, $parentMode, true);
 
 		$this->dwoo = new Dwoo_Core($compileDir, $cacheDir);
@@ -177,23 +177,23 @@ 
 		$engine = $this->getEngine();
 
 		$data = array();
-		if($this->extractVars) {
+		if ($this->extractVars) {
 			$data = $attributes;
 		} else {
 			$data[$this->varName] = &$attributes;
 		}
 
-		$data[$this->slotsVarName] =& $slots;
+		$data[$this->slotsVarName] = & $slots;
 
-		foreach($this->assigns as $key => $getter) {
+		foreach ($this->assigns as $key => $getter) {
 			$data[$key] = $this->getContext()->$getter();
 		}
 
-		foreach($moreAssigns as $key => &$value) {
-			if(isset($this->moreAssignNames[$key])) {
+		foreach ($moreAssigns as $key => &$value) {
+			if (isset($this->moreAssignNames[$key])) {
 				$key = $this->moreAssignNames[$key];
 			}
-			$data[$key] =& $value;
+			$data[$key] = & $value;
 		}
 
 		return $engine->get($layer->getResourceStreamIdentifier(), $data);