pradosoft / prado

framework/I18N/TGlobalization.php

Doc Comments +2 added lines, -1 removed lines

@@ -90,7 +90,7 @@ 
 	}
 
 	/**
-	 * @return string default culture
+	 * @return boolean default culture
 	 */
 	public function getTranslateDefaultCulture()
 	{
@@ -163,6 +163,7 @@ 
 
 	/**
 	 * @param string localization charset, e.g. <tt>UTF-8</tt>
+	 * @param string $charset
 	 */
 	public function setCharset($charset)
 	{

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TGlobalization class file.
- *
- * @author Wei Zhuo<weizhuo[at]gmail[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.I18N
- */
+	 * TGlobalization class file.
+	 *
+	 * @author Wei Zhuo<weizhuo[at]gmail[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.I18N
+	 */
 
 
 /**

Spacing +31 added lines, -31 removed lines

@@ -41,13 +41,13 @@ 
 	 * The current charset.
 	 * @var string
 	 */
-	private $_charset=null;
+	private $_charset = null;
 
 	/**
 	 * The current culture.
 	 * @var string
 	 */
-	private $_culture=null;
+	private $_culture = null;
 
 	/**
 	 * Translation source parameters.
@@ -58,7 +58,7 @@ 
 	/**
 	 * @var boolean whether we should translate the default culture
 	 */
-	private $_translateDefaultCulture=true;
+	private $_translateDefaultCulture = true;
 
 	/**
 	 * Initialize the Culture and Charset for this application.
@@ -69,21 +69,21 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_charset===null)
-			$this->_charset=$this->getDefaultCharset();
-		if($this->_culture===null)
-			$this->_culture=$this->getDefaultCulture();
+		if ($this->_charset === null)
+			$this->_charset = $this->getDefaultCharset();
+		if ($this->_culture === null)
+			$this->_culture = $this->getDefaultCulture();
 
-		if($config!==null)
+		if ($config !== null)
 		{
-			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-				$translation = isset($config['translate'])?$config['translate']:null;
+			if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+				$translation = isset($config['translate']) ? $config['translate'] : null;
 			else
 			{
 				$t = $config->getElementByTagName('translation');
-				$translation = ($t)?$t->getAttributes():null;
+				$translation = ($t) ? $t->getAttributes() : null;
 			}
-			if($translation)
+			if ($translation)
 				$this->setTranslationConfiguration($translation);
 		}
 		$this->getApplication()->setGlobalization($this);
@@ -118,7 +118,7 @@ 
 	 */
 	public function setDefaultCulture($culture)
 	{
-		$this->_defaultCulture = str_replace('-','_',$culture);
+		$this->_defaultCulture = str_replace('-', '_', $culture);
 	}
 
 	/**
@@ -150,7 +150,7 @@ 
 	 */
 	public function setCulture($culture)
 	{
-		$this->_culture = str_replace('-','_',$culture);
+		$this->_culture = str_replace('-', '_', $culture);
 	}
 
 	/**
@@ -196,14 +196,14 @@ 
 	 */
 	protected function setTranslationConfiguration($config)
 	{
-		if($config['type'] == 'XLIFF' || $config['type'] == 'gettext')
+		if ($config['type'] == 'XLIFF' || $config['type'] == 'gettext')
 		{
-			if($config['source'])
+			if ($config['source'])
 			{
 				$config['source'] = Prado::getPathOfNamespace($config['source']);
-				if(!is_dir($config['source']))
+				if (!is_dir($config['source']))
 				{
-					if(@mkdir($config['source'])===false)
+					if (@mkdir($config['source']) === false)
 					throw new TConfigurationException('globalization_source_path_failed',
 						$config['source']);
 					chmod($config['source'], PRADO_CHMOD); //make it deletable
@@ -214,12 +214,12 @@ 
 				throw new TConfigurationException("invalid source dir '{$config['source']}'");
 			}
 		}
-		if($config['cache'])
+		if ($config['cache'])
 		{
-			$config['cache'] = $this->getApplication()->getRunTimePath().'/i18n';
-			if(!is_dir($config['cache']))
+			$config['cache'] = $this->getApplication()->getRunTimePath() . '/i18n';
+			if (!is_dir($config['cache']))
 			{
-				if(@mkdir($config['cache'])===false)
+				if (@mkdir($config['cache']) === false)
 					throw new TConfigurationException('globalization_cache_path_failed',
 						$config['cache']);
 				chmod($config['cache'], PRADO_CHMOD); //make it deletable
@@ -250,12 +250,12 @@ 
 	 * @param string $culture the Culture string
 	 * @return array variants of the culture.
 	 */
-	public function getCultureVariants($culture=null)
+	public function getCultureVariants($culture = null)
 	{
-		if($culture===null) $culture = $this->getCulture();
+		if ($culture === null) $culture = $this->getCulture();
 		$variants = explode('_', $culture);
 		$result = array();
-		for(; count($variants) > 0; array_pop($variants))
+		for (; count($variants) > 0; array_pop($variants))
 			$result[] = implode('_', $variants);
 		return $result;
 	}
@@ -279,16 +279,16 @@ 
 	 * @param string culture string, null to use current culture
 	 * @return array list of possible localized resource files.
 	 */
-	public function getLocalizedResource($file,$culture=null)
+	public function getLocalizedResource($file, $culture = null)
 	{
 		$files = array();
 		$variants = $this->getCultureVariants($culture);
 		$path = pathinfo($file);
-		foreach($variants as $variant)
-			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$variant.DIRECTORY_SEPARATOR.$path['basename'];
-		$filename = substr($path['basename'],0,strrpos($path['basename'],'.'));
-		foreach($variants as $variant)
-			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$filename.'.'.$variant.'.'.$path['extension'];
+		foreach ($variants as $variant)
+			$files[] = $path['dirname'] . DIRECTORY_SEPARATOR . $variant . DIRECTORY_SEPARATOR . $path['basename'];
+		$filename = substr($path['basename'], 0, strrpos($path['basename'], '.'));
+		foreach ($variants as $variant)
+			$files[] = $path['dirname'] . DIRECTORY_SEPARATOR . $filename . '.' . $variant . '.' . $path['extension'];
 		$files[] = $file;
 		return $files;
 	}

Braces +31 added lines, -22 removed lines

@@ -69,22 +69,25 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_charset===null)
-			$this->_charset=$this->getDefaultCharset();
-		if($this->_culture===null)
-			$this->_culture=$this->getDefaultCulture();
+		if($this->_charset===null) {
+					$this->_charset=$this->getDefaultCharset();
+		}
+		if($this->_culture===null) {
+					$this->_culture=$this->getDefaultCulture();
+		}
 
 		if($config!==null)
 		{
-			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-				$translation = isset($config['translate'])?$config['translate']:null;
-			else
+			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP) {
+							$translation = isset($config['translate'])?$config['translate']:null;
+			} else
 			{
 				$t = $config->getElementByTagName('translation');
 				$translation = ($t)?$t->getAttributes():null;
 			}
-			if($translation)
-				$this->setTranslationConfiguration($translation);
+			if($translation) {
+							$this->setTranslationConfiguration($translation);
+			}
 		}
 		$this->getApplication()->setGlobalization($this);
 	}
@@ -203,13 +206,13 @@ 
 				$config['source'] = Prado::getPathOfNamespace($config['source']);
 				if(!is_dir($config['source']))
 				{
-					if(@mkdir($config['source'])===false)
-					throw new TConfigurationException('globalization_source_path_failed',
+					if(@mkdir($config['source'])===false) {
+										throw new TConfigurationException('globalization_source_path_failed',
 						$config['source']);
+					}
 					chmod($config['source'], PRADO_CHMOD); //make it deletable
 				}
-			}
-			else
+			} else
 			{
 				throw new TConfigurationException("invalid source dir '{$config['source']}'");
 			}
@@ -219,9 +222,10 @@ 
 			$config['cache'] = $this->getApplication()->getRunTimePath().'/i18n';
 			if(!is_dir($config['cache']))
 			{
-				if(@mkdir($config['cache'])===false)
-					throw new TConfigurationException('globalization_cache_path_failed',
+				if(@mkdir($config['cache'])===false) {
+									throw new TConfigurationException('globalization_cache_path_failed',
 						$config['cache']);
+				}
 				chmod($config['cache'], PRADO_CHMOD); //make it deletable
 			}
 		}
@@ -252,11 +256,14 @@ 
 	 */
 	public function getCultureVariants($culture=null)
 	{
-		if($culture===null) $culture = $this->getCulture();
+		if($culture===null) {
+			$culture = $this->getCulture();
+		}
 		$variants = explode('_', $culture);
 		$result = array();
-		for(; count($variants) > 0; array_pop($variants))
-			$result[] = implode('_', $variants);
+		for(; count($variants) > 0; array_pop($variants)) {
+					$result[] = implode('_', $variants);
+		}
 		return $result;
 	}
 
@@ -284,11 +291,13 @@ 
 		$files = array();
 		$variants = $this->getCultureVariants($culture);
 		$path = pathinfo($file);
-		foreach($variants as $variant)
-			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$variant.DIRECTORY_SEPARATOR.$path['basename'];
+		foreach($variants as $variant) {
+					$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$variant.DIRECTORY_SEPARATOR.$path['basename'];
+		}
 		$filename = substr($path['basename'],0,strrpos($path['basename'],'.'));
-		foreach($variants as $variant)
-			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$filename.'.'.$variant.'.'.$path['extension'];
+		foreach($variants as $variant) {
+					$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$filename.'.'.$variant.'.'.$path['extension'];
+		}
 		$files[] = $file;
 		return $files;
 	}

framework/interfaces.php

Doc Comments +18 added lines

@@ -23,6 +23,7 @@ 
 	/**
 	 * Initializes the module.
 	 * @param TXmlElement the configuration for the module
+	 * @return void
 	 */
 	public function init($config);
 	/**
@@ -31,6 +32,7 @@ 
 	public function getID();
 	/**
 	 * @param string ID of the module
+	 * @return void
 	 */
 	public function setID($id);
 }
@@ -49,6 +51,7 @@ 
 	/**
 	 * Initializes the service.
 	 * @param TXmlElement the configuration for the service
+	 * @return void
 	 */
 	public function init($config);
 	/**
@@ -57,6 +60,7 @@ 
 	public function getID();
 	/**
 	 * @param string ID of the service
+	 * @return void
 	 */
 	public function setID($id);
 	/**
@@ -65,10 +69,12 @@ 
 	public function getEnabled();
 	/**
 	 * @param boolean whether the service is enabled
+	 * @return void
 	 */
 	public function setEnabled($value);
 	/**
 	 * Runs the service.
+	 * @return void
 	 */
 	public function run();
 }
@@ -87,6 +93,7 @@ 
 	/**
 	 * Writes a string.
 	 * @param string string to be written
+	 * @return void
 	 */
 	public function write($str);
 	/**
@@ -113,6 +120,7 @@ 
 	public function getName();
 	/**
 	 * @param string username
+	 * @return void
 	 */
 	public function setName($value);
 	/**
@@ -121,6 +129,8 @@ 
 	public function getIsGuest();
 	/**
 	 * @param boolean if the user is a guest
+	 * @param boolean $value
+	 * @return void
 	 */
 	public function setIsGuest($value);
 	/**
@@ -167,6 +177,7 @@ 
 	/**
 	 * Saves state into a persistent storage.
 	 * @param mixed the state to be saved
+	 * @return void
 	 */
 	public function save($state);
 }
@@ -208,6 +219,7 @@ 
 	 * @param mixed the value to be cached
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labelled invalid.
+	 * @param string $id
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
 	public function add($id,$value,$expire=0,$dependency=null);
@@ -259,6 +271,7 @@ 
 	/**
 	 * Renders the component to end-users.
 	 * @param ITextWriter writer for the rendering purpose
+	 * @return void
 	 */
 	public function render($writer);
 }
@@ -276,6 +289,7 @@ 
 {
 	/**
 	 * Performs databinding.
+	 * @return void
 	 */
 	public function dataBind();
 }
@@ -301,6 +315,7 @@ 
 	public function getStyle();
 	/**
 	 * Removes all styles associated with the object
+	 * @return void
 	 */
 	public function clearStyle();
 }
@@ -339,6 +354,7 @@ 
 	 * appropriate event(s) (e.g. OnClick, OnCommand) indicating the component
 	 * is responsible for the callback event.
 	 * @param TCallbackEventParameter the parameter associated with the callback event
+	 * @return void
 	 */
 	public function raiseCallbackEvent($eventArgument);
 }
@@ -362,6 +378,8 @@ 
 
 	/**
 	 * @param mixed the data to be bound to this object
+	 * @param TActiveRecord $value
+	 * @return void
 	 */
 	public function setData($value);
 }

Spacing +2 added lines, -2 removed lines

@@ -200,7 +200,7 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labelled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function set($id,$value,$expire=0,$dependency=null);
+	public function set($id, $value, $expire = 0, $dependency = null);
 	/**
 	 * Stores a value identified by a key into cache if the cache does not contain this key.
 	 * Nothing will be done if the cache already contains the key.
@@ -210,7 +210,7 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labelled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function add($id,$value,$expire=0,$dependency=null);
+	public function add($id, $value, $expire = 0, $dependency = null);
 	/**
 	 * Deletes a value with the specified key from cache
 	 * @param string the key of the value to be deleted

framework/IO/TTarFileExtractor.php

Doc Comments +9 added lines

@@ -224,6 +224,9 @@ 
       return $v_block;
     }
 
+    /**
+     * @param double $p_len
+     */
     private function _jumpBlock($p_len=null)
     {
       if (is_resource($this->_file)) {
@@ -317,6 +320,12 @@ 
       return true;
     }
 
+    /**
+     * @param string $p_path
+     * @param string $p_mode
+     * @param integer $p_file_list
+     * @param string $p_remove_path
+     */
     protected function _extractList($p_path, &$p_list_detail, $p_mode,
 	                      $p_file_list, $p_remove_path)
     {

Indentation +510 added lines, -510 removed lines

@@ -35,537 +35,537 @@
  */
 class TTarFileExtractor
 {
-    /**
-    * @var string Name of the Tar
-    */
-    private $_tarname='';
-
-    /**
-    * @var file descriptor
-    */
-    private $_file=0;
-
-    /**
-    * @var string Local Tar name of a remote Tar (http:// or ftp://)
-    */
-    private $_temp_tarname='';
-
-    /**
-    * Archive_Tar Class constructor. This flavour of the constructor only
-    * declare a new Archive_Tar object, identifying it by the name of the
-    * tar file.
-    *
-    * @param    string  $p_tarname  The name of the tar archive to create
-    * @access public
-    */
-    public function __construct($p_tarname)
-    {
-        $this->_tarname = $p_tarname;
-    }
-
-    public function __destruct()
-    {
-        $this->_close();
-        // ----- Look for a local copy to delete
-        if ($this->_temp_tarname != '')
-            @unlink($this->_temp_tarname);
-    }
-
-    public function extract($p_path='')
-    {
-        return $this->extractModify($p_path, '');
-    }
-
-    /**
-    * This method extract all the content of the archive in the directory
-    * indicated by $p_path. When relevant the memorized path of the
-    * files/dir can be modified by removing the $p_remove_path path at the
-    * beginning of the file/dir path.
-    * While extracting a file, if the directory path does not exists it is
-    * created.
-    * While extracting a file, if the file already exists it is replaced
-    * without looking for last modification date.
-    * While extracting a file, if the file already exists and is write
-    * protected, the extraction is aborted.
-    * While extracting a file, if a directory with the same name already
-    * exists, the extraction is aborted.
-    * While extracting a directory, if a file with the same name already
-    * exists, the extraction is aborted.
-    * While extracting a file/directory if the destination directory exist
-    * and is write protected, or does not exist but can not be created,
-    * the extraction is aborted.
-    * If after extraction an extracted file does not show the correct
-    * stored file size, the extraction is aborted.
-    * When the extraction is aborted, a PEAR error text is set and false
-    * is returned. However the result can be a partial extraction that may
-    * need to be manually cleaned.
-    *
-    * @param string $p_path         The path of the directory where the
-	*                               files/dir need to by extracted.
-    * @param string $p_remove_path  Part of the memorized path that can be
-	*                               removed if present at the beginning of
-	*                               the file/dir path.
-    * @return boolean               true on success, false on error.
-    * @access public
-    */
-    protected function extractModify($p_path, $p_remove_path)
-    {
-        $v_result = true;
-        $v_list_detail = array();
-
-        if ($v_result = $this->_openRead()) {
-            $v_result = $this->_extractList($p_path, $v_list_detail,
-			                                "complete", 0, $p_remove_path);
-            $this->_close();
-        }
-
-        return $v_result;
-    }
-
-    protected function _error($p_message)
-    {
+	/**
+	 * @var string Name of the Tar
+	 */
+	private $_tarname='';
+
+	/**
+	 * @var file descriptor
+	 */
+	private $_file=0;
+
+	/**
+	 * @var string Local Tar name of a remote Tar (http:// or ftp://)
+	 */
+	private $_temp_tarname='';
+
+	/**
+	 * Archive_Tar Class constructor. This flavour of the constructor only
+	 * declare a new Archive_Tar object, identifying it by the name of the
+	 * tar file.
+	 *
+	 * @param    string  $p_tarname  The name of the tar archive to create
+	 * @access public
+	 */
+	public function __construct($p_tarname)
+	{
+		$this->_tarname = $p_tarname;
+	}
+
+	public function __destruct()
+	{
+		$this->_close();
+		// ----- Look for a local copy to delete
+		if ($this->_temp_tarname != '')
+			@unlink($this->_temp_tarname);
+	}
+
+	public function extract($p_path='')
+	{
+		return $this->extractModify($p_path, '');
+	}
+
+	/**
+	 * This method extract all the content of the archive in the directory
+	 * indicated by $p_path. When relevant the memorized path of the
+	 * files/dir can be modified by removing the $p_remove_path path at the
+	 * beginning of the file/dir path.
+	 * While extracting a file, if the directory path does not exists it is
+	 * created.
+	 * While extracting a file, if the file already exists it is replaced
+	 * without looking for last modification date.
+	 * While extracting a file, if the file already exists and is write
+	 * protected, the extraction is aborted.
+	 * While extracting a file, if a directory with the same name already
+	 * exists, the extraction is aborted.
+	 * While extracting a directory, if a file with the same name already
+	 * exists, the extraction is aborted.
+	 * While extracting a file/directory if the destination directory exist
+	 * and is write protected, or does not exist but can not be created,
+	 * the extraction is aborted.
+	 * If after extraction an extracted file does not show the correct
+	 * stored file size, the extraction is aborted.
+	 * When the extraction is aborted, a PEAR error text is set and false
+	 * is returned. However the result can be a partial extraction that may
+	 * need to be manually cleaned.
+	 *
+	 * @param string $p_path         The path of the directory where the
+	 *                               files/dir need to by extracted.
+	 * @param string $p_remove_path  Part of the memorized path that can be
+	 *                               removed if present at the beginning of
+	 *                               the file/dir path.
+	 * @return boolean               true on success, false on error.
+	 * @access public
+	 */
+	protected function extractModify($p_path, $p_remove_path)
+	{
+		$v_result = true;
+		$v_list_detail = array();
+
+		if ($v_result = $this->_openRead()) {
+			$v_result = $this->_extractList($p_path, $v_list_detail,
+											"complete", 0, $p_remove_path);
+			$this->_close();
+		}
+
+		return $v_result;
+	}
+
+	protected function _error($p_message)
+	{
 		throw new Exception($p_message);
-    }
-
-    private function _isArchive($p_filename=null)
-    {
-        if ($p_filename == null) {
-            $p_filename = $this->_tarname;
-        }
-        clearstatcache();
-        return @is_file($p_filename);
-    }
-
-    private function _openRead()
-    {
-        if (strtolower(substr($this->_tarname, 0, 7)) == 'http://') {
-
-          // ----- Look if a local copy need to be done
-          if ($this->_temp_tarname == '') {
-              $this->_temp_tarname = uniqid('tar').'.tmp';
-              if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
-                $this->_error('Unable to open in read mode \''
-				              .$this->_tarname.'\'');
-                $this->_temp_tarname = '';
-                return false;
-              }
-              if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
-                $this->_error('Unable to open in write mode \''
-				              .$this->_temp_tarname.'\'');
-                $this->_temp_tarname = '';
-                return false;
-              }
-              while ($v_data = @fread($v_file_from, 1024))
-                  @fwrite($v_file_to, $v_data);
-              @fclose($v_file_from);
-              @fclose($v_file_to);
-          }
-
-          // ----- File to open if the local copy
-          $v_filename = $this->_temp_tarname;
-
-        } else
-          // ----- File to open if the normal Tar file
-          $v_filename = $this->_tarname;
+	}
+
+	private function _isArchive($p_filename=null)
+	{
+		if ($p_filename == null) {
+			$p_filename = $this->_tarname;
+		}
+		clearstatcache();
+		return @is_file($p_filename);
+	}
+
+	private function _openRead()
+	{
+		if (strtolower(substr($this->_tarname, 0, 7)) == 'http://') {
+
+		  // ----- Look if a local copy need to be done
+		  if ($this->_temp_tarname == '') {
+			  $this->_temp_tarname = uniqid('tar').'.tmp';
+			  if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
+				$this->_error('Unable to open in read mode \''
+							  .$this->_tarname.'\'');
+				$this->_temp_tarname = '';
+				return false;
+			  }
+			  if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
+				$this->_error('Unable to open in write mode \''
+							  .$this->_temp_tarname.'\'');
+				$this->_temp_tarname = '';
+				return false;
+			  }
+			  while ($v_data = @fread($v_file_from, 1024))
+				  @fwrite($v_file_to, $v_data);
+			  @fclose($v_file_from);
+			  @fclose($v_file_to);
+		  }
+
+		  // ----- File to open if the local copy
+		  $v_filename = $this->_temp_tarname;
+
+		} else
+		  // ----- File to open if the normal Tar file
+		  $v_filename = $this->_tarname;
 
 		$this->_file = @fopen($v_filename, "rb");
 
-        if ($this->_file == 0) {
-            $this->_error('Unable to open in read mode \''.$v_filename.'\'');
-            return false;
-        }
+		if ($this->_file == 0) {
+			$this->_error('Unable to open in read mode \''.$v_filename.'\'');
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    private function _close()
-    {
-        //if (isset($this->_file)) {
-        if (is_resource($this->_file))
+	private function _close()
+	{
+		//if (isset($this->_file)) {
+		if (is_resource($this->_file))
 		{
-               @fclose($this->_file);
-            $this->_file = 0;
-        }
-
-        // ----- Look if a local copy need to be erase
-        // Note that it might be interesting to keep the url for a time : ToDo
-        if ($this->_temp_tarname != '') {
-            @unlink($this->_temp_tarname);
-            $this->_temp_tarname = '';
-        }
-
-        return true;
-    }
-
-    private function _cleanFile()
-    {
-        $this->_close();
-
-        // ----- Look for a local copy
-        if ($this->_temp_tarname != '') {
-            // ----- Remove the local copy but not the remote tarname
-            @unlink($this->_temp_tarname);
-            $this->_temp_tarname = '';
-        } else {
-            // ----- Remove the local tarname file
-            @unlink($this->_tarname);
-        }
-        $this->_tarname = '';
-
-        return true;
-    }
-
-    private function _readBlock()
-    {
-      $v_block = null;
-      if (is_resource($this->_file)) {
-              $v_block = @fread($this->_file, 512);
-      }
-      return $v_block;
-    }
-
-    private function _jumpBlock($p_len=null)
-    {
-      if (is_resource($this->_file)) {
-          if ($p_len === null)
-              $p_len = 1;
-
-              @fseek($this->_file, @ftell($this->_file)+($p_len*512));
-      }
-      return true;
-    }
-
-    private function _readHeader($v_binary_data, &$v_header)
-    {
-        if (strlen($v_binary_data)==0) {
-            $v_header['filename'] = '';
-            return true;
-        }
-
-        if (strlen($v_binary_data) != 512) {
-            $v_header['filename'] = '';
-            $this->_error('Invalid block size : '.strlen($v_binary_data));
-            return false;
-        }
-
-        // ----- Calculate the checksum
-        $v_checksum = 0;
-        // ..... First part of the header
-        for ($i=0; $i<148; $i++)
-            $v_checksum+=ord(substr($v_binary_data,$i,1));
-        // ..... Ignore the checksum value and replace it by ' ' (space)
-        for ($i=148; $i<156; $i++)
-            $v_checksum += ord(' ');
-        // ..... Last part of the header
-        for ($i=156; $i<512; $i++)
-           $v_checksum+=ord(substr($v_binary_data,$i,1));
-
-        $v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
-		                 ."a8checksum/a1typeflag/a100link/a6magic/a2version/"
+			   @fclose($this->_file);
+			$this->_file = 0;
+		}
+
+		// ----- Look if a local copy need to be erase
+		// Note that it might be interesting to keep the url for a time : ToDo
+		if ($this->_temp_tarname != '') {
+			@unlink($this->_temp_tarname);
+			$this->_temp_tarname = '';
+		}
+
+		return true;
+	}
+
+	private function _cleanFile()
+	{
+		$this->_close();
+
+		// ----- Look for a local copy
+		if ($this->_temp_tarname != '') {
+			// ----- Remove the local copy but not the remote tarname
+			@unlink($this->_temp_tarname);
+			$this->_temp_tarname = '';
+		} else {
+			// ----- Remove the local tarname file
+			@unlink($this->_tarname);
+		}
+		$this->_tarname = '';
+
+		return true;
+	}
+
+	private function _readBlock()
+	{
+	  $v_block = null;
+	  if (is_resource($this->_file)) {
+			  $v_block = @fread($this->_file, 512);
+	  }
+	  return $v_block;
+	}
+
+	private function _jumpBlock($p_len=null)
+	{
+	  if (is_resource($this->_file)) {
+		  if ($p_len === null)
+			  $p_len = 1;
+
+			  @fseek($this->_file, @ftell($this->_file)+($p_len*512));
+	  }
+	  return true;
+	}
+
+	private function _readHeader($v_binary_data, &$v_header)
+	{
+		if (strlen($v_binary_data)==0) {
+			$v_header['filename'] = '';
+			return true;
+		}
+
+		if (strlen($v_binary_data) != 512) {
+			$v_header['filename'] = '';
+			$this->_error('Invalid block size : '.strlen($v_binary_data));
+			return false;
+		}
+
+		// ----- Calculate the checksum
+		$v_checksum = 0;
+		// ..... First part of the header
+		for ($i=0; $i<148; $i++)
+			$v_checksum+=ord(substr($v_binary_data,$i,1));
+		// ..... Ignore the checksum value and replace it by ' ' (space)
+		for ($i=148; $i<156; $i++)
+			$v_checksum += ord(' ');
+		// ..... Last part of the header
+		for ($i=156; $i<512; $i++)
+		   $v_checksum+=ord(substr($v_binary_data,$i,1));
+
+		$v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
+						 ."a8checksum/a1typeflag/a100link/a6magic/a2version/"
 						 ."a32uname/a32gname/a8devmajor/a8devminor",
 						 $v_binary_data);
 
-        // ----- Extract the checksum
-        $v_header['checksum'] = OctDec(trim($v_data['checksum']));
-        if ($v_header['checksum'] != $v_checksum) {
-            $v_header['filename'] = '';
+		// ----- Extract the checksum
+		$v_header['checksum'] = OctDec(trim($v_data['checksum']));
+		if ($v_header['checksum'] != $v_checksum) {
+			$v_header['filename'] = '';
 
-            // ----- Look for last block (empty block)
-            if (($v_checksum == 256) && ($v_header['checksum'] == 0))
-                return true;
+			// ----- Look for last block (empty block)
+			if (($v_checksum == 256) && ($v_header['checksum'] == 0))
+				return true;
 
-            $this->_error('Invalid checksum for file "'.$v_data['filename']
-			              .'" : '.$v_checksum.' calculated, '
+			$this->_error('Invalid checksum for file "'.$v_data['filename']
+						  .'" : '.$v_checksum.' calculated, '
 						  .$v_header['checksum'].' expected');
-            return false;
-        }
-
-        // ----- Extract the properties
-        $v_header['filename'] = trim($v_data['filename']);
-        $v_header['mode'] = OctDec(trim($v_data['mode']));
-        $v_header['uid'] = OctDec(trim($v_data['uid']));
-        $v_header['gid'] = OctDec(trim($v_data['gid']));
-        $v_header['size'] = OctDec(trim($v_data['size']));
-        $v_header['mtime'] = OctDec(trim($v_data['mtime']));
-        if (($v_header['typeflag'] = $v_data['typeflag']) == "5") {
-          $v_header['size'] = 0;
-        }
-        return true;
-    }
-
-    private function _readLongHeader(&$v_header)
-    {
-      $v_filename = '';
-      $n = floor($v_header['size']/512);
-      for ($i=0; $i<$n; $i++) {
-        $v_content = $this->_readBlock();
-        $v_filename .= $v_content;
-      }
-      if (($v_header['size'] % 512) != 0) {
-        $v_content = $this->_readBlock();
-        $v_filename .= $v_content;
-      }
-
-      // ----- Read the next header
-      $v_binary_data = $this->_readBlock();
-
-      if (!$this->_readHeader($v_binary_data, $v_header))
-        return false;
-
-      $v_header['filename'] = $v_filename;
-
-      return true;
-    }
-
-    protected function _extractList($p_path, &$p_list_detail, $p_mode,
-	                      $p_file_list, $p_remove_path)
-    {
-    $v_result=true;
-    $v_nb = 0;
-    $v_extract_all = true;
-    $v_listing = false;
-
-    $p_path = $this->_translateWinPath($p_path, false);
-    if ($p_path == '' || (substr($p_path, 0, 1) != '/'
-	    && substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))) {
-      $p_path = "./".$p_path;
-    }
-    $p_remove_path = $this->_translateWinPath($p_remove_path);
-
-    // ----- Look for path to remove format (should end by /)
-    if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/'))
-      $p_remove_path .= '/';
-    $p_remove_path_size = strlen($p_remove_path);
-
-    switch ($p_mode) {
-      case "complete" :
-        $v_extract_all = true;
-        $v_listing = false;
-      break;
-      case "partial" :
-          $v_extract_all = false;
-          $v_listing = false;
-      break;
-      case "list" :
-          $v_extract_all = false;
-          $v_listing = true;
-      break;
-      default :
-        $this->_error('Invalid extract mode ('.$p_mode.')');
-        return false;
-    }
-
-    clearstatcache();
-
-    while (strlen($v_binary_data = $this->_readBlock()) != 0)
-    {
-      $v_extract_file = false;
-      $v_extraction_stopped = 0;
-
-      if (!$this->_readHeader($v_binary_data, $v_header))
-        return false;
-
-      if ($v_header['filename'] == '') {
-        continue;
-      }
-
-      // ----- Look for long filename
-      if ($v_header['typeflag'] == 'L') {
-        if (!$this->_readLongHeader($v_header))
-          return false;
-      }
-
-      if ((!$v_extract_all) && (is_array($p_file_list))) {
-        // ----- By default no unzip if the file is not found
-        $v_extract_file = false;
-
-        for ($i=0; $i<sizeof($p_file_list); $i++) {
-          // ----- Look if it is a directory
-          if (substr($p_file_list[$i], -1) == '/') {
-            // ----- Look if the directory is in the filename path
-            if ((strlen($v_header['filename']) > strlen($p_file_list[$i]))
-			    && (substr($v_header['filename'], 0, strlen($p_file_list[$i]))
-				    == $p_file_list[$i])) {
-              $v_extract_file = true;
-              break;
-            }
-          }
-
-          // ----- It is a file, so compare the file names
-          elseif ($p_file_list[$i] == $v_header['filename']) {
-            $v_extract_file = true;
-            break;
-          }
-        }
-      } else {
-        $v_extract_file = true;
-      }
-
-      // ----- Look if this file need to be extracted
-      if (($v_extract_file) && (!$v_listing))
-      {
-        if (($p_remove_path != '')
-            && (substr($v_header['filename'], 0, $p_remove_path_size)
-			    == $p_remove_path))
-          $v_header['filename'] = substr($v_header['filename'],
-		                                 $p_remove_path_size);
-        if (($p_path != './') && ($p_path != '/')) {
-          while (substr($p_path, -1) == '/')
-            $p_path = substr($p_path, 0, strlen($p_path)-1);
-
-          if (substr($v_header['filename'], 0, 1) == '/')
-              $v_header['filename'] = $p_path.$v_header['filename'];
-          else
-            $v_header['filename'] = $p_path.'/'.$v_header['filename'];
-        }
-        if (file_exists($v_header['filename'])) {
-          if (   (@is_dir($v_header['filename']))
-		      && ($v_header['typeflag'] == '')) {
-            $this->_error('File '.$v_header['filename']
-			              .' already exists as a directory');
-            return false;
-          }
-          if (   ($this->_isArchive($v_header['filename']))
-		      && ($v_header['typeflag'] == "5")) {
-            $this->_error('Directory '.$v_header['filename']
-			              .' already exists as a file');
-            return false;
-          }
-          if (!is_writeable($v_header['filename'])) {
-            $this->_error('File '.$v_header['filename']
-			              .' already exists and is write protected');
-            return false;
-          }
-          if (filemtime($v_header['filename']) > $v_header['mtime']) {
-            // To be completed : An error or silent no replace ?
-          }
-        }
-
-        // ----- Check the directory availability and create it if necessary
-        elseif (($v_result
-		         = $this->_dirCheck(($v_header['typeflag'] == "5"
-				                    ?$v_header['filename']
+			return false;
+		}
+
+		// ----- Extract the properties
+		$v_header['filename'] = trim($v_data['filename']);
+		$v_header['mode'] = OctDec(trim($v_data['mode']));
+		$v_header['uid'] = OctDec(trim($v_data['uid']));
+		$v_header['gid'] = OctDec(trim($v_data['gid']));
+		$v_header['size'] = OctDec(trim($v_data['size']));
+		$v_header['mtime'] = OctDec(trim($v_data['mtime']));
+		if (($v_header['typeflag'] = $v_data['typeflag']) == "5") {
+		  $v_header['size'] = 0;
+		}
+		return true;
+	}
+
+	private function _readLongHeader(&$v_header)
+	{
+	  $v_filename = '';
+	  $n = floor($v_header['size']/512);
+	  for ($i=0; $i<$n; $i++) {
+		$v_content = $this->_readBlock();
+		$v_filename .= $v_content;
+	  }
+	  if (($v_header['size'] % 512) != 0) {
+		$v_content = $this->_readBlock();
+		$v_filename .= $v_content;
+	  }
+
+	  // ----- Read the next header
+	  $v_binary_data = $this->_readBlock();
+
+	  if (!$this->_readHeader($v_binary_data, $v_header))
+		return false;
+
+	  $v_header['filename'] = $v_filename;
+
+	  return true;
+	}
+
+	protected function _extractList($p_path, &$p_list_detail, $p_mode,
+						  $p_file_list, $p_remove_path)
+	{
+	$v_result=true;
+	$v_nb = 0;
+	$v_extract_all = true;
+	$v_listing = false;
+
+	$p_path = $this->_translateWinPath($p_path, false);
+	if ($p_path == '' || (substr($p_path, 0, 1) != '/'
+		&& substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))) {
+	  $p_path = "./".$p_path;
+	}
+	$p_remove_path = $this->_translateWinPath($p_remove_path);
+
+	// ----- Look for path to remove format (should end by /)
+	if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/'))
+	  $p_remove_path .= '/';
+	$p_remove_path_size = strlen($p_remove_path);
+
+	switch ($p_mode) {
+	  case "complete" :
+		$v_extract_all = true;
+		$v_listing = false;
+	  break;
+	  case "partial" :
+		  $v_extract_all = false;
+		  $v_listing = false;
+	  break;
+	  case "list" :
+		  $v_extract_all = false;
+		  $v_listing = true;
+	  break;
+	  default :
+		$this->_error('Invalid extract mode ('.$p_mode.')');
+		return false;
+	}
+
+	clearstatcache();
+
+	while (strlen($v_binary_data = $this->_readBlock()) != 0)
+	{
+	  $v_extract_file = false;
+	  $v_extraction_stopped = 0;
+
+	  if (!$this->_readHeader($v_binary_data, $v_header))
+		return false;
+
+	  if ($v_header['filename'] == '') {
+		continue;
+	  }
+
+	  // ----- Look for long filename
+	  if ($v_header['typeflag'] == 'L') {
+		if (!$this->_readLongHeader($v_header))
+		  return false;
+	  }
+
+	  if ((!$v_extract_all) && (is_array($p_file_list))) {
+		// ----- By default no unzip if the file is not found
+		$v_extract_file = false;
+
+		for ($i=0; $i<sizeof($p_file_list); $i++) {
+		  // ----- Look if it is a directory
+		  if (substr($p_file_list[$i], -1) == '/') {
+			// ----- Look if the directory is in the filename path
+			if ((strlen($v_header['filename']) > strlen($p_file_list[$i]))
+				&& (substr($v_header['filename'], 0, strlen($p_file_list[$i]))
+					== $p_file_list[$i])) {
+			  $v_extract_file = true;
+			  break;
+			}
+		  }
+
+		  // ----- It is a file, so compare the file names
+		  elseif ($p_file_list[$i] == $v_header['filename']) {
+			$v_extract_file = true;
+			break;
+		  }
+		}
+	  } else {
+		$v_extract_file = true;
+	  }
+
+	  // ----- Look if this file need to be extracted
+	  if (($v_extract_file) && (!$v_listing))
+	  {
+		if (($p_remove_path != '')
+			&& (substr($v_header['filename'], 0, $p_remove_path_size)
+				== $p_remove_path))
+		  $v_header['filename'] = substr($v_header['filename'],
+										 $p_remove_path_size);
+		if (($p_path != './') && ($p_path != '/')) {
+		  while (substr($p_path, -1) == '/')
+			$p_path = substr($p_path, 0, strlen($p_path)-1);
+
+		  if (substr($v_header['filename'], 0, 1) == '/')
+			  $v_header['filename'] = $p_path.$v_header['filename'];
+		  else
+			$v_header['filename'] = $p_path.'/'.$v_header['filename'];
+		}
+		if (file_exists($v_header['filename'])) {
+		  if (   (@is_dir($v_header['filename']))
+			  && ($v_header['typeflag'] == '')) {
+			$this->_error('File '.$v_header['filename']
+						  .' already exists as a directory');
+			return false;
+		  }
+		  if (   ($this->_isArchive($v_header['filename']))
+			  && ($v_header['typeflag'] == "5")) {
+			$this->_error('Directory '.$v_header['filename']
+						  .' already exists as a file');
+			return false;
+		  }
+		  if (!is_writeable($v_header['filename'])) {
+			$this->_error('File '.$v_header['filename']
+						  .' already exists and is write protected');
+			return false;
+		  }
+		  if (filemtime($v_header['filename']) > $v_header['mtime']) {
+			// To be completed : An error or silent no replace ?
+		  }
+		}
+
+		// ----- Check the directory availability and create it if necessary
+		elseif (($v_result
+				 = $this->_dirCheck(($v_header['typeflag'] == "5"
+									?$v_header['filename']
 									:dirname($v_header['filename'])))) != 1) {
-            $this->_error('Unable to create path for '.$v_header['filename']);
-            return false;
-        }
-
-        if ($v_extract_file) {
-          if ($v_header['typeflag'] == "5") {
-            if (!@file_exists($v_header['filename'])) {
-                if (!@mkdir($v_header['filename'], PRADO_CHMOD)) {
-                    $this->_error('Unable to create directory {'
-					              .$v_header['filename'].'}');
-                    return false;
-                }
-                chmod($v_header['filename'], PRADO_CHMOD);
-            }
-          } else {
-              if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
-                  $this->_error('Error while opening {'.$v_header['filename']
-				                .'} in write binary mode');
-                  return false;
-              } else {
-                  $n = floor($v_header['size']/512);
-                  for ($i=0; $i<$n; $i++) {
-                      $v_content = $this->_readBlock();
-                      fwrite($v_dest_file, $v_content, 512);
-                  }
-            if (($v_header['size'] % 512) != 0) {
-              $v_content = $this->_readBlock();
-              fwrite($v_dest_file, $v_content, ($v_header['size'] % 512));
-            }
-
-            @fclose($v_dest_file);
-
-            // ----- Change the file mode, mtime
-            @touch($v_header['filename'], $v_header['mtime']);
-            // To be completed
-            //chmod($v_header[filename], DecOct($v_header[mode]));
-          }
-
-          // ----- Check the file size
-          clearstatcache();
-          if (filesize($v_header['filename']) != $v_header['size']) {
-              $this->_error('Extracted file '.$v_header['filename']
-			                .' does not have the correct file size \''
+			$this->_error('Unable to create path for '.$v_header['filename']);
+			return false;
+		}
+
+		if ($v_extract_file) {
+		  if ($v_header['typeflag'] == "5") {
+			if (!@file_exists($v_header['filename'])) {
+				if (!@mkdir($v_header['filename'], PRADO_CHMOD)) {
+					$this->_error('Unable to create directory {'
+								  .$v_header['filename'].'}');
+					return false;
+				}
+				chmod($v_header['filename'], PRADO_CHMOD);
+			}
+		  } else {
+			  if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
+				  $this->_error('Error while opening {'.$v_header['filename']
+								.'} in write binary mode');
+				  return false;
+			  } else {
+				  $n = floor($v_header['size']/512);
+				  for ($i=0; $i<$n; $i++) {
+					  $v_content = $this->_readBlock();
+					  fwrite($v_dest_file, $v_content, 512);
+				  }
+			if (($v_header['size'] % 512) != 0) {
+			  $v_content = $this->_readBlock();
+			  fwrite($v_dest_file, $v_content, ($v_header['size'] % 512));
+			}
+
+			@fclose($v_dest_file);
+
+			// ----- Change the file mode, mtime
+			@touch($v_header['filename'], $v_header['mtime']);
+			// To be completed
+			//chmod($v_header[filename], DecOct($v_header[mode]));
+		  }
+
+		  // ----- Check the file size
+		  clearstatcache();
+		  if (filesize($v_header['filename']) != $v_header['size']) {
+			  $this->_error('Extracted file '.$v_header['filename']
+							.' does not have the correct file size \''
 							.filesize($v_header['filename'])
 							.'\' ('.$v_header['size']
 							.' expected). Archive may be corrupted.');
-              return false;
-          }
-          }
-        } else {
-          $this->_jumpBlock(ceil(($v_header['size']/512)));
-        }
-      } else {
-          $this->_jumpBlock(ceil(($v_header['size']/512)));
-      }
-
-      /* TBC : Seems to be unused ...
+			  return false;
+		  }
+		  }
+		} else {
+		  $this->_jumpBlock(ceil(($v_header['size']/512)));
+		}
+	  } else {
+		  $this->_jumpBlock(ceil(($v_header['size']/512)));
+	  }
+
+	  /* TBC : Seems to be unused ...
       if ($this->_compress)
         $v_end_of_file = @gzeof($this->_file);
       else
         $v_end_of_file = @feof($this->_file);
         */
 
-      if ($v_listing || $v_extract_file || $v_extraction_stopped) {
-        // ----- Log extracted files
-        if (($v_file_dir = dirname($v_header['filename']))
-		    == $v_header['filename'])
-          $v_file_dir = '';
-        if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == ''))
-          $v_file_dir = '/';
-
-        $p_list_detail[$v_nb++] = $v_header;
-      }
-    }
-
-        return true;
-    }
-
-    /**
-     * Check if a directory exists and create it (including parent
-     * dirs) if not.
-     *
-     * @param string $p_dir directory to check
-     *
-     * @return bool true if the directory exists or was created
-     */
-    protected function _dirCheck($p_dir)
-    {
-        if ((@is_dir($p_dir)) || ($p_dir == ''))
-            return true;
-
-        $p_parent_dir = dirname($p_dir);
-
-        if (($p_parent_dir != $p_dir) &&
-            ($p_parent_dir != '') &&
-            (!$this->_dirCheck($p_parent_dir)))
-             return false;
-
-        if (!@mkdir($p_dir, PRADO_CHMOD)) {
-            $this->_error("Unable to create directory '$p_dir'");
-            return false;
-        }
-        chmod($p_dir,PRADO_CHMOD);
-
-        return true;
-    }
-
-    protected function _translateWinPath($p_path, $p_remove_disk_letter=true)
-    {
-      if (substr(PHP_OS, 0, 3) == 'WIN') {
-          // ----- Look for potential disk letter
-          if (   ($p_remove_disk_letter)
-		      && (($v_position = strpos($p_path, ':')) != false)) {
-              $p_path = substr($p_path, $v_position+1);
-          }
-          // ----- Change potential windows directory separator
-          if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
-              $p_path = strtr($p_path, '\\', '/');
-          }
-      }
-      return $p_path;
-    }
+	  if ($v_listing || $v_extract_file || $v_extraction_stopped) {
+		// ----- Log extracted files
+		if (($v_file_dir = dirname($v_header['filename']))
+			== $v_header['filename'])
+		  $v_file_dir = '';
+		if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == ''))
+		  $v_file_dir = '/';
+
+		$p_list_detail[$v_nb++] = $v_header;
+	  }
+	}
+
+		return true;
+	}
+
+	/**
+	 * Check if a directory exists and create it (including parent
+	 * dirs) if not.
+	 *
+	 * @param string $p_dir directory to check
+	 *
+	 * @return bool true if the directory exists or was created
+	 */
+	protected function _dirCheck($p_dir)
+	{
+		if ((@is_dir($p_dir)) || ($p_dir == ''))
+			return true;
+
+		$p_parent_dir = dirname($p_dir);
+
+		if (($p_parent_dir != $p_dir) &&
+			($p_parent_dir != '') &&
+			(!$this->_dirCheck($p_parent_dir)))
+			 return false;
+
+		if (!@mkdir($p_dir, PRADO_CHMOD)) {
+			$this->_error("Unable to create directory '$p_dir'");
+			return false;
+		}
+		chmod($p_dir,PRADO_CHMOD);
+
+		return true;
+	}
+
+	protected function _translateWinPath($p_path, $p_remove_disk_letter=true)
+	{
+	  if (substr(PHP_OS, 0, 3) == 'WIN') {
+		  // ----- Look for potential disk letter
+		  if (   ($p_remove_disk_letter)
+			  && (($v_position = strpos($p_path, ':')) != false)) {
+			  $p_path = substr($p_path, $v_position+1);
+		  }
+		  // ----- Change potential windows directory separator
+		  if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
+			  $p_path = strtr($p_path, '\\', '/');
+		  }
+	  }
+	  return $p_path;
+	}
 }

Spacing +50 added lines, -50 removed lines

@@ -38,17 +38,17 @@ 
     /**
     * @var string Name of the Tar
     */
-    private $_tarname='';
+    private $_tarname = '';
 
     /**
     * @var file descriptor
     */
-    private $_file=0;
+    private $_file = 0;
 
     /**
     * @var string Local Tar name of a remote Tar (http:// or ftp://)
     */
-    private $_temp_tarname='';
+    private $_temp_tarname = '';
 
     /**
     * Archive_Tar Class constructor. This flavour of the constructor only
@@ -71,7 +71,7 @@ 
             @unlink($this->_temp_tarname);
     }
 
-    public function extract($p_path='')
+    public function extract($p_path = '')
     {
         return $this->extractModify($p_path, '');
     }
@@ -127,7 +127,7 @@ 
 		throw new Exception($p_message);
     }
 
-    private function _isArchive($p_filename=null)
+    private function _isArchive($p_filename = null)
     {
         if ($p_filename == null) {
             $p_filename = $this->_tarname;
@@ -142,16 +142,16 @@ 
 
           // ----- Look if a local copy need to be done
           if ($this->_temp_tarname == '') {
-              $this->_temp_tarname = uniqid('tar').'.tmp';
+              $this->_temp_tarname = uniqid('tar') . '.tmp';
               if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
                 $this->_error('Unable to open in read mode \''
-				              .$this->_tarname.'\'');
+				              .$this->_tarname . '\'');
                 $this->_temp_tarname = '';
                 return false;
               }
               if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
                 $this->_error('Unable to open in write mode \''
-				              .$this->_temp_tarname.'\'');
+				              .$this->_temp_tarname . '\'');
                 $this->_temp_tarname = '';
                 return false;
               }
@@ -171,7 +171,7 @@ 
 		$this->_file = @fopen($v_filename, "rb");
 
         if ($this->_file == 0) {
-            $this->_error('Unable to open in read mode \''.$v_filename.'\'');
+            $this->_error('Unable to open in read mode \'' . $v_filename . '\'');
             return false;
         }
 
@@ -224,41 +224,41 @@ 
       return $v_block;
     }
 
-    private function _jumpBlock($p_len=null)
+    private function _jumpBlock($p_len = null)
     {
       if (is_resource($this->_file)) {
           if ($p_len === null)
               $p_len = 1;
 
-              @fseek($this->_file, @ftell($this->_file)+($p_len*512));
+              @fseek($this->_file, @ftell($this->_file) + ($p_len * 512));
       }
       return true;
     }
 
     private function _readHeader($v_binary_data, &$v_header)
     {
-        if (strlen($v_binary_data)==0) {
+        if (strlen($v_binary_data) == 0) {
             $v_header['filename'] = '';
             return true;
         }
 
         if (strlen($v_binary_data) != 512) {
             $v_header['filename'] = '';
-            $this->_error('Invalid block size : '.strlen($v_binary_data));
+            $this->_error('Invalid block size : ' . strlen($v_binary_data));
             return false;
         }
 
         // ----- Calculate the checksum
         $v_checksum = 0;
         // ..... First part of the header
-        for ($i=0; $i<148; $i++)
-            $v_checksum+=ord(substr($v_binary_data,$i,1));
+        for ($i = 0; $i < 148; $i++)
+            $v_checksum += ord(substr($v_binary_data, $i, 1));
         // ..... Ignore the checksum value and replace it by ' ' (space)
-        for ($i=148; $i<156; $i++)
+        for ($i = 148; $i < 156; $i++)
             $v_checksum += ord(' ');
         // ..... Last part of the header
-        for ($i=156; $i<512; $i++)
-           $v_checksum+=ord(substr($v_binary_data,$i,1));
+        for ($i = 156; $i < 512; $i++)
+           $v_checksum += ord(substr($v_binary_data, $i, 1));
 
         $v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
 		                 ."a8checksum/a1typeflag/a100link/a6magic/a2version/"
@@ -274,9 +274,9 @@ 
             if (($v_checksum == 256) && ($v_header['checksum'] == 0))
                 return true;
 
-            $this->_error('Invalid checksum for file "'.$v_data['filename']
-			              .'" : '.$v_checksum.' calculated, '
-						  .$v_header['checksum'].' expected');
+            $this->_error('Invalid checksum for file "' . $v_data['filename']
+			              .'" : ' . $v_checksum . ' calculated, '
+						  .$v_header['checksum'] . ' expected');
             return false;
         }
 
@@ -296,8 +296,8 @@ 
     private function _readLongHeader(&$v_header)
     {
       $v_filename = '';
-      $n = floor($v_header['size']/512);
-      for ($i=0; $i<$n; $i++) {
+      $n = floor($v_header['size'] / 512);
+      for ($i = 0; $i < $n; $i++) {
         $v_content = $this->_readBlock();
         $v_filename .= $v_content;
       }
@@ -320,7 +320,7 @@ 
     protected function _extractList($p_path, &$p_list_detail, $p_mode,
 	                      $p_file_list, $p_remove_path)
     {
-    $v_result=true;
+    $v_result = true;
     $v_nb = 0;
     $v_extract_all = true;
     $v_listing = false;
@@ -328,7 +328,7 @@ 
     $p_path = $this->_translateWinPath($p_path, false);
     if ($p_path == '' || (substr($p_path, 0, 1) != '/'
 	    && substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))) {
-      $p_path = "./".$p_path;
+      $p_path = "./" . $p_path;
     }
     $p_remove_path = $this->_translateWinPath($p_remove_path);
 
@@ -351,7 +351,7 @@ 
           $v_listing = true;
       break;
       default :
-        $this->_error('Invalid extract mode ('.$p_mode.')');
+        $this->_error('Invalid extract mode (' . $p_mode . ')');
         return false;
     }
 
@@ -379,7 +379,7 @@ 
         // ----- By default no unzip if the file is not found
         $v_extract_file = false;
 
-        for ($i=0; $i<sizeof($p_file_list); $i++) {
+        for ($i = 0; $i < sizeof($p_file_list); $i++) {
           // ----- Look if it is a directory
           if (substr($p_file_list[$i], -1) == '/') {
             // ----- Look if the directory is in the filename path
@@ -411,28 +411,28 @@ 
 		                                 $p_remove_path_size);
         if (($p_path != './') && ($p_path != '/')) {
           while (substr($p_path, -1) == '/')
-            $p_path = substr($p_path, 0, strlen($p_path)-1);
+            $p_path = substr($p_path, 0, strlen($p_path) - 1);
 
           if (substr($v_header['filename'], 0, 1) == '/')
-              $v_header['filename'] = $p_path.$v_header['filename'];
+              $v_header['filename'] = $p_path . $v_header['filename'];
           else
-            $v_header['filename'] = $p_path.'/'.$v_header['filename'];
+            $v_header['filename'] = $p_path . '/' . $v_header['filename'];
         }
         if (file_exists($v_header['filename'])) {
-          if (   (@is_dir($v_header['filename']))
+          if ((@is_dir($v_header['filename']))
 		      && ($v_header['typeflag'] == '')) {
-            $this->_error('File '.$v_header['filename']
+            $this->_error('File ' . $v_header['filename']
 			              .' already exists as a directory');
             return false;
           }
-          if (   ($this->_isArchive($v_header['filename']))
+          if (($this->_isArchive($v_header['filename']))
 		      && ($v_header['typeflag'] == "5")) {
-            $this->_error('Directory '.$v_header['filename']
+            $this->_error('Directory ' . $v_header['filename']
 			              .' already exists as a file');
             return false;
           }
           if (!is_writeable($v_header['filename'])) {
-            $this->_error('File '.$v_header['filename']
+            $this->_error('File ' . $v_header['filename']
 			              .' already exists and is write protected');
             return false;
           }
@@ -444,9 +444,9 @@ 
         // ----- Check the directory availability and create it if necessary
         elseif (($v_result
 		         = $this->_dirCheck(($v_header['typeflag'] == "5"
-				                    ?$v_header['filename']
+				                    ? $v_header['filename']
 									:dirname($v_header['filename'])))) != 1) {
-            $this->_error('Unable to create path for '.$v_header['filename']);
+            $this->_error('Unable to create path for ' . $v_header['filename']);
             return false;
         }
 
@@ -455,19 +455,19 @@ 
             if (!@file_exists($v_header['filename'])) {
                 if (!@mkdir($v_header['filename'], PRADO_CHMOD)) {
                     $this->_error('Unable to create directory {'
-					              .$v_header['filename'].'}');
+					              .$v_header['filename'] . '}');
                     return false;
                 }
                 chmod($v_header['filename'], PRADO_CHMOD);
             }
           } else {
               if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
-                  $this->_error('Error while opening {'.$v_header['filename']
+                  $this->_error('Error while opening {' . $v_header['filename']
 				                .'} in write binary mode');
                   return false;
               } else {
-                  $n = floor($v_header['size']/512);
-                  for ($i=0; $i<$n; $i++) {
+                  $n = floor($v_header['size'] / 512);
+                  for ($i = 0; $i < $n; $i++) {
                       $v_content = $this->_readBlock();
                       fwrite($v_dest_file, $v_content, 512);
                   }
@@ -487,19 +487,19 @@ 
           // ----- Check the file size
           clearstatcache();
           if (filesize($v_header['filename']) != $v_header['size']) {
-              $this->_error('Extracted file '.$v_header['filename']
+              $this->_error('Extracted file ' . $v_header['filename']
 			                .' does not have the correct file size \''
 							.filesize($v_header['filename'])
-							.'\' ('.$v_header['size']
+							.'\' (' . $v_header['size']
 							.' expected). Archive may be corrupted.');
               return false;
           }
           }
         } else {
-          $this->_jumpBlock(ceil(($v_header['size']/512)));
+          $this->_jumpBlock(ceil(($v_header['size'] / 512)));
         }
       } else {
-          $this->_jumpBlock(ceil(($v_header['size']/512)));
+          $this->_jumpBlock(ceil(($v_header['size'] / 512)));
       }
 
       /* TBC : Seems to be unused ...
@@ -548,21 +548,21 @@ 
             $this->_error("Unable to create directory '$p_dir'");
             return false;
         }
-        chmod($p_dir,PRADO_CHMOD);
+        chmod($p_dir, PRADO_CHMOD);
 
         return true;
     }
 
-    protected function _translateWinPath($p_path, $p_remove_disk_letter=true)
+    protected function _translateWinPath($p_path, $p_remove_disk_letter = true)
     {
       if (substr(PHP_OS, 0, 3) == 'WIN') {
           // ----- Look for potential disk letter
-          if (   ($p_remove_disk_letter)
+          if (($p_remove_disk_letter)
 		      && (($v_position = strpos($p_path, ':')) != false)) {
-              $p_path = substr($p_path, $v_position+1);
+              $p_path = substr($p_path, $v_position + 1);
           }
           // ----- Change potential windows directory separator
-          if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
+          if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
               $p_path = strtr($p_path, '\\', '/');
           }
       }

Braces +59 added lines, -40 removed lines

@@ -67,8 +67,9 @@ 
     {
         $this->_close();
         // ----- Look for a local copy to delete
-        if ($this->_temp_tarname != '')
-            @unlink($this->_temp_tarname);
+        if ($this->_temp_tarname != '') {
+                    @unlink($this->_temp_tarname);
+        }
     }
 
     public function extract($p_path='')
@@ -155,8 +156,9 @@ 
                 $this->_temp_tarname = '';
                 return false;
               }
-              while ($v_data = @fread($v_file_from, 1024))
-                  @fwrite($v_file_to, $v_data);
+              while ($v_data = @fread($v_file_from, 1024)) {
+                                @fwrite($v_file_to, $v_data);
+              }
               @fclose($v_file_from);
               @fclose($v_file_to);
           }
@@ -164,9 +166,10 @@ 
           // ----- File to open if the local copy
           $v_filename = $this->_temp_tarname;
 
-        } else
-          // ----- File to open if the normal Tar file
+        } else {
+                  // ----- File to open if the normal Tar file
           $v_filename = $this->_tarname;
+        }
 
 		$this->_file = @fopen($v_filename, "rb");
 
@@ -227,8 +230,9 @@ 
     private function _jumpBlock($p_len=null)
     {
       if (is_resource($this->_file)) {
-          if ($p_len === null)
-              $p_len = 1;
+          if ($p_len === null) {
+                        $p_len = 1;
+          }
 
               @fseek($this->_file, @ftell($this->_file)+($p_len*512));
       }
@@ -251,14 +255,17 @@ 
         // ----- Calculate the checksum
         $v_checksum = 0;
         // ..... First part of the header
-        for ($i=0; $i<148; $i++)
-            $v_checksum+=ord(substr($v_binary_data,$i,1));
+        for ($i=0; $i<148; $i++) {
+                    $v_checksum+=ord(substr($v_binary_data,$i,1));
+        }
         // ..... Ignore the checksum value and replace it by ' ' (space)
-        for ($i=148; $i<156; $i++)
-            $v_checksum += ord(' ');
+        for ($i=148; $i<156; $i++) {
+                    $v_checksum += ord(' ');
+        }
         // ..... Last part of the header
-        for ($i=156; $i<512; $i++)
-           $v_checksum+=ord(substr($v_binary_data,$i,1));
+        for ($i=156; $i<512; $i++) {
+                   $v_checksum+=ord(substr($v_binary_data,$i,1));
+        }
 
         $v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
 		                 ."a8checksum/a1typeflag/a100link/a6magic/a2version/"
@@ -271,8 +278,9 @@ 
             $v_header['filename'] = '';
 
             // ----- Look for last block (empty block)
-            if (($v_checksum == 256) && ($v_header['checksum'] == 0))
-                return true;
+            if (($v_checksum == 256) && ($v_header['checksum'] == 0)) {
+                            return true;
+            }
 
             $this->_error('Invalid checksum for file "'.$v_data['filename']
 			              .'" : '.$v_checksum.' calculated, '
@@ -309,8 +317,9 @@ 
       // ----- Read the next header
       $v_binary_data = $this->_readBlock();
 
-      if (!$this->_readHeader($v_binary_data, $v_header))
-        return false;
+      if (!$this->_readHeader($v_binary_data, $v_header)) {
+              return false;
+      }
 
       $v_header['filename'] = $v_filename;
 
@@ -333,8 +342,9 @@ 
     $p_remove_path = $this->_translateWinPath($p_remove_path);
 
     // ----- Look for path to remove format (should end by /)
-    if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/'))
-      $p_remove_path .= '/';
+    if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/')) {
+          $p_remove_path .= '/';
+    }
     $p_remove_path_size = strlen($p_remove_path);
 
     switch ($p_mode) {
@@ -362,8 +372,9 @@ 
       $v_extract_file = false;
       $v_extraction_stopped = 0;
 
-      if (!$this->_readHeader($v_binary_data, $v_header))
-        return false;
+      if (!$this->_readHeader($v_binary_data, $v_header)) {
+              return false;
+      }
 
       if ($v_header['filename'] == '') {
         continue;
@@ -371,8 +382,9 @@ 
 
       // ----- Look for long filename
       if ($v_header['typeflag'] == 'L') {
-        if (!$this->_readLongHeader($v_header))
-          return false;
+        if (!$this->_readLongHeader($v_header)) {
+                  return false;
+        }
       }
 
       if ((!$v_extract_all) && (is_array($p_file_list))) {
@@ -406,17 +418,20 @@ 
       {
         if (($p_remove_path != '')
             && (substr($v_header['filename'], 0, $p_remove_path_size)
-			    == $p_remove_path))
-          $v_header['filename'] = substr($v_header['filename'],
+			    == $p_remove_path)) {
+                  $v_header['filename'] = substr($v_header['filename'],
 		                                 $p_remove_path_size);
+        }
         if (($p_path != './') && ($p_path != '/')) {
-          while (substr($p_path, -1) == '/')
-            $p_path = substr($p_path, 0, strlen($p_path)-1);
+          while (substr($p_path, -1) == '/') {
+                      $p_path = substr($p_path, 0, strlen($p_path)-1);
+          }
 
-          if (substr($v_header['filename'], 0, 1) == '/')
-              $v_header['filename'] = $p_path.$v_header['filename'];
-          else
-            $v_header['filename'] = $p_path.'/'.$v_header['filename'];
+          if (substr($v_header['filename'], 0, 1) == '/') {
+                        $v_header['filename'] = $p_path.$v_header['filename'];
+          } else {
+                      $v_header['filename'] = $p_path.'/'.$v_header['filename'];
+          }
         }
         if (file_exists($v_header['filename'])) {
           if (   (@is_dir($v_header['filename']))
@@ -512,10 +527,12 @@ 
       if ($v_listing || $v_extract_file || $v_extraction_stopped) {
         // ----- Log extracted files
         if (($v_file_dir = dirname($v_header['filename']))
-		    == $v_header['filename'])
-          $v_file_dir = '';
-        if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == ''))
-          $v_file_dir = '/';
+		    == $v_header['filename']) {
+                  $v_file_dir = '';
+        }
+        if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == '')) {
+                  $v_file_dir = '/';
+        }
 
         $p_list_detail[$v_nb++] = $v_header;
       }
@@ -534,15 +551,17 @@ 
      */
     protected function _dirCheck($p_dir)
     {
-        if ((@is_dir($p_dir)) || ($p_dir == ''))
-            return true;
+        if ((@is_dir($p_dir)) || ($p_dir == '')) {
+                    return true;
+        }
 
         $p_parent_dir = dirname($p_dir);
 
         if (($p_parent_dir != $p_dir) &&
             ($p_parent_dir != '') &&
-            (!$this->_dirCheck($p_parent_dir)))
-             return false;
+            (!$this->_dirCheck($p_parent_dir))) {
+                     return false;
+        }
 
         if (!@mkdir($p_dir, PRADO_CHMOD)) {
             $this->_error("Unable to create directory '$p_dir'");

framework/IO/TTextWriter.php

Doc Comments +1 added lines

@@ -38,6 +38,7 @@
 	/**
 	 * Writes a string.
 	 * @param string string to be written
+	 * @param string $str
 	 */
 	public function write($str)
 	{

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
  */
 class TTextWriter extends TComponent implements ITextWriter
 {
-	private $_str='';
+	private $_str = '';
 
 	/**
 	 * Flushes the content that has been written.
@@ -30,8 +30,8 @@ 
 	 */
 	public function flush()
 	{
-		$str=$this->_str;
-		$this->_str='';
+		$str = $this->_str;
+		$this->_str = '';
 		return $str;
 	}
 
@@ -41,7 +41,7 @@ 
 	 */
 	public function write($str)
 	{
-		$this->_str.=$str;
+		$this->_str .= $str;
 	}
 
 	/**
@@ -49,9 +49,9 @@ 
 	 * @param string content to be written
 	 * @see write
 	 */
-	public function writeLine($str='')
+	public function writeLine($str = '')
 	{
-		$this->write($str."\n");
+		$this->write($str . "\n");
 	}
 }
 

framework/PradoBase.php

Doc Comments +1 added lines

@@ -184,6 +184,7 @@
 	 * will cause the throw of an exception.
 	 * This method should only be used by framework developers.
 	 * @param TApplication the application instance
+	 * @param TApplication $application
 	 * @throws TInvalidOperationException if this method is invoked twice or more.
 	 */
 	public static function setApplication($application)

Indentation +13 added lines, -13 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 /**
- * PradoBase class file.
- *
- * This is the file that establishes the PRADO component model
- * and error handling mechanism.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System
- */
+	 * PradoBase class file.
+	 *
+	 * This is the file that establishes the PRADO component model
+	 * and error handling mechanism.
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System
+	 */
 
 /**
  * Defines the PRADO framework installation path.
@@ -18,8 +18,8 @@ 
 if(!defined('PRADO_DIR'))
 	define('PRADO_DIR',dirname(__FILE__));
 /**
- * Defines the default permission for writable directories and files
- */
+	 * Defines the default permission for writable directories and files
+	 */
 if(!defined('PRADO_CHMOD'))
 	define('PRADO_CHMOD',0777);
 

Spacing +133 added lines, -133 removed lines

@@ -15,13 +15,13 @@ 
 /**
  * Defines the PRADO framework installation path.
  */
-if(!defined('PRADO_DIR'))
-	define('PRADO_DIR',dirname(__FILE__));
+if (!defined('PRADO_DIR'))
+	define('PRADO_DIR', dirname(__FILE__));
 /**
  * Defines the default permission for writable directories and files
  */
-if(!defined('PRADO_CHMOD'))
-	define('PRADO_CHMOD',0777);
+if (!defined('PRADO_CHMOD'))
+	define('PRADO_CHMOD', 0777);
 
 /**
  * PradoBase class.
@@ -41,23 +41,23 @@ 
 	/**
 	 * File extension for Prado class files.
 	 */
-	const CLASS_FILE_EXT='.php';
+	const CLASS_FILE_EXT = '.php';
 	/**
 	 * @var array list of path aliases
 	 */
-	private static $_aliases=array('System'=>PRADO_DIR);
+	private static $_aliases = array('System'=>PRADO_DIR);
 	/**
 	 * @var array list of namespaces currently in use
 	 */
-	private static $_usings=array();
+	private static $_usings = array();
 	/**
 	 * @var TApplication the application instance
 	 */
-	private static $_application=null;
+	private static $_application = null;
 	/**
 	 * @var TLogger logger instance
 	 */
-	private static $_logger=null;
+	private static $_logger = null;
 
 	/**
 	 * @var array list of class exists checks
@@ -82,15 +82,15 @@ 
 		/**
 		 * Sets error handler to be Prado::phpErrorHandler
 		 */
-		set_error_handler(array('PradoBase','phpErrorHandler'));
+		set_error_handler(array('PradoBase', 'phpErrorHandler'));
 		/**
 		 * Sets shutdown function to be Prado::phpFatalErrorHandler
 		 */
-		register_shutdown_function(array('PradoBase','phpFatalErrorHandler'));
+		register_shutdown_function(array('PradoBase', 'phpFatalErrorHandler'));
 		/**
 		 * Sets exception handler to be Prado::exceptionHandler
 		 */
-		set_exception_handler(array('PradoBase','exceptionHandler'));
+		set_exception_handler(array('PradoBase', 'exceptionHandler'));
 	}
 
 	/**
@@ -100,8 +100,8 @@ 
 	 */
 	public static function autoload($className)
 	{
-		include_once($className.self::CLASS_FILE_EXT);
-		if(!class_exists($className,false) && !interface_exists($className,false))
+		include_once($className . self::CLASS_FILE_EXT);
+		if (!class_exists($className, false) && !interface_exists($className, false))
 			self::fatalError("Class file for '$className' cannot be found.");
 	}
 
@@ -109,17 +109,17 @@ 
 	 * @param integer the type of "powered logo". Valid values include 0 and 1.
 	 * @return string a string that can be displayed on your Web page showing powered-by-PRADO information
 	 */
-	public static function poweredByPrado($logoType=0)
+	public static function poweredByPrado($logoType = 0)
 	{
-		$logoName=$logoType==1?'powered2':'powered';
-		if(self::$_application!==null)
+		$logoName = $logoType == 1 ? 'powered2' : 'powered';
+		if (self::$_application !== null)
 		{
-			$am=self::$_application->getAssetManager();
-			$url=$am->publishFilePath(self::getPathOfNamespace('System.'.$logoName,'.gif'));
+			$am = self::$_application->getAssetManager();
+			$url = $am->publishFilePath(self::getPathOfNamespace('System.' . $logoName, '.gif'));
 		}
 		else
-			$url='http://pradosoft.github.io/docs/'.$logoName.'.gif';
-		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="'.$url.'" style="border-width:0px;" alt="Powered by PRADO" /></a>';
+			$url = 'http://pradosoft.github.io/docs/' . $logoName . '.gif';
+		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="' . $url . '" style="border-width:0px;" alt="Powered by PRADO" /></a>';
 	}
 
 	/**
@@ -132,10 +132,10 @@ 
 	 * @param string the filename that the error was raised in
 	 * @param integer the line number the error was raised at
 	 */
-	public static function phpErrorHandler($errno,$errstr,$errfile,$errline)
+	public static function phpErrorHandler($errno, $errstr, $errfile, $errline)
 	{
-		if(error_reporting() & $errno)
-			throw new TPhpErrorException($errno,$errstr,$errfile,$errline);
+		if (error_reporting() & $errno)
+			throw new TPhpErrorException($errno, $errstr, $errfile, $errline);
 	}
 
 	/**
@@ -147,11 +147,11 @@ 
 	public static function phpFatalErrorHandler()
 	{
 		$error = error_get_last();
-		if($error && 
+		if ($error && 
 			TPhpErrorException::isFatalError($error) &&
 			error_reporting() & $error['type'])
 		{
-			self::exceptionHandler(new TPhpErrorException($error['type'],$error['message'],$error['file'],$error['line']));
+			self::exceptionHandler(new TPhpErrorException($error['type'], $error['message'], $error['file'], $error['line']));
 		}
 	}
 
@@ -166,9 +166,9 @@ 
 	 */
 	public static function exceptionHandler($exception)
 	{
-		if(self::$_application!==null && ($errorHandler=self::$_application->getErrorHandler())!==null)
+		if (self::$_application !== null && ($errorHandler = self::$_application->getErrorHandler()) !== null)
 		{
-			$errorHandler->handleError(null,$exception);
+			$errorHandler->handleError(null, $exception);
 		}
 		else
 		{
@@ -188,9 +188,9 @@ 
 	 */
 	public static function setApplication($application)
 	{
-		if(self::$_application!==null && !defined('PRADO_TEST_RUN'))
+		if (self::$_application !== null && !defined('PRADO_TEST_RUN'))
 			throw new TInvalidOperationException('prado_application_singleton_required');
-		self::$_application=$application;
+		self::$_application = $application;
 	}
 
 	/**
@@ -224,21 +224,21 @@ 
 	 */
 	public static function createComponent($type)
 	{
-		if(!isset(self::$classExists[$type]))
+		if (!isset(self::$classExists[$type]))
 			self::$classExists[$type] = class_exists($type, false);
 
-		if( !isset(self::$_usings[$type]) && !self::$classExists[$type]) {
+		if (!isset(self::$_usings[$type]) && !self::$classExists[$type]) {
 			self::using($type);
 			self::$classExists[$type] = class_exists($type, false);
 		}
 
-		if( ($pos = strrpos($type, '.')) !== false)
-			$type = substr($type,$pos+1);
+		if (($pos = strrpos($type, '.')) !== false)
+			$type = substr($type, $pos + 1);
 
-		if(($n=func_num_args())>1)
+		if (($n = func_num_args()) > 1)
 		{
 			$args = func_get_args();
-			switch($n) {
+			switch ($n) {
 				case 2:
 					return new $type($args[1]);
 				break;
@@ -252,9 +252,9 @@ 
 					return new $type($args[1], $args[2], $args[3], $args[4]);
 				break;
 				default:
-					$s='$args[1]';
-					for($i=2;$i<$n;++$i)
-						$s.=",\$args[$i]";
+					$s = '$args[1]';
+					for ($i = 2; $i < $n; ++$i)
+						$s .= ",\$args[$i]";
 					eval("\$component=new $type($s);");
 					return $component;
 				break;
@@ -273,45 +273,45 @@ 
 	 * @param boolean whether to check the existence of the class after the class file is included
 	 * @throws TInvalidDataValueException if the namespace is invalid
 	 */
-	public static function using($namespace,$checkClassExistence=true)
+	public static function using($namespace, $checkClassExistence = true)
 	{
-		if(isset(self::$_usings[$namespace]) || class_exists($namespace,false))
+		if (isset(self::$_usings[$namespace]) || class_exists($namespace, false))
 			return;
-		if(($pos=strrpos($namespace,'.'))===false)  // a class name
+		if (($pos = strrpos($namespace, '.')) === false)  // a class name
 		{
 			try
 			{
-				include_once($namespace.self::CLASS_FILE_EXT);
+				include_once($namespace . self::CLASS_FILE_EXT);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
-				if($checkClassExistence && !class_exists($namespace,false))
-					throw new TInvalidOperationException('prado_component_unknown',$namespace,$e->getMessage());
+				if ($checkClassExistence && !class_exists($namespace, false))
+					throw new TInvalidOperationException('prado_component_unknown', $namespace, $e->getMessage());
 				else
 					throw $e;
 			}
 		}
-		else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
+		else if (($path = self::getPathOfNamespace($namespace, self::CLASS_FILE_EXT)) !== null)
 		{
-			$className=substr($namespace,$pos+1);
-			if($className==='*')  // a directory
+			$className = substr($namespace, $pos + 1);
+			if ($className === '*')  // a directory
 			{
-				self::$_usings[$namespace]=$path;
-				set_include_path(get_include_path().PATH_SEPARATOR.$path);
+				self::$_usings[$namespace] = $path;
+				set_include_path(get_include_path() . PATH_SEPARATOR . $path);
 			}
 			else  // a file
 			{
-				self::$_usings[$namespace]=$path;
-				if(!$checkClassExistence || !class_exists($className,false))
+				self::$_usings[$namespace] = $path;
+				if (!$checkClassExistence || !class_exists($className, false))
 				{
 					try
 					{
 						include_once($path);
 					}
-					catch(Exception $e)
+					catch (Exception $e)
 					{
-						if($checkClassExistence && !class_exists($className,false))
-							throw new TInvalidOperationException('prado_component_unknown',$className,$e->getMessage());
+						if ($checkClassExistence && !class_exists($className, false))
+							throw new TInvalidOperationException('prado_component_unknown', $className, $e->getMessage());
 						else
 							throw $e;
 					}
@@ -319,7 +319,7 @@ 
 			}
 		}
 		else
-			throw new TInvalidDataValueException('prado_using_invalid',$namespace);
+			throw new TInvalidDataValueException('prado_using_invalid', $namespace);
 	}
 
 	/**
@@ -334,22 +334,22 @@ 
 	 * @param string extension to be appended if the namespace refers to a file
 	 * @return string file path corresponding to the namespace, null if namespace is invalid
 	 */
-	public static function getPathOfNamespace($namespace, $ext='')
+	public static function getPathOfNamespace($namespace, $ext = '')
 	{
-		if(self::CLASS_FILE_EXT === $ext || empty($ext))
+		if (self::CLASS_FILE_EXT === $ext || empty($ext))
 		{
-			if(isset(self::$_usings[$namespace]))
+			if (isset(self::$_usings[$namespace]))
 				return self::$_usings[$namespace];
 
-			if(isset(self::$_aliases[$namespace]))
+			if (isset(self::$_aliases[$namespace]))
 				return self::$_aliases[$namespace];
 		}
 
-		$segs = explode('.',$namespace);
+		$segs = explode('.', $namespace);
 		$alias = array_shift($segs);
 
-		if(null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias)))
-			return rtrim($root.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR ,$segs),'/\\').(($file === '*') ? '' : DIRECTORY_SEPARATOR.$file.$ext);
+		if (null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias)))
+			return rtrim($root . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $segs), '/\\') . (($file === '*') ? '' : DIRECTORY_SEPARATOR . $file . $ext);
 
 		return null;
 	}
@@ -360,7 +360,7 @@ 
 	 */
 	public static function getPathOfAlias($alias)
 	{
-		return isset(self::$_aliases[$alias])?self::$_aliases[$alias]:null;
+		return isset(self::$_aliases[$alias]) ? self::$_aliases[$alias] : null;
 	}
 
 	protected static function getPathAliases()
@@ -374,19 +374,19 @@ 
 	 * @throws TInvalidOperationException if the alias is already defined
 	 * @throws TInvalidDataValueException if the path is not a valid file path
 	 */
-	public static function setPathOfAlias($alias,$path)
+	public static function setPathOfAlias($alias, $path)
 	{
-		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
-			throw new TInvalidOperationException('prado_alias_redefined',$alias);
-		else if(($rp=realpath($path))!==false && is_dir($rp))
+		if (isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
+			throw new TInvalidOperationException('prado_alias_redefined', $alias);
+		else if (($rp = realpath($path)) !== false && is_dir($rp))
 		{
-			if(strpos($alias,'.')===false)
-				self::$_aliases[$alias]=$rp;
+			if (strpos($alias, '.') === false)
+				self::$_aliases[$alias] = $rp;
 			else
-				throw new TInvalidDataValueException('prado_aliasname_invalid',$alias);
+				throw new TInvalidDataValueException('prado_aliasname_invalid', $alias);
 		}
 		else
-			throw new TInvalidDataValueException('prado_alias_invalid',$alias,$path);
+			throw new TInvalidDataValueException('prado_alias_invalid', $alias, $path);
 	}
 
 	/**
@@ -398,36 +398,36 @@ 
 	public static function fatalError($msg)
 	{
 		echo '<h1>Fatal Error</h1>';
-		echo '<p>'.$msg.'</p>';
-		if(!function_exists('debug_backtrace'))
+		echo '<p>' . $msg . '</p>';
+		if (!function_exists('debug_backtrace'))
 			return;
 		echo '<h2>Debug Backtrace</h2>';
 		echo '<pre>';
-		$index=-1;
-		foreach(debug_backtrace() as $t)
+		$index = -1;
+		foreach (debug_backtrace() as $t)
 		{
 			$index++;
-			if($index==0)  // hide the backtrace of this function
+			if ($index == 0)  // hide the backtrace of this function
 				continue;
-			echo '#'.$index.' ';
-			if(isset($t['file']))
+			echo '#' . $index . ' ';
+			if (isset($t['file']))
 				echo basename($t['file']) . ':' . $t['line'];
 			else
 				 echo '<PHP inner-code>';
 			echo ' -- ';
-			if(isset($t['class']))
+			if (isset($t['class']))
 				echo $t['class'] . $t['type'];
 			echo $t['function'] . '(';
-			if(isset($t['args']) && sizeof($t['args']) > 0)
+			if (isset($t['args']) && sizeof($t['args']) > 0)
 			{
-				$count=0;
-				foreach($t['args'] as $item)
+				$count = 0;
+				foreach ($t['args'] as $item)
 				{
-					if(is_string($item))
+					if (is_string($item))
 					{
-						$str=htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
+						$str = htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
 						if (strlen($item) > 70)
-							echo "'". substr($str, 0, 70) . "...'";
+							echo "'" . substr($str, 0, 70) . "...'";
 						else
 							echo "'" . $str . "'";
 					}
@@ -463,23 +463,23 @@ 
 	 */
 	public static function getUserLanguages()
 	{
-		static $languages=null;
-		if($languages===null)
+		static $languages = null;
+		if ($languages === null)
 		{
-			if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
-				$languages[0]='en';
+			if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
+				$languages[0] = 'en';
 			else
 			{
-				$languages=array();
-				foreach(explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
+				$languages = array();
+				foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
 				{
-					$array=explode(';q=',trim($language));
-					$languages[trim($array[0])]=isset($array[1])?(float)$array[1]:1.0;
+					$array = explode(';q=', trim($language));
+					$languages[trim($array[0])] = isset($array[1]) ? (float) $array[1] : 1.0;
 				}
 				arsort($languages);
-				$languages=array_keys($languages);
-				if(empty($languages))
-					$languages[0]='en';
+				$languages = array_keys($languages);
+				if (empty($languages))
+					$languages[0] = 'en';
 			}
 		}
 		return $languages;
@@ -491,15 +491,15 @@ 
 	 */
 	public static function getPreferredLanguage()
 	{
-		static $language=null;
-		if($language===null)
+		static $language = null;
+		if ($language === null)
 		{
-			$langs=Prado::getUserLanguages();
-			$lang=explode('-',$langs[0]);
-			if(empty($lang[0]) || !ctype_alpha($lang[0]))
-				$language='en';
+			$langs = Prado::getUserLanguages();
+			$lang = explode('-', $langs[0]);
+			if (empty($lang[0]) || !ctype_alpha($lang[0]))
+				$language = 'en';
 			else
-				$language=$lang[0];
+				$language = $lang[0];
 		}
 		return $language;
 	}
@@ -516,20 +516,20 @@ 
 	 * @param (string|TControl) control of the message
 	 * @see log, getLogger
 	 */
-	public static function trace($msg,$category='Uncategorized',$ctl=null)
+	public static function trace($msg, $category = 'Uncategorized', $ctl = null)
 	{
-		if(self::$_application && self::$_application->getMode()===TApplicationMode::Performance)
+		if (self::$_application && self::$_application->getMode() === TApplicationMode::Performance)
 			return;
-		if(!self::$_application || self::$_application->getMode()===TApplicationMode::Debug)
+		if (!self::$_application || self::$_application->getMode() === TApplicationMode::Debug)
 		{
-			$trace=debug_backtrace();
-			if(isset($trace[0]['file']) && isset($trace[0]['line']))
-				$msg.=" (line {$trace[0]['line']}, {$trace[0]['file']})";
-			$level=TLogger::DEBUG;
+			$trace = debug_backtrace();
+			if (isset($trace[0]['file']) && isset($trace[0]['line']))
+				$msg .= " (line {$trace[0]['line']}, {$trace[0]['file']})";
+			$level = TLogger::DEBUG;
 		}
 		else
-			$level=TLogger::INFO;
-		self::log($msg,$level,$category,$ctl);
+			$level = TLogger::INFO;
+		self::log($msg, $level, $category, $ctl);
 	}
 
 	/**
@@ -544,11 +544,11 @@ 
 	 * @param string category of the message
 	 * @param (string|TControl) control of the message
 	 */
-	public static function log($msg,$level=TLogger::INFO,$category='Uncategorized',$ctl=null)
+	public static function log($msg, $level = TLogger::INFO, $category = 'Uncategorized', $ctl = null)
 	{
-		if(self::$_logger===null)
-			self::$_logger=new TLogger;
-		self::$_logger->log($msg,$level,$category,$ctl);
+		if (self::$_logger === null)
+			self::$_logger = new TLogger;
+		self::$_logger->log($msg, $level, $category, $ctl);
 	}
 
 	/**
@@ -556,8 +556,8 @@ 
 	 */
 	public static function getLogger()
 	{
-		if(self::$_logger===null)
-			self::$_logger=new TLogger;
+		if (self::$_logger === null)
+			self::$_logger = new TLogger;
 		return self::$_logger;
 	}
 
@@ -570,10 +570,10 @@ 
 	 * @param boolean whether to syntax highlight the output. Defaults to false.
 	 * @return string the string representation of the variable
 	 */
-	public static function varDump($var,$depth=10,$highlight=false)
+	public static function varDump($var, $depth = 10, $highlight = false)
 	{
 		Prado::using('System.Util.TVarDumper');
-		return TVarDumper::dump($var,$depth,$highlight);
+		return TVarDumper::dump($var, $depth, $highlight);
 	}
 
 	/**
@@ -586,35 +586,35 @@ 
 	 * @see TTranslate::formatter()
 	 * @see TTranslate::init()
 	 */
-	public static function localize($text, $parameters=array(), $catalogue=null, $charset=null)
+	public static function localize($text, $parameters = array(), $catalogue = null, $charset = null)
 	{
 		Prado::using('System.I18N.Translation');
 		$app = Prado::getApplication()->getGlobalization(false);
 
 		$params = array();
-		foreach($parameters as $key => $value)
-			$params['{'.$key.'}'] = $value;
+		foreach ($parameters as $key => $value)
+			$params['{' . $key . '}'] = $value;
 
 		//no translation handler provided
-		if($app===null || ($config = $app->getTranslationConfiguration())===null)
+		if ($app === null || ($config = $app->getTranslationConfiguration()) === null)
 			return strtr($text, $params);
 
-		if ($catalogue===null)
-			$catalogue=isset($config['catalogue'])?$config['catalogue']:'messages';
+		if ($catalogue === null)
+			$catalogue = isset($config['catalogue']) ? $config['catalogue'] : 'messages';
 
 		Translation::init($catalogue);
 
 		//globalization charset
-		$appCharset = $app===null ? '' : $app->getCharset();
+		$appCharset = $app === null ? '' : $app->getCharset();
 
 		//default charset
-		$defaultCharset = ($app===null) ? 'UTF-8' : $app->getDefaultCharset();
+		$defaultCharset = ($app === null) ? 'UTF-8' : $app->getDefaultCharset();
 
 		//fall back
-		if(empty($charset)) $charset = $appCharset;
-		if(empty($charset)) $charset = $defaultCharset;
+		if (empty($charset)) $charset = $appCharset;
+		if (empty($charset)) $charset = $defaultCharset;
 
-		return Translation::formatter($catalogue)->format($text,$params,$catalogue,$charset);
+		return Translation::formatter($catalogue)->format($text, $params, $catalogue, $charset);
 	}
 }
 

Braces +145 added lines, -111 removed lines

@@ -15,13 +15,15 @@ 
 /**
  * Defines the PRADO framework installation path.
  */
-if(!defined('PRADO_DIR'))
+if(!defined('PRADO_DIR')) {
 	define('PRADO_DIR',dirname(__FILE__));
+}
 /**
  * Defines the default permission for writable directories and files
  */
-if(!defined('PRADO_CHMOD'))
+if(!defined('PRADO_CHMOD')) {
 	define('PRADO_CHMOD',0777);
+}
 
 /**
  * PradoBase class.
@@ -101,8 +103,9 @@ 
 	public static function autoload($className)
 	{
 		include_once($className.self::CLASS_FILE_EXT);
-		if(!class_exists($className,false) && !interface_exists($className,false))
-			self::fatalError("Class file for '$className' cannot be found.");
+		if(!class_exists($className,false) && !interface_exists($className,false)) {
+					self::fatalError("Class file for '$className' cannot be found.");
+		}
 	}
 
 	/**
@@ -116,9 +119,9 @@ 
 		{
 			$am=self::$_application->getAssetManager();
 			$url=$am->publishFilePath(self::getPathOfNamespace('System.'.$logoName,'.gif'));
+		} else {
+					$url='http://pradosoft.github.io/docs/'.$logoName.'.gif';
 		}
-		else
-			$url='http://pradosoft.github.io/docs/'.$logoName.'.gif';
 		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="'.$url.'" style="border-width:0px;" alt="Powered by PRADO" /></a>';
 	}
 
@@ -134,8 +137,9 @@ 
 	 */
 	public static function phpErrorHandler($errno,$errstr,$errfile,$errline)
 	{
-		if(error_reporting() & $errno)
-			throw new TPhpErrorException($errno,$errstr,$errfile,$errline);
+		if(error_reporting() & $errno) {
+					throw new TPhpErrorException($errno,$errstr,$errfile,$errline);
+		}
 	}
 
 	/**
@@ -169,8 +173,7 @@ 
 		if(self::$_application!==null && ($errorHandler=self::$_application->getErrorHandler())!==null)
 		{
 			$errorHandler->handleError(null,$exception);
-		}
-		else
+		} else
 		{
 			echo $exception;
 		}
@@ -188,8 +191,9 @@ 
 	 */
 	public static function setApplication($application)
 	{
-		if(self::$_application!==null && !defined('PRADO_TEST_RUN'))
-			throw new TInvalidOperationException('prado_application_singleton_required');
+		if(self::$_application!==null && !defined('PRADO_TEST_RUN')) {
+					throw new TInvalidOperationException('prado_application_singleton_required');
+		}
 		self::$_application=$application;
 	}
 
@@ -224,16 +228,18 @@ 
 	 */
 	public static function createComponent($type)
 	{
-		if(!isset(self::$classExists[$type]))
-			self::$classExists[$type] = class_exists($type, false);
+		if(!isset(self::$classExists[$type])) {
+					self::$classExists[$type] = class_exists($type, false);
+		}
 
 		if( !isset(self::$_usings[$type]) && !self::$classExists[$type]) {
 			self::using($type);
 			self::$classExists[$type] = class_exists($type, false);
 		}
 
-		if( ($pos = strrpos($type, '.')) !== false)
-			$type = substr($type,$pos+1);
+		if( ($pos = strrpos($type, '.')) !== false) {
+					$type = substr($type,$pos+1);
+		}
 
 		if(($n=func_num_args())>1)
 		{
@@ -253,15 +259,16 @@ 
 				break;
 				default:
 					$s='$args[1]';
-					for($i=2;$i<$n;++$i)
-						$s.=",\$args[$i]";
+					for($i=2;$i<$n;++$i) {
+											$s.=",\$args[$i]";
+					}
 					eval("\$component=new $type($s);");
 					return $component;
 				break;
 			}
+		} else {
+					return new $type;
 		}
-		else
-			return new $type;
 	}
 
 	/**
@@ -275,31 +282,34 @@ 
 	 */
 	public static function using($namespace,$checkClassExistence=true)
 	{
-		if(isset(self::$_usings[$namespace]) || class_exists($namespace,false))
-			return;
-		if(($pos=strrpos($namespace,'.'))===false)  // a class name
+		if(isset(self::$_usings[$namespace]) || class_exists($namespace,false)) {
+					return;
+		}
+		if(($pos=strrpos($namespace,'.'))===false) {
+			// a class name
 		{
 			try
 			{
 				include_once($namespace.self::CLASS_FILE_EXT);
-			}
-			catch(Exception $e)
+		}
+			} catch(Exception $e)
 			{
-				if($checkClassExistence && !class_exists($namespace,false))
-					throw new TInvalidOperationException('prado_component_unknown',$namespace,$e->getMessage());
-				else
-					throw $e;
+				if($checkClassExistence && !class_exists($namespace,false)) {
+									throw new TInvalidOperationException('prado_component_unknown',$namespace,$e->getMessage());
+				} else {
+									throw $e;
+				}
 			}
-		}
-		else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
+		} else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
 		{
 			$className=substr($namespace,$pos+1);
-			if($className==='*')  // a directory
+			if($className==='*') {
+				// a directory
 			{
 				self::$_usings[$namespace]=$path;
-				set_include_path(get_include_path().PATH_SEPARATOR.$path);
 			}
-			else  // a file
+				set_include_path(get_include_path().PATH_SEPARATOR.$path);
+			} else  // a file
 			{
 				self::$_usings[$namespace]=$path;
 				if(!$checkClassExistence || !class_exists($className,false))
@@ -307,19 +317,19 @@ 
 					try
 					{
 						include_once($path);
-					}
-					catch(Exception $e)
+					} catch(Exception $e)
 					{
-						if($checkClassExistence && !class_exists($className,false))
-							throw new TInvalidOperationException('prado_component_unknown',$className,$e->getMessage());
-						else
-							throw $e;
+						if($checkClassExistence && !class_exists($className,false)) {
+													throw new TInvalidOperationException('prado_component_unknown',$className,$e->getMessage());
+						} else {
+													throw $e;
+						}
 					}
 				}
 			}
+		} else {
+					throw new TInvalidDataValueException('prado_using_invalid',$namespace);
 		}
-		else
-			throw new TInvalidDataValueException('prado_using_invalid',$namespace);
 	}
 
 	/**
@@ -338,18 +348,21 @@ 
 	{
 		if(self::CLASS_FILE_EXT === $ext || empty($ext))
 		{
-			if(isset(self::$_usings[$namespace]))
-				return self::$_usings[$namespace];
+			if(isset(self::$_usings[$namespace])) {
+							return self::$_usings[$namespace];
+			}
 
-			if(isset(self::$_aliases[$namespace]))
-				return self::$_aliases[$namespace];
+			if(isset(self::$_aliases[$namespace])) {
+							return self::$_aliases[$namespace];
+			}
 		}
 
 		$segs = explode('.',$namespace);
 		$alias = array_shift($segs);
 
-		if(null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias)))
-			return rtrim($root.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR ,$segs),'/\\').(($file === '*') ? '' : DIRECTORY_SEPARATOR.$file.$ext);
+		if(null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias))) {
+					return rtrim($root.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR ,$segs),'/\\').(($file === '*') ? '' : DIRECTORY_SEPARATOR.$file.$ext);
+		}
 
 		return null;
 	}
@@ -376,17 +389,18 @@ 
 	 */
 	public static function setPathOfAlias($alias,$path)
 	{
-		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
-			throw new TInvalidOperationException('prado_alias_redefined',$alias);
-		else if(($rp=realpath($path))!==false && is_dir($rp))
+		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN')) {
+					throw new TInvalidOperationException('prado_alias_redefined',$alias);
+		} else if(($rp=realpath($path))!==false && is_dir($rp))
 		{
-			if(strpos($alias,'.')===false)
-				self::$_aliases[$alias]=$rp;
-			else
-				throw new TInvalidDataValueException('prado_aliasname_invalid',$alias);
+			if(strpos($alias,'.')===false) {
+							self::$_aliases[$alias]=$rp;
+			} else {
+							throw new TInvalidDataValueException('prado_aliasname_invalid',$alias);
+			}
+		} else {
+					throw new TInvalidDataValueException('prado_alias_invalid',$alias,$path);
 		}
-		else
-			throw new TInvalidDataValueException('prado_alias_invalid',$alias,$path);
 	}
 
 	/**
@@ -399,24 +413,29 @@ 
 	{
 		echo '<h1>Fatal Error</h1>';
 		echo '<p>'.$msg.'</p>';
-		if(!function_exists('debug_backtrace'))
-			return;
+		if(!function_exists('debug_backtrace')) {
+					return;
+		}
 		echo '<h2>Debug Backtrace</h2>';
 		echo '<pre>';
 		$index=-1;
 		foreach(debug_backtrace() as $t)
 		{
 			$index++;
-			if($index==0)  // hide the backtrace of this function
+			if($index==0) {
+				// hide the backtrace of this function
 				continue;
+			}
 			echo '#'.$index.' ';
-			if(isset($t['file']))
-				echo basename($t['file']) . ':' . $t['line'];
-			else
-				 echo '<PHP inner-code>';
+			if(isset($t['file'])) {
+							echo basename($t['file']) . ':' . $t['line'];
+			} else {
+							 echo '<PHP inner-code>';
+			}
 			echo ' -- ';
-			if(isset($t['class']))
-				echo $t['class'] . $t['type'];
+			if(isset($t['class'])) {
+							echo $t['class'] . $t['type'];
+			}
 			echo $t['function'] . '(';
 			if(isset($t['args']) && sizeof($t['args']) > 0)
 			{
@@ -426,26 +445,28 @@ 
 					if(is_string($item))
 					{
 						$str=htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
-						if (strlen($item) > 70)
-							echo "'". substr($str, 0, 70) . "...'";
-						else
-							echo "'" . $str . "'";
+						if (strlen($item) > 70) {
+													echo "'". substr($str, 0, 70) . "...'";
+						} else {
+													echo "'" . $str . "'";
+						}
+					} else if (is_int($item) || is_float($item)) {
+											echo $item;
+					} else if (is_object($item)) {
+											echo get_class($item);
+					} else if (is_array($item)) {
+											echo 'array(' . count($item) . ')';
+					} else if (is_bool($item)) {
+											echo $item ? 'true' : 'false';
+					} else if ($item === null) {
+											echo 'NULL';
+					} else if (is_resource($item)) {
+											echo get_resource_type($item);
 					}
-					else if (is_int($item) || is_float($item))
-						echo $item;
-					else if (is_object($item))
-						echo get_class($item);
-					else if (is_array($item))
-						echo 'array(' . count($item) . ')';
-					else if (is_bool($item))
-						echo $item ? 'true' : 'false';
-					else if ($item === null)
-						echo 'NULL';
-					else if (is_resource($item))
-						echo get_resource_type($item);
 					$count++;
-					if (count($t['args']) > $count)
-						echo ', ';
+					if (count($t['args']) > $count) {
+											echo ', ';
+					}
 				}
 			}
 			echo ")\n";
@@ -466,9 +487,9 @@ 
 		static $languages=null;
 		if($languages===null)
 		{
-			if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
-				$languages[0]='en';
-			else
+			if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+							$languages[0]='en';
+			} else
 			{
 				$languages=array();
 				foreach(explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
@@ -478,8 +499,9 @@ 
 				}
 				arsort($languages);
 				$languages=array_keys($languages);
-				if(empty($languages))
-					$languages[0]='en';
+				if(empty($languages)) {
+									$languages[0]='en';
+				}
 			}
 		}
 		return $languages;
@@ -496,10 +518,11 @@ 
 		{
 			$langs=Prado::getUserLanguages();
 			$lang=explode('-',$langs[0]);
-			if(empty($lang[0]) || !ctype_alpha($lang[0]))
-				$language='en';
-			else
-				$language=$lang[0];
+			if(empty($lang[0]) || !ctype_alpha($lang[0])) {
+							$language='en';
+			} else {
+							$language=$lang[0];
+			}
 		}
 		return $language;
 	}
@@ -518,17 +541,19 @@ 
 	 */
 	public static function trace($msg,$category='Uncategorized',$ctl=null)
 	{
-		if(self::$_application && self::$_application->getMode()===TApplicationMode::Performance)
-			return;
+		if(self::$_application && self::$_application->getMode()===TApplicationMode::Performance) {
+					return;
+		}
 		if(!self::$_application || self::$_application->getMode()===TApplicationMode::Debug)
 		{
 			$trace=debug_backtrace();
-			if(isset($trace[0]['file']) && isset($trace[0]['line']))
-				$msg.=" (line {$trace[0]['line']}, {$trace[0]['file']})";
+			if(isset($trace[0]['file']) && isset($trace[0]['line'])) {
+							$msg.=" (line {$trace[0]['line']}, {$trace[0]['file']})";
+			}
 			$level=TLogger::DEBUG;
+		} else {
+					$level=TLogger::INFO;
 		}
-		else
-			$level=TLogger::INFO;
 		self::log($msg,$level,$category,$ctl);
 	}
 
@@ -546,8 +571,9 @@ 
 	 */
 	public static function log($msg,$level=TLogger::INFO,$category='Uncategorized',$ctl=null)
 	{
-		if(self::$_logger===null)
-			self::$_logger=new TLogger;
+		if(self::$_logger===null) {
+					self::$_logger=new TLogger;
+		}
 		self::$_logger->log($msg,$level,$category,$ctl);
 	}
 
@@ -556,8 +582,9 @@ 
 	 */
 	public static function getLogger()
 	{
-		if(self::$_logger===null)
-			self::$_logger=new TLogger;
+		if(self::$_logger===null) {
+					self::$_logger=new TLogger;
+		}
 		return self::$_logger;
 	}
 
@@ -592,15 +619,18 @@ 
 		$app = Prado::getApplication()->getGlobalization(false);
 
 		$params = array();
-		foreach($parameters as $key => $value)
-			$params['{'.$key.'}'] = $value;
+		foreach($parameters as $key => $value) {
+					$params['{'.$key.'}'] = $value;
+		}
 
 		//no translation handler provided
-		if($app===null || ($config = $app->getTranslationConfiguration())===null)
-			return strtr($text, $params);
+		if($app===null || ($config = $app->getTranslationConfiguration())===null) {
+					return strtr($text, $params);
+		}
 
-		if ($catalogue===null)
-			$catalogue=isset($config['catalogue'])?$config['catalogue']:'messages';
+		if ($catalogue===null) {
+					$catalogue=isset($config['catalogue'])?$config['catalogue']:'messages';
+		}
 
 		Translation::init($catalogue);
 
@@ -611,8 +641,12 @@ 
 		$defaultCharset = ($app===null) ? 'UTF-8' : $app->getDefaultCharset();
 
 		//fall back
-		if(empty($charset)) $charset = $appCharset;
-		if(empty($charset)) $charset = $defaultCharset;
+		if(empty($charset)) {
+			$charset = $appCharset;
+		}
+		if(empty($charset)) {
+			$charset = $defaultCharset;
+		}
 
 		return Translation::formatter($catalogue)->format($text,$params,$catalogue,$charset);
 	}

framework/pradolite.php

Doc Comments +857 added lines

@@ -67,6 +67,10 @@ 
 		}
 		exit(1);
 	}
+
+	/**
+	 * @param TApplication $application
+	 */
 	public static function setApplication($application)
 	{
 		if(self::$_application!==null && !defined('PRADO_TEST_RUN'))
@@ -360,14 +364,26 @@ 
 interface IModule
 {
 	public function init($config);
+
+	/**
+	 * @return string
+	 */
 	public function getID();
 	public function setID($id);
 }
 interface IService
 {
 	public function init($config);
+
+	/**
+	 * @return string
+	 */
 	public function getID();
 	public function setID($id);
+
+	/**
+	 * @return boolean
+	 */
 	public function getEnabled();
 	public function setEnabled($value);
 	public function run();
@@ -379,14 +395,37 @@ 
 }
 interface IUser
 {
+	/**
+	 * @return string
+	 */
 	public function getName();
 	public function setName($value);
+
+	/**
+	 * @return boolean
+	 */
 	public function getIsGuest();
+
+	/**
+	 * @param boolean $value
+	 */
 	public function setIsGuest($value);
 	public function getRoles();
 	public function setRoles($value);
+
+	/**
+	 * @return boolean
+	 */
 	public function isInRole($role);
+
+	/**
+	 * @return string
+	 */
 	public function saveToString();
+
+	/**
+	 * @return BlogUser
+	 */
 	public function loadFromString($string);
 }
 interface IStatePersister
@@ -398,6 +437,12 @@ 
 {
 	public function get($id);
 	public function set($id,$value,$expire=0,$dependency=null);
+
+	/**
+	 * @param string $id
+	 *
+	 * @return boolean
+	 */
 	public function add($id,$value,$expire=0,$dependency=null);
 	public function delete($id);
 	public function flush();
@@ -416,12 +461,22 @@ 
 }
 interface IStyleable
 {
+	/**
+	 * @return boolean
+	 */
 	public function getHasStyle();
+
+	/**
+	 * @return TStyle
+	 */
 	public function getStyle();
 	public function clearStyle();
 }
 interface IActiveControl
 {
+	/**
+	 * @return TBaseActiveControl
+	 */
 	public function getActiveControl();
 }
 interface ICallbackEventHandler
@@ -431,6 +486,10 @@ 
 interface IDataRenderer
 {
 	public function getData();
+
+	/**
+	 * @param TActiveRecord $value
+	 */
 	public function setData($value);
 }
 class TApplicationComponent extends TComponent
@@ -459,6 +518,11 @@ 
 	{
 		return Prado::getApplication()->getUser();
 	}
+
+	/**
+	 * @param string $assetPath
+	 * @param string $className
+	 */
 	public function publishAsset($assetPath,$className=null)
 	{
 		if($className===null)
@@ -467,6 +531,10 @@ 
 		$fullPath=dirname($class->getFileName()).DIRECTORY_SEPARATOR.$assetPath;
 		return $this->publishFilePath($fullPath);
 	}
+
+	/**
+	 * @param string $fullPath
+	 */
 	public function publishFilePath($fullPath, $checkTimestamp=false)
 	{
 		return Prado::getApplication()->getAssetManager()->publishFilePath($fullPath, $checkTimestamp);
@@ -498,6 +566,10 @@ 
 	{
 		return $this->_id;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setID($value)
 	{
 		$this->_id=$value;
@@ -537,6 +609,10 @@ 
 		else
 			throw new TConfigurationException('errorhandler_errortemplatepath_invalid',$value);
 	}
+
+	/**
+	 * @param null|TApplication $sender
+	 */
 	public function handleError($sender,$param)
 	{
 		static $handling=false;
@@ -559,6 +635,10 @@ 
 				$this->handleExternalError(500,$param);
 		}
 	}
+
+	/**
+	 * @return string
+	 */
 	protected static function hideSecurityRelated($value, $exception=null)
 	{
 		$aRpl = array();
@@ -706,6 +786,10 @@ 
 			return null;
 		return $result;
 	}
+
+	/**
+	 * @param string $pattern
+	 */
 	private function getPropertyAccessTrace($trace,$pattern)
 	{
 		$result=null;
@@ -735,6 +819,10 @@ 
 		}
 		return $source;
 	}
+
+	/**
+	 * @param string $message
+	 */
 	private function addLink($message)
 	{
 		$baseUrl='http://pradosoft.github.io/docs/manual/class-';
@@ -756,6 +844,10 @@ 
 	{
 		return $this->_r;
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	protected function setReadOnly($value)
 	{
 		$this->_r=TPropertyValue::ensureBoolean($value);
@@ -912,6 +1004,11 @@ 
 	{
 		return $this->itemAt($offset);
 	}
+
+	/**
+	 * @param null|integer $offset
+	 * @param integer $item
+	 */
 	public function offsetSet($offset,$item)
 	{
 		if($offset===null || $offset===$this->_c)
@@ -922,6 +1019,10 @@ 
 			$this->insertAt($offset,$item);
 		}
 	}
+
+	/**
+	 * @param integer $offset
+	 */
 	public function offsetUnset($offset)
 	{
 		$this->removeAt($offset);
@@ -987,6 +1088,10 @@ 
 	{
 		return $this->_prefix;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setKeyPrefix($value)
 	{
 		$this->_prefix=$value;
@@ -1016,6 +1121,11 @@ 
 			return $this->setValue($this->generateUniqueKey($id),$data,$expire);
 		}
 	}
+
+	/**
+	 * @param string $id
+	 * @param string $value
+	 */
 	public function add($id,$value,$expire=0,$dependency=null)
 	{
 		if(empty($value) && $expire === 0)
@@ -1031,9 +1141,27 @@ 
 	{
 		throw new TNotSupportedException('cache_flush_unsupported');
 	}
+
+	/**
+	 * @param string $key
+	 */
 	abstract protected function getValue($key);
+
+	/**
+	 * @param string $key
+	 * @param integer $expire
+	 */
 	abstract protected function setValue($key,$value,$expire);
+
+	/**
+	 * @param string $key
+	 * @param integer $expire
+	 */
 	abstract protected function addValue($key,$value,$expire);
+
+	/**
+	 * @param string $key
+	 */
 	abstract protected function deleteValue($key);
 	public function offsetExists($id)
 	{
@@ -1087,6 +1215,10 @@ 
 	private $_recursiveLevel=-1;
 	private $_timestamps;
 	private $_directory;
+
+	/**
+	 * @param string $directory
+	 */
 	public function __construct($directory)
 	{
 		$this->setDirectory($directory);
@@ -1106,6 +1238,10 @@ 
 	{
 		return $this->_recursiveCheck;
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	public function setRecursiveCheck($value)
 	{
 		$this->_recursiveCheck=TPropertyValue::ensureBoolean($value);
@@ -1114,6 +1250,10 @@ 
 	{
 		return $this->_recursiveLevel;
 	}
+
+	/**
+	 * @param integer $value
+	 */
 	public function setRecursiveLevel($value)
 	{
 		$this->_recursiveLevel=TPropertyValue::ensureInteger($value);
@@ -1122,14 +1262,26 @@ 
 	{
 		return $this->generateTimestamps($this->_directory)!=$this->_timestamps;
 	}
+
+	/**
+	 * @param string $fileName
+	 */
 	protected function validateFile($fileName)
 	{
 		return true;
 	}
+
+	/**
+	 * @param string $directory
+	 */
 	protected function validateDirectory($directory)
 	{
 		return true;
 	}
+
+	/**
+	 * @param string $directory
+	 */
 	protected function generateTimestamps($directory,$level=0)
 	{
 		if(($dir=opendir($directory))===false)
@@ -1220,6 +1372,10 @@ 
 		$this->_str='';
 		return $str;
 	}
+
+	/**
+	 * @param string $str
+	 */
 	public function write($str)
 	{
 		$this->_str.=$str;
@@ -1254,6 +1410,10 @@ 
 	{
 		return $this->_c;
 	}
+
+	/**
+	 * @param integer $priority
+	 */
 	public function getPriorityCount($priority=null)
 	{
 		if($priority===null)
@@ -1267,6 +1427,10 @@ 
 	{
 		return $this->_dp;
 	}
+
+	/**
+	 * @param integer $value
+	 */
 	protected function setDefaultPriority($value)
 	{
 		$this->_dp=(string)round(TPropertyValue::ensureFloat($value),$this->_p);
@@ -1275,6 +1439,10 @@ 
 	{
 		return $this->_p;
 	}
+
+	/**
+	 * @param integer $value
+	 */
 	protected function setPrecision($value)
 	{
 		$this->_p=TPropertyValue::ensureInteger($value);
@@ -1318,6 +1486,10 @@ 
 		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
 		return isset($this->_d[$priority])?$this->_d[$priority]:null;
 	}
+
+	/**
+	 * @param integer $index
+	 */
 	public function itemAtIndexInPriority($index,$priority=null)
 	{
 		if($priority===null)
@@ -1333,6 +1505,10 @@ 
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 		return $this->insertAtIndexInPriority($item,false,$priority,true);
 	}
+
+	/**
+	 * @param integer $index
+	 */
 	public function insertAt($index,$item)
 	{
 		if($this->getReadOnly())
@@ -1446,6 +1622,10 @@ 
 			unset($this->_d[$priority]);
 		}
 	}
+
+	/**
+	 * @param PriorityListItem $item
+	 */
 	public function contains($item)
 	{
 		return $this->indexOf($item)>=0;
@@ -1513,6 +1693,10 @@ 
 		$this->sortPriorities();
 		return $this->_d;
 	}
+
+	/**
+	 * @param integer $priority
+	 */
 	public function toArrayBelowPriority($priority,$inclusive=false)
 	{
 		$this->sortPriorities();
@@ -1525,6 +1709,10 @@ 
 		}
 		return $items;
 	}
+
+	/**
+	 * @param integer $priority
+	 */
 	public function toArrayAbovePriority($priority,$inclusive=true)
 	{
 		$this->sortPriorities();
@@ -1582,6 +1770,11 @@ 
 	{
 		return $this->itemAt($offset);
 	}
+
+	/**
+	 * @param null|integer $offset
+	 * @param integer $item
+	 */
 	public function offsetSet($offset,$item)
 	{
 		if($offset===null)
@@ -1595,6 +1788,10 @@ 
 		}
 		$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
 	}
+
+	/**
+	 * @param integer $offset
+	 */
 	public function offsetUnset($offset)
 	{
 		$this->removeAt($offset);
@@ -1614,6 +1811,10 @@ 
 	{
 		return $this->_r;
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	protected function setReadOnly($value)
 	{
 		$this->_r=TPropertyValue::ensureBoolean($value);
@@ -1765,6 +1966,10 @@ 
 	{
 		return $this->_r;
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	protected function setReadOnly($value)
 	{
 		$this->_r=TPropertyValue::ensureBoolean($value);
@@ -1773,6 +1978,10 @@ 
 	{
 		return $this->_dp;
 	}
+
+	/**
+	 * @param integer $value
+	 */
 	protected function setDefaultPriority($value)
 	{
 		$this->_dp = (string)round(TPropertyValue::ensureFloat($value), $this->_p);
@@ -1781,6 +1990,10 @@ 
 	{
 		return $this->_p;
 	}
+
+	/**
+	 * @param integer $value
+	 */
 	protected function setPrecision($value)
 	{
 		$this->_p=TPropertyValue::ensureInteger($value);
@@ -1842,6 +2055,11 @@ 
 			return (isset($this->_d[$priority])&&isset($this->_d[$priority][$key]))?$this->_d[$priority][$key]:null;
 		}
 	}
+
+	/**
+	 * @param string $key
+	 * @param integer $priority
+	 */
 	public function setPriorityAt($key,$priority=null)
 	{
 		if($priority===null)
@@ -1967,6 +2185,10 @@ 
 	{
 		return $this->flattenPriorities();
 	}
+
+	/**
+	 * @param integer $priority
+	 */
 	public function toArrayBelowPriority($priority,$inclusive=false)
 	{
 		$this->sortPriorities();
@@ -1979,6 +2201,10 @@ 
 		}
 		return $items;
 	}
+
+	/**
+	 * @param integer $priority
+	 */
 	public function toArrayAbovePriority($priority,$inclusive=true)
 	{
 		$this->sortPriorities();
@@ -2052,6 +2278,10 @@ 
 {
 	private $_d=array();
 	private $_c=0;
+
+	/**
+	 * @param integer[] $data
+	 */
 	public function __construct($data=null)
 	{
 		if($data!==null)
@@ -2166,6 +2396,10 @@ 
 	{
 		return $this->_parent;
 	}
+
+	/**
+	 * @param TXmlElement|null $parent
+	 */
 	public function setParent($parent)
 	{
 		$this->_parent=$parent;
@@ -2194,6 +2428,10 @@ 
 	{
 		return $this->_attributes!==null && $this->_attributes->getCount()>0;
 	}
+
+	/**
+	 * @param string $name
+	 */
 	public function getAttribute($name)
 	{
 		if($this->_attributes!==null)
@@ -2201,6 +2439,11 @@ 
 		else
 			return null;
 	}
+
+	/**
+	 * @param string $name
+	 * @param string $value
+	 */
 	public function setAttribute($name,$value)
 	{
 		$this->getAttributes()->add($name,TPropertyValue::ensureString($value));
@@ -2217,6 +2460,10 @@ 
 			$this->_attributes=new TMap;
 		return $this->_attributes;
 	}
+
+	/**
+	 * @param string $tagName
+	 */
 	public function getElementByTagName($tagName)
 	{
 		if($this->_elements)
@@ -2227,6 +2474,10 @@ 
 		}
 		return null;
 	}
+
+	/**
+	 * @param string $tagName
+	 */
 	public function getElementsByTagName($tagName)
 	{
 		$list=new TList;
@@ -2296,6 +2547,10 @@ 
 	{
 		return $this->_version;
 	}
+
+	/**
+	 * @param string $version
+	 */
 	public function setVersion($version)
 	{
 		$this->_version=$version;
@@ -2304,6 +2559,10 @@ 
 	{
 		return $this->_encoding;
 	}
+
+	/**
+	 * @param string $encoding
+	 */
 	public function setEncoding($encoding)
 	{
 		$this->_encoding=$encoding;
@@ -2354,6 +2613,10 @@ 
 		}
 		return true;
 	}
+
+	/**
+	 * @param string $file
+	 */
 	public function saveToFile($file)
 	{
 		if(($fw=fopen($file,'w'))!==false)
@@ -2399,6 +2662,10 @@ 
 	{
 		return $this->_o;
 	}
+
+	/**
+	 * @param integer $index
+	 */
 	public function insertAt($index,$item)
 	{
 		if($item instanceof TXmlElement)
@@ -2411,6 +2678,10 @@ 
 		else
 			throw new TInvalidDataTypeException('xmlelementlist_xmlelement_required');
 	}
+
+	/**
+	 * @param integer $index
+	 */
 	public function removeAt($index)
 	{
 		$item=parent::removeAt($index);
@@ -2532,10 +2803,18 @@ 
 		}
 		return 0;
 	}
+
+	/**
+	 * @param IUser $user
+	 */
 	private function isUserMatched($user)
 	{
 		return ($this->_everyone || ($this->_guest && $user->getIsGuest()) || ($this->_authenticated && !$user->getIsGuest()) || in_array(strtolower($user->getName()),$this->_users));
 	}
+
+	/**
+	 * @param IUser $user
+	 */
 	private function isRoleMatched($user)
 	{
 		foreach($this->_roles as $role)
@@ -2552,6 +2831,11 @@ 
 }
 class TAuthorizationRuleCollection extends TList
 {
+	/**
+	 * @param IUser $user
+	 * @param string $verb
+	 * @param string $ip
+	 */
 	public function isUserAllowed($user,$verb,$ip)
 	{
 		if($user instanceof IUser)
@@ -2603,6 +2887,10 @@ 
 		}
 		return $this->_validationKey;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setValidationKey($value)
 	{
 		if('' === $value)
@@ -2619,6 +2907,10 @@ 
 		}
 		return $this->_encryptionKey;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setEncryptionKey($value)
 	{
 		if('' === $value)
@@ -2633,6 +2925,10 @@ 
 	{
 		return $this->_hashAlgorithm;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setValidation($value)
 	{
 		$this->_hashAlgorithm = TPropertyValue::ensureEnum($value, 'TSecurityManagerValidationMode');
@@ -2655,10 +2951,18 @@ 
 	{
 		return $this->_cryptAlgorithm;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setCryptAlgorithm($value)
 	{
 		$this->_cryptAlgorithm = $value;
 	}
+
+	/**
+	 * @param string $data
+	 */
 	public function encrypt($data)
 	{
 		$module=$this->openCryptModule();
@@ -2671,6 +2975,10 @@ 
 		mcrypt_module_close($module);
 		return $encrypted;
 	}
+
+	/**
+	 * @param string $data
+	 */
 	public function decrypt($data)
 	{
 		$module=$this->openCryptModule();
@@ -2732,6 +3040,11 @@ 
 	{
 		return $this->_mbstring ? mb_strlen($string,'8bit') : strlen($string);
 	}
+
+	/**
+	 * @param integer $start
+	 * @param integer $length
+	 */
 	private function substr($string,$start,$length)
 	{
 		return $this->_mbstring ? mb_substr($string,$start,$length,'8bit') : substr($string,$start,$length);
@@ -2751,6 +3064,10 @@ 
 	{
 		return strtr($s,self::$_encodeTable);
 	}
+
+	/**
+	 * @param string $s
+	 */
 	public static function htmlDecode($s)
 	{
 		return strtr($s,self::$_decodeTable);
@@ -2891,6 +3208,10 @@ 
 		self::checkJsonError();
 		return $s;
 	}
+
+	/**
+	 * @param string $sourceEncoding
+	 */
 	private static function convertToUtf8(&$value, $sourceEncoding) {
 		if(is_string($value))
 			$value=iconv($sourceEncoding, 'UTF-8', $value);
@@ -2900,6 +3221,10 @@ 
 				self::convertToUtf8($element, $sourceEncoding);
 		}
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public static function jsonDecode($value, $assoc = false, $depth = 512)
 	{
 		$s= @json_decode($value, $assoc, $depth);
@@ -2934,6 +3259,10 @@ 
 		}
 		throw new Exception("JSON error ($err): $msg");
 	}
+
+	/**
+	 * @param string $code
+	 */
 	public static function JSMin($code)
 	{
 		Prado::using('System.Web.Javascripts.JSMin');
@@ -3047,6 +3376,10 @@ 
 	{
 		return $this->_id;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setID($value)
 	{
 		$this->_id=$value;
@@ -3121,6 +3454,10 @@ 
 	{
 		return $this->getID();
 	}
+
+	/**
+	 * @param TUrlManager $manager
+	 */
 	protected function cacheUrlManager($manager)
 	{
 		if($this->getEnableCache())
@@ -3158,6 +3495,10 @@ 
 	{
 		return $this->_urlManagerID;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setUrlManager($value)
 	{
 		$this->_urlManagerID=$value;
@@ -3198,6 +3539,10 @@ 
 	{
 		return $this->_separator;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setUrlParamSeparator($value)
 	{
 		if(strlen($value)===1)
@@ -3324,6 +3669,10 @@ 
 	{
 		return $this->_enableCookieValidation;
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	public function setEnableCookieValidation($value)
 	{
 		$this->_enableCookieValidation=TPropertyValue::ensureBoolean($value);
@@ -3370,6 +3719,10 @@ 
 	{
 		return $_ENV;
 	}
+
+	/**
+	 * @param string $serviceID
+	 */
 	public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=true,$encodeGetItems=true)
 	{
 		if ($this->_cookieOnly===null)
@@ -3470,18 +3823,35 @@ 
 	{
 		return $this->_items;
 	}
+
+	/**
+	 * @param integer $offset
+	 */
 	public function offsetExists($offset)
 	{
 		return $this->contains($offset);
 	}
+
+	/**
+	 * @param integer $offset
+	 */
 	public function offsetGet($offset)
 	{
 		return $this->itemAt($offset);
 	}
+
+	/**
+	 * @param integer $offset
+	 * @param string $item
+	 */
 	public function offsetSet($offset,$item)
 	{
 		$this->add($offset,$item);
 	}
+
+	/**
+	 * @param integer $offset
+	 */
 	public function offsetUnset($offset)
 	{
 		$this->remove($offset);
@@ -3490,10 +3860,18 @@ 
 class THttpCookieCollection extends TList
 {
 	private $_o;
+
+	/**
+	 * @param THttpResponse $owner
+	 */
 	public function __construct($owner=null)
 	{
 		$this->_o=$owner;
 	}
+
+	/**
+	 * @param integer $index
+	 */
 	public function insertAt($index,$item)
 	{
 		if($item instanceof THttpCookie)
@@ -3505,6 +3883,10 @@ 
 		else
 			throw new TInvalidDataTypeException('httpcookiecollection_httpcookie_required');
 	}
+
+	/**
+	 * @param integer $index
+	 */
 	public function removeAt($index)
 	{
 		$item=parent::removeAt($index);
@@ -3545,6 +3927,10 @@ 
 	{
 		return $this->_domain;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setDomain($value)
 	{
 		$this->_domain=$value;
@@ -3553,6 +3939,10 @@ 
 	{
 		return $this->_expire;
 	}
+
+	/**
+	 * @param integer $value
+	 */
 	public function setExpire($value)
 	{
 		$this->_expire=TPropertyValue::ensureInteger($value);
@@ -3569,6 +3959,10 @@ 
 	{
 		return $this->_name;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setName($value)
 	{
 		$this->_name=$value;
@@ -3577,6 +3971,10 @@ 
 	{
 		return $this->_value;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setValue($value)
 	{
 		$this->_value=$value;
@@ -3585,6 +3983,10 @@ 
 	{
 		return $this->_path;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setPath($value)
 	{
 		$this->_path=$value;
@@ -3593,6 +3995,10 @@ 
 	{
 		return $this->_secure;
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	public function setSecure($value)
 	{
 		$this->_secure=TPropertyValue::ensureBoolean($value);
@@ -3619,6 +4025,10 @@ 
 	private $_query;
 	private $_fragment;
 	private $_uri;
+
+	/**
+	 * @param string $uri
+	 */
 	public function __construct($uri)
 	{
 		if(($ret=@parse_url($uri))!==false)
@@ -3684,6 +4094,10 @@ 
 class THttpResponseAdapter extends TApplicationComponent
 {
 	private $_response;
+
+	/**
+	 * @param THttpResponse $response
+	 */
 	public function __construct($response)
 	{
 		$this->_response=$response;
@@ -3753,6 +4167,10 @@ 
 	{
 		return session_cache_expire();
 	}
+
+	/**
+	 * @param integer $value
+	 */
 	public function setCacheExpire($value)
 	{
 		session_cache_expire(TPropertyValue::ensureInteger($value));
@@ -3761,6 +4179,10 @@ 
 	{
 		return session_cache_limiter();
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setCacheControl($value)
 	{
 		session_cache_limiter(TPropertyValue::ensureEnum($value,array('none','nocache','private','private_no_expire','public')));
@@ -3779,6 +4201,10 @@ 
 	{
 		return $this->_charset;
 	}
+
+	/**
+	 * @param string $charset
+	 */
 	public function setCharset($charset)
 	{
 		$this->_charset = (strToLower($charset) === 'false') ? false : (string)$charset;
@@ -3787,6 +4213,10 @@ 
 	{
 		return $this->_bufferOutput;
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	public function setBufferOutput($value)
 	{
 		if($this->_initialized)
@@ -4002,6 +4432,10 @@ 
 			return array_change_key_case($result, $case);
 		return $result;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function appendHeader($value, $replace=true)
 	{
 		header($value, $replace);
@@ -4010,6 +4444,10 @@ 
 	{
 		error_log($message,$messageType,$destination,$extraHeaders);
 	}
+
+	/**
+	 * @param THttpCookie $cookie
+	 */
 	public function addCookie($cookie)
 	{
 		$request=$this->getRequest();
@@ -4067,6 +4505,10 @@ 
 		else
 			return $this->createNewHtmlWriter($type, $this);
 	}
+
+	/**
+	 * @param THttpResponse $writer
+	 */
 	public function createNewHtmlWriter($type, $writer)
 	{
 		return Prado::createComponent($type, $writer);
@@ -4176,6 +4618,10 @@ 
 	{
 		return $this->_customStorage;
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	public function setUseCustomStorage($value)
 	{
 		$this->_customStorage=TPropertyValue::ensureBoolean($value);
@@ -4318,10 +4764,18 @@ 
 	{
 		return array_keys($_SESSION);
 	}
+
+	/**
+	 * @param string $key
+	 */
 	public function itemAt($key)
 	{
 		return isset($_SESSION[$key]) ? $_SESSION[$key] : null;
 	}
+
+	/**
+	 * @param string $key
+	 */
 	public function add($key,$value)
 	{
 		$_SESSION[$key]=$value;
@@ -4422,6 +4876,10 @@ 
 	{
 		return $this->_caseSensitive;
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	public function setCaseSensitive($value)
 	{
 		$this->_caseSensitive=TPropertyValue::ensureBoolean($value);
@@ -4434,6 +4892,10 @@ 
 	{
 		parent::add($this->_caseSensitive?$key:strtolower($key),$value);
 	}
+
+	/**
+	 * @param string $key
+	 */
 	public function remove($key)
 	{
 		return parent::remove($this->_caseSensitive?$key:strtolower($key));
@@ -4442,14 +4904,26 @@ 
 	{
 		return parent::contains($this->_caseSensitive?$key:strtolower($key));
 	}
+
+	/**
+	 * @param string $name
+	 */
 	public function hasProperty($name)
 	{
 		return $this->contains($name) || parent::canGetProperty($name) || parent::canSetProperty($name);
 	}
+
+	/**
+	 * @param string $name
+	 */
 	public function canGetProperty($name)
 	{
 		return $this->contains($name) || parent::canGetProperty($name);
 	}
+
+	/**
+	 * @param string $name
+	 */
 	public function canSetProperty($name)
 	{
 		return true;
@@ -4584,6 +5058,10 @@ 
 		}
 		return $this->_page;
 	}
+
+	/**
+	 * @param TPage $page
+	 */
 	public function setPage($page)
 	{
 		$this->_page=$page;
@@ -4727,6 +5205,10 @@ 
 		else
 			return $this->getViewState('Visible',true);
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	public function setVisible($value)
 	{
 		$this->setViewState('Visible',TPropertyValue::ensureBoolean($value),true);
@@ -4765,6 +5247,10 @@ 
 			return $attributes;
 		}
 	}
+
+	/**
+	 * @param string $name
+	 */
 	public function hasAttribute($name)
 	{
 		if($attributes=$this->getViewState('Attributes',null))
@@ -4772,6 +5258,10 @@ 
 		else
 			return false;
 	}
+
+	/**
+	 * @param string $name
+	 */
 	public function getAttribute($name)
 	{
 		if($attributes=$this->getViewState('Attributes',null))
@@ -4779,6 +5269,10 @@ 
 		else
 			return null;
 	}
+
+	/**
+	 * @param string $name
+	 */
 	public function setAttribute($name,$value)
 	{
 		$this->getAttributes()->add($name,$value);
@@ -4802,6 +5296,10 @@ 
 		else
 			return !($this->_flags & self::IS_DISABLE_VIEWSTATE);
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	public function setEnableViewState($value)
 	{
 		if(TPropertyValue::ensureBoolean($value))
@@ -4809,10 +5307,19 @@ 
 		else
 			$this->_flags |= self::IS_DISABLE_VIEWSTATE;
 	}
+
+	/**
+	 * @param string $key
+	 */
 	protected function getControlState($key,$defaultValue=null)
 	{
 		return isset($this->_rf[self::RF_CONTROLSTATE][$key])?$this->_rf[self::RF_CONTROLSTATE][$key]:$defaultValue;
 	}
+
+	/**
+	 * @param string $key
+	 * @param integer $defaultValue
+	 */
 	protected function setControlState($key,$value,$defaultValue=null)
 	{
 		if($value===$defaultValue)
@@ -4824,6 +5331,10 @@ 
 	{
 		unset($this->_rf[self::RF_CONTROLSTATE][$key]);
 	}
+
+	/**
+	 * @param boolean $enabled
+	 */
 	public function trackViewState($enabled)
 	{
 		$this->_trackViewState=TPropertyValue::ensureBoolean($enabled);
@@ -4841,6 +5352,10 @@ 
 		else
 			return $defaultValue;
 	}
+
+	/**
+	 * @param string $key
+	 */
 	public function setViewState($key,$value,$defaultValue=null)
 	{
 		if($this->_trackViewState)
@@ -4854,6 +5369,10 @@ 
 			$this->_tempState[$key]=$value;
 		}
 	}
+
+	/**
+	 * @param string $key
+	 */
 	public function clearViewState($key)
 	{
 		unset($this->_viewState[$key]);
@@ -4910,6 +5429,10 @@ 
 	{
 		return ($this->_flags & self::IS_CHILD_CREATED)!==0;
 	}
+
+	/**
+	 * @param boolean $value
+	 */
 	final protected function setChildControlsCreated($value)
 	{
 		if($value)
@@ -4969,6 +5492,10 @@ 
 				return null;
 		}
 	}
+
+	/**
+	 * @param string $type
+	 */
 	public function findControlsByType($type,$strict=true)
 	{
 		$controls=array();
@@ -5040,6 +5567,10 @@ 
 	{
 		return $this->getControlStage() >= self::CS_PRERENDERED;
 	}
+
+	/**
+	 * @param string $name
+	 */
 	public function getRegisteredObject($name)
 	{
 		return isset($this->_rf[self::RF_NAMED_OBJECTS][$name])?$this->_rf[self::RF_NAMED_OBJECTS][$name]:null;
@@ -5063,6 +5594,10 @@ 
 			$control=$control->_parent;
 		return $control===$ancestor;
 	}
+
+	/**
+	 * @param TControl $control
+	 */
 	public function addedControl($control)
 	{
 		if($control->_parent)
@@ -5101,6 +5636,10 @@ 
 			}
 		}
 	}
+
+	/**
+	 * @param TControl $control
+	 */
 	public function removedControl($control)
 	{
 		if($this->_namingContainer)
@@ -5246,6 +5785,10 @@ 
 		$rootControl=(($page=$this->getPage())===null)?$this:$page;
 		$rootControl->broadcastEventInternal($name,$sender,new TBroadcastEventParameter($name,$param));
 	}
+
+	/**
+	 * @param TBroadcastEventParameter $param
+	 */
 	private function broadcastEventInternal($name,$sender,$param)
 	{
 		if($this->hasEvent($name))
@@ -5388,6 +5931,10 @@ 
 		else if($this->_flags & self::IS_STYLESHEET_APPLIED)
 			throw new TInvalidOperationException('control_stylesheet_applied',get_class($this));
 	}
+
+	/**
+	 * @param boolean $recursive
+	 */
 	private function clearCachedUniqueID($recursive)
 	{
 		if($recursive && $this->_uid!==null && isset($this->_rf[self::RF_CONTROLS]))
@@ -5411,6 +5958,10 @@ 
 	{
 		unset($this->_rf[self::RF_NAMED_CONTROLS]);
 	}
+
+	/**
+	 * @param TControl $container
+	 */
 	private function fillNameTable($container,$controls)
 	{
 		foreach($controls as $control)
@@ -5483,11 +6034,18 @@ 
 }
 interface IPostBackEventHandler
 {
+	/**
+	 * @return void
+	 */
 	public function raisePostBackEvent($param);
 }
 interface IPostBackDataHandler
 {
 	public function loadPostData($key,$values);
+
+	/**
+	 * @return void
+	 */
 	public function raisePostDataChangedEvent();
 	public function getDataChanged();
 }
@@ -5495,8 +6053,16 @@ 
 {
 	public function validate();
 	public function getIsValid();
+
+	/**
+	 * @return void
+	 */
 	public function setIsValid($value);
 	public function getErrorMessage();
+
+	/**
+	 * @return void
+	 */
 	public function setErrorMessage($value);
 }
 interface IValidatable
@@ -5511,26 +6077,66 @@ 
 }
 interface ITheme
 {
+	/**
+	 * @return boolean
+	 */
 	public function applySkin($control);
 }
 interface ITemplate
 {
+	/**
+	 * @return void
+	 */
 	public function instantiateIn($parent);
 }
 interface IButtonControl
 {
 	public function getText();
+
+	/**
+	 * @param string $value
+	 *
+	 * @return void
+	 */
 	public function setText($value);
 	public function getCausesValidation();
+
+	/**
+	 * @return void
+	 */
 	public function setCausesValidation($value);
 	public function getCommandName();
+
+	/**
+	 * @return void
+	 */
 	public function setCommandName($value);
 	public function getCommandParameter();
+
+	/**
+	 * @return void
+	 */
 	public function setCommandParameter($value);
 	public function getValidationGroup();
+
+	/**
+	 * @return void
+	 */
 	public function setValidationGroup($value);
+
+	/**
+	 * @return void
+	 */
 	public function onClick($param);
+
+	/**
+	 * @return void
+	 */
 	public function onCommand($param);
+
+	/**
+	 * @return void
+	 */
 	public function setIsDefaultButton($value);
 	public function getIsDefaultButton();
 }
@@ -5964,6 +6570,10 @@ 
 	{
 		return $this->_customStyle===null?'':$this->_customStyle;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setCustomStyle($value)
 	{
 		$this->_customStyle=$value;
@@ -5972,6 +6582,11 @@ 
 	{
 		return isset($this->_fields[$name])?$this->_fields[$name]:'';
 	}
+
+	/**
+	 * @param string $name
+	 * @param string $value
+	 */
 	public function setStyleField($name,$value)
 	{
 		$this->_fields[$name]=$value;
@@ -6441,6 +7056,10 @@ 
 {
 	private $_ensureid=false;
 	protected $_decorator;
+
+	/**
+	 * @param boolean $value
+	 */
 	public function setEnsureId($value)
 	{
 		$this->_ensureid |= TPropertyValue::ensureBoolean($value);
@@ -6530,6 +7149,10 @@ 
 		else
 			return '';
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setForeColor($value)
 	{
 		$this->getStyle()->setForeColor($value);
@@ -6560,6 +7183,10 @@ 
 		else
 			return '';
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setHeight($value)
 	{
 		$this->getStyle()->setHeight($value);
@@ -6621,6 +7248,10 @@ 
 		else
 			return '';
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setWidth($value)
 	{
 		$this->getStyle()->setWidth($value);
@@ -6748,6 +7379,10 @@ 
 			$tpl->instantiateIn($this);
 		}
 	}
+
+	/**
+	 * @param string $id
+	 */
 	public function registerContent($id,TContent $object)
 	{
 		if(isset($this->_contents[$id]))
@@ -6755,6 +7390,10 @@ 
 		else
 			$this->_contents[$id]=$object;
 	}
+
+	/**
+	 * @param string $id
+	 */
 	public function registerContentPlaceHolder($id,TContentPlaceHolder $object)
 	{
 		if(isset($this->_placeholders[$id]))
@@ -6951,6 +7590,10 @@ 
 	{
 		return $this->getViewState('Enctype','');
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setEnctype($value)
 	{
 		$this->setViewState('Enctype',$value,'');
@@ -7070,6 +7713,10 @@ 
 		$scripts = array_unique($scripts);
 		return $scripts;
 	}
+
+	/**
+	 * @param string $base
+	 */
 	protected function getPackagePathUrl($base)
 	{
 		$assets = Prado::getApplication()->getAssetManager();
@@ -7219,6 +7866,11 @@ 
 		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript','registerEndScript',$params);
 	}
+
+	/**
+	 * @param string $name
+	 * @param string $value
+	 */
 	public function registerHiddenField($name,$value)
 	{
 		$this->_hiddenFields[$name]=$value;
@@ -7356,6 +8008,10 @@ 
 			$this->renderAllPendingScriptFiles($writer);
 		}
 	}
+
+	/**
+	 * @param boolean $initial
+	 */
 	protected function renderHiddenFieldsInt($writer, $initial)
  	{
 		if ($initial) $this->_renderedHiddenFields = array();
@@ -7391,12 +8047,20 @@ 
 abstract class TClientSideOptions extends TComponent
 {
 	private $_options;
+
+	/**
+	 * @param string $name
+	 */
 	protected function setFunction($name, $code)
 	{
 		if(!TJavaScript::isJsLiteral($code))
 			$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
 		$this->setOption($name, $code);
 	}
+
+	/**
+	 * @param string $name
+	 */
 	protected function getOption($name)
 	{
 		if ($this->_options)
@@ -7519,6 +8183,10 @@ 
 		$this->renderControl($writer);
 		$this->unloadRecursive();
 	}
+
+	/**
+	 * @param string $enc
+	 */
 	protected static function decodeUTF8($data, $enc)
 	{
 		if(is_array($data))
@@ -7600,6 +8268,10 @@ 
 		else
 			throw new TInvalidOperationException('page_form_duplicated');
 	}
+
+	/**
+	 * @param string $validationGroup
+	 */
 	public function getValidators($validationGroup=null)
 	{
 		if(!$this->_validators)
@@ -7670,6 +8342,10 @@ 
 	{
 		$this->_styleSheet=empty($value)?null:$value;
 	}
+
+	/**
+	 * @param TControl $control
+	 */
 	public function applyControlSkin($control)
 	{
 		if(($theme=$this->getTheme())!==null)
@@ -7817,6 +8493,10 @@ 
 	{
 		$this->_postBackEventParameter=$value;
 	}
+
+	/**
+	 * @param boolean $beforeLoad
+	 */
 	protected function processPostData($postData,$beforeLoad)
 	{
 		$this->_isLoadingPostData=true;
@@ -7905,6 +8585,10 @@ 
 			$this->getClientScript()->registerFocusControl($lastFocus);
 		$this->_inFormRender=false;
 	}
+
+	/**
+	 * @param TControl $value
+	 */
 	public function setFocus($value)
 	{
 		$this->_focus=$value;
@@ -7950,6 +8634,10 @@ 
 	{
 		return $this->_clientState;
 	}
+
+	/**
+	 * @param string $state
+	 */
 	public function setClientState($state)
 	{
 		$this->_clientState=$state;
@@ -8009,6 +8697,11 @@ 
 	{
 		$this->_pagePath=$value;
 	}
+
+	/**
+	 * @param string $context
+	 * @param string $funcName
+	 */
 	public function registerCachingAction($context,$funcName,$funcParams)
 	{
 		if($this->_cachingStack)
@@ -8031,13 +8724,27 @@ 
 }
 interface IPageStatePersister
 {
+	/**
+	 * @return TPage
+	 */
 	public function getPage();
+
+	/**
+	 * @return void
+	 */
 	public function setPage(TPage $page);
+
+	/**
+	 * @return void
+	 */
 	public function save($state);
 	public function load();
 }
 class TPageStateFormatter
 {
+	/**
+	 * @param TPage $page
+	 */
 	public static function serialize($page,$data)
 	{
 		$sm=$page->getApplication()->getSecurityManager();
@@ -8051,6 +8758,10 @@ 
 			$str=$sm->encrypt($str);
 		return base64_encode($str);
 	}
+
+	/**
+	 * @param TPage $page
+	 */
 	public static function unserialize($page,$data)
 	{
 		$str=base64_decode($data);
@@ -8244,6 +8955,10 @@ 
 	{
 		$this->_cacheModuleID=$value;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setCacheKeyPrefix($value)
 	{
 		$this->_keyPrefix=$value;
@@ -8294,10 +9009,18 @@ 
 	{
 		$this->_cachePostBack=TPropertyValue::ensureBoolean($value);
 	}
+
+	/**
+	 * @param TOutputCacheCheckDependencyEventParameter $param
+	 */
 	public function onCheckDependency($param)
 	{
 		$this->raiseEvent('OnCheckDependency',$this,$param);
 	}
+
+	/**
+	 * @param TOutputCacheCalculateKeyEventParameter $param
+	 */
 	public function onCalculateKey($param)
 	{
 		$this->raiseEvent('OnCalculateKey',$this,$param);
@@ -8389,6 +9112,10 @@ 
 		$tplFile=dirname($class->getFileName()).DIRECTORY_SEPARATOR.$className.self::TEMPLATE_FILE_EXT;
 		return $this->getTemplateByFileName($tplFile);
 	}
+
+	/**
+	 * @param string $fileName
+	 */
 	public function getTemplateByFileName($fileName)
 	{
 		if(($fileName=$this->getLocalizedTemplate($fileName))!==null)
@@ -8428,6 +9155,10 @@ 
 		else
 			return null;
 	}
+
+	/**
+	 * @return string
+	 */
 	protected function getLocalizedTemplate($filename)
 	{
 		if(($app=$this->getApplication()->getGlobalization(false))===null)
@@ -8593,12 +9324,20 @@ 
 				$parentControl->addParsedObject($control);
 		}
 	}
+
+	/**
+	 * @param TControl $control
+	 */
 	protected function configureControl($control,$name,$value)
 	{
 		if(strncasecmp($name,'on',2)===0)					$this->configureEvent($control,$name,$value,$control);
 		else if(($pos=strrpos($name,'.'))===false)				$this->configureProperty($control,$name,$value);
 		else				$this->configureSubProperty($control,$name,$value);
 	}
+
+	/**
+	 * @param TComponent $component
+	 */
 	protected function configureComponent($component,$name,$value)
 	{
 		if(strpos($name,'.')===false)				$this->configureProperty($component,$name,$value);
@@ -8908,6 +9647,11 @@ 
 		$tpl=$objects;
 		return $objects;
 	}
+
+	/**
+	 * @param string $str
+	 * @param string $offset
+	 */
 	protected function parseAttributes($str,$offset)
 	{
 		if($str==='')
@@ -8939,11 +9683,19 @@ 
 		}
 		return $attributes;
 	}
+
+	/**
+	 * @param string $content
+	 */
 	protected function parseTemplateProperty($content,$offset)
 	{
 		$line=$this->_startingLine+count(explode("\n",substr($this->_content,0,$offset)))-1;
 		return array(self::CONFIG_TEMPLATE,new TTemplate($content,$this->_contextPath,$this->_tplFile,$line,false));
 	}
+
+	/**
+	 * @param string $value
+	 */
 	protected function parseAttribute($value)
 	{
 		if(($n=preg_match_all('/<%[#=].*?%>/msS',$value,$matches,PREG_OFFSET_CAPTURE))>0)
@@ -9066,6 +9818,11 @@ 
 	{
 		return $this->_includedFiles;
 	}
+
+	/**
+	 * @param Exception $e
+	 * @param integer $line
+	 */
 	protected function handleException($e,$line,$input=null)
 	{
 		$srcFile=$this->_tplFile;
@@ -9122,6 +9879,10 @@ 
 		}
 		return $input;
 	}
+
+	/**
+	 * @param string $method
+	 */
 	protected function isClassBehaviorMethod(ReflectionClass $class,$method)
 	{
 	  $component=new ReflectionClass('TComponent');
@@ -9204,6 +9965,10 @@ 
 				throw new TInvalidDataValueException('thememanager_basepath_invalid',$value);
 		}
 	}
+
+	/**
+	 * @return string
+	 */
 	public function getBaseUrl()
 	{
 		if($this->_baseUrl===null)
@@ -9602,6 +10367,10 @@ 
 	{
 		return $this->_defaultPage;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setDefaultPage($value)
 	{
 		if($this->_initialized)
@@ -9690,6 +10459,10 @@ 
 			$page->setSubProperty($name,$value);
 		$page->run($this->getResponse()->createHtmlWriter());
 	}
+
+	/**
+	 * @param string $pagePath
+	 */
 	public function constructUrl($pagePath,$getParams=null,$encodeAmpersand=true,$encodeGetItems=true)
 	{
 		return $this->getRequest()->constructUrl($this->getID(),$pagePath,$getParams,$encodeAmpersand,$encodeGetItems);
@@ -9761,11 +10534,20 @@ 
 				throw new TConfigurationException('pageserviceconf_file_invalid',$fname);
 		}
 	}
+
+	/**
+	 * @param string $configPath
+	 */
 	public function loadFromPhp($config,$configPath,$configPagePath)
 	{
 		$this->loadApplicationConfigurationFromPhp($config,$configPath);
 		$this->loadPageConfigurationFromPhp($config,$configPath,$configPagePath);
 	}
+
+	/**
+	 * @param TXmlDocument $dom
+	 * @param string $configPath
+	 */
 	public function loadFromXml($dom,$configPath,$configPagePath)
 	{
 		$this->loadApplicationConfigurationFromXml($dom,$configPath);
@@ -9959,6 +10741,10 @@ 
 	{
 		return $this->_basePath;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setBasePath($value)
 	{
 		if($this->_initialized)
@@ -9974,6 +10760,10 @@ 
 	{
 		return $this->_baseUrl;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setBaseUrl($value)
 	{
 		if($this->_initialized)
@@ -10022,6 +10812,10 @@ 
 		else
 			return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash($path);
 	}
+
+	/**
+	 * @param string $path
+	 */
 	public function getPublishedUrl($path)
 	{
 		$path=realpath($path);
@@ -10030,10 +10824,19 @@ 
 		else
 			return $this->_baseUrl.'/'.$this->hash($path);
 	}
+
+	/**
+	 * @param string $dir
+	 */
 	protected function hash($dir)
 	{
 		return sprintf('%x',crc32($dir.Prado::getVersion()));
 	}
+
+	/**
+	 * @param string $src
+	 * @param string $dst
+	 */
 	protected function copyFile($src,$dst)
 	{
 		if(!is_dir($dst))
@@ -10047,6 +10850,11 @@ 
 			@copy($src,$dstFile);
 		}
 	}
+
+	/**
+	 * @param string $src
+	 * @param string $dst
+	 */
 	public function copyDirectory($src,$dst)
 	{
 		if(!is_dir($dst))
@@ -10076,6 +10884,11 @@ 
 			throw new TInvalidDataValueException('assetmanager_source_directory_invalid', $src);
 		}
 	}
+
+	/**
+	 * @param string $tarfile
+	 * @param string $md5sum
+	 */
 	public function publishTarFile($tarfile, $md5sum, $checkTimestamp=false)
 	{
 		if(isset($this->_published[$md5sum]))
@@ -10098,6 +10911,10 @@ 
 			return $this->_published[$md5sum]=$this->_baseUrl.'/'.$dir;
 		}
 	}
+
+	/**
+	 * @param string $destination
+	 */
 	protected function deployTarFile($path,$destination)
 	{
 		if(($fullpath=realpath($path))===false || !is_file($fullpath))
@@ -10174,6 +10991,10 @@ 
 	{
 		return $this->_charset;
 	}
+
+	/**
+	 * @param string $charset
+	 */
 	public function setCharset($charset)
 	{
 		$this->_charset = $charset;
@@ -10319,6 +11140,10 @@ 
 		$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
 		Prado::setPathOfAlias('Application',$this->_basePath);
 	}
+
+	/**
+	 * @param string $basePath
+	 */
 	protected function resolvePaths($basePath)
 	{
 				if(empty($basePath) || ($basePath=realpath($basePath))===false)
@@ -10384,10 +11209,18 @@ 
 	{
 		return $this->_requestCompleted;
 	}
+
+	/**
+	 * @param integer $defaultValue
+	 */
 	public function getGlobalState($key,$defaultValue=null)
 	{
 		return isset($this->_globals[$key])?$this->_globals[$key]:$defaultValue;
 	}
+
+	/**
+	 * @param string $key
+	 */
 	public function setGlobalState($key,$value,$defaultValue=null,$forceSave=false)
 	{
 		$this->_stateChanged=true;
@@ -10447,6 +11280,10 @@ 
 	{
 		return $this->_basePath;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setBasePath($value)
 	{
 		$this->_basePath=$value;
@@ -10455,6 +11292,10 @@ 
 	{
 		return $this->_configFile;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setConfigurationFile($value)
 	{
 		$this->_configFile=$value;
@@ -10463,6 +11304,10 @@ 
 	{
 		return $this->_configType;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setConfigurationType($value)
 	{
 		$this->_configType = $value;
@@ -10502,6 +11347,10 @@ 
 	{
 		return $this->_runtimePath;
 	}
+
+	/**
+	 * @param string $value
+	 */
 	public function setRuntimePath($value)
 	{
 		$this->_runtimePath=$value;
@@ -10513,6 +11362,10 @@ 
 	{
 		return $this->_service;
 	}
+
+	/**
+	 * @param IService $value
+	 */
 	public function setService($value)
 	{
 		$this->_service=$value;
@@ -10793,6 +11646,10 @@ 
 		else
 			throw new THttpException(500,'application_service_unknown',$serviceID);
 	}
+
+	/**
+	 * @param Exception $param
+	 */
 	public function onError($param)
 	{
 		Prado::log($param->getMessage(),TLogger::ERROR,'System.TApplication');

Indentation +97 added lines, -97 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 /**
- * File Name: pradolite.php
- * Last Update: 2015/12/07 15:35:09
- * Generated By: buildscripts/phpbuilder/build.php
- *
- * This file is used in lieu of prado.php to boost PRADO application performance.
- * It is generated by expanding prado.php with included files.
- * Comments and trace statements are stripped off.
- *
- * Do not modify this file manually.
- */
+	 * File Name: pradolite.php
+	 * Last Update: 2015/12/07 15:35:09
+	 * Generated By: buildscripts/phpbuilder/build.php
+	 *
+	 * This file is used in lieu of prado.php to boost PRADO application performance.
+	 * It is generated by expanding prado.php with included files.
+	 * Comments and trace statements are stripped off.
+	 *
+	 * Do not modify this file manually.
+	 */
 
 if(!defined('PRADO_DIR'))
 	define('PRADO_DIR',dirname(__FILE__));
@@ -4203,10 +4203,10 @@ 
 		{
 			$value=TPropertyValue::ensureEnum($value,'THttpSessionCookieMode');
 			if($value===THttpSessionCookieMode::None) 
-      {
+	  {
 				ini_set('session.use_cookies','0');
 			  ini_set('session.use_only_cookies','0');
-      }
+	  }
 			else if($value===THttpSessionCookieMode::Allow)
 			{
 				ini_set('session.use_cookies','1');
@@ -6805,77 +6805,77 @@ 
 			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
 		parent::initRecursive($namingContainer);
 	}
-        public function tryToUpdateView($arObj, $throwExceptions = false)
-        {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
-                {
-                        try
-                        {
-                                if ($key != "RELATIONS")
-                                {
-                                        $control = $this->{$key};
-                                        if ($control instanceof TTextBox)
-                                                $control->Text = $arObj->{$key};
-                                        elseif ($control instanceof TCheckBox)
-                                                $control->Checked = (boolean) $arObj->{$key};
-                                        elseif ($control instanceof TDatePicker)
-                                                $control->Date = $arObj->{$key};
-                                }
-                                else
-                                {
-                                        foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
-                                        {
-                                                $relControl = $this->{$relKey};
-                                                switch ($relValues[0])
-                                                {
-                                                        case TActiveRecord::BELONGS_TO:
-                                                        case TActiveRecord::HAS_ONE:
-                                                                $relControl->Text = $arObj->{$relKey};
-                                                                break;
-                                                        case TActiveRecord::HAS_MANY:
-                                                                if ($relControl instanceof TListControl)
-                                                                {
-                                                                        $relControl->DataSource = $arObj->{$relKey};
-                                                                        $relControl->dataBind();
-                                                                }
-                                                                break;
-                                                }
-                                        }
-                                        break;
-                                }
-                        } 
-                        catch (Exception $ex)
-                        {
-                                if ($throwExceptions)
-                                        throw $ex;
-                        }
-                }
-        }
-        public function tryToUpdateAR($arObj, $throwExceptions = false)
-        {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
-                {
-                        try
-                        {
-                                if ($key == "RELATIONS")
-                                        break;
-                                $control = $this->{$key};
-                                if ($control instanceof TTextBox)
-                                        $arObj->{$key} = $control->Text;
-                                elseif ($control instanceof TCheckBox)
-                                        $arObj->{$key} = $control->Checked;
-                                elseif ($control instanceof TDatePicker)
-                                        $arObj->{$key} = $control->Date;
-                        } 
-                        catch (Exception $ex)
-                        {
-                                if ($throwExceptions)
-                                        throw $ex;
-                        }
-                }
-        }
+		public function tryToUpdateView($arObj, $throwExceptions = false)
+		{
+				$objAttrs = get_class_vars(get_class($arObj));
+				foreach (array_keys($objAttrs) as $key)
+				{
+						try
+						{
+								if ($key != "RELATIONS")
+								{
+										$control = $this->{$key};
+										if ($control instanceof TTextBox)
+												$control->Text = $arObj->{$key};
+										elseif ($control instanceof TCheckBox)
+												$control->Checked = (boolean) $arObj->{$key};
+										elseif ($control instanceof TDatePicker)
+												$control->Date = $arObj->{$key};
+								}
+								else
+								{
+										foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
+										{
+												$relControl = $this->{$relKey};
+												switch ($relValues[0])
+												{
+														case TActiveRecord::BELONGS_TO:
+														case TActiveRecord::HAS_ONE:
+																$relControl->Text = $arObj->{$relKey};
+																break;
+														case TActiveRecord::HAS_MANY:
+																if ($relControl instanceof TListControl)
+																{
+																		$relControl->DataSource = $arObj->{$relKey};
+																		$relControl->dataBind();
+																}
+																break;
+												}
+										}
+										break;
+								}
+						} 
+						catch (Exception $ex)
+						{
+								if ($throwExceptions)
+										throw $ex;
+						}
+				}
+		}
+		public function tryToUpdateAR($arObj, $throwExceptions = false)
+		{
+				$objAttrs = get_class_vars(get_class($arObj));
+				foreach (array_keys($objAttrs) as $key)
+				{
+						try
+						{
+								if ($key == "RELATIONS")
+										break;
+								$control = $this->{$key};
+								if ($control instanceof TTextBox)
+										$arObj->{$key} = $control->Text;
+								elseif ($control instanceof TCheckBox)
+										$arObj->{$key} = $control->Checked;
+								elseif ($control instanceof TDatePicker)
+										$arObj->{$key} = $control->Date;
+						} 
+						catch (Exception $ex)
+						{
+								if ($throwExceptions)
+										throw $ex;
+						}
+				}
+		}
 }
 class TForm extends TControl
 {
@@ -7536,13 +7536,13 @@ 
 	{
 		Prado::using('System.Web.UI.ActiveControls.TActivePageAdapter');
 		$this->setAdapter(new TActivePageAdapter($this));
-        $callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
-        if(strlen($callbackEventParameter) > 0)
-            $this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
-                if (($g=$this->getApplication()->getGlobalization(false))!==null &&
-            strtoupper($enc=$g->getCharset())!='UTF-8')
-                foreach ($this->_postData as $k=>$v)
-                	$this->_postData[$k]=self::decodeUTF8($v, $enc);
+		$callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
+		if(strlen($callbackEventParameter) > 0)
+			$this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
+				if (($g=$this->getApplication()->getGlobalization(false))!==null &&
+			strtoupper($enc=$g->getCharset())!='UTF-8')
+				foreach ($this->_postData as $k=>$v)
+					$this->_postData[$k]=self::decodeUTF8($v, $enc);
 		$this->onPreInit(null);
 		$this->initRecursive();
 		$this->onInitComplete(null);
@@ -9127,15 +9127,15 @@ 
 	  $component=new ReflectionClass('TComponent');
 	  $behaviors=$component->getStaticProperties();
 	  if(!isset($behaviors['_um']))
-	    return false;
+		return false;
 	  foreach($behaviors['_um'] as $name=>$list)
 	  {
-	    if(strtolower($class->getShortName())!==$name && !$class->isSubclassOf($name)) continue;
-	    foreach($list as $param)
-	    {
-	      if(method_exists($param->getBehavior(),$method))
-	        return true;
-	    }
+		if(strtolower($class->getShortName())!==$name && !$class->isSubclassOf($name)) continue;
+		foreach($list as $param)
+		{
+		  if(method_exists($param->getBehavior(),$method))
+			return true;
+		}
 	  }
 	  return false;
 	}

Spacing +3777 added lines, -3777 removed lines

@@ -11,17 +11,17 @@ 
  * Do not modify this file manually.
  */
 
-if(!defined('PRADO_DIR'))
-	define('PRADO_DIR',dirname(__FILE__));
-if(!defined('PRADO_CHMOD'))
-	define('PRADO_CHMOD',0777);
+if (!defined('PRADO_DIR'))
+	define('PRADO_DIR', dirname(__FILE__));
+if (!defined('PRADO_CHMOD'))
+	define('PRADO_CHMOD', 0777);
 class PradoBase
 {
-	const CLASS_FILE_EXT='.php';
-	private static $_aliases=array('System'=>PRADO_DIR);
-	private static $_usings=array();
-	private static $_application=null;
-	private static $_logger=null;
+	const CLASS_FILE_EXT = '.php';
+	private static $_aliases = array('System'=>PRADO_DIR);
+	private static $_usings = array();
+	private static $_application = null;
+	private static $_logger = null;
 	protected static $classExists = array();
 	public static function getVersion()
 	{
@@ -29,37 +29,37 @@ 
 	}
 	public static function initErrorHandlers()
 	{
-		set_error_handler(array('PradoBase','phpErrorHandler'));
-		set_exception_handler(array('PradoBase','exceptionHandler'));
+		set_error_handler(array('PradoBase', 'phpErrorHandler'));
+		set_exception_handler(array('PradoBase', 'exceptionHandler'));
 	}
 	public static function autoload($className)
 	{
-		include_once($className.self::CLASS_FILE_EXT);
-		if(!class_exists($className,false) && !interface_exists($className,false))
+		include_once($className . self::CLASS_FILE_EXT);
+		if (!class_exists($className, false) && !interface_exists($className, false))
 			self::fatalError("Class file for '$className' cannot be found.");
 	}
-	public static function poweredByPrado($logoType=0)
+	public static function poweredByPrado($logoType = 0)
 	{
-		$logoName=$logoType==1?'powered2':'powered';
-		if(self::$_application!==null)
+		$logoName = $logoType == 1 ? 'powered2' : 'powered';
+		if (self::$_application !== null)
 		{
-			$am=self::$_application->getAssetManager();
-			$url=$am->publishFilePath(self::getPathOfNamespace('System.'.$logoName,'.gif'));
+			$am = self::$_application->getAssetManager();
+			$url = $am->publishFilePath(self::getPathOfNamespace('System.' . $logoName, '.gif'));
 		}
 		else
-			$url='http://pradosoft.github.io/docs/'.$logoName.'.gif';
-		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="'.$url.'" style="border-width:0px;" alt="Powered by PRADO" /></a>';
+			$url = 'http://pradosoft.github.io/docs/' . $logoName . '.gif';
+		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="' . $url . '" style="border-width:0px;" alt="Powered by PRADO" /></a>';
 	}
-	public static function phpErrorHandler($errno,$errstr,$errfile,$errline)
+	public static function phpErrorHandler($errno, $errstr, $errfile, $errline)
 	{
-		if(error_reporting() & $errno)
-			throw new TPhpErrorException($errno,$errstr,$errfile,$errline);
+		if (error_reporting() & $errno)
+			throw new TPhpErrorException($errno, $errstr, $errfile, $errline);
 	}
 	public static function exceptionHandler($exception)
 	{
-		if(self::$_application!==null && ($errorHandler=self::$_application->getErrorHandler())!==null)
+		if (self::$_application !== null && ($errorHandler = self::$_application->getErrorHandler()) !== null)
 		{
-			$errorHandler->handleError(null,$exception);
+			$errorHandler->handleError(null, $exception);
 		}
 		else
 		{
@@ -69,9 +69,9 @@ 
 	}
 	public static function setApplication($application)
 	{
-		if(self::$_application!==null && !defined('PRADO_TEST_RUN'))
+		if (self::$_application !== null && !defined('PRADO_TEST_RUN'))
 			throw new TInvalidOperationException('prado_application_singleton_required');
-		self::$_application=$application;
+		self::$_application = $application;
 	}
 	public static function getApplication()
 	{
@@ -83,18 +83,18 @@ 
 	}
 	public static function createComponent($type)
 	{
-		if(!isset(self::$classExists[$type]))
+		if (!isset(self::$classExists[$type]))
 			self::$classExists[$type] = class_exists($type, false);
-		if( !isset(self::$_usings[$type]) && !self::$classExists[$type]) {
+		if (!isset(self::$_usings[$type]) && !self::$classExists[$type]) {
 			self::using($type);
 			self::$classExists[$type] = class_exists($type, false);
 		}
-		if( ($pos = strrpos($type, '.')) !== false)
-			$type = substr($type,$pos+1);
-		if(($n=func_num_args())>1)
+		if (($pos = strrpos($type, '.')) !== false)
+			$type = substr($type, $pos + 1);
+		if (($n = func_num_args()) > 1)
 		{
 			$args = func_get_args();
-			switch($n) {
+			switch ($n) {
 				case 2:
 					return new $type($args[1]);
 				break;
@@ -108,9 +108,9 @@ 
 					return new $type($args[1], $args[2], $args[3], $args[4]);
 				break;
 				default:
-					$s='$args[1]';
-					for($i=2;$i<$n;++$i)
-						$s.=",\$args[$i]";
+					$s = '$args[1]';
+					for ($i = 2; $i < $n; ++$i)
+						$s .= ",\$args[$i]";
 					eval("\$component=new $type($s);");
 					return $component;
 				break;
@@ -119,42 +119,42 @@ 
 		else
 			return new $type;
 	}
-	public static function using($namespace,$checkClassExistence=true)
+	public static function using($namespace, $checkClassExistence = true)
 	{
-		if(isset(self::$_usings[$namespace]) || class_exists($namespace,false))
+		if (isset(self::$_usings[$namespace]) || class_exists($namespace, false))
 			return;
-		if(($pos=strrpos($namespace,'.'))===false)  		{
+		if (($pos = strrpos($namespace, '.')) === false) {
 			try
 			{
-				include_once($namespace.self::CLASS_FILE_EXT);
+				include_once($namespace . self::CLASS_FILE_EXT);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
-				if($checkClassExistence && !class_exists($namespace,false))
-					throw new TInvalidOperationException('prado_component_unknown',$namespace,$e->getMessage());
+				if ($checkClassExistence && !class_exists($namespace, false))
+					throw new TInvalidOperationException('prado_component_unknown', $namespace, $e->getMessage());
 				else
 					throw $e;
 			}
 		}
-		else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
+		else if (($path = self::getPathOfNamespace($namespace, self::CLASS_FILE_EXT)) !== null)
 		{
-			$className=substr($namespace,$pos+1);
-			if($className==='*')  			{
-				self::$_usings[$namespace]=$path;
-				set_include_path(get_include_path().PATH_SEPARATOR.$path);
+			$className = substr($namespace, $pos + 1);
+			if ($className === '*') {
+				self::$_usings[$namespace] = $path;
+				set_include_path(get_include_path() . PATH_SEPARATOR . $path);
 			}
-			else  			{
-				self::$_usings[$namespace]=$path;
-				if(!$checkClassExistence || !class_exists($className,false))
+			else {
+				self::$_usings[$namespace] = $path;
+				if (!$checkClassExistence || !class_exists($className, false))
 				{
 					try
 					{
 						include_once($path);
 					}
-					catch(Exception $e)
+					catch (Exception $e)
 					{
-						if($checkClassExistence && !class_exists($className,false))
-							throw new TInvalidOperationException('prado_component_unknown',$className,$e->getMessage());
+						if ($checkClassExistence && !class_exists($className, false))
+							throw new TInvalidOperationException('prado_component_unknown', $className, $e->getMessage());
 						else
 							throw $e;
 					}
@@ -162,77 +162,77 @@ 
 			}
 		}
 		else
-			throw new TInvalidDataValueException('prado_using_invalid',$namespace);
+			throw new TInvalidDataValueException('prado_using_invalid', $namespace);
 	}
-	public static function getPathOfNamespace($namespace, $ext='')
+	public static function getPathOfNamespace($namespace, $ext = '')
 	{
-		if(self::CLASS_FILE_EXT === $ext || empty($ext))
+		if (self::CLASS_FILE_EXT === $ext || empty($ext))
 		{
-			if(isset(self::$_usings[$namespace]))
+			if (isset(self::$_usings[$namespace]))
 				return self::$_usings[$namespace];
-			if(isset(self::$_aliases[$namespace]))
+			if (isset(self::$_aliases[$namespace]))
 				return self::$_aliases[$namespace];
 		}
-		$segs = explode('.',$namespace);
+		$segs = explode('.', $namespace);
 		$alias = array_shift($segs);
-		if(null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias)))
-			return rtrim($root.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR ,$segs),'/\\').(($file === '*') ? '' : DIRECTORY_SEPARATOR.$file.$ext);
+		if (null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias)))
+			return rtrim($root . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $segs), '/\\') . (($file === '*') ? '' : DIRECTORY_SEPARATOR . $file . $ext);
 		return null;
 	}
 	public static function getPathOfAlias($alias)
 	{
-		return isset(self::$_aliases[$alias])?self::$_aliases[$alias]:null;
+		return isset(self::$_aliases[$alias]) ? self::$_aliases[$alias] : null;
 	}
 	protected static function getPathAliases()
 	{
 		return self::$_aliases;
 	}
-	public static function setPathOfAlias($alias,$path)
+	public static function setPathOfAlias($alias, $path)
 	{
-		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
-			throw new TInvalidOperationException('prado_alias_redefined',$alias);
-		else if(($rp=realpath($path))!==false && is_dir($rp))
+		if (isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
+			throw new TInvalidOperationException('prado_alias_redefined', $alias);
+		else if (($rp = realpath($path)) !== false && is_dir($rp))
 		{
-			if(strpos($alias,'.')===false)
-				self::$_aliases[$alias]=$rp;
+			if (strpos($alias, '.') === false)
+				self::$_aliases[$alias] = $rp;
 			else
-				throw new TInvalidDataValueException('prado_aliasname_invalid',$alias);
+				throw new TInvalidDataValueException('prado_aliasname_invalid', $alias);
 		}
 		else
-			throw new TInvalidDataValueException('prado_alias_invalid',$alias,$path);
+			throw new TInvalidDataValueException('prado_alias_invalid', $alias, $path);
 	}
 	public static function fatalError($msg)
 	{
 		echo '<h1>Fatal Error</h1>';
-		echo '<p>'.$msg.'</p>';
-		if(!function_exists('debug_backtrace'))
+		echo '<p>' . $msg . '</p>';
+		if (!function_exists('debug_backtrace'))
 			return;
 		echo '<h2>Debug Backtrace</h2>';
 		echo '<pre>';
-		$index=-1;
-		foreach(debug_backtrace() as $t)
+		$index = -1;
+		foreach (debug_backtrace() as $t)
 		{
 			$index++;
-			if($index==0)  				continue;
-			echo '#'.$index.' ';
-			if(isset($t['file']))
+			if ($index == 0)  				continue;
+			echo '#' . $index . ' ';
+			if (isset($t['file']))
 				echo basename($t['file']) . ':' . $t['line'];
 			else
 				 echo '<PHP inner-code>';
 			echo ' -- ';
-			if(isset($t['class']))
+			if (isset($t['class']))
 				echo $t['class'] . $t['type'];
 			echo $t['function'] . '(';
-			if(isset($t['args']) && sizeof($t['args']) > 0)
+			if (isset($t['args']) && sizeof($t['args']) > 0)
 			{
-				$count=0;
-				foreach($t['args'] as $item)
+				$count = 0;
+				foreach ($t['args'] as $item)
 				{
-					if(is_string($item))
+					if (is_string($item))
 					{
-						$str=htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
+						$str = htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
 						if (strlen($item) > 70)
-							echo "'". substr($str, 0, 70) . "...'";
+							echo "'" . substr($str, 0, 70) . "...'";
 						else
 							echo "'" . $str . "'";
 					}
@@ -260,102 +260,102 @@ 
 	}
 	public static function getUserLanguages()
 	{
-		static $languages=null;
-		if($languages===null)
+		static $languages = null;
+		if ($languages === null)
 		{
-			if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
-				$languages[0]='en';
+			if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
+				$languages[0] = 'en';
 			else
 			{
-				$languages=array();
-				foreach(explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
+				$languages = array();
+				foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
 				{
-					$array=explode(';q=',trim($language));
-					$languages[trim($array[0])]=isset($array[1])?(float)$array[1]:1.0;
+					$array = explode(';q=', trim($language));
+					$languages[trim($array[0])] = isset($array[1]) ? (float) $array[1] : 1.0;
 				}
 				arsort($languages);
-				$languages=array_keys($languages);
-				if(empty($languages))
-					$languages[0]='en';
+				$languages = array_keys($languages);
+				if (empty($languages))
+					$languages[0] = 'en';
 			}
 		}
 		return $languages;
 	}
 	public static function getPreferredLanguage()
 	{
-		static $language=null;
-		if($language===null)
+		static $language = null;
+		if ($language === null)
 		{
-			$langs=Prado::getUserLanguages();
-			$lang=explode('-',$langs[0]);
-			if(empty($lang[0]) || !ctype_alpha($lang[0]))
-				$language='en';
+			$langs = Prado::getUserLanguages();
+			$lang = explode('-', $langs[0]);
+			if (empty($lang[0]) || !ctype_alpha($lang[0]))
+				$language = 'en';
 			else
-				$language=$lang[0];
+				$language = $lang[0];
 		}
 		return $language;
 	}
-	public static function trace($msg,$category='Uncategorized',$ctl=null)
+	public static function trace($msg, $category = 'Uncategorized', $ctl = null)
 	{
-		if(self::$_application && self::$_application->getMode()===TApplicationMode::Performance)
+		if (self::$_application && self::$_application->getMode() === TApplicationMode::Performance)
 			return;
-		if(!self::$_application || self::$_application->getMode()===TApplicationMode::Debug)
+		if (!self::$_application || self::$_application->getMode() === TApplicationMode::Debug)
 		{
-			$trace=debug_backtrace();
-			if(isset($trace[0]['file']) && isset($trace[0]['line']))
-				$msg.=" (line {$trace[0]['line']}, {$trace[0]['file']})";
-			$level=TLogger::DEBUG;
+			$trace = debug_backtrace();
+			if (isset($trace[0]['file']) && isset($trace[0]['line']))
+				$msg .= " (line {$trace[0]['line']}, {$trace[0]['file']})";
+			$level = TLogger::DEBUG;
 		}
 		else
-			$level=TLogger::INFO;
-		self::log($msg,$level,$category,$ctl);
+			$level = TLogger::INFO;
+		self::log($msg, $level, $category, $ctl);
 	}
-	public static function log($msg,$level=TLogger::INFO,$category='Uncategorized',$ctl=null)
+	public static function log($msg, $level = TLogger::INFO, $category = 'Uncategorized', $ctl = null)
 	{
-		if(self::$_logger===null)
-			self::$_logger=new TLogger;
-		self::$_logger->log($msg,$level,$category,$ctl);
+		if (self::$_logger === null)
+			self::$_logger = new TLogger;
+		self::$_logger->log($msg, $level, $category, $ctl);
 	}
 	public static function getLogger()
 	{
-		if(self::$_logger===null)
-			self::$_logger=new TLogger;
+		if (self::$_logger === null)
+			self::$_logger = new TLogger;
 		return self::$_logger;
 	}
-	public static function varDump($var,$depth=10,$highlight=false)
+	public static function varDump($var, $depth = 10, $highlight = false)
 	{
 		Prado::using('System.Util.TVarDumper');
-		return TVarDumper::dump($var,$depth,$highlight);
+		return TVarDumper::dump($var, $depth, $highlight);
 	}
-	public static function localize($text, $parameters=array(), $catalogue=null, $charset=null)
+	public static function localize($text, $parameters = array(), $catalogue = null, $charset = null)
 	{
 		Prado::using('System.I18N.Translation');
 		$app = Prado::getApplication()->getGlobalization(false);
 		$params = array();
-		foreach($parameters as $key => $value)
-			$params['{'.$key.'}'] = $value;
-				if($app===null || ($config = $app->getTranslationConfiguration())===null)
+		foreach ($parameters as $key => $value)
+			$params['{' . $key . '}'] = $value;
+				if ($app === null || ($config = $app->getTranslationConfiguration()) === null)
 			return strtr($text, $params);
-		if ($catalogue===null)
-			$catalogue=isset($config['catalogue'])?$config['catalogue']:'messages';
+		if ($catalogue === null)
+			$catalogue = isset($config['catalogue']) ? $config['catalogue'] : 'messages';
 		Translation::init($catalogue);
-				$appCharset = $app===null ? '' : $app->getCharset();
-				$defaultCharset = ($app===null) ? 'UTF-8' : $app->getDefaultCharset();
-				if(empty($charset)) $charset = $appCharset;
-		if(empty($charset)) $charset = $defaultCharset;
-		return Translation::formatter($catalogue)->format($text,$params,$catalogue,$charset);
+				$appCharset = $app === null ? '' : $app->getCharset();
+				$defaultCharset = ($app === null) ? 'UTF-8' : $app->getDefaultCharset();
+				if (empty($charset)) $charset = $appCharset;
+		if (empty($charset)) $charset = $defaultCharset;
+		return Translation::formatter($catalogue)->format($text, $params, $catalogue, $charset);
 	}
 }
 PradoBase::using('System.TComponent');
 PradoBase::using('System.Exceptions.TException');
 PradoBase::using('System.Util.TLogger');
-if(!class_exists('Prado',false))
+if (!class_exists('Prado', false))
 {
 	class Prado extends PradoBase
 	{
 	}
 }
-spl_autoload_register(array('Prado','autoload'));
+spl_autoload_register(array('Prado', 'autoload'));
 Prado::initErrorHandlers();
 interface IModule
 {
@@ -397,8 +397,8 @@ 
 interface ICache
 {
 	public function get($id);
-	public function set($id,$value,$expire=0,$dependency=null);
-	public function add($id,$value,$expire=0,$dependency=null);
+	public function set($id, $value, $expire = 0, $dependency = null);
+	public function add($id, $value, $expire = 0, $dependency = null);
 	public function delete($id);
 	public function flush();
 }
@@ -459,15 +459,15 @@ 
 	{
 		return Prado::getApplication()->getUser();
 	}
-	public function publishAsset($assetPath,$className=null)
+	public function publishAsset($assetPath, $className = null)
 	{
-		if($className===null)
-			$className=get_class($this);
-		$class=new ReflectionClass($className);
-		$fullPath=dirname($class->getFileName()).DIRECTORY_SEPARATOR.$assetPath;
+		if ($className === null)
+			$className = get_class($this);
+		$class = new ReflectionClass($className);
+		$fullPath = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . $assetPath;
 		return $this->publishFilePath($fullPath);
 	}
-	public function publishFilePath($fullPath, $checkTimestamp=false)
+	public function publishFilePath($fullPath, $checkTimestamp = false)
 	{
 		return Prado::getApplication()->getAssetManager()->publishFilePath($fullPath, $checkTimestamp);
 	}
@@ -484,13 +484,13 @@ 
 	}
 	public function setID($value)
 	{
-		$this->_id=$value;
+		$this->_id = $value;
 	}
 }
 abstract class TService extends TApplicationComponent implements IService
 {
 	private $_id;
-	private $_enabled=true;
+	private $_enabled = true;
 	public function init($config)
 	{
 	}
@@ -500,7 +500,7 @@ 
 	}
 	public function setID($value)
 	{
-		$this->_id=$value;
+		$this->_id = $value;
 	}
 	public function getEnabled()
 	{
@@ -508,7 +508,7 @@ 
 	}
 	public function setEnabled($value)
 	{
-		$this->_enabled=TPropertyValue::ensureBoolean($value);
+		$this->_enabled = TPropertyValue::ensureBoolean($value);
 	}
 	public function run()
 	{
@@ -516,239 +516,239 @@ 
 }
 class TErrorHandler extends TModule
 {
-	const ERROR_FILE_NAME='error';
-	const EXCEPTION_FILE_NAME='exception';
-	const SOURCE_LINES=12;
-	private $_templatePath=null;
+	const ERROR_FILE_NAME = 'error';
+	const EXCEPTION_FILE_NAME = 'exception';
+	const SOURCE_LINES = 12;
+	private $_templatePath = null;
 	public function init($config)
 	{
 		$this->getApplication()->setErrorHandler($this);
 	}
 	public function getErrorTemplatePath()
 	{
-		if($this->_templatePath===null)
-			$this->_templatePath=Prado::getFrameworkPath().'/Exceptions/templates';
+		if ($this->_templatePath === null)
+			$this->_templatePath = Prado::getFrameworkPath() . '/Exceptions/templates';
 		return $this->_templatePath;
 	}
 	public function setErrorTemplatePath($value)
 	{
-		if(($templatePath=Prado::getPathOfNamespace($value))!==null && is_dir($templatePath))
-			$this->_templatePath=$templatePath;
+		if (($templatePath = Prado::getPathOfNamespace($value)) !== null && is_dir($templatePath))
+			$this->_templatePath = $templatePath;
 		else
-			throw new TConfigurationException('errorhandler_errortemplatepath_invalid',$value);
+			throw new TConfigurationException('errorhandler_errortemplatepath_invalid', $value);
 	}
-	public function handleError($sender,$param)
+	public function handleError($sender, $param)
 	{
-		static $handling=false;
+		static $handling = false;
 								restore_error_handler();
 		restore_exception_handler();
-				if($handling)
+				if ($handling)
 			$this->handleRecursiveError($param);
 		else
 		{
-			$handling=true;
-			if(($response=$this->getResponse())!==null)
+			$handling = true;
+			if (($response = $this->getResponse()) !== null)
 				$response->clear();
-			if(!headers_sent())
+			if (!headers_sent())
 				header('Content-Type: text/html; charset=UTF-8');
-			if($param instanceof THttpException)
-				$this->handleExternalError($param->getStatusCode(),$param);
-			else if($this->getApplication()->getMode()===TApplicationMode::Debug)
+			if ($param instanceof THttpException)
+				$this->handleExternalError($param->getStatusCode(), $param);
+			else if ($this->getApplication()->getMode() === TApplicationMode::Debug)
 				$this->displayException($param);
 			else
-				$this->handleExternalError(500,$param);
+				$this->handleExternalError(500, $param);
 		}
 	}
-	protected static function hideSecurityRelated($value, $exception=null)
+	protected static function hideSecurityRelated($value, $exception = null)
 	{
 		$aRpl = array();
-		if($exception !== null && $exception instanceof Exception)
+		if ($exception !== null && $exception instanceof Exception)
 		{
 			$aTrace = $exception->getTrace();
-			foreach($aTrace as $item)
+			foreach ($aTrace as $item)
 			{
-				if(isset($item['file']))
+				if (isset($item['file']))
 					$aRpl[dirname($item['file']) . DIRECTORY_SEPARATOR] = '<hidden>' . DIRECTORY_SEPARATOR;
 			}
 		}
 		$aRpl[$_SERVER['DOCUMENT_ROOT']] = '${DocumentRoot}';
 		$aRpl[str_replace('/', DIRECTORY_SEPARATOR, $_SERVER['DOCUMENT_ROOT'])] = '${DocumentRoot}';
 		$aRpl[PRADO_DIR . DIRECTORY_SEPARATOR] = '${PradoFramework}' . DIRECTORY_SEPARATOR;
-		if(isset($aRpl[DIRECTORY_SEPARATOR])) unset($aRpl[DIRECTORY_SEPARATOR]);
+		if (isset($aRpl[DIRECTORY_SEPARATOR])) unset($aRpl[DIRECTORY_SEPARATOR]);
 		$aRpl = array_reverse($aRpl, true);
 		return str_replace(array_keys($aRpl), $aRpl, $value);
 	}
-	protected function handleExternalError($statusCode,$exception)
+	protected function handleExternalError($statusCode, $exception)
 	{
-		if(!($exception instanceof THttpException))
+		if (!($exception instanceof THttpException))
 			error_log($exception->__toString());
-		$content=$this->getErrorTemplate($statusCode,$exception);
-		$serverAdmin=isset($_SERVER['SERVER_ADMIN'])?$_SERVER['SERVER_ADMIN']:'';
-		$isDebug = $this->getApplication()->getMode()===TApplicationMode::Debug;
+		$content = $this->getErrorTemplate($statusCode, $exception);
+		$serverAdmin = isset($_SERVER['SERVER_ADMIN']) ? $_SERVER['SERVER_ADMIN'] : '';
+		$isDebug = $this->getApplication()->getMode() === TApplicationMode::Debug;
 		$errorMessage = $exception->getMessage();
-		if($isDebug)
-			$version=$_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
+		if ($isDebug)
+			$version = $_SERVER['SERVER_SOFTWARE'] . ' <a href="https://github.com/pradosoft/prado">PRADO</a>/' . Prado::getVersion();
 		else
 		{
-			$version='';
+			$version = '';
 			$errorMessage = self::hideSecurityRelated($errorMessage, $exception);
 		}
-		$tokens=array(
+		$tokens = array(
 			'%%StatusCode%%' => "$statusCode",
 			'%%ErrorMessage%%' => htmlspecialchars($errorMessage),
 			'%%ServerAdmin%%' => $serverAdmin,
 			'%%Version%%' => $version,
-			'%%Time%%' => @strftime('%Y-%m-%d %H:%M',time())
+			'%%Time%%' => @strftime('%Y-%m-%d %H:%M', time())
 		);
 		$this->getApplication()->getResponse()->setStatusCode($statusCode, $isDebug ? $exception->getMessage() : null);
-		echo strtr($content,$tokens);
+		echo strtr($content, $tokens);
 	}
 	protected function handleRecursiveError($exception)
 	{
-		if($this->getApplication()->getMode()===TApplicationMode::Debug)
+		if ($this->getApplication()->getMode() === TApplicationMode::Debug)
 		{
 			echo "<html><head><title>Recursive Error</title></head>\n";
 			echo "<body><h1>Recursive Error</h1>\n";
-			echo "<pre>".$exception->__toString()."</pre>\n";
+			echo "<pre>" . $exception->__toString() . "</pre>\n";
 			echo "</body></html>";
 		}
 		else
 		{
-			error_log("Error happened while processing an existing error:\n".$exception->__toString());
+			error_log("Error happened while processing an existing error:\n" . $exception->__toString());
 			header('HTTP/1.0 500 Internal Error');
 		}
 	}
 	protected function displayException($exception)
 	{
-		if(php_sapi_name()==='cli')
+		if (php_sapi_name() === 'cli')
 		{
-			echo $exception->getMessage()."\n";
+			echo $exception->getMessage() . "\n";
 			echo $exception->getTraceAsString();
 			return;
 		}
-		if($exception instanceof TTemplateException)
+		if ($exception instanceof TTemplateException)
 		{
-			$fileName=$exception->getTemplateFile();
-			$lines=empty($fileName)?explode("\n",$exception->getTemplateSource()):@file($fileName);
-			$source=$this->getSourceCode($lines,$exception->getLineNumber());
-			if($fileName==='')
-				$fileName='---embedded template---';
-			$errorLine=$exception->getLineNumber();
+			$fileName = $exception->getTemplateFile();
+			$lines = empty($fileName) ? explode("\n", $exception->getTemplateSource()) : @file($fileName);
+			$source = $this->getSourceCode($lines, $exception->getLineNumber());
+			if ($fileName === '')
+				$fileName = '---embedded template---';
+			$errorLine = $exception->getLineNumber();
 		}
 		else
 		{
-			if(($trace=$this->getExactTrace($exception))!==null)
+			if (($trace = $this->getExactTrace($exception)) !== null)
 			{
-				$fileName=$trace['file'];
-				$errorLine=$trace['line'];
+				$fileName = $trace['file'];
+				$errorLine = $trace['line'];
 			}
 			else
 			{
-				$fileName=$exception->getFile();
-				$errorLine=$exception->getLine();
+				$fileName = $exception->getFile();
+				$errorLine = $exception->getLine();
 			}
-			$source=$this->getSourceCode(@file($fileName),$errorLine);
+			$source = $this->getSourceCode(@file($fileName), $errorLine);
 		}
-		if($this->getApplication()->getMode()===TApplicationMode::Debug)
-			$version=$_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
+		if ($this->getApplication()->getMode() === TApplicationMode::Debug)
+			$version = $_SERVER['SERVER_SOFTWARE'] . ' <a href="https://github.com/pradosoft/prado">PRADO</a>/' . Prado::getVersion();
 		else
-			$version='';
-		$tokens=array(
+			$version = '';
+		$tokens = array(
 			'%%ErrorType%%' => get_class($exception),
 			'%%ErrorMessage%%' => $this->addLink(htmlspecialchars($exception->getMessage())),
-			'%%SourceFile%%' => htmlspecialchars($fileName).' ('.$errorLine.')',
+			'%%SourceFile%%' => htmlspecialchars($fileName) . ' (' . $errorLine . ')',
 			'%%SourceCode%%' => $source,
 			'%%StackTrace%%' => htmlspecialchars($exception->getTraceAsString()),
 			'%%Version%%' => $version,
-			'%%Time%%' => @strftime('%Y-%m-%d %H:%M',time())
+			'%%Time%%' => @strftime('%Y-%m-%d %H:%M', time())
 		);
-		$content=$this->getExceptionTemplate($exception);
-		echo strtr($content,$tokens);
+		$content = $this->getExceptionTemplate($exception);
+		echo strtr($content, $tokens);
 	}
 	protected function getExceptionTemplate($exception)
 	{
-		$lang=Prado::getPreferredLanguage();
-		$exceptionFile=Prado::getFrameworkPath().'/Exceptions/templates/'.self::EXCEPTION_FILE_NAME.'-'.$lang.'.html';
-		if(!is_file($exceptionFile))
-			$exceptionFile=Prado::getFrameworkPath().'/Exceptions/templates/'.self::EXCEPTION_FILE_NAME.'.html';
-		if(($content=@file_get_contents($exceptionFile))===false)
+		$lang = Prado::getPreferredLanguage();
+		$exceptionFile = Prado::getFrameworkPath() . '/Exceptions/templates/' . self::EXCEPTION_FILE_NAME . '-' . $lang . '.html';
+		if (!is_file($exceptionFile))
+			$exceptionFile = Prado::getFrameworkPath() . '/Exceptions/templates/' . self::EXCEPTION_FILE_NAME . '.html';
+		if (($content = @file_get_contents($exceptionFile)) === false)
 			die("Unable to open exception template file '$exceptionFile'.");
 		return $content;
 	}
-	protected function getErrorTemplate($statusCode,$exception)
+	protected function getErrorTemplate($statusCode, $exception)
 	{
-		$base=$this->getErrorTemplatePath().DIRECTORY_SEPARATOR.self::ERROR_FILE_NAME;
-		$lang=Prado::getPreferredLanguage();
-		if(is_file("$base$statusCode-$lang.html"))
-			$errorFile="$base$statusCode-$lang.html";
-		else if(is_file("$base$statusCode.html"))
-			$errorFile="$base$statusCode.html";
-		else if(is_file("$base-$lang.html"))
-			$errorFile="$base-$lang.html";
+		$base = $this->getErrorTemplatePath() . DIRECTORY_SEPARATOR . self::ERROR_FILE_NAME;
+		$lang = Prado::getPreferredLanguage();
+		if (is_file("$base$statusCode-$lang.html"))
+			$errorFile = "$base$statusCode-$lang.html";
+		else if (is_file("$base$statusCode.html"))
+			$errorFile = "$base$statusCode.html";
+		else if (is_file("$base-$lang.html"))
+			$errorFile = "$base-$lang.html";
 		else
-			$errorFile="$base.html";
-		if(($content=@file_get_contents($errorFile))===false)
+			$errorFile = "$base.html";
+		if (($content = @file_get_contents($errorFile)) === false)
 			die("Unable to open error template file '$errorFile'.");
 		return $content;
 	}
 	private function getExactTrace($exception)
 	{
-		$trace=$exception->getTrace();
-		$result=null;
-						if($exception instanceof TPhpErrorException)
-			$result=isset($trace[0]['file'])?$trace[0]:$trace[1];
-		else if($exception instanceof TInvalidOperationException)
+		$trace = $exception->getTrace();
+		$result = null;
+						if ($exception instanceof TPhpErrorException)
+			$result = isset($trace[0]['file']) ? $trace[0] : $trace[1];
+		else if ($exception instanceof TInvalidOperationException)
 		{
-						if(($result=$this->getPropertyAccessTrace($trace,'__get'))===null)
-				$result=$this->getPropertyAccessTrace($trace,'__set');
+						if (($result = $this->getPropertyAccessTrace($trace, '__get')) === null)
+				$result = $this->getPropertyAccessTrace($trace, '__set');
 		}
-		if($result!==null && strpos($result['file'],': eval()\'d code')!==false)
+		if ($result !== null && strpos($result['file'], ': eval()\'d code') !== false)
 			return null;
 		return $result;
 	}
-	private function getPropertyAccessTrace($trace,$pattern)
+	private function getPropertyAccessTrace($trace, $pattern)
 	{
-		$result=null;
-		foreach($trace as $t)
+		$result = null;
+		foreach ($trace as $t)
 		{
-			if(isset($t['function']) && $t['function']===$pattern)
-				$result=$t;
+			if (isset($t['function']) && $t['function'] === $pattern)
+				$result = $t;
 			else
 				break;
 		}
 		return $result;
 	}
-	private function getSourceCode($lines,$errorLine)
+	private function getSourceCode($lines, $errorLine)
 	{
-		$beginLine=$errorLine-self::SOURCE_LINES>=0?$errorLine-self::SOURCE_LINES:0;
-		$endLine=$errorLine+self::SOURCE_LINES<=count($lines)?$errorLine+self::SOURCE_LINES:count($lines);
-		$source='';
-		for($i=$beginLine;$i<$endLine;++$i)
+		$beginLine = $errorLine - self::SOURCE_LINES >= 0 ? $errorLine - self::SOURCE_LINES : 0;
+		$endLine = $errorLine + self::SOURCE_LINES <= count($lines) ? $errorLine + self::SOURCE_LINES : count($lines);
+		$source = '';
+		for ($i = $beginLine; $i < $endLine; ++$i)
 		{
-			if($i===$errorLine-1)
+			if ($i === $errorLine - 1)
 			{
-				$line=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
-				$source.="<div class=\"error\">".$line."</div>";
+				$line = htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
+				$source .= "<div class=\"error\">" . $line . "</div>";
 			}
 			else
-				$source.=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
+				$source .= htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
 		}
 		return $source;
 	}
 	private function addLink($message)
 	{
-		$baseUrl='http://pradosoft.github.io/docs/manual/class-';
-		return preg_replace('/\b(T[A-Z]\w+)\b/',"<a href=\"$baseUrl/\${1}\" target=\"_blank\">\${1}</a>",$message);
+		$baseUrl = 'http://pradosoft.github.io/docs/manual/class-';
+		return preg_replace('/\b(T[A-Z]\w+)\b/', "<a href=\"$baseUrl/\${1}\" target=\"_blank\">\${1}</a>", $message);
 	}
 }
-class TList extends TComponent implements IteratorAggregate,ArrayAccess,Countable
+class TList extends TComponent implements IteratorAggregate, ArrayAccess, Countable
 {
-	private $_d=array();
-	private $_c=0;
-	private $_r=false;
-	public function __construct($data=null,$readOnly=false)
+	private $_d = array();
+	private $_c = 0;
+	private $_r = false;
+	public function __construct($data = null, $readOnly = false)
 	{
-		if($data!==null)
+		if ($data !== null)
 			$this->copyFrom($data);
 		$this->setReadOnly($readOnly);
 	}
@@ -758,11 +758,11 @@ 
 	}
 	protected function setReadOnly($value)
 	{
-		$this->_r=TPropertyValue::ensureBoolean($value);
+		$this->_r = TPropertyValue::ensureBoolean($value);
 	}
 	public function getIterator()
 	{
-		return new ArrayIterator( $this->_d );
+		return new ArrayIterator($this->_d);
 	}
 	public function count()
 	{
@@ -774,38 +774,38 @@ 
 	}
 	public function itemAt($index)
 	{
-		if($index>=0 && $index<$this->_c)
+		if ($index >= 0 && $index < $this->_c)
 			return $this->_d[$index];
 		else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+			throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
 	public function add($item)
 	{
-		$this->insertAt($this->_c,$item);
-		return $this->_c-1;
+		$this->insertAt($this->_c, $item);
+		return $this->_c - 1;
 	}
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if(!$this->_r)
+		if (!$this->_r)
 		{
-			if($index===$this->_c)
-				$this->_d[$this->_c++]=$item;
-			else if($index>=0 && $index<$this->_c)
+			if ($index === $this->_c)
+				$this->_d[$this->_c++] = $item;
+			else if ($index >= 0 && $index < $this->_c)
 			{
-				array_splice($this->_d,$index,0,array($item));
+				array_splice($this->_d, $index, 0, array($item));
 				$this->_c++;
 			}
 			else
-				throw new TInvalidDataValueException('list_index_invalid',$index);
+				throw new TInvalidDataValueException('list_index_invalid', $index);
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 	public function remove($item)
 	{
-		if(!$this->_r)
+		if (!$this->_r)
 		{
-			if(($index=$this->indexOf($item))>=0)
+			if (($index = $this->indexOf($item)) >= 0)
 			{
 				$this->removeAt($index);
 				return $index;
@@ -814,69 +814,69 @@ 
 				throw new TInvalidDataValueException('list_item_inexistent');
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 	public function removeAt($index)
 	{
-		if(!$this->_r)
+		if (!$this->_r)
 		{
-			if($index>=0 && $index<$this->_c)
+			if ($index >= 0 && $index < $this->_c)
 			{
 				$this->_c--;
-				if($index===$this->_c)
+				if ($index === $this->_c)
 					return array_pop($this->_d);
 				else
 				{
-					$item=$this->_d[$index];
-					array_splice($this->_d,$index,1);
+					$item = $this->_d[$index];
+					array_splice($this->_d, $index, 1);
 					return $item;
 				}
 			}
 			else
-				throw new TInvalidDataValueException('list_index_invalid',$index);
+				throw new TInvalidDataValueException('list_index_invalid', $index);
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 	public function clear()
 	{
-		for($i=$this->_c-1;$i>=0;--$i)
+		for ($i = $this->_c - 1; $i >= 0; --$i)
 			$this->removeAt($i);
 	}
 	public function contains($item)
 	{
-		return $this->indexOf($item)>=0;
+		return $this->indexOf($item) >= 0;
 	}
 	public function indexOf($item)
 	{
-		if(($index=array_search($item,$this->_d,true))===false)
+		if (($index = array_search($item, $this->_d, true)) === false)
 			return -1;
 		else
 			return $index;
 	}
 	public function insertBefore($baseitem, $item)
 	{
-		if(!$this->_r)
+		if (!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
+			if (($index = $this->indexOf($baseitem)) == -1)
 				throw new TInvalidDataValueException('list_item_inexistent');
 			$this->insertAt($index, $item);
 			return $index;
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 	public function insertAfter($baseitem, $item)
 	{
-		if(!$this->_r)
+		if (!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
+			if (($index = $this->indexOf($baseitem)) == -1)
 				throw new TInvalidDataValueException('list_item_inexistent');
 			$this->insertAt($index + 1, $item);
 			return $index + 1;
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 	public function toArray()
 	{
@@ -884,42 +884,42 @@ 
 	}
 	public function copyFrom($data)
 	{
-		if(is_array($data) || ($data instanceof Traversable))
+		if (is_array($data) || ($data instanceof Traversable))
 		{
-			if($this->_c>0)
+			if ($this->_c > 0)
 				$this->clear();
-			foreach($data as $item)
+			foreach ($data as $item)
 				$this->add($item);
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 	public function mergeWith($data)
 	{
-		if(is_array($data) || ($data instanceof Traversable))
+		if (is_array($data) || ($data instanceof Traversable))
 		{
-			foreach($data as $item)
+			foreach ($data as $item)
 				$this->add($item);
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 	public function offsetExists($offset)
 	{
-		return ($offset>=0 && $offset<$this->_c);
+		return ($offset >= 0 && $offset < $this->_c);
 	}
 	public function offsetGet($offset)
 	{
 		return $this->itemAt($offset);
 	}
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		if($offset===null || $offset===$this->_c)
-			$this->insertAt($this->_c,$item);
+		if ($offset === null || $offset === $this->_c)
+			$this->insertAt($this->_c, $item);
 		else
 		{
 			$this->removeAt($offset);
-			$this->insertAt($offset,$item);
+			$this->insertAt($offset, $item);
 		}
 	}
 	public function offsetUnset($offset)
@@ -934,13 +934,13 @@ 
 	private $_c;
 	public function __construct(&$data)
 	{
-		$this->_d=&$data;
-		$this->_i=0;
-		$this->_c=count($this->_d);
+		$this->_d = &$data;
+		$this->_i = 0;
+		$this->_c = count($this->_d);
 	}
 	public function rewind()
 	{
-		$this->_i=0;
+		$this->_i = 0;
 	}
 	public function key()
 	{
@@ -956,23 +956,23 @@ 
 	}
 	public function valid()
 	{
-		return $this->_i<$this->_c;
+		return $this->_i < $this->_c;
 	}
 }
 abstract class TCache extends TModule implements ICache, ArrayAccess
 {
-	private $_prefix=null;
-	private $_primary=true;
+	private $_prefix = null;
+	private $_primary = true;
 	public function init($config)
 	{
-		if($this->_prefix===null)
-			$this->_prefix=$this->getApplication()->getUniqueID();
-		if($this->_primary)
+		if ($this->_prefix === null)
+			$this->_prefix = $this->getApplication()->getUniqueID();
+		if ($this->_primary)
 		{
-			if($this->getApplication()->getCache()===null)
+			if ($this->getApplication()->getCache() === null)
 				$this->getApplication()->setCache($this);
 			else
-				throw new TConfigurationException('cache_primary_duplicated',get_class($this));
+				throw new TConfigurationException('cache_primary_duplicated', get_class($this));
 		}
 	}
 	public function getPrimaryCache()
@@ -981,7 +981,7 @@ 
 	}
 	public function setPrimaryCache($value)
 	{
-		$this->_primary=TPropertyValue::ensureBoolean($value);
+		$this->_primary = TPropertyValue::ensureBoolean($value);
 	}
 	public function getKeyPrefix()
 	{
@@ -989,39 +989,39 @@ 
 	}
 	public function setKeyPrefix($value)
 	{
-		$this->_prefix=$value;
+		$this->_prefix = $value;
 	}
 	protected function generateUniqueKey($key)
 	{
-		return md5($this->_prefix.$key);
+		return md5($this->_prefix . $key);
 	}
 	public function get($id)
 	{
-		if(($data=$this->getValue($this->generateUniqueKey($id)))!==false)
+		if (($data = $this->getValue($this->generateUniqueKey($id))) !== false)
 		{
-			if(!is_array($data))
+			if (!is_array($data))
 				return false;
-			if(!($data[1] instanceof ICacheDependency) || !$data[1]->getHasChanged())
+			if (!($data[1] instanceof ICacheDependency) || !$data[1]->getHasChanged())
 				return $data[0];
 		}
 		return false;
 	}
-	public function set($id,$value,$expire=0,$dependency=null)
+	public function set($id, $value, $expire = 0, $dependency = null)
 	{
-		if(empty($value) && $expire === 0)
+		if (empty($value) && $expire === 0)
 			$this->delete($id);
 		else
 		{
-			$data=array($value,$dependency);
-			return $this->setValue($this->generateUniqueKey($id),$data,$expire);
+			$data = array($value, $dependency);
+			return $this->setValue($this->generateUniqueKey($id), $data, $expire);
 		}
 	}
-	public function add($id,$value,$expire=0,$dependency=null)
+	public function add($id, $value, $expire = 0, $dependency = null)
 	{
-		if(empty($value) && $expire === 0)
+		if (empty($value) && $expire === 0)
 			return false;
-		$data=array($value,$dependency);
-		return $this->addValue($this->generateUniqueKey($id),$data,$expire);
+		$data = array($value, $dependency);
+		return $this->addValue($this->generateUniqueKey($id), $data, $expire);
 	}
 	public function delete($id)
 	{
@@ -1032,8 +1032,8 @@ 
 		throw new TNotSupportedException('cache_flush_unsupported');
 	}
 	abstract protected function getValue($key);
-	abstract protected function setValue($key,$value,$expire);
-	abstract protected function addValue($key,$value,$expire);
+	abstract protected function setValue($key, $value, $expire);
+	abstract protected function addValue($key, $value, $expire);
 	abstract protected function deleteValue($key);
 	public function offsetExists($id)
 	{
@@ -1069,8 +1069,8 @@ 
 	}
 	public function setFileName($value)
 	{
-		$this->_fileName=$value;
-		$this->_timestamp=@filemtime($value);
+		$this->_fileName = $value;
+		$this->_timestamp = @filemtime($value);
 	}
 	public function getTimestamp()
 	{
@@ -1078,13 +1078,13 @@ 
 	}
 	public function getHasChanged()
 	{
-		return @filemtime($this->_fileName)!==$this->_timestamp;
+		return @filemtime($this->_fileName) !== $this->_timestamp;
 	}
 }
 class TDirectoryCacheDependency extends TCacheDependency
 {
-	private $_recursiveCheck=true;
-	private $_recursiveLevel=-1;
+	private $_recursiveCheck = true;
+	private $_recursiveLevel = -1;
 	private $_timestamps;
 	private $_directory;
 	public function __construct($directory)
@@ -1097,10 +1097,10 @@ 
 	}
 	public function setDirectory($directory)
 	{
-		if(($path=realpath($directory))===false || !is_dir($path))
-			throw new TInvalidDataValueException('directorycachedependency_directory_invalid',$directory);
-		$this->_directory=$path;
-		$this->_timestamps=$this->generateTimestamps($path);
+		if (($path = realpath($directory)) === false || !is_dir($path))
+			throw new TInvalidDataValueException('directorycachedependency_directory_invalid', $directory);
+		$this->_directory = $path;
+		$this->_timestamps = $this->generateTimestamps($path);
 	}
 	public function getRecursiveCheck()
 	{
@@ -1108,7 +1108,7 @@ 
 	}
 	public function setRecursiveCheck($value)
 	{
-		$this->_recursiveCheck=TPropertyValue::ensureBoolean($value);
+		$this->_recursiveCheck = TPropertyValue::ensureBoolean($value);
 	}
 	public function getRecursiveLevel()
 	{
@@ -1116,11 +1116,11 @@ 
 	}
 	public function setRecursiveLevel($value)
 	{
-		$this->_recursiveLevel=TPropertyValue::ensureInteger($value);
+		$this->_recursiveLevel = TPropertyValue::ensureInteger($value);
 	}
 	public function getHasChanged()
 	{
-		return $this->generateTimestamps($this->_directory)!=$this->_timestamps;
+		return $this->generateTimestamps($this->_directory) != $this->_timestamps;
 	}
 	protected function validateFile($fileName)
 	{
@@ -1130,23 +1130,23 @@ 
 	{
 		return true;
 	}
-	protected function generateTimestamps($directory,$level=0)
+	protected function generateTimestamps($directory, $level = 0)
 	{
-		if(($dir=opendir($directory))===false)
-			throw new TIOException('directorycachedependency_directory_invalid',$directory);
-		$timestamps=array();
-		while(($file=readdir($dir))!==false)
+		if (($dir = opendir($directory)) === false)
+			throw new TIOException('directorycachedependency_directory_invalid', $directory);
+		$timestamps = array();
+		while (($file = readdir($dir)) !== false)
 		{
-			$path=$directory.DIRECTORY_SEPARATOR.$file;
-			if($file==='.' || $file==='..')
+			$path = $directory . DIRECTORY_SEPARATOR . $file;
+			if ($file === '.' || $file === '..')
 				continue;
-			else if(is_dir($path))
+			else if (is_dir($path))
 			{
-				if(($this->_recursiveLevel<0 || $level<$this->_recursiveLevel) && $this->validateDirectory($path))
-					$timestamps=array_merge($this->generateTimestamps($path,$level+1));
+				if (($this->_recursiveLevel < 0 || $level < $this->_recursiveLevel) && $this->validateDirectory($path))
+					$timestamps = array_merge($this->generateTimestamps($path, $level + 1));
 			}
-			else if($this->validateFile($path))
-				$timestamps[$path]=filemtime($path);
+			else if ($this->validateFile($path))
+				$timestamps[$path] = filemtime($path);
 		}
 		closedir($dir);
 		return $timestamps;
@@ -1166,29 +1166,29 @@ 
 	}
 	public function setStateName($value)
 	{
-		$this->_stateName=$value;
-		$this->_stateValue=Prado::getApplication()->getGlobalState($value);
+		$this->_stateName = $value;
+		$this->_stateValue = Prado::getApplication()->getGlobalState($value);
 	}
 	public function getHasChanged()
 	{
-		return $this->_stateValue!==Prado::getApplication()->getGlobalState($this->_stateName);
+		return $this->_stateValue !== Prado::getApplication()->getGlobalState($this->_stateName);
 	}
 }
 class TChainedCacheDependency extends TCacheDependency
 {
-	private $_dependencies=null;
+	private $_dependencies = null;
 	public function getDependencies()
 	{
-		if($this->_dependencies===null)
-			$this->_dependencies=new TCacheDependencyList;
+		if ($this->_dependencies === null)
+			$this->_dependencies = new TCacheDependencyList;
 		return $this->_dependencies;
 	}
 	public function getHasChanged()
 	{
-		if($this->_dependencies!==null)
+		if ($this->_dependencies !== null)
 		{
-			foreach($this->_dependencies as $dependency)
-				if($dependency->getHasChanged())
+			foreach ($this->_dependencies as $dependency)
+				if ($dependency->getHasChanged())
 					return true;
 		}
 		return false;
@@ -1198,49 +1198,49 @@ 
 {
 	public function getHasChanged()
 	{
-		return Prado::getApplication()->getMode()!==TApplicationMode::Performance;
+		return Prado::getApplication()->getMode() !== TApplicationMode::Performance;
 	}
 }
 class TCacheDependencyList extends TList
 {
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if($item instanceof ICacheDependency)
-			parent::insertAt($index,$item);
+		if ($item instanceof ICacheDependency)
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('cachedependencylist_cachedependency_required');
 	}
 }
 class TTextWriter extends TComponent implements ITextWriter
 {
-	private $_str='';
+	private $_str = '';
 	public function flush()
 	{
-		$str=$this->_str;
-		$this->_str='';
+		$str = $this->_str;
+		$this->_str = '';
 		return $str;
 	}
 	public function write($str)
 	{
-		$this->_str.=$str;
+		$this->_str .= $str;
 	}
-	public function writeLine($str='')
+	public function writeLine($str = '')
 	{
-		$this->write($str."\n");
+		$this->write($str . "\n");
 	}
 }
 class TPriorityList extends TList
 {
-	private $_d=array();
-	private $_o=false;
-	private $_fd=null;
-	private $_c=0;
-	private $_dp=10;
-	private $_p=8;
-	public function __construct($data=null,$readOnly=false,$defaultPriority=10,$precision=8)
+	private $_d = array();
+	private $_o = false;
+	private $_fd = null;
+	private $_c = 0;
+	private $_dp = 10;
+	private $_p = 8;
+	public function __construct($data = null, $readOnly = false, $defaultPriority = 10, $precision = 8)
 	{
 		parent::__construct();
-		if($data!==null)
+		if ($data !== null)
 			$this->copyFrom($data);
 		$this->setReadOnly($readOnly);
 		$this->setPrecision($precision);
@@ -1254,12 +1254,12 @@ 
 	{
 		return $this->_c;
 	}
-	public function getPriorityCount($priority=null)
+	public function getPriorityCount($priority = null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-		if(!isset($this->_d[$priority]) || !is_array($this->_d[$priority]))
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+		if (!isset($this->_d[$priority]) || !is_array($this->_d[$priority]))
 			return false;
 		return count($this->_d[$priority]);
 	}
@@ -1269,7 +1269,7 @@ 
 	}
 	protected function setDefaultPriority($value)
 	{
-		$this->_dp=(string)round(TPropertyValue::ensureFloat($value),$this->_p);
+		$this->_dp = (string) round(TPropertyValue::ensureFloat($value), $this->_p);
 	}
 	public function getPrecision()
 	{
@@ -1277,7 +1277,7 @@ 
 	}
 	protected function setPrecision($value)
 	{
-		$this->_p=TPropertyValue::ensureInteger($value);
+		$this->_p = TPropertyValue::ensureInteger($value);
 	}
 	public function getIterator()
 	{
@@ -1289,122 +1289,122 @@ 
 		return array_keys($this->_d);
 	}
 	protected function sortPriorities() {
-		if(!$this->_o) {
-			ksort($this->_d,SORT_NUMERIC);
-			$this->_o=true;
+		if (!$this->_o) {
+			ksort($this->_d, SORT_NUMERIC);
+			$this->_o = true;
 		}
 	}
 	protected function flattenPriorities() {
-		if(is_array($this->_fd))
+		if (is_array($this->_fd))
 			return $this->_fd;
 		$this->sortPriorities();
-		$this->_fd=array();
-		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd=array_merge($this->_fd,$itemsatpriority);
+		$this->_fd = array();
+		foreach ($this->_d as $priority => $itemsatpriority)
+			$this->_fd = array_merge($this->_fd, $itemsatpriority);
 		return $this->_fd;
 	}
 	public function itemAt($index)
 	{
-		if($index>=0&&$index<$this->getCount()) {
-			$arr=$this->flattenPriorities();
+		if ($index >= 0 && $index < $this->getCount()) {
+			$arr = $this->flattenPriorities();
 			return $arr[$index];
 		} else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+			throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
-	public function itemsAtPriority($priority=null)
+	public function itemsAtPriority($priority = null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-		return isset($this->_d[$priority])?$this->_d[$priority]:null;
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+		return isset($this->_d[$priority]) ? $this->_d[$priority] : null;
 	}
-	public function itemAtIndexInPriority($index,$priority=null)
+	public function itemAtIndexInPriority($index, $priority = null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority), $this->_p);
-		return !isset($this->_d[$priority])?false:(
-				isset($this->_d[$priority][$index])?$this->_d[$priority][$index]:false
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+		return !isset($this->_d[$priority]) ? false : (
+				isset($this->_d[$priority][$index]) ? $this->_d[$priority][$index] : false
 			);
 	}
-	public function add($item,$priority=null)
+	public function add($item, $priority = null)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		return $this->insertAtIndexInPriority($item,false,$priority,true);
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
+		return $this->insertAtIndexInPriority($item, false, $priority, true);
 	}
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		if(($priority=$this->priorityAt($index,true))!==false)
-			$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if (($priority = $this->priorityAt($index, true)) !== false)
+			$this->insertAtIndexInPriority($item, $priority[1], $priority[0]);
 		else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+			throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
-	public function insertAtIndexInPriority($item,$index=false,$priority=null,$preserveCache=false)
+	public function insertAtIndexInPriority($item, $index = false, $priority = null, $preserveCache = false)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority), $this->_p);
-		if($preserveCache) {
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+		if ($preserveCache) {
 			$this->sortPriorities();
-			$cc=0;
-			foreach($this->_d as $prioritykey=>$items)
-				if($prioritykey>=$priority)
+			$cc = 0;
+			foreach ($this->_d as $prioritykey=>$items)
+				if ($prioritykey >= $priority)
 					break;
 				else
-					$cc+=count($items);
-			if($index===false&&isset($this->_d[$priority])) {
-				$c=count($this->_d[$priority]);
-				$c+=$cc;
-				$this->_d[$priority][]=$item;
-			} else if(isset($this->_d[$priority])) {
-				$c=$index+$cc;
-				array_splice($this->_d[$priority],$index,0,array($item));
+					$cc += count($items);
+			if ($index === false && isset($this->_d[$priority])) {
+				$c = count($this->_d[$priority]);
+				$c += $cc;
+				$this->_d[$priority][] = $item;
+			} else if (isset($this->_d[$priority])) {
+				$c = $index + $cc;
+				array_splice($this->_d[$priority], $index, 0, array($item));
 			} else {
 				$c = $cc;
 				$this->_o = false;
-				$this->_d[$priority]=array($item);
+				$this->_d[$priority] = array($item);
 			}
-			if($this->_fd&&is_array($this->_fd)) 				array_splice($this->_fd,$c,0,array($item));
+			if ($this->_fd && is_array($this->_fd)) 				array_splice($this->_fd, $c, 0, array($item));
 		} else {
-			$c=null;
-			if($index===false&&isset($this->_d[$priority])) {
-				$cc=count($this->_d[$priority]);
-				$this->_d[$priority][]=$item;
-			} else if(isset($this->_d[$priority])) {
-				$cc=$index;
-				array_splice($this->_d[$priority],$index,0,array($item));
+			$c = null;
+			if ($index === false && isset($this->_d[$priority])) {
+				$cc = count($this->_d[$priority]);
+				$this->_d[$priority][] = $item;
+			} else if (isset($this->_d[$priority])) {
+				$cc = $index;
+				array_splice($this->_d[$priority], $index, 0, array($item));
 			} else {
-				$cc=0;
-				$this->_o=false;
-				$this->_d[$priority]=array($item);
+				$cc = 0;
+				$this->_o = false;
+				$this->_d[$priority] = array($item);
 			}
-			if($this->_fd&&is_array($this->_fd)&&count($this->_d)==1)
-				array_splice($this->_fd,$cc,0,array($item));
+			if ($this->_fd && is_array($this->_fd) && count($this->_d) == 1)
+				array_splice($this->_fd, $cc, 0, array($item));
 			else
-				$this->_fd=null;
+				$this->_fd = null;
 		}
 		$this->_c++;
 		return $c;
 	}
-	public function remove($item,$priority=false)
+	public function remove($item, $priority = false)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		if(($p=$this->priorityOf($item,true))!==false)
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if (($p = $this->priorityOf($item, true)) !== false)
 		{
-			if($priority!==false) {
-				if($priority===null)
-					$priority=$this->getDefaultPriority();
-				$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-				if($p[0]!=$priority)
+			if ($priority !== false) {
+				if ($priority === null)
+					$priority = $this->getDefaultPriority();
+				$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+				if ($p[0] != $priority)
 					throw new TInvalidDataValueException('list_item_inexistent');
 			}
-			$this->removeAtIndexInPriority($p[1],$p[0]);
+			$this->removeAtIndexInPriority($p[1], $p[0]);
 			return $p[2];
 		}
 		else
@@ -1412,97 +1412,97 @@ 
 	}
 	public function removeAt($index)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		if(($priority=$this->priorityAt($index, true))!==false)
-			return $this->removeAtIndexInPriority($priority[1],$priority[0]);
-		throw new TInvalidDataValueException('list_index_invalid',$index);
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if (($priority = $this->priorityAt($index, true)) !== false)
+			return $this->removeAtIndexInPriority($priority[1], $priority[0]);
+		throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
-	public function removeAtIndexInPriority($index, $priority=null)
+	public function removeAtIndexInPriority($index, $priority = null)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-		if(!isset($this->_d[$priority])||$index<0||$index>=count($this->_d[$priority]))
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+		if (!isset($this->_d[$priority]) || $index < 0 || $index >= count($this->_d[$priority]))
 			throw new TInvalidDataValueException('list_item_inexistent');
-				$value=array_splice($this->_d[$priority],$index,1);
-		$value=$value[0];
-		if(!count($this->_d[$priority]))
+				$value = array_splice($this->_d[$priority], $index, 1);
+		$value = $value[0];
+		if (!count($this->_d[$priority]))
 			unset($this->_d[$priority]);
 		$this->_c--;
-		$this->_fd=null;
+		$this->_fd = null;
 		return $value;
 	}
 	public function clear()
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		$d=array_reverse($this->_d,true);
-		foreach($this->_d as $priority=>$items) {
-			for($index=count($items)-1;$index>=0;$index--)
-				$this->removeAtIndexInPriority($index,$priority);
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
+		$d = array_reverse($this->_d, true);
+		foreach ($this->_d as $priority=>$items) {
+			for ($index = count($items) - 1; $index >= 0; $index--)
+				$this->removeAtIndexInPriority($index, $priority);
 			unset($this->_d[$priority]);
 		}
 	}
 	public function contains($item)
 	{
-		return $this->indexOf($item)>=0;
+		return $this->indexOf($item) >= 0;
 	}
 	public function indexOf($item)
 	{
-		if(($index=array_search($item,$this->flattenPriorities(),true))===false)
+		if (($index = array_search($item, $this->flattenPriorities(), true)) === false)
 			return -1;
 		else
 			return $index;
 	}
-	public function priorityOf($item,$withindex = false)
+	public function priorityOf($item, $withindex = false)
 	{
 		$this->sortPriorities();
 		$absindex = 0;
-		foreach($this->_d as $priority=>$items) {
-			if(($index=array_search($item,$items,true))!==false) {
-				$absindex+=$index;
-				return $withindex?array($priority,$index,$absindex,
-						'priority'=>$priority,'index'=>$index,'absindex'=>$absindex):$priority;
+		foreach ($this->_d as $priority=>$items) {
+			if (($index = array_search($item, $items, true)) !== false) {
+				$absindex += $index;
+				return $withindex ? array($priority, $index, $absindex,
+						'priority'=>$priority, 'index'=>$index, 'absindex'=>$absindex) : $priority;
 			} else
-				$absindex+=count($items);
+				$absindex += count($items);
 		}
 		return false;
 	}
-	public function priorityAt($index,$withindex = false)
+	public function priorityAt($index, $withindex = false)
 	{
-		if($index<0||$index>=$this->getCount())
-			throw new TInvalidDataValueException('list_index_invalid',$index);
-		$absindex=$index;
+		if ($index < 0 || $index >= $this->getCount())
+			throw new TInvalidDataValueException('list_index_invalid', $index);
+		$absindex = $index;
 		$this->sortPriorities();
-		foreach($this->_d as $priority=>$items) {
-			if($index>=($c=count($items)))
-				$index-=$c;
+		foreach ($this->_d as $priority=>$items) {
+			if ($index >= ($c = count($items)))
+				$index -= $c;
 			else
-				return $withindex?array($priority,$index,$absindex,
-						'priority'=>$priority,'index'=>$index,'absindex'=>$absindex):$priority;
+				return $withindex ? array($priority, $index, $absindex,
+						'priority'=>$priority, 'index'=>$index, 'absindex'=>$absindex) : $priority;
 		}
 		return false;
 	}
 	public function insertBefore($indexitem, $item)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		if(($priority=$this->priorityOf($indexitem,true))===false)
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if (($priority = $this->priorityOf($indexitem, true)) === false)
 			throw new TInvalidDataValueException('list_item_inexistent');
-		$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
+		$this->insertAtIndexInPriority($item, $priority[1], $priority[0]);
 		return $priority[2];
 	}
 	public function insertAfter($indexitem, $item)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		if(($priority=$this->priorityOf($indexitem,true))===false)
+		if ($this->getReadOnly())
+			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if (($priority = $this->priorityOf($indexitem, true)) === false)
 			throw new TInvalidDataValueException('list_item_inexistent');
-		$this->insertAtIndexInPriority($item,$priority[1]+1,$priority[0]);
-		return $priority[2]+1;
+		$this->insertAtIndexInPriority($item, $priority[1] + 1, $priority[0]);
+		return $priority[2] + 1;
 	}
 	public function toArray()
 	{
@@ -1513,100 +1513,100 @@ 
 		$this->sortPriorities();
 		return $this->_d;
 	}
-	public function toArrayBelowPriority($priority,$inclusive=false)
+	public function toArrayBelowPriority($priority, $inclusive = false)
 	{
 		$this->sortPriorities();
-		$items=array();
-		foreach($this->_d as $itemspriority=>$itemsatpriority)
+		$items = array();
+		foreach ($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority>=$priority)||$itemspriority>$priority)
+			if ((!$inclusive && $itemspriority >= $priority) || $itemspriority > $priority)
 				break;
-			$items=array_merge($items,$itemsatpriority);
+			$items = array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
-	public function toArrayAbovePriority($priority,$inclusive=true)
+	public function toArrayAbovePriority($priority, $inclusive = true)
 	{
 		$this->sortPriorities();
-		$items=array();
-		foreach($this->_d as $itemspriority=>$itemsatpriority)
+		$items = array();
+		foreach ($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority<=$priority)||$itemspriority<$priority)
+			if ((!$inclusive && $itemspriority <= $priority) || $itemspriority < $priority)
 				continue;
-			$items=array_merge($items,$itemsatpriority);
+			$items = array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
 	public function copyFrom($data)
 	{
-		if($data instanceof TPriorityList)
+		if ($data instanceof TPriorityList)
 		{
-			if($this->getCount()>0)
+			if ($this->getCount() > 0)
 				$this->clear();
-			foreach($data->getPriorities() as $priority)
+			foreach ($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $index=>$item)
-					$this->insertAtIndexInPriority($item,$index,$priority);
+				foreach ($data->itemsAtPriority($priority) as $index=>$item)
+					$this->insertAtIndexInPriority($item, $index, $priority);
 			}
-		} else if(is_array($data)||$data instanceof Traversable) {
-			if($this->getCount()>0)
+		} else if (is_array($data) || $data instanceof Traversable) {
+			if ($this->getCount() > 0)
 				$this->clear();
-			foreach($data as $key=>$item)
+			foreach ($data as $key=>$item)
 				$this->add($item);
-		} else if($data!==null)
+		} else if ($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function mergeWith($data)
 	{
-		if($data instanceof TPriorityList)
+		if ($data instanceof TPriorityList)
 		{
-			foreach($data->getPriorities() as $priority)
+			foreach ($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $index=>$item)
-					$this->insertAtIndexInPriority($item,false,$priority);
+				foreach ($data->itemsAtPriority($priority) as $index=>$item)
+					$this->insertAtIndexInPriority($item, false, $priority);
 			}
 		}
-		else if(is_array($data)||$data instanceof Traversable)
+		else if (is_array($data) || $data instanceof Traversable)
 		{
-			foreach($data as $priority=>$item)
+			foreach ($data as $priority=>$item)
 				$this->add($item);
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function offsetExists($offset)
 	{
-		return ($offset>=0&&$offset<$this->getCount());
+		return ($offset >= 0 && $offset < $this->getCount());
 	}
 	public function offsetGet($offset)
 	{
 		return $this->itemAt($offset);
 	}
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		if($offset===null)
+		if ($offset === null)
 			return $this->add($item);
-		if($offset===$this->getCount()) {
-			$priority=$this->priorityAt($offset-1,true);
+		if ($offset === $this->getCount()) {
+			$priority = $this->priorityAt($offset - 1, true);
 			$priority[1]++;
 		} else {
-			$priority=$this->priorityAt($offset,true);
-			$this->removeAtIndexInPriority($priority[1],$priority[0]);
+			$priority = $this->priorityAt($offset, true);
+			$this->removeAtIndexInPriority($priority[1], $priority[0]);
 		}
-		$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
+		$this->insertAtIndexInPriority($item, $priority[1], $priority[0]);
 	}
 	public function offsetUnset($offset)
 	{
 		$this->removeAt($offset);
 	}
 }
-class TMap extends TComponent implements IteratorAggregate,ArrayAccess,Countable
+class TMap extends TComponent implements IteratorAggregate, ArrayAccess, Countable
 {
-	private $_d=array();
-	private $_r=false;
-	public function __construct($data=null,$readOnly=false)
+	private $_d = array();
+	private $_r = false;
+	public function __construct($data = null, $readOnly = false)
 	{
-		if($data!==null)
+		if ($data !== null)
 			$this->copyFrom($data);
 		$this->setReadOnly($readOnly);
 	}
@@ -1616,11 +1616,11 @@ 
 	}
 	protected function setReadOnly($value)
 	{
-		$this->_r=TPropertyValue::ensureBoolean($value);
+		$this->_r = TPropertyValue::ensureBoolean($value);
 	}
 	public function getIterator()
 	{
-		return new ArrayIterator( $this->_d );
+		return new ArrayIterator($this->_d);
 	}
 	public function count()
 	{
@@ -1638,20 +1638,20 @@ 
 	{
 		return isset($this->_d[$key]) ? $this->_d[$key] : null;
 	}
-	public function add($key,$value)
+	public function add($key, $value)
 	{
-		if(!$this->_r)
-			$this->_d[$key]=$value;
+		if (!$this->_r)
+			$this->_d[$key] = $value;
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 	public function remove($key)
 	{
-		if(!$this->_r)
+		if (!$this->_r)
 		{
-			if(isset($this->_d[$key]) || array_key_exists($key,$this->_d))
+			if (isset($this->_d[$key]) || array_key_exists($key, $this->_d))
 			{
-				$value=$this->_d[$key];
+				$value = $this->_d[$key];
 				unset($this->_d[$key]);
 				return $value;
 			}
@@ -1659,16 +1659,16 @@ 
 				return null;
 		}
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 	public function clear()
 	{
-		foreach(array_keys($this->_d) as $key)
+		foreach (array_keys($this->_d) as $key)
 			$this->remove($key);
 	}
 	public function contains($key)
 	{
-		return isset($this->_d[$key]) || array_key_exists($key,$this->_d);
+		return isset($this->_d[$key]) || array_key_exists($key, $this->_d);
 	}
 	public function toArray()
 	{
@@ -1676,24 +1676,24 @@ 
 	}
 	public function copyFrom($data)
 	{
-		if(is_array($data) || $data instanceof Traversable)
+		if (is_array($data) || $data instanceof Traversable)
 		{
-			if($this->getCount()>0)
+			if ($this->getCount() > 0)
 				$this->clear();
-			foreach($data as $key=>$value)
-				$this->add($key,$value);
+			foreach ($data as $key=>$value)
+				$this->add($key, $value);
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function mergeWith($data)
 	{
-		if(is_array($data) || $data instanceof Traversable)
+		if (is_array($data) || $data instanceof Traversable)
 		{
-			foreach($data as $key=>$value)
-				$this->add($key,$value);
+			foreach ($data as $key=>$value)
+				$this->add($key, $value);
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function offsetExists($offset)
@@ -1704,9 +1704,9 @@ 
 	{
 		return $this->itemAt($offset);
 	}
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		$this->add($offset,$item);
+		$this->add($offset, $item);
 	}
 	public function offsetUnset($offset)
 	{
@@ -1720,12 +1720,12 @@ 
 	private $_key;
 	public function __construct(&$data)
 	{
-		$this->_d=&$data;
-		$this->_keys=array_keys($data);
+		$this->_d = &$data;
+		$this->_keys = array_keys($data);
 	}
 	public function rewind()
 	{
-		$this->_key=reset($this->_keys);
+		$this->_key = reset($this->_keys);
 	}
 	public function key()
 	{
@@ -1737,25 +1737,25 @@ 
 	}
 	public function next()
 	{
-		$this->_key=next($this->_keys);
+		$this->_key = next($this->_keys);
 	}
 	public function valid()
 	{
-		return $this->_key!==false;
+		return $this->_key !== false;
 	}
 }
 class TPriorityMap extends TMap
 {
-	private $_d=array();
-	private $_r=false;
-	private $_o=false;
-	private $_fd=null;
-	private $_c=0;
-	private $_dp=10;
-	private $_p=8;
-	public function __construct($data=null,$readOnly=false,$defaultPriority=10,$precision=8)
-	{
-		if($data!==null)
+	private $_d = array();
+	private $_r = false;
+	private $_o = false;
+	private $_fd = null;
+	private $_c = 0;
+	private $_dp = 10;
+	private $_p = 8;
+	public function __construct($data = null, $readOnly = false, $defaultPriority = 10, $precision = 8)
+	{
+		if ($data !== null)
 			$this->copyFrom($data);
 		$this->setReadOnly($readOnly);
 		$this->setPrecision($precision);
@@ -1767,7 +1767,7 @@ 
 	}
 	protected function setReadOnly($value)
 	{
-		$this->_r=TPropertyValue::ensureBoolean($value);
+		$this->_r = TPropertyValue::ensureBoolean($value);
 	}
 	public function getDefaultPriority()
 	{
@@ -1775,7 +1775,7 @@ 
 	}
 	protected function setDefaultPriority($value)
 	{
-		$this->_dp = (string)round(TPropertyValue::ensureFloat($value), $this->_p);
+		$this->_dp = (string) round(TPropertyValue::ensureFloat($value), $this->_p);
 	}
 	public function getPrecision()
 	{
@@ -1783,24 +1783,24 @@ 
 	}
 	protected function setPrecision($value)
 	{
-		$this->_p=TPropertyValue::ensureInteger($value);
+		$this->_p = TPropertyValue::ensureInteger($value);
 	}
 	public function getIterator()
 	{
 		return new ArrayIterator($this->flattenPriorities());
 	}
 	protected function sortPriorities() {
-		if(!$this->_o) {
+		if (!$this->_o) {
 			ksort($this->_d, SORT_NUMERIC);
-			$this->_o=true;
+			$this->_o = true;
 		}
 	}
 	protected function flattenPriorities() {
-		if(is_array($this->_fd))
+		if (is_array($this->_fd))
 			return $this->_fd;
 		$this->sortPriorities();
 		$this->_fd = array();
-		foreach($this->_d as $priority => $itemsatpriority)
+		foreach ($this->_d as $priority => $itemsatpriority)
 			$this->_fd = array_merge($this->_fd, $itemsatpriority);
 		return $this->_fd;
 	}
@@ -1812,12 +1812,12 @@ 
 	{
 		return $this->_c;
 	}
-	public function getPriorityCount($priority=null)
+	public function getPriorityCount($priority = null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-		if(!isset($this->_d[$priority])||!is_array($this->_d[$priority]))
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+		if (!isset($this->_d[$priority]) || !is_array($this->_d[$priority]))
 			return false;
 		return count($this->_d[$priority]);
 	}
@@ -1830,119 +1830,119 @@ 
 	{
 		return array_keys($this->flattenPriorities());
 	}
-	public function itemAt($key,$priority=false)
+	public function itemAt($key, $priority = false)
 	{
-		if($priority===false){
-			$map=$this->flattenPriorities();
-			return isset($map[$key])?$map[$key]:null;
+		if ($priority === false) {
+			$map = $this->flattenPriorities();
+			return isset($map[$key]) ? $map[$key] : null;
 		} else {
-			if($priority===null)
-				$priority=$this->getDefaultPriority();
-			$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-			return (isset($this->_d[$priority])&&isset($this->_d[$priority][$key]))?$this->_d[$priority][$key]:null;
+			if ($priority === null)
+				$priority = $this->getDefaultPriority();
+			$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+			return (isset($this->_d[$priority]) && isset($this->_d[$priority][$key])) ? $this->_d[$priority][$key] : null;
 		}
 	}
-	public function setPriorityAt($key,$priority=null)
+	public function setPriorityAt($key, $priority = null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-		$oldpriority=$this->priorityAt($key);
-		if($oldpriority!==false&&$oldpriority!=$priority) {
-			$value=$this->remove($key,$oldpriority);
-			$this->add($key,$value,$priority);
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+		$oldpriority = $this->priorityAt($key);
+		if ($oldpriority !== false && $oldpriority != $priority) {
+			$value = $this->remove($key, $oldpriority);
+			$this->add($key, $value, $priority);
 		}
 		return $oldpriority;
 	}
-	public function itemsAtPriority($priority=null)
+	public function itemsAtPriority($priority = null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-		return isset($this->_d[$priority])?$this->_d[$priority]:null;
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+		return isset($this->_d[$priority]) ? $this->_d[$priority] : null;
 	}
 	public function priorityOf($item)
 	{
 		$this->sortPriorities();
-		foreach($this->_d as $priority=>$items)
-			if(($index=array_search($item,$items,true))!==false)
+		foreach ($this->_d as $priority=>$items)
+			if (($index = array_search($item, $items, true)) !== false)
 				return $priority;
 		return false;
 	}
 	public function priorityAt($key)
 	{
 		$this->sortPriorities();
-		foreach($this->_d as $priority=>$items)
-			if(array_key_exists($key,$items))
+		foreach ($this->_d as $priority=>$items)
+			if (array_key_exists($key, $items))
 				return $priority;
 		return false;
 	}
-	public function add($key,$value,$priority=null)
+	public function add($key, $value, $priority = null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-		if(!$this->_r)
+		if ($priority === null)
+			$priority = $this->getDefaultPriority();
+		$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+		if (!$this->_r)
 		{
-			foreach($this->_d as $innerpriority=>$items)
-				if(array_key_exists($key,$items))
+			foreach ($this->_d as $innerpriority=>$items)
+				if (array_key_exists($key, $items))
 				{
 					unset($this->_d[$innerpriority][$key]);
 					$this->_c--;
-					if(count($this->_d[$innerpriority])===0)
+					if (count($this->_d[$innerpriority]) === 0)
 						unset($this->_d[$innerpriority]);
 				}
-			if(!isset($this->_d[$priority])) {
-				$this->_d[$priority]=array($key=>$value);
-				$this->_o=false;
+			if (!isset($this->_d[$priority])) {
+				$this->_d[$priority] = array($key=>$value);
+				$this->_o = false;
 			}
 			else
-				$this->_d[$priority][$key]=$value;
+				$this->_d[$priority][$key] = $value;
 			$this->_c++;
-			$this->_fd=null;
+			$this->_fd = null;
 		}
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 		return $priority;
 	}
-	public function remove($key,$priority=false)
+	public function remove($key, $priority = false)
 	{
-		if(!$this->_r)
+		if (!$this->_r)
 		{
-			if($priority===null)
-				$priority=$this->getDefaultPriority();
-			if($priority===false)
+			if ($priority === null)
+				$priority = $this->getDefaultPriority();
+			if ($priority === false)
 			{
 				$this->sortPriorities();
-				foreach($this->_d as $priority=>$items)
-					if(array_key_exists($key,$items))
+				foreach ($this->_d as $priority=>$items)
+					if (array_key_exists($key, $items))
 					{
-						$value=$this->_d[$priority][$key];
+						$value = $this->_d[$priority][$key];
 						unset($this->_d[$priority][$key]);
 						$this->_c--;
-						if(count($this->_d[$priority])===0)
+						if (count($this->_d[$priority]) === 0)
 						{
 							unset($this->_d[$priority]);
-							$this->_o=false;
+							$this->_o = false;
 						}
-						$this->_fd=null;
+						$this->_fd = null;
 						return $value;
 					}
 				return null;
 			}
 			else
 			{
-				$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-				if(isset($this->_d[$priority])&&(isset($this->_d[$priority][$key])||array_key_exists($key,$this->_d[$priority])))
+				$priority = (string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+				if (isset($this->_d[$priority]) && (isset($this->_d[$priority][$key]) || array_key_exists($key, $this->_d[$priority])))
 				{
-					$value=$this->_d[$priority][$key];
+					$value = $this->_d[$priority][$key];
 					unset($this->_d[$priority][$key]);
 					$this->_c--;
-					if(count($this->_d[$priority])===0) {
+					if (count($this->_d[$priority]) === 0) {
 						unset($this->_d[$priority]);
-						$this->_o=false;
+						$this->_o = false;
 					}
-					$this->_fd=null;
+					$this->_fd = null;
 					return $value;
 				}
 				else
@@ -1950,85 +1950,85 @@ 
 			}
 		}
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 	public function clear()
 	{
-		foreach($this->_d as $priority=>$items)
-			foreach(array_keys($items) as $key)
+		foreach ($this->_d as $priority=>$items)
+			foreach (array_keys($items) as $key)
 				$this->remove($key);
 	}
 	public function contains($key)
 	{
-		$map=$this->flattenPriorities();
-		return isset($map[$key])||array_key_exists($key,$map);
+		$map = $this->flattenPriorities();
+		return isset($map[$key]) || array_key_exists($key, $map);
 	}
 	public function toArray()
 	{
 		return $this->flattenPriorities();
 	}
-	public function toArrayBelowPriority($priority,$inclusive=false)
+	public function toArrayBelowPriority($priority, $inclusive = false)
 	{
 		$this->sortPriorities();
-		$items=array();
-		foreach($this->_d as $itemspriority=>$itemsatpriority)
+		$items = array();
+		foreach ($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority>=$priority)||$itemspriority>$priority)
+			if ((!$inclusive && $itemspriority >= $priority) || $itemspriority > $priority)
 				break;
-			$items=array_merge($items,$itemsatpriority);
+			$items = array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
-	public function toArrayAbovePriority($priority,$inclusive=true)
+	public function toArrayAbovePriority($priority, $inclusive = true)
 	{
 		$this->sortPriorities();
-		$items=array();
-		foreach($this->_d as $itemspriority=>$itemsatpriority)
+		$items = array();
+		foreach ($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority<=$priority)||$itemspriority<$priority)
+			if ((!$inclusive && $itemspriority <= $priority) || $itemspriority < $priority)
 				continue;
-			$items=array_merge($items,$itemsatpriority);
+			$items = array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
 	public function copyFrom($data)
 	{
-		if($data instanceof TPriorityMap)
+		if ($data instanceof TPriorityMap)
 		{
-			if($this->getCount()>0)
+			if ($this->getCount() > 0)
 				$this->clear();
-			foreach($data->getPriorities() as $priority) {
-				foreach($data->itemsAtPriority($priority) as $key => $value) {
-					$this->add($key,$value,$priority);
+			foreach ($data->getPriorities() as $priority) {
+				foreach ($data->itemsAtPriority($priority) as $key => $value) {
+					$this->add($key, $value, $priority);
 				}
 			}
 		}
-		else if(is_array($data)||$data instanceof Traversable)
+		else if (is_array($data) || $data instanceof Traversable)
 		{
-			if($this->getCount()>0)
+			if ($this->getCount() > 0)
 				$this->clear();
-			foreach($data as $key=>$value)
-				$this->add($key,$value);
+			foreach ($data as $key=>$value)
+				$this->add($key, $value);
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function mergeWith($data)
 	{
-		if($data instanceof TPriorityMap)
+		if ($data instanceof TPriorityMap)
 		{
-			foreach($data->getPriorities() as $priority)
+			foreach ($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $key => $value)
-					$this->add($key,$value,$priority);
+				foreach ($data->itemsAtPriority($priority) as $key => $value)
+					$this->add($key, $value, $priority);
 			}
 		}
-		else if(is_array($data)||$data instanceof Traversable)
+		else if (is_array($data) || $data instanceof Traversable)
 		{
-			foreach($data as $key=>$value)
-				$this->add($key,$value);
+			foreach ($data as $key=>$value)
+				$this->add($key, $value);
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function offsetExists($offset)
@@ -2039,22 +2039,22 @@ 
 	{
 		return $this->itemAt($offset);
 	}
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		$this->add($offset,$item);
+		$this->add($offset, $item);
 	}
 	public function offsetUnset($offset)
 	{
 		$this->remove($offset);
 	}
 }
-class TStack extends TComponent implements IteratorAggregate,Countable
+class TStack extends TComponent implements IteratorAggregate, Countable
 {
-	private $_d=array();
-	private $_c=0;
-	public function __construct($data=null)
+	private $_d = array();
+	private $_c = 0;
+	public function __construct($data = null)
 	{
-		if($data!==null)
+		if ($data !== null)
 			$this->copyFrom($data);
 	}
 	public function toArray()
@@ -2063,37 +2063,37 @@ 
 	}
 	public function copyFrom($data)
 	{
-		if(is_array($data) || ($data instanceof Traversable))
+		if (is_array($data) || ($data instanceof Traversable))
 		{
 			$this->clear();
-			foreach($data as $item)
+			foreach ($data as $item)
 			{
-				$this->_d[]=$item;
+				$this->_d[] = $item;
 				++$this->_c;
 			}
 		}
-		else if($data!==null)
+		else if ($data !== null)
 			throw new TInvalidDataTypeException('stack_data_not_iterable');
 	}
 	public function clear()
 	{
-		$this->_c=0;
-		$this->_d=array();
+		$this->_c = 0;
+		$this->_d = array();
 	}
 	public function contains($item)
 	{
-		return array_search($item,$this->_d,true)!==false;
+		return array_search($item, $this->_d, true) !== false;
 	}
 	public function peek()
 	{
-		if($this->_c===0)
+		if ($this->_c === 0)
 			throw new TInvalidOperationException('stack_empty');
 		else
-			return $this->_d[$this->_c-1];
+			return $this->_d[$this->_c - 1];
 	}
 	public function pop()
 	{
-		if($this->_c===0)
+		if ($this->_c === 0)
 			throw new TInvalidOperationException('stack_empty');
 		else
 		{
@@ -2108,7 +2108,7 @@ 
 	}
 	public function getIterator()
 	{
-		return new ArrayIterator( $this->_d );
+		return new ArrayIterator($this->_d);
 	}
 	public function getCount()
 	{
@@ -2126,13 +2126,13 @@ 
 	private $_c;
 	public function __construct(&$data)
 	{
-		$this->_d=&$data;
-		$this->_i=0;
-		$this->_c=count($this->_d);
+		$this->_d = &$data;
+		$this->_i = 0;
+		$this->_c = count($this->_d);
 	}
 	public function rewind()
 	{
-		$this->_i=0;
+		$this->_i = 0;
 	}
 	public function key()
 	{
@@ -2148,16 +2148,16 @@ 
 	}
 	public function valid()
 	{
-		return $this->_i<$this->_c;
+		return $this->_i < $this->_c;
 	}
 }
 class TXmlElement extends TComponent
 {
-	private $_parent=null;
-	private $_tagName='unknown';
-	private $_value='';
-	private $_elements=null;
-	private $_attributes=null;
+	private $_parent = null;
+	private $_tagName = 'unknown';
+	private $_value = '';
+	private $_elements = null;
+	private $_attributes = null;
 	public function __construct($tagName)
 	{
 		$this->setTagName($tagName);
@@ -2168,7 +2168,7 @@ 
 	}
 	public function setParent($parent)
 	{
-		$this->_parent=$parent;
+		$this->_parent = $parent;
 	}
 	public function getTagName()
 	{
@@ -2176,7 +2176,7 @@ 
 	}
 	public function setTagName($tagName)
 	{
-		$this->_tagName=$tagName;
+		$this->_tagName = $tagName;
 	}
 	public function getValue()
 	{
@@ -2184,87 +2184,87 @@ 
 	}
 	public function setValue($value)
 	{
-		$this->_value=TPropertyValue::ensureString($value);
+		$this->_value = TPropertyValue::ensureString($value);
 	}
 	public function getHasElement()
 	{
-		return $this->_elements!==null && $this->_elements->getCount()>0;
+		return $this->_elements !== null && $this->_elements->getCount() > 0;
 	}
 	public function getHasAttribute()
 	{
-		return $this->_attributes!==null && $this->_attributes->getCount()>0;
+		return $this->_attributes !== null && $this->_attributes->getCount() > 0;
 	}
 	public function getAttribute($name)
 	{
-		if($this->_attributes!==null)
+		if ($this->_attributes !== null)
 			return $this->_attributes->itemAt($name);
 		else
 			return null;
 	}
-	public function setAttribute($name,$value)
+	public function setAttribute($name, $value)
 	{
-		$this->getAttributes()->add($name,TPropertyValue::ensureString($value));
+		$this->getAttributes()->add($name, TPropertyValue::ensureString($value));
 	}
 	public function getElements()
 	{
-		if(!$this->_elements)
-			$this->_elements=new TXmlElementList($this);
+		if (!$this->_elements)
+			$this->_elements = new TXmlElementList($this);
 		return $this->_elements;
 	}
 	public function getAttributes()
 	{
-		if(!$this->_attributes)
-			$this->_attributes=new TMap;
+		if (!$this->_attributes)
+			$this->_attributes = new TMap;
 		return $this->_attributes;
 	}
 	public function getElementByTagName($tagName)
 	{
-		if($this->_elements)
+		if ($this->_elements)
 		{
-			foreach($this->_elements as $element)
-				if($element->_tagName===$tagName)
+			foreach ($this->_elements as $element)
+				if ($element->_tagName === $tagName)
 					return $element;
 		}
 		return null;
 	}
 	public function getElementsByTagName($tagName)
 	{
-		$list=new TList;
-		if($this->_elements)
+		$list = new TList;
+		if ($this->_elements)
 		{
-			foreach($this->_elements as $element)
-				if($element->_tagName===$tagName)
+			foreach ($this->_elements as $element)
+				if ($element->_tagName === $tagName)
 					$list->add($element);
 		}
 		return $list;
 	}
-	public function toString($indent=0)
+	public function toString($indent = 0)
 	{
-		$attr='';
-		if($this->_attributes!==null)
+		$attr = '';
+		if ($this->_attributes !== null)
 		{
-			foreach($this->_attributes as $name=>$value)
+			foreach ($this->_attributes as $name=>$value)
 			{
-				$value=$this->xmlEncode($value);
-				$attr.=" $name=\"$value\"";
+				$value = $this->xmlEncode($value);
+				$attr .= " $name=\"$value\"";
 			}
 		}
-		$prefix=str_repeat(' ',$indent*4);
-		if($this->getHasElement())
+		$prefix = str_repeat(' ', $indent * 4);
+		if ($this->getHasElement())
 		{
-			$str=$prefix."<{$this->_tagName}$attr>\n";
-			foreach($this->getElements() as $element)
-				$str.=$element->toString($indent+1)."\n";
-			$str.=$prefix."</{$this->_tagName}>";
+			$str = $prefix . "<{$this->_tagName}$attr>\n";
+			foreach ($this->getElements() as $element)
+				$str .= $element->toString($indent + 1) . "\n";
+			$str .= $prefix . "</{$this->_tagName}>";
 			return $str;
 		}
-		else if(($value=$this->getValue())!=='')
+		else if (($value = $this->getValue()) !== '')
 		{
-			$value=$this->xmlEncode($value);
-			return $prefix."<{$this->_tagName}$attr>$value</{$this->_tagName}>";
+			$value = $this->xmlEncode($value);
+			return $prefix . "<{$this->_tagName}$attr>$value</{$this->_tagName}>";
 		}
 		else
-			return $prefix."<{$this->_tagName}$attr />";
+			return $prefix . "<{$this->_tagName}$attr />";
 	}
 	public function __toString()
 	{
@@ -2272,7 +2272,7 @@ 
 	}
 	private function xmlEncode($str)
 	{
-		return strtr($str,array(
+		return strtr($str, array(
 			'>'=>'&gt;',
 			'<'=>'&lt;',
 			'&'=>'&amp;',
@@ -2286,7 +2286,7 @@ 
 {
 	private $_version;
 	private $_encoding;
-	public function __construct($version='1.0',$encoding='')
+	public function __construct($version = '1.0', $encoding = '')
 	{
 		parent::__construct('');
 		$this->setVersion($version);
@@ -2298,7 +2298,7 @@ 
 	}
 	public function setVersion($version)
 	{
-		$this->_version=$version;
+		$this->_version = $version;
 	}
 	public function getEncoding()
 	{
@@ -2306,69 +2306,69 @@ 
 	}
 	public function setEncoding($encoding)
 	{
-		$this->_encoding=$encoding;
+		$this->_encoding = $encoding;
 	}
 	public function loadFromFile($file)
 	{
-		if(($str=@file_get_contents($file))!==false)
+		if (($str = @file_get_contents($file)) !== false)
 			return $this->loadFromString($str);
 		else
-			throw new TIOException('xmldocument_file_read_failed',$file);
+			throw new TIOException('xmldocument_file_read_failed', $file);
 	}
 	public function loadFromString($string)
 	{
-				$doc=new DOMDocument();
-		if($doc->loadXML($string)===false)
+				$doc = new DOMDocument();
+		if ($doc->loadXML($string) === false)
 			return false;
 		$this->setEncoding($doc->encoding);
 		$this->setVersion($doc->version);
-		$element=$doc->documentElement;
+		$element = $doc->documentElement;
 		$this->setTagName($element->tagName);
 		$this->setValue($element->nodeValue);
-		$elements=$this->getElements();
-		$attributes=$this->getAttributes();
+		$elements = $this->getElements();
+		$attributes = $this->getAttributes();
 		$elements->clear();
 		$attributes->clear();
 		static $bSimpleXml;
-		if($bSimpleXml === null)
-			$bSimpleXml = (boolean)function_exists('simplexml_load_string');
-		if($bSimpleXml)
+		if ($bSimpleXml === null)
+			$bSimpleXml = (boolean) function_exists('simplexml_load_string');
+		if ($bSimpleXml)
 		{
 			$simpleDoc = simplexml_load_string($string);
 			$docNamespaces = $simpleDoc->getDocNamespaces(false);
 			$simpleDoc = null;
-			foreach($docNamespaces as $prefix => $uri)
+			foreach ($docNamespaces as $prefix => $uri)
 			{
- 				if($prefix === '')
+ 				if ($prefix === '')
    					$attributes->add('xmlns', $uri);
    				else
-   					$attributes->add('xmlns:'.$prefix, $uri);
+   					$attributes->add('xmlns:' . $prefix, $uri);
 			}
 		}
-		foreach($element->attributes as $name=>$attr)
-			$attributes->add(($attr->prefix === '' ? '' : $attr->prefix . ':') .$name,$attr->value);
-		foreach($element->childNodes as $child)
+		foreach ($element->attributes as $name=>$attr)
+			$attributes->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name, $attr->value);
+		foreach ($element->childNodes as $child)
 		{
-			if($child instanceof DOMElement)
+			if ($child instanceof DOMElement)
 				$elements->add($this->buildElement($child));
 		}
 		return true;
 	}
 	public function saveToFile($file)
 	{
-		if(($fw=fopen($file,'w'))!==false)
+		if (($fw = fopen($file, 'w')) !== false)
 		{
-			fwrite($fw,$this->saveToString());
+			fwrite($fw, $this->saveToString());
 			fclose($fw);
 		}
 		else
-			throw new TIOException('xmldocument_file_write_failed',$file);
+			throw new TIOException('xmldocument_file_write_failed', $file);
 	}
 	public function saveToString()
 	{
-		$version=empty($this->_version)?' version="1.0"':' version="'.$this->_version.'"';
-		$encoding=empty($this->_encoding)?'':' encoding="'.$this->_encoding.'"';
-		return "<?xml{$version}{$encoding}?>\n".$this->toString(0);
+		$version = empty($this->_version) ? ' version="1.0"' : ' version="' . $this->_version . '"';
+		$encoding = empty($this->_encoding) ? '' : ' encoding="' . $this->_encoding . '"';
+		return "<?xml{$version}{$encoding}?>\n" . $this->toString(0);
 	}
 	public function __toString()
 	{
@@ -2376,13 +2376,13 @@ 
 	}
 	protected function buildElement($node)
 	{
-		$element=new TXmlElement($node->tagName);
+		$element = new TXmlElement($node->tagName);
 		$element->setValue($node->nodeValue);
-		foreach($node->attributes as $name=>$attr)
-			$element->getAttributes()->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name,$attr->value);
-		foreach($node->childNodes as $child)
+		foreach ($node->attributes as $name=>$attr)
+			$element->getAttributes()->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name, $attr->value);
+		foreach ($node->childNodes as $child)
 		{
-			if($child instanceof DOMElement)
+			if ($child instanceof DOMElement)
 				$element->getElements()->add($this->buildElement($child));
 		}
 		return $element;
@@ -2393,18 +2393,18 @@ 
 	private $_o;
 	public function __construct(TXmlElement $owner)
 	{
-		$this->_o=$owner;
+		$this->_o = $owner;
 	}
 	protected function getOwner()
 	{
 		return $this->_o;
 	}
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if($item instanceof TXmlElement)
+		if ($item instanceof TXmlElement)
 		{
-			parent::insertAt($index,$item);
-			if($item->getParent()!==null)
+			parent::insertAt($index, $item);
+			if ($item->getParent() !== null)
 				$item->getParent()->getElements()->remove($item);
 			$item->setParent($this->_o);
 		}
@@ -2413,8 +2413,8 @@ 
 	}
 	public function removeAt($index)
 	{
-		$item=parent::removeAt($index);
-		if($item instanceof TXmlElement)
+		$item = parent::removeAt($index);
+		if ($item instanceof TXmlElement)
 			$item->setParent(null);
 		return $item;
 	}
@@ -2429,57 +2429,57 @@ 
 	private $_everyone;
 	private $_guest;
 	private $_authenticated;
-	public function __construct($action,$users,$roles,$verb='',$ipRules='')
-	{
-		$action=strtolower(trim($action));
-		if($action==='allow' || $action==='deny')
-			$this->_action=$action;
-		else
-			throw new TInvalidDataValueException('authorizationrule_action_invalid',$action);
-		$this->_users=array();
-		$this->_roles=array();
-		$this->_ipRules=array();
-		$this->_everyone=false;
-		$this->_guest=false;
-		$this->_authenticated=false;
-		if(trim($users)==='')
-			$users='*';
-		foreach(explode(',',$users) as $user)
-		{
-			if(($user=trim(strtolower($user)))!=='')
-			{
-				if($user==='*')
+	public function __construct($action, $users, $roles, $verb = '', $ipRules = '')
+	{
+		$action = strtolower(trim($action));
+		if ($action === 'allow' || $action === 'deny')
+			$this->_action = $action;
+		else
+			throw new TInvalidDataValueException('authorizationrule_action_invalid', $action);
+		$this->_users = array();
+		$this->_roles = array();
+		$this->_ipRules = array();
+		$this->_everyone = false;
+		$this->_guest = false;
+		$this->_authenticated = false;
+		if (trim($users) === '')
+			$users = '*';
+		foreach (explode(',', $users) as $user)
+		{
+			if (($user = trim(strtolower($user))) !== '')
+			{
+				if ($user === '*')
 				{
-					$this->_everyone=true;
+					$this->_everyone = true;
 					break;
 				}
-				else if($user==='?')
-					$this->_guest=true;
-				else if($user==='@')
-					$this->_authenticated=true;
+				else if ($user === '?')
+					$this->_guest = true;
+				else if ($user === '@')
+					$this->_authenticated = true;
 				else
-					$this->_users[]=$user;
+					$this->_users[] = $user;
 			}
 		}
-		if(trim($roles)==='')
-			$roles='*';
-		foreach(explode(',',$roles) as $role)
+		if (trim($roles) === '')
+			$roles = '*';
+		foreach (explode(',', $roles) as $role)
 		{
-			if(($role=trim(strtolower($role)))!=='')
-				$this->_roles[]=$role;
+			if (($role = trim(strtolower($role))) !== '')
+				$this->_roles[] = $role;
 		}
-		if(($verb=trim(strtolower($verb)))==='')
-			$verb='*';
-		if($verb==='*' || $verb==='get' || $verb==='post')
-			$this->_verb=$verb;
+		if (($verb = trim(strtolower($verb))) === '')
+			$verb = '*';
+		if ($verb === '*' || $verb === 'get' || $verb === 'post')
+			$this->_verb = $verb;
 		else
-			throw new TInvalidDataValueException('authorizationrule_verb_invalid',$verb);
-		if(trim($ipRules)==='')
-			$ipRules='*';
-		foreach(explode(',',$ipRules) as $ipRule)
+			throw new TInvalidDataValueException('authorizationrule_verb_invalid', $verb);
+		if (trim($ipRules) === '')
+			$ipRules = '*';
+		foreach (explode(',', $ipRules) as $ipRule)
 		{
-			if(($ipRule=trim($ipRule))!=='')
-				$this->_ipRules[]=$ipRule;
+			if (($ipRule = trim($ipRule)) !== '')
+				$this->_ipRules[] = $ipRule;
 		}
 	}
 	public function getAction()
@@ -2514,63 +2514,63 @@ 
 	{
 		return $this->_authenticated || $this->_everyone;
 	}
-	public function isUserAllowed(IUser $user,$verb,$ip)
+	public function isUserAllowed(IUser $user, $verb, $ip)
 	{
-		if($this->isVerbMatched($verb) && $this->isIpMatched($ip) && $this->isUserMatched($user) && $this->isRoleMatched($user))
-			return ($this->_action==='allow')?1:-1;
+		if ($this->isVerbMatched($verb) && $this->isIpMatched($ip) && $this->isUserMatched($user) && $this->isRoleMatched($user))
+			return ($this->_action === 'allow') ? 1 : -1;
 		else
 			return 0;
 	}
 	private function isIpMatched($ip)
 	{
-		if(empty($this->_ipRules))
+		if (empty($this->_ipRules))
 			return 1;
-		foreach($this->_ipRules as $rule)
+		foreach ($this->_ipRules as $rule)
 		{
-			if($rule==='*' || $rule===$ip || (($pos=strpos($rule,'*'))!==false && strncmp($ip,$rule,$pos)===0))
+			if ($rule === '*' || $rule === $ip || (($pos = strpos($rule, '*')) !== false && strncmp($ip, $rule, $pos) === 0))
 				return 1;
 		}
 		return 0;
 	}
 	private function isUserMatched($user)
 	{
-		return ($this->_everyone || ($this->_guest && $user->getIsGuest()) || ($this->_authenticated && !$user->getIsGuest()) || in_array(strtolower($user->getName()),$this->_users));
+		return ($this->_everyone || ($this->_guest && $user->getIsGuest()) || ($this->_authenticated && !$user->getIsGuest()) || in_array(strtolower($user->getName()), $this->_users));
 	}
 	private function isRoleMatched($user)
 	{
-		foreach($this->_roles as $role)
+		foreach ($this->_roles as $role)
 		{
-			if($role==='*' || $user->isInRole($role))
+			if ($role === '*' || $user->isInRole($role))
 				return true;
 		}
 		return false;
 	}
 	private function isVerbMatched($verb)
 	{
-		return ($this->_verb==='*' || strcasecmp($verb,$this->_verb)===0);
+		return ($this->_verb === '*' || strcasecmp($verb, $this->_verb) === 0);
 	}
 }
 class TAuthorizationRuleCollection extends TList
 {
-	public function isUserAllowed($user,$verb,$ip)
+	public function isUserAllowed($user, $verb, $ip)
 	{
-		if($user instanceof IUser)
+		if ($user instanceof IUser)
 		{
-			$verb=strtolower(trim($verb));
-			foreach($this as $rule)
+			$verb = strtolower(trim($verb));
+			foreach ($this as $rule)
 			{
-				if(($decision=$rule->isUserAllowed($user,$verb,$ip))!==0)
-					return ($decision>0);
+				if (($decision = $rule->isUserAllowed($user, $verb, $ip)) !== 0)
+					return ($decision > 0);
 			}
 			return true;
 		}
 		else
 			return false;
 	}
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if($item instanceof TAuthorizationRule)
-			parent::insertAt($index,$item);
+		if ($item instanceof TAuthorizationRule)
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('authorizationrulecollection_authorizationrule_required');
 	}
@@ -2586,17 +2586,17 @@ 
 	private $_mbstring;
 	public function init($config)
 	{
-		$this->_mbstring=extension_loaded('mbstring');
+		$this->_mbstring = extension_loaded('mbstring');
 		$this->getApplication()->setSecurityManager($this);
 	}
 	protected function generateRandomKey()
 	{
-		return sprintf('%08x%08x%08x%08x',mt_rand(),mt_rand(),mt_rand(),mt_rand());
+		return sprintf('%08x%08x%08x%08x', mt_rand(), mt_rand(), mt_rand(), mt_rand());
 	}
 	public function getValidationKey()
 	{
-		if(null === $this->_validationKey) {
-			if(null === ($this->_validationKey = $this->getApplication()->getGlobalState(self::STATE_VALIDATION_KEY))) {
+		if (null === $this->_validationKey) {
+			if (null === ($this->_validationKey = $this->getApplication()->getGlobalState(self::STATE_VALIDATION_KEY))) {
 				$this->_validationKey = $this->generateRandomKey();
 				$this->getApplication()->setGlobalState(self::STATE_VALIDATION_KEY, $this->_validationKey, null, true);
 			}
@@ -2605,14 +2605,14 @@ 
 	}
 	public function setValidationKey($value)
 	{
-		if('' === $value)
+		if ('' === $value)
 			throw new TInvalidDataValueException('securitymanager_validationkey_invalid');
 		$this->_validationKey = $value;
 	}
 	public function getEncryptionKey()
 	{
-		if(null === $this->_encryptionKey) {
-			if(null === ($this->_encryptionKey = $this->getApplication()->getGlobalState(self::STATE_ENCRYPTION_KEY))) {
+		if (null === $this->_encryptionKey) {
+			if (null === ($this->_encryptionKey = $this->getApplication()->getGlobalState(self::STATE_ENCRYPTION_KEY))) {
 				$this->_encryptionKey = $this->generateRandomKey();
 				$this->getApplication()->setGlobalState(self::STATE_ENCRYPTION_KEY, $this->_encryptionKey, null, true);
 			}
@@ -2621,7 +2621,7 @@ 
 	}
 	public function setEncryptionKey($value)
 	{
-		if('' === $value)
+		if ('' === $value)
 			throw new TInvalidDataValueException('securitymanager_encryptionkey_invalid');
 		$this->_encryptionKey = $value;
 	}
@@ -2643,7 +2643,7 @@ 
 	}
 	public function getEncryption()
 	{
-		if(is_string($this->_cryptAlgorithm))
+		if (is_string($this->_cryptAlgorithm))
 			return $this->_cryptAlgorithm;
 				return "3DES";
 	}
@@ -2661,19 +2661,19 @@ 
 	}
 	public function encrypt($data)
 	{
-		$module=$this->openCryptModule();
+		$module = $this->openCryptModule();
 		$key = $this->substr(md5($this->getEncryptionKey()), 0, mcrypt_enc_get_key_size($module));
 		srand();
 		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($module), MCRYPT_RAND);
 		mcrypt_generic_init($module, $key, $iv);
-		$encrypted = $iv.mcrypt_generic($module, $data);
+		$encrypted = $iv . mcrypt_generic($module, $data);
 		mcrypt_generic_deinit($module);
 		mcrypt_module_close($module);
 		return $encrypted;
 	}
 	public function decrypt($data)
 	{
-		$module=$this->openCryptModule();
+		$module = $this->openCryptModule();
 		$key = $this->substr(md5($this->getEncryptionKey()), 0, mcrypt_enc_get_key_size($module));
 		$ivSize = mcrypt_enc_get_iv_size($module);
 		$iv = $this->substr($data, 0, $ivSize);
@@ -2685,13 +2685,13 @@ 
 	}
 	protected function openCryptModule()
 	{
-		if(extension_loaded('mcrypt'))
+		if (extension_loaded('mcrypt'))
 		{
-			if(is_array($this->_cryptAlgorithm))
-				$module=@call_user_func_array('mcrypt_module_open',$this->_cryptAlgorithm);
+			if (is_array($this->_cryptAlgorithm))
+				$module = @call_user_func_array('mcrypt_module_open', $this->_cryptAlgorithm);
 			else
-				$module=@mcrypt_module_open($this->_cryptAlgorithm,'', MCRYPT_MODE_CBC,'');
-			if($module===false)
+				$module = @mcrypt_module_open($this->_cryptAlgorithm, '', MCRYPT_MODE_CBC, '');
+			if ($module === false)
 				throw new TNotSupportedException('securitymanager_mcryptextension_initfailed');
 			return $module;
 		}
@@ -2701,23 +2701,23 @@ 
 	public function hashData($data)
 	{
 		$hmac = $this->computeHMAC($data);
-		return $hmac.$data;
+		return $hmac . $data;
 	}
 	public function validateData($data)
 	{
-		$len=$this->strlen($this->computeHMAC('test'));
-		if($this->strlen($data) < $len)
+		$len = $this->strlen($this->computeHMAC('test'));
+		if ($this->strlen($data) < $len)
 			return false;
 		$hmac = $this->substr($data, 0, $len);
-		$data2=$this->substr($data, $len, $this->strlen($data));
+		$data2 = $this->substr($data, $len, $this->strlen($data));
 		return $hmac === $this->computeHMAC($data2) ? $data2 : false;
 	}
 	protected function computeHMAC($data)
 	{
 		$key = $this->getValidationKey();
-		if(function_exists('hash_hmac'))
+		if (function_exists('hash_hmac'))
 			return hash_hmac($this->_hashAlgorithm, $data, $key);
-		if(!strcasecmp($this->_hashAlgorithm,'sha1'))
+		if (!strcasecmp($this->_hashAlgorithm, 'sha1'))
 		{
 			$pack = 'H40';
 			$func = 'sha1';
@@ -2730,11 +2730,11 @@ 
 	}
 	private function strlen($string)
 	{
-		return $this->_mbstring ? mb_strlen($string,'8bit') : strlen($string);
+		return $this->_mbstring ? mb_strlen($string, '8bit') : strlen($string);
 	}
-	private function substr($string,$start,$length)
+	private function substr($string, $start, $length)
 	{
-		return $this->_mbstring ? mb_substr($string,$start,$length,'8bit') : substr($string,$start,$length);
+		return $this->_mbstring ? mb_substr($string, $start, $length, '8bit') : substr($string, $start, $length);
 	}
 }
 class TSecurityManagerValidationMode extends TEnumerable
@@ -2744,46 +2744,46 @@ 
 }
 class THttpUtility
 {
-	private static $_encodeTable=array('<'=>'&lt;','>'=>'&gt;','"'=>'&quot;');
-	private static $_decodeTable=array('&lt;'=>'<','&gt;'=>'>','&quot;'=>'"');
-	private static $_stripTable=array('&lt;'=>'','&gt;'=>'','&quot;'=>'');
+	private static $_encodeTable = array('<'=>'&lt;', '>'=>'&gt;', '"'=>'&quot;');
+	private static $_decodeTable = array('&lt;'=>'<', '&gt;'=>'>', '&quot;'=>'"');
+	private static $_stripTable = array('&lt;'=>'', '&gt;'=>'', '&quot;'=>'');
 	public static function htmlEncode($s)
 	{
-		return strtr($s,self::$_encodeTable);
+		return strtr($s, self::$_encodeTable);
 	}
 	public static function htmlDecode($s)
 	{
-		return strtr($s,self::$_decodeTable);
+		return strtr($s, self::$_decodeTable);
 	}
 	public static function htmlStrip($s)
 	{
-		return strtr($s,self::$_stripTable);
+		return strtr($s, self::$_stripTable);
 	}
 }
 class TJavaScript
 {
 	public static function renderScriptFiles($files)
 	{
-		$str='';
-		foreach($files as $file)
-			$str.= self::renderScriptFile($file);
+		$str = '';
+		foreach ($files as $file)
+			$str .= self::renderScriptFile($file);
 		return $str;
 	}
 	public static function renderScriptFile($file)
 	{
-		return '<script type="text/javascript" src="'.THttpUtility::htmlEncode($file)."\"></script>\n";
+		return '<script type="text/javascript" src="' . THttpUtility::htmlEncode($file) . "\"></script>\n";
 	}
 	public static function renderScriptBlocks($scripts)
 	{
-		if(count($scripts))
-			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n".implode("\n",$scripts)."\n/*]]>*/\n</script>\n";
+		if (count($scripts))
+			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n" . implode("\n", $scripts) . "\n/*]]>*/\n</script>\n";
 		else
 			return '';
 	}
 	public static function renderScriptBlocksCallback($scripts)
 	{
-		if(count($scripts))
-			return implode("\n",$scripts)."\n";
+		if (count($scripts))
+			return implode("\n", $scripts) . "\n";
 		else
 			return '';
 	}
@@ -2793,11 +2793,11 @@ 
 	}
 	public static function quoteString($js)
 	{
-		return self::jsonEncode($js,JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
+		return self::jsonEncode($js, JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
 	}
 	public static function quoteJsLiteral($js)
 	{
-		if($js instanceof TJavaScriptLiteral)
+		if ($js instanceof TJavaScriptLiteral)
 			return $js;
 		else
 			return new TJavaScriptLiteral($js);
@@ -2814,47 +2814,47 @@ 
 	{
 		return self::isJsLiteral($js);
 	}
-	public static function encode($value,$toMap=true,$encodeEmptyStrings=false)
+	public static function encode($value, $toMap = true, $encodeEmptyStrings = false)
 	{
-		if(is_string($value))
+		if (is_string($value))
 			return self::quoteString($value);
-		else if(is_bool($value))
-			return $value?'true':'false';
-		else if(is_array($value))
+		else if (is_bool($value))
+			return $value ? 'true' : 'false';
+		else if (is_array($value))
 		{
-			$results='';
-			if(($n=count($value))>0 && array_keys($value)!==range(0,$n-1))
+			$results = '';
+			if (($n = count($value)) > 0 && array_keys($value) !== range(0, $n - 1))
 			{
-				foreach($value as $k=>$v)
+				foreach ($value as $k=>$v)
 				{
-					if($v!=='' || $encodeEmptyStrings)
+					if ($v !== '' || $encodeEmptyStrings)
 					{
-						if($results!=='')
-							$results.=',';
-						$results.="'$k':".self::encode($v,$toMap,$encodeEmptyStrings);
+						if ($results !== '')
+							$results .= ',';
+						$results .= "'$k':" . self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
-				return '{'.$results.'}';
+				return '{' . $results . '}';
 			}
 			else
 			{
-				foreach($value as $v)
+				foreach ($value as $v)
 				{
-					if($v!=='' || $encodeEmptyStrings)
+					if ($v !== '' || $encodeEmptyStrings)
 					{
-						if($results!=='')
-							$results.=',';
-						$results.=self::encode($v,$toMap, $encodeEmptyStrings);
+						if ($results !== '')
+							$results .= ',';
+						$results .= self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
-				return '['.$results.']';
+				return '[' . $results . ']';
 			}
 		}
-		else if(is_integer($value))
+		else if (is_integer($value))
 			return "$value";
-		else if(is_float($value))
+		else if (is_float($value))
 		{
-			switch($value)
+			switch ($value)
 			{
 				case -INF:
 					return 'Number.NEGATIVE_INFINITY';
@@ -2863,46 +2863,46 @@ 
 					return 'Number.POSITIVE_INFINITY';
 					break;
 				default:
-					$locale=localeConv();
-					if($locale['decimal_point']=='.')
+					$locale = localeConv();
+					if ($locale['decimal_point'] == '.')
 						return "$value";
 					else
 						return str_replace($locale['decimal_point'], '.', "$value");
 					break;
 			}
 		}
-		else if(is_object($value))
+		else if (is_object($value))
 			if ($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
 			else
-				return self::encode(get_object_vars($value),$toMap);
-		else if($value===null)
+				return self::encode(get_object_vars($value), $toMap);
+		else if ($value === null)
 			return 'null';
 		else
 			return '';
 	}
 	public static function jsonEncode($value, $options = 0)
 	{
-		if (($g=Prado::getApplication()->getGlobalization(false))!==null &&
-			strtoupper($enc=$g->getCharset())!='UTF-8') {
+		if (($g = Prado::getApplication()->getGlobalization(false)) !== null &&
+			strtoupper($enc = $g->getCharset()) != 'UTF-8') {
 			self::convertToUtf8($value, $enc);
 		}
-		$s = @json_encode($value,$options);
+		$s = @json_encode($value, $options);
 		self::checkJsonError();
 		return $s;
 	}
 	private static function convertToUtf8(&$value, $sourceEncoding) {
-		if(is_string($value))
-			$value=iconv($sourceEncoding, 'UTF-8', $value);
+		if (is_string($value))
+			$value = iconv($sourceEncoding, 'UTF-8', $value);
 		else if (is_array($value))
 		{
-			foreach($value as &$element)
+			foreach ($value as &$element)
 				self::convertToUtf8($element, $sourceEncoding);
 		}
 	}
 	public static function jsonDecode($value, $assoc = false, $depth = 512)
 	{
-		$s= @json_decode($value, $assoc, $depth);
+		$s = @json_decode($value, $assoc, $depth);
 		self::checkJsonError();
 		return $s;
 	}
@@ -2942,77 +2942,77 @@ 
 }
 class TUrlManager extends TModule
 {
-	public function constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems)
+	public function constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems)
 	{
-		$url=$serviceID.'='.urlencode($serviceParam);
-		$amp=$encodeAmpersand?'&amp;':'&';
-		$request=$this->getRequest();
-		if(is_array($getItems) || $getItems instanceof Traversable)
+		$url = $serviceID . '=' . urlencode($serviceParam);
+		$amp = $encodeAmpersand ? '&amp;' : '&';
+		$request = $this->getRequest();
+		if (is_array($getItems) || $getItems instanceof Traversable)
 		{
-			if($encodeGetItems)
+			if ($encodeGetItems)
 			{
-				foreach($getItems as $name=>$value)
+				foreach ($getItems as $name=>$value)
 				{
-					if(is_array($value))
+					if (is_array($value))
 					{
-						$name=urlencode($name.'[]');
-						foreach($value as $v)
-							$url.=$amp.$name.'='.urlencode($v);
+						$name = urlencode($name . '[]');
+						foreach ($value as $v)
+							$url .= $amp . $name . '=' . urlencode($v);
 					}
 					else
-						$url.=$amp.urlencode($name).'='.urlencode($value);
+						$url .= $amp . urlencode($name) . '=' . urlencode($value);
 				}
 			}
 			else
 			{
-				foreach($getItems as $name=>$value)
+				foreach ($getItems as $name=>$value)
 				{
-					if(is_array($value))
+					if (is_array($value))
 					{
-						foreach($value as $v)
-							$url.=$amp.$name.'[]='.$v;
+						foreach ($value as $v)
+							$url .= $amp . $name . '[]=' . $v;
 					}
 					else
-						$url.=$amp.$name.'='.$value;
+						$url .= $amp . $name . '=' . $value;
 				}
 			}
 		}
-		switch($request->getUrlFormat())
+		switch ($request->getUrlFormat())
 		{
 			case THttpRequestUrlFormat::Path:
-				return $request->getApplicationUrl().'/'.strtr($url,array($amp=>'/','?'=>'/','='=>$request->getUrlParamSeparator()));
+				return $request->getApplicationUrl() . '/' . strtr($url, array($amp=>'/', '?'=>'/', '='=>$request->getUrlParamSeparator()));
 			case THttpRequestUrlFormat::HiddenPath:
-				return rtrim(dirname($request->getApplicationUrl()), '/').'/'.strtr($url,array($amp=>'/','?'=>'/','='=>$request->getUrlParamSeparator()));
+				return rtrim(dirname($request->getApplicationUrl()), '/') . '/' . strtr($url, array($amp=>'/', '?'=>'/', '='=>$request->getUrlParamSeparator()));
 			default:
-				return $request->getApplicationUrl().'?'.$url;
+				return $request->getApplicationUrl() . '?' . $url;
 		}
 	}
 	public function parseUrl()
 	{
-		$request=$this->getRequest();
-		$pathInfo=trim($request->getPathInfo(),'/');
-		if(($request->getUrlFormat()===THttpRequestUrlFormat::Path ||
-			$request->getUrlFormat()===THttpRequestUrlFormat::HiddenPath) &&
-			$pathInfo!=='')
+		$request = $this->getRequest();
+		$pathInfo = trim($request->getPathInfo(), '/');
+		if (($request->getUrlFormat() === THttpRequestUrlFormat::Path ||
+			$request->getUrlFormat() === THttpRequestUrlFormat::HiddenPath) &&
+			$pathInfo !== '')
 		{
-			$separator=$request->getUrlParamSeparator();
-			$paths=explode('/',$pathInfo);
-			$getVariables=array();
-			foreach($paths as $path)
+			$separator = $request->getUrlParamSeparator();
+			$paths = explode('/', $pathInfo);
+			$getVariables = array();
+			foreach ($paths as $path)
 			{
-				if(($path=trim($path))!=='')
+				if (($path = trim($path)) !== '')
 				{
-					if(($pos=strpos($path,$separator))!==false)
+					if (($pos = strpos($path, $separator)) !== false)
 					{
-						$name=substr($path,0,$pos);
-						$value=substr($path,$pos+1);
-						if(($pos=strpos($name,'[]'))!==false)
-							$getVariables[substr($name,0,$pos)][]=$value;
+						$name = substr($path, 0, $pos);
+						$value = substr($path, $pos + 1);
+						if (($pos = strpos($name, '[]')) !== false)
+							$getVariables[substr($name, 0, $pos)][] = $value;
 						else
-							$getVariables[$name]=$value;
+							$getVariables[$name] = $value;
 					}
 					else
-						$getVariables[$path]='';
+						$getVariables[$path] = '';
 				}
 			}
 			return $getVariables;
@@ -3021,91 +3021,91 @@ 
 			return array();
 	}
 }
-class THttpRequest extends TApplicationComponent implements IteratorAggregate,ArrayAccess,Countable,IModule
+class THttpRequest extends TApplicationComponent implements IteratorAggregate, ArrayAccess, Countable, IModule
 {
-	const CGIFIX__PATH_INFO		= 1;
-	const CGIFIX__SCRIPT_NAME	= 2;
-	private $_urlManager=null;
-	private $_urlManagerID='';
-	private $_separator=',';
-	private $_serviceID=null;
-	private $_serviceParam=null;
-	private $_cookies=null;
+	const CGIFIX__PATH_INFO = 1;
+	const CGIFIX__SCRIPT_NAME = 2;
+	private $_urlManager = null;
+	private $_urlManagerID = '';
+	private $_separator = ',';
+	private $_serviceID = null;
+	private $_serviceParam = null;
+	private $_cookies = null;
 	private $_requestUri;
 	private $_pathInfo;
-	private $_cookieOnly=null;
-	private $_urlFormat=THttpRequestUrlFormat::Get;
+	private $_cookieOnly = null;
+	private $_urlFormat = THttpRequestUrlFormat::Get;
 	private $_services;
-	private $_requestResolved=false;
-	private $_enableCookieValidation=false;
-	private $_cgiFix=0;
-	private $_enableCache=false;
-	private $_url=null;
+	private $_requestResolved = false;
+	private $_enableCookieValidation = false;
+	private $_cgiFix = 0;
+	private $_enableCache = false;
+	private $_url = null;
 	private $_id;
-	private $_items=array();
+	private $_items = array();
 	public function getID()
 	{
 		return $this->_id;
 	}
 	public function setID($value)
 	{
-		$this->_id=$value;
+		$this->_id = $value;
 	}
 	public function init($config)
 	{
-				if(php_sapi_name()==='cli')
-		{
-			$_SERVER['REMOTE_ADDR']='127.0.0.1';
-			$_SERVER['REQUEST_METHOD']='GET';
-			$_SERVER['SERVER_NAME']='localhost';
-			$_SERVER['SERVER_PORT']=80;
-			$_SERVER['HTTP_USER_AGENT']='';
-		}
-														if(isset($_SERVER['REQUEST_URI']))
-			$this->_requestUri=$_SERVER['REQUEST_URI'];
-		else  			$this->_requestUri=$_SERVER['SCRIPT_NAME'].(empty($_SERVER['QUERY_STRING'])?'':'?'.$_SERVER['QUERY_STRING']);
-		if($this->_cgiFix&self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
-			$this->_pathInfo=substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
-		elseif(isset($_SERVER['PATH_INFO']))
-			$this->_pathInfo=$_SERVER['PATH_INFO'];
-		else if(strpos($_SERVER['PHP_SELF'],$_SERVER['SCRIPT_NAME'])===0 && $_SERVER['PHP_SELF']!==$_SERVER['SCRIPT_NAME'])
-			$this->_pathInfo=substr($_SERVER['PHP_SELF'],strlen($_SERVER['SCRIPT_NAME']));
-		else
-			$this->_pathInfo='';
-		if(get_magic_quotes_gpc())
-		{
-			if(isset($_GET))
-				$_GET=$this->stripSlashes($_GET);
-			if(isset($_POST))
-				$_POST=$this->stripSlashes($_POST);
-			if(isset($_REQUEST))
-				$_REQUEST=$this->stripSlashes($_REQUEST);
-			if(isset($_COOKIE))
-				$_COOKIE=$this->stripSlashes($_COOKIE);
+				if (php_sapi_name() === 'cli')
+		{
+			$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
+			$_SERVER['REQUEST_METHOD'] = 'GET';
+			$_SERVER['SERVER_NAME'] = 'localhost';
+			$_SERVER['SERVER_PORT'] = 80;
+			$_SERVER['HTTP_USER_AGENT'] = '';
+		}
+														if (isset($_SERVER['REQUEST_URI']))
+			$this->_requestUri = $_SERVER['REQUEST_URI'];
+		else  			$this->_requestUri = $_SERVER['SCRIPT_NAME'] . (empty($_SERVER['QUERY_STRING']) ? '' : '?' . $_SERVER['QUERY_STRING']);
+		if ($this->_cgiFix & self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
+			$this->_pathInfo = substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
+		elseif (isset($_SERVER['PATH_INFO']))
+			$this->_pathInfo = $_SERVER['PATH_INFO'];
+		else if (strpos($_SERVER['PHP_SELF'], $_SERVER['SCRIPT_NAME']) === 0 && $_SERVER['PHP_SELF'] !== $_SERVER['SCRIPT_NAME'])
+			$this->_pathInfo = substr($_SERVER['PHP_SELF'], strlen($_SERVER['SCRIPT_NAME']));
+		else
+			$this->_pathInfo = '';
+		if (get_magic_quotes_gpc())
+		{
+			if (isset($_GET))
+				$_GET = $this->stripSlashes($_GET);
+			if (isset($_POST))
+				$_POST = $this->stripSlashes($_POST);
+			if (isset($_REQUEST))
+				$_REQUEST = $this->stripSlashes($_REQUEST);
+			if (isset($_COOKIE))
+				$_COOKIE = $this->stripSlashes($_COOKIE);
 		}
 		$this->getApplication()->setRequest($this);
 	}
 	public function stripSlashes(&$data)
 	{
-		return is_array($data)?array_map(array($this,'stripSlashes'),$data):stripslashes($data);
+		return is_array($data) ? array_map(array($this, 'stripSlashes'), $data) : stripslashes($data);
 	}
 	public function getUrl()
 	{
-		if($this->_url===null)
+		if ($this->_url === null)
 		{
-			$secure=$this->getIsSecureConnection();
-			$url=$secure?'https://':'http://';
-			if(empty($_SERVER['HTTP_HOST']))
+			$secure = $this->getIsSecureConnection();
+			$url = $secure ? 'https://' : 'http://';
+			if (empty($_SERVER['HTTP_HOST']))
 			{
-				$url.=$_SERVER['SERVER_NAME'];
-				$port=$_SERVER['SERVER_PORT'];
-				if(($port!=80 && !$secure) || ($port!=443 && $secure))
-					$url.=':'.$port;
+				$url .= $_SERVER['SERVER_NAME'];
+				$port = $_SERVER['SERVER_PORT'];
+				if (($port != 80 && !$secure) || ($port != 443 && $secure))
+					$url .= ':' . $port;
 			}
 			else
-				$url.=$_SERVER['HTTP_HOST'];
-			$url.=$this->getRequestUri();
-			$this->_url=new TUri($url);
+				$url .= $_SERVER['HTTP_HOST'];
+			$url .= $this->getRequestUri();
+			$this->_url = new TUri($url);
 		}
 		return $this->_url;
 	}
@@ -3123,16 +3123,16 @@ 
 	}
 	protected function cacheUrlManager($manager)
 	{
-		if($this->getEnableCache())
+		if ($this->getEnableCache())
 		{
 			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			if ($cache !== null)
 			{
 				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
+				if ($this->getApplication()->getMode() !== TApplicationMode::Performance)
 					if ($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
 					{
-						$fn = Prado::getPathOfNamespace($fn,$this->getApplication()->getConfigurationFileExt());
+						$fn = Prado::getPathOfNamespace($fn, $this->getApplication()->getConfigurationFileExt());
 						$dependencies = new TFileCacheDependency($fn);
 					}
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
@@ -3142,13 +3142,13 @@ 
 	}
 	protected function loadCachedUrlManager()
 	{
-		if($this->getEnableCache())
+		if ($this->getEnableCache())
 		{
 			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			if ($cache !== null)
 			{
 				$manager = $cache->get($this->getCacheKey());
-				if($manager instanceof TUrlManager)
+				if ($manager instanceof TUrlManager)
 					return $manager;
 			}
 		}
@@ -3160,26 +3160,26 @@ 
 	}
 	public function setUrlManager($value)
 	{
-		$this->_urlManagerID=$value;
+		$this->_urlManagerID = $value;
 	}
 	public function getUrlManagerModule()
 	{
-		if($this->_urlManager===null)
+		if ($this->_urlManager === null)
 		{
-			if(($this->_urlManager = $this->loadCachedUrlManager())===null)
+			if (($this->_urlManager = $this->loadCachedUrlManager()) === null)
 			{
-				if(empty($this->_urlManagerID))
+				if (empty($this->_urlManagerID))
 				{
-					$this->_urlManager=new TUrlManager;
+					$this->_urlManager = new TUrlManager;
 					$this->_urlManager->init(null);
 				}
 				else
 				{
-					$this->_urlManager=$this->getApplication()->getModule($this->_urlManagerID);
-					if($this->_urlManager===null)
-						throw new TConfigurationException('httprequest_urlmanager_inexist',$this->_urlManagerID);
-					if(!($this->_urlManager instanceof TUrlManager))
-						throw new TConfigurationException('httprequest_urlmanager_invalid',$this->_urlManagerID);
+					$this->_urlManager = $this->getApplication()->getModule($this->_urlManagerID);
+					if ($this->_urlManager === null)
+						throw new TConfigurationException('httprequest_urlmanager_inexist', $this->_urlManagerID);
+					if (!($this->_urlManager instanceof TUrlManager))
+						throw new TConfigurationException('httprequest_urlmanager_invalid', $this->_urlManagerID);
 				}
 				$this->cacheUrlManager($this->_urlManager);
 			}
@@ -3192,7 +3192,7 @@ 
 	}
 	public function setUrlFormat($value)
 	{
-		$this->_urlFormat=TPropertyValue::ensureEnum($value,'THttpRequestUrlFormat');
+		$this->_urlFormat = TPropertyValue::ensureEnum($value, 'THttpRequestUrlFormat');
 	}
 	public function getUrlParamSeparator()
 	{
@@ -3200,26 +3200,26 @@ 
 	}
 	public function setUrlParamSeparator($value)
 	{
-		if(strlen($value)===1)
-			$this->_separator=$value;
+		if (strlen($value) === 1)
+			$this->_separator = $value;
 		else
 			throw new TInvalidDataValueException('httprequest_separator_invalid');
 	}
 	public function getRequestType()
 	{
-		return isset($_SERVER['REQUEST_METHOD'])?$_SERVER['REQUEST_METHOD']:null;
+		return isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : null;
 	}
 	public function getContentType($mimetypeOnly = true)
 	{
-		if(!isset($_SERVER['CONTENT_TYPE']))
+		if (!isset($_SERVER['CONTENT_TYPE']))
 			return null;
-		if($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false)
+		if ($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false)
 			return substr($_SERVER['CONTENT_TYPE'], 0, $_pos);
 		return $_SERVER['CONTENT_TYPE'];
 	}
 	public function getIsSecureConnection()
 	{
-			return isset($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'],'off');
+			return isset($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'off');
 	}
 	public function getPathInfo()
 	{
@@ -3227,27 +3227,27 @@ 
 	}
 	public function getQueryString()
 	{
-		return isset($_SERVER['QUERY_STRING'])?$_SERVER['QUERY_STRING']:null;
+		return isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : null;
 	}
 	public function getHttpProtocolVersion()
 	{
-		return isset($_SERVER['SERVER_PROTOCOL'])?$_SERVER['SERVER_PROTOCOL']:null;
+		return isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : null;
 	}
-	public function getHeaders($case=null)
+	public function getHeaders($case = null)
 	{
 		static $result;
-		if($result === null && function_exists('apache_request_headers')) {
+		if ($result === null && function_exists('apache_request_headers')) {
 			$result = apache_request_headers();
 		}
-		elseif($result === null) {
+		elseif ($result === null) {
 			$result = array();
-			foreach($_SERVER as $key=>$value) {
-				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
-					$key = str_replace(' ','-', ucwords(strtolower(str_replace('_',' ', substr($key, 5)))));
+			foreach ($_SERVER as $key=>$value) {
+				if (strncasecmp($key, 'HTTP_', 5) !== 0) continue;
+					$key = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($key, 5)))));
 					$result[$key] = $value;
 			}
 		}
-		if($case !== null)
+		if ($case !== null)
 			return array_change_key_case($result, $case);
 		return $result;
 	}
@@ -3255,39 +3255,39 @@ 
 	{
 		return $this->_requestUri;
 	}
-	public function getBaseUrl($forceSecureConnection=null)
+	public function getBaseUrl($forceSecureConnection = null)
 	{
-		$url=$this->getUrl();
-		$scheme=($forceSecureConnection)?"https": (($forceSecureConnection === null)?$url->getScheme():'http');
-		$host=$url->getHost();
-		if (($port=$url->getPort())) $host.=':'.$port;
-		return $scheme.'://'.$host;
+		$url = $this->getUrl();
+		$scheme = ($forceSecureConnection) ? "https" : (($forceSecureConnection === null) ? $url->getScheme() : 'http');
+		$host = $url->getHost();
+		if (($port = $url->getPort())) $host .= ':' . $port;
+		return $scheme . '://' . $host;
 	}
 	public function getApplicationUrl()
 	{
-		if($this->_cgiFix&self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
+		if ($this->_cgiFix & self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
 			return $_SERVER['ORIG_SCRIPT_NAME'];
-		return isset($_SERVER['SCRIPT_NAME'])?$_SERVER['SCRIPT_NAME']:null;
+		return isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : null;
 	}
-	public function getAbsoluteApplicationUrl($forceSecureConnection=null)
+	public function getAbsoluteApplicationUrl($forceSecureConnection = null)
 	{
 		return $this->getBaseUrl($forceSecureConnection) . $this->getApplicationUrl();
 	}
 	public function getApplicationFilePath()
 	{
-		return realpath(isset($_SERVER['SCRIPT_FILENAME'])?$_SERVER['SCRIPT_FILENAME']:null);
+		return realpath(isset($_SERVER['SCRIPT_FILENAME']) ? $_SERVER['SCRIPT_FILENAME'] : null);
 	}
 	public function getServerName()
 	{
-		return isset($_SERVER['SERVER_NAME'])?$_SERVER['SERVER_NAME']:null;
+		return isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
 	}
 	public function getServerPort()
 	{
-		return isset($_SERVER['SERVER_PORT'])?$_SERVER['SERVER_PORT']:null;
+		return isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : null;
 	}
 	public function getUrlReferrer()
 	{
-		return isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:null;
+		return isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
 	}
 	public function getBrowser()
 	{
@@ -3295,26 +3295,26 @@ 
 		{
 			return get_browser();
 		}
-		catch(TPhpErrorException $e)
+		catch (TPhpErrorException $e)
 		{
 			throw new TConfigurationException('httprequest_browscap_required');
 		}
 	}
 	public function getUserAgent()
 	{
-		return isset($_SERVER['HTTP_USER_AGENT'])?$_SERVER['HTTP_USER_AGENT']:null;
+		return isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
 	}
 	public function getUserHostAddress()
 	{
-		return isset($_SERVER['REMOTE_ADDR'])?$_SERVER['REMOTE_ADDR']:null;
+		return isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null;
 	}
 	public function getUserHost()
 	{
-		return isset($_SERVER['REMOTE_HOST'])?$_SERVER['REMOTE_HOST']:null;
+		return isset($_SERVER['REMOTE_HOST']) ? $_SERVER['REMOTE_HOST'] : null;
 	}
 	public function getAcceptTypes()
 	{
-				return isset($_SERVER['HTTP_ACCEPT'])?$_SERVER['HTTP_ACCEPT']:null;
+				return isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
 	}
 	public function getUserLanguages()
 	{
@@ -3326,7 +3326,7 @@ 
 	}
 	public function setEnableCookieValidation($value)
 	{
-		$this->_enableCookieValidation=TPropertyValue::ensureBoolean($value);
+		$this->_enableCookieValidation = TPropertyValue::ensureBoolean($value);
 	}
 	public function getCgiFix()
 	{
@@ -3334,26 +3334,26 @@ 
 	}
 	public function setCgiFix($value)
 	{
-		$this->_cgiFix=TPropertyValue::ensureInteger($value);
+		$this->_cgiFix = TPropertyValue::ensureInteger($value);
 	}
 	public function getCookies()
 	{
-		if($this->_cookies===null)
+		if ($this->_cookies === null)
 		{
-			$this->_cookies=new THttpCookieCollection;
-			if($this->getEnableCookieValidation())
+			$this->_cookies = new THttpCookieCollection;
+			if ($this->getEnableCookieValidation())
 			{
-				$sm=$this->getApplication()->getSecurityManager();
-				foreach($_COOKIE as $key=>$value)
+				$sm = $this->getApplication()->getSecurityManager();
+				foreach ($_COOKIE as $key=>$value)
 				{
-					if(($value=$sm->validateData($value))!==false)
-						$this->_cookies->add(new THttpCookie($key,$value));
+					if (($value = $sm->validateData($value)) !== false)
+						$this->_cookies->add(new THttpCookie($key, $value));
 				}
 			}
 			else
 			{
-				foreach($_COOKIE as $key=>$value)
-					$this->_cookies->add(new THttpCookie($key,$value));
+				foreach ($_COOKIE as $key=>$value)
+					$this->_cookies->add(new THttpCookie($key, $value));
 			}
 		}
 		return $this->_cookies;
@@ -3370,13 +3370,13 @@ 
 	{
 		return $_ENV;
 	}
-	public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=true,$encodeGetItems=true)
+	public function constructUrl($serviceID, $serviceParam, $getItems = null, $encodeAmpersand = true, $encodeGetItems = true)
 	{
-		if ($this->_cookieOnly===null)
-				$this->_cookieOnly=(int)ini_get('session.use_cookies') && (int)ini_get('session.use_only_cookies');
-		$url=$this->getUrlManagerModule()->constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems);
-		if(defined('SID') && SID != '' && !$this->_cookieOnly)
-			return $url . (strpos($url,'?')===false? '?' : ($encodeAmpersand?'&amp;':'&')) . SID;
+		if ($this->_cookieOnly === null)
+				$this->_cookieOnly = (int) ini_get('session.use_cookies') && (int) ini_get('session.use_only_cookies');
+		$url = $this->getUrlManagerModule()->constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems);
+		if (defined('SID') && SID != '' && !$this->_cookieOnly)
+			return $url . (strpos($url, '?') === false ? '?' : ($encodeAmpersand ? '&amp;' : '&')) . SID;
 		else
 			return $url;
 	}
@@ -3386,14 +3386,14 @@ 
 	}
 	public function resolveRequest($serviceIDs)
 	{
-		$getParams=$this->parseUrl();
-		foreach($getParams as $name=>$value)
-			$_GET[$name]=$value;
-		$this->_items=array_merge($_GET,$_POST);
-		$this->_requestResolved=true;
-		foreach($serviceIDs as $serviceID)
+		$getParams = $this->parseUrl();
+		foreach ($getParams as $name=>$value)
+			$_GET[$name] = $value;
+		$this->_items = array_merge($_GET, $_POST);
+		$this->_requestResolved = true;
+		foreach ($serviceIDs as $serviceID)
 		{
-			if($this->contains($serviceID))
+			if ($this->contains($serviceID))
 			{
 				$this->setServiceID($serviceID);
 				$this->setServiceParameter($this->itemAt($serviceID));
@@ -3412,7 +3412,7 @@ 
 	}
 	public function setServiceID($value)
 	{
-		$this->_serviceID=$value;
+		$this->_serviceID = $value;
 	}
 	public function getServiceParameter()
 	{
@@ -3420,7 +3420,7 @@ 
 	}
 	public function setServiceParameter($value)
 	{
-		$this->_serviceParam=$value;
+		$this->_serviceParam = $value;
 	}
 	public function getIterator()
 	{
@@ -3442,15 +3442,15 @@ 
 	{
 		return isset($this->_items[$key]) ? $this->_items[$key] : null;
 	}
-	public function add($key,$value)
+	public function add($key, $value)
 	{
-		$this->_items[$key]=$value;
+		$this->_items[$key] = $value;
 	}
 	public function remove($key)
 	{
-		if(isset($this->_items[$key]) || array_key_exists($key,$this->_items))
+		if (isset($this->_items[$key]) || array_key_exists($key, $this->_items))
 		{
-			$value=$this->_items[$key];
+			$value = $this->_items[$key];
 			unset($this->_items[$key]);
 			return $value;
 		}
@@ -3459,12 +3459,12 @@ 
 	}
 	public function clear()
 	{
-		foreach(array_keys($this->_items) as $key)
+		foreach (array_keys($this->_items) as $key)
 			$this->remove($key);
 	}
 	public function contains($key)
 	{
-		return isset($this->_items[$key]) || array_key_exists($key,$this->_items);
+		return isset($this->_items[$key]) || array_key_exists($key, $this->_items);
 	}
 	public function toArray()
 	{
@@ -3478,9 +3478,9 @@ 
 	{
 		return $this->itemAt($offset);
 	}
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		$this->add($offset,$item);
+		$this->add($offset, $item);
 	}
 	public function offsetUnset($offset)
 	{
@@ -3490,16 +3490,16 @@ 
 class THttpCookieCollection extends TList
 {
 	private $_o;
-	public function __construct($owner=null)
+	public function __construct($owner = null)
 	{
-		$this->_o=$owner;
+		$this->_o = $owner;
 	}
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if($item instanceof THttpCookie)
+		if ($item instanceof THttpCookie)
 		{
-			parent::insertAt($index,$item);
-			if($this->_o instanceof THttpResponse)
+			parent::insertAt($index, $item);
+			if ($this->_o instanceof THttpResponse)
 				$this->_o->addCookie($item);
 		}
 		else
@@ -3507,39 +3507,39 @@ 
 	}
 	public function removeAt($index)
 	{
-		$item=parent::removeAt($index);
-		if($this->_o instanceof THttpResponse)
+		$item = parent::removeAt($index);
+		if ($this->_o instanceof THttpResponse)
 			$this->_o->removeCookie($item);
 		return $item;
 	}
 	public function itemAt($index)
 	{
-		if(is_integer($index))
+		if (is_integer($index))
 			return parent::itemAt($index);
 		else
 			return $this->findCookieByName($index);
 	}
 	public function findCookieByName($name)
 	{
-		foreach($this as $cookie)
-			if($cookie->getName()===$name)
+		foreach ($this as $cookie)
+			if ($cookie->getName() === $name)
 				return $cookie;
 		return null;
 	}
 }
 class THttpCookie extends TComponent
 {
-	private $_domain='';
+	private $_domain = '';
 	private $_name;
-	private $_value='';
-	private $_expire=0;
-	private $_path='/';
-	private $_secure=false;
-	private $_httpOnly=false;
-	public function __construct($name,$value)
+	private $_value = '';
+	private $_expire = 0;
+	private $_path = '/';
+	private $_secure = false;
+	private $_httpOnly = false;
+	public function __construct($name, $value)
 	{
-		$this->_name=$name;
-		$this->_value=$value;
+		$this->_name = $name;
+		$this->_value = $value;
 	}
 	public function getDomain()
 	{
@@ -3547,7 +3547,7 @@ 
 	}
 	public function setDomain($value)
 	{
-		$this->_domain=$value;
+		$this->_domain = $value;
 	}
 	public function getExpire()
 	{
@@ -3555,7 +3555,7 @@ 
 	}
 	public function setExpire($value)
 	{
-		$this->_expire=TPropertyValue::ensureInteger($value);
+		$this->_expire = TPropertyValue::ensureInteger($value);
 	}
 	public function getHttpOnly()
 	{
@@ -3571,7 +3571,7 @@ 
 	}
 	public function setName($value)
 	{
-		$this->_name=$value;
+		$this->_name = $value;
 	}
 	public function getValue()
 	{
@@ -3579,7 +3579,7 @@ 
 	}
 	public function setValue($value)
 	{
-		$this->_value=$value;
+		$this->_value = $value;
 	}
 	public function getPath()
 	{
@@ -3587,7 +3587,7 @@ 
 	}
 	public function setPath($value)
 	{
-		$this->_path=$value;
+		$this->_path = $value;
 	}
 	public function getSecure()
 	{
@@ -3595,12 +3595,12 @@ 
 	}
 	public function setSecure($value)
 	{
-		$this->_secure=TPropertyValue::ensureBoolean($value);
+		$this->_secure = TPropertyValue::ensureBoolean($value);
 	}
 }
 class TUri extends TComponent
 {
-	private static $_defaultPort=array(
+	private static $_defaultPort = array(
 		'ftp'=>21,
 		'gopher'=>70,
 		'http'=>80,
@@ -3621,21 +3621,21 @@ 
 	private $_uri;
 	public function __construct($uri)
 	{
-		if(($ret=@parse_url($uri))!==false)
+		if (($ret = @parse_url($uri)) !== false)
 		{
-						$this->_scheme=isset($ret['scheme'])?$ret['scheme']:'';
-			$this->_host=isset($ret['host'])?$ret['host']:'';
-			$this->_port=isset($ret['port'])?$ret['port']:'';
-			$this->_user=isset($ret['user'])?$ret['user']:'';
-			$this->_pass=isset($ret['pass'])?$ret['pass']:'';
-			$this->_path=isset($ret['path'])?$ret['path']:'';
-			$this->_query=isset($ret['query'])?$ret['query']:'';
-			$this->_fragment=isset($ret['fragment'])?$ret['fragment']:'';
-			$this->_uri=$uri;
+						$this->_scheme = isset($ret['scheme']) ? $ret['scheme'] : '';
+			$this->_host = isset($ret['host']) ? $ret['host'] : '';
+			$this->_port = isset($ret['port']) ? $ret['port'] : '';
+			$this->_user = isset($ret['user']) ? $ret['user'] : '';
+			$this->_pass = isset($ret['pass']) ? $ret['pass'] : '';
+			$this->_path = isset($ret['path']) ? $ret['path'] : '';
+			$this->_query = isset($ret['query']) ? $ret['query'] : '';
+			$this->_fragment = isset($ret['fragment']) ? $ret['fragment'] : '';
+			$this->_uri = $uri;
 		}
 		else
 		{
-			throw new TInvalidDataValueException('uri_format_invalid',$uri);
+			throw new TInvalidDataValueException('uri_format_invalid', $uri);
 		}
 	}
 	public function getUri()
@@ -3677,16 +3677,16 @@ 
 }
 class THttpRequestUrlFormat extends TEnumerable
 {
-	const Get='Get';
-	const Path='Path';
-	const HiddenPath='HiddenPath';
+	const Get = 'Get';
+	const Path = 'Path';
+	const HiddenPath = 'HiddenPath';
 }
 class THttpResponseAdapter extends TApplicationComponent
 {
 	private $_response;
 	public function __construct($response)
 	{
-		$this->_response=$response;
+		$this->_response = $response;
 	}
 	public function getResponse()
 	{
@@ -3702,13 +3702,13 @@ 
 	}
 	public function createNewHtmlWriter($type, $writer)
 	{
-		return $this->_response->createNewHtmlWriter($type,$writer);
+		return $this->_response->createNewHtmlWriter($type, $writer);
 	}
 }
 class THttpResponse extends TModule implements ITextWriter
 {
-	const DEFAULT_CONTENTTYPE	= 'text/html';
-	const DEFAULT_CHARSET		= 'UTF-8';
+	const DEFAULT_CONTENTTYPE = 'text/html';
+	const DEFAULT_CHARSET = 'UTF-8';
 	private static $HTTP_STATUS_CODES = array(
 		100 => 'Continue', 101 => 'Switching Protocols',
 		200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content',
@@ -3716,14 +3716,14 @@ 
 		400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Time-out', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Large', 415 => 'Unsupported Media Type', 416 => 'Requested range not satisfiable', 417 => 'Expectation Failed',
 		500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Time-out', 505 => 'HTTP Version not supported'
 	);
-	private $_bufferOutput=true;
-	private $_initialized=false;
-	private $_cookies=null;
-	private $_status=200;
-	private $_reason='OK';
-	private $_htmlWriterType='System.Web.UI.THtmlWriter';
-	private $_contentType=null;
-	private $_charset='';
+	private $_bufferOutput = true;
+	private $_initialized = false;
+	private $_cookies = null;
+	private $_status = 200;
+	private $_reason = 'OK';
+	private $_htmlWriterType = 'System.Web.UI.THtmlWriter';
+	private $_contentType = null;
+	private $_charset = '';
 	private $_adapter;
 	private $_httpHeaderSent;
 	private $_contentTypeHeaderSent;
@@ -3732,7 +3732,7 @@ 
 					}
 	public function setAdapter(THttpResponseAdapter $adapter)
 	{
-		$this->_adapter=$adapter;
+		$this->_adapter = $adapter;
 	}
 	public function getAdapter()
 	{
@@ -3740,13 +3740,13 @@ 
 	}
 	public function getHasAdapter()
 	{
-		return $this->_adapter!==null;
+		return $this->_adapter !== null;
 	}
 	public function init($config)
 	{
-		if($this->_bufferOutput)
+		if ($this->_bufferOutput)
 			ob_start();
-		$this->_initialized=true;
+		$this->_initialized = true;
 		$this->getApplication()->setResponse($this);
 	}
 	public function getCacheExpire()
@@ -3763,7 +3763,7 @@ 
 	}
 	public function setCacheControl($value)
 	{
-		session_cache_limiter(TPropertyValue::ensureEnum($value,array('none','nocache','private','private_no_expire','public')));
+		session_cache_limiter(TPropertyValue::ensureEnum($value, array('none', 'nocache', 'private', 'private_no_expire', 'public')));
 	}
 	public function setContentType($type)
 	{
@@ -3781,7 +3781,7 @@ 
 	}
 	public function setCharset($charset)
 	{
-		$this->_charset = (strToLower($charset) === 'false') ? false : (string)$charset;
+		$this->_charset = (strToLower($charset) === 'false') ? false : (string) $charset;
 	}
 	public function getBufferOutput()
 	{
@@ -3789,41 +3789,41 @@ 
 	}
 	public function setBufferOutput($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('httpresponse_bufferoutput_unchangeable');
 		else
-			$this->_bufferOutput=TPropertyValue::ensureBoolean($value);
+			$this->_bufferOutput = TPropertyValue::ensureBoolean($value);
 	}
 	public function getStatusCode()
 	{
 		return $this->_status;
 	}
-	public function setStatusCode($status, $reason=null)
+	public function setStatusCode($status, $reason = null)
 	{
 		if ($this->_httpHeaderSent)
 			throw new Exception('Unable to alter response as HTTP header already sent');
-		$status=TPropertyValue::ensureInteger($status);
-		if(isset(self::$HTTP_STATUS_CODES[$status])) {
-			$this->_reason=self::$HTTP_STATUS_CODES[$status];
-		}else{
-			if($reason===null || $reason==='') {
+		$status = TPropertyValue::ensureInteger($status);
+		if (isset(self::$HTTP_STATUS_CODES[$status])) {
+			$this->_reason = self::$HTTP_STATUS_CODES[$status];
+		} else {
+			if ($reason === null || $reason === '') {
 				throw new TInvalidDataValueException("response_status_reason_missing");
 			}
-			$reason=TPropertyValue::ensureString($reason);
-			if(strpos($reason, "\r")!=false || strpos($reason, "\n")!=false) {
+			$reason = TPropertyValue::ensureString($reason);
+			if (strpos($reason, "\r") != false || strpos($reason, "\n") != false) {
 				throw new TInvalidDataValueException("response_status_reason_barchars");
 			}
-			$this->_reason=$reason;
+			$this->_reason = $reason;
 		}
-		$this->_status=$status;
+		$this->_status = $status;
 	}
 	public function getStatusReason() {
 		return $this->_reason;
 	}
 	public function getCookies()
 	{
-		if($this->_cookies===null)
-			$this->_cookies=new THttpCookieCollection($this);
+		if ($this->_cookies === null)
+			$this->_cookies = new THttpCookieCollection($this);
 		return $this->_cookies;
 	}
 	public function write($str)
@@ -3832,9 +3832,9 @@ 
 			$this->ensureHeadersSent();
 		echo $str;
 	}
-	public function writeFile($fileName,$content=null,$mimeType=null,$headers=null,$forceDownload=true,$clientFileName=null,$fileSize=null)
+	public function writeFile($fileName, $content = null, $mimeType = null, $headers = null, $forceDownload = true, $clientFileName = null, $fileSize = null)
 	{
-		static $defaultMimeTypes=array(
+		static $defaultMimeTypes = array(
 			'css'=>'text/css',
 			'gif'=>'image/gif',
 			'png'=>'image/png',
@@ -3846,28 +3846,28 @@ 
 			'pdf'=>'application/pdf',
 			'xls'=>'application/vnd.ms-excel',
 		);
-		if($mimeType===null)
+		if ($mimeType === null)
 		{
-			$mimeType='text/plain';
-			if(function_exists('mime_content_type'))
-				$mimeType=mime_content_type($fileName);
-			else if(($ext=strrchr($fileName,'.'))!==false)
+			$mimeType = 'text/plain';
+			if (function_exists('mime_content_type'))
+				$mimeType = mime_content_type($fileName);
+			else if (($ext = strrchr($fileName, '.')) !== false)
 			{
-				$ext=substr($ext,1);
-				if(isset($defaultMimeTypes[$ext]))
-					$mimeType=$defaultMimeTypes[$ext];
+				$ext = substr($ext, 1);
+				if (isset($defaultMimeTypes[$ext]))
+					$mimeType = $defaultMimeTypes[$ext];
 			}
 		}
-		if($clientFileName===null)
-			$clientFileName=basename($fileName);
+		if ($clientFileName === null)
+			$clientFileName = basename($fileName);
 		else
-			$clientFileName=basename($clientFileName);
-		if($fileSize===null || $fileSize < 0)
-			$fileSize = ($content===null?filesize($fileName):strlen($content));
+			$clientFileName = basename($clientFileName);
+		if ($fileSize === null || $fileSize < 0)
+			$fileSize = ($content === null ? filesize($fileName) : strlen($content));
 		$this->sendHttpHeader();
-		if(is_array($headers))
+		if (is_array($headers))
 		{
-			foreach($headers as $h)
+			foreach ($headers as $h)
 				header($h);
 		}
 		else
@@ -3878,17 +3878,17 @@ 
 			header("Content-Type: $mimeType");
 			$this->_contentTypeHeaderSent = true;
 		}
-		header('Content-Length: '.$fileSize);
+		header('Content-Length: ' . $fileSize);
 		header("Content-Disposition: " . ($forceDownload ? 'attachment' : 'inline') . "; filename=\"$clientFileName\"");
 		header('Content-Transfer-Encoding: binary');
-		if($content===null)
+		if ($content === null)
 			readfile($fileName);
 		else
 			echo $content;
 	}
 	public function redirect($url)
 	{
-		if($this->getHasAdapter())
+		if ($this->getHasAdapter())
 			$this->_adapter->httpRedirect($url);
 		else
 			$this->httpRedirect($url);
@@ -3896,13 +3896,13 @@ 
 	public function httpRedirect($url)
 	{
 		$this->ensureHeadersSent();
-		if($url[0]==='/')
-			$url=$this->getRequest()->getBaseUrl().$url;
+		if ($url[0] === '/')
+			$url = $this->getRequest()->getBaseUrl() . $url;
 		if ($this->_status >= 300 && $this->_status < 400)
-						header('Location: '.str_replace('&amp;','&',$url), true, $this->_status);
+						header('Location: ' . str_replace('&amp;', '&', $url), true, $this->_status);
 		else
-			header('Location: '.str_replace('&amp;','&',$url));
-		if(!$this->getApplication()->getRequestCompleted())
+			header('Location: ' . str_replace('&amp;', '&', $url));
+		if (!$this->getApplication()->getRequestCompleted())
 			$this->getApplication()->onEndRequest();
 		exit();
 	}
@@ -3912,7 +3912,7 @@ 
 	}
 	public function flush($continueBuffering = true)
 	{
-		if($this->getHasAdapter())
+		if ($this->getHasAdapter())
 			$this->_adapter->flushContent($continueBuffering);
 		else
 			$this->flushContent($continueBuffering);
@@ -3925,9 +3925,9 @@ 
 	public function flushContent($continueBuffering = true)
 	{
 		$this->ensureHeadersSent();
-		if($this->_bufferOutput)
+		if ($this->_bufferOutput)
 		{
-						if (ob_get_length()>0)
+						if (ob_get_length() > 0)
 			{
 				if (!$continueBuffering)
 				{
@@ -3949,12 +3949,12 @@ 
 	}
 	protected function sendHttpHeader()
 	{
-		$protocol=$this->getRequest()->getHttpProtocolVersion();
-		if($this->getRequest()->getHttpProtocolVersion() === null)
-			$protocol='HTTP/1.1';
+		$protocol = $this->getRequest()->getHttpProtocolVersion();
+		if ($this->getRequest()->getHttpProtocolVersion() === null)
+			$protocol = 'HTTP/1.1';
 		$phpSapiName = substr(php_sapi_name(), 0, 3);
 		$cgi = $phpSapiName == 'cgi' || $phpSapiName == 'fpm';
-		header(($cgi ? 'Status:' : $protocol).' '.$this->_status.' '.$this->_reason, true, TPropertyValue::ensureInteger($this->_status));
+		header(($cgi ? 'Status:' : $protocol) . ' ' . $this->_status . ' ' . $this->_reason, true, TPropertyValue::ensureInteger($this->_status));
 		$this->_httpHeaderSent = true;
 	}
 	protected function ensureContentTypeHeaderSent()
@@ -3964,58 +3964,58 @@ 
 	}
 	protected function sendContentTypeHeader()
 	{
-		$contentType=$this->_contentType===null?self::DEFAULT_CONTENTTYPE:$this->_contentType;
-		$charset=$this->getCharset();
-		if($charset === false) {
-			$this->appendHeader('Content-Type: '.$contentType);
+		$contentType = $this->_contentType === null ? self::DEFAULT_CONTENTTYPE : $this->_contentType;
+		$charset = $this->getCharset();
+		if ($charset === false) {
+			$this->appendHeader('Content-Type: ' . $contentType);
 			return;
 		}
-		if($charset==='' && ($globalization=$this->getApplication()->getGlobalization(false))!==null)
-			$charset=$globalization->getCharset();
-		if($charset==='') $charset = self::DEFAULT_CHARSET;
-		$this->appendHeader('Content-Type: '.$contentType.';charset='.$charset);
+		if ($charset === '' && ($globalization = $this->getApplication()->getGlobalization(false)) !== null)
+			$charset = $globalization->getCharset();
+		if ($charset === '') $charset = self::DEFAULT_CHARSET;
+		$this->appendHeader('Content-Type: ' . $contentType . ';charset=' . $charset);
 		$this->_contentTypeHeaderSent = true;
 	}
 	public function getContents()
 	{
-		return $this->_bufferOutput?ob_get_contents():'';
+		return $this->_bufferOutput ? ob_get_contents() : '';
 	}
 	public function clear()
 	{
-		if($this->_bufferOutput)
+		if ($this->_bufferOutput)
 			ob_clean();
 	}
-	public function getHeaders($case=null)
+	public function getHeaders($case = null)
 	{
 		$result = array();
 		$headers = headers_list();
-		foreach($headers as $header) {
+		foreach ($headers as $header) {
 			$tmp = explode(':', $header);
 			$key = trim(array_shift($tmp));
 			$value = trim(implode(':', $tmp));
-			if(isset($result[$key]))
+			if (isset($result[$key]))
 				$result[$key] .= ', ' . $value;
 			else
 				$result[$key] = $value;
 		}
-		if($case !== null)
+		if ($case !== null)
 			return array_change_key_case($result, $case);
 		return $result;
 	}
-	public function appendHeader($value, $replace=true)
+	public function appendHeader($value, $replace = true)
 	{
 		header($value, $replace);
 	}
-	public function appendLog($message,$messageType=0,$destination='',$extraHeaders='')
+	public function appendLog($message, $messageType = 0, $destination = '', $extraHeaders = '')
 	{
-		error_log($message,$messageType,$destination,$extraHeaders);
+		error_log($message, $messageType, $destination, $extraHeaders);
 	}
 	public function addCookie($cookie)
 	{
-		$request=$this->getRequest();
-		if($request->getEnableCookieValidation())
+		$request = $this->getRequest();
+		if ($request->getEnableCookieValidation())
 		{
-			$value=$this->getApplication()->getSecurityManager()->hashData($cookie->getValue());
+			$value = $this->getApplication()->getSecurityManager()->hashData($cookie->getValue());
 			setcookie(
 				$cookie->getName(),
 				$value,
@@ -4056,13 +4056,13 @@ 
 	}
 	public function setHtmlWriterType($value)
 	{
-		$this->_htmlWriterType=$value;
+		$this->_htmlWriterType = $value;
 	}
-	public function createHtmlWriter($type=null)
+	public function createHtmlWriter($type = null)
 	{
-		if($type===null)
-			$type=$this->getHtmlWriterType();
-		if($this->getHasAdapter())
+		if ($type === null)
+			$type = $this->getHtmlWriterType();
+		if ($this->getHasAdapter())
 			return $this->_adapter->createNewHtmlWriter($type, $this);
 		else
 			return $this->createNewHtmlWriter($type, $this);
@@ -4072,60 +4072,60 @@ 
 		return Prado::createComponent($type, $writer);
 	}
 }
-class THttpSession extends TApplicationComponent implements IteratorAggregate,ArrayAccess,Countable,IModule
+class THttpSession extends TApplicationComponent implements IteratorAggregate, ArrayAccess, Countable, IModule
 {
-	private $_initialized=false;
-	private $_started=false;
-	private $_autoStart=false;
-	private $_cookie=null;
+	private $_initialized = false;
+	private $_started = false;
+	private $_autoStart = false;
+	private $_cookie = null;
 	private $_id;
-	private $_customStorage=false;
+	private $_customStorage = false;
 	public function getID()
 	{
 		return $this->_id;
 	}
 	public function setID($value)
 	{
-		$this->_id=$value;
+		$this->_id = $value;
 	}
 	public function init($config)
 	{
-		if($this->_autoStart)
+		if ($this->_autoStart)
 			$this->open();
-		$this->_initialized=true;
+		$this->_initialized = true;
 		$this->getApplication()->setSession($this);
 		register_shutdown_function(array($this, "close"));
 	}
 	public function open()
 	{
-		if(!$this->_started)
+		if (!$this->_started)
 		{
-			if($this->_customStorage)
-				session_set_save_handler(array($this,'_open'),array($this,'_close'),array($this,'_read'),array($this,'_write'),array($this,'_destroy'),array($this,'_gc'));
-			if($this->_cookie!==null)
-				session_set_cookie_params($this->_cookie->getExpire(),$this->_cookie->getPath(),$this->_cookie->getDomain(),$this->_cookie->getSecure(),$this->_cookie->getHttpOnly());
-			if(ini_get('session.auto_start')!=='1')
+			if ($this->_customStorage)
+				session_set_save_handler(array($this, '_open'), array($this, '_close'), array($this, '_read'), array($this, '_write'), array($this, '_destroy'), array($this, '_gc'));
+			if ($this->_cookie !== null)
+				session_set_cookie_params($this->_cookie->getExpire(), $this->_cookie->getPath(), $this->_cookie->getDomain(), $this->_cookie->getSecure(), $this->_cookie->getHttpOnly());
+			if (ini_get('session.auto_start') !== '1')
 				session_start();
-			$this->_started=true;
+			$this->_started = true;
 		}
 	}
 	public function close()
 	{
-		if($this->_started)
+		if ($this->_started)
 		{
 			session_write_close();
-			$this->_started=false;
+			$this->_started = false;
 		}
 	}
 	public function destroy()
 	{
-		if($this->_started)
+		if ($this->_started)
 		{
 			session_destroy();
-			$this->_started=false;
+			$this->_started = false;
 		}
 	}
-	public function regenerate($deleteOld=false)
+	public function regenerate($deleteOld = false)
 	{
 		$old = $this->getSessionID();
 		session_regenerate_id($deleteOld);
@@ -4141,7 +4141,7 @@ 
 	}
 	public function setSessionID($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_sessionid_unchangeable');
 		else
 			session_id($value);
@@ -4152,12 +4152,12 @@ 
 	}
 	public function setSessionName($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_sessionname_unchangeable');
-		else if(ctype_alnum($value))
+		else if (ctype_alnum($value))
 			session_name($value);
 		else
-			throw new TInvalidDataValueException('httpsession_sessionname_invalid',$value);
+			throw new TInvalidDataValueException('httpsession_sessionname_invalid', $value);
 	}
 	public function getSavePath()
 	{
@@ -4165,12 +4165,12 @@ 
 	}
 	public function setSavePath($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_savepath_unchangeable');
-		else if(is_dir($value))
+		else if (is_dir($value))
 			session_save_path($value);
 		else
-			throw new TInvalidDataValueException('httpsession_savepath_invalid',$value);
+			throw new TInvalidDataValueException('httpsession_savepath_invalid', $value);
 	}
 	public function getUseCustomStorage()
 	{
@@ -4178,44 +4178,44 @@ 
 	}
 	public function setUseCustomStorage($value)
 	{
-		$this->_customStorage=TPropertyValue::ensureBoolean($value);
+		$this->_customStorage = TPropertyValue::ensureBoolean($value);
 	}
 	public function getCookie()
 	{
-		if($this->_cookie===null)
-			$this->_cookie=new THttpCookie($this->getSessionName(),$this->getSessionID());
+		if ($this->_cookie === null)
+			$this->_cookie = new THttpCookie($this->getSessionName(), $this->getSessionID());
 		return $this->_cookie;
 	}
 	public function getCookieMode()
 	{
-		if(ini_get('session.use_cookies')==='0')
+		if (ini_get('session.use_cookies') === '0')
 			return THttpSessionCookieMode::None;
-		else if(ini_get('session.use_only_cookies')==='0')
+		else if (ini_get('session.use_only_cookies') === '0')
 			return THttpSessionCookieMode::Allow;
 		else
 			return THttpSessionCookieMode::Only;
 	}
 	public function setCookieMode($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_cookiemode_unchangeable');
 		else
 		{
-			$value=TPropertyValue::ensureEnum($value,'THttpSessionCookieMode');
-			if($value===THttpSessionCookieMode::None) 
+			$value = TPropertyValue::ensureEnum($value, 'THttpSessionCookieMode');
+			if ($value === THttpSessionCookieMode::None) 
       {
-				ini_set('session.use_cookies','0');
-			  ini_set('session.use_only_cookies','0');
+				ini_set('session.use_cookies', '0');
+			  ini_set('session.use_only_cookies', '0');
       }
-			else if($value===THttpSessionCookieMode::Allow)
+			else if ($value === THttpSessionCookieMode::Allow)
 			{
-				ini_set('session.use_cookies','1');
-				ini_set('session.use_only_cookies','0');
+				ini_set('session.use_cookies', '1');
+				ini_set('session.use_only_cookies', '0');
 			}
 			else
 			{
-				ini_set('session.use_cookies','1');
-				ini_set('session.use_only_cookies','1');
+				ini_set('session.use_cookies', '1');
+				ini_set('session.use_only_cookies', '1');
 				ini_set('session.use_trans_sid', 0);
 			}
 		}
@@ -4226,10 +4226,10 @@ 
 	}
 	public function setAutoStart($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('httpsession_autostart_unchangeable');
 		else
-			$this->_autoStart=TPropertyValue::ensureBoolean($value);
+			$this->_autoStart = TPropertyValue::ensureBoolean($value);
 	}
 	public function getGCProbability()
 	{
@@ -4237,34 +4237,34 @@ 
 	}
 	public function setGCProbability($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_gcprobability_unchangeable');
 		else
 		{
-			$value=TPropertyValue::ensureInteger($value);
-			if($value>=0 && $value<=100)
+			$value = TPropertyValue::ensureInteger($value);
+			if ($value >= 0 && $value <= 100)
 			{
-				ini_set('session.gc_probability',$value);
-				ini_set('session.gc_divisor','100');
+				ini_set('session.gc_probability', $value);
+				ini_set('session.gc_divisor', '100');
 			}
 			else
-				throw new TInvalidDataValueException('httpsession_gcprobability_invalid',$value);
+				throw new TInvalidDataValueException('httpsession_gcprobability_invalid', $value);
 		}
 	}
 	public function getUseTransparentSessionID()
 	{
-		return ini_get('session.use_trans_sid')==='1';
+		return ini_get('session.use_trans_sid') === '1';
 	}
 	public function setUseTransparentSessionID($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_transid_unchangeable');
 		else
 		{
-			$value=TPropertyValue::ensureBoolean($value);
-			if ($value && $this->getCookieMode()==THttpSessionCookieMode::Only)
+			$value = TPropertyValue::ensureBoolean($value);
+			if ($value && $this->getCookieMode() == THttpSessionCookieMode::Only)
 					throw new TInvalidOperationException('httpsession_transid_cookieonly');
-			ini_set('session.use_trans_sid',$value?'1':'0');
+			ini_set('session.use_trans_sid', $value ? '1' : '0');
 		}
 	}
 	public function getTimeout()
@@ -4273,12 +4273,12 @@ 
 	}
 	public function setTimeout($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_maxlifetime_unchangeable');
 		else
-			ini_set('session.gc_maxlifetime',$value);
+			ini_set('session.gc_maxlifetime', $value);
 	}
-	public function _open($savePath,$sessionName)
+	public function _open($savePath, $sessionName)
 	{
 		return true;
 	}
@@ -4290,7 +4290,7 @@ 
 	{
 		return '';
 	}
-	public function _write($id,$data)
+	public function _write($id, $data)
 	{
 		return true;
 	}
@@ -4322,15 +4322,15 @@ 
 	{
 		return isset($_SESSION[$key]) ? $_SESSION[$key] : null;
 	}
-	public function add($key,$value)
+	public function add($key, $value)
 	{
-		$_SESSION[$key]=$value;
+		$_SESSION[$key] = $value;
 	}
 	public function remove($key)
 	{
-		if(isset($_SESSION[$key]))
+		if (isset($_SESSION[$key]))
 		{
-			$value=$_SESSION[$key];
+			$value = $_SESSION[$key];
 			unset($_SESSION[$key]);
 			return $value;
 		}
@@ -4339,7 +4339,7 @@ 
 	}
 	public function clear()
 	{
-		foreach(array_keys($_SESSION) as $key)
+		foreach (array_keys($_SESSION) as $key)
 			unset($_SESSION[$key]);
 	}
 	public function contains($key)
@@ -4358,9 +4358,9 @@ 
 	{
 		return isset($_SESSION[$offset]) ? $_SESSION[$offset] : null;
 	}
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		$_SESSION[$offset]=$item;
+		$_SESSION[$offset] = $item;
 	}
 	public function offsetUnset($offset)
 	{
@@ -4373,11 +4373,11 @@ 
 	private $_key;
 	public function __construct()
 	{
-		$this->_keys=array_keys($_SESSION);
+		$this->_keys = array_keys($_SESSION);
 	}
 	public function rewind()
 	{
-		$this->_key=reset($this->_keys);
+		$this->_key = reset($this->_keys);
 	}
 	public function key()
 	{
@@ -4385,38 +4385,38 @@ 
 	}
 	public function current()
 	{
-		return isset($_SESSION[$this->_key])?$_SESSION[$this->_key]:null;
+		return isset($_SESSION[$this->_key]) ? $_SESSION[$this->_key] : null;
 	}
 	public function next()
 	{
 		do
 		{
-			$this->_key=next($this->_keys);
+			$this->_key = next($this->_keys);
 		}
-		while(!isset($_SESSION[$this->_key]) && $this->_key!==false);
+		while (!isset($_SESSION[$this->_key]) && $this->_key !== false);
 	}
 	public function valid()
 	{
-		return $this->_key!==false;
+		return $this->_key !== false;
 	}
 }
 class THttpSessionCookieMode extends TEnumerable
 {
-	const None='None';
-	const Allow='Allow';
-	const Only='Only';
+	const None = 'None';
+	const Allow = 'Allow';
+	const Only = 'Only';
 }
 Prado::using('System.Web.UI.WebControls.*');
 class TAttributeCollection extends TMap
 {
-	private $_caseSensitive=false;
+	private $_caseSensitive = false;
 	public function __get($name)
 	{
-		return $this->contains($name)?$this->itemAt($name):parent::__get($name);
+		return $this->contains($name) ? $this->itemAt($name) : parent::__get($name);
 	}
-	public function __set($name,$value)
+	public function __set($name, $value)
 	{
-		$this->add($name,$value);
+		$this->add($name, $value);
 	}
 	public function getCaseSensitive()
 	{
@@ -4424,23 +4424,23 @@ 
 	}
 	public function setCaseSensitive($value)
 	{
-		$this->_caseSensitive=TPropertyValue::ensureBoolean($value);
+		$this->_caseSensitive = TPropertyValue::ensureBoolean($value);
 	}
 	public function itemAt($key)
 	{
-		return parent::itemAt($this->_caseSensitive?$key:strtolower($key));
+		return parent::itemAt($this->_caseSensitive ? $key : strtolower($key));
 	}
-	public function add($key,$value)
+	public function add($key, $value)
 	{
-		parent::add($this->_caseSensitive?$key:strtolower($key),$value);
+		parent::add($this->_caseSensitive ? $key : strtolower($key), $value);
 	}
 	public function remove($key)
 	{
-		return parent::remove($this->_caseSensitive?$key:strtolower($key));
+		return parent::remove($this->_caseSensitive ? $key : strtolower($key));
 	}
 	public function contains($key)
 	{
-		return parent::contains($this->_caseSensitive?$key:strtolower($key));
+		return parent::contains($this->_caseSensitive ? $key : strtolower($key));
 	}
 	public function hasProperty($name)
 	{
@@ -4460,7 +4460,7 @@ 
 	protected $_control;
 	public function __construct($control)
 	{
-		$this->_control=$control;
+		$this->_control = $control;
 	}
 	public function getControl()
 	{
@@ -4468,7 +4468,7 @@ 
 	}
 	public function getPage()
 	{
-		return $this->_control?$this->_control->getPage():null;
+		return $this->_control ? $this->_control->getPage() : null;
 	}
 	public function createChildControls()
 	{
@@ -4509,39 +4509,39 @@ 
 }
 class TControl extends TApplicationComponent implements IRenderable, IBindable
 {
-	const ID_FORMAT='/^[a-zA-Z_]\\w*$/';
-	const ID_SEPARATOR='$';
-	const CLIENT_ID_SEPARATOR='_';
-	const AUTOMATIC_ID_PREFIX='ctl';
-	const CS_CONSTRUCTED=0;
-	const CS_CHILD_INITIALIZED=1;
-	const CS_INITIALIZED=2;
-	const CS_STATE_LOADED=3;
-	const CS_LOADED=4;
-	const CS_PRERENDERED=5;
-	const IS_ID_SET=0x01;
-	const IS_DISABLE_VIEWSTATE=0x02;
-	const IS_SKIN_APPLIED=0x04;
-	const IS_STYLESHEET_APPLIED=0x08;
-	const IS_DISABLE_THEMING=0x10;
-	const IS_CHILD_CREATED=0x20;
-	const IS_CREATING_CHILD=0x40;
-	const RF_CONTROLS=0;				const RF_CHILD_STATE=1;				const RF_NAMED_CONTROLS=2;			const RF_NAMED_CONTROLS_ID=3;		const RF_SKIN_ID=4;					const RF_DATA_BINDINGS=5;			const RF_EVENTS=6;					const RF_CONTROLSTATE=7;			const RF_NAMED_OBJECTS=8;			const RF_ADAPTER=9;					const RF_AUTO_BINDINGS=10;		
-	private $_id='';
+	const ID_FORMAT = '/^[a-zA-Z_]\\w*$/';
+	const ID_SEPARATOR = '$';
+	const CLIENT_ID_SEPARATOR = '_';
+	const AUTOMATIC_ID_PREFIX = 'ctl';
+	const CS_CONSTRUCTED = 0;
+	const CS_CHILD_INITIALIZED = 1;
+	const CS_INITIALIZED = 2;
+	const CS_STATE_LOADED = 3;
+	const CS_LOADED = 4;
+	const CS_PRERENDERED = 5;
+	const IS_ID_SET = 0x01;
+	const IS_DISABLE_VIEWSTATE = 0x02;
+	const IS_SKIN_APPLIED = 0x04;
+	const IS_STYLESHEET_APPLIED = 0x08;
+	const IS_DISABLE_THEMING = 0x10;
+	const IS_CHILD_CREATED = 0x20;
+	const IS_CREATING_CHILD = 0x40;
+	const RF_CONTROLS = 0; const RF_CHILD_STATE = 1; const RF_NAMED_CONTROLS = 2; const RF_NAMED_CONTROLS_ID = 3; const RF_SKIN_ID = 4; const RF_DATA_BINDINGS = 5; const RF_EVENTS = 6; const RF_CONTROLSTATE = 7; const RF_NAMED_OBJECTS = 8; const RF_ADAPTER = 9; const RF_AUTO_BINDINGS = 10;		
+	private $_id = '';
 	private $_uid;
 	private $_parent;
 	private $_page;
 	private $_namingContainer;
 	private $_tplControl;
-	private $_viewState=array();
-	private $_tempState=array();
-	private $_trackViewState=true;
-	private $_stage=0;
-	private $_flags=0;
-	private $_rf=array();
+	private $_viewState = array();
+	private $_tempState = array();
+	private $_trackViewState = true;
+	private $_stage = 0;
+	private $_flags = 0;
+	private $_rf = array();
 	public function __get($name)
 	{
-		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
+		if (isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
 			return $this->_rf[self::RF_NAMED_OBJECTS][$name];
 		else
 			return parent::__get($name);
@@ -4552,11 +4552,11 @@ 
 	}
 	public function getAdapter()
 	{
-		return isset($this->_rf[self::RF_ADAPTER])?$this->_rf[self::RF_ADAPTER]:null;
+		return isset($this->_rf[self::RF_ADAPTER]) ? $this->_rf[self::RF_ADAPTER] : null;
 	}
 	public function setAdapter(TControlAdapter $adapter)
 	{
-		$this->_rf[self::RF_ADAPTER]=$adapter;
+		$this->_rf[self::RF_ADAPTER] = $adapter;
 	}
 	public function getParent()
 	{
@@ -4564,46 +4564,46 @@ 
 	}
 	public function getNamingContainer()
 	{
-		if(!$this->_namingContainer && $this->_parent)
+		if (!$this->_namingContainer && $this->_parent)
 		{
-			if($this->_parent instanceof INamingContainer)
-				$this->_namingContainer=$this->_parent;
+			if ($this->_parent instanceof INamingContainer)
+				$this->_namingContainer = $this->_parent;
 			else
-				$this->_namingContainer=$this->_parent->getNamingContainer();
+				$this->_namingContainer = $this->_parent->getNamingContainer();
 		}
 		return $this->_namingContainer;
 	}
 	public function getPage()
 	{
-		if(!$this->_page)
+		if (!$this->_page)
 		{
-			if($this->_parent)
-				$this->_page=$this->_parent->getPage();
-			else if($this->_tplControl)
-				$this->_page=$this->_tplControl->getPage();
+			if ($this->_parent)
+				$this->_page = $this->_parent->getPage();
+			else if ($this->_tplControl)
+				$this->_page = $this->_tplControl->getPage();
 		}
 		return $this->_page;
 	}
 	public function setPage($page)
 	{
-		$this->_page=$page;
+		$this->_page = $page;
 	}
 	public function setTemplateControl($control)
 	{
-		$this->_tplControl=$control;
+		$this->_tplControl = $control;
 	}
 	public function getTemplateControl()
 	{
-		if(!$this->_tplControl && $this->_parent)
-			$this->_tplControl=$this->_parent->getTemplateControl();
+		if (!$this->_tplControl && $this->_parent)
+			$this->_tplControl = $this->_parent->getTemplateControl();
 		return $this->_tplControl;
 	}
 	public function getSourceTemplateControl()
 	{
-		$control=$this;
-		while(($control instanceof TControl) && ($control=$control->getTemplateControl())!==null)
+		$control = $this;
+		while (($control instanceof TControl) && ($control = $control->getTemplateControl()) !== null)
 		{
-			if(($control instanceof TTemplateControl) && $control->getIsSourceTemplateControl())
+			if (($control instanceof TTemplateControl) && $control->getIsSourceTemplateControl())
 				return $control;
 		}
 		return $this->getPage();
@@ -4614,36 +4614,36 @@ 
 	}
 	protected function setControlStage($value)
 	{
-		$this->_stage=$value;
+		$this->_stage = $value;
 	}
-	public function getID($hideAutoID=true)
+	public function getID($hideAutoID = true)
 	{
-		if($hideAutoID)
+		if ($hideAutoID)
 			return ($this->_flags & self::IS_ID_SET) ? $this->_id : '';
 		else
 			return $this->_id;
 	}
 	public function setID($id)
 	{
-		if(!preg_match(self::ID_FORMAT,$id))
-			throw new TInvalidDataValueException('control_id_invalid',get_class($this),$id);
-		$this->_id=$id;
+		if (!preg_match(self::ID_FORMAT, $id))
+			throw new TInvalidDataValueException('control_id_invalid', get_class($this), $id);
+		$this->_id = $id;
 		$this->_flags |= self::IS_ID_SET;
 		$this->clearCachedUniqueID($this instanceof INamingContainer);
-		if($this->_namingContainer)
+		if ($this->_namingContainer)
 			$this->_namingContainer->clearNameTable();
 	}
 	public function getUniqueID()
 	{
-		if($this->_uid==='' || $this->_uid===null)			{
-			$this->_uid='';  			if($namingContainer=$this->getNamingContainer())
+		if ($this->_uid === '' || $this->_uid === null) {
+			$this->_uid = ''; if ($namingContainer = $this->getNamingContainer())
 			{
-				if($this->getPage()===$namingContainer)
-					return ($this->_uid=$this->_id);
-				else if(($prefix=$namingContainer->getUniqueID())==='')
+				if ($this->getPage() === $namingContainer)
+					return ($this->_uid = $this->_id);
+				else if (($prefix = $namingContainer->getUniqueID()) === '')
 					return $this->_id;
 				else
-					return ($this->_uid=$prefix.self::ID_SEPARATOR.$this->_id);
+					return ($this->_uid = $prefix . self::ID_SEPARATOR . $this->_id);
 			}
 			else					return $this->_id;
 		}
@@ -4656,22 +4656,22 @@ 
 	}
 	public function getClientID()
 	{
-		return strtr($this->getUniqueID(),self::ID_SEPARATOR,self::CLIENT_ID_SEPARATOR);
+		return strtr($this->getUniqueID(), self::ID_SEPARATOR, self::CLIENT_ID_SEPARATOR);
 	}
 	public static function convertUniqueIdToClientId($uniqueID)
 	{
-		return strtr($uniqueID,self::ID_SEPARATOR,self::CLIENT_ID_SEPARATOR);
+		return strtr($uniqueID, self::ID_SEPARATOR, self::CLIENT_ID_SEPARATOR);
 	}
 	public function getSkinID()
 	{
-		return isset($this->_rf[self::RF_SKIN_ID])?$this->_rf[self::RF_SKIN_ID]:'';
+		return isset($this->_rf[self::RF_SKIN_ID]) ? $this->_rf[self::RF_SKIN_ID] : '';
 	}
 	public function setSkinID($value)
 	{
-		if(($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage>=self::CS_CHILD_INITIALIZED)
-			throw new TInvalidOperationException('control_skinid_unchangeable',get_class($this));
+		if (($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage >= self::CS_CHILD_INITIALIZED)
+			throw new TInvalidOperationException('control_skinid_unchangeable', get_class($this));
 		else
-			$this->_rf[self::RF_SKIN_ID]=$value;
+			$this->_rf[self::RF_SKIN_ID] = $value;
 	}
 	public function getIsSkinApplied()
 	{
@@ -4679,123 +4679,123 @@ 
 	}
 	public function getEnableTheming()
 	{
-		if($this->_flags & self::IS_DISABLE_THEMING)
+		if ($this->_flags & self::IS_DISABLE_THEMING)
 			return false;
 		else
-			return $this->_parent?$this->_parent->getEnableTheming():true;
+			return $this->_parent ? $this->_parent->getEnableTheming() : true;
 	}
 	public function setEnableTheming($value)
 	{
-		if($this->_stage>=self::CS_CHILD_INITIALIZED)
-			throw new TInvalidOperationException('control_enabletheming_unchangeable',get_class($this),$this->getUniqueID());
-		else if(TPropertyValue::ensureBoolean($value))
+		if ($this->_stage >= self::CS_CHILD_INITIALIZED)
+			throw new TInvalidOperationException('control_enabletheming_unchangeable', get_class($this), $this->getUniqueID());
+		else if (TPropertyValue::ensureBoolean($value))
 			$this->_flags &= ~self::IS_DISABLE_THEMING;
 		else
 			$this->_flags |= self::IS_DISABLE_THEMING;
 	}
 	public function getCustomData()
 	{
-		return $this->getViewState('CustomData',null);
+		return $this->getViewState('CustomData', null);
 	}
 	public function setCustomData($value)
 	{
-		$this->setViewState('CustomData',$value,null);
+		$this->setViewState('CustomData', $value, null);
 	}
 	public function getHasControls()
 	{
-		return isset($this->_rf[self::RF_CONTROLS]) && $this->_rf[self::RF_CONTROLS]->getCount()>0;
+		return isset($this->_rf[self::RF_CONTROLS]) && $this->_rf[self::RF_CONTROLS]->getCount() > 0;
 	}
 	public function getControls()
 	{
-		if(!isset($this->_rf[self::RF_CONTROLS]))
-			$this->_rf[self::RF_CONTROLS]=$this->createControlCollection();
+		if (!isset($this->_rf[self::RF_CONTROLS]))
+			$this->_rf[self::RF_CONTROLS] = $this->createControlCollection();
 		return $this->_rf[self::RF_CONTROLS];
 	}
 	protected function createControlCollection()
 	{
-		return $this->getAllowChildControls()?new TControlCollection($this):new TEmptyControlCollection($this);
+		return $this->getAllowChildControls() ? new TControlCollection($this) : new TEmptyControlCollection($this);
 	}
-	public function getVisible($checkParents=true)
+	public function getVisible($checkParents = true)
 	{
-		if($checkParents)
+		if ($checkParents)
 		{
-			for($control=$this;$control;$control=$control->_parent)
-				if(!$control->getVisible(false))
+			for ($control = $this; $control; $control = $control->_parent)
+				if (!$control->getVisible(false))
 					return false;
 			return true;
 		}
 		else
-			return $this->getViewState('Visible',true);
+			return $this->getViewState('Visible', true);
 	}
 	public function setVisible($value)
 	{
-		$this->setViewState('Visible',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('Visible', TPropertyValue::ensureBoolean($value), true);
 	}
-	public function getEnabled($checkParents=false)
+	public function getEnabled($checkParents = false)
 	{
-		if($checkParents)
+		if ($checkParents)
 		{
-			for($control=$this;$control;$control=$control->_parent)
-				if(!$control->getViewState('Enabled',true))
+			for ($control = $this; $control; $control = $control->_parent)
+				if (!$control->getViewState('Enabled', true))
 					return false;
 			return true;
 		}
 		else
-			return $this->getViewState('Enabled',true);
+			return $this->getViewState('Enabled', true);
 	}
 	public function setEnabled($value)
 	{
-		$this->setViewState('Enabled',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('Enabled', TPropertyValue::ensureBoolean($value), true);
 	}
 	public function getHasAttributes()
 	{
-		if($attributes=$this->getViewState('Attributes',null))
-			return $attributes->getCount()>0;
+		if ($attributes = $this->getViewState('Attributes', null))
+			return $attributes->getCount() > 0;
 		else
 			return false;
 	}
 	public function getAttributes()
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if ($attributes = $this->getViewState('Attributes', null))
 			return $attributes;
 		else
 		{
-			$attributes=new TAttributeCollection;
-			$this->setViewState('Attributes',$attributes,null);
+			$attributes = new TAttributeCollection;
+			$this->setViewState('Attributes', $attributes, null);
 			return $attributes;
 		}
 	}
 	public function hasAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if ($attributes = $this->getViewState('Attributes', null))
 			return $attributes->contains($name);
 		else
 			return false;
 	}
 	public function getAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if ($attributes = $this->getViewState('Attributes', null))
 			return $attributes->itemAt($name);
 		else
 			return null;
 	}
-	public function setAttribute($name,$value)
+	public function setAttribute($name, $value)
 	{
-		$this->getAttributes()->add($name,$value);
+		$this->getAttributes()->add($name, $value);
 	}
 	public function removeAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if ($attributes = $this->getViewState('Attributes', null))
 			return $attributes->remove($name);
 		else
 			return null;
 	}
-	public function getEnableViewState($checkParents=false)
+	public function getEnableViewState($checkParents = false)
 	{
-		if($checkParents)
+		if ($checkParents)
 		{
-			for($control=$this;$control!==null;$control=$control->getParent())
-				if($control->_flags & self::IS_DISABLE_VIEWSTATE)
+			for ($control = $this; $control !== null; $control = $control->getParent())
+				if ($control->_flags & self::IS_DISABLE_VIEWSTATE)
 					return false;
 			return true;
 		}
@@ -4804,21 +4804,21 @@ 
 	}
 	public function setEnableViewState($value)
 	{
-		if(TPropertyValue::ensureBoolean($value))
+		if (TPropertyValue::ensureBoolean($value))
 			$this->_flags &= ~self::IS_DISABLE_VIEWSTATE;
 		else
 			$this->_flags |= self::IS_DISABLE_VIEWSTATE;
 	}
-	protected function getControlState($key,$defaultValue=null)
+	protected function getControlState($key, $defaultValue = null)
 	{
-		return isset($this->_rf[self::RF_CONTROLSTATE][$key])?$this->_rf[self::RF_CONTROLSTATE][$key]:$defaultValue;
+		return isset($this->_rf[self::RF_CONTROLSTATE][$key]) ? $this->_rf[self::RF_CONTROLSTATE][$key] : $defaultValue;
 	}
-	protected function setControlState($key,$value,$defaultValue=null)
+	protected function setControlState($key, $value, $defaultValue = null)
 	{
-		if($value===$defaultValue)
+		if ($value === $defaultValue)
 			unset($this->_rf[self::RF_CONTROLSTATE][$key]);
 		else
-			$this->_rf[self::RF_CONTROLSTATE][$key]=$value;
+			$this->_rf[self::RF_CONTROLSTATE][$key] = $value;
 	}
 	protected function clearControlState($key)
 	{
@@ -4826,32 +4826,32 @@ 
 	}
 	public function trackViewState($enabled)
 	{
-		$this->_trackViewState=TPropertyValue::ensureBoolean($enabled);
+		$this->_trackViewState = TPropertyValue::ensureBoolean($enabled);
 	}
-	public function getViewState($key,$defaultValue=null)
+	public function getViewState($key, $defaultValue = null)
 	{
-		if(isset($this->_viewState[$key]))
-			return $this->_viewState[$key]!==null?$this->_viewState[$key]:$defaultValue;
-		else if(isset($this->_tempState[$key]))
+		if (isset($this->_viewState[$key]))
+			return $this->_viewState[$key] !== null ? $this->_viewState[$key] : $defaultValue;
+		else if (isset($this->_tempState[$key]))
 		{
-			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
-				$this->_viewState[$key]=$this->_tempState[$key];
+			if (is_object($this->_tempState[$key]) && $this->_trackViewState)
+				$this->_viewState[$key] = $this->_tempState[$key];
 			return $this->_tempState[$key];
 		}
 		else
 			return $defaultValue;
 	}
-	public function setViewState($key,$value,$defaultValue=null)
+	public function setViewState($key, $value, $defaultValue = null)
 	{
-		if($this->_trackViewState)
+		if ($this->_trackViewState)
 		{
-			$this->_viewState[$key]=$value;
+			$this->_viewState[$key] = $value;
 			unset($this->_tempState[$key]);
 		}
 		else
 		{
 			unset($this->_viewState[$key]);
-			$this->_tempState[$key]=$value;
+			$this->_tempState[$key] = $value;
 		}
 	}
 	public function clearViewState($key)
@@ -4859,17 +4859,17 @@ 
 		unset($this->_viewState[$key]);
 		unset($this->_tempState[$key]);
 	}
-	public function bindProperty($name,$expression)
+	public function bindProperty($name, $expression)
 	{
-		$this->_rf[self::RF_DATA_BINDINGS][$name]=$expression;
+		$this->_rf[self::RF_DATA_BINDINGS][$name] = $expression;
 	}
 	public function unbindProperty($name)
 	{
 		unset($this->_rf[self::RF_DATA_BINDINGS][$name]);
 	}
-	public function autoBindProperty($name,$expression)
+	public function autoBindProperty($name, $expression)
 	{
-		$this->_rf[self::RF_AUTO_BINDINGS][$name]=$expression;
+		$this->_rf[self::RF_AUTO_BINDINGS][$name] = $expression;
 	}
 	public function dataBind()
 	{
@@ -4879,63 +4879,63 @@ 
 	}
 	protected function dataBindProperties()
 	{
-		if(isset($this->_rf[self::RF_DATA_BINDINGS]))
+		if (isset($this->_rf[self::RF_DATA_BINDINGS]))
 		{
-			if(($context=$this->getTemplateControl())===null)
-				$context=$this;
-			foreach($this->_rf[self::RF_DATA_BINDINGS] as $property=>$expression)
-				$this->setSubProperty($property,$context->evaluateExpression($expression));
+			if (($context = $this->getTemplateControl()) === null)
+				$context = $this;
+			foreach ($this->_rf[self::RF_DATA_BINDINGS] as $property=>$expression)
+				$this->setSubProperty($property, $context->evaluateExpression($expression));
 		}
 	}
 	protected function autoDataBindProperties()
 	{
-		if(isset($this->_rf[self::RF_AUTO_BINDINGS]))
+		if (isset($this->_rf[self::RF_AUTO_BINDINGS]))
 		{
-			if(($context=$this->getTemplateControl())===null)
-				$context=$this;
-			foreach($this->_rf[self::RF_AUTO_BINDINGS] as $property=>$expression)
-				$this->setSubProperty($property,$context->evaluateExpression($expression));
+			if (($context = $this->getTemplateControl()) === null)
+				$context = $this;
+			foreach ($this->_rf[self::RF_AUTO_BINDINGS] as $property=>$expression)
+				$this->setSubProperty($property, $context->evaluateExpression($expression));
 		}
 	}
 	protected function dataBindChildren()
 	{
-		if(isset($this->_rf[self::RF_CONTROLS]))
+		if (isset($this->_rf[self::RF_CONTROLS]))
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof IBindable)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
+				if ($control instanceof IBindable)
 					$control->dataBind();
 		}
 	}
 	final protected function getChildControlsCreated()
 	{
-		return ($this->_flags & self::IS_CHILD_CREATED)!==0;
+		return ($this->_flags & self::IS_CHILD_CREATED) !== 0;
 	}
 	final protected function setChildControlsCreated($value)
 	{
-		if($value)
+		if ($value)
 			$this->_flags |= self::IS_CHILD_CREATED;
 		else
 		{
-			if($this->getHasControls() && ($this->_flags & self::IS_CHILD_CREATED))
+			if ($this->getHasControls() && ($this->_flags & self::IS_CHILD_CREATED))
 				$this->getControls()->clear();
 			$this->_flags &= ~self::IS_CHILD_CREATED;
 		}
 	}
 	public function ensureChildControls()
 	{
-		if(!($this->_flags & self::IS_CHILD_CREATED) && !($this->_flags & self::IS_CREATING_CHILD))
+		if (!($this->_flags & self::IS_CHILD_CREATED) && !($this->_flags & self::IS_CREATING_CHILD))
 		{
 			try
 			{
 				$this->_flags |= self::IS_CREATING_CHILD;
-				if(isset($this->_rf[self::RF_ADAPTER]))
+				if (isset($this->_rf[self::RF_ADAPTER]))
 					$this->_rf[self::RF_ADAPTER]->createChildControls();
 				else
 					$this->createChildControls();
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
@@ -4948,54 +4948,54 @@ 
 	}
 	public function findControl($id)
 	{
-		$id=strtr($id,'.',self::ID_SEPARATOR);
-		$container=($this instanceof INamingContainer)?$this:$this->getNamingContainer();
-		if(!$container || !$container->getHasControls())
+		$id = strtr($id, '.', self::ID_SEPARATOR);
+		$container = ($this instanceof INamingContainer) ? $this : $this->getNamingContainer();
+		if (!$container || !$container->getHasControls())
 			return null;
-		if(!isset($container->_rf[self::RF_NAMED_CONTROLS]))
+		if (!isset($container->_rf[self::RF_NAMED_CONTROLS]))
 		{
-			$container->_rf[self::RF_NAMED_CONTROLS]=array();
-			$container->fillNameTable($container,$container->_rf[self::RF_CONTROLS]);
+			$container->_rf[self::RF_NAMED_CONTROLS] = array();
+			$container->fillNameTable($container, $container->_rf[self::RF_CONTROLS]);
 		}
-		if(($pos=strpos($id,self::ID_SEPARATOR))===false)
-			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id])?$container->_rf[self::RF_NAMED_CONTROLS][$id]:null;
+		if (($pos = strpos($id, self::ID_SEPARATOR)) === false)
+			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id]) ? $container->_rf[self::RF_NAMED_CONTROLS][$id] : null;
 		else
 		{
-			$cid=substr($id,0,$pos);
-			$sid=substr($id,$pos+1);
-			if(isset($container->_rf[self::RF_NAMED_CONTROLS][$cid]))
+			$cid = substr($id, 0, $pos);
+			$sid = substr($id, $pos + 1);
+			if (isset($container->_rf[self::RF_NAMED_CONTROLS][$cid]))
 				return $container->_rf[self::RF_NAMED_CONTROLS][$cid]->findControl($sid);
 			else
 				return null;
 		}
 	}
-	public function findControlsByType($type,$strict=true)
+	public function findControlsByType($type, $strict = true)
 	{
-		$controls=array();
-		if($this->getHasControls())
+		$controls = array();
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if(is_object($control) && (get_class($control)===$type || (!$strict && ($control instanceof $type))))
-					$controls[]=$control;
-				if(($control instanceof TControl) && $control->getHasControls())
-					$controls=array_merge($controls,$control->findControlsByType($type,$strict));
+				if (is_object($control) && (get_class($control) === $type || (!$strict && ($control instanceof $type))))
+					$controls[] = $control;
+				if (($control instanceof TControl) && $control->getHasControls())
+					$controls = array_merge($controls, $control->findControlsByType($type, $strict));
 			}
 		}
 		return $controls;
 	}
 	public function findControlsByID($id)
 	{
-		$controls=array();
-		if($this->getHasControls())
+		$controls = array();
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 				{
-					if($control->_id===$id)
-						$controls[]=$control;
-					$controls=array_merge($controls,$control->findControlsByID($id));
+					if ($control->_id === $id)
+						$controls[] = $control;
+					$controls = array_merge($controls, $control->findControlsByID($id));
 				}
 			}
 		}
@@ -5006,11 +5006,11 @@ 
 		unset($this->_rf[self::RF_NAMED_CONTROLS_ID]);
 		$this->clearNameTable();
 	}
-	public function registerObject($name,$object)
+	public function registerObject($name, $object)
 	{
-		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
-			throw new TInvalidOperationException('control_object_reregistered',$name);
-		$this->_rf[self::RF_NAMED_OBJECTS][$name]=$object;
+		if (isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
+			throw new TInvalidOperationException('control_object_reregistered', $name);
+		$this->_rf[self::RF_NAMED_OBJECTS][$name] = $object;
 	}
 	public function unregisterObject($name)
 	{
@@ -5042,7 +5042,7 @@ 
 	}
 	public function getRegisteredObject($name)
 	{
-		return isset($this->_rf[self::RF_NAMED_OBJECTS][$name])?$this->_rf[self::RF_NAMED_OBJECTS][$name]:null;
+		return isset($this->_rf[self::RF_NAMED_OBJECTS][$name]) ? $this->_rf[self::RF_NAMED_OBJECTS][$name] : null;
 	}
 	public function getAllowChildControls()
 	{
@@ -5058,44 +5058,44 @@ 
 	}
 	final protected function isDescendentOf($ancestor)
 	{
-		$control=$this;
-		while($control!==$ancestor && $control->_parent)
-			$control=$control->_parent;
-		return $control===$ancestor;
+		$control = $this;
+		while ($control !== $ancestor && $control->_parent)
+			$control = $control->_parent;
+		return $control === $ancestor;
 	}
 	public function addedControl($control)
 	{
-		if($control->_parent)
+		if ($control->_parent)
 			$control->_parent->getControls()->remove($control);
-		$control->_parent=$this;
-		$control->_page=$this->getPage();
-		$namingContainer=($this instanceof INamingContainer)?$this:$this->_namingContainer;
-		if($namingContainer)
+		$control->_parent = $this;
+		$control->_page = $this->getPage();
+		$namingContainer = ($this instanceof INamingContainer) ? $this : $this->_namingContainer;
+		if ($namingContainer)
 		{
-			$control->_namingContainer=$namingContainer;
-			if($control->_id==='')
+			$control->_namingContainer = $namingContainer;
+			if ($control->_id === '')
 				$control->generateAutomaticID();
 			else
 				$namingContainer->clearNameTable();
 			$control->clearCachedUniqueID($control instanceof INamingContainer);
 		}
-		if($this->_stage>=self::CS_CHILD_INITIALIZED)
+		if ($this->_stage >= self::CS_CHILD_INITIALIZED)
 		{
 			$control->initRecursive($namingContainer);
-			if($this->_stage>=self::CS_STATE_LOADED)
+			if ($this->_stage >= self::CS_STATE_LOADED)
 			{
-				if(isset($this->_rf[self::RF_CHILD_STATE][$control->_id]))
+				if (isset($this->_rf[self::RF_CHILD_STATE][$control->_id]))
 				{
-					$state=$this->_rf[self::RF_CHILD_STATE][$control->_id];
+					$state = $this->_rf[self::RF_CHILD_STATE][$control->_id];
 					unset($this->_rf[self::RF_CHILD_STATE][$control->_id]);
 				}
 				else
-					$state=null;
-				$control->loadStateRecursive($state,!($this->_flags & self::IS_DISABLE_VIEWSTATE));
-				if($this->_stage>=self::CS_LOADED)
+					$state = null;
+				$control->loadStateRecursive($state, !($this->_flags & self::IS_DISABLE_VIEWSTATE));
+				if ($this->_stage >= self::CS_LOADED)
 				{
 					$control->loadRecursive();
-					if($this->_stage>=self::CS_PRERENDERED)
+					if ($this->_stage >= self::CS_PRERENDERED)
 						$control->preRenderRecursive();
 				}
 			}
@@ -5103,186 +5103,186 @@ 
 	}
 	public function removedControl($control)
 	{
-		if($this->_namingContainer)
+		if ($this->_namingContainer)
 			$this->_namingContainer->clearNameTable();
 		$control->unloadRecursive();
-		$control->_parent=null;
-		$control->_page=null;
-		$control->_namingContainer=null;
-		$control->_tplControl=null;
-				if(!($control->_flags & self::IS_ID_SET))
-			$control->_id='';
+		$control->_parent = null;
+		$control->_page = null;
+		$control->_namingContainer = null;
+		$control->_tplControl = null;
+				if (!($control->_flags & self::IS_ID_SET))
+			$control->_id = '';
 		else
 			unset($this->_rf[self::RF_NAMED_OBJECTS][$control->_id]);
 		$control->clearCachedUniqueID(true);
 	}
-	protected function initRecursive($namingContainer=null)
+	protected function initRecursive($namingContainer = null)
 	{
 		$this->ensureChildControls();
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			if($this instanceof INamingContainer)
-				$namingContainer=$this;
-			$page=$this->getPage();
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			if ($this instanceof INamingContainer)
+				$namingContainer = $this;
+			$page = $this->getPage();
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 				{
-					$control->_namingContainer=$namingContainer;
-					$control->_page=$page;
-					if($control->_id==='' && $namingContainer)
+					$control->_namingContainer = $namingContainer;
+					$control->_page = $page;
+					if ($control->_id === '' && $namingContainer)
 						$control->generateAutomaticID();
 					$control->initRecursive($namingContainer);
 				}
 			}
 		}
-		if($this->_stage<self::CS_INITIALIZED)
+		if ($this->_stage < self::CS_INITIALIZED)
 		{
-			$this->_stage=self::CS_CHILD_INITIALIZED;
-			if(($page=$this->getPage()) && $this->getEnableTheming() && !($this->_flags & self::IS_SKIN_APPLIED))
+			$this->_stage = self::CS_CHILD_INITIALIZED;
+			if (($page = $this->getPage()) && $this->getEnableTheming() && !($this->_flags & self::IS_SKIN_APPLIED))
 			{
 				$page->applyControlSkin($this);
 				$this->_flags |= self::IS_SKIN_APPLIED;
 			}
-			if(isset($this->_rf[self::RF_ADAPTER]))
+			if (isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onInit(null);
 			else
 				$this->onInit(null);
-			$this->_stage=self::CS_INITIALIZED;
+			$this->_stage = self::CS_INITIALIZED;
 		}
 	}
 	protected function loadRecursive()
 	{
-		if($this->_stage<self::CS_LOADED)
+		if ($this->_stage < self::CS_LOADED)
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
+			if (isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onLoad(null);
 			else
 				$this->onLoad(null);
 		}
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 					$control->loadRecursive();
 			}
 		}
-		if($this->_stage<self::CS_LOADED)
-			$this->_stage=self::CS_LOADED;
+		if ($this->_stage < self::CS_LOADED)
+			$this->_stage = self::CS_LOADED;
 	}
 	protected function preRenderRecursive()
 	{
 		$this->autoDataBindProperties();
-		if($this->getVisible(false))
+		if ($this->getVisible(false))
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
+			if (isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onPreRender(null);
 			else
 				$this->onPreRender(null);
-			if($this->getHasControls())
+			if ($this->getHasControls())
 			{
-				foreach($this->_rf[self::RF_CONTROLS] as $control)
+				foreach ($this->_rf[self::RF_CONTROLS] as $control)
 				{
-					if($control instanceof TControl)
+					if ($control instanceof TControl)
 						$control->preRenderRecursive();
-					else if($control instanceof TCompositeLiteral)
+					else if ($control instanceof TCompositeLiteral)
 						$control->evaluateDynamicContent();
 				}
 			}
 		}
-		$this->_stage=self::CS_PRERENDERED;
+		$this->_stage = self::CS_PRERENDERED;
 	}
 	protected function unloadRecursive()
 	{
-		if(!($this->_flags & self::IS_ID_SET))
-			$this->_id='';
-		if($this->getHasControls())
+		if (!($this->_flags & self::IS_ID_SET))
+			$this->_id = '';
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof TControl)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
+				if ($control instanceof TControl)
 					$control->unloadRecursive();
 		}
-		if(isset($this->_rf[self::RF_ADAPTER]))
+		if (isset($this->_rf[self::RF_ADAPTER]))
 			$this->_rf[self::RF_ADAPTER]->onUnload(null);
 		else
 			$this->onUnload(null);
 	}
 	public function onInit($param)
 	{
-		$this->raiseEvent('OnInit',$this,$param);
+		$this->raiseEvent('OnInit', $this, $param);
 	}
 	public function onLoad($param)
 	{
-		$this->raiseEvent('OnLoad',$this,$param);
+		$this->raiseEvent('OnLoad', $this, $param);
 	}
 	public function onDataBinding($param)
 	{
-		$this->raiseEvent('OnDataBinding',$this,$param);
+		$this->raiseEvent('OnDataBinding', $this, $param);
 	}
 	public function onUnload($param)
 	{
-		$this->raiseEvent('OnUnload',$this,$param);
+		$this->raiseEvent('OnUnload', $this, $param);
 	}
 	public function onPreRender($param)
 	{
-		$this->raiseEvent('OnPreRender',$this,$param);
+		$this->raiseEvent('OnPreRender', $this, $param);
 	}
-	protected function raiseBubbleEvent($sender,$param)
+	protected function raiseBubbleEvent($sender, $param)
 	{
-		$control=$this;
-		while($control=$control->_parent)
+		$control = $this;
+		while ($control = $control->_parent)
 		{
-			if($control->bubbleEvent($sender,$param))
+			if ($control->bubbleEvent($sender, $param))
 				break;
 		}
 	}
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		return false;
 	}
-	public function broadcastEvent($name,$sender,$param)
+	public function broadcastEvent($name, $sender, $param)
 	{
-		$rootControl=(($page=$this->getPage())===null)?$this:$page;
-		$rootControl->broadcastEventInternal($name,$sender,new TBroadcastEventParameter($name,$param));
+		$rootControl = (($page = $this->getPage()) === null) ? $this : $page;
+		$rootControl->broadcastEventInternal($name, $sender, new TBroadcastEventParameter($name, $param));
 	}
-	private function broadcastEventInternal($name,$sender,$param)
+	private function broadcastEventInternal($name, $sender, $param)
 	{
-		if($this->hasEvent($name))
-			$this->raiseEvent($name,$sender,$param->getParameter());
-		if($this instanceof IBroadcastEventReceiver)
-			$this->broadcastEventReceived($sender,$param);
-		if($this->getHasControls())
+		if ($this->hasEvent($name))
+			$this->raiseEvent($name, $sender, $param->getParameter());
+		if ($this instanceof IBroadcastEventReceiver)
+			$this->broadcastEventReceived($sender, $param);
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
-					$control->broadcastEventInternal($name,$sender,$param);
+				if ($control instanceof TControl)
+					$control->broadcastEventInternal($name, $sender, $param);
 			}
 		}
 	}
-	protected function traverseChildControls($param,$preCallback=null,$postCallback=null)
+	protected function traverseChildControls($param, $preCallback = null, $postCallback = null)
 	{
-		if($preCallback!==null)
-			call_user_func($preCallback,$this,$param);
-		if($this->getHasControls())
+		if ($preCallback !== null)
+			call_user_func($preCallback, $this, $param);
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 				{
-					$control->traverseChildControls($param,$preCallback,$postCallback);
+					$control->traverseChildControls($param, $preCallback, $postCallback);
 				}
 			}
 		}
-		if($postCallback!==null)
-			call_user_func($postCallback,$this,$param);
+		if ($postCallback !== null)
+			call_user_func($postCallback, $this, $param);
 	}
 	public function renderControl($writer)
 	{
-		if($this instanceof IActiveControl || $this->getVisible(false))
+		if ($this instanceof IActiveControl || $this->getVisible(false))
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
+			if (isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->render($writer);
 			else
 				$this->render($writer);
@@ -5294,15 +5294,15 @@ 
 	}
 	public function renderChildren($writer)
 	{
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if(is_string($control))
+				if (is_string($control))
 					$writer->write($control);
-				else if($control instanceof TControl)
+				else if ($control instanceof TControl)
 					$control->renderControl($writer);
-				else if($control instanceof IRenderable)
+				else if ($control instanceof IRenderable)
 					$control->render($writer);
 			}
 		}
@@ -5313,119 +5313,119 @@ 
 	public function loadState()
 	{
 	}
-	protected function loadStateRecursive(&$state,$needViewState=true)
+	protected function loadStateRecursive(&$state, $needViewState = true)
 	{
-		if(is_array($state))
+		if (is_array($state))
 		{
-									$needViewState=($needViewState && !($this->_flags & self::IS_DISABLE_VIEWSTATE));
-			if(isset($state[1]))
+									$needViewState = ($needViewState && !($this->_flags & self::IS_DISABLE_VIEWSTATE));
+			if (isset($state[1]))
 			{
-				$this->_rf[self::RF_CONTROLSTATE]=&$state[1];
+				$this->_rf[self::RF_CONTROLSTATE] = &$state[1];
 				unset($state[1]);
 			}
 			else
 				unset($this->_rf[self::RF_CONTROLSTATE]);
-			if($needViewState)
+			if ($needViewState)
 			{
-				if(isset($state[0]))
-					$this->_viewState=&$state[0];
+				if (isset($state[0]))
+					$this->_viewState = &$state[0];
 				else
-					$this->_viewState=array();
+					$this->_viewState = array();
 			}
 			unset($state[0]);
-			if($this->getHasControls())
+			if ($this->getHasControls())
 			{
-				foreach($this->_rf[self::RF_CONTROLS] as $control)
+				foreach ($this->_rf[self::RF_CONTROLS] as $control)
 				{
-					if($control instanceof TControl)
+					if ($control instanceof TControl)
 					{
-						if(isset($state[$control->_id]))
+						if (isset($state[$control->_id]))
 						{
-							$control->loadStateRecursive($state[$control->_id],$needViewState);
+							$control->loadStateRecursive($state[$control->_id], $needViewState);
 							unset($state[$control->_id]);
 						}
 					}
 				}
 			}
-			if(!empty($state))
-				$this->_rf[self::RF_CHILD_STATE]=&$state;
+			if (!empty($state))
+				$this->_rf[self::RF_CHILD_STATE] = &$state;
 		}
-		$this->_stage=self::CS_STATE_LOADED;
-		if(isset($this->_rf[self::RF_ADAPTER]))
+		$this->_stage = self::CS_STATE_LOADED;
+		if (isset($this->_rf[self::RF_ADAPTER]))
 			$this->_rf[self::RF_ADAPTER]->loadState();
 		else
 			$this->loadState();
 	}
-	protected function &saveStateRecursive($needViewState=true)
+	protected function &saveStateRecursive($needViewState = true)
 	{
-		if(isset($this->_rf[self::RF_ADAPTER]))
+		if (isset($this->_rf[self::RF_ADAPTER]))
 			$this->_rf[self::RF_ADAPTER]->saveState();
 		else
 			$this->saveState();
-		$needViewState=($needViewState && !($this->_flags & self::IS_DISABLE_VIEWSTATE));
-		$state=array();
-		if($this->getHasControls())
+		$needViewState = ($needViewState && !($this->_flags & self::IS_DISABLE_VIEWSTATE));
+		$state = array();
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
-					$state[$control->_id]=&$control->saveStateRecursive($needViewState);
+				if ($control instanceof TControl)
+					$state[$control->_id] = &$control->saveStateRecursive($needViewState);
 			}
 		}
-		if($needViewState && !empty($this->_viewState))
-			$state[0]=&$this->_viewState;
-		if(isset($this->_rf[self::RF_CONTROLSTATE]))
-			$state[1]=&$this->_rf[self::RF_CONTROLSTATE];
+		if ($needViewState && !empty($this->_viewState))
+			$state[0] = &$this->_viewState;
+		if (isset($this->_rf[self::RF_CONTROLSTATE]))
+			$state[1] = &$this->_rf[self::RF_CONTROLSTATE];
 		return $state;
 	}
 	public function applyStyleSheetSkin($page)
 	{
-		if($page && !($this->_flags & self::IS_STYLESHEET_APPLIED))
+		if ($page && !($this->_flags & self::IS_STYLESHEET_APPLIED))
 		{
 			$page->applyControlStyleSheet($this);
 			$this->_flags |= self::IS_STYLESHEET_APPLIED;
 		}
-		else if($this->_flags & self::IS_STYLESHEET_APPLIED)
-			throw new TInvalidOperationException('control_stylesheet_applied',get_class($this));
+		else if ($this->_flags & self::IS_STYLESHEET_APPLIED)
+			throw new TInvalidOperationException('control_stylesheet_applied', get_class($this));
 	}
 	private function clearCachedUniqueID($recursive)
 	{
-		if($recursive && $this->_uid!==null && isset($this->_rf[self::RF_CONTROLS]))
+		if ($recursive && $this->_uid !== null && isset($this->_rf[self::RF_CONTROLS]))
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof TControl)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
+				if ($control instanceof TControl)
 					$control->clearCachedUniqueID($recursive);
 		}
-		$this->_uid=null;
+		$this->_uid = null;
 	}
 	private function generateAutomaticID()
 	{
 		$this->_flags &= ~self::IS_ID_SET;
-		if(!isset($this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]))
-			$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]=0;
-		$id=$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]++;
-		$this->_id=self::AUTOMATIC_ID_PREFIX . $id;
+		if (!isset($this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]))
+			$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID] = 0;
+		$id = $this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]++;
+		$this->_id = self::AUTOMATIC_ID_PREFIX . $id;
 		$this->_namingContainer->clearNameTable();
 	}
 	private function clearNameTable()
 	{
 		unset($this->_rf[self::RF_NAMED_CONTROLS]);
 	}
-	private function fillNameTable($container,$controls)
+	private function fillNameTable($container, $controls)
 	{
-		foreach($controls as $control)
+		foreach ($controls as $control)
 		{
-			if($control instanceof TControl)
+			if ($control instanceof TControl)
 			{
-				if($control->_id!=='')
+				if ($control->_id !== '')
 				{
-					if(isset($container->_rf[self::RF_NAMED_CONTROLS][$control->_id]))
-						throw new TInvalidDataValueException('control_id_nonunique',get_class($control),$control->_id);
+					if (isset($container->_rf[self::RF_NAMED_CONTROLS][$control->_id]))
+						throw new TInvalidDataValueException('control_id_nonunique', get_class($control), $control->_id);
 					else
-						$container->_rf[self::RF_NAMED_CONTROLS][$control->_id]=$control;
+						$container->_rf[self::RF_NAMED_CONTROLS][$control->_id] = $control;
 				}
-				if(!($control instanceof INamingContainer) && $control->getHasControls())
-					$this->fillNameTable($container,$control->_rf[self::RF_CONTROLS]);
+				if (!($control instanceof INamingContainer) && $control->getHasControls())
+					$this->fillNameTable($container, $control->_rf[self::RF_CONTROLS]);
 			}
 		}
 	}
@@ -5433,38 +5433,38 @@ 
 class TControlCollection extends TList
 {
 	private $_o;
-	public function __construct(TControl $owner,$readOnly=false)
+	public function __construct(TControl $owner, $readOnly = false)
 	{
-		$this->_o=$owner;
-		parent::__construct(null,$readOnly);
+		$this->_o = $owner;
+		parent::__construct(null, $readOnly);
 	}
 	protected function getOwner()
 	{
 		return $this->_o;
 	}
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if($item instanceof TControl)
+		if ($item instanceof TControl)
 		{
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 			$this->_o->addedControl($item);
 		}
-		else if(is_string($item) || ($item instanceof IRenderable))
-			parent::insertAt($index,$item);
+		else if (is_string($item) || ($item instanceof IRenderable))
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('controlcollection_control_required');
 	}
 	public function removeAt($index)
 	{
-		$item=parent::removeAt($index);
-		if($item instanceof TControl)
+		$item = parent::removeAt($index);
+		if ($item instanceof TControl)
 			$this->_o->removedControl($item);
 		return $item;
 	}
 	public function clear()
 	{
 		parent::clear();
-		if($this->_o instanceof INamingContainer)
+		if ($this->_o instanceof INamingContainer)
 			$this->_o->clearNamingContainer();
 	}
 }
@@ -5472,11 +5472,11 @@ 
 {
 	public function __construct(TControl $owner)
 	{
-		parent::__construct($owner,true);
+		parent::__construct($owner, true);
 	}
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if(!is_string($item))  			parent::insertAt($index,$item);  	}
+		if (!is_string($item))  			parent::insertAt($index, $item); }
 }
 interface INamingContainer
 {
@@ -5487,7 +5487,7 @@ 
 }
 interface IPostBackDataHandler
 {
-	public function loadPostData($key,$values);
+	public function loadPostData($key, $values);
 	public function raisePostDataChangedEvent();
 	public function getDataChanged();
 }
@@ -5507,7 +5507,7 @@ 
 }
 interface IBroadcastEventReceiver
 {
-	public function broadcastEventReceived($sender,$param);
+	public function broadcastEventReceived($sender, $param);
 }
 interface ITheme
 {
@@ -5543,10 +5543,10 @@ 
 {
 	private $_name;
 	private $_param;
-	public function __construct($name='',$parameter=null)
+	public function __construct($name = '', $parameter = null)
 	{
-		$this->_name=$name;
-		$this->_param=$parameter;
+		$this->_name = $name;
+		$this->_param = $parameter;
 	}
 	public function getName()
 	{
@@ -5554,7 +5554,7 @@ 
 	}
 	public function setName($value)
 	{
-		$this->_name=$value;
+		$this->_name = $value;
 	}
 	public function getParameter()
 	{
@@ -5562,17 +5562,17 @@ 
 	}
 	public function setParameter($value)
 	{
-		$this->_param=$value;
+		$this->_param = $value;
 	}
 }
 class TCommandEventParameter extends TEventParameter
 {
 	private $_name;
 	private $_param;
-	public function __construct($name='',$parameter='')
+	public function __construct($name = '', $parameter = '')
 	{
-		$this->_name=$name;
-		$this->_param=$parameter;
+		$this->_name = $name;
+		$this->_param = $parameter;
 	}
 	public function getCommandName()
 	{
@@ -5585,33 +5585,33 @@ 
 }
 class TCompositeLiteral extends TComponent implements IRenderable, IBindable
 {
-	const TYPE_EXPRESSION=0;
-	const TYPE_STATEMENTS=1;
-	const TYPE_DATABINDING=2;
-	private $_container=null;
-	private $_items=array();
-	private $_expressions=array();
-	private $_statements=array();
-	private $_bindings=array();
+	const TYPE_EXPRESSION = 0;
+	const TYPE_STATEMENTS = 1;
+	const TYPE_DATABINDING = 2;
+	private $_container = null;
+	private $_items = array();
+	private $_expressions = array();
+	private $_statements = array();
+	private $_bindings = array();
 	public function __construct($items)
 	{
-		$this->_items=array();
-		$this->_expressions=array();
-		$this->_statements=array();
-		foreach($items as $id=>$item)
+		$this->_items = array();
+		$this->_expressions = array();
+		$this->_statements = array();
+		foreach ($items as $id=>$item)
 		{
-			if(is_array($item))
+			if (is_array($item))
 			{
-				if($item[0]===self::TYPE_EXPRESSION)
-					$this->_expressions[$id]=$item[1];
-				else if($item[0]===self::TYPE_STATEMENTS)
-					$this->_statements[$id]=$item[1];
-				else if($item[0]===self::TYPE_DATABINDING)
-					$this->_bindings[$id]=$item[1];
-				$this->_items[$id]='';
+				if ($item[0] === self::TYPE_EXPRESSION)
+					$this->_expressions[$id] = $item[1];
+				else if ($item[0] === self::TYPE_STATEMENTS)
+					$this->_statements[$id] = $item[1];
+				else if ($item[0] === self::TYPE_DATABINDING)
+					$this->_bindings[$id] = $item[1];
+				$this->_items[$id] = '';
 			}
 			else
-				$this->_items[$id]=$item;
+				$this->_items[$id] = $item;
 		}
 	}
 	public function getContainer()
@@ -5620,76 +5620,76 @@ 
 	}
 	public function setContainer(TComponent $value)
 	{
-		$this->_container=$value;
+		$this->_container = $value;
 	}
 	public function evaluateDynamicContent()
 	{
-		$context=$this->_container===null?$this:$this->_container;
-		foreach($this->_expressions as $id=>$expression)
-			$this->_items[$id]=$context->evaluateExpression($expression);
-		foreach($this->_statements as $id=>$statement)
-			$this->_items[$id]=$context->evaluateStatements($statement);
+		$context = $this->_container === null ? $this : $this->_container;
+		foreach ($this->_expressions as $id=>$expression)
+			$this->_items[$id] = $context->evaluateExpression($expression);
+		foreach ($this->_statements as $id=>$statement)
+			$this->_items[$id] = $context->evaluateStatements($statement);
 	}
 	public function dataBind()
 	{
-		$context=$this->_container===null?$this:$this->_container;
-		foreach($this->_bindings as $id=>$binding)
-			$this->_items[$id]=$context->evaluateExpression($binding);
+		$context = $this->_container === null ? $this : $this->_container;
+		foreach ($this->_bindings as $id=>$binding)
+			$this->_items[$id] = $context->evaluateExpression($binding);
 	}
 	public function render($writer)
 	{
-		$writer->write(implode('',$this->_items));
+		$writer->write(implode('', $this->_items));
 	}
 }
 class TFont extends TComponent
 {
-	const IS_BOLD=0x01;
-	const IS_ITALIC=0x02;
-	const IS_OVERLINE=0x04;
-	const IS_STRIKEOUT=0x08;
-	const IS_UNDERLINE=0x10;
-	const IS_SET_BOLD=0x01000;
-	const IS_SET_ITALIC=0x02000;
-	const IS_SET_OVERLINE=0x04000;
-	const IS_SET_STRIKEOUT=0x08000;
-	const IS_SET_UNDERLINE=0x10000;
-	const IS_SET_SIZE=0x20000;
-	const IS_SET_NAME=0x40000;
-	private $_flags=0;
-	private $_name='';
-	private $_size='';
+	const IS_BOLD = 0x01;
+	const IS_ITALIC = 0x02;
+	const IS_OVERLINE = 0x04;
+	const IS_STRIKEOUT = 0x08;
+	const IS_UNDERLINE = 0x10;
+	const IS_SET_BOLD = 0x01000;
+	const IS_SET_ITALIC = 0x02000;
+	const IS_SET_OVERLINE = 0x04000;
+	const IS_SET_STRIKEOUT = 0x08000;
+	const IS_SET_UNDERLINE = 0x10000;
+	const IS_SET_SIZE = 0x20000;
+	const IS_SET_NAME = 0x40000;
+	private $_flags = 0;
+	private $_name = '';
+	private $_size = '';
 	public function getBold()
 	{
-		return ($this->_flags & self::IS_BOLD)!==0;
+		return ($this->_flags & self::IS_BOLD) !== 0;
 	}
 	public function setBold($value)
 	{
 		$this->_flags |= self::IS_SET_BOLD;
-		if(TPropertyValue::ensureBoolean($value))
+		if (TPropertyValue::ensureBoolean($value))
 			$this->_flags |= self::IS_BOLD;
 		else
 			$this->_flags &= ~self::IS_BOLD;
 	}
 	public function getItalic()
 	{
-		return ($this->_flags & self::IS_ITALIC)!==0;
+		return ($this->_flags & self::IS_ITALIC) !== 0;
 	}
 	public function setItalic($value)
 	{
 		$this->_flags |= self::IS_SET_ITALIC;
-		if(TPropertyValue::ensureBoolean($value))
+		if (TPropertyValue::ensureBoolean($value))
 			$this->_flags |= self::IS_ITALIC;
 		else
 			$this->_flags &= ~self::IS_ITALIC;
 	}
 	public function getOverline()
 	{
-		return ($this->_flags & self::IS_OVERLINE)!==0;
+		return ($this->_flags & self::IS_OVERLINE) !== 0;
 	}
 	public function setOverline($value)
 	{
 		$this->_flags |= self::IS_SET_OVERLINE;
-		if(TPropertyValue::ensureBoolean($value))
+		if (TPropertyValue::ensureBoolean($value))
 			$this->_flags |= self::IS_OVERLINE;
 		else
 			$this->_flags &= ~self::IS_OVERLINE;
@@ -5701,28 +5701,28 @@ 
 	public function setSize($value)
 	{
 		$this->_flags |= self::IS_SET_SIZE;
-		$this->_size=$value;
+		$this->_size = $value;
 	}
 	public function getStrikeout()
 	{
-		return ($this->_flags & self::IS_STRIKEOUT)!==0;
+		return ($this->_flags & self::IS_STRIKEOUT) !== 0;
 	}
 	public function setStrikeout($value)
 	{
 		$this->_flags |= self::IS_SET_STRIKEOUT;
-		if(TPropertyValue::ensureBoolean($value))
+		if (TPropertyValue::ensureBoolean($value))
 			$this->_flags |= self::IS_STRIKEOUT;
 		else
 			$this->_flags &= ~self::IS_STRIKEOUT;
 	}
 	public function getUnderline()
 	{
-		return ($this->_flags & self::IS_UNDERLINE)!==0;
+		return ($this->_flags & self::IS_UNDERLINE) !== 0;
 	}
 	public function setUnderline($value)
 	{
 		$this->_flags |= self::IS_SET_UNDERLINE;
-		if(TPropertyValue::ensureBoolean($value))
+		if (TPropertyValue::ensureBoolean($value))
 			$this->_flags |= self::IS_UNDERLINE;
 		else
 			$this->_flags &= ~self::IS_UNDERLINE;
@@ -5734,7 +5734,7 @@ 
 	public function setName($value)
 	{
 		$this->_flags |= self::IS_SET_NAME;
-		$this->_name=$value;
+		$this->_name = $value;
 	}
 	public function getIsEmpty()
 	{
@@ -5742,174 +5742,174 @@ 
 	}
 	public function reset()
 	{
-		$this->_flags=0;
-		$this->_name='';
-		$this->_size='';
+		$this->_flags = 0;
+		$this->_name = '';
+		$this->_size = '';
 	}
 	public function mergeWith($font)
 	{
-		if($font===null || $font->_flags===0)
+		if ($font === null || $font->_flags === 0)
 			return;
-		if(!($this->_flags & self::IS_SET_BOLD) && ($font->_flags & self::IS_SET_BOLD))
+		if (!($this->_flags & self::IS_SET_BOLD) && ($font->_flags & self::IS_SET_BOLD))
 			$this->setBold($font->getBold());
-		if(!($this->_flags & self::IS_SET_ITALIC) && ($font->_flags & self::IS_SET_ITALIC))
+		if (!($this->_flags & self::IS_SET_ITALIC) && ($font->_flags & self::IS_SET_ITALIC))
 			$this->setItalic($font->getItalic());
-		if(!($this->_flags & self::IS_SET_OVERLINE) && ($font->_flags & self::IS_SET_OVERLINE))
+		if (!($this->_flags & self::IS_SET_OVERLINE) && ($font->_flags & self::IS_SET_OVERLINE))
 			$this->setOverline($font->getOverline());
-		if(!($this->_flags & self::IS_SET_STRIKEOUT) && ($font->_flags & self::IS_SET_STRIKEOUT))
+		if (!($this->_flags & self::IS_SET_STRIKEOUT) && ($font->_flags & self::IS_SET_STRIKEOUT))
 			$this->setStrikeout($font->getStrikeout());
-		if(!($this->_flags & self::IS_SET_UNDERLINE) && ($font->_flags & self::IS_SET_UNDERLINE))
+		if (!($this->_flags & self::IS_SET_UNDERLINE) && ($font->_flags & self::IS_SET_UNDERLINE))
 			$this->setUnderline($font->getUnderline());
-		if(!($this->_flags & self::IS_SET_SIZE) && ($font->_flags & self::IS_SET_SIZE))
+		if (!($this->_flags & self::IS_SET_SIZE) && ($font->_flags & self::IS_SET_SIZE))
 			$this->setSize($font->getSize());
-		if(!($this->_flags & self::IS_SET_NAME) && ($font->_flags & self::IS_SET_NAME))
+		if (!($this->_flags & self::IS_SET_NAME) && ($font->_flags & self::IS_SET_NAME))
 			$this->setName($font->getName());
 	}
 	public function copyFrom($font)
 	{
-		if($font===null || $font->_flags===0)
+		if ($font === null || $font->_flags === 0)
 			return;
-		if($font->_flags & self::IS_SET_BOLD)
+		if ($font->_flags & self::IS_SET_BOLD)
 			$this->setBold($font->getBold());
-		if($font->_flags & self::IS_SET_ITALIC)
+		if ($font->_flags & self::IS_SET_ITALIC)
 			$this->setItalic($font->getItalic());
-		if($font->_flags & self::IS_SET_OVERLINE)
+		if ($font->_flags & self::IS_SET_OVERLINE)
 			$this->setOverline($font->getOverline());
-		if($font->_flags & self::IS_SET_STRIKEOUT)
+		if ($font->_flags & self::IS_SET_STRIKEOUT)
 			$this->setStrikeout($font->getStrikeout());
-		if($font->_flags & self::IS_SET_UNDERLINE)
+		if ($font->_flags & self::IS_SET_UNDERLINE)
 			$this->setUnderline($font->getUnderline());
-		if($font->_flags & self::IS_SET_SIZE)
+		if ($font->_flags & self::IS_SET_SIZE)
 			$this->setSize($font->getSize());
-		if($font->_flags & self::IS_SET_NAME)
+		if ($font->_flags & self::IS_SET_NAME)
 			$this->setName($font->getName());
 	}
 	public function toString()
 	{
-		if($this->_flags===0)
+		if ($this->_flags === 0)
 			return '';
-		$str='';
-		if($this->_flags & self::IS_SET_BOLD)
-			$str.='font-weight:'.(($this->_flags & self::IS_BOLD)?'bold;':'normal;');
-		if($this->_flags & self::IS_SET_ITALIC)
-			$str.='font-style:'.(($this->_flags & self::IS_ITALIC)?'italic;':'normal;');
-		$textDec='';
-		if($this->_flags & self::IS_UNDERLINE)
-			$textDec.='underline';
-		if($this->_flags & self::IS_OVERLINE)
-			$textDec.=' overline';
-		if($this->_flags & self::IS_STRIKEOUT)
-			$textDec.=' line-through';
-		$textDec=ltrim($textDec);
-		if($textDec!=='')
-			$str.='text-decoration:'.$textDec.';';
-		if($this->_size!=='')
-			$str.='font-size:'.$this->_size.';';
-		if($this->_name!=='')
-			$str.='font-family:'.$this->_name.';';
+		$str = '';
+		if ($this->_flags & self::IS_SET_BOLD)
+			$str .= 'font-weight:' . (($this->_flags & self::IS_BOLD) ? 'bold;' : 'normal;');
+		if ($this->_flags & self::IS_SET_ITALIC)
+			$str .= 'font-style:' . (($this->_flags & self::IS_ITALIC) ? 'italic;' : 'normal;');
+		$textDec = '';
+		if ($this->_flags & self::IS_UNDERLINE)
+			$textDec .= 'underline';
+		if ($this->_flags & self::IS_OVERLINE)
+			$textDec .= ' overline';
+		if ($this->_flags & self::IS_STRIKEOUT)
+			$textDec .= ' line-through';
+		$textDec = ltrim($textDec);
+		if ($textDec !== '')
+			$str .= 'text-decoration:' . $textDec . ';';
+		if ($this->_size !== '')
+			$str .= 'font-size:' . $this->_size . ';';
+		if ($this->_name !== '')
+			$str .= 'font-family:' . $this->_name . ';';
 		return $str;
 	}
 	public function addAttributesToRender($writer)
 	{
-		if($this->_flags===0)
+		if ($this->_flags === 0)
 			return;
-		if($this->_flags & self::IS_SET_BOLD)
-			$writer->addStyleAttribute('font-weight',(($this->_flags & self::IS_BOLD)?'bold':'normal'));
-		if($this->_flags & self::IS_SET_ITALIC)
-			$writer->addStyleAttribute('font-style',(($this->_flags & self::IS_ITALIC)?'italic':'normal'));
-		$textDec='';
-		if($this->_flags & self::IS_UNDERLINE)
-			$textDec.='underline';
-		if($this->_flags & self::IS_OVERLINE)
-			$textDec.=' overline';
-		if($this->_flags & self::IS_STRIKEOUT)
-			$textDec.=' line-through';
-		$textDec=ltrim($textDec);
-		if($textDec!=='')
-			$writer->addStyleAttribute('text-decoration',$textDec);
-		if($this->_size!=='')
-			$writer->addStyleAttribute('font-size',$this->_size);
-		if($this->_name!=='')
-			$writer->addStyleAttribute('font-family',$this->_name);
+		if ($this->_flags & self::IS_SET_BOLD)
+			$writer->addStyleAttribute('font-weight', (($this->_flags & self::IS_BOLD) ? 'bold' : 'normal'));
+		if ($this->_flags & self::IS_SET_ITALIC)
+			$writer->addStyleAttribute('font-style', (($this->_flags & self::IS_ITALIC) ? 'italic' : 'normal'));
+		$textDec = '';
+		if ($this->_flags & self::IS_UNDERLINE)
+			$textDec .= 'underline';
+		if ($this->_flags & self::IS_OVERLINE)
+			$textDec .= ' overline';
+		if ($this->_flags & self::IS_STRIKEOUT)
+			$textDec .= ' line-through';
+		$textDec = ltrim($textDec);
+		if ($textDec !== '')
+			$writer->addStyleAttribute('text-decoration', $textDec);
+		if ($this->_size !== '')
+			$writer->addStyleAttribute('font-size', $this->_size);
+		if ($this->_name !== '')
+			$writer->addStyleAttribute('font-family', $this->_name);
 	}
 }
 class TStyle extends TComponent
 {
-	private $_fields=array();
-	private $_font=null;
-	private $_class=null;
-	private $_customStyle=null;
-	private $_displayStyle='Fixed';
-	public function __construct($style=null)
-	{
-		if($style!==null)
+	private $_fields = array();
+	private $_font = null;
+	private $_class = null;
+	private $_customStyle = null;
+	private $_displayStyle = 'Fixed';
+	public function __construct($style = null)
+	{
+		if ($style !== null)
 			$this->copyFrom($style);
 	}
 	public function __clone()
 	{
-		if($this->_font!==null)
+		if ($this->_font !== null)
 			$this->_font = clone($this->_font);
 	}
 	public function getBackColor()
 	{
-		return isset($this->_fields['background-color'])?$this->_fields['background-color']:'';
+		return isset($this->_fields['background-color']) ? $this->_fields['background-color'] : '';
 	}
 	public function setBackColor($value)
 	{
-		if(trim($value)==='')
+		if (trim($value) === '')
 			unset($this->_fields['background-color']);
 		else
-			$this->_fields['background-color']=$value;
+			$this->_fields['background-color'] = $value;
 	}
 	public function getBorderColor()
 	{
-		return isset($this->_fields['border-color'])?$this->_fields['border-color']:'';
+		return isset($this->_fields['border-color']) ? $this->_fields['border-color'] : '';
 	}
 	public function setBorderColor($value)
 	{
-		if(trim($value)==='')
+		if (trim($value) === '')
 			unset($this->_fields['border-color']);
 		else
-			$this->_fields['border-color']=$value;
+			$this->_fields['border-color'] = $value;
 	}
 	public function getBorderStyle()
 	{
-		return isset($this->_fields['border-style'])?$this->_fields['border-style']:'';
+		return isset($this->_fields['border-style']) ? $this->_fields['border-style'] : '';
 	}
 	public function setBorderStyle($value)
 	{
-		if(trim($value)==='')
+		if (trim($value) === '')
 			unset($this->_fields['border-style']);
 		else
-			$this->_fields['border-style']=$value;
+			$this->_fields['border-style'] = $value;
 	}
 	public function getBorderWidth()
 	{
-		return isset($this->_fields['border-width'])?$this->_fields['border-width']:'';
+		return isset($this->_fields['border-width']) ? $this->_fields['border-width'] : '';
 	}
 	public function setBorderWidth($value)
 	{
-		if(trim($value)==='')
+		if (trim($value) === '')
 			unset($this->_fields['border-width']);
 		else
-			$this->_fields['border-width']=$value;
+			$this->_fields['border-width'] = $value;
 	}
 	public function getCssClass()
 	{
-		return $this->_class===null?'':$this->_class;
+		return $this->_class === null ? '' : $this->_class;
 	}
 	public function hasCssClass()
 	{
-		return ($this->_class!==null);
+		return ($this->_class !== null);
 	}
 	public function setCssClass($value)
 	{
-		$this->_class=$value;
+		$this->_class = $value;
 	}
 	public function getFont()
 	{
-		if($this->_font===null)
-			$this->_font=new TFont;
+		if ($this->_font === null)
+			$this->_font = new TFont;
 		return $this->_font;
 	}
 	public function hasFont()
@@ -5919,13 +5919,13 @@ 
 	public function setDisplayStyle($value)
 	{
 		$this->_displayStyle = TPropertyValue::ensureEnum($value, 'TDisplayStyle');
-		switch($this->_displayStyle)
+		switch ($this->_displayStyle)
 		{
 			case TDisplayStyle::None:
 				$this->_fields['display'] = 'none';
 				break;
 			case TDisplayStyle::Dynamic:
-				$this->_fields['display'] = ''; 				break;
+				$this->_fields['display'] = ''; break;
 			case TDisplayStyle::Fixed:
 				$this->_fields['visibility'] = 'visible';
 				break;
@@ -5940,41 +5940,41 @@ 
 	}
 	public function getForeColor()
 	{
-		return isset($this->_fields['color'])?$this->_fields['color']:'';
+		return isset($this->_fields['color']) ? $this->_fields['color'] : '';
 	}
 	public function setForeColor($value)
 	{
-		if(trim($value)==='')
+		if (trim($value) === '')
 			unset($this->_fields['color']);
 		else
-			$this->_fields['color']=$value;
+			$this->_fields['color'] = $value;
 	}
 	public function getHeight()
 	{
-		return isset($this->_fields['height'])?$this->_fields['height']:'';
+		return isset($this->_fields['height']) ? $this->_fields['height'] : '';
 	}
 	public function setHeight($value)
 	{
-		if(trim($value)==='')
+		if (trim($value) === '')
 			unset($this->_fields['height']);
 		else
-			$this->_fields['height']=$value;
+			$this->_fields['height'] = $value;
 	}
 	public function getCustomStyle()
 	{
-		return $this->_customStyle===null?'':$this->_customStyle;
+		return $this->_customStyle === null ? '' : $this->_customStyle;
 	}
 	public function setCustomStyle($value)
 	{
-		$this->_customStyle=$value;
+		$this->_customStyle = $value;
 	}
 	public function getStyleField($name)
 	{
-		return isset($this->_fields[$name])?$this->_fields[$name]:'';
+		return isset($this->_fields[$name]) ? $this->_fields[$name] : '';
 	}
-	public function setStyleField($name,$value)
+	public function setStyleField($name, $value)
 	{
-		$this->_fields[$name]=$value;
+		$this->_fields[$name] = $value;
 	}
 	public function clearStyleField($name)
 	{
@@ -5986,61 +5986,61 @@ 
 	}
 	public function getWidth()
 	{
-		return isset($this->_fields['width'])?$this->_fields['width']:'';
+		return isset($this->_fields['width']) ? $this->_fields['width'] : '';
 	}
 	public function setWidth($value)
 	{
-		$this->_fields['width']=$value;
+		$this->_fields['width'] = $value;
 	}
 	public function reset()
 	{
-		$this->_fields=array();
-		$this->_font=null;
-		$this->_class=null;
-		$this->_customStyle=null;
+		$this->_fields = array();
+		$this->_font = null;
+		$this->_class = null;
+		$this->_customStyle = null;
 	}
 	public function copyFrom($style)
 	{
-		if($style instanceof TStyle)
+		if ($style instanceof TStyle)
 		{
-			$this->_fields=array_merge($this->_fields,$style->_fields);
-			if($style->_class!==null)
-				$this->_class=$style->_class;
-			if($style->_customStyle!==null)
-				$this->_customStyle=$style->_customStyle;
-			if($style->_font!==null)
+			$this->_fields = array_merge($this->_fields, $style->_fields);
+			if ($style->_class !== null)
+				$this->_class = $style->_class;
+			if ($style->_customStyle !== null)
+				$this->_customStyle = $style->_customStyle;
+			if ($style->_font !== null)
 				$this->getFont()->copyFrom($style->_font);
 		}
 	}
 	public function mergeWith($style)
 	{
-		if($style instanceof TStyle)
+		if ($style instanceof TStyle)
 		{
-			$this->_fields=array_merge($style->_fields,$this->_fields);
-			if($this->_class===null)
-				$this->_class=$style->_class;
-			if($this->_customStyle===null)
-				$this->_customStyle=$style->_customStyle;
-			if($style->_font!==null)
+			$this->_fields = array_merge($style->_fields, $this->_fields);
+			if ($this->_class === null)
+				$this->_class = $style->_class;
+			if ($this->_customStyle === null)
+				$this->_customStyle = $style->_customStyle;
+			if ($style->_font !== null)
 				$this->getFont()->mergeWith($style->_font);
 		}
 	}
 	public function addAttributesToRender($writer)
 	{
-		if($this->_customStyle!==null)
+		if ($this->_customStyle !== null)
 		{
-			foreach(explode(';',$this->_customStyle) as $style)
+			foreach (explode(';', $this->_customStyle) as $style)
 			{
-				$arr=explode(':',$style,2);
-				if(isset($arr[1]) && trim($arr[0])!=='')
-					$writer->addStyleAttribute(trim($arr[0]),trim($arr[1]));
+				$arr = explode(':', $style, 2);
+				if (isset($arr[1]) && trim($arr[0]) !== '')
+					$writer->addStyleAttribute(trim($arr[0]), trim($arr[1]));
 			}
 		}
 		$writer->addStyleAttributes($this->_fields);
-		if($this->_font!==null)
+		if ($this->_font !== null)
 			$this->_font->addAttributesToRender($writer);
-		if($this->_class!==null)
-			$writer->addAttribute('class',$this->_class);
+		if ($this->_class !== null)
+			$writer->addAttribute('class', $this->_class);
 	}
 	public function getStyleFields()
 	{
@@ -6049,231 +6049,231 @@ 
 }
 class TDisplayStyle extends TEnumerable
 {
-	const None='None';
-	const Dynamic='Dynamic';
-	const Fixed='Fixed';
-	const Hidden='Hidden';
+	const None = 'None';
+	const Dynamic = 'Dynamic';
+	const Fixed = 'Fixed';
+	const Hidden = 'Hidden';
 }
 class TTableStyle extends TStyle
 {
-	private $_backImageUrl=null;
-	private $_horizontalAlign=null;
-	private $_cellPadding=null;
-	private $_cellSpacing=null;
-	private $_gridLines=null;
-	private $_borderCollapse=null;
+	private $_backImageUrl = null;
+	private $_horizontalAlign = null;
+	private $_cellPadding = null;
+	private $_cellSpacing = null;
+	private $_gridLines = null;
+	private $_borderCollapse = null;
 	public function reset()
 	{
-		$this->_backImageUrl=null;
-		$this->_horizontalAlign=null;
-		$this->_cellPadding=null;
-		$this->_cellSpacing=null;
-		$this->_gridLines=null;
-		$this->_borderCollapse=null;
+		$this->_backImageUrl = null;
+		$this->_horizontalAlign = null;
+		$this->_cellPadding = null;
+		$this->_cellSpacing = null;
+		$this->_gridLines = null;
+		$this->_borderCollapse = null;
 	}
 	public function copyFrom($style)
 	{
 		parent::copyFrom($style);
-		if($style instanceof TTableStyle)
-		{
-			if($style->_backImageUrl!==null)
-				$this->_backImageUrl=$style->_backImageUrl;
-			if($style->_horizontalAlign!==null)
-				$this->_horizontalAlign=$style->_horizontalAlign;
-			if($style->_cellPadding!==null)
-				$this->_cellPadding=$style->_cellPadding;
-			if($style->_cellSpacing!==null)
-				$this->_cellSpacing=$style->_cellSpacing;
-			if($style->_gridLines!==null)
-				$this->_gridLines=$style->_gridLines;
-			if($style->_borderCollapse!==null)
-				$this->_borderCollapse=$style->_borderCollapse;
+		if ($style instanceof TTableStyle)
+		{
+			if ($style->_backImageUrl !== null)
+				$this->_backImageUrl = $style->_backImageUrl;
+			if ($style->_horizontalAlign !== null)
+				$this->_horizontalAlign = $style->_horizontalAlign;
+			if ($style->_cellPadding !== null)
+				$this->_cellPadding = $style->_cellPadding;
+			if ($style->_cellSpacing !== null)
+				$this->_cellSpacing = $style->_cellSpacing;
+			if ($style->_gridLines !== null)
+				$this->_gridLines = $style->_gridLines;
+			if ($style->_borderCollapse !== null)
+				$this->_borderCollapse = $style->_borderCollapse;
 		}
 	}
 	public function mergeWith($style)
 	{
 		parent::mergeWith($style);
-		if($style instanceof TTableStyle)
-		{
-			if($this->_backImageUrl===null && $style->_backImageUrl!==null)
-				$this->_backImageUrl=$style->_backImageUrl;
-			if($this->_horizontalAlign===null && $style->_horizontalAlign!==null)
-				$this->_horizontalAlign=$style->_horizontalAlign;
-			if($this->_cellPadding===null && $style->_cellPadding!==null)
-				$this->_cellPadding=$style->_cellPadding;
-			if($this->_cellSpacing===null && $style->_cellSpacing!==null)
-				$this->_cellSpacing=$style->_cellSpacing;
-			if($this->_gridLines===null && $style->_gridLines!==null)
-				$this->_gridLines=$style->_gridLines;
-			if($this->_borderCollapse===null && $style->_borderCollapse!==null)
-				$this->_borderCollapse=$style->_borderCollapse;
+		if ($style instanceof TTableStyle)
+		{
+			if ($this->_backImageUrl === null && $style->_backImageUrl !== null)
+				$this->_backImageUrl = $style->_backImageUrl;
+			if ($this->_horizontalAlign === null && $style->_horizontalAlign !== null)
+				$this->_horizontalAlign = $style->_horizontalAlign;
+			if ($this->_cellPadding === null && $style->_cellPadding !== null)
+				$this->_cellPadding = $style->_cellPadding;
+			if ($this->_cellSpacing === null && $style->_cellSpacing !== null)
+				$this->_cellSpacing = $style->_cellSpacing;
+			if ($this->_gridLines === null && $style->_gridLines !== null)
+				$this->_gridLines = $style->_gridLines;
+			if ($this->_borderCollapse === null && $style->_borderCollapse !== null)
+				$this->_borderCollapse = $style->_borderCollapse;
 		}
 	}
 	public function addAttributesToRender($writer)
 	{
-		if(($url=trim($this->getBackImageUrl()))!=='')
-			$writer->addStyleAttribute('background-image','url('.$url.')');
-		if(($horizontalAlign=$this->getHorizontalAlign())!==THorizontalAlign::NotSet)
-			$writer->addStyleAttribute('text-align',strtolower($horizontalAlign));
-		if(($cellPadding=$this->getCellPadding())>=0)
-			$writer->addAttribute('cellpadding',"$cellPadding");
-		if(($cellSpacing=$this->getCellSpacing())>=0)
-			$writer->addAttribute('cellspacing',"$cellSpacing");
-		if($this->getBorderCollapse())
-			$writer->addStyleAttribute('border-collapse','collapse');
-		switch($this->getGridLines())
-		{
-			case TTableGridLines::Horizontal : $writer->addAttribute('rules','rows'); break;
-			case TTableGridLines::Vertical : $writer->addAttribute('rules','cols'); break;
-			case TTableGridLines::Both : $writer->addAttribute('rules','all'); break;
+		if (($url = trim($this->getBackImageUrl())) !== '')
+			$writer->addStyleAttribute('background-image', 'url(' . $url . ')');
+		if (($horizontalAlign = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet)
+			$writer->addStyleAttribute('text-align', strtolower($horizontalAlign));
+		if (($cellPadding = $this->getCellPadding()) >= 0)
+			$writer->addAttribute('cellpadding', "$cellPadding");
+		if (($cellSpacing = $this->getCellSpacing()) >= 0)
+			$writer->addAttribute('cellspacing', "$cellSpacing");
+		if ($this->getBorderCollapse())
+			$writer->addStyleAttribute('border-collapse', 'collapse');
+		switch ($this->getGridLines())
+		{
+			case TTableGridLines::Horizontal : $writer->addAttribute('rules', 'rows'); break;
+			case TTableGridLines::Vertical : $writer->addAttribute('rules', 'cols'); break;
+			case TTableGridLines::Both : $writer->addAttribute('rules', 'all'); break;
 		}
 		parent::addAttributesToRender($writer);
 	}
 	public function getBackImageUrl()
 	{
-		return $this->_backImageUrl===null?'':$this->_backImageUrl;
+		return $this->_backImageUrl === null ? '' : $this->_backImageUrl;
 	}
 	public function setBackImageUrl($value)
 	{
-		$this->_backImageUrl=$value;
+		$this->_backImageUrl = $value;
 	}
 	public function getHorizontalAlign()
 	{
-		return $this->_horizontalAlign===null?THorizontalAlign::NotSet:$this->_horizontalAlign;
+		return $this->_horizontalAlign === null ? THorizontalAlign::NotSet : $this->_horizontalAlign;
 	}
 	public function setHorizontalAlign($value)
 	{
-		$this->_horizontalAlign=TPropertyValue::ensureEnum($value,'THorizontalAlign');
+		$this->_horizontalAlign = TPropertyValue::ensureEnum($value, 'THorizontalAlign');
 	}
 	public function getCellPadding()
 	{
-		return $this->_cellPadding===null?-1:$this->_cellPadding;
+		return $this->_cellPadding === null ?-1 : $this->_cellPadding;
 	}
 	public function setCellPadding($value)
 	{
-		if(($this->_cellPadding=TPropertyValue::ensureInteger($value))<-1)
+		if (($this->_cellPadding = TPropertyValue::ensureInteger($value)) < -1)
 			throw new TInvalidDataValueException('tablestyle_cellpadding_invalid');
 	}
 	public function getCellSpacing()
 	{
-		return $this->_cellSpacing===null?-1:$this->_cellSpacing;
+		return $this->_cellSpacing === null ?-1 : $this->_cellSpacing;
 	}
 	public function setCellSpacing($value)
 	{
-		if(($this->_cellSpacing=TPropertyValue::ensureInteger($value))<-1)
+		if (($this->_cellSpacing = TPropertyValue::ensureInteger($value)) < -1)
 			throw new TInvalidDataValueException('tablestyle_cellspacing_invalid');
 	}
 	public function getGridLines()
 	{
-		return $this->_gridLines===null?TTableGridLines::None:$this->_gridLines;
+		return $this->_gridLines === null ? TTableGridLines::None : $this->_gridLines;
 	}
 	public function setGridLines($value)
 	{
-		$this->_gridLines=TPropertyValue::ensureEnum($value,'TTableGridLines');
+		$this->_gridLines = TPropertyValue::ensureEnum($value, 'TTableGridLines');
 	}
 	public function getBorderCollapse()
 	{
-		return $this->_borderCollapse===null?false:$this->_borderCollapse;
+		return $this->_borderCollapse === null ? false : $this->_borderCollapse;
 	}
 	public function setBorderCollapse($value)
 	{
-		$this->_borderCollapse=TPropertyValue::ensureBoolean($value);
+		$this->_borderCollapse = TPropertyValue::ensureBoolean($value);
 	}
 }
 class TTableItemStyle extends TStyle
 {
-	private $_horizontalAlign=null;
-	private $_verticalAlign=null;
-	private $_wrap=null;
+	private $_horizontalAlign = null;
+	private $_verticalAlign = null;
+	private $_wrap = null;
 	public function reset()
 	{
 		parent::reset();
-		$this->_verticalAlign=null;
-		$this->_horizontalAlign=null;
-		$this->_wrap=null;
+		$this->_verticalAlign = null;
+		$this->_horizontalAlign = null;
+		$this->_wrap = null;
 	}
 	public function copyFrom($style)
 	{
 		parent::copyFrom($style);
-		if($style instanceof TTableItemStyle)
+		if ($style instanceof TTableItemStyle)
 		{
-			if($this->_verticalAlign===null && $style->_verticalAlign!==null)
-				$this->_verticalAlign=$style->_verticalAlign;
-			if($this->_horizontalAlign===null && $style->_horizontalAlign!==null)
-				$this->_horizontalAlign=$style->_horizontalAlign;
-			if($this->_wrap===null && $style->_wrap!==null)
-				$this->_wrap=$style->_wrap;
+			if ($this->_verticalAlign === null && $style->_verticalAlign !== null)
+				$this->_verticalAlign = $style->_verticalAlign;
+			if ($this->_horizontalAlign === null && $style->_horizontalAlign !== null)
+				$this->_horizontalAlign = $style->_horizontalAlign;
+			if ($this->_wrap === null && $style->_wrap !== null)
+				$this->_wrap = $style->_wrap;
 		}
 	}
 	public function mergeWith($style)
 	{
 		parent::mergeWith($style);
-		if($style instanceof TTableItemStyle)
+		if ($style instanceof TTableItemStyle)
 		{
-			if($style->_verticalAlign!==null)
-				$this->_verticalAlign=$style->_verticalAlign;
-			if($style->_horizontalAlign!==null)
-				$this->_horizontalAlign=$style->_horizontalAlign;
-			if($style->_wrap!==null)
-				$this->_wrap=$style->_wrap;
+			if ($style->_verticalAlign !== null)
+				$this->_verticalAlign = $style->_verticalAlign;
+			if ($style->_horizontalAlign !== null)
+				$this->_horizontalAlign = $style->_horizontalAlign;
+			if ($style->_wrap !== null)
+				$this->_wrap = $style->_wrap;
 		}
 	}
 	public function addAttributesToRender($writer)
 	{
-		if(!$this->getWrap())
-			$writer->addStyleAttribute('white-space','nowrap');
-		if(($horizontalAlign=$this->getHorizontalAlign())!==THorizontalAlign::NotSet)
-			$writer->addAttribute('align',strtolower($horizontalAlign));
-		if(($verticalAlign=$this->getVerticalAlign())!==TVerticalAlign::NotSet)
-			$writer->addAttribute('valign',strtolower($verticalAlign));
+		if (!$this->getWrap())
+			$writer->addStyleAttribute('white-space', 'nowrap');
+		if (($horizontalAlign = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet)
+			$writer->addAttribute('align', strtolower($horizontalAlign));
+		if (($verticalAlign = $this->getVerticalAlign()) !== TVerticalAlign::NotSet)
+			$writer->addAttribute('valign', strtolower($verticalAlign));
 		parent::addAttributesToRender($writer);
 	}
 	public function getHorizontalAlign()
 	{
-		return $this->_horizontalAlign===null?THorizontalAlign::NotSet:$this->_horizontalAlign;
+		return $this->_horizontalAlign === null ? THorizontalAlign::NotSet : $this->_horizontalAlign;
 	}
 	public function setHorizontalAlign($value)
 	{
-		$this->_horizontalAlign=TPropertyValue::ensureEnum($value,'THorizontalAlign');
+		$this->_horizontalAlign = TPropertyValue::ensureEnum($value, 'THorizontalAlign');
 	}
 	public function getVerticalAlign()
 	{
-		return $this->_verticalAlign===null?TVerticalAlign::NotSet:$this->_verticalAlign;
+		return $this->_verticalAlign === null ? TVerticalAlign::NotSet : $this->_verticalAlign;
 	}
 	public function setVerticalAlign($value)
 	{
-		$this->_verticalAlign=TPropertyValue::ensureEnum($value,'TVerticalAlign');
+		$this->_verticalAlign = TPropertyValue::ensureEnum($value, 'TVerticalAlign');
 	}
 	public function getWrap()
 	{
-		return $this->_wrap===null?true:$this->_wrap;
+		return $this->_wrap === null ? true : $this->_wrap;
 	}
 	public function setWrap($value)
 	{
-		$this->_wrap=TPropertyValue::ensureBoolean($value);
+		$this->_wrap = TPropertyValue::ensureBoolean($value);
 	}
 }
 class THorizontalAlign extends TEnumerable
 {
-	const NotSet='NotSet';
-	const Left='Left';
-	const Right='Right';
-	const Center='Center';
-	const Justify='Justify';
+	const NotSet = 'NotSet';
+	const Left = 'Left';
+	const Right = 'Right';
+	const Center = 'Center';
+	const Justify = 'Justify';
 }
 class TVerticalAlign extends TEnumerable
 {
-	const NotSet='NotSet';
-	const Top='Top';
-	const Bottom='Bottom';
-	const Middle='Middle';
+	const NotSet = 'NotSet';
+	const Top = 'Top';
+	const Bottom = 'Bottom';
+	const Middle = 'Middle';
 }
 class TTableGridLines extends TEnumerable
 {
-	const None='None';
-	const Horizontal='Horizontal';
-	const Vertical='Vertical';
-	const Both='Both';
+	const None = 'None';
+	const Horizontal = 'Horizontal';
+	const Vertical = 'Vertical';
+	const Both = 'Both';
 }
 class TWebControlAdapter extends TControlAdapter
 {
@@ -6301,7 +6301,7 @@ 
 	private $_usestate = false;
 	private $_control;
 	private $_outercontrol;
-	private $_addedTemplateDecoration=false;
+	private $_addedTemplateDecoration = false;
 	private $_pretagtext = '';
 	private $_precontentstext = '';
 	private $_postcontentstext = '';
@@ -6326,97 +6326,97 @@ 
 		return $this->_pretagtext;
 	}
 	public function setPreTagText($value) {
-		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
+		if (!$this->_internalonly && !$this->_control->getIsSkinApplied())
 			$this->_pretagtext = TPropertyValue::ensureString($value);
 	}
 	public function getPreContentsText() {
 		return $this->_precontentstext;
 	}
 	public function setPreContentsText($value) {
-		if(!$this->_control->getIsSkinApplied())
+		if (!$this->_control->getIsSkinApplied())
 			$this->_precontentstext = TPropertyValue::ensureString($value);
 	}
 	public function getPostContentsText() {
 		return $this->_postcontentstext;
 	}
 	public function setPostContentsText($value) {
-		if(!$this->_control->getIsSkinApplied())
+		if (!$this->_control->getIsSkinApplied())
 			$this->_postcontentstext = TPropertyValue::ensureString($value);
 	}
 	public function getPostTagText() {
 		return $this->_posttagtext;
 	}
 	public function setPostTagText($value) {
-		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
+		if (!$this->_internalonly && !$this->_control->getIsSkinApplied())
 			$this->_posttagtext = TPropertyValue::ensureString($value);
 	}
 	public function getPreTagTemplate() {
 		return $this->_pretagtemplate;
 	}
 	public function setPreTagTemplate($value) {
-		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
+		if (!$this->_internalonly && !$this->_control->getIsSkinApplied())
 			$this->_pretagtemplate = $value;
 	}
 	public function getPreContentsTemplate() {
 		return $this->_precontentstemplate;
 	}
 	public function setPreContentsTemplate($value) {
-		if(!$this->_control->getIsSkinApplied())
+		if (!$this->_control->getIsSkinApplied())
 			$this->_precontentstemplate = $value;
 	}
 	public function getPostContentsTemplate() {
 		return $this->_postcontentstemplate;
 	}
 	public function setPostContentsTemplate($value) {
-		if(!$this->_control->getIsSkinApplied())
+		if (!$this->_control->getIsSkinApplied())
 			$this->_postcontentstemplate = $value;
 	}
 	public function getPostTagTemplate() {
 		return $this->_posttagtemplate;
 	}
 	public function setPostTagTemplate($value) {
-		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
+		if (!$this->_internalonly && !$this->_control->getIsSkinApplied())
 			$this->_posttagtemplate = $value;
 	}
 	public function instantiate($outercontrol = null) {
-		if($this->getPreTagTemplate() || $this->getPreContentsTemplate() ||
+		if ($this->getPreTagTemplate() || $this->getPreContentsTemplate() ||
 			$this->getPostContentsTemplate() || $this->getPostTagTemplate()) {
 			$this->_outercontrol = $outercontrol;
-			if($this->getUseState())
+			if ($this->getUseState())
 				$this->ensureTemplateDecoration();
 			else
 				$this->_control->getPage()->onSaveStateComplete[] = array($this, 'ensureTemplateDecoration');
 		}
 	}
-	public function ensureTemplateDecoration($sender=null, $param=null) {
+	public function ensureTemplateDecoration($sender = null, $param = null) {
 		$control = $this->_control;
 		$outercontrol = $this->_outercontrol;
-		if($outercontrol === null)
+		if ($outercontrol === null)
 			$outercontrol = $control;
-		if($this->_addedTemplateDecoration)
+		if ($this->_addedTemplateDecoration)
 			return $this->_addedTemplateDecoration;
 		$this->_addedTemplateDecoration = true;
-		if($this->getPreContentsTemplate())
+		if ($this->getPreContentsTemplate())
 		{
 			$precontents = Prado::createComponent('TCompositeControl');
 			$this->getPreContentsTemplate()->instantiateIn($precontents);
 			$control->getControls()->insertAt(0, $precontents);
 		}
-		if($this->getPostContentsTemplate())
+		if ($this->getPostContentsTemplate())
 		{
 			$postcontents = Prado::createComponent('TCompositeControl');
 			$this->getPostContentsTemplate()->instantiateIn($postcontents);
 			$control->getControls()->add($postcontents);
 		}
-		if(!$outercontrol->getParent())
+		if (!$outercontrol->getParent())
 			return $this->_addedTemplateDecoration;
-		if($this->getPreTagTemplate())
+		if ($this->getPreTagTemplate())
 		{
 			$pretag = Prado::createComponent('TCompositeControl');
 			$this->getPreTagTemplate()->instantiateIn($pretag);
 			$outercontrol->getParent()->getControls()->insertBefore($outercontrol, $pretag);
 		}
-		if($this->getPostTagTemplate())
+		if ($this->getPostTagTemplate())
 		{
 			$posttag = Prado::createComponent('TCompositeControl');
 			$this->getPostTagTemplate()->instantiateIn($posttag);
@@ -6439,7 +6439,7 @@ 
 }
 class TWebControl extends TControl implements IStyleable
 {
-	private $_ensureid=false;
+	private $_ensureid = false;
 	protected $_decorator;
 	public function setEnsureId($value)
 	{
@@ -6449,9 +6449,9 @@ 
 	{
 		return $this->_ensureid;
 	}
-	public function getDecorator($create=true)
+	public function getDecorator($create = true)
 	{
-		if($create && !$this->_decorator)
+		if ($create && !$this->_decorator)
 			$this->_decorator = Prado::createComponent('TWebControlDecorator', $this);
 		return $this->_decorator;
 	}
@@ -6460,24 +6460,24 @@ 
 		$this->setAccessKey($control->getAccessKey());
 		$this->setToolTip($control->getToolTip());
 		$this->setTabIndex($control->getTabIndex());
-		if(!$control->getEnabled())
+		if (!$control->getEnabled())
 			$this->setEnabled(false);
-		if($control->getHasAttributes())
+		if ($control->getHasAttributes())
 			$this->getAttributes()->copyFrom($control->getAttributes());
 	}
 	public function getAccessKey()
 	{
-		return $this->getViewState('AccessKey','');
+		return $this->getViewState('AccessKey', '');
 	}
 	public function setAccessKey($value)
 	{
-		if(strlen($value)>1)
-			throw new TInvalidDataValueException('webcontrol_accesskey_invalid',get_class($this),$value);
-		$this->setViewState('AccessKey',$value,'');
+		if (strlen($value) > 1)
+			throw new TInvalidDataValueException('webcontrol_accesskey_invalid', get_class($this), $value);
+		$this->setViewState('AccessKey', $value, '');
 	}
 	public function getBackColor()
 	{
-		if($style=$this->getViewState('Style',null))
+		if ($style = $this->getViewState('Style', null))
 			return $style->getBackColor();
 		else
 			return '';
@@ -6488,7 +6488,7 @@ 
 	}
 	public function getBorderColor()
 	{
-		if($style=$this->getViewState('Style',null))
+		if ($style = $this->getViewState('Style', null))
 			return $style->getBorderColor();
 		else
 			return '';
@@ -6499,7 +6499,7 @@ 
 	}
 	public function getBorderStyle()
 	{
-		if($style=$this->getViewState('Style',null))
+		if ($style = $this->getViewState('Style', null))
 			return $style->getBorderStyle();
 		else
 			return '';
@@ -6510,7 +6510,7 @@ 
 	}
 	public function getBorderWidth()
 	{
-		if($style=$this->getViewState('Style',null))
+		if ($style = $this->getViewState('Style', null))
 			return $style->getBorderWidth();
 		else
 			return '';
@@ -6525,7 +6525,7 @@ 
 	}
 	public function getForeColor()
 	{
-		if($style=$this->getViewState('Style',null))
+		if ($style = $this->getViewState('Style', null))
 			return $style->getForeColor();
 		else
 			return '';
@@ -6536,7 +6536,7 @@ 
 	}
 	public function getHeight()
 	{
-		if($style=$this->getViewState('Style',null))
+		if ($style = $this->getViewState('Style', null))
 			return $style->getHeight();
 		else
 			return '';
@@ -6555,7 +6555,7 @@ 
 	}
 	public function getCssClass()
 	{
-		if($style=$this->getViewState('Style',null))
+		if ($style = $this->getViewState('Style', null))
 			return $style->getCssClass();
 		else
 			return '';
@@ -6566,7 +6566,7 @@ 
 	}
 	public function getHasStyle()
 	{
-		return $this->getViewState('Style',null)!==null;
+		return $this->getViewState('Style', null) !== null;
 	}
 	protected function createStyle()
 	{
@@ -6574,21 +6574,21 @@ 
 	}
 	public function getStyle()
 	{
-		if($style=$this->getViewState('Style',null))
+		if ($style = $this->getViewState('Style', null))
 			return $style;
 		else
 		{
-			$style=$this->createStyle();
-			$this->setViewState('Style',$style,null);
+			$style = $this->createStyle();
+			$this->setViewState('Style', $style, null);
 			return $style;
 		}
 	}
 	public function setStyle($value)
 	{
-		if(is_string($value))
+		if (is_string($value))
 			$this->getStyle()->setCustomStyle($value);
 		else
-			throw new TInvalidDataValueException('webcontrol_style_invalid',get_class($this));
+			throw new TInvalidDataValueException('webcontrol_style_invalid', get_class($this));
 	}
 	public function clearStyle()
 	{
@@ -6596,11 +6596,11 @@ 
 	}
 	public function getTabIndex()
 	{
-		return $this->getViewState('TabIndex',0);
+		return $this->getViewState('TabIndex', 0);
 	}
 	public function setTabIndex($value)
 	{
-		$this->setViewState('TabIndex',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('TabIndex', TPropertyValue::ensureInteger($value), 0);
 	}
 	protected function getTagName()
 	{
@@ -6608,15 +6608,15 @@ 
 	}
 	public function getToolTip()
 	{
-		return $this->getViewState('ToolTip','');
+		return $this->getViewState('ToolTip', '');
 	}
 	public function setToolTip($value)
 	{
-		$this->setViewState('ToolTip',$value,'');
+		$this->setViewState('ToolTip', $value, '');
 	}
 	public function getWidth()
 	{
-		if($style=$this->getViewState('Style',null))
+		if ($style = $this->getViewState('Style', null))
 			return $style->getWidth();
 		else
 			return '';
@@ -6626,28 +6626,28 @@ 
 		$this->getStyle()->setWidth($value);
 	}
 	public function onPreRender($param) {
-		if($decorator = $this->getDecorator(false))
+		if ($decorator = $this->getDecorator(false))
 			$decorator->instantiate();
 		parent::onPreRender($param);
 	}
 	protected function addAttributesToRender($writer)
 	{
-		if($this->getID()!=='' || $this->getEnsureId())
-			$writer->addAttribute('id',$this->getClientID());
-		if(($accessKey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accessKey);
-		if(!$this->getEnabled())
-			$writer->addAttribute('disabled','disabled');
-		if(($tabIndex=$this->getTabIndex())>0)
-			$writer->addAttribute('tabindex',"$tabIndex");
-		if(($toolTip=$this->getToolTip())!=='')
-			$writer->addAttribute('title',$toolTip);
-		if($style=$this->getViewState('Style',null))
+		if ($this->getID() !== '' || $this->getEnsureId())
+			$writer->addAttribute('id', $this->getClientID());
+		if (($accessKey = $this->getAccessKey()) !== '')
+			$writer->addAttribute('accesskey', $accessKey);
+		if (!$this->getEnabled())
+			$writer->addAttribute('disabled', 'disabled');
+		if (($tabIndex = $this->getTabIndex()) > 0)
+			$writer->addAttribute('tabindex', "$tabIndex");
+		if (($toolTip = $this->getToolTip()) !== '')
+			$writer->addAttribute('title', $toolTip);
+		if ($style = $this->getViewState('Style', null))
 			$style->addAttributesToRender($writer);
-		if($this->getHasAttributes())
+		if ($this->getHasAttributes())
 		{
-			foreach($this->getAttributes() as $name=>$value)
-				$writer->addAttribute($name,$value);
+			foreach ($this->getAttributes() as $name=>$value)
+				$writer->addAttribute($name, $value);
 		}
 	}
 	public function render($writer)
@@ -6658,7 +6658,7 @@ 
 	}
 	public function renderBeginTag($writer)
 	{
-		if($decorator = $this->getDecorator(false)) {
+		if ($decorator = $this->getDecorator(false)) {
 			$decorator->renderPreTagText($writer);
 			$this->addAttributesToRender($writer);
 			$writer->renderBeginTag($this->getTagName());
@@ -6674,7 +6674,7 @@ 
 	}
 	public function renderEndTag($writer)
 	{
-		if($decorator = $this->getDecorator(false)) {
+		if ($decorator = $this->getDecorator(false)) {
 			$decorator->renderPostContentsText($writer);
 			$writer->renderEndTag();
 			$decorator->renderPostTagText($writer);
@@ -6684,7 +6684,7 @@ 
 }
 class TCompositeControl extends TControl implements INamingContainer
 {
-	protected function initRecursive($namingContainer=null)
+	protected function initRecursive($namingContainer = null)
 	{
 		$this->ensureChildControls();
 		parent::initRecursive($namingContainer);
@@ -6692,20 +6692,20 @@ 
 }
 class TTemplateControl extends TCompositeControl
 {
-	const EXT_TEMPLATE='.tpl';
-	private static $_template=array();
-	private $_localTemplate=null;
-	private $_master=null;
-	private $_masterClass='';
-	private $_contents=array();
-	private $_placeholders=array();
+	const EXT_TEMPLATE = '.tpl';
+	private static $_template = array();
+	private $_localTemplate = null;
+	private $_master = null;
+	private $_masterClass = '';
+	private $_contents = array();
+	private $_placeholders = array();
 	public function getTemplate()
 	{
-		if($this->_localTemplate===null)
+		if ($this->_localTemplate === null)
 		{
-			$class=get_class($this);
-			if(!isset(self::$_template[$class]))
-				self::$_template[$class]=$this->loadTemplate();
+			$class = get_class($this);
+			if (!isset(self::$_template[$class]))
+				self::$_template[$class] = $this->loadTemplate();
 			return self::$_template[$class];
 		}
 		else
@@ -6713,54 +6713,54 @@ 
 	}
 	public function setTemplate($value)
 	{
-		$this->_localTemplate=$value;
+		$this->_localTemplate = $value;
 	}
 	public function getIsSourceTemplateControl()
 	{
-		if(($template=$this->getTemplate())!==null)
+		if (($template = $this->getTemplate()) !== null)
 			return $template->getIsSourceTemplate();
 		else
 			return false;
 	}
 	public function getTemplateDirectory()
 	{
-		if(($template=$this->getTemplate())!==null)
+		if (($template = $this->getTemplate()) !== null)
 			return $template->getContextPath();
 		else
 			return '';
 	}
 	protected function loadTemplate()
 	{
-		$template=$this->getService()->getTemplateManager()->getTemplateByClassName(get_class($this));
+		$template = $this->getService()->getTemplateManager()->getTemplateByClassName(get_class($this));
 		return $template;
 	}
 	public function createChildControls()
 	{
-		if($tpl=$this->getTemplate())
+		if ($tpl = $this->getTemplate())
 		{
-			foreach($tpl->getDirective() as $name=>$value)
+			foreach ($tpl->getDirective() as $name=>$value)
 			{
-				if(is_string($value))
-					$this->setSubProperty($name,$value);
+				if (is_string($value))
+					$this->setSubProperty($name, $value);
 				else
-					throw new TConfigurationException('templatecontrol_directive_invalid',get_class($this),$name);
+					throw new TConfigurationException('templatecontrol_directive_invalid', get_class($this), $name);
 			}
 			$tpl->instantiateIn($this);
 		}
 	}
-	public function registerContent($id,TContent $object)
+	public function registerContent($id, TContent $object)
 	{
-		if(isset($this->_contents[$id]))
-			throw new TConfigurationException('templatecontrol_contentid_duplicated',$id);
+		if (isset($this->_contents[$id]))
+			throw new TConfigurationException('templatecontrol_contentid_duplicated', $id);
 		else
-			$this->_contents[$id]=$object;
+			$this->_contents[$id] = $object;
 	}
-	public function registerContentPlaceHolder($id,TContentPlaceHolder $object)
+	public function registerContentPlaceHolder($id, TContentPlaceHolder $object)
 	{
-		if(isset($this->_placeholders[$id]))
-			throw new TConfigurationException('templatecontrol_placeholderid_duplicated',$id);
+		if (isset($this->_placeholders[$id]))
+			throw new TConfigurationException('templatecontrol_placeholderid_duplicated', $id);
 		else
-			$this->_placeholders[$id]=$object;
+			$this->_placeholders[$id] = $object;
 	}
 	public function getMasterClass()
 	{
@@ -6768,41 +6768,41 @@ 
 	}
 	public function setMasterClass($value)
 	{
-		$this->_masterClass=$value;
+		$this->_masterClass = $value;
 	}
 	public function getMaster()
 	{
 		return $this->_master;
 	}
-	public function injectContent($id,$content)
+	public function injectContent($id, $content)
 	{
-		if(isset($this->_placeholders[$id]))
+		if (isset($this->_placeholders[$id]))
 		{
-			$placeholder=$this->_placeholders[$id];
-			$controls=$placeholder->getParent()->getControls();
-			$loc=$controls->remove($placeholder);
-			$controls->insertAt($loc,$content);
+			$placeholder = $this->_placeholders[$id];
+			$controls = $placeholder->getParent()->getControls();
+			$loc = $controls->remove($placeholder);
+			$controls->insertAt($loc, $content);
 		}
 		else
-			throw new TConfigurationException('templatecontrol_placeholder_inexistent',$id);
+			throw new TConfigurationException('templatecontrol_placeholder_inexistent', $id);
 	}
-	protected function initRecursive($namingContainer=null)
+	protected function initRecursive($namingContainer = null)
 	{
 		$this->ensureChildControls();
-		if($this->_masterClass!=='')
+		if ($this->_masterClass !== '')
 		{
-			$master=Prado::createComponent($this->_masterClass);
-			if(!($master instanceof TTemplateControl))
+			$master = Prado::createComponent($this->_masterClass);
+			if (!($master instanceof TTemplateControl))
 				throw new TInvalidDataValueException('templatecontrol_mastercontrol_invalid');
-			$this->_master=$master;
+			$this->_master = $master;
 			$this->getControls()->clear();
 			$this->getControls()->add($master);
 			$master->ensureChildControls();
-			foreach($this->_contents as $id=>$content)
-				$master->injectContent($id,$content);
+			foreach ($this->_contents as $id=>$content)
+				$master->injectContent($id, $content);
 		}
-		else if(!empty($this->_contents))
-			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
+		else if (!empty($this->_contents))
+			throw new TConfigurationException('templatecontrol_mastercontrol_required', get_class($this));
 		parent::initRecursive($namingContainer);
 	}
         public function tryToUpdateView($arObj, $throwExceptions = false)
@@ -6886,30 +6886,30 @@ 
 	}
 	protected function addAttributesToRender($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
-		$writer->addAttribute('method',$this->getMethod());
-		$uri=$this->getRequest()->getRequestURI();
-		$writer->addAttribute('action',str_replace('&','&amp;',str_replace('&amp;','&',$uri)));
-		if(($enctype=$this->getEnctype())!=='')
-			$writer->addAttribute('enctype',$enctype);
-		$attributes=$this->getAttributes();
+		$writer->addAttribute('id', $this->getClientID());
+		$writer->addAttribute('method', $this->getMethod());
+		$uri = $this->getRequest()->getRequestURI();
+		$writer->addAttribute('action', str_replace('&', '&amp;', str_replace('&amp;', '&', $uri)));
+		if (($enctype = $this->getEnctype()) !== '')
+			$writer->addAttribute('enctype', $enctype);
+		$attributes = $this->getAttributes();
 		$attributes->remove('action');
 		$writer->addAttributes($attributes);
-		if(($butt=$this->getDefaultButton())!=='')
+		if (($butt = $this->getDefaultButton()) !== '')
 		{
-			if(($button=$this->findControl($butt))!==null)
+			if (($button = $this->findControl($butt)) !== null)
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 			else
-				throw new TInvalidDataValueException('form_defaultbutton_invalid',$butt);
+				throw new TInvalidDataValueException('form_defaultbutton_invalid', $butt);
 		}
 	}
 	public function render($writer)
 	{
-		$page=$this->getPage();
+		$page = $this->getPage();
 		$this->addAttributesToRender($writer);
 		$writer->renderBeginTag('form');
-		$cs=$page->getClientScript();
-		if($page->getClientSupportsJavaScript())
+		$cs = $page->getClientScript();
+		if ($page->getClientSupportsJavaScript())
 		{
 			$cs->renderHiddenFieldsBegin($writer);
 			$cs->renderScriptFilesBegin($writer);
@@ -6933,27 +6933,27 @@ 
 	}
 	public function getDefaultButton()
 	{
-		return $this->getViewState('DefaultButton','');
+		return $this->getViewState('DefaultButton', '');
 	}
 	public function setDefaultButton($value)
 	{
-		$this->setViewState('DefaultButton',$value,'');
+		$this->setViewState('DefaultButton', $value, '');
 	}
 	public function getMethod()
 	{
-		return $this->getViewState('Method','post');
+		return $this->getViewState('Method', 'post');
 	}
 	public function setMethod($value)
 	{
-		$this->setViewState('Method',TPropertyValue::ensureEnum($value,'post','get'),'post');
+		$this->setViewState('Method', TPropertyValue::ensureEnum($value, 'post', 'get'), 'post');
 	}
 	public function getEnctype()
 	{
-		return $this->getViewState('Enctype','');
+		return $this->getViewState('Enctype', '');
 	}
 	public function setEnctype($value)
 	{
-		$this->setViewState('Enctype',$value,'');
+		$this->setViewState('Enctype', $value, '');
 	}
 	public function getName()
 	{
@@ -6962,26 +6962,26 @@ 
 }
 class TClientScriptManager extends TApplicationComponent
 {
-	const SCRIPT_PATH='Web/Javascripts/source';
-	const PACKAGES_FILE='Web/Javascripts/packages.php';
+	const SCRIPT_PATH = 'Web/Javascripts/source';
+	const PACKAGES_FILE = 'Web/Javascripts/packages.php';
 	private $_page;
-	private $_hiddenFields=array();
-	private $_beginScripts=array();
-	private $_endScripts=array();
-	private $_scriptFiles=array();
-	private $_headScriptFiles=array();
-	private $_headScripts=array();
-	private $_styleSheetFiles=array();
-	private $_styleSheets=array();
-	private $_registeredPradoScripts=array();
+	private $_hiddenFields = array();
+	private $_beginScripts = array();
+	private $_endScripts = array();
+	private $_scriptFiles = array();
+	private $_headScriptFiles = array();
+	private $_headScripts = array();
+	private $_styleSheetFiles = array();
+	private $_styleSheets = array();
+	private $_registeredPradoScripts = array();
 	private static $_pradoScripts;
 	private static $_pradoPackages;
 	private $_renderedHiddenFields;
-	private $_renderedScriptFiles=array();
+	private $_renderedScriptFiles = array();
 	private $_expandedPradoScripts;
 	public function __construct(TPage $owner)
 	{
-		$this->_page=$owner;
+		$this->_page = $owner;
 	}
 	public function getRequiresHead()
 	{
@@ -6999,30 +6999,30 @@ 
 	public function registerPradoScript($name)
 	{
 		$this->registerPradoScriptInternal($name);
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPradoScript',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPradoScript', $params);
 	}
 	protected function registerPradoScriptInternal($name)
 	{
-				if(!isset($this->_registeredPradoScripts[$name]))
+				if (!isset($this->_registeredPradoScripts[$name]))
 		{
-			if(self::$_pradoScripts === null)
+			if (self::$_pradoScripts === null)
 			{
-				$packageFile = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::PACKAGES_FILE;
-				list($packages,$deps)= include($packageFile);
+				$packageFile = Prado::getFrameworkPath() . DIRECTORY_SEPARATOR . self::PACKAGES_FILE;
+				list($packages, $deps) = include($packageFile);
 				self::$_pradoScripts = $deps;
 				self::$_pradoPackages = $packages;
 			}
 			if (isset(self::$_pradoScripts[$name]))
-				$this->_registeredPradoScripts[$name]=true;
+				$this->_registeredPradoScripts[$name] = true;
 			else
-				throw new TInvalidOperationException('csmanager_pradoscript_invalid',$name);
-			if(($packages=array_keys($this->_registeredPradoScripts))!==array())
+				throw new TInvalidOperationException('csmanager_pradoscript_invalid', $name);
+			if (($packages = array_keys($this->_registeredPradoScripts)) !== array())
 			{
-				$base = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
-				list($path,$baseUrl)=$this->getPackagePathUrl($base);
-				$packagesUrl=array();
-				$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
+				$base = Prado::getFrameworkPath() . DIRECTORY_SEPARATOR . self::SCRIPT_PATH;
+				list($path, $baseUrl) = $this->getPackagePathUrl($base);
+				$packagesUrl = array();
+				$isDebug = $this->getApplication()->getMode() === TApplicationMode::Debug;
 				foreach ($packages as $p)
 				{
 					foreach (self::$_pradoScripts[$p] as $dep)
@@ -7031,35 +7031,35 @@ 
 						if (!isset($this->_expandedPradoScripts[$script]))
 						{
 							$this->_expandedPradoScripts[$script] = true;
-							if($isDebug)
+							if ($isDebug)
 							{
-								if (!in_array($url=$baseUrl.'/'.$script,$packagesUrl))
-									$packagesUrl[]=$url;
+								if (!in_array($url = $baseUrl . '/' . $script, $packagesUrl))
+									$packagesUrl[] = $url;
 							} else {
-								if (!in_array($url=$baseUrl.'/min/'.$script,$packagesUrl))
+								if (!in_array($url = $baseUrl . '/min/' . $script, $packagesUrl))
 								{
-									if(!is_file($filePath=$path.'/min/'.$script))
+									if (!is_file($filePath = $path . '/min/' . $script))
 									{
-										$dirPath=dirname($filePath);
-										if(!is_dir($dirPath))
+										$dirPath = dirname($filePath);
+										if (!is_dir($dirPath))
 											mkdir($dirPath, PRADO_CHMOD, true);
-										file_put_contents($filePath, TJavaScript::JSMin(file_get_contents($base.'/'.$script)));
+										file_put_contents($filePath, TJavaScript::JSMin(file_get_contents($base . '/' . $script)));
 										chmod($filePath, PRADO_CHMOD);
 									}
-									$packagesUrl[]=$url;
+									$packagesUrl[] = $url;
 								}
 							}
 						}
 					}
 				}
-				foreach($packagesUrl as $url)
-					$this->registerScriptFile($url,$url);
+				foreach ($packagesUrl as $url)
+					$this->registerScriptFile($url, $url);
 			}
 		}
 	}
 	public function getPradoScriptAssetUrl()
 	{
-		$base = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
+		$base = Prado::getFrameworkPath() . DIRECTORY_SEPARATOR . self::SCRIPT_PATH;
 		$assets = Prado::getApplication()->getAssetManager();
 		return $assets->getPublishedUrl($base);
 	}
@@ -7073,19 +7073,19 @@ 
 	protected function getPackagePathUrl($base)
 	{
 		$assets = Prado::getApplication()->getAssetManager();
-		if(strpos($base, $assets->getBaseUrl())===false)
+		if (strpos($base, $assets->getBaseUrl()) === false)
 		{
-			if(($dir = Prado::getPathOfNameSpace($base)) !== null) {
+			if (($dir = Prado::getPathOfNameSpace($base)) !== null) {
 				$base = $dir;
 			}
 			return array($assets->getPublishedPath($base), $assets->publishFilePath($base));
 		}
 		else
 		{
-			return array($assets->getBasePath().str_replace($assets->getBaseUrl(),'',$base), $base);
+			return array($assets->getBasePath() . str_replace($assets->getBaseUrl(), '', $base), $base);
 		}
 	}
-	public function getCallbackReference(ICallbackEventHandler $callbackHandler, $options=null)
+	public function getCallbackReference(ICallbackEventHandler $callbackHandler, $options = null)
 	{
 		$options = !is_array($options) ? array() : $options;
 		$class = new ReflectionClass($callbackHandler);
@@ -7098,43 +7098,43 @@ 
 	}
 	public function registerCallbackControl($class, $options)
 	{
-		$optionString=TJavaScript::encode($options);
-		$code="new {$class}({$optionString});";
-		$this->_endScripts[sprintf('%08X', crc32($code))]=$code;
+		$optionString = TJavaScript::encode($options);
+		$code = "new {$class}({$optionString});";
+		$this->_endScripts[sprintf('%08X', crc32($code))] = $code;
 		$this->registerPradoScriptInternal('ajax');
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerCallbackControl',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerCallbackControl', $params);
 	}
-	public function registerPostBackControl($class,$options)
+	public function registerPostBackControl($class, $options)
 	{
-		if($class === null) {
+		if ($class === null) {
 			return;
 		}
-		if(!isset($options['FormID']) && ($form=$this->_page->getForm())!==null)
-			$options['FormID']=$form->getClientID();
-		$optionString=TJavaScript::encode($options);
-		$code="new {$class}({$optionString});";
-		$this->_endScripts[sprintf('%08X', crc32($code))]=$code;
+		if (!isset($options['FormID']) && ($form = $this->_page->getForm()) !== null)
+			$options['FormID'] = $form->getClientID();
+		$optionString = TJavaScript::encode($options);
+		$code = "new {$class}({$optionString});";
+		$this->_endScripts[sprintf('%08X', crc32($code))] = $code;
 		$this->registerPradoScriptInternal('prado');
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPostBackControl',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPostBackControl', $params);
 	}
 	public function registerDefaultButton($panel, $button)
 	{
-		$panelID=is_string($panel)?$panel:$panel->getUniqueID();
-		if(is_string($button))
-			$buttonID=$button;
+		$panelID = is_string($panel) ? $panel : $panel->getUniqueID();
+		if (is_string($button))
+			$buttonID = $button;
 		else
 		{
 			$button->setIsDefaultButton(true);
-			$buttonID=$button->getUniqueID();
+			$buttonID = $button->getUniqueID();
 		}
 		$options = TJavaScript::encode($this->getDefaultButtonOptions($panelID, $buttonID));
 		$code = "new Prado.WebUI.DefaultButton($options);";
-		$this->_endScripts['prado:'.$panelID]=$code;
+		$this->_endScripts['prado:' . $panelID] = $code;
 		$this->registerPradoScriptInternal('prado');
-		$params=array($panelID,$buttonID);
-		$this->_page->registerCachingAction('Page.ClientScript','registerDefaultButton',$params);
+		$params = array($panelID, $buttonID);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerDefaultButton', $params);
 	}
 	protected function getDefaultButtonOptions($panelID, $buttonID)
 	{
@@ -7148,26 +7148,26 @@ 
 	public function registerFocusControl($target)
 	{
 		$this->registerPradoScriptInternal('jquery');
-		if($target instanceof TControl)
-			$target=$target->getClientID();
-		$this->_endScripts['prado:focus'] = 'jQuery(\'#'.$target.'\').focus();';
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerFocusControl',$params);
+		if ($target instanceof TControl)
+			$target = $target->getClientID();
+		$this->_endScripts['prado:focus'] = 'jQuery(\'#' . $target . '\').focus();';
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerFocusControl', $params);
 	}
-	public function registerStyleSheetFile($key,$url,$media='')
+	public function registerStyleSheetFile($key, $url, $media = '')
 	{
-		if($media==='')
-			$this->_styleSheetFiles[$key]=$url;
+		if ($media === '')
+			$this->_styleSheetFiles[$key] = $url;
 		else
-			$this->_styleSheetFiles[$key]=array($url,$media);
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerStyleSheetFile',$params);
+			$this->_styleSheetFiles[$key] = array($url, $media);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheetFile', $params);
 	}
-	public function registerStyleSheet($key,$css,$media='')
+	public function registerStyleSheet($key, $css, $media = '')
 	{
-		$this->_styleSheets[$key]=$css;
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerStyleSheet',$params);
+		$this->_styleSheets[$key] = $css;
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheet', $params);
 	}
 	public function getStyleSheetUrls()
 	{
@@ -7176,8 +7176,8 @@ 
 				create_function('$e', 'return is_array($e) ? $e[0] : $e;'),
 				$this->_styleSheetFiles)
 		);
-		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path=>$url)
-			if (substr($url,strlen($url)-4)=='.css')
+		foreach (Prado::getApplication()->getAssetManager()->getPublished() as $path=>$url)
+			if (substr($url, strlen($url) - 4) == '.css')
 				$stylesheets[] = $url;
 		$stylesheets = array_unique($stylesheets);
 		return $stylesheets;
@@ -7186,44 +7186,44 @@ 
 	{
 		return array_unique(array_values($this->_styleSheets));
 	}
-	public function registerHeadScriptFile($key,$url)
+	public function registerHeadScriptFile($key, $url)
 	{
 		$this->checkIfNotInRender();
-		$this->_headScriptFiles[$key]=$url;
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHeadScriptFile',$params);
+		$this->_headScriptFiles[$key] = $url;
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHeadScriptFile', $params);
 	}
-	public function registerHeadScript($key,$script)
+	public function registerHeadScript($key, $script)
 	{
 		$this->checkIfNotInRender();
-		$this->_headScripts[$key]=$script;
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHeadScript',$params);
+		$this->_headScripts[$key] = $script;
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHeadScript', $params);
 	}
 	public function registerScriptFile($key, $url)
 	{
-		$this->_scriptFiles[$key]=$url;
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerScriptFile',$params);
+		$this->_scriptFiles[$key] = $url;
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerScriptFile', $params);
 	}
-	public function registerBeginScript($key,$script)
+	public function registerBeginScript($key, $script)
 	{
 		$this->checkIfNotInRender();
-		$this->_beginScripts[$key]=$script;
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerBeginScript',$params);
+		$this->_beginScripts[$key] = $script;
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerBeginScript', $params);
 	}
-	public function registerEndScript($key,$script)
+	public function registerEndScript($key, $script)
 	{
-		$this->_endScripts[$key]=$script;
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerEndScript',$params);
+		$this->_endScripts[$key] = $script;
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerEndScript', $params);
 	}
-	public function registerHiddenField($name,$value)
+	public function registerHiddenField($name, $value)
 	{
-		$this->_hiddenFields[$name]=$value;
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHiddenField',$params);
+		$this->_hiddenFields[$name] = $value;
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHiddenField', $params);
 	}
 	public function isStyleSheetFileRegistered($key)
 	{
@@ -7267,24 +7267,24 @@ 
 	}
 	public function renderStyleSheetFiles($writer)
 	{
-		$str='';
-		foreach($this->_styleSheetFiles as $url)
+		$str = '';
+		foreach ($this->_styleSheetFiles as $url)
 		{
-			if(is_array($url))
-				$str.="<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"".THttpUtility::htmlEncode($url[0])."\" />\n";
+			if (is_array($url))
+				$str .= "<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"" . THttpUtility::htmlEncode($url[0]) . "\" />\n";
 			else
-				$str.="<link rel=\"stylesheet\" type=\"text/css\" href=\"".THttpUtility::htmlEncode($url)."\" />\n";
+				$str .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" . THttpUtility::htmlEncode($url) . "\" />\n";
 		}
 		$writer->write($str);
 	}
 	public function renderStyleSheets($writer)
 	{
-		if(count($this->_styleSheets))
-			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n".implode("\n",$this->_styleSheets)."\n/*]]>*/\n</style>\n");
+		if (count($this->_styleSheets))
+			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n" . implode("\n", $this->_styleSheets) . "\n/*]]>*/\n</style>\n");
 	}
 	public function renderHeadScriptFiles($writer)
 	{
-		$this->renderScriptFiles($writer,$this->_headScriptFiles);
+		$this->renderScriptFiles($writer, $this->_headScriptFiles);
 	}
 	public function renderHeadScripts($writer)
 	{
@@ -7301,12 +7301,12 @@ 
 	public function markScriptFileAsRendered($url)
 	{
 		$this->_renderedScriptFiles[$url] = $url;
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','markScriptFileAsRendered',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'markScriptFileAsRendered', $params);
 	}
 	protected function renderScriptFiles($writer, Array $scripts)
 	{
-		foreach($scripts as $script)
+		foreach ($scripts as $script)
 		{
 			$writer->write(TJavaScript::renderScriptFile($script));
 			$this->markScriptFileAsRendered($script);
@@ -7318,10 +7318,10 @@ 
 	}
 	public function renderAllPendingScriptFiles($writer)
 	{
-		if(!empty($this->_scriptFiles))
+		if (!empty($this->_scriptFiles))
 		{
-			$addedScripts = array_diff($this->_scriptFiles,$this->getRenderedScriptFiles());
-			$this->renderScriptFiles($writer,$addedScripts);
+			$addedScripts = array_diff($this->_scriptFiles, $this->getRenderedScriptFiles());
+			$this->renderScriptFiles($writer, $addedScripts);
 		}
 	}
 	public function renderBeginScripts($writer)
@@ -7342,15 +7342,15 @@ 
 	}
 	public function renderHiddenFieldsBegin($writer)
 	{
-		$this->renderHiddenFieldsInt($writer,true);
+		$this->renderHiddenFieldsInt($writer, true);
 	}
 	public function renderHiddenFieldsEnd($writer)
 	{
-		$this->renderHiddenFieldsInt($writer,false);
+		$this->renderHiddenFieldsInt($writer, false);
 	}
-	public function flushScriptFiles($writer, $control=null)
+	public function flushScriptFiles($writer, $control = null)
 	{
-		if(!$this->_page->getIsCallback())
+		if (!$this->_page->getIsCallback())
 		{
 			$this->_page->ensureRenderInForm($control);
 			$this->renderAllPendingScriptFiles($writer);
@@ -7359,24 +7359,24 @@ 
 	protected function renderHiddenFieldsInt($writer, $initial)
  	{
 		if ($initial) $this->_renderedHiddenFields = array();
-		$str='';
-		foreach($this->_hiddenFields as $name=>$value)
+		$str = '';
+		foreach ($this->_hiddenFields as $name=>$value)
 		{
-			if (in_array($name,$this->_renderedHiddenFields)) continue;
-			$id=strtr($name,':','_');
-			if(is_array($value))
+			if (in_array($name, $this->_renderedHiddenFields)) continue;
+			$id = strtr($name, ':', '_');
+			if (is_array($value))
 			{
-				foreach($value as $v)
-					$str.='<input type="hidden" name="'.$name.'[]" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
+				foreach ($value as $v)
+					$str .= '<input type="hidden" name="' . $name . '[]" id="' . $id . '" value="' . THttpUtility::htmlEncode($value) . "\" />\n";
 			}
 			else
 			{
-				$str.='<input type="hidden" name="'.$name.'" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
+				$str .= '<input type="hidden" name="' . $name . '" id="' . $id . '" value="' . THttpUtility::htmlEncode($value) . "\" />\n";
 			}
 			$this->_renderedHiddenFields[] = $name;
 		}
-		if($str!=='')
-			$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
+		if ($str !== '')
+			$writer->write("<div style=\"visibility:hidden;\">\n" . $str . "</div>\n");
 	}
 	public function getHiddenFields()
 	{
@@ -7393,7 +7393,7 @@ 
 	private $_options;
 	protected function setFunction($name, $code)
 	{
-		if(!TJavaScript::isJsLiteral($code))
+		if (!TJavaScript::isJsLiteral($code))
 			$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
 		$this->setOption($name, $code);
 	}
@@ -7421,13 +7421,13 @@ 
 }
 class TPage extends TTemplateControl
 {
-	const FIELD_POSTBACK_TARGET='PRADO_POSTBACK_TARGET';
-	const FIELD_POSTBACK_PARAMETER='PRADO_POSTBACK_PARAMETER';
-	const FIELD_LASTFOCUS='PRADO_LASTFOCUS';
-	const FIELD_PAGESTATE='PRADO_PAGESTATE';
-	const FIELD_CALLBACK_TARGET='PRADO_CALLBACK_TARGET';
-	const FIELD_CALLBACK_PARAMETER='PRADO_CALLBACK_PARAMETER';
-	private static $_systemPostFields=array(
+	const FIELD_POSTBACK_TARGET = 'PRADO_POSTBACK_TARGET';
+	const FIELD_POSTBACK_PARAMETER = 'PRADO_POSTBACK_PARAMETER';
+	const FIELD_LASTFOCUS = 'PRADO_LASTFOCUS';
+	const FIELD_PAGESTATE = 'PRADO_PAGESTATE';
+	const FIELD_CALLBACK_TARGET = 'PRADO_CALLBACK_TARGET';
+	const FIELD_CALLBACK_PARAMETER = 'PRADO_CALLBACK_PARAMETER';
+	private static $_systemPostFields = array(
 		'PRADO_POSTBACK_TARGET'=>true,
 		'PRADO_POSTBACK_PARAMETER'=>true,
 		'PRADO_LASTFOCUS'=>true,
@@ -7437,32 +7437,32 @@ 
 	);
 	private $_form;
 	private $_head;
-	private $_validators=array();
-	private $_validated=false;
+	private $_validators = array();
+	private $_validated = false;
 	private $_theme;
 	private $_title;
 	private $_styleSheet;
 	private $_clientScript;
 	protected $_postData;
 	protected $_restPostData;
-	protected $_controlsPostDataChanged=array();
-	protected $_controlsRequiringPostData=array();
-	protected $_controlsRegisteredForPostData=array();
+	protected $_controlsPostDataChanged = array();
+	protected $_controlsRequiringPostData = array();
+	protected $_controlsRegisteredForPostData = array();
 	private $_postBackEventTarget;
 	private $_postBackEventParameter;
-	protected $_formRendered=false;
-	protected $_inFormRender=false;
+	protected $_formRendered = false;
+	protected $_inFormRender = false;
 	private $_focus;
-	private $_pagePath='';
-	private $_enableStateValidation=true;
-	private $_enableStateEncryption=false;
-	private $_enableStateCompression=true;
-	private $_statePersisterClass='System.Web.UI.TPageStatePersister';
+	private $_pagePath = '';
+	private $_enableStateValidation = true;
+	private $_enableStateEncryption = false;
+	private $_enableStateCompression = true;
+	private $_statePersisterClass = 'System.Web.UI.TPageStatePersister';
 	private $_statePersister;
 	private $_cachingStack;
-	private $_clientState='';
-	protected $_isLoadingPostData=false;
-	private $_enableJavaScript=true;
+	private $_clientState = '';
+	protected $_isLoadingPostData = false;
+	private $_enableJavaScript = true;
 	private $_writer;
 	public function __construct()
 	{
@@ -7472,9 +7472,9 @@ 
 	{
 		$this->_writer = $writer;
 		$this->determinePostBackMode();
-		if($this->getIsPostBack())
+		if ($this->getIsPostBack())
 		{
-			if($this->getIsCallback())
+			if ($this->getIsCallback())
 				$this->processCallbackRequest($writer);
 			else
 				$this->processPostBackRequest($writer);
@@ -7503,12 +7503,12 @@ 
 		$this->onPreInit(null);
 		$this->initRecursive();
 		$this->onInitComplete(null);
-		$this->_restPostData=new TMap;
+		$this->_restPostData = new TMap;
 		$this->loadPageState();
-		$this->processPostData($this->_postData,true);
+		$this->processPostData($this->_postData, true);
 		$this->onPreLoad(null);
 		$this->loadRecursive();
-		$this->processPostData($this->_restPostData,false);
+		$this->processPostData($this->_restPostData, false);
 		$this->raiseChangedEvents();
 		$this->raisePostBackEvent();
 		$this->onLoadComplete(null);
@@ -7521,13 +7521,13 @@ 
 	}
 	protected static function decodeUTF8($data, $enc)
 	{
-		if(is_array($data))
+		if (is_array($data))
 		{
-			foreach($data as $k=>$v)
-				$data[$k]=self::decodeUTF8($v, $enc);
+			foreach ($data as $k=>$v)
+				$data[$k] = self::decodeUTF8($v, $enc);
 			return $data;
-		} elseif(is_string($data)) {
-			return iconv('UTF-8',$enc.'//IGNORE',$data);
+		} elseif (is_string($data)) {
+			return iconv('UTF-8', $enc . '//IGNORE', $data);
 		} else {
 			return $data;
 		}
@@ -7537,21 +7537,21 @@ 
 		Prado::using('System.Web.UI.ActiveControls.TActivePageAdapter');
 		$this->setAdapter(new TActivePageAdapter($this));
         $callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
-        if(strlen($callbackEventParameter) > 0)
-            $this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
-                if (($g=$this->getApplication()->getGlobalization(false))!==null &&
-            strtoupper($enc=$g->getCharset())!='UTF-8')
+        if (strlen($callbackEventParameter) > 0)
+            $this->_postData[TPage::FIELD_CALLBACK_PARAMETER] = TJavaScript::jsonDecode((string) $callbackEventParameter);
+                if (($g = $this->getApplication()->getGlobalization(false)) !== null &&
+            strtoupper($enc = $g->getCharset()) != 'UTF-8')
                 foreach ($this->_postData as $k=>$v)
-                	$this->_postData[$k]=self::decodeUTF8($v, $enc);
+                	$this->_postData[$k] = self::decodeUTF8($v, $enc);
 		$this->onPreInit(null);
 		$this->initRecursive();
 		$this->onInitComplete(null);
-		$this->_restPostData=new TMap;
+		$this->_restPostData = new TMap;
 		$this->loadPageState();
-		$this->processPostData($this->_postData,true);
+		$this->processPostData($this->_postData, true);
 		$this->onPreLoad(null);
 		$this->loadRecursive();
-		$this->processPostData($this->_restPostData,false);
+		$this->processPostData($this->_restPostData, false);
 		$this->raiseChangedEvents();
 		$this->getAdapter()->processCallbackEvent($writer);
 		$this->onLoadComplete(null);
@@ -7564,7 +7564,7 @@ 
 	}
 	public function getCallbackClient()
 	{
-		if($this->getAdapter() !== null)
+		if ($this->getAdapter() !== null)
 			return $this->getAdapter()->getCallbackClientHandler();
 		else
 			return new TCallbackClientScript();
@@ -7595,41 +7595,41 @@ 
 	}
 	public function setForm(TForm $form)
 	{
-		if($this->_form===null)
-			$this->_form=$form;
+		if ($this->_form === null)
+			$this->_form = $form;
 		else
 			throw new TInvalidOperationException('page_form_duplicated');
 	}
-	public function getValidators($validationGroup=null)
+	public function getValidators($validationGroup = null)
 	{
-		if(!$this->_validators)
-			$this->_validators=new TList;
-		if(empty($validationGroup) === true)
+		if (!$this->_validators)
+			$this->_validators = new TList;
+		if (empty($validationGroup) === true)
 			return $this->_validators;
 		else
 		{
-			$list=new TList;
-			foreach($this->_validators as $validator)
-				if($validator->getValidationGroup()===$validationGroup)
+			$list = new TList;
+			foreach ($this->_validators as $validator)
+				if ($validator->getValidationGroup() === $validationGroup)
 					$list->add($validator);
 			return $list;
 		}
 	}
-	public function validate($validationGroup=null)
+	public function validate($validationGroup = null)
 	{
-		$this->_validated=true;
-		if($this->_validators && $this->_validators->getCount())
+		$this->_validated = true;
+		if ($this->_validators && $this->_validators->getCount())
 		{
-			if($validationGroup===null)
+			if ($validationGroup === null)
 			{
-				foreach($this->_validators as $validator)
+				foreach ($this->_validators as $validator)
 					$validator->validate();
 			}
 			else
 			{
-				foreach($this->_validators as $validator)
+				foreach ($this->_validators as $validator)
 				{
-					if($validator->getValidationGroup()===$validationGroup)
+					if ($validator->getValidationGroup() === $validationGroup)
 						$validator->validate();
 				}
 			}
@@ -7637,12 +7637,12 @@ 
 	}
 	public function getIsValid()
 	{
-		if($this->_validated)
+		if ($this->_validated)
 		{
-			if($this->_validators && $this->_validators->getCount())
+			if ($this->_validators && $this->_validators->getCount())
 			{
-				foreach($this->_validators as $validator)
-					if(!$validator->getIsValid())
+				foreach ($this->_validators as $validator)
+					if (!$validator->getIsValid())
 						return false;
 			}
 			return true;
@@ -7652,107 +7652,107 @@ 
 	}
 	public function getTheme()
 	{
-		if(is_string($this->_theme))
-			$this->_theme=$this->getService()->getThemeManager()->getTheme($this->_theme);
+		if (is_string($this->_theme))
+			$this->_theme = $this->getService()->getThemeManager()->getTheme($this->_theme);
 		return $this->_theme;
 	}
 	public function setTheme($value)
 	{
-		$this->_theme=empty($value)?null:$value;
+		$this->_theme = empty($value) ? null : $value;
 	}
 	public function getStyleSheetTheme()
 	{
-		if(is_string($this->_styleSheet))
-			$this->_styleSheet=$this->getService()->getThemeManager()->getTheme($this->_styleSheet);
+		if (is_string($this->_styleSheet))
+			$this->_styleSheet = $this->getService()->getThemeManager()->getTheme($this->_styleSheet);
 		return $this->_styleSheet;
 	}
 	public function setStyleSheetTheme($value)
 	{
-		$this->_styleSheet=empty($value)?null:$value;
+		$this->_styleSheet = empty($value) ? null : $value;
 	}
 	public function applyControlSkin($control)
 	{
-		if(($theme=$this->getTheme())!==null)
+		if (($theme = $this->getTheme()) !== null)
 			$theme->applySkin($control);
 	}
 	public function applyControlStyleSheet($control)
 	{
-		if(($theme=$this->getStyleSheetTheme())!==null)
+		if (($theme = $this->getStyleSheetTheme()) !== null)
 			$theme->applySkin($control);
 	}
 	public function getClientScript()
 	{
-		if(!$this->_clientScript) {
+		if (!$this->_clientScript) {
 			$className = $classPath = $this->getService()->getClientScriptManagerClass();
 			Prado::using($className);
-			if(($pos=strrpos($className,'.'))!==false)
-				$className=substr($className,$pos+1);
- 			if(!class_exists($className,false) || ($className!=='TClientScriptManager' && !is_subclass_of($className,'TClientScriptManager')))
-				throw new THttpException(404,'page_csmanagerclass_invalid',$classPath);
-			$this->_clientScript=new $className($this);
+			if (($pos = strrpos($className, '.')) !== false)
+				$className = substr($className, $pos + 1);
+ 			if (!class_exists($className, false) || ($className !== 'TClientScriptManager' && !is_subclass_of($className, 'TClientScriptManager')))
+				throw new THttpException(404, 'page_csmanagerclass_invalid', $classPath);
+			$this->_clientScript = new $className($this);
 		}
 		return $this->_clientScript;
 	}
 	public function onPreInit($param)
 	{
-		$this->raiseEvent('OnPreInit',$this,$param);
+		$this->raiseEvent('OnPreInit', $this, $param);
 	}
 	public function onInitComplete($param)
 	{
-		$this->raiseEvent('OnInitComplete',$this,$param);
+		$this->raiseEvent('OnInitComplete', $this, $param);
 	}
 	public function onPreLoad($param)
 	{
-		$this->raiseEvent('OnPreLoad',$this,$param);
+		$this->raiseEvent('OnPreLoad', $this, $param);
 	}
 	public function onLoadComplete($param)
 	{
-		$this->raiseEvent('OnLoadComplete',$this,$param);
+		$this->raiseEvent('OnLoadComplete', $this, $param);
 	}
 	public function onPreRenderComplete($param)
 	{
-		$this->raiseEvent('OnPreRenderComplete',$this,$param);
-		$cs=$this->getClientScript();
-		$theme=$this->getTheme();
-		if($theme instanceof ITheme)
+		$this->raiseEvent('OnPreRenderComplete', $this, $param);
+		$cs = $this->getClientScript();
+		$theme = $this->getTheme();
+		if ($theme instanceof ITheme)
 		{
-			foreach($theme->getStyleSheetFiles() as $url)
-				$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
-			foreach($theme->getJavaScriptFiles() as $url)
-				$cs->registerHeadScriptFile($url,$url);
+			foreach ($theme->getStyleSheetFiles() as $url)
+				$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
+			foreach ($theme->getJavaScriptFiles() as $url)
+				$cs->registerHeadScriptFile($url, $url);
 		}
-		$styleSheet=$this->getStyleSheetTheme();
-		if($styleSheet instanceof ITheme)
+		$styleSheet = $this->getStyleSheetTheme();
+		if ($styleSheet instanceof ITheme)
 		{
-			foreach($styleSheet->getStyleSheetFiles() as $url)
-				$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
-			foreach($styleSheet->getJavaScriptFiles() as $url)
-				$cs->registerHeadScriptFile($url,$url);
+			foreach ($styleSheet->getStyleSheetFiles() as $url)
+				$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
+			foreach ($styleSheet->getJavaScriptFiles() as $url)
+				$cs->registerHeadScriptFile($url, $url);
 		}
-		if($cs->getRequiresHead() && $this->getHead()===null)
+		if ($cs->getRequiresHead() && $this->getHead() === null)
 			throw new TConfigurationException('page_head_required');
 	}
 	private function getCssMediaType($url)
 	{
-		$segs=explode('.',basename($url));
-		if(isset($segs[2]))
-			return $segs[count($segs)-2];
+		$segs = explode('.', basename($url));
+		if (isset($segs[2]))
+			return $segs[count($segs) - 2];
 		else
 			return '';
 	}
 	public function onSaveStateComplete($param)
 	{
-		$this->raiseEvent('OnSaveStateComplete',$this,$param);
+		$this->raiseEvent('OnSaveStateComplete', $this, $param);
 	}
 	private function determinePostBackMode()
 	{
-		$postData=$this->getRequest();
-		if($postData->contains(self::FIELD_PAGESTATE) || $postData->contains(self::FIELD_POSTBACK_TARGET))
-			$this->_postData=$postData;
+		$postData = $this->getRequest();
+		if ($postData->contains(self::FIELD_PAGESTATE) || $postData->contains(self::FIELD_POSTBACK_TARGET))
+			$this->_postData = $postData;
 	}
 	public function getIsPostBack()
 	{
-		return $this->_postData!==null;
+		return $this->_postData !== null;
 	}
 	public function getIsCallback()
 	{
@@ -7761,21 +7761,21 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		$this->setViewState('ControlsRequiringPostBack',$this->_controlsRegisteredForPostData,array());
+		$this->setViewState('ControlsRequiringPostBack', $this->_controlsRegisteredForPostData, array());
 	}
 	public function loadState()
 	{
 		parent::loadState();
-		$this->_controlsRequiringPostData=$this->getViewState('ControlsRequiringPostBack',array());
+		$this->_controlsRequiringPostData = $this->getViewState('ControlsRequiringPostBack', array());
 	}
 	protected function loadPageState()
 	{
-		$state=$this->getStatePersister()->load();
-		$this->loadStateRecursive($state,$this->getEnableViewState());
+		$state = $this->getStatePersister()->load();
+		$this->loadStateRecursive($state, $this->getEnableViewState());
 	}
 	protected function savePageState()
 	{
-		$state=&$this->saveStateRecursive($this->getEnableViewState());
+		$state = &$this->saveStateRecursive($this->getEnableViewState());
 		$this->getStatePersister()->save($state);
 	}
 	protected function isSystemPostField($field)
@@ -7784,79 +7784,79 @@ 
 	}
 	public function registerRequiresPostData($control)
 	{
-		$id=is_string($control)?$control:$control->getUniqueID();
-		$this->_controlsRegisteredForPostData[$id]=true;
-		$params=func_get_args();
-		foreach($this->getCachingStack() as $item)
-			$item->registerAction('Page','registerRequiresPostData',array($id));
+		$id = is_string($control) ? $control : $control->getUniqueID();
+		$this->_controlsRegisteredForPostData[$id] = true;
+		$params = func_get_args();
+		foreach ($this->getCachingStack() as $item)
+			$item->registerAction('Page', 'registerRequiresPostData', array($id));
 	}
 	public function getPostBackEventTarget()
 	{
-		if($this->_postBackEventTarget===null && $this->_postData!==null)
+		if ($this->_postBackEventTarget === null && $this->_postData !== null)
 		{
-			$eventTarget=$this->_postData->itemAt(self::FIELD_POSTBACK_TARGET);
-			if(!empty($eventTarget))
-				$this->_postBackEventTarget=$this->findControl($eventTarget);
+			$eventTarget = $this->_postData->itemAt(self::FIELD_POSTBACK_TARGET);
+			if (!empty($eventTarget))
+				$this->_postBackEventTarget = $this->findControl($eventTarget);
 		}
 		return $this->_postBackEventTarget;
 	}
 	public function setPostBackEventTarget(TControl $control)
 	{
-		$this->_postBackEventTarget=$control;
+		$this->_postBackEventTarget = $control;
 	}
 	public function getPostBackEventParameter()
 	{
-		if($this->_postBackEventParameter===null && $this->_postData!==null)
+		if ($this->_postBackEventParameter === null && $this->_postData !== null)
 		{
-			if(($this->_postBackEventParameter=$this->_postData->itemAt(self::FIELD_POSTBACK_PARAMETER))===null)
-				$this->_postBackEventParameter='';
+			if (($this->_postBackEventParameter = $this->_postData->itemAt(self::FIELD_POSTBACK_PARAMETER)) === null)
+				$this->_postBackEventParameter = '';
 		}
 		return $this->_postBackEventParameter;
 	}
 	public function setPostBackEventParameter($value)
 	{
-		$this->_postBackEventParameter=$value;
+		$this->_postBackEventParameter = $value;
 	}
-	protected function processPostData($postData,$beforeLoad)
+	protected function processPostData($postData, $beforeLoad)
 	{
-		$this->_isLoadingPostData=true;
-		if($beforeLoad)
-			$this->_restPostData=new TMap;
-		foreach($postData as $key=>$value)
+		$this->_isLoadingPostData = true;
+		if ($beforeLoad)
+			$this->_restPostData = new TMap;
+		foreach ($postData as $key=>$value)
 		{
-			if($this->isSystemPostField($key))
+			if ($this->isSystemPostField($key))
 				continue;
-			else if($control=$this->findControl($key))
+			else if ($control = $this->findControl($key))
 			{
-				if($control instanceof IPostBackDataHandler)
+				if ($control instanceof IPostBackDataHandler)
 				{
-					if($control->loadPostData($key,$postData))
-						$this->_controlsPostDataChanged[]=$control;
+					if ($control->loadPostData($key, $postData))
+						$this->_controlsPostDataChanged[] = $control;
 				}
-				else if($control instanceof IPostBackEventHandler &&
+				else if ($control instanceof IPostBackEventHandler &&
 					empty($this->_postData[self::FIELD_POSTBACK_TARGET]))
 				{
-					$this->_postData->add(self::FIELD_POSTBACK_TARGET,$key);  				}
+					$this->_postData->add(self::FIELD_POSTBACK_TARGET, $key); }
 				unset($this->_controlsRequiringPostData[$key]);
 			}
-			else if($beforeLoad)
-				$this->_restPostData->add($key,$value);
+			else if ($beforeLoad)
+				$this->_restPostData->add($key, $value);
 		}
-		foreach($this->_controlsRequiringPostData as $key=>$value)
+		foreach ($this->_controlsRequiringPostData as $key=>$value)
 		{
-			if($control=$this->findControl($key))
+			if ($control = $this->findControl($key))
 			{
-				if($control instanceof IPostBackDataHandler)
+				if ($control instanceof IPostBackDataHandler)
 				{
-					if($control->loadPostData($key,$this->_postData))
-						$this->_controlsPostDataChanged[]=$control;
+					if ($control->loadPostData($key, $this->_postData))
+						$this->_controlsPostDataChanged[] = $control;
 				}
 				else
-					throw new TInvalidDataValueException('page_postbackcontrol_invalid',$key);
+					throw new TInvalidDataValueException('page_postbackcontrol_invalid', $key);
 				unset($this->_controlsRequiringPostData[$key]);
 			}
 		}
-		$this->_isLoadingPostData=false;
+		$this->_isLoadingPostData = false;
 	}
 	public function getIsLoadingPostData()
 	{
@@ -7864,14 +7864,14 @@ 
 	}
 	protected function raiseChangedEvents()
 	{
-		foreach($this->_controlsPostDataChanged as $control)
+		foreach ($this->_controlsPostDataChanged as $control)
 			$control->raisePostDataChangedEvent();
 	}
 	protected function raisePostBackEvent()
 	{
-		if(($postBackHandler=$this->getPostBackEventTarget())===null)
+		if (($postBackHandler = $this->getPostBackEventTarget()) === null)
 			$this->validate();
-		else if($postBackHandler instanceof IPostBackEventHandler)
+		else if ($postBackHandler instanceof IPostBackEventHandler)
 			$postBackHandler->raisePostBackEvent($this->getPostBackEventParameter());
 	}
 	public function getInFormRender()
@@ -7880,34 +7880,34 @@ 
 	}
 	public function ensureRenderInForm($control)
 	{
-		if(!$this->getIsCallback() && !$this->_inFormRender)
-			throw new TConfigurationException('page_control_outofform',get_class($control), $control ? $control->getUniqueID() : null);
+		if (!$this->getIsCallback() && !$this->_inFormRender)
+			throw new TConfigurationException('page_control_outofform', get_class($control), $control ? $control->getUniqueID() : null);
 	}
 	public function beginFormRender($writer)
 	{
-		if($this->_formRendered)
+		if ($this->_formRendered)
 			throw new TConfigurationException('page_form_duplicated');
-		$this->_formRendered=true;
-		$this->getClientScript()->registerHiddenField(self::FIELD_PAGESTATE,$this->getClientState());
-		$this->_inFormRender=true;
+		$this->_formRendered = true;
+		$this->getClientScript()->registerHiddenField(self::FIELD_PAGESTATE, $this->getClientState());
+		$this->_inFormRender = true;
 	}
 	public function endFormRender($writer)
 	{
-		if($this->_focus)
+		if ($this->_focus)
 		{
-			if(($this->_focus instanceof TControl) && $this->_focus->getVisible(true))
-				$focus=$this->_focus->getClientID();
+			if (($this->_focus instanceof TControl) && $this->_focus->getVisible(true))
+				$focus = $this->_focus->getClientID();
 			else
-				$focus=$this->_focus;
+				$focus = $this->_focus;
 			$this->getClientScript()->registerFocusControl($focus);
 		}
-		else if($this->_postData && ($lastFocus=$this->_postData->itemAt(self::FIELD_LASTFOCUS))!==null)
+		else if ($this->_postData && ($lastFocus = $this->_postData->itemAt(self::FIELD_LASTFOCUS)) !== null)
 			$this->getClientScript()->registerFocusControl($lastFocus);
-		$this->_inFormRender=false;
+		$this->_inFormRender = false;
 	}
 	public function setFocus($value)
 	{
-		$this->_focus=$value;
+		$this->_focus = $value;
 	}
 	public function getClientSupportsJavaScript()
 	{
@@ -7915,7 +7915,7 @@ 
 	}
 	public function setClientSupportsJavaScript($value)
 	{
-		$this->_enableJavaScript=TPropertyValue::ensureBoolean($value);
+		$this->_enableJavaScript = TPropertyValue::ensureBoolean($value);
 	}
 	public function getHead()
 	{
@@ -7923,28 +7923,28 @@ 
 	}
 	public function setHead(THead $value)
 	{
-		if($this->_head)
+		if ($this->_head)
 			throw new TInvalidOperationException('page_head_duplicated');
-		$this->_head=$value;
-		if($this->_title!==null)
+		$this->_head = $value;
+		if ($this->_title !== null)
 		{
 			$this->_head->setTitle($this->_title);
-			$this->_title=null;
+			$this->_title = null;
 		}
 	}
 	public function getTitle()
 	{
-		if($this->_head)
+		if ($this->_head)
 			return $this->_head->getTitle();
 		else
-			return $this->_title===null ? '' : $this->_title;
+			return $this->_title === null ? '' : $this->_title;
 	}
 	public function setTitle($value)
 	{
-		if($this->_head)
+		if ($this->_head)
 			$this->_head->setTitle($value);
 		else
-			$this->_title=$value;
+			$this->_title = $value;
 	}
 	public function getClientState()
 	{
@@ -7952,7 +7952,7 @@ 
 	}
 	public function setClientState($state)
 	{
-		$this->_clientState=$state;
+		$this->_clientState = $state;
 	}
 	public function getRequestClientState()
 	{
@@ -7964,14 +7964,14 @@ 
 	}
 	public function setStatePersisterClass($value)
 	{
-		$this->_statePersisterClass=$value;
+		$this->_statePersisterClass = $value;
 	}
 	public function getStatePersister()
 	{
-		if($this->_statePersister===null)
+		if ($this->_statePersister === null)
 		{
-			$this->_statePersister=Prado::createComponent($this->_statePersisterClass);
-			if(!($this->_statePersister instanceof IPageStatePersister))
+			$this->_statePersister = Prado::createComponent($this->_statePersisterClass);
+			if (!($this->_statePersister instanceof IPageStatePersister))
 				throw new TInvalidDataTypeException('page_statepersister_invalid');
 			$this->_statePersister->setPage($this);
 		}
@@ -7983,7 +7983,7 @@ 
 	}
 	public function setEnableStateValidation($value)
 	{
-		$this->_enableStateValidation=TPropertyValue::ensureBoolean($value);
+		$this->_enableStateValidation = TPropertyValue::ensureBoolean($value);
 	}
 	public function getEnableStateEncryption()
 	{
@@ -7991,7 +7991,7 @@ 
 	}
 	public function setEnableStateEncryption($value)
 	{
-		$this->_enableStateEncryption=TPropertyValue::ensureBoolean($value);
+		$this->_enableStateEncryption = TPropertyValue::ensureBoolean($value);
 	}
 	public function getEnableStateCompression()
 	{
@@ -7999,7 +7999,7 @@ 
 	}
 	public function setEnableStateCompression($value)
 	{
-		$this->_enableStateCompression=TPropertyValue::ensureBoolean($value);
+		$this->_enableStateCompression = TPropertyValue::ensureBoolean($value);
 	}
 	public function getPagePath()
 	{
@@ -8007,20 +8007,20 @@ 
 	}
 	public function setPagePath($value)
 	{
-		$this->_pagePath=$value;
+		$this->_pagePath = $value;
 	}
-	public function registerCachingAction($context,$funcName,$funcParams)
+	public function registerCachingAction($context, $funcName, $funcParams)
 	{
-		if($this->_cachingStack)
+		if ($this->_cachingStack)
 		{
-			foreach($this->_cachingStack as $cache)
-				$cache->registerAction($context,$funcName,$funcParams);
+			foreach ($this->_cachingStack as $cache)
+				$cache->registerAction($context, $funcName, $funcParams);
 		}
 	}
 	public function getCachingStack()
 	{
-		if(!$this->_cachingStack)
-			$this->_cachingStack=new TStack;
+		if (!$this->_cachingStack)
+			$this->_cachingStack = new TStack;
 		return $this->_cachingStack;
 	}
 	public function flushWriter()
@@ -8038,34 +8038,34 @@ 
 }
 class TPageStateFormatter
 {
-	public static function serialize($page,$data)
+	public static function serialize($page, $data)
 	{
-		$sm=$page->getApplication()->getSecurityManager();
-		if($page->getEnableStateValidation())
-			$str=$sm->hashData(serialize($data));
+		$sm = $page->getApplication()->getSecurityManager();
+		if ($page->getEnableStateValidation())
+			$str = $sm->hashData(serialize($data));
 		else
-			$str=serialize($data);
-		if($page->getEnableStateCompression() && extension_loaded('zlib'))
-			$str=gzcompress($str);
-		if($page->getEnableStateEncryption())
-			$str=$sm->encrypt($str);
+			$str = serialize($data);
+		if ($page->getEnableStateCompression() && extension_loaded('zlib'))
+			$str = gzcompress($str);
+		if ($page->getEnableStateEncryption())
+			$str = $sm->encrypt($str);
 		return base64_encode($str);
 	}
-	public static function unserialize($page,$data)
+	public static function unserialize($page, $data)
 	{
-		$str=base64_decode($data);
-		if($str==='')
+		$str = base64_decode($data);
+		if ($str === '')
 			return null;
-		if($str!==false)
+		if ($str !== false)
 		{
-			$sm=$page->getApplication()->getSecurityManager();
-			if($page->getEnableStateEncryption())
-				$str=$sm->decrypt($str);
-			if($page->getEnableStateCompression() && extension_loaded('zlib'))
-				$str=@gzuncompress($str);
-			if($page->getEnableStateValidation())
+			$sm = $page->getApplication()->getSecurityManager();
+			if ($page->getEnableStateEncryption())
+				$str = $sm->decrypt($str);
+			if ($page->getEnableStateCompression() && extension_loaded('zlib'))
+				$str = @gzuncompress($str);
+			if ($page->getEnableStateValidation())
 			{
-				if(($str=$sm->validateData($str))!==false)
+				if (($str = $sm->validateData($str)) !== false)
 					return unserialize($str);
 			}
 			else
@@ -8076,22 +8076,22 @@ 
 }
 class TOutputCache extends TControl implements INamingContainer
 {
-	const CACHE_ID_PREFIX='prado:outputcache';
-	private $_cacheModuleID='';
-	private $_dataCached=false;
-	private $_cacheAvailable=false;
-	private $_cacheChecked=false;
-	private $_cacheKey=null;
-	private $_duration=60;
-	private $_cache=null;
+	const CACHE_ID_PREFIX = 'prado:outputcache';
+	private $_cacheModuleID = '';
+	private $_dataCached = false;
+	private $_cacheAvailable = false;
+	private $_cacheChecked = false;
+	private $_cacheKey = null;
+	private $_duration = 60;
+	private $_cache = null;
 	private $_contents;
 	private $_state;
-	private $_actions=array();
-	private $_varyByParam='';
-	private $_keyPrefix='';
-	private $_varyBySession=false;
-	private $_cachePostBack=false;
-	private $_cacheTime=0;
+	private $_actions = array();
+	private $_varyByParam = '';
+	private $_keyPrefix = '';
+	private $_varyBySession = false;
+	private $_cachePostBack = false;
+	private $_cacheTime = 0;
 	public function getAllowChildControls()
 	{
 		$this->determineCacheability();
@@ -8099,43 +8099,43 @@ 
 	}
 	private function determineCacheability()
 	{
-		if(!$this->_cacheChecked)
+		if (!$this->_cacheChecked)
 		{
-			$this->_cacheChecked=true;
-			if($this->_duration>0 && ($this->_cachePostBack || !$this->getPage()->getIsPostBack()))
+			$this->_cacheChecked = true;
+			if ($this->_duration > 0 && ($this->_cachePostBack || !$this->getPage()->getIsPostBack()))
 			{
-				if($this->_cacheModuleID!=='')
+				if ($this->_cacheModuleID !== '')
 				{
-					$this->_cache=$this->getApplication()->getModule($this->_cacheModuleID);
-					if(!($this->_cache instanceof ICache))
-						throw new TConfigurationException('outputcache_cachemoduleid_invalid',$this->_cacheModuleID);
+					$this->_cache = $this->getApplication()->getModule($this->_cacheModuleID);
+					if (!($this->_cache instanceof ICache))
+						throw new TConfigurationException('outputcache_cachemoduleid_invalid', $this->_cacheModuleID);
 				}
 				else
-					$this->_cache=$this->getApplication()->getCache();
-				if($this->_cache!==null)
+					$this->_cache = $this->getApplication()->getCache();
+				if ($this->_cache !== null)
 				{
-					$this->_cacheAvailable=true;
-					$data=$this->_cache->get($this->getCacheKey());
-					if(is_array($data))
+					$this->_cacheAvailable = true;
+					$data = $this->_cache->get($this->getCacheKey());
+					if (is_array($data))
 					{
-						$param=new TOutputCacheCheckDependencyEventParameter;
-						$param->setCacheTime(isset($data[3])?$data[3]:0);
+						$param = new TOutputCacheCheckDependencyEventParameter;
+						$param->setCacheTime(isset($data[3]) ? $data[3] : 0);
 						$this->onCheckDependency($param);
-						$this->_dataCached=$param->getIsValid();
+						$this->_dataCached = $param->getIsValid();
 					}
 					else
-						$this->_dataCached=false;
-					if($this->_dataCached)
-						list($this->_contents,$this->_state,$this->_actions,$this->_cacheTime)=$data;
+						$this->_dataCached = false;
+					if ($this->_dataCached)
+						list($this->_contents, $this->_state, $this->_actions, $this->_cacheTime) = $data;
 				}
 			}
 		}
 	}
-	protected function initRecursive($namingContainer=null)
+	protected function initRecursive($namingContainer = null)
 	{
-		if($this->_cacheAvailable && !$this->_dataCached)
+		if ($this->_cacheAvailable && !$this->_dataCached)
 		{
-			$stack=$this->getPage()->getCachingStack();
+			$stack = $this->getPage()->getCachingStack();
 			$stack->push($this);
 			parent::initRecursive($namingContainer);
 			$stack->pop();
@@ -8145,39 +8145,39 @@ 
 	}
 	protected function loadRecursive()
 	{
-		if($this->_cacheAvailable && !$this->_dataCached)
+		if ($this->_cacheAvailable && !$this->_dataCached)
 		{
-			$stack=$this->getPage()->getCachingStack();
+			$stack = $this->getPage()->getCachingStack();
 			$stack->push($this);
 			parent::loadRecursive();
 			$stack->pop();
 		}
 		else
 		{
-			if($this->_dataCached)
+			if ($this->_dataCached)
 				$this->performActions();
 			parent::loadRecursive();
 		}
 	}
 	private function performActions()
 	{
-		$page=$this->getPage();
-		$cs=$page->getClientScript();
-		foreach($this->_actions as $action)
+		$page = $this->getPage();
+		$cs = $page->getClientScript();
+		foreach ($this->_actions as $action)
 		{
-			if($action[0]==='Page.ClientScript')
-				call_user_func_array(array($cs,$action[1]),$action[2]);
-			else if($action[0]==='Page')
-				call_user_func_array(array($page,$action[1]),$action[2]);
+			if ($action[0] === 'Page.ClientScript')
+				call_user_func_array(array($cs, $action[1]), $action[2]);
+			else if ($action[0] === 'Page')
+				call_user_func_array(array($page, $action[1]), $action[2]);
 			else
-				call_user_func_array(array($this->getSubProperty($action[0]),$action[1]),$action[2]);
+				call_user_func_array(array($this->getSubProperty($action[0]), $action[1]), $action[2]);
 		}
 	}
 	protected function preRenderRecursive()
 	{
-		if($this->_cacheAvailable && !$this->_dataCached)
+		if ($this->_cacheAvailable && !$this->_dataCached)
 		{
-			$stack=$this->getPage()->getCachingStack();
+			$stack = $this->getPage()->getCachingStack();
 			$stack->push($this);
 			parent::preRenderRecursive();
 			$stack->pop();
@@ -8185,56 +8185,56 @@ 
 		else
 			parent::preRenderRecursive();
 	}
-	protected function loadStateRecursive(&$state,$needViewState=true)
+	protected function loadStateRecursive(&$state, $needViewState = true)
 	{
-		$st=unserialize($state);
-		parent::loadStateRecursive($st,$needViewState);
+		$st = unserialize($state);
+		parent::loadStateRecursive($st, $needViewState);
 	}
-	protected function &saveStateRecursive($needViewState=true)
+	protected function &saveStateRecursive($needViewState = true)
 	{
-		if($this->_dataCached)
+		if ($this->_dataCached)
 			return $this->_state;
 		else
 		{
-			$st=parent::saveStateRecursive($needViewState);
-						$this->_state=serialize($st);
+			$st = parent::saveStateRecursive($needViewState);
+						$this->_state = serialize($st);
 			return $this->_state;
 		}
 	}
-	public function registerAction($context,$funcName,$funcParams)
+	public function registerAction($context, $funcName, $funcParams)
 	{
-		$this->_actions[]=array($context,$funcName,$funcParams);
+		$this->_actions[] = array($context, $funcName, $funcParams);
 	}
 	public function getCacheKey()
 	{
-		if($this->_cacheKey===null)
-			$this->_cacheKey=$this->calculateCacheKey();
+		if ($this->_cacheKey === null)
+			$this->_cacheKey = $this->calculateCacheKey();
 		return $this->_cacheKey;
 	}
 	protected function calculateCacheKey()
 	{
-		$key=$this->getBaseCacheKey();
-		if($this->_varyBySession)
-			$key.=$this->getSession()->getSessionID();
-		if($this->_varyByParam!=='')
+		$key = $this->getBaseCacheKey();
+		if ($this->_varyBySession)
+			$key .= $this->getSession()->getSessionID();
+		if ($this->_varyByParam !== '')
 		{
-			$params=array();
-			$request=$this->getRequest();
-			foreach(explode(',',$this->_varyByParam) as $name)
+			$params = array();
+			$request = $this->getRequest();
+			foreach (explode(',', $this->_varyByParam) as $name)
 			{
-				$name=trim($name);
-				$params[$name]=$request->itemAt($name);
+				$name = trim($name);
+				$params[$name] = $request->itemAt($name);
 			}
-			$key.=serialize($params);
+			$key .= serialize($params);
 		}
-		$param=new TOutputCacheCalculateKeyEventParameter;
+		$param = new TOutputCacheCalculateKeyEventParameter;
 		$this->onCalculateKey($param);
-		$key.=$param->getCacheKey();
+		$key .= $param->getCacheKey();
 		return $key;
 	}
 	protected function getBaseCacheKey()
 	{
-		return self::CACHE_ID_PREFIX.$this->_keyPrefix.$this->getPage()->getPagePath().$this->getUniqueID();
+		return self::CACHE_ID_PREFIX . $this->_keyPrefix . $this->getPage()->getPagePath() . $this->getUniqueID();
 	}
 	public function getCacheModuleID()
 	{
@@ -8242,11 +8242,11 @@ 
 	}
 	public function setCacheModuleID($value)
 	{
-		$this->_cacheModuleID=$value;
+		$this->_cacheModuleID = $value;
 	}
 	public function setCacheKeyPrefix($value)
 	{
-		$this->_keyPrefix=$value;
+		$this->_keyPrefix = $value;
 	}
 	public function getCacheTime()
 	{
@@ -8266,9 +8266,9 @@ 
 	}
 	public function setDuration($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			throw new TInvalidDataValueException('outputcache_duration_invalid',get_class($this));
-		$this->_duration=$value;
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
+			throw new TInvalidDataValueException('outputcache_duration_invalid', get_class($this));
+		$this->_duration = $value;
 	}
 	public function getVaryByParam()
 	{
@@ -8276,7 +8276,7 @@ 
 	}
 	public function setVaryByParam($value)
 	{
-		$this->_varyByParam=trim($value);
+		$this->_varyByParam = trim($value);
 	}
 	public function getVaryBySession()
 	{
@@ -8284,7 +8284,7 @@ 
 	}
 	public function setVaryBySession($value)
 	{
-		$this->_varyBySession=TPropertyValue::ensureBoolean($value);
+		$this->_varyBySession = TPropertyValue::ensureBoolean($value);
 	}
 	public function getCachingPostBack()
 	{
@@ -8292,32 +8292,32 @@ 
 	}
 	public function setCachingPostBack($value)
 	{
-		$this->_cachePostBack=TPropertyValue::ensureBoolean($value);
+		$this->_cachePostBack = TPropertyValue::ensureBoolean($value);
 	}
 	public function onCheckDependency($param)
 	{
-		$this->raiseEvent('OnCheckDependency',$this,$param);
+		$this->raiseEvent('OnCheckDependency', $this, $param);
 	}
 	public function onCalculateKey($param)
 	{
-		$this->raiseEvent('OnCalculateKey',$this,$param);
+		$this->raiseEvent('OnCalculateKey', $this, $param);
 	}
 	public function render($writer)
 	{
-		if($this->_dataCached)
+		if ($this->_dataCached)
 			$writer->write($this->_contents);
-		else if($this->_cacheAvailable)
+		else if ($this->_cacheAvailable)
 		{
 			$textwriter = new TTextWriter();
-			$multiwriter = new TOutputCacheTextWriterMulti(array($writer->getWriter(),$textwriter));
+			$multiwriter = new TOutputCacheTextWriterMulti(array($writer->getWriter(), $textwriter));
 			$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), $multiwriter);
-			$stack=$this->getPage()->getCachingStack();
+			$stack = $this->getPage()->getCachingStack();
 			$stack->push($this);
 			parent::render($htmlWriter);
 			$stack->pop();
-			$content=$textwriter->flush();
-			$data=array($content,$this->_state,$this->_actions,time());
-			$this->_cache->set($this->getCacheKey(),$data,$this->getDuration(),$this->getCacheDependency());
+			$content = $textwriter->flush();
+			$data = array($content, $this->_state, $this->_actions, time());
+			$this->_cache->set($this->getCacheKey(), $data, $this->getDuration(), $this->getCacheDependency());
 		}
 		else
 			parent::render($writer);
@@ -8325,15 +8325,15 @@ 
 }
 class TOutputCacheCheckDependencyEventParameter extends TEventParameter
 {
-	private $_isValid=true;
-	private $_cacheTime=0;
+	private $_isValid = true;
+	private $_cacheTime = 0;
 	public function getIsValid()
 	{
 		return $this->_isValid;
 	}
 	public function setIsValid($value)
 	{
-		$this->_isValid=TPropertyValue::ensureBoolean($value);
+		$this->_isValid = TPropertyValue::ensureBoolean($value);
 	}
 	public function getCacheTime()
 	{
@@ -8341,19 +8341,19 @@ 
 	}
 	public function setCacheTime($value)
 	{
-		$this->_cacheTime=TPropertyValue::ensureInteger($value);
+		$this->_cacheTime = TPropertyValue::ensureInteger($value);
 	}
 }
 class TOutputCacheCalculateKeyEventParameter extends TEventParameter
 {
-	private $_cacheKey='';
+	private $_cacheKey = '';
 	public function getCacheKey()
 	{
 		return $this->_cacheKey;
 	}
 	public function setCacheKey($value)
 	{
-		$this->_cacheKey=TPropertyValue::ensureString($value);
+		$this->_cacheKey = TPropertyValue::ensureString($value);
 	}
 }
 class TOutputCacheTextWriterMulti extends TTextWriter
@@ -8365,63 +8365,63 @@ 
 	}
 	public function write($s)
 	{
-		foreach($this->_writers as $writer)
+		foreach ($this->_writers as $writer)
 			$writer->write($s);
 	}
 	public function flush()
 	{
-		foreach($this->_writers as $writer)
+		foreach ($this->_writers as $writer)
 			$s = $writer->flush();
 		return $s;
 	}
 }
 class TTemplateManager extends TModule
 {
-	const TEMPLATE_FILE_EXT='.tpl';
-	const TEMPLATE_CACHE_PREFIX='prado:template:';
+	const TEMPLATE_FILE_EXT = '.tpl';
+	const TEMPLATE_CACHE_PREFIX = 'prado:template:';
 	public function init($config)
 	{
 		$this->getService()->setTemplateManager($this);
 	}
 	public function getTemplateByClassName($className)
 	{
-		$class=new ReflectionClass($className);
-		$tplFile=dirname($class->getFileName()).DIRECTORY_SEPARATOR.$className.self::TEMPLATE_FILE_EXT;
+		$class = new ReflectionClass($className);
+		$tplFile = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . $className . self::TEMPLATE_FILE_EXT;
 		return $this->getTemplateByFileName($tplFile);
 	}
 	public function getTemplateByFileName($fileName)
 	{
-		if(($fileName=$this->getLocalizedTemplate($fileName))!==null)
+		if (($fileName = $this->getLocalizedTemplate($fileName)) !== null)
 		{
-			if(($cache=$this->getApplication()->getCache())===null)
-				return new TTemplate(file_get_contents($fileName),dirname($fileName),$fileName);
+			if (($cache = $this->getApplication()->getCache()) === null)
+				return new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
 			else
 			{
-				$array=$cache->get(self::TEMPLATE_CACHE_PREFIX.$fileName);
-				if(is_array($array))
+				$array = $cache->get(self::TEMPLATE_CACHE_PREFIX . $fileName);
+				if (is_array($array))
 				{
-					list($template,$timestamps)=$array;
-					if($this->getApplication()->getMode()===TApplicationMode::Performance)
+					list($template, $timestamps) = $array;
+					if ($this->getApplication()->getMode() === TApplicationMode::Performance)
 						return $template;
-					$cacheValid=true;
-					foreach($timestamps as $tplFile=>$timestamp)
+					$cacheValid = true;
+					foreach ($timestamps as $tplFile=>$timestamp)
 					{
-						if(!is_file($tplFile) || filemtime($tplFile)>$timestamp)
+						if (!is_file($tplFile) || filemtime($tplFile) > $timestamp)
 						{
-							$cacheValid=false;
+							$cacheValid = false;
 							break;
 						}
 					}
-					if($cacheValid)
+					if ($cacheValid)
 						return $template;
 				}
-				$template=new TTemplate(file_get_contents($fileName),dirname($fileName),$fileName);
-				$includedFiles=$template->getIncludedFiles();
-				$timestamps=array();
-				$timestamps[$fileName]=filemtime($fileName);
-				foreach($includedFiles as $includedFile)
-					$timestamps[$includedFile]=filemtime($includedFile);
-				$cache->set(self::TEMPLATE_CACHE_PREFIX.$fileName,array($template,$timestamps));
+				$template = new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
+				$includedFiles = $template->getIncludedFiles();
+				$timestamps = array();
+				$timestamps[$fileName] = filemtime($fileName);
+				foreach ($includedFiles as $includedFile)
+					$timestamps[$includedFile] = filemtime($includedFile);
+				$cache->set(self::TEMPLATE_CACHE_PREFIX . $fileName, array($template, $timestamps));
 				return $template;
 			}
 		}
@@ -8430,11 +8430,11 @@ 
 	}
 	protected function getLocalizedTemplate($filename)
 	{
-		if(($app=$this->getApplication()->getGlobalization(false))===null)
-			return is_file($filename)?$filename:null;
-		foreach($app->getLocalizedResource($filename) as $file)
+		if (($app = $this->getApplication()->getGlobalization(false)) === null)
+			return is_file($filename) ? $filename : null;
+		foreach ($app->getLocalizedResource($filename) as $file)
 		{
-			if(($file=realpath($file))!==false && is_file($file))
+			if (($file = realpath($file)) !== false && is_file($file))
 				return $file;
 		}
 		return null;
@@ -8442,35 +8442,35 @@ 
 }
 class TTemplate extends TApplicationComponent implements ITemplate
 {
-	const REGEX_RULES='/<!--.*?--!>|<!---.*?--->|<\/?com:([\w\.]+)((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?"|\s*[\w\.]+\s*=\s*<%.*?%>)*)\s*\/?>|<\/?prop:([\w\.]+)\s*>|<%@\s*((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?")*)\s*%>|<%[%#~\/\\$=\\[](.*?)%>|<prop:([\w\.]+)((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?"|\s*[\w\.]+\s*=\s*<%.*?%>)*)\s*\/>/msS';
-	const CONFIG_DATABIND=0;
-	const CONFIG_EXPRESSION=1;
-	const CONFIG_ASSET=2;
-	const CONFIG_PARAMETER=3;
-	const CONFIG_LOCALIZATION=4;
-	const CONFIG_TEMPLATE=5;
-	private $_tpl=array();
-	private $_directive=array();
+	const REGEX_RULES = '/<!--.*?--!>|<!---.*?--->|<\/?com:([\w\.]+)((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?"|\s*[\w\.]+\s*=\s*<%.*?%>)*)\s*\/?>|<\/?prop:([\w\.]+)\s*>|<%@\s*((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?")*)\s*%>|<%[%#~\/\\$=\\[](.*?)%>|<prop:([\w\.]+)((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?"|\s*[\w\.]+\s*=\s*<%.*?%>)*)\s*\/>/msS';
+	const CONFIG_DATABIND = 0;
+	const CONFIG_EXPRESSION = 1;
+	const CONFIG_ASSET = 2;
+	const CONFIG_PARAMETER = 3;
+	const CONFIG_LOCALIZATION = 4;
+	const CONFIG_TEMPLATE = 5;
+	private $_tpl = array();
+	private $_directive = array();
 	private $_contextPath;
-	private $_tplFile=null;
-	private $_startingLine=0;
+	private $_tplFile = null;
+	private $_startingLine = 0;
 	private $_content;
-	private $_sourceTemplate=true;
-	private $_hashCode='';
-	private $_tplControl=null;
-	private $_includedFiles=array();
-	private $_includeAtLine=array();
-	private $_includeLines=array();
-	public function __construct($template,$contextPath,$tplFile=null,$startingLine=0,$sourceTemplate=true)
-	{
-		$this->_sourceTemplate=$sourceTemplate;
-		$this->_contextPath=$contextPath;
-		$this->_tplFile=$tplFile;
-		$this->_startingLine=$startingLine;
-		$this->_content=$template;
-		$this->_hashCode=md5($template);
+	private $_sourceTemplate = true;
+	private $_hashCode = '';
+	private $_tplControl = null;
+	private $_includedFiles = array();
+	private $_includeAtLine = array();
+	private $_includeLines = array();
+	public function __construct($template, $contextPath, $tplFile = null, $startingLine = 0, $sourceTemplate = true)
+	{
+		$this->_sourceTemplate = $sourceTemplate;
+		$this->_contextPath = $contextPath;
+		$this->_tplFile = $tplFile;
+		$this->_startingLine = $startingLine;
+		$this->_content = $template;
+		$this->_hashCode = md5($template);
 		$this->parse($template);
-		$this->_content=null; 	}
+		$this->_content = null; }
 	public function getTemplateFile()
 	{
 		return $this->_tplFile;
@@ -8495,40 +8495,40 @@ 
 	{
 		return $this->_tpl;
 	}
-	public function instantiateIn($tplControl,$parentControl=null)
-	{
-		$this->_tplControl=$tplControl;
-		if($parentControl===null)
-			$parentControl=$tplControl;
-		if(($page=$tplControl->getPage())===null)
-			$page=$this->getService()->getRequestedPage();
-		$controls=array();
-		$directChildren=array();
-		foreach($this->_tpl as $key=>$object)
-		{
-			if($object[0]===-1)
-				$parent=$parentControl;
-			else if(isset($controls[$object[0]]))
-				$parent=$controls[$object[0]];
+	public function instantiateIn($tplControl, $parentControl = null)
+	{
+		$this->_tplControl = $tplControl;
+		if ($parentControl === null)
+			$parentControl = $tplControl;
+		if (($page = $tplControl->getPage()) === null)
+			$page = $this->getService()->getRequestedPage();
+		$controls = array();
+		$directChildren = array();
+		foreach ($this->_tpl as $key=>$object)
+		{
+			if ($object[0] === -1)
+				$parent = $parentControl;
+			else if (isset($controls[$object[0]]))
+				$parent = $controls[$object[0]];
 			else
 				continue;
-			if(isset($object[2]))				{
-				$component=Prado::createComponent($object[1]);
-				$properties=&$object[2];
-				if($component instanceof TControl)
+			if (isset($object[2])) {
+				$component = Prado::createComponent($object[1]);
+				$properties = &$object[2];
+				if ($component instanceof TControl)
 				{
-					if($component instanceof TOutputCache)
-						$component->setCacheKeyPrefix($this->_hashCode.$key);
+					if ($component instanceof TOutputCache)
+						$component->setCacheKeyPrefix($this->_hashCode . $key);
 					$component->setTemplateControl($tplControl);
-					if(isset($properties['id']))
+					if (isset($properties['id']))
 					{
-						if(is_array($properties['id']))
-							$properties['id']=$component->evaluateExpression($properties['id'][1]);
-						$tplControl->registerObject($properties['id'],$component);
+						if (is_array($properties['id']))
+							$properties['id'] = $component->evaluateExpression($properties['id'][1]);
+						$tplControl->registerObject($properties['id'], $component);
 					}
-					if(isset($properties['skinid']))
+					if (isset($properties['skinid']))
 					{
-						if(is_array($properties['skinid']))
+						if (is_array($properties['skinid']))
 							$component->setSkinID($component->evaluateExpression($properties['skinid'][1]));
 						else
 							$component->setSkinID($properties['skinid']);
@@ -8536,558 +8536,558 @@ 
 					}
 					$component->trackViewState(false);
 					$component->applyStyleSheetSkin($page);
-					foreach($properties as $name=>$value)
-						$this->configureControl($component,$name,$value);
+					foreach ($properties as $name=>$value)
+						$this->configureControl($component, $name, $value);
 					$component->trackViewState(true);
-					if($parent===$parentControl)
-						$directChildren[]=$component;
+					if ($parent === $parentControl)
+						$directChildren[] = $component;
 					else
 						$component->createdOnTemplate($parent);
-					if($component->getAllowChildControls())
-						$controls[$key]=$component;
+					if ($component->getAllowChildControls())
+						$controls[$key] = $component;
 				}
-				else if($component instanceof TComponent)
+				else if ($component instanceof TComponent)
 				{
-					$controls[$key]=$component;
-					if(isset($properties['id']))
+					$controls[$key] = $component;
+					if (isset($properties['id']))
 					{
-						if(is_array($properties['id']))
-							$properties['id']=$component->evaluateExpression($properties['id'][1]);
-						$tplControl->registerObject($properties['id'],$component);
-						if(!$component->hasProperty('id'))
+						if (is_array($properties['id']))
+							$properties['id'] = $component->evaluateExpression($properties['id'][1]);
+						$tplControl->registerObject($properties['id'], $component);
+						if (!$component->hasProperty('id'))
 							unset($properties['id']);
 					}
-					foreach($properties as $name=>$value)
-						$this->configureComponent($component,$name,$value);
-					if($parent===$parentControl)
-						$directChildren[]=$component;
+					foreach ($properties as $name=>$value)
+						$this->configureComponent($component, $name, $value);
+					if ($parent === $parentControl)
+						$directChildren[] = $component;
 					else
 						$component->createdOnTemplate($parent);
 				}
 			}
 			else
 			{
-				if($object[1] instanceof TCompositeLiteral)
+				if ($object[1] instanceof TCompositeLiteral)
 				{
-										$o=clone $object[1];
+										$o = clone $object[1];
 					$o->setContainer($tplControl);
-					if($parent===$parentControl)
-						$directChildren[]=$o;
+					if ($parent === $parentControl)
+						$directChildren[] = $o;
 					else
 						$parent->addParsedObject($o);
 				}
 				else
 				{
-					if($parent===$parentControl)
-						$directChildren[]=$object[1];
+					if ($parent === $parentControl)
+						$directChildren[] = $object[1];
 					else
 						$parent->addParsedObject($object[1]);
 				}
 			}
 		}
-								foreach($directChildren as $control)
+								foreach ($directChildren as $control)
 		{
-			if($control instanceof TComponent)
+			if ($control instanceof TComponent)
 				$control->createdOnTemplate($parentControl);
 			else
 				$parentControl->addParsedObject($control);
 		}
 	}
-	protected function configureControl($control,$name,$value)
+	protected function configureControl($control, $name, $value)
 	{
-		if(strncasecmp($name,'on',2)===0)					$this->configureEvent($control,$name,$value,$control);
-		else if(($pos=strrpos($name,'.'))===false)				$this->configureProperty($control,$name,$value);
-		else				$this->configureSubProperty($control,$name,$value);
+		if (strncasecmp($name, 'on', 2) === 0)					$this->configureEvent($control, $name, $value, $control);
+		else if (($pos = strrpos($name, '.')) === false)				$this->configureProperty($control, $name, $value);
+		else				$this->configureSubProperty($control, $name, $value);
 	}
-	protected function configureComponent($component,$name,$value)
+	protected function configureComponent($component, $name, $value)
 	{
-		if(strpos($name,'.')===false)				$this->configureProperty($component,$name,$value);
-		else				$this->configureSubProperty($component,$name,$value);
+		if (strpos($name, '.') === false)				$this->configureProperty($component, $name, $value);
+		else				$this->configureSubProperty($component, $name, $value);
 	}
-	protected function configureEvent($control,$name,$value,$contextControl)
+	protected function configureEvent($control, $name, $value, $contextControl)
 	{
-		if(strpos($value,'.')===false)
-			$control->attachEventHandler($name,array($contextControl,'TemplateControl.'.$value));
+		if (strpos($value, '.') === false)
+			$control->attachEventHandler($name, array($contextControl, 'TemplateControl.' . $value));
 		else
-			$control->attachEventHandler($name,array($contextControl,$value));
+			$control->attachEventHandler($name, array($contextControl, $value));
 	}
-	protected function configureProperty($component,$name,$value)
+	protected function configureProperty($component, $name, $value)
 	{
-		if(is_array($value))
+		if (is_array($value))
 		{
-			switch($value[0])
+			switch ($value[0])
 			{
 				case self::CONFIG_DATABIND:
-					$component->bindProperty($name,$value[1]);
+					$component->bindProperty($name, $value[1]);
 					break;
 				case self::CONFIG_EXPRESSION:
-					if($component instanceof TControl)
-						$component->autoBindProperty($name,$value[1]);
+					if ($component instanceof TControl)
+						$component->autoBindProperty($name, $value[1]);
 					else
 					{
-						$setter='set'.$name;
+						$setter = 'set' . $name;
 						$component->$setter($this->_tplControl->evaluateExpression($value[1]));
 					}
 					break;
 				case self::CONFIG_TEMPLATE:
-					$setter='set'.$name;
+					$setter = 'set' . $name;
 					$component->$setter($value[1]);
 					break;
-				case self::CONFIG_ASSET:							$setter='set'.$name;
-					$url=$this->publishFilePath($this->_contextPath.DIRECTORY_SEPARATOR.$value[1]);
+				case self::CONFIG_ASSET:							$setter = 'set' . $name;
+					$url = $this->publishFilePath($this->_contextPath . DIRECTORY_SEPARATOR . $value[1]);
 					$component->$setter($url);
 					break;
-				case self::CONFIG_PARAMETER:							$setter='set'.$name;
+				case self::CONFIG_PARAMETER:							$setter = 'set' . $name;
 					$component->$setter($this->getApplication()->getParameters()->itemAt($value[1]));
 					break;
 				case self::CONFIG_LOCALIZATION:
-					$setter='set'.$name;
+					$setter = 'set' . $name;
 					$component->$setter(Prado::localize($value[1]));
 					break;
-				default:						throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
+				default:						throw new TConfigurationException('template_tag_unexpected', $name, $value[1]);
 					break;
 			}
 		}
 		else
 		{
-			if (substr($name,0,2)=='js')
+			if (substr($name, 0, 2) == 'js')
 				if ($value and !($value instanceof TJavaScriptLiteral))
 					$value = new TJavaScriptLiteral($value);
-			$setter='set'.$name;
+			$setter = 'set' . $name;
 			$component->$setter($value);
 		}
 	}
-	protected function configureSubProperty($component,$name,$value)
+	protected function configureSubProperty($component, $name, $value)
 	{
-		if(is_array($value))
+		if (is_array($value))
 		{
-			switch($value[0])
+			switch ($value[0])
 			{
-				case self::CONFIG_DATABIND:							$component->bindProperty($name,$value[1]);
+				case self::CONFIG_DATABIND:							$component->bindProperty($name, $value[1]);
 					break;
-				case self::CONFIG_EXPRESSION:							if($component instanceof TControl)
-						$component->autoBindProperty($name,$value[1]);
+				case self::CONFIG_EXPRESSION:							if ($component instanceof TControl)
+						$component->autoBindProperty($name, $value[1]);
 					else
-						$component->setSubProperty($name,$this->_tplControl->evaluateExpression($value[1]));
+						$component->setSubProperty($name, $this->_tplControl->evaluateExpression($value[1]));
 					break;
 				case self::CONFIG_TEMPLATE:
-					$component->setSubProperty($name,$value[1]);
+					$component->setSubProperty($name, $value[1]);
 					break;
-				case self::CONFIG_ASSET:							$url=$this->publishFilePath($this->_contextPath.DIRECTORY_SEPARATOR.$value[1]);
-					$component->setSubProperty($name,$url);
+				case self::CONFIG_ASSET:							$url = $this->publishFilePath($this->_contextPath . DIRECTORY_SEPARATOR . $value[1]);
+					$component->setSubProperty($name, $url);
 					break;
-				case self::CONFIG_PARAMETER:							$component->setSubProperty($name,$this->getApplication()->getParameters()->itemAt($value[1]));
+				case self::CONFIG_PARAMETER:							$component->setSubProperty($name, $this->getApplication()->getParameters()->itemAt($value[1]));
 					break;
 				case self::CONFIG_LOCALIZATION:
-					$component->setSubProperty($name,Prado::localize($value[1]));
+					$component->setSubProperty($name, Prado::localize($value[1]));
 					break;
-				default:						throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
+				default:						throw new TConfigurationException('template_tag_unexpected', $name, $value[1]);
 					break;
 			}
 		}
 		else
-			$component->setSubProperty($name,$value);
+			$component->setSubProperty($name, $value);
 	}
 	protected function parse($input)
 	{
-		$input=$this->preprocess($input);
-		$tpl=&$this->_tpl;
-		$n=preg_match_all(self::REGEX_RULES,$input,$matches,PREG_SET_ORDER|PREG_OFFSET_CAPTURE);
-		$expectPropEnd=false;
-		$textStart=0;
-				$stack=array();
-		$container=-1;
-		$matchEnd=0;
-		$c=0;
-		$this->_directive=null;
+		$input = $this->preprocess($input);
+		$tpl = &$this->_tpl;
+		$n = preg_match_all(self::REGEX_RULES, $input, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
+		$expectPropEnd = false;
+		$textStart = 0;
+				$stack = array();
+		$container = -1;
+		$matchEnd = 0;
+		$c = 0;
+		$this->_directive = null;
 		try
 		{
-			for($i=0;$i<$n;++$i)
+			for ($i = 0; $i < $n; ++$i)
 			{
-				$match=&$matches[$i];
-				$str=$match[0][0];
-				$matchStart=$match[0][1];
-				$matchEnd=$matchStart+strlen($str)-1;
-				if(strpos($str,'<com:')===0)					{
-					if($expectPropEnd)
+				$match = &$matches[$i];
+				$str = $match[0][0];
+				$matchStart = $match[0][1];
+				$matchEnd = $matchStart + strlen($str) - 1;
+				if (strpos($str, '<com:') === 0) {
+					if ($expectPropEnd)
 						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
-					$type=$match[1][0];
-					$attributes=$this->parseAttributes($match[2][0],$match[2][1]);
-					$this->validateAttributes($type,$attributes);
-					$tpl[$c++]=array($container,$type,$attributes);
-					if($str[strlen($str)-2]!=='/')  					{
+					if ($matchStart > $textStart)
+						$tpl[$c++] = array($container, substr($input, $textStart, $matchStart - $textStart));
+					$textStart = $matchEnd + 1;
+					$type = $match[1][0];
+					$attributes = $this->parseAttributes($match[2][0], $match[2][1]);
+					$this->validateAttributes($type, $attributes);
+					$tpl[$c++] = array($container, $type, $attributes);
+					if ($str[strlen($str) - 2] !== '/') {
 						$stack[] = $type;
-						$container=$c-1;
+						$container = $c - 1;
 					}
 				}
-				else if(strpos($str,'</com:')===0)					{
-					if($expectPropEnd)
+				else if (strpos($str, '</com:') === 0) {
+					if ($expectPropEnd)
 						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
-					$type=$match[1][0];
-					if(empty($stack))
-						throw new TConfigurationException('template_closingtag_unexpected',"</com:$type>");
-					$name=array_pop($stack);
-					if($name!==$type)
+					if ($matchStart > $textStart)
+						$tpl[$c++] = array($container, substr($input, $textStart, $matchStart - $textStart));
+					$textStart = $matchEnd + 1;
+					$type = $match[1][0];
+					if (empty($stack))
+						throw new TConfigurationException('template_closingtag_unexpected', "</com:$type>");
+					$name = array_pop($stack);
+					if ($name !== $type)
 					{
-						$tag=$name[0]==='@' ? '</prop:'.substr($name,1).'>' : "</com:$name>";
-						throw new TConfigurationException('template_closingtag_expected',$tag);
+						$tag = $name[0] === '@' ? '</prop:' . substr($name, 1) . '>' : "</com:$name>";
+						throw new TConfigurationException('template_closingtag_expected', $tag);
 					}
-					$container=$tpl[$container][0];
+					$container = $tpl[$container][0];
 				}
-				else if(strpos($str,'<%@')===0)					{
-					if($expectPropEnd)
+				else if (strpos($str, '<%@') === 0) {
+					if ($expectPropEnd)
 						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
-					if(isset($tpl[0]) || $this->_directive!==null)
+					if ($matchStart > $textStart)
+						$tpl[$c++] = array($container, substr($input, $textStart, $matchStart - $textStart));
+					$textStart = $matchEnd + 1;
+					if (isset($tpl[0]) || $this->_directive !== null)
 						throw new TConfigurationException('template_directive_nonunique');
-					$this->_directive=$this->parseAttributes($match[4][0],$match[4][1]);
+					$this->_directive = $this->parseAttributes($match[4][0], $match[4][1]);
 				}
-				else if(strpos($str,'<%')===0)					{
-					if($expectPropEnd)
+				else if (strpos($str, '<%') === 0) {
+					if ($expectPropEnd)
 						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
-					$literal=trim($match[5][0]);
-					if($str[2]==='=')							$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,$literal));
-					else if($str[2]==='%')  						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_STATEMENTS,$literal));
-					else if($str[2]==='#')
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_DATABINDING,$literal));
-					else if($str[2]==='$')
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"\$this->getApplication()->getParameters()->itemAt('$literal')"));
-					else if($str[2]==='~')
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"\$this->publishFilePath('$this->_contextPath/$literal')"));
-					else if($str[2]==='/')
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '/').'/$literal'"));
-					else if($str[2]==='[')
+					if ($matchStart > $textStart)
+						$tpl[$c++] = array($container, substr($input, $textStart, $matchStart - $textStart));
+					$textStart = $matchEnd + 1;
+					$literal = trim($match[5][0]);
+					if ($str[2] === '=')							$tpl[$c++] = array($container, array(TCompositeLiteral::TYPE_EXPRESSION, $literal));
+					else if ($str[2] === '%')  						$tpl[$c++] = array($container, array(TCompositeLiteral::TYPE_STATEMENTS, $literal));
+					else if ($str[2] === '#')
+						$tpl[$c++] = array($container, array(TCompositeLiteral::TYPE_DATABINDING, $literal));
+					else if ($str[2] === '$')
+						$tpl[$c++] = array($container, array(TCompositeLiteral::TYPE_EXPRESSION, "\$this->getApplication()->getParameters()->itemAt('$literal')"));
+					else if ($str[2] === '~')
+						$tpl[$c++] = array($container, array(TCompositeLiteral::TYPE_EXPRESSION, "\$this->publishFilePath('$this->_contextPath/$literal')"));
+					else if ($str[2] === '/')
+						$tpl[$c++] = array($container, array(TCompositeLiteral::TYPE_EXPRESSION, "rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '/').'/$literal'"));
+					else if ($str[2] === '[')
 					{
-						$literal=strtr(trim(substr($literal,0,strlen($literal)-1)),array("'"=>"\'","\\"=>"\\\\"));
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"Prado::localize('$literal')"));
+						$literal = strtr(trim(substr($literal, 0, strlen($literal) - 1)), array("'"=>"\'", "\\"=>"\\\\"));
+						$tpl[$c++] = array($container, array(TCompositeLiteral::TYPE_EXPRESSION, "Prado::localize('$literal')"));
 					}
 				}
-				else if(strpos($str,'<prop:')===0)					{
-					if(strrpos($str,'/>')===strlen($str)-2)  					{
-						if($expectPropEnd)
+				else if (strpos($str, '<prop:') === 0) {
+					if (strrpos($str, '/>') === strlen($str) - 2) {
+						if ($expectPropEnd)
 							continue;
-						if($matchStart>$textStart)
-							$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-						$textStart=$matchEnd+1;
-						$prop=strtolower($match[6][0]);
-						$attrs=$this->parseAttributes($match[7][0],$match[7][1]);
-						$attributes=array();
-						foreach($attrs as $name=>$value)
-							$attributes[$prop.'.'.$name]=$value;
-						$type=$tpl[$container][1];
-						$this->validateAttributes($type,$attributes);
-						foreach($attributes as $name=>$value)
+						if ($matchStart > $textStart)
+							$tpl[$c++] = array($container, substr($input, $textStart, $matchStart - $textStart));
+						$textStart = $matchEnd + 1;
+						$prop = strtolower($match[6][0]);
+						$attrs = $this->parseAttributes($match[7][0], $match[7][1]);
+						$attributes = array();
+						foreach ($attrs as $name=>$value)
+							$attributes[$prop . '.' . $name] = $value;
+						$type = $tpl[$container][1];
+						$this->validateAttributes($type, $attributes);
+						foreach ($attributes as $name=>$value)
 						{
-							if(isset($tpl[$container][2][$name]))
-								throw new TConfigurationException('template_property_duplicated',$name);
-							$tpl[$container][2][$name]=$value;
+							if (isset($tpl[$container][2][$name]))
+								throw new TConfigurationException('template_property_duplicated', $name);
+							$tpl[$container][2][$name] = $value;
 						}
 					}
-					else  					{
-						$prop=strtolower($match[3][0]);
-						$stack[] = '@'.$prop;
-						if(!$expectPropEnd)
+					else {
+						$prop = strtolower($match[3][0]);
+						$stack[] = '@' . $prop;
+						if (!$expectPropEnd)
 						{
-							if($matchStart>$textStart)
-								$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-							$textStart=$matchEnd+1;
-							$expectPropEnd=true;
+							if ($matchStart > $textStart)
+								$tpl[$c++] = array($container, substr($input, $textStart, $matchStart - $textStart));
+							$textStart = $matchEnd + 1;
+							$expectPropEnd = true;
 						}
 					}
 				}
-				else if(strpos($str,'</prop:')===0)					{
-					$prop=strtolower($match[3][0]);
-					if(empty($stack))
-						throw new TConfigurationException('template_closingtag_unexpected',"</prop:$prop>");
-					$name=array_pop($stack);
-					if($name!=='@'.$prop)
+				else if (strpos($str, '</prop:') === 0) {
+					$prop = strtolower($match[3][0]);
+					if (empty($stack))
+						throw new TConfigurationException('template_closingtag_unexpected', "</prop:$prop>");
+					$name = array_pop($stack);
+					if ($name !== '@' . $prop)
 					{
-						$tag=$name[0]==='@' ? '</prop:'.substr($name,1).'>' : "</com:$name>";
-						throw new TConfigurationException('template_closingtag_expected',$tag);
+						$tag = $name[0] === '@' ? '</prop:' . substr($name, 1) . '>' : "</com:$name>";
+						throw new TConfigurationException('template_closingtag_expected', $tag);
 					}
-					if(($last=count($stack))<1 || $stack[$last-1][0]!=='@')
+					if (($last = count($stack)) < 1 || $stack[$last - 1][0] !== '@')
 					{
-						if($matchStart>$textStart)
+						if ($matchStart > $textStart)
 						{
-							$value=substr($input,$textStart,$matchStart-$textStart);
-							if(substr($prop,-8,8)==='template')
-								$value=$this->parseTemplateProperty($value,$textStart);
+							$value = substr($input, $textStart, $matchStart - $textStart);
+							if (substr($prop, -8, 8) === 'template')
+								$value = $this->parseTemplateProperty($value, $textStart);
 							else
-								$value=$this->parseAttribute($value);
-							if($container>=0)
+								$value = $this->parseAttribute($value);
+							if ($container >= 0)
 							{
-								$type=$tpl[$container][1];
-								$this->validateAttributes($type,array($prop=>$value));
-								if(isset($tpl[$container][2][$prop]))
-									throw new TConfigurationException('template_property_duplicated',$prop);
-								$tpl[$container][2][$prop]=$value;
+								$type = $tpl[$container][1];
+								$this->validateAttributes($type, array($prop=>$value));
+								if (isset($tpl[$container][2][$prop]))
+									throw new TConfigurationException('template_property_duplicated', $prop);
+								$tpl[$container][2][$prop] = $value;
 							}
-							else									$this->_directive[$prop]=$value;
-							$textStart=$matchEnd+1;
+							else									$this->_directive[$prop] = $value;
+							$textStart = $matchEnd + 1;
 						}
-						$expectPropEnd=false;
+						$expectPropEnd = false;
 					}
 				}
-				else if(strpos($str,'<!--')===0)					{
-					if($expectPropEnd)
+				else if (strpos($str, '<!--') === 0) {
+					if ($expectPropEnd)
 						throw new TConfigurationException('template_comments_forbidden');
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
+					if ($matchStart > $textStart)
+						$tpl[$c++] = array($container, substr($input, $textStart, $matchStart - $textStart));
+					$textStart = $matchEnd + 1;
 				}
 				else
-					throw new TConfigurationException('template_matching_unexpected',$match);
+					throw new TConfigurationException('template_matching_unexpected', $match);
 			}
-			if(!empty($stack))
+			if (!empty($stack))
 			{
-				$name=array_pop($stack);
-				$tag=$name[0]==='@' ? '</prop:'.substr($name,1).'>' : "</com:$name>";
-				throw new TConfigurationException('template_closingtag_expected',$tag);
+				$name = array_pop($stack);
+				$tag = $name[0] === '@' ? '</prop:' . substr($name, 1) . '>' : "</com:$name>";
+				throw new TConfigurationException('template_closingtag_expected', $tag);
 			}
-			if($textStart<strlen($input))
-				$tpl[$c++]=array($container,substr($input,$textStart));
+			if ($textStart < strlen($input))
+				$tpl[$c++] = array($container, substr($input, $textStart));
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
-			if(($e instanceof TException) && ($e instanceof TTemplateException))
+			if (($e instanceof TException) && ($e instanceof TTemplateException))
 				throw $e;
-			if($matchEnd===0)
-				$line=$this->_startingLine+1;
+			if ($matchEnd === 0)
+				$line = $this->_startingLine + 1;
 			else
-				$line=$this->_startingLine+count(explode("\n",substr($input,0,$matchEnd+1)));
-			$this->handleException($e,$line,$input);
+				$line = $this->_startingLine + count(explode("\n", substr($input, 0, $matchEnd + 1)));
+			$this->handleException($e, $line, $input);
 		}
-		if($this->_directive===null)
-			$this->_directive=array();
-				$objects=array();
-		$parent=null;
-		$merged=array();
-		foreach($tpl as $id=>$object)
+		if ($this->_directive === null)
+			$this->_directive = array();
+				$objects = array();
+		$parent = null;
+		$merged = array();
+		foreach ($tpl as $id=>$object)
 		{
-			if(isset($object[2]) || $object[0]!==$parent)
+			if (isset($object[2]) || $object[0] !== $parent)
 			{
-				if($parent!==null)
+				if ($parent !== null)
 				{
-					if(count($merged[1])===1 && is_string($merged[1][0]))
-						$objects[$id-1]=array($merged[0],$merged[1][0]);
+					if (count($merged[1]) === 1 && is_string($merged[1][0]))
+						$objects[$id - 1] = array($merged[0], $merged[1][0]);
 					else
-						$objects[$id-1]=array($merged[0],new TCompositeLiteral($merged[1]));
+						$objects[$id - 1] = array($merged[0], new TCompositeLiteral($merged[1]));
 				}
-				if(isset($object[2]))
+				if (isset($object[2]))
 				{
-					$parent=null;
-					$objects[$id]=$object;
+					$parent = null;
+					$objects[$id] = $object;
 				}
 				else
 				{
-					$parent=$object[0];
-					$merged=array($parent,array($object[1]));
+					$parent = $object[0];
+					$merged = array($parent, array($object[1]));
 				}
 			}
 			else
-				$merged[1][]=$object[1];
+				$merged[1][] = $object[1];
 		}
-		if($parent!==null)
+		if ($parent !== null)
 		{
-			if(count($merged[1])===1 && is_string($merged[1][0]))
-				$objects[$id]=array($merged[0],$merged[1][0]);
+			if (count($merged[1]) === 1 && is_string($merged[1][0]))
+				$objects[$id] = array($merged[0], $merged[1][0]);
 			else
-				$objects[$id]=array($merged[0],new TCompositeLiteral($merged[1]));
+				$objects[$id] = array($merged[0], new TCompositeLiteral($merged[1]));
 		}
-		$tpl=$objects;
+		$tpl = $objects;
 		return $objects;
 	}
-	protected function parseAttributes($str,$offset)
+	protected function parseAttributes($str, $offset)
 	{
-		if($str==='')
+		if ($str === '')
 			return array();
-		$pattern='/([\w\.\-]+)\s*=\s*(\'.*?\'|".*?"|<%.*?%>)/msS';
-		$attributes=array();
-		$n=preg_match_all($pattern,$str,$matches,PREG_SET_ORDER|PREG_OFFSET_CAPTURE);
-		for($i=0;$i<$n;++$i)
-		{
-			$match=&$matches[$i];
-			$name=strtolower($match[1][0]);
-			if(isset($attributes[$name]))
-				throw new TConfigurationException('template_property_duplicated',$name);
-			$value=$match[2][0];
-			if(substr($name,-8,8)==='template')
-			{
-				if($value[0]==='\'' || $value[0]==='"')
-					$attributes[$name]=$this->parseTemplateProperty(substr($value,1,strlen($value)-2),$match[2][1]+1);
+		$pattern = '/([\w\.\-]+)\s*=\s*(\'.*?\'|".*?"|<%.*?%>)/msS';
+		$attributes = array();
+		$n = preg_match_all($pattern, $str, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
+		for ($i = 0; $i < $n; ++$i)
+		{
+			$match = &$matches[$i];
+			$name = strtolower($match[1][0]);
+			if (isset($attributes[$name]))
+				throw new TConfigurationException('template_property_duplicated', $name);
+			$value = $match[2][0];
+			if (substr($name, -8, 8) === 'template')
+			{
+				if ($value[0] === '\'' || $value[0] === '"')
+					$attributes[$name] = $this->parseTemplateProperty(substr($value, 1, strlen($value) - 2), $match[2][1] + 1);
 				else
-					$attributes[$name]=$this->parseTemplateProperty($value,$match[2][1]);
+					$attributes[$name] = $this->parseTemplateProperty($value, $match[2][1]);
 			}
 			else
 			{
-				if($value[0]==='\'' || $value[0]==='"')
-					$attributes[$name]=$this->parseAttribute(substr($value,1,strlen($value)-2));
+				if ($value[0] === '\'' || $value[0] === '"')
+					$attributes[$name] = $this->parseAttribute(substr($value, 1, strlen($value) - 2));
 				else
-					$attributes[$name]=$this->parseAttribute($value);
+					$attributes[$name] = $this->parseAttribute($value);
 			}
 		}
 		return $attributes;
 	}
-	protected function parseTemplateProperty($content,$offset)
+	protected function parseTemplateProperty($content, $offset)
 	{
-		$line=$this->_startingLine+count(explode("\n",substr($this->_content,0,$offset)))-1;
-		return array(self::CONFIG_TEMPLATE,new TTemplate($content,$this->_contextPath,$this->_tplFile,$line,false));
+		$line = $this->_startingLine + count(explode("\n", substr($this->_content, 0, $offset))) - 1;
+		return array(self::CONFIG_TEMPLATE, new TTemplate($content, $this->_contextPath, $this->_tplFile, $line, false));
 	}
 	protected function parseAttribute($value)
 	{
-		if(($n=preg_match_all('/<%[#=].*?%>/msS',$value,$matches,PREG_OFFSET_CAPTURE))>0)
-		{
-			$isDataBind=false;
-			$textStart=0;
-			$expr='';
-			for($i=0;$i<$n;++$i)
-			{
-				$match=$matches[0][$i];
-				$token=$match[0];
-				$offset=$match[1];
-				$length=strlen($token);
-				if($token[2]==='#')
-					$isDataBind=true;
-				if($offset>$textStart)
-					$expr.=".'".strtr(substr($value,$textStart,$offset-$textStart),array("'"=>"\\'","\\"=>"\\\\"))."'";
-				$expr.='.('.substr($token,3,$length-5).')';
-				$textStart=$offset+$length;
-			}
-			$length=strlen($value);
-			if($length>$textStart)
-				$expr.=".'".strtr(substr($value,$textStart,$length-$textStart),array("'"=>"\\'","\\"=>"\\\\"))."'";
-			if($isDataBind)
-				return array(self::CONFIG_DATABIND,ltrim($expr,'.'));
+		if (($n = preg_match_all('/<%[#=].*?%>/msS', $value, $matches, PREG_OFFSET_CAPTURE)) > 0)
+		{
+			$isDataBind = false;
+			$textStart = 0;
+			$expr = '';
+			for ($i = 0; $i < $n; ++$i)
+			{
+				$match = $matches[0][$i];
+				$token = $match[0];
+				$offset = $match[1];
+				$length = strlen($token);
+				if ($token[2] === '#')
+					$isDataBind = true;
+				if ($offset > $textStart)
+					$expr .= ".'" . strtr(substr($value, $textStart, $offset - $textStart), array("'"=>"\\'", "\\"=>"\\\\")) . "'";
+				$expr .= '.(' . substr($token, 3, $length - 5) . ')';
+				$textStart = $offset + $length;
+			}
+			$length = strlen($value);
+			if ($length > $textStart)
+				$expr .= ".'" . strtr(substr($value, $textStart, $length - $textStart), array("'"=>"\\'", "\\"=>"\\\\")) . "'";
+			if ($isDataBind)
+				return array(self::CONFIG_DATABIND, ltrim($expr, '.'));
 			else
-				return array(self::CONFIG_EXPRESSION,ltrim($expr,'.'));
+				return array(self::CONFIG_EXPRESSION, ltrim($expr, '.'));
 		}
-		else if(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS',$value,$matches) && $matches[0]===$value)
+		else if (preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS', $value, $matches) && $matches[0] === $value)
 		{
-			$value=$matches[1];
-			if($value[2]==='~')
-				return array(self::CONFIG_ASSET,trim(substr($value,3,strlen($value)-5)));
-			elseif($value[2]==='[')
-				return array(self::CONFIG_LOCALIZATION,trim(substr($value,3,strlen($value)-6)));
-			elseif($value[2]==='$')
-				return array(self::CONFIG_PARAMETER,trim(substr($value,3,strlen($value)-5)));
-			elseif($value[2]==='/') {
-				$literal = trim(substr($value,3,strlen($value)-5));
-				return array(self::CONFIG_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '/').'/$literal'");
+			$value = $matches[1];
+			if ($value[2] === '~')
+				return array(self::CONFIG_ASSET, trim(substr($value, 3, strlen($value) - 5)));
+			elseif ($value[2] === '[')
+				return array(self::CONFIG_LOCALIZATION, trim(substr($value, 3, strlen($value) - 6)));
+			elseif ($value[2] === '$')
+				return array(self::CONFIG_PARAMETER, trim(substr($value, 3, strlen($value) - 5)));
+			elseif ($value[2] === '/') {
+				$literal = trim(substr($value, 3, strlen($value) - 5));
+				return array(self::CONFIG_EXPRESSION, "rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '/').'/$literal'");
 			}
 		}
 		else
 			return $value;
 	}
-	protected function validateAttributes($type,$attributes)
+	protected function validateAttributes($type, $attributes)
 	{
 		Prado::using($type);
-		if(($pos=strrpos($type,'.'))!==false)
-			$className=substr($type,$pos+1);
+		if (($pos = strrpos($type, '.')) !== false)
+			$className = substr($type, $pos + 1);
 		else
-			$className=$type;
-		$class=new ReflectionClass($className);
-		if(is_subclass_of($className,'TControl') || $className==='TControl')
+			$className = $type;
+		$class = new ReflectionClass($className);
+		if (is_subclass_of($className, 'TControl') || $className === 'TControl')
 		{
-			foreach($attributes as $name=>$att)
+			foreach ($attributes as $name=>$att)
 			{
-				if(($pos=strpos($name,'.'))!==false)
+				if (($pos = strpos($name, '.')) !== false)
 				{
-										$subname=substr($name,0,$pos);
-					if(!$class->hasMethod('get'.$subname))
-						throw new TConfigurationException('template_property_unknown',$type,$subname);
+										$subname = substr($name, 0, $pos);
+					if (!$class->hasMethod('get' . $subname))
+						throw new TConfigurationException('template_property_unknown', $type, $subname);
 				}
-				else if(strncasecmp($name,'on',2)===0)
+				else if (strncasecmp($name, 'on', 2) === 0)
 				{
-										if(!$class->hasMethod($name))
-						throw new TConfigurationException('template_event_unknown',$type,$name);
-					else if(!is_string($att))
-						throw new TConfigurationException('template_eventhandler_invalid',$type,$name);
+										if (!$class->hasMethod($name))
+						throw new TConfigurationException('template_event_unknown', $type, $name);
+					else if (!is_string($att))
+						throw new TConfigurationException('template_eventhandler_invalid', $type, $name);
 				}
 				else
 				{
-										if (! ($class->hasMethod('set'.$name) || $class->hasMethod('setjs'.$name) || $this->isClassBehaviorMethod($class,'set'.$name)) )
+										if (!($class->hasMethod('set' . $name) || $class->hasMethod('setjs' . $name) || $this->isClassBehaviorMethod($class, 'set' . $name)))
 					{
-						if ($class->hasMethod('get'.$name) || $class->hasMethod('getjs'.$name))
-							throw new TConfigurationException('template_property_readonly',$type,$name);
+						if ($class->hasMethod('get' . $name) || $class->hasMethod('getjs' . $name))
+							throw new TConfigurationException('template_property_readonly', $type, $name);
 						else
-							throw new TConfigurationException('template_property_unknown',$type,$name);
+							throw new TConfigurationException('template_property_unknown', $type, $name);
 					}
-					else if(is_array($att) && $att[0]!==self::CONFIG_EXPRESSION)
+					else if (is_array($att) && $att[0] !== self::CONFIG_EXPRESSION)
 					{
-						if(strcasecmp($name,'id')===0)
-							throw new TConfigurationException('template_controlid_invalid',$type);
-						else if(strcasecmp($name,'skinid')===0)
-							throw new TConfigurationException('template_controlskinid_invalid',$type);
+						if (strcasecmp($name, 'id') === 0)
+							throw new TConfigurationException('template_controlid_invalid', $type);
+						else if (strcasecmp($name, 'skinid') === 0)
+							throw new TConfigurationException('template_controlskinid_invalid', $type);
 					}
 				}
 			}
 		}
-		else if(is_subclass_of($className,'TComponent') || $className==='TComponent')
+		else if (is_subclass_of($className, 'TComponent') || $className === 'TComponent')
 		{
-			foreach($attributes as $name=>$att)
+			foreach ($attributes as $name=>$att)
 			{
-				if(is_array($att) && ($att[0]===self::CONFIG_DATABIND))
-					throw new TConfigurationException('template_databind_forbidden',$type,$name);
-				if(($pos=strpos($name,'.'))!==false)
+				if (is_array($att) && ($att[0] === self::CONFIG_DATABIND))
+					throw new TConfigurationException('template_databind_forbidden', $type, $name);
+				if (($pos = strpos($name, '.')) !== false)
 				{
-										$subname=substr($name,0,$pos);
-					if(!$class->hasMethod('get'.$subname))
-						throw new TConfigurationException('template_property_unknown',$type,$subname);
+										$subname = substr($name, 0, $pos);
+					if (!$class->hasMethod('get' . $subname))
+						throw new TConfigurationException('template_property_unknown', $type, $subname);
 				}
-				else if(strncasecmp($name,'on',2)===0)
-					throw new TConfigurationException('template_event_forbidden',$type,$name);
+				else if (strncasecmp($name, 'on', 2) === 0)
+					throw new TConfigurationException('template_event_forbidden', $type, $name);
 				else
 				{
-										if(strcasecmp($name,'id')!==0 && !($class->hasMethod('set'.$name) || $this->isClassBehaviorMethod($class,'set'.$name)))
+										if (strcasecmp($name, 'id') !== 0 && !($class->hasMethod('set' . $name) || $this->isClassBehaviorMethod($class, 'set' . $name)))
 					{
-						if($class->hasMethod('get'.$name))
-							throw new TConfigurationException('template_property_readonly',$type,$name);
+						if ($class->hasMethod('get' . $name))
+							throw new TConfigurationException('template_property_readonly', $type, $name);
 						else
-							throw new TConfigurationException('template_property_unknown',$type,$name);
+							throw new TConfigurationException('template_property_unknown', $type, $name);
 					}
 				}
 			}
 		}
 		else
-			throw new TConfigurationException('template_component_required',$type);
+			throw new TConfigurationException('template_component_required', $type);
 	}
 	public function getIncludedFiles()
 	{
 		return $this->_includedFiles;
 	}
-	protected function handleException($e,$line,$input=null)
+	protected function handleException($e, $line, $input = null)
 	{
-		$srcFile=$this->_tplFile;
-		if(($n=count($this->_includedFiles))>0) 		{
-			for($i=$n-1;$i>=0;--$i)
+		$srcFile = $this->_tplFile;
+		if (($n = count($this->_includedFiles)) > 0) {
+			for ($i = $n - 1; $i >= 0; --$i)
 			{
-				if($this->_includeAtLine[$i]<=$line)
+				if ($this->_includeAtLine[$i] <= $line)
 				{
-					if($line<$this->_includeAtLine[$i]+$this->_includeLines[$i])
+					if ($line < $this->_includeAtLine[$i] + $this->_includeLines[$i])
 					{
-						$line=$line-$this->_includeAtLine[$i]+1;
-						$srcFile=$this->_includedFiles[$i];
+						$line = $line - $this->_includeAtLine[$i] + 1;
+						$srcFile = $this->_includedFiles[$i];
 						break;
 					}
 					else
-						$line=$line-$this->_includeLines[$i]+1;
+						$line = $line - $this->_includeLines[$i] + 1;
 				}
 			}
 		}
-		$exception=new TTemplateException('template_format_invalid',$e->getMessage());
+		$exception = new TTemplateException('template_format_invalid', $e->getMessage());
 		$exception->setLineNumber($line);
-		if(!empty($srcFile))
+		if (!empty($srcFile))
 			$exception->setTemplateFile($srcFile);
 		else
 			$exception->setTemplateSource($input);
@@ -9095,45 +9095,45 @@ 
 	}
 	protected function preprocess($input)
 	{
-		if($n=preg_match_all('/<%include(.*?)%>/',$input,$matches,PREG_SET_ORDER|PREG_OFFSET_CAPTURE))
+		if ($n = preg_match_all('/<%include(.*?)%>/', $input, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
 		{
-			for($i=0;$i<$n;++$i)
+			for ($i = 0; $i < $n; ++$i)
 			{
-				$filePath=Prado::getPathOfNamespace(trim($matches[$i][1][0]),TTemplateManager::TEMPLATE_FILE_EXT);
-				if($filePath!==null && is_file($filePath))
-					$this->_includedFiles[]=$filePath;
+				$filePath = Prado::getPathOfNamespace(trim($matches[$i][1][0]), TTemplateManager::TEMPLATE_FILE_EXT);
+				if ($filePath !== null && is_file($filePath))
+					$this->_includedFiles[] = $filePath;
 				else
 				{
-					$errorLine=count(explode("\n",substr($input,0,$matches[$i][0][1]+1)));
-					$this->handleException(new TConfigurationException('template_include_invalid',trim($matches[$i][1][0])),$errorLine,$input);
+					$errorLine = count(explode("\n", substr($input, 0, $matches[$i][0][1] + 1)));
+					$this->handleException(new TConfigurationException('template_include_invalid', trim($matches[$i][1][0])), $errorLine, $input);
 				}
 			}
-			$base=0;
-			for($i=0;$i<$n;++$i)
+			$base = 0;
+			for ($i = 0; $i < $n; ++$i)
 			{
-				$ext=file_get_contents($this->_includedFiles[$i]);
-				$length=strlen($matches[$i][0][0]);
-				$offset=$base+$matches[$i][0][1];
-				$this->_includeAtLine[$i]=count(explode("\n",substr($input,0,$offset)));
-				$this->_includeLines[$i]=count(explode("\n",$ext));
-				$input=substr_replace($input,$ext,$offset,$length);
-				$base+=strlen($ext)-$length;
+				$ext = file_get_contents($this->_includedFiles[$i]);
+				$length = strlen($matches[$i][0][0]);
+				$offset = $base + $matches[$i][0][1];
+				$this->_includeAtLine[$i] = count(explode("\n", substr($input, 0, $offset)));
+				$this->_includeLines[$i] = count(explode("\n", $ext));
+				$input = substr_replace($input, $ext, $offset, $length);
+				$base += strlen($ext) - $length;
 			}
 		}
 		return $input;
 	}
-	protected function isClassBehaviorMethod(ReflectionClass $class,$method)
+	protected function isClassBehaviorMethod(ReflectionClass $class, $method)
 	{
-	  $component=new ReflectionClass('TComponent');
-	  $behaviors=$component->getStaticProperties();
-	  if(!isset($behaviors['_um']))
+	  $component = new ReflectionClass('TComponent');
+	  $behaviors = $component->getStaticProperties();
+	  if (!isset($behaviors['_um']))
 	    return false;
-	  foreach($behaviors['_um'] as $name=>$list)
+	  foreach ($behaviors['_um'] as $name=>$list)
 	  {
-	    if(strtolower($class->getShortName())!==$name && !$class->isSubclassOf($name)) continue;
-	    foreach($list as $param)
+	    if (strtolower($class->getShortName()) !== $name && !$class->isSubclassOf($name)) continue;
+	    foreach ($list as $param)
 	    {
-	      if(method_exists($param->getBehavior(),$method))
+	      if (method_exists($param->getBehavior(), $method))
 	        return true;
 	    }
 	  }
@@ -9142,177 +9142,177 @@ 
 }
 class TThemeManager extends TModule
 {
-	const DEFAULT_BASEPATH='themes';
+	const DEFAULT_BASEPATH = 'themes';
 	const DEFAULT_THEMECLASS = 'TTheme';
-	private $_themeClass=self::DEFAULT_THEMECLASS;
-	private $_initialized=false;
-	private $_basePath=null;
-	private $_baseUrl=null;
+	private $_themeClass = self::DEFAULT_THEMECLASS;
+	private $_initialized = false;
+	private $_basePath = null;
+	private $_baseUrl = null;
 	public function init($config)
 	{
-		$this->_initialized=true;
-		$service=$this->getService();
-		if($service instanceof TPageService)
+		$this->_initialized = true;
+		$service = $this->getService();
+		if ($service instanceof TPageService)
 			$service->setThemeManager($this);
 		else
 			throw new TConfigurationException('thememanager_service_unavailable');
 	}
 	public function getTheme($name)
 	{
-		$themePath=$this->getBasePath().DIRECTORY_SEPARATOR.$name;
-		$themeUrl=rtrim($this->getBaseUrl(),'/').'/'.$name;
+		$themePath = $this->getBasePath() . DIRECTORY_SEPARATOR . $name;
+		$themeUrl = rtrim($this->getBaseUrl(), '/') . '/' . $name;
 		return Prado::createComponent($this->getThemeClass(), $themePath, $themeUrl);
 	}
 	public function setThemeClass($class) {
-		$this->_themeClass = $class===null ? self::DEFAULT_THEMECLASS : (string)$class;
+		$this->_themeClass = $class === null ? self::DEFAULT_THEMECLASS : (string) $class;
 	}
 	public function getThemeClass() {
 		return $this->_themeClass;
 	}
 	public function getAvailableThemes()
 	{
-		$themes=array();
-		$basePath=$this->getBasePath();
-		$folder=@opendir($basePath);
-		while($file=@readdir($folder))
+		$themes = array();
+		$basePath = $this->getBasePath();
+		$folder = @opendir($basePath);
+		while ($file = @readdir($folder))
 		{
-			if($file!=='.' && $file!=='..' && $file!=='.svn' && is_dir($basePath.DIRECTORY_SEPARATOR.$file))
-				$themes[]=$file;
+			if ($file !== '.' && $file !== '..' && $file !== '.svn' && is_dir($basePath . DIRECTORY_SEPARATOR . $file))
+				$themes[] = $file;
 		}
 		closedir($folder);
 		return $themes;
 	}
 	public function getBasePath()
 	{
-		if($this->_basePath===null)
+		if ($this->_basePath === null)
 		{
-			$this->_basePath=dirname($this->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
-			if(($basePath=realpath($this->_basePath))===false || !is_dir($basePath))
-				throw new TConfigurationException('thememanager_basepath_invalid2',$this->_basePath);
-			$this->_basePath=$basePath;
+			$this->_basePath = dirname($this->getRequest()->getApplicationFilePath()) . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
+			if (($basePath = realpath($this->_basePath)) === false || !is_dir($basePath))
+				throw new TConfigurationException('thememanager_basepath_invalid2', $this->_basePath);
+			$this->_basePath = $basePath;
 		}
 		return $this->_basePath;
 	}
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('thememanager_basepath_unchangeable');
 		else
 		{
-			$this->_basePath=Prado::getPathOfNamespace($value);
-			if($this->_basePath===null || !is_dir($this->_basePath))
-				throw new TInvalidDataValueException('thememanager_basepath_invalid',$value);
+			$this->_basePath = Prado::getPathOfNamespace($value);
+			if ($this->_basePath === null || !is_dir($this->_basePath))
+				throw new TInvalidDataValueException('thememanager_basepath_invalid', $value);
 		}
 	}
 	public function getBaseUrl()
 	{
-		if($this->_baseUrl===null)
+		if ($this->_baseUrl === null)
 		{
-			$appPath=dirname($this->getRequest()->getApplicationFilePath());
-			$basePath=$this->getBasePath();
-			if(strpos($basePath,$appPath)===false)
+			$appPath = dirname($this->getRequest()->getApplicationFilePath());
+			$basePath = $this->getBasePath();
+			if (strpos($basePath, $appPath) === false)
 				throw new TConfigurationException('thememanager_baseurl_required');
-			$appUrl=rtrim(dirname($this->getRequest()->getApplicationUrl()),'/\\');
-			$this->_baseUrl=$appUrl.strtr(substr($basePath,strlen($appPath)),'\\','/');
+			$appUrl = rtrim(dirname($this->getRequest()->getApplicationUrl()), '/\\');
+			$this->_baseUrl = $appUrl . strtr(substr($basePath, strlen($appPath)), '\\', '/');
 		}
 		return $this->_baseUrl;
 	}
 	public function setBaseUrl($value)
 	{
-		$this->_baseUrl=rtrim($value,'/');
+		$this->_baseUrl = rtrim($value, '/');
 	}
 }
 class TTheme extends TApplicationComponent implements ITheme
 {
-	const THEME_CACHE_PREFIX='prado:theme:';
-	const SKIN_FILE_EXT='.skin';
+	const THEME_CACHE_PREFIX = 'prado:theme:';
+	const SKIN_FILE_EXT = '.skin';
 	private $_themePath;
 	private $_themeUrl;
-	private $_skins=null;
-	private $_name='';
-	private $_cssFiles=array();
-	private $_jsFiles=array();
-	public function __construct($themePath,$themeUrl)
-	{
-		$this->_themeUrl=$themeUrl;
-		$this->_themePath=realpath($themePath);
-		$this->_name=basename($themePath);
-		$cacheValid=false;
-				if(($cache=$this->getApplication()->getCache())!==null)
-		{
-			$array=$cache->get(self::THEME_CACHE_PREFIX.$themePath);
-			if(is_array($array))
-			{
-				list($skins,$cssFiles,$jsFiles,$timestamp)=$array;
-				if($this->getApplication()->getMode()!==TApplicationMode::Performance)
+	private $_skins = null;
+	private $_name = '';
+	private $_cssFiles = array();
+	private $_jsFiles = array();
+	public function __construct($themePath, $themeUrl)
+	{
+		$this->_themeUrl = $themeUrl;
+		$this->_themePath = realpath($themePath);
+		$this->_name = basename($themePath);
+		$cacheValid = false;
+				if (($cache = $this->getApplication()->getCache()) !== null)
+		{
+			$array = $cache->get(self::THEME_CACHE_PREFIX . $themePath);
+			if (is_array($array))
+			{
+				list($skins, $cssFiles, $jsFiles, $timestamp) = $array;
+				if ($this->getApplication()->getMode() !== TApplicationMode::Performance)
 				{
-					if(($dir=opendir($themePath))===false)
-						throw new TIOException('theme_path_inexistent',$themePath);
-					$cacheValid=true;
-					while(($file=readdir($dir))!==false)
+					if (($dir = opendir($themePath)) === false)
+						throw new TIOException('theme_path_inexistent', $themePath);
+					$cacheValid = true;
+					while (($file = readdir($dir)) !== false)
 					{
-						if($file==='.' || $file==='..')
+						if ($file === '.' || $file === '..')
 							continue;
-						else if(basename($file,'.css')!==$file)
-							$this->_cssFiles[]=$themeUrl.'/'.$file;
-						else if(basename($file,'.js')!==$file)
-							$this->_jsFiles[]=$themeUrl.'/'.$file;
-						else if(basename($file,self::SKIN_FILE_EXT)!==$file && filemtime($themePath.DIRECTORY_SEPARATOR.$file)>$timestamp)
+						else if (basename($file, '.css') !== $file)
+							$this->_cssFiles[] = $themeUrl . '/' . $file;
+						else if (basename($file, '.js') !== $file)
+							$this->_jsFiles[] = $themeUrl . '/' . $file;
+						else if (basename($file, self::SKIN_FILE_EXT) !== $file && filemtime($themePath . DIRECTORY_SEPARATOR . $file) > $timestamp)
 						{
-							$cacheValid=false;
+							$cacheValid = false;
 							break;
 						}
 					}
 					closedir($dir);
-					if($cacheValid)
-						$this->_skins=$skins;
+					if ($cacheValid)
+						$this->_skins = $skins;
 				}
 				else
 				{
-					$cacheValid=true;
-					$this->_cssFiles=$cssFiles;
-					$this->_jsFiles=$jsFiles;
-					$this->_skins=$skins;
+					$cacheValid = true;
+					$this->_cssFiles = $cssFiles;
+					$this->_jsFiles = $jsFiles;
+					$this->_skins = $skins;
 				}
 			}
 		}
-		if(!$cacheValid)
+		if (!$cacheValid)
 		{
-			$this->_cssFiles=array();
-			$this->_jsFiles=array();
-			$this->_skins=array();
-			if(($dir=opendir($themePath))===false)
-				throw new TIOException('theme_path_inexistent',$themePath);
-			while(($file=readdir($dir))!==false)
+			$this->_cssFiles = array();
+			$this->_jsFiles = array();
+			$this->_skins = array();
+			if (($dir = opendir($themePath)) === false)
+				throw new TIOException('theme_path_inexistent', $themePath);
+			while (($file = readdir($dir)) !== false)
 			{
-				if($file==='.' || $file==='..')
+				if ($file === '.' || $file === '..')
 					continue;
-				else if(basename($file,'.css')!==$file)
-					$this->_cssFiles[]=$themeUrl.'/'.$file;
-				else if(basename($file,'.js')!==$file)
-					$this->_jsFiles[]=$themeUrl.'/'.$file;
-				else if(basename($file,self::SKIN_FILE_EXT)!==$file)
+				else if (basename($file, '.css') !== $file)
+					$this->_cssFiles[] = $themeUrl . '/' . $file;
+				else if (basename($file, '.js') !== $file)
+					$this->_jsFiles[] = $themeUrl . '/' . $file;
+				else if (basename($file, self::SKIN_FILE_EXT) !== $file)
 				{
-					$template=new TTemplate(file_get_contents($themePath.'/'.$file),$themePath,$themePath.'/'.$file);
-					foreach($template->getItems() as $skin)
+					$template = new TTemplate(file_get_contents($themePath . '/' . $file), $themePath, $themePath . '/' . $file);
+					foreach ($template->getItems() as $skin)
 					{
-						if(!isset($skin[2]))  							continue;
-						else if($skin[0]!==-1)
-							throw new TConfigurationException('theme_control_nested',$skin[1],dirname($themePath));
-						$type=$skin[1];
-						$id=isset($skin[2]['skinid'])?$skin[2]['skinid']:0;
+						if (!isset($skin[2]))  							continue;
+						else if ($skin[0] !== -1)
+							throw new TConfigurationException('theme_control_nested', $skin[1], dirname($themePath));
+						$type = $skin[1];
+						$id = isset($skin[2]['skinid']) ? $skin[2]['skinid'] : 0;
 						unset($skin[2]['skinid']);
-						if(isset($this->_skins[$type][$id]))
-							throw new TConfigurationException('theme_skinid_duplicated',$type,$id,dirname($themePath));
-						$this->_skins[$type][$id]=$skin[2];
+						if (isset($this->_skins[$type][$id]))
+							throw new TConfigurationException('theme_skinid_duplicated', $type, $id, dirname($themePath));
+						$this->_skins[$type][$id] = $skin[2];
 					}
 				}
 			}
 			closedir($dir);
 			sort($this->_cssFiles);
 			sort($this->_jsFiles);
-			if($cache!==null)
-				$cache->set(self::THEME_CACHE_PREFIX.$themePath,array($this->_skins,$this->_cssFiles,$this->_jsFiles,time()));
+			if ($cache !== null)
+				$cache->set(self::THEME_CACHE_PREFIX . $themePath, array($this->_skins, $this->_cssFiles, $this->_jsFiles, time()));
 		}
 	}
 	public function getName()
@@ -9329,7 +9329,7 @@ 
 	}
 	protected function setBaseUrl($value)
 	{
-		$this->_themeUrl=rtrim($value,'/');
+		$this->_themeUrl = rtrim($value, '/');
 	}
 	public function getBasePath()
 	{
@@ -9337,7 +9337,7 @@ 
 	}
 	protected function setBasePath($value)
 	{
-		$this->_themePath=$value;
+		$this->_themePath = $value;
 	}
 	public function getSkins()
 	{
@@ -9349,57 +9349,57 @@ 
 	}
 	public function applySkin($control)
 	{
-		$type=get_class($control);
-		if(($id=$control->getSkinID())==='')
-			$id=0;
-		if(isset($this->_skins[$type][$id]))
+		$type = get_class($control);
+		if (($id = $control->getSkinID()) === '')
+			$id = 0;
+		if (isset($this->_skins[$type][$id]))
 		{
-			foreach($this->_skins[$type][$id] as $name=>$value)
+			foreach ($this->_skins[$type][$id] as $name=>$value)
 			{
-				if(is_array($value))
+				if (is_array($value))
 				{
-					switch($value[0])
+					switch ($value[0])
 					{
 						case TTemplate::CONFIG_EXPRESSION:
-							$value=$this->evaluateExpression($value[1]);
+							$value = $this->evaluateExpression($value[1]);
 							break;
 						case TTemplate::CONFIG_ASSET:
-							$value=$this->_themeUrl.'/'.ltrim($value[1],'/');
+							$value = $this->_themeUrl . '/' . ltrim($value[1], '/');
 							break;
 						case TTemplate::CONFIG_DATABIND:
-							$control->bindProperty($name,$value[1]);
+							$control->bindProperty($name, $value[1]);
 							break;
 						case TTemplate::CONFIG_PARAMETER:
-							$control->setSubProperty($name,$this->getApplication()->getParameters()->itemAt($value[1]));
+							$control->setSubProperty($name, $this->getApplication()->getParameters()->itemAt($value[1]));
 							break;
 						case TTemplate::CONFIG_TEMPLATE:
-							$control->setSubProperty($name,$value[1]);
+							$control->setSubProperty($name, $value[1]);
 							break;
 						case TTemplate::CONFIG_LOCALIZATION:
-							$control->setSubProperty($name,Prado::localize($value[1]));
+							$control->setSubProperty($name, Prado::localize($value[1]));
 							break;
 						default:
-							throw new TConfigurationException('theme_tag_unexpected',$name,$value[0]);
+							throw new TConfigurationException('theme_tag_unexpected', $name, $value[0]);
 							break;
 					}
 				}
-				if(!is_array($value))
+				if (!is_array($value))
 				{
-					if(strpos($name,'.')===false)						{
-						if($control->hasProperty($name))
+					if (strpos($name, '.') === false) {
+						if ($control->hasProperty($name))
 						{
-							if($control->canSetProperty($name))
+							if ($control->canSetProperty($name))
 							{
-								$setter='set'.$name;
+								$setter = 'set' . $name;
 								$control->$setter($value);
 							}
 							else
-								throw new TConfigurationException('theme_property_readonly',$type,$name);
+								throw new TConfigurationException('theme_property_readonly', $type, $name);
 						}
 						else
-							throw new TConfigurationException('theme_property_undefined',$type,$name);
+							throw new TConfigurationException('theme_property_undefined', $type, $name);
 					}
-					else							$control->setSubProperty($name,$value);
+					else							$control->setSubProperty($name, $value);
 				}
 			}
 			return true;
@@ -9413,7 +9413,7 @@ 
 	}
 	protected function setStyleSheetFiles($value)
 	{
-		$this->_cssFiles=$value;
+		$this->_cssFiles = $value;
 	}
 	public function getJavaScriptFiles()
 	{
@@ -9421,176 +9421,176 @@ 
 	}
 	protected function setJavaScriptFiles($value)
 	{
-		$this->_jsFiles=$value;
+		$this->_jsFiles = $value;
 	}
 }
 class TPageService extends TService
 {
-	const CONFIG_FILE_XML='config.xml';
-	const CONFIG_FILE_PHP='config.php';
-	const DEFAULT_BASEPATH='Pages';
-	const FALLBACK_BASEPATH='pages';
-	const CONFIG_CACHE_PREFIX='prado:pageservice:';
-	const PAGE_FILE_EXT='.page';
-	private $_basePath=null;
-	private $_basePageClass='TPage';
-	private $_clientScriptManagerClass='System.Web.UI.TClientScriptManager';
-	private $_defaultPage='Home';
-	private $_pagePath=null;
-	private $_page=null;
-	private $_properties=array();
-	private $_initialized=false;
-	private $_themeManager=null;
-	private $_templateManager=null;
+	const CONFIG_FILE_XML = 'config.xml';
+	const CONFIG_FILE_PHP = 'config.php';
+	const DEFAULT_BASEPATH = 'Pages';
+	const FALLBACK_BASEPATH = 'pages';
+	const CONFIG_CACHE_PREFIX = 'prado:pageservice:';
+	const PAGE_FILE_EXT = '.page';
+	private $_basePath = null;
+	private $_basePageClass = 'TPage';
+	private $_clientScriptManagerClass = 'System.Web.UI.TClientScriptManager';
+	private $_defaultPage = 'Home';
+	private $_pagePath = null;
+	private $_page = null;
+	private $_properties = array();
+	private $_initialized = false;
+	private $_themeManager = null;
+	private $_templateManager = null;
 	public function init($config)
 	{
-		$pageConfig=$this->loadPageConfig($config);
+		$pageConfig = $this->loadPageConfig($config);
 		$this->initPageContext($pageConfig);
-		$this->_initialized=true;
+		$this->_initialized = true;
 	}
 	protected function initPageContext($pageConfig)
 	{
-		$application=$this->getApplication();
-		foreach($pageConfig->getApplicationConfigurations() as $appConfig)
+		$application = $this->getApplication();
+		foreach ($pageConfig->getApplicationConfigurations() as $appConfig)
 			$application->applyConfiguration($appConfig);
 		$this->applyConfiguration($pageConfig);
 	}
 	protected function applyConfiguration($config)
 	{
-				$this->_properties=array_merge($this->_properties, $config->getProperties());
+				$this->_properties = array_merge($this->_properties, $config->getProperties());
 		$this->getApplication()->getAuthorizationRules()->mergeWith($config->getRules());
-		$pagePath=$this->getRequestedPagePath();
-				foreach($config->getExternalConfigurations() as $filePath=>$params)
-		{
-			list($configPagePath,$condition)=$params;
-			if($condition!==true)
-				$condition=$this->evaluateExpression($condition);
-			if($condition)
-			{
-				if(($path=Prado::getPathOfNamespace($filePath,Prado::getApplication()->getConfigurationFileExt()))===null || !is_file($path))
-					throw new TConfigurationException('pageservice_includefile_invalid',$filePath);
-				$c=new TPageConfiguration($pagePath);
-				$c->loadFromFile($path,$configPagePath);
+		$pagePath = $this->getRequestedPagePath();
+				foreach ($config->getExternalConfigurations() as $filePath=>$params)
+		{
+			list($configPagePath, $condition) = $params;
+			if ($condition !== true)
+				$condition = $this->evaluateExpression($condition);
+			if ($condition)
+			{
+				if (($path = Prado::getPathOfNamespace($filePath, Prado::getApplication()->getConfigurationFileExt())) === null || !is_file($path))
+					throw new TConfigurationException('pageservice_includefile_invalid', $filePath);
+				$c = new TPageConfiguration($pagePath);
+				$c->loadFromFile($path, $configPagePath);
 				$this->applyConfiguration($c);
 			}
 		}
 	}
 	protected function determineRequestedPagePath()
 	{
-		$pagePath=$this->getRequest()->getServiceParameter();
-		if(empty($pagePath))
-			$pagePath=$this->getDefaultPage();
+		$pagePath = $this->getRequest()->getServiceParameter();
+		if (empty($pagePath))
+			$pagePath = $this->getDefaultPage();
 		return $pagePath;
 	}
 	protected function loadPageConfig($config)
 	{
-		$application=$this->getApplication();
-		$pagePath=$this->getRequestedPagePath();
-		if(($cache=$application->getCache())===null)
+		$application = $this->getApplication();
+		$pagePath = $this->getRequestedPagePath();
+		if (($cache = $application->getCache()) === null)
 		{
-			$pageConfig=new TPageConfiguration($pagePath);
-			if($config!==null)
+			$pageConfig = new TPageConfiguration($pagePath);
+			if ($config !== null)
 			{
-				if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-					$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
+				if ($application->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+					$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
 				else
-					$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
+					$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
 			}
 			$pageConfig->loadFromFiles($this->getBasePath());
 		}
 		else
 		{
-			$configCached=true;
-			$currentTimestamp=array();
-			$arr=$cache->get(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath);
-			if(is_array($arr))
+			$configCached = true;
+			$currentTimestamp = array();
+			$arr = $cache->get(self::CONFIG_CACHE_PREFIX . $this->getID() . $pagePath);
+			if (is_array($arr))
 			{
-				list($pageConfig,$timestamps)=$arr;
-				if($application->getMode()!==TApplicationMode::Performance)
+				list($pageConfig, $timestamps) = $arr;
+				if ($application->getMode() !== TApplicationMode::Performance)
 				{
-					foreach($timestamps as $fileName=>$timestamp)
+					foreach ($timestamps as $fileName=>$timestamp)
 					{
-						if($fileName===0) 						{
-							$appConfigFile=$application->getConfigurationFile();
-							$currentTimestamp[0]=$appConfigFile===null?0:@filemtime($appConfigFile);
-							if($currentTimestamp[0]>$timestamp || ($timestamp>0 && !$currentTimestamp[0]))
-								$configCached=false;
+						if ($fileName === 0) {
+							$appConfigFile = $application->getConfigurationFile();
+							$currentTimestamp[0] = $appConfigFile === null ? 0 : @filemtime($appConfigFile);
+							if ($currentTimestamp[0] > $timestamp || ($timestamp > 0 && !$currentTimestamp[0]))
+								$configCached = false;
 						}
 						else
 						{
-							$currentTimestamp[$fileName]=@filemtime($fileName);
-							if($currentTimestamp[$fileName]>$timestamp || ($timestamp>0 && !$currentTimestamp[$fileName]))
-								$configCached=false;
+							$currentTimestamp[$fileName] = @filemtime($fileName);
+							if ($currentTimestamp[$fileName] > $timestamp || ($timestamp > 0 && !$currentTimestamp[$fileName]))
+								$configCached = false;
 						}
 					}
 				}
 			}
 			else
 			{
-				$configCached=false;
-				$paths=explode('.',$pagePath);
-				$configPath=$this->getBasePath();
-				$fileName = $this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
+				$configCached = false;
+				$paths = explode('.', $pagePath);
+				$configPath = $this->getBasePath();
+				$fileName = $this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP
 					? self::CONFIG_FILE_PHP
 					: self::CONFIG_FILE_XML;
-				foreach($paths as $path)
+				foreach ($paths as $path)
 				{
-					$configFile=$configPath.DIRECTORY_SEPARATOR.$fileName;
-					$currentTimestamp[$configFile]=@filemtime($configFile);
-					$configPath.=DIRECTORY_SEPARATOR.$path;
+					$configFile = $configPath . DIRECTORY_SEPARATOR . $fileName;
+					$currentTimestamp[$configFile] = @filemtime($configFile);
+					$configPath .= DIRECTORY_SEPARATOR . $path;
 				}
-				$appConfigFile=$application->getConfigurationFile();
-				$currentTimestamp[0]=$appConfigFile===null?0:@filemtime($appConfigFile);
+				$appConfigFile = $application->getConfigurationFile();
+				$currentTimestamp[0] = $appConfigFile === null ? 0 : @filemtime($appConfigFile);
 			}
-			if(!$configCached)
+			if (!$configCached)
 			{
-				$pageConfig=new TPageConfiguration($pagePath);
-				if($config!==null)
+				$pageConfig = new TPageConfiguration($pagePath);
+				if ($config !== null)
 				{
-					if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-						$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
+					if ($application->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+						$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
 					else
-						$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
+						$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
 				}
 				$pageConfig->loadFromFiles($this->getBasePath());
-				$cache->set(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath,array($pageConfig,$currentTimestamp));
+				$cache->set(self::CONFIG_CACHE_PREFIX . $this->getID() . $pagePath, array($pageConfig, $currentTimestamp));
 			}
 		}
 		return $pageConfig;
 	}
 	public function getTemplateManager()
 	{
-		if(!$this->_templateManager)
+		if (!$this->_templateManager)
 		{
-			$this->_templateManager=new TTemplateManager;
+			$this->_templateManager = new TTemplateManager;
 			$this->_templateManager->init(null);
 		}
 		return $this->_templateManager;
 	}
 	public function setTemplateManager(TTemplateManager $value)
 	{
-		$this->_templateManager=$value;
+		$this->_templateManager = $value;
 	}
 	public function getThemeManager()
 	{
-		if(!$this->_themeManager)
+		if (!$this->_themeManager)
 		{
-			$this->_themeManager=new TThemeManager;
+			$this->_themeManager = new TThemeManager;
 			$this->_themeManager->init(null);
 		}
 		return $this->_themeManager;
 	}
 	public function setThemeManager(TThemeManager $value)
 	{
-		$this->_themeManager=$value;
+		$this->_themeManager = $value;
 	}
 	public function getRequestedPagePath()
 	{
-		if($this->_pagePath===null)
+		if ($this->_pagePath === null)
 		{
-			$this->_pagePath=strtr($this->determineRequestedPagePath(),'/\\','..');
-			if(empty($this->_pagePath))
-				throw new THttpException(404,'pageservice_page_required');
+			$this->_pagePath = strtr($this->determineRequestedPagePath(), '/\\', '..');
+			if (empty($this->_pagePath))
+				throw new THttpException(404, 'pageservice_page_required');
 		}
 		return $this->_pagePath;
 	}
@@ -9604,10 +9604,10 @@ 
 	}
 	public function setDefaultPage($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('pageservice_defaultpage_unchangeable');
 		else
-			$this->_defaultPage=$value;
+			$this->_defaultPage = $value;
 	}
 	public function getDefaultPageUrl()
 	{
@@ -9615,29 +9615,29 @@ 
 	}
 	public function getBasePath()
 	{
-		if($this->_basePath===null)
+		if ($this->_basePath === null)
 		{
-			$basePath=$this->getApplication()->getBasePath().DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
-			if(($this->_basePath=realpath($basePath))===false || !is_dir($this->_basePath))
+			$basePath = $this->getApplication()->getBasePath() . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
+			if (($this->_basePath = realpath($basePath)) === false || !is_dir($this->_basePath))
 			{
-				$basePath=$this->getApplication()->getBasePath().DIRECTORY_SEPARATOR.self::FALLBACK_BASEPATH;
-				if(($this->_basePath=realpath($basePath))===false || !is_dir($this->_basePath))
-					throw new TConfigurationException('pageservice_basepath_invalid',$basePath);
+				$basePath = $this->getApplication()->getBasePath() . DIRECTORY_SEPARATOR . self::FALLBACK_BASEPATH;
+				if (($this->_basePath = realpath($basePath)) === false || !is_dir($this->_basePath))
+					throw new TConfigurationException('pageservice_basepath_invalid', $basePath);
 			}
 		}
 		return $this->_basePath;
 	}
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('pageservice_basepath_unchangeable');
-		else if(($path=Prado::getPathOfNamespace($value))===null || !is_dir($path))
-			throw new TConfigurationException('pageservice_basepath_invalid',$value);
-		$this->_basePath=realpath($path);
+		else if (($path = Prado::getPathOfNamespace($value)) === null || !is_dir($path))
+			throw new TConfigurationException('pageservice_basepath_invalid', $value);
+		$this->_basePath = realpath($path);
 	}
 	public function setBasePageClass($value)
 	{
-		$this->_basePageClass=$value;
+		$this->_basePageClass = $value;
 	}
 	public function getBasePageClass()
 	{
@@ -9645,7 +9645,7 @@ 
 	}
 	public function setClientScriptManagerClass($value)
 	{
-		$this->_clientScriptManagerClass=$value;
+		$this->_clientScriptManagerClass = $value;
 	}
 	public function getClientScriptManagerClass()
 	{
@@ -9653,58 +9653,58 @@ 
 	}
 	public function run()
 	{
-		$this->_page=$this->createPage($this->getRequestedPagePath());
-		$this->runPage($this->_page,$this->_properties);
+		$this->_page = $this->createPage($this->getRequestedPagePath());
+		$this->runPage($this->_page, $this->_properties);
 	}
 	protected function createPage($pagePath)
 	{
-		$path=$this->getBasePath().DIRECTORY_SEPARATOR.strtr($pagePath,'.',DIRECTORY_SEPARATOR);
-		$hasTemplateFile=is_file($path.self::PAGE_FILE_EXT);
-		$hasClassFile=is_file($path.Prado::CLASS_FILE_EXT);
-		if(!$hasTemplateFile && !$hasClassFile)
-			throw new THttpException(404,'pageservice_page_unknown',$pagePath);
-		if($hasClassFile)
+		$path = $this->getBasePath() . DIRECTORY_SEPARATOR . strtr($pagePath, '.', DIRECTORY_SEPARATOR);
+		$hasTemplateFile = is_file($path . self::PAGE_FILE_EXT);
+		$hasClassFile = is_file($path . Prado::CLASS_FILE_EXT);
+		if (!$hasTemplateFile && !$hasClassFile)
+			throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
+		if ($hasClassFile)
 		{
-			$className=basename($path);
-			if(!class_exists($className,false))
-				include_once($path.Prado::CLASS_FILE_EXT);
+			$className = basename($path);
+			if (!class_exists($className, false))
+				include_once($path . Prado::CLASS_FILE_EXT);
 		}
 		else
 		{
-			$className=$this->getBasePageClass();
+			$className = $this->getBasePageClass();
 			Prado::using($className);
-			if(($pos=strrpos($className,'.'))!==false)
-				$className=substr($className,$pos+1);
+			if (($pos = strrpos($className, '.')) !== false)
+				$className = substr($className, $pos + 1);
 		}
- 		if(!class_exists($className,false) || ($className!=='TPage' && !is_subclass_of($className,'TPage')))
-			throw new THttpException(404,'pageservice_page_unknown',$pagePath);
-		$page=Prado::createComponent($className);
+ 		if (!class_exists($className, false) || ($className !== 'TPage' && !is_subclass_of($className, 'TPage')))
+			throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
+		$page = Prado::createComponent($className);
 		$page->setPagePath($pagePath);
-		if($hasTemplateFile)
-			$page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path.self::PAGE_FILE_EXT));
+		if ($hasTemplateFile)
+			$page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path . self::PAGE_FILE_EXT));
 		return $page;
 	}
-	protected function runPage($page,$properties)
+	protected function runPage($page, $properties)
 	{
-		foreach($properties as $name=>$value)
-			$page->setSubProperty($name,$value);
+		foreach ($properties as $name=>$value)
+			$page->setSubProperty($name, $value);
 		$page->run($this->getResponse()->createHtmlWriter());
 	}
-	public function constructUrl($pagePath,$getParams=null,$encodeAmpersand=true,$encodeGetItems=true)
+	public function constructUrl($pagePath, $getParams = null, $encodeAmpersand = true, $encodeGetItems = true)
 	{
-		return $this->getRequest()->constructUrl($this->getID(),$pagePath,$getParams,$encodeAmpersand,$encodeGetItems);
+		return $this->getRequest()->constructUrl($this->getID(), $pagePath, $getParams, $encodeAmpersand, $encodeGetItems);
 	}
 }
 class TPageConfiguration extends TComponent
 {
-	private $_appConfigs=array();
-	private $_properties=array();
-	private $_rules=array();
-	private $_includes=array();
-	private $_pagePath='';
+	private $_appConfigs = array();
+	private $_properties = array();
+	private $_rules = array();
+	private $_includes = array();
+	private $_pagePath = '';
 	public function __construct($pagePath)
 	{
-		$this->_pagePath=$pagePath;
+		$this->_pagePath = $pagePath;
 	}
 	public function getExternalConfigurations()
 	{
@@ -9724,236 +9724,236 @@ 
 	}
 	public function loadFromFiles($basePath)
 	{
-		$paths=explode('.',$this->_pagePath);
-		$page=array_pop($paths);
-		$path=$basePath;
-		$configPagePath='';
-		$fileName = Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
+		$paths = explode('.', $this->_pagePath);
+		$page = array_pop($paths);
+		$path = $basePath;
+		$configPagePath = '';
+		$fileName = Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP
 			? TPageService::CONFIG_FILE_PHP
 			: TPageService::CONFIG_FILE_XML;
-		foreach($paths as $p)
+		foreach ($paths as $p)
 		{
-			$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName,$configPagePath);
-			$path.=DIRECTORY_SEPARATOR.$p;
-			if($configPagePath==='')
-				$configPagePath=$p;
+			$this->loadFromFile($path . DIRECTORY_SEPARATOR . $fileName, $configPagePath);
+			$path .= DIRECTORY_SEPARATOR . $p;
+			if ($configPagePath === '')
+				$configPagePath = $p;
 			else
-				$configPagePath.='.'.$p;
+				$configPagePath .= '.' . $p;
 		}
-		$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName,$configPagePath);
-		$this->_rules=new TAuthorizationRuleCollection($this->_rules);
+		$this->loadFromFile($path . DIRECTORY_SEPARATOR . $fileName, $configPagePath);
+		$this->_rules = new TAuthorizationRuleCollection($this->_rules);
 	}
-	public function loadFromFile($fname,$configPagePath)
+	public function loadFromFile($fname, $configPagePath)
 	{
-		if(empty($fname) || !is_file($fname))
+		if (empty($fname) || !is_file($fname))
 			return;
-		if(Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
+		if (Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 		{
 			$fcontent = include $fname;
-			$this->loadFromPhp($fcontent,dirname($fname),$configPagePath);
+			$this->loadFromPhp($fcontent, dirname($fname), $configPagePath);
 		}
 		else
 		{
-			$dom=new TXmlDocument;
-			if($dom->loadFromFile($fname))
-				$this->loadFromXml($dom,dirname($fname),$configPagePath);
+			$dom = new TXmlDocument;
+			if ($dom->loadFromFile($fname))
+				$this->loadFromXml($dom, dirname($fname), $configPagePath);
 			else
-				throw new TConfigurationException('pageserviceconf_file_invalid',$fname);
+				throw new TConfigurationException('pageserviceconf_file_invalid', $fname);
 		}
 	}
-	public function loadFromPhp($config,$configPath,$configPagePath)
+	public function loadFromPhp($config, $configPath, $configPagePath)
 	{
-		$this->loadApplicationConfigurationFromPhp($config,$configPath);
-		$this->loadPageConfigurationFromPhp($config,$configPath,$configPagePath);
+		$this->loadApplicationConfigurationFromPhp($config, $configPath);
+		$this->loadPageConfigurationFromPhp($config, $configPath, $configPagePath);
 	}
-	public function loadFromXml($dom,$configPath,$configPagePath)
+	public function loadFromXml($dom, $configPath, $configPagePath)
 	{
-		$this->loadApplicationConfigurationFromXml($dom,$configPath);
-		$this->loadPageConfigurationFromXml($dom,$configPath,$configPagePath);
+		$this->loadApplicationConfigurationFromXml($dom, $configPath);
+		$this->loadPageConfigurationFromXml($dom, $configPath, $configPagePath);
 	}
-	public function loadApplicationConfigurationFromPhp($config,$configPath)
+	public function loadApplicationConfigurationFromPhp($config, $configPath)
 	{
-		$appConfig=new TApplicationConfiguration;
-		$appConfig->loadFromPhp($config,$configPath);
-		$this->_appConfigs[]=$appConfig;
+		$appConfig = new TApplicationConfiguration;
+		$appConfig->loadFromPhp($config, $configPath);
+		$this->_appConfigs[] = $appConfig;
 	}
-	public function loadApplicationConfigurationFromXml($dom,$configPath)
+	public function loadApplicationConfigurationFromXml($dom, $configPath)
 	{
-		$appConfig=new TApplicationConfiguration;
-		$appConfig->loadFromXml($dom,$configPath);
-		$this->_appConfigs[]=$appConfig;
+		$appConfig = new TApplicationConfiguration;
+		$appConfig->loadFromXml($dom, $configPath);
+		$this->_appConfigs[] = $appConfig;
 	}
 	public function loadPageConfigurationFromPhp($config, $configPath, $configPagePath)
 	{
-				if(isset($config['authorization']) && is_array($config['authorization']))
+				if (isset($config['authorization']) && is_array($config['authorization']))
 		{
 			$rules = array();
-			foreach($config['authorization'] as $authorization)
+			foreach ($config['authorization'] as $authorization)
 			{
-				$patterns=isset($authorization['pages'])?$authorization['pages']:'';
-				$ruleApplies=false;
-				if(empty($patterns) || trim($patterns)==='*') 					$ruleApplies=true;
+				$patterns = isset($authorization['pages']) ? $authorization['pages'] : '';
+				$ruleApplies = false;
+				if (empty($patterns) || trim($patterns) === '*') 					$ruleApplies = true;
 				else
 				{
-					foreach(explode(',',$patterns) as $pattern)
+					foreach (explode(',', $patterns) as $pattern)
 					{
-						if(($pattern=trim($pattern))!=='')
+						if (($pattern = trim($pattern)) !== '')
 						{
-														if($configPagePath!=='')  								$pattern=$configPagePath.'.'.$pattern;
-							if(strcasecmp($pattern,$this->_pagePath)===0)
+														if ($configPagePath !== '')  								$pattern = $configPagePath . '.' . $pattern;
+							if (strcasecmp($pattern, $this->_pagePath) === 0)
 							{
-								$ruleApplies=true;
+								$ruleApplies = true;
 								break;
 							}
-							if($pattern[strlen($pattern)-1]==='*') 							{
-								if(strncasecmp($this->_pagePath,$pattern,strlen($pattern)-1)===0)
+							if ($pattern[strlen($pattern) - 1] === '*') {
+								if (strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1) === 0)
 								{
-									$ruleApplies=true;
+									$ruleApplies = true;
 									break;
 								}
 							}
 						}
 					}
 				}
-				if($ruleApplies)
+				if ($ruleApplies)
 				{
-					$action = isset($authorization['action'])?$authorization['action']:'';
-					$users = isset($authorization['users'])?$authorization['users']:'';
-					$roles = isset($authorization['roles'])?$authorization['roles']:'';
-					$verb = isset($authorization['verb'])?$authorization['verb']:'';
-					$ips = isset($authorization['ips'])?$authorization['ips']:'';
-					$rules[]=new TAuthorizationRule($action,$users,$roles,$verb,$ips);
+					$action = isset($authorization['action']) ? $authorization['action'] : '';
+					$users = isset($authorization['users']) ? $authorization['users'] : '';
+					$roles = isset($authorization['roles']) ? $authorization['roles'] : '';
+					$verb = isset($authorization['verb']) ? $authorization['verb'] : '';
+					$ips = isset($authorization['ips']) ? $authorization['ips'] : '';
+					$rules[] = new TAuthorizationRule($action, $users, $roles, $verb, $ips);
 				}
 			}
-			$this->_rules=array_merge($rules,$this->_rules);
+			$this->_rules = array_merge($rules, $this->_rules);
 		}
-				if(isset($config['pages']) && is_array($config['pages']))
+				if (isset($config['pages']) && is_array($config['pages']))
 		{
-			if(isset($config['pages']['properties']))
+			if (isset($config['pages']['properties']))
 			{
 				$this->_properties = array_merge($this->_properties, $config['pages']['properties']);
 				unset($config['pages']['properties']);
 			}
-			foreach($config['pages'] as $id => $page)
+			foreach ($config['pages'] as $id => $page)
 			{
 				$properties = array();
-				if(isset($page['properties']))
+				if (isset($page['properties']))
 				{
-					$properties=$page['properties'];
+					$properties = $page['properties'];
 					unset($page['properties']);
 				}
-				$matching=false;
-				$id=($configPagePath==='')?$id:$configPagePath.'.'.$id;
-				if(strcasecmp($id,$this->_pagePath)===0)
-					$matching=true;
-				else if($id[strlen($id)-1]==='*') 					$matching=strncasecmp($this->_pagePath,$id,strlen($id)-1)===0;
-				if($matching)
-					$this->_properties=array_merge($this->_properties,$properties);
+				$matching = false;
+				$id = ($configPagePath === '') ? $id : $configPagePath . '.' . $id;
+				if (strcasecmp($id, $this->_pagePath) === 0)
+					$matching = true;
+				else if ($id[strlen($id) - 1] === '*') 					$matching = strncasecmp($this->_pagePath, $id, strlen($id) - 1) === 0;
+				if ($matching)
+					$this->_properties = array_merge($this->_properties, $properties);
 			}
 		}
-				if(isset($config['includes']) && is_array($config['includes']))
+				if (isset($config['includes']) && is_array($config['includes']))
 		{
-			foreach($config['includes'] as $include)
+			foreach ($config['includes'] as $include)
 			{
-				$when = isset($include['when'])?true:false;
-				if(!isset($include['file']))
+				$when = isset($include['when']) ? true : false;
+				if (!isset($include['file']))
 					throw new TConfigurationException('pageserviceconf_includefile_required');
 				$filePath = $include['file'];
-				if(isset($this->_includes[$filePath]))
-					$this->_includes[$filePath]=array($configPagePath,'('.$this->_includes[$filePath][1].') || ('.$when.')');
+				if (isset($this->_includes[$filePath]))
+					$this->_includes[$filePath] = array($configPagePath, '(' . $this->_includes[$filePath][1] . ') || (' . $when . ')');
 				else
-					$this->_includes[$filePath]=array($configPagePath,$when);
+					$this->_includes[$filePath] = array($configPagePath, $when);
 			}
 		}
 	}
-	public function loadPageConfigurationFromXml($dom,$configPath,$configPagePath)
+	public function loadPageConfigurationFromXml($dom, $configPath, $configPagePath)
 	{
-				if(($authorizationNode=$dom->getElementByTagName('authorization'))!==null)
+				if (($authorizationNode = $dom->getElementByTagName('authorization')) !== null)
 		{
-			$rules=array();
-			foreach($authorizationNode->getElements() as $node)
+			$rules = array();
+			foreach ($authorizationNode->getElements() as $node)
 			{
-				$patterns=$node->getAttribute('pages');
-				$ruleApplies=false;
-				if(empty($patterns) || trim($patterns)==='*') 					$ruleApplies=true;
+				$patterns = $node->getAttribute('pages');
+				$ruleApplies = false;
+				if (empty($patterns) || trim($patterns) === '*') 					$ruleApplies = true;
 				else
 				{
-					foreach(explode(',',$patterns) as $pattern)
+					foreach (explode(',', $patterns) as $pattern)
 					{
-						if(($pattern=trim($pattern))!=='')
+						if (($pattern = trim($pattern)) !== '')
 						{
-														if($configPagePath!=='')  								$pattern=$configPagePath.'.'.$pattern;
-							if(strcasecmp($pattern,$this->_pagePath)===0)
+														if ($configPagePath !== '')  								$pattern = $configPagePath . '.' . $pattern;
+							if (strcasecmp($pattern, $this->_pagePath) === 0)
 							{
-								$ruleApplies=true;
+								$ruleApplies = true;
 								break;
 							}
-							if($pattern[strlen($pattern)-1]==='*') 							{
-								if(strncasecmp($this->_pagePath,$pattern,strlen($pattern)-1)===0)
+							if ($pattern[strlen($pattern) - 1] === '*') {
+								if (strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1) === 0)
 								{
-									$ruleApplies=true;
+									$ruleApplies = true;
 									break;
 								}
 							}
 						}
 					}
 				}
-				if($ruleApplies)
-					$rules[]=new TAuthorizationRule($node->getTagName(),$node->getAttribute('users'),$node->getAttribute('roles'),$node->getAttribute('verb'),$node->getAttribute('ips'));
+				if ($ruleApplies)
+					$rules[] = new TAuthorizationRule($node->getTagName(), $node->getAttribute('users'), $node->getAttribute('roles'), $node->getAttribute('verb'), $node->getAttribute('ips'));
 			}
-			$this->_rules=array_merge($rules,$this->_rules);
+			$this->_rules = array_merge($rules, $this->_rules);
 		}
-				if(($pagesNode=$dom->getElementByTagName('pages'))!==null)
+				if (($pagesNode = $dom->getElementByTagName('pages')) !== null)
 		{
-			$this->_properties=array_merge($this->_properties,$pagesNode->getAttributes()->toArray());
-						foreach($pagesNode->getElementsByTagName('page') as $node)
+			$this->_properties = array_merge($this->_properties, $pagesNode->getAttributes()->toArray());
+						foreach ($pagesNode->getElementsByTagName('page') as $node)
 			{
-				$properties=$node->getAttributes();
-				$id=$properties->remove('id');
-				if(empty($id))
-					throw new TConfigurationException('pageserviceconf_page_invalid',$configPath);
-				$matching=false;
-				$id=($configPagePath==='')?$id:$configPagePath.'.'.$id;
-				if(strcasecmp($id,$this->_pagePath)===0)
-					$matching=true;
-				else if($id[strlen($id)-1]==='*') 					$matching=strncasecmp($this->_pagePath,$id,strlen($id)-1)===0;
-				if($matching)
-					$this->_properties=array_merge($this->_properties,$properties->toArray());
+				$properties = $node->getAttributes();
+				$id = $properties->remove('id');
+				if (empty($id))
+					throw new TConfigurationException('pageserviceconf_page_invalid', $configPath);
+				$matching = false;
+				$id = ($configPagePath === '') ? $id : $configPagePath . '.' . $id;
+				if (strcasecmp($id, $this->_pagePath) === 0)
+					$matching = true;
+				else if ($id[strlen($id) - 1] === '*') 					$matching = strncasecmp($this->_pagePath, $id, strlen($id) - 1) === 0;
+				if ($matching)
+					$this->_properties = array_merge($this->_properties, $properties->toArray());
 			}
 		}
-				foreach($dom->getElementsByTagName('include') as $node)
+				foreach ($dom->getElementsByTagName('include') as $node)
 		{
-			if(($when=$node->getAttribute('when'))===null)
-				$when=true;
-			if(($filePath=$node->getAttribute('file'))===null)
+			if (($when = $node->getAttribute('when')) === null)
+				$when = true;
+			if (($filePath = $node->getAttribute('file')) === null)
 				throw new TConfigurationException('pageserviceconf_includefile_required');
-			if(isset($this->_includes[$filePath]))
-				$this->_includes[$filePath]=array($configPagePath,'('.$this->_includes[$filePath][1].') || ('.$when.')');
+			if (isset($this->_includes[$filePath]))
+				$this->_includes[$filePath] = array($configPagePath, '(' . $this->_includes[$filePath][1] . ') || (' . $when . ')');
 			else
-				$this->_includes[$filePath]=array($configPagePath,$when);
+				$this->_includes[$filePath] = array($configPagePath, $when);
 		}
 	}
 }
 class TAssetManager extends TModule
 {
-	const DEFAULT_BASEPATH='assets';
-	private $_basePath=null;
-	private $_baseUrl=null;
-	private $_checkTimestamp=false;
+	const DEFAULT_BASEPATH = 'assets';
+	private $_basePath = null;
+	private $_baseUrl = null;
+	private $_checkTimestamp = false;
 	private $_application;
-	private $_published=array();
-	private $_initialized=false;
+	private $_published = array();
+	private $_initialized = false;
 	public function init($config)
 	{
-		$application=$this->getApplication();
-		if($this->_basePath===null)
-			$this->_basePath=dirname($application->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
-		if(!is_writable($this->_basePath) || !is_dir($this->_basePath))
-			throw new TConfigurationException('assetmanager_basepath_invalid',$this->_basePath);
-		if($this->_baseUrl===null)
-			$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationUrl()),'/\\').'/'.self::DEFAULT_BASEPATH;
+		$application = $this->getApplication();
+		if ($this->_basePath === null)
+			$this->_basePath = dirname($application->getRequest()->getApplicationFilePath()) . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
+		if (!is_writable($this->_basePath) || !is_dir($this->_basePath))
+			throw new TConfigurationException('assetmanager_basepath_invalid', $this->_basePath);
+		if ($this->_baseUrl === null)
+			$this->_baseUrl = rtrim(dirname($application->getRequest()->getApplicationUrl()), '/\\') . '/' . self::DEFAULT_BASEPATH;
 		$application->setAssetManager($this);
-		$this->_initialized=true;
+		$this->_initialized = true;
 	}
 	public function getBasePath()
 	{
@@ -9961,13 +9961,13 @@ 
 	}
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('assetmanager_basepath_unchangeable');
 		else
 		{
-			$this->_basePath=Prado::getPathOfNamespace($value);
-			if($this->_basePath===null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
-				throw new TInvalidDataValueException('assetmanager_basepath_invalid',$value);
+			$this->_basePath = Prado::getPathOfNamespace($value);
+			if ($this->_basePath === null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
+				throw new TInvalidDataValueException('assetmanager_basepath_invalid', $value);
 		}
 	}
 	public function getBaseUrl()
@@ -9976,132 +9976,132 @@ 
 	}
 	public function setBaseUrl($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
 		else
-			$this->_baseUrl=rtrim($value,'/');
+			$this->_baseUrl = rtrim($value, '/');
 	}
-	public function publishFilePath($path,$checkTimestamp=false)
+	public function publishFilePath($path, $checkTimestamp = false)
 	{
-		if(isset($this->_published[$path]))
+		if (isset($this->_published[$path]))
 			return $this->_published[$path];
-		else if(empty($path) || ($fullpath=realpath($path))===false)
-			throw new TInvalidDataValueException('assetmanager_filepath_invalid',$path);
-		else if(is_file($fullpath))
+		else if (empty($path) || ($fullpath = realpath($path)) === false)
+			throw new TInvalidDataValueException('assetmanager_filepath_invalid', $path);
+		else if (is_file($fullpath))
 		{
-			$dir=$this->hash(dirname($fullpath));
-			$fileName=basename($fullpath);
-			$dst=$this->_basePath.DIRECTORY_SEPARATOR.$dir;
-			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
-				$this->copyFile($fullpath,$dst);
-			return $this->_published[$path]=$this->_baseUrl.'/'.$dir.'/'.$fileName;
+			$dir = $this->hash(dirname($fullpath));
+			$fileName = basename($fullpath);
+			$dst = $this->_basePath . DIRECTORY_SEPARATOR . $dir;
+			if (!is_file($dst . DIRECTORY_SEPARATOR . $fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
+				$this->copyFile($fullpath, $dst);
+			return $this->_published[$path] = $this->_baseUrl . '/' . $dir . '/' . $fileName;
 		}
 		else
 		{
-			$dir=$this->hash($fullpath);
-			if(!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
+			$dir = $this->hash($fullpath);
+			if (!is_dir($this->_basePath . DIRECTORY_SEPARATOR . $dir) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
 			{
-				$this->copyDirectory($fullpath,$this->_basePath.DIRECTORY_SEPARATOR.$dir);
+				$this->copyDirectory($fullpath, $this->_basePath . DIRECTORY_SEPARATOR . $dir);
 			}
-			return $this->_published[$path]=$this->_baseUrl.'/'.$dir;
+			return $this->_published[$path] = $this->_baseUrl . '/' . $dir;
 		}
 	}
 	public function getPublished()
 	{
 		return $this->_published;
 	}
-	protected function setPublished($values=array())
+	protected function setPublished($values = array())
 	{
 		$this->_published = $values;
 	}
 	public function getPublishedPath($path)
 	{
-		$path=realpath($path);
-		if(is_file($path))
-			return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash(dirname($path)).DIRECTORY_SEPARATOR.basename($path);
+		$path = realpath($path);
+		if (is_file($path))
+			return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash(dirname($path)) . DIRECTORY_SEPARATOR . basename($path);
 		else
-			return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash($path);
+			return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash($path);
 	}
 	public function getPublishedUrl($path)
 	{
-		$path=realpath($path);
-		if(is_file($path))
-			return $this->_baseUrl.'/'.$this->hash(dirname($path)).'/'.basename($path);
+		$path = realpath($path);
+		if (is_file($path))
+			return $this->_baseUrl . '/' . $this->hash(dirname($path)) . '/' . basename($path);
 		else
-			return $this->_baseUrl.'/'.$this->hash($path);
+			return $this->_baseUrl . '/' . $this->hash($path);
 	}
 	protected function hash($dir)
 	{
-		return sprintf('%x',crc32($dir.Prado::getVersion()));
+		return sprintf('%x', crc32($dir . Prado::getVersion()));
 	}
-	protected function copyFile($src,$dst)
+	protected function copyFile($src, $dst)
 	{
-		if(!is_dir($dst))
+		if (!is_dir($dst))
 		{
 			@mkdir($dst);
 			@chmod($dst, PRADO_CHMOD);
 		}
-		$dstFile=$dst.DIRECTORY_SEPARATOR.basename($src);
-		if(@filemtime($dstFile)<@filemtime($src))
+		$dstFile = $dst . DIRECTORY_SEPARATOR . basename($src);
+		if (@filemtime($dstFile) < @filemtime($src))
 		{
-			@copy($src,$dstFile);
+			@copy($src, $dstFile);
 		}
 	}
-	public function copyDirectory($src,$dst)
+	public function copyDirectory($src, $dst)
 	{
-		if(!is_dir($dst))
+		if (!is_dir($dst))
 		{
 			@mkdir($dst);
 			@chmod($dst, PRADO_CHMOD);
 		}
-		if($folder=@opendir($src))
+		if ($folder = @opendir($src))
 		{
-			while($file=@readdir($folder))
+			while ($file = @readdir($folder))
 			{
-				if($file==='.' || $file==='..' || $file==='.svn')
+				if ($file === '.' || $file === '..' || $file === '.svn')
 					continue;
-				else if(is_file($src.DIRECTORY_SEPARATOR.$file))
+				else if (is_file($src . DIRECTORY_SEPARATOR . $file))
 				{
-					if(@filemtime($dst.DIRECTORY_SEPARATOR.$file)<@filemtime($src.DIRECTORY_SEPARATOR.$file))
+					if (@filemtime($dst . DIRECTORY_SEPARATOR . $file) < @filemtime($src . DIRECTORY_SEPARATOR . $file))
 					{
-						@copy($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
-						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
+						@copy($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
+						@chmod($dst . DIRECTORY_SEPARATOR . $file, PRADO_CHMOD);
 					}
 				}
 				else
-					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
+					$this->copyDirectory($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
 			}
 			closedir($folder);
 		} else {
 			throw new TInvalidDataValueException('assetmanager_source_directory_invalid', $src);
 		}
 	}
-	public function publishTarFile($tarfile, $md5sum, $checkTimestamp=false)
+	public function publishTarFile($tarfile, $md5sum, $checkTimestamp = false)
 	{
-		if(isset($this->_published[$md5sum]))
+		if (isset($this->_published[$md5sum]))
 			return $this->_published[$md5sum];
-		else if(($fullpath=realpath($md5sum))===false || !is_file($fullpath))
-			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid',$md5sum);
+		else if (($fullpath = realpath($md5sum)) === false || !is_file($fullpath))
+			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid', $md5sum);
 		else
 		{
-			$dir=$this->hash(dirname($fullpath));
-			$fileName=basename($fullpath);
-			$dst=$this->_basePath.DIRECTORY_SEPARATOR.$dir;
-			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
+			$dir = $this->hash(dirname($fullpath));
+			$fileName = basename($fullpath);
+			$dst = $this->_basePath . DIRECTORY_SEPARATOR . $dir;
+			if (!is_file($dst . DIRECTORY_SEPARATOR . $fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
 			{
-				if(@filemtime($dst.DIRECTORY_SEPARATOR.$fileName)<@filemtime($fullpath))
+				if (@filemtime($dst . DIRECTORY_SEPARATOR . $fileName) < @filemtime($fullpath))
 				{
-					$this->copyFile($fullpath,$dst);
-					$this->deployTarFile($tarfile,$dst);
+					$this->copyFile($fullpath, $dst);
+					$this->deployTarFile($tarfile, $dst);
 				}
 			}
-			return $this->_published[$md5sum]=$this->_baseUrl.'/'.$dir;
+			return $this->_published[$md5sum] = $this->_baseUrl . '/' . $dir;
 		}
 	}
-	protected function deployTarFile($path,$destination)
+	protected function deployTarFile($path, $destination)
 	{
-		if(($fullpath=realpath($path))===false || !is_file($fullpath))
-			throw new TIOException('assetmanager_tarfile_invalid',$path);
+		if (($fullpath = realpath($path)) === false || !is_file($fullpath))
+			throw new TIOException('assetmanager_tarfile_invalid', $path);
 		else
 		{
 			Prado::using('System.IO.TTarFileExtractor');
@@ -10114,26 +10114,26 @@ 
 {
 	private $_defaultCharset = 'UTF-8';
 	private $_defaultCulture = 'en';
-	private $_charset=null;
-	private $_culture=null;
+	private $_charset = null;
+	private $_culture = null;
 	private $_translation;
-	private $_translateDefaultCulture=true;
+	private $_translateDefaultCulture = true;
 	public function init($config)
 	{
-		if($this->_charset===null)
-			$this->_charset=$this->getDefaultCharset();
-		if($this->_culture===null)
-			$this->_culture=$this->getDefaultCulture();
-		if($config!==null)
+		if ($this->_charset === null)
+			$this->_charset = $this->getDefaultCharset();
+		if ($this->_culture === null)
+			$this->_culture = $this->getDefaultCulture();
+		if ($config !== null)
 		{
-			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-				$translation = isset($config['translate'])?$config['translate']:null;
+			if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+				$translation = isset($config['translate']) ? $config['translate'] : null;
 			else
 			{
 				$t = $config->getElementByTagName('translation');
-				$translation = ($t)?$t->getAttributes():null;
+				$translation = ($t) ? $t->getAttributes() : null;
 			}
-			if($translation)
+			if ($translation)
 				$this->setTranslationConfiguration($translation);
 		}
 		$this->getApplication()->setGlobalization($this);
@@ -10152,7 +10152,7 @@ 
 	}
 	public function setDefaultCulture($culture)
 	{
-		$this->_defaultCulture = str_replace('-','_',$culture);
+		$this->_defaultCulture = str_replace('-', '_', $culture);
 	}
 	public function getDefaultCharset()
 	{
@@ -10168,7 +10168,7 @@ 
 	}
 	public function setCulture($culture)
 	{
-		$this->_culture = str_replace('-','_',$culture);
+		$this->_culture = str_replace('-', '_', $culture);
 	}
 	public function getCharset()
 	{
@@ -10186,32 +10186,32 @@ 
 	}
 	protected function setTranslationConfiguration($config)
 	{
-		if($config['type'] == 'XLIFF' || $config['type'] == 'gettext')
+		if ($config['type'] == 'XLIFF' || $config['type'] == 'gettext')
 		{
-			if($config['source'])
+			if ($config['source'])
 			{
 				$config['source'] = Prado::getPathOfNamespace($config['source']);
-				if(!is_dir($config['source']))
+				if (!is_dir($config['source']))
 				{
-					if(@mkdir($config['source'])===false)
+					if (@mkdir($config['source']) === false)
 					throw new TConfigurationException('globalization_source_path_failed',
 						$config['source']);
-					chmod($config['source'], PRADO_CHMOD); 				}
+					chmod($config['source'], PRADO_CHMOD); }
 			}
 			else
 			{
 				throw new TConfigurationException("invalid source dir '{$config['source']}'");
 			}
 		}
-		if($config['cache'])
+		if ($config['cache'])
 		{
-			$config['cache'] = $this->getApplication()->getRunTimePath().'/i18n';
-			if(!is_dir($config['cache']))
+			$config['cache'] = $this->getApplication()->getRunTimePath() . '/i18n';
+			if (!is_dir($config['cache']))
 			{
-				if(@mkdir($config['cache'])===false)
+				if (@mkdir($config['cache']) === false)
 					throw new TConfigurationException('globalization_cache_path_failed',
 						$config['cache']);
-				chmod($config['cache'], PRADO_CHMOD); 			}
+				chmod($config['cache'], PRADO_CHMOD); }
 		}
 		$this->_translation = $config;
 	}
@@ -10223,46 +10223,46 @@ 
 	{
 		$this->_translation['catalogue'] = $value;
 	}
-	public function getCultureVariants($culture=null)
+	public function getCultureVariants($culture = null)
 	{
-		if($culture===null) $culture = $this->getCulture();
+		if ($culture === null) $culture = $this->getCulture();
 		$variants = explode('_', $culture);
 		$result = array();
-		for(; count($variants) > 0; array_pop($variants))
+		for (; count($variants) > 0; array_pop($variants))
 			$result[] = implode('_', $variants);
 		return $result;
 	}
-	public function getLocalizedResource($file,$culture=null)
+	public function getLocalizedResource($file, $culture = null)
 	{
 		$files = array();
 		$variants = $this->getCultureVariants($culture);
 		$path = pathinfo($file);
-		foreach($variants as $variant)
-			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$variant.DIRECTORY_SEPARATOR.$path['basename'];
-		$filename = substr($path['basename'],0,strrpos($path['basename'],'.'));
-		foreach($variants as $variant)
-			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$filename.'.'.$variant.'.'.$path['extension'];
+		foreach ($variants as $variant)
+			$files[] = $path['dirname'] . DIRECTORY_SEPARATOR . $variant . DIRECTORY_SEPARATOR . $path['basename'];
+		$filename = substr($path['basename'], 0, strrpos($path['basename'], '.'));
+		foreach ($variants as $variant)
+			$files[] = $path['dirname'] . DIRECTORY_SEPARATOR . $filename . '.' . $variant . '.' . $path['extension'];
 		$files[] = $file;
 		return $files;
 	}
 }
 class TApplication extends TComponent
 {
-	const STATE_OFF='Off';
-	const STATE_DEBUG='Debug';
-	const STATE_NORMAL='Normal';
-	const STATE_PERFORMANCE='Performance';
-	const PAGE_SERVICE_ID='page';
-	const CONFIG_FILE_XML='application.xml';
-	const CONFIG_FILE_EXT_XML='.xml';
+	const STATE_OFF = 'Off';
+	const STATE_DEBUG = 'Debug';
+	const STATE_NORMAL = 'Normal';
+	const STATE_PERFORMANCE = 'Performance';
+	const PAGE_SERVICE_ID = 'page';
+	const CONFIG_FILE_XML = 'application.xml';
+	const CONFIG_FILE_EXT_XML = '.xml';
 	const CONFIG_TYPE_XML = 'xml';
-	const CONFIG_FILE_PHP='application.php';
-	const CONFIG_FILE_EXT_PHP='.php';
+	const CONFIG_FILE_PHP = 'application.php';
+	const CONFIG_FILE_EXT_PHP = '.php';
 	const CONFIG_TYPE_PHP = 'php';
-	const RUNTIME_PATH='runtime';
-	const CONFIGCACHE_FILE='config.cache';
-	const GLOBAL_FILE='global.cache';
-	private static $_steps=array(
+	const RUNTIME_PATH = 'runtime';
+	const CONFIGCACHE_FILE = 'config.cache';
+	const GLOBAL_FILE = 'global.cache';
+	private static $_steps = array(
 		'onBeginRequest',
 		'onLoadState',
 		'onLoadStateComplete',
@@ -10279,20 +10279,20 @@ 
 	);
 	private $_id;
 	private $_uniqueID;
-	private $_requestCompleted=false;
+	private $_requestCompleted = false;
 	private $_step;
 	private $_services;
 	private $_service;
-	private $_modules=array();
-	private $_lazyModules=array();
+	private $_modules = array();
+	private $_lazyModules = array();
 	private $_parameters;
 	private $_configFile;
 	private $_configFileExt;
 	private $_configType;
 	private $_basePath;
 	private $_runtimePath;
-	private $_stateChanged=false;
-	private $_globals=array();
+	private $_stateChanged = false;
+	private $_globals = array();
 	private $_cacheFile;
 	private $_errorHandler;
 	private $_request;
@@ -10305,72 +10305,72 @@ 
 	private $_security;
 	private $_assetManager;
 	private $_authRules;
-	private $_mode=TApplicationMode::Debug;
+	private $_mode = TApplicationMode::Debug;
 	private $_pageServiceID = self::PAGE_SERVICE_ID;
-	public function __construct($basePath='protected',$cacheConfig=true, $configType=self::CONFIG_TYPE_XML)
+	public function __construct($basePath = 'protected', $cacheConfig = true, $configType = self::CONFIG_TYPE_XML)
 	{
 				Prado::setApplication($this);
 		$this->setConfigurationType($configType);
 		$this->resolvePaths($basePath);
-		if($cacheConfig)
-			$this->_cacheFile=$this->_runtimePath.DIRECTORY_SEPARATOR.self::CONFIGCACHE_FILE;
-				$this->_uniqueID=md5($this->_runtimePath);
-		$this->_parameters=new TMap;
-		$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
-		Prado::setPathOfAlias('Application',$this->_basePath);
+		if ($cacheConfig)
+			$this->_cacheFile = $this->_runtimePath . DIRECTORY_SEPARATOR . self::CONFIGCACHE_FILE;
+				$this->_uniqueID = md5($this->_runtimePath);
+		$this->_parameters = new TMap;
+		$this->_services = array($this->getPageServiceID()=>array('TPageService', array(), null));
+		Prado::setPathOfAlias('Application', $this->_basePath);
 	}
 	protected function resolvePaths($basePath)
 	{
-				if(empty($basePath) || ($basePath=realpath($basePath))===false)
-			throw new TConfigurationException('application_basepath_invalid',$basePath);
-		if(is_dir($basePath) && is_file($basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName()))
-			$configFile=$basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName();
-		else if(is_file($basePath))
+				if (empty($basePath) || ($basePath = realpath($basePath)) === false)
+			throw new TConfigurationException('application_basepath_invalid', $basePath);
+		if (is_dir($basePath) && is_file($basePath . DIRECTORY_SEPARATOR . $this->getConfigurationFileName()))
+			$configFile = $basePath . DIRECTORY_SEPARATOR . $this->getConfigurationFileName();
+		else if (is_file($basePath))
 		{
-			$configFile=$basePath;
-			$basePath=dirname($configFile);
+			$configFile = $basePath;
+			$basePath = dirname($configFile);
 		}
 		else
-			$configFile=null;
-				$runtimePath=$basePath.DIRECTORY_SEPARATOR.self::RUNTIME_PATH;
-		if(is_writable($runtimePath))
+			$configFile = null;
+				$runtimePath = $basePath . DIRECTORY_SEPARATOR . self::RUNTIME_PATH;
+		if (is_writable($runtimePath))
 		{
-			if($configFile!==null)
+			if ($configFile !== null)
 			{
-				$runtimePath.=DIRECTORY_SEPARATOR.basename($configFile).'-'.Prado::getVersion();
-				if(!is_dir($runtimePath))
+				$runtimePath .= DIRECTORY_SEPARATOR . basename($configFile) . '-' . Prado::getVersion();
+				if (!is_dir($runtimePath))
 				{
-					if(@mkdir($runtimePath)===false)
-						throw new TConfigurationException('application_runtimepath_failed',$runtimePath);
-					@chmod($runtimePath, PRADO_CHMOD); 				}
+					if (@mkdir($runtimePath) === false)
+						throw new TConfigurationException('application_runtimepath_failed', $runtimePath);
+					@chmod($runtimePath, PRADO_CHMOD); }
 				$this->setConfigurationFile($configFile);
 			}
 			$this->setBasePath($basePath);
 			$this->setRuntimePath($runtimePath);
 		}
 		else
-			throw new TConfigurationException('application_runtimepath_invalid',$runtimePath);
+			throw new TConfigurationException('application_runtimepath_invalid', $runtimePath);
 	}
 	public function run()
 	{
 		try
 		{
 			$this->initApplication();
-			$n=count(self::$_steps);
-			$this->_step=0;
-			$this->_requestCompleted=false;
-			while($this->_step<$n)
-			{
-				if($this->_mode===self::STATE_OFF)
-					throw new THttpException(503,'application_unavailable');
-				if($this->_requestCompleted)
+			$n = count(self::$_steps);
+			$this->_step = 0;
+			$this->_requestCompleted = false;
+			while ($this->_step < $n)
+			{
+				if ($this->_mode === self::STATE_OFF)
+					throw new THttpException(503, 'application_unavailable');
+				if ($this->_requestCompleted)
 					break;
-				$method=self::$_steps[$this->_step];
+				$method = self::$_steps[$this->_step];
 				$this->$method();
 				$this->_step++;
 			}
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			$this->onError($e);
 		}
@@ -10378,40 +10378,40 @@ 
 	}
 	public function completeRequest()
 	{
-		$this->_requestCompleted=true;
+		$this->_requestCompleted = true;
 	}
 	public function getRequestCompleted()
 	{
 		return $this->_requestCompleted;
 	}
-	public function getGlobalState($key,$defaultValue=null)
+	public function getGlobalState($key, $defaultValue = null)
 	{
-		return isset($this->_globals[$key])?$this->_globals[$key]:$defaultValue;
+		return isset($this->_globals[$key]) ? $this->_globals[$key] : $defaultValue;
 	}
-	public function setGlobalState($key,$value,$defaultValue=null,$forceSave=false)
+	public function setGlobalState($key, $value, $defaultValue = null, $forceSave = false)
 	{
-		$this->_stateChanged=true;
-		if($value===$defaultValue)
+		$this->_stateChanged = true;
+		if ($value === $defaultValue)
 			unset($this->_globals[$key]);
 		else
-			$this->_globals[$key]=$value;
-		if($forceSave)
+			$this->_globals[$key] = $value;
+		if ($forceSave)
 			$this->saveGlobals();
 	}
 	public function clearGlobalState($key)
 	{
-		$this->_stateChanged=true;
+		$this->_stateChanged = true;
 		unset($this->_globals[$key]);
 	}
 	protected function loadGlobals()
 	{
-		$this->_globals=$this->getApplicationStatePersister()->load();
+		$this->_globals = $this->getApplicationStatePersister()->load();
 	}
 	protected function saveGlobals()
 	{
-		if($this->_stateChanged)
+		if ($this->_stateChanged)
 		{
-			$this->_stateChanged=false;
+			$this->_stateChanged = false;
 			$this->getApplicationStatePersister()->save($this->_globals);
 		}
 	}
@@ -10421,7 +10421,7 @@ 
 	}
 	public function setID($value)
 	{
-		$this->_id=$value;
+		$this->_id = $value;
 	}
 	public function getPageServiceID()
 	{
@@ -10429,7 +10429,7 @@ 
 	}
 	public function setPageServiceID($value)
 	{
-		$this->_pageServiceID=$value;
+		$this->_pageServiceID = $value;
 	}
 	public function getUniqueID()
 	{
@@ -10441,7 +10441,7 @@ 
 	}
 	public function setMode($value)
 	{
-		$this->_mode=TPropertyValue::ensureEnum($value,'TApplicationMode');
+		$this->_mode = TPropertyValue::ensureEnum($value, 'TApplicationMode');
 	}
 	public function getBasePath()
 	{
@@ -10449,7 +10449,7 @@ 
 	}
 	public function setBasePath($value)
 	{
-		$this->_basePath=$value;
+		$this->_basePath = $value;
 	}
 	public function getConfigurationFile()
 	{
@@ -10457,7 +10457,7 @@ 
 	}
 	public function setConfigurationFile($value)
 	{
-		$this->_configFile=$value;
+		$this->_configFile = $value;
 	}
 	public function getConfigurationType()
 	{
@@ -10469,9 +10469,9 @@ 
 	}
 	public function getConfigurationFileExt()
 	{
-		if($this->_configFileExt===null)
+		if ($this->_configFileExt === null)
 		{
-			switch($this->_configType)
+			switch ($this->_configType)
 			{
 				case TApplication::CONFIG_TYPE_PHP:
 					$this->_configFileExt = TApplication::CONFIG_FILE_EXT_PHP;
@@ -10485,9 +10485,9 @@ 
 	public function getConfigurationFileName()
 	{
 		static $fileName;
-		if($fileName == null)
+		if ($fileName == null)
 		{
-			switch($this->_configType)
+			switch ($this->_configType)
 			{
 				case TApplication::CONFIG_TYPE_PHP:
 					$fileName = TApplication::CONFIG_FILE_PHP;
@@ -10504,10 +10504,10 @@ 
 	}
 	public function setRuntimePath($value)
 	{
-		$this->_runtimePath=$value;
-		if($this->_cacheFile)
-			$this->_cacheFile=$this->_runtimePath.DIRECTORY_SEPARATOR.self::CONFIGCACHE_FILE;
-				$this->_uniqueID=md5($this->_runtimePath);
+		$this->_runtimePath = $value;
+		if ($this->_cacheFile)
+			$this->_cacheFile = $this->_runtimePath . DIRECTORY_SEPARATOR . self::CONFIGCACHE_FILE;
+				$this->_uniqueID = md5($this->_runtimePath);
 	}
 	public function getService()
 	{
@@ -10515,20 +10515,20 @@ 
 	}
 	public function setService($value)
 	{
-		$this->_service=$value;
+		$this->_service = $value;
 	}
-	public function setModule($id,IModule $module=null)
+	public function setModule($id, IModule $module = null)
 	{
-		if(isset($this->_modules[$id]))
-			throw new TConfigurationException('application_moduleid_duplicated',$id);
+		if (isset($this->_modules[$id]))
+			throw new TConfigurationException('application_moduleid_duplicated', $id);
 		else
-			$this->_modules[$id]=$module;
+			$this->_modules[$id] = $module;
 	}
 	public function getModule($id)
 	{
-		if(!array_key_exists($id, $this->_modules))
+		if (!array_key_exists($id, $this->_modules))
 			return null;
-				if($this->_modules[$id]===null)
+				if ($this->_modules[$id] === null)
 		{
 			$module = $this->internalLoadModule($id, true);
 			$module[0]->init($module[1]);
@@ -10545,94 +10545,94 @@ 
 	}
 	public function getRequest()
 	{
-		if(!$this->_request)
+		if (!$this->_request)
 		{
-			$this->_request=new THttpRequest;
+			$this->_request = new THttpRequest;
 			$this->_request->init(null);
 		}
 		return $this->_request;
 	}
 	public function setRequest(THttpRequest $request)
 	{
-		$this->_request=$request;
+		$this->_request = $request;
 	}
 	public function getResponse()
 	{
-		if(!$this->_response)
+		if (!$this->_response)
 		{
-			$this->_response=new THttpResponse;
+			$this->_response = new THttpResponse;
 			$this->_response->init(null);
 		}
 		return $this->_response;
 	}
 	public function setResponse(THttpResponse $response)
 	{
-		$this->_response=$response;
+		$this->_response = $response;
 	}
 	public function getSession()
 	{
-		if(!$this->_session)
+		if (!$this->_session)
 		{
-			$this->_session=new THttpSession;
+			$this->_session = new THttpSession;
 			$this->_session->init(null);
 		}
 		return $this->_session;
 	}
 	public function setSession(THttpSession $session)
 	{
-		$this->_session=$session;
+		$this->_session = $session;
 	}
 	public function getErrorHandler()
 	{
-		if(!$this->_errorHandler)
+		if (!$this->_errorHandler)
 		{
-			$this->_errorHandler=new TErrorHandler;
+			$this->_errorHandler = new TErrorHandler;
 			$this->_errorHandler->init(null);
 		}
 		return $this->_errorHandler;
 	}
 	public function setErrorHandler(TErrorHandler $handler)
 	{
-		$this->_errorHandler=$handler;
+		$this->_errorHandler = $handler;
 	}
 	public function getSecurityManager()
 	{
-		if(!$this->_security)
+		if (!$this->_security)
 		{
-			$this->_security=new TSecurityManager;
+			$this->_security = new TSecurityManager;
 			$this->_security->init(null);
 		}
 		return $this->_security;
 	}
 	public function setSecurityManager(TSecurityManager $sm)
 	{
-		$this->_security=$sm;
+		$this->_security = $sm;
 	}
 	public function getAssetManager()
 	{
-		if(!$this->_assetManager)
+		if (!$this->_assetManager)
 		{
-			$this->_assetManager=new TAssetManager;
+			$this->_assetManager = new TAssetManager;
 			$this->_assetManager->init(null);
 		}
 		return $this->_assetManager;
 	}
 	public function setAssetManager(TAssetManager $value)
 	{
-		$this->_assetManager=$value;
+		$this->_assetManager = $value;
 	}
 	public function getApplicationStatePersister()
 	{
-		if(!$this->_statePersister)
+		if (!$this->_statePersister)
 		{
-			$this->_statePersister=new TApplicationStatePersister;
+			$this->_statePersister = new TApplicationStatePersister;
 			$this->_statePersister->init(null);
 		}
 		return $this->_statePersister;
 	}
 	public function setApplicationStatePersister(IStatePersister $persister)
 	{
-		$this->_statePersister=$persister;
+		$this->_statePersister = $persister;
 	}
 	public function getCache()
 	{
@@ -10640,7 +10640,7 @@ 
 	}
 	public function setCache(ICache $cache)
 	{
-		$this->_cache=$cache;
+		$this->_cache = $cache;
 	}
 	public function getUser()
 	{
@@ -10648,207 +10648,207 @@ 
 	}
 	public function setUser(IUser $user)
 	{
-		$this->_user=$user;
+		$this->_user = $user;
 	}
-	public function getGlobalization($createIfNotExists=true)
+	public function getGlobalization($createIfNotExists = true)
 	{
-		if($this->_globalization===null && $createIfNotExists)
+		if ($this->_globalization === null && $createIfNotExists)
 		{
-			$this->_globalization=new TGlobalization;
+			$this->_globalization = new TGlobalization;
 			$this->_globalization->init(null);
 		}
 		return $this->_globalization;
 	}
 	public function setGlobalization(TGlobalization $glob)
 	{
-		$this->_globalization=$glob;
+		$this->_globalization = $glob;
 	}
 	public function getAuthorizationRules()
 	{
-		if($this->_authRules===null)
-			$this->_authRules=new TAuthorizationRuleCollection;
+		if ($this->_authRules === null)
+			$this->_authRules = new TAuthorizationRuleCollection;
 		return $this->_authRules;
 	}
 	protected function getApplicationConfigurationClass()
 	{
 		return 'TApplicationConfiguration';
 	}
-	protected function internalLoadModule($id, $force=false)
+	protected function internalLoadModule($id, $force = false)
 	{
-		list($moduleClass, $initProperties, $configElement)=$this->_lazyModules[$id];
-		if(isset($initProperties['lazy']) && $initProperties['lazy'] && !$force)
+		list($moduleClass, $initProperties, $configElement) = $this->_lazyModules[$id];
+		if (isset($initProperties['lazy']) && $initProperties['lazy'] && !$force)
 		{
 			$this->setModule($id, null);
 			return null;
 		}
-		$module=Prado::createComponent($moduleClass);
-		foreach($initProperties as $name=>$value)
+		$module = Prado::createComponent($moduleClass);
+		foreach ($initProperties as $name=>$value)
 		{
-			if($name==='lazy') continue;
-			$module->setSubProperty($name,$value);
+			if ($name === 'lazy') continue;
+			$module->setSubProperty($name, $value);
 		}
-		$this->setModule($id,$module);
-				$this->_lazyModules[$id]=null;
-		return array($module,$configElement);
+		$this->setModule($id, $module);
+				$this->_lazyModules[$id] = null;
+		return array($module, $configElement);
 	}
-	public function applyConfiguration($config,$withinService=false)
+	public function applyConfiguration($config, $withinService = false)
 	{
-		if($config->getIsEmpty())
+		if ($config->getIsEmpty())
 			return;
-				foreach($config->getAliases() as $alias=>$path)
-			Prado::setPathOfAlias($alias,$path);
-		foreach($config->getUsings() as $using)
+				foreach ($config->getAliases() as $alias=>$path)
+			Prado::setPathOfAlias($alias, $path);
+		foreach ($config->getUsings() as $using)
 			Prado::using($using);
-				if(!$withinService)
+				if (!$withinService)
 		{
-			foreach($config->getProperties() as $name=>$value)
-				$this->setSubProperty($name,$value);
+			foreach ($config->getProperties() as $name=>$value)
+				$this->setSubProperty($name, $value);
 		}
-		if(empty($this->_services))
-			$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
-				foreach($config->getParameters() as $id=>$parameter)
+		if (empty($this->_services))
+			$this->_services = array($this->getPageServiceID()=>array('TPageService', array(), null));
+				foreach ($config->getParameters() as $id=>$parameter)
 		{
-			if(is_array($parameter))
+			if (is_array($parameter))
 			{
-				$component=Prado::createComponent($parameter[0]);
-				foreach($parameter[1] as $name=>$value)
-					$component->setSubProperty($name,$value);
-				$this->_parameters->add($id,$component);
+				$component = Prado::createComponent($parameter[0]);
+				foreach ($parameter[1] as $name=>$value)
+					$component->setSubProperty($name, $value);
+				$this->_parameters->add($id, $component);
 			}
 			else
-				$this->_parameters->add($id,$parameter);
+				$this->_parameters->add($id, $parameter);
 		}
-				$modules=array();
-		foreach($config->getModules() as $id=>$moduleConfig)
+				$modules = array();
+		foreach ($config->getModules() as $id=>$moduleConfig)
 		{
-			if(!is_string($id))
-				$id='_module'.count($this->_lazyModules);
-			$this->_lazyModules[$id]=$moduleConfig;
-			if($module = $this->internalLoadModule($id))
-				$modules[]=$module;
+			if (!is_string($id))
+				$id = '_module' . count($this->_lazyModules);
+			$this->_lazyModules[$id] = $moduleConfig;
+			if ($module = $this->internalLoadModule($id))
+				$modules[] = $module;
 		}
-		foreach($modules as $module)
+		foreach ($modules as $module)
 			$module[0]->init($module[1]);
-				foreach($config->getServices() as $serviceID=>$serviceConfig)
-			$this->_services[$serviceID]=$serviceConfig;
-				foreach($config->getExternalConfigurations() as $filePath=>$condition)
-		{
-			if($condition!==true)
-				$condition=$this->evaluateExpression($condition);
-			if($condition)
-			{
-				if(($path=Prado::getPathOfNamespace($filePath,$this->getConfigurationFileExt()))===null || !is_file($path))
-					throw new TConfigurationException('application_includefile_invalid',$filePath);
-				$cn=$this->getApplicationConfigurationClass();
-				$c=new $cn;
+				foreach ($config->getServices() as $serviceID=>$serviceConfig)
+			$this->_services[$serviceID] = $serviceConfig;
+				foreach ($config->getExternalConfigurations() as $filePath=>$condition)
+		{
+			if ($condition !== true)
+				$condition = $this->evaluateExpression($condition);
+			if ($condition)
+			{
+				if (($path = Prado::getPathOfNamespace($filePath, $this->getConfigurationFileExt())) === null || !is_file($path))
+					throw new TConfigurationException('application_includefile_invalid', $filePath);
+				$cn = $this->getApplicationConfigurationClass();
+				$c = new $cn;
 				$c->loadFromFile($path);
-				$this->applyConfiguration($c,$withinService);
+				$this->applyConfiguration($c, $withinService);
 			}
 		}
 	}
 	protected function initApplication()
 	{
-		if($this->_configFile!==null)
+		if ($this->_configFile !== null)
 		{
-			if($this->_cacheFile===null || @filemtime($this->_cacheFile)<filemtime($this->_configFile))
+			if ($this->_cacheFile === null || @filemtime($this->_cacheFile) < filemtime($this->_configFile))
 			{
-				$config=new TApplicationConfiguration;
+				$config = new TApplicationConfiguration;
 				$config->loadFromFile($this->_configFile);
-				if($this->_cacheFile!==null)
-					file_put_contents($this->_cacheFile,serialize($config),LOCK_EX);
+				if ($this->_cacheFile !== null)
+					file_put_contents($this->_cacheFile, serialize($config), LOCK_EX);
 			}
 			else
-				$config=unserialize(file_get_contents($this->_cacheFile));
-			$this->applyConfiguration($config,false);
+				$config = unserialize(file_get_contents($this->_cacheFile));
+			$this->applyConfiguration($config, false);
 		}
-		if(($serviceID=$this->getRequest()->resolveRequest(array_keys($this->_services)))===null)
-			$serviceID=$this->getPageServiceID();
+		if (($serviceID = $this->getRequest()->resolveRequest(array_keys($this->_services))) === null)
+			$serviceID = $this->getPageServiceID();
 		$this->startService($serviceID);
 	}
 	public function startService($serviceID)
 	{
-		if(isset($this->_services[$serviceID]))
+		if (isset($this->_services[$serviceID]))
 		{
-			list($serviceClass,$initProperties,$configElement)=$this->_services[$serviceID];
-			$service=Prado::createComponent($serviceClass);
-			if(!($service instanceof IService))
-				throw new THttpException(500,'application_service_invalid',$serviceClass);
-			if(!$service->getEnabled())
-				throw new THttpException(500,'application_service_unavailable',$serviceClass);
+			list($serviceClass, $initProperties, $configElement) = $this->_services[$serviceID];
+			$service = Prado::createComponent($serviceClass);
+			if (!($service instanceof IService))
+				throw new THttpException(500, 'application_service_invalid', $serviceClass);
+			if (!$service->getEnabled())
+				throw new THttpException(500, 'application_service_unavailable', $serviceClass);
 			$service->setID($serviceID);
 			$this->setService($service);
-			foreach($initProperties as $name=>$value)
-				$service->setSubProperty($name,$value);
-			if($configElement!==null)
+			foreach ($initProperties as $name=>$value)
+				$service->setSubProperty($name, $value);
+			if ($configElement !== null)
 			{
-				$config=new TApplicationConfiguration;
-				if($this->getConfigurationType()==self::CONFIG_TYPE_PHP)
-					$config->loadFromPhp($configElement,$this->getBasePath());
+				$config = new TApplicationConfiguration;
+				if ($this->getConfigurationType() == self::CONFIG_TYPE_PHP)
+					$config->loadFromPhp($configElement, $this->getBasePath());
 				else
-					$config->loadFromXml($configElement,$this->getBasePath());
-				$this->applyConfiguration($config,true);
+					$config->loadFromXml($configElement, $this->getBasePath());
+				$this->applyConfiguration($config, true);
 			}
 			$service->init($configElement);
 		}
 		else
-			throw new THttpException(500,'application_service_unknown',$serviceID);
+			throw new THttpException(500, 'application_service_unknown', $serviceID);
 	}
 	public function onError($param)
 	{
-		Prado::log($param->getMessage(),TLogger::ERROR,'System.TApplication');
-		$this->raiseEvent('OnError',$this,$param);
-		$this->getErrorHandler()->handleError($this,$param);
+		Prado::log($param->getMessage(), TLogger::ERROR, 'System.TApplication');
+		$this->raiseEvent('OnError', $this, $param);
+		$this->getErrorHandler()->handleError($this, $param);
 	}
 	public function onBeginRequest()
 	{
-		$this->raiseEvent('OnBeginRequest',$this,null);
+		$this->raiseEvent('OnBeginRequest', $this, null);
 	}
 	public function onAuthentication()
 	{
-		$this->raiseEvent('OnAuthentication',$this,null);
+		$this->raiseEvent('OnAuthentication', $this, null);
 	}
 	public function onAuthenticationComplete()
 	{
-		$this->raiseEvent('OnAuthenticationComplete',$this,null);
+		$this->raiseEvent('OnAuthenticationComplete', $this, null);
 	}
 	public function onAuthorization()
 	{
-		$this->raiseEvent('OnAuthorization',$this,null);
+		$this->raiseEvent('OnAuthorization', $this, null);
 	}
 	public function onAuthorizationComplete()
 	{
-		$this->raiseEvent('OnAuthorizationComplete',$this,null);
+		$this->raiseEvent('OnAuthorizationComplete', $this, null);
 	}
 	public function onLoadState()
 	{
 		$this->loadGlobals();
-		$this->raiseEvent('OnLoadState',$this,null);
+		$this->raiseEvent('OnLoadState', $this, null);
 	}
 	public function onLoadStateComplete()
 	{
-		$this->raiseEvent('OnLoadStateComplete',$this,null);
+		$this->raiseEvent('OnLoadStateComplete', $this, null);
 	}
 	public function onPreRunService()
 	{
-		$this->raiseEvent('OnPreRunService',$this,null);
+		$this->raiseEvent('OnPreRunService', $this, null);
 	}
 	public function runService()
 	{
-		if($this->_service)
+		if ($this->_service)
 			$this->_service->run();
 	}
 	public function onSaveState()
 	{
-		$this->raiseEvent('OnSaveState',$this,null);
+		$this->raiseEvent('OnSaveState', $this, null);
 		$this->saveGlobals();
 	}
 	public function onSaveStateComplete()
 	{
-		$this->raiseEvent('OnSaveStateComplete',$this,null);
+		$this->raiseEvent('OnSaveStateComplete', $this, null);
 	}
 	public function onPreFlushOutput()
 	{
-		$this->raiseEvent('OnPreFlushOutput',$this,null);
+		$this->raiseEvent('OnPreFlushOutput', $this, null);
 	}
 	public function flushOutput($continueBuffering = true)
 	{
@@ -10856,38 +10856,38 @@ 
 	}
 	public function onEndRequest()
 	{
-		$this->flushOutput(false); 		$this->saveGlobals();  		$this->raiseEvent('OnEndRequest',$this,null);
+		$this->flushOutput(false); $this->saveGlobals(); $this->raiseEvent('OnEndRequest', $this, null);
 	}
 }
 class TApplicationMode extends TEnumerable
 {
-	const Off='Off';
-	const Debug='Debug';
-	const Normal='Normal';
-	const Performance='Performance';
+	const Off = 'Off';
+	const Debug = 'Debug';
+	const Normal = 'Normal';
+	const Performance = 'Performance';
 }
 class TApplicationConfiguration extends TComponent
 {
-	private $_properties=array();
-	private $_usings=array();
-	private $_aliases=array();
-	private $_modules=array();
-	private $_services=array();
-	private $_parameters=array();
-	private $_includes=array();
-	private $_empty=true;
+	private $_properties = array();
+	private $_usings = array();
+	private $_aliases = array();
+	private $_modules = array();
+	private $_services = array();
+	private $_parameters = array();
+	private $_includes = array();
+	private $_empty = true;
 	public function loadFromFile($fname)
 	{
-		if(Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
+		if (Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 		{
 			$fcontent = include $fname;
-			$this->loadFromPhp($fcontent,dirname($fname));
+			$this->loadFromPhp($fcontent, dirname($fname));
 		}
 		else
 		{
-			$dom=new TXmlDocument;
+			$dom = new TXmlDocument;
 			$dom->loadFromFile($fname);
-			$this->loadFromXml($dom,dirname($fname));
+			$this->loadFromXml($dom, dirname($fname));
 		}
 	}
 	public function getIsEmpty()
@@ -10896,50 +10896,50 @@ 
 	}
 	public function loadFromPhp($config, $configPath)
 	{
-				if(isset($config['application']))
+				if (isset($config['application']))
 		{
-			foreach($config['application'] as $name=>$value)
+			foreach ($config['application'] as $name=>$value)
 			{
-				$this->_properties[$name]=$value;
+				$this->_properties[$name] = $value;
 			}
 			$this->_empty = false;
 		}
-		if(isset($config['paths']) && is_array($config['paths']))
-			$this->loadPathsPhp($config['paths'],$configPath);
-		if(isset($config['modules']) && is_array($config['modules']))
-			$this->loadModulesPhp($config['modules'],$configPath);
-		if(isset($config['services']) && is_array($config['services']))
-			$this->loadServicesPhp($config['services'],$configPath);
-		if(isset($config['parameters']) && is_array($config['parameters']))
+		if (isset($config['paths']) && is_array($config['paths']))
+			$this->loadPathsPhp($config['paths'], $configPath);
+		if (isset($config['modules']) && is_array($config['modules']))
+			$this->loadModulesPhp($config['modules'], $configPath);
+		if (isset($config['services']) && is_array($config['services']))
+			$this->loadServicesPhp($config['services'], $configPath);
+		if (isset($config['parameters']) && is_array($config['parameters']))
 			$this->loadParametersPhp($config['parameters'], $configPath);
-		if(isset($config['includes']) && is_array($config['includes']))
-			$this->loadExternalXml($config['includes'],$configPath);
+		if (isset($config['includes']) && is_array($config['includes']))
+			$this->loadExternalXml($config['includes'], $configPath);
 	}
-	public function loadFromXml($dom,$configPath)
+	public function loadFromXml($dom, $configPath)
 	{
-				foreach($dom->getAttributes() as $name=>$value)
+				foreach ($dom->getAttributes() as $name=>$value)
 		{
-			$this->_properties[$name]=$value;
-			$this->_empty=false;
+			$this->_properties[$name] = $value;
+			$this->_empty = false;
 		}
-		foreach($dom->getElements() as $element)
+		foreach ($dom->getElements() as $element)
 		{
-			switch($element->getTagName())
+			switch ($element->getTagName())
 			{
 				case 'paths':
-					$this->loadPathsXml($element,$configPath);
+					$this->loadPathsXml($element, $configPath);
 					break;
 				case 'modules':
-					$this->loadModulesXml($element,$configPath);
+					$this->loadModulesXml($element, $configPath);
 					break;
 				case 'services':
-					$this->loadServicesXml($element,$configPath);
+					$this->loadServicesXml($element, $configPath);
 					break;
 				case 'parameters':
-					$this->loadParametersXml($element,$configPath);
+					$this->loadParametersXml($element, $configPath);
 					break;
 				case 'include':
-					$this->loadExternalXml($element,$configPath);
+					$this->loadExternalXml($element, $configPath);
 					break;
 				default:
 										break;
@@ -10948,155 +10948,155 @@ 
 	}
 	protected function loadPathsPhp($pathsNode, $configPath)
 	{
-		if(isset($pathsNode['aliases']) && is_array($pathsNode['aliases']))
+		if (isset($pathsNode['aliases']) && is_array($pathsNode['aliases']))
 		{
-			foreach($pathsNode['aliases'] as $id=>$path)
+			foreach ($pathsNode['aliases'] as $id=>$path)
 			{
-				$path=str_replace('\\','/',$path);
-				if(preg_match('/^\\/|.:\\/|.:\\\\/',$path))						$p=realpath($path);
+				$path = str_replace('\\', '/', $path);
+				if (preg_match('/^\\/|.:\\/|.:\\\\/', $path))						$p = realpath($path);
 				else
-					$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
-				if($p===false || !is_dir($p))
-					throw new TConfigurationException('appconfig_aliaspath_invalid',$id,$path);
-				if(isset($this->_aliases[$id]))
-					throw new TConfigurationException('appconfig_alias_redefined',$id);
-				$this->_aliases[$id]=$p;
+					$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
+				if ($p === false || !is_dir($p))
+					throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
+				if (isset($this->_aliases[$id]))
+					throw new TConfigurationException('appconfig_alias_redefined', $id);
+				$this->_aliases[$id] = $p;
 			}
 		}
-		if(isset($pathsNode['using']) && is_array($pathsNode['using']))
+		if (isset($pathsNode['using']) && is_array($pathsNode['using']))
 		{
-			foreach($pathsNode['using'] as $namespace)
+			foreach ($pathsNode['using'] as $namespace)
 			{
 				$this->_usings[] = $namespace;
 			}
 		}
 	}
-	protected function loadPathsXml($pathsNode,$configPath)
+	protected function loadPathsXml($pathsNode, $configPath)
 	{
-		foreach($pathsNode->getElements() as $element)
+		foreach ($pathsNode->getElements() as $element)
 		{
-			switch($element->getTagName())
+			switch ($element->getTagName())
 			{
 				case 'alias':
 				{
-					if(($id=$element->getAttribute('id'))!==null && ($path=$element->getAttribute('path'))!==null)
+					if (($id = $element->getAttribute('id')) !== null && ($path = $element->getAttribute('path')) !== null)
 					{
-						$path=str_replace('\\','/',$path);
-						if(preg_match('/^\\/|.:\\/|.:\\\\/',$path))								$p=realpath($path);
+						$path = str_replace('\\', '/', $path);
+						if (preg_match('/^\\/|.:\\/|.:\\\\/', $path))								$p = realpath($path);
 						else
-							$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
-						if($p===false || !is_dir($p))
-							throw new TConfigurationException('appconfig_aliaspath_invalid',$id,$path);
-						if(isset($this->_aliases[$id]))
-							throw new TConfigurationException('appconfig_alias_redefined',$id);
-						$this->_aliases[$id]=$p;
+							$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
+						if ($p === false || !is_dir($p))
+							throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
+						if (isset($this->_aliases[$id]))
+							throw new TConfigurationException('appconfig_alias_redefined', $id);
+						$this->_aliases[$id] = $p;
 					}
 					else
 						throw new TConfigurationException('appconfig_alias_invalid');
-					$this->_empty=false;
+					$this->_empty = false;
 					break;
 				}
 				case 'using':
 				{
-					if(($namespace=$element->getAttribute('namespace'))!==null)
-						$this->_usings[]=$namespace;
+					if (($namespace = $element->getAttribute('namespace')) !== null)
+						$this->_usings[] = $namespace;
 					else
 						throw new TConfigurationException('appconfig_using_invalid');
-					$this->_empty=false;
+					$this->_empty = false;
 					break;
 				}
 				default:
-					throw new TConfigurationException('appconfig_paths_invalid',$element->getTagName());
+					throw new TConfigurationException('appconfig_paths_invalid', $element->getTagName());
 			}
 		}
 	}
 	protected function loadModulesPhp($modulesNode, $configPath)
 	{
-		foreach($modulesNode as $id=>$module)
+		foreach ($modulesNode as $id=>$module)
 		{
-			if(!isset($module['class']))
-				throw new TConfigurationException('appconfig_moduletype_required',$id);
+			if (!isset($module['class']))
+				throw new TConfigurationException('appconfig_moduletype_required', $id);
 			$type = $module['class'];
 			unset($module['class']);
 			$properties = array();
-			if(isset($module['properties']))
+			if (isset($module['properties']))
 			{
 				$properties = $module['properties'];
 				unset($module['properties']);
 			}
 			$properties['id'] = $id;
-			$this->_modules[$id]=array($type,$properties,$module);
-			$this->_empty=false;
+			$this->_modules[$id] = array($type, $properties, $module);
+			$this->_empty = false;
 		}
 	}
-	protected function loadModulesXml($modulesNode,$configPath)
+	protected function loadModulesXml($modulesNode, $configPath)
 	{
-		foreach($modulesNode->getElements() as $element)
+		foreach ($modulesNode->getElements() as $element)
 		{
-			if($element->getTagName()==='module')
+			if ($element->getTagName() === 'module')
 			{
-				$properties=$element->getAttributes();
-				$id=$properties->itemAt('id');
-				$type=$properties->remove('class');
-				if($type===null)
-					throw new TConfigurationException('appconfig_moduletype_required',$id);
+				$properties = $element->getAttributes();
+				$id = $properties->itemAt('id');
+				$type = $properties->remove('class');
+				if ($type === null)
+					throw new TConfigurationException('appconfig_moduletype_required', $id);
 				$element->setParent(null);
-				if($id===null)
-					$this->_modules[]=array($type,$properties->toArray(),$element);
+				if ($id === null)
+					$this->_modules[] = array($type, $properties->toArray(), $element);
 				else
-					$this->_modules[$id]=array($type,$properties->toArray(),$element);
-				$this->_empty=false;
+					$this->_modules[$id] = array($type, $properties->toArray(), $element);
+				$this->_empty = false;
 			}
 			else
-				throw new TConfigurationException('appconfig_modules_invalid',$element->getTagName());
+				throw new TConfigurationException('appconfig_modules_invalid', $element->getTagName());
 		}
 	}
-	protected function loadServicesPhp($servicesNode,$configPath)
+	protected function loadServicesPhp($servicesNode, $configPath)
 	{
-		foreach($servicesNode as $id => $service)
+		foreach ($servicesNode as $id => $service)
 		{
-			if(!isset($service['class']))
+			if (!isset($service['class']))
 				throw new TConfigurationException('appconfig_servicetype_required');
 			$type = $service['class'];
 			$properties = isset($service['properties']) ? $service['properties'] : array();
 			unset($service['properties']);
 			$properties['id'] = $id;
-			$this->_services[$id] = array($type,$properties,$service);
+			$this->_services[$id] = array($type, $properties, $service);
 			$this->_empty = false;
 		}
 	}
-	protected function loadServicesXml($servicesNode,$configPath)
+	protected function loadServicesXml($servicesNode, $configPath)
 	{
-		foreach($servicesNode->getElements() as $element)
+		foreach ($servicesNode->getElements() as $element)
 		{
-			if($element->getTagName()==='service')
+			if ($element->getTagName() === 'service')
 			{
-				$properties=$element->getAttributes();
-				if(($id=$properties->itemAt('id'))===null)
+				$properties = $element->getAttributes();
+				if (($id = $properties->itemAt('id')) === null)
 					throw new TConfigurationException('appconfig_serviceid_required');
-				if(($type=$properties->remove('class'))===null)
-					throw new TConfigurationException('appconfig_servicetype_required',$id);
+				if (($type = $properties->remove('class')) === null)
+					throw new TConfigurationException('appconfig_servicetype_required', $id);
 				$element->setParent(null);
-				$this->_services[$id]=array($type,$properties->toArray(),$element);
-				$this->_empty=false;
+				$this->_services[$id] = array($type, $properties->toArray(), $element);
+				$this->_empty = false;
 			}
 			else
-				throw new TConfigurationException('appconfig_services_invalid',$element->getTagName());
+				throw new TConfigurationException('appconfig_services_invalid', $element->getTagName());
 		}
 	}
-	protected function loadParametersPhp($parametersNode,$configPath)
+	protected function loadParametersPhp($parametersNode, $configPath)
 	{
-		foreach($parametersNode as $id => $parameter)
+		foreach ($parametersNode as $id => $parameter)
 		{
-			if(is_array($parameter))
+			if (is_array($parameter))
 			{
-				if(isset($parameter['class']))
+				if (isset($parameter['class']))
 				{
 					$type = $parameter['class'];
 					unset($parameter['class']);
 					$properties = isset($service['properties']) ? $service['properties'] : array();
 					$properties['id'] = $id;
-					$this->_parameters[$id] = array($type,$properties);
+					$this->_parameters[$id] = array($type, $properties);
 				}
 			}
 			else
@@ -11105,56 +11105,56 @@ 
 			}
 		}
 	}
-	protected function loadParametersXml($parametersNode,$configPath)
+	protected function loadParametersXml($parametersNode, $configPath)
 	{
-		foreach($parametersNode->getElements() as $element)
+		foreach ($parametersNode->getElements() as $element)
 		{
-			if($element->getTagName()==='parameter')
+			if ($element->getTagName() === 'parameter')
 			{
-				$properties=$element->getAttributes();
-				if(($id=$properties->remove('id'))===null)
+				$properties = $element->getAttributes();
+				if (($id = $properties->remove('id')) === null)
 					throw new TConfigurationException('appconfig_parameterid_required');
-				if(($type=$properties->remove('class'))===null)
+				if (($type = $properties->remove('class')) === null)
 				{
-					if(($value=$properties->remove('value'))===null)
-						$this->_parameters[$id]=$element;
+					if (($value = $properties->remove('value')) === null)
+						$this->_parameters[$id] = $element;
 					else
-						$this->_parameters[$id]=$value;
+						$this->_parameters[$id] = $value;
 				}
 				else
-					$this->_parameters[$id]=array($type,$properties->toArray());
-				$this->_empty=false;
+					$this->_parameters[$id] = array($type, $properties->toArray());
+				$this->_empty = false;
 			}
 			else
-				throw new TConfigurationException('appconfig_parameters_invalid',$element->getTagName());
+				throw new TConfigurationException('appconfig_parameters_invalid', $element->getTagName());
 		}
 	}
-	protected function loadExternalPhp($includeNode,$configPath)
+	protected function loadExternalPhp($includeNode, $configPath)
 	{
-		foreach($includeNode as $include)
+		foreach ($includeNode as $include)
 		{
-			$when = isset($include['when'])?true:false;
-			if(!isset($include['file']))
+			$when = isset($include['when']) ? true : false;
+			if (!isset($include['file']))
 				throw new TConfigurationException('appconfig_includefile_required');
 			$filePath = $include['file'];
-			if(isset($this->_includes[$filePath]))
-				$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
+			if (isset($this->_includes[$filePath]))
+				$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
 			else
-				$$this->_includes[$filePath]=$when;
-			$this->_empty=false;
+				$$this->_includes[$filePath] = $when;
+			$this->_empty = false;
 		}
 	}
-	protected function loadExternalXml($includeNode,$configPath)
+	protected function loadExternalXml($includeNode, $configPath)
 	{
-		if(($when=$includeNode->getAttribute('when'))===null)
-			$when=true;
-		if(($filePath=$includeNode->getAttribute('file'))===null)
+		if (($when = $includeNode->getAttribute('when')) === null)
+			$when = true;
+		if (($filePath = $includeNode->getAttribute('file')) === null)
 			throw new TConfigurationException('appconfig_includefile_required');
-		if(isset($this->_includes[$filePath]))
-			$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
+		if (isset($this->_includes[$filePath]))
+			$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
 		else
-			$this->_includes[$filePath]=$when;
-		$this->_empty=false;
+			$this->_includes[$filePath] = $when;
+		$this->_empty = false;
 	}
 	public function getProperties()
 	{
@@ -11187,22 +11187,22 @@ 
 }
 class TApplicationStatePersister extends TModule implements IStatePersister
 {
-	const CACHE_NAME='prado:appstate';
+	const CACHE_NAME = 'prado:appstate';
 	public function init($config)
 	{
 		$this->getApplication()->setApplicationStatePersister($this);
 	}
 	protected function getStateFilePath()
 	{
-		return $this->getApplication()->getRuntimePath().'/global.cache';
+		return $this->getApplication()->getRuntimePath() . '/global.cache';
 	}
 	public function load()
 	{
-		if(($cache=$this->getApplication()->getCache())!==null && ($value=$cache->get(self::CACHE_NAME))!==false)
+		if (($cache = $this->getApplication()->getCache()) !== null && ($value = $cache->get(self::CACHE_NAME)) !== false)
 			return unserialize($value);
 		else
 		{
-			if(($content=@file_get_contents($this->getStateFilePath()))!==false)
+			if (($content = @file_get_contents($this->getStateFilePath())) !== false)
 				return unserialize($content);
 			else
 				return null;
@@ -11210,19 +11210,19 @@ 
 	}
 	public function save($state)
 	{
-		$content=serialize($state);
-		$saveFile=true;
-		if(($cache=$this->getApplication()->getCache())!==null)
+		$content = serialize($state);
+		$saveFile = true;
+		if (($cache = $this->getApplication()->getCache()) !== null)
 		{
-			if($cache->get(self::CACHE_NAME)===$content)
-				$saveFile=false;
+			if ($cache->get(self::CACHE_NAME) === $content)
+				$saveFile = false;
 			else
-				$cache->set(self::CACHE_NAME,$content);
+				$cache->set(self::CACHE_NAME, $content);
 		}
-		if($saveFile)
+		if ($saveFile)
 		{
-			$fileName=$this->getStateFilePath();
-			file_put_contents($fileName,$content,LOCK_EX);
+			$fileName = $this->getStateFilePath();
+			file_put_contents($fileName, $content, LOCK_EX);
 		}
 	}
 }

Braces +3076 added lines, -2362 removed lines

@@ -11,10 +11,12 @@ 
  * Do not modify this file manually.
  */
 
-if(!defined('PRADO_DIR'))
+if(!defined('PRADO_DIR')) {
 	define('PRADO_DIR',dirname(__FILE__));
-if(!defined('PRADO_CHMOD'))
+}
+if(!defined('PRADO_CHMOD')) {
 	define('PRADO_CHMOD',0777);
+}
 class PradoBase
 {
 	const CLASS_FILE_EXT='.php';
@@ -35,8 +37,9 @@ 
 	public static function autoload($className)
 	{
 		include_once($className.self::CLASS_FILE_EXT);
-		if(!class_exists($className,false) && !interface_exists($className,false))
-			self::fatalError("Class file for '$className' cannot be found.");
+		if(!class_exists($className,false) && !interface_exists($className,false)) {
+					self::fatalError("Class file for '$className' cannot be found.");
+		}
 	}
 	public static function poweredByPrado($logoType=0)
 	{
@@ -45,23 +48,23 @@ 
 		{
 			$am=self::$_application->getAssetManager();
 			$url=$am->publishFilePath(self::getPathOfNamespace('System.'.$logoName,'.gif'));
+		} else {
+					$url='http://pradosoft.github.io/docs/'.$logoName.'.gif';
 		}
-		else
-			$url='http://pradosoft.github.io/docs/'.$logoName.'.gif';
 		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="'.$url.'" style="border-width:0px;" alt="Powered by PRADO" /></a>';
 	}
 	public static function phpErrorHandler($errno,$errstr,$errfile,$errline)
 	{
-		if(error_reporting() & $errno)
-			throw new TPhpErrorException($errno,$errstr,$errfile,$errline);
+		if(error_reporting() & $errno) {
+					throw new TPhpErrorException($errno,$errstr,$errfile,$errline);
+		}
 	}
 	public static function exceptionHandler($exception)
 	{
 		if(self::$_application!==null && ($errorHandler=self::$_application->getErrorHandler())!==null)
 		{
 			$errorHandler->handleError(null,$exception);
-		}
-		else
+		} else
 		{
 			echo $exception;
 		}
@@ -69,8 +72,9 @@ 
 	}
 	public static function setApplication($application)
 	{
-		if(self::$_application!==null && !defined('PRADO_TEST_RUN'))
-			throw new TInvalidOperationException('prado_application_singleton_required');
+		if(self::$_application!==null && !defined('PRADO_TEST_RUN')) {
+					throw new TInvalidOperationException('prado_application_singleton_required');
+		}
 		self::$_application=$application;
 	}
 	public static function getApplication()
@@ -83,14 +87,16 @@ 
 	}
 	public static function createComponent($type)
 	{
-		if(!isset(self::$classExists[$type]))
-			self::$classExists[$type] = class_exists($type, false);
+		if(!isset(self::$classExists[$type])) {
+					self::$classExists[$type] = class_exists($type, false);
+		}
 		if( !isset(self::$_usings[$type]) && !self::$classExists[$type]) {
 			self::using($type);
 			self::$classExists[$type] = class_exists($type, false);
 		}
-		if( ($pos = strrpos($type, '.')) !== false)
-			$type = substr($type,$pos+1);
+		if( ($pos = strrpos($type, '.')) !== false) {
+					$type = substr($type,$pos+1);
+		}
 		if(($n=func_num_args())>1)
 		{
 			$args = func_get_args();
@@ -109,74 +115,77 @@ 
 				break;
 				default:
 					$s='$args[1]';
-					for($i=2;$i<$n;++$i)
-						$s.=",\$args[$i]";
+					for($i=2;$i<$n;++$i) {
+											$s.=",\$args[$i]";
+					}
 					eval("\$component=new $type($s);");
 					return $component;
 				break;
 			}
+		} else {
+					return new $type;
 		}
-		else
-			return new $type;
 	}
 	public static function using($namespace,$checkClassExistence=true)
 	{
-		if(isset(self::$_usings[$namespace]) || class_exists($namespace,false))
-			return;
+		if(isset(self::$_usings[$namespace]) || class_exists($namespace,false)) {
+					return;
+		}
 		if(($pos=strrpos($namespace,'.'))===false)  		{
 			try
 			{
 				include_once($namespace.self::CLASS_FILE_EXT);
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
-				if($checkClassExistence && !class_exists($namespace,false))
-					throw new TInvalidOperationException('prado_component_unknown',$namespace,$e->getMessage());
-				else
-					throw $e;
+				if($checkClassExistence && !class_exists($namespace,false)) {
+									throw new TInvalidOperationException('prado_component_unknown',$namespace,$e->getMessage());
+				} else {
+									throw $e;
+				}
 			}
-		}
-		else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
+		} else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
 		{
 			$className=substr($namespace,$pos+1);
 			if($className==='*')  			{
 				self::$_usings[$namespace]=$path;
 				set_include_path(get_include_path().PATH_SEPARATOR.$path);
-			}
-			else  			{
+			} else  			{
 				self::$_usings[$namespace]=$path;
 				if(!$checkClassExistence || !class_exists($className,false))
 				{
 					try
 					{
 						include_once($path);
-					}
-					catch(Exception $e)
+					} catch(Exception $e)
 					{
-						if($checkClassExistence && !class_exists($className,false))
-							throw new TInvalidOperationException('prado_component_unknown',$className,$e->getMessage());
-						else
-							throw $e;
+						if($checkClassExistence && !class_exists($className,false)) {
+													throw new TInvalidOperationException('prado_component_unknown',$className,$e->getMessage());
+						} else {
+													throw $e;
+						}
 					}
 				}
 			}
+		} else {
+					throw new TInvalidDataValueException('prado_using_invalid',$namespace);
 		}
-		else
-			throw new TInvalidDataValueException('prado_using_invalid',$namespace);
 	}
 	public static function getPathOfNamespace($namespace, $ext='')
 	{
 		if(self::CLASS_FILE_EXT === $ext || empty($ext))
 		{
-			if(isset(self::$_usings[$namespace]))
-				return self::$_usings[$namespace];
-			if(isset(self::$_aliases[$namespace]))
-				return self::$_aliases[$namespace];
+			if(isset(self::$_usings[$namespace])) {
+							return self::$_usings[$namespace];
+			}
+			if(isset(self::$_aliases[$namespace])) {
+							return self::$_aliases[$namespace];
+			}
 		}
 		$segs = explode('.',$namespace);
 		$alias = array_shift($segs);
-		if(null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias)))
-			return rtrim($root.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR ,$segs),'/\\').(($file === '*') ? '' : DIRECTORY_SEPARATOR.$file.$ext);
+		if(null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias))) {
+					return rtrim($root.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR ,$segs),'/\\').(($file === '*') ? '' : DIRECTORY_SEPARATOR.$file.$ext);
+		}
 		return null;
 	}
 	public static function getPathOfAlias($alias)
@@ -189,39 +198,45 @@ 
 	}
 	public static function setPathOfAlias($alias,$path)
 	{
-		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
-			throw new TInvalidOperationException('prado_alias_redefined',$alias);
-		else if(($rp=realpath($path))!==false && is_dir($rp))
+		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN')) {
+					throw new TInvalidOperationException('prado_alias_redefined',$alias);
+		} else if(($rp=realpath($path))!==false && is_dir($rp))
 		{
-			if(strpos($alias,'.')===false)
-				self::$_aliases[$alias]=$rp;
-			else
-				throw new TInvalidDataValueException('prado_aliasname_invalid',$alias);
+			if(strpos($alias,'.')===false) {
+							self::$_aliases[$alias]=$rp;
+			} else {
+							throw new TInvalidDataValueException('prado_aliasname_invalid',$alias);
+			}
+		} else {
+					throw new TInvalidDataValueException('prado_alias_invalid',$alias,$path);
 		}
-		else
-			throw new TInvalidDataValueException('prado_alias_invalid',$alias,$path);
 	}
 	public static function fatalError($msg)
 	{
 		echo '<h1>Fatal Error</h1>';
 		echo '<p>'.$msg.'</p>';
-		if(!function_exists('debug_backtrace'))
-			return;
+		if(!function_exists('debug_backtrace')) {
+					return;
+		}
 		echo '<h2>Debug Backtrace</h2>';
 		echo '<pre>';
 		$index=-1;
 		foreach(debug_backtrace() as $t)
 		{
 			$index++;
-			if($index==0)  				continue;
+			if($index==0) {
+				continue;
+			}
 			echo '#'.$index.' ';
-			if(isset($t['file']))
-				echo basename($t['file']) . ':' . $t['line'];
-			else
-				 echo '<PHP inner-code>';
+			if(isset($t['file'])) {
+							echo basename($t['file']) . ':' . $t['line'];
+			} else {
+							 echo '<PHP inner-code>';
+			}
 			echo ' -- ';
-			if(isset($t['class']))
-				echo $t['class'] . $t['type'];
+			if(isset($t['class'])) {
+							echo $t['class'] . $t['type'];
+			}
 			echo $t['function'] . '(';
 			if(isset($t['args']) && sizeof($t['args']) > 0)
 			{
@@ -231,26 +246,28 @@ 
 					if(is_string($item))
 					{
 						$str=htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
-						if (strlen($item) > 70)
-							echo "'". substr($str, 0, 70) . "...'";
-						else
-							echo "'" . $str . "'";
+						if (strlen($item) > 70) {
+													echo "'". substr($str, 0, 70) . "...'";
+						} else {
+													echo "'" . $str . "'";
+						}
+					} else if (is_int($item) || is_float($item)) {
+											echo $item;
+					} else if (is_object($item)) {
+											echo get_class($item);
+					} else if (is_array($item)) {
+											echo 'array(' . count($item) . ')';
+					} else if (is_bool($item)) {
+											echo $item ? 'true' : 'false';
+					} else if ($item === null) {
+											echo 'NULL';
+					} else if (is_resource($item)) {
+											echo get_resource_type($item);
 					}
-					else if (is_int($item) || is_float($item))
-						echo $item;
-					else if (is_object($item))
-						echo get_class($item);
-					else if (is_array($item))
-						echo 'array(' . count($item) . ')';
-					else if (is_bool($item))
-						echo $item ? 'true' : 'false';
-					else if ($item === null)
-						echo 'NULL';
-					else if (is_resource($item))
-						echo get_resource_type($item);
 					$count++;
-					if (count($t['args']) > $count)
-						echo ', ';
+					if (count($t['args']) > $count) {
+											echo ', ';
+					}
 				}
 			}
 			echo ")\n";
@@ -263,9 +280,9 @@ 
 		static $languages=null;
 		if($languages===null)
 		{
-			if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
-				$languages[0]='en';
-			else
+			if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+							$languages[0]='en';
+			} else
 			{
 				$languages=array();
 				foreach(explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
@@ -275,8 +292,9 @@ 
 				}
 				arsort($languages);
 				$languages=array_keys($languages);
-				if(empty($languages))
-					$languages[0]='en';
+				if(empty($languages)) {
+									$languages[0]='en';
+				}
 			}
 		}
 		return $languages;
@@ -288,38 +306,43 @@ 
 		{
 			$langs=Prado::getUserLanguages();
 			$lang=explode('-',$langs[0]);
-			if(empty($lang[0]) || !ctype_alpha($lang[0]))
-				$language='en';
-			else
-				$language=$lang[0];
+			if(empty($lang[0]) || !ctype_alpha($lang[0])) {
+							$language='en';
+			} else {
+							$language=$lang[0];
+			}
 		}
 		return $language;
 	}
 	public static function trace($msg,$category='Uncategorized',$ctl=null)
 	{
-		if(self::$_application && self::$_application->getMode()===TApplicationMode::Performance)
-			return;
+		if(self::$_application && self::$_application->getMode()===TApplicationMode::Performance) {
+					return;
+		}
 		if(!self::$_application || self::$_application->getMode()===TApplicationMode::Debug)
 		{
 			$trace=debug_backtrace();
-			if(isset($trace[0]['file']) && isset($trace[0]['line']))
-				$msg.=" (line {$trace[0]['line']}, {$trace[0]['file']})";
+			if(isset($trace[0]['file']) && isset($trace[0]['line'])) {
+							$msg.=" (line {$trace[0]['line']}, {$trace[0]['file']})";
+			}
 			$level=TLogger::DEBUG;
+		} else {
+					$level=TLogger::INFO;
 		}
-		else
-			$level=TLogger::INFO;
 		self::log($msg,$level,$category,$ctl);
 	}
 	public static function log($msg,$level=TLogger::INFO,$category='Uncategorized',$ctl=null)
 	{
-		if(self::$_logger===null)
-			self::$_logger=new TLogger;
+		if(self::$_logger===null) {
+					self::$_logger=new TLogger;
+		}
 		self::$_logger->log($msg,$level,$category,$ctl);
 	}
 	public static function getLogger()
 	{
-		if(self::$_logger===null)
-			self::$_logger=new TLogger;
+		if(self::$_logger===null) {
+					self::$_logger=new TLogger;
+		}
 		return self::$_logger;
 	}
 	public static function varDump($var,$depth=10,$highlight=false)
@@ -332,17 +355,24 @@ 
 		Prado::using('System.I18N.Translation');
 		$app = Prado::getApplication()->getGlobalization(false);
 		$params = array();
-		foreach($parameters as $key => $value)
-			$params['{'.$key.'}'] = $value;
-				if($app===null || ($config = $app->getTranslationConfiguration())===null)
-			return strtr($text, $params);
-		if ($catalogue===null)
-			$catalogue=isset($config['catalogue'])?$config['catalogue']:'messages';
+		foreach($parameters as $key => $value) {
+					$params['{'.$key.'}'] = $value;
+		}
+				if($app===null || ($config = $app->getTranslationConfiguration())===null) {
+							return strtr($text, $params);
+				}
+		if ($catalogue===null) {
+					$catalogue=isset($config['catalogue'])?$config['catalogue']:'messages';
+		}
 		Translation::init($catalogue);
 				$appCharset = $app===null ? '' : $app->getCharset();
 				$defaultCharset = ($app===null) ? 'UTF-8' : $app->getDefaultCharset();
-				if(empty($charset)) $charset = $appCharset;
-		if(empty($charset)) $charset = $defaultCharset;
+				if(empty($charset)) {
+					$charset = $appCharset;
+				}
+		if(empty($charset)) {
+			$charset = $defaultCharset;
+		}
 		return Translation::formatter($catalogue)->format($text,$params,$catalogue,$charset);
 	}
 }
@@ -461,8 +491,9 @@ 
 	}
 	public function publishAsset($assetPath,$className=null)
 	{
-		if($className===null)
-			$className=get_class($this);
+		if($className===null) {
+					$className=get_class($this);
+		}
 		$class=new ReflectionClass($className);
 		$fullPath=dirname($class->getFileName()).DIRECTORY_SEPARATOR.$assetPath;
 		return $this->publishFilePath($fullPath);
@@ -526,37 +557,42 @@ 
 	}
 	public function getErrorTemplatePath()
 	{
-		if($this->_templatePath===null)
-			$this->_templatePath=Prado::getFrameworkPath().'/Exceptions/templates';
+		if($this->_templatePath===null) {
+					$this->_templatePath=Prado::getFrameworkPath().'/Exceptions/templates';
+		}
 		return $this->_templatePath;
 	}
 	public function setErrorTemplatePath($value)
 	{
-		if(($templatePath=Prado::getPathOfNamespace($value))!==null && is_dir($templatePath))
-			$this->_templatePath=$templatePath;
-		else
-			throw new TConfigurationException('errorhandler_errortemplatepath_invalid',$value);
+		if(($templatePath=Prado::getPathOfNamespace($value))!==null && is_dir($templatePath)) {
+					$this->_templatePath=$templatePath;
+		} else {
+					throw new TConfigurationException('errorhandler_errortemplatepath_invalid',$value);
+		}
 	}
 	public function handleError($sender,$param)
 	{
 		static $handling=false;
 								restore_error_handler();
 		restore_exception_handler();
-				if($handling)
-			$this->handleRecursiveError($param);
-		else
+				if($handling) {
+							$this->handleRecursiveError($param);
+				} else
 		{
 			$handling=true;
-			if(($response=$this->getResponse())!==null)
-				$response->clear();
-			if(!headers_sent())
-				header('Content-Type: text/html; charset=UTF-8');
-			if($param instanceof THttpException)
-				$this->handleExternalError($param->getStatusCode(),$param);
-			else if($this->getApplication()->getMode()===TApplicationMode::Debug)
-				$this->displayException($param);
-			else
-				$this->handleExternalError(500,$param);
+			if(($response=$this->getResponse())!==null) {
+							$response->clear();
+			}
+			if(!headers_sent()) {
+							header('Content-Type: text/html; charset=UTF-8');
+			}
+			if($param instanceof THttpException) {
+							$this->handleExternalError($param->getStatusCode(),$param);
+			} else if($this->getApplication()->getMode()===TApplicationMode::Debug) {
+							$this->displayException($param);
+			} else {
+							$this->handleExternalError(500,$param);
+			}
 		}
 	}
 	protected static function hideSecurityRelated($value, $exception=null)
@@ -567,28 +603,32 @@ 
 			$aTrace = $exception->getTrace();
 			foreach($aTrace as $item)
 			{
-				if(isset($item['file']))
-					$aRpl[dirname($item['file']) . DIRECTORY_SEPARATOR] = '<hidden>' . DIRECTORY_SEPARATOR;
+				if(isset($item['file'])) {
+									$aRpl[dirname($item['file']) . DIRECTORY_SEPARATOR] = '<hidden>' . DIRECTORY_SEPARATOR;
+				}
 			}
 		}
 		$aRpl[$_SERVER['DOCUMENT_ROOT']] = '${DocumentRoot}';
 		$aRpl[str_replace('/', DIRECTORY_SEPARATOR, $_SERVER['DOCUMENT_ROOT'])] = '${DocumentRoot}';
 		$aRpl[PRADO_DIR . DIRECTORY_SEPARATOR] = '${PradoFramework}' . DIRECTORY_SEPARATOR;
-		if(isset($aRpl[DIRECTORY_SEPARATOR])) unset($aRpl[DIRECTORY_SEPARATOR]);
+		if(isset($aRpl[DIRECTORY_SEPARATOR])) {
+			unset($aRpl[DIRECTORY_SEPARATOR]);
+		}
 		$aRpl = array_reverse($aRpl, true);
 		return str_replace(array_keys($aRpl), $aRpl, $value);
 	}
 	protected function handleExternalError($statusCode,$exception)
 	{
-		if(!($exception instanceof THttpException))
-			error_log($exception->__toString());
+		if(!($exception instanceof THttpException)) {
+					error_log($exception->__toString());
+		}
 		$content=$this->getErrorTemplate($statusCode,$exception);
 		$serverAdmin=isset($_SERVER['SERVER_ADMIN'])?$_SERVER['SERVER_ADMIN']:'';
 		$isDebug = $this->getApplication()->getMode()===TApplicationMode::Debug;
 		$errorMessage = $exception->getMessage();
-		if($isDebug)
-			$version=$_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
-		else
+		if($isDebug) {
+					$version=$_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
+		} else
 		{
 			$version='';
 			$errorMessage = self::hideSecurityRelated($errorMessage, $exception);
@@ -611,8 +651,7 @@ 
 			echo "<body><h1>Recursive Error</h1>\n";
 			echo "<pre>".$exception->__toString()."</pre>\n";
 			echo "</body></html>";
-		}
-		else
+		} else
 		{
 			error_log("Error happened while processing an existing error:\n".$exception->__toString());
 			header('HTTP/1.0 500 Internal Error');
@@ -631,28 +670,28 @@ 
 			$fileName=$exception->getTemplateFile();
 			$lines=empty($fileName)?explode("\n",$exception->getTemplateSource()):@file($fileName);
 			$source=$this->getSourceCode($lines,$exception->getLineNumber());
-			if($fileName==='')
-				$fileName='---embedded template---';
+			if($fileName==='') {
+							$fileName='---embedded template---';
+			}
 			$errorLine=$exception->getLineNumber();
-		}
-		else
+		} else
 		{
 			if(($trace=$this->getExactTrace($exception))!==null)
 			{
 				$fileName=$trace['file'];
 				$errorLine=$trace['line'];
-			}
-			else
+			} else
 			{
 				$fileName=$exception->getFile();
 				$errorLine=$exception->getLine();
 			}
 			$source=$this->getSourceCode(@file($fileName),$errorLine);
 		}
-		if($this->getApplication()->getMode()===TApplicationMode::Debug)
-			$version=$_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
-		else
-			$version='';
+		if($this->getApplication()->getMode()===TApplicationMode::Debug) {
+					$version=$_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
+		} else {
+					$version='';
+		}
 		$tokens=array(
 			'%%ErrorType%%' => get_class($exception),
 			'%%ErrorMessage%%' => $this->addLink(htmlspecialchars($exception->getMessage())),
@@ -669,41 +708,47 @@ 
 	{
 		$lang=Prado::getPreferredLanguage();
 		$exceptionFile=Prado::getFrameworkPath().'/Exceptions/templates/'.self::EXCEPTION_FILE_NAME.'-'.$lang.'.html';
-		if(!is_file($exceptionFile))
-			$exceptionFile=Prado::getFrameworkPath().'/Exceptions/templates/'.self::EXCEPTION_FILE_NAME.'.html';
-		if(($content=@file_get_contents($exceptionFile))===false)
-			die("Unable to open exception template file '$exceptionFile'.");
+		if(!is_file($exceptionFile)) {
+					$exceptionFile=Prado::getFrameworkPath().'/Exceptions/templates/'.self::EXCEPTION_FILE_NAME.'.html';
+		}
+		if(($content=@file_get_contents($exceptionFile))===false) {
+					die("Unable to open exception template file '$exceptionFile'.");
+		}
 		return $content;
 	}
 	protected function getErrorTemplate($statusCode,$exception)
 	{
 		$base=$this->getErrorTemplatePath().DIRECTORY_SEPARATOR.self::ERROR_FILE_NAME;
 		$lang=Prado::getPreferredLanguage();
-		if(is_file("$base$statusCode-$lang.html"))
-			$errorFile="$base$statusCode-$lang.html";
-		else if(is_file("$base$statusCode.html"))
-			$errorFile="$base$statusCode.html";
-		else if(is_file("$base-$lang.html"))
-			$errorFile="$base-$lang.html";
-		else
-			$errorFile="$base.html";
-		if(($content=@file_get_contents($errorFile))===false)
-			die("Unable to open error template file '$errorFile'.");
+		if(is_file("$base$statusCode-$lang.html")) {
+					$errorFile="$base$statusCode-$lang.html";
+		} else if(is_file("$base$statusCode.html")) {
+					$errorFile="$base$statusCode.html";
+		} else if(is_file("$base-$lang.html")) {
+					$errorFile="$base-$lang.html";
+		} else {
+					$errorFile="$base.html";
+		}
+		if(($content=@file_get_contents($errorFile))===false) {
+					die("Unable to open error template file '$errorFile'.");
+		}
 		return $content;
 	}
 	private function getExactTrace($exception)
 	{
 		$trace=$exception->getTrace();
 		$result=null;
-						if($exception instanceof TPhpErrorException)
-			$result=isset($trace[0]['file'])?$trace[0]:$trace[1];
-		else if($exception instanceof TInvalidOperationException)
+						if($exception instanceof TPhpErrorException) {
+									$result=isset($trace[0]['file'])?$trace[0]:$trace[1];
+						} else if($exception instanceof TInvalidOperationException)
 		{
-						if(($result=$this->getPropertyAccessTrace($trace,'__get'))===null)
-				$result=$this->getPropertyAccessTrace($trace,'__set');
+						if(($result=$this->getPropertyAccessTrace($trace,'__get'))===null) {
+										$result=$this->getPropertyAccessTrace($trace,'__set');
+						}
+		}
+		if($result!==null && strpos($result['file'],': eval()\'d code')!==false) {
+					return null;
 		}
-		if($result!==null && strpos($result['file'],': eval()\'d code')!==false)
-			return null;
 		return $result;
 	}
 	private function getPropertyAccessTrace($trace,$pattern)
@@ -711,10 +756,11 @@ 
 		$result=null;
 		foreach($trace as $t)
 		{
-			if(isset($t['function']) && $t['function']===$pattern)
-				$result=$t;
-			else
-				break;
+			if(isset($t['function']) && $t['function']===$pattern) {
+							$result=$t;
+			} else {
+							break;
+			}
 		}
 		return $result;
 	}
@@ -729,9 +775,9 @@ 
 			{
 				$line=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
 				$source.="<div class=\"error\">".$line."</div>";
+			} else {
+							$source.=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
 			}
-			else
-				$source.=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
 		}
 		return $source;
 	}
@@ -748,8 +794,9 @@ 
 	private $_r=false;
 	public function __construct($data=null,$readOnly=false)
 	{
-		if($data!==null)
-			$this->copyFrom($data);
+		if($data!==null) {
+					$this->copyFrom($data);
+		}
 		$this->setReadOnly($readOnly);
 	}
 	public function getReadOnly()
@@ -774,10 +821,11 @@ 
 	}
 	public function itemAt($index)
 	{
-		if($index>=0 && $index<$this->_c)
-			return $this->_d[$index];
-		else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+		if($index>=0 && $index<$this->_c) {
+					return $this->_d[$index];
+		} else {
+					throw new TInvalidDataValueException('list_index_invalid',$index);
+		}
 	}
 	public function add($item)
 	{
@@ -788,18 +836,18 @@ 
 	{
 		if(!$this->_r)
 		{
-			if($index===$this->_c)
-				$this->_d[$this->_c++]=$item;
-			else if($index>=0 && $index<$this->_c)
+			if($index===$this->_c) {
+							$this->_d[$this->_c++]=$item;
+			} else if($index>=0 && $index<$this->_c)
 			{
 				array_splice($this->_d,$index,0,array($item));
 				$this->_c++;
+			} else {
+							throw new TInvalidDataValueException('list_index_invalid',$index);
 			}
-			else
-				throw new TInvalidDataValueException('list_index_invalid',$index);
+		} else {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 	public function remove($item)
 	{
@@ -809,12 +857,12 @@ 
 			{
 				$this->removeAt($index);
 				return $index;
+			} else {
+							throw new TInvalidDataValueException('list_item_inexistent');
 			}
-			else
-				throw new TInvalidDataValueException('list_item_inexistent');
+		} else {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 	public function removeAt($index)
 	{
@@ -823,25 +871,26 @@ 
 			if($index>=0 && $index<$this->_c)
 			{
 				$this->_c--;
-				if($index===$this->_c)
-					return array_pop($this->_d);
-				else
+				if($index===$this->_c) {
+									return array_pop($this->_d);
+				} else
 				{
 					$item=$this->_d[$index];
 					array_splice($this->_d,$index,1);
 					return $item;
 				}
+			} else {
+							throw new TInvalidDataValueException('list_index_invalid',$index);
 			}
-			else
-				throw new TInvalidDataValueException('list_index_invalid',$index);
+		} else {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 	public function clear()
 	{
-		for($i=$this->_c-1;$i>=0;--$i)
-			$this->removeAt($i);
+		for($i=$this->_c-1;$i>=0;--$i) {
+					$this->removeAt($i);
+		}
 	}
 	public function contains($item)
 	{
@@ -849,34 +898,37 @@ 
 	}
 	public function indexOf($item)
 	{
-		if(($index=array_search($item,$this->_d,true))===false)
-			return -1;
-		else
-			return $index;
+		if(($index=array_search($item,$this->_d,true))===false) {
+					return -1;
+		} else {
+					return $index;
+		}
 	}
 	public function insertBefore($baseitem, $item)
 	{
 		if(!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
-				throw new TInvalidDataValueException('list_item_inexistent');
+			if(($index = $this->indexOf($baseitem)) == -1) {
+							throw new TInvalidDataValueException('list_item_inexistent');
+			}
 			$this->insertAt($index, $item);
 			return $index;
+		} else {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 	public function insertAfter($baseitem, $item)
 	{
 		if(!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
-				throw new TInvalidDataValueException('list_item_inexistent');
+			if(($index = $this->indexOf($baseitem)) == -1) {
+							throw new TInvalidDataValueException('list_item_inexistent');
+			}
 			$this->insertAt($index + 1, $item);
 			return $index + 1;
+		} else {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 	public function toArray()
 	{
@@ -886,23 +938,26 @@ 
 	{
 		if(is_array($data) || ($data instanceof Traversable))
 		{
-			if($this->_c>0)
-				$this->clear();
-			foreach($data as $item)
-				$this->add($item);
+			if($this->_c>0) {
+							$this->clear();
+			}
+			foreach($data as $item) {
+							$this->add($item);
+			}
+		} else if($data!==null) {
+					throw new TInvalidDataTypeException('list_data_not_iterable');
 		}
-		else if($data!==null)
-			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 	public function mergeWith($data)
 	{
 		if(is_array($data) || ($data instanceof Traversable))
 		{
-			foreach($data as $item)
-				$this->add($item);
+			foreach($data as $item) {
+							$this->add($item);
+			}
+		} else if($data!==null) {
+					throw new TInvalidDataTypeException('list_data_not_iterable');
 		}
-		else if($data!==null)
-			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 	public function offsetExists($offset)
 	{
@@ -914,9 +969,9 @@ 
 	}
 	public function offsetSet($offset,$item)
 	{
-		if($offset===null || $offset===$this->_c)
-			$this->insertAt($this->_c,$item);
-		else
+		if($offset===null || $offset===$this->_c) {
+					$this->insertAt($this->_c,$item);
+		} else
 		{
 			$this->removeAt($offset);
 			$this->insertAt($offset,$item);
@@ -965,14 +1020,16 @@ 
 	private $_primary=true;
 	public function init($config)
 	{
-		if($this->_prefix===null)
-			$this->_prefix=$this->getApplication()->getUniqueID();
+		if($this->_prefix===null) {
+					$this->_prefix=$this->getApplication()->getUniqueID();
+		}
 		if($this->_primary)
 		{
-			if($this->getApplication()->getCache()===null)
-				$this->getApplication()->setCache($this);
-			else
-				throw new TConfigurationException('cache_primary_duplicated',get_class($this));
+			if($this->getApplication()->getCache()===null) {
+							$this->getApplication()->setCache($this);
+			} else {
+							throw new TConfigurationException('cache_primary_duplicated',get_class($this));
+			}
 		}
 	}
 	public function getPrimaryCache()
@@ -999,18 +1056,20 @@ 
 	{
 		if(($data=$this->getValue($this->generateUniqueKey($id)))!==false)
 		{
-			if(!is_array($data))
-				return false;
-			if(!($data[1] instanceof ICacheDependency) || !$data[1]->getHasChanged())
-				return $data[0];
+			if(!is_array($data)) {
+							return false;
+			}
+			if(!($data[1] instanceof ICacheDependency) || !$data[1]->getHasChanged()) {
+							return $data[0];
+			}
 		}
 		return false;
 	}
 	public function set($id,$value,$expire=0,$dependency=null)
 	{
-		if(empty($value) && $expire === 0)
-			$this->delete($id);
-		else
+		if(empty($value) && $expire === 0) {
+					$this->delete($id);
+		} else
 		{
 			$data=array($value,$dependency);
 			return $this->setValue($this->generateUniqueKey($id),$data,$expire);
@@ -1018,8 +1077,9 @@ 
 	}
 	public function add($id,$value,$expire=0,$dependency=null)
 	{
-		if(empty($value) && $expire === 0)
-			return false;
+		if(empty($value) && $expire === 0) {
+					return false;
+		}
 		$data=array($value,$dependency);
 		return $this->addValue($this->generateUniqueKey($id),$data,$expire);
 	}
@@ -1097,8 +1157,9 @@ 
 	}
 	public function setDirectory($directory)
 	{
-		if(($path=realpath($directory))===false || !is_dir($path))
-			throw new TInvalidDataValueException('directorycachedependency_directory_invalid',$directory);
+		if(($path=realpath($directory))===false || !is_dir($path)) {
+					throw new TInvalidDataValueException('directorycachedependency_directory_invalid',$directory);
+		}
 		$this->_directory=$path;
 		$this->_timestamps=$this->generateTimestamps($path);
 	}
@@ -1132,21 +1193,23 @@ 
 	}
 	protected function generateTimestamps($directory,$level=0)
 	{
-		if(($dir=opendir($directory))===false)
-			throw new TIOException('directorycachedependency_directory_invalid',$directory);
+		if(($dir=opendir($directory))===false) {
+					throw new TIOException('directorycachedependency_directory_invalid',$directory);
+		}
 		$timestamps=array();
 		while(($file=readdir($dir))!==false)
 		{
 			$path=$directory.DIRECTORY_SEPARATOR.$file;
-			if($file==='.' || $file==='..')
-				continue;
-			else if(is_dir($path))
+			if($file==='.' || $file==='..') {
+							continue;
+			} else if(is_dir($path))
 			{
-				if(($this->_recursiveLevel<0 || $level<$this->_recursiveLevel) && $this->validateDirectory($path))
-					$timestamps=array_merge($this->generateTimestamps($path,$level+1));
+				if(($this->_recursiveLevel<0 || $level<$this->_recursiveLevel) && $this->validateDirectory($path)) {
+									$timestamps=array_merge($this->generateTimestamps($path,$level+1));
+				}
+			} else if($this->validateFile($path)) {
+							$timestamps[$path]=filemtime($path);
 			}
-			else if($this->validateFile($path))
-				$timestamps[$path]=filemtime($path);
 		}
 		closedir($dir);
 		return $timestamps;
@@ -1179,17 +1242,19 @@ 
 	private $_dependencies=null;
 	public function getDependencies()
 	{
-		if($this->_dependencies===null)
-			$this->_dependencies=new TCacheDependencyList;
+		if($this->_dependencies===null) {
+					$this->_dependencies=new TCacheDependencyList;
+		}
 		return $this->_dependencies;
 	}
 	public function getHasChanged()
 	{
 		if($this->_dependencies!==null)
 		{
-			foreach($this->_dependencies as $dependency)
-				if($dependency->getHasChanged())
+			foreach($this->_dependencies as $dependency) {
+							if($dependency->getHasChanged())
 					return true;
+			}
 		}
 		return false;
 	}
@@ -1205,10 +1270,11 @@ 
 {
 	public function insertAt($index,$item)
 	{
-		if($item instanceof ICacheDependency)
-			parent::insertAt($index,$item);
-		else
-			throw new TInvalidDataTypeException('cachedependencylist_cachedependency_required');
+		if($item instanceof ICacheDependency) {
+					parent::insertAt($index,$item);
+		} else {
+					throw new TInvalidDataTypeException('cachedependencylist_cachedependency_required');
+		}
 	}
 }
 class TTextWriter extends TComponent implements ITextWriter
@@ -1240,8 +1306,9 @@ 
 	public function __construct($data=null,$readOnly=false,$defaultPriority=10,$precision=8)
 	{
 		parent::__construct();
-		if($data!==null)
-			$this->copyFrom($data);
+		if($data!==null) {
+					$this->copyFrom($data);
+		}
 		$this->setReadOnly($readOnly);
 		$this->setPrecision($precision);
 		$this->setDefaultPriority($defaultPriority);
@@ -1256,11 +1323,13 @@ 
 	}
 	public function getPriorityCount($priority=null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
+		if($priority===null) {
+					$priority=$this->getDefaultPriority();
+		}
 		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-		if(!isset($this->_d[$priority]) || !is_array($this->_d[$priority]))
-			return false;
+		if(!isset($this->_d[$priority]) || !is_array($this->_d[$priority])) {
+					return false;
+		}
 		return count($this->_d[$priority]);
 	}
 	public function getDefaultPriority()
@@ -1295,12 +1364,14 @@ 
 		}
 	}
 	protected function flattenPriorities() {
-		if(is_array($this->_fd))
-			return $this->_fd;
+		if(is_array($this->_fd)) {
+					return $this->_fd;
+		}
 		$this->sortPriorities();
 		$this->_fd=array();
-		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd=array_merge($this->_fd,$itemsatpriority);
+		foreach($this->_d as $priority => $itemsatpriority) {
+					$this->_fd=array_merge($this->_fd,$itemsatpriority);
+		}
 		return $this->_fd;
 	}
 	public function itemAt($index)
@@ -1308,20 +1379,23 @@ 
 		if($index>=0&&$index<$this->getCount()) {
 			$arr=$this->flattenPriorities();
 			return $arr[$index];
-		} else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+		} else {
+					throw new TInvalidDataValueException('list_index_invalid',$index);
+		}
 	}
 	public function itemsAtPriority($priority=null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
+		if($priority===null) {
+					$priority=$this->getDefaultPriority();
+		}
 		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
 		return isset($this->_d[$priority])?$this->_d[$priority]:null;
 	}
 	public function itemAtIndexInPriority($index,$priority=null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
+		if($priority===null) {
+					$priority=$this->getDefaultPriority();
+		}
 		$priority=(string)round(TPropertyValue::ensureFloat($priority), $this->_p);
 		return !isset($this->_d[$priority])?false:(
 				isset($this->_d[$priority][$index])?$this->_d[$priority][$index]:false
@@ -1329,34 +1403,41 @@ 
 	}
 	public function add($item,$priority=null)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
+		}
 		return $this->insertAtIndexInPriority($item,false,$priority,true);
 	}
 	public function insertAt($index,$item)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		if(($priority=$this->priorityAt($index,true))!==false)
-			$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
-		else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
+		}
+		if(($priority=$this->priorityAt($index,true))!==false) {
+					$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
+		} else {
+					throw new TInvalidDataValueException('list_index_invalid',$index);
+		}
 	}
 	public function insertAtIndexInPriority($item,$index=false,$priority=null,$preserveCache=false)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
+		}
+		if($priority===null) {
+					$priority=$this->getDefaultPriority();
+		}
 		$priority=(string)round(TPropertyValue::ensureFloat($priority), $this->_p);
 		if($preserveCache) {
 			$this->sortPriorities();
 			$cc=0;
-			foreach($this->_d as $prioritykey=>$items)
-				if($prioritykey>=$priority)
+			foreach($this->_d as $prioritykey=>$items) {
+							if($prioritykey>=$priority)
 					break;
-				else
-					$cc+=count($items);
+			}
+				else {
+									$cc+=count($items);
+				}
 			if($index===false&&isset($this->_d[$priority])) {
 				$c=count($this->_d[$priority]);
 				$c+=$cc;
@@ -1369,7 +1450,9 @@ 
 				$this->_o = false;
 				$this->_d[$priority]=array($item);
 			}
-			if($this->_fd&&is_array($this->_fd)) 				array_splice($this->_fd,$c,0,array($item));
+			if($this->_fd&&is_array($this->_fd)) {
+				array_splice($this->_fd,$c,0,array($item));
+			}
 		} else {
 			$c=null;
 			if($index===false&&isset($this->_d[$priority])) {
@@ -1383,66 +1466,78 @@ 
 				$this->_o=false;
 				$this->_d[$priority]=array($item);
 			}
-			if($this->_fd&&is_array($this->_fd)&&count($this->_d)==1)
-				array_splice($this->_fd,$cc,0,array($item));
-			else
-				$this->_fd=null;
+			if($this->_fd&&is_array($this->_fd)&&count($this->_d)==1) {
+							array_splice($this->_fd,$cc,0,array($item));
+			} else {
+							$this->_fd=null;
+			}
 		}
 		$this->_c++;
 		return $c;
 	}
 	public function remove($item,$priority=false)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
+		}
 		if(($p=$this->priorityOf($item,true))!==false)
 		{
 			if($priority!==false) {
-				if($priority===null)
-					$priority=$this->getDefaultPriority();
+				if($priority===null) {
+									$priority=$this->getDefaultPriority();
+				}
 				$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-				if($p[0]!=$priority)
-					throw new TInvalidDataValueException('list_item_inexistent');
+				if($p[0]!=$priority) {
+									throw new TInvalidDataValueException('list_item_inexistent');
+				}
 			}
 			$this->removeAtIndexInPriority($p[1],$p[0]);
 			return $p[2];
+		} else {
+					throw new TInvalidDataValueException('list_item_inexistent');
 		}
-		else
-			throw new TInvalidDataValueException('list_item_inexistent');
 	}
 	public function removeAt($index)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		if(($priority=$this->priorityAt($index, true))!==false)
-			return $this->removeAtIndexInPriority($priority[1],$priority[0]);
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
+		}
+		if(($priority=$this->priorityAt($index, true))!==false) {
+					return $this->removeAtIndexInPriority($priority[1],$priority[0]);
+		}
 		throw new TInvalidDataValueException('list_index_invalid',$index);
 	}
 	public function removeAtIndexInPriority($index, $priority=null)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
+		}
+		if($priority===null) {
+					$priority=$this->getDefaultPriority();
+		}
 		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-		if(!isset($this->_d[$priority])||$index<0||$index>=count($this->_d[$priority]))
-			throw new TInvalidDataValueException('list_item_inexistent');
+		if(!isset($this->_d[$priority])||$index<0||$index>=count($this->_d[$priority])) {
+					throw new TInvalidDataValueException('list_item_inexistent');
+		}
 				$value=array_splice($this->_d[$priority],$index,1);
 		$value=$value[0];
-		if(!count($this->_d[$priority]))
-			unset($this->_d[$priority]);
+		if(!count($this->_d[$priority])) {
+					unset($this->_d[$priority]);
+		}
 		$this->_c--;
 		$this->_fd=null;
 		return $value;
 	}
 	public function clear()
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
+		}
 		$d=array_reverse($this->_d,true);
 		foreach($this->_d as $priority=>$items) {
-			for($index=count($items)-1;$index>=0;$index--)
-				$this->removeAtIndexInPriority($index,$priority);
+			for($index=count($items)-1;$index>=0;$index--) {
+							$this->removeAtIndexInPriority($index,$priority);
+			}
 			unset($this->_d[$priority]);
 		}
 	}
@@ -1452,10 +1547,11 @@ 
 	}
 	public function indexOf($item)
 	{
-		if(($index=array_search($item,$this->flattenPriorities(),true))===false)
-			return -1;
-		else
-			return $index;
+		if(($index=array_search($item,$this->flattenPriorities(),true))===false) {
+					return -1;
+		} else {
+					return $index;
+		}
 	}
 	public function priorityOf($item,$withindex = false)
 	{
@@ -1466,41 +1562,48 @@ 
 				$absindex+=$index;
 				return $withindex?array($priority,$index,$absindex,
 						'priority'=>$priority,'index'=>$index,'absindex'=>$absindex):$priority;
-			} else
-				$absindex+=count($items);
+			} else {
+							$absindex+=count($items);
+			}
 		}
 		return false;
 	}
 	public function priorityAt($index,$withindex = false)
 	{
-		if($index<0||$index>=$this->getCount())
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+		if($index<0||$index>=$this->getCount()) {
+					throw new TInvalidDataValueException('list_index_invalid',$index);
+		}
 		$absindex=$index;
 		$this->sortPriorities();
 		foreach($this->_d as $priority=>$items) {
-			if($index>=($c=count($items)))
-				$index-=$c;
-			else
-				return $withindex?array($priority,$index,$absindex,
+			if($index>=($c=count($items))) {
+							$index-=$c;
+			} else {
+							return $withindex?array($priority,$index,$absindex,
 						'priority'=>$priority,'index'=>$index,'absindex'=>$absindex):$priority;
+			}
 		}
 		return false;
 	}
 	public function insertBefore($indexitem, $item)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		if(($priority=$this->priorityOf($indexitem,true))===false)
-			throw new TInvalidDataValueException('list_item_inexistent');
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
+		}
+		if(($priority=$this->priorityOf($indexitem,true))===false) {
+					throw new TInvalidDataValueException('list_item_inexistent');
+		}
 		$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
 		return $priority[2];
 	}
 	public function insertAfter($indexitem, $item)
 	{
-		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		if(($priority=$this->priorityOf($indexitem,true))===false)
-			throw new TInvalidDataValueException('list_item_inexistent');
+		if($this->getReadOnly()) {
+					throw new TInvalidOperationException('list_readonly',get_class($this));
+		}
+		if(($priority=$this->priorityOf($indexitem,true))===false) {
+					throw new TInvalidDataValueException('list_item_inexistent');
+		}
 		$this->insertAtIndexInPriority($item,$priority[1]+1,$priority[0]);
 		return $priority[2]+1;
 	}
@@ -1519,8 +1622,9 @@ 
 		$items=array();
 		foreach($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority>=$priority)||$itemspriority>$priority)
-				break;
+			if((!$inclusive&&$itemspriority>=$priority)||$itemspriority>$priority) {
+							break;
+			}
 			$items=array_merge($items,$itemsatpriority);
 		}
 		return $items;
@@ -1531,8 +1635,9 @@ 
 		$items=array();
 		foreach($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority<=$priority)||$itemspriority<$priority)
-				continue;
+			if((!$inclusive&&$itemspriority<=$priority)||$itemspriority<$priority) {
+							continue;
+			}
 			$items=array_merge($items,$itemsatpriority);
 		}
 		return $items;
@@ -1541,20 +1646,25 @@ 
 	{
 		if($data instanceof TPriorityList)
 		{
-			if($this->getCount()>0)
-				$this->clear();
+			if($this->getCount()>0) {
+							$this->clear();
+			}
 			foreach($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $index=>$item)
-					$this->insertAtIndexInPriority($item,$index,$priority);
+				foreach($data->itemsAtPriority($priority) as $index=>$item) {
+									$this->insertAtIndexInPriority($item,$index,$priority);
+				}
 			}
 		} else if(is_array($data)||$data instanceof Traversable) {
-			if($this->getCount()>0)
-				$this->clear();
-			foreach($data as $key=>$item)
-				$this->add($item);
-		} else if($data!==null)
-			throw new TInvalidDataTypeException('map_data_not_iterable');
+			if($this->getCount()>0) {
+							$this->clear();
+			}
+			foreach($data as $key=>$item) {
+							$this->add($item);
+			}
+		} else if($data!==null) {
+					throw new TInvalidDataTypeException('map_data_not_iterable');
+		}
 	}
 	public function mergeWith($data)
 	{
@@ -1562,17 +1672,18 @@ 
 		{
 			foreach($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $index=>$item)
-					$this->insertAtIndexInPriority($item,false,$priority);
+				foreach($data->itemsAtPriority($priority) as $index=>$item) {
+									$this->insertAtIndexInPriority($item,false,$priority);
+				}
 			}
-		}
-		else if(is_array($data)||$data instanceof Traversable)
+		} else if(is_array($data)||$data instanceof Traversable)
 		{
-			foreach($data as $priority=>$item)
-				$this->add($item);
+			foreach($data as $priority=>$item) {
+							$this->add($item);
+			}
+		} else if($data!==null) {
+					throw new TInvalidDataTypeException('map_data_not_iterable');
 		}
-		else if($data!==null)
-			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function offsetExists($offset)
 	{
@@ -1584,8 +1695,9 @@ 
 	}
 	public function offsetSet($offset,$item)
 	{
-		if($offset===null)
-			return $this->add($item);
+		if($offset===null) {
+					return $this->add($item);
+		}
 		if($offset===$this->getCount()) {
 			$priority=$this->priorityAt($offset-1,true);
 			$priority[1]++;
@@ -1606,8 +1718,9 @@ 
 	private $_r=false;
 	public function __construct($data=null,$readOnly=false)
 	{
-		if($data!==null)
-			$this->copyFrom($data);
+		if($data!==null) {
+					$this->copyFrom($data);
+		}
 		$this->setReadOnly($readOnly);
 	}
 	public function getReadOnly()
@@ -1640,10 +1753,11 @@ 
 	}
 	public function add($key,$value)
 	{
-		if(!$this->_r)
-			$this->_d[$key]=$value;
-		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+		if(!$this->_r) {
+					$this->_d[$key]=$value;
+		} else {
+					throw new TInvalidOperationException('map_readonly',get_class($this));
+		}
 	}
 	public function remove($key)
 	{
@@ -1654,17 +1768,18 @@ 
 				$value=$this->_d[$key];
 				unset($this->_d[$key]);
 				return $value;
+			} else {
+							return null;
 			}
-			else
-				return null;
+		} else {
+					throw new TInvalidOperationException('map_readonly',get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
 	}
 	public function clear()
 	{
-		foreach(array_keys($this->_d) as $key)
-			$this->remove($key);
+		foreach(array_keys($this->_d) as $key) {
+					$this->remove($key);
+		}
 	}
 	public function contains($key)
 	{
@@ -1678,23 +1793,26 @@ 
 	{
 		if(is_array($data) || $data instanceof Traversable)
 		{
-			if($this->getCount()>0)
-				$this->clear();
-			foreach($data as $key=>$value)
-				$this->add($key,$value);
+			if($this->getCount()>0) {
+							$this->clear();
+			}
+			foreach($data as $key=>$value) {
+							$this->add($key,$value);
+			}
+		} else if($data!==null) {
+					throw new TInvalidDataTypeException('map_data_not_iterable');
 		}
-		else if($data!==null)
-			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function mergeWith($data)
 	{
 		if(is_array($data) || $data instanceof Traversable)
 		{
-			foreach($data as $key=>$value)
-				$this->add($key,$value);
+			foreach($data as $key=>$value) {
+							$this->add($key,$value);
+			}
+		} else if($data!==null) {
+					throw new TInvalidDataTypeException('map_data_not_iterable');
 		}
-		else if($data!==null)
-			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function offsetExists($offset)
 	{
@@ -1755,8 +1873,9 @@ 
 	private $_p=8;
 	public function __construct($data=null,$readOnly=false,$defaultPriority=10,$precision=8)
 	{
-		if($data!==null)
-			$this->copyFrom($data);
+		if($data!==null) {
+					$this->copyFrom($data);
+		}
 		$this->setReadOnly($readOnly);
 		$this->setPrecision($precision);
 		$this->setDefaultPriority($defaultPriority);
@@ -1796,12 +1915,14 @@ 
 		}
 	}
 	protected function flattenPriorities() {
-		if(is_array($this->_fd))
-			return $this->_fd;
+		if(is_array($this->_fd)) {
+					return $this->_fd;
+		}
 		$this->sortPriorities();
 		$this->_fd = array();
-		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd = array_merge($this->_fd, $itemsatpriority);
+		foreach($this->_d as $priority => $itemsatpriority) {
+					$this->_fd = array_merge($this->_fd, $itemsatpriority);
+		}
 		return $this->_fd;
 	}
 	public function count()
@@ -1814,11 +1935,13 @@ 
 	}
 	public function getPriorityCount($priority=null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
+		if($priority===null) {
+					$priority=$this->getDefaultPriority();
+		}
 		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-		if(!isset($this->_d[$priority])||!is_array($this->_d[$priority]))
-			return false;
+		if(!isset($this->_d[$priority])||!is_array($this->_d[$priority])) {
+					return false;
+		}
 		return count($this->_d[$priority]);
 	}
 	public function getPriorities()
@@ -1836,16 +1959,18 @@ 
 			$map=$this->flattenPriorities();
 			return isset($map[$key])?$map[$key]:null;
 		} else {
-			if($priority===null)
-				$priority=$this->getDefaultPriority();
+			if($priority===null) {
+							$priority=$this->getDefaultPriority();
+			}
 			$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
 			return (isset($this->_d[$priority])&&isset($this->_d[$priority][$key]))?$this->_d[$priority][$key]:null;
 		}
 	}
 	public function setPriorityAt($key,$priority=null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
+		if($priority===null) {
+					$priority=$this->getDefaultPriority();
+		}
 		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
 		$oldpriority=$this->priorityAt($key);
 		if($oldpriority!==false&&$oldpriority!=$priority) {
@@ -1856,68 +1981,76 @@ 
 	}
 	public function itemsAtPriority($priority=null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
+		if($priority===null) {
+					$priority=$this->getDefaultPriority();
+		}
 		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
 		return isset($this->_d[$priority])?$this->_d[$priority]:null;
 	}
 	public function priorityOf($item)
 	{
 		$this->sortPriorities();
-		foreach($this->_d as $priority=>$items)
-			if(($index=array_search($item,$items,true))!==false)
+		foreach($this->_d as $priority=>$items) {
+					if(($index=array_search($item,$items,true))!==false)
 				return $priority;
+		}
 		return false;
 	}
 	public function priorityAt($key)
 	{
 		$this->sortPriorities();
-		foreach($this->_d as $priority=>$items)
-			if(array_key_exists($key,$items))
+		foreach($this->_d as $priority=>$items) {
+					if(array_key_exists($key,$items))
 				return $priority;
+		}
 		return false;
 	}
 	public function add($key,$value,$priority=null)
 	{
-		if($priority===null)
-			$priority=$this->getDefaultPriority();
+		if($priority===null) {
+					$priority=$this->getDefaultPriority();
+		}
 		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
 		if(!$this->_r)
 		{
-			foreach($this->_d as $innerpriority=>$items)
-				if(array_key_exists($key,$items))
+			foreach($this->_d as $innerpriority=>$items) {
+							if(array_key_exists($key,$items))
 				{
 					unset($this->_d[$innerpriority][$key]);
+			}
 					$this->_c--;
-					if(count($this->_d[$innerpriority])===0)
-						unset($this->_d[$innerpriority]);
+					if(count($this->_d[$innerpriority])===0) {
+											unset($this->_d[$innerpriority]);
+					}
 				}
 			if(!isset($this->_d[$priority])) {
 				$this->_d[$priority]=array($key=>$value);
 				$this->_o=false;
+			} else {
+							$this->_d[$priority][$key]=$value;
 			}
-			else
-				$this->_d[$priority][$key]=$value;
 			$this->_c++;
 			$this->_fd=null;
+		} else {
+					throw new TInvalidOperationException('map_readonly',get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
 		return $priority;
 	}
 	public function remove($key,$priority=false)
 	{
 		if(!$this->_r)
 		{
-			if($priority===null)
-				$priority=$this->getDefaultPriority();
+			if($priority===null) {
+							$priority=$this->getDefaultPriority();
+			}
 			if($priority===false)
 			{
 				$this->sortPriorities();
-				foreach($this->_d as $priority=>$items)
-					if(array_key_exists($key,$items))
+				foreach($this->_d as $priority=>$items) {
+									if(array_key_exists($key,$items))
 					{
 						$value=$this->_d[$priority][$key];
+				}
 						unset($this->_d[$priority][$key]);
 						$this->_c--;
 						if(count($this->_d[$priority])===0)
@@ -1929,8 +2062,7 @@ 
 						return $value;
 					}
 				return null;
-			}
-			else
+			} else
 			{
 				$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
 				if(isset($this->_d[$priority])&&(isset($this->_d[$priority][$key])||array_key_exists($key,$this->_d[$priority])))
@@ -1944,19 +2076,20 @@ 
 					}
 					$this->_fd=null;
 					return $value;
+				} else {
+									return null;
 				}
-				else
-					return null;
 			}
+		} else {
+					throw new TInvalidOperationException('map_readonly',get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
 	}
 	public function clear()
 	{
-		foreach($this->_d as $priority=>$items)
-			foreach(array_keys($items) as $key)
+		foreach($this->_d as $priority=>$items) {
+					foreach(array_keys($items) as $key)
 				$this->remove($key);
+		}
 	}
 	public function contains($key)
 	{
@@ -1973,8 +2106,9 @@ 
 		$items=array();
 		foreach($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority>=$priority)||$itemspriority>$priority)
-				break;
+			if((!$inclusive&&$itemspriority>=$priority)||$itemspriority>$priority) {
+							break;
+			}
 			$items=array_merge($items,$itemsatpriority);
 		}
 		return $items;
@@ -1985,8 +2119,9 @@ 
 		$items=array();
 		foreach($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority<=$priority)||$itemspriority<$priority)
-				continue;
+			if((!$inclusive&&$itemspriority<=$priority)||$itemspriority<$priority) {
+							continue;
+			}
 			$items=array_merge($items,$itemsatpriority);
 		}
 		return $items;
@@ -1995,23 +2130,25 @@ 
 	{
 		if($data instanceof TPriorityMap)
 		{
-			if($this->getCount()>0)
-				$this->clear();
+			if($this->getCount()>0) {
+							$this->clear();
+			}
 			foreach($data->getPriorities() as $priority) {
 				foreach($data->itemsAtPriority($priority) as $key => $value) {
 					$this->add($key,$value,$priority);
 				}
 			}
-		}
-		else if(is_array($data)||$data instanceof Traversable)
+		} else if(is_array($data)||$data instanceof Traversable)
 		{
-			if($this->getCount()>0)
-				$this->clear();
-			foreach($data as $key=>$value)
-				$this->add($key,$value);
+			if($this->getCount()>0) {
+							$this->clear();
+			}
+			foreach($data as $key=>$value) {
+							$this->add($key,$value);
+			}
+		} else if($data!==null) {
+					throw new TInvalidDataTypeException('map_data_not_iterable');
 		}
-		else if($data!==null)
-			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function mergeWith($data)
 	{
@@ -2019,17 +2156,18 @@ 
 		{
 			foreach($data->getPriorities() as $priority)
 			{
-				foreach($data->itemsAtPriority($priority) as $key => $value)
-					$this->add($key,$value,$priority);
+				foreach($data->itemsAtPriority($priority) as $key => $value) {
+									$this->add($key,$value,$priority);
+				}
 			}
-		}
-		else if(is_array($data)||$data instanceof Traversable)
+		} else if(is_array($data)||$data instanceof Traversable)
 		{
-			foreach($data as $key=>$value)
-				$this->add($key,$value);
+			foreach($data as $key=>$value) {
+							$this->add($key,$value);
+			}
+		} else if($data!==null) {
+					throw new TInvalidDataTypeException('map_data_not_iterable');
 		}
-		else if($data!==null)
-			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function offsetExists($offset)
 	{
@@ -2054,8 +2192,9 @@ 
 	private $_c=0;
 	public function __construct($data=null)
 	{
-		if($data!==null)
-			$this->copyFrom($data);
+		if($data!==null) {
+					$this->copyFrom($data);
+		}
 	}
 	public function toArray()
 	{
@@ -2071,9 +2210,9 @@ 
 				$this->_d[]=$item;
 				++$this->_c;
 			}
+		} else if($data!==null) {
+					throw new TInvalidDataTypeException('stack_data_not_iterable');
 		}
-		else if($data!==null)
-			throw new TInvalidDataTypeException('stack_data_not_iterable');
 	}
 	public function clear()
 	{
@@ -2086,16 +2225,17 @@ 
 	}
 	public function peek()
 	{
-		if($this->_c===0)
-			throw new TInvalidOperationException('stack_empty');
-		else
-			return $this->_d[$this->_c-1];
+		if($this->_c===0) {
+					throw new TInvalidOperationException('stack_empty');
+		} else {
+					return $this->_d[$this->_c-1];
+		}
 	}
 	public function pop()
 	{
-		if($this->_c===0)
-			throw new TInvalidOperationException('stack_empty');
-		else
+		if($this->_c===0) {
+					throw new TInvalidOperationException('stack_empty');
+		} else
 		{
 			--$this->_c;
 			return array_pop($this->_d);
@@ -2196,10 +2336,11 @@ 
 	}
 	public function getAttribute($name)
 	{
-		if($this->_attributes!==null)
-			return $this->_attributes->itemAt($name);
-		else
-			return null;
+		if($this->_attributes!==null) {
+					return $this->_attributes->itemAt($name);
+		} else {
+					return null;
+		}
 	}
 	public function setAttribute($name,$value)
 	{
@@ -2207,23 +2348,26 @@ 
 	}
 	public function getElements()
 	{
-		if(!$this->_elements)
-			$this->_elements=new TXmlElementList($this);
+		if(!$this->_elements) {
+					$this->_elements=new TXmlElementList($this);
+		}
 		return $this->_elements;
 	}
 	public function getAttributes()
 	{
-		if(!$this->_attributes)
-			$this->_attributes=new TMap;
+		if(!$this->_attributes) {
+					$this->_attributes=new TMap;
+		}
 		return $this->_attributes;
 	}
 	public function getElementByTagName($tagName)
 	{
 		if($this->_elements)
 		{
-			foreach($this->_elements as $element)
-				if($element->_tagName===$tagName)
+			foreach($this->_elements as $element) {
+							if($element->_tagName===$tagName)
 					return $element;
+			}
 		}
 		return null;
 	}
@@ -2232,9 +2376,10 @@ 
 		$list=new TList;
 		if($this->_elements)
 		{
-			foreach($this->_elements as $element)
-				if($element->_tagName===$tagName)
+			foreach($this->_elements as $element) {
+							if($element->_tagName===$tagName)
 					$list->add($element);
+			}
 		}
 		return $list;
 	}
@@ -2253,18 +2398,18 @@ 
 		if($this->getHasElement())
 		{
 			$str=$prefix."<{$this->_tagName}$attr>\n";
-			foreach($this->getElements() as $element)
-				$str.=$element->toString($indent+1)."\n";
+			foreach($this->getElements() as $element) {
+							$str.=$element->toString($indent+1)."\n";
+			}
 			$str.=$prefix."</{$this->_tagName}>";
 			return $str;
-		}
-		else if(($value=$this->getValue())!=='')
+		} else if(($value=$this->getValue())!=='')
 		{
 			$value=$this->xmlEncode($value);
 			return $prefix."<{$this->_tagName}$attr>$value</{$this->_tagName}>";
+		} else {
+					return $prefix."<{$this->_tagName}$attr />";
 		}
-		else
-			return $prefix."<{$this->_tagName}$attr />";
 	}
 	public function __toString()
 	{
@@ -2310,16 +2455,18 @@ 
 	}
 	public function loadFromFile($file)
 	{
-		if(($str=@file_get_contents($file))!==false)
-			return $this->loadFromString($str);
-		else
-			throw new TIOException('xmldocument_file_read_failed',$file);
+		if(($str=@file_get_contents($file))!==false) {
+					return $this->loadFromString($str);
+		} else {
+					throw new TIOException('xmldocument_file_read_failed',$file);
+		}
 	}
 	public function loadFromString($string)
 	{
 				$doc=new DOMDocument();
-		if($doc->loadXML($string)===false)
-			return false;
+		if($doc->loadXML($string)===false) {
+					return false;
+		}
 		$this->setEncoding($doc->encoding);
 		$this->setVersion($doc->version);
 		$element=$doc->documentElement;
@@ -2330,8 +2477,9 @@ 
 		$elements->clear();
 		$attributes->clear();
 		static $bSimpleXml;
-		if($bSimpleXml === null)
-			$bSimpleXml = (boolean)function_exists('simplexml_load_string');
+		if($bSimpleXml === null) {
+					$bSimpleXml = (boolean)function_exists('simplexml_load_string');
+		}
 		if($bSimpleXml)
 		{
 			$simpleDoc = simplexml_load_string($string);
@@ -2339,18 +2487,21 @@ 
 			$simpleDoc = null;
 			foreach($docNamespaces as $prefix => $uri)
 			{
- 				if($prefix === '')
-   					$attributes->add('xmlns', $uri);
-   				else
-   					$attributes->add('xmlns:'.$prefix, $uri);
+ 				if($prefix === '') {
+ 				   					$attributes->add('xmlns', $uri);
+ 				} else {
+   				   					$attributes->add('xmlns:'.$prefix, $uri);
+   				}
 			}
 		}
-		foreach($element->attributes as $name=>$attr)
-			$attributes->add(($attr->prefix === '' ? '' : $attr->prefix . ':') .$name,$attr->value);
+		foreach($element->attributes as $name=>$attr) {
+					$attributes->add(($attr->prefix === '' ? '' : $attr->prefix . ':') .$name,$attr->value);
+		}
 		foreach($element->childNodes as $child)
 		{
-			if($child instanceof DOMElement)
-				$elements->add($this->buildElement($child));
+			if($child instanceof DOMElement) {
+							$elements->add($this->buildElement($child));
+			}
 		}
 		return true;
 	}
@@ -2360,9 +2511,9 @@ 
 		{
 			fwrite($fw,$this->saveToString());
 			fclose($fw);
+		} else {
+					throw new TIOException('xmldocument_file_write_failed',$file);
 		}
-		else
-			throw new TIOException('xmldocument_file_write_failed',$file);
 	}
 	public function saveToString()
 	{
@@ -2378,12 +2529,14 @@ 
 	{
 		$element=new TXmlElement($node->tagName);
 		$element->setValue($node->nodeValue);
-		foreach($node->attributes as $name=>$attr)
-			$element->getAttributes()->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name,$attr->value);
+		foreach($node->attributes as $name=>$attr) {
+					$element->getAttributes()->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name,$attr->value);
+		}
 		foreach($node->childNodes as $child)
 		{
-			if($child instanceof DOMElement)
-				$element->getElements()->add($this->buildElement($child));
+			if($child instanceof DOMElement) {
+							$element->getElements()->add($this->buildElement($child));
+			}
 		}
 		return $element;
 	}
@@ -2404,18 +2557,20 @@ 
 		if($item instanceof TXmlElement)
 		{
 			parent::insertAt($index,$item);
-			if($item->getParent()!==null)
-				$item->getParent()->getElements()->remove($item);
+			if($item->getParent()!==null) {
+							$item->getParent()->getElements()->remove($item);
+			}
 			$item->setParent($this->_o);
+		} else {
+					throw new TInvalidDataTypeException('xmlelementlist_xmlelement_required');
 		}
-		else
-			throw new TInvalidDataTypeException('xmlelementlist_xmlelement_required');
 	}
 	public function removeAt($index)
 	{
 		$item=parent::removeAt($index);
-		if($item instanceof TXmlElement)
-			$item->setParent(null);
+		if($item instanceof TXmlElement) {
+					$item->setParent(null);
+		}
 		return $item;
 	}
 }
@@ -2432,18 +2587,20 @@ 
 	public function __construct($action,$users,$roles,$verb='',$ipRules='')
 	{
 		$action=strtolower(trim($action));
-		if($action==='allow' || $action==='deny')
-			$this->_action=$action;
-		else
-			throw new TInvalidDataValueException('authorizationrule_action_invalid',$action);
+		if($action==='allow' || $action==='deny') {
+					$this->_action=$action;
+		} else {
+					throw new TInvalidDataValueException('authorizationrule_action_invalid',$action);
+		}
 		$this->_users=array();
 		$this->_roles=array();
 		$this->_ipRules=array();
 		$this->_everyone=false;
 		$this->_guest=false;
 		$this->_authenticated=false;
-		if(trim($users)==='')
-			$users='*';
+		if(trim($users)==='') {
+					$users='*';
+		}
 		foreach(explode(',',$users) as $user)
 		{
 			if(($user=trim(strtolower($user)))!=='')
@@ -2452,34 +2609,40 @@ 
 				{
 					$this->_everyone=true;
 					break;
+				} else if($user==='?') {
+									$this->_guest=true;
+				} else if($user==='@') {
+									$this->_authenticated=true;
+				} else {
+									$this->_users[]=$user;
 				}
-				else if($user==='?')
-					$this->_guest=true;
-				else if($user==='@')
-					$this->_authenticated=true;
-				else
-					$this->_users[]=$user;
 			}
 		}
-		if(trim($roles)==='')
-			$roles='*';
+		if(trim($roles)==='') {
+					$roles='*';
+		}
 		foreach(explode(',',$roles) as $role)
 		{
-			if(($role=trim(strtolower($role)))!=='')
-				$this->_roles[]=$role;
-		}
-		if(($verb=trim(strtolower($verb)))==='')
-			$verb='*';
-		if($verb==='*' || $verb==='get' || $verb==='post')
-			$this->_verb=$verb;
-		else
-			throw new TInvalidDataValueException('authorizationrule_verb_invalid',$verb);
-		if(trim($ipRules)==='')
-			$ipRules='*';
+			if(($role=trim(strtolower($role)))!=='') {
+							$this->_roles[]=$role;
+			}
+		}
+		if(($verb=trim(strtolower($verb)))==='') {
+					$verb='*';
+		}
+		if($verb==='*' || $verb==='get' || $verb==='post') {
+					$this->_verb=$verb;
+		} else {
+					throw new TInvalidDataValueException('authorizationrule_verb_invalid',$verb);
+		}
+		if(trim($ipRules)==='') {
+					$ipRules='*';
+		}
 		foreach(explode(',',$ipRules) as $ipRule)
 		{
-			if(($ipRule=trim($ipRule))!=='')
-				$this->_ipRules[]=$ipRule;
+			if(($ipRule=trim($ipRule))!=='') {
+							$this->_ipRules[]=$ipRule;
+			}
 		}
 	}
 	public function getAction()
@@ -2516,19 +2679,22 @@ 
 	}
 	public function isUserAllowed(IUser $user,$verb,$ip)
 	{
-		if($this->isVerbMatched($verb) && $this->isIpMatched($ip) && $this->isUserMatched($user) && $this->isRoleMatched($user))
-			return ($this->_action==='allow')?1:-1;
-		else
-			return 0;
+		if($this->isVerbMatched($verb) && $this->isIpMatched($ip) && $this->isUserMatched($user) && $this->isRoleMatched($user)) {
+					return ($this->_action==='allow')?1:-1;
+		} else {
+					return 0;
+		}
 	}
 	private function isIpMatched($ip)
 	{
-		if(empty($this->_ipRules))
-			return 1;
+		if(empty($this->_ipRules)) {
+					return 1;
+		}
 		foreach($this->_ipRules as $rule)
 		{
-			if($rule==='*' || $rule===$ip || (($pos=strpos($rule,'*'))!==false && strncmp($ip,$rule,$pos)===0))
-				return 1;
+			if($rule==='*' || $rule===$ip || (($pos=strpos($rule,'*'))!==false && strncmp($ip,$rule,$pos)===0)) {
+							return 1;
+			}
 		}
 		return 0;
 	}
@@ -2540,8 +2706,9 @@ 
 	{
 		foreach($this->_roles as $role)
 		{
-			if($role==='*' || $user->isInRole($role))
-				return true;
+			if($role==='*' || $user->isInRole($role)) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -2559,20 +2726,22 @@ 
 			$verb=strtolower(trim($verb));
 			foreach($this as $rule)
 			{
-				if(($decision=$rule->isUserAllowed($user,$verb,$ip))!==0)
-					return ($decision>0);
+				if(($decision=$rule->isUserAllowed($user,$verb,$ip))!==0) {
+									return ($decision>0);
+				}
 			}
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 	public function insertAt($index,$item)
 	{
-		if($item instanceof TAuthorizationRule)
-			parent::insertAt($index,$item);
-		else
-			throw new TInvalidDataTypeException('authorizationrulecollection_authorizationrule_required');
+		if($item instanceof TAuthorizationRule) {
+					parent::insertAt($index,$item);
+		} else {
+					throw new TInvalidDataTypeException('authorizationrulecollection_authorizationrule_required');
+		}
 	}
 }
 class TSecurityManager extends TModule
@@ -2605,8 +2774,9 @@ 
 	}
 	public function setValidationKey($value)
 	{
-		if('' === $value)
-			throw new TInvalidDataValueException('securitymanager_validationkey_invalid');
+		if('' === $value) {
+					throw new TInvalidDataValueException('securitymanager_validationkey_invalid');
+		}
 		$this->_validationKey = $value;
 	}
 	public function getEncryptionKey()
@@ -2621,8 +2791,9 @@ 
 	}
 	public function setEncryptionKey($value)
 	{
-		if('' === $value)
-			throw new TInvalidDataValueException('securitymanager_encryptionkey_invalid');
+		if('' === $value) {
+					throw new TInvalidDataValueException('securitymanager_encryptionkey_invalid');
+		}
 		$this->_encryptionKey = $value;
 	}
 	public function getValidation()
@@ -2643,8 +2814,9 @@ 
 	}
 	public function getEncryption()
 	{
-		if(is_string($this->_cryptAlgorithm))
-			return $this->_cryptAlgorithm;
+		if(is_string($this->_cryptAlgorithm)) {
+					return $this->_cryptAlgorithm;
+		}
 				return "3DES";
 	}
 	public function setEncryption($value)
@@ -2687,16 +2859,18 @@ 
 	{
 		if(extension_loaded('mcrypt'))
 		{
-			if(is_array($this->_cryptAlgorithm))
-				$module=@call_user_func_array('mcrypt_module_open',$this->_cryptAlgorithm);
-			else
-				$module=@mcrypt_module_open($this->_cryptAlgorithm,'', MCRYPT_MODE_CBC,'');
-			if($module===false)
-				throw new TNotSupportedException('securitymanager_mcryptextension_initfailed');
+			if(is_array($this->_cryptAlgorithm)) {
+							$module=@call_user_func_array('mcrypt_module_open',$this->_cryptAlgorithm);
+			} else {
+							$module=@mcrypt_module_open($this->_cryptAlgorithm,'', MCRYPT_MODE_CBC,'');
+			}
+			if($module===false) {
+							throw new TNotSupportedException('securitymanager_mcryptextension_initfailed');
+			}
 			return $module;
+		} else {
+					throw new TNotSupportedException('securitymanager_mcryptextension_required');
 		}
-		else
-			throw new TNotSupportedException('securitymanager_mcryptextension_required');
 	}
 	public function hashData($data)
 	{
@@ -2706,8 +2880,9 @@ 
 	public function validateData($data)
 	{
 		$len=$this->strlen($this->computeHMAC('test'));
-		if($this->strlen($data) < $len)
-			return false;
+		if($this->strlen($data) < $len) {
+					return false;
+		}
 		$hmac = $this->substr($data, 0, $len);
 		$data2=$this->substr($data, $len, $this->strlen($data));
 		return $hmac === $this->computeHMAC($data2) ? $data2 : false;
@@ -2715,8 +2890,9 @@ 
 	protected function computeHMAC($data)
 	{
 		$key = $this->getValidationKey();
-		if(function_exists('hash_hmac'))
-			return hash_hmac($this->_hashAlgorithm, $data, $key);
+		if(function_exists('hash_hmac')) {
+					return hash_hmac($this->_hashAlgorithm, $data, $key);
+		}
 		if(!strcasecmp($this->_hashAlgorithm,'sha1'))
 		{
 			$pack = 'H40';
@@ -2765,8 +2941,9 @@ 
 	public static function renderScriptFiles($files)
 	{
 		$str='';
-		foreach($files as $file)
-			$str.= self::renderScriptFile($file);
+		foreach($files as $file) {
+					$str.= self::renderScriptFile($file);
+		}
 		return $str;
 	}
 	public static function renderScriptFile($file)
@@ -2775,17 +2952,19 @@ 
 	}
 	public static function renderScriptBlocks($scripts)
 	{
-		if(count($scripts))
-			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n".implode("\n",$scripts)."\n/*]]>*/\n</script>\n";
-		else
-			return '';
+		if(count($scripts)) {
+					return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n".implode("\n",$scripts)."\n/*]]>*/\n</script>\n";
+		} else {
+					return '';
+		}
 	}
 	public static function renderScriptBlocksCallback($scripts)
 	{
-		if(count($scripts))
-			return implode("\n",$scripts)."\n";
-		else
-			return '';
+		if(count($scripts)) {
+					return implode("\n",$scripts)."\n";
+		} else {
+					return '';
+		}
 	}
 	public static function renderScriptBlock($script)
 	{
@@ -2797,10 +2976,11 @@ 
 	}
 	public static function quoteJsLiteral($js)
 	{
-		if($js instanceof TJavaScriptLiteral)
-			return $js;
-		else
-			return new TJavaScriptLiteral($js);
+		if($js instanceof TJavaScriptLiteral) {
+					return $js;
+		} else {
+					return new TJavaScriptLiteral($js);
+		}
 	}
 	public static function quoteFunction($js)
 	{
@@ -2816,11 +2996,11 @@ 
 	}
 	public static function encode($value,$toMap=true,$encodeEmptyStrings=false)
 	{
-		if(is_string($value))
-			return self::quoteString($value);
-		else if(is_bool($value))
-			return $value?'true':'false';
-		else if(is_array($value))
+		if(is_string($value)) {
+					return self::quoteString($value);
+		} else if(is_bool($value)) {
+					return $value?'true':'false';
+		} else if(is_array($value))
 		{
 			$results='';
 			if(($n=count($value))>0 && array_keys($value)!==range(0,$n-1))
@@ -2829,30 +3009,30 @@ 
 				{
 					if($v!=='' || $encodeEmptyStrings)
 					{
-						if($results!=='')
-							$results.=',';
+						if($results!=='') {
+													$results.=',';
+						}
 						$results.="'$k':".self::encode($v,$toMap,$encodeEmptyStrings);
 					}
 				}
 				return '{'.$results.'}';
-			}
-			else
+			} else
 			{
 				foreach($value as $v)
 				{
 					if($v!=='' || $encodeEmptyStrings)
 					{
-						if($results!=='')
-							$results.=',';
+						if($results!=='') {
+													$results.=',';
+						}
 						$results.=self::encode($v,$toMap, $encodeEmptyStrings);
 					}
 				}
 				return '['.$results.']';
 			}
-		}
-		else if(is_integer($value))
-			return "$value";
-		else if(is_float($value))
+		} else if(is_integer($value)) {
+					return "$value";
+		} else if(is_float($value))
 		{
 			switch($value)
 			{
@@ -2864,22 +3044,24 @@ 
 					break;
 				default:
 					$locale=localeConv();
-					if($locale['decimal_point']=='.')
-						return "$value";
-					else
-						return str_replace($locale['decimal_point'], '.', "$value");
+					if($locale['decimal_point']=='.') {
+											return "$value";
+					} else {
+											return str_replace($locale['decimal_point'], '.', "$value");
+					}
 					break;
 			}
-		}
-		else if(is_object($value))
-			if ($value instanceof TJavaScriptLiteral)
+		} else if(is_object($value)) {
+					if ($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
-			else
-				return self::encode(get_object_vars($value),$toMap);
-		else if($value===null)
-			return 'null';
-		else
-			return '';
+		} else {
+							return self::encode(get_object_vars($value),$toMap);
+			}
+		else if($value===null) {
+					return 'null';
+		} else {
+					return '';
+		}
 	}
 	public static function jsonEncode($value, $options = 0)
 	{
@@ -2892,12 +3074,13 @@ 
 		return $s;
 	}
 	private static function convertToUtf8(&$value, $sourceEncoding) {
-		if(is_string($value))
-			$value=iconv($sourceEncoding, 'UTF-8', $value);
-		else if (is_array($value))
+		if(is_string($value)) {
+					$value=iconv($sourceEncoding, 'UTF-8', $value);
+		} else if (is_array($value))
 		{
-			foreach($value as &$element)
-				self::convertToUtf8($element, $sourceEncoding);
+			foreach($value as &$element) {
+							self::convertToUtf8($element, $sourceEncoding);
+			}
 		}
 	}
 	public static function jsonDecode($value, $assoc = false, $depth = 512)
@@ -2956,24 +3139,25 @@ 
 					if(is_array($value))
 					{
 						$name=urlencode($name.'[]');
-						foreach($value as $v)
-							$url.=$amp.$name.'='.urlencode($v);
+						foreach($value as $v) {
+													$url.=$amp.$name.'='.urlencode($v);
+						}
+					} else {
+											$url.=$amp.urlencode($name).'='.urlencode($value);
 					}
-					else
-						$url.=$amp.urlencode($name).'='.urlencode($value);
 				}
-			}
-			else
+			} else
 			{
 				foreach($getItems as $name=>$value)
 				{
 					if(is_array($value))
 					{
-						foreach($value as $v)
-							$url.=$amp.$name.'[]='.$v;
+						foreach($value as $v) {
+													$url.=$amp.$name.'[]='.$v;
+						}
+					} else {
+											$url.=$amp.$name.'='.$value;
 					}
-					else
-						$url.=$amp.$name.'='.$value;
 				}
 			}
 		}
@@ -3006,19 +3190,20 @@ 
 					{
 						$name=substr($path,0,$pos);
 						$value=substr($path,$pos+1);
-						if(($pos=strpos($name,'[]'))!==false)
-							$getVariables[substr($name,0,$pos)][]=$value;
-						else
-							$getVariables[$name]=$value;
+						if(($pos=strpos($name,'[]'))!==false) {
+													$getVariables[substr($name,0,$pos)][]=$value;
+						} else {
+													$getVariables[$name]=$value;
+						}
+					} else {
+											$getVariables[$path]='';
 					}
-					else
-						$getVariables[$path]='';
 				}
 			}
 			return $getVariables;
+		} else {
+					return array();
 		}
-		else
-			return array();
 	}
 }
 class THttpRequest extends TApplicationComponent implements IteratorAggregate,ArrayAccess,Countable,IModule
@@ -3061,27 +3246,34 @@ 
 			$_SERVER['SERVER_PORT']=80;
 			$_SERVER['HTTP_USER_AGENT']='';
 		}
-														if(isset($_SERVER['REQUEST_URI']))
-			$this->_requestUri=$_SERVER['REQUEST_URI'];
-		else  			$this->_requestUri=$_SERVER['SCRIPT_NAME'].(empty($_SERVER['QUERY_STRING'])?'':'?'.$_SERVER['QUERY_STRING']);
-		if($this->_cgiFix&self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
-			$this->_pathInfo=substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
-		elseif(isset($_SERVER['PATH_INFO']))
-			$this->_pathInfo=$_SERVER['PATH_INFO'];
-		else if(strpos($_SERVER['PHP_SELF'],$_SERVER['SCRIPT_NAME'])===0 && $_SERVER['PHP_SELF']!==$_SERVER['SCRIPT_NAME'])
-			$this->_pathInfo=substr($_SERVER['PHP_SELF'],strlen($_SERVER['SCRIPT_NAME']));
-		else
-			$this->_pathInfo='';
+														if(isset($_SERVER['REQUEST_URI'])) {
+																	$this->_requestUri=$_SERVER['REQUEST_URI'];
+														} else {
+			$this->_requestUri=$_SERVER['SCRIPT_NAME'].(empty($_SERVER['QUERY_STRING'])?'':'?'.$_SERVER['QUERY_STRING']);
+		}
+		if($this->_cgiFix&self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO'])) {
+					$this->_pathInfo=substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
+		} elseif(isset($_SERVER['PATH_INFO'])) {
+					$this->_pathInfo=$_SERVER['PATH_INFO'];
+		} else if(strpos($_SERVER['PHP_SELF'],$_SERVER['SCRIPT_NAME'])===0 && $_SERVER['PHP_SELF']!==$_SERVER['SCRIPT_NAME']) {
+					$this->_pathInfo=substr($_SERVER['PHP_SELF'],strlen($_SERVER['SCRIPT_NAME']));
+		} else {
+					$this->_pathInfo='';
+		}
 		if(get_magic_quotes_gpc())
 		{
-			if(isset($_GET))
-				$_GET=$this->stripSlashes($_GET);
-			if(isset($_POST))
-				$_POST=$this->stripSlashes($_POST);
-			if(isset($_REQUEST))
-				$_REQUEST=$this->stripSlashes($_REQUEST);
-			if(isset($_COOKIE))
-				$_COOKIE=$this->stripSlashes($_COOKIE);
+			if(isset($_GET)) {
+							$_GET=$this->stripSlashes($_GET);
+			}
+			if(isset($_POST)) {
+							$_POST=$this->stripSlashes($_POST);
+			}
+			if(isset($_REQUEST)) {
+							$_REQUEST=$this->stripSlashes($_REQUEST);
+			}
+			if(isset($_COOKIE)) {
+							$_COOKIE=$this->stripSlashes($_COOKIE);
+			}
 		}
 		$this->getApplication()->setRequest($this);
 	}
@@ -3099,11 +3291,12 @@ 
 			{
 				$url.=$_SERVER['SERVER_NAME'];
 				$port=$_SERVER['SERVER_PORT'];
-				if(($port!=80 && !$secure) || ($port!=443 && $secure))
-					$url.=':'.$port;
+				if(($port!=80 && !$secure) || ($port!=443 && $secure)) {
+									$url.=':'.$port;
+				}
+			} else {
+							$url.=$_SERVER['HTTP_HOST'];
 			}
-			else
-				$url.=$_SERVER['HTTP_HOST'];
 			$url.=$this->getRequestUri();
 			$this->_url=new TUri($url);
 		}
@@ -3129,10 +3322,11 @@ 
 			if($cache !== null)
 			{
 				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
-					if ($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
+				if($this->getApplication()->getMode() !== TApplicationMode::Performance) {
+									if ($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
 					{
 						$fn = Prado::getPathOfNamespace($fn,$this->getApplication()->getConfigurationFileExt());
+				}
 						$dependencies = new TFileCacheDependency($fn);
 					}
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
@@ -3148,8 +3342,9 @@ 
 			if($cache !== null)
 			{
 				$manager = $cache->get($this->getCacheKey());
-				if($manager instanceof TUrlManager)
-					return $manager;
+				if($manager instanceof TUrlManager) {
+									return $manager;
+				}
 			}
 		}
 		return null;
@@ -3172,14 +3367,15 @@ 
 				{
 					$this->_urlManager=new TUrlManager;
 					$this->_urlManager->init(null);
-				}
-				else
+				} else
 				{
 					$this->_urlManager=$this->getApplication()->getModule($this->_urlManagerID);
-					if($this->_urlManager===null)
-						throw new TConfigurationException('httprequest_urlmanager_inexist',$this->_urlManagerID);
-					if(!($this->_urlManager instanceof TUrlManager))
-						throw new TConfigurationException('httprequest_urlmanager_invalid',$this->_urlManagerID);
+					if($this->_urlManager===null) {
+											throw new TConfigurationException('httprequest_urlmanager_inexist',$this->_urlManagerID);
+					}
+					if(!($this->_urlManager instanceof TUrlManager)) {
+											throw new TConfigurationException('httprequest_urlmanager_invalid',$this->_urlManagerID);
+					}
 				}
 				$this->cacheUrlManager($this->_urlManager);
 			}
@@ -3200,10 +3396,11 @@ 
 	}
 	public function setUrlParamSeparator($value)
 	{
-		if(strlen($value)===1)
-			$this->_separator=$value;
-		else
-			throw new TInvalidDataValueException('httprequest_separator_invalid');
+		if(strlen($value)===1) {
+					$this->_separator=$value;
+		} else {
+					throw new TInvalidDataValueException('httprequest_separator_invalid');
+		}
 	}
 	public function getRequestType()
 	{
@@ -3211,10 +3408,12 @@ 
 	}
 	public function getContentType($mimetypeOnly = true)
 	{
-		if(!isset($_SERVER['CONTENT_TYPE']))
-			return null;
-		if($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false)
-			return substr($_SERVER['CONTENT_TYPE'], 0, $_pos);
+		if(!isset($_SERVER['CONTENT_TYPE'])) {
+					return null;
+		}
+		if($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false) {
+					return substr($_SERVER['CONTENT_TYPE'], 0, $_pos);
+		}
 		return $_SERVER['CONTENT_TYPE'];
 	}
 	public function getIsSecureConnection()
@@ -3238,17 +3437,19 @@ 
 		static $result;
 		if($result === null && function_exists('apache_request_headers')) {
 			$result = apache_request_headers();
-		}
-		elseif($result === null) {
+		} elseif($result === null) {
 			$result = array();
 			foreach($_SERVER as $key=>$value) {
-				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
+				if(strncasecmp($key, 'HTTP_', 5) !== 0) {
+					continue;
+				}
 					$key = str_replace(' ','-', ucwords(strtolower(str_replace('_',' ', substr($key, 5)))));
 					$result[$key] = $value;
 			}
 		}
-		if($case !== null)
-			return array_change_key_case($result, $case);
+		if($case !== null) {
+					return array_change_key_case($result, $case);
+		}
 		return $result;
 	}
 	public function getRequestUri()
@@ -3260,13 +3461,16 @@ 
 		$url=$this->getUrl();
 		$scheme=($forceSecureConnection)?"https": (($forceSecureConnection === null)?$url->getScheme():'http');
 		$host=$url->getHost();
-		if (($port=$url->getPort())) $host.=':'.$port;
+		if (($port=$url->getPort())) {
+			$host.=':'.$port;
+		}
 		return $scheme.'://'.$host;
 	}
 	public function getApplicationUrl()
 	{
-		if($this->_cgiFix&self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
-			return $_SERVER['ORIG_SCRIPT_NAME'];
+		if($this->_cgiFix&self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME'])) {
+					return $_SERVER['ORIG_SCRIPT_NAME'];
+		}
 		return isset($_SERVER['SCRIPT_NAME'])?$_SERVER['SCRIPT_NAME']:null;
 	}
 	public function getAbsoluteApplicationUrl($forceSecureConnection=null)
@@ -3294,8 +3498,7 @@ 
 		try
 		{
 			return get_browser();
-		}
-		catch(TPhpErrorException $e)
+		} catch(TPhpErrorException $e)
 		{
 			throw new TConfigurationException('httprequest_browscap_required');
 		}
@@ -3346,14 +3549,15 @@ 
 				$sm=$this->getApplication()->getSecurityManager();
 				foreach($_COOKIE as $key=>$value)
 				{
-					if(($value=$sm->validateData($value))!==false)
-						$this->_cookies->add(new THttpCookie($key,$value));
+					if(($value=$sm->validateData($value))!==false) {
+											$this->_cookies->add(new THttpCookie($key,$value));
+					}
 				}
-			}
-			else
+			} else
 			{
-				foreach($_COOKIE as $key=>$value)
-					$this->_cookies->add(new THttpCookie($key,$value));
+				foreach($_COOKIE as $key=>$value) {
+									$this->_cookies->add(new THttpCookie($key,$value));
+				}
 			}
 		}
 		return $this->_cookies;
@@ -3372,13 +3576,15 @@ 
 	}
 	public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=true,$encodeGetItems=true)
 	{
-		if ($this->_cookieOnly===null)
-				$this->_cookieOnly=(int)ini_get('session.use_cookies') && (int)ini_get('session.use_only_cookies');
+		if ($this->_cookieOnly===null) {
+						$this->_cookieOnly=(int)ini_get('session.use_cookies') && (int)ini_get('session.use_only_cookies');
+		}
 		$url=$this->getUrlManagerModule()->constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems);
-		if(defined('SID') && SID != '' && !$this->_cookieOnly)
-			return $url . (strpos($url,'?')===false? '?' : ($encodeAmpersand?'&amp;':'&')) . SID;
-		else
-			return $url;
+		if(defined('SID') && SID != '' && !$this->_cookieOnly) {
+					return $url . (strpos($url,'?')===false? '?' : ($encodeAmpersand?'&amp;':'&')) . SID;
+		} else {
+					return $url;
+		}
 	}
 	protected function parseUrl()
 	{
@@ -3387,8 +3593,9 @@ 
 	public function resolveRequest($serviceIDs)
 	{
 		$getParams=$this->parseUrl();
-		foreach($getParams as $name=>$value)
-			$_GET[$name]=$value;
+		foreach($getParams as $name=>$value) {
+					$_GET[$name]=$value;
+		}
 		$this->_items=array_merge($_GET,$_POST);
 		$this->_requestResolved=true;
 		foreach($serviceIDs as $serviceID)
@@ -3453,14 +3660,15 @@ 
 			$value=$this->_items[$key];
 			unset($this->_items[$key]);
 			return $value;
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 	public function clear()
 	{
-		foreach(array_keys($this->_items) as $key)
-			$this->remove($key);
+		foreach(array_keys($this->_items) as $key) {
+					$this->remove($key);
+		}
 	}
 	public function contains($key)
 	{
@@ -3499,31 +3707,35 @@ 
 		if($item instanceof THttpCookie)
 		{
 			parent::insertAt($index,$item);
-			if($this->_o instanceof THttpResponse)
-				$this->_o->addCookie($item);
+			if($this->_o instanceof THttpResponse) {
+							$this->_o->addCookie($item);
+			}
+		} else {
+					throw new TInvalidDataTypeException('httpcookiecollection_httpcookie_required');
 		}
-		else
-			throw new TInvalidDataTypeException('httpcookiecollection_httpcookie_required');
 	}
 	public function removeAt($index)
 	{
 		$item=parent::removeAt($index);
-		if($this->_o instanceof THttpResponse)
-			$this->_o->removeCookie($item);
+		if($this->_o instanceof THttpResponse) {
+					$this->_o->removeCookie($item);
+		}
 		return $item;
 	}
 	public function itemAt($index)
 	{
-		if(is_integer($index))
-			return parent::itemAt($index);
-		else
-			return $this->findCookieByName($index);
+		if(is_integer($index)) {
+					return parent::itemAt($index);
+		} else {
+					return $this->findCookieByName($index);
+		}
 	}
 	public function findCookieByName($name)
 	{
-		foreach($this as $cookie)
-			if($cookie->getName()===$name)
+		foreach($this as $cookie) {
+					if($cookie->getName()===$name)
 				return $cookie;
+		}
 		return null;
 	}
 }
@@ -3632,8 +3844,7 @@ 
 			$this->_query=isset($ret['query'])?$ret['query']:'';
 			$this->_fragment=isset($ret['fragment'])?$ret['fragment']:'';
 			$this->_uri=$uri;
-		}
-		else
+		} else
 		{
 			throw new TInvalidDataValueException('uri_format_invalid',$uri);
 		}
@@ -3744,8 +3955,9 @@ 
 	}
 	public function init($config)
 	{
-		if($this->_bufferOutput)
-			ob_start();
+		if($this->_bufferOutput) {
+					ob_start();
+		}
 		$this->_initialized=true;
 		$this->getApplication()->setResponse($this);
 	}
@@ -3767,8 +3979,9 @@ 
 	}
 	public function setContentType($type)
 	{
-		if ($this->_contentTypeHeaderSent)
-			throw new Exception('Unable to alter content-type as it has been already sent');
+		if ($this->_contentTypeHeaderSent) {
+					throw new Exception('Unable to alter content-type as it has been already sent');
+		}
 		$this->_contentType = $type;
 	}
 	public function getContentType()
@@ -3789,10 +4002,11 @@ 
 	}
 	public function setBufferOutput($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('httpresponse_bufferoutput_unchangeable');
-		else
-			$this->_bufferOutput=TPropertyValue::ensureBoolean($value);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('httpresponse_bufferoutput_unchangeable');
+		} else {
+					$this->_bufferOutput=TPropertyValue::ensureBoolean($value);
+		}
 	}
 	public function getStatusCode()
 	{
@@ -3800,12 +4014,13 @@ 
 	}
 	public function setStatusCode($status, $reason=null)
 	{
-		if ($this->_httpHeaderSent)
-			throw new Exception('Unable to alter response as HTTP header already sent');
+		if ($this->_httpHeaderSent) {
+					throw new Exception('Unable to alter response as HTTP header already sent');
+		}
 		$status=TPropertyValue::ensureInteger($status);
 		if(isset(self::$HTTP_STATUS_CODES[$status])) {
 			$this->_reason=self::$HTTP_STATUS_CODES[$status];
-		}else{
+		} else{
 			if($reason===null || $reason==='') {
 				throw new TInvalidDataValueException("response_status_reason_missing");
 			}
@@ -3822,14 +4037,16 @@ 
 	}
 	public function getCookies()
 	{
-		if($this->_cookies===null)
-			$this->_cookies=new THttpCookieCollection($this);
+		if($this->_cookies===null) {
+					$this->_cookies=new THttpCookieCollection($this);
+		}
 		return $this->_cookies;
 	}
 	public function write($str)
 	{
-				if (!$this->_bufferOutput and !$this->_httpHeaderSent)
-			$this->ensureHeadersSent();
+				if (!$this->_bufferOutput and !$this->_httpHeaderSent) {
+							$this->ensureHeadersSent();
+				}
 		echo $str;
 	}
 	public function writeFile($fileName,$content=null,$mimeType=null,$headers=null,$forceDownload=true,$clientFileName=null,$fileSize=null)
@@ -3849,28 +4066,31 @@ 
 		if($mimeType===null)
 		{
 			$mimeType='text/plain';
-			if(function_exists('mime_content_type'))
-				$mimeType=mime_content_type($fileName);
-			else if(($ext=strrchr($fileName,'.'))!==false)
+			if(function_exists('mime_content_type')) {
+							$mimeType=mime_content_type($fileName);
+			} else if(($ext=strrchr($fileName,'.'))!==false)
 			{
 				$ext=substr($ext,1);
-				if(isset($defaultMimeTypes[$ext]))
-					$mimeType=$defaultMimeTypes[$ext];
+				if(isset($defaultMimeTypes[$ext])) {
+									$mimeType=$defaultMimeTypes[$ext];
+				}
 			}
 		}
-		if($clientFileName===null)
-			$clientFileName=basename($fileName);
-		else
-			$clientFileName=basename($clientFileName);
-		if($fileSize===null || $fileSize < 0)
-			$fileSize = ($content===null?filesize($fileName):strlen($content));
+		if($clientFileName===null) {
+					$clientFileName=basename($fileName);
+		} else {
+					$clientFileName=basename($clientFileName);
+		}
+		if($fileSize===null || $fileSize < 0) {
+					$fileSize = ($content===null?filesize($fileName):strlen($content));
+		}
 		$this->sendHttpHeader();
 		if(is_array($headers))
 		{
-			foreach($headers as $h)
-				header($h);
-		}
-		else
+			foreach($headers as $h) {
+							header($h);
+			}
+		} else
 		{
 			header('Pragma: public');
 			header('Expires: 0');
@@ -3881,29 +4101,34 @@ 
 		header('Content-Length: '.$fileSize);
 		header("Content-Disposition: " . ($forceDownload ? 'attachment' : 'inline') . "; filename=\"$clientFileName\"");
 		header('Content-Transfer-Encoding: binary');
-		if($content===null)
-			readfile($fileName);
-		else
-			echo $content;
+		if($content===null) {
+					readfile($fileName);
+		} else {
+					echo $content;
+		}
 	}
 	public function redirect($url)
 	{
-		if($this->getHasAdapter())
-			$this->_adapter->httpRedirect($url);
-		else
-			$this->httpRedirect($url);
+		if($this->getHasAdapter()) {
+					$this->_adapter->httpRedirect($url);
+		} else {
+					$this->httpRedirect($url);
+		}
 	}
 	public function httpRedirect($url)
 	{
 		$this->ensureHeadersSent();
-		if($url[0]==='/')
-			$url=$this->getRequest()->getBaseUrl().$url;
-		if ($this->_status >= 300 && $this->_status < 400)
-						header('Location: '.str_replace('&amp;','&',$url), true, $this->_status);
-		else
-			header('Location: '.str_replace('&amp;','&',$url));
-		if(!$this->getApplication()->getRequestCompleted())
-			$this->getApplication()->onEndRequest();
+		if($url[0]==='/') {
+					$url=$this->getRequest()->getBaseUrl().$url;
+		}
+		if ($this->_status >= 300 && $this->_status < 400) {
+								header('Location: '.str_replace('&amp;','&',$url), true, $this->_status);
+		} else {
+					header('Location: '.str_replace('&amp;','&',$url));
+		}
+		if(!$this->getApplication()->getRequestCompleted()) {
+					$this->getApplication()->onEndRequest();
+		}
 		exit();
 	}
 	public function reload()
@@ -3912,10 +4137,11 @@ 
 	}
 	public function flush($continueBuffering = true)
 	{
-		if($this->getHasAdapter())
-			$this->_adapter->flushContent($continueBuffering);
-		else
-			$this->flushContent($continueBuffering);
+		if($this->getHasAdapter()) {
+					$this->_adapter->flushContent($continueBuffering);
+		} else {
+					$this->flushContent($continueBuffering);
+		}
 	}
 	public function ensureHeadersSent()
 	{
@@ -3933,25 +4159,27 @@ 
 				{
 					$this->_bufferOutput = false;
 					ob_end_flush();
+				} else {
+									ob_flush();
 				}
-				else
-					ob_flush();
 				flush();
 			}
+		} else {
+					flush();
 		}
-		else
-			flush();
 	}
 	protected function ensureHttpHeaderSent()
 	{
-		if (!$this->_httpHeaderSent)
-			$this->sendHttpHeader();
+		if (!$this->_httpHeaderSent) {
+					$this->sendHttpHeader();
+		}
 	}
 	protected function sendHttpHeader()
 	{
 		$protocol=$this->getRequest()->getHttpProtocolVersion();
-		if($this->getRequest()->getHttpProtocolVersion() === null)
-			$protocol='HTTP/1.1';
+		if($this->getRequest()->getHttpProtocolVersion() === null) {
+					$protocol='HTTP/1.1';
+		}
 		$phpSapiName = substr(php_sapi_name(), 0, 3);
 		$cgi = $phpSapiName == 'cgi' || $phpSapiName == 'fpm';
 		header(($cgi ? 'Status:' : $protocol).' '.$this->_status.' '.$this->_reason, true, TPropertyValue::ensureInteger($this->_status));
@@ -3959,8 +4187,9 @@ 
 	}
 	protected function ensureContentTypeHeaderSent()
 	{
-		if (!$this->_contentTypeHeaderSent)
-			$this->sendContentTypeHeader();
+		if (!$this->_contentTypeHeaderSent) {
+					$this->sendContentTypeHeader();
+		}
 	}
 	protected function sendContentTypeHeader()
 	{
@@ -3970,9 +4199,12 @@ 
 			$this->appendHeader('Content-Type: '.$contentType);
 			return;
 		}
-		if($charset==='' && ($globalization=$this->getApplication()->getGlobalization(false))!==null)
-			$charset=$globalization->getCharset();
-		if($charset==='') $charset = self::DEFAULT_CHARSET;
+		if($charset==='' && ($globalization=$this->getApplication()->getGlobalization(false))!==null) {
+					$charset=$globalization->getCharset();
+		}
+		if($charset==='') {
+			$charset = self::DEFAULT_CHARSET;
+		}
 		$this->appendHeader('Content-Type: '.$contentType.';charset='.$charset);
 		$this->_contentTypeHeaderSent = true;
 	}
@@ -3982,8 +4214,9 @@ 
 	}
 	public function clear()
 	{
-		if($this->_bufferOutput)
-			ob_clean();
+		if($this->_bufferOutput) {
+					ob_clean();
+		}
 	}
 	public function getHeaders($case=null)
 	{
@@ -3993,13 +4226,15 @@ 
 			$tmp = explode(':', $header);
 			$key = trim(array_shift($tmp));
 			$value = trim(implode(':', $tmp));
-			if(isset($result[$key]))
-				$result[$key] .= ', ' . $value;
-			else
-				$result[$key] = $value;
+			if(isset($result[$key])) {
+							$result[$key] .= ', ' . $value;
+			} else {
+							$result[$key] = $value;
+			}
+		}
+		if($case !== null) {
+					return array_change_key_case($result, $case);
 		}
-		if($case !== null)
-			return array_change_key_case($result, $case);
 		return $result;
 	}
 	public function appendHeader($value, $replace=true)
@@ -4025,8 +4260,7 @@ 
 				$cookie->getSecure(),
 				$cookie->getHttpOnly()
 			);
-		}
-		else {
+		} else {
 			setcookie(
 				$cookie->getName(),
 				$cookie->getValue(),
@@ -4060,12 +4294,14 @@ 
 	}
 	public function createHtmlWriter($type=null)
 	{
-		if($type===null)
-			$type=$this->getHtmlWriterType();
-		if($this->getHasAdapter())
-			return $this->_adapter->createNewHtmlWriter($type, $this);
-		else
-			return $this->createNewHtmlWriter($type, $this);
+		if($type===null) {
+					$type=$this->getHtmlWriterType();
+		}
+		if($this->getHasAdapter()) {
+					return $this->_adapter->createNewHtmlWriter($type, $this);
+		} else {
+					return $this->createNewHtmlWriter($type, $this);
+		}
 	}
 	public function createNewHtmlWriter($type, $writer)
 	{
@@ -4090,8 +4326,9 @@ 
 	}
 	public function init($config)
 	{
-		if($this->_autoStart)
-			$this->open();
+		if($this->_autoStart) {
+					$this->open();
+		}
 		$this->_initialized=true;
 		$this->getApplication()->setSession($this);
 		register_shutdown_function(array($this, "close"));
@@ -4100,12 +4337,15 @@ 
 	{
 		if(!$this->_started)
 		{
-			if($this->_customStorage)
-				session_set_save_handler(array($this,'_open'),array($this,'_close'),array($this,'_read'),array($this,'_write'),array($this,'_destroy'),array($this,'_gc'));
-			if($this->_cookie!==null)
-				session_set_cookie_params($this->_cookie->getExpire(),$this->_cookie->getPath(),$this->_cookie->getDomain(),$this->_cookie->getSecure(),$this->_cookie->getHttpOnly());
-			if(ini_get('session.auto_start')!=='1')
-				session_start();
+			if($this->_customStorage) {
+							session_set_save_handler(array($this,'_open'),array($this,'_close'),array($this,'_read'),array($this,'_write'),array($this,'_destroy'),array($this,'_gc'));
+			}
+			if($this->_cookie!==null) {
+							session_set_cookie_params($this->_cookie->getExpire(),$this->_cookie->getPath(),$this->_cookie->getDomain(),$this->_cookie->getSecure(),$this->_cookie->getHttpOnly());
+			}
+			if(ini_get('session.auto_start')!=='1') {
+							session_start();
+			}
 			$this->_started=true;
 		}
 	}
@@ -4141,10 +4381,11 @@ 
 	}
 	public function setSessionID($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_sessionid_unchangeable');
-		else
-			session_id($value);
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_sessionid_unchangeable');
+		} else {
+					session_id($value);
+		}
 	}
 	public function getSessionName()
 	{
@@ -4152,12 +4393,13 @@ 
 	}
 	public function setSessionName($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_sessionname_unchangeable');
-		else if(ctype_alnum($value))
-			session_name($value);
-		else
-			throw new TInvalidDataValueException('httpsession_sessionname_invalid',$value);
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_sessionname_unchangeable');
+		} else if(ctype_alnum($value)) {
+					session_name($value);
+		} else {
+					throw new TInvalidDataValueException('httpsession_sessionname_invalid',$value);
+		}
 	}
 	public function getSavePath()
 	{
@@ -4165,12 +4407,13 @@ 
 	}
 	public function setSavePath($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_savepath_unchangeable');
-		else if(is_dir($value))
-			session_save_path($value);
-		else
-			throw new TInvalidDataValueException('httpsession_savepath_invalid',$value);
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_savepath_unchangeable');
+		} else if(is_dir($value)) {
+					session_save_path($value);
+		} else {
+					throw new TInvalidDataValueException('httpsession_savepath_invalid',$value);
+		}
 	}
 	public function getUseCustomStorage()
 	{
@@ -4182,37 +4425,37 @@ 
 	}
 	public function getCookie()
 	{
-		if($this->_cookie===null)
-			$this->_cookie=new THttpCookie($this->getSessionName(),$this->getSessionID());
+		if($this->_cookie===null) {
+					$this->_cookie=new THttpCookie($this->getSessionName(),$this->getSessionID());
+		}
 		return $this->_cookie;
 	}
 	public function getCookieMode()
 	{
-		if(ini_get('session.use_cookies')==='0')
-			return THttpSessionCookieMode::None;
-		else if(ini_get('session.use_only_cookies')==='0')
-			return THttpSessionCookieMode::Allow;
-		else
-			return THttpSessionCookieMode::Only;
+		if(ini_get('session.use_cookies')==='0') {
+					return THttpSessionCookieMode::None;
+		} else if(ini_get('session.use_only_cookies')==='0') {
+					return THttpSessionCookieMode::Allow;
+		} else {
+					return THttpSessionCookieMode::Only;
+		}
 	}
 	public function setCookieMode($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_cookiemode_unchangeable');
-		else
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_cookiemode_unchangeable');
+		} else
 		{
 			$value=TPropertyValue::ensureEnum($value,'THttpSessionCookieMode');
 			if($value===THttpSessionCookieMode::None) 
       {
 				ini_set('session.use_cookies','0');
 			  ini_set('session.use_only_cookies','0');
-      }
-			else if($value===THttpSessionCookieMode::Allow)
+      } else if($value===THttpSessionCookieMode::Allow)
 			{
 				ini_set('session.use_cookies','1');
 				ini_set('session.use_only_cookies','0');
-			}
-			else
+			} else
 			{
 				ini_set('session.use_cookies','1');
 				ini_set('session.use_only_cookies','1');
@@ -4226,10 +4469,11 @@ 
 	}
 	public function setAutoStart($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('httpsession_autostart_unchangeable');
-		else
-			$this->_autoStart=TPropertyValue::ensureBoolean($value);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('httpsession_autostart_unchangeable');
+		} else {
+					$this->_autoStart=TPropertyValue::ensureBoolean($value);
+		}
 	}
 	public function getGCProbability()
 	{
@@ -4237,18 +4481,18 @@ 
 	}
 	public function setGCProbability($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_gcprobability_unchangeable');
-		else
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_gcprobability_unchangeable');
+		} else
 		{
 			$value=TPropertyValue::ensureInteger($value);
 			if($value>=0 && $value<=100)
 			{
 				ini_set('session.gc_probability',$value);
 				ini_set('session.gc_divisor','100');
+			} else {
+							throw new TInvalidDataValueException('httpsession_gcprobability_invalid',$value);
 			}
-			else
-				throw new TInvalidDataValueException('httpsession_gcprobability_invalid',$value);
 		}
 	}
 	public function getUseTransparentSessionID()
@@ -4257,13 +4501,14 @@ 
 	}
 	public function setUseTransparentSessionID($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_transid_unchangeable');
-		else
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_transid_unchangeable');
+		} else
 		{
 			$value=TPropertyValue::ensureBoolean($value);
-			if ($value && $this->getCookieMode()==THttpSessionCookieMode::Only)
-					throw new TInvalidOperationException('httpsession_transid_cookieonly');
+			if ($value && $this->getCookieMode()==THttpSessionCookieMode::Only) {
+								throw new TInvalidOperationException('httpsession_transid_cookieonly');
+			}
 			ini_set('session.use_trans_sid',$value?'1':'0');
 		}
 	}
@@ -4273,10 +4518,11 @@ 
 	}
 	public function setTimeout($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_maxlifetime_unchangeable');
-		else
-			ini_set('session.gc_maxlifetime',$value);
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_maxlifetime_unchangeable');
+		} else {
+					ini_set('session.gc_maxlifetime',$value);
+		}
 	}
 	public function _open($savePath,$sessionName)
 	{
@@ -4333,14 +4579,15 @@ 
 			$value=$_SESSION[$key];
 			unset($_SESSION[$key]);
 			return $value;
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 	public function clear()
 	{
-		foreach(array_keys($_SESSION) as $key)
-			unset($_SESSION[$key]);
+		foreach(array_keys($_SESSION) as $key) {
+					unset($_SESSION[$key]);
+		}
 	}
 	public function contains($key)
 	{
@@ -4541,10 +4788,11 @@ 
 	private $_rf=array();
 	public function __get($name)
 	{
-		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
-			return $this->_rf[self::RF_NAMED_OBJECTS][$name];
-		else
-			return parent::__get($name);
+		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name])) {
+					return $this->_rf[self::RF_NAMED_OBJECTS][$name];
+		} else {
+					return parent::__get($name);
+		}
 	}
 	public function getHasAdapter()
 	{
@@ -4566,10 +4814,11 @@ 
 	{
 		if(!$this->_namingContainer && $this->_parent)
 		{
-			if($this->_parent instanceof INamingContainer)
-				$this->_namingContainer=$this->_parent;
-			else
-				$this->_namingContainer=$this->_parent->getNamingContainer();
+			if($this->_parent instanceof INamingContainer) {
+							$this->_namingContainer=$this->_parent;
+			} else {
+							$this->_namingContainer=$this->_parent->getNamingContainer();
+			}
 		}
 		return $this->_namingContainer;
 	}
@@ -4577,10 +4826,11 @@ 
 	{
 		if(!$this->_page)
 		{
-			if($this->_parent)
-				$this->_page=$this->_parent->getPage();
-			else if($this->_tplControl)
-				$this->_page=$this->_tplControl->getPage();
+			if($this->_parent) {
+							$this->_page=$this->_parent->getPage();
+			} else if($this->_tplControl) {
+							$this->_page=$this->_tplControl->getPage();
+			}
 		}
 		return $this->_page;
 	}
@@ -4594,8 +4844,9 @@ 
 	}
 	public function getTemplateControl()
 	{
-		if(!$this->_tplControl && $this->_parent)
-			$this->_tplControl=$this->_parent->getTemplateControl();
+		if(!$this->_tplControl && $this->_parent) {
+					$this->_tplControl=$this->_parent->getTemplateControl();
+		}
 		return $this->_tplControl;
 	}
 	public function getSourceTemplateControl()
@@ -4603,8 +4854,9 @@ 
 		$control=$this;
 		while(($control instanceof TControl) && ($control=$control->getTemplateControl())!==null)
 		{
-			if(($control instanceof TTemplateControl) && $control->getIsSourceTemplateControl())
-				return $control;
+			if(($control instanceof TTemplateControl) && $control->getIsSourceTemplateControl()) {
+							return $control;
+			}
 		}
 		return $this->getPage();
 	}
@@ -4618,37 +4870,42 @@ 
 	}
 	public function getID($hideAutoID=true)
 	{
-		if($hideAutoID)
-			return ($this->_flags & self::IS_ID_SET) ? $this->_id : '';
-		else
-			return $this->_id;
+		if($hideAutoID) {
+					return ($this->_flags & self::IS_ID_SET) ? $this->_id : '';
+		} else {
+					return $this->_id;
+		}
 	}
 	public function setID($id)
 	{
-		if(!preg_match(self::ID_FORMAT,$id))
-			throw new TInvalidDataValueException('control_id_invalid',get_class($this),$id);
+		if(!preg_match(self::ID_FORMAT,$id)) {
+					throw new TInvalidDataValueException('control_id_invalid',get_class($this),$id);
+		}
 		$this->_id=$id;
 		$this->_flags |= self::IS_ID_SET;
 		$this->clearCachedUniqueID($this instanceof INamingContainer);
-		if($this->_namingContainer)
-			$this->_namingContainer->clearNameTable();
+		if($this->_namingContainer) {
+					$this->_namingContainer->clearNameTable();
+		}
 	}
 	public function getUniqueID()
 	{
 		if($this->_uid==='' || $this->_uid===null)			{
 			$this->_uid='';  			if($namingContainer=$this->getNamingContainer())
 			{
-				if($this->getPage()===$namingContainer)
-					return ($this->_uid=$this->_id);
-				else if(($prefix=$namingContainer->getUniqueID())==='')
-					return $this->_id;
-				else
-					return ($this->_uid=$prefix.self::ID_SEPARATOR.$this->_id);
+				if($this->getPage()===$namingContainer) {
+									return ($this->_uid=$this->_id);
+				} else if(($prefix=$namingContainer->getUniqueID())==='') {
+									return $this->_id;
+				} else {
+									return ($this->_uid=$prefix.self::ID_SEPARATOR.$this->_id);
+				}
+			} else {
+				return $this->_id;
 			}
-			else					return $this->_id;
+		} else {
+					return $this->_uid;
 		}
-		else
-			return $this->_uid;
 	}
 	public function focus()
 	{
@@ -4668,10 +4925,11 @@ 
 	}
 	public function setSkinID($value)
 	{
-		if(($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage>=self::CS_CHILD_INITIALIZED)
-			throw new TInvalidOperationException('control_skinid_unchangeable',get_class($this));
-		else
-			$this->_rf[self::RF_SKIN_ID]=$value;
+		if(($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage>=self::CS_CHILD_INITIALIZED) {
+					throw new TInvalidOperationException('control_skinid_unchangeable',get_class($this));
+		} else {
+					$this->_rf[self::RF_SKIN_ID]=$value;
+		}
 	}
 	public function getIsSkinApplied()
 	{
@@ -4679,19 +4937,21 @@ 
 	}
 	public function getEnableTheming()
 	{
-		if($this->_flags & self::IS_DISABLE_THEMING)
-			return false;
-		else
-			return $this->_parent?$this->_parent->getEnableTheming():true;
+		if($this->_flags & self::IS_DISABLE_THEMING) {
+					return false;
+		} else {
+					return $this->_parent?$this->_parent->getEnableTheming():true;
+		}
 	}
 	public function setEnableTheming($value)
 	{
-		if($this->_stage>=self::CS_CHILD_INITIALIZED)
-			throw new TInvalidOperationException('control_enabletheming_unchangeable',get_class($this),$this->getUniqueID());
-		else if(TPropertyValue::ensureBoolean($value))
-			$this->_flags &= ~self::IS_DISABLE_THEMING;
-		else
-			$this->_flags |= self::IS_DISABLE_THEMING;
+		if($this->_stage>=self::CS_CHILD_INITIALIZED) {
+					throw new TInvalidOperationException('control_enabletheming_unchangeable',get_class($this),$this->getUniqueID());
+		} else if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags &= ~self::IS_DISABLE_THEMING;
+		} else {
+					$this->_flags |= self::IS_DISABLE_THEMING;
+		}
 	}
 	public function getCustomData()
 	{
@@ -4707,8 +4967,9 @@ 
 	}
 	public function getControls()
 	{
-		if(!isset($this->_rf[self::RF_CONTROLS]))
-			$this->_rf[self::RF_CONTROLS]=$this->createControlCollection();
+		if(!isset($this->_rf[self::RF_CONTROLS])) {
+					$this->_rf[self::RF_CONTROLS]=$this->createControlCollection();
+		}
 		return $this->_rf[self::RF_CONTROLS];
 	}
 	protected function createControlCollection()
@@ -4719,13 +4980,14 @@ 
 	{
 		if($checkParents)
 		{
-			for($control=$this;$control;$control=$control->_parent)
-				if(!$control->getVisible(false))
+			for($control=$this;$control;$control=$control->_parent) {
+							if(!$control->getVisible(false))
 					return false;
+			}
 			return true;
+		} else {
+					return $this->getViewState('Visible',true);
 		}
-		else
-			return $this->getViewState('Visible',true);
 	}
 	public function setVisible($value)
 	{
@@ -4735,13 +4997,14 @@ 
 	{
 		if($checkParents)
 		{
-			for($control=$this;$control;$control=$control->_parent)
-				if(!$control->getViewState('Enabled',true))
+			for($control=$this;$control;$control=$control->_parent) {
+							if(!$control->getViewState('Enabled',true))
 					return false;
+			}
 			return true;
+		} else {
+					return $this->getViewState('Enabled',true);
 		}
-		else
-			return $this->getViewState('Enabled',true);
 	}
 	public function setEnabled($value)
 	{
@@ -4749,16 +5012,17 @@ 
 	}
 	public function getHasAttributes()
 	{
-		if($attributes=$this->getViewState('Attributes',null))
-			return $attributes->getCount()>0;
-		else
-			return false;
+		if($attributes=$this->getViewState('Attributes',null)) {
+					return $attributes->getCount()>0;
+		} else {
+					return false;
+		}
 	}
 	public function getAttributes()
 	{
-		if($attributes=$this->getViewState('Attributes',null))
-			return $attributes;
-		else
+		if($attributes=$this->getViewState('Attributes',null)) {
+					return $attributes;
+		} else
 		{
 			$attributes=new TAttributeCollection;
 			$this->setViewState('Attributes',$attributes,null);
@@ -4767,17 +5031,19 @@ 
 	}
 	public function hasAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
-			return $attributes->contains($name);
-		else
-			return false;
+		if($attributes=$this->getViewState('Attributes',null)) {
+					return $attributes->contains($name);
+		} else {
+					return false;
+		}
 	}
 	public function getAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
-			return $attributes->itemAt($name);
-		else
-			return null;
+		if($attributes=$this->getViewState('Attributes',null)) {
+					return $attributes->itemAt($name);
+		} else {
+					return null;
+		}
 	}
 	public function setAttribute($name,$value)
 	{
@@ -4785,29 +5051,32 @@ 
 	}
 	public function removeAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
-			return $attributes->remove($name);
-		else
-			return null;
+		if($attributes=$this->getViewState('Attributes',null)) {
+					return $attributes->remove($name);
+		} else {
+					return null;
+		}
 	}
 	public function getEnableViewState($checkParents=false)
 	{
 		if($checkParents)
 		{
-			for($control=$this;$control!==null;$control=$control->getParent())
-				if($control->_flags & self::IS_DISABLE_VIEWSTATE)
+			for($control=$this;$control!==null;$control=$control->getParent()) {
+							if($control->_flags & self::IS_DISABLE_VIEWSTATE)
 					return false;
+			}
 			return true;
+		} else {
+					return !($this->_flags & self::IS_DISABLE_VIEWSTATE);
 		}
-		else
-			return !($this->_flags & self::IS_DISABLE_VIEWSTATE);
 	}
 	public function setEnableViewState($value)
 	{
-		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags &= ~self::IS_DISABLE_VIEWSTATE;
-		else
-			$this->_flags |= self::IS_DISABLE_VIEWSTATE;
+		if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags &= ~self::IS_DISABLE_VIEWSTATE;
+		} else {
+					$this->_flags |= self::IS_DISABLE_VIEWSTATE;
+		}
 	}
 	protected function getControlState($key,$defaultValue=null)
 	{
@@ -4815,10 +5084,11 @@ 
 	}
 	protected function setControlState($key,$value,$defaultValue=null)
 	{
-		if($value===$defaultValue)
-			unset($this->_rf[self::RF_CONTROLSTATE][$key]);
-		else
-			$this->_rf[self::RF_CONTROLSTATE][$key]=$value;
+		if($value===$defaultValue) {
+					unset($this->_rf[self::RF_CONTROLSTATE][$key]);
+		} else {
+					$this->_rf[self::RF_CONTROLSTATE][$key]=$value;
+		}
 	}
 	protected function clearControlState($key)
 	{
@@ -4830,16 +5100,17 @@ 
 	}
 	public function getViewState($key,$defaultValue=null)
 	{
-		if(isset($this->_viewState[$key]))
-			return $this->_viewState[$key]!==null?$this->_viewState[$key]:$defaultValue;
-		else if(isset($this->_tempState[$key]))
+		if(isset($this->_viewState[$key])) {
+					return $this->_viewState[$key]!==null?$this->_viewState[$key]:$defaultValue;
+		} else if(isset($this->_tempState[$key]))
 		{
-			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
-				$this->_viewState[$key]=$this->_tempState[$key];
+			if(is_object($this->_tempState[$key]) && $this->_trackViewState) {
+							$this->_viewState[$key]=$this->_tempState[$key];
+			}
 			return $this->_tempState[$key];
+		} else {
+					return $defaultValue;
 		}
-		else
-			return $defaultValue;
 	}
 	public function setViewState($key,$value,$defaultValue=null)
 	{
@@ -4847,8 +5118,7 @@ 
 		{
 			$this->_viewState[$key]=$value;
 			unset($this->_tempState[$key]);
-		}
-		else
+		} else
 		{
 			unset($this->_viewState[$key]);
 			$this->_tempState[$key]=$value;
@@ -4881,29 +5151,34 @@ 
 	{
 		if(isset($this->_rf[self::RF_DATA_BINDINGS]))
 		{
-			if(($context=$this->getTemplateControl())===null)
-				$context=$this;
-			foreach($this->_rf[self::RF_DATA_BINDINGS] as $property=>$expression)
-				$this->setSubProperty($property,$context->evaluateExpression($expression));
+			if(($context=$this->getTemplateControl())===null) {
+							$context=$this;
+			}
+			foreach($this->_rf[self::RF_DATA_BINDINGS] as $property=>$expression) {
+							$this->setSubProperty($property,$context->evaluateExpression($expression));
+			}
 		}
 	}
 	protected function autoDataBindProperties()
 	{
 		if(isset($this->_rf[self::RF_AUTO_BINDINGS]))
 		{
-			if(($context=$this->getTemplateControl())===null)
-				$context=$this;
-			foreach($this->_rf[self::RF_AUTO_BINDINGS] as $property=>$expression)
-				$this->setSubProperty($property,$context->evaluateExpression($expression));
+			if(($context=$this->getTemplateControl())===null) {
+							$context=$this;
+			}
+			foreach($this->_rf[self::RF_AUTO_BINDINGS] as $property=>$expression) {
+							$this->setSubProperty($property,$context->evaluateExpression($expression));
+			}
 		}
 	}
 	protected function dataBindChildren()
 	{
 		if(isset($this->_rf[self::RF_CONTROLS]))
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof IBindable)
+			foreach($this->_rf[self::RF_CONTROLS] as $control) {
+							if($control instanceof IBindable)
 					$control->dataBind();
+			}
 		}
 	}
 	final protected function getChildControlsCreated()
@@ -4912,12 +5187,13 @@ 
 	}
 	final protected function setChildControlsCreated($value)
 	{
-		if($value)
-			$this->_flags |= self::IS_CHILD_CREATED;
-		else
+		if($value) {
+					$this->_flags |= self::IS_CHILD_CREATED;
+		} else
 		{
-			if($this->getHasControls() && ($this->_flags & self::IS_CHILD_CREATED))
-				$this->getControls()->clear();
+			if($this->getHasControls() && ($this->_flags & self::IS_CHILD_CREATED)) {
+							$this->getControls()->clear();
+			}
 			$this->_flags &= ~self::IS_CHILD_CREATED;
 		}
 	}
@@ -4928,14 +5204,14 @@ 
 			try
 			{
 				$this->_flags |= self::IS_CREATING_CHILD;
-				if(isset($this->_rf[self::RF_ADAPTER]))
-					$this->_rf[self::RF_ADAPTER]->createChildControls();
-				else
-					$this->createChildControls();
+				if(isset($this->_rf[self::RF_ADAPTER])) {
+									$this->_rf[self::RF_ADAPTER]->createChildControls();
+				} else {
+									$this->createChildControls();
+				}
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
@@ -4950,23 +5226,25 @@ 
 	{
 		$id=strtr($id,'.',self::ID_SEPARATOR);
 		$container=($this instanceof INamingContainer)?$this:$this->getNamingContainer();
-		if(!$container || !$container->getHasControls())
-			return null;
+		if(!$container || !$container->getHasControls()) {
+					return null;
+		}
 		if(!isset($container->_rf[self::RF_NAMED_CONTROLS]))
 		{
 			$container->_rf[self::RF_NAMED_CONTROLS]=array();
 			$container->fillNameTable($container,$container->_rf[self::RF_CONTROLS]);
 		}
-		if(($pos=strpos($id,self::ID_SEPARATOR))===false)
-			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id])?$container->_rf[self::RF_NAMED_CONTROLS][$id]:null;
-		else
+		if(($pos=strpos($id,self::ID_SEPARATOR))===false) {
+					return isset($container->_rf[self::RF_NAMED_CONTROLS][$id])?$container->_rf[self::RF_NAMED_CONTROLS][$id]:null;
+		} else
 		{
 			$cid=substr($id,0,$pos);
 			$sid=substr($id,$pos+1);
-			if(isset($container->_rf[self::RF_NAMED_CONTROLS][$cid]))
-				return $container->_rf[self::RF_NAMED_CONTROLS][$cid]->findControl($sid);
-			else
-				return null;
+			if(isset($container->_rf[self::RF_NAMED_CONTROLS][$cid])) {
+							return $container->_rf[self::RF_NAMED_CONTROLS][$cid]->findControl($sid);
+			} else {
+							return null;
+			}
 		}
 	}
 	public function findControlsByType($type,$strict=true)
@@ -4976,10 +5254,12 @@ 
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if(is_object($control) && (get_class($control)===$type || (!$strict && ($control instanceof $type))))
-					$controls[]=$control;
-				if(($control instanceof TControl) && $control->getHasControls())
-					$controls=array_merge($controls,$control->findControlsByType($type,$strict));
+				if(is_object($control) && (get_class($control)===$type || (!$strict && ($control instanceof $type)))) {
+									$controls[]=$control;
+				}
+				if(($control instanceof TControl) && $control->getHasControls()) {
+									$controls=array_merge($controls,$control->findControlsByType($type,$strict));
+				}
 			}
 		}
 		return $controls;
@@ -4993,8 +5273,9 @@ 
 			{
 				if($control instanceof TControl)
 				{
-					if($control->_id===$id)
-						$controls[]=$control;
+					if($control->_id===$id) {
+											$controls[]=$control;
+					}
 					$controls=array_merge($controls,$control->findControlsByID($id));
 				}
 			}
@@ -5008,8 +5289,9 @@ 
 	}
 	public function registerObject($name,$object)
 	{
-		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
-			throw new TInvalidOperationException('control_object_reregistered',$name);
+		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name])) {
+					throw new TInvalidOperationException('control_object_reregistered',$name);
+		}
 		$this->_rf[self::RF_NAMED_OBJECTS][$name]=$object;
 	}
 	public function unregisterObject($name)
@@ -5059,24 +5341,27 @@ 
 	final protected function isDescendentOf($ancestor)
 	{
 		$control=$this;
-		while($control!==$ancestor && $control->_parent)
-			$control=$control->_parent;
+		while($control!==$ancestor && $control->_parent) {
+					$control=$control->_parent;
+		}
 		return $control===$ancestor;
 	}
 	public function addedControl($control)
 	{
-		if($control->_parent)
-			$control->_parent->getControls()->remove($control);
+		if($control->_parent) {
+					$control->_parent->getControls()->remove($control);
+		}
 		$control->_parent=$this;
 		$control->_page=$this->getPage();
 		$namingContainer=($this instanceof INamingContainer)?$this:$this->_namingContainer;
 		if($namingContainer)
 		{
 			$control->_namingContainer=$namingContainer;
-			if($control->_id==='')
-				$control->generateAutomaticID();
-			else
-				$namingContainer->clearNameTable();
+			if($control->_id==='') {
+							$control->generateAutomaticID();
+			} else {
+							$namingContainer->clearNameTable();
+			}
 			$control->clearCachedUniqueID($control instanceof INamingContainer);
 		}
 		if($this->_stage>=self::CS_CHILD_INITIALIZED)
@@ -5088,32 +5373,35 @@ 
 				{
 					$state=$this->_rf[self::RF_CHILD_STATE][$control->_id];
 					unset($this->_rf[self::RF_CHILD_STATE][$control->_id]);
+				} else {
+									$state=null;
 				}
-				else
-					$state=null;
 				$control->loadStateRecursive($state,!($this->_flags & self::IS_DISABLE_VIEWSTATE));
 				if($this->_stage>=self::CS_LOADED)
 				{
 					$control->loadRecursive();
-					if($this->_stage>=self::CS_PRERENDERED)
-						$control->preRenderRecursive();
+					if($this->_stage>=self::CS_PRERENDERED) {
+											$control->preRenderRecursive();
+					}
 				}
 			}
 		}
 	}
 	public function removedControl($control)
 	{
-		if($this->_namingContainer)
-			$this->_namingContainer->clearNameTable();
+		if($this->_namingContainer) {
+					$this->_namingContainer->clearNameTable();
+		}
 		$control->unloadRecursive();
 		$control->_parent=null;
 		$control->_page=null;
 		$control->_namingContainer=null;
 		$control->_tplControl=null;
-				if(!($control->_flags & self::IS_ID_SET))
-			$control->_id='';
-		else
-			unset($this->_rf[self::RF_NAMED_OBJECTS][$control->_id]);
+				if(!($control->_flags & self::IS_ID_SET)) {
+							$control->_id='';
+				} else {
+					unset($this->_rf[self::RF_NAMED_OBJECTS][$control->_id]);
+		}
 		$control->clearCachedUniqueID(true);
 	}
 	protected function initRecursive($namingContainer=null)
@@ -5121,8 +5409,9 @@ 
 		$this->ensureChildControls();
 		if($this->getHasControls())
 		{
-			if($this instanceof INamingContainer)
-				$namingContainer=$this;
+			if($this instanceof INamingContainer) {
+							$namingContainer=$this;
+			}
 			$page=$this->getPage();
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
@@ -5130,8 +5419,9 @@ 
 				{
 					$control->_namingContainer=$namingContainer;
 					$control->_page=$page;
-					if($control->_id==='' && $namingContainer)
-						$control->generateAutomaticID();
+					if($control->_id==='' && $namingContainer) {
+											$control->generateAutomaticID();
+					}
 					$control->initRecursive($namingContainer);
 				}
 			}
@@ -5144,10 +5434,11 @@ 
 				$page->applyControlSkin($this);
 				$this->_flags |= self::IS_SKIN_APPLIED;
 			}
-			if(isset($this->_rf[self::RF_ADAPTER]))
-				$this->_rf[self::RF_ADAPTER]->onInit(null);
-			else
-				$this->onInit(null);
+			if(isset($this->_rf[self::RF_ADAPTER])) {
+							$this->_rf[self::RF_ADAPTER]->onInit(null);
+			} else {
+							$this->onInit(null);
+			}
 			$this->_stage=self::CS_INITIALIZED;
 		}
 	}
@@ -5155,39 +5446,44 @@ 
 	{
 		if($this->_stage<self::CS_LOADED)
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
-				$this->_rf[self::RF_ADAPTER]->onLoad(null);
-			else
-				$this->onLoad(null);
+			if(isset($this->_rf[self::RF_ADAPTER])) {
+							$this->_rf[self::RF_ADAPTER]->onLoad(null);
+			} else {
+							$this->onLoad(null);
+			}
 		}
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
-					$control->loadRecursive();
+				if($control instanceof TControl) {
+									$control->loadRecursive();
+				}
 			}
 		}
-		if($this->_stage<self::CS_LOADED)
-			$this->_stage=self::CS_LOADED;
+		if($this->_stage<self::CS_LOADED) {
+					$this->_stage=self::CS_LOADED;
+		}
 	}
 	protected function preRenderRecursive()
 	{
 		$this->autoDataBindProperties();
 		if($this->getVisible(false))
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
-				$this->_rf[self::RF_ADAPTER]->onPreRender(null);
-			else
-				$this->onPreRender(null);
+			if(isset($this->_rf[self::RF_ADAPTER])) {
+							$this->_rf[self::RF_ADAPTER]->onPreRender(null);
+			} else {
+							$this->onPreRender(null);
+			}
 			if($this->getHasControls())
 			{
 				foreach($this->_rf[self::RF_CONTROLS] as $control)
 				{
-					if($control instanceof TControl)
-						$control->preRenderRecursive();
-					else if($control instanceof TCompositeLiteral)
-						$control->evaluateDynamicContent();
+					if($control instanceof TControl) {
+											$control->preRenderRecursive();
+					} else if($control instanceof TCompositeLiteral) {
+											$control->evaluateDynamicContent();
+					}
 				}
 			}
 		}
@@ -5195,18 +5491,21 @@ 
 	}
 	protected function unloadRecursive()
 	{
-		if(!($this->_flags & self::IS_ID_SET))
-			$this->_id='';
+		if(!($this->_flags & self::IS_ID_SET)) {
+					$this->_id='';
+		}
 		if($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof TControl)
+			foreach($this->_rf[self::RF_CONTROLS] as $control) {
+							if($control instanceof TControl)
 					$control->unloadRecursive();
+			}
+		}
+		if(isset($this->_rf[self::RF_ADAPTER])) {
+					$this->_rf[self::RF_ADAPTER]->onUnload(null);
+		} else {
+					$this->onUnload(null);
 		}
-		if(isset($this->_rf[self::RF_ADAPTER]))
-			$this->_rf[self::RF_ADAPTER]->onUnload(null);
-		else
-			$this->onUnload(null);
 	}
 	public function onInit($param)
 	{
@@ -5233,8 +5532,9 @@ 
 		$control=$this;
 		while($control=$control->_parent)
 		{
-			if($control->bubbleEvent($sender,$param))
-				break;
+			if($control->bubbleEvent($sender,$param)) {
+							break;
+			}
 		}
 	}
 	public function bubbleEvent($sender,$param)
@@ -5248,23 +5548,27 @@ 
 	}
 	private function broadcastEventInternal($name,$sender,$param)
 	{
-		if($this->hasEvent($name))
-			$this->raiseEvent($name,$sender,$param->getParameter());
-		if($this instanceof IBroadcastEventReceiver)
-			$this->broadcastEventReceived($sender,$param);
+		if($this->hasEvent($name)) {
+					$this->raiseEvent($name,$sender,$param->getParameter());
+		}
+		if($this instanceof IBroadcastEventReceiver) {
+					$this->broadcastEventReceived($sender,$param);
+		}
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
-					$control->broadcastEventInternal($name,$sender,$param);
+				if($control instanceof TControl) {
+									$control->broadcastEventInternal($name,$sender,$param);
+				}
 			}
 		}
 	}
 	protected function traverseChildControls($param,$preCallback=null,$postCallback=null)
 	{
-		if($preCallback!==null)
-			call_user_func($preCallback,$this,$param);
+		if($preCallback!==null) {
+					call_user_func($preCallback,$this,$param);
+		}
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
@@ -5275,17 +5579,19 @@ 
 				}
 			}
 		}
-		if($postCallback!==null)
-			call_user_func($postCallback,$this,$param);
+		if($postCallback!==null) {
+					call_user_func($postCallback,$this,$param);
+		}
 	}
 	public function renderControl($writer)
 	{
 		if($this instanceof IActiveControl || $this->getVisible(false))
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
-				$this->_rf[self::RF_ADAPTER]->render($writer);
-			else
-				$this->render($writer);
+			if(isset($this->_rf[self::RF_ADAPTER])) {
+							$this->_rf[self::RF_ADAPTER]->render($writer);
+			} else {
+							$this->render($writer);
+			}
 		}
 	}
 	public function render($writer)
@@ -5298,12 +5604,13 @@ 
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if(is_string($control))
-					$writer->write($control);
-				else if($control instanceof TControl)
-					$control->renderControl($writer);
-				else if($control instanceof IRenderable)
-					$control->render($writer);
+				if(is_string($control)) {
+									$writer->write($control);
+				} else if($control instanceof TControl) {
+									$control->renderControl($writer);
+				} else if($control instanceof IRenderable) {
+									$control->render($writer);
+				}
 			}
 		}
 	}
@@ -5322,15 +5629,16 @@ 
 			{
 				$this->_rf[self::RF_CONTROLSTATE]=&$state[1];
 				unset($state[1]);
+			} else {
+							unset($this->_rf[self::RF_CONTROLSTATE]);
 			}
-			else
-				unset($this->_rf[self::RF_CONTROLSTATE]);
 			if($needViewState)
 			{
-				if(isset($state[0]))
-					$this->_viewState=&$state[0];
-				else
-					$this->_viewState=array();
+				if(isset($state[0])) {
+									$this->_viewState=&$state[0];
+				} else {
+									$this->_viewState=array();
+				}
 			}
 			unset($state[0]);
 			if($this->getHasControls())
@@ -5347,35 +5655,41 @@ 
 					}
 				}
 			}
-			if(!empty($state))
-				$this->_rf[self::RF_CHILD_STATE]=&$state;
+			if(!empty($state)) {
+							$this->_rf[self::RF_CHILD_STATE]=&$state;
+			}
 		}
 		$this->_stage=self::CS_STATE_LOADED;
-		if(isset($this->_rf[self::RF_ADAPTER]))
-			$this->_rf[self::RF_ADAPTER]->loadState();
-		else
-			$this->loadState();
+		if(isset($this->_rf[self::RF_ADAPTER])) {
+					$this->_rf[self::RF_ADAPTER]->loadState();
+		} else {
+					$this->loadState();
+		}
 	}
 	protected function &saveStateRecursive($needViewState=true)
 	{
-		if(isset($this->_rf[self::RF_ADAPTER]))
-			$this->_rf[self::RF_ADAPTER]->saveState();
-		else
-			$this->saveState();
+		if(isset($this->_rf[self::RF_ADAPTER])) {
+					$this->_rf[self::RF_ADAPTER]->saveState();
+		} else {
+					$this->saveState();
+		}
 		$needViewState=($needViewState && !($this->_flags & self::IS_DISABLE_VIEWSTATE));
 		$state=array();
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
-					$state[$control->_id]=&$control->saveStateRecursive($needViewState);
+				if($control instanceof TControl) {
+									$state[$control->_id]=&$control->saveStateRecursive($needViewState);
+				}
 			}
 		}
-		if($needViewState && !empty($this->_viewState))
-			$state[0]=&$this->_viewState;
-		if(isset($this->_rf[self::RF_CONTROLSTATE]))
-			$state[1]=&$this->_rf[self::RF_CONTROLSTATE];
+		if($needViewState && !empty($this->_viewState)) {
+					$state[0]=&$this->_viewState;
+		}
+		if(isset($this->_rf[self::RF_CONTROLSTATE])) {
+					$state[1]=&$this->_rf[self::RF_CONTROLSTATE];
+		}
 		return $state;
 	}
 	public function applyStyleSheetSkin($page)
@@ -5384,25 +5698,27 @@ 
 		{
 			$page->applyControlStyleSheet($this);
 			$this->_flags |= self::IS_STYLESHEET_APPLIED;
+		} else if($this->_flags & self::IS_STYLESHEET_APPLIED) {
+					throw new TInvalidOperationException('control_stylesheet_applied',get_class($this));
 		}
-		else if($this->_flags & self::IS_STYLESHEET_APPLIED)
-			throw new TInvalidOperationException('control_stylesheet_applied',get_class($this));
 	}
 	private function clearCachedUniqueID($recursive)
 	{
 		if($recursive && $this->_uid!==null && isset($this->_rf[self::RF_CONTROLS]))
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof TControl)
+			foreach($this->_rf[self::RF_CONTROLS] as $control) {
+							if($control instanceof TControl)
 					$control->clearCachedUniqueID($recursive);
+			}
 		}
 		$this->_uid=null;
 	}
 	private function generateAutomaticID()
 	{
 		$this->_flags &= ~self::IS_ID_SET;
-		if(!isset($this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]))
-			$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]=0;
+		if(!isset($this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID])) {
+					$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]=0;
+		}
 		$id=$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]++;
 		$this->_id=self::AUTOMATIC_ID_PREFIX . $id;
 		$this->_namingContainer->clearNameTable();
@@ -5419,13 +5735,15 @@ 
 			{
 				if($control->_id!=='')
 				{
-					if(isset($container->_rf[self::RF_NAMED_CONTROLS][$control->_id]))
-						throw new TInvalidDataValueException('control_id_nonunique',get_class($control),$control->_id);
-					else
-						$container->_rf[self::RF_NAMED_CONTROLS][$control->_id]=$control;
+					if(isset($container->_rf[self::RF_NAMED_CONTROLS][$control->_id])) {
+											throw new TInvalidDataValueException('control_id_nonunique',get_class($control),$control->_id);
+					} else {
+											$container->_rf[self::RF_NAMED_CONTROLS][$control->_id]=$control;
+					}
+				}
+				if(!($control instanceof INamingContainer) && $control->getHasControls()) {
+									$this->fillNameTable($container,$control->_rf[self::RF_CONTROLS]);
 				}
-				if(!($control instanceof INamingContainer) && $control->getHasControls())
-					$this->fillNameTable($container,$control->_rf[self::RF_CONTROLS]);
 			}
 		}
 	}
@@ -5448,24 +5766,26 @@ 
 		{
 			parent::insertAt($index,$item);
 			$this->_o->addedControl($item);
+		} else if(is_string($item) || ($item instanceof IRenderable)) {
+					parent::insertAt($index,$item);
+		} else {
+					throw new TInvalidDataTypeException('controlcollection_control_required');
 		}
-		else if(is_string($item) || ($item instanceof IRenderable))
-			parent::insertAt($index,$item);
-		else
-			throw new TInvalidDataTypeException('controlcollection_control_required');
 	}
 	public function removeAt($index)
 	{
 		$item=parent::removeAt($index);
-		if($item instanceof TControl)
-			$this->_o->removedControl($item);
+		if($item instanceof TControl) {
+					$this->_o->removedControl($item);
+		}
 		return $item;
 	}
 	public function clear()
 	{
 		parent::clear();
-		if($this->_o instanceof INamingContainer)
-			$this->_o->clearNamingContainer();
+		if($this->_o instanceof INamingContainer) {
+					$this->_o->clearNamingContainer();
+		}
 	}
 }
 class TEmptyControlCollection extends TControlCollection
@@ -5476,7 +5796,10 @@ 
 	}
 	public function insertAt($index,$item)
 	{
-		if(!is_string($item))  			parent::insertAt($index,$item);  	}
+		if(!is_string($item)) {
+			parent::insertAt($index,$item);
+		}
+		}
 }
 interface INamingContainer
 {
@@ -5602,16 +5925,17 @@ 
 		{
 			if(is_array($item))
 			{
-				if($item[0]===self::TYPE_EXPRESSION)
-					$this->_expressions[$id]=$item[1];
-				else if($item[0]===self::TYPE_STATEMENTS)
-					$this->_statements[$id]=$item[1];
-				else if($item[0]===self::TYPE_DATABINDING)
-					$this->_bindings[$id]=$item[1];
+				if($item[0]===self::TYPE_EXPRESSION) {
+									$this->_expressions[$id]=$item[1];
+				} else if($item[0]===self::TYPE_STATEMENTS) {
+									$this->_statements[$id]=$item[1];
+				} else if($item[0]===self::TYPE_DATABINDING) {
+									$this->_bindings[$id]=$item[1];
+				}
 				$this->_items[$id]='';
+			} else {
+							$this->_items[$id]=$item;
 			}
-			else
-				$this->_items[$id]=$item;
 		}
 	}
 	public function getContainer()
@@ -5625,16 +5949,19 @@ 
 	public function evaluateDynamicContent()
 	{
 		$context=$this->_container===null?$this:$this->_container;
-		foreach($this->_expressions as $id=>$expression)
-			$this->_items[$id]=$context->evaluateExpression($expression);
-		foreach($this->_statements as $id=>$statement)
-			$this->_items[$id]=$context->evaluateStatements($statement);
+		foreach($this->_expressions as $id=>$expression) {
+					$this->_items[$id]=$context->evaluateExpression($expression);
+		}
+		foreach($this->_statements as $id=>$statement) {
+					$this->_items[$id]=$context->evaluateStatements($statement);
+		}
 	}
 	public function dataBind()
 	{
 		$context=$this->_container===null?$this:$this->_container;
-		foreach($this->_bindings as $id=>$binding)
-			$this->_items[$id]=$context->evaluateExpression($binding);
+		foreach($this->_bindings as $id=>$binding) {
+					$this->_items[$id]=$context->evaluateExpression($binding);
+		}
 	}
 	public function render($writer)
 	{
@@ -5665,10 +5992,11 @@ 
 	public function setBold($value)
 	{
 		$this->_flags |= self::IS_SET_BOLD;
-		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_BOLD;
-		else
-			$this->_flags &= ~self::IS_BOLD;
+		if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags |= self::IS_BOLD;
+		} else {
+					$this->_flags &= ~self::IS_BOLD;
+		}
 	}
 	public function getItalic()
 	{
@@ -5677,10 +6005,11 @@ 
 	public function setItalic($value)
 	{
 		$this->_flags |= self::IS_SET_ITALIC;
-		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_ITALIC;
-		else
-			$this->_flags &= ~self::IS_ITALIC;
+		if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags |= self::IS_ITALIC;
+		} else {
+					$this->_flags &= ~self::IS_ITALIC;
+		}
 	}
 	public function getOverline()
 	{
@@ -5689,10 +6018,11 @@ 
 	public function setOverline($value)
 	{
 		$this->_flags |= self::IS_SET_OVERLINE;
-		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_OVERLINE;
-		else
-			$this->_flags &= ~self::IS_OVERLINE;
+		if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags |= self::IS_OVERLINE;
+		} else {
+					$this->_flags &= ~self::IS_OVERLINE;
+		}
 	}
 	public function getSize()
 	{
@@ -5710,10 +6040,11 @@ 
 	public function setStrikeout($value)
 	{
 		$this->_flags |= self::IS_SET_STRIKEOUT;
-		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_STRIKEOUT;
-		else
-			$this->_flags &= ~self::IS_STRIKEOUT;
+		if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags |= self::IS_STRIKEOUT;
+		} else {
+					$this->_flags &= ~self::IS_STRIKEOUT;
+		}
 	}
 	public function getUnderline()
 	{
@@ -5722,10 +6053,11 @@ 
 	public function setUnderline($value)
 	{
 		$this->_flags |= self::IS_SET_UNDERLINE;
-		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_UNDERLINE;
-		else
-			$this->_flags &= ~self::IS_UNDERLINE;
+		if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags |= self::IS_UNDERLINE;
+		} else {
+					$this->_flags &= ~self::IS_UNDERLINE;
+		}
 	}
 	public function getName()
 	{
@@ -5748,89 +6080,123 @@ 
 	}
 	public function mergeWith($font)
 	{
-		if($font===null || $font->_flags===0)
-			return;
-		if(!($this->_flags & self::IS_SET_BOLD) && ($font->_flags & self::IS_SET_BOLD))
-			$this->setBold($font->getBold());
-		if(!($this->_flags & self::IS_SET_ITALIC) && ($font->_flags & self::IS_SET_ITALIC))
-			$this->setItalic($font->getItalic());
-		if(!($this->_flags & self::IS_SET_OVERLINE) && ($font->_flags & self::IS_SET_OVERLINE))
-			$this->setOverline($font->getOverline());
-		if(!($this->_flags & self::IS_SET_STRIKEOUT) && ($font->_flags & self::IS_SET_STRIKEOUT))
-			$this->setStrikeout($font->getStrikeout());
-		if(!($this->_flags & self::IS_SET_UNDERLINE) && ($font->_flags & self::IS_SET_UNDERLINE))
-			$this->setUnderline($font->getUnderline());
-		if(!($this->_flags & self::IS_SET_SIZE) && ($font->_flags & self::IS_SET_SIZE))
-			$this->setSize($font->getSize());
-		if(!($this->_flags & self::IS_SET_NAME) && ($font->_flags & self::IS_SET_NAME))
-			$this->setName($font->getName());
+		if($font===null || $font->_flags===0) {
+					return;
+		}
+		if(!($this->_flags & self::IS_SET_BOLD) && ($font->_flags & self::IS_SET_BOLD)) {
+					$this->setBold($font->getBold());
+		}
+		if(!($this->_flags & self::IS_SET_ITALIC) && ($font->_flags & self::IS_SET_ITALIC)) {
+					$this->setItalic($font->getItalic());
+		}
+		if(!($this->_flags & self::IS_SET_OVERLINE) && ($font->_flags & self::IS_SET_OVERLINE)) {
+					$this->setOverline($font->getOverline());
+		}
+		if(!($this->_flags & self::IS_SET_STRIKEOUT) && ($font->_flags & self::IS_SET_STRIKEOUT)) {
+					$this->setStrikeout($font->getStrikeout());
+		}
+		if(!($this->_flags & self::IS_SET_UNDERLINE) && ($font->_flags & self::IS_SET_UNDERLINE)) {
+					$this->setUnderline($font->getUnderline());
+		}
+		if(!($this->_flags & self::IS_SET_SIZE) && ($font->_flags & self::IS_SET_SIZE)) {
+					$this->setSize($font->getSize());
+		}
+		if(!($this->_flags & self::IS_SET_NAME) && ($font->_flags & self::IS_SET_NAME)) {
+					$this->setName($font->getName());
+		}
 	}
 	public function copyFrom($font)
 	{
-		if($font===null || $font->_flags===0)
-			return;
-		if($font->_flags & self::IS_SET_BOLD)
-			$this->setBold($font->getBold());
-		if($font->_flags & self::IS_SET_ITALIC)
-			$this->setItalic($font->getItalic());
-		if($font->_flags & self::IS_SET_OVERLINE)
-			$this->setOverline($font->getOverline());
-		if($font->_flags & self::IS_SET_STRIKEOUT)
-			$this->setStrikeout($font->getStrikeout());
-		if($font->_flags & self::IS_SET_UNDERLINE)
-			$this->setUnderline($font->getUnderline());
-		if($font->_flags & self::IS_SET_SIZE)
-			$this->setSize($font->getSize());
-		if($font->_flags & self::IS_SET_NAME)
-			$this->setName($font->getName());
+		if($font===null || $font->_flags===0) {
+					return;
+		}
+		if($font->_flags & self::IS_SET_BOLD) {
+					$this->setBold($font->getBold());
+		}
+		if($font->_flags & self::IS_SET_ITALIC) {
+					$this->setItalic($font->getItalic());
+		}
+		if($font->_flags & self::IS_SET_OVERLINE) {
+					$this->setOverline($font->getOverline());
+		}
+		if($font->_flags & self::IS_SET_STRIKEOUT) {
+					$this->setStrikeout($font->getStrikeout());
+		}
+		if($font->_flags & self::IS_SET_UNDERLINE) {
+					$this->setUnderline($font->getUnderline());
+		}
+		if($font->_flags & self::IS_SET_SIZE) {
+					$this->setSize($font->getSize());
+		}
+		if($font->_flags & self::IS_SET_NAME) {
+					$this->setName($font->getName());
+		}
 	}
 	public function toString()
 	{
-		if($this->_flags===0)
-			return '';
+		if($this->_flags===0) {
+					return '';
+		}
 		$str='';
-		if($this->_flags & self::IS_SET_BOLD)
-			$str.='font-weight:'.(($this->_flags & self::IS_BOLD)?'bold;':'normal;');
-		if($this->_flags & self::IS_SET_ITALIC)
-			$str.='font-style:'.(($this->_flags & self::IS_ITALIC)?'italic;':'normal;');
+		if($this->_flags & self::IS_SET_BOLD) {
+					$str.='font-weight:'.(($this->_flags & self::IS_BOLD)?'bold;':'normal;');
+		}
+		if($this->_flags & self::IS_SET_ITALIC) {
+					$str.='font-style:'.(($this->_flags & self::IS_ITALIC)?'italic;':'normal;');
+		}
 		$textDec='';
-		if($this->_flags & self::IS_UNDERLINE)
-			$textDec.='underline';
-		if($this->_flags & self::IS_OVERLINE)
-			$textDec.=' overline';
-		if($this->_flags & self::IS_STRIKEOUT)
-			$textDec.=' line-through';
+		if($this->_flags & self::IS_UNDERLINE) {
+					$textDec.='underline';
+		}
+		if($this->_flags & self::IS_OVERLINE) {
+					$textDec.=' overline';
+		}
+		if($this->_flags & self::IS_STRIKEOUT) {
+					$textDec.=' line-through';
+		}
 		$textDec=ltrim($textDec);
-		if($textDec!=='')
-			$str.='text-decoration:'.$textDec.';';
-		if($this->_size!=='')
-			$str.='font-size:'.$this->_size.';';
-		if($this->_name!=='')
-			$str.='font-family:'.$this->_name.';';
+		if($textDec!=='') {
+					$str.='text-decoration:'.$textDec.';';
+		}
+		if($this->_size!=='') {
+					$str.='font-size:'.$this->_size.';';
+		}
+		if($this->_name!=='') {
+					$str.='font-family:'.$this->_name.';';
+		}
 		return $str;
 	}
 	public function addAttributesToRender($writer)
 	{
-		if($this->_flags===0)
-			return;
-		if($this->_flags & self::IS_SET_BOLD)
-			$writer->addStyleAttribute('font-weight',(($this->_flags & self::IS_BOLD)?'bold':'normal'));
-		if($this->_flags & self::IS_SET_ITALIC)
-			$writer->addStyleAttribute('font-style',(($this->_flags & self::IS_ITALIC)?'italic':'normal'));
+		if($this->_flags===0) {
+					return;
+		}
+		if($this->_flags & self::IS_SET_BOLD) {
+					$writer->addStyleAttribute('font-weight',(($this->_flags & self::IS_BOLD)?'bold':'normal'));
+		}
+		if($this->_flags & self::IS_SET_ITALIC) {
+					$writer->addStyleAttribute('font-style',(($this->_flags & self::IS_ITALIC)?'italic':'normal'));
+		}
 		$textDec='';
-		if($this->_flags & self::IS_UNDERLINE)
-			$textDec.='underline';
-		if($this->_flags & self::IS_OVERLINE)
-			$textDec.=' overline';
-		if($this->_flags & self::IS_STRIKEOUT)
-			$textDec.=' line-through';
+		if($this->_flags & self::IS_UNDERLINE) {
+					$textDec.='underline';
+		}
+		if($this->_flags & self::IS_OVERLINE) {
+					$textDec.=' overline';
+		}
+		if($this->_flags & self::IS_STRIKEOUT) {
+					$textDec.=' line-through';
+		}
 		$textDec=ltrim($textDec);
-		if($textDec!=='')
-			$writer->addStyleAttribute('text-decoration',$textDec);
-		if($this->_size!=='')
-			$writer->addStyleAttribute('font-size',$this->_size);
-		if($this->_name!=='')
-			$writer->addStyleAttribute('font-family',$this->_name);
+		if($textDec!=='') {
+					$writer->addStyleAttribute('text-decoration',$textDec);
+		}
+		if($this->_size!=='') {
+					$writer->addStyleAttribute('font-size',$this->_size);
+		}
+		if($this->_name!=='') {
+					$writer->addStyleAttribute('font-family',$this->_name);
+		}
 	}
 }
 class TStyle extends TComponent
@@ -5842,13 +6208,15 @@ 
 	private $_displayStyle='Fixed';
 	public function __construct($style=null)
 	{
-		if($style!==null)
-			$this->copyFrom($style);
+		if($style!==null) {
+					$this->copyFrom($style);
+		}
 	}
 	public function __clone()
 	{
-		if($this->_font!==null)
-			$this->_font = clone($this->_font);
+		if($this->_font!==null) {
+					$this->_font = clone($this->_font);
+		}
 	}
 	public function getBackColor()
 	{
@@ -5856,10 +6224,11 @@ 
 	}
 	public function setBackColor($value)
 	{
-		if(trim($value)==='')
-			unset($this->_fields['background-color']);
-		else
-			$this->_fields['background-color']=$value;
+		if(trim($value)==='') {
+					unset($this->_fields['background-color']);
+		} else {
+					$this->_fields['background-color']=$value;
+		}
 	}
 	public function getBorderColor()
 	{
@@ -5867,10 +6236,11 @@ 
 	}
 	public function setBorderColor($value)
 	{
-		if(trim($value)==='')
-			unset($this->_fields['border-color']);
-		else
-			$this->_fields['border-color']=$value;
+		if(trim($value)==='') {
+					unset($this->_fields['border-color']);
+		} else {
+					$this->_fields['border-color']=$value;
+		}
 	}
 	public function getBorderStyle()
 	{
@@ -5878,10 +6248,11 @@ 
 	}
 	public function setBorderStyle($value)
 	{
-		if(trim($value)==='')
-			unset($this->_fields['border-style']);
-		else
-			$this->_fields['border-style']=$value;
+		if(trim($value)==='') {
+					unset($this->_fields['border-style']);
+		} else {
+					$this->_fields['border-style']=$value;
+		}
 	}
 	public function getBorderWidth()
 	{
@@ -5889,10 +6260,11 @@ 
 	}
 	public function setBorderWidth($value)
 	{
-		if(trim($value)==='')
-			unset($this->_fields['border-width']);
-		else
-			$this->_fields['border-width']=$value;
+		if(trim($value)==='') {
+					unset($this->_fields['border-width']);
+		} else {
+					$this->_fields['border-width']=$value;
+		}
 	}
 	public function getCssClass()
 	{
@@ -5908,8 +6280,9 @@ 
 	}
 	public function getFont()
 	{
-		if($this->_font===null)
-			$this->_font=new TFont;
+		if($this->_font===null) {
+					$this->_font=new TFont;
+		}
 		return $this->_font;
 	}
 	public function hasFont()
@@ -5944,10 +6317,11 @@ 
 	}
 	public function setForeColor($value)
 	{
-		if(trim($value)==='')
-			unset($this->_fields['color']);
-		else
-			$this->_fields['color']=$value;
+		if(trim($value)==='') {
+					unset($this->_fields['color']);
+		} else {
+					$this->_fields['color']=$value;
+		}
 	}
 	public function getHeight()
 	{
@@ -5955,10 +6329,11 @@ 
 	}
 	public function setHeight($value)
 	{
-		if(trim($value)==='')
-			unset($this->_fields['height']);
-		else
-			$this->_fields['height']=$value;
+		if(trim($value)==='') {
+					unset($this->_fields['height']);
+		} else {
+					$this->_fields['height']=$value;
+		}
 	}
 	public function getCustomStyle()
 	{
@@ -6004,12 +6379,15 @@ 
 		if($style instanceof TStyle)
 		{
 			$this->_fields=array_merge($this->_fields,$style->_fields);
-			if($style->_class!==null)
-				$this->_class=$style->_class;
-			if($style->_customStyle!==null)
-				$this->_customStyle=$style->_customStyle;
-			if($style->_font!==null)
-				$this->getFont()->copyFrom($style->_font);
+			if($style->_class!==null) {
+							$this->_class=$style->_class;
+			}
+			if($style->_customStyle!==null) {
+							$this->_customStyle=$style->_customStyle;
+			}
+			if($style->_font!==null) {
+							$this->getFont()->copyFrom($style->_font);
+			}
 		}
 	}
 	public function mergeWith($style)
@@ -6017,12 +6395,15 @@ 
 		if($style instanceof TStyle)
 		{
 			$this->_fields=array_merge($style->_fields,$this->_fields);
-			if($this->_class===null)
-				$this->_class=$style->_class;
-			if($this->_customStyle===null)
-				$this->_customStyle=$style->_customStyle;
-			if($style->_font!==null)
-				$this->getFont()->mergeWith($style->_font);
+			if($this->_class===null) {
+							$this->_class=$style->_class;
+			}
+			if($this->_customStyle===null) {
+							$this->_customStyle=$style->_customStyle;
+			}
+			if($style->_font!==null) {
+							$this->getFont()->mergeWith($style->_font);
+			}
 		}
 	}
 	public function addAttributesToRender($writer)
@@ -6032,15 +6413,18 @@ 
 			foreach(explode(';',$this->_customStyle) as $style)
 			{
 				$arr=explode(':',$style,2);
-				if(isset($arr[1]) && trim($arr[0])!=='')
-					$writer->addStyleAttribute(trim($arr[0]),trim($arr[1]));
+				if(isset($arr[1]) && trim($arr[0])!=='') {
+									$writer->addStyleAttribute(trim($arr[0]),trim($arr[1]));
+				}
 			}
 		}
 		$writer->addStyleAttributes($this->_fields);
-		if($this->_font!==null)
-			$this->_font->addAttributesToRender($writer);
-		if($this->_class!==null)
-			$writer->addAttribute('class',$this->_class);
+		if($this->_font!==null) {
+					$this->_font->addAttributesToRender($writer);
+		}
+		if($this->_class!==null) {
+					$writer->addAttribute('class',$this->_class);
+		}
 	}
 	public function getStyleFields()
 	{
@@ -6076,18 +6460,24 @@ 
 		parent::copyFrom($style);
 		if($style instanceof TTableStyle)
 		{
-			if($style->_backImageUrl!==null)
-				$this->_backImageUrl=$style->_backImageUrl;
-			if($style->_horizontalAlign!==null)
-				$this->_horizontalAlign=$style->_horizontalAlign;
-			if($style->_cellPadding!==null)
-				$this->_cellPadding=$style->_cellPadding;
-			if($style->_cellSpacing!==null)
-				$this->_cellSpacing=$style->_cellSpacing;
-			if($style->_gridLines!==null)
-				$this->_gridLines=$style->_gridLines;
-			if($style->_borderCollapse!==null)
-				$this->_borderCollapse=$style->_borderCollapse;
+			if($style->_backImageUrl!==null) {
+							$this->_backImageUrl=$style->_backImageUrl;
+			}
+			if($style->_horizontalAlign!==null) {
+							$this->_horizontalAlign=$style->_horizontalAlign;
+			}
+			if($style->_cellPadding!==null) {
+							$this->_cellPadding=$style->_cellPadding;
+			}
+			if($style->_cellSpacing!==null) {
+							$this->_cellSpacing=$style->_cellSpacing;
+			}
+			if($style->_gridLines!==null) {
+							$this->_gridLines=$style->_gridLines;
+			}
+			if($style->_borderCollapse!==null) {
+							$this->_borderCollapse=$style->_borderCollapse;
+			}
 		}
 	}
 	public function mergeWith($style)
@@ -6095,32 +6485,43 @@ 
 		parent::mergeWith($style);
 		if($style instanceof TTableStyle)
 		{
-			if($this->_backImageUrl===null && $style->_backImageUrl!==null)
-				$this->_backImageUrl=$style->_backImageUrl;
-			if($this->_horizontalAlign===null && $style->_horizontalAlign!==null)
-				$this->_horizontalAlign=$style->_horizontalAlign;
-			if($this->_cellPadding===null && $style->_cellPadding!==null)
-				$this->_cellPadding=$style->_cellPadding;
-			if($this->_cellSpacing===null && $style->_cellSpacing!==null)
-				$this->_cellSpacing=$style->_cellSpacing;
-			if($this->_gridLines===null && $style->_gridLines!==null)
-				$this->_gridLines=$style->_gridLines;
-			if($this->_borderCollapse===null && $style->_borderCollapse!==null)
-				$this->_borderCollapse=$style->_borderCollapse;
+			if($this->_backImageUrl===null && $style->_backImageUrl!==null) {
+							$this->_backImageUrl=$style->_backImageUrl;
+			}
+			if($this->_horizontalAlign===null && $style->_horizontalAlign!==null) {
+							$this->_horizontalAlign=$style->_horizontalAlign;
+			}
+			if($this->_cellPadding===null && $style->_cellPadding!==null) {
+							$this->_cellPadding=$style->_cellPadding;
+			}
+			if($this->_cellSpacing===null && $style->_cellSpacing!==null) {
+							$this->_cellSpacing=$style->_cellSpacing;
+			}
+			if($this->_gridLines===null && $style->_gridLines!==null) {
+							$this->_gridLines=$style->_gridLines;
+			}
+			if($this->_borderCollapse===null && $style->_borderCollapse!==null) {
+							$this->_borderCollapse=$style->_borderCollapse;
+			}
 		}
 	}
 	public function addAttributesToRender($writer)
 	{
-		if(($url=trim($this->getBackImageUrl()))!=='')
-			$writer->addStyleAttribute('background-image','url('.$url.')');
-		if(($horizontalAlign=$this->getHorizontalAlign())!==THorizontalAlign::NotSet)
-			$writer->addStyleAttribute('text-align',strtolower($horizontalAlign));
-		if(($cellPadding=$this->getCellPadding())>=0)
-			$writer->addAttribute('cellpadding',"$cellPadding");
-		if(($cellSpacing=$this->getCellSpacing())>=0)
-			$writer->addAttribute('cellspacing',"$cellSpacing");
-		if($this->getBorderCollapse())
-			$writer->addStyleAttribute('border-collapse','collapse');
+		if(($url=trim($this->getBackImageUrl()))!=='') {
+					$writer->addStyleAttribute('background-image','url('.$url.')');
+		}
+		if(($horizontalAlign=$this->getHorizontalAlign())!==THorizontalAlign::NotSet) {
+					$writer->addStyleAttribute('text-align',strtolower($horizontalAlign));
+		}
+		if(($cellPadding=$this->getCellPadding())>=0) {
+					$writer->addAttribute('cellpadding',"$cellPadding");
+		}
+		if(($cellSpacing=$this->getCellSpacing())>=0) {
+					$writer->addAttribute('cellspacing',"$cellSpacing");
+		}
+		if($this->getBorderCollapse()) {
+					$writer->addStyleAttribute('border-collapse','collapse');
+		}
 		switch($this->getGridLines())
 		{
 			case TTableGridLines::Horizontal : $writer->addAttribute('rules','rows'); break;
@@ -6151,8 +6552,9 @@ 
 	}
 	public function setCellPadding($value)
 	{
-		if(($this->_cellPadding=TPropertyValue::ensureInteger($value))<-1)
-			throw new TInvalidDataValueException('tablestyle_cellpadding_invalid');
+		if(($this->_cellPadding=TPropertyValue::ensureInteger($value))<-1) {
+					throw new TInvalidDataValueException('tablestyle_cellpadding_invalid');
+		}
 	}
 	public function getCellSpacing()
 	{
@@ -6160,8 +6562,9 @@ 
 	}
 	public function setCellSpacing($value)
 	{
-		if(($this->_cellSpacing=TPropertyValue::ensureInteger($value))<-1)
-			throw new TInvalidDataValueException('tablestyle_cellspacing_invalid');
+		if(($this->_cellSpacing=TPropertyValue::ensureInteger($value))<-1) {
+					throw new TInvalidDataValueException('tablestyle_cellspacing_invalid');
+		}
 	}
 	public function getGridLines()
 	{
@@ -6197,12 +6600,15 @@ 
 		parent::copyFrom($style);
 		if($style instanceof TTableItemStyle)
 		{
-			if($this->_verticalAlign===null && $style->_verticalAlign!==null)
-				$this->_verticalAlign=$style->_verticalAlign;
-			if($this->_horizontalAlign===null && $style->_horizontalAlign!==null)
-				$this->_horizontalAlign=$style->_horizontalAlign;
-			if($this->_wrap===null && $style->_wrap!==null)
-				$this->_wrap=$style->_wrap;
+			if($this->_verticalAlign===null && $style->_verticalAlign!==null) {
+							$this->_verticalAlign=$style->_verticalAlign;
+			}
+			if($this->_horizontalAlign===null && $style->_horizontalAlign!==null) {
+							$this->_horizontalAlign=$style->_horizontalAlign;
+			}
+			if($this->_wrap===null && $style->_wrap!==null) {
+							$this->_wrap=$style->_wrap;
+			}
 		}
 	}
 	public function mergeWith($style)
@@ -6210,22 +6616,28 @@ 
 		parent::mergeWith($style);
 		if($style instanceof TTableItemStyle)
 		{
-			if($style->_verticalAlign!==null)
-				$this->_verticalAlign=$style->_verticalAlign;
-			if($style->_horizontalAlign!==null)
-				$this->_horizontalAlign=$style->_horizontalAlign;
-			if($style->_wrap!==null)
-				$this->_wrap=$style->_wrap;
+			if($style->_verticalAlign!==null) {
+							$this->_verticalAlign=$style->_verticalAlign;
+			}
+			if($style->_horizontalAlign!==null) {
+							$this->_horizontalAlign=$style->_horizontalAlign;
+			}
+			if($style->_wrap!==null) {
+							$this->_wrap=$style->_wrap;
+			}
 		}
 	}
 	public function addAttributesToRender($writer)
 	{
-		if(!$this->getWrap())
-			$writer->addStyleAttribute('white-space','nowrap');
-		if(($horizontalAlign=$this->getHorizontalAlign())!==THorizontalAlign::NotSet)
-			$writer->addAttribute('align',strtolower($horizontalAlign));
-		if(($verticalAlign=$this->getVerticalAlign())!==TVerticalAlign::NotSet)
-			$writer->addAttribute('valign',strtolower($verticalAlign));
+		if(!$this->getWrap()) {
+					$writer->addStyleAttribute('white-space','nowrap');
+		}
+		if(($horizontalAlign=$this->getHorizontalAlign())!==THorizontalAlign::NotSet) {
+					$writer->addAttribute('align',strtolower($horizontalAlign));
+		}
+		if(($verticalAlign=$this->getVerticalAlign())!==TVerticalAlign::NotSet) {
+					$writer->addAttribute('valign',strtolower($verticalAlign));
+		}
 		parent::addAttributesToRender($writer);
 	}
 	public function getHorizontalAlign()
@@ -6326,75 +6738,86 @@ 
 		return $this->_pretagtext;
 	}
 	public function setPreTagText($value) {
-		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
-			$this->_pretagtext = TPropertyValue::ensureString($value);
+		if(!$this->_internalonly && !$this->_control->getIsSkinApplied()) {
+					$this->_pretagtext = TPropertyValue::ensureString($value);
+		}
 	}
 	public function getPreContentsText() {
 		return $this->_precontentstext;
 	}
 	public function setPreContentsText($value) {
-		if(!$this->_control->getIsSkinApplied())
-			$this->_precontentstext = TPropertyValue::ensureString($value);
+		if(!$this->_control->getIsSkinApplied()) {
+					$this->_precontentstext = TPropertyValue::ensureString($value);
+		}
 	}
 	public function getPostContentsText() {
 		return $this->_postcontentstext;
 	}
 	public function setPostContentsText($value) {
-		if(!$this->_control->getIsSkinApplied())
-			$this->_postcontentstext = TPropertyValue::ensureString($value);
+		if(!$this->_control->getIsSkinApplied()) {
+					$this->_postcontentstext = TPropertyValue::ensureString($value);
+		}
 	}
 	public function getPostTagText() {
 		return $this->_posttagtext;
 	}
 	public function setPostTagText($value) {
-		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
-			$this->_posttagtext = TPropertyValue::ensureString($value);
+		if(!$this->_internalonly && !$this->_control->getIsSkinApplied()) {
+					$this->_posttagtext = TPropertyValue::ensureString($value);
+		}
 	}
 	public function getPreTagTemplate() {
 		return $this->_pretagtemplate;
 	}
 	public function setPreTagTemplate($value) {
-		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
-			$this->_pretagtemplate = $value;
+		if(!$this->_internalonly && !$this->_control->getIsSkinApplied()) {
+					$this->_pretagtemplate = $value;
+		}
 	}
 	public function getPreContentsTemplate() {
 		return $this->_precontentstemplate;
 	}
 	public function setPreContentsTemplate($value) {
-		if(!$this->_control->getIsSkinApplied())
-			$this->_precontentstemplate = $value;
+		if(!$this->_control->getIsSkinApplied()) {
+					$this->_precontentstemplate = $value;
+		}
 	}
 	public function getPostContentsTemplate() {
 		return $this->_postcontentstemplate;
 	}
 	public function setPostContentsTemplate($value) {
-		if(!$this->_control->getIsSkinApplied())
-			$this->_postcontentstemplate = $value;
+		if(!$this->_control->getIsSkinApplied()) {
+					$this->_postcontentstemplate = $value;
+		}
 	}
 	public function getPostTagTemplate() {
 		return $this->_posttagtemplate;
 	}
 	public function setPostTagTemplate($value) {
-		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
-			$this->_posttagtemplate = $value;
+		if(!$this->_internalonly && !$this->_control->getIsSkinApplied()) {
+					$this->_posttagtemplate = $value;
+		}
 	}
 	public function instantiate($outercontrol = null) {
 		if($this->getPreTagTemplate() || $this->getPreContentsTemplate() ||
 			$this->getPostContentsTemplate() || $this->getPostTagTemplate()) {
 			$this->_outercontrol = $outercontrol;
-			if($this->getUseState())
-				$this->ensureTemplateDecoration();
-			else
-				$this->_control->getPage()->onSaveStateComplete[] = array($this, 'ensureTemplateDecoration');
+			if($this->getUseState()) {
+							$this->ensureTemplateDecoration();
+			} else {
+							$this->_control->getPage()->onSaveStateComplete[] = array($this, 'ensureTemplateDecoration');
+			}
 		}
 	}
 	public function ensureTemplateDecoration($sender=null, $param=null) {
 		$control = $this->_control;
 		$outercontrol = $this->_outercontrol;
-		if($outercontrol === null)
-			$outercontrol = $control;
-		if($this->_addedTemplateDecoration)
-			return $this->_addedTemplateDecoration;
+		if($outercontrol === null) {
+					$outercontrol = $control;
+		}
+		if($this->_addedTemplateDecoration) {
+					return $this->_addedTemplateDecoration;
+		}
 		$this->_addedTemplateDecoration = true;
 		if($this->getPreContentsTemplate())
 		{
@@ -6408,8 +6831,9 @@ 
 			$this->getPostContentsTemplate()->instantiateIn($postcontents);
 			$control->getControls()->add($postcontents);
 		}
-		if(!$outercontrol->getParent())
-			return $this->_addedTemplateDecoration;
+		if(!$outercontrol->getParent()) {
+					return $this->_addedTemplateDecoration;
+		}
 		if($this->getPreTagTemplate())
 		{
 			$pretag = Prado::createComponent('TCompositeControl');
@@ -6451,8 +6875,9 @@ 
 	}
 	public function getDecorator($create=true)
 	{
-		if($create && !$this->_decorator)
-			$this->_decorator = Prado::createComponent('TWebControlDecorator', $this);
+		if($create && !$this->_decorator) {
+					$this->_decorator = Prado::createComponent('TWebControlDecorator', $this);
+		}
 		return $this->_decorator;
 	}
 	public function copyBaseAttributes(TWebControl $control)
@@ -6460,10 +6885,12 @@ 
 		$this->setAccessKey($control->getAccessKey());
 		$this->setToolTip($control->getToolTip());
 		$this->setTabIndex($control->getTabIndex());
-		if(!$control->getEnabled())
-			$this->setEnabled(false);
-		if($control->getHasAttributes())
-			$this->getAttributes()->copyFrom($control->getAttributes());
+		if(!$control->getEnabled()) {
+					$this->setEnabled(false);
+		}
+		if($control->getHasAttributes()) {
+					$this->getAttributes()->copyFrom($control->getAttributes());
+		}
 	}
 	public function getAccessKey()
 	{
@@ -6471,16 +6898,18 @@ 
 	}
 	public function setAccessKey($value)
 	{
-		if(strlen($value)>1)
-			throw new TInvalidDataValueException('webcontrol_accesskey_invalid',get_class($this),$value);
+		if(strlen($value)>1) {
+					throw new TInvalidDataValueException('webcontrol_accesskey_invalid',get_class($this),$value);
+		}
 		$this->setViewState('AccessKey',$value,'');
 	}
 	public function getBackColor()
 	{
-		if($style=$this->getViewState('Style',null))
-			return $style->getBackColor();
-		else
-			return '';
+		if($style=$this->getViewState('Style',null)) {
+					return $style->getBackColor();
+		} else {
+					return '';
+		}
 	}
 	public function setBackColor($value)
 	{
@@ -6488,10 +6917,11 @@ 
 	}
 	public function getBorderColor()
 	{
-		if($style=$this->getViewState('Style',null))
-			return $style->getBorderColor();
-		else
-			return '';
+		if($style=$this->getViewState('Style',null)) {
+					return $style->getBorderColor();
+		} else {
+					return '';
+		}
 	}
 	public function setBorderColor($value)
 	{
@@ -6499,10 +6929,11 @@ 
 	}
 	public function getBorderStyle()
 	{
-		if($style=$this->getViewState('Style',null))
-			return $style->getBorderStyle();
-		else
-			return '';
+		if($style=$this->getViewState('Style',null)) {
+					return $style->getBorderStyle();
+		} else {
+					return '';
+		}
 	}
 	public function setBorderStyle($value)
 	{
@@ -6510,10 +6941,11 @@ 
 	}
 	public function getBorderWidth()
 	{
-		if($style=$this->getViewState('Style',null))
-			return $style->getBorderWidth();
-		else
-			return '';
+		if($style=$this->getViewState('Style',null)) {
+					return $style->getBorderWidth();
+		} else {
+					return '';
+		}
 	}
 	public function setBorderWidth($value)
 	{
@@ -6525,10 +6957,11 @@ 
 	}
 	public function getForeColor()
 	{
-		if($style=$this->getViewState('Style',null))
-			return $style->getForeColor();
-		else
-			return '';
+		if($style=$this->getViewState('Style',null)) {
+					return $style->getForeColor();
+		} else {
+					return '';
+		}
 	}
 	public function setForeColor($value)
 	{
@@ -6536,10 +6969,11 @@ 
 	}
 	public function getHeight()
 	{
-		if($style=$this->getViewState('Style',null))
-			return $style->getHeight();
-		else
-			return '';
+		if($style=$this->getViewState('Style',null)) {
+					return $style->getHeight();
+		} else {
+					return '';
+		}
 	}
 	public function setDisplay($value)
 	{
@@ -6555,10 +6989,11 @@ 
 	}
 	public function getCssClass()
 	{
-		if($style=$this->getViewState('Style',null))
-			return $style->getCssClass();
-		else
-			return '';
+		if($style=$this->getViewState('Style',null)) {
+					return $style->getCssClass();
+		} else {
+					return '';
+		}
 	}
 	public function setHeight($value)
 	{
@@ -6574,9 +7009,9 @@ 
 	}
 	public function getStyle()
 	{
-		if($style=$this->getViewState('Style',null))
-			return $style;
-		else
+		if($style=$this->getViewState('Style',null)) {
+					return $style;
+		} else
 		{
 			$style=$this->createStyle();
 			$this->setViewState('Style',$style,null);
@@ -6585,10 +7020,11 @@ 
 	}
 	public function setStyle($value)
 	{
-		if(is_string($value))
-			$this->getStyle()->setCustomStyle($value);
-		else
-			throw new TInvalidDataValueException('webcontrol_style_invalid',get_class($this));
+		if(is_string($value)) {
+					$this->getStyle()->setCustomStyle($value);
+		} else {
+					throw new TInvalidDataValueException('webcontrol_style_invalid',get_class($this));
+		}
 	}
 	public function clearStyle()
 	{
@@ -6616,38 +7052,47 @@ 
 	}
 	public function getWidth()
 	{
-		if($style=$this->getViewState('Style',null))
-			return $style->getWidth();
-		else
-			return '';
+		if($style=$this->getViewState('Style',null)) {
+					return $style->getWidth();
+		} else {
+					return '';
+		}
 	}
 	public function setWidth($value)
 	{
 		$this->getStyle()->setWidth($value);
 	}
 	public function onPreRender($param) {
-		if($decorator = $this->getDecorator(false))
-			$decorator->instantiate();
+		if($decorator = $this->getDecorator(false)) {
+					$decorator->instantiate();
+		}
 		parent::onPreRender($param);
 	}
 	protected function addAttributesToRender($writer)
 	{
-		if($this->getID()!=='' || $this->getEnsureId())
-			$writer->addAttribute('id',$this->getClientID());
-		if(($accessKey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accessKey);
-		if(!$this->getEnabled())
-			$writer->addAttribute('disabled','disabled');
-		if(($tabIndex=$this->getTabIndex())>0)
-			$writer->addAttribute('tabindex',"$tabIndex");
-		if(($toolTip=$this->getToolTip())!=='')
-			$writer->addAttribute('title',$toolTip);
-		if($style=$this->getViewState('Style',null))
-			$style->addAttributesToRender($writer);
+		if($this->getID()!=='' || $this->getEnsureId()) {
+					$writer->addAttribute('id',$this->getClientID());
+		}
+		if(($accessKey=$this->getAccessKey())!=='') {
+					$writer->addAttribute('accesskey',$accessKey);
+		}
+		if(!$this->getEnabled()) {
+					$writer->addAttribute('disabled','disabled');
+		}
+		if(($tabIndex=$this->getTabIndex())>0) {
+					$writer->addAttribute('tabindex',"$tabIndex");
+		}
+		if(($toolTip=$this->getToolTip())!=='') {
+					$writer->addAttribute('title',$toolTip);
+		}
+		if($style=$this->getViewState('Style',null)) {
+					$style->addAttributesToRender($writer);
+		}
 		if($this->getHasAttributes())
 		{
-			foreach($this->getAttributes() as $name=>$value)
-				$writer->addAttribute($name,$value);
+			foreach($this->getAttributes() as $name=>$value) {
+							$writer->addAttribute($name,$value);
+			}
 		}
 	}
 	public function render($writer)
@@ -6678,8 +7123,9 @@ 
 			$decorator->renderPostContentsText($writer);
 			$writer->renderEndTag();
 			$decorator->renderPostTagText($writer);
-		} else
-			$writer->renderEndTag($writer);
+		} else {
+					$writer->renderEndTag($writer);
+		}
 	}
 }
 class TCompositeControl extends TControl implements INamingContainer
@@ -6704,12 +7150,13 @@ 
 		if($this->_localTemplate===null)
 		{
 			$class=get_class($this);
-			if(!isset(self::$_template[$class]))
-				self::$_template[$class]=$this->loadTemplate();
+			if(!isset(self::$_template[$class])) {
+							self::$_template[$class]=$this->loadTemplate();
+			}
 			return self::$_template[$class];
+		} else {
+					return $this->_localTemplate;
 		}
-		else
-			return $this->_localTemplate;
 	}
 	public function setTemplate($value)
 	{
@@ -6717,17 +7164,19 @@ 
 	}
 	public function getIsSourceTemplateControl()
 	{
-		if(($template=$this->getTemplate())!==null)
-			return $template->getIsSourceTemplate();
-		else
-			return false;
+		if(($template=$this->getTemplate())!==null) {
+					return $template->getIsSourceTemplate();
+		} else {
+					return false;
+		}
 	}
 	public function getTemplateDirectory()
 	{
-		if(($template=$this->getTemplate())!==null)
-			return $template->getContextPath();
-		else
-			return '';
+		if(($template=$this->getTemplate())!==null) {
+					return $template->getContextPath();
+		} else {
+					return '';
+		}
 	}
 	protected function loadTemplate()
 	{
@@ -6740,27 +7189,30 @@ 
 		{
 			foreach($tpl->getDirective() as $name=>$value)
 			{
-				if(is_string($value))
-					$this->setSubProperty($name,$value);
-				else
-					throw new TConfigurationException('templatecontrol_directive_invalid',get_class($this),$name);
+				if(is_string($value)) {
+									$this->setSubProperty($name,$value);
+				} else {
+									throw new TConfigurationException('templatecontrol_directive_invalid',get_class($this),$name);
+				}
 			}
 			$tpl->instantiateIn($this);
 		}
 	}
 	public function registerContent($id,TContent $object)
 	{
-		if(isset($this->_contents[$id]))
-			throw new TConfigurationException('templatecontrol_contentid_duplicated',$id);
-		else
-			$this->_contents[$id]=$object;
+		if(isset($this->_contents[$id])) {
+					throw new TConfigurationException('templatecontrol_contentid_duplicated',$id);
+		} else {
+					$this->_contents[$id]=$object;
+		}
 	}
 	public function registerContentPlaceHolder($id,TContentPlaceHolder $object)
 	{
-		if(isset($this->_placeholders[$id]))
-			throw new TConfigurationException('templatecontrol_placeholderid_duplicated',$id);
-		else
-			$this->_placeholders[$id]=$object;
+		if(isset($this->_placeholders[$id])) {
+					throw new TConfigurationException('templatecontrol_placeholderid_duplicated',$id);
+		} else {
+					$this->_placeholders[$id]=$object;
+		}
 	}
 	public function getMasterClass()
 	{
@@ -6782,9 +7234,9 @@ 
 			$controls=$placeholder->getParent()->getControls();
 			$loc=$controls->remove($placeholder);
 			$controls->insertAt($loc,$content);
+		} else {
+					throw new TConfigurationException('templatecontrol_placeholder_inexistent',$id);
 		}
-		else
-			throw new TConfigurationException('templatecontrol_placeholder_inexistent',$id);
 	}
 	protected function initRecursive($namingContainer=null)
 	{
@@ -6792,17 +7244,19 @@ 
 		if($this->_masterClass!=='')
 		{
 			$master=Prado::createComponent($this->_masterClass);
-			if(!($master instanceof TTemplateControl))
-				throw new TInvalidDataValueException('templatecontrol_mastercontrol_invalid');
+			if(!($master instanceof TTemplateControl)) {
+							throw new TInvalidDataValueException('templatecontrol_mastercontrol_invalid');
+			}
 			$this->_master=$master;
 			$this->getControls()->clear();
 			$this->getControls()->add($master);
 			$master->ensureChildControls();
-			foreach($this->_contents as $id=>$content)
-				$master->injectContent($id,$content);
+			foreach($this->_contents as $id=>$content) {
+							$master->injectContent($id,$content);
+			}
+		} else if(!empty($this->_contents)) {
+					throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
 		}
-		else if(!empty($this->_contents))
-			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
 		parent::initRecursive($namingContainer);
 	}
         public function tryToUpdateView($arObj, $throwExceptions = false)
@@ -6815,14 +7269,14 @@ 
                                 if ($key != "RELATIONS")
                                 {
                                         $control = $this->{$key};
-                                        if ($control instanceof TTextBox)
-                                                $control->Text = $arObj->{$key};
-                                        elseif ($control instanceof TCheckBox)
-                                                $control->Checked = (boolean) $arObj->{$key};
-                                        elseif ($control instanceof TDatePicker)
-                                                $control->Date = $arObj->{$key};
-                                }
-                                else
+                                        if ($control instanceof TTextBox) {
+                                                                                        $control->Text = $arObj->{$key};
+                                        } elseif ($control instanceof TCheckBox) {
+                                                                                        $control->Checked = (boolean) $arObj->{$key};
+                                        } elseif ($control instanceof TDatePicker) {
+                                                                                        $control->Date = $arObj->{$key};
+                                        }
+                                } else
                                 {
                                         foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
                                         {
@@ -6844,11 +7298,11 @@ 
                                         }
                                         break;
                                 }
-                        } 
-                        catch (Exception $ex)
+                        } catch (Exception $ex)
                         {
-                                if ($throwExceptions)
-                                        throw $ex;
+                                if ($throwExceptions) {
+                                                                        throw $ex;
+                                }
                         }
                 }
         }
@@ -6859,20 +7313,22 @@ 
                 {
                         try
                         {
-                                if ($key == "RELATIONS")
-                                        break;
+                                if ($key == "RELATIONS") {
+                                                                        break;
+                                }
                                 $control = $this->{$key};
-                                if ($control instanceof TTextBox)
-                                        $arObj->{$key} = $control->Text;
-                                elseif ($control instanceof TCheckBox)
-                                        $arObj->{$key} = $control->Checked;
-                                elseif ($control instanceof TDatePicker)
-                                        $arObj->{$key} = $control->Date;
-                        } 
-                        catch (Exception $ex)
+                                if ($control instanceof TTextBox) {
+                                                                        $arObj->{$key} = $control->Text;
+                                } elseif ($control instanceof TCheckBox) {
+                                                                        $arObj->{$key} = $control->Checked;
+                                } elseif ($control instanceof TDatePicker) {
+                                                                        $arObj->{$key} = $control->Date;
+                                }
+                        } catch (Exception $ex)
                         {
-                                if ($throwExceptions)
-                                        throw $ex;
+                                if ($throwExceptions) {
+                                                                        throw $ex;
+                                }
                         }
                 }
         }
@@ -6890,17 +7346,19 @@ 
 		$writer->addAttribute('method',$this->getMethod());
 		$uri=$this->getRequest()->getRequestURI();
 		$writer->addAttribute('action',str_replace('&','&amp;',str_replace('&amp;','&',$uri)));
-		if(($enctype=$this->getEnctype())!=='')
-			$writer->addAttribute('enctype',$enctype);
+		if(($enctype=$this->getEnctype())!=='') {
+					$writer->addAttribute('enctype',$enctype);
+		}
 		$attributes=$this->getAttributes();
 		$attributes->remove('action');
 		$writer->addAttributes($attributes);
 		if(($butt=$this->getDefaultButton())!=='')
 		{
-			if(($button=$this->findControl($butt))!==null)
-				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
-			else
-				throw new TInvalidDataValueException('form_defaultbutton_invalid',$butt);
+			if(($button=$this->findControl($butt))!==null) {
+							$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
+			} else {
+							throw new TInvalidDataValueException('form_defaultbutton_invalid',$butt);
+			}
 		}
 	}
 	public function render($writer)
@@ -6920,8 +7378,7 @@ 
  			$page->endFormRender($writer);
 			$cs->renderScriptFilesEnd($writer);
 			$cs->renderEndScripts($writer);
-		}
-		else
+		} else
 		{
 			$cs->renderHiddenFieldsBegin($writer);
 			$page->beginFormRender($writer);
@@ -7013,10 +7470,11 @@ 
 				self::$_pradoScripts = $deps;
 				self::$_pradoPackages = $packages;
 			}
-			if (isset(self::$_pradoScripts[$name]))
-				$this->_registeredPradoScripts[$name]=true;
-			else
-				throw new TInvalidOperationException('csmanager_pradoscript_invalid',$name);
+			if (isset(self::$_pradoScripts[$name])) {
+							$this->_registeredPradoScripts[$name]=true;
+			} else {
+							throw new TInvalidOperationException('csmanager_pradoscript_invalid',$name);
+			}
 			if(($packages=array_keys($this->_registeredPradoScripts))!==array())
 			{
 				$base = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
@@ -7027,22 +7485,25 @@ 
 				{
 					foreach (self::$_pradoScripts[$p] as $dep)
 					{
-						foreach (self::$_pradoPackages[$dep] as $script)
-						if (!isset($this->_expandedPradoScripts[$script]))
+						foreach (self::$_pradoPackages[$dep] as $script) {
+												if (!isset($this->_expandedPradoScripts[$script]))
 						{
 							$this->_expandedPradoScripts[$script] = true;
+						}
 							if($isDebug)
 							{
-								if (!in_array($url=$baseUrl.'/'.$script,$packagesUrl))
-									$packagesUrl[]=$url;
+								if (!in_array($url=$baseUrl.'/'.$script,$packagesUrl)) {
+																	$packagesUrl[]=$url;
+								}
 							} else {
 								if (!in_array($url=$baseUrl.'/min/'.$script,$packagesUrl))
 								{
 									if(!is_file($filePath=$path.'/min/'.$script))
 									{
 										$dirPath=dirname($filePath);
-										if(!is_dir($dirPath))
-											mkdir($dirPath, PRADO_CHMOD, true);
+										if(!is_dir($dirPath)) {
+																					mkdir($dirPath, PRADO_CHMOD, true);
+										}
 										file_put_contents($filePath, TJavaScript::JSMin(file_get_contents($base.'/'.$script)));
 										chmod($filePath, PRADO_CHMOD);
 									}
@@ -7052,8 +7513,9 @@ 
 						}
 					}
 				}
-				foreach($packagesUrl as $url)
-					$this->registerScriptFile($url,$url);
+				foreach($packagesUrl as $url) {
+									$this->registerScriptFile($url,$url);
+				}
 			}
 		}
 	}
@@ -7079,8 +7541,7 @@ 
 				$base = $dir;
 			}
 			return array($assets->getPublishedPath($base), $assets->publishFilePath($base));
-		}
-		else
+		} else
 		{
 			return array($assets->getBasePath().str_replace($assets->getBaseUrl(),'',$base), $base);
 		}
@@ -7110,8 +7571,9 @@ 
 		if($class === null) {
 			return;
 		}
-		if(!isset($options['FormID']) && ($form=$this->_page->getForm())!==null)
-			$options['FormID']=$form->getClientID();
+		if(!isset($options['FormID']) && ($form=$this->_page->getForm())!==null) {
+					$options['FormID']=$form->getClientID();
+		}
 		$optionString=TJavaScript::encode($options);
 		$code="new {$class}({$optionString});";
 		$this->_endScripts[sprintf('%08X', crc32($code))]=$code;
@@ -7122,9 +7584,9 @@ 
 	public function registerDefaultButton($panel, $button)
 	{
 		$panelID=is_string($panel)?$panel:$panel->getUniqueID();
-		if(is_string($button))
-			$buttonID=$button;
-		else
+		if(is_string($button)) {
+					$buttonID=$button;
+		} else
 		{
 			$button->setIsDefaultButton(true);
 			$buttonID=$button->getUniqueID();
@@ -7148,18 +7610,20 @@ 
 	public function registerFocusControl($target)
 	{
 		$this->registerPradoScriptInternal('jquery');
-		if($target instanceof TControl)
-			$target=$target->getClientID();
+		if($target instanceof TControl) {
+					$target=$target->getClientID();
+		}
 		$this->_endScripts['prado:focus'] = 'jQuery(\'#'.$target.'\').focus();';
 		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript','registerFocusControl',$params);
 	}
 	public function registerStyleSheetFile($key,$url,$media='')
 	{
-		if($media==='')
-			$this->_styleSheetFiles[$key]=$url;
-		else
-			$this->_styleSheetFiles[$key]=array($url,$media);
+		if($media==='') {
+					$this->_styleSheetFiles[$key]=$url;
+		} else {
+					$this->_styleSheetFiles[$key]=array($url,$media);
+		}
 		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript','registerStyleSheetFile',$params);
 	}
@@ -7176,9 +7640,10 @@ 
 				create_function('$e', 'return is_array($e) ? $e[0] : $e;'),
 				$this->_styleSheetFiles)
 		);
-		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path=>$url)
-			if (substr($url,strlen($url)-4)=='.css')
+		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path=>$url) {
+					if (substr($url,strlen($url)-4)=='.css')
 				$stylesheets[] = $url;
+		}
 		$stylesheets = array_unique($stylesheets);
 		return $stylesheets;
 	}
@@ -7270,17 +7735,19 @@ 
 		$str='';
 		foreach($this->_styleSheetFiles as $url)
 		{
-			if(is_array($url))
-				$str.="<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"".THttpUtility::htmlEncode($url[0])."\" />\n";
-			else
-				$str.="<link rel=\"stylesheet\" type=\"text/css\" href=\"".THttpUtility::htmlEncode($url)."\" />\n";
+			if(is_array($url)) {
+							$str.="<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"".THttpUtility::htmlEncode($url[0])."\" />\n";
+			} else {
+							$str.="<link rel=\"stylesheet\" type=\"text/css\" href=\"".THttpUtility::htmlEncode($url)."\" />\n";
+			}
 		}
 		$writer->write($str);
 	}
 	public function renderStyleSheets($writer)
 	{
-		if(count($this->_styleSheets))
-			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n".implode("\n",$this->_styleSheets)."\n/*]]>*/\n</style>\n");
+		if(count($this->_styleSheets)) {
+					$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n".implode("\n",$this->_styleSheets)."\n/*]]>*/\n</style>\n");
+		}
 	}
 	public function renderHeadScriptFiles($writer)
 	{
@@ -7358,25 +7825,30 @@ 
 	}
 	protected function renderHiddenFieldsInt($writer, $initial)
  	{
-		if ($initial) $this->_renderedHiddenFields = array();
+		if ($initial) {
+			$this->_renderedHiddenFields = array();
+		}
 		$str='';
 		foreach($this->_hiddenFields as $name=>$value)
 		{
-			if (in_array($name,$this->_renderedHiddenFields)) continue;
+			if (in_array($name,$this->_renderedHiddenFields)) {
+				continue;
+			}
 			$id=strtr($name,':','_');
 			if(is_array($value))
 			{
-				foreach($value as $v)
-					$str.='<input type="hidden" name="'.$name.'[]" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
-			}
-			else
+				foreach($value as $v) {
+									$str.='<input type="hidden" name="'.$name.'[]" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
+				}
+			} else
 			{
 				$str.='<input type="hidden" name="'.$name.'" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
 			}
 			$this->_renderedHiddenFields[] = $name;
 		}
-		if($str!=='')
-			$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
+		if($str!=='') {
+					$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
+		}
 	}
 	public function getHiddenFields()
 	{
@@ -7384,8 +7856,9 @@ 
 	}
 	protected function checkIfNotInRender()
 	{
-		if ($form = $this->_page->InFormRender)
-			throw new Exception('Operation invalid when page is already rendering');
+		if ($form = $this->_page->InFormRender) {
+					throw new Exception('Operation invalid when page is already rendering');
+		}
 	}
 }
 abstract class TClientSideOptions extends TComponent
@@ -7393,16 +7866,18 @@ 
 	private $_options;
 	protected function setFunction($name, $code)
 	{
-		if(!TJavaScript::isJsLiteral($code))
-			$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
+		if(!TJavaScript::isJsLiteral($code)) {
+					$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
+		}
 		$this->setOption($name, $code);
 	}
 	protected function getOption($name)
 	{
-		if ($this->_options)
-			return $this->_options->itemAt($name);
-		else
-			return null;
+		if ($this->_options) {
+					return $this->_options->itemAt($name);
+		} else {
+					return null;
+		}
 	}
 	protected function setOption($name, $value)
 	{
@@ -7410,8 +7885,9 @@ 
 	}
 	public function getOptions()
 	{
-		if (!$this->_options)
-			$this->_options = Prado::createComponent('System.Collections.TMap');
+		if (!$this->_options) {
+					$this->_options = Prado::createComponent('System.Collections.TMap');
+		}
 		return $this->_options;
 	}
 	protected function ensureFunction($javascript)
@@ -7474,13 +7950,14 @@ 
 		$this->determinePostBackMode();
 		if($this->getIsPostBack())
 		{
-			if($this->getIsCallback())
-				$this->processCallbackRequest($writer);
-			else
-				$this->processPostBackRequest($writer);
+			if($this->getIsCallback()) {
+							$this->processCallbackRequest($writer);
+			} else {
+							$this->processPostBackRequest($writer);
+			}
+		} else {
+					$this->processNormalRequest($writer);
 		}
-		else
-			$this->processNormalRequest($writer);
 		$this->_writer = null;
 	}
 	protected function processNormalRequest($writer)
@@ -7523,8 +8000,9 @@ 
 	{
 		if(is_array($data))
 		{
-			foreach($data as $k=>$v)
-				$data[$k]=self::decodeUTF8($v, $enc);
+			foreach($data as $k=>$v) {
+							$data[$k]=self::decodeUTF8($v, $enc);
+			}
 			return $data;
 		} elseif(is_string($data)) {
 			return iconv('UTF-8',$enc.'//IGNORE',$data);
@@ -7537,12 +8015,14 @@ 
 		Prado::using('System.Web.UI.ActiveControls.TActivePageAdapter');
 		$this->setAdapter(new TActivePageAdapter($this));
         $callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
-        if(strlen($callbackEventParameter) > 0)
-            $this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
+        if(strlen($callbackEventParameter) > 0) {
+                    $this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
+        }
                 if (($g=$this->getApplication()->getGlobalization(false))!==null &&
-            strtoupper($enc=$g->getCharset())!='UTF-8')
-                foreach ($this->_postData as $k=>$v)
+            strtoupper($enc=$g->getCharset())!='UTF-8') {
+                                foreach ($this->_postData as $k=>$v)
                 	$this->_postData[$k]=self::decodeUTF8($v, $enc);
+                }
 		$this->onPreInit(null);
 		$this->initRecursive();
 		$this->onInitComplete(null);
@@ -7564,10 +8044,11 @@ 
 	}
 	public function getCallbackClient()
 	{
-		if($this->getAdapter() !== null)
-			return $this->getAdapter()->getCallbackClientHandler();
-		else
-			return new TCallbackClientScript();
+		if($this->getAdapter() !== null) {
+					return $this->getAdapter()->getCallbackClientHandler();
+		} else {
+					return new TCallbackClientScript();
+		}
 	}
 	public function setCallbackClient($client)
 	{
@@ -7595,23 +8076,26 @@ 
 	}
 	public function setForm(TForm $form)
 	{
-		if($this->_form===null)
-			$this->_form=$form;
-		else
-			throw new TInvalidOperationException('page_form_duplicated');
+		if($this->_form===null) {
+					$this->_form=$form;
+		} else {
+					throw new TInvalidOperationException('page_form_duplicated');
+		}
 	}
 	public function getValidators($validationGroup=null)
 	{
-		if(!$this->_validators)
-			$this->_validators=new TList;
-		if(empty($validationGroup) === true)
-			return $this->_validators;
-		else
+		if(!$this->_validators) {
+					$this->_validators=new TList;
+		}
+		if(empty($validationGroup) === true) {
+					return $this->_validators;
+		} else
 		{
 			$list=new TList;
-			foreach($this->_validators as $validator)
-				if($validator->getValidationGroup()===$validationGroup)
+			foreach($this->_validators as $validator) {
+							if($validator->getValidationGroup()===$validationGroup)
 					$list->add($validator);
+			}
 			return $list;
 		}
 	}
@@ -7622,15 +8106,16 @@ 
 		{
 			if($validationGroup===null)
 			{
-				foreach($this->_validators as $validator)
-					$validator->validate();
-			}
-			else
+				foreach($this->_validators as $validator) {
+									$validator->validate();
+				}
+			} else
 			{
 				foreach($this->_validators as $validator)
 				{
-					if($validator->getValidationGroup()===$validationGroup)
-						$validator->validate();
+					if($validator->getValidationGroup()===$validationGroup) {
+											$validator->validate();
+					}
 				}
 			}
 		}
@@ -7641,19 +8126,21 @@ 
 		{
 			if($this->_validators && $this->_validators->getCount())
 			{
-				foreach($this->_validators as $validator)
-					if(!$validator->getIsValid())
+				foreach($this->_validators as $validator) {
+									if(!$validator->getIsValid())
 						return false;
+				}
 			}
 			return true;
+		} else {
+					throw new TInvalidOperationException('page_isvalid_unknown');
 		}
-		else
-			throw new TInvalidOperationException('page_isvalid_unknown');
 	}
 	public function getTheme()
 	{
-		if(is_string($this->_theme))
-			$this->_theme=$this->getService()->getThemeManager()->getTheme($this->_theme);
+		if(is_string($this->_theme)) {
+					$this->_theme=$this->getService()->getThemeManager()->getTheme($this->_theme);
+		}
 		return $this->_theme;
 	}
 	public function setTheme($value)
@@ -7662,8 +8149,9 @@ 
 	}
 	public function getStyleSheetTheme()
 	{
-		if(is_string($this->_styleSheet))
-			$this->_styleSheet=$this->getService()->getThemeManager()->getTheme($this->_styleSheet);
+		if(is_string($this->_styleSheet)) {
+					$this->_styleSheet=$this->getService()->getThemeManager()->getTheme($this->_styleSheet);
+		}
 		return $this->_styleSheet;
 	}
 	public function setStyleSheetTheme($value)
@@ -7672,23 +8160,27 @@ 
 	}
 	public function applyControlSkin($control)
 	{
-		if(($theme=$this->getTheme())!==null)
-			$theme->applySkin($control);
+		if(($theme=$this->getTheme())!==null) {
+					$theme->applySkin($control);
+		}
 	}
 	public function applyControlStyleSheet($control)
 	{
-		if(($theme=$this->getStyleSheetTheme())!==null)
-			$theme->applySkin($control);
+		if(($theme=$this->getStyleSheetTheme())!==null) {
+					$theme->applySkin($control);
+		}
 	}
 	public function getClientScript()
 	{
 		if(!$this->_clientScript) {
 			$className = $classPath = $this->getService()->getClientScriptManagerClass();
 			Prado::using($className);
-			if(($pos=strrpos($className,'.'))!==false)
-				$className=substr($className,$pos+1);
- 			if(!class_exists($className,false) || ($className!=='TClientScriptManager' && !is_subclass_of($className,'TClientScriptManager')))
-				throw new THttpException(404,'page_csmanagerclass_invalid',$classPath);
+			if(($pos=strrpos($className,'.'))!==false) {
+							$className=substr($className,$pos+1);
+			}
+ 			if(!class_exists($className,false) || ($className!=='TClientScriptManager' && !is_subclass_of($className,'TClientScriptManager'))) {
+ 							throw new THttpException(404,'page_csmanagerclass_invalid',$classPath);
+ 			}
 			$this->_clientScript=new $className($this);
 		}
 		return $this->_clientScript;
@@ -7716,29 +8208,35 @@ 
 		$theme=$this->getTheme();
 		if($theme instanceof ITheme)
 		{
-			foreach($theme->getStyleSheetFiles() as $url)
-				$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
-			foreach($theme->getJavaScriptFiles() as $url)
-				$cs->registerHeadScriptFile($url,$url);
+			foreach($theme->getStyleSheetFiles() as $url) {
+							$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
+			}
+			foreach($theme->getJavaScriptFiles() as $url) {
+							$cs->registerHeadScriptFile($url,$url);
+			}
 		}
 		$styleSheet=$this->getStyleSheetTheme();
 		if($styleSheet instanceof ITheme)
 		{
-			foreach($styleSheet->getStyleSheetFiles() as $url)
-				$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
-			foreach($styleSheet->getJavaScriptFiles() as $url)
-				$cs->registerHeadScriptFile($url,$url);
+			foreach($styleSheet->getStyleSheetFiles() as $url) {
+							$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
+			}
+			foreach($styleSheet->getJavaScriptFiles() as $url) {
+							$cs->registerHeadScriptFile($url,$url);
+			}
+		}
+		if($cs->getRequiresHead() && $this->getHead()===null) {
+					throw new TConfigurationException('page_head_required');
 		}
-		if($cs->getRequiresHead() && $this->getHead()===null)
-			throw new TConfigurationException('page_head_required');
 	}
 	private function getCssMediaType($url)
 	{
 		$segs=explode('.',basename($url));
-		if(isset($segs[2]))
-			return $segs[count($segs)-2];
-		else
-			return '';
+		if(isset($segs[2])) {
+					return $segs[count($segs)-2];
+		} else {
+					return '';
+		}
 	}
 	public function onSaveStateComplete($param)
 	{
@@ -7747,8 +8245,9 @@ 
 	private function determinePostBackMode()
 	{
 		$postData=$this->getRequest();
-		if($postData->contains(self::FIELD_PAGESTATE) || $postData->contains(self::FIELD_POSTBACK_TARGET))
-			$this->_postData=$postData;
+		if($postData->contains(self::FIELD_PAGESTATE) || $postData->contains(self::FIELD_POSTBACK_TARGET)) {
+					$this->_postData=$postData;
+		}
 	}
 	public function getIsPostBack()
 	{
@@ -7787,16 +8286,18 @@ 
 		$id=is_string($control)?$control:$control->getUniqueID();
 		$this->_controlsRegisteredForPostData[$id]=true;
 		$params=func_get_args();
-		foreach($this->getCachingStack() as $item)
-			$item->registerAction('Page','registerRequiresPostData',array($id));
+		foreach($this->getCachingStack() as $item) {
+					$item->registerAction('Page','registerRequiresPostData',array($id));
+		}
 	}
 	public function getPostBackEventTarget()
 	{
 		if($this->_postBackEventTarget===null && $this->_postData!==null)
 		{
 			$eventTarget=$this->_postData->itemAt(self::FIELD_POSTBACK_TARGET);
-			if(!empty($eventTarget))
-				$this->_postBackEventTarget=$this->findControl($eventTarget);
+			if(!empty($eventTarget)) {
+							$this->_postBackEventTarget=$this->findControl($eventTarget);
+			}
 		}
 		return $this->_postBackEventTarget;
 	}
@@ -7808,8 +8309,9 @@ 
 	{
 		if($this->_postBackEventParameter===null && $this->_postData!==null)
 		{
-			if(($this->_postBackEventParameter=$this->_postData->itemAt(self::FIELD_POSTBACK_PARAMETER))===null)
-				$this->_postBackEventParameter='';
+			if(($this->_postBackEventParameter=$this->_postData->itemAt(self::FIELD_POSTBACK_PARAMETER))===null) {
+							$this->_postBackEventParameter='';
+			}
 		}
 		return $this->_postBackEventParameter;
 	}
@@ -7820,27 +8322,28 @@ 
 	protected function processPostData($postData,$beforeLoad)
 	{
 		$this->_isLoadingPostData=true;
-		if($beforeLoad)
-			$this->_restPostData=new TMap;
+		if($beforeLoad) {
+					$this->_restPostData=new TMap;
+		}
 		foreach($postData as $key=>$value)
 		{
-			if($this->isSystemPostField($key))
-				continue;
-			else if($control=$this->findControl($key))
+			if($this->isSystemPostField($key)) {
+							continue;
+			} else if($control=$this->findControl($key))
 			{
 				if($control instanceof IPostBackDataHandler)
 				{
-					if($control->loadPostData($key,$postData))
-						$this->_controlsPostDataChanged[]=$control;
-				}
-				else if($control instanceof IPostBackEventHandler &&
+					if($control->loadPostData($key,$postData)) {
+											$this->_controlsPostDataChanged[]=$control;
+					}
+				} else if($control instanceof IPostBackEventHandler &&
 					empty($this->_postData[self::FIELD_POSTBACK_TARGET]))
 				{
 					$this->_postData->add(self::FIELD_POSTBACK_TARGET,$key);  				}
 				unset($this->_controlsRequiringPostData[$key]);
+			} else if($beforeLoad) {
+							$this->_restPostData->add($key,$value);
 			}
-			else if($beforeLoad)
-				$this->_restPostData->add($key,$value);
 		}
 		foreach($this->_controlsRequiringPostData as $key=>$value)
 		{
@@ -7848,11 +8351,12 @@ 
 			{
 				if($control instanceof IPostBackDataHandler)
 				{
-					if($control->loadPostData($key,$this->_postData))
-						$this->_controlsPostDataChanged[]=$control;
+					if($control->loadPostData($key,$this->_postData)) {
+											$this->_controlsPostDataChanged[]=$control;
+					}
+				} else {
+									throw new TInvalidDataValueException('page_postbackcontrol_invalid',$key);
 				}
-				else
-					throw new TInvalidDataValueException('page_postbackcontrol_invalid',$key);
 				unset($this->_controlsRequiringPostData[$key]);
 			}
 		}
@@ -7864,15 +8368,17 @@ 
 	}
 	protected function raiseChangedEvents()
 	{
-		foreach($this->_controlsPostDataChanged as $control)
-			$control->raisePostDataChangedEvent();
+		foreach($this->_controlsPostDataChanged as $control) {
+					$control->raisePostDataChangedEvent();
+		}
 	}
 	protected function raisePostBackEvent()
 	{
-		if(($postBackHandler=$this->getPostBackEventTarget())===null)
-			$this->validate();
-		else if($postBackHandler instanceof IPostBackEventHandler)
-			$postBackHandler->raisePostBackEvent($this->getPostBackEventParameter());
+		if(($postBackHandler=$this->getPostBackEventTarget())===null) {
+					$this->validate();
+		} else if($postBackHandler instanceof IPostBackEventHandler) {
+					$postBackHandler->raisePostBackEvent($this->getPostBackEventParameter());
+		}
 	}
 	public function getInFormRender()
 	{
@@ -7880,13 +8386,15 @@ 
 	}
 	public function ensureRenderInForm($control)
 	{
-		if(!$this->getIsCallback() && !$this->_inFormRender)
-			throw new TConfigurationException('page_control_outofform',get_class($control), $control ? $control->getUniqueID() : null);
+		if(!$this->getIsCallback() && !$this->_inFormRender) {
+					throw new TConfigurationException('page_control_outofform',get_class($control), $control ? $control->getUniqueID() : null);
+		}
 	}
 	public function beginFormRender($writer)
 	{
-		if($this->_formRendered)
-			throw new TConfigurationException('page_form_duplicated');
+		if($this->_formRendered) {
+					throw new TConfigurationException('page_form_duplicated');
+		}
 		$this->_formRendered=true;
 		$this->getClientScript()->registerHiddenField(self::FIELD_PAGESTATE,$this->getClientState());
 		$this->_inFormRender=true;
@@ -7895,14 +8403,15 @@ 
 	{
 		if($this->_focus)
 		{
-			if(($this->_focus instanceof TControl) && $this->_focus->getVisible(true))
-				$focus=$this->_focus->getClientID();
-			else
-				$focus=$this->_focus;
+			if(($this->_focus instanceof TControl) && $this->_focus->getVisible(true)) {
+							$focus=$this->_focus->getClientID();
+			} else {
+							$focus=$this->_focus;
+			}
 			$this->getClientScript()->registerFocusControl($focus);
+		} else if($this->_postData && ($lastFocus=$this->_postData->itemAt(self::FIELD_LASTFOCUS))!==null) {
+					$this->getClientScript()->registerFocusControl($lastFocus);
 		}
-		else if($this->_postData && ($lastFocus=$this->_postData->itemAt(self::FIELD_LASTFOCUS))!==null)
-			$this->getClientScript()->registerFocusControl($lastFocus);
 		$this->_inFormRender=false;
 	}
 	public function setFocus($value)
@@ -7923,8 +8432,9 @@ 
 	}
 	public function setHead(THead $value)
 	{
-		if($this->_head)
-			throw new TInvalidOperationException('page_head_duplicated');
+		if($this->_head) {
+					throw new TInvalidOperationException('page_head_duplicated');
+		}
 		$this->_head=$value;
 		if($this->_title!==null)
 		{
@@ -7934,17 +8444,19 @@ 
 	}
 	public function getTitle()
 	{
-		if($this->_head)
-			return $this->_head->getTitle();
-		else
-			return $this->_title===null ? '' : $this->_title;
+		if($this->_head) {
+					return $this->_head->getTitle();
+		} else {
+					return $this->_title===null ? '' : $this->_title;
+		}
 	}
 	public function setTitle($value)
 	{
-		if($this->_head)
-			$this->_head->setTitle($value);
-		else
-			$this->_title=$value;
+		if($this->_head) {
+					$this->_head->setTitle($value);
+		} else {
+					$this->_title=$value;
+		}
 	}
 	public function getClientState()
 	{
@@ -7971,8 +8483,9 @@ 
 		if($this->_statePersister===null)
 		{
 			$this->_statePersister=Prado::createComponent($this->_statePersisterClass);
-			if(!($this->_statePersister instanceof IPageStatePersister))
-				throw new TInvalidDataTypeException('page_statepersister_invalid');
+			if(!($this->_statePersister instanceof IPageStatePersister)) {
+							throw new TInvalidDataTypeException('page_statepersister_invalid');
+			}
 			$this->_statePersister->setPage($this);
 		}
 		return $this->_statePersister;
@@ -8013,20 +8526,23 @@ 
 	{
 		if($this->_cachingStack)
 		{
-			foreach($this->_cachingStack as $cache)
-				$cache->registerAction($context,$funcName,$funcParams);
+			foreach($this->_cachingStack as $cache) {
+							$cache->registerAction($context,$funcName,$funcParams);
+			}
 		}
 	}
 	public function getCachingStack()
 	{
-		if(!$this->_cachingStack)
-			$this->_cachingStack=new TStack;
+		if(!$this->_cachingStack) {
+					$this->_cachingStack=new TStack;
+		}
 		return $this->_cachingStack;
 	}
 	public function flushWriter()
 	{
-		if ($this->_writer)
-			$this->Response->write($this->_writer->flush());
+		if ($this->_writer) {
+					$this->Response->write($this->_writer->flush());
+		}
 	}
 }
 interface IPageStatePersister
@@ -8041,35 +8557,42 @@ 
 	public static function serialize($page,$data)
 	{
 		$sm=$page->getApplication()->getSecurityManager();
-		if($page->getEnableStateValidation())
-			$str=$sm->hashData(serialize($data));
-		else
-			$str=serialize($data);
-		if($page->getEnableStateCompression() && extension_loaded('zlib'))
-			$str=gzcompress($str);
-		if($page->getEnableStateEncryption())
-			$str=$sm->encrypt($str);
+		if($page->getEnableStateValidation()) {
+					$str=$sm->hashData(serialize($data));
+		} else {
+					$str=serialize($data);
+		}
+		if($page->getEnableStateCompression() && extension_loaded('zlib')) {
+					$str=gzcompress($str);
+		}
+		if($page->getEnableStateEncryption()) {
+					$str=$sm->encrypt($str);
+		}
 		return base64_encode($str);
 	}
 	public static function unserialize($page,$data)
 	{
 		$str=base64_decode($data);
-		if($str==='')
-			return null;
+		if($str==='') {
+					return null;
+		}
 		if($str!==false)
 		{
 			$sm=$page->getApplication()->getSecurityManager();
-			if($page->getEnableStateEncryption())
-				$str=$sm->decrypt($str);
-			if($page->getEnableStateCompression() && extension_loaded('zlib'))
-				$str=@gzuncompress($str);
+			if($page->getEnableStateEncryption()) {
+							$str=$sm->decrypt($str);
+			}
+			if($page->getEnableStateCompression() && extension_loaded('zlib')) {
+							$str=@gzuncompress($str);
+			}
 			if($page->getEnableStateValidation())
 			{
-				if(($str=$sm->validateData($str))!==false)
-					return unserialize($str);
+				if(($str=$sm->validateData($str))!==false) {
+									return unserialize($str);
+				}
+			} else {
+							return unserialize($str);
 			}
-			else
-				return unserialize($str);
 		}
 		return null;
 	}
@@ -8107,11 +8630,12 @@ 
 				if($this->_cacheModuleID!=='')
 				{
 					$this->_cache=$this->getApplication()->getModule($this->_cacheModuleID);
-					if(!($this->_cache instanceof ICache))
-						throw new TConfigurationException('outputcache_cachemoduleid_invalid',$this->_cacheModuleID);
+					if(!($this->_cache instanceof ICache)) {
+											throw new TConfigurationException('outputcache_cachemoduleid_invalid',$this->_cacheModuleID);
+					}
+				} else {
+									$this->_cache=$this->getApplication()->getCache();
 				}
-				else
-					$this->_cache=$this->getApplication()->getCache();
 				if($this->_cache!==null)
 				{
 					$this->_cacheAvailable=true;
@@ -8122,11 +8646,12 @@ 
 						$param->setCacheTime(isset($data[3])?$data[3]:0);
 						$this->onCheckDependency($param);
 						$this->_dataCached=$param->getIsValid();
+					} else {
+											$this->_dataCached=false;
+					}
+					if($this->_dataCached) {
+											list($this->_contents,$this->_state,$this->_actions,$this->_cacheTime)=$data;
 					}
-					else
-						$this->_dataCached=false;
-					if($this->_dataCached)
-						list($this->_contents,$this->_state,$this->_actions,$this->_cacheTime)=$data;
 				}
 			}
 		}
@@ -8139,9 +8664,9 @@ 
 			$stack->push($this);
 			parent::initRecursive($namingContainer);
 			$stack->pop();
+		} else {
+					parent::initRecursive($namingContainer);
 		}
-		else
-			parent::initRecursive($namingContainer);
 	}
 	protected function loadRecursive()
 	{
@@ -8151,11 +8676,11 @@ 
 			$stack->push($this);
 			parent::loadRecursive();
 			$stack->pop();
-		}
-		else
+		} else
 		{
-			if($this->_dataCached)
-				$this->performActions();
+			if($this->_dataCached) {
+							$this->performActions();
+			}
 			parent::loadRecursive();
 		}
 	}
@@ -8165,12 +8690,13 @@ 
 		$cs=$page->getClientScript();
 		foreach($this->_actions as $action)
 		{
-			if($action[0]==='Page.ClientScript')
-				call_user_func_array(array($cs,$action[1]),$action[2]);
-			else if($action[0]==='Page')
-				call_user_func_array(array($page,$action[1]),$action[2]);
-			else
-				call_user_func_array(array($this->getSubProperty($action[0]),$action[1]),$action[2]);
+			if($action[0]==='Page.ClientScript') {
+							call_user_func_array(array($cs,$action[1]),$action[2]);
+			} else if($action[0]==='Page') {
+							call_user_func_array(array($page,$action[1]),$action[2]);
+			} else {
+							call_user_func_array(array($this->getSubProperty($action[0]),$action[1]),$action[2]);
+			}
 		}
 	}
 	protected function preRenderRecursive()
@@ -8181,9 +8707,9 @@ 
 			$stack->push($this);
 			parent::preRenderRecursive();
 			$stack->pop();
+		} else {
+					parent::preRenderRecursive();
 		}
-		else
-			parent::preRenderRecursive();
 	}
 	protected function loadStateRecursive(&$state,$needViewState=true)
 	{
@@ -8192,9 +8718,9 @@ 
 	}
 	protected function &saveStateRecursive($needViewState=true)
 	{
-		if($this->_dataCached)
-			return $this->_state;
-		else
+		if($this->_dataCached) {
+					return $this->_state;
+		} else
 		{
 			$st=parent::saveStateRecursive($needViewState);
 						$this->_state=serialize($st);
@@ -8207,15 +8733,17 @@ 
 	}
 	public function getCacheKey()
 	{
-		if($this->_cacheKey===null)
-			$this->_cacheKey=$this->calculateCacheKey();
+		if($this->_cacheKey===null) {
+					$this->_cacheKey=$this->calculateCacheKey();
+		}
 		return $this->_cacheKey;
 	}
 	protected function calculateCacheKey()
 	{
 		$key=$this->getBaseCacheKey();
-		if($this->_varyBySession)
-			$key.=$this->getSession()->getSessionID();
+		if($this->_varyBySession) {
+					$key.=$this->getSession()->getSessionID();
+		}
 		if($this->_varyByParam!=='')
 		{
 			$params=array();
@@ -8266,8 +8794,9 @@ 
 	}
 	public function setDuration($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			throw new TInvalidDataValueException('outputcache_duration_invalid',get_class($this));
+		if(($value=TPropertyValue::ensureInteger($value))<0) {
+					throw new TInvalidDataValueException('outputcache_duration_invalid',get_class($this));
+		}
 		$this->_duration=$value;
 	}
 	public function getVaryByParam()
@@ -8304,9 +8833,9 @@ 
 	}
 	public function render($writer)
 	{
-		if($this->_dataCached)
-			$writer->write($this->_contents);
-		else if($this->_cacheAvailable)
+		if($this->_dataCached) {
+					$writer->write($this->_contents);
+		} else if($this->_cacheAvailable)
 		{
 			$textwriter = new TTextWriter();
 			$multiwriter = new TOutputCacheTextWriterMulti(array($writer->getWriter(),$textwriter));
@@ -8318,9 +8847,9 @@ 
 			$content=$textwriter->flush();
 			$data=array($content,$this->_state,$this->_actions,time());
 			$this->_cache->set($this->getCacheKey(),$data,$this->getDuration(),$this->getCacheDependency());
+		} else {
+					parent::render($writer);
 		}
-		else
-			parent::render($writer);
 	}
 }
 class TOutputCacheCheckDependencyEventParameter extends TEventParameter
@@ -8365,13 +8894,15 @@ 
 	}
 	public function write($s)
 	{
-		foreach($this->_writers as $writer)
-			$writer->write($s);
+		foreach($this->_writers as $writer) {
+					$writer->write($s);
+		}
 	}
 	public function flush()
 	{
-		foreach($this->_writers as $writer)
-			$s = $writer->flush();
+		foreach($this->_writers as $writer) {
+					$s = $writer->flush();
+		}
 		return $s;
 	}
 }
@@ -8393,16 +8924,17 @@ 
 	{
 		if(($fileName=$this->getLocalizedTemplate($fileName))!==null)
 		{
-			if(($cache=$this->getApplication()->getCache())===null)
-				return new TTemplate(file_get_contents($fileName),dirname($fileName),$fileName);
-			else
+			if(($cache=$this->getApplication()->getCache())===null) {
+							return new TTemplate(file_get_contents($fileName),dirname($fileName),$fileName);
+			} else
 			{
 				$array=$cache->get(self::TEMPLATE_CACHE_PREFIX.$fileName);
 				if(is_array($array))
 				{
 					list($template,$timestamps)=$array;
-					if($this->getApplication()->getMode()===TApplicationMode::Performance)
-						return $template;
+					if($this->getApplication()->getMode()===TApplicationMode::Performance) {
+											return $template;
+					}
 					$cacheValid=true;
 					foreach($timestamps as $tplFile=>$timestamp)
 					{
@@ -8412,30 +8944,34 @@ 
 							break;
 						}
 					}
-					if($cacheValid)
-						return $template;
+					if($cacheValid) {
+											return $template;
+					}
 				}
 				$template=new TTemplate(file_get_contents($fileName),dirname($fileName),$fileName);
 				$includedFiles=$template->getIncludedFiles();
 				$timestamps=array();
 				$timestamps[$fileName]=filemtime($fileName);
-				foreach($includedFiles as $includedFile)
-					$timestamps[$includedFile]=filemtime($includedFile);
+				foreach($includedFiles as $includedFile) {
+									$timestamps[$includedFile]=filemtime($includedFile);
+				}
 				$cache->set(self::TEMPLATE_CACHE_PREFIX.$fileName,array($template,$timestamps));
 				return $template;
 			}
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 	protected function getLocalizedTemplate($filename)
 	{
-		if(($app=$this->getApplication()->getGlobalization(false))===null)
-			return is_file($filename)?$filename:null;
+		if(($app=$this->getApplication()->getGlobalization(false))===null) {
+					return is_file($filename)?$filename:null;
+		}
 		foreach($app->getLocalizedResource($filename) as $file)
 		{
-			if(($file=realpath($file))!==false && is_file($file))
-				return $file;
+			if(($file=realpath($file))!==false && is_file($file)) {
+							return $file;
+			}
 		}
 		return null;
 	}
@@ -8498,118 +9034,139 @@ 
 	public function instantiateIn($tplControl,$parentControl=null)
 	{
 		$this->_tplControl=$tplControl;
-		if($parentControl===null)
-			$parentControl=$tplControl;
-		if(($page=$tplControl->getPage())===null)
-			$page=$this->getService()->getRequestedPage();
+		if($parentControl===null) {
+					$parentControl=$tplControl;
+		}
+		if(($page=$tplControl->getPage())===null) {
+					$page=$this->getService()->getRequestedPage();
+		}
 		$controls=array();
 		$directChildren=array();
 		foreach($this->_tpl as $key=>$object)
 		{
-			if($object[0]===-1)
-				$parent=$parentControl;
-			else if(isset($controls[$object[0]]))
-				$parent=$controls[$object[0]];
-			else
-				continue;
+			if($object[0]===-1) {
+							$parent=$parentControl;
+			} else if(isset($controls[$object[0]])) {
+							$parent=$controls[$object[0]];
+			} else {
+							continue;
+			}
 			if(isset($object[2]))				{
 				$component=Prado::createComponent($object[1]);
 				$properties=&$object[2];
 				if($component instanceof TControl)
 				{
-					if($component instanceof TOutputCache)
-						$component->setCacheKeyPrefix($this->_hashCode.$key);
+					if($component instanceof TOutputCache) {
+											$component->setCacheKeyPrefix($this->_hashCode.$key);
+					}
 					$component->setTemplateControl($tplControl);
 					if(isset($properties['id']))
 					{
-						if(is_array($properties['id']))
-							$properties['id']=$component->evaluateExpression($properties['id'][1]);
+						if(is_array($properties['id'])) {
+													$properties['id']=$component->evaluateExpression($properties['id'][1]);
+						}
 						$tplControl->registerObject($properties['id'],$component);
 					}
 					if(isset($properties['skinid']))
 					{
-						if(is_array($properties['skinid']))
-							$component->setSkinID($component->evaluateExpression($properties['skinid'][1]));
-						else
-							$component->setSkinID($properties['skinid']);
+						if(is_array($properties['skinid'])) {
+													$component->setSkinID($component->evaluateExpression($properties['skinid'][1]));
+						} else {
+													$component->setSkinID($properties['skinid']);
+						}
 						unset($properties['skinid']);
 					}
 					$component->trackViewState(false);
 					$component->applyStyleSheetSkin($page);
-					foreach($properties as $name=>$value)
-						$this->configureControl($component,$name,$value);
+					foreach($properties as $name=>$value) {
+											$this->configureControl($component,$name,$value);
+					}
 					$component->trackViewState(true);
-					if($parent===$parentControl)
-						$directChildren[]=$component;
-					else
-						$component->createdOnTemplate($parent);
-					if($component->getAllowChildControls())
-						$controls[$key]=$component;
-				}
-				else if($component instanceof TComponent)
+					if($parent===$parentControl) {
+											$directChildren[]=$component;
+					} else {
+											$component->createdOnTemplate($parent);
+					}
+					if($component->getAllowChildControls()) {
+											$controls[$key]=$component;
+					}
+				} else if($component instanceof TComponent)
 				{
 					$controls[$key]=$component;
 					if(isset($properties['id']))
 					{
-						if(is_array($properties['id']))
-							$properties['id']=$component->evaluateExpression($properties['id'][1]);
+						if(is_array($properties['id'])) {
+													$properties['id']=$component->evaluateExpression($properties['id'][1]);
+						}
 						$tplControl->registerObject($properties['id'],$component);
-						if(!$component->hasProperty('id'))
-							unset($properties['id']);
+						if(!$component->hasProperty('id')) {
+													unset($properties['id']);
+						}
+					}
+					foreach($properties as $name=>$value) {
+											$this->configureComponent($component,$name,$value);
+					}
+					if($parent===$parentControl) {
+											$directChildren[]=$component;
+					} else {
+											$component->createdOnTemplate($parent);
 					}
-					foreach($properties as $name=>$value)
-						$this->configureComponent($component,$name,$value);
-					if($parent===$parentControl)
-						$directChildren[]=$component;
-					else
-						$component->createdOnTemplate($parent);
 				}
-			}
-			else
+			} else
 			{
 				if($object[1] instanceof TCompositeLiteral)
 				{
 										$o=clone $object[1];
 					$o->setContainer($tplControl);
-					if($parent===$parentControl)
-						$directChildren[]=$o;
-					else
-						$parent->addParsedObject($o);
-				}
-				else
+					if($parent===$parentControl) {
+											$directChildren[]=$o;
+					} else {
+											$parent->addParsedObject($o);
+					}
+				} else
 				{
-					if($parent===$parentControl)
-						$directChildren[]=$object[1];
-					else
-						$parent->addParsedObject($object[1]);
+					if($parent===$parentControl) {
+											$directChildren[]=$object[1];
+					} else {
+											$parent->addParsedObject($object[1]);
+					}
 				}
 			}
 		}
 								foreach($directChildren as $control)
 		{
-			if($control instanceof TComponent)
-				$control->createdOnTemplate($parentControl);
-			else
-				$parentControl->addParsedObject($control);
+			if($control instanceof TComponent) {
+							$control->createdOnTemplate($parentControl);
+			} else {
+							$parentControl->addParsedObject($control);
+			}
 		}
 	}
 	protected function configureControl($control,$name,$value)
 	{
-		if(strncasecmp($name,'on',2)===0)					$this->configureEvent($control,$name,$value,$control);
-		else if(($pos=strrpos($name,'.'))===false)				$this->configureProperty($control,$name,$value);
-		else				$this->configureSubProperty($control,$name,$value);
+		if(strncasecmp($name,'on',2)===0) {
+			$this->configureEvent($control,$name,$value,$control);
+		} else if(($pos=strrpos($name,'.'))===false) {
+			$this->configureProperty($control,$name,$value);
+		} else {
+			$this->configureSubProperty($control,$name,$value);
+		}
 	}
 	protected function configureComponent($component,$name,$value)
 	{
-		if(strpos($name,'.')===false)				$this->configureProperty($component,$name,$value);
-		else				$this->configureSubProperty($component,$name,$value);
+		if(strpos($name,'.')===false) {
+			$this->configureProperty($component,$name,$value);
+		} else {
+			$this->configureSubProperty($component,$name,$value);
+		}
 	}
 	protected function configureEvent($control,$name,$value,$contextControl)
 	{
-		if(strpos($value,'.')===false)
-			$control->attachEventHandler($name,array($contextControl,'TemplateControl.'.$value));
-		else
-			$control->attachEventHandler($name,array($contextControl,$value));
+		if(strpos($value,'.')===false) {
+					$control->attachEventHandler($name,array($contextControl,'TemplateControl.'.$value));
+		} else {
+					$control->attachEventHandler($name,array($contextControl,$value));
+		}
 	}
 	protected function configureProperty($component,$name,$value)
 	{
@@ -8621,9 +9178,9 @@ 
 					$component->bindProperty($name,$value[1]);
 					break;
 				case self::CONFIG_EXPRESSION:
-					if($component instanceof TControl)
-						$component->autoBindProperty($name,$value[1]);
-					else
+					if($component instanceof TControl) {
+											$component->autoBindProperty($name,$value[1]);
+					} else
 					{
 						$setter='set'.$name;
 						$component->$setter($this->_tplControl->evaluateExpression($value[1]));
@@ -8647,12 +9204,12 @@ 
 				default:						throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
 					break;
 			}
-		}
-		else
+		} else
 		{
-			if (substr($name,0,2)=='js')
-				if ($value and !($value instanceof TJavaScriptLiteral))
+			if (substr($name,0,2)=='js') {
+							if ($value and !($value instanceof TJavaScriptLiteral))
 					$value = new TJavaScriptLiteral($value);
+			}
 			$setter='set'.$name;
 			$component->$setter($value);
 		}
@@ -8665,10 +9222,11 @@ 
 			{
 				case self::CONFIG_DATABIND:							$component->bindProperty($name,$value[1]);
 					break;
-				case self::CONFIG_EXPRESSION:							if($component instanceof TControl)
-						$component->autoBindProperty($name,$value[1]);
-					else
-						$component->setSubProperty($name,$this->_tplControl->evaluateExpression($value[1]));
+				case self::CONFIG_EXPRESSION:							if($component instanceof TControl) {
+										$component->autoBindProperty($name,$value[1]);
+				} else {
+											$component->setSubProperty($name,$this->_tplControl->evaluateExpression($value[1]));
+					}
 					break;
 				case self::CONFIG_TEMPLATE:
 					$component->setSubProperty($name,$value[1]);
@@ -8684,9 +9242,9 @@ 
 				default:						throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
 					break;
 			}
+		} else {
+					$component->setSubProperty($name,$value);
 		}
-		else
-			$component->setSubProperty($name,$value);
 	}
 	protected function parse($input)
 	{
@@ -8709,10 +9267,12 @@ 
 				$matchStart=$match[0][1];
 				$matchEnd=$matchStart+strlen($str)-1;
 				if(strpos($str,'<com:')===0)					{
-					if($expectPropEnd)
-						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
+					if($expectPropEnd) {
+											continue;
+					}
+					if($matchStart>$textStart) {
+											$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
+					}
 					$textStart=$matchEnd+1;
 					$type=$match[1][0];
 					$attributes=$this->parseAttributes($match[2][0],$match[2][1]);
@@ -8722,16 +9282,18 @@ 
 						$stack[] = $type;
 						$container=$c-1;
 					}
-				}
-				else if(strpos($str,'</com:')===0)					{
-					if($expectPropEnd)
-						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
+				} else if(strpos($str,'</com:')===0)					{
+					if($expectPropEnd) {
+											continue;
+					}
+					if($matchStart>$textStart) {
+											$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
+					}
 					$textStart=$matchEnd+1;
 					$type=$match[1][0];
-					if(empty($stack))
-						throw new TConfigurationException('template_closingtag_unexpected',"</com:$type>");
+					if(empty($stack)) {
+											throw new TConfigurationException('template_closingtag_unexpected',"</com:$type>");
+					}
 					$name=array_pop($stack);
 					if($name!==$type)
 					{
@@ -8739,77 +9301,85 @@ 
 						throw new TConfigurationException('template_closingtag_expected',$tag);
 					}
 					$container=$tpl[$container][0];
-				}
-				else if(strpos($str,'<%@')===0)					{
-					if($expectPropEnd)
-						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
+				} else if(strpos($str,'<%@')===0)					{
+					if($expectPropEnd) {
+											continue;
+					}
+					if($matchStart>$textStart) {
+											$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
+					}
 					$textStart=$matchEnd+1;
-					if(isset($tpl[0]) || $this->_directive!==null)
-						throw new TConfigurationException('template_directive_nonunique');
+					if(isset($tpl[0]) || $this->_directive!==null) {
+											throw new TConfigurationException('template_directive_nonunique');
+					}
 					$this->_directive=$this->parseAttributes($match[4][0],$match[4][1]);
-				}
-				else if(strpos($str,'<%')===0)					{
-					if($expectPropEnd)
-						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
+				} else if(strpos($str,'<%')===0)					{
+					if($expectPropEnd) {
+											continue;
+					}
+					if($matchStart>$textStart) {
+											$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
+					}
 					$textStart=$matchEnd+1;
 					$literal=trim($match[5][0]);
-					if($str[2]==='=')							$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,$literal));
-					else if($str[2]==='%')  						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_STATEMENTS,$literal));
-					else if($str[2]==='#')
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_DATABINDING,$literal));
-					else if($str[2]==='$')
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"\$this->getApplication()->getParameters()->itemAt('$literal')"));
-					else if($str[2]==='~')
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"\$this->publishFilePath('$this->_contextPath/$literal')"));
-					else if($str[2]==='/')
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '/').'/$literal'"));
-					else if($str[2]==='[')
+					if($str[2]==='=') {
+						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,$literal));
+					} else if($str[2]==='%') {
+						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_STATEMENTS,$literal));
+					} else if($str[2]==='#') {
+											$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_DATABINDING,$literal));
+					} else if($str[2]==='$') {
+											$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"\$this->getApplication()->getParameters()->itemAt('$literal')"));
+					} else if($str[2]==='~') {
+											$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"\$this->publishFilePath('$this->_contextPath/$literal')"));
+					} else if($str[2]==='/') {
+											$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '/').'/$literal'"));
+					} else if($str[2]==='[')
 					{
 						$literal=strtr(trim(substr($literal,0,strlen($literal)-1)),array("'"=>"\'","\\"=>"\\\\"));
 						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"Prado::localize('$literal')"));
 					}
-				}
-				else if(strpos($str,'<prop:')===0)					{
+				} else if(strpos($str,'<prop:')===0)					{
 					if(strrpos($str,'/>')===strlen($str)-2)  					{
-						if($expectPropEnd)
-							continue;
-						if($matchStart>$textStart)
-							$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
+						if($expectPropEnd) {
+													continue;
+						}
+						if($matchStart>$textStart) {
+													$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
+						}
 						$textStart=$matchEnd+1;
 						$prop=strtolower($match[6][0]);
 						$attrs=$this->parseAttributes($match[7][0],$match[7][1]);
 						$attributes=array();
-						foreach($attrs as $name=>$value)
-							$attributes[$prop.'.'.$name]=$value;
+						foreach($attrs as $name=>$value) {
+													$attributes[$prop.'.'.$name]=$value;
+						}
 						$type=$tpl[$container][1];
 						$this->validateAttributes($type,$attributes);
 						foreach($attributes as $name=>$value)
 						{
-							if(isset($tpl[$container][2][$name]))
-								throw new TConfigurationException('template_property_duplicated',$name);
+							if(isset($tpl[$container][2][$name])) {
+															throw new TConfigurationException('template_property_duplicated',$name);
+							}
 							$tpl[$container][2][$name]=$value;
 						}
-					}
-					else  					{
+					} else  					{
 						$prop=strtolower($match[3][0]);
 						$stack[] = '@'.$prop;
 						if(!$expectPropEnd)
 						{
-							if($matchStart>$textStart)
-								$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
+							if($matchStart>$textStart) {
+															$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
+							}
 							$textStart=$matchEnd+1;
 							$expectPropEnd=true;
 						}
 					}
-				}
-				else if(strpos($str,'</prop:')===0)					{
+				} else if(strpos($str,'</prop:')===0)					{
 					$prop=strtolower($match[3][0]);
-					if(empty($stack))
-						throw new TConfigurationException('template_closingtag_unexpected',"</prop:$prop>");
+					if(empty($stack)) {
+											throw new TConfigurationException('template_closingtag_unexpected',"</prop:$prop>");
+					}
 					$name=array_pop($stack);
 					if($name!=='@'.$prop)
 					{
@@ -8821,33 +9391,37 @@ 
 						if($matchStart>$textStart)
 						{
 							$value=substr($input,$textStart,$matchStart-$textStart);
-							if(substr($prop,-8,8)==='template')
-								$value=$this->parseTemplateProperty($value,$textStart);
-							else
-								$value=$this->parseAttribute($value);
+							if(substr($prop,-8,8)==='template') {
+															$value=$this->parseTemplateProperty($value,$textStart);
+							} else {
+															$value=$this->parseAttribute($value);
+							}
 							if($container>=0)
 							{
 								$type=$tpl[$container][1];
 								$this->validateAttributes($type,array($prop=>$value));
-								if(isset($tpl[$container][2][$prop]))
-									throw new TConfigurationException('template_property_duplicated',$prop);
+								if(isset($tpl[$container][2][$prop])) {
+																	throw new TConfigurationException('template_property_duplicated',$prop);
+								}
 								$tpl[$container][2][$prop]=$value;
+							} else {
+								$this->_directive[$prop]=$value;
 							}
-							else									$this->_directive[$prop]=$value;
 							$textStart=$matchEnd+1;
 						}
 						$expectPropEnd=false;
 					}
-				}
-				else if(strpos($str,'<!--')===0)					{
-					if($expectPropEnd)
-						throw new TConfigurationException('template_comments_forbidden');
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
+				} else if(strpos($str,'<!--')===0)					{
+					if($expectPropEnd) {
+											throw new TConfigurationException('template_comments_forbidden');
+					}
+					if($matchStart>$textStart) {
+											$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
+					}
 					$textStart=$matchEnd+1;
+				} else {
+									throw new TConfigurationException('template_matching_unexpected',$match);
 				}
-				else
-					throw new TConfigurationException('template_matching_unexpected',$match);
 			}
 			if(!empty($stack))
 			{
@@ -8855,21 +9429,24 @@ 
 				$tag=$name[0]==='@' ? '</prop:'.substr($name,1).'>' : "</com:$name>";
 				throw new TConfigurationException('template_closingtag_expected',$tag);
 			}
-			if($textStart<strlen($input))
-				$tpl[$c++]=array($container,substr($input,$textStart));
-		}
-		catch(Exception $e)
+			if($textStart<strlen($input)) {
+							$tpl[$c++]=array($container,substr($input,$textStart));
+			}
+		} catch(Exception $e)
 		{
-			if(($e instanceof TException) && ($e instanceof TTemplateException))
-				throw $e;
-			if($matchEnd===0)
-				$line=$this->_startingLine+1;
-			else
-				$line=$this->_startingLine+count(explode("\n",substr($input,0,$matchEnd+1)));
+			if(($e instanceof TException) && ($e instanceof TTemplateException)) {
+							throw $e;
+			}
+			if($matchEnd===0) {
+							$line=$this->_startingLine+1;
+			} else {
+							$line=$this->_startingLine+count(explode("\n",substr($input,0,$matchEnd+1)));
+			}
 			$this->handleException($e,$line,$input);
 		}
-		if($this->_directive===null)
-			$this->_directive=array();
+		if($this->_directive===null) {
+					$this->_directive=array();
+		}
 				$objects=array();
 		$parent=null;
 		$merged=array();
@@ -8879,39 +9456,41 @@ 
 			{
 				if($parent!==null)
 				{
-					if(count($merged[1])===1 && is_string($merged[1][0]))
-						$objects[$id-1]=array($merged[0],$merged[1][0]);
-					else
-						$objects[$id-1]=array($merged[0],new TCompositeLiteral($merged[1]));
+					if(count($merged[1])===1 && is_string($merged[1][0])) {
+											$objects[$id-1]=array($merged[0],$merged[1][0]);
+					} else {
+											$objects[$id-1]=array($merged[0],new TCompositeLiteral($merged[1]));
+					}
 				}
 				if(isset($object[2]))
 				{
 					$parent=null;
 					$objects[$id]=$object;
-				}
-				else
+				} else
 				{
 					$parent=$object[0];
 					$merged=array($parent,array($object[1]));
 				}
+			} else {
+							$merged[1][]=$object[1];
 			}
-			else
-				$merged[1][]=$object[1];
 		}
 		if($parent!==null)
 		{
-			if(count($merged[1])===1 && is_string($merged[1][0]))
-				$objects[$id]=array($merged[0],$merged[1][0]);
-			else
-				$objects[$id]=array($merged[0],new TCompositeLiteral($merged[1]));
+			if(count($merged[1])===1 && is_string($merged[1][0])) {
+							$objects[$id]=array($merged[0],$merged[1][0]);
+			} else {
+							$objects[$id]=array($merged[0],new TCompositeLiteral($merged[1]));
+			}
 		}
 		$tpl=$objects;
 		return $objects;
 	}
 	protected function parseAttributes($str,$offset)
 	{
-		if($str==='')
-			return array();
+		if($str==='') {
+					return array();
+		}
 		$pattern='/([\w\.\-]+)\s*=\s*(\'.*?\'|".*?"|<%.*?%>)/msS';
 		$attributes=array();
 		$n=preg_match_all($pattern,$str,$matches,PREG_SET_ORDER|PREG_OFFSET_CAPTURE);
@@ -8919,22 +9498,24 @@ 
 		{
 			$match=&$matches[$i];
 			$name=strtolower($match[1][0]);
-			if(isset($attributes[$name]))
-				throw new TConfigurationException('template_property_duplicated',$name);
+			if(isset($attributes[$name])) {
+							throw new TConfigurationException('template_property_duplicated',$name);
+			}
 			$value=$match[2][0];
 			if(substr($name,-8,8)==='template')
 			{
-				if($value[0]==='\'' || $value[0]==='"')
-					$attributes[$name]=$this->parseTemplateProperty(substr($value,1,strlen($value)-2),$match[2][1]+1);
-				else
-					$attributes[$name]=$this->parseTemplateProperty($value,$match[2][1]);
-			}
-			else
+				if($value[0]==='\'' || $value[0]==='"') {
+									$attributes[$name]=$this->parseTemplateProperty(substr($value,1,strlen($value)-2),$match[2][1]+1);
+				} else {
+									$attributes[$name]=$this->parseTemplateProperty($value,$match[2][1]);
+				}
+			} else
 			{
-				if($value[0]==='\'' || $value[0]==='"')
-					$attributes[$name]=$this->parseAttribute(substr($value,1,strlen($value)-2));
-				else
-					$attributes[$name]=$this->parseAttribute($value);
+				if($value[0]==='\'' || $value[0]==='"') {
+									$attributes[$name]=$this->parseAttribute(substr($value,1,strlen($value)-2));
+				} else {
+									$attributes[$name]=$this->parseAttribute($value);
+				}
 			}
 		}
 		return $attributes;
@@ -8957,45 +9538,49 @@ 
 				$token=$match[0];
 				$offset=$match[1];
 				$length=strlen($token);
-				if($token[2]==='#')
-					$isDataBind=true;
-				if($offset>$textStart)
-					$expr.=".'".strtr(substr($value,$textStart,$offset-$textStart),array("'"=>"\\'","\\"=>"\\\\"))."'";
+				if($token[2]==='#') {
+									$isDataBind=true;
+				}
+				if($offset>$textStart) {
+									$expr.=".'".strtr(substr($value,$textStart,$offset-$textStart),array("'"=>"\\'","\\"=>"\\\\"))."'";
+				}
 				$expr.='.('.substr($token,3,$length-5).')';
 				$textStart=$offset+$length;
 			}
 			$length=strlen($value);
-			if($length>$textStart)
-				$expr.=".'".strtr(substr($value,$textStart,$length-$textStart),array("'"=>"\\'","\\"=>"\\\\"))."'";
-			if($isDataBind)
-				return array(self::CONFIG_DATABIND,ltrim($expr,'.'));
-			else
-				return array(self::CONFIG_EXPRESSION,ltrim($expr,'.'));
-		}
-		else if(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS',$value,$matches) && $matches[0]===$value)
+			if($length>$textStart) {
+							$expr.=".'".strtr(substr($value,$textStart,$length-$textStart),array("'"=>"\\'","\\"=>"\\\\"))."'";
+			}
+			if($isDataBind) {
+							return array(self::CONFIG_DATABIND,ltrim($expr,'.'));
+			} else {
+							return array(self::CONFIG_EXPRESSION,ltrim($expr,'.'));
+			}
+		} else if(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS',$value,$matches) && $matches[0]===$value)
 		{
 			$value=$matches[1];
-			if($value[2]==='~')
-				return array(self::CONFIG_ASSET,trim(substr($value,3,strlen($value)-5)));
-			elseif($value[2]==='[')
-				return array(self::CONFIG_LOCALIZATION,trim(substr($value,3,strlen($value)-6)));
-			elseif($value[2]==='$')
-				return array(self::CONFIG_PARAMETER,trim(substr($value,3,strlen($value)-5)));
-			elseif($value[2]==='/') {
+			if($value[2]==='~') {
+							return array(self::CONFIG_ASSET,trim(substr($value,3,strlen($value)-5)));
+			} elseif($value[2]==='[') {
+							return array(self::CONFIG_LOCALIZATION,trim(substr($value,3,strlen($value)-6)));
+			} elseif($value[2]==='$') {
+							return array(self::CONFIG_PARAMETER,trim(substr($value,3,strlen($value)-5)));
+			} elseif($value[2]==='/') {
 				$literal = trim(substr($value,3,strlen($value)-5));
 				return array(self::CONFIG_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '/').'/$literal'");
 			}
+		} else {
+					return $value;
 		}
-		else
-			return $value;
 	}
 	protected function validateAttributes($type,$attributes)
 	{
 		Prado::using($type);
-		if(($pos=strrpos($type,'.'))!==false)
-			$className=substr($type,$pos+1);
-		else
-			$className=$type;
+		if(($pos=strrpos($type,'.'))!==false) {
+					$className=substr($type,$pos+1);
+		} else {
+					$className=$type;
+		}
 		$class=new ReflectionClass($className);
 		if(is_subclass_of($className,'TControl') || $className==='TControl')
 		{
@@ -9004,63 +9589,65 @@ 
 				if(($pos=strpos($name,'.'))!==false)
 				{
 										$subname=substr($name,0,$pos);
-					if(!$class->hasMethod('get'.$subname))
-						throw new TConfigurationException('template_property_unknown',$type,$subname);
-				}
-				else if(strncasecmp($name,'on',2)===0)
+					if(!$class->hasMethod('get'.$subname)) {
+											throw new TConfigurationException('template_property_unknown',$type,$subname);
+					}
+				} else if(strncasecmp($name,'on',2)===0)
 				{
-										if(!$class->hasMethod($name))
-						throw new TConfigurationException('template_event_unknown',$type,$name);
-					else if(!is_string($att))
-						throw new TConfigurationException('template_eventhandler_invalid',$type,$name);
-				}
-				else
+										if(!$class->hasMethod($name)) {
+																throw new TConfigurationException('template_event_unknown',$type,$name);
+										} else if(!is_string($att)) {
+											throw new TConfigurationException('template_eventhandler_invalid',$type,$name);
+					}
+				} else
 				{
 										if (! ($class->hasMethod('set'.$name) || $class->hasMethod('setjs'.$name) || $this->isClassBehaviorMethod($class,'set'.$name)) )
 					{
-						if ($class->hasMethod('get'.$name) || $class->hasMethod('getjs'.$name))
-							throw new TConfigurationException('template_property_readonly',$type,$name);
-						else
-							throw new TConfigurationException('template_property_unknown',$type,$name);
-					}
-					else if(is_array($att) && $att[0]!==self::CONFIG_EXPRESSION)
+						if ($class->hasMethod('get'.$name) || $class->hasMethod('getjs'.$name)) {
+													throw new TConfigurationException('template_property_readonly',$type,$name);
+						} else {
+													throw new TConfigurationException('template_property_unknown',$type,$name);
+						}
+					} else if(is_array($att) && $att[0]!==self::CONFIG_EXPRESSION)
 					{
-						if(strcasecmp($name,'id')===0)
-							throw new TConfigurationException('template_controlid_invalid',$type);
-						else if(strcasecmp($name,'skinid')===0)
-							throw new TConfigurationException('template_controlskinid_invalid',$type);
+						if(strcasecmp($name,'id')===0) {
+													throw new TConfigurationException('template_controlid_invalid',$type);
+						} else if(strcasecmp($name,'skinid')===0) {
+													throw new TConfigurationException('template_controlskinid_invalid',$type);
+						}
 					}
 				}
 			}
-		}
-		else if(is_subclass_of($className,'TComponent') || $className==='TComponent')
+		} else if(is_subclass_of($className,'TComponent') || $className==='TComponent')
 		{
 			foreach($attributes as $name=>$att)
 			{
-				if(is_array($att) && ($att[0]===self::CONFIG_DATABIND))
-					throw new TConfigurationException('template_databind_forbidden',$type,$name);
+				if(is_array($att) && ($att[0]===self::CONFIG_DATABIND)) {
+									throw new TConfigurationException('template_databind_forbidden',$type,$name);
+				}
 				if(($pos=strpos($name,'.'))!==false)
 				{
 										$subname=substr($name,0,$pos);
-					if(!$class->hasMethod('get'.$subname))
-						throw new TConfigurationException('template_property_unknown',$type,$subname);
-				}
-				else if(strncasecmp($name,'on',2)===0)
-					throw new TConfigurationException('template_event_forbidden',$type,$name);
-				else
+					if(!$class->hasMethod('get'.$subname)) {
+											throw new TConfigurationException('template_property_unknown',$type,$subname);
+					}
+				} else if(strncasecmp($name,'on',2)===0) {
+									throw new TConfigurationException('template_event_forbidden',$type,$name);
+				} else
 				{
 										if(strcasecmp($name,'id')!==0 && !($class->hasMethod('set'.$name) || $this->isClassBehaviorMethod($class,'set'.$name)))
 					{
-						if($class->hasMethod('get'.$name))
-							throw new TConfigurationException('template_property_readonly',$type,$name);
-						else
-							throw new TConfigurationException('template_property_unknown',$type,$name);
+						if($class->hasMethod('get'.$name)) {
+													throw new TConfigurationException('template_property_readonly',$type,$name);
+						} else {
+													throw new TConfigurationException('template_property_unknown',$type,$name);
+						}
 					}
 				}
 			}
+		} else {
+					throw new TConfigurationException('template_component_required',$type);
 		}
-		else
-			throw new TConfigurationException('template_component_required',$type);
 	}
 	public function getIncludedFiles()
 	{
@@ -9079,18 +9666,19 @@ 
 						$line=$line-$this->_includeAtLine[$i]+1;
 						$srcFile=$this->_includedFiles[$i];
 						break;
+					} else {
+											$line=$line-$this->_includeLines[$i]+1;
 					}
-					else
-						$line=$line-$this->_includeLines[$i]+1;
 				}
 			}
 		}
 		$exception=new TTemplateException('template_format_invalid',$e->getMessage());
 		$exception->setLineNumber($line);
-		if(!empty($srcFile))
-			$exception->setTemplateFile($srcFile);
-		else
-			$exception->setTemplateSource($input);
+		if(!empty($srcFile)) {
+					$exception->setTemplateFile($srcFile);
+		} else {
+					$exception->setTemplateSource($input);
+		}
 		throw $exception;
 	}
 	protected function preprocess($input)
@@ -9100,9 +9688,9 @@ 
 			for($i=0;$i<$n;++$i)
 			{
 				$filePath=Prado::getPathOfNamespace(trim($matches[$i][1][0]),TTemplateManager::TEMPLATE_FILE_EXT);
-				if($filePath!==null && is_file($filePath))
-					$this->_includedFiles[]=$filePath;
-				else
+				if($filePath!==null && is_file($filePath)) {
+									$this->_includedFiles[]=$filePath;
+				} else
 				{
 					$errorLine=count(explode("\n",substr($input,0,$matches[$i][0][1]+1)));
 					$this->handleException(new TConfigurationException('template_include_invalid',trim($matches[$i][1][0])),$errorLine,$input);
@@ -9126,15 +9714,19 @@ 
 	{
 	  $component=new ReflectionClass('TComponent');
 	  $behaviors=$component->getStaticProperties();
-	  if(!isset($behaviors['_um']))
-	    return false;
+	  if(!isset($behaviors['_um'])) {
+	  	    return false;
+	  }
 	  foreach($behaviors['_um'] as $name=>$list)
 	  {
-	    if(strtolower($class->getShortName())!==$name && !$class->isSubclassOf($name)) continue;
+	    if(strtolower($class->getShortName())!==$name && !$class->isSubclassOf($name)) {
+	    	continue;
+	    }
 	    foreach($list as $param)
 	    {
-	      if(method_exists($param->getBehavior(),$method))
-	        return true;
+	      if(method_exists($param->getBehavior(),$method)) {
+	      	        return true;
+	      }
 	    }
 	  }
 	  return false;
@@ -9152,10 +9744,11 @@ 
 	{
 		$this->_initialized=true;
 		$service=$this->getService();
-		if($service instanceof TPageService)
-			$service->setThemeManager($this);
-		else
-			throw new TConfigurationException('thememanager_service_unavailable');
+		if($service instanceof TPageService) {
+					$service->setThemeManager($this);
+		} else {
+					throw new TConfigurationException('thememanager_service_unavailable');
+		}
 	}
 	public function getTheme($name)
 	{
@@ -9176,8 +9769,9 @@ 
 		$folder=@opendir($basePath);
 		while($file=@readdir($folder))
 		{
-			if($file!=='.' && $file!=='..' && $file!=='.svn' && is_dir($basePath.DIRECTORY_SEPARATOR.$file))
-				$themes[]=$file;
+			if($file!=='.' && $file!=='..' && $file!=='.svn' && is_dir($basePath.DIRECTORY_SEPARATOR.$file)) {
+							$themes[]=$file;
+			}
 		}
 		closedir($folder);
 		return $themes;
@@ -9187,21 +9781,23 @@ 
 		if($this->_basePath===null)
 		{
 			$this->_basePath=dirname($this->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
-			if(($basePath=realpath($this->_basePath))===false || !is_dir($basePath))
-				throw new TConfigurationException('thememanager_basepath_invalid2',$this->_basePath);
+			if(($basePath=realpath($this->_basePath))===false || !is_dir($basePath)) {
+							throw new TConfigurationException('thememanager_basepath_invalid2',$this->_basePath);
+			}
 			$this->_basePath=$basePath;
 		}
 		return $this->_basePath;
 	}
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('thememanager_basepath_unchangeable');
-		else
+		if($this->_initialized) {
+					throw new TInvalidOperationException('thememanager_basepath_unchangeable');
+		} else
 		{
 			$this->_basePath=Prado::getPathOfNamespace($value);
-			if($this->_basePath===null || !is_dir($this->_basePath))
-				throw new TInvalidDataValueException('thememanager_basepath_invalid',$value);
+			if($this->_basePath===null || !is_dir($this->_basePath)) {
+							throw new TInvalidDataValueException('thememanager_basepath_invalid',$value);
+			}
 		}
 	}
 	public function getBaseUrl()
@@ -9210,8 +9806,9 @@ 
 		{
 			$appPath=dirname($this->getRequest()->getApplicationFilePath());
 			$basePath=$this->getBasePath();
-			if(strpos($basePath,$appPath)===false)
-				throw new TConfigurationException('thememanager_baseurl_required');
+			if(strpos($basePath,$appPath)===false) {
+							throw new TConfigurationException('thememanager_baseurl_required');
+			}
 			$appUrl=rtrim(dirname($this->getRequest()->getApplicationUrl()),'/\\');
 			$this->_baseUrl=$appUrl.strtr(substr($basePath,strlen($appPath)),'\\','/');
 		}
@@ -9246,28 +9843,29 @@ 
 				list($skins,$cssFiles,$jsFiles,$timestamp)=$array;
 				if($this->getApplication()->getMode()!==TApplicationMode::Performance)
 				{
-					if(($dir=opendir($themePath))===false)
-						throw new TIOException('theme_path_inexistent',$themePath);
+					if(($dir=opendir($themePath))===false) {
+											throw new TIOException('theme_path_inexistent',$themePath);
+					}
 					$cacheValid=true;
 					while(($file=readdir($dir))!==false)
 					{
-						if($file==='.' || $file==='..')
-							continue;
-						else if(basename($file,'.css')!==$file)
-							$this->_cssFiles[]=$themeUrl.'/'.$file;
-						else if(basename($file,'.js')!==$file)
-							$this->_jsFiles[]=$themeUrl.'/'.$file;
-						else if(basename($file,self::SKIN_FILE_EXT)!==$file && filemtime($themePath.DIRECTORY_SEPARATOR.$file)>$timestamp)
+						if($file==='.' || $file==='..') {
+													continue;
+						} else if(basename($file,'.css')!==$file) {
+													$this->_cssFiles[]=$themeUrl.'/'.$file;
+						} else if(basename($file,'.js')!==$file) {
+													$this->_jsFiles[]=$themeUrl.'/'.$file;
+						} else if(basename($file,self::SKIN_FILE_EXT)!==$file && filemtime($themePath.DIRECTORY_SEPARATOR.$file)>$timestamp)
 						{
 							$cacheValid=false;
 							break;
 						}
 					}
 					closedir($dir);
-					if($cacheValid)
-						$this->_skins=$skins;
-				}
-				else
+					if($cacheValid) {
+											$this->_skins=$skins;
+					}
+				} else
 				{
 					$cacheValid=true;
 					$this->_cssFiles=$cssFiles;
@@ -9281,29 +9879,33 @@ 
 			$this->_cssFiles=array();
 			$this->_jsFiles=array();
 			$this->_skins=array();
-			if(($dir=opendir($themePath))===false)
-				throw new TIOException('theme_path_inexistent',$themePath);
+			if(($dir=opendir($themePath))===false) {
+							throw new TIOException('theme_path_inexistent',$themePath);
+			}
 			while(($file=readdir($dir))!==false)
 			{
-				if($file==='.' || $file==='..')
-					continue;
-				else if(basename($file,'.css')!==$file)
-					$this->_cssFiles[]=$themeUrl.'/'.$file;
-				else if(basename($file,'.js')!==$file)
-					$this->_jsFiles[]=$themeUrl.'/'.$file;
-				else if(basename($file,self::SKIN_FILE_EXT)!==$file)
+				if($file==='.' || $file==='..') {
+									continue;
+				} else if(basename($file,'.css')!==$file) {
+									$this->_cssFiles[]=$themeUrl.'/'.$file;
+				} else if(basename($file,'.js')!==$file) {
+									$this->_jsFiles[]=$themeUrl.'/'.$file;
+				} else if(basename($file,self::SKIN_FILE_EXT)!==$file)
 				{
 					$template=new TTemplate(file_get_contents($themePath.'/'.$file),$themePath,$themePath.'/'.$file);
 					foreach($template->getItems() as $skin)
 					{
-						if(!isset($skin[2]))  							continue;
-						else if($skin[0]!==-1)
-							throw new TConfigurationException('theme_control_nested',$skin[1],dirname($themePath));
+						if(!isset($skin[2])) {
+							continue;
+						} else if($skin[0]!==-1) {
+													throw new TConfigurationException('theme_control_nested',$skin[1],dirname($themePath));
+						}
 						$type=$skin[1];
 						$id=isset($skin[2]['skinid'])?$skin[2]['skinid']:0;
 						unset($skin[2]['skinid']);
-						if(isset($this->_skins[$type][$id]))
-							throw new TConfigurationException('theme_skinid_duplicated',$type,$id,dirname($themePath));
+						if(isset($this->_skins[$type][$id])) {
+													throw new TConfigurationException('theme_skinid_duplicated',$type,$id,dirname($themePath));
+						}
 						$this->_skins[$type][$id]=$skin[2];
 					}
 				}
@@ -9311,8 +9913,9 @@ 
 			closedir($dir);
 			sort($this->_cssFiles);
 			sort($this->_jsFiles);
-			if($cache!==null)
-				$cache->set(self::THEME_CACHE_PREFIX.$themePath,array($this->_skins,$this->_cssFiles,$this->_jsFiles,time()));
+			if($cache!==null) {
+							$cache->set(self::THEME_CACHE_PREFIX.$themePath,array($this->_skins,$this->_cssFiles,$this->_jsFiles,time()));
+			}
 		}
 	}
 	public function getName()
@@ -9350,8 +9953,9 @@ 
 	public function applySkin($control)
 	{
 		$type=get_class($control);
-		if(($id=$control->getSkinID())==='')
-			$id=0;
+		if(($id=$control->getSkinID())==='') {
+					$id=0;
+		}
 		if(isset($this->_skins[$type][$id]))
 		{
 			foreach($this->_skins[$type][$id] as $name=>$value)
@@ -9392,20 +9996,21 @@ 
 							{
 								$setter='set'.$name;
 								$control->$setter($value);
+							} else {
+															throw new TConfigurationException('theme_property_readonly',$type,$name);
 							}
-							else
-								throw new TConfigurationException('theme_property_readonly',$type,$name);
+						} else {
+													throw new TConfigurationException('theme_property_undefined',$type,$name);
 						}
-						else
-							throw new TConfigurationException('theme_property_undefined',$type,$name);
+					} else {
+						$control->setSubProperty($name,$value);
 					}
-					else							$control->setSubProperty($name,$value);
 				}
 			}
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 	public function getStyleSheetFiles()
 	{
@@ -9451,8 +10056,9 @@ 
 	protected function initPageContext($pageConfig)
 	{
 		$application=$this->getApplication();
-		foreach($pageConfig->getApplicationConfigurations() as $appConfig)
-			$application->applyConfiguration($appConfig);
+		foreach($pageConfig->getApplicationConfigurations() as $appConfig) {
+					$application->applyConfiguration($appConfig);
+		}
 		$this->applyConfiguration($pageConfig);
 	}
 	protected function applyConfiguration($config)
@@ -9463,12 +10069,14 @@ 
 				foreach($config->getExternalConfigurations() as $filePath=>$params)
 		{
 			list($configPagePath,$condition)=$params;
-			if($condition!==true)
-				$condition=$this->evaluateExpression($condition);
+			if($condition!==true) {
+							$condition=$this->evaluateExpression($condition);
+			}
 			if($condition)
 			{
-				if(($path=Prado::getPathOfNamespace($filePath,Prado::getApplication()->getConfigurationFileExt()))===null || !is_file($path))
-					throw new TConfigurationException('pageservice_includefile_invalid',$filePath);
+				if(($path=Prado::getPathOfNamespace($filePath,Prado::getApplication()->getConfigurationFileExt()))===null || !is_file($path)) {
+									throw new TConfigurationException('pageservice_includefile_invalid',$filePath);
+				}
 				$c=new TPageConfiguration($pagePath);
 				$c->loadFromFile($path,$configPagePath);
 				$this->applyConfiguration($c);
@@ -9478,8 +10086,9 @@ 
 	protected function determineRequestedPagePath()
 	{
 		$pagePath=$this->getRequest()->getServiceParameter();
-		if(empty($pagePath))
-			$pagePath=$this->getDefaultPage();
+		if(empty($pagePath)) {
+					$pagePath=$this->getDefaultPage();
+		}
 		return $pagePath;
 	}
 	protected function loadPageConfig($config)
@@ -9491,14 +10100,14 @@ 
 			$pageConfig=new TPageConfiguration($pagePath);
 			if($config!==null)
 			{
-				if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-					$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
-				else
-					$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
+				if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP) {
+									$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
+				} else {
+									$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
+				}
 			}
 			$pageConfig->loadFromFiles($this->getBasePath());
-		}
-		else
+		} else
 		{
 			$configCached=true;
 			$currentTimestamp=array();
@@ -9513,19 +10122,19 @@ 
 						if($fileName===0) 						{
 							$appConfigFile=$application->getConfigurationFile();
 							$currentTimestamp[0]=$appConfigFile===null?0:@filemtime($appConfigFile);
-							if($currentTimestamp[0]>$timestamp || ($timestamp>0 && !$currentTimestamp[0]))
-								$configCached=false;
-						}
-						else
+							if($currentTimestamp[0]>$timestamp || ($timestamp>0 && !$currentTimestamp[0])) {
+															$configCached=false;
+							}
+						} else
 						{
 							$currentTimestamp[$fileName]=@filemtime($fileName);
-							if($currentTimestamp[$fileName]>$timestamp || ($timestamp>0 && !$currentTimestamp[$fileName]))
-								$configCached=false;
+							if($currentTimestamp[$fileName]>$timestamp || ($timestamp>0 && !$currentTimestamp[$fileName])) {
+															$configCached=false;
+							}
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				$configCached=false;
 				$paths=explode('.',$pagePath);
@@ -9547,10 +10156,11 @@ 
 				$pageConfig=new TPageConfiguration($pagePath);
 				if($config!==null)
 				{
-					if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-						$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
-					else
-						$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
+					if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP) {
+											$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
+					} else {
+											$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
+					}
 				}
 				$pageConfig->loadFromFiles($this->getBasePath());
 				$cache->set(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath,array($pageConfig,$currentTimestamp));
@@ -9589,8 +10199,9 @@ 
 		if($this->_pagePath===null)
 		{
 			$this->_pagePath=strtr($this->determineRequestedPagePath(),'/\\','..');
-			if(empty($this->_pagePath))
-				throw new THttpException(404,'pageservice_page_required');
+			if(empty($this->_pagePath)) {
+							throw new THttpException(404,'pageservice_page_required');
+			}
 		}
 		return $this->_pagePath;
 	}
@@ -9604,10 +10215,11 @@ 
 	}
 	public function setDefaultPage($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('pageservice_defaultpage_unchangeable');
-		else
-			$this->_defaultPage=$value;
+		if($this->_initialized) {
+					throw new TInvalidOperationException('pageservice_defaultpage_unchangeable');
+		} else {
+					$this->_defaultPage=$value;
+		}
 	}
 	public function getDefaultPageUrl()
 	{
@@ -9621,18 +10233,20 @@ 
 			if(($this->_basePath=realpath($basePath))===false || !is_dir($this->_basePath))
 			{
 				$basePath=$this->getApplication()->getBasePath().DIRECTORY_SEPARATOR.self::FALLBACK_BASEPATH;
-				if(($this->_basePath=realpath($basePath))===false || !is_dir($this->_basePath))
-					throw new TConfigurationException('pageservice_basepath_invalid',$basePath);
+				if(($this->_basePath=realpath($basePath))===false || !is_dir($this->_basePath)) {
+									throw new TConfigurationException('pageservice_basepath_invalid',$basePath);
+				}
 			}
 		}
 		return $this->_basePath;
 	}
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('pageservice_basepath_unchangeable');
-		else if(($path=Prado::getPathOfNamespace($value))===null || !is_dir($path))
-			throw new TConfigurationException('pageservice_basepath_invalid',$value);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('pageservice_basepath_unchangeable');
+		} else if(($path=Prado::getPathOfNamespace($value))===null || !is_dir($path)) {
+					throw new TConfigurationException('pageservice_basepath_invalid',$value);
+		}
 		$this->_basePath=realpath($path);
 	}
 	public function setBasePageClass($value)
@@ -9661,33 +10275,38 @@ 
 		$path=$this->getBasePath().DIRECTORY_SEPARATOR.strtr($pagePath,'.',DIRECTORY_SEPARATOR);
 		$hasTemplateFile=is_file($path.self::PAGE_FILE_EXT);
 		$hasClassFile=is_file($path.Prado::CLASS_FILE_EXT);
-		if(!$hasTemplateFile && !$hasClassFile)
-			throw new THttpException(404,'pageservice_page_unknown',$pagePath);
+		if(!$hasTemplateFile && !$hasClassFile) {
+					throw new THttpException(404,'pageservice_page_unknown',$pagePath);
+		}
 		if($hasClassFile)
 		{
 			$className=basename($path);
-			if(!class_exists($className,false))
-				include_once($path.Prado::CLASS_FILE_EXT);
-		}
-		else
+			if(!class_exists($className,false)) {
+							include_once($path.Prado::CLASS_FILE_EXT);
+			}
+		} else
 		{
 			$className=$this->getBasePageClass();
 			Prado::using($className);
-			if(($pos=strrpos($className,'.'))!==false)
-				$className=substr($className,$pos+1);
+			if(($pos=strrpos($className,'.'))!==false) {
+							$className=substr($className,$pos+1);
+			}
 		}
- 		if(!class_exists($className,false) || ($className!=='TPage' && !is_subclass_of($className,'TPage')))
-			throw new THttpException(404,'pageservice_page_unknown',$pagePath);
+ 		if(!class_exists($className,false) || ($className!=='TPage' && !is_subclass_of($className,'TPage'))) {
+ 					throw new THttpException(404,'pageservice_page_unknown',$pagePath);
+ 		}
 		$page=Prado::createComponent($className);
 		$page->setPagePath($pagePath);
-		if($hasTemplateFile)
-			$page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path.self::PAGE_FILE_EXT));
+		if($hasTemplateFile) {
+					$page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path.self::PAGE_FILE_EXT));
+		}
 		return $page;
 	}
 	protected function runPage($page,$properties)
 	{
-		foreach($properties as $name=>$value)
-			$page->setSubProperty($name,$value);
+		foreach($properties as $name=>$value) {
+					$page->setSubProperty($name,$value);
+		}
 		$page->run($this->getResponse()->createHtmlWriter());
 	}
 	public function constructUrl($pagePath,$getParams=null,$encodeAmpersand=true,$encodeGetItems=true)
@@ -9735,30 +10354,32 @@ 
 		{
 			$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName,$configPagePath);
 			$path.=DIRECTORY_SEPARATOR.$p;
-			if($configPagePath==='')
-				$configPagePath=$p;
-			else
-				$configPagePath.='.'.$p;
+			if($configPagePath==='') {
+							$configPagePath=$p;
+			} else {
+							$configPagePath.='.'.$p;
+			}
 		}
 		$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName,$configPagePath);
 		$this->_rules=new TAuthorizationRuleCollection($this->_rules);
 	}
 	public function loadFromFile($fname,$configPagePath)
 	{
-		if(empty($fname) || !is_file($fname))
-			return;
+		if(empty($fname) || !is_file($fname)) {
+					return;
+		}
 		if(Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent,dirname($fname),$configPagePath);
-		}
-		else
+		} else
 		{
 			$dom=new TXmlDocument;
-			if($dom->loadFromFile($fname))
-				$this->loadFromXml($dom,dirname($fname),$configPagePath);
-			else
-				throw new TConfigurationException('pageserviceconf_file_invalid',$fname);
+			if($dom->loadFromFile($fname)) {
+							$this->loadFromXml($dom,dirname($fname),$configPagePath);
+			} else {
+							throw new TConfigurationException('pageserviceconf_file_invalid',$fname);
+			}
 		}
 	}
 	public function loadFromPhp($config,$configPath,$configPagePath)
@@ -9792,14 +10413,17 @@ 
 			{
 				$patterns=isset($authorization['pages'])?$authorization['pages']:'';
 				$ruleApplies=false;
-				if(empty($patterns) || trim($patterns)==='*') 					$ruleApplies=true;
-				else
+				if(empty($patterns) || trim($patterns)==='*') {
+					$ruleApplies=true;
+				} else
 				{
 					foreach(explode(',',$patterns) as $pattern)
 					{
 						if(($pattern=trim($pattern))!=='')
 						{
-														if($configPagePath!=='')  								$pattern=$configPagePath.'.'.$pattern;
+														if($configPagePath!=='') {
+															$pattern=$configPagePath.'.'.$pattern;
+														}
 							if(strcasecmp($pattern,$this->_pagePath)===0)
 							{
 								$ruleApplies=true;
@@ -9844,11 +10468,14 @@ 
 				}
 				$matching=false;
 				$id=($configPagePath==='')?$id:$configPagePath.'.'.$id;
-				if(strcasecmp($id,$this->_pagePath)===0)
-					$matching=true;
-				else if($id[strlen($id)-1]==='*') 					$matching=strncasecmp($this->_pagePath,$id,strlen($id)-1)===0;
-				if($matching)
-					$this->_properties=array_merge($this->_properties,$properties);
+				if(strcasecmp($id,$this->_pagePath)===0) {
+									$matching=true;
+				} else if($id[strlen($id)-1]==='*') {
+					$matching=strncasecmp($this->_pagePath,$id,strlen($id)-1)===0;
+				}
+				if($matching) {
+									$this->_properties=array_merge($this->_properties,$properties);
+				}
 			}
 		}
 				if(isset($config['includes']) && is_array($config['includes']))
@@ -9856,13 +10483,15 @@ 
 			foreach($config['includes'] as $include)
 			{
 				$when = isset($include['when'])?true:false;
-				if(!isset($include['file']))
-					throw new TConfigurationException('pageserviceconf_includefile_required');
+				if(!isset($include['file'])) {
+									throw new TConfigurationException('pageserviceconf_includefile_required');
+				}
 				$filePath = $include['file'];
-				if(isset($this->_includes[$filePath]))
-					$this->_includes[$filePath]=array($configPagePath,'('.$this->_includes[$filePath][1].') || ('.$when.')');
-				else
-					$this->_includes[$filePath]=array($configPagePath,$when);
+				if(isset($this->_includes[$filePath])) {
+									$this->_includes[$filePath]=array($configPagePath,'('.$this->_includes[$filePath][1].') || ('.$when.')');
+				} else {
+									$this->_includes[$filePath]=array($configPagePath,$when);
+				}
 			}
 		}
 	}
@@ -9875,14 +10504,17 @@ 
 			{
 				$patterns=$node->getAttribute('pages');
 				$ruleApplies=false;
-				if(empty($patterns) || trim($patterns)==='*') 					$ruleApplies=true;
-				else
+				if(empty($patterns) || trim($patterns)==='*') {
+					$ruleApplies=true;
+				} else
 				{
 					foreach(explode(',',$patterns) as $pattern)
 					{
 						if(($pattern=trim($pattern))!=='')
 						{
-														if($configPagePath!=='')  								$pattern=$configPagePath.'.'.$pattern;
+														if($configPagePath!=='') {
+															$pattern=$configPagePath.'.'.$pattern;
+														}
 							if(strcasecmp($pattern,$this->_pagePath)===0)
 							{
 								$ruleApplies=true;
@@ -9898,8 +10530,9 @@ 
 						}
 					}
 				}
-				if($ruleApplies)
-					$rules[]=new TAuthorizationRule($node->getTagName(),$node->getAttribute('users'),$node->getAttribute('roles'),$node->getAttribute('verb'),$node->getAttribute('ips'));
+				if($ruleApplies) {
+									$rules[]=new TAuthorizationRule($node->getTagName(),$node->getAttribute('users'),$node->getAttribute('roles'),$node->getAttribute('verb'),$node->getAttribute('ips'));
+				}
 			}
 			$this->_rules=array_merge($rules,$this->_rules);
 		}
@@ -9910,27 +10543,34 @@ 
 			{
 				$properties=$node->getAttributes();
 				$id=$properties->remove('id');
-				if(empty($id))
-					throw new TConfigurationException('pageserviceconf_page_invalid',$configPath);
+				if(empty($id)) {
+									throw new TConfigurationException('pageserviceconf_page_invalid',$configPath);
+				}
 				$matching=false;
 				$id=($configPagePath==='')?$id:$configPagePath.'.'.$id;
-				if(strcasecmp($id,$this->_pagePath)===0)
-					$matching=true;
-				else if($id[strlen($id)-1]==='*') 					$matching=strncasecmp($this->_pagePath,$id,strlen($id)-1)===0;
-				if($matching)
-					$this->_properties=array_merge($this->_properties,$properties->toArray());
+				if(strcasecmp($id,$this->_pagePath)===0) {
+									$matching=true;
+				} else if($id[strlen($id)-1]==='*') {
+					$matching=strncasecmp($this->_pagePath,$id,strlen($id)-1)===0;
+				}
+				if($matching) {
+									$this->_properties=array_merge($this->_properties,$properties->toArray());
+				}
 			}
 		}
 				foreach($dom->getElementsByTagName('include') as $node)
 		{
-			if(($when=$node->getAttribute('when'))===null)
-				$when=true;
-			if(($filePath=$node->getAttribute('file'))===null)
-				throw new TConfigurationException('pageserviceconf_includefile_required');
-			if(isset($this->_includes[$filePath]))
-				$this->_includes[$filePath]=array($configPagePath,'('.$this->_includes[$filePath][1].') || ('.$when.')');
-			else
-				$this->_includes[$filePath]=array($configPagePath,$when);
+			if(($when=$node->getAttribute('when'))===null) {
+							$when=true;
+			}
+			if(($filePath=$node->getAttribute('file'))===null) {
+							throw new TConfigurationException('pageserviceconf_includefile_required');
+			}
+			if(isset($this->_includes[$filePath])) {
+							$this->_includes[$filePath]=array($configPagePath,'('.$this->_includes[$filePath][1].') || ('.$when.')');
+			} else {
+							$this->_includes[$filePath]=array($configPagePath,$when);
+			}
 		}
 	}
 }
@@ -9946,12 +10586,15 @@ 
 	public function init($config)
 	{
 		$application=$this->getApplication();
-		if($this->_basePath===null)
-			$this->_basePath=dirname($application->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
-		if(!is_writable($this->_basePath) || !is_dir($this->_basePath))
-			throw new TConfigurationException('assetmanager_basepath_invalid',$this->_basePath);
-		if($this->_baseUrl===null)
-			$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationUrl()),'/\\').'/'.self::DEFAULT_BASEPATH;
+		if($this->_basePath===null) {
+					$this->_basePath=dirname($application->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
+		}
+		if(!is_writable($this->_basePath) || !is_dir($this->_basePath)) {
+					throw new TConfigurationException('assetmanager_basepath_invalid',$this->_basePath);
+		}
+		if($this->_baseUrl===null) {
+					$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationUrl()),'/\\').'/'.self::DEFAULT_BASEPATH;
+		}
 		$application->setAssetManager($this);
 		$this->_initialized=true;
 	}
@@ -9961,13 +10604,14 @@ 
 	}
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('assetmanager_basepath_unchangeable');
-		else
+		if($this->_initialized) {
+					throw new TInvalidOperationException('assetmanager_basepath_unchangeable');
+		} else
 		{
 			$this->_basePath=Prado::getPathOfNamespace($value);
-			if($this->_basePath===null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
-				throw new TInvalidDataValueException('assetmanager_basepath_invalid',$value);
+			if($this->_basePath===null || !is_dir($this->_basePath) || !is_writable($this->_basePath)) {
+							throw new TInvalidDataValueException('assetmanager_basepath_invalid',$value);
+			}
 		}
 	}
 	public function getBaseUrl()
@@ -9976,27 +10620,28 @@ 
 	}
 	public function setBaseUrl($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
-		else
-			$this->_baseUrl=rtrim($value,'/');
+		if($this->_initialized) {
+					throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
+		} else {
+					$this->_baseUrl=rtrim($value,'/');
+		}
 	}
 	public function publishFilePath($path,$checkTimestamp=false)
 	{
-		if(isset($this->_published[$path]))
-			return $this->_published[$path];
-		else if(empty($path) || ($fullpath=realpath($path))===false)
-			throw new TInvalidDataValueException('assetmanager_filepath_invalid',$path);
-		else if(is_file($fullpath))
+		if(isset($this->_published[$path])) {
+					return $this->_published[$path];
+		} else if(empty($path) || ($fullpath=realpath($path))===false) {
+					throw new TInvalidDataValueException('assetmanager_filepath_invalid',$path);
+		} else if(is_file($fullpath))
 		{
 			$dir=$this->hash(dirname($fullpath));
 			$fileName=basename($fullpath);
 			$dst=$this->_basePath.DIRECTORY_SEPARATOR.$dir;
-			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
-				$this->copyFile($fullpath,$dst);
+			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance) {
+							$this->copyFile($fullpath,$dst);
+			}
 			return $this->_published[$path]=$this->_baseUrl.'/'.$dir.'/'.$fileName;
-		}
-		else
+		} else
 		{
 			$dir=$this->hash($fullpath);
 			if(!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
@@ -10017,18 +10662,20 @@ 
 	public function getPublishedPath($path)
 	{
 		$path=realpath($path);
-		if(is_file($path))
-			return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash(dirname($path)).DIRECTORY_SEPARATOR.basename($path);
-		else
-			return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash($path);
+		if(is_file($path)) {
+					return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash(dirname($path)).DIRECTORY_SEPARATOR.basename($path);
+		} else {
+					return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash($path);
+		}
 	}
 	public function getPublishedUrl($path)
 	{
 		$path=realpath($path);
-		if(is_file($path))
-			return $this->_baseUrl.'/'.$this->hash(dirname($path)).'/'.basename($path);
-		else
-			return $this->_baseUrl.'/'.$this->hash($path);
+		if(is_file($path)) {
+					return $this->_baseUrl.'/'.$this->hash(dirname($path)).'/'.basename($path);
+		} else {
+					return $this->_baseUrl.'/'.$this->hash($path);
+		}
 	}
 	protected function hash($dir)
 	{
@@ -10058,18 +10705,18 @@ 
 		{
 			while($file=@readdir($folder))
 			{
-				if($file==='.' || $file==='..' || $file==='.svn')
-					continue;
-				else if(is_file($src.DIRECTORY_SEPARATOR.$file))
+				if($file==='.' || $file==='..' || $file==='.svn') {
+									continue;
+				} else if(is_file($src.DIRECTORY_SEPARATOR.$file))
 				{
 					if(@filemtime($dst.DIRECTORY_SEPARATOR.$file)<@filemtime($src.DIRECTORY_SEPARATOR.$file))
 					{
 						@copy($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
 					}
+				} else {
+									$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 				}
-				else
-					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 			}
 			closedir($folder);
 		} else {
@@ -10078,11 +10725,11 @@ 
 	}
 	public function publishTarFile($tarfile, $md5sum, $checkTimestamp=false)
 	{
-		if(isset($this->_published[$md5sum]))
-			return $this->_published[$md5sum];
-		else if(($fullpath=realpath($md5sum))===false || !is_file($fullpath))
-			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid',$md5sum);
-		else
+		if(isset($this->_published[$md5sum])) {
+					return $this->_published[$md5sum];
+		} else if(($fullpath=realpath($md5sum))===false || !is_file($fullpath)) {
+					throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid',$md5sum);
+		} else
 		{
 			$dir=$this->hash(dirname($fullpath));
 			$fileName=basename($fullpath);
@@ -10100,9 +10747,9 @@ 
 	}
 	protected function deployTarFile($path,$destination)
 	{
-		if(($fullpath=realpath($path))===false || !is_file($fullpath))
-			throw new TIOException('assetmanager_tarfile_invalid',$path);
-		else
+		if(($fullpath=realpath($path))===false || !is_file($fullpath)) {
+					throw new TIOException('assetmanager_tarfile_invalid',$path);
+		} else
 		{
 			Prado::using('System.IO.TTarFileExtractor');
 			$tar = new TTarFileExtractor($fullpath);
@@ -10120,21 +10767,24 @@ 
 	private $_translateDefaultCulture=true;
 	public function init($config)
 	{
-		if($this->_charset===null)
-			$this->_charset=$this->getDefaultCharset();
-		if($this->_culture===null)
-			$this->_culture=$this->getDefaultCulture();
+		if($this->_charset===null) {
+					$this->_charset=$this->getDefaultCharset();
+		}
+		if($this->_culture===null) {
+					$this->_culture=$this->getDefaultCulture();
+		}
 		if($config!==null)
 		{
-			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-				$translation = isset($config['translate'])?$config['translate']:null;
-			else
+			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP) {
+							$translation = isset($config['translate'])?$config['translate']:null;
+			} else
 			{
 				$t = $config->getElementByTagName('translation');
 				$translation = ($t)?$t->getAttributes():null;
 			}
-			if($translation)
-				$this->setTranslationConfiguration($translation);
+			if($translation) {
+							$this->setTranslationConfiguration($translation);
+			}
 		}
 		$this->getApplication()->setGlobalization($this);
 	}
@@ -10193,12 +10843,12 @@ 
 				$config['source'] = Prado::getPathOfNamespace($config['source']);
 				if(!is_dir($config['source']))
 				{
-					if(@mkdir($config['source'])===false)
-					throw new TConfigurationException('globalization_source_path_failed',
+					if(@mkdir($config['source'])===false) {
+										throw new TConfigurationException('globalization_source_path_failed',
 						$config['source']);
+					}
 					chmod($config['source'], PRADO_CHMOD); 				}
-			}
-			else
+			} else
 			{
 				throw new TConfigurationException("invalid source dir '{$config['source']}'");
 			}
@@ -10208,9 +10858,10 @@ 
 			$config['cache'] = $this->getApplication()->getRunTimePath().'/i18n';
 			if(!is_dir($config['cache']))
 			{
-				if(@mkdir($config['cache'])===false)
-					throw new TConfigurationException('globalization_cache_path_failed',
+				if(@mkdir($config['cache'])===false) {
+									throw new TConfigurationException('globalization_cache_path_failed',
 						$config['cache']);
+				}
 				chmod($config['cache'], PRADO_CHMOD); 			}
 		}
 		$this->_translation = $config;
@@ -10225,11 +10876,14 @@ 
 	}
 	public function getCultureVariants($culture=null)
 	{
-		if($culture===null) $culture = $this->getCulture();
+		if($culture===null) {
+			$culture = $this->getCulture();
+		}
 		$variants = explode('_', $culture);
 		$result = array();
-		for(; count($variants) > 0; array_pop($variants))
-			$result[] = implode('_', $variants);
+		for(; count($variants) > 0; array_pop($variants)) {
+					$result[] = implode('_', $variants);
+		}
 		return $result;
 	}
 	public function getLocalizedResource($file,$culture=null)
@@ -10237,11 +10891,13 @@ 
 		$files = array();
 		$variants = $this->getCultureVariants($culture);
 		$path = pathinfo($file);
-		foreach($variants as $variant)
-			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$variant.DIRECTORY_SEPARATOR.$path['basename'];
+		foreach($variants as $variant) {
+					$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$variant.DIRECTORY_SEPARATOR.$path['basename'];
+		}
 		$filename = substr($path['basename'],0,strrpos($path['basename'],'.'));
-		foreach($variants as $variant)
-			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$filename.'.'.$variant.'.'.$path['extension'];
+		foreach($variants as $variant) {
+					$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$filename.'.'.$variant.'.'.$path['extension'];
+		}
 		$files[] = $file;
 		return $files;
 	}
@@ -10312,8 +10968,9 @@ 
 				Prado::setApplication($this);
 		$this->setConfigurationType($configType);
 		$this->resolvePaths($basePath);
-		if($cacheConfig)
-			$this->_cacheFile=$this->_runtimePath.DIRECTORY_SEPARATOR.self::CONFIGCACHE_FILE;
+		if($cacheConfig) {
+					$this->_cacheFile=$this->_runtimePath.DIRECTORY_SEPARATOR.self::CONFIGCACHE_FILE;
+		}
 				$this->_uniqueID=md5($this->_runtimePath);
 		$this->_parameters=new TMap;
 		$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
@@ -10321,17 +10978,18 @@ 
 	}
 	protected function resolvePaths($basePath)
 	{
-				if(empty($basePath) || ($basePath=realpath($basePath))===false)
-			throw new TConfigurationException('application_basepath_invalid',$basePath);
-		if(is_dir($basePath) && is_file($basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName()))
-			$configFile=$basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName();
-		else if(is_file($basePath))
+				if(empty($basePath) || ($basePath=realpath($basePath))===false) {
+							throw new TConfigurationException('application_basepath_invalid',$basePath);
+				}
+		if(is_dir($basePath) && is_file($basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName())) {
+					$configFile=$basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName();
+		} else if(is_file($basePath))
 		{
 			$configFile=$basePath;
 			$basePath=dirname($configFile);
+		} else {
+					$configFile=null;
 		}
-		else
-			$configFile=null;
 				$runtimePath=$basePath.DIRECTORY_SEPARATOR.self::RUNTIME_PATH;
 		if(is_writable($runtimePath))
 		{
@@ -10340,16 +10998,17 @@ 
 				$runtimePath.=DIRECTORY_SEPARATOR.basename($configFile).'-'.Prado::getVersion();
 				if(!is_dir($runtimePath))
 				{
-					if(@mkdir($runtimePath)===false)
-						throw new TConfigurationException('application_runtimepath_failed',$runtimePath);
+					if(@mkdir($runtimePath)===false) {
+											throw new TConfigurationException('application_runtimepath_failed',$runtimePath);
+					}
 					@chmod($runtimePath, PRADO_CHMOD); 				}
 				$this->setConfigurationFile($configFile);
 			}
 			$this->setBasePath($basePath);
 			$this->setRuntimePath($runtimePath);
+		} else {
+					throw new TConfigurationException('application_runtimepath_invalid',$runtimePath);
 		}
-		else
-			throw new TConfigurationException('application_runtimepath_invalid',$runtimePath);
 	}
 	public function run()
 	{
@@ -10361,16 +11020,17 @@ 
 			$this->_requestCompleted=false;
 			while($this->_step<$n)
 			{
-				if($this->_mode===self::STATE_OFF)
-					throw new THttpException(503,'application_unavailable');
-				if($this->_requestCompleted)
-					break;
+				if($this->_mode===self::STATE_OFF) {
+									throw new THttpException(503,'application_unavailable');
+				}
+				if($this->_requestCompleted) {
+									break;
+				}
 				$method=self::$_steps[$this->_step];
 				$this->$method();
 				$this->_step++;
 			}
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$this->onError($e);
 		}
@@ -10391,12 +11051,14 @@ 
 	public function setGlobalState($key,$value,$defaultValue=null,$forceSave=false)
 	{
 		$this->_stateChanged=true;
-		if($value===$defaultValue)
-			unset($this->_globals[$key]);
-		else
-			$this->_globals[$key]=$value;
-		if($forceSave)
-			$this->saveGlobals();
+		if($value===$defaultValue) {
+					unset($this->_globals[$key]);
+		} else {
+					$this->_globals[$key]=$value;
+		}
+		if($forceSave) {
+					$this->saveGlobals();
+		}
 	}
 	public function clearGlobalState($key)
 	{
@@ -10505,8 +11167,9 @@ 
 	public function setRuntimePath($value)
 	{
 		$this->_runtimePath=$value;
-		if($this->_cacheFile)
-			$this->_cacheFile=$this->_runtimePath.DIRECTORY_SEPARATOR.self::CONFIGCACHE_FILE;
+		if($this->_cacheFile) {
+					$this->_cacheFile=$this->_runtimePath.DIRECTORY_SEPARATOR.self::CONFIGCACHE_FILE;
+		}
 				$this->_uniqueID=md5($this->_runtimePath);
 	}
 	public function getService()
@@ -10519,15 +11182,17 @@ 
 	}
 	public function setModule($id,IModule $module=null)
 	{
-		if(isset($this->_modules[$id]))
-			throw new TConfigurationException('application_moduleid_duplicated',$id);
-		else
-			$this->_modules[$id]=$module;
+		if(isset($this->_modules[$id])) {
+					throw new TConfigurationException('application_moduleid_duplicated',$id);
+		} else {
+					$this->_modules[$id]=$module;
+		}
 	}
 	public function getModule($id)
 	{
-		if(!array_key_exists($id, $this->_modules))
-			return null;
+		if(!array_key_exists($id, $this->_modules)) {
+					return null;
+		}
 				if($this->_modules[$id]===null)
 		{
 			$module = $this->internalLoadModule($id, true);
@@ -10665,8 +11330,9 @@ 
 	}
 	public function getAuthorizationRules()
 	{
-		if($this->_authRules===null)
-			$this->_authRules=new TAuthorizationRuleCollection;
+		if($this->_authRules===null) {
+					$this->_authRules=new TAuthorizationRuleCollection;
+		}
 		return $this->_authRules;
 	}
 	protected function getApplicationConfigurationClass()
@@ -10684,7 +11350,9 @@ 
 		$module=Prado::createComponent($moduleClass);
 		foreach($initProperties as $name=>$value)
 		{
-			if($name==='lazy') continue;
+			if($name==='lazy') {
+				continue;
+			}
 			$module->setSubProperty($name,$value);
 		}
 		$this->setModule($id,$module);
@@ -10693,52 +11361,64 @@ 
 	}
 	public function applyConfiguration($config,$withinService=false)
 	{
-		if($config->getIsEmpty())
-			return;
-				foreach($config->getAliases() as $alias=>$path)
-			Prado::setPathOfAlias($alias,$path);
-		foreach($config->getUsings() as $using)
-			Prado::using($using);
+		if($config->getIsEmpty()) {
+					return;
+		}
+				foreach($config->getAliases() as $alias=>$path) {
+							Prado::setPathOfAlias($alias,$path);
+				}
+		foreach($config->getUsings() as $using) {
+					Prado::using($using);
+		}
 				if(!$withinService)
 		{
-			foreach($config->getProperties() as $name=>$value)
-				$this->setSubProperty($name,$value);
+			foreach($config->getProperties() as $name=>$value) {
+							$this->setSubProperty($name,$value);
+			}
+		}
+		if(empty($this->_services)) {
+					$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
 		}
-		if(empty($this->_services))
-			$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
 				foreach($config->getParameters() as $id=>$parameter)
 		{
 			if(is_array($parameter))
 			{
 				$component=Prado::createComponent($parameter[0]);
-				foreach($parameter[1] as $name=>$value)
-					$component->setSubProperty($name,$value);
+				foreach($parameter[1] as $name=>$value) {
+									$component->setSubProperty($name,$value);
+				}
 				$this->_parameters->add($id,$component);
+			} else {
+							$this->_parameters->add($id,$parameter);
 			}
-			else
-				$this->_parameters->add($id,$parameter);
 		}
 				$modules=array();
 		foreach($config->getModules() as $id=>$moduleConfig)
 		{
-			if(!is_string($id))
-				$id='_module'.count($this->_lazyModules);
+			if(!is_string($id)) {
+							$id='_module'.count($this->_lazyModules);
+			}
 			$this->_lazyModules[$id]=$moduleConfig;
-			if($module = $this->internalLoadModule($id))
-				$modules[]=$module;
+			if($module = $this->internalLoadModule($id)) {
+							$modules[]=$module;
+			}
 		}
-		foreach($modules as $module)
-			$module[0]->init($module[1]);
-				foreach($config->getServices() as $serviceID=>$serviceConfig)
-			$this->_services[$serviceID]=$serviceConfig;
+		foreach($modules as $module) {
+					$module[0]->init($module[1]);
+		}
+				foreach($config->getServices() as $serviceID=>$serviceConfig) {
+							$this->_services[$serviceID]=$serviceConfig;
+				}
 				foreach($config->getExternalConfigurations() as $filePath=>$condition)
 		{
-			if($condition!==true)
-				$condition=$this->evaluateExpression($condition);
+			if($condition!==true) {
+							$condition=$this->evaluateExpression($condition);
+			}
 			if($condition)
 			{
-				if(($path=Prado::getPathOfNamespace($filePath,$this->getConfigurationFileExt()))===null || !is_file($path))
-					throw new TConfigurationException('application_includefile_invalid',$filePath);
+				if(($path=Prado::getPathOfNamespace($filePath,$this->getConfigurationFileExt()))===null || !is_file($path)) {
+									throw new TConfigurationException('application_includefile_invalid',$filePath);
+				}
 				$cn=$this->getApplicationConfigurationClass();
 				$c=new $cn;
 				$c->loadFromFile($path);
@@ -10754,15 +11434,17 @@ 
 			{
 				$config=new TApplicationConfiguration;
 				$config->loadFromFile($this->_configFile);
-				if($this->_cacheFile!==null)
-					file_put_contents($this->_cacheFile,serialize($config),LOCK_EX);
+				if($this->_cacheFile!==null) {
+									file_put_contents($this->_cacheFile,serialize($config),LOCK_EX);
+				}
+			} else {
+							$config=unserialize(file_get_contents($this->_cacheFile));
 			}
-			else
-				$config=unserialize(file_get_contents($this->_cacheFile));
 			$this->applyConfiguration($config,false);
 		}
-		if(($serviceID=$this->getRequest()->resolveRequest(array_keys($this->_services)))===null)
-			$serviceID=$this->getPageServiceID();
+		if(($serviceID=$this->getRequest()->resolveRequest(array_keys($this->_services)))===null) {
+					$serviceID=$this->getPageServiceID();
+		}
 		$this->startService($serviceID);
 	}
 	public function startService($serviceID)
@@ -10771,27 +11453,31 @@ 
 		{
 			list($serviceClass,$initProperties,$configElement)=$this->_services[$serviceID];
 			$service=Prado::createComponent($serviceClass);
-			if(!($service instanceof IService))
-				throw new THttpException(500,'application_service_invalid',$serviceClass);
-			if(!$service->getEnabled())
-				throw new THttpException(500,'application_service_unavailable',$serviceClass);
+			if(!($service instanceof IService)) {
+							throw new THttpException(500,'application_service_invalid',$serviceClass);
+			}
+			if(!$service->getEnabled()) {
+							throw new THttpException(500,'application_service_unavailable',$serviceClass);
+			}
 			$service->setID($serviceID);
 			$this->setService($service);
-			foreach($initProperties as $name=>$value)
-				$service->setSubProperty($name,$value);
+			foreach($initProperties as $name=>$value) {
+							$service->setSubProperty($name,$value);
+			}
 			if($configElement!==null)
 			{
 				$config=new TApplicationConfiguration;
-				if($this->getConfigurationType()==self::CONFIG_TYPE_PHP)
-					$config->loadFromPhp($configElement,$this->getBasePath());
-				else
-					$config->loadFromXml($configElement,$this->getBasePath());
+				if($this->getConfigurationType()==self::CONFIG_TYPE_PHP) {
+									$config->loadFromPhp($configElement,$this->getBasePath());
+				} else {
+									$config->loadFromXml($configElement,$this->getBasePath());
+				}
 				$this->applyConfiguration($config,true);
 			}
 			$service->init($configElement);
+		} else {
+					throw new THttpException(500,'application_service_unknown',$serviceID);
 		}
-		else
-			throw new THttpException(500,'application_service_unknown',$serviceID);
 	}
 	public function onError($param)
 	{
@@ -10834,8 +11520,9 @@ 
 	}
 	public function runService()
 	{
-		if($this->_service)
-			$this->_service->run();
+		if($this->_service) {
+					$this->_service->run();
+		}
 	}
 	public function onSaveState()
 	{
@@ -10882,8 +11569,7 @@ 
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent,dirname($fname));
-		}
-		else
+		} else
 		{
 			$dom=new TXmlDocument;
 			$dom->loadFromFile($fname);
@@ -10904,16 +11590,21 @@ 
 			}
 			$this->_empty = false;
 		}
-		if(isset($config['paths']) && is_array($config['paths']))
-			$this->loadPathsPhp($config['paths'],$configPath);
-		if(isset($config['modules']) && is_array($config['modules']))
-			$this->loadModulesPhp($config['modules'],$configPath);
-		if(isset($config['services']) && is_array($config['services']))
-			$this->loadServicesPhp($config['services'],$configPath);
-		if(isset($config['parameters']) && is_array($config['parameters']))
-			$this->loadParametersPhp($config['parameters'], $configPath);
-		if(isset($config['includes']) && is_array($config['includes']))
-			$this->loadExternalXml($config['includes'],$configPath);
+		if(isset($config['paths']) && is_array($config['paths'])) {
+					$this->loadPathsPhp($config['paths'],$configPath);
+		}
+		if(isset($config['modules']) && is_array($config['modules'])) {
+					$this->loadModulesPhp($config['modules'],$configPath);
+		}
+		if(isset($config['services']) && is_array($config['services'])) {
+					$this->loadServicesPhp($config['services'],$configPath);
+		}
+		if(isset($config['parameters']) && is_array($config['parameters'])) {
+					$this->loadParametersPhp($config['parameters'], $configPath);
+		}
+		if(isset($config['includes']) && is_array($config['includes'])) {
+					$this->loadExternalXml($config['includes'],$configPath);
+		}
 	}
 	public function loadFromXml($dom,$configPath)
 	{
@@ -10953,13 +11644,17 @@ 
 			foreach($pathsNode['aliases'] as $id=>$path)
 			{
 				$path=str_replace('\\','/',$path);
-				if(preg_match('/^\\/|.:\\/|.:\\\\/',$path))						$p=realpath($path);
-				else
-					$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
-				if($p===false || !is_dir($p))
-					throw new TConfigurationException('appconfig_aliaspath_invalid',$id,$path);
-				if(isset($this->_aliases[$id]))
-					throw new TConfigurationException('appconfig_alias_redefined',$id);
+				if(preg_match('/^\\/|.:\\/|.:\\\\/',$path)) {
+					$p=realpath($path);
+				} else {
+									$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
+				}
+				if($p===false || !is_dir($p)) {
+									throw new TConfigurationException('appconfig_aliaspath_invalid',$id,$path);
+				}
+				if(isset($this->_aliases[$id])) {
+									throw new TConfigurationException('appconfig_alias_redefined',$id);
+				}
 				$this->_aliases[$id]=$p;
 			}
 		}
@@ -10982,26 +11677,31 @@ 
 					if(($id=$element->getAttribute('id'))!==null && ($path=$element->getAttribute('path'))!==null)
 					{
 						$path=str_replace('\\','/',$path);
-						if(preg_match('/^\\/|.:\\/|.:\\\\/',$path))								$p=realpath($path);
-						else
-							$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
-						if($p===false || !is_dir($p))
-							throw new TConfigurationException('appconfig_aliaspath_invalid',$id,$path);
-						if(isset($this->_aliases[$id]))
-							throw new TConfigurationException('appconfig_alias_redefined',$id);
+						if(preg_match('/^\\/|.:\\/|.:\\\\/',$path)) {
+							$p=realpath($path);
+						} else {
+													$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
+						}
+						if($p===false || !is_dir($p)) {
+													throw new TConfigurationException('appconfig_aliaspath_invalid',$id,$path);
+						}
+						if(isset($this->_aliases[$id])) {
+													throw new TConfigurationException('appconfig_alias_redefined',$id);
+						}
 						$this->_aliases[$id]=$p;
+					} else {
+											throw new TConfigurationException('appconfig_alias_invalid');
 					}
-					else
-						throw new TConfigurationException('appconfig_alias_invalid');
 					$this->_empty=false;
 					break;
 				}
 				case 'using':
 				{
-					if(($namespace=$element->getAttribute('namespace'))!==null)
-						$this->_usings[]=$namespace;
-					else
-						throw new TConfigurationException('appconfig_using_invalid');
+					if(($namespace=$element->getAttribute('namespace'))!==null) {
+											$this->_usings[]=$namespace;
+					} else {
+											throw new TConfigurationException('appconfig_using_invalid');
+					}
 					$this->_empty=false;
 					break;
 				}
@@ -11014,8 +11714,9 @@ 
 	{
 		foreach($modulesNode as $id=>$module)
 		{
-			if(!isset($module['class']))
-				throw new TConfigurationException('appconfig_moduletype_required',$id);
+			if(!isset($module['class'])) {
+							throw new TConfigurationException('appconfig_moduletype_required',$id);
+			}
 			$type = $module['class'];
 			unset($module['class']);
 			$properties = array();
@@ -11038,25 +11739,28 @@ 
 				$properties=$element->getAttributes();
 				$id=$properties->itemAt('id');
 				$type=$properties->remove('class');
-				if($type===null)
-					throw new TConfigurationException('appconfig_moduletype_required',$id);
+				if($type===null) {
+									throw new TConfigurationException('appconfig_moduletype_required',$id);
+				}
 				$element->setParent(null);
-				if($id===null)
-					$this->_modules[]=array($type,$properties->toArray(),$element);
-				else
-					$this->_modules[$id]=array($type,$properties->toArray(),$element);
+				if($id===null) {
+									$this->_modules[]=array($type,$properties->toArray(),$element);
+				} else {
+									$this->_modules[$id]=array($type,$properties->toArray(),$element);
+				}
 				$this->_empty=false;
+			} else {
+							throw new TConfigurationException('appconfig_modules_invalid',$element->getTagName());
 			}
-			else
-				throw new TConfigurationException('appconfig_modules_invalid',$element->getTagName());
 		}
 	}
 	protected function loadServicesPhp($servicesNode,$configPath)
 	{
 		foreach($servicesNode as $id => $service)
 		{
-			if(!isset($service['class']))
-				throw new TConfigurationException('appconfig_servicetype_required');
+			if(!isset($service['class'])) {
+							throw new TConfigurationException('appconfig_servicetype_required');
+			}
 			$type = $service['class'];
 			$properties = isset($service['properties']) ? $service['properties'] : array();
 			unset($service['properties']);
@@ -11072,16 +11776,18 @@ 
 			if($element->getTagName()==='service')
 			{
 				$properties=$element->getAttributes();
-				if(($id=$properties->itemAt('id'))===null)
-					throw new TConfigurationException('appconfig_serviceid_required');
-				if(($type=$properties->remove('class'))===null)
-					throw new TConfigurationException('appconfig_servicetype_required',$id);
+				if(($id=$properties->itemAt('id'))===null) {
+									throw new TConfigurationException('appconfig_serviceid_required');
+				}
+				if(($type=$properties->remove('class'))===null) {
+									throw new TConfigurationException('appconfig_servicetype_required',$id);
+				}
 				$element->setParent(null);
 				$this->_services[$id]=array($type,$properties->toArray(),$element);
 				$this->_empty=false;
+			} else {
+							throw new TConfigurationException('appconfig_services_invalid',$element->getTagName());
 			}
-			else
-				throw new TConfigurationException('appconfig_services_invalid',$element->getTagName());
 		}
 	}
 	protected function loadParametersPhp($parametersNode,$configPath)
@@ -11098,8 +11804,7 @@ 
 					$properties['id'] = $id;
 					$this->_parameters[$id] = array($type,$properties);
 				}
-			}
-			else
+			} else
 			{
 				$this->_parameters[$id] = $parameter;
 			}
@@ -11112,21 +11817,23 @@ 
 			if($element->getTagName()==='parameter')
 			{
 				$properties=$element->getAttributes();
-				if(($id=$properties->remove('id'))===null)
-					throw new TConfigurationException('appconfig_parameterid_required');
+				if(($id=$properties->remove('id'))===null) {
+									throw new TConfigurationException('appconfig_parameterid_required');
+				}
 				if(($type=$properties->remove('class'))===null)
 				{
-					if(($value=$properties->remove('value'))===null)
-						$this->_parameters[$id]=$element;
-					else
-						$this->_parameters[$id]=$value;
+					if(($value=$properties->remove('value'))===null) {
+											$this->_parameters[$id]=$element;
+					} else {
+											$this->_parameters[$id]=$value;
+					}
+				} else {
+									$this->_parameters[$id]=array($type,$properties->toArray());
 				}
-				else
-					$this->_parameters[$id]=array($type,$properties->toArray());
 				$this->_empty=false;
+			} else {
+							throw new TConfigurationException('appconfig_parameters_invalid',$element->getTagName());
 			}
-			else
-				throw new TConfigurationException('appconfig_parameters_invalid',$element->getTagName());
 		}
 	}
 	protected function loadExternalPhp($includeNode,$configPath)
@@ -11134,26 +11841,31 @@ 
 		foreach($includeNode as $include)
 		{
 			$when = isset($include['when'])?true:false;
-			if(!isset($include['file']))
-				throw new TConfigurationException('appconfig_includefile_required');
+			if(!isset($include['file'])) {
+							throw new TConfigurationException('appconfig_includefile_required');
+			}
 			$filePath = $include['file'];
-			if(isset($this->_includes[$filePath]))
-				$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
-			else
-				$$this->_includes[$filePath]=$when;
+			if(isset($this->_includes[$filePath])) {
+							$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
+			} else {
+							$$this->_includes[$filePath]=$when;
+			}
 			$this->_empty=false;
 		}
 	}
 	protected function loadExternalXml($includeNode,$configPath)
 	{
-		if(($when=$includeNode->getAttribute('when'))===null)
-			$when=true;
-		if(($filePath=$includeNode->getAttribute('file'))===null)
-			throw new TConfigurationException('appconfig_includefile_required');
-		if(isset($this->_includes[$filePath]))
-			$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
-		else
-			$this->_includes[$filePath]=$when;
+		if(($when=$includeNode->getAttribute('when'))===null) {
+					$when=true;
+		}
+		if(($filePath=$includeNode->getAttribute('file'))===null) {
+					throw new TConfigurationException('appconfig_includefile_required');
+		}
+		if(isset($this->_includes[$filePath])) {
+					$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
+		} else {
+					$this->_includes[$filePath]=$when;
+		}
 		$this->_empty=false;
 	}
 	public function getProperties()
@@ -11198,14 +11910,15 @@ 
 	}
 	public function load()
 	{
-		if(($cache=$this->getApplication()->getCache())!==null && ($value=$cache->get(self::CACHE_NAME))!==false)
-			return unserialize($value);
-		else
+		if(($cache=$this->getApplication()->getCache())!==null && ($value=$cache->get(self::CACHE_NAME))!==false) {
+					return unserialize($value);
+		} else
 		{
-			if(($content=@file_get_contents($this->getStateFilePath()))!==false)
-				return unserialize($content);
-			else
-				return null;
+			if(($content=@file_get_contents($this->getStateFilePath()))!==false) {
+							return unserialize($content);
+			} else {
+							return null;
+			}
 		}
 	}
 	public function save($state)
@@ -11214,10 +11927,11 @@ 
 		$saveFile=true;
 		if(($cache=$this->getApplication()->getCache())!==null)
 		{
-			if($cache->get(self::CACHE_NAME)===$content)
-				$saveFile=false;
-			else
-				$cache->set(self::CACHE_NAME,$content);
+			if($cache->get(self::CACHE_NAME)===$content) {
+							$saveFile=false;
+			} else {
+							$cache->set(self::CACHE_NAME,$content);
+			}
 		}
 		if($saveFile)
 		{

framework/Security/IUserManager.php

Doc Comments +3 added lines

@@ -35,6 +35,7 @@ 
 	/**
 	 * Returns a user instance according to auth data stored in a cookie.
 	 * @param THttpCookie the cookie storing user authentication information
+	 * @param THttpCookie $cookie
 	 * @return TUser the user instance generated based on the cookie auth data, null if the cookie does not have valid auth data.
 	 * @since 3.1.1
 	 */
@@ -42,7 +43,9 @@ 
 	/**
 	 * Saves user auth data into a cookie.
 	 * @param THttpCookie the cookie to receive the user auth data.
+	 * @param THttpCookie $cookie
 	 * @since 3.1.1
+	 * @return void
 	 */
 	public function saveUserToCookie($cookie);
 	/**

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * IUserManager interface file
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Security
- */
+	 * IUserManager interface file
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Security
+	 */
 
 /**
  * IUserManager interface

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param string user name, null if it is a guest.
 	 * @return TUser the user instance, null if the specified username is not in the user database.
 	 */
-	public function getUser($username=null);
+	public function getUser($username = null);
 	/**
 	 * Returns a user instance according to auth data stored in a cookie.
 	 * @param THttpCookie the cookie storing user authentication information
@@ -51,6 +51,6 @@ 
 	 * @param string password
 	 * @return boolean true if validation is successful, false otherwise.
 	 */
-	public function validateUser($username,$password);
+	public function validateUser($username, $password);
 }
 

framework/Security/TAuthManager.php

Doc Comments +2 added lines

@@ -115,6 +115,7 @@ 
 
 	/**
 	 * @param string|IUserManager the user manager module ID or the user manager object
+	 * @param string $provider
 	 * @throws TInvalidOperationException if the module has been initialized or the user manager object is not IUserManager
 	 */
 	public function setUserManager($provider)
@@ -138,6 +139,7 @@ 
 	 * Sets the login page that the client browser will be redirected to if login is needed.
 	 * Login page should be specified in the format of page path.
 	 * @param string path of login page should login is required
+	 * @param string $pagePath
 	 * @see TPageService
 	 */
 	public function setLoginPage($pagePath)

Indentation +1 added lines, -1 removed lines

@@ -289,7 +289,7 @@
 
 		// check for authentication expiration
 		$isAuthExpired = $this->_authExpire>0 && !$user->getIsGuest() &&
-        ($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime<time();
+		($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime<time();
 
 		// try authenticating through cookie if possible
 		if($this->getAllowAutoLogin() && ($user->getIsGuest() || $isAuthExpired))

Spacing +77 added lines, -77 removed lines

@@ -44,11 +44,11 @@ 
 	/**
 	 * GET variable name for return url
 	 */
-	const RETURN_URL_VAR='ReturnUrl';
+	const RETURN_URL_VAR = 'ReturnUrl';
 	/**
 	 * @var boolean if the module has been initialized
 	 */
-	private $_initialized=false;
+	private $_initialized = false;
 	/**
 	 * @var IUserManager user manager instance
 	 */
@@ -60,7 +60,7 @@ 
 	/**
 	 * @var boolean whether authorization should be skipped
 	 */
-	private $_skipAuthorization=false;
+	private $_skipAuthorization = false;
 	/**
 	 * @var string the session var name for storing return URL
 	 */
@@ -68,7 +68,7 @@ 
 	/**
 	 * @var boolean whether to allow auto login (using cookie)
 	 */
-	private $_allowAutoLogin=false;
+	private $_allowAutoLogin = false;
 	/**
 	 * @var string variable name used to store user session or cookie
 	 */
@@ -76,7 +76,7 @@ 
 	/**
 	 * @var integer authentication expiration time in seconds. Defaults to zero (no expiration)
 	 */
-	private $_authExpire=0;
+	private $_authExpire = 0;
 
 	/**
 	 * Initializes this module.
@@ -86,23 +86,23 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_userManager===null)
+		if ($this->_userManager === null)
 			throw new TConfigurationException('authmanager_usermanager_required');
-		if($this->_returnUrlVarName===null)
-			$this->_returnUrlVarName=$this->getApplication()->getID().':'.self::RETURN_URL_VAR;
-		$application=$this->getApplication();
-		if(is_string($this->_userManager))
+		if ($this->_returnUrlVarName === null)
+			$this->_returnUrlVarName = $this->getApplication()->getID() . ':' . self::RETURN_URL_VAR;
+		$application = $this->getApplication();
+		if (is_string($this->_userManager))
 		{
-			if(($users=$application->getModule($this->_userManager))===null)
-				throw new TConfigurationException('authmanager_usermanager_inexistent',$this->_userManager);
-			if(!($users instanceof IUserManager))
-				throw new TConfigurationException('authmanager_usermanager_invalid',$this->_userManager);
-			$this->_userManager=$users;
+			if (($users = $application->getModule($this->_userManager)) === null)
+				throw new TConfigurationException('authmanager_usermanager_inexistent', $this->_userManager);
+			if (!($users instanceof IUserManager))
+				throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
+			$this->_userManager = $users;
 		}
-		$application->attachEventHandler('OnAuthentication',array($this,'doAuthentication'));
-		$application->attachEventHandler('OnEndRequest',array($this,'leave'));
-		$application->attachEventHandler('OnAuthorization',array($this,'doAuthorization'));
-		$this->_initialized=true;
+		$application->attachEventHandler('OnAuthentication', array($this, 'doAuthentication'));
+		$application->attachEventHandler('OnEndRequest', array($this, 'leave'));
+		$application->attachEventHandler('OnAuthorization', array($this, 'doAuthorization'));
+		$this->_initialized = true;
 	}
 
 	/**
@@ -119,11 +119,11 @@ 
 	 */
 	public function setUserManager($provider)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('authmanager_usermanager_unchangeable');
-		if(!is_string($provider) && !($provider instanceof IUserManager))
-			throw new TConfigurationException('authmanager_usermanager_invalid',$this->_userManager);
-		$this->_userManager=$provider;
+		if (!is_string($provider) && !($provider instanceof IUserManager))
+			throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
+		$this->_userManager = $provider;
 	}
 
 	/**
@@ -142,7 +142,7 @@ 
 	 */
 	public function setLoginPage($pagePath)
 	{
-		$this->_loginPage=$pagePath;
+		$this->_loginPage = $pagePath;
 	}
 
 	/**
@@ -152,13 +152,13 @@ 
 	 * @param mixed sender of the Authentication event
 	 * @param mixed event parameter
 	 */
-	public function doAuthentication($sender,$param)
+	public function doAuthentication($sender, $param)
 	{
 		$this->onAuthenticate($param);
 
-		$service=$this->getService();
-		if(($service instanceof TPageService) && $service->getRequestedPagePath()===$this->getLoginPage())
-			$this->_skipAuthorization=true;
+		$service = $this->getService();
+		if (($service instanceof TPageService) && $service->getRequestedPagePath() === $this->getLoginPage())
+			$this->_skipAuthorization = true;
 	}
 
 	/**
@@ -168,9 +168,9 @@ 
 	 * @param mixed sender of the Authorization event
 	 * @param mixed event parameter
 	 */
-	public function doAuthorization($sender,$param)
+	public function doAuthorization($sender, $param)
 	{
-		if(!$this->_skipAuthorization)
+		if (!$this->_skipAuthorization)
 		{
 			$this->onAuthorize($param);
 		}
@@ -183,17 +183,17 @@ 
 	 * @param mixed sender of the event
 	 * @param mixed event parameter
 	 */
-	public function leave($sender,$param)
+	public function leave($sender, $param)
 	{
-		$application=$this->getApplication();
-		if($application->getResponse()->getStatusCode()===401)
+		$application = $this->getApplication();
+		if ($application->getResponse()->getStatusCode() === 401)
 		{
-			$service=$application->getService();
-			if($service instanceof TPageService)
+			$service = $application->getService();
+			if ($service instanceof TPageService)
 			{
-				$returnUrl=$application->getRequest()->getRequestUri();
+				$returnUrl = $application->getRequest()->getRequestUri();
 				$this->setReturnUrl($returnUrl);
-				$url=$service->constructUrl($this->getLoginPage());
+				$url = $service->constructUrl($this->getLoginPage());
 				$application->getResponse()->redirect($url);
 			}
 		}
@@ -212,7 +212,7 @@ 
 	 */
 	public function setReturnUrlVarName($value)
 	{
-		$this->_returnUrlVarName=$value;
+		$this->_returnUrlVarName = $value;
 	}
 
 	/**
@@ -229,7 +229,7 @@ 
 	 */
 	public function setReturnUrl($value)
 	{
-		$this->getSession()->add($this->getReturnUrlVarName(),$value);
+		$this->getSession()->add($this->getReturnUrlVarName(), $value);
 	}
 
 	/**
@@ -247,7 +247,7 @@ 
 	 */
 	public function setAllowAutoLogin($value)
 	{
-		$this->_allowAutoLogin=TPropertyValue::ensureBoolean($value);
+		$this->_allowAutoLogin = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -265,7 +265,7 @@ 
 	 */
 	public function setAuthExpire($value)
 	{
-		$this->_authExpire=TPropertyValue::ensureInteger($value);
+		$this->_authExpire = TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -278,28 +278,28 @@ 
 	 */
 	public function onAuthenticate($param)
 	{
-		$application=$this->getApplication();
+		$application = $this->getApplication();
 
 		// restoring user info from session
-		if(($session=$application->getSession())===null)
+		if (($session = $application->getSession()) === null)
 			throw new TConfigurationException('authmanager_session_required');
 		$session->open();
-		$sessionInfo=$session->itemAt($this->getUserKey());
-		$user=$this->_userManager->getUser(null)->loadFromString($sessionInfo);
+		$sessionInfo = $session->itemAt($this->getUserKey());
+		$user = $this->_userManager->getUser(null)->loadFromString($sessionInfo);
 
 		// check for authentication expiration
-		$isAuthExpired = $this->_authExpire>0 && !$user->getIsGuest() &&
-        ($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime<time();
+		$isAuthExpired = $this->_authExpire > 0 && !$user->getIsGuest() &&
+        ($expiretime = $session->itemAt('AuthExpireTime')) && $expiretime < time();
 
 		// try authenticating through cookie if possible
-		if($this->getAllowAutoLogin() && ($user->getIsGuest() || $isAuthExpired))
+		if ($this->getAllowAutoLogin() && ($user->getIsGuest() || $isAuthExpired))
 		{
-			$cookie=$this->getRequest()->getCookies()->itemAt($this->getUserKey());
-			if($cookie instanceof THttpCookie)
+			$cookie = $this->getRequest()->getCookies()->itemAt($this->getUserKey());
+			if ($cookie instanceof THttpCookie)
 			{
-				if(($user2=$this->_userManager->getUserFromCookie($cookie))!==null)
+				if (($user2 = $this->_userManager->getUserFromCookie($cookie)) !== null)
 				{
-					$user=$user2;
+					$user = $user2;
 					$this->updateSessionUser($user);
 					// user is restored from cookie, auth may not expire
 					$isAuthExpired = false;
@@ -310,14 +310,14 @@ 
 		$application->setUser($user);
 
 		// handle authentication expiration or update expiration time
-		if($isAuthExpired)
+		if ($isAuthExpired)
 			$this->onAuthExpire($param);
 		else
 			$session->add('AuthExpireTime', time() + $this->_authExpire);
 
 		// event handler gets a chance to do further auth work
-		if($this->hasEventHandler('OnAuthenticate'))
-			$this->raiseEvent('OnAuthenticate',$this,$application);
+		if ($this->hasEventHandler('OnAuthenticate'))
+			$this->raiseEvent('OnAuthenticate', $this, $application);
 	}
 
 	/**
@@ -328,8 +328,8 @@ 
 	public function onAuthExpire($param)
 	{
 		$this->logout();
-		if($this->hasEventHandler('OnAuthExpire'))
-			$this->raiseEvent('OnAuthExpire',$this,$param);
+		if ($this->hasEventHandler('OnAuthExpire'))
+			$this->raiseEvent('OnAuthExpire', $this, $param);
 	}
 
 	/**
@@ -341,10 +341,10 @@ 
 	 */
 	public function onAuthorize($param)
 	{
-		$application=$this->getApplication();
-		if($this->hasEventHandler('OnAuthorize'))
-			$this->raiseEvent('OnAuthorize',$this,$application);
-		if(!$application->getAuthorizationRules()->isUserAllowed($application->getUser(),$application->getRequest()->getRequestType(),$application->getRequest()->getUserHostAddress()))
+		$application = $this->getApplication();
+		if ($this->hasEventHandler('OnAuthorize'))
+			$this->raiseEvent('OnAuthorize', $this, $application);
+		if (!$application->getAuthorizationRules()->isUserAllowed($application->getUser(), $application->getRequest()->getRequestType(), $application->getRequest()->getUserHostAddress()))
 		{
 			$application->getResponse()->setStatusCode(401);
 			$application->completeRequest();
@@ -357,8 +357,8 @@ 
 	 */
 	public function getUserKey()
 	{
-		if($this->_userKey===null)
-			$this->_userKey=$this->generateUserKey();
+		if ($this->_userKey === null)
+			$this->_userKey = $this->generateUserKey();
 		return $this->_userKey;
 	}
 
@@ -368,7 +368,7 @@ 
 	 */
 	protected function generateUserKey()
 	{
-		return md5($this->getApplication()->getUniqueID().'prado:user');
+		return md5($this->getApplication()->getUniqueID() . 'prado:user');
 	}
 
 	/**
@@ -378,12 +378,12 @@ 
 	 */
 	public function updateSessionUser($user)
 	{
-		if(!$user->getIsGuest())
+		if (!$user->getIsGuest())
 		{
-			if(($session=$this->getSession())===null)
+			if (($session = $this->getSession()) === null)
 				throw new TConfigurationException('authmanager_session_required');
 			else
-				$session->add($this->getUserKey(),$user->saveToString());
+				$session->add($this->getUserKey(), $user->saveToString());
 		}
 	}
 
@@ -395,7 +395,7 @@ 
 	 */
 	public function switchUser($username)
 	{
-		if(($user=$this->_userManager->getUser($username))===null)
+		if (($user = $this->_userManager->getUser($username)) === null)
 			return false;
 		$this->updateSessionUser($user);
 		$this->getApplication()->setUser($user);
@@ -411,19 +411,19 @@ 
 	 * @param integer number of seconds that automatic login will remain effective. If 0, it means user logs out when session ends. This parameter is added since 3.1.1.
 	 * @return boolean if login is successful
 	 */
-	public function login($username,$password,$expire=0)
+	public function login($username, $password, $expire = 0)
 	{
-		if($this->_userManager->validateUser($username,$password))
+		if ($this->_userManager->validateUser($username, $password))
 		{
-			if(($user=$this->_userManager->getUser($username))===null)
+			if (($user = $this->_userManager->getUser($username)) === null)
 				return false;
 			$this->updateSessionUser($user);
 			$this->getApplication()->setUser($user);
 
-			if($expire>0)
+			if ($expire > 0)
 			{
-				$cookie=new THttpCookie($this->getUserKey(),'');
-				$cookie->setExpire(time()+$expire);
+				$cookie = new THttpCookie($this->getUserKey(), '');
+				$cookie->setExpire(time() + $expire);
 				$this->_userManager->saveUserToCookie($cookie);
 				$this->getResponse()->getCookies()->add($cookie);
 			}
@@ -440,13 +440,13 @@ 
 	 */
 	public function logout()
 	{
-		if(($session=$this->getSession())===null)
+		if (($session = $this->getSession()) === null)
 			throw new TConfigurationException('authmanager_session_required');
 		$this->getApplication()->getUser()->setIsGuest(true);
 		$session->destroy();
-		if($this->getAllowAutoLogin())
+		if ($this->getAllowAutoLogin())
 		{
-			$cookie=new THttpCookie($this->getUserKey(),'');
+			$cookie = new THttpCookie($this->getUserKey(), '');
 			$this->getResponse()->getCookies()->add($cookie);
 		}
 	}

Braces +57 added lines, -40 removed lines

@@ -86,17 +86,21 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_userManager===null)
-			throw new TConfigurationException('authmanager_usermanager_required');
-		if($this->_returnUrlVarName===null)
-			$this->_returnUrlVarName=$this->getApplication()->getID().':'.self::RETURN_URL_VAR;
+		if($this->_userManager===null) {
+					throw new TConfigurationException('authmanager_usermanager_required');
+		}
+		if($this->_returnUrlVarName===null) {
+					$this->_returnUrlVarName=$this->getApplication()->getID().':'.self::RETURN_URL_VAR;
+		}
 		$application=$this->getApplication();
 		if(is_string($this->_userManager))
 		{
-			if(($users=$application->getModule($this->_userManager))===null)
-				throw new TConfigurationException('authmanager_usermanager_inexistent',$this->_userManager);
-			if(!($users instanceof IUserManager))
-				throw new TConfigurationException('authmanager_usermanager_invalid',$this->_userManager);
+			if(($users=$application->getModule($this->_userManager))===null) {
+							throw new TConfigurationException('authmanager_usermanager_inexistent',$this->_userManager);
+			}
+			if(!($users instanceof IUserManager)) {
+							throw new TConfigurationException('authmanager_usermanager_invalid',$this->_userManager);
+			}
 			$this->_userManager=$users;
 		}
 		$application->attachEventHandler('OnAuthentication',array($this,'doAuthentication'));
@@ -119,10 +123,12 @@ 
 	 */
 	public function setUserManager($provider)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('authmanager_usermanager_unchangeable');
-		if(!is_string($provider) && !($provider instanceof IUserManager))
-			throw new TConfigurationException('authmanager_usermanager_invalid',$this->_userManager);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('authmanager_usermanager_unchangeable');
+		}
+		if(!is_string($provider) && !($provider instanceof IUserManager)) {
+					throw new TConfigurationException('authmanager_usermanager_invalid',$this->_userManager);
+		}
 		$this->_userManager=$provider;
 	}
 
@@ -157,8 +163,9 @@ 
 		$this->onAuthenticate($param);
 
 		$service=$this->getService();
-		if(($service instanceof TPageService) && $service->getRequestedPagePath()===$this->getLoginPage())
-			$this->_skipAuthorization=true;
+		if(($service instanceof TPageService) && $service->getRequestedPagePath()===$this->getLoginPage()) {
+					$this->_skipAuthorization=true;
+		}
 	}
 
 	/**
@@ -281,8 +288,9 @@ 
 		$application=$this->getApplication();
 
 		// restoring user info from session
-		if(($session=$application->getSession())===null)
-			throw new TConfigurationException('authmanager_session_required');
+		if(($session=$application->getSession())===null) {
+					throw new TConfigurationException('authmanager_session_required');
+		}
 		$session->open();
 		$sessionInfo=$session->itemAt($this->getUserKey());
 		$user=$this->_userManager->getUser(null)->loadFromString($sessionInfo);
@@ -310,14 +318,16 @@ 
 		$application->setUser($user);
 
 		// handle authentication expiration or update expiration time
-		if($isAuthExpired)
-			$this->onAuthExpire($param);
-		else
-			$session->add('AuthExpireTime', time() + $this->_authExpire);
+		if($isAuthExpired) {
+					$this->onAuthExpire($param);
+		} else {
+					$session->add('AuthExpireTime', time() + $this->_authExpire);
+		}
 
 		// event handler gets a chance to do further auth work
-		if($this->hasEventHandler('OnAuthenticate'))
-			$this->raiseEvent('OnAuthenticate',$this,$application);
+		if($this->hasEventHandler('OnAuthenticate')) {
+					$this->raiseEvent('OnAuthenticate',$this,$application);
+		}
 	}
 
 	/**
@@ -328,8 +338,9 @@ 
 	public function onAuthExpire($param)
 	{
 		$this->logout();
-		if($this->hasEventHandler('OnAuthExpire'))
-			$this->raiseEvent('OnAuthExpire',$this,$param);
+		if($this->hasEventHandler('OnAuthExpire')) {
+					$this->raiseEvent('OnAuthExpire',$this,$param);
+		}
 	}
 
 	/**
@@ -342,8 +353,9 @@ 
 	public function onAuthorize($param)
 	{
 		$application=$this->getApplication();
-		if($this->hasEventHandler('OnAuthorize'))
-			$this->raiseEvent('OnAuthorize',$this,$application);
+		if($this->hasEventHandler('OnAuthorize')) {
+					$this->raiseEvent('OnAuthorize',$this,$application);
+		}
 		if(!$application->getAuthorizationRules()->isUserAllowed($application->getUser(),$application->getRequest()->getRequestType(),$application->getRequest()->getUserHostAddress()))
 		{
 			$application->getResponse()->setStatusCode(401);
@@ -357,8 +369,9 @@ 
 	 */
 	public function getUserKey()
 	{
-		if($this->_userKey===null)
-			$this->_userKey=$this->generateUserKey();
+		if($this->_userKey===null) {
+					$this->_userKey=$this->generateUserKey();
+		}
 		return $this->_userKey;
 	}
 
@@ -380,10 +393,11 @@ 
 	{
 		if(!$user->getIsGuest())
 		{
-			if(($session=$this->getSession())===null)
-				throw new TConfigurationException('authmanager_session_required');
-			else
-				$session->add($this->getUserKey(),$user->saveToString());
+			if(($session=$this->getSession())===null) {
+							throw new TConfigurationException('authmanager_session_required');
+			} else {
+							$session->add($this->getUserKey(),$user->saveToString());
+			}
 		}
 	}
 
@@ -395,8 +409,9 @@ 
 	 */
 	public function switchUser($username)
 	{
-		if(($user=$this->_userManager->getUser($username))===null)
-			return false;
+		if(($user=$this->_userManager->getUser($username))===null) {
+					return false;
+		}
 		$this->updateSessionUser($user);
 		$this->getApplication()->setUser($user);
 		return true;
@@ -415,8 +430,9 @@ 
 	{
 		if($this->_userManager->validateUser($username,$password))
 		{
-			if(($user=$this->_userManager->getUser($username))===null)
-				return false;
+			if(($user=$this->_userManager->getUser($username))===null) {
+							return false;
+			}
 			$this->updateSessionUser($user);
 			$this->getApplication()->setUser($user);
 
@@ -428,9 +444,9 @@ 
 				$this->getResponse()->getCookies()->add($cookie);
 			}
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -440,8 +456,9 @@ 
 	 */
 	public function logout()
 	{
-		if(($session=$this->getSession())===null)
-			throw new TConfigurationException('authmanager_session_required');
+		if(($session=$this->getSession())===null) {
+					throw new TConfigurationException('authmanager_session_required');
+		}
 		$this->getApplication()->getUser()->setIsGuest(true);
 		$session->destroy();
 		if($this->getAllowAutoLogin())

framework/Security/TAuthorizationRule.php

Doc Comments +9 added lines

@@ -219,11 +219,17 @@ 
 		return 0;
 	}
 
+	/**
+	 * @param IUser $user
+	 */
 	private function isUserMatched($user)
 	{
 		return ($this->_everyone || ($this->_guest && $user->getIsGuest()) || ($this->_authenticated && !$user->getIsGuest()) || in_array(strtolower($user->getName()),$this->_users));
 	}
 
+	/**
+	 * @param IUser $user
+	 */
 	private function isRoleMatched($user)
 	{
 		foreach($this->_roles as $role)
@@ -256,6 +262,9 @@ 
 	 * @param IUser the user to be authorized
 	 * @param string verb, can be empty, 'post' or 'get'.
 	 * @param string the request IP address
+	 * @param IUser $user
+	 * @param string $verb
+	 * @param string $ip
 	 * @return boolean whether the user is allowed
 	 */
 	public function isUserAllowed($user,$verb,$ip)

Spacing +56 added lines, -56 removed lines

@@ -70,61 +70,61 @@ 
 	 * @param string verb, can be empty, 'get', or 'post'
 	 * @param string IP rules (separated by comma, can contain wild card *)
 	 */
-	public function __construct($action,$users,$roles,$verb='',$ipRules='')
+	public function __construct($action, $users, $roles, $verb = '', $ipRules = '')
 	{
-		$action=strtolower(trim($action));
-		if($action==='allow' || $action==='deny')
-			$this->_action=$action;
+		$action = strtolower(trim($action));
+		if ($action === 'allow' || $action === 'deny')
+			$this->_action = $action;
 		else
-			throw new TInvalidDataValueException('authorizationrule_action_invalid',$action);
-		$this->_users=array();
-		$this->_roles=array();
-		$this->_ipRules=array();
-		$this->_everyone=false;
-		$this->_guest=false;
-		$this->_authenticated=false;
+			throw new TInvalidDataValueException('authorizationrule_action_invalid', $action);
+		$this->_users = array();
+		$this->_roles = array();
+		$this->_ipRules = array();
+		$this->_everyone = false;
+		$this->_guest = false;
+		$this->_authenticated = false;
 
-		if(trim($users)==='')
-			$users='*';
-		foreach(explode(',',$users) as $user)
+		if (trim($users) === '')
+			$users = '*';
+		foreach (explode(',', $users) as $user)
 		{
-			if(($user=trim(strtolower($user)))!=='')
+			if (($user = trim(strtolower($user))) !== '')
 			{
-				if($user==='*')
+				if ($user === '*')
 				{
-					$this->_everyone=true;
+					$this->_everyone = true;
 					break;
 				}
-				else if($user==='?')
-					$this->_guest=true;
-				else if($user==='@')
-					$this->_authenticated=true;
+				else if ($user === '?')
+					$this->_guest = true;
+				else if ($user === '@')
+					$this->_authenticated = true;
 				else
-					$this->_users[]=$user;
+					$this->_users[] = $user;
 			}
 		}
 
-		if(trim($roles)==='')
-			$roles='*';
-		foreach(explode(',',$roles) as $role)
+		if (trim($roles) === '')
+			$roles = '*';
+		foreach (explode(',', $roles) as $role)
 		{
-			if(($role=trim(strtolower($role)))!=='')
-				$this->_roles[]=$role;
+			if (($role = trim(strtolower($role))) !== '')
+				$this->_roles[] = $role;
 		}
 
-		if(($verb=trim(strtolower($verb)))==='')
-			$verb='*';
-		if($verb==='*' || $verb==='get' || $verb==='post')
-			$this->_verb=$verb;
+		if (($verb = trim(strtolower($verb))) === '')
+			$verb = '*';
+		if ($verb === '*' || $verb === 'get' || $verb === 'post')
+			$this->_verb = $verb;
 		else
-			throw new TInvalidDataValueException('authorizationrule_verb_invalid',$verb);
+			throw new TInvalidDataValueException('authorizationrule_verb_invalid', $verb);
 
-		if(trim($ipRules)==='')
-			$ipRules='*';
-		foreach(explode(',',$ipRules) as $ipRule)
+		if (trim($ipRules) === '')
+			$ipRules = '*';
+		foreach (explode(',', $ipRules) as $ipRule)
 		{
-			if(($ipRule=trim($ipRule))!=='')
-				$this->_ipRules[]=$ipRule;
+			if (($ipRule = trim($ipRule)) !== '')
+				$this->_ipRules[] = $ipRule;
 		}
 	}
 
@@ -199,21 +199,21 @@ 
 	 * @param string the request IP address
 	 * @return integer 1 if the user is allowed, -1 if the user is denied, 0 if the rule does not apply to the user
 	 */
-	public function isUserAllowed(IUser $user,$verb,$ip)
+	public function isUserAllowed(IUser $user, $verb, $ip)
 	{
-		if($this->isVerbMatched($verb) && $this->isIpMatched($ip) && $this->isUserMatched($user) && $this->isRoleMatched($user))
-			return ($this->_action==='allow')?1:-1;
+		if ($this->isVerbMatched($verb) && $this->isIpMatched($ip) && $this->isUserMatched($user) && $this->isRoleMatched($user))
+			return ($this->_action === 'allow') ? 1 : -1;
 		else
 			return 0;
 	}
 
 	private function isIpMatched($ip)
 	{
-		if(empty($this->_ipRules))
+		if (empty($this->_ipRules))
 			return 1;
-		foreach($this->_ipRules as $rule)
+		foreach ($this->_ipRules as $rule)
 		{
-			if($rule==='*' || $rule===$ip || (($pos=strpos($rule,'*'))!==false && strncmp($ip,$rule,$pos)===0))
+			if ($rule === '*' || $rule === $ip || (($pos = strpos($rule, '*')) !== false && strncmp($ip, $rule, $pos) === 0))
 				return 1;
 		}
 		return 0;
@@ -221,14 +221,14 @@ 
 
 	private function isUserMatched($user)
 	{
-		return ($this->_everyone || ($this->_guest && $user->getIsGuest()) || ($this->_authenticated && !$user->getIsGuest()) || in_array(strtolower($user->getName()),$this->_users));
+		return ($this->_everyone || ($this->_guest && $user->getIsGuest()) || ($this->_authenticated && !$user->getIsGuest()) || in_array(strtolower($user->getName()), $this->_users));
 	}
 
 	private function isRoleMatched($user)
 	{
-		foreach($this->_roles as $role)
+		foreach ($this->_roles as $role)
 		{
-			if($role==='*' || $user->isInRole($role))
+			if ($role === '*' || $user->isInRole($role))
 				return true;
 		}
 		return false;
@@ -236,7 +236,7 @@ 
 
 	private function isVerbMatched($verb)
 	{
-		return ($this->_verb==='*' || strcasecmp($verb,$this->_verb)===0);
+		return ($this->_verb === '*' || strcasecmp($verb, $this->_verb) === 0);
 	}
 }
 
@@ -258,15 +258,15 @@ 
 	 * @param string the request IP address
 	 * @return boolean whether the user is allowed
 	 */
-	public function isUserAllowed($user,$verb,$ip)
+	public function isUserAllowed($user, $verb, $ip)
 	{
-		if($user instanceof IUser)
+		if ($user instanceof IUser)
 		{
-			$verb=strtolower(trim($verb));
-			foreach($this as $rule)
+			$verb = strtolower(trim($verb));
+			foreach ($this as $rule)
 			{
-				if(($decision=$rule->isUserAllowed($user,$verb,$ip))!==0)
-					return ($decision>0);
+				if (($decision = $rule->isUserAllowed($user, $verb, $ip)) !== 0)
+					return ($decision > 0);
 			}
 			return true;
 		}
@@ -282,10 +282,10 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a TAuthorizationRule object.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if($item instanceof TAuthorizationRule)
-			parent::insertAt($index,$item);
+		if ($item instanceof TAuthorizationRule)
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('authorizationrulecollection_authorizationrule_required');
 	}

Braces +58 added lines, -44 removed lines

@@ -73,10 +73,11 @@ 
 	public function __construct($action,$users,$roles,$verb='',$ipRules='')
 	{
 		$action=strtolower(trim($action));
-		if($action==='allow' || $action==='deny')
-			$this->_action=$action;
-		else
-			throw new TInvalidDataValueException('authorizationrule_action_invalid',$action);
+		if($action==='allow' || $action==='deny') {
+					$this->_action=$action;
+		} else {
+					throw new TInvalidDataValueException('authorizationrule_action_invalid',$action);
+		}
 		$this->_users=array();
 		$this->_roles=array();
 		$this->_ipRules=array();
@@ -84,8 +85,9 @@ 
 		$this->_guest=false;
 		$this->_authenticated=false;
 
-		if(trim($users)==='')
-			$users='*';
+		if(trim($users)==='') {
+					$users='*';
+		}
 		foreach(explode(',',$users) as $user)
 		{
 			if(($user=trim(strtolower($user)))!=='')
@@ -94,37 +96,43 @@ 
 				{
 					$this->_everyone=true;
 					break;
+				} else if($user==='?') {
+									$this->_guest=true;
+				} else if($user==='@') {
+									$this->_authenticated=true;
+				} else {
+									$this->_users[]=$user;
 				}
-				else if($user==='?')
-					$this->_guest=true;
-				else if($user==='@')
-					$this->_authenticated=true;
-				else
-					$this->_users[]=$user;
 			}
 		}
 
-		if(trim($roles)==='')
-			$roles='*';
+		if(trim($roles)==='') {
+					$roles='*';
+		}
 		foreach(explode(',',$roles) as $role)
 		{
-			if(($role=trim(strtolower($role)))!=='')
-				$this->_roles[]=$role;
+			if(($role=trim(strtolower($role)))!=='') {
+							$this->_roles[]=$role;
+			}
 		}
 
-		if(($verb=trim(strtolower($verb)))==='')
-			$verb='*';
-		if($verb==='*' || $verb==='get' || $verb==='post')
-			$this->_verb=$verb;
-		else
-			throw new TInvalidDataValueException('authorizationrule_verb_invalid',$verb);
+		if(($verb=trim(strtolower($verb)))==='') {
+					$verb='*';
+		}
+		if($verb==='*' || $verb==='get' || $verb==='post') {
+					$this->_verb=$verb;
+		} else {
+					throw new TInvalidDataValueException('authorizationrule_verb_invalid',$verb);
+		}
 
-		if(trim($ipRules)==='')
-			$ipRules='*';
+		if(trim($ipRules)==='') {
+					$ipRules='*';
+		}
 		foreach(explode(',',$ipRules) as $ipRule)
 		{
-			if(($ipRule=trim($ipRule))!=='')
-				$this->_ipRules[]=$ipRule;
+			if(($ipRule=trim($ipRule))!=='') {
+							$this->_ipRules[]=$ipRule;
+			}
 		}
 	}
 
@@ -201,20 +209,23 @@ 
 	 */
 	public function isUserAllowed(IUser $user,$verb,$ip)
 	{
-		if($this->isVerbMatched($verb) && $this->isIpMatched($ip) && $this->isUserMatched($user) && $this->isRoleMatched($user))
-			return ($this->_action==='allow')?1:-1;
-		else
-			return 0;
+		if($this->isVerbMatched($verb) && $this->isIpMatched($ip) && $this->isUserMatched($user) && $this->isRoleMatched($user)) {
+					return ($this->_action==='allow')?1:-1;
+		} else {
+					return 0;
+		}
 	}
 
 	private function isIpMatched($ip)
 	{
-		if(empty($this->_ipRules))
-			return 1;
+		if(empty($this->_ipRules)) {
+					return 1;
+		}
 		foreach($this->_ipRules as $rule)
 		{
-			if($rule==='*' || $rule===$ip || (($pos=strpos($rule,'*'))!==false && strncmp($ip,$rule,$pos)===0))
-				return 1;
+			if($rule==='*' || $rule===$ip || (($pos=strpos($rule,'*'))!==false && strncmp($ip,$rule,$pos)===0)) {
+							return 1;
+			}
 		}
 		return 0;
 	}
@@ -228,8 +239,9 @@ 
 	{
 		foreach($this->_roles as $role)
 		{
-			if($role==='*' || $user->isInRole($role))
-				return true;
+			if($role==='*' || $user->isInRole($role)) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -265,13 +277,14 @@ 
 			$verb=strtolower(trim($verb));
 			foreach($this as $rule)
 			{
-				if(($decision=$rule->isUserAllowed($user,$verb,$ip))!==0)
-					return ($decision>0);
+				if(($decision=$rule->isUserAllowed($user,$verb,$ip))!==0) {
+									return ($decision>0);
+				}
 			}
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -284,10 +297,11 @@ 
 	 */
 	public function insertAt($index,$item)
 	{
-		if($item instanceof TAuthorizationRule)
-			parent::insertAt($index,$item);
-		else
-			throw new TInvalidDataTypeException('authorizationrulecollection_authorizationrule_required');
+		if($item instanceof TAuthorizationRule) {
+					parent::insertAt($index,$item);
+		} else {
+					throw new TInvalidDataTypeException('authorizationrulecollection_authorizationrule_required');
+		}
 	}
 }