dwoo-project / dwoo

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/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

Switch Indentation +11 added lines, -11 removed lines

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

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/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/Adapters/CodeIgniter/libraries/Dwootemplate.php

Spacing +2 added lines, -2 removed lines

@@ -97,14 +97,14 @@
         $CI->benchmark->mark('dwoo_parse_start');
 
         // Check if file exists
-        if ( !file_exists($this->template_dir . $sTemplate ) ) {
+        if (!file_exists($this->template_dir.$sTemplate)) {
             $message = sprintf('Template file \'%s\' not found.', $sTemplate);
             show_error($message);
             log_message('error', $message);
         }
 
         // Create new template
-        $tpl = new Dwoo_Template_File($this->template_dir . $sTemplate);
+        $tpl = new Dwoo_Template_File($this->template_dir.$sTemplate);
 
         // render the template
         $template = $this->get($tpl, $this->dwoo_data);

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

Spacing +3 added lines, -3 removed lines

@@ -1,12 +1,12 @@
 <?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 // The name of the directory where templates are located.
-$config['template_dir'] = dirname(FCPATH) . '/../application/views/';
+$config['template_dir'] = dirname(FCPATH).'/../application/views/';
 
 // The directory where compiled templates are located
-$config['compileDir']   = dirname(FCPATH) . '/../compile/';
+$config['compileDir']   = dirname(FCPATH).'/../compile/';
 
 //This tells Dwoo whether or not to cache the output of the templates to the $cache_dir.
 $config['caching']      = 0;
-$config['cacheDir']     = dirname(FCPATH) . '/../cache/';
+$config['cacheDir']     = dirname(FCPATH).'/../cache/';
 $config['cacheTime']    = 0;

lib/Dwoo/Adapters/ZendFramework/Dwoo.php

Spacing +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@
 			return $this->getPluginProxy()->view->$name;
 		}
 		$trace = debug_backtrace();
-		trigger_error('Undefined property via __get(): ' . $name .
-					  ' in ' . $trace[0]['file'] .
-					  ' on line ' . $trace[0]['line'], E_USER_NOTICE);
+		trigger_error('Undefined property via __get(): '.$name.
+					  ' in '.$trace[0]['file'].
+					  ' on line '.$trace[0]['line'], E_USER_NOTICE);
 		return null;
 	}
 }
\ No newline at end of file