PrivateBin / PrivateBin

lib/i18n.php

Doc Comments -2 removed lines

@@ -77,7 +77,6 @@ 
      * @access public
      * @static
      * @param  string $messageId
-     * @param  mixed $args one or multiple parameters injected into placeholders
      * @return string
      */
     public static function _($messageId)
@@ -91,7 +90,6 @@ 
      * @access public
      * @static
      * @param  string $messageId
-     * @param  mixed $args one or multiple parameters injected into placeholders
      * @return string
      */
     public static function translate($messageId)

Spacing +3 added lines, -3 removed lines

@@ -112,7 +112,7 @@ 
         {
             $number = (int) $args[1];
             $key = self::_getPluralForm($number);
-            $max = count(self::$_translations[$messageId]) - 1;
+            $max = count(self::$_translations[$messageId])-1;
             if ($key > $max) $key = $max;
 
             $args[0] = self::$_translations[$messageId][$key];
@@ -306,7 +306,7 @@ 
             case 'zh':
                 return ($n > 1 ? 1 : 0);
             case 'pl':
-                return ($n == 1 ? 0 : $n%10 >= 2 && $n %10 <=4 && ($n%100 < 10 || $n%100 >= 20) ? 1 : 2);
+                return ($n == 1 ? 0 : $n % 10 >= 2 && $n % 10 <= 4 && ($n % 100 < 10 || $n % 100 >= 20) ? 1 : 2);
             // en, de
             default:
                 return ($n != 1 ? 1 : 0);
@@ -386,7 +386,7 @@ 
     protected static function _matchLanguage($a, $b) {
         $a = explode('-', $a);
         $b = explode('-', $b);
-        for ($i=0, $n=min(count($a), count($b)); $i<$n; $i++)
+        for ($i = 0, $n = min(count($a), count($b)); $i < $n; $i++)
         {
             if ($a[$i] !== $b[$i]) break;
         }

Braces +23 added lines, -12 removed lines

@@ -96,8 +96,12 @@ 
      */
     public static function translate($messageId)
     {
-        if (empty($messageId)) return $messageId;
-        if (count(self::$_translations) === 0) self::loadTranslations();
+        if (empty($messageId)) {
+            return $messageId;
+        }
+        if (count(self::$_translations) === 0) {
+            self::loadTranslations();
+        }
         $messages = $messageId;
         if (is_array($messageId))
         {
@@ -113,12 +117,13 @@ 
             $number = (int) $args[1];
             $key = self::_getPluralForm($number);
             $max = count(self::$_translations[$messageId]) - 1;
-            if ($key > $max) $key = $max;
+            if ($key > $max) {
+                $key = $max;
+            }
 
             $args[0] = self::$_translations[$messageId][$key];
             $args[1] = $number;
-        }
-        else
+        } else
         {
             $args[0] = self::$_translations[$messageId];
         }
@@ -208,8 +213,7 @@ 
                     if (!isset($match[2]))
                     {
                         $match[2] = '1.0';
-                    }
-                    else
+                    } else
                     {
                         $match[2] = (string) floatval($match[2]);
                     }
@@ -254,7 +258,9 @@ 
         {
             self::$_languageLabels = json_decode(file_get_contents($file), true);
         }
-        if (count($languages) == 0) return self::$_languageLabels;
+        if (count($languages) == 0) {
+            return self::$_languageLabels;
+        }
         return array_intersect_key(self::$_languageLabels, array_flip($languages));
     }
 
@@ -268,8 +274,9 @@ 
      */
     public static function setLanguageFallback($lang)
     {
-        if (in_array($lang, self::getAvailableLanguages()))
-            self::$_languageFallback = $lang;
+        if (in_array($lang, self::getAvailableLanguages())) {
+                    self::$_languageFallback = $lang;
+        }
     }
 
     /**
@@ -330,7 +337,9 @@ 
         foreach ($acceptedLanguages as $acceptedQuality => $acceptedValues)
         {
             $acceptedQuality = floatval($acceptedQuality);
-            if ($acceptedQuality === 0.0) continue;
+            if ($acceptedQuality === 0.0) {
+                continue;
+            }
             foreach ($availableLanguages as $availableValue)
             {
                 $availableQuality = 1.0;
@@ -388,7 +397,9 @@ 
         $b = explode('-', $b);
         for ($i=0, $n=min(count($a), count($b)); $i<$n; $i++)
         {
-            if ($a[$i] !== $b[$i]) break;
+            if ($a[$i] !== $b[$i]) {
+                break;
+            }
         }
         return $i === 0 ? 0 : (float) $i / count($a);
     }

lib/persistence.php

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
      * @access public
      * @static
      * @param  string $filename
-     * @return void
+     * @return string
      */
     public static function getPath($filename = null)
     {

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
      */
     public static function getPath($filename = null)
     {
-        if(strlen($filename)) {
+        if (strlen($filename)) {
             return self::$_path . DIRECTORY_SEPARATOR . $filename;
         } else {
             return self::$_path;
@@ -92,7 +92,7 @@ 
             $writtenBytes = @file_put_contents(
                 $file,
                 'Allow from none' . PHP_EOL .
-                'Deny from all'. PHP_EOL,
+                'Deny from all' . PHP_EOL,
                 LOCK_EX
             );
             if ($writtenBytes === false || $writtenBytes < 30) {

Braces +3 added lines, -2 removed lines

@@ -81,9 +81,10 @@
     protected static function _initialize()
     {
         // Create storage directory if it does not exist.
-        if (!is_dir(self::$_path))
-            if (!@mkdir(self::$_path))
+        if (!is_dir(self::$_path)) {
+                    if (!@mkdir(self::$_path))
                 throw new Exception('unable to create directory ' . self::$_path, 10);
+        }
 
         // Create .htaccess file if it does not exist.
         $file = self::$_path . DIRECTORY_SEPARATOR . '.htaccess';

lib/RainTPL.php

Doc Comments +3 added lines, -5 removed lines

@@ -174,7 +174,7 @@ 
 	 * eg. 	$t->assign('name','mickey');
 	 *
 	 * @access public
-	 * @param  mixed $variable_name Name of template variable or associative array name/value
+	 * @param  string $variable Name of template variable or associative array name/value
 	 * @param  mixed $value value assigned to this variable. Not set if variable_name is an associative array
 	 */
 	public function assign( $variable, $value = null ){
@@ -252,7 +252,7 @@ 
 	 *
 	 * @access public
 	 * @param  string $tpl_name Name of template (set the same of draw)
-	 * @param  int $expiration_time Set after how many seconds the cache expire and must be regenerated
+	 * @param  int $expire_time Set after how many seconds the cache expire and must be regenerated
 	 * @param  string $cache_id Suffix to be used when writing file to cache (optional)
 	 * @return string it return the HTML or null if the cache must be recreated
 	 */
@@ -299,7 +299,7 @@ 
 	 * @access protected
 	 * @param  string $tpl_name template name to check
 	 * @throws RainTpl_NotFoundException
-	 * @return bool return true if the template has changed
+	 * @return boolean|null return true if the template has changed
 	 */
 	protected function check_template( $tpl_name ){
 
@@ -1168,8 +1168,6 @@ 
  * alias for i18n::translate()
  *
  * @access public
- * @param  string $messageId
- * @param  mixed $args one or multiple parameters injected into placeholders
  * @return string
  */
 function t() {

Indentation +976 added lines, -976 removed lines

@@ -14,1046 +14,1046 @@ 
  */
 class RainTPL{
 
-	// -------------------------
-	// 	CONFIGURATION
-	// -------------------------
-
-		/**
-		 * Template directory
-		 *
-		 * @var string
-		 */
-		static $tpl_dir = 'tpl/';
-
-
-		/**
-		 * Cache directory
-		 *
-		 * Is the directory where RainTPL will compile the template and save the cache
-		 *
-		 * @var string
-		 */
-		static $cache_dir = 'tmp/';
-
-
-		/**
-		 * Template base URL
-		 *
-		 * RainTPL will add this URL to the relative paths of element selected in $path_replace_list.
-		 *
-		 * @var string
-		 */
-		static $base_url = null;
-
-
-		/**
-		 * Template extension
-		 *
-		 * @var string
-		 */
-		static $tpl_ext = "html";
-
-
-		/**
-		 * Should the path be replaced
-		 *
-		 * Path replace is a cool features that replace all relative paths of images (<img src="...">), stylesheet (<link href="...">), script (<script src="...">) and link (<a href="...">)
-		 * Set true to enable the path replace.
-		 *
-		 * @var boolean
-		 */
-		static $path_replace = true;
-
-
-		/**
-		 * You can set what the path_replace method will replace.
-		 * Avaible options: a, img, link, script, input
-		 *
-		 * @var array
-		 */
-		static $path_replace_list = array( 'a', 'img', 'link', 'script', 'input' );
-
-
-		/**
-		 * You can define in the black list what string are disabled into the template tags
-		 *
-		 * @var array
-		 */
-		static $black_list = array( '\$this', 'raintpl::', 'self::', '_SESSION', '_SERVER', '_ENV',  'eval', 'exec', 'unlink', 'rmdir' );
-
-
-		/**
-		 * Check template
-		 *
-		 * true: checks template update time, if changed it compile them
-		 * false: loads the compiled template. Set false if server doesn't have write permission for cache_directory.
-		 *
-		 * @var bool
-		 */
-		static $check_template_update = true;
-
-
-		/**
-		 * PHP tags <? ?>
-		 *
-		 * True: php tags are enabled into the template
-		 * False: php tags are disabled into the template and rendered as html
-		 *
-		 * @var bool
-		 */
-		static $php_enabled = false;
-
-
-		/**
-		 * Debug mode flag
-		 *
-		 * True: debug mode is used, syntax errors are displayed directly in template. Execution of script is not terminated.
-		 * False: exception is thrown on found error.
-		 *
-		 * @var bool
-		 */
-		static $debug = false;
-
-	// -------------------------
-
-
-	// -------------------------
-	// 	RAINTPL VARIABLES
-	// -------------------------
-
-		/**
-		 * Is the array where RainTPL keep the variables assigned
-		 *
-		 * @var array
-		 */
-		public $var = array();
-
-		/**
-		 * variables to keep the template directories and info
-		 *
-		 * @var array
-		 */
-		protected $tpl = array();		//
-
-		/**
-		 * static cache enabled / disabled
-		 *
-		 * @var bool
-		 */
-		protected $cache = false;
-
-		/**
-		 * identify only one cache
-		 *
-		 * @var string
-		 */
-		protected $cache_id = '';
-
-		/**
-		 * takes all the config to create the md5 of the file
-		 *
-		 * @var array the file
-		 */
-		protected static $config_name_sum = array();
-
-	// -------------------------
-
-
-
-	/**
-	 * default cache expire time = hour
-	 *
-	 * @const int
-	 */
-	const CACHE_EXPIRE_TIME = 3600;
-
-
-
-	/**
-	 * Assign variable
-	 * eg. 	$t->assign('name','mickey');
-	 *
-	 * @access public
-	 * @param  mixed $variable_name Name of template variable or associative array name/value
-	 * @param  mixed $value value assigned to this variable. Not set if variable_name is an associative array
-	 */
-	public function assign( $variable, $value = null ){
-		if( is_array( $variable ) )
-			$this->var += $variable;
-		else
-			$this->var[ $variable ] = $value;
-	}
-
-
-
-	/**
-	 * Draw the template
-	 * eg. 	$html = $tpl->draw( 'demo', TRUE ); // return template in string
-	 * or 	$tpl->draw( $tpl_name ); // echo the template
-	 *
-	 * @access public
-	 * @param  string $tpl_name  template to load
-	 * @param  boolean $return_string  true=return a string, false=echo the template
-	 * @return string
-	 */
-	public function draw( $tpl_name, $return_string = false ){
-
-		try {
-			// compile the template if necessary and set the template filepath
-			$this->check_template( $tpl_name );
-		} catch (RainTpl_Exception $e) {
-			$output = $this->printDebug($e);
-			die($output);
-		}
-
-		// Cache is off and, return_string is false
-		// Rain just echo the template
-
-		if( !$this->cache && !$return_string ){
-			extract( $this->var );
-			include $this->tpl['compiled_filename'];
-			unset( $this->tpl );
-		}
-
-
-		// cache or return_string are enabled
-		// rain get the output buffer to save the output in the cache or to return it as string
-
-		else{
-
-			//----------------------
-			// get the output buffer
-			//----------------------
-				ob_start();
-				extract( $this->var );
-				include $this->tpl['compiled_filename'];
-				$raintpl_contents = ob_get_clean();
-			//----------------------
-
-
-			// save the output in the cache
-			if( $this->cache )
-				file_put_contents( $this->tpl['cache_filename'], "<?php if(!class_exists('raintpl')){exit;}?>" . $raintpl_contents );
-
-			// free memory
-			unset( $this->tpl );
-
-			// return or print the template
-			if( $return_string ) return $raintpl_contents; else echo $raintpl_contents;
-
-		}
-
-	}
-
-
-
-	/**
-	 * If exists a valid cache for this template it returns the cache
-	 *
-	 * @access public
-	 * @param  string $tpl_name Name of template (set the same of draw)
-	 * @param  int $expiration_time Set after how many seconds the cache expire and must be regenerated
-	 * @param  string $cache_id Suffix to be used when writing file to cache (optional)
-	 * @return string it return the HTML or null if the cache must be recreated
-	 */
-	public function cache( $tpl_name, $expire_time = self::CACHE_EXPIRE_TIME, $cache_id = '' ){
-
-		// set the cache_id
-		$this->cache_id = $cache_id;
-
-		if( !$this->check_template( $tpl_name ) && file_exists( $this->tpl['cache_filename'] ) && ( time() - filemtime( $this->tpl['cache_filename'] ) < $expire_time ) )
-			return substr( file_get_contents( $this->tpl['cache_filename'] ), 43 );
-		else{
-			//delete the cache of the selected template
-			if (file_exists($this->tpl['cache_filename']))
-			unlink($this->tpl['cache_filename'] );
-			$this->cache = true;
-		}
-	}
-
-
-
-	/**
-	 * Configure the settings of RainTPL
-	 *
-	 * @access public
-	 * @static
-	 * @param  array|string $setting array of settings or setting name
-	 * @param  mixed $value content to set in the setting (optional)
-	 */
-	public static function configure( $setting, $value = null ){
-		if( is_array( $setting ) )
-			foreach( $setting as $key => $value )
-				self::configure( $key, $value );
-		else if( property_exists( __CLASS__, $setting ) ){
-			self::$$setting = $value;
-			self::$config_name_sum[ $setting ] = $value; // take trace of all config
-		}
-	}
-
-
-
-	/**
-	 * Check if has to compile the template
-	 *
-	 * @access protected
-	 * @param  string $tpl_name template name to check
-	 * @throws RainTpl_NotFoundException
-	 * @return bool return true if the template has changed
-	 */
-	protected function check_template( $tpl_name ){
-
-		if( !isset($this->tpl['checked']) ){
-
-			$tpl_basename					   = basename( $tpl_name );														// template basename
-			$tpl_basedir						= strpos($tpl_name,"/") ? dirname($tpl_name) . '/' : null;						// template basedirectory
-			$tpl_dir							= PATH . self::$tpl_dir . $tpl_basedir;								// template directory
-			$this->tpl['tpl_filename']		  = $tpl_dir . $tpl_basename . '.' . self::$tpl_ext;	// template filename
-			$temp_compiled_filename			 = PATH . self::$cache_dir . $tpl_basename . "." . md5( $tpl_dir . serialize(self::$config_name_sum));
-			$this->tpl['compiled_filename']	 = $temp_compiled_filename . '.rtpl.php';	// cache filename
-			$this->tpl['cache_filename']		= $temp_compiled_filename . '.s_' . $this->cache_id . '.rtpl.php';	// static cache filename
-
-			// if the template doesn't exsist throw an error
-			if( self::$check_template_update && !file_exists( $this->tpl['tpl_filename'] ) ){
-				$e = new RainTpl_NotFoundException( 'Template '. $tpl_basename .' not found!' );
-				throw $e->setTemplateFile($this->tpl['tpl_filename']);
-			}
-
-			// file doesn't exsist, or the template was updated, Rain will compile the template
-			if( !file_exists( $this->tpl['compiled_filename'] ) || ( self::$check_template_update && filemtime($this->tpl['compiled_filename']) < filemtime( $this->tpl['tpl_filename'] ) ) ){
-				$this->compileFile( $tpl_basename, $tpl_basedir, $this->tpl['tpl_filename'], PATH . self::$cache_dir, $this->tpl['compiled_filename'] );
-				return true;
-			}
-			$this->tpl['checked'] = true;
-		}
-	}
-
-
-
-	/**
-	 * execute stripslaches() on the xml block. Invoqued by preg_replace_callback function below
-	 *
-	 * @access protected
-	 * @param string $capture
-	 * @return string
-	 */
-	protected function xml_reSubstitution($capture) {
-			return "<?php echo '<?xml ".stripslashes($capture[1])." ?>'; ?>";
-	}
-
-
-
-	/**
-	 * Compile and write the compiled template file
-	 *
-	 * @access protected
-	 * @param  string $tpl_basename
-	 * @param  string $tpl_basedir
-	 * @param  string $tpl_filename
-	 * @param  string $cache_dir
-	 * @param  string $compiled_filename
-	 * @throws RainTpl_Exception
-	 * @return void
-	 */
-	protected function compileFile( $tpl_basename, $tpl_basedir, $tpl_filename, $cache_dir, $compiled_filename ){
-
-		//read template file
-		$this->tpl['source'] = $template_code = file_get_contents( $tpl_filename );
-
-		//xml substitution
-		$template_code = preg_replace( "/<\?xml(.*?)\?>/s", "##XML\\1XML##", $template_code );
-
-		//disable php tag
-		if( !self::$php_enabled )
-			$template_code = str_replace( array("<?","?>"), array("&lt;?","?&gt;"), $template_code );
-
-		//xml re-substitution
-		$template_code = preg_replace_callback ( "/##XML(.*?)XML##/s", array($this, 'xml_reSubstitution'), $template_code );
-
-		//compile template
-		$template_compiled = "<?php if(!class_exists('raintpl')){exit;}?>" . $this->compileTemplate( $template_code, $tpl_basedir );
-
-
-		// fix the php-eating-newline-after-closing-tag-problem
-		$template_compiled = str_replace( "?>\n", "?>\n\n", $template_compiled );
-
-		// create directories
-		if( !is_dir( $cache_dir ) )
-			mkdir( $cache_dir, 0755, true );
-
-		if( !is_writable( $cache_dir ) )
-			throw new RainTpl_Exception ('Cache directory ' . $cache_dir . ' doesn\'t have write permission. Set write permission or set RAINTPL_CHECK_TEMPLATE_UPDATE to false. More details on http://www.raintpl.com/Documentation/Documentation-for-PHP-developers/Configuration/');
-
-		//write compiled file
-		file_put_contents( $compiled_filename, $template_compiled );
-	}
-
-
-
-	/**
-	 * Compile template
-	 *
-	 * @access protected
-	 * @param  string $template_code
-	 * @param  string $tpl_basedir
-	 * @return string
-	 */
-	protected function compileTemplate( $template_code, $tpl_basedir ){
-
-		//tag list
-		$tag_regexp = array( 'loop'		 => '(\{loop(?: name){0,1}="\${0,1}[^"]*"\})',
-							 'loop_close'   => '(\{\/loop\})',
-							 'if'		   => '(\{if(?: condition){0,1}="[^"]*"\})',
-							 'elseif'	   => '(\{elseif(?: condition){0,1}="[^"]*"\})',
-							 'else'		 => '(\{else\})',
-							 'if_close'	 => '(\{\/if\})',
-							 'function'	 => '(\{function="[^"]*"\})',
-							 'noparse'	  => '(\{noparse\})',
-							 'noparse_close'=> '(\{\/noparse\})',
-							 'ignore'	   => '(\{ignore\}|\{\*)',
-							 'ignore_close'	=> '(\{\/ignore\}|\*\})',
-							 'include'	  => '(\{include="[^"]*"(?: cache="[^"]*")?\})',
-							 'template_info'=> '(\{\$template_info\})',
-							 'function'		=> '(\{function="(\w*?)(?:.*?)"\})'
-							);
-
-		$tag_regexp = "/" . join( "|", $tag_regexp ) . "/";
-
-		//split the code with the tags regexp
-		$template_code = preg_split ( $tag_regexp, $template_code, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
-
-		//path replace (src of img, background and href of link)
-		$template_code = $this->path_replace( $template_code, $tpl_basedir );
-
-		//compile the code
-		$compiled_code = $this->compileCode( $template_code );
-
-		//return the compiled code
-		return $compiled_code;
-
-	}
+    // -------------------------
+    // 	CONFIGURATION
+    // -------------------------
+
+        /**
+         * Template directory
+         *
+         * @var string
+         */
+        static $tpl_dir = 'tpl/';
+
+
+        /**
+         * Cache directory
+         *
+         * Is the directory where RainTPL will compile the template and save the cache
+         *
+         * @var string
+         */
+        static $cache_dir = 'tmp/';
+
+
+        /**
+         * Template base URL
+         *
+         * RainTPL will add this URL to the relative paths of element selected in $path_replace_list.
+         *
+         * @var string
+         */
+        static $base_url = null;
+
+
+        /**
+         * Template extension
+         *
+         * @var string
+         */
+        static $tpl_ext = "html";
+
+
+        /**
+         * Should the path be replaced
+         *
+         * Path replace is a cool features that replace all relative paths of images (&lt;img src="..."&gt;), stylesheet (&lt;link href="..."&gt;), script (&lt;script src="..."&gt;) and link (&lt;a href="..."&gt;)
+         * Set true to enable the path replace.
+         *
+         * @var boolean
+         */
+        static $path_replace = true;
+
+
+        /**
+         * You can set what the path_replace method will replace.
+         * Avaible options: a, img, link, script, input
+         *
+         * @var array
+         */
+        static $path_replace_list = array( 'a', 'img', 'link', 'script', 'input' );
+
+
+        /**
+         * You can define in the black list what string are disabled into the template tags
+         *
+         * @var array
+         */
+        static $black_list = array( '\$this', 'raintpl::', 'self::', '_SESSION', '_SERVER', '_ENV',  'eval', 'exec', 'unlink', 'rmdir' );
+
+
+        /**
+         * Check template
+         *
+         * true: checks template update time, if changed it compile them
+         * false: loads the compiled template. Set false if server doesn't have write permission for cache_directory.
+         *
+         * @var bool
+         */
+        static $check_template_update = true;
+
+
+        /**
+         * PHP tags <? ?>
+         *
+         * True: php tags are enabled into the template
+         * False: php tags are disabled into the template and rendered as html
+         *
+         * @var bool
+         */
+        static $php_enabled = false;
+
+
+        /**
+         * Debug mode flag
+         *
+         * True: debug mode is used, syntax errors are displayed directly in template. Execution of script is not terminated.
+         * False: exception is thrown on found error.
+         *
+         * @var bool
+         */
+        static $debug = false;
+
+    // -------------------------
+
+
+    // -------------------------
+    // 	RAINTPL VARIABLES
+    // -------------------------
+
+        /**
+         * Is the array where RainTPL keep the variables assigned
+         *
+         * @var array
+         */
+        public $var = array();
+
+        /**
+         * variables to keep the template directories and info
+         *
+         * @var array
+         */
+        protected $tpl = array();		//
+
+        /**
+         * static cache enabled / disabled
+         *
+         * @var bool
+         */
+        protected $cache = false;
+
+        /**
+         * identify only one cache
+         *
+         * @var string
+         */
+        protected $cache_id = '';
+
+        /**
+         * takes all the config to create the md5 of the file
+         *
+         * @var array the file
+         */
+        protected static $config_name_sum = array();
+
+    // -------------------------
+
+
+
+    /**
+     * default cache expire time = hour
+     *
+     * @const int
+     */
+    const CACHE_EXPIRE_TIME = 3600;
+
+
+
+    /**
+     * Assign variable
+     * eg. 	$t->assign('name','mickey');
+     *
+     * @access public
+     * @param  mixed $variable_name Name of template variable or associative array name/value
+     * @param  mixed $value value assigned to this variable. Not set if variable_name is an associative array
+     */
+    public function assign( $variable, $value = null ){
+        if( is_array( $variable ) )
+            $this->var += $variable;
+        else
+            $this->var[ $variable ] = $value;
+    }
+
+
+
+    /**
+     * Draw the template
+     * eg. 	$html = $tpl->draw( 'demo', TRUE ); // return template in string
+     * or 	$tpl->draw( $tpl_name ); // echo the template
+     *
+     * @access public
+     * @param  string $tpl_name  template to load
+     * @param  boolean $return_string  true=return a string, false=echo the template
+     * @return string
+     */
+    public function draw( $tpl_name, $return_string = false ){
+
+        try {
+            // compile the template if necessary and set the template filepath
+            $this->check_template( $tpl_name );
+        } catch (RainTpl_Exception $e) {
+            $output = $this->printDebug($e);
+            die($output);
+        }
+
+        // Cache is off and, return_string is false
+        // Rain just echo the template
+
+        if( !$this->cache && !$return_string ){
+            extract( $this->var );
+            include $this->tpl['compiled_filename'];
+            unset( $this->tpl );
+        }
+
+
+        // cache or return_string are enabled
+        // rain get the output buffer to save the output in the cache or to return it as string
+
+        else{
+
+            //----------------------
+            // get the output buffer
+            //----------------------
+                ob_start();
+                extract( $this->var );
+                include $this->tpl['compiled_filename'];
+                $raintpl_contents = ob_get_clean();
+            //----------------------
+
+
+            // save the output in the cache
+            if( $this->cache )
+                file_put_contents( $this->tpl['cache_filename'], "<?php if(!class_exists('raintpl')){exit;}?>" . $raintpl_contents );
+
+            // free memory
+            unset( $this->tpl );
+
+            // return or print the template
+            if( $return_string ) return $raintpl_contents; else echo $raintpl_contents;
+
+        }
+
+    }
+
+
+
+    /**
+     * If exists a valid cache for this template it returns the cache
+     *
+     * @access public
+     * @param  string $tpl_name Name of template (set the same of draw)
+     * @param  int $expiration_time Set after how many seconds the cache expire and must be regenerated
+     * @param  string $cache_id Suffix to be used when writing file to cache (optional)
+     * @return string it return the HTML or null if the cache must be recreated
+     */
+    public function cache( $tpl_name, $expire_time = self::CACHE_EXPIRE_TIME, $cache_id = '' ){
+
+        // set the cache_id
+        $this->cache_id = $cache_id;
+
+        if( !$this->check_template( $tpl_name ) && file_exists( $this->tpl['cache_filename'] ) && ( time() - filemtime( $this->tpl['cache_filename'] ) < $expire_time ) )
+            return substr( file_get_contents( $this->tpl['cache_filename'] ), 43 );
+        else{
+            //delete the cache of the selected template
+            if (file_exists($this->tpl['cache_filename']))
+            unlink($this->tpl['cache_filename'] );
+            $this->cache = true;
+        }
+    }
+
+
+
+    /**
+     * Configure the settings of RainTPL
+     *
+     * @access public
+     * @static
+     * @param  array|string $setting array of settings or setting name
+     * @param  mixed $value content to set in the setting (optional)
+     */
+    public static function configure( $setting, $value = null ){
+        if( is_array( $setting ) )
+            foreach( $setting as $key => $value )
+                self::configure( $key, $value );
+        else if( property_exists( __CLASS__, $setting ) ){
+            self::$$setting = $value;
+            self::$config_name_sum[ $setting ] = $value; // take trace of all config
+        }
+    }
+
+
+
+    /**
+     * Check if has to compile the template
+     *
+     * @access protected
+     * @param  string $tpl_name template name to check
+     * @throws RainTpl_NotFoundException
+     * @return bool return true if the template has changed
+     */
+    protected function check_template( $tpl_name ){
+
+        if( !isset($this->tpl['checked']) ){
+
+            $tpl_basename					   = basename( $tpl_name );														// template basename
+            $tpl_basedir						= strpos($tpl_name,"/") ? dirname($tpl_name) . '/' : null;						// template basedirectory
+            $tpl_dir							= PATH . self::$tpl_dir . $tpl_basedir;								// template directory
+            $this->tpl['tpl_filename']		  = $tpl_dir . $tpl_basename . '.' . self::$tpl_ext;	// template filename
+            $temp_compiled_filename			 = PATH . self::$cache_dir . $tpl_basename . "." . md5( $tpl_dir . serialize(self::$config_name_sum));
+            $this->tpl['compiled_filename']	 = $temp_compiled_filename . '.rtpl.php';	// cache filename
+            $this->tpl['cache_filename']		= $temp_compiled_filename . '.s_' . $this->cache_id . '.rtpl.php';	// static cache filename
+
+            // if the template doesn't exsist throw an error
+            if( self::$check_template_update && !file_exists( $this->tpl['tpl_filename'] ) ){
+                $e = new RainTpl_NotFoundException( 'Template '. $tpl_basename .' not found!' );
+                throw $e->setTemplateFile($this->tpl['tpl_filename']);
+            }
+
+            // file doesn't exsist, or the template was updated, Rain will compile the template
+            if( !file_exists( $this->tpl['compiled_filename'] ) || ( self::$check_template_update && filemtime($this->tpl['compiled_filename']) < filemtime( $this->tpl['tpl_filename'] ) ) ){
+                $this->compileFile( $tpl_basename, $tpl_basedir, $this->tpl['tpl_filename'], PATH . self::$cache_dir, $this->tpl['compiled_filename'] );
+                return true;
+            }
+            $this->tpl['checked'] = true;
+        }
+    }
+
+
+
+    /**
+     * execute stripslaches() on the xml block. Invoqued by preg_replace_callback function below
+     *
+     * @access protected
+     * @param string $capture
+     * @return string
+     */
+    protected function xml_reSubstitution($capture) {
+            return "<?php echo '<?xml ".stripslashes($capture[1])." ?>'; ?>";
+    }
+
+
+
+    /**
+     * Compile and write the compiled template file
+     *
+     * @access protected
+     * @param  string $tpl_basename
+     * @param  string $tpl_basedir
+     * @param  string $tpl_filename
+     * @param  string $cache_dir
+     * @param  string $compiled_filename
+     * @throws RainTpl_Exception
+     * @return void
+     */
+    protected function compileFile( $tpl_basename, $tpl_basedir, $tpl_filename, $cache_dir, $compiled_filename ){
+
+        //read template file
+        $this->tpl['source'] = $template_code = file_get_contents( $tpl_filename );
+
+        //xml substitution
+        $template_code = preg_replace( "/<\?xml(.*?)\?>/s", "##XML\\1XML##", $template_code );
+
+        //disable php tag
+        if( !self::$php_enabled )
+            $template_code = str_replace( array("<?","?>"), array("&lt;?","?&gt;"), $template_code );
+
+        //xml re-substitution
+        $template_code = preg_replace_callback ( "/##XML(.*?)XML##/s", array($this, 'xml_reSubstitution'), $template_code );
+
+        //compile template
+        $template_compiled = "<?php if(!class_exists('raintpl')){exit;}?>" . $this->compileTemplate( $template_code, $tpl_basedir );
+
+
+        // fix the php-eating-newline-after-closing-tag-problem
+        $template_compiled = str_replace( "?>\n", "?>\n\n", $template_compiled );
+
+        // create directories
+        if( !is_dir( $cache_dir ) )
+            mkdir( $cache_dir, 0755, true );
+
+        if( !is_writable( $cache_dir ) )
+            throw new RainTpl_Exception ('Cache directory ' . $cache_dir . ' doesn\'t have write permission. Set write permission or set RAINTPL_CHECK_TEMPLATE_UPDATE to false. More details on http://www.raintpl.com/Documentation/Documentation-for-PHP-developers/Configuration/');
+
+        //write compiled file
+        file_put_contents( $compiled_filename, $template_compiled );
+    }
+
+
+
+    /**
+     * Compile template
+     *
+     * @access protected
+     * @param  string $template_code
+     * @param  string $tpl_basedir
+     * @return string
+     */
+    protected function compileTemplate( $template_code, $tpl_basedir ){
+
+        //tag list
+        $tag_regexp = array( 'loop'		 => '(\{loop(?: name){0,1}="\${0,1}[^"]*"\})',
+                                'loop_close'   => '(\{\/loop\})',
+                                'if'		   => '(\{if(?: condition){0,1}="[^"]*"\})',
+                                'elseif'	   => '(\{elseif(?: condition){0,1}="[^"]*"\})',
+                                'else'		 => '(\{else\})',
+                                'if_close'	 => '(\{\/if\})',
+                                'function'	 => '(\{function="[^"]*"\})',
+                                'noparse'	  => '(\{noparse\})',
+                                'noparse_close'=> '(\{\/noparse\})',
+                                'ignore'	   => '(\{ignore\}|\{\*)',
+                                'ignore_close'	=> '(\{\/ignore\}|\*\})',
+                                'include'	  => '(\{include="[^"]*"(?: cache="[^"]*")?\})',
+                                'template_info'=> '(\{\$template_info\})',
+                                'function'		=> '(\{function="(\w*?)(?:.*?)"\})'
+                            );
+
+        $tag_regexp = "/" . join( "|", $tag_regexp ) . "/";
+
+        //split the code with the tags regexp
+        $template_code = preg_split ( $tag_regexp, $template_code, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
+
+        //path replace (src of img, background and href of link)
+        $template_code = $this->path_replace( $template_code, $tpl_basedir );
+
+        //compile the code
+        $compiled_code = $this->compileCode( $template_code );
+
+        //return the compiled code
+        return $compiled_code;
+
+    }
 
 
 
-	/**
-	 * Compile the code
-	 *
-	 * @access protected
-	 * @param  string $parsed_code
-	 * @throws RainTpl_SyntaxException
-	 * @return string
-	 */
-	protected function compileCode( $parsed_code ){
+    /**
+     * Compile the code
+     *
+     * @access protected
+     * @param  string $parsed_code
+     * @throws RainTpl_SyntaxException
+     * @return string
+     */
+    protected function compileCode( $parsed_code ){
 
-		//variables initialization
-		$compiled_code = $open_if = $comment_is_open = $ignore_is_open = null;
-		$loop_level = 0;
+        //variables initialization
+        $compiled_code = $open_if = $comment_is_open = $ignore_is_open = null;
+        $loop_level = 0;
 
-		//read all parsed code
-		while( $html = array_shift( $parsed_code ) ){
+        //read all parsed code
+        while( $html = array_shift( $parsed_code ) ){
 
-			//close ignore tag
-			if( !$comment_is_open && ( strpos( $html, '{/ignore}' ) !== FALSE || strpos( $html, '*}' ) !== FALSE ) )
-				$ignore_is_open = false;
+            //close ignore tag
+            if( !$comment_is_open && ( strpos( $html, '{/ignore}' ) !== FALSE || strpos( $html, '*}' ) !== FALSE ) )
+                $ignore_is_open = false;
 
-			//code between tag ignore id deleted
-			elseif( $ignore_is_open ){
-				//ignore the code
-			}
+            //code between tag ignore id deleted
+            elseif( $ignore_is_open ){
+                //ignore the code
+            }
 
-			//close no parse tag
-			elseif( strpos( $html, '{/noparse}' ) !== FALSE )
-				$comment_is_open = false;
+            //close no parse tag
+            elseif( strpos( $html, '{/noparse}' ) !== FALSE )
+                $comment_is_open = false;
 
-			//code between tag noparse is not compiled
-			elseif( $comment_is_open )
-				$compiled_code .= $html;
+            //code between tag noparse is not compiled
+            elseif( $comment_is_open )
+                $compiled_code .= $html;
 
-			//ignore
-			elseif( strpos( $html, '{ignore}' ) !== FALSE || strpos( $html, '{*' ) !== FALSE )
-				$ignore_is_open = true;
+            //ignore
+            elseif( strpos( $html, '{ignore}' ) !== FALSE || strpos( $html, '{*' ) !== FALSE )
+                $ignore_is_open = true;
 
-			//noparse
-			elseif( strpos( $html, '{noparse}' ) !== FALSE )
-				$comment_is_open = true;
+            //noparse
+            elseif( strpos( $html, '{noparse}' ) !== FALSE )
+                $comment_is_open = true;
 
-			//include tag
-			elseif( preg_match( '/\{include="([^"]*)"(?: cache="([^"]*)"){0,1}\}/', $html, $code ) ){
+            //include tag
+            elseif( preg_match( '/\{include="([^"]*)"(?: cache="([^"]*)"){0,1}\}/', $html, $code ) ){
 
-				//variables substitution
-				$include_var = $this->var_replace( $code[ 1 ], $left_delimiter = null, $right_delimiter = null, $php_left_delimiter = '".' , $php_right_delimiter = '."', $loop_level );
+                //variables substitution
+                $include_var = $this->var_replace( $code[ 1 ], $left_delimiter = null, $right_delimiter = null, $php_left_delimiter = '".' , $php_right_delimiter = '."', $loop_level );
 
-				// if the cache is active
-				if( isset($code[ 2 ]) ){
+                // if the cache is active
+                if( isset($code[ 2 ]) ){
 
-					//dynamic include
-					$compiled_code .= '<?php $tpl = new '.get_class($this).';' .
-								 'if( $cache = $tpl->cache( $template = basename("'.$include_var.'") ) )' .
-								 '	echo $cache;' .
-								 'else{' .
-								 '	$tpl_dir_temp = self::$tpl_dir;' .
-								 '	$tpl->assign( $this->var );' .
-									( !$loop_level ? null : '$tpl->assign( "key", $key'.$loop_level.' ); $tpl->assign( "value", $value'.$loop_level.' );' ).
-								 '	$tpl->draw( dirname("'.$include_var.'") . ( substr("'.$include_var.'",-1,1) != "/" ? "/" : "" ) . basename("'.$include_var.'") );'.
-								 '} ?>';
-				}
-				else{
+                    //dynamic include
+                    $compiled_code .= '<?php $tpl = new '.get_class($this).';' .
+                                    'if( $cache = $tpl->cache( $template = basename("'.$include_var.'") ) )' .
+                                    '	echo $cache;' .
+                                    'else{' .
+                                    '	$tpl_dir_temp = self::$tpl_dir;' .
+                                    '	$tpl->assign( $this->var );' .
+                                    ( !$loop_level ? null : '$tpl->assign( "key", $key'.$loop_level.' ); $tpl->assign( "value", $value'.$loop_level.' );' ).
+                                    '	$tpl->draw( dirname("'.$include_var.'") . ( substr("'.$include_var.'",-1,1) != "/" ? "/" : "" ) . basename("'.$include_var.'") );'.
+                                    '} ?>';
+                }
+                else{
 
-					//dynamic include
-					$compiled_code .= '<?php $tpl = new '.get_class($this).';' .
-									  '$tpl_dir_temp = self::$tpl_dir;' .
-									  '$tpl->assign( $this->var );' .
-									  ( !$loop_level ? null : '$tpl->assign( "key", $key'.$loop_level.' ); $tpl->assign( "value", $value'.$loop_level.' );' ).
-									  '$tpl->draw( dirname("'.$include_var.'") . ( substr("'.$include_var.'",-1,1) != "/" ? "/" : "" ) . basename("'.$include_var.'") );'.
-									  '?>';
+                    //dynamic include
+                    $compiled_code .= '<?php $tpl = new '.get_class($this).';' .
+                                        '$tpl_dir_temp = self::$tpl_dir;' .
+                                        '$tpl->assign( $this->var );' .
+                                        ( !$loop_level ? null : '$tpl->assign( "key", $key'.$loop_level.' ); $tpl->assign( "value", $value'.$loop_level.' );' ).
+                                        '$tpl->draw( dirname("'.$include_var.'") . ( substr("'.$include_var.'",-1,1) != "/" ? "/" : "" ) . basename("'.$include_var.'") );'.
+                                        '?>';
 
 
-				}
+                }
 
-			}
+            }
 
-			//loop
-			elseif( preg_match( '/\{loop(?: name){0,1}="\${0,1}([^"]*)"\}/', $html, $code ) ){
+            //loop
+            elseif( preg_match( '/\{loop(?: name){0,1}="\${0,1}([^"]*)"\}/', $html, $code ) ){
 
-				//increase the loop counter
-				$loop_level++;
+                //increase the loop counter
+                $loop_level++;
 
-				//replace the variable in the loop
-				$var = $this->var_replace( '$' . $code[ 1 ], $tag_left_delimiter=null, $tag_right_delimiter=null, $php_left_delimiter=null, $php_right_delimiter=null, $loop_level-1 );
+                //replace the variable in the loop
+                $var = $this->var_replace( '$' . $code[ 1 ], $tag_left_delimiter=null, $tag_right_delimiter=null, $php_left_delimiter=null, $php_right_delimiter=null, $loop_level-1 );
 
-				//loop variables
-				$counter = "\$counter$loop_level";	   // count iteration
-				$key = "\$key$loop_level";			   // key
-				$value = "\$value$loop_level";		   // value
+                //loop variables
+                $counter = "\$counter$loop_level";	   // count iteration
+                $key = "\$key$loop_level";			   // key
+                $value = "\$value$loop_level";		   // value
 
-				//loop code
-				$compiled_code .=  "<?php $counter=-1; if( isset($var) && is_array($var) && sizeof($var) ) foreach( $var as $key => $value ){ $counter++; ?>";
+                //loop code
+                $compiled_code .=  "<?php $counter=-1; if( isset($var) && is_array($var) && sizeof($var) ) foreach( $var as $key => $value ){ $counter++; ?>";
 
-			}
+            }
 
-			//close loop tag
-			elseif( strpos( $html, '{/loop}' ) !== FALSE ) {
+            //close loop tag
+            elseif( strpos( $html, '{/loop}' ) !== FALSE ) {
 
-				//iterator
-				$counter = "\$counter$loop_level";
+                //iterator
+                $counter = "\$counter$loop_level";
 
-				//decrease the loop counter
-				$loop_level--;
+                //decrease the loop counter
+                $loop_level--;
 
-				//close loop code
-				$compiled_code .=  "<?php } ?>";
+                //close loop code
+                $compiled_code .=  "<?php } ?>";
 
-			}
+            }
 
-			//if
-			elseif( preg_match( '/\{if(?: condition){0,1}="([^"]*)"\}/', $html, $code ) ){
+            //if
+            elseif( preg_match( '/\{if(?: condition){0,1}="([^"]*)"\}/', $html, $code ) ){
 
-				//increase open if counter (for intendation)
-				$open_if++;
+                //increase open if counter (for intendation)
+                $open_if++;
 
-				//tag
-				$tag = $code[ 0 ];
+                //tag
+                $tag = $code[ 0 ];
 
-				//condition attribute
-				$condition = $code[ 1 ];
+                //condition attribute
+                $condition = $code[ 1 ];
 
-				// check if there's any function disabled by black_list
-				$this->function_check( $tag );
+                // check if there's any function disabled by black_list
+                $this->function_check( $tag );
 
-				//variable substitution into condition (no delimiter into the condition)
-				$parsed_condition = $this->var_replace( $condition, $tag_left_delimiter = null, $tag_right_delimiter = null, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level );
+                //variable substitution into condition (no delimiter into the condition)
+                $parsed_condition = $this->var_replace( $condition, $tag_left_delimiter = null, $tag_right_delimiter = null, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level );
 
-				//if code
-				$compiled_code .=   "<?php if( $parsed_condition ){ ?>";
+                //if code
+                $compiled_code .=   "<?php if( $parsed_condition ){ ?>";
 
-			}
+            }
 
-			//elseif
-			elseif( preg_match( '/\{elseif(?: condition){0,1}="([^"]*)"\}/', $html, $code ) ){
+            //elseif
+            elseif( preg_match( '/\{elseif(?: condition){0,1}="([^"]*)"\}/', $html, $code ) ){
 
-				//tag
-				$tag = $code[ 0 ];
+                //tag
+                $tag = $code[ 0 ];
 
-				//condition attribute
-				$condition = $code[ 1 ];
+                //condition attribute
+                $condition = $code[ 1 ];
 
-				//variable substitution into condition (no delimiter into the condition)
-				$parsed_condition = $this->var_replace( $condition, $tag_left_delimiter = null, $tag_right_delimiter = null, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level );
+                //variable substitution into condition (no delimiter into the condition)
+                $parsed_condition = $this->var_replace( $condition, $tag_left_delimiter = null, $tag_right_delimiter = null, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level );
 
-				//elseif code
-				$compiled_code .=   "<?php }elseif( $parsed_condition ){ ?>";
-			}
+                //elseif code
+                $compiled_code .=   "<?php }elseif( $parsed_condition ){ ?>";
+            }
 
-			//else
-			elseif( strpos( $html, '{else}' ) !== FALSE ) {
+            //else
+            elseif( strpos( $html, '{else}' ) !== FALSE ) {
 
-				//else code
-				$compiled_code .=   '<?php }else{ ?>';
+                //else code
+                $compiled_code .=   '<?php }else{ ?>';
 
-			}
+            }
 
-			//close if tag
-			elseif( strpos( $html, '{/if}' ) !== FALSE ) {
+            //close if tag
+            elseif( strpos( $html, '{/if}' ) !== FALSE ) {
 
-				//decrease if counter
-				$open_if--;
+                //decrease if counter
+                $open_if--;
 
-				// close if code
-				$compiled_code .=   '<?php } ?>';
+                // close if code
+                $compiled_code .=   '<?php } ?>';
 
-			}
+            }
 
-			//function
-			elseif( preg_match( '/\{function="(\w*)(.*?)"\}/', $html, $code ) ){
+            //function
+            elseif( preg_match( '/\{function="(\w*)(.*?)"\}/', $html, $code ) ){
 
-				//tag
-				$tag = $code[ 0 ];
+                //tag
+                $tag = $code[ 0 ];
 
-				//function
-				$function = $code[ 1 ];
+                //function
+                $function = $code[ 1 ];
 
-				// check if there's any function disabled by black_list
-				$this->function_check( $tag );
+                // check if there's any function disabled by black_list
+                $this->function_check( $tag );
 
-				if( empty( $code[ 2 ] ) )
-					$parsed_function = $function . "()";
-				else
-					// parse the function
-					$parsed_function = $function . $this->var_replace( $code[ 2 ], $tag_left_delimiter = null, $tag_right_delimiter = null, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level );
+                if( empty( $code[ 2 ] ) )
+                    $parsed_function = $function . "()";
+                else
+                    // parse the function
+                    $parsed_function = $function . $this->var_replace( $code[ 2 ], $tag_left_delimiter = null, $tag_right_delimiter = null, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level );
 
-				//if code
-				$compiled_code .=   "<?php echo $parsed_function; ?>";
-			}
+                //if code
+                $compiled_code .=   "<?php echo $parsed_function; ?>";
+            }
 
-			// show all vars
-			elseif ( strpos( $html, '{$template_info}' ) !== FALSE ) {
+            // show all vars
+            elseif ( strpos( $html, '{$template_info}' ) !== FALSE ) {
 
-				//tag
-				$tag  = '{$template_info}';
+                //tag
+                $tag  = '{$template_info}';
 
-				//if code
-				$compiled_code .=   '<?php echo "<pre>"; print_r( $this->var ); echo "</pre>"; ?>';
-			}
+                //if code
+                $compiled_code .=   '<?php echo "<pre>"; print_r( $this->var ); echo "</pre>"; ?>';
+            }
 
 
-			//all html code
-			else{
+            //all html code
+            else{
 
-				//variables substitution (es. {$title})
-				$html = $this->var_replace( $html, $left_delimiter = '\{', $right_delimiter = '\}', $php_left_delimiter = '<?php ', $php_right_delimiter = ';?>', $loop_level, $echo = true );
-				//const substitution (es. {#CONST#})
-				$html = $this->const_replace( $html, $left_delimiter = '\{', $right_delimiter = '\}', $php_left_delimiter = '<?php ', $php_right_delimiter = ';?>', $loop_level, $echo = true );
-				//functions substitution (es. {"string"|functions})
-				$compiled_code .= $this->func_replace( $html, $left_delimiter = '\{', $right_delimiter = '\}', $php_left_delimiter = '<?php ', $php_right_delimiter = ';?>', $loop_level, $echo = true );
-			}
-		}
+                //variables substitution (es. {$title})
+                $html = $this->var_replace( $html, $left_delimiter = '\{', $right_delimiter = '\}', $php_left_delimiter = '<?php ', $php_right_delimiter = ';?>', $loop_level, $echo = true );
+                //const substitution (es. {#CONST#})
+                $html = $this->const_replace( $html, $left_delimiter = '\{', $right_delimiter = '\}', $php_left_delimiter = '<?php ', $php_right_delimiter = ';?>', $loop_level, $echo = true );
+                //functions substitution (es. {"string"|functions})
+                $compiled_code .= $this->func_replace( $html, $left_delimiter = '\{', $right_delimiter = '\}', $php_left_delimiter = '<?php ', $php_right_delimiter = ';?>', $loop_level, $echo = true );
+            }
+        }
 
-		if( $open_if > 0 ) {
-			$e = new RainTpl_SyntaxException('Error! You need to close an {if} tag in ' . $this->tpl['tpl_filename'] . ' template');
-			throw $e->setTemplateFile($this->tpl['tpl_filename']);
-		}
-		return $compiled_code;
-	}
+        if( $open_if > 0 ) {
+            $e = new RainTpl_SyntaxException('Error! You need to close an {if} tag in ' . $this->tpl['tpl_filename'] . ' template');
+            throw $e->setTemplateFile($this->tpl['tpl_filename']);
+        }
+        return $compiled_code;
+    }
 
 
 
-	/**
-	 * Reduce a path
-	 *
-	 * eg. www/library/../filepath//file => www/filepath/file
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	protected function reduce_path( $path ){
-		$path = str_replace( "://", "@not_replace@", $path );
-		$path = str_replace( "//", "/", $path );
-		$path = str_replace( "@not_replace@", "://", $path );
-		return preg_replace('/\w+\/\.\.\//', '', $path );
-	}
+    /**
+     * Reduce a path
+     *
+     * eg. www/library/../filepath//file => www/filepath/file
+     *
+     * @param string $path
+     * @return string
+     */
+    protected function reduce_path( $path ){
+        $path = str_replace( "://", "@not_replace@", $path );
+        $path = str_replace( "//", "/", $path );
+        $path = str_replace( "@not_replace@", "://", $path );
+        return preg_replace('/\w+\/\.\.\//', '', $path );
+    }
 
 
 
-	/**
-	 * replace the path of image src, link href and a href
-	 *
-	 * url => template_dir/url
-	 * url# => url
-	 * http://url => http://url
-	 *
-	 * @access protected
-	 * @param  string $html
-	 * @param  string $tpl_basedir
-	 * @return string html substitution
-	 */
-	protected function path_replace( $html, $tpl_basedir ){
+    /**
+     * replace the path of image src, link href and a href
+     *
+     * url => template_dir/url
+     * url# => url
+     * http://url => http://url
+     *
+     * @access protected
+     * @param  string $html
+     * @param  string $tpl_basedir
+     * @return string html substitution
+     */
+    protected function path_replace( $html, $tpl_basedir ){
 
-		if( self::$path_replace ){
+        if( self::$path_replace ){
 
-			$tpl_dir = self::$base_url . PATH . self::$tpl_dir . $tpl_basedir;
+            $tpl_dir = self::$base_url . PATH . self::$tpl_dir . $tpl_basedir;
 
-			// reduce the path
-			$path = $this->reduce_path($tpl_dir);
+            // reduce the path
+            $path = $this->reduce_path($tpl_dir);
 
-			$exp = $sub = array();
+            $exp = $sub = array();
 
-			if( in_array( "img", self::$path_replace_list ) ){
-				$exp = array( '/<img(.*?)src=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<img(.*?)src=(?:")([^"]+?)#(?:")/i', '/<img(.*?)src="(.*?)"/', '/<img(.*?)src=(?:\@)([^"]+?)(?:\@)/i' );
-				$sub = array( '<img$1src=@$2://$3@', '<img$1src=@$2@', '<img$1src="' . $path . '$2"', '<img$1src="$2"' );
-			}
+            if( in_array( "img", self::$path_replace_list ) ){
+                $exp = array( '/<img(.*?)src=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<img(.*?)src=(?:")([^"]+?)#(?:")/i', '/<img(.*?)src="(.*?)"/', '/<img(.*?)src=(?:\@)([^"]+?)(?:\@)/i' );
+                $sub = array( '<img$1src=@$2://$3@', '<img$1src=@$2@', '<img$1src="' . $path . '$2"', '<img$1src="$2"' );
+            }
 
-			if( in_array( "script", self::$path_replace_list ) ){
-				$exp = array_merge( $exp , array( '/<script(.*?)src=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<script(.*?)src=(?:")([^"]+?)#(?:")/i', '/<script(.*?)src="(.*?)"/', '/<script(.*?)src=(?:\@)([^"]+?)(?:\@)/i' ) );
-				$sub = array_merge( $sub , array( '<script$1src=@$2://$3@', '<script$1src=@$2@', '<script$1src="' . $path . '$2"', '<script$1src="$2"' ) );
-			}
+            if( in_array( "script", self::$path_replace_list ) ){
+                $exp = array_merge( $exp , array( '/<script(.*?)src=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<script(.*?)src=(?:")([^"]+?)#(?:")/i', '/<script(.*?)src="(.*?)"/', '/<script(.*?)src=(?:\@)([^"]+?)(?:\@)/i' ) );
+                $sub = array_merge( $sub , array( '<script$1src=@$2://$3@', '<script$1src=@$2@', '<script$1src="' . $path . '$2"', '<script$1src="$2"' ) );
+            }
 
-			if( in_array( "link", self::$path_replace_list ) ){
-				$exp = array_merge( $exp , array( '/<link(.*?)href=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<link(.*?)href=(?:")([^"]+?)#(?:")/i', '/<link(.*?)href="(.*?)"/', '/<link(.*?)href=(?:\@)([^"]+?)(?:\@)/i' ) );
-				$sub = array_merge( $sub , array( '<link$1href=@$2://$3@', '<link$1href=@$2@' , '<link$1href="' . $path . '$2"', '<link$1href="$2"' ) );
-			}
+            if( in_array( "link", self::$path_replace_list ) ){
+                $exp = array_merge( $exp , array( '/<link(.*?)href=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<link(.*?)href=(?:")([^"]+?)#(?:")/i', '/<link(.*?)href="(.*?)"/', '/<link(.*?)href=(?:\@)([^"]+?)(?:\@)/i' ) );
+                $sub = array_merge( $sub , array( '<link$1href=@$2://$3@', '<link$1href=@$2@' , '<link$1href="' . $path . '$2"', '<link$1href="$2"' ) );
+            }
 
-			if( in_array( "a", self::$path_replace_list ) ){
-				$exp = array_merge( $exp , array( '/<a(.*?)href=(?:")(http\:\/\/|https\:\/\/|javascript:)([^"]+?)(?:")/i', '/<a(.*?)href="(.*?)"/', '/<a(.*?)href=(?:\@)([^"]+?)(?:\@)/i'  ) );
-				$sub = array_merge( $sub , array( '<a$1href=@$2$3@', '<a$1href="' . self::$base_url . '$2"', '<a$1href="$2"' ) );
-			}
+            if( in_array( "a", self::$path_replace_list ) ){
+                $exp = array_merge( $exp , array( '/<a(.*?)href=(?:")(http\:\/\/|https\:\/\/|javascript:)([^"]+?)(?:")/i', '/<a(.*?)href="(.*?)"/', '/<a(.*?)href=(?:\@)([^"]+?)(?:\@)/i'  ) );
+                $sub = array_merge( $sub , array( '<a$1href=@$2$3@', '<a$1href="' . self::$base_url . '$2"', '<a$1href="$2"' ) );
+            }
 
-			if( in_array( "input", self::$path_replace_list ) ){
-				$exp = array_merge( $exp , array( '/<input(.*?)src=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<input(.*?)src=(?:")([^"]+?)#(?:")/i', '/<input(.*?)src="(.*?)"/', '/<input(.*?)src=(?:\@)([^"]+?)(?:\@)/i' ) );
-				$sub = array_merge( $sub , array( '<input$1src=@$2://$3@', '<input$1src=@$2@', '<input$1src="' . $path . '$2"', '<input$1src="$2"' ) );
-			}
+            if( in_array( "input", self::$path_replace_list ) ){
+                $exp = array_merge( $exp , array( '/<input(.*?)src=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<input(.*?)src=(?:")([^"]+?)#(?:")/i', '/<input(.*?)src="(.*?)"/', '/<input(.*?)src=(?:\@)([^"]+?)(?:\@)/i' ) );
+                $sub = array_merge( $sub , array( '<input$1src=@$2://$3@', '<input$1src=@$2@', '<input$1src="' . $path . '$2"', '<input$1src="$2"' ) );
+            }
 
-			return preg_replace( $exp, $sub, $html );
+            return preg_replace( $exp, $sub, $html );
 
-		}
-		else
-			return $html;
+        }
+        else
+            return $html;
 
-	}
+    }
 
 
 
-	/**
-	 * replace constants
-	 *
-	 * @access public
-	 * @param  string $html
-	 * @param  string $tag_left_delimiter
-	 * @param  string $tag_right_delimiter
-	 * @param  string $php_left_delimiter (optional)
-	 * @param  string $php_right_delimiter (optional)
-	 * @param  string $loop_level (optional)
-	 * @param  string $echo (optional)
-	 * @return string
-	 */
-	public function const_replace( $html, $tag_left_delimiter, $tag_right_delimiter, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level = null, $echo = null ){
-		// const
-		return preg_replace( '/\{\#(\w+)\#{0,1}\}/', $php_left_delimiter . ( $echo ? " echo " : null ) . '\\1' . $php_right_delimiter, $html );
-	}
+    /**
+     * replace constants
+     *
+     * @access public
+     * @param  string $html
+     * @param  string $tag_left_delimiter
+     * @param  string $tag_right_delimiter
+     * @param  string $php_left_delimiter (optional)
+     * @param  string $php_right_delimiter (optional)
+     * @param  string $loop_level (optional)
+     * @param  string $echo (optional)
+     * @return string
+     */
+    public function const_replace( $html, $tag_left_delimiter, $tag_right_delimiter, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level = null, $echo = null ){
+        // const
+        return preg_replace( '/\{\#(\w+)\#{0,1}\}/', $php_left_delimiter . ( $echo ? " echo " : null ) . '\\1' . $php_right_delimiter, $html );
+    }
 
 
 
-	/**
-	 * replace functions/modifiers on constants and strings
-	 *
-	 * @access public
-	 * @param  string $html
-	 * @param  string $tag_left_delimiter
-	 * @param  string $tag_right_delimiter
-	 * @param  string $php_left_delimiter (optional)
-	 * @param  string $php_right_delimiter (optional)
-	 * @param  string $loop_level (optional)
-	 * @param  string $echo (optional)
-	 * @return string
-	 */
-	public function func_replace( $html, $tag_left_delimiter, $tag_right_delimiter, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level = null, $echo = null ){
+    /**
+     * replace functions/modifiers on constants and strings
+     *
+     * @access public
+     * @param  string $html
+     * @param  string $tag_left_delimiter
+     * @param  string $tag_right_delimiter
+     * @param  string $php_left_delimiter (optional)
+     * @param  string $php_right_delimiter (optional)
+     * @param  string $loop_level (optional)
+     * @param  string $echo (optional)
+     * @return string
+     */
+    public function func_replace( $html, $tag_left_delimiter, $tag_right_delimiter, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level = null, $echo = null ){
 
-		preg_match_all( '/' . '\{\#{0,1}(\"{0,1}.*?\"{0,1})(\|\w.*?)\#{0,1}\}' . '/', $html, $matches );
+        preg_match_all( '/' . '\{\#{0,1}(\"{0,1}.*?\"{0,1})(\|\w.*?)\#{0,1}\}' . '/', $html, $matches );
 
-		for( $i=0, $n=count($matches[0]); $i<$n; $i++ ){
+        for( $i=0, $n=count($matches[0]); $i<$n; $i++ ){
 
-			//complete tag ex: {$news.title|substr:0,100}
-			$tag = $matches[ 0 ][ $i ];
+            //complete tag ex: {$news.title|substr:0,100}
+            $tag = $matches[ 0 ][ $i ];
 
-			//variable name ex: news.title
-			$var = $matches[ 1 ][ $i ];
+            //variable name ex: news.title
+            $var = $matches[ 1 ][ $i ];
 
-			//function and parameters associate to the variable ex: substr:0,100
-			$extra_var = $matches[ 2 ][ $i ];
+            //function and parameters associate to the variable ex: substr:0,100
+            $extra_var = $matches[ 2 ][ $i ];
 
-			// check if there's any function disabled by black_list
-			$this->function_check( $tag );
+            // check if there's any function disabled by black_list
+            $this->function_check( $tag );
 
-			$extra_var = $this->var_replace( $extra_var, null, null, null, null, $loop_level );
+            $extra_var = $this->var_replace( $extra_var, null, null, null, null, $loop_level );
 
 
-			// check if there's an operator = in the variable tags, if there's this is an initialization so it will not output any value
-			$is_init_variable = preg_match( "/^(\s*?)\=[^=](.*?)$/", $extra_var );
+            // check if there's an operator = in the variable tags, if there's this is an initialization so it will not output any value
+            $is_init_variable = preg_match( "/^(\s*?)\=[^=](.*?)$/", $extra_var );
 
-			//function associate to variable
-			$function_var = ( $extra_var and $extra_var[0] == '|') ? substr( $extra_var, 1 ) : null;
+            //function associate to variable
+            $function_var = ( $extra_var and $extra_var[0] == '|') ? substr( $extra_var, 1 ) : null;
 
-			//variable path split array (ex. $news.title o $news[title]) or object (ex. $news->title)
-			$temp = preg_split( "/\.|\[|\-\>/", $var );
+            //variable path split array (ex. $news.title o $news[title]) or object (ex. $news->title)
+            $temp = preg_split( "/\.|\[|\-\>/", $var );
 
-			//variable name
-			$var_name = $temp[ 0 ];
+            //variable name
+            $var_name = $temp[ 0 ];
 
-			//variable path
-			$variable_path = substr( $var, strlen( $var_name ) );
+            //variable path
+            $variable_path = substr( $var, strlen( $var_name ) );
 
-			//parentesis transform [ e ] in [" e in "]
-			$variable_path = str_replace( '[', '["', $variable_path );
-			$variable_path = str_replace( ']', '"]', $variable_path );
+            //parentesis transform [ e ] in [" e in "]
+            $variable_path = str_replace( '[', '["', $variable_path );
+            $variable_path = str_replace( ']', '"]', $variable_path );
 
-			//transform .$variable in ["$variable"]
-			$variable_path = preg_replace('/\.\$(\w+)/', '["$\\1"]', $variable_path );
+            //transform .$variable in ["$variable"]
+            $variable_path = preg_replace('/\.\$(\w+)/', '["$\\1"]', $variable_path );
 
-			//transform [variable] in ["variable"]
-			$variable_path = preg_replace('/\.(\w+)/', '["\\1"]', $variable_path );
+            //transform [variable] in ["variable"]
+            $variable_path = preg_replace('/\.(\w+)/', '["\\1"]', $variable_path );
 
-			//if there's a function
-			if( $function_var ){
+            //if there's a function
+            if( $function_var ){
 
-				// check if there's a function or a static method and separate, function by parameters
-				$function_var = str_replace("::", "@double_dot@", $function_var );
+                // check if there's a function or a static method and separate, function by parameters
+                $function_var = str_replace("::", "@double_dot@", $function_var );
 
-				// get the position of the first :
-				if( $dot_position = strpos( $function_var, ":" ) ){
+                // get the position of the first :
+                if( $dot_position = strpos( $function_var, ":" ) ){
 
-					// get the function and the parameters
-					$function = substr( $function_var, 0, $dot_position );
-					$params = substr( $function_var, $dot_position+1 );
+                    // get the function and the parameters
+                    $function = substr( $function_var, 0, $dot_position );
+                    $params = substr( $function_var, $dot_position+1 );
 
-				}
-				else{
+                }
+                else{
 
-					//get the function
-					$function = str_replace( "@double_dot@", "::", $function_var );
-					$params = null;
+                    //get the function
+                    $function = str_replace( "@double_dot@", "::", $function_var );
+                    $params = null;
 
-				}
+                }
 
-				// replace back the @double_dot@ with ::
-				$function = str_replace( "@double_dot@", "::", $function );
-				$params = str_replace( "@double_dot@", "::", $params );
+                // replace back the @double_dot@ with ::
+                $function = str_replace( "@double_dot@", "::", $function );
+                $params = str_replace( "@double_dot@", "::", $params );
 
 
-			}
-			else
-				$function = $params = null;
+            }
+            else
+                $function = $params = null;
 
-			$php_var = $var_name . $variable_path;
+            $php_var = $var_name . $variable_path;
 
-			// compile the variable for php
-			if( isset( $function ) ){
-				if( $php_var )
-					$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . ( $params ? "( $function( $php_var, $params ) )" : "$function( $php_var )" ) . $php_right_delimiter;
-				else
-					$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . ( $params ? "( $function( $params ) )" : "$function()" ) . $php_right_delimiter;
-			}
-			else
-				$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . $php_var . $extra_var . $php_right_delimiter;
+            // compile the variable for php
+            if( isset( $function ) ){
+                if( $php_var )
+                    $php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . ( $params ? "( $function( $php_var, $params ) )" : "$function( $php_var )" ) . $php_right_delimiter;
+                else
+                    $php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . ( $params ? "( $function( $params ) )" : "$function()" ) . $php_right_delimiter;
+            }
+            else
+                $php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . $php_var . $extra_var . $php_right_delimiter;
 
-			$html = str_replace( $tag, $php_var, $html );
+            $html = str_replace( $tag, $php_var, $html );
 
-		}
+        }
 
-		return $html;
+        return $html;
 
-	}
+    }
 
 
 
-	/**
-	 * replace variables
-	 *
-	 * @access public
-	 * @param  string $html
-	 * @param  string $tag_left_delimiter
-	 * @param  string $tag_right_delimiter
-	 * @param  string $php_left_delimiter (optional)
-	 * @param  string $php_right_delimiter (optional)
-	 * @param  string $loop_level (optional)
-	 * @param  string $echo (optional)
-	 * @return string
-	 */
-	public function var_replace( $html, $tag_left_delimiter, $tag_right_delimiter, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level = null, $echo = null ){
+    /**
+     * replace variables
+     *
+     * @access public
+     * @param  string $html
+     * @param  string $tag_left_delimiter
+     * @param  string $tag_right_delimiter
+     * @param  string $php_left_delimiter (optional)
+     * @param  string $php_right_delimiter (optional)
+     * @param  string $loop_level (optional)
+     * @param  string $echo (optional)
+     * @return string
+     */
+    public function var_replace( $html, $tag_left_delimiter, $tag_right_delimiter, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level = null, $echo = null ){
 
-		//all variables
-		if( preg_match_all( '/' . $tag_left_delimiter . '\$(\w+(?:\.\${0,1}[A-Za-z0-9_]+)*(?:(?:\[\${0,1}[A-Za-z0-9_]+\])|(?:\-\>\${0,1}[A-Za-z0-9_]+))*)(.*?)' . $tag_right_delimiter . '/', $html, $matches ) ){
+        //all variables
+        if( preg_match_all( '/' . $tag_left_delimiter . '\$(\w+(?:\.\${0,1}[A-Za-z0-9_]+)*(?:(?:\[\${0,1}[A-Za-z0-9_]+\])|(?:\-\>\${0,1}[A-Za-z0-9_]+))*)(.*?)' . $tag_right_delimiter . '/', $html, $matches ) ){
 
-			for( $parsed=array(), $i=0, $n=count($matches[0]); $i<$n; $i++ )
-				$parsed[$matches[0][$i]] = array('var'=>$matches[1][$i],'extra_var'=>$matches[2][$i]);
+            for( $parsed=array(), $i=0, $n=count($matches[0]); $i<$n; $i++ )
+                $parsed[$matches[0][$i]] = array('var'=>$matches[1][$i],'extra_var'=>$matches[2][$i]);
 
-			foreach( $parsed as $tag => $array ){
+            foreach( $parsed as $tag => $array ){
 
-				//variable name ex: news.title
-				$var = $array['var'];
+                //variable name ex: news.title
+                $var = $array['var'];
 
-				//function and parameters associate to the variable ex: substr:0,100
-				$extra_var = $array['extra_var'];
+                //function and parameters associate to the variable ex: substr:0,100
+                $extra_var = $array['extra_var'];
 
-				// check if there's any function disabled by black_list
-				$this->function_check( $tag );
+                // check if there's any function disabled by black_list
+                $this->function_check( $tag );
 
-				$extra_var = $this->var_replace( $extra_var, null, null, null, null, $loop_level );
+                $extra_var = $this->var_replace( $extra_var, null, null, null, null, $loop_level );
 
-				// check if there's an operator = in the variable tags, if there's this is an initialization so it will not output any value
-				$is_init_variable = preg_match( "/^[a-z_A-Z\.\[\](\-\>)]*=[^=]*$/", $extra_var );
+                // check if there's an operator = in the variable tags, if there's this is an initialization so it will not output any value
+                $is_init_variable = preg_match( "/^[a-z_A-Z\.\[\](\-\>)]*=[^=]*$/", $extra_var );
 
-				//function associate to variable
-				$function_var = ( $extra_var and $extra_var[0] == '|') ? substr( $extra_var, 1 ) : null;
+                //function associate to variable
+                $function_var = ( $extra_var and $extra_var[0] == '|') ? substr( $extra_var, 1 ) : null;
 
-				//variable path split array (ex. $news.title o $news[title]) or object (ex. $news->title)
-				$temp = preg_split( "/\.|\[|\-\>/", $var );
+                //variable path split array (ex. $news.title o $news[title]) or object (ex. $news->title)
+                $temp = preg_split( "/\.|\[|\-\>/", $var );
 
-				//variable name
-				$var_name = $temp[ 0 ];
+                //variable name
+                $var_name = $temp[ 0 ];
 
-				//variable path
-				$variable_path = substr( $var, strlen( $var_name ) );
+                //variable path
+                $variable_path = substr( $var, strlen( $var_name ) );
 
-				//parentesis transform [ e ] in [" e in "]
-				$variable_path = str_replace( '[', '["', $variable_path );
-				$variable_path = str_replace( ']', '"]', $variable_path );
+                //parentesis transform [ e ] in [" e in "]
+                $variable_path = str_replace( '[', '["', $variable_path );
+                $variable_path = str_replace( ']', '"]', $variable_path );
 
-				//transform .$variable in ["$variable"] and .variable in ["variable"]
-				$variable_path = preg_replace('/\.(\${0,1}\w+)/', '["\\1"]', $variable_path );
+                //transform .$variable in ["$variable"] and .variable in ["variable"]
+                $variable_path = preg_replace('/\.(\${0,1}\w+)/', '["\\1"]', $variable_path );
 
-				// if is an assignment also assign the variable to $this->var['value']
-				if( $is_init_variable )
-					$extra_var = "=\$this->var['{$var_name}']{$variable_path}" . $extra_var;
+                // if is an assignment also assign the variable to $this->var['value']
+                if( $is_init_variable )
+                    $extra_var = "=\$this->var['{$var_name}']{$variable_path}" . $extra_var;
 
 
 
-				//if there's a function
-				if( $function_var ){
+                //if there's a function
+                if( $function_var ){
 
-					// check if there's a function or a static method and separate, function by parameters
-					$function_var = str_replace("::", "@double_dot@", $function_var );
+                    // check if there's a function or a static method and separate, function by parameters
+                    $function_var = str_replace("::", "@double_dot@", $function_var );
 
 
-					// get the position of the first :
-					if( $dot_position = strpos( $function_var, ":" ) ){
+                    // get the position of the first :
+                    if( $dot_position = strpos( $function_var, ":" ) ){
 
-						// get the function and the parameters
-						$function = substr( $function_var, 0, $dot_position );
-						$params = substr( $function_var, $dot_position+1 );
+                        // get the function and the parameters
+                        $function = substr( $function_var, 0, $dot_position );
+                        $params = substr( $function_var, $dot_position+1 );
 
-					}
-					else{
+                    }
+                    else{
 
-						//get the function
-						$function = str_replace( "@double_dot@", "::", $function_var );
-						$params = null;
+                        //get the function
+                        $function = str_replace( "@double_dot@", "::", $function_var );
+                        $params = null;
 
-					}
+                    }
 
-					// replace back the @double_dot@ with ::
-					$function = str_replace( "@double_dot@", "::", $function );
-					$params = str_replace( "@double_dot@", "::", $params );
-				}
-				else
-					$function = $params = null;
+                    // replace back the @double_dot@ with ::
+                    $function = str_replace( "@double_dot@", "::", $function );
+                    $params = str_replace( "@double_dot@", "::", $params );
+                }
+                else
+                    $function = $params = null;
 
-				//if it is inside a loop
-				if( $loop_level ){
-					//verify the variable name
-					if( $var_name == 'key' )
-							$php_var = '$key' . $loop_level;
-					elseif( $var_name == 'value' )
-							$php_var = '$value' . $loop_level . $variable_path;
-					elseif( $var_name == 'counter' )
-							$php_var = '$counter' . $loop_level;
-					else
-							$php_var = '$' . $var_name . $variable_path;
-				}else
-					$php_var = '$' . $var_name . $variable_path;
-
-				// compile the variable for php
-				if( isset( $function ) )
-					$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . ( $params ? "( $function( $php_var, $params ) )" : "$function( $php_var )" ) . $php_right_delimiter;
-				else
-					$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . $php_var . $extra_var . $php_right_delimiter;
-
-				$html = str_replace( $tag, $php_var, $html );
-
-
-			}
-		}
-
-		return $html;
-	}
-
-
-
-	/**
-	 * Check if function is in black list (sandbox)
-	 *
-	 * @access protected
-	 * @param  string $code
-	 * @throws RainTpl_SyntaxException
-	 * @return void
-	 */
-	protected function function_check( $code ){
-
-		$preg = '#(\W|\s)' . implode( '(\W|\s)|(\W|\s)', self::$black_list ) . '(\W|\s)#';
-
-		// check if the function is in the black list (or not in white list)
-		if( count(self::$black_list) && preg_match( $preg, $code, $match ) ){
-
-			// find the line of the error
-			$line = 0;
-			$rows=explode("\n",$this->tpl['source']);
-			while( !strpos($rows[$line],$code) )
-				$line++;
-
-			// stop the execution of the script
-			$e = new RainTpl_SyntaxException('Unallowed syntax in ' . $this->tpl['tpl_filename'] . ' template');
-			throw $e->setTemplateFile($this->tpl['tpl_filename'])
-				->setTag($code)
-				->setTemplateLine($line);
-		}
-
-	}
-
-
-
-	/**
-	 * Prints debug info about exception or passes it further if debug is disabled.
-	 *
-	 * @access protected
-	 * @param  RainTpl_Exception $e
-	 * @return string
-	 */
-	protected function printDebug(RainTpl_Exception $e){
-		if (!self::$debug) {
-			throw $e;
-		}
-		$output = sprintf('<h2>Exception: %s</h2><h3>%s</h3><p>template: %s</p>',
-			get_class($e),
-			$e->getMessage(),
-			$e->getTemplateFile()
-		);
-		if ($e instanceof RainTpl_SyntaxException) {
-			if (null != $e->getTemplateLine()) {
-				$output .= '<p>line: ' . $e->getTemplateLine() . '</p>';
-			}
-			if (null != $e->getTag()) {
-				$output .= '<p>in tag: ' . htmlspecialchars($e->getTag()) . '</p>';
-			}
-			if (null != $e->getTemplateLine() && null != $e->getTag()) {
-				$rows=explode("\n",  htmlspecialchars($this->tpl['source']));
-				$rows[$e->getTemplateLine()] = '<font color=red>' . $rows[$e->getTemplateLine()] . '</font>';
-				$output .= '<h3>template code</h3>' . implode('<br />', $rows) . '</pre>';
-			}
-		}
-		$output .= sprintf('<h3>trace</h3><p>In %s on line %d</p><pre>%s</pre>',
-			$e->getFile(), $e->getLine(),
-			nl2br(htmlspecialchars($e->getTraceAsString()))
-		);
-		return $output;
-	}
+                //if it is inside a loop
+                if( $loop_level ){
+                    //verify the variable name
+                    if( $var_name == 'key' )
+                            $php_var = '$key' . $loop_level;
+                    elseif( $var_name == 'value' )
+                            $php_var = '$value' . $loop_level . $variable_path;
+                    elseif( $var_name == 'counter' )
+                            $php_var = '$counter' . $loop_level;
+                    else
+                            $php_var = '$' . $var_name . $variable_path;
+                }else
+                    $php_var = '$' . $var_name . $variable_path;
+
+                // compile the variable for php
+                if( isset( $function ) )
+                    $php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . ( $params ? "( $function( $php_var, $params ) )" : "$function( $php_var )" ) . $php_right_delimiter;
+                else
+                    $php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . $php_var . $extra_var . $php_right_delimiter;
+
+                $html = str_replace( $tag, $php_var, $html );
+
+
+            }
+        }
+
+        return $html;
+    }
+
+
+
+    /**
+     * Check if function is in black list (sandbox)
+     *
+     * @access protected
+     * @param  string $code
+     * @throws RainTpl_SyntaxException
+     * @return void
+     */
+    protected function function_check( $code ){
+
+        $preg = '#(\W|\s)' . implode( '(\W|\s)|(\W|\s)', self::$black_list ) . '(\W|\s)#';
+
+        // check if the function is in the black list (or not in white list)
+        if( count(self::$black_list) && preg_match( $preg, $code, $match ) ){
+
+            // find the line of the error
+            $line = 0;
+            $rows=explode("\n",$this->tpl['source']);
+            while( !strpos($rows[$line],$code) )
+                $line++;
+
+            // stop the execution of the script
+            $e = new RainTpl_SyntaxException('Unallowed syntax in ' . $this->tpl['tpl_filename'] . ' template');
+            throw $e->setTemplateFile($this->tpl['tpl_filename'])
+                ->setTag($code)
+                ->setTemplateLine($line);
+        }
+
+    }
+
+
+
+    /**
+     * Prints debug info about exception or passes it further if debug is disabled.
+     *
+     * @access protected
+     * @param  RainTpl_Exception $e
+     * @return string
+     */
+    protected function printDebug(RainTpl_Exception $e){
+        if (!self::$debug) {
+            throw $e;
+        }
+        $output = sprintf('<h2>Exception: %s</h2><h3>%s</h3><p>template: %s</p>',
+            get_class($e),
+            $e->getMessage(),
+            $e->getTemplateFile()
+        );
+        if ($e instanceof RainTpl_SyntaxException) {
+            if (null != $e->getTemplateLine()) {
+                $output .= '<p>line: ' . $e->getTemplateLine() . '</p>';
+            }
+            if (null != $e->getTag()) {
+                $output .= '<p>in tag: ' . htmlspecialchars($e->getTag()) . '</p>';
+            }
+            if (null != $e->getTemplateLine() && null != $e->getTag()) {
+                $rows=explode("\n",  htmlspecialchars($this->tpl['source']));
+                $rows[$e->getTemplateLine()] = '<font color=red>' . $rows[$e->getTemplateLine()] . '</font>';
+                $output .= '<h3>template code</h3>' . implode('<br />', $rows) . '</pre>';
+            }
+        }
+        $output .= sprintf('<h3>trace</h3><p>In %s on line %d</p><pre>%s</pre>',
+            $e->getFile(), $e->getLine(),
+            nl2br(htmlspecialchars($e->getTraceAsString()))
+        );
+        return $output;
+    }
 }
 
 
@@ -1062,32 +1062,32 @@ 
  * Basic Rain tpl exception.
  */
 class RainTpl_Exception extends Exception{
-	/**
-	 * Path of template file with error.
-	 */
-	protected $templateFile = '';
-
-	/**
-	 * Returns path of template file with error.
-	 *
-	 * @return string
-	 */
-	public function getTemplateFile()
-	{
-		return $this->templateFile;
-	}
-
-	/**
-	 * Sets path of template file with error.
-	 *
-	 * @param string $templateFile
-	 * @return RainTpl_Exception
-	 */
-	public function setTemplateFile($templateFile)
-	{
-		$this->templateFile = (string) $templateFile;
-		return $this;
-	}
+    /**
+     * Path of template file with error.
+     */
+    protected $templateFile = '';
+
+    /**
+     * Returns path of template file with error.
+     *
+     * @return string
+     */
+    public function getTemplateFile()
+    {
+        return $this->templateFile;
+    }
+
+    /**
+     * Sets path of template file with error.
+     *
+     * @param string $templateFile
+     * @return RainTpl_Exception
+     */
+    public function setTemplateFile($templateFile)
+    {
+        $this->templateFile = (string) $templateFile;
+        return $this;
+    }
 }
 
 
@@ -1102,64 +1102,64 @@ 
  * Exception thrown when syntax error occurs.
  */
 class RainTpl_SyntaxException extends RainTpl_Exception{
-	/**
-	 * Line in template file where error has occured.
-	 *
-	 * @var int | null
-	 */
-	protected $templateLine = null;
-
-	/**
-	 * Tag which caused an error.
-	 *
-	 * @var string | null
-	 */
-	protected $tag = null;
-
-	/**
-	 * Returns line in template file where error has occured
-	 * or null if line is not defined.
-	 *
-	 * @return int | null
-	 */
-	public function getTemplateLine()
-	{
-		return $this->templateLine;
-	}
-
-	/**
-	 * Sets  line in template file where error has occured.
-	 *
-	 * @param int $templateLine
-	 * @return RainTpl_SyntaxException
-	 */
-	public function setTemplateLine($templateLine)
-	{
-		$this->templateLine = (int) $templateLine;
-		return $this;
-	}
-
-	/**
-	 * Returns tag which caused an error.
-	 *
-	 * @return string
-	 */
-	public function getTag()
-	{
-		return $this->tag;
-	}
-
-	/**
-	 * Sets tag which caused an error.
-	 *
-	 * @param string $tag
-	 * @return RainTpl_SyntaxException
-	 */
-	public function setTag($tag)
-	{
-		$this->tag = (string) $tag;
-		return $this;
-	}
+    /**
+     * Line in template file where error has occured.
+     *
+     * @var int | null
+     */
+    protected $templateLine = null;
+
+    /**
+     * Tag which caused an error.
+     *
+     * @var string | null
+     */
+    protected $tag = null;
+
+    /**
+     * Returns line in template file where error has occured
+     * or null if line is not defined.
+     *
+     * @return int | null
+     */
+    public function getTemplateLine()
+    {
+        return $this->templateLine;
+    }
+
+    /**
+     * Sets  line in template file where error has occured.
+     *
+     * @param int $templateLine
+     * @return RainTpl_SyntaxException
+     */
+    public function setTemplateLine($templateLine)
+    {
+        $this->templateLine = (int) $templateLine;
+        return $this;
+    }
+
+    /**
+     * Returns tag which caused an error.
+     *
+     * @return string
+     */
+    public function getTag()
+    {
+        return $this->tag;
+    }
+
+    /**
+     * Sets tag which caused an error.
+     *
+     * @param string $tag
+     * @return RainTpl_SyntaxException
+     */
+    public function setTag($tag)
+    {
+        $this->tag = (string) $tag;
+        return $this;
+    }
 }
 
 /**
@@ -1173,7 +1173,7 @@ 
  * @return string
  */
 function t() {
-	return call_user_func_array(array('i18n', 'translate'), func_get_args());
+    return call_user_func_array(array('i18n', 'translate'), func_get_args());
 }
 
 // -- end

Spacing +220 added lines, -220 removed lines

@@ -12,7 +12,7 @@ 
 /**
  * RainTPL
  */
-class RainTPL{
+class RainTPL {
 
 	// -------------------------
 	// 	CONFIGURATION
@@ -71,7 +71,7 @@ 
 		 *
 		 * @var array
 		 */
-		static $path_replace_list = array( 'a', 'img', 'link', 'script', 'input' );
+		static $path_replace_list = array('a', 'img', 'link', 'script', 'input');
 
 
 		/**
@@ -79,7 +79,7 @@ 
 		 *
 		 * @var array
 		 */
-		static $black_list = array( '\$this', 'raintpl::', 'self::', '_SESSION', '_SERVER', '_ENV',  'eval', 'exec', 'unlink', 'rmdir' );
+		static $black_list = array('\$this', 'raintpl::', 'self::', '_SESSION', '_SERVER', '_ENV', 'eval', 'exec', 'unlink', 'rmdir');
 
 
 		/**
@@ -133,7 +133,7 @@ 
 		 *
 		 * @var array
 		 */
-		protected $tpl = array();		//
+		protected $tpl = array(); //
 
 		/**
 		 * static cache enabled / disabled
@@ -177,11 +177,11 @@ 
 	 * @param  mixed $variable_name Name of template variable or associative array name/value
 	 * @param  mixed $value value assigned to this variable. Not set if variable_name is an associative array
 	 */
-	public function assign( $variable, $value = null ){
-		if( is_array( $variable ) )
+	public function assign($variable, $value = null) {
+		if (is_array($variable))
 			$this->var += $variable;
 		else
-			$this->var[ $variable ] = $value;
+			$this->var[$variable] = $value;
 	}
 
 
@@ -196,11 +196,11 @@ 
 	 * @param  boolean $return_string  true=return a string, false=echo the template
 	 * @return string
 	 */
-	public function draw( $tpl_name, $return_string = false ){
+	public function draw($tpl_name, $return_string = false) {
 
 		try {
 			// compile the template if necessary and set the template filepath
-			$this->check_template( $tpl_name );
+			$this->check_template($tpl_name);
 		} catch (RainTpl_Exception $e) {
 			$output = $this->printDebug($e);
 			die($output);
@@ -209,37 +209,37 @@ 
 		// Cache is off and, return_string is false
 		// Rain just echo the template
 
-		if( !$this->cache && !$return_string ){
-			extract( $this->var );
+		if (!$this->cache && !$return_string) {
+			extract($this->var);
 			include $this->tpl['compiled_filename'];
-			unset( $this->tpl );
+			unset($this->tpl);
 		}
 
 
 		// cache or return_string are enabled
 		// rain get the output buffer to save the output in the cache or to return it as string
 
-		else{
+		else {
 
 			//----------------------
 			// get the output buffer
 			//----------------------
 				ob_start();
-				extract( $this->var );
+				extract($this->var);
 				include $this->tpl['compiled_filename'];
 				$raintpl_contents = ob_get_clean();
 			//----------------------
 
 
 			// save the output in the cache
-			if( $this->cache )
-				file_put_contents( $this->tpl['cache_filename'], "<?php if(!class_exists('raintpl')){exit;}?>" . $raintpl_contents );
+			if ($this->cache)
+				file_put_contents($this->tpl['cache_filename'], "<?php if(!class_exists('raintpl')){exit;}?>" . $raintpl_contents);
 
 			// free memory
-			unset( $this->tpl );
+			unset($this->tpl);
 
 			// return or print the template
-			if( $return_string ) return $raintpl_contents; else echo $raintpl_contents;
+			if ($return_string) return $raintpl_contents; else echo $raintpl_contents;
 
 		}
 
@@ -256,17 +256,17 @@ 
 	 * @param  string $cache_id Suffix to be used when writing file to cache (optional)
 	 * @return string it return the HTML or null if the cache must be recreated
 	 */
-	public function cache( $tpl_name, $expire_time = self::CACHE_EXPIRE_TIME, $cache_id = '' ){
+	public function cache($tpl_name, $expire_time = self::CACHE_EXPIRE_TIME, $cache_id = '') {
 
 		// set the cache_id
 		$this->cache_id = $cache_id;
 
-		if( !$this->check_template( $tpl_name ) && file_exists( $this->tpl['cache_filename'] ) && ( time() - filemtime( $this->tpl['cache_filename'] ) < $expire_time ) )
-			return substr( file_get_contents( $this->tpl['cache_filename'] ), 43 );
-		else{
+		if (!$this->check_template($tpl_name) && file_exists($this->tpl['cache_filename']) && (time()-filemtime($this->tpl['cache_filename']) < $expire_time))
+			return substr(file_get_contents($this->tpl['cache_filename']), 43);
+		else {
 			//delete the cache of the selected template
 			if (file_exists($this->tpl['cache_filename']))
-			unlink($this->tpl['cache_filename'] );
+			unlink($this->tpl['cache_filename']);
 			$this->cache = true;
 		}
 	}
@@ -281,13 +281,13 @@ 
 	 * @param  array|string $setting array of settings or setting name
 	 * @param  mixed $value content to set in the setting (optional)
 	 */
-	public static function configure( $setting, $value = null ){
-		if( is_array( $setting ) )
-			foreach( $setting as $key => $value )
-				self::configure( $key, $value );
-		else if( property_exists( __CLASS__, $setting ) ){
+	public static function configure($setting, $value = null) {
+		if (is_array($setting))
+			foreach ($setting as $key => $value)
+				self::configure($key, $value);
+		else if (property_exists(__CLASS__, $setting)) {
 			self::$$setting = $value;
-			self::$config_name_sum[ $setting ] = $value; // take trace of all config
+			self::$config_name_sum[$setting] = $value; // take trace of all config
 		}
 	}
 
@@ -301,27 +301,27 @@ 
 	 * @throws RainTpl_NotFoundException
 	 * @return bool return true if the template has changed
 	 */
-	protected function check_template( $tpl_name ){
+	protected function check_template($tpl_name) {
 
-		if( !isset($this->tpl['checked']) ){
+		if (!isset($this->tpl['checked'])) {
 
-			$tpl_basename					   = basename( $tpl_name );														// template basename
-			$tpl_basedir						= strpos($tpl_name,"/") ? dirname($tpl_name) . '/' : null;						// template basedirectory
-			$tpl_dir							= PATH . self::$tpl_dir . $tpl_basedir;								// template directory
-			$this->tpl['tpl_filename']		  = $tpl_dir . $tpl_basename . '.' . self::$tpl_ext;	// template filename
-			$temp_compiled_filename			 = PATH . self::$cache_dir . $tpl_basename . "." . md5( $tpl_dir . serialize(self::$config_name_sum));
-			$this->tpl['compiled_filename']	 = $temp_compiled_filename . '.rtpl.php';	// cache filename
-			$this->tpl['cache_filename']		= $temp_compiled_filename . '.s_' . $this->cache_id . '.rtpl.php';	// static cache filename
+			$tpl_basename = basename($tpl_name); // template basename
+			$tpl_basedir = strpos($tpl_name, "/") ? dirname($tpl_name) . '/' : null; // template basedirectory
+			$tpl_dir = PATH . self::$tpl_dir . $tpl_basedir; // template directory
+			$this->tpl['tpl_filename']		  = $tpl_dir . $tpl_basename . '.' . self::$tpl_ext; // template filename
+			$temp_compiled_filename = PATH . self::$cache_dir . $tpl_basename . "." . md5($tpl_dir . serialize(self::$config_name_sum));
+			$this->tpl['compiled_filename'] = $temp_compiled_filename . '.rtpl.php'; // cache filename
+			$this->tpl['cache_filename']		= $temp_compiled_filename . '.s_' . $this->cache_id . '.rtpl.php'; // static cache filename
 
 			// if the template doesn't exsist throw an error
-			if( self::$check_template_update && !file_exists( $this->tpl['tpl_filename'] ) ){
-				$e = new RainTpl_NotFoundException( 'Template '. $tpl_basename .' not found!' );
+			if (self::$check_template_update && !file_exists($this->tpl['tpl_filename'])) {
+				$e = new RainTpl_NotFoundException('Template ' . $tpl_basename . ' not found!');
 				throw $e->setTemplateFile($this->tpl['tpl_filename']);
 			}
 
 			// file doesn't exsist, or the template was updated, Rain will compile the template
-			if( !file_exists( $this->tpl['compiled_filename'] ) || ( self::$check_template_update && filemtime($this->tpl['compiled_filename']) < filemtime( $this->tpl['tpl_filename'] ) ) ){
-				$this->compileFile( $tpl_basename, $tpl_basedir, $this->tpl['tpl_filename'], PATH . self::$cache_dir, $this->tpl['compiled_filename'] );
+			if (!file_exists($this->tpl['compiled_filename']) || (self::$check_template_update && filemtime($this->tpl['compiled_filename']) < filemtime($this->tpl['tpl_filename']))) {
+				$this->compileFile($tpl_basename, $tpl_basedir, $this->tpl['tpl_filename'], PATH . self::$cache_dir, $this->tpl['compiled_filename']);
 				return true;
 			}
 			$this->tpl['checked'] = true;
@@ -338,7 +338,7 @@ 
 	 * @return string
 	 */
 	protected function xml_reSubstitution($capture) {
-			return "<?php echo '<?xml ".stripslashes($capture[1])." ?>'; ?>";
+			return "<?php echo '<?xml " . stripslashes($capture[1]) . " ?>'; ?>";
 	}
 
 
@@ -355,37 +355,37 @@ 
 	 * @throws RainTpl_Exception
 	 * @return void
 	 */
-	protected function compileFile( $tpl_basename, $tpl_basedir, $tpl_filename, $cache_dir, $compiled_filename ){
+	protected function compileFile($tpl_basename, $tpl_basedir, $tpl_filename, $cache_dir, $compiled_filename) {
 
 		//read template file
-		$this->tpl['source'] = $template_code = file_get_contents( $tpl_filename );
+		$this->tpl['source'] = $template_code = file_get_contents($tpl_filename);
 
 		//xml substitution
-		$template_code = preg_replace( "/<\?xml(.*?)\?>/s", "##XML\\1XML##", $template_code );
+		$template_code = preg_replace("/<\?xml(.*?)\?>/s", "##XML\\1XML##", $template_code);
 
 		//disable php tag
-		if( !self::$php_enabled )
-			$template_code = str_replace( array("<?","?>"), array("&lt;?","?&gt;"), $template_code );
+		if (!self::$php_enabled)
+			$template_code = str_replace(array("<?", "?>"), array("&lt;?", "?&gt;"), $template_code);
 
 		//xml re-substitution
-		$template_code = preg_replace_callback ( "/##XML(.*?)XML##/s", array($this, 'xml_reSubstitution'), $template_code );
+		$template_code = preg_replace_callback("/##XML(.*?)XML##/s", array($this, 'xml_reSubstitution'), $template_code);
 
 		//compile template
-		$template_compiled = "<?php if(!class_exists('raintpl')){exit;}?>" . $this->compileTemplate( $template_code, $tpl_basedir );
+		$template_compiled = "<?php if(!class_exists('raintpl')){exit;}?>" . $this->compileTemplate($template_code, $tpl_basedir);
 
 
 		// fix the php-eating-newline-after-closing-tag-problem
-		$template_compiled = str_replace( "?>\n", "?>\n\n", $template_compiled );
+		$template_compiled = str_replace("?>\n", "?>\n\n", $template_compiled);
 
 		// create directories
-		if( !is_dir( $cache_dir ) )
-			mkdir( $cache_dir, 0755, true );
+		if (!is_dir($cache_dir))
+			mkdir($cache_dir, 0755, true);
 
-		if( !is_writable( $cache_dir ) )
-			throw new RainTpl_Exception ('Cache directory ' . $cache_dir . ' doesn\'t have write permission. Set write permission or set RAINTPL_CHECK_TEMPLATE_UPDATE to false. More details on http://www.raintpl.com/Documentation/Documentation-for-PHP-developers/Configuration/');
+		if (!is_writable($cache_dir))
+			throw new RainTpl_Exception('Cache directory ' . $cache_dir . ' doesn\'t have write permission. Set write permission or set RAINTPL_CHECK_TEMPLATE_UPDATE to false. More details on http://www.raintpl.com/Documentation/Documentation-for-PHP-developers/Configuration/');
 
 		//write compiled file
-		file_put_contents( $compiled_filename, $template_compiled );
+		file_put_contents($compiled_filename, $template_compiled);
 	}
 
 
@@ -398,10 +398,10 @@ 
 	 * @param  string $tpl_basedir
 	 * @return string
 	 */
-	protected function compileTemplate( $template_code, $tpl_basedir ){
+	protected function compileTemplate($template_code, $tpl_basedir) {
 
 		//tag list
-		$tag_regexp = array( 'loop'		 => '(\{loop(?: name){0,1}="\${0,1}[^"]*"\})',
+		$tag_regexp = array('loop'		 => '(\{loop(?: name){0,1}="\${0,1}[^"]*"\})',
 							 'loop_close'   => '(\{\/loop\})',
 							 'if'		   => '(\{if(?: condition){0,1}="[^"]*"\})',
 							 'elseif'	   => '(\{elseif(?: condition){0,1}="[^"]*"\})',
@@ -417,16 +417,16 @@ 
 							 'function'		=> '(\{function="(\w*?)(?:.*?)"\})'
 							);
 
-		$tag_regexp = "/" . join( "|", $tag_regexp ) . "/";
+		$tag_regexp = "/" . join("|", $tag_regexp) . "/";
 
 		//split the code with the tags regexp
-		$template_code = preg_split ( $tag_regexp, $template_code, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
+		$template_code = preg_split($tag_regexp, $template_code, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
 		//path replace (src of img, background and href of link)
-		$template_code = $this->path_replace( $template_code, $tpl_basedir );
+		$template_code = $this->path_replace($template_code, $tpl_basedir);
 
 		//compile the code
-		$compiled_code = $this->compileCode( $template_code );
+		$compiled_code = $this->compileCode($template_code);
 
 		//return the compiled code
 		return $compiled_code;
@@ -443,68 +443,68 @@ 
 	 * @throws RainTpl_SyntaxException
 	 * @return string
 	 */
-	protected function compileCode( $parsed_code ){
+	protected function compileCode($parsed_code) {
 
 		//variables initialization
 		$compiled_code = $open_if = $comment_is_open = $ignore_is_open = null;
 		$loop_level = 0;
 
 		//read all parsed code
-		while( $html = array_shift( $parsed_code ) ){
+		while ($html = array_shift($parsed_code)) {
 
 			//close ignore tag
-			if( !$comment_is_open && ( strpos( $html, '{/ignore}' ) !== FALSE || strpos( $html, '*}' ) !== FALSE ) )
+			if (!$comment_is_open && (strpos($html, '{/ignore}') !== FALSE || strpos($html, '*}') !== FALSE))
 				$ignore_is_open = false;
 
 			//code between tag ignore id deleted
-			elseif( $ignore_is_open ){
+			elseif ($ignore_is_open) {
 				//ignore the code
 			}
 
 			//close no parse tag
-			elseif( strpos( $html, '{/noparse}' ) !== FALSE )
+			elseif (strpos($html, '{/noparse}') !== FALSE)
 				$comment_is_open = false;
 
 			//code between tag noparse is not compiled
-			elseif( $comment_is_open )
+			elseif ($comment_is_open)
 				$compiled_code .= $html;
 
 			//ignore
-			elseif( strpos( $html, '{ignore}' ) !== FALSE || strpos( $html, '{*' ) !== FALSE )
+			elseif (strpos($html, '{ignore}') !== FALSE || strpos($html, '{*') !== FALSE)
 				$ignore_is_open = true;
 
 			//noparse
-			elseif( strpos( $html, '{noparse}' ) !== FALSE )
+			elseif (strpos($html, '{noparse}') !== FALSE)
 				$comment_is_open = true;
 
 			//include tag
-			elseif( preg_match( '/\{include="([^"]*)"(?: cache="([^"]*)"){0,1}\}/', $html, $code ) ){
+			elseif (preg_match('/\{include="([^"]*)"(?: cache="([^"]*)"){0,1}\}/', $html, $code)) {
 
 				//variables substitution
-				$include_var = $this->var_replace( $code[ 1 ], $left_delimiter = null, $right_delimiter = null, $php_left_delimiter = '".' , $php_right_delimiter = '."', $loop_level );
+				$include_var = $this->var_replace($code[1], $left_delimiter = null, $right_delimiter = null, $php_left_delimiter = '".', $php_right_delimiter = '."', $loop_level);
 
 				// if the cache is active
-				if( isset($code[ 2 ]) ){
+				if (isset($code[2])) {
 
 					//dynamic include
-					$compiled_code .= '<?php $tpl = new '.get_class($this).';' .
-								 'if( $cache = $tpl->cache( $template = basename("'.$include_var.'") ) )' .
+					$compiled_code .= '<?php $tpl = new ' . get_class($this) . ';' .
+								 'if( $cache = $tpl->cache( $template = basename("' . $include_var . '") ) )' .
 								 '	echo $cache;' .
 								 'else{' .
 								 '	$tpl_dir_temp = self::$tpl_dir;' .
 								 '	$tpl->assign( $this->var );' .
-									( !$loop_level ? null : '$tpl->assign( "key", $key'.$loop_level.' ); $tpl->assign( "value", $value'.$loop_level.' );' ).
-								 '	$tpl->draw( dirname("'.$include_var.'") . ( substr("'.$include_var.'",-1,1) != "/" ? "/" : "" ) . basename("'.$include_var.'") );'.
+									(!$loop_level ? null : '$tpl->assign( "key", $key' . $loop_level . ' ); $tpl->assign( "value", $value' . $loop_level . ' );') .
+								 '	$tpl->draw( dirname("' . $include_var . '") . ( substr("' . $include_var . '",-1,1) != "/" ? "/" : "" ) . basename("' . $include_var . '") );' .
 								 '} ?>';
 				}
-				else{
+				else {
 
 					//dynamic include
-					$compiled_code .= '<?php $tpl = new '.get_class($this).';' .
+					$compiled_code .= '<?php $tpl = new ' . get_class($this) . ';' .
 									  '$tpl_dir_temp = self::$tpl_dir;' .
 									  '$tpl->assign( $this->var );' .
-									  ( !$loop_level ? null : '$tpl->assign( "key", $key'.$loop_level.' ); $tpl->assign( "value", $value'.$loop_level.' );' ).
-									  '$tpl->draw( dirname("'.$include_var.'") . ( substr("'.$include_var.'",-1,1) != "/" ? "/" : "" ) . basename("'.$include_var.'") );'.
+									  (!$loop_level ? null : '$tpl->assign( "key", $key' . $loop_level . ' ); $tpl->assign( "value", $value' . $loop_level . ' );') .
+									  '$tpl->draw( dirname("' . $include_var . '") . ( substr("' . $include_var . '",-1,1) != "/" ? "/" : "" ) . basename("' . $include_var . '") );' .
 									  '?>';
 
 
@@ -513,26 +513,26 @@ 
 			}
 
 			//loop
-			elseif( preg_match( '/\{loop(?: name){0,1}="\${0,1}([^"]*)"\}/', $html, $code ) ){
+			elseif (preg_match('/\{loop(?: name){0,1}="\${0,1}([^"]*)"\}/', $html, $code)) {
 
 				//increase the loop counter
 				$loop_level++;
 
 				//replace the variable in the loop
-				$var = $this->var_replace( '$' . $code[ 1 ], $tag_left_delimiter=null, $tag_right_delimiter=null, $php_left_delimiter=null, $php_right_delimiter=null, $loop_level-1 );
+				$var = $this->var_replace('$' . $code[1], $tag_left_delimiter = null, $tag_right_delimiter = null, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level-1);
 
 				//loop variables
-				$counter = "\$counter$loop_level";	   // count iteration
-				$key = "\$key$loop_level";			   // key
-				$value = "\$value$loop_level";		   // value
+				$counter = "\$counter$loop_level"; // count iteration
+				$key = "\$key$loop_level"; // key
+				$value = "\$value$loop_level"; // value
 
 				//loop code
-				$compiled_code .=  "<?php $counter=-1; if( isset($var) && is_array($var) && sizeof($var) ) foreach( $var as $key => $value ){ $counter++; ?>";
+				$compiled_code .= "<?php $counter=-1; if( isset($var) && is_array($var) && sizeof($var) ) foreach( $var as $key => $value ){ $counter++; ?>";
 
 			}
 
 			//close loop tag
-			elseif( strpos( $html, '{/loop}' ) !== FALSE ) {
+			elseif (strpos($html, '{/loop}') !== FALSE) {
 
 				//iterator
 				$counter = "\$counter$loop_level";
@@ -541,114 +541,114 @@ 
 				$loop_level--;
 
 				//close loop code
-				$compiled_code .=  "<?php } ?>";
+				$compiled_code .= "<?php } ?>";
 
 			}
 
 			//if
-			elseif( preg_match( '/\{if(?: condition){0,1}="([^"]*)"\}/', $html, $code ) ){
+			elseif (preg_match('/\{if(?: condition){0,1}="([^"]*)"\}/', $html, $code)) {
 
 				//increase open if counter (for intendation)
 				$open_if++;
 
 				//tag
-				$tag = $code[ 0 ];
+				$tag = $code[0];
 
 				//condition attribute
-				$condition = $code[ 1 ];
+				$condition = $code[1];
 
 				// check if there's any function disabled by black_list
-				$this->function_check( $tag );
+				$this->function_check($tag);
 
 				//variable substitution into condition (no delimiter into the condition)
-				$parsed_condition = $this->var_replace( $condition, $tag_left_delimiter = null, $tag_right_delimiter = null, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level );
+				$parsed_condition = $this->var_replace($condition, $tag_left_delimiter = null, $tag_right_delimiter = null, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level);
 
 				//if code
-				$compiled_code .=   "<?php if( $parsed_condition ){ ?>";
+				$compiled_code .= "<?php if( $parsed_condition ){ ?>";
 
 			}
 
 			//elseif
-			elseif( preg_match( '/\{elseif(?: condition){0,1}="([^"]*)"\}/', $html, $code ) ){
+			elseif (preg_match('/\{elseif(?: condition){0,1}="([^"]*)"\}/', $html, $code)) {
 
 				//tag
-				$tag = $code[ 0 ];
+				$tag = $code[0];
 
 				//condition attribute
-				$condition = $code[ 1 ];
+				$condition = $code[1];
 
 				//variable substitution into condition (no delimiter into the condition)
-				$parsed_condition = $this->var_replace( $condition, $tag_left_delimiter = null, $tag_right_delimiter = null, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level );
+				$parsed_condition = $this->var_replace($condition, $tag_left_delimiter = null, $tag_right_delimiter = null, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level);
 
 				//elseif code
-				$compiled_code .=   "<?php }elseif( $parsed_condition ){ ?>";
+				$compiled_code .= "<?php }elseif( $parsed_condition ){ ?>";
 			}
 
 			//else
-			elseif( strpos( $html, '{else}' ) !== FALSE ) {
+			elseif (strpos($html, '{else}') !== FALSE) {
 
 				//else code
-				$compiled_code .=   '<?php }else{ ?>';
+				$compiled_code .= '<?php }else{ ?>';
 
 			}
 
 			//close if tag
-			elseif( strpos( $html, '{/if}' ) !== FALSE ) {
+			elseif (strpos($html, '{/if}') !== FALSE) {
 
 				//decrease if counter
 				$open_if--;
 
 				// close if code
-				$compiled_code .=   '<?php } ?>';
+				$compiled_code .= '<?php } ?>';
 
 			}
 
 			//function
-			elseif( preg_match( '/\{function="(\w*)(.*?)"\}/', $html, $code ) ){
+			elseif (preg_match('/\{function="(\w*)(.*?)"\}/', $html, $code)) {
 
 				//tag
-				$tag = $code[ 0 ];
+				$tag = $code[0];
 
 				//function
-				$function = $code[ 1 ];
+				$function = $code[1];
 
 				// check if there's any function disabled by black_list
-				$this->function_check( $tag );
+				$this->function_check($tag);
 
-				if( empty( $code[ 2 ] ) )
+				if (empty($code[2]))
 					$parsed_function = $function . "()";
 				else
 					// parse the function
-					$parsed_function = $function . $this->var_replace( $code[ 2 ], $tag_left_delimiter = null, $tag_right_delimiter = null, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level );
+					$parsed_function = $function . $this->var_replace($code[2], $tag_left_delimiter = null, $tag_right_delimiter = null, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level);
 
 				//if code
-				$compiled_code .=   "<?php echo $parsed_function; ?>";
+				$compiled_code .= "<?php echo $parsed_function; ?>";
 			}
 
 			// show all vars
-			elseif ( strpos( $html, '{$template_info}' ) !== FALSE ) {
+			elseif (strpos($html, '{$template_info}') !== FALSE) {
 
 				//tag
-				$tag  = '{$template_info}';
+				$tag = '{$template_info}';
 
 				//if code
-				$compiled_code .=   '<?php echo "<pre>"; print_r( $this->var ); echo "</pre>"; ?>';
+				$compiled_code .= '<?php echo "<pre>"; print_r( $this->var ); echo "</pre>"; ?>';
 			}
 
 
 			//all html code
-			else{
+			else {
 
 				//variables substitution (es. {$title})
-				$html = $this->var_replace( $html, $left_delimiter = '\{', $right_delimiter = '\}', $php_left_delimiter = '<?php ', $php_right_delimiter = ';?>', $loop_level, $echo = true );
+				$html = $this->var_replace($html, $left_delimiter = '\{', $right_delimiter = '\}', $php_left_delimiter = '<?php ', $php_right_delimiter = ';?>', $loop_level, $echo = true);
 				//const substitution (es. {#CONST#})
-				$html = $this->const_replace( $html, $left_delimiter = '\{', $right_delimiter = '\}', $php_left_delimiter = '<?php ', $php_right_delimiter = ';?>', $loop_level, $echo = true );
+				$html = $this->const_replace($html, $left_delimiter = '\{', $right_delimiter = '\}', $php_left_delimiter = '<?php ', $php_right_delimiter = ';?>', $loop_level, $echo = true);
 				//functions substitution (es. {"string"|functions})
-				$compiled_code .= $this->func_replace( $html, $left_delimiter = '\{', $right_delimiter = '\}', $php_left_delimiter = '<?php ', $php_right_delimiter = ';?>', $loop_level, $echo = true );
+				$compiled_code .= $this->func_replace($html, $left_delimiter = '\{', $right_delimiter = '\}', $php_left_delimiter = '<?php ', $php_right_delimiter = ';?>', $loop_level, $echo = true);
 			}
 		}
 
-		if( $open_if > 0 ) {
+		if ($open_if > 0) {
 			$e = new RainTpl_SyntaxException('Error! You need to close an {if} tag in ' . $this->tpl['tpl_filename'] . ' template');
 			throw $e->setTemplateFile($this->tpl['tpl_filename']);
 		}
@@ -665,11 +665,11 @@ 
 	 * @param string $path
 	 * @return string
 	 */
-	protected function reduce_path( $path ){
-		$path = str_replace( "://", "@not_replace@", $path );
-		$path = str_replace( "//", "/", $path );
-		$path = str_replace( "@not_replace@", "://", $path );
-		return preg_replace('/\w+\/\.\.\//', '', $path );
+	protected function reduce_path($path) {
+		$path = str_replace("://", "@not_replace@", $path);
+		$path = str_replace("//", "/", $path);
+		$path = str_replace("@not_replace@", "://", $path);
+		return preg_replace('/\w+\/\.\.\//', '', $path);
 	}
 
 
@@ -686,9 +686,9 @@ 
 	 * @param  string $tpl_basedir
 	 * @return string html substitution
 	 */
-	protected function path_replace( $html, $tpl_basedir ){
+	protected function path_replace($html, $tpl_basedir) {
 
-		if( self::$path_replace ){
+		if (self::$path_replace) {
 
 			$tpl_dir = self::$base_url . PATH . self::$tpl_dir . $tpl_basedir;
 
@@ -697,32 +697,32 @@ 
 
 			$exp = $sub = array();
 
-			if( in_array( "img", self::$path_replace_list ) ){
-				$exp = array( '/<img(.*?)src=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<img(.*?)src=(?:")([^"]+?)#(?:")/i', '/<img(.*?)src="(.*?)"/', '/<img(.*?)src=(?:\@)([^"]+?)(?:\@)/i' );
-				$sub = array( '<img$1src=@$2://$3@', '<img$1src=@$2@', '<img$1src="' . $path . '$2"', '<img$1src="$2"' );
+			if (in_array("img", self::$path_replace_list)) {
+				$exp = array('/<img(.*?)src=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<img(.*?)src=(?:")([^"]+?)#(?:")/i', '/<img(.*?)src="(.*?)"/', '/<img(.*?)src=(?:\@)([^"]+?)(?:\@)/i');
+				$sub = array('<img$1src=@$2://$3@', '<img$1src=@$2@', '<img$1src="' . $path . '$2"', '<img$1src="$2"');
 			}
 
-			if( in_array( "script", self::$path_replace_list ) ){
-				$exp = array_merge( $exp , array( '/<script(.*?)src=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<script(.*?)src=(?:")([^"]+?)#(?:")/i', '/<script(.*?)src="(.*?)"/', '/<script(.*?)src=(?:\@)([^"]+?)(?:\@)/i' ) );
-				$sub = array_merge( $sub , array( '<script$1src=@$2://$3@', '<script$1src=@$2@', '<script$1src="' . $path . '$2"', '<script$1src="$2"' ) );
+			if (in_array("script", self::$path_replace_list)) {
+				$exp = array_merge($exp, array('/<script(.*?)src=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<script(.*?)src=(?:")([^"]+?)#(?:")/i', '/<script(.*?)src="(.*?)"/', '/<script(.*?)src=(?:\@)([^"]+?)(?:\@)/i'));
+				$sub = array_merge($sub, array('<script$1src=@$2://$3@', '<script$1src=@$2@', '<script$1src="' . $path . '$2"', '<script$1src="$2"'));
 			}
 
-			if( in_array( "link", self::$path_replace_list ) ){
-				$exp = array_merge( $exp , array( '/<link(.*?)href=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<link(.*?)href=(?:")([^"]+?)#(?:")/i', '/<link(.*?)href="(.*?)"/', '/<link(.*?)href=(?:\@)([^"]+?)(?:\@)/i' ) );
-				$sub = array_merge( $sub , array( '<link$1href=@$2://$3@', '<link$1href=@$2@' , '<link$1href="' . $path . '$2"', '<link$1href="$2"' ) );
+			if (in_array("link", self::$path_replace_list)) {
+				$exp = array_merge($exp, array('/<link(.*?)href=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<link(.*?)href=(?:")([^"]+?)#(?:")/i', '/<link(.*?)href="(.*?)"/', '/<link(.*?)href=(?:\@)([^"]+?)(?:\@)/i'));
+				$sub = array_merge($sub, array('<link$1href=@$2://$3@', '<link$1href=@$2@', '<link$1href="' . $path . '$2"', '<link$1href="$2"'));
 			}
 
-			if( in_array( "a", self::$path_replace_list ) ){
-				$exp = array_merge( $exp , array( '/<a(.*?)href=(?:")(http\:\/\/|https\:\/\/|javascript:)([^"]+?)(?:")/i', '/<a(.*?)href="(.*?)"/', '/<a(.*?)href=(?:\@)([^"]+?)(?:\@)/i'  ) );
-				$sub = array_merge( $sub , array( '<a$1href=@$2$3@', '<a$1href="' . self::$base_url . '$2"', '<a$1href="$2"' ) );
+			if (in_array("a", self::$path_replace_list)) {
+				$exp = array_merge($exp, array('/<a(.*?)href=(?:")(http\:\/\/|https\:\/\/|javascript:)([^"]+?)(?:")/i', '/<a(.*?)href="(.*?)"/', '/<a(.*?)href=(?:\@)([^"]+?)(?:\@)/i'));
+				$sub = array_merge($sub, array('<a$1href=@$2$3@', '<a$1href="' . self::$base_url . '$2"', '<a$1href="$2"'));
 			}
 
-			if( in_array( "input", self::$path_replace_list ) ){
-				$exp = array_merge( $exp , array( '/<input(.*?)src=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<input(.*?)src=(?:")([^"]+?)#(?:")/i', '/<input(.*?)src="(.*?)"/', '/<input(.*?)src=(?:\@)([^"]+?)(?:\@)/i' ) );
-				$sub = array_merge( $sub , array( '<input$1src=@$2://$3@', '<input$1src=@$2@', '<input$1src="' . $path . '$2"', '<input$1src="$2"' ) );
+			if (in_array("input", self::$path_replace_list)) {
+				$exp = array_merge($exp, array('/<input(.*?)src=(?:")(http|https)\:\/\/([^"]+?)(?:")/i', '/<input(.*?)src=(?:")([^"]+?)#(?:")/i', '/<input(.*?)src="(.*?)"/', '/<input(.*?)src=(?:\@)([^"]+?)(?:\@)/i'));
+				$sub = array_merge($sub, array('<input$1src=@$2://$3@', '<input$1src=@$2@', '<input$1src="' . $path . '$2"', '<input$1src="$2"'));
 			}
 
-			return preg_replace( $exp, $sub, $html );
+			return preg_replace($exp, $sub, $html);
 
 		}
 		else
@@ -745,9 +745,9 @@ 
 	 * @param  string $echo (optional)
 	 * @return string
 	 */
-	public function const_replace( $html, $tag_left_delimiter, $tag_right_delimiter, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level = null, $echo = null ){
+	public function const_replace($html, $tag_left_delimiter, $tag_right_delimiter, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level = null, $echo = null) {
 		// const
-		return preg_replace( '/\{\#(\w+)\#{0,1}\}/', $php_left_delimiter . ( $echo ? " echo " : null ) . '\\1' . $php_right_delimiter, $html );
+		return preg_replace('/\{\#(\w+)\#{0,1}\}/', $php_left_delimiter . ($echo ? " echo " : null) . '\\1' . $php_right_delimiter, $html);
 	}
 
 
@@ -765,77 +765,77 @@ 
 	 * @param  string $echo (optional)
 	 * @return string
 	 */
-	public function func_replace( $html, $tag_left_delimiter, $tag_right_delimiter, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level = null, $echo = null ){
+	public function func_replace($html, $tag_left_delimiter, $tag_right_delimiter, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level = null, $echo = null) {
 
-		preg_match_all( '/' . '\{\#{0,1}(\"{0,1}.*?\"{0,1})(\|\w.*?)\#{0,1}\}' . '/', $html, $matches );
+		preg_match_all('/' . '\{\#{0,1}(\"{0,1}.*?\"{0,1})(\|\w.*?)\#{0,1}\}' . '/', $html, $matches);
 
-		for( $i=0, $n=count($matches[0]); $i<$n; $i++ ){
+		for ($i = 0, $n = count($matches[0]); $i < $n; $i++) {
 
 			//complete tag ex: {$news.title|substr:0,100}
-			$tag = $matches[ 0 ][ $i ];
+			$tag = $matches[0][$i];
 
 			//variable name ex: news.title
-			$var = $matches[ 1 ][ $i ];
+			$var = $matches[1][$i];
 
 			//function and parameters associate to the variable ex: substr:0,100
-			$extra_var = $matches[ 2 ][ $i ];
+			$extra_var = $matches[2][$i];
 
 			// check if there's any function disabled by black_list
-			$this->function_check( $tag );
+			$this->function_check($tag);
 
-			$extra_var = $this->var_replace( $extra_var, null, null, null, null, $loop_level );
+			$extra_var = $this->var_replace($extra_var, null, null, null, null, $loop_level);
 
 
 			// check if there's an operator = in the variable tags, if there's this is an initialization so it will not output any value
-			$is_init_variable = preg_match( "/^(\s*?)\=[^=](.*?)$/", $extra_var );
+			$is_init_variable = preg_match("/^(\s*?)\=[^=](.*?)$/", $extra_var);
 
 			//function associate to variable
-			$function_var = ( $extra_var and $extra_var[0] == '|') ? substr( $extra_var, 1 ) : null;
+			$function_var = ($extra_var and $extra_var[0] == '|') ? substr($extra_var, 1) : null;
 
 			//variable path split array (ex. $news.title o $news[title]) or object (ex. $news->title)
-			$temp = preg_split( "/\.|\[|\-\>/", $var );
+			$temp = preg_split("/\.|\[|\-\>/", $var);
 
 			//variable name
-			$var_name = $temp[ 0 ];
+			$var_name = $temp[0];
 
 			//variable path
-			$variable_path = substr( $var, strlen( $var_name ) );
+			$variable_path = substr($var, strlen($var_name));
 
 			//parentesis transform [ e ] in [" e in "]
-			$variable_path = str_replace( '[', '["', $variable_path );
-			$variable_path = str_replace( ']', '"]', $variable_path );
+			$variable_path = str_replace('[', '["', $variable_path);
+			$variable_path = str_replace(']', '"]', $variable_path);
 
 			//transform .$variable in ["$variable"]
-			$variable_path = preg_replace('/\.\$(\w+)/', '["$\\1"]', $variable_path );
+			$variable_path = preg_replace('/\.\$(\w+)/', '["$\\1"]', $variable_path);
 
 			//transform [variable] in ["variable"]
-			$variable_path = preg_replace('/\.(\w+)/', '["\\1"]', $variable_path );
+			$variable_path = preg_replace('/\.(\w+)/', '["\\1"]', $variable_path);
 
 			//if there's a function
-			if( $function_var ){
+			if ($function_var) {
 
 				// check if there's a function or a static method and separate, function by parameters
-				$function_var = str_replace("::", "@double_dot@", $function_var );
+				$function_var = str_replace("::", "@double_dot@", $function_var);
 
 				// get the position of the first :
-				if( $dot_position = strpos( $function_var, ":" ) ){
+				if ($dot_position = strpos($function_var, ":")) {
 
 					// get the function and the parameters
-					$function = substr( $function_var, 0, $dot_position );
-					$params = substr( $function_var, $dot_position+1 );
+					$function = substr($function_var, 0, $dot_position);
+					$params = substr($function_var, $dot_position+1);
 
 				}
-				else{
+				else {
 
 					//get the function
-					$function = str_replace( "@double_dot@", "::", $function_var );
+					$function = str_replace("@double_dot@", "::", $function_var);
 					$params = null;
 
 				}
 
 				// replace back the @double_dot@ with ::
-				$function = str_replace( "@double_dot@", "::", $function );
-				$params = str_replace( "@double_dot@", "::", $params );
+				$function = str_replace("@double_dot@", "::", $function);
+				$params = str_replace("@double_dot@", "::", $params);
 
 
 			}
@@ -845,16 +845,16 @@ 
 			$php_var = $var_name . $variable_path;
 
 			// compile the variable for php
-			if( isset( $function ) ){
-				if( $php_var )
-					$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . ( $params ? "( $function( $php_var, $params ) )" : "$function( $php_var )" ) . $php_right_delimiter;
+			if (isset($function)) {
+				if ($php_var)
+					$php_var = $php_left_delimiter . (!$is_init_variable && $echo ? 'echo ' : null) . ($params ? "( $function( $php_var, $params ) )" : "$function( $php_var )") . $php_right_delimiter;
 				else
-					$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . ( $params ? "( $function( $params ) )" : "$function()" ) . $php_right_delimiter;
+					$php_var = $php_left_delimiter . (!$is_init_variable && $echo ? 'echo ' : null) . ($params ? "( $function( $params ) )" : "$function()") . $php_right_delimiter;
 			}
 			else
-				$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . $php_var . $extra_var . $php_right_delimiter;
+				$php_var = $php_left_delimiter . (!$is_init_variable && $echo ? 'echo ' : null) . $php_var . $extra_var . $php_right_delimiter;
 
-			$html = str_replace( $tag, $php_var, $html );
+			$html = str_replace($tag, $php_var, $html);
 
 		}
 
@@ -877,15 +877,15 @@ 
 	 * @param  string $echo (optional)
 	 * @return string
 	 */
-	public function var_replace( $html, $tag_left_delimiter, $tag_right_delimiter, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level = null, $echo = null ){
+	public function var_replace($html, $tag_left_delimiter, $tag_right_delimiter, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level = null, $echo = null) {
 
 		//all variables
-		if( preg_match_all( '/' . $tag_left_delimiter . '\$(\w+(?:\.\${0,1}[A-Za-z0-9_]+)*(?:(?:\[\${0,1}[A-Za-z0-9_]+\])|(?:\-\>\${0,1}[A-Za-z0-9_]+))*)(.*?)' . $tag_right_delimiter . '/', $html, $matches ) ){
+		if (preg_match_all('/' . $tag_left_delimiter . '\$(\w+(?:\.\${0,1}[A-Za-z0-9_]+)*(?:(?:\[\${0,1}[A-Za-z0-9_]+\])|(?:\-\>\${0,1}[A-Za-z0-9_]+))*)(.*?)' . $tag_right_delimiter . '/', $html, $matches)) {
 
-			for( $parsed=array(), $i=0, $n=count($matches[0]); $i<$n; $i++ )
-				$parsed[$matches[0][$i]] = array('var'=>$matches[1][$i],'extra_var'=>$matches[2][$i]);
+			for ($parsed = array(), $i = 0, $n = count($matches[0]); $i < $n; $i++)
+				$parsed[$matches[0][$i]] = array('var'=>$matches[1][$i], 'extra_var'=>$matches[2][$i]);
 
-			foreach( $parsed as $tag => $array ){
+			foreach ($parsed as $tag => $array) {
 
 				//variable name ex: news.title
 				$var = $array['var'];
@@ -894,89 +894,89 @@ 
 				$extra_var = $array['extra_var'];
 
 				// check if there's any function disabled by black_list
-				$this->function_check( $tag );
+				$this->function_check($tag);
 
-				$extra_var = $this->var_replace( $extra_var, null, null, null, null, $loop_level );
+				$extra_var = $this->var_replace($extra_var, null, null, null, null, $loop_level);
 
 				// check if there's an operator = in the variable tags, if there's this is an initialization so it will not output any value
-				$is_init_variable = preg_match( "/^[a-z_A-Z\.\[\](\-\>)]*=[^=]*$/", $extra_var );
+				$is_init_variable = preg_match("/^[a-z_A-Z\.\[\](\-\>)]*=[^=]*$/", $extra_var);
 
 				//function associate to variable
-				$function_var = ( $extra_var and $extra_var[0] == '|') ? substr( $extra_var, 1 ) : null;
+				$function_var = ($extra_var and $extra_var[0] == '|') ? substr($extra_var, 1) : null;
 
 				//variable path split array (ex. $news.title o $news[title]) or object (ex. $news->title)
-				$temp = preg_split( "/\.|\[|\-\>/", $var );
+				$temp = preg_split("/\.|\[|\-\>/", $var);
 
 				//variable name
-				$var_name = $temp[ 0 ];
+				$var_name = $temp[0];
 
 				//variable path
-				$variable_path = substr( $var, strlen( $var_name ) );
+				$variable_path = substr($var, strlen($var_name));
 
 				//parentesis transform [ e ] in [" e in "]
-				$variable_path = str_replace( '[', '["', $variable_path );
-				$variable_path = str_replace( ']', '"]', $variable_path );
+				$variable_path = str_replace('[', '["', $variable_path);
+				$variable_path = str_replace(']', '"]', $variable_path);
 
 				//transform .$variable in ["$variable"] and .variable in ["variable"]
-				$variable_path = preg_replace('/\.(\${0,1}\w+)/', '["\\1"]', $variable_path );
+				$variable_path = preg_replace('/\.(\${0,1}\w+)/', '["\\1"]', $variable_path);
 
 				// if is an assignment also assign the variable to $this->var['value']
-				if( $is_init_variable )
+				if ($is_init_variable)
 					$extra_var = "=\$this->var['{$var_name}']{$variable_path}" . $extra_var;
 
 
 
 				//if there's a function
-				if( $function_var ){
+				if ($function_var) {
 
 					// check if there's a function or a static method and separate, function by parameters
-					$function_var = str_replace("::", "@double_dot@", $function_var );
+					$function_var = str_replace("::", "@double_dot@", $function_var);
 
 
 					// get the position of the first :
-					if( $dot_position = strpos( $function_var, ":" ) ){
+					if ($dot_position = strpos($function_var, ":")) {
 
 						// get the function and the parameters
-						$function = substr( $function_var, 0, $dot_position );
-						$params = substr( $function_var, $dot_position+1 );
+						$function = substr($function_var, 0, $dot_position);
+						$params = substr($function_var, $dot_position+1);
 
 					}
-					else{
+					else {
 
 						//get the function
-						$function = str_replace( "@double_dot@", "::", $function_var );
+						$function = str_replace("@double_dot@", "::", $function_var);
 						$params = null;
 
 					}
 
 					// replace back the @double_dot@ with ::
-					$function = str_replace( "@double_dot@", "::", $function );
-					$params = str_replace( "@double_dot@", "::", $params );
+					$function = str_replace("@double_dot@", "::", $function);
+					$params = str_replace("@double_dot@", "::", $params);
 				}
 				else
 					$function = $params = null;
 
 				//if it is inside a loop
-				if( $loop_level ){
+				if ($loop_level) {
 					//verify the variable name
-					if( $var_name == 'key' )
+					if ($var_name == 'key')
 							$php_var = '$key' . $loop_level;
-					elseif( $var_name == 'value' )
+					elseif ($var_name == 'value')
 							$php_var = '$value' . $loop_level . $variable_path;
-					elseif( $var_name == 'counter' )
+					elseif ($var_name == 'counter')
 							$php_var = '$counter' . $loop_level;
 					else
 							$php_var = '$' . $var_name . $variable_path;
-				}else
+				} else
 					$php_var = '$' . $var_name . $variable_path;
 
 				// compile the variable for php
-				if( isset( $function ) )
-					$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . ( $params ? "( $function( $php_var, $params ) )" : "$function( $php_var )" ) . $php_right_delimiter;
+				if (isset($function))
+					$php_var = $php_left_delimiter . (!$is_init_variable && $echo ? 'echo ' : null) . ($params ? "( $function( $php_var, $params ) )" : "$function( $php_var )") . $php_right_delimiter;
 				else
-					$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . $php_var . $extra_var . $php_right_delimiter;
+					$php_var = $php_left_delimiter . (!$is_init_variable && $echo ? 'echo ' : null) . $php_var . $extra_var . $php_right_delimiter;
 
-				$html = str_replace( $tag, $php_var, $html );
+				$html = str_replace($tag, $php_var, $html);
 
 
 			}
@@ -995,17 +995,17 @@ 
 	 * @throws RainTpl_SyntaxException
 	 * @return void
 	 */
-	protected function function_check( $code ){
+	protected function function_check($code) {
 
-		$preg = '#(\W|\s)' . implode( '(\W|\s)|(\W|\s)', self::$black_list ) . '(\W|\s)#';
+		$preg = '#(\W|\s)' . implode('(\W|\s)|(\W|\s)', self::$black_list) . '(\W|\s)#';
 
 		// check if the function is in the black list (or not in white list)
-		if( count(self::$black_list) && preg_match( $preg, $code, $match ) ){
+		if (count(self::$black_list) && preg_match($preg, $code, $match)) {
 
 			// find the line of the error
 			$line = 0;
-			$rows=explode("\n",$this->tpl['source']);
-			while( !strpos($rows[$line],$code) )
+			$rows = explode("\n", $this->tpl['source']);
+			while (!strpos($rows[$line], $code))
 				$line++;
 
 			// stop the execution of the script
@@ -1026,7 +1026,7 @@ 
 	 * @param  RainTpl_Exception $e
 	 * @return string
 	 */
-	protected function printDebug(RainTpl_Exception $e){
+	protected function printDebug(RainTpl_Exception $e) {
 		if (!self::$debug) {
 			throw $e;
 		}
@@ -1043,7 +1043,7 @@ 
 				$output .= '<p>in tag: ' . htmlspecialchars($e->getTag()) . '</p>';
 			}
 			if (null != $e->getTemplateLine() && null != $e->getTag()) {
-				$rows=explode("\n",  htmlspecialchars($this->tpl['source']));
+				$rows = explode("\n", htmlspecialchars($this->tpl['source']));
 				$rows[$e->getTemplateLine()] = '<font color=red>' . $rows[$e->getTemplateLine()] . '</font>';
 				$output .= '<h3>template code</h3>' . implode('<br />', $rows) . '</pre>';
 			}
@@ -1061,7 +1061,7 @@ 
 /**
  * Basic Rain tpl exception.
  */
-class RainTpl_Exception extends Exception{
+class RainTpl_Exception extends Exception {
 	/**
 	 * Path of template file with error.
 	 */
@@ -1095,13 +1095,13 @@ 
 /**
  * Exception thrown when template file does not exists.
  */
-class RainTpl_NotFoundException extends RainTpl_Exception{
+class RainTpl_NotFoundException extends RainTpl_Exception {
 }
 
 /**
  * Exception thrown when syntax error occurs.
  */
-class RainTpl_SyntaxException extends RainTpl_Exception{
+class RainTpl_SyntaxException extends RainTpl_Exception {
 	/**
 	 * Line in template file where error has occured.
 	 *

Braces +93 added lines, -73 removed lines

@@ -178,10 +178,11 @@ 
 	 * @param  mixed $value value assigned to this variable. Not set if variable_name is an associative array
 	 */
 	public function assign( $variable, $value = null ){
-		if( is_array( $variable ) )
-			$this->var += $variable;
-		else
-			$this->var[ $variable ] = $value;
+		if( is_array( $variable ) ) {
+					$this->var += $variable;
+		} else {
+					$this->var[ $variable ] = $value;
+		}
 	}
 
 
@@ -232,14 +233,19 @@ 
 
 
 			// save the output in the cache
-			if( $this->cache )
-				file_put_contents( $this->tpl['cache_filename'], "<?php if(!class_exists('raintpl')){exit;}?>" . $raintpl_contents );
+			if( $this->cache ) {
+							file_put_contents( $this->tpl['cache_filename'], "<?php if(!class_exists('raintpl')){exit;}?>" . $raintpl_contents );
+			}
 
 			// free memory
 			unset( $this->tpl );
 
 			// return or print the template
-			if( $return_string ) return $raintpl_contents; else echo $raintpl_contents;
+			if( $return_string ) {
+			    return $raintpl_contents;
+			} else {
+			    echo $raintpl_contents;
+			}
 
 		}
 
@@ -261,12 +267,13 @@ 
 		// set the cache_id
 		$this->cache_id = $cache_id;
 
-		if( !$this->check_template( $tpl_name ) && file_exists( $this->tpl['cache_filename'] ) && ( time() - filemtime( $this->tpl['cache_filename'] ) < $expire_time ) )
-			return substr( file_get_contents( $this->tpl['cache_filename'] ), 43 );
-		else{
+		if( !$this->check_template( $tpl_name ) && file_exists( $this->tpl['cache_filename'] ) && ( time() - filemtime( $this->tpl['cache_filename'] ) < $expire_time ) ) {
+					return substr( file_get_contents( $this->tpl['cache_filename'] ), 43 );
+		} else{
 			//delete the cache of the selected template
-			if (file_exists($this->tpl['cache_filename']))
-			unlink($this->tpl['cache_filename'] );
+			if (file_exists($this->tpl['cache_filename'])) {
+						unlink($this->tpl['cache_filename'] );
+			}
 			$this->cache = true;
 		}
 	}
@@ -282,10 +289,10 @@ 
 	 * @param  mixed $value content to set in the setting (optional)
 	 */
 	public static function configure( $setting, $value = null ){
-		if( is_array( $setting ) )
-			foreach( $setting as $key => $value )
+		if( is_array( $setting ) ) {
+					foreach( $setting as $key => $value )
 				self::configure( $key, $value );
-		else if( property_exists( __CLASS__, $setting ) ){
+		} else if( property_exists( __CLASS__, $setting ) ){
 			self::$$setting = $value;
 			self::$config_name_sum[ $setting ] = $value; // take trace of all config
 		}
@@ -364,8 +371,9 @@ 
 		$template_code = preg_replace( "/<\?xml(.*?)\?>/s", "##XML\\1XML##", $template_code );
 
 		//disable php tag
-		if( !self::$php_enabled )
-			$template_code = str_replace( array("<?","?>"), array("&lt;?","?&gt;"), $template_code );
+		if( !self::$php_enabled ) {
+					$template_code = str_replace( array("<?","?>"), array("&lt;?","?&gt;"), $template_code );
+		}
 
 		//xml re-substitution
 		$template_code = preg_replace_callback ( "/##XML(.*?)XML##/s", array($this, 'xml_reSubstitution'), $template_code );
@@ -378,11 +386,13 @@ 
 		$template_compiled = str_replace( "?>\n", "?>\n\n", $template_compiled );
 
 		// create directories
-		if( !is_dir( $cache_dir ) )
-			mkdir( $cache_dir, 0755, true );
+		if( !is_dir( $cache_dir ) ) {
+					mkdir( $cache_dir, 0755, true );
+		}
 
-		if( !is_writable( $cache_dir ) )
-			throw new RainTpl_Exception ('Cache directory ' . $cache_dir . ' doesn\'t have write permission. Set write permission or set RAINTPL_CHECK_TEMPLATE_UPDATE to false. More details on http://www.raintpl.com/Documentation/Documentation-for-PHP-developers/Configuration/');
+		if( !is_writable( $cache_dir ) ) {
+					throw new RainTpl_Exception ('Cache directory ' . $cache_dir . ' doesn\'t have write permission. Set write permission or set RAINTPL_CHECK_TEMPLATE_UPDATE to false. More details on http://www.raintpl.com/Documentation/Documentation-for-PHP-developers/Configuration/');
+		}
 
 		//write compiled file
 		file_put_contents( $compiled_filename, $template_compiled );
@@ -453,8 +463,9 @@ 
 		while( $html = array_shift( $parsed_code ) ){
 
 			//close ignore tag
-			if( !$comment_is_open && ( strpos( $html, '{/ignore}' ) !== FALSE || strpos( $html, '*}' ) !== FALSE ) )
-				$ignore_is_open = false;
+			if( !$comment_is_open && ( strpos( $html, '{/ignore}' ) !== FALSE || strpos( $html, '*}' ) !== FALSE ) ) {
+							$ignore_is_open = false;
+			}
 
 			//code between tag ignore id deleted
 			elseif( $ignore_is_open ){
@@ -462,20 +473,24 @@ 
 			}
 
 			//close no parse tag
-			elseif( strpos( $html, '{/noparse}' ) !== FALSE )
-				$comment_is_open = false;
+			elseif( strpos( $html, '{/noparse}' ) !== FALSE ) {
+							$comment_is_open = false;
+			}
 
 			//code between tag noparse is not compiled
-			elseif( $comment_is_open )
-				$compiled_code .= $html;
+			elseif( $comment_is_open ) {
+							$compiled_code .= $html;
+			}
 
 			//ignore
-			elseif( strpos( $html, '{ignore}' ) !== FALSE || strpos( $html, '{*' ) !== FALSE )
-				$ignore_is_open = true;
+			elseif( strpos( $html, '{ignore}' ) !== FALSE || strpos( $html, '{*' ) !== FALSE ) {
+							$ignore_is_open = true;
+			}
 
 			//noparse
-			elseif( strpos( $html, '{noparse}' ) !== FALSE )
-				$comment_is_open = true;
+			elseif( strpos( $html, '{noparse}' ) !== FALSE ) {
+							$comment_is_open = true;
+			}
 
 			//include tag
 			elseif( preg_match( '/\{include="([^"]*)"(?: cache="([^"]*)"){0,1}\}/', $html, $code ) ){
@@ -496,8 +511,7 @@ 
 									( !$loop_level ? null : '$tpl->assign( "key", $key'.$loop_level.' ); $tpl->assign( "value", $value'.$loop_level.' );' ).
 								 '	$tpl->draw( dirname("'.$include_var.'") . ( substr("'.$include_var.'",-1,1) != "/" ? "/" : "" ) . basename("'.$include_var.'") );'.
 								 '} ?>';
-				}
-				else{
+				} else{
 
 					//dynamic include
 					$compiled_code .= '<?php $tpl = new '.get_class($this).';' .
@@ -615,11 +629,12 @@ 
 				// check if there's any function disabled by black_list
 				$this->function_check( $tag );
 
-				if( empty( $code[ 2 ] ) )
-					$parsed_function = $function . "()";
-				else
-					// parse the function
+				if( empty( $code[ 2 ] ) ) {
+									$parsed_function = $function . "()";
+				} else {
+									// parse the function
 					$parsed_function = $function . $this->var_replace( $code[ 2 ], $tag_left_delimiter = null, $tag_right_delimiter = null, $php_left_delimiter = null, $php_right_delimiter = null, $loop_level );
+				}
 
 				//if code
 				$compiled_code .=   "<?php echo $parsed_function; ?>";
@@ -724,9 +739,9 @@ 
 
 			return preg_replace( $exp, $sub, $html );
 
+		} else {
+					return $html;
 		}
-		else
-			return $html;
 
 	}
 
@@ -824,8 +839,7 @@ 
 					$function = substr( $function_var, 0, $dot_position );
 					$params = substr( $function_var, $dot_position+1 );
 
-				}
-				else{
+				} else{
 
 					//get the function
 					$function = str_replace( "@double_dot@", "::", $function_var );
@@ -838,21 +852,22 @@ 
 				$params = str_replace( "@double_dot@", "::", $params );
 
 
+			} else {
+							$function = $params = null;
 			}
-			else
-				$function = $params = null;
 
 			$php_var = $var_name . $variable_path;
 
 			// compile the variable for php
 			if( isset( $function ) ){
-				if( $php_var )
-					$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . ( $params ? "( $function( $php_var, $params ) )" : "$function( $php_var )" ) . $php_right_delimiter;
-				else
-					$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . ( $params ? "( $function( $params ) )" : "$function()" ) . $php_right_delimiter;
+				if( $php_var ) {
+									$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . ( $params ? "( $function( $php_var, $params ) )" : "$function( $php_var )" ) . $php_right_delimiter;
+				} else {
+									$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . ( $params ? "( $function( $params ) )" : "$function()" ) . $php_right_delimiter;
+				}
+			} else {
+							$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . $php_var . $extra_var . $php_right_delimiter;
 			}
-			else
-				$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . $php_var . $extra_var . $php_right_delimiter;
 
 			$html = str_replace( $tag, $php_var, $html );
 
@@ -882,8 +897,9 @@ 
 		//all variables
 		if( preg_match_all( '/' . $tag_left_delimiter . '\$(\w+(?:\.\${0,1}[A-Za-z0-9_]+)*(?:(?:\[\${0,1}[A-Za-z0-9_]+\])|(?:\-\>\${0,1}[A-Za-z0-9_]+))*)(.*?)' . $tag_right_delimiter . '/', $html, $matches ) ){
 
-			for( $parsed=array(), $i=0, $n=count($matches[0]); $i<$n; $i++ )
-				$parsed[$matches[0][$i]] = array('var'=>$matches[1][$i],'extra_var'=>$matches[2][$i]);
+			for( $parsed=array(), $i=0, $n=count($matches[0]); $i<$n; $i++ ) {
+							$parsed[$matches[0][$i]] = array('var'=>$matches[1][$i],'extra_var'=>$matches[2][$i]);
+			}
 
 			foreach( $parsed as $tag => $array ){
 
@@ -921,8 +937,9 @@ 
 				$variable_path = preg_replace('/\.(\${0,1}\w+)/', '["\\1"]', $variable_path );
 
 				// if is an assignment also assign the variable to $this->var['value']
-				if( $is_init_variable )
-					$extra_var = "=\$this->var['{$var_name}']{$variable_path}" . $extra_var;
+				if( $is_init_variable ) {
+									$extra_var = "=\$this->var['{$var_name}']{$variable_path}" . $extra_var;
+				}
 
 
 
@@ -940,8 +957,7 @@ 
 						$function = substr( $function_var, 0, $dot_position );
 						$params = substr( $function_var, $dot_position+1 );
 
-					}
-					else{
+					} else{
 
 						//get the function
 						$function = str_replace( "@double_dot@", "::", $function_var );
@@ -952,29 +968,32 @@ 
 					// replace back the @double_dot@ with ::
 					$function = str_replace( "@double_dot@", "::", $function );
 					$params = str_replace( "@double_dot@", "::", $params );
+				} else {
+									$function = $params = null;
 				}
-				else
-					$function = $params = null;
 
 				//if it is inside a loop
 				if( $loop_level ){
 					//verify the variable name
-					if( $var_name == 'key' )
-							$php_var = '$key' . $loop_level;
-					elseif( $var_name == 'value' )
-							$php_var = '$value' . $loop_level . $variable_path;
-					elseif( $var_name == 'counter' )
-							$php_var = '$counter' . $loop_level;
-					else
-							$php_var = '$' . $var_name . $variable_path;
-				}else
-					$php_var = '$' . $var_name . $variable_path;
+					if( $var_name == 'key' ) {
+												$php_var = '$key' . $loop_level;
+					} elseif( $var_name == 'value' ) {
+												$php_var = '$value' . $loop_level . $variable_path;
+					} elseif( $var_name == 'counter' ) {
+												$php_var = '$counter' . $loop_level;
+					} else {
+												$php_var = '$' . $var_name . $variable_path;
+					}
+				} else {
+									$php_var = '$' . $var_name . $variable_path;
+				}
 
 				// compile the variable for php
-				if( isset( $function ) )
-					$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . ( $params ? "( $function( $php_var, $params ) )" : "$function( $php_var )" ) . $php_right_delimiter;
-				else
-					$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . $php_var . $extra_var . $php_right_delimiter;
+				if( isset( $function ) ) {
+									$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . ( $params ? "( $function( $php_var, $params ) )" : "$function( $php_var )" ) . $php_right_delimiter;
+				} else {
+									$php_var = $php_left_delimiter . ( !$is_init_variable && $echo ? 'echo ' : null ) . $php_var . $extra_var . $php_right_delimiter;
+				}
 
 				$html = str_replace( $tag, $php_var, $html );
 
@@ -1005,8 +1024,9 @@ 
 			// find the line of the error
 			$line = 0;
 			$rows=explode("\n",$this->tpl['source']);
-			while( !strpos($rows[$line],$code) )
-				$line++;
+			while( !strpos($rows[$line],$code) ) {
+							$line++;
+			}
 
 			// stop the execution of the script
 			$e = new RainTpl_SyntaxException('Unallowed syntax in ' . $this->tpl['tpl_filename'] . ' template');

lib/vizhash16x16.php

Doc Comments +2 added lines, -2 removed lines

@@ -175,8 +175,8 @@
      * @access private
      * @param  resource $img
      * @param  string $direction
-     * @param  array $color1
-     * @param  array $color2
+     * @param  integer[] $color1
+     * @param  integer[] $color2
      * @return resource
      */
     private function degrade($img,$direction,$color1,$color2)

Spacing +44 added lines, -44 removed lines

@@ -89,38 +89,38 @@ 
         if (!function_exists('gd_info')) return '';
 
         // We hash the input string.
-        $hash=hash('sha1',$text.$this->salt).hash('md5',$text.$this->salt);
-        $hash=$hash.strrev($hash);  # more data to make graphics
+        $hash = hash('sha1', $text . $this->salt) . hash('md5', $text . $this->salt);
+        $hash = $hash . strrev($hash); # more data to make graphics
 
         // We convert the hash into an array of integers.
-        $this->VALUES=array();
-        for($i=0; $i<strlen($hash); $i=$i+2){ array_push($this->VALUES,hexdec(substr($hash,$i,2))); }
-        $this->VALUES_INDEX=0; // to walk the array.
+        $this->VALUES = array();
+        for ($i = 0; $i < strlen($hash); $i = $i+2) { array_push($this->VALUES, hexdec(substr($hash, $i, 2))); }
+        $this->VALUES_INDEX = 0; // to walk the array.
 
         // Then use these integers to drive the creation of an image.
-        $image = imagecreatetruecolor($this->width,$this->height);
+        $image = imagecreatetruecolor($this->width, $this->height);
 
-        $r0 = $this->getInt();$r=$r0;
-        $g0 = $this->getInt();$g=$g0;
-        $b0 = $this->getInt();$b=$b0;
+        $r0 = $this->getInt(); $r = $r0;
+        $g0 = $this->getInt(); $g = $g0;
+        $b0 = $this->getInt(); $b = $b0;
 
         // First, create an image with a specific gradient background.
-        $op='v'; if (($this->getInt()%2)==0) { $op='h'; };
-        $image = $this->degrade($image,$op,array($r0,$g0,$b0),array(0,0,0));
+        $op = 'v'; if (($this->getInt() % 2) == 0) { $op = 'h'; };
+        $image = $this->degrade($image, $op, array($r0, $g0, $b0), array(0, 0, 0));
 
-        for($i=0; $i<7; $i=$i+1)
+        for ($i = 0; $i < 7; $i = $i+1)
         {
-            $action=$this->getInt();
-            $color = imagecolorallocate($image, $r,$g,$b);
-            $r = ($r0 + $this->getInt()/25)%256;
-            $g = ($g0 + $this->getInt()/25)%256;
-            $b = ($b0 + $this->getInt()/25)%256;
-            $r0=$r; $g0=$g; $b0=$b;
-            $this->drawshape($image,$action,$color);
+            $action = $this->getInt();
+            $color = imagecolorallocate($image, $r, $g, $b);
+            $r = ($r0+$this->getInt() / 25) % 256;
+            $g = ($g0+$this->getInt() / 25) % 256;
+            $b = ($b0+$this->getInt() / 25) % 256;
+            $r0 = $r; $g0 = $g; $b0 = $b;
+            $this->drawshape($image, $action, $color);
         }
 
-        $color = imagecolorallocate($image,$this->getInt(),$this->getInt(),$this->getInt());
-        $this->drawshape($image,$this->getInt(),$color);
+        $color = imagecolorallocate($image, $this->getInt(), $this->getInt(), $this->getInt());
+        $this->drawshape($image, $this->getInt(), $color);
         ob_start();
         imagepng($image);
         $imagedata = ob_get_contents();
@@ -138,7 +138,7 @@ 
      */
     private function getInt()
     {
-        $v= $this->VALUES[$this->VALUES_INDEX];
+        $v = $this->VALUES[$this->VALUES_INDEX];
         $this->VALUES_INDEX++;
         $this->VALUES_INDEX %= count($this->VALUES); // Warp around the array
         return $v;
@@ -152,7 +152,7 @@ 
      */
     private function getX()
     {
-        return $this->width*$this->getInt()/256;
+        return $this->width * $this->getInt() / 256;
     }
 
     /**
@@ -163,7 +163,7 @@ 
      */
     private function getY()
     {
-        return $this->height*$this->getInt()/256;
+        return $this->height * $this->getInt() / 256;
     }
 
     /**
@@ -179,22 +179,22 @@ 
      * @param  array $color2
      * @return resource
      */
-    private function degrade($img,$direction,$color1,$color2)
+    private function degrade($img, $direction, $color1, $color2)
     {
-            if($direction=='h') { $size = imagesx($img); $sizeinv = imagesy($img); }
-            else { $size = imagesy($img); $sizeinv = imagesx($img);}
+            if ($direction == 'h') { $size = imagesx($img); $sizeinv = imagesy($img); }
+            else { $size = imagesy($img); $sizeinv = imagesx($img); }
             $diffs = array(
-                    (($color2[0]-$color1[0])/$size),
-                    (($color2[1]-$color1[1])/$size),
-                    (($color2[2]-$color1[2])/$size)
+                    (($color2[0]-$color1[0]) / $size),
+                    (($color2[1]-$color1[1]) / $size),
+                    (($color2[2]-$color1[2]) / $size)
             );
-            for($i=0;$i<$size;$i++)
+            for ($i = 0; $i < $size; $i++)
             {
-                    $r = $color1[0]+($diffs[0]*$i);
-                    $g = $color1[1]+($diffs[1]*$i);
-                    $b = $color1[2]+($diffs[2]*$i);
-                    if($direction=='h') { imageline($img,$i,0,$i,$sizeinv,imagecolorallocate($img,$r,$g,$b)); }
-                    else { imageline($img,0,$i,$sizeinv,$i,imagecolorallocate($img,$r,$g,$b)); }
+                    $r = $color1[0]+($diffs[0] * $i);
+                    $g = $color1[1]+($diffs[1] * $i);
+                    $b = $color1[2]+($diffs[2] * $i);
+                    if ($direction == 'h') { imageline($img, $i, 0, $i, $sizeinv, imagecolorallocate($img, $r, $g, $b)); }
+                    else { imageline($img, 0, $i, $sizeinv, $i, imagecolorallocate($img, $r, $g, $b)); }
             }
             return $img;
     }
@@ -208,24 +208,24 @@ 
      * @param  int $color
      * @return void
      */
-    private function drawshape($image,$action,$color)
+    private function drawshape($image, $action, $color)
     {
-        switch($action%7)
+        switch ($action % 7)
         {
             case 0:
-                ImageFilledRectangle ($image,$this->getX(),$this->getY(),$this->getX(),$this->getY(),$color);
+                ImageFilledRectangle($image, $this->getX(), $this->getY(), $this->getX(), $this->getY(), $color);
                 break;
             case 1:
             case 2:
-                ImageFilledEllipse ($image, $this->getX(), $this->getY(), $this->getX(), $this->getY(), $color);
+                ImageFilledEllipse($image, $this->getX(), $this->getY(), $this->getX(), $this->getY(), $color);
                 break;
             case 3:
-                $points = array($this->getX(), $this->getY(), $this->getX(), $this->getY(), $this->getX(), $this->getY(),$this->getX(), $this->getY());
-                ImageFilledPolygon ($image, $points, 4, $color);
+                $points = array($this->getX(), $this->getY(), $this->getX(), $this->getY(), $this->getX(), $this->getY(), $this->getX(), $this->getY());
+                ImageFilledPolygon($image, $points, 4, $color);
                 break;
             default:
-                $start=$this->getInt()*360/256; $end=$start+$this->getInt()*180/256;
-                ImageFilledArc ($image, $this->getX(), $this->getY(), $this->getX(), $this->getY(),$start,$end,$color,IMG_ARC_PIE);
+                $start = $this->getInt() * 360 / 256; $end = $start+$this->getInt() * 180 / 256;
+                ImageFilledArc($image, $this->getX(), $this->getY(), $this->getX(), $this->getY(), $start, $end, $color, IMG_ARC_PIE);
         }
     }
 }

Braces +5 added lines, -5 removed lines

@@ -86,7 +86,9 @@ 
      */
     public function generate($text)
     {
-        if (!function_exists('gd_info')) return '';
+        if (!function_exists('gd_info')) {
+            return '';
+        }
 
         // We hash the input string.
         $hash=hash('sha1',$text.$this->salt).hash('md5',$text.$this->salt);
@@ -181,8 +183,7 @@ 
      */
     private function degrade($img,$direction,$color1,$color2)
     {
-            if($direction=='h') { $size = imagesx($img); $sizeinv = imagesy($img); }
-            else { $size = imagesy($img); $sizeinv = imagesx($img);}
+            if($direction=='h') { $size = imagesx($img); $sizeinv = imagesy($img); } else { $size = imagesy($img); $sizeinv = imagesx($img);}
             $diffs = array(
                     (($color2[0]-$color1[0])/$size),
                     (($color2[1]-$color1[1])/$size),
@@ -193,8 +194,7 @@ 
                     $r = $color1[0]+($diffs[0]*$i);
                     $g = $color1[1]+($diffs[1]*$i);
                     $b = $color1[2]+($diffs[2]*$i);
-                    if($direction=='h') { imageline($img,$i,0,$i,$sizeinv,imagecolorallocate($img,$r,$g,$b)); }
-                    else { imageline($img,0,$i,$sizeinv,$i,imagecolorallocate($img,$r,$g,$b)); }
+                    if($direction=='h') { imageline($img,$i,0,$i,$sizeinv,imagecolorallocate($img,$r,$g,$b)); } else { imageline($img,0,$i,$sizeinv,$i,imagecolorallocate($img,$r,$g,$b)); }
             }
             return $img;
     }

lib/zerobin/abstract.php

Doc Comments +3 added lines, -3 removed lines

@@ -86,7 +86,7 @@ 
      * Test if a paste exists.
      *
      * @access public
-     * @param  string $dataid
+     * @param string $pasteid
      * @return bool
      */
     abstract public function exists($pasteid);
@@ -116,9 +116,9 @@ 
      * Test if a comment exists.
      *
      * @access public
-     * @param  string $dataid
      * @param  string $parentid
      * @param  string $commentid
+     * @param string $pasteid
      * @return void
      */
     abstract public function existsComment($pasteid, $parentid, $commentid);
@@ -128,7 +128,7 @@ 
      *
      * @access public
      * @param  array $comments
-     * @param  int|string $postdate
+     * @param  integer $postdate
      * @return void
      */
     protected function getOpenSlot(&$comments, $postdate)

Braces +3 added lines, -1 removed lines

@@ -136,7 +136,9 @@
         if (array_key_exists($postdate, $comments))
         {
             $parts = explode('.', $postdate, 2);
-            if (!array_key_exists(1, $parts)) $parts[1] = 0;
+            if (!array_key_exists(1, $parts)) {
+                $parts[1] = 0;
+            }
             ++$parts[1];
             return $this->getOpenSlot($comments, implode('.', $parts));
         }

lib/zerobin/data.php

Doc Comments +5 added lines, -6 removed lines

@@ -124,8 +124,7 @@ 
      * Test if a paste exists.
      *
      * @access public
-     * @param  string $dataid
-     * @return void
+     * @return boolean
      */
     public function exists($pasteid)
     {
@@ -197,10 +196,10 @@ 
      * Test if a comment exists.
      *
      * @access public
-     * @param  string $dataid
      * @param  string $parentid
      * @param  string $commentid
-     * @return void
+     * @param string $pasteid
+     * @return boolean
      */
     public function existsComment($pasteid, $parentid, $commentid)
     {
@@ -245,7 +244,7 @@ 
      * @access private
      * @static
      * @param  string $dataid
-     * @return void
+     * @return string
      */
     private static function _dataid2path($dataid)
     {
@@ -260,7 +259,7 @@ 
      * @access private
      * @static
      * @param  string $dataid
-     * @return void
+     * @return string
      */
     private static function _dataid2discussionpath($dataid)
     {

Spacing +5 added lines, -5 removed lines

@@ -42,7 +42,7 @@ 
             array_key_exists('dir', $options)
         ) self::$_dir = $options['dir'] . DIRECTORY_SEPARATOR;
         // if needed initialize the singleton
-        if(!(self::$_instance instanceof zerobin_data)) {
+        if (!(self::$_instance instanceof zerobin_data)) {
             self::$_instance = new self;
             self::_init();
         }
@@ -74,7 +74,7 @@ 
      */
     public function read($pasteid)
     {
-        if(!$this->exists($pasteid)) return false;
+        if (!$this->exists($pasteid)) return false;
         $paste = json_decode(
             file_get_contents(self::_dataid2path($pasteid) . $pasteid)
         );
@@ -111,7 +111,7 @@ 
             $dir = dir($discdir);
             while (false !== ($filename = $dir->read()))
             {
-                if (is_file($discdir.$filename)) @unlink($discdir.$filename);
+                if (is_file($discdir . $filename)) @unlink($discdir . $filename);
             }
             $dir->close();
 
@@ -227,7 +227,7 @@ 
             file_put_contents(
                 self::$_dir . '.htaccess',
                 'Allow from none' . PHP_EOL .
-                'Deny from all'. PHP_EOL
+                'Deny from all' . PHP_EOL
             );
         }
     }
@@ -249,7 +249,7 @@ 
      */
     private static function _dataid2path($dataid)
     {
-        return self::$_dir . substr($dataid,0,2) . '/' . substr($dataid,2,2) . '/';
+        return self::$_dir . substr($dataid, 0, 2) . '/' . substr($dataid, 2, 2) . '/';
     }
 
     /**

Braces +24 added lines, -8 removed lines

@@ -40,7 +40,9 @@ 
         if (
             is_array($options) &&
             array_key_exists('dir', $options)
-        ) self::$_dir = $options['dir'] . DIRECTORY_SEPARATOR;
+        ) {
+            self::$_dir = $options['dir'] . DIRECTORY_SEPARATOR;
+        }
         // if needed initialize the singleton
         if(!(self::$_instance instanceof zerobin_data)) {
             self::$_instance = new self;
@@ -60,8 +62,12 @@ 
     public function create($pasteid, $paste)
     {
         $storagedir = self::_dataid2path($pasteid);
-        if (is_file($storagedir . $pasteid)) return false;
-        if (!is_dir($storagedir)) mkdir($storagedir, 0705, true);
+        if (is_file($storagedir . $pasteid)) {
+            return false;
+        }
+        if (!is_dir($storagedir)) {
+            mkdir($storagedir, 0705, true);
+        }
         return (bool) @file_put_contents($storagedir . $pasteid, json_encode($paste));
     }
 
@@ -74,7 +80,9 @@ 
      */
     public function read($pasteid)
     {
-        if(!$this->exists($pasteid)) return false;
+        if(!$this->exists($pasteid)) {
+            return false;
+        }
         $paste = json_decode(
             file_get_contents(self::_dataid2path($pasteid) . $pasteid)
         );
@@ -111,7 +119,9 @@ 
             $dir = dir($discdir);
             while (false !== ($filename = $dir->read()))
             {
-                if (is_file($discdir.$filename)) @unlink($discdir.$filename);
+                if (is_file($discdir.$filename)) {
+                    @unlink($discdir.$filename);
+                }
             }
             $dir->close();
 
@@ -146,8 +156,12 @@ 
     {
         $storagedir = self::_dataid2discussionpath($pasteid);
         $filename = $pasteid . '.' . $commentid . '.' . $parentid;
-        if (is_file($storagedir . $filename)) return false;
-        if (!is_dir($storagedir)) mkdir($storagedir, 0705, true);
+        if (is_file($storagedir . $filename)) {
+            return false;
+        }
+        if (!is_dir($storagedir)) {
+            mkdir($storagedir, 0705, true);
+        }
         return (bool) @file_put_contents($storagedir . $filename, json_encode($comment));
     }
 
@@ -220,7 +234,9 @@ 
     private static function _init()
     {
         // Create storage directory if it does not exist.
-        if (!is_dir(self::$_dir)) mkdir(self::$_dir, 0705);
+        if (!is_dir(self::$_dir)) {
+            mkdir(self::$_dir, 0705);
+        }
         // Create .htaccess file if it does not exist.
         if (!is_file(self::$_dir . '.htaccess'))
         {

lib/zerobin/db.php

Doc Comments +5 added lines, -6 removed lines

@@ -295,8 +295,7 @@ 
      * Test if a paste exists.
      *
      * @access public
-     * @param  string $dataid
-     * @return void
+     * @return boolean
      */
     public function exists($pasteid)
     {
@@ -373,10 +372,10 @@ 
      * Test if a comment exists.
      *
      * @access public
-     * @param  string $dataid
      * @param  string $parentid
      * @param  string $commentid
-     * @return void
+     * @param string $pasteid
+     * @return boolean
      */
     public function existsComment($pasteid, $parentid, $commentid)
     {
@@ -393,7 +392,7 @@ 
      * @access private
      * @static
      * @param  string $sql
-     * @param  array $params
+     * @param  string[] $params
      * @throws PDOException
      * @return array
      */
@@ -411,7 +410,7 @@ 
      * @access private
      * @static
      * @param  string $sql
-     * @param  array $params
+     * @param  string[] $params
      * @param  bool $firstOnly if only the first row should be returned
      * @throws PDOException
      * @return array

Indentation +14 added lines, -14 removed lines

@@ -448,7 +448,7 @@ 
                 break;
             case 'mssql':
                 $sql = "SELECT name FROM sysobjects "
-                     . "WHERE type = 'U' ORDER BY name";
+                        . "WHERE type = 'U' ORDER BY name";
                 break;
             case 'mysql':
                 $sql = 'SHOW TABLES';
@@ -458,22 +458,22 @@ 
                 break;
             case 'pgsql':
                 $sql = "SELECT c.relname AS table_name "
-                     . "FROM pg_class c, pg_user u "
-                     . "WHERE c.relowner = u.usesysid AND c.relkind = 'r' "
-                     . "AND NOT EXISTS (SELECT 1 FROM pg_views WHERE viewname = c.relname) "
-                     . "AND c.relname !~ '^(pg_|sql_)' "
-                     . "UNION "
-                     . "SELECT c.relname AS table_name "
-                     . "FROM pg_class c "
-                     . "WHERE c.relkind = 'r' "
-                     . "AND NOT EXISTS (SELECT 1 FROM pg_views WHERE viewname = c.relname) "
-                     . "AND NOT EXISTS (SELECT 1 FROM pg_user WHERE usesysid = c.relowner) "
-                     . "AND c.relname !~ '^pg_'";
+                        . "FROM pg_class c, pg_user u "
+                        . "WHERE c.relowner = u.usesysid AND c.relkind = 'r' "
+                        . "AND NOT EXISTS (SELECT 1 FROM pg_views WHERE viewname = c.relname) "
+                        . "AND c.relname !~ '^(pg_|sql_)' "
+                        . "UNION "
+                        . "SELECT c.relname AS table_name "
+                        . "FROM pg_class c "
+                        . "WHERE c.relkind = 'r' "
+                        . "AND NOT EXISTS (SELECT 1 FROM pg_views WHERE viewname = c.relname) "
+                        . "AND NOT EXISTS (SELECT 1 FROM pg_user WHERE usesysid = c.relowner) "
+                        . "AND c.relname !~ '^pg_'";
                 break;
             case 'sqlite':
                 $sql = "SELECT name FROM sqlite_master WHERE type='table' "
-                     . "UNION ALL SELECT name FROM sqlite_temp_master "
-                     . "WHERE type='table' ORDER BY name";
+                        . "UNION ALL SELECT name FROM sqlite_temp_master "
+                        . "WHERE type='table' ORDER BY name";
                 break;
             default:
                 throw new Exception(

Spacing +5 added lines, -6 removed lines

@@ -63,7 +63,7 @@ 
     public static function getInstance($options = null)
     {
         // if needed initialize the singleton
-        if(!(self::$_instance instanceof zerobin_db)) {
+        if (!(self::$_instance instanceof zerobin_db)) {
             self::$_instance = new self;
         }
 
@@ -152,7 +152,7 @@ 
         if (
             array_key_exists($pasteid, self::$_cache)
         ) {
-            if(false !== self::$_cache[$pasteid]) {
+            if (false !== self::$_cache[$pasteid]) {
                 return false;
             } else {
                 unset(self::$_cache[$pasteid]);
@@ -223,7 +223,7 @@ 
                 array($pasteid), true
             );
 
-            if(false !== $paste) {
+            if (false !== $paste) {
                 // create object
                 self::$_cache[$pasteid] = new stdClass;
                 self::$_cache[$pasteid]->data = $paste['data'];
@@ -421,8 +421,7 @@ 
         $statement = self::$_db->prepare($sql);
         $statement->execute($params);
         $result = $firstOnly ?
-            $statement->fetch(PDO::FETCH_ASSOC) :
-            $statement->fetchAll(PDO::FETCH_ASSOC);
+            $statement->fetch(PDO::FETCH_ASSOC) : $statement->fetchAll(PDO::FETCH_ASSOC);
         $statement->closeCursor();
         return $result;
     }
@@ -438,7 +437,7 @@ 
      */
     private static function _getTableQuery($type)
     {
-        switch($type)
+        switch ($type)
         {
             case 'ibm':
                 $sql = 'SELECT tabname FROM SYSCAT.TABLES ';

Braces +33 added lines, -18 removed lines

@@ -70,7 +70,9 @@ 
         if (is_array($options))
         {
             // set table prefix if given
-            if (array_key_exists('tbl', $options)) self::$_prefix = $options['tbl'];
+            if (array_key_exists('tbl', $options)) {
+                self::$_prefix = $options['tbl'];
+            }
 
             // initialize the db connection with new options
             if (
@@ -121,9 +123,10 @@ 
                 {
                     self::_createConfigTable();
                     // if we only needed to create the config table, the DB is older then 0.22
-                    if ($db_tables_exist) $db_version = '0.21';
-                }
-                else
+                    if ($db_tables_exist) {
+                        $db_version = '0.21';
+                    }
+                } else
                 {
                     $db_version = self::_getConfig('VERSION');
                 }
@@ -229,7 +232,9 @@ 
                 self::$_cache[$pasteid]->data = $paste['data'];
 
                 $meta = json_decode($paste['meta']);
-                if (!is_object($meta)) $meta = new stdClass;
+                if (!is_object($meta)) {
+                    $meta = new stdClass;
+                }
 
                 // support older attachments
                 if (property_exists($meta, 'attachment'))
@@ -256,13 +261,19 @@ 
                 $expire_date = (int) $paste['expiredate'];
                 if (
                     $expire_date > 0
-                ) self::$_cache[$pasteid]->meta->expire_date = $expire_date;
+                ) {
+                    self::$_cache[$pasteid]->meta->expire_date = $expire_date;
+                }
                 if (
                     $paste['opendiscussion']
-                ) self::$_cache[$pasteid]->meta->opendiscussion = true;
+                ) {
+                    self::$_cache[$pasteid]->meta->opendiscussion = true;
+                }
                 if (
                     $paste['burnafterreading']
-                ) self::$_cache[$pasteid]->meta->burnafterreading = true;
+                ) {
+                    self::$_cache[$pasteid]->meta->burnafterreading = true;
+                }
             }
         }
 
@@ -288,7 +299,9 @@ 
         );
         if (
             array_key_exists($pasteid, self::$_cache)
-        ) unset(self::$_cache[$pasteid]);
+        ) {
+            unset(self::$_cache[$pasteid]);
+        }
     }
 
     /**
@@ -302,7 +315,9 @@ 
     {
         if (
             !array_key_exists($pasteid, self::$_cache)
-        ) self::$_cache[$pasteid] = $this->read($pasteid);
+        ) {
+            self::$_cache[$pasteid] = $this->read($pasteid);
+        }
         return (bool) self::$_cache[$pasteid];
     }
 
@@ -359,10 +374,12 @@ 
                 $comments[$i]->data = $row['data'];
                 $comments[$i]->meta = new stdClass;
                 $comments[$i]->meta->postdate = (int) $row['postdate'];
-                if (array_key_exists('nickname', $row))
-                    $comments[$i]->meta->nickname = $row['nickname'];
-                if (array_key_exists('vizhash', $row))
-                    $comments[$i]->meta->vizhash = $row['vizhash'];
+                if (array_key_exists('nickname', $row)) {
+                                    $comments[$i]->meta->nickname = $row['nickname'];
+                }
+                if (array_key_exists('vizhash', $row)) {
+                                    $comments[$i]->meta->vizhash = $row['vizhash'];
+                }
             }
             ksort($comments);
         }
@@ -515,8 +532,7 @@ 
         if (self::$_type === 'mysql')
         {
             $after_key = ", PRIMARY KEY ($key)";
-        }
-        else
+        } else
         {
             $main_key = ' PRIMARY KEY';
         }
@@ -634,8 +650,7 @@ 
                         'MODIFY COLUMN nickname BLOB, ' .
                         'MODIFY COLUMN vizhash BLOB;'
                     );
-                }
-                else
+                } else
                 {
                     self::$_db->exec(
                         'CREATE UNIQUE INDEX primary ON ' . self::$_prefix . 'paste(dataid);'

tst/bootstrap.php

Doc Comments +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
     /**
      * get example paste
      *
-     * @return array
+     * @return string
      */
     public static function getPasteAsJson($meta = array())
     {

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-error_reporting( E_ALL | E_STRICT );
+error_reporting(E_ALL | E_STRICT);
 
 // change this, if your php files and data is outside of your webservers document root
 if (!defined('PUBLIC_PATH')) define('PUBLIC_PATH', '..');
@@ -154,19 +154,19 @@ 
     {
         $path .= DIRECTORY_SEPARATOR;
         $dir = dir($path);
-        while(false !== ($file = $dir->read())) {
-            if($file != '.' && $file != '..') {
-                if(is_dir($path . $file)) {
+        while (false !== ($file = $dir->read())) {
+            if ($file != '.' && $file != '..') {
+                if (is_dir($path . $file)) {
                     self::rmdir($path . $file);
-                } elseif(is_file($path . $file)) {
-                    if(!@unlink($path . $file)) {
+                } elseif (is_file($path . $file)) {
+                    if (!@unlink($path . $file)) {
                         throw new Exception('Error deleting file "' . $path . $file . '".');
                     }
                 }
             }
         }
         $dir->close();
-        if(!@rmdir($path)) {
+        if (!@rmdir($path)) {
             throw new Exception('Error deleting directory "' . $path . '".');
         }
     }
@@ -206,7 +206,7 @@ 
             $ini = fopen($pathToFile, 'a');
             foreach ($values as $section => $options) {
                 fwrite($ini, "[$section]" . PHP_EOL);
-                foreach($options as $option => $setting) {
+                foreach ($options as $option => $setting) {
                     if (is_null($setting)) {
                         continue;
                     } elseif (is_string($setting)) {

Braces +21 added lines, -10 removed lines

@@ -2,10 +2,18 @@ 
 error_reporting( E_ALL | E_STRICT );
 
 // change this, if your php files and data is outside of your webservers document root
-if (!defined('PUBLIC_PATH')) define('PUBLIC_PATH', '..');
-if (!defined('PATH')) define('PATH', '..' . DIRECTORY_SEPARATOR);
-if (!defined('CONF')) define('CONF', PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.ini');
-if (!is_file(CONF)) copy(CONF . '.sample', CONF);
+if (!defined('PUBLIC_PATH')) {
+    define('PUBLIC_PATH', '..');
+}
+if (!defined('PATH')) {
+    define('PATH', '..' . DIRECTORY_SEPARATOR);
+}
+if (!defined('CONF')) {
+    define('CONF', PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.ini');
+}
+if (!is_file(CONF)) {
+    copy(CONF . '.sample', CONF);
+}
 
 require PATH . 'lib/auto.php';
 
@@ -100,8 +108,9 @@ 
         $example = self::getPaste();
         // the JSON shouldn't contain the salt
         unset($example['meta']['salt']);
-        if (count($meta))
-            $example['meta'] = $meta;
+        if (count($meta)) {
+                    $example['meta'] = $meta;
+        }
         $example['comments'] = array();
         $example['comment_count'] = 0;
         $example['comment_offset'] = 0;
@@ -178,8 +187,9 @@ 
      */
     public static function confBackup()
     {
-        if (!is_file(CONF . '.bak') && is_file(CONF))
-            rename(CONF, CONF . '.bak');
+        if (!is_file(CONF . '.bak') && is_file(CONF)) {
+                    rename(CONF, CONF . '.bak');
+        }
     }
 
     /**
@@ -189,8 +199,9 @@ 
      */
     public static function confRestore()
     {
-        if (is_file(CONF . '.bak'))
-            rename(CONF . '.bak', CONF);
+        if (is_file(CONF . '.bak')) {
+                    rename(CONF . '.bak', CONF);
+        }
     }
 
     /**

tst/serversalt.php

Doc Comments +5 added lines

@@ -40,6 +40,11 @@
         if (!function_exists('mcrypt_create_iv'))
         {
             if (!defined('MCRYPT_DEV_URANDOM')) define('MCRYPT_DEV_URANDOM', 1);
+
+            /**
+             * @param integer $int
+             * @param integer $flag
+             */
             function mcrypt_create_iv($int, $flag)
             {
                 $randomSalt = '';

Spacing +3 added lines, -3 removed lines

@@ -13,13 +13,13 @@ 
     {
         /* Setup Routine */
         $this->_path = PATH . 'data';
-        if(!is_dir($this->_path)) mkdir($this->_path);
+        if (!is_dir($this->_path)) mkdir($this->_path);
         serversalt::setPath($this->_path);
 
         $this->_otherPath = $this->_path . DIRECTORY_SEPARATOR . 'foo';
 
         $this->_invalidPath = $this->_path . DIRECTORY_SEPARATOR . 'bar';
-        if(!is_dir($this->_invalidPath)) mkdir($this->_invalidPath);
+        if (!is_dir($this->_invalidPath)) mkdir($this->_invalidPath);
         $this->_invalidFile = $this->_invalidPath . DIRECTORY_SEPARATOR . 'salt.php';
     }
 
@@ -43,7 +43,7 @@ 
             function mcrypt_create_iv($int, $flag)
             {
                 $randomSalt = '';
-                for($i = 0; $i < $int; ++$i) {
+                for ($i = 0; $i < $int; ++$i) {
                     $randomSalt .= base_convert(mt_rand(), 10, 16);
                 }
                 // hex2bin requires an even length, pad if necessary

Braces +9 added lines, -3 removed lines

@@ -13,13 +13,17 @@ 
     {
         /* Setup Routine */
         $this->_path = PATH . 'data';
-        if(!is_dir($this->_path)) mkdir($this->_path);
+        if(!is_dir($this->_path)) {
+            mkdir($this->_path);
+        }
         serversalt::setPath($this->_path);
 
         $this->_otherPath = $this->_path . DIRECTORY_SEPARATOR . 'foo';
 
         $this->_invalidPath = $this->_path . DIRECTORY_SEPARATOR . 'bar';
-        if(!is_dir($this->_invalidPath)) mkdir($this->_invalidPath);
+        if(!is_dir($this->_invalidPath)) {
+            mkdir($this->_invalidPath);
+        }
         $this->_invalidFile = $this->_invalidPath . DIRECTORY_SEPARATOR . 'salt.php';
     }
 
@@ -39,7 +43,9 @@ 
         // mcrypt mock
         if (!function_exists('mcrypt_create_iv'))
         {
-            if (!defined('MCRYPT_DEV_URANDOM')) define('MCRYPT_DEV_URANDOM', 1);
+            if (!defined('MCRYPT_DEV_URANDOM')) {
+                define('MCRYPT_DEV_URANDOM', 1);
+            }
             function mcrypt_create_iv($int, $flag)
             {
                 $randomSalt = '';