pradosoft / prado

framework/pradolite.php

Braces +3149 added lines, -2413 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';
@@ -36,8 +38,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)
 	{
@@ -46,15 +49,16 @@ 
 		{
 			$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 phpFatalErrorHandler()
 	{
@@ -71,8 +75,7 @@ 
 		if(self::$_application!==null && ($errorHandler=self::$_application->getErrorHandler())!==null)
 		{
 			$errorHandler->handleError(null,$exception);
-		}
-		else
+		} else
 		{
 			echo $exception;
 		}
@@ -80,8 +83,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()
@@ -94,14 +98,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();
@@ -120,74 +126,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)
@@ -200,39 +209,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)
 			{
@@ -242,26 +257,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";
@@ -274,9 +291,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)
@@ -286,8 +303,9 @@ 
 				}
 				arsort($languages);
 				$languages=array_keys($languages);
-				if(empty($languages))
-					$languages[0]='en';
+				if(empty($languages)) {
+									$languages[0]='en';
+				}
 			}
 		}
 		return $languages;
@@ -299,38 +317,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)
@@ -343,17 +366,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);
 	}
 }
@@ -472,8 +502,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);
@@ -537,37 +568,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)
@@ -578,28 +614,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);
@@ -622,8 +662,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');
@@ -642,28 +681,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())),
@@ -680,26 +719,30 @@ 
 	{
 		$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)
@@ -708,18 +751,20 @@ 
 		$result=null;
 						if($exception instanceof TPhpErrorException)
 		{
-			if(isset($trace[0]['file']))
-				$result=$trace[0];
-			elseif(isset($trace[1]))
-				$result=$trace[1];
-		}
-		else if($exception instanceof TInvalidOperationException)
+			if(isset($trace[0]['file'])) {
+							$result=$trace[0];
+			} elseif(isset($trace[1])) {
+							$result=$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)
@@ -727,10 +772,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;
 	}
@@ -745,9 +791,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;
 	}
@@ -764,8 +810,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()
@@ -790,10 +837,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)
 	{
@@ -804,18 +852,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)
 	{
@@ -825,12 +873,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)
 	{
@@ -839,25 +887,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)
 	{
@@ -865,34 +914,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()
 	{
@@ -902,23 +954,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)
 	{
@@ -930,9 +985,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);
@@ -952,14 +1007,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()
@@ -986,18 +1043,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);
@@ -1005,8 +1064,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);
 	}
@@ -1084,8 +1144,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);
 	}
@@ -1119,21 +1180,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;
@@ -1166,17 +1229,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;
 	}
@@ -1192,10 +1257,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
@@ -1227,8 +1293,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);
@@ -1243,11 +1310,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()
@@ -1282,12 +1351,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)
@@ -1295,20 +1366,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
@@ -1316,34 +1390,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;
@@ -1356,7 +1437,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])) {
@@ -1370,66 +1453,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]);
 		}
 	}
@@ -1439,10 +1534,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)
 	{
@@ -1453,41 +1549,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;
 	}
@@ -1506,8 +1609,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;
@@ -1518,8 +1622,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;
@@ -1528,20 +1633,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)
 	{
@@ -1549,17 +1659,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)
 	{
@@ -1571,8 +1682,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]++;
@@ -1594,15 +1706,18 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_d===array())
-			$exprops[] = "\0TMap\0_d";
-		if ($this->_r===false)
-			$exprops[] = "\0TMap\0_r";
+		if ($this->_d===array()) {
+					$exprops[] = "\0TMap\0_d";
+		}
+		if ($this->_r===false) {
+					$exprops[] = "\0TMap\0_r";
+		}
 	}
 	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()
@@ -1635,10 +1750,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)
 	{
@@ -1649,17 +1765,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)
 	{
@@ -1673,23 +1790,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)
 	{
@@ -1722,8 +1842,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);
@@ -1763,12 +1884,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()
@@ -1781,11 +1904,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()
@@ -1803,16 +1928,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) {
@@ -1823,68 +1950,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)
@@ -1896,8 +2031,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])))
@@ -1911,19 +2045,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)
 	{
@@ -1940,8 +2075,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;
@@ -1952,8 +2088,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;
@@ -1962,23 +2099,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)
 	{
@@ -1986,17 +2125,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)
 	{
@@ -2021,8 +2161,9 @@ 
 	private $_c=0;
 	public function __construct($data=null)
 	{
-		if($data!==null)
-			$this->copyFrom($data);
+		if($data!==null) {
+					$this->copyFrom($data);
+		}
 	}
 	public function toArray()
 	{
@@ -2038,9 +2179,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()
 	{
@@ -2053,16 +2194,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);
@@ -2163,10 +2305,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)
 	{
@@ -2174,23 +2317,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;
 	}
@@ -2199,9 +2345,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;
 	}
@@ -2220,18 +2367,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()
 	{
@@ -2277,16 +2424,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->xmlVersion);
 		$element=$doc->documentElement;
@@ -2297,8 +2446,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);
@@ -2306,18 +2456,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;
 	}
@@ -2327,9 +2480,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()
 	{
@@ -2345,12 +2498,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;
 	}
@@ -2371,18 +2526,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;
 	}
 }
@@ -2399,18 +2556,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)))!=='')
@@ -2419,34 +2578,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()
@@ -2483,19 +2648,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;
 	}
@@ -2507,8 +2675,9 @@ 
 	{
 		foreach($this->_roles as $role)
 		{
-			if($role==='*' || $user->isInRole($role))
-				return true;
+			if($role==='*' || $user->isInRole($role)) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -2526,20 +2695,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
@@ -2572,8 +2743,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()
@@ -2588,8 +2760,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()
@@ -2610,8 +2783,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)
@@ -2654,16 +2828,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)
 	{
@@ -2673,8 +2849,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;
@@ -2682,8 +2859,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';
@@ -2732,8 +2910,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)
@@ -2742,17 +2921,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)
 	{
@@ -2764,10 +2945,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)
 	{
@@ -2783,11 +2965,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))
@@ -2796,30 +2978,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)
 			{
@@ -2831,22 +3013,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)
 	{
@@ -2859,12 +3043,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)
@@ -2923,24 +3108,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;
 				}
 			}
 		}
@@ -2973,19 +3159,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
@@ -3028,27 +3215,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);
 	}
@@ -3066,11 +3260,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);
 		}
@@ -3096,10 +3291,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);
@@ -3115,8 +3311,9 @@ 
 			if($cache !== null)
 			{
 				$manager = $cache->get($this->getCacheKey());
-				if($manager instanceof TUrlManager)
-					return $manager;
+				if($manager instanceof TUrlManager) {
+									return $manager;
+				}
 			}
 		}
 		return null;
@@ -3139,14 +3336,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);
 			}
@@ -3167,10 +3365,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()
 	{
@@ -3178,10 +3377,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()
@@ -3205,17 +3406,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()
@@ -3227,13 +3430,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)
@@ -3261,8 +3467,7 @@ 
 		try
 		{
 			return get_browser();
-		}
-		catch(TPhpErrorException $e)
+		} catch(TPhpErrorException $e)
 		{
 			throw new TConfigurationException('httprequest_browscap_required');
 		}
@@ -3313,14 +3518,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;
@@ -3339,13 +3545,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()
 	{
@@ -3354,8 +3562,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)
@@ -3420,14 +3629,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)
 	{
@@ -3466,31 +3676,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;
 	}
 }
@@ -3599,8 +3813,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);
 		}
@@ -3711,8 +3924,9 @@ 
 	}
 	public function init($config)
 	{
-		if($this->_bufferOutput)
-			ob_start();
+		if($this->_bufferOutput) {
+					ob_start();
+		}
 		$this->_initialized=true;
 		$this->getApplication()->setResponse($this);
 	}
@@ -3734,8 +3948,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()
@@ -3756,10 +3971,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()
 	{
@@ -3767,12 +3983,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");
 			}
@@ -3789,14 +4006,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)
@@ -3816,28 +4035,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');
@@ -3848,29 +4070,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()
@@ -3879,10 +4106,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()
 	{
@@ -3900,25 +4128,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));
@@ -3926,8 +4156,9 @@ 
 	}
 	protected function ensureContentTypeHeaderSent()
 	{
-		if (!$this->_contentTypeHeaderSent)
-			$this->sendContentTypeHeader();
+		if (!$this->_contentTypeHeaderSent) {
+					$this->sendContentTypeHeader();
+		}
 	}
 	protected function sendContentTypeHeader()
 	{
@@ -3937,9 +4168,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;
 	}
@@ -3949,8 +4183,9 @@ 
 	}
 	public function clear()
 	{
-		if($this->_bufferOutput)
-			ob_clean();
+		if($this->_bufferOutput) {
+					ob_clean();
+		}
 	}
 	public function getHeaders($case=null)
 	{
@@ -3960,13 +4195,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)
@@ -3992,8 +4229,7 @@ 
 				$cookie->getSecure(),
 				$cookie->getHttpOnly()
 			);
-		}
-		else {
+		} else {
 			setcookie(
 				$cookie->getName(),
 				$cookie->getValue(),
@@ -4027,12 +4263,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)
 	{
@@ -4057,8 +4295,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"));
@@ -4067,12 +4306,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;
 		}
 	}
@@ -4108,10 +4350,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()
 	{
@@ -4119,12 +4362,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()
 	{
@@ -4132,12 +4376,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()
 	{
@@ -4149,37 +4394,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');
@@ -4193,10 +4438,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()
 	{
@@ -4204,18 +4450,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()
@@ -4224,13 +4470,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');
 		}
 	}
@@ -4240,10 +4487,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)
 	{
@@ -4300,14 +4548,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)
 	{
@@ -4380,8 +4629,9 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_caseSensitive===false)
-			$exprops[] = "\0TAttributeCollection\0_caseSensitive";
+		if ($this->_caseSensitive===false) {
+					$exprops[] = "\0TAttributeCollection\0_caseSensitive";
+		}
 	}
 	public function __get($name)
 	{
@@ -4514,10 +4764,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()
 	{
@@ -4539,10 +4790,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;
 	}
@@ -4550,10 +4802,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;
 	}
@@ -4567,8 +4820,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()
@@ -4576,8 +4830,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();
 	}
@@ -4591,37 +4846,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()
 	{
@@ -4641,10 +4901,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()
 	{
@@ -4652,19 +4913,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()
 	{
@@ -4680,8 +4943,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()
@@ -4692,13 +4956,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)
 	{
@@ -4708,13 +4973,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)
 	{
@@ -4722,16 +4988,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);
@@ -4740,17 +5007,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)
 	{
@@ -4758,29 +5027,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)
 	{
@@ -4788,10 +5060,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)
 	{
@@ -4803,34 +5076,36 @@ 
 	}
 	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)
 	{
 		if($this->_trackViewState)
 		{
 			unset($this->_tempState[$key]);
-			if($value===$defaultValue)
-				unset($this->_viewState[$key]);
-			else
-				$this->_viewState[$key]=$value;
-		}
-		else
+			if($value===$defaultValue) {
+							unset($this->_viewState[$key]);
+			} else {
+							$this->_viewState[$key]=$value;
+			}
+		} else
 		{
 			unset($this->_viewState[$key]);
-			if($value===$defaultValue)
-				unset($this->_tempState[$key]);
-			else
-				$this->_tempState[$key]=$value;
+			if($value===$defaultValue) {
+							unset($this->_tempState[$key]);
+			} else {
+							$this->_tempState[$key]=$value;
+			}
 		}
 	}
 	public function clearViewState($key)
@@ -4860,29 +5135,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()
@@ -4891,12 +5171,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;
 		}
 	}
@@ -4907,14 +5188,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;
@@ -4929,23 +5210,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)
@@ -4955,10 +5238,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;
@@ -4972,8 +5257,9 @@ 
 			{
 				if($control instanceof TControl)
 				{
-					if($control->_id===$id)
-						$controls[]=$control;
+					if($control->_id===$id) {
+											$controls[]=$control;
+					}
 					$controls=array_merge($controls,$control->findControlsByID($id));
 				}
 			}
@@ -4987,8 +5273,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)
@@ -5038,24 +5325,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)
@@ -5067,32 +5357,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)
@@ -5100,8 +5393,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)
 			{
@@ -5109,8 +5403,9 @@ 
 				{
 					$control->_namingContainer=$namingContainer;
 					$control->_page=$page;
-					if($control->_id==='' && $namingContainer)
-						$control->generateAutomaticID();
+					if($control->_id==='' && $namingContainer) {
+											$control->generateAutomaticID();
+					}
 					$control->initRecursive($namingContainer);
 				}
 			}
@@ -5123,10 +5418,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;
 		}
 	}
@@ -5134,39 +5430,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();
+					}
 				}
 			}
 		}
@@ -5174,18 +5475,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)
 	{
@@ -5212,8 +5516,9 @@ 
 		$control=$this;
 		while($control=$control->_parent)
 		{
-			if($control->bubbleEvent($sender,$param))
-				break;
+			if($control->bubbleEvent($sender,$param)) {
+							break;
+			}
 		}
 	}
 	public function bubbleEvent($sender,$param)
@@ -5227,23 +5532,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)
@@ -5254,17 +5563,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)
@@ -5277,12 +5588,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);
+				}
 			}
 		}
 	}
@@ -5301,15 +5613,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())
@@ -5326,21 +5639,24 @@ 
 					}
 				}
 			}
-			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())
@@ -5349,15 +5665,18 @@ 
 			{
 				if($control instanceof TControl)
 				{
-					if(count($tmp = &$control->saveStateRecursive($needViewState)))
-						$state[$control->_id]=$tmp;
+					if(count($tmp = &$control->saveStateRecursive($needViewState))) {
+											$state[$control->_id]=$tmp;
+					}
 				}
 			}
 		}
-		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)
@@ -5366,25 +5685,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();
@@ -5401,13 +5722,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]);
 			}
 		}
 	}
@@ -5430,24 +5753,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
@@ -5458,7 +5783,10 @@ 
 	}
 	public function insertAt($index,$item)
 	{
-		if(!is_string($item))  			parent::insertAt($index,$item);  	}
+		if(!is_string($item)) {
+			parent::insertAt($index,$item);
+		}
+		}
 }
 interface INamingContainer
 {
@@ -5584,16 +5912,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()
@@ -5607,16 +5936,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)
 	{
@@ -5643,12 +5975,15 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_flags===0)
-			$exprops[] = "\0TFont\0_flags";
-		if ($this->_name==='')
-			$exprops[] = "\0TFont\0_name";
-		if ($this->_size==='')
-			$exprops[] = "\0TFont\0_size";
+		if ($this->_flags===0) {
+					$exprops[] = "\0TFont\0_flags";
+		}
+		if ($this->_name==='') {
+					$exprops[] = "\0TFont\0_name";
+		}
+		if ($this->_size==='') {
+					$exprops[] = "\0TFont\0_size";
+		}
 	}
 	public function getBold()
 	{
@@ -5657,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()
 	{
@@ -5669,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()
 	{
@@ -5681,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()
 	{
@@ -5702,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()
 	{
@@ -5714,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()
 	{
@@ -5740,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
@@ -5835,26 +6209,33 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_fields===array())
-			$exprops[] = "\0TStyle\0_fields";
-		if($this->_font===null)
-			$exprops[] = "\0TStyle\0_font";
-		if($this->_class===null)
-			$exprops[] = "\0TStyle\0_class";
-		if ($this->_customStyle===null)
-			$exprops[] = "\0TStyle\0_customStyle";
-		if ($this->_displayStyle==='Fixed')
-			$exprops[] = "\0TStyle\0_displayStyle";
+		if ($this->_fields===array()) {
+					$exprops[] = "\0TStyle\0_fields";
+		}
+		if($this->_font===null) {
+					$exprops[] = "\0TStyle\0_font";
+		}
+		if($this->_class===null) {
+					$exprops[] = "\0TStyle\0_class";
+		}
+		if ($this->_customStyle===null) {
+					$exprops[] = "\0TStyle\0_customStyle";
+		}
+		if ($this->_displayStyle==='Fixed') {
+					$exprops[] = "\0TStyle\0_displayStyle";
+		}
 	}
 	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()
 	{
@@ -5862,10 +6243,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()
 	{
@@ -5873,10 +6255,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()
 	{
@@ -5884,10 +6267,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()
 	{
@@ -5895,10 +6279,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()
 	{
@@ -5914,8 +6299,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()
@@ -5950,10 +6336,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()
 	{
@@ -5961,10 +6348,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()
 	{
@@ -6010,12 +6398,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)
@@ -6023,12 +6414,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)
@@ -6038,15 +6432,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()
 	{
@@ -6071,18 +6468,24 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_backImageUrl===null)
-			$exprops[] = "\0TTableStyle\0_backImageUrl";
-		if ($this->_horizontalAlign===null)
-			$exprops[] = "\0TTableStyle\0_horizontalAlign";
-		if ($this->_cellPadding===null)
-			$exprops[] = "\0TTableStyle\0_cellPadding";
-		if ($this->_cellSpacing===null)
-			$exprops[] = "\0TTableStyle\0_cellSpacing";
-		if ($this->_gridLines===null)
-			$exprops[] = "\0TTableStyle\0_gridLines";
-		if ($this->_borderCollapse===null)
-			$exprops[] = "\0TTableStyle\0_borderCollapse";
+		if ($this->_backImageUrl===null) {
+					$exprops[] = "\0TTableStyle\0_backImageUrl";
+		}
+		if ($this->_horizontalAlign===null) {
+					$exprops[] = "\0TTableStyle\0_horizontalAlign";
+		}
+		if ($this->_cellPadding===null) {
+					$exprops[] = "\0TTableStyle\0_cellPadding";
+		}
+		if ($this->_cellSpacing===null) {
+					$exprops[] = "\0TTableStyle\0_cellSpacing";
+		}
+		if ($this->_gridLines===null) {
+					$exprops[] = "\0TTableStyle\0_gridLines";
+		}
+		if ($this->_borderCollapse===null) {
+					$exprops[] = "\0TTableStyle\0_borderCollapse";
+		}
 	}
 	public function reset()
 	{
@@ -6098,18 +6501,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)
@@ -6117,32 +6526,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;
@@ -6173,8 +6593,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()
 	{
@@ -6182,8 +6603,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()
 	{
@@ -6210,12 +6632,15 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_horizontalAlign===null)
-			$exprops[] = "\0TTableItemStyle\0_horizontalAlign";
-		if ($this->_verticalAlign===null)
-			$exprops[] = "\0TTableItemStyle\0_verticalAlign";
-		if ($this->_wrap===null)
-			$exprops[] = "\0TTableItemStyle\0_wrap";
+		if ($this->_horizontalAlign===null) {
+					$exprops[] = "\0TTableItemStyle\0_horizontalAlign";
+		}
+		if ($this->_verticalAlign===null) {
+					$exprops[] = "\0TTableItemStyle\0_verticalAlign";
+		}
+		if ($this->_wrap===null) {
+					$exprops[] = "\0TTableItemStyle\0_wrap";
+		}
 	}
 	public function reset()
 	{
@@ -6229,12 +6654,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)
@@ -6242,22 +6670,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()
@@ -6358,75 +6792,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())
 		{
@@ -6440,8 +6885,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');
@@ -6483,8 +6929,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)
@@ -6492,10 +6939,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()
 	{
@@ -6503,16 +6952,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)
 	{
@@ -6520,10 +6971,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)
 	{
@@ -6531,10 +6983,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)
 	{
@@ -6542,10 +6995,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)
 	{
@@ -6557,10 +7011,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)
 	{
@@ -6568,10 +7023,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)
 	{
@@ -6587,10 +7043,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)
 	{
@@ -6606,9 +7063,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);
@@ -6617,10 +7074,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()
 	{
@@ -6648,38 +7106,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)
@@ -6710,8 +7177,9 @@ 
 			$decorator->renderPostContentsText($writer);
 			$writer->renderEndTag();
 			$decorator->renderPostTagText($writer);
-		} else
-			$writer->renderEndTag($writer);
+		} else {
+					$writer->renderEndTag($writer);
+		}
 	}
 }
 class TCompositeControl extends TControl implements INamingContainer
@@ -6736,12 +7204,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)
 	{
@@ -6749,17 +7218,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()
 	{
@@ -6772,27 +7243,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()
 	{
@@ -6814,9 +7288,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)
 	{
@@ -6824,17 +7298,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)
@@ -6847,14 +7323,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)
                                         {
@@ -6876,11 +7352,11 @@ 
                                         }
                                         break;
                                 }
-                        } 
-                        catch (Exception $ex)
+                        } catch (Exception $ex)
                         {
-                                if ($throwExceptions)
-                                        throw $ex;
+                                if ($throwExceptions) {
+                                                                        throw $ex;
+                                }
                         }
                 }
         }
@@ -6891,20 +7367,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;
+                                }
                         }
                 }
         }
@@ -6922,17 +7400,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)
@@ -6952,8 +7432,7 @@ 
  			$page->endFormRender($writer);
 			$cs->renderScriptFilesEnd($writer);
 			$cs->renderEndScripts($writer);
-		}
-		else
+		} else
 		{
 			$cs->renderHiddenFieldsBegin($writer);
 			$page->beginFormRender($writer);
@@ -7045,10 +7524,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;
@@ -7059,22 +7539,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);
 									}
@@ -7084,8 +7567,9 @@ 
 						}
 					}
 				}
-				foreach($packagesUrl as $url)
-					$this->registerScriptFile($url,$url);
+				foreach($packagesUrl as $url) {
+									$this->registerScriptFile($url,$url);
+				}
 			}
 		}
 	}
@@ -7111,8 +7595,7 @@ 
 				$base = $dir;
 			}
 			return array($assets->getPublishedPath($base), $assets->publishFilePath($base));
-		}
-		else
+		} else
 		{
 			return array($assets->getBasePath().str_replace($assets->getBaseUrl(),'',$base), $base);
 		}
@@ -7142,8 +7625,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;
@@ -7154,9 +7638,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();
@@ -7180,18 +7664,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);
 	}
@@ -7208,9 +7694,10 @@ 
 				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;
 	}
@@ -7302,17 +7789,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)
 	{
@@ -7390,25 +7879,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()
 	{
@@ -7416,8 +7910,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
@@ -7425,16 +7920,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)
 	{
@@ -7442,8 +7939,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)
@@ -7506,13 +8004,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)
@@ -7555,8 +8054,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);
@@ -7570,12 +8070,14 @@ 
 		Prado::using('System.Web.UI.JuiControls.TJuiControlOptions');
 		$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);
@@ -7597,10 +8099,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)
 	{
@@ -7628,23 +8131,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;
 		}
 	}
@@ -7655,15 +8161,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();
+					}
 				}
 			}
 		}
@@ -7674,19 +8181,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)
@@ -7695,8 +8204,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)
@@ -7705,23 +8215,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;
@@ -7749,29 +8263,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)
 	{
@@ -7780,8 +8300,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()
 	{
@@ -7820,16 +8341,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;
 	}
@@ -7841,8 +8364,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;
 	}
@@ -7853,27 +8377,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)
 		{
@@ -7881,11 +8406,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]);
 			}
 		}
@@ -7897,15 +8423,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()
 	{
@@ -7913,13 +8441,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;
@@ -7928,14 +8458,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)
@@ -7956,8 +8487,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)
 		{
@@ -7967,17 +8499,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()
 	{
@@ -8004,8 +8538,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;
@@ -8046,20 +8581,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
@@ -8074,35 +8612,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;
 	}
@@ -8140,11 +8685,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;
@@ -8155,11 +8701,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;
 				}
 			}
 		}
@@ -8172,9 +8719,9 @@ 
 			$stack->push($this);
 			parent::initRecursive($namingContainer);
 			$stack->pop();
+		} else {
+					parent::initRecursive($namingContainer);
 		}
-		else
-			parent::initRecursive($namingContainer);
 	}
 	protected function loadRecursive()
 	{
@@ -8184,11 +8731,11 @@ 
 			$stack->push($this);
 			parent::loadRecursive();
 			$stack->pop();
-		}
-		else
+		} else
 		{
-			if($this->_dataCached)
-				$this->performActions();
+			if($this->_dataCached) {
+							$this->performActions();
+			}
 			parent::loadRecursive();
 		}
 	}
@@ -8198,12 +8745,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()
@@ -8214,9 +8762,9 @@ 
 			$stack->push($this);
 			parent::preRenderRecursive();
 			$stack->pop();
+		} else {
+					parent::preRenderRecursive();
 		}
-		else
-			parent::preRenderRecursive();
 	}
 	protected function loadStateRecursive(&$state,$needViewState=true)
 	{
@@ -8225,9 +8773,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);
@@ -8240,15 +8788,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();
@@ -8299,8 +8849,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()
@@ -8337,9 +8888,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));
@@ -8351,9 +8902,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
@@ -8398,13 +8949,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;
 	}
 }
@@ -8426,16 +8979,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)
 					{
@@ -8445,30 +8999,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;
 	}
@@ -8531,118 +9089,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)
 	{
@@ -8654,9 +9233,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]));
@@ -8680,12 +9259,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);
 		}
@@ -8698,10 +9277,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]);
@@ -8717,9 +9297,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)
 	{
@@ -8742,10 +9322,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]);
@@ -8755,16 +9337,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)
 					{
@@ -8772,77 +9356,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)
 					{
@@ -8854,33 +9446,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))
 			{
@@ -8888,21 +9484,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();
@@ -8912,39 +9511,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);
@@ -8952,22 +9553,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;
@@ -8990,45 +9593,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')
 		{
@@ -9037,63 +9644,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()
 	{
@@ -9112,18 +9721,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)
@@ -9133,9 +9743,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);
@@ -9159,15 +9769,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;
@@ -9185,10 +9799,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)
 	{
@@ -9209,8 +9824,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;
@@ -9220,21 +9836,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()
@@ -9243,8 +9861,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)),'\\','/');
 		}
@@ -9279,28 +9898,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;
@@ -9314,29 +9934,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];
 					}
 				}
@@ -9344,8 +9968,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()
@@ -9383,8 +10008,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)
@@ -9425,20 +10051,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()
 	{
@@ -9484,8 +10111,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)
@@ -9496,12 +10124,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);
@@ -9511,8 +10141,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)
@@ -9524,14 +10155,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();
@@ -9546,19 +10177,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);
@@ -9580,10 +10211,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));
@@ -9622,8 +10254,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;
 	}
@@ -9637,10 +10270,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()
 	{
@@ -9654,18 +10288,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)
@@ -9694,33 +10330,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)
@@ -9768,30 +10409,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)
@@ -9825,14 +10468,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;
@@ -9877,11 +10523,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']))
@@ -9889,13 +10538,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);
+				}
 			}
 		}
 	}
@@ -9908,14 +10559,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;
@@ -9931,8 +10585,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);
 		}
@@ -9943,27 +10598,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);
+			}
 		}
 	}
 }
@@ -9979,12 +10641,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;
 	}
@@ -9994,13 +10659,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()
@@ -10009,27 +10675,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)
@@ -10050,18 +10717,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)
 	{
@@ -10091,18 +10760,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 {
@@ -10111,11 +10780,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);
@@ -10133,9 +10802,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);
@@ -10153,21 +10822,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);
 	}
@@ -10226,12 +10898,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']}'");
 			}
@@ -10241,9 +10913,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;
@@ -10258,11 +10931,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)
@@ -10270,11 +10946,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;
 	}
@@ -10345,8 +11023,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));
@@ -10354,17 +11033,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))
 		{
@@ -10373,16 +11053,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()
 	{
@@ -10394,16 +11075,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);
 		}
@@ -10424,12 +11106,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)
 	{
@@ -10538,8 +11222,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()
@@ -10552,15 +11237,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);
@@ -10698,8 +11385,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()
@@ -10717,7 +11405,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);
@@ -10726,52 +11416,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);
@@ -10787,15 +11489,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)
@@ -10804,27 +11508,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)
 	{
@@ -10867,8 +11575,9 @@ 
 	}
 	public function runService()
 	{
-		if($this->_service)
-			$this->_service->run();
+		if($this->_service) {
+					$this->_service->run();
+		}
 	}
 	public function onSaveState()
 	{
@@ -10915,8 +11624,7 @@ 
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent,dirname($fname));
-		}
-		else
+		} else
 		{
 			$dom=new TXmlDocument;
 			$dom->loadFromFile($fname);
@@ -10937,16 +11645,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)
 	{
@@ -10986,13 +11699,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;
 			}
 		}
@@ -11015,26 +11732,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;
 				}
@@ -11047,8 +11769,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();
@@ -11071,25 +11794,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']);
@@ -11105,16 +11831,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)
@@ -11131,8 +11859,7 @@ 
 					$properties['id'] = $id;
 					$this->_parameters[$id] = array($type,$properties);
 				}
-			}
-			else
+			} else
 			{
 				$this->_parameters[$id] = $parameter;
 			}
@@ -11145,21 +11872,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)
@@ -11167,26 +11896,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()
@@ -11231,14 +11965,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)
@@ -11247,10 +11982,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)
 		{