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

Indentation +149 added lines, -149 removed lines

@@ -20,153 +20,153 @@
  * @uses the dwoo package from http://dwoo.org
  */
 class Dwootemplate extends Dwoo_Core {
-    protected $dwoo_data = array();
-
-    /**
-     * Constructor for the DwooTemplate engine
-     *
-     */
-    public function __construct() {
-        // Call parents constructor
-        parent::__construct();
-
-        // Set the config settings
-        $this->initialize();
-
-        // Assign some defaults to dwoo
-        $CI                         = get_instance();
-        $this->dwoo_data            = new Dwoo_Data();
-        $this->dwoo_data->js_files  = array();
-        $this->dwoo_data->css_files = array();
-        $this->dwoo_data->CI        = $CI;
-        $this->dwoo_data->site_url  = $CI->config->site_url(); // so we can get the full path to CI easily
-        $this->dwoo_data->uniqid    = uniqid();
-        $this->dwoo_data->timestamp = mktime();
-
-        log_message('debug', "Dwoo Template Class Initialized");
-    }
-
-
-    /**
-     * Assign data to dwoo data object
-     *
-     * @param string $key
-     * @param mixed $value
-     */
-    public function assign($key, $value) {
-        $this->dwoo_data->$key = $value;
-    }
-
-
-    /**
-     * Add Javascript files to template
-     *
-     * @param string $js
-     */
-    public function add_js($js) {
-        $current   = $this->dwoo_data->js_files;
-        $current[] = $js;
-        $this->dwoo_data->js_files = $current;
-    }
-
-
-    /**
-     * Add Css stylesheets to template
-     *
-     * @param string $css
-     */
-    public function add_css($css) {
-        $current   = $this->dwoo_data->css_files;
-        $current[] = $css;
-        $this->dwoo_data->css_files = $current;
-    }
-
-
-    /**
-     * Display or return the compiled template
-     * Since we assign the results to the standard CI output module
-     * you can also use the helper from CI in your templates!!
-     *
-     * @param string $sTemplate
-     * @param boolean $return
-     * @return mixed
-     */
-    public function display($sTemplate, $return = FALSE) {
-        // Start benchmark
-        $CI = get_instance();
-        $CI->benchmark->mark('dwoo_parse_start');
-
-        // Check if file exists
-        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);
-
-        // render the template
-        $template = $this->get($tpl, $this->dwoo_data);
-
-        // Finish benchmark
-        $CI->benchmark->mark('dwoo_parse_end');
-
-        // Return results or not ?
-        if ($return == FALSE) {
-            $CI->output->final_output = $template;
-        } else {
-            return $template;
-        }
-    }
-
-
-    /**
-     * Toggle Codeigniter profiler on/off
-     *
-     */
-    public function enable_profiler($toggle = TRUE) {
-        $CI = get_instance();
-        $CI->output->enable_profiler($toggle);
-    }
-
-
-    /**
-     * Set http header
-     *
-     * @example $this->output->set_header("HTTP/1.1 200 OK");
-     * @example $this->output->set_header('Last-Modified: '.gmdate('D, d M Y H:i:s', $last_update).' GMT');
-     * @param string $header
-     */
-    public function set_header($header) {
-        $CI = get_instance();
-        $CI->output->set_header($header);
-    }
-
-
-    /**
-     * Set status header
-     *
-     * @example $this->output->set_status_header('401');
-     * @example // Sets the header as: Unauthorized
-     * @param string $header
-     */
-    public function set_status_header($header) {
-        $CI = get_instance();
-        $CI->output->set_status_header($header);
-    }
-
-
-    /**
-     * Assign the dwootemplate config items to the instance
-     *
-     */
-    private function initialize() {
-        $CI = get_instance();
-        $CI->config->load('dwootemplate', TRUE);
-        $config = $CI->config->item('dwootemplate');
-        foreach ($config as $key => $val) {
-                $this->$key = $val;
-        }
-    }
+	protected $dwoo_data = array();
+
+	/**
+	 * Constructor for the DwooTemplate engine
+	 *
+	 */
+	public function __construct() {
+		// Call parents constructor
+		parent::__construct();
+
+		// Set the config settings
+		$this->initialize();
+
+		// Assign some defaults to dwoo
+		$CI                         = get_instance();
+		$this->dwoo_data            = new Dwoo_Data();
+		$this->dwoo_data->js_files  = array();
+		$this->dwoo_data->css_files = array();
+		$this->dwoo_data->CI        = $CI;
+		$this->dwoo_data->site_url  = $CI->config->site_url(); // so we can get the full path to CI easily
+		$this->dwoo_data->uniqid    = uniqid();
+		$this->dwoo_data->timestamp = mktime();
+
+		log_message('debug', "Dwoo Template Class Initialized");
+	}
+
+
+	/**
+	 * Assign data to dwoo data object
+	 *
+	 * @param string $key
+	 * @param mixed $value
+	 */
+	public function assign($key, $value) {
+		$this->dwoo_data->$key = $value;
+	}
+
+
+	/**
+	 * Add Javascript files to template
+	 *
+	 * @param string $js
+	 */
+	public function add_js($js) {
+		$current   = $this->dwoo_data->js_files;
+		$current[] = $js;
+		$this->dwoo_data->js_files = $current;
+	}
+
+
+	/**
+	 * Add Css stylesheets to template
+	 *
+	 * @param string $css
+	 */
+	public function add_css($css) {
+		$current   = $this->dwoo_data->css_files;
+		$current[] = $css;
+		$this->dwoo_data->css_files = $current;
+	}
+
+
+	/**
+	 * Display or return the compiled template
+	 * Since we assign the results to the standard CI output module
+	 * you can also use the helper from CI in your templates!!
+	 *
+	 * @param string $sTemplate
+	 * @param boolean $return
+	 * @return mixed
+	 */
+	public function display($sTemplate, $return = FALSE) {
+		// Start benchmark
+		$CI = get_instance();
+		$CI->benchmark->mark('dwoo_parse_start');
+
+		// Check if file exists
+		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);
+
+		// render the template
+		$template = $this->get($tpl, $this->dwoo_data);
+
+		// Finish benchmark
+		$CI->benchmark->mark('dwoo_parse_end');
+
+		// Return results or not ?
+		if ($return == FALSE) {
+			$CI->output->final_output = $template;
+		} else {
+			return $template;
+		}
+	}
+
+
+	/**
+	 * Toggle Codeigniter profiler on/off
+	 *
+	 */
+	public function enable_profiler($toggle = TRUE) {
+		$CI = get_instance();
+		$CI->output->enable_profiler($toggle);
+	}
+
+
+	/**
+	 * Set http header
+	 *
+	 * @example $this->output->set_header("HTTP/1.1 200 OK");
+	 * @example $this->output->set_header('Last-Modified: '.gmdate('D, d M Y H:i:s', $last_update).' GMT');
+	 * @param string $header
+	 */
+	public function set_header($header) {
+		$CI = get_instance();
+		$CI->output->set_header($header);
+	}
+
+
+	/**
+	 * Set status header
+	 *
+	 * @example $this->output->set_status_header('401');
+	 * @example // Sets the header as: Unauthorized
+	 * @param string $header
+	 */
+	public function set_status_header($header) {
+		$CI = get_instance();
+		$CI->output->set_status_header($header);
+	}
+
+
+	/**
+	 * Assign the dwootemplate config items to the instance
+	 *
+	 */
+	private function initialize() {
+		$CI = get_instance();
+		$CI->config->load('dwootemplate', TRUE);
+		$config = $CI->config->item('dwootemplate');
+		foreach ($config as $key => $val) {
+				$this->$key = $val;
+		}
+	}
 }
\ No newline at end of file

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/CodeIgniter/controllers/dwoowelcome.php

Indentation +10 added lines, -10 removed lines

@@ -2,15 +2,15 @@
 
 class Dwoowelcome extends Controller {
 
-    function __construct()
-    {
-        parent::Controller();
-    }
+	function __construct()
+	{
+		parent::Controller();
+	}
 
-    function index()
-    {
-    	$this->load->library('Dwootemplate');
-    	$this->dwootemplate->assign('itshowlate', date('H:i:s'));
-    	$this->dwootemplate->display('dwoowelcome.tpl');
-    }
+	function index()
+	{
+		$this->load->library('Dwootemplate');
+		$this->dwootemplate->assign('itshowlate', date('H:i:s'));
+		$this->dwootemplate->display('dwoowelcome.tpl');
+	}
 }
\ No newline at end of file

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