pradosoft / prado

framework/pradolite.php

Indentation +87 added lines, -87 removed lines

@@ -4203,10 +4203,10 @@ 
 		{
 			$value=TPropertyValue::ensureEnum($value,'THttpSessionCookieMode');
 			if($value===THttpSessionCookieMode::None) 
-      {
+	  {
 				ini_set('session.use_cookies','0');
 			  ini_set('session.use_only_cookies','0');
-      }
+	  }
 			else if($value===THttpSessionCookieMode::Allow)
 			{
 				ini_set('session.use_cookies','1');
@@ -6805,77 +6805,77 @@ 
 			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
 		parent::initRecursive($namingContainer);
 	}
-        public function tryToUpdateView($arObj, $throwExceptions = false)
-        {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
-                {
-                        try
-                        {
-                                if ($key != "RELATIONS")
-                                {
-                                        $control = $this->{$key};
-                                        if ($control instanceof TTextBox)
-                                                $control->Text = $arObj->{$key};
-                                        elseif ($control instanceof TCheckBox)
-                                                $control->Checked = (boolean) $arObj->{$key};
-                                        elseif ($control instanceof TDatePicker)
-                                                $control->Date = $arObj->{$key};
-                                }
-                                else
-                                {
-                                        foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
-                                        {
-                                                $relControl = $this->{$relKey};
-                                                switch ($relValues[0])
-                                                {
-                                                        case TActiveRecord::BELONGS_TO:
-                                                        case TActiveRecord::HAS_ONE:
-                                                                $relControl->Text = $arObj->{$relKey};
-                                                                break;
-                                                        case TActiveRecord::HAS_MANY:
-                                                                if ($relControl instanceof TListControl)
-                                                                {
-                                                                        $relControl->DataSource = $arObj->{$relKey};
-                                                                        $relControl->dataBind();
-                                                                }
-                                                                break;
-                                                }
-                                        }
-                                        break;
-                                }
-                        } 
-                        catch (Exception $ex)
-                        {
-                                if ($throwExceptions)
-                                        throw $ex;
-                        }
-                }
-        }
-        public function tryToUpdateAR($arObj, $throwExceptions = false)
-        {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
-                {
-                        try
-                        {
-                                if ($key == "RELATIONS")
-                                        break;
-                                $control = $this->{$key};
-                                if ($control instanceof TTextBox)
-                                        $arObj->{$key} = $control->Text;
-                                elseif ($control instanceof TCheckBox)
-                                        $arObj->{$key} = $control->Checked;
-                                elseif ($control instanceof TDatePicker)
-                                        $arObj->{$key} = $control->Date;
-                        } 
-                        catch (Exception $ex)
-                        {
-                                if ($throwExceptions)
-                                        throw $ex;
-                        }
-                }
-        }
+		public function tryToUpdateView($arObj, $throwExceptions = false)
+		{
+				$objAttrs = get_class_vars(get_class($arObj));
+				foreach (array_keys($objAttrs) as $key)
+				{
+						try
+						{
+								if ($key != "RELATIONS")
+								{
+										$control = $this->{$key};
+										if ($control instanceof TTextBox)
+												$control->Text = $arObj->{$key};
+										elseif ($control instanceof TCheckBox)
+												$control->Checked = (boolean) $arObj->{$key};
+										elseif ($control instanceof TDatePicker)
+												$control->Date = $arObj->{$key};
+								}
+								else
+								{
+										foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
+										{
+												$relControl = $this->{$relKey};
+												switch ($relValues[0])
+												{
+														case TActiveRecord::BELONGS_TO:
+														case TActiveRecord::HAS_ONE:
+																$relControl->Text = $arObj->{$relKey};
+																break;
+														case TActiveRecord::HAS_MANY:
+																if ($relControl instanceof TListControl)
+																{
+																		$relControl->DataSource = $arObj->{$relKey};
+																		$relControl->dataBind();
+																}
+																break;
+												}
+										}
+										break;
+								}
+						} 
+						catch (Exception $ex)
+						{
+								if ($throwExceptions)
+										throw $ex;
+						}
+				}
+		}
+		public function tryToUpdateAR($arObj, $throwExceptions = false)
+		{
+				$objAttrs = get_class_vars(get_class($arObj));
+				foreach (array_keys($objAttrs) as $key)
+				{
+						try
+						{
+								if ($key == "RELATIONS")
+										break;
+								$control = $this->{$key};
+								if ($control instanceof TTextBox)
+										$arObj->{$key} = $control->Text;
+								elseif ($control instanceof TCheckBox)
+										$arObj->{$key} = $control->Checked;
+								elseif ($control instanceof TDatePicker)
+										$arObj->{$key} = $control->Date;
+						} 
+						catch (Exception $ex)
+						{
+								if ($throwExceptions)
+										throw $ex;
+						}
+				}
+		}
 }
 class TForm extends TControl
 {
@@ -7536,13 +7536,13 @@ 
 	{
 		Prado::using('System.Web.UI.ActiveControls.TActivePageAdapter');
 		$this->setAdapter(new TActivePageAdapter($this));
-        $callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
-        if(strlen($callbackEventParameter) > 0)
-            $this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
-                if (($g=$this->getApplication()->getGlobalization(false))!==null &&
-            strtoupper($enc=$g->getCharset())!='UTF-8')
-                foreach ($this->_postData as $k=>$v)
-                	$this->_postData[$k]=self::decodeUTF8($v, $enc);
+		$callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
+		if(strlen($callbackEventParameter) > 0)
+			$this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
+				if (($g=$this->getApplication()->getGlobalization(false))!==null &&
+			strtoupper($enc=$g->getCharset())!='UTF-8')
+				foreach ($this->_postData as $k=>$v)
+					$this->_postData[$k]=self::decodeUTF8($v, $enc);
 		$this->onPreInit(null);
 		$this->initRecursive();
 		$this->onInitComplete(null);
@@ -9127,15 +9127,15 @@ 
 	  $component=new ReflectionClass('TComponent');
 	  $behaviors=$component->getStaticProperties();
 	  if(!isset($behaviors['_um']))
-	    return false;
+		return false;
 	  foreach($behaviors['_um'] as $name=>$list)
 	  {
-	    if(strtolower($class->getShortName())!==$name && !$class->isSubclassOf($name)) continue;
-	    foreach($list as $param)
-	    {
-	      if(method_exists($param->getBehavior(),$method))
-	        return true;
-	    }
+		if(strtolower($class->getShortName())!==$name && !$class->isSubclassOf($name)) continue;
+		foreach($list as $param)
+		{
+		  if(method_exists($param->getBehavior(),$method))
+			return true;
+		}
 	  }
 	  return false;
 	}

Spacing +1633 added lines, -1633 removed lines

@@ -12,9 +12,9 @@ 
  */
 
 if(!defined('PRADO_DIR'))
-	define('PRADO_DIR',dirname(__FILE__));
+	define('PRADO_DIR', dirname(__FILE__));
 if(!defined('PRADO_CHMOD'))
-	define('PRADO_CHMOD',0777);
+	define('PRADO_CHMOD', 0777);
 class PradoBase
 {
 	const CLASS_FILE_EXT='.php';
@@ -22,55 +22,55 @@ 
 	private static $_usings=array();
 	private static $_application=null;
 	private static $_logger=null;
-	protected static $classExists = array();
+	protected static $classExists=array();
 	public static function getVersion()
 	{
 		return '3.3.0';
 	}
 	public static function initErrorHandlers()
 	{
-		set_error_handler(array('PradoBase','phpErrorHandler'));
-		register_shutdown_function(array('PradoBase','phpFatalErrorHandler'));
-		set_exception_handler(array('PradoBase','exceptionHandler'));
+		set_error_handler(array('PradoBase', 'phpErrorHandler'));
+		register_shutdown_function(array('PradoBase', 'phpFatalErrorHandler'));
+		set_exception_handler(array('PradoBase', 'exceptionHandler'));
 	}
 	public static function autoload($className)
 	{
 		include_once($className.self::CLASS_FILE_EXT);
-		if(!class_exists($className,false) && !interface_exists($className,false))
+		if(!class_exists($className, false) && !interface_exists($className, false))
 			self::fatalError("Class file for '$className' cannot be found.");
 	}
 	public static function poweredByPrado($logoType=0)
 	{
-		$logoName=$logoType==1?'powered2':'powered';
+		$logoName=$logoType==1 ? 'powered2' : 'powered';
 		if(self::$_application!==null)
 		{
 			$am=self::$_application->getAssetManager();
-			$url=$am->publishFilePath(self::getPathOfNamespace('System.'.$logoName,'.gif'));
+			$url=$am->publishFilePath(self::getPathOfNamespace('System.'.$logoName, '.gif'));
 		}
 		else
 			$url='http://pradosoft.github.io/docs/'.$logoName.'.gif';
 		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="'.$url.'" style="border-width:0px;" alt="Powered by PRADO" /></a>';
 	}
-	public static function phpErrorHandler($errno,$errstr,$errfile,$errline)
+	public static function phpErrorHandler($errno, $errstr, $errfile, $errline)
 	{
 		if(error_reporting() & $errno)
-			throw new TPhpErrorException($errno,$errstr,$errfile,$errline);
+			throw new TPhpErrorException($errno, $errstr, $errfile, $errline);
 	}
 	public static function phpFatalErrorHandler()
 	{
-		$error = error_get_last();
+		$error=error_get_last();
 		if($error && 
 			TPhpErrorException::isFatalError($error) &&
 			error_reporting() & $error['type'])
 		{
-			self::exceptionHandler(new TPhpErrorException($error['type'],$error['message'],$error['file'],$error['line']));
+			self::exceptionHandler(new TPhpErrorException($error['type'], $error['message'], $error['file'], $error['line']));
 		}
 	}
 	public static function exceptionHandler($exception)
 	{
 		if(self::$_application!==null && ($errorHandler=self::$_application->getErrorHandler())!==null)
 		{
-			$errorHandler->handleError(null,$exception);
+			$errorHandler->handleError(null, $exception);
 		}
 		else
 		{
@@ -95,16 +95,16 @@ 
 	public static function createComponent($type)
 	{
 		if(!isset(self::$classExists[$type]))
-			self::$classExists[$type] = class_exists($type, false);
-		if( !isset(self::$_usings[$type]) && !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);
+			self::$classExists[$type]=class_exists($type, false);
 		}
-		if( ($pos = strrpos($type, '.')) !== false)
-			$type = substr($type,$pos+1);
-		if(($n=func_num_args())>1)
+		if(($pos=strrpos($type, '.'))!==false)
+			$type=substr($type, $pos + 1);
+		if(($n=func_num_args()) > 1)
 		{
-			$args = func_get_args();
+			$args=func_get_args();
 			switch($n) {
 				case 2:
 					return new $type($args[1]);
@@ -120,7 +120,7 @@ 
 				break;
 				default:
 					$s='$args[1]';
-					for($i=2;$i<$n;++$i)
+					for($i=2; $i < $n; ++$i)
 						$s.=",\$args[$i]";
 					eval("\$component=new $type($s);");
 					return $component;
@@ -130,33 +130,33 @@ 
 		else
 			return new $type;
 	}
-	public static function using($namespace,$checkClassExistence=true)
+	public static function using($namespace, $checkClassExistence=true)
 	{
-		if(isset(self::$_usings[$namespace]) || class_exists($namespace,false))
+		if(isset(self::$_usings[$namespace]) || class_exists($namespace, false))
 			return;
-		if(($pos=strrpos($namespace,'.'))===false)  		{
+		if(($pos=strrpos($namespace, '.'))===false) {
 			try
 			{
 				include_once($namespace.self::CLASS_FILE_EXT);
 			}
 			catch(Exception $e)
 			{
-				if($checkClassExistence && !class_exists($namespace,false))
-					throw new TInvalidOperationException('prado_component_unknown',$namespace,$e->getMessage());
+				if($checkClassExistence && !class_exists($namespace, false))
+					throw new TInvalidOperationException('prado_component_unknown', $namespace, $e->getMessage());
 				else
 					throw $e;
 			}
 		}
-		else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
+		else if(($path=self::getPathOfNamespace($namespace, self::CLASS_FILE_EXT))!==null)
 		{
-			$className=substr($namespace,$pos+1);
-			if($className==='*')  			{
+			$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))
+				if(!$checkClassExistence || !class_exists($className, false))
 				{
 					try
 					{
@@ -164,8 +164,8 @@ 
 					}
 					catch(Exception $e)
 					{
-						if($checkClassExistence && !class_exists($className,false))
-							throw new TInvalidOperationException('prado_component_unknown',$className,$e->getMessage());
+						if($checkClassExistence && !class_exists($className, false))
+							throw new TInvalidOperationException('prado_component_unknown', $className, $e->getMessage());
 						else
 							throw $e;
 					}
@@ -173,44 +173,44 @@ 
 			}
 		}
 		else
-			throw new TInvalidDataValueException('prado_using_invalid',$namespace);
+			throw new TInvalidDataValueException('prado_using_invalid', $namespace);
 	}
 	public static function getPathOfNamespace($namespace, $ext='')
 	{
-		if(self::CLASS_FILE_EXT === $ext || empty($ext))
+		if(self::CLASS_FILE_EXT===$ext || empty($ext))
 		{
 			if(isset(self::$_usings[$namespace]))
 				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);
+		$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);
 		return null;
 	}
 	public static function getPathOfAlias($alias)
 	{
-		return isset(self::$_aliases[$alias])?self::$_aliases[$alias]:null;
+		return isset(self::$_aliases[$alias]) ? self::$_aliases[$alias] : null;
 	}
 	protected static function getPathAliases()
 	{
 		return self::$_aliases;
 	}
-	public static function setPathOfAlias($alias,$path)
+	public static function setPathOfAlias($alias, $path)
 	{
 		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
-			throw new TInvalidOperationException('prado_alias_redefined',$alias);
+			throw new TInvalidOperationException('prado_alias_redefined', $alias);
 		else if(($rp=realpath($path))!==false && is_dir($rp))
 		{
-			if(strpos($alias,'.')===false)
+			if(strpos($alias, '.')===false)
 				self::$_aliases[$alias]=$rp;
 			else
-				throw new TInvalidDataValueException('prado_aliasname_invalid',$alias);
+				throw new TInvalidDataValueException('prado_aliasname_invalid', $alias);
 		}
 		else
-			throw new TInvalidDataValueException('prado_alias_invalid',$alias,$path);
+			throw new TInvalidDataValueException('prado_alias_invalid', $alias, $path);
 	}
 	public static function fatalError($msg)
 	{
@@ -227,13 +227,13 @@ 
 			if($index==0)  				continue;
 			echo '#'.$index.' ';
 			if(isset($t['file']))
-				echo basename($t['file']) . ':' . $t['line'];
+				echo basename($t['file']).':'.$t['line'];
 			else
 				 echo '<PHP inner-code>';
 			echo ' -- ';
 			if(isset($t['class']))
-				echo $t['class'] . $t['type'];
-			echo $t['function'] . '(';
+				echo $t['class'].$t['type'];
+			echo $t['function'].'(';
 			if(isset($t['args']) && sizeof($t['args']) > 0)
 			{
 				$count=0;
@@ -242,25 +242,25 @@ 
 					if(is_string($item))
 					{
 						$str=htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
-						if (strlen($item) > 70)
-							echo "'". substr($str, 0, 70) . "...'";
+						if(strlen($item) > 70)
+							echo "'".substr($str, 0, 70)."...'";
 						else
-							echo "'" . $str . "'";
+							echo "'".$str."'";
 					}
-					else if (is_int($item) || is_float($item))
+					else if(is_int($item) || is_float($item))
 						echo $item;
-					else if (is_object($item))
+					else if(is_object($item))
 						echo get_class($item);
-					else if (is_array($item))
-						echo 'array(' . count($item) . ')';
-					else if (is_bool($item))
+					else if(is_array($item))
+						echo 'array('.count($item).')';
+					else if(is_bool($item))
 						echo $item ? 'true' : 'false';
-					else if ($item === null)
+					else if($item===null)
 						echo 'NULL';
-					else if (is_resource($item))
+					else if(is_resource($item))
 						echo get_resource_type($item);
 					$count++;
-					if (count($t['args']) > $count)
+					if(count($t['args']) > $count)
 						echo ', ';
 				}
 			}
@@ -279,10 +279,10 @@ 
 			else
 			{
 				$languages=array();
-				foreach(explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
+				foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
 				{
-					$array=explode(';q=',trim($language));
-					$languages[trim($array[0])]=isset($array[1])?(float)$array[1]:1.0;
+					$array=explode(';q=', trim($language));
+					$languages[trim($array[0])]=isset($array[1]) ? (float) $array[1] : 1.0;
 				}
 				arsort($languages);
 				$languages=array_keys($languages);
@@ -298,7 +298,7 @@ 
 		if($language===null)
 		{
 			$langs=Prado::getUserLanguages();
-			$lang=explode('-',$langs[0]);
+			$lang=explode('-', $langs[0]);
 			if(empty($lang[0]) || !ctype_alpha($lang[0]))
 				$language='en';
 			else
@@ -306,7 +306,7 @@ 
 		}
 		return $language;
 	}
-	public static function trace($msg,$category='Uncategorized',$ctl=null)
+	public static function trace($msg, $category='Uncategorized', $ctl=null)
 	{
 		if(self::$_application && self::$_application->getMode()===TApplicationMode::Performance)
 			return;
@@ -319,13 +319,13 @@ 
 		}
 		else
 			$level=TLogger::INFO;
-		self::log($msg,$level,$category,$ctl);
+		self::log($msg, $level, $category, $ctl);
 	}
-	public static function log($msg,$level=TLogger::INFO,$category='Uncategorized',$ctl=null)
+	public static function log($msg, $level=TLogger::INFO, $category='Uncategorized', $ctl=null)
 	{
 		if(self::$_logger===null)
 			self::$_logger=new TLogger;
-		self::$_logger->log($msg,$level,$category,$ctl);
+		self::$_logger->log($msg, $level, $category, $ctl);
 	}
 	public static function getLogger()
 	{
@@ -333,40 +333,40 @@ 
 			self::$_logger=new TLogger;
 		return self::$_logger;
 	}
-	public static function varDump($var,$depth=10,$highlight=false)
+	public static function varDump($var, $depth=10, $highlight=false)
 	{
 		Prado::using('System.Util.TVarDumper');
-		return TVarDumper::dump($var,$depth,$highlight);
+		return TVarDumper::dump($var, $depth, $highlight);
 	}
 	public static function localize($text, $parameters=array(), $catalogue=null, $charset=null)
 	{
 		Prado::using('System.I18N.Translation');
-		$app = Prado::getApplication()->getGlobalization(false);
-		$params = array();
+		$app=Prado::getApplication()->getGlobalization(false);
+		$params=array();
 		foreach($parameters as $key => $value)
-			$params['{'.$key.'}'] = $value;
-				if($app===null || ($config = $app->getTranslationConfiguration())===null)
+			$params['{'.$key.'}']=$value;
+				if($app===null || ($config=$app->getTranslationConfiguration())===null)
 			return strtr($text, $params);
-		if ($catalogue===null)
-			$catalogue=isset($config['catalogue'])?$config['catalogue']:'messages';
+		if($catalogue===null)
+			$catalogue=isset($config['catalogue']) ? $config['catalogue'] : 'messages';
 		Translation::init($catalogue);
-				$appCharset = $app===null ? '' : $app->getCharset();
-				$defaultCharset = ($app===null) ? 'UTF-8' : $app->getDefaultCharset();
-				if(empty($charset)) $charset = $appCharset;
-		if(empty($charset)) $charset = $defaultCharset;
-		return Translation::formatter($catalogue)->format($text,$params,$catalogue,$charset);
+				$appCharset=$app===null ? '' : $app->getCharset();
+				$defaultCharset=($app===null) ? 'UTF-8' : $app->getDefaultCharset();
+				if(empty($charset)) $charset=$appCharset;
+		if(empty($charset)) $charset=$defaultCharset;
+		return Translation::formatter($catalogue)->format($text, $params, $catalogue, $charset);
 	}
 }
 PradoBase::using('System.TComponent');
 PradoBase::using('System.Exceptions.TException');
 PradoBase::using('System.Util.TLogger');
-if(!class_exists('Prado',false))
+if(!class_exists('Prado', false))
 {
 	class Prado extends PradoBase
 	{
 	}
 }
-spl_autoload_register(array('Prado','autoload'));
+spl_autoload_register(array('Prado', 'autoload'));
 Prado::initErrorHandlers();
 interface IModule
 {
@@ -408,8 +408,8 @@ 
 interface ICache
 {
 	public function get($id);
-	public function set($id,$value,$expire=0,$dependency=null);
-	public function add($id,$value,$expire=0,$dependency=null);
+	public function set($id, $value, $expire=0, $dependency=null);
+	public function add($id, $value, $expire=0, $dependency=null);
 	public function delete($id);
 	public function flush();
 }
@@ -470,7 +470,7 @@ 
 	{
 		return Prado::getApplication()->getUser();
 	}
-	public function publishAsset($assetPath,$className=null)
+	public function publishAsset($assetPath, $className=null)
 	{
 		if($className===null)
 			$className=get_class($this);
@@ -546,9 +546,9 @@ 
 		if(($templatePath=Prado::getPathOfNamespace($value))!==null && is_dir($templatePath))
 			$this->_templatePath=$templatePath;
 		else
-			throw new TConfigurationException('errorhandler_errortemplatepath_invalid',$value);
+			throw new TConfigurationException('errorhandler_errortemplatepath_invalid', $value);
 	}
-	public function handleError($sender,$param)
+	public function handleError($sender, $param)
 	{
 		static $handling=false;
 								restore_error_handler();
@@ -563,56 +563,56 @@ 
 			if(!headers_sent())
 				header('Content-Type: text/html; charset=UTF-8');
 			if($param instanceof THttpException)
-				$this->handleExternalError($param->getStatusCode(),$param);
+				$this->handleExternalError($param->getStatusCode(), $param);
 			else if($this->getApplication()->getMode()===TApplicationMode::Debug)
 				$this->displayException($param);
 			else
-				$this->handleExternalError(500,$param);
+				$this->handleExternalError(500, $param);
 		}
 	}
 	protected static function hideSecurityRelated($value, $exception=null)
 	{
-		$aRpl = array();
-		if($exception !== null && $exception instanceof Exception)
+		$aRpl=array();
+		if($exception!==null && $exception instanceof Exception)
 		{
-			$aTrace = $exception->getTrace();
+			$aTrace=$exception->getTrace();
 			foreach($aTrace as $item)
 			{
 				if(isset($item['file']))
-					$aRpl[dirname($item['file']) . DIRECTORY_SEPARATOR] = '<hidden>' . DIRECTORY_SEPARATOR;
+					$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;
+		$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]);
-		$aRpl = array_reverse($aRpl, true);
+		$aRpl=array_reverse($aRpl, true);
 		return str_replace(array_keys($aRpl), $aRpl, $value);
 	}
-	protected function handleExternalError($statusCode,$exception)
+	protected function handleExternalError($statusCode, $exception)
 	{
 		if(!($exception instanceof THttpException))
 			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();
+		$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
 		{
 			$version='';
-			$errorMessage = self::hideSecurityRelated($errorMessage, $exception);
+			$errorMessage=self::hideSecurityRelated($errorMessage, $exception);
 		}
 		$tokens=array(
 			'%%StatusCode%%' => "$statusCode",
 			'%%ErrorMessage%%' => htmlspecialchars($errorMessage),
 			'%%ServerAdmin%%' => $serverAdmin,
 			'%%Version%%' => $version,
-			'%%Time%%' => @strftime('%Y-%m-%d %H:%M',time())
+			'%%Time%%' => @strftime('%Y-%m-%d %H:%M', time())
 		);
 		$this->getApplication()->getResponse()->setStatusCode($statusCode, $isDebug ? $exception->getMessage() : null);
-		echo strtr($content,$tokens);
+		echo strtr($content, $tokens);
 	}
 	protected function handleRecursiveError($exception)
 	{
@@ -640,8 +640,8 @@ 
 		if($exception instanceof TTemplateException)
 		{
 			$fileName=$exception->getTemplateFile();
-			$lines=empty($fileName)?explode("\n",$exception->getTemplateSource()):@file($fileName);
-			$source=$this->getSourceCode($lines,$exception->getLineNumber());
+			$lines=empty($fileName) ? explode("\n", $exception->getTemplateSource()) : @file($fileName);
+			$source=$this->getSourceCode($lines, $exception->getLineNumber());
 			if($fileName==='')
 				$fileName='---embedded template---';
 			$errorLine=$exception->getLineNumber();
@@ -658,7 +658,7 @@ 
 				$fileName=$exception->getFile();
 				$errorLine=$exception->getLine();
 			}
-			$source=$this->getSourceCode(@file($fileName),$errorLine);
+			$source=$this->getSourceCode(@file($fileName), $errorLine);
 		}
 		if($this->getApplication()->getMode()===TApplicationMode::Debug)
 			$version=$_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
@@ -671,10 +671,10 @@ 
 			'%%SourceCode%%' => $source,
 			'%%StackTrace%%' => htmlspecialchars($exception->getTraceAsString()),
 			'%%Version%%' => $version,
-			'%%Time%%' => @strftime('%Y-%m-%d %H:%M',time())
+			'%%Time%%' => @strftime('%Y-%m-%d %H:%M', time())
 		);
 		$content=$this->getExceptionTemplate($exception);
-		echo strtr($content,$tokens);
+		echo strtr($content, $tokens);
 	}
 	protected function getExceptionTemplate($exception)
 	{
@@ -686,7 +686,7 @@ 
 			die("Unable to open exception template file '$exceptionFile'.");
 		return $content;
 	}
-	protected function getErrorTemplate($statusCode,$exception)
+	protected function getErrorTemplate($statusCode, $exception)
 	{
 		$base=$this->getErrorTemplatePath().DIRECTORY_SEPARATOR.self::ERROR_FILE_NAME;
 		$lang=Prado::getPreferredLanguage();
@@ -715,14 +715,14 @@ 
 		}
 		else if($exception instanceof TInvalidOperationException)
 		{
-						if(($result=$this->getPropertyAccessTrace($trace,'__get'))===null)
-				$result=$this->getPropertyAccessTrace($trace,'__set');
+						if(($result=$this->getPropertyAccessTrace($trace, '__get'))===null)
+				$result=$this->getPropertyAccessTrace($trace, '__set');
 		}
-		if($result!==null && strpos($result['file'],': eval()\'d code')!==false)
+		if($result!==null && strpos($result['file'], ': eval()\'d code')!==false)
 			return null;
 		return $result;
 	}
-	private function getPropertyAccessTrace($trace,$pattern)
+	private function getPropertyAccessTrace($trace, $pattern)
 	{
 		$result=null;
 		foreach($trace as $t)
@@ -734,35 +734,35 @@ 
 		}
 		return $result;
 	}
-	private function getSourceCode($lines,$errorLine)
+	private function getSourceCode($lines, $errorLine)
 	{
-		$beginLine=$errorLine-self::SOURCE_LINES>=0?$errorLine-self::SOURCE_LINES:0;
-		$endLine=$errorLine+self::SOURCE_LINES<=count($lines)?$errorLine+self::SOURCE_LINES:count($lines);
+		$beginLine=$errorLine - self::SOURCE_LINES >= 0 ? $errorLine - self::SOURCE_LINES : 0;
+		$endLine=$errorLine + self::SOURCE_LINES <= count($lines) ? $errorLine + self::SOURCE_LINES : count($lines);
 		$source='';
-		for($i=$beginLine;$i<$endLine;++$i)
+		for($i=$beginLine; $i < $endLine; ++$i)
 		{
-			if($i===$errorLine-1)
+			if($i===$errorLine - 1)
 			{
-				$line=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
+				$line=htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
 				$source.="<div class=\"error\">".$line."</div>";
 			}
 			else
-				$source.=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
+				$source.=htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
 		}
 		return $source;
 	}
 	private function addLink($message)
 	{
 		$baseUrl='http://pradosoft.github.io/docs/manual/class-';
-		return preg_replace('/\b(T[A-Z]\w+)\b/',"<a href=\"$baseUrl\${1}\" target=\"_blank\">\${1}</a>",$message);
+		return preg_replace('/\b(T[A-Z]\w+)\b/', "<a href=\"$baseUrl\${1}\" target=\"_blank\">\${1}</a>", $message);
 	}
 }
-class TList extends TComponent implements IteratorAggregate,ArrayAccess,Countable
+class TList extends TComponent implements IteratorAggregate, ArrayAccess, Countable
 {
 	private $_d=array();
 	private $_c=0;
 	private $_r=false;
-	public function __construct($data=null,$readOnly=false)
+	public function __construct($data=null, $readOnly=false)
 	{
 		if($data!==null)
 			$this->copyFrom($data);
@@ -778,7 +778,7 @@ 
 	}
 	public function getIterator()
 	{
-		return new ArrayIterator( $this->_d );
+		return new ArrayIterator($this->_d);
 	}
 	public function count()
 	{
@@ -790,38 +790,38 @@ 
 	}
 	public function itemAt($index)
 	{
-		if($index>=0 && $index<$this->_c)
+		if($index >= 0 && $index < $this->_c)
 			return $this->_d[$index];
 		else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+			throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
 	public function add($item)
 	{
-		$this->insertAt($this->_c,$item);
-		return $this->_c-1;
+		$this->insertAt($this->_c, $item);
+		return $this->_c - 1;
 	}
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if(!$this->_r)
 		{
 			if($index===$this->_c)
 				$this->_d[$this->_c++]=$item;
-			else if($index>=0 && $index<$this->_c)
+			else if($index >= 0 && $index < $this->_c)
 			{
-				array_splice($this->_d,$index,0,array($item));
+				array_splice($this->_d, $index, 0, array($item));
 				$this->_c++;
 			}
 			else
-				throw new TInvalidDataValueException('list_index_invalid',$index);
+				throw new TInvalidDataValueException('list_index_invalid', $index);
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 	public function remove($item)
 	{
 		if(!$this->_r)
 		{
-			if(($index=$this->indexOf($item))>=0)
+			if(($index=$this->indexOf($item)) >= 0)
 			{
 				$this->removeAt($index);
 				return $index;
@@ -830,13 +830,13 @@ 
 				throw new TInvalidDataValueException('list_item_inexistent');
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 	public function removeAt($index)
 	{
 		if(!$this->_r)
 		{
-			if($index>=0 && $index<$this->_c)
+			if($index >= 0 && $index < $this->_c)
 			{
 				$this->_c--;
 				if($index===$this->_c)
@@ -844,28 +844,28 @@ 
 				else
 				{
 					$item=$this->_d[$index];
-					array_splice($this->_d,$index,1);
+					array_splice($this->_d, $index, 1);
 					return $item;
 				}
 			}
 			else
-				throw new TInvalidDataValueException('list_index_invalid',$index);
+				throw new TInvalidDataValueException('list_index_invalid', $index);
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 	public function clear()
 	{
-		for($i=$this->_c-1;$i>=0;--$i)
+		for($i=$this->_c - 1; $i >= 0; --$i)
 			$this->removeAt($i);
 	}
 	public function contains($item)
 	{
-		return $this->indexOf($item)>=0;
+		return $this->indexOf($item) >= 0;
 	}
 	public function indexOf($item)
 	{
-		if(($index=array_search($item,$this->_d,true))===false)
+		if(($index=array_search($item, $this->_d, true))===false)
 			return -1;
 		else
 			return $index;
@@ -874,25 +874,25 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
+			if(($index=$this->indexOf($baseitem))==-1)
 				throw new TInvalidDataValueException('list_item_inexistent');
 			$this->insertAt($index, $item);
 			return $index;
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 	public function insertAfter($baseitem, $item)
 	{
 		if(!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
+			if(($index=$this->indexOf($baseitem))==-1)
 				throw new TInvalidDataValueException('list_item_inexistent');
 			$this->insertAt($index + 1, $item);
 			return $index + 1;
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 	public function toArray()
 	{
@@ -902,7 +902,7 @@ 
 	{
 		if(is_array($data) || ($data instanceof Traversable))
 		{
-			if($this->_c>0)
+			if($this->_c > 0)
 				$this->clear();
 			foreach($data as $item)
 				$this->add($item);
@@ -922,20 +922,20 @@ 
 	}
 	public function offsetExists($offset)
 	{
-		return ($offset>=0 && $offset<$this->_c);
+		return ($offset >= 0 && $offset < $this->_c);
 	}
 	public function offsetGet($offset)
 	{
 		return $this->itemAt($offset);
 	}
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
 		if($offset===null || $offset===$this->_c)
-			$this->insertAt($this->_c,$item);
+			$this->insertAt($this->_c, $item);
 		else
 		{
 			$this->removeAt($offset);
-			$this->insertAt($offset,$item);
+			$this->insertAt($offset, $item);
 		}
 	}
 	public function offsetUnset($offset)
@@ -959,7 +959,7 @@ 
 			if($this->getApplication()->getCache()===null)
 				$this->getApplication()->setCache($this);
 			else
-				throw new TConfigurationException('cache_primary_duplicated',get_class($this));
+				throw new TConfigurationException('cache_primary_duplicated', get_class($this));
 		}
 	}
 	public function getPrimaryCache()
@@ -993,22 +993,22 @@ 
 		}
 		return false;
 	}
-	public function set($id,$value,$expire=0,$dependency=null)
+	public function set($id, $value, $expire=0, $dependency=null)
 	{
-		if(empty($value) && $expire === 0)
+		if(empty($value) && $expire===0)
 			$this->delete($id);
 		else
 		{
-			$data=array($value,$dependency);
-			return $this->setValue($this->generateUniqueKey($id),$data,$expire);
+			$data=array($value, $dependency);
+			return $this->setValue($this->generateUniqueKey($id), $data, $expire);
 		}
 	}
-	public function add($id,$value,$expire=0,$dependency=null)
+	public function add($id, $value, $expire=0, $dependency=null)
 	{
-		if(empty($value) && $expire === 0)
+		if(empty($value) && $expire===0)
 			return false;
-		$data=array($value,$dependency);
-		return $this->addValue($this->generateUniqueKey($id),$data,$expire);
+		$data=array($value, $dependency);
+		return $this->addValue($this->generateUniqueKey($id), $data, $expire);
 	}
 	public function delete($id)
 	{
@@ -1019,12 +1019,12 @@ 
 		throw new TNotSupportedException('cache_flush_unsupported');
 	}
 	abstract protected function getValue($key);
-	abstract protected function setValue($key,$value,$expire);
-	abstract protected function addValue($key,$value,$expire);
+	abstract protected function setValue($key, $value, $expire);
+	abstract protected function addValue($key, $value, $expire);
 	abstract protected function deleteValue($key);
 	public function offsetExists($id)
 	{
-		return $this->get($id) !== false;
+		return $this->get($id)!==false;
 	}
 	public function offsetGet($id)
 	{
@@ -1085,7 +1085,7 @@ 
 	public function setDirectory($directory)
 	{
 		if(($path=realpath($directory))===false || !is_dir($path))
-			throw new TInvalidDataValueException('directorycachedependency_directory_invalid',$directory);
+			throw new TInvalidDataValueException('directorycachedependency_directory_invalid', $directory);
 		$this->_directory=$path;
 		$this->_timestamps=$this->generateTimestamps($path);
 	}
@@ -1117,10 +1117,10 @@ 
 	{
 		return true;
 	}
-	protected function generateTimestamps($directory,$level=0)
+	protected function generateTimestamps($directory, $level=0)
 	{
 		if(($dir=opendir($directory))===false)
-			throw new TIOException('directorycachedependency_directory_invalid',$directory);
+			throw new TIOException('directorycachedependency_directory_invalid', $directory);
 		$timestamps=array();
 		while(($file=readdir($dir))!==false)
 		{
@@ -1129,8 +1129,8 @@ 
 				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);
@@ -1190,10 +1190,10 @@ 
 }
 class TCacheDependencyList extends TList
 {
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof ICacheDependency)
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('cachedependencylist_cachedependency_required');
 	}
@@ -1224,7 +1224,7 @@ 
 	private $_c=0;
 	private $_dp=10;
 	private $_p=8;
-	public function __construct($data=null,$readOnly=false,$defaultPriority=10,$precision=8)
+	public function __construct($data=null, $readOnly=false, $defaultPriority=10, $precision=8)
 	{
 		parent::__construct();
 		if($data!==null)
@@ -1245,7 +1245,7 @@ 
 	{
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 		if(!isset($this->_d[$priority]) || !is_array($this->_d[$priority]))
 			return false;
 		return count($this->_d[$priority]);
@@ -1256,7 +1256,7 @@ 
 	}
 	protected function setDefaultPriority($value)
 	{
-		$this->_dp=(string)round(TPropertyValue::ensureFloat($value),$this->_p);
+		$this->_dp=(string) round(TPropertyValue::ensureFloat($value), $this->_p);
 	}
 	public function getPrecision()
 	{
@@ -1277,7 +1277,7 @@ 
 	}
 	protected function sortPriorities() {
 		if(!$this->_o) {
-			ksort($this->_d,SORT_NUMERIC);
+			ksort($this->_d, SORT_NUMERIC);
 			$this->_o=true;
 		}
 	}
@@ -1287,111 +1287,111 @@ 
 		$this->sortPriorities();
 		$this->_fd=array();
 		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd=array_merge($this->_fd,$itemsatpriority);
+			$this->_fd=array_merge($this->_fd, $itemsatpriority);
 		return $this->_fd;
 	}
 	public function itemAt($index)
 	{
-		if($index>=0&&$index<$this->getCount()) {
+		if($index >= 0 && $index < $this->getCount()) {
 			$arr=$this->flattenPriorities();
 			return $arr[$index];
 		} else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+			throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
 	public function itemsAtPriority($priority=null)
 	{
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-		return isset($this->_d[$priority])?$this->_d[$priority]:null;
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+		return isset($this->_d[$priority]) ? $this->_d[$priority] : null;
 	}
-	public function itemAtIndexInPriority($index,$priority=null)
+	public function itemAtIndexInPriority($index, $priority=null)
 	{
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority), $this->_p);
-		return !isset($this->_d[$priority])?false:(
-				isset($this->_d[$priority][$index])?$this->_d[$priority][$index]:false
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+		return !isset($this->_d[$priority]) ? false : (
+				isset($this->_d[$priority][$index]) ? $this->_d[$priority][$index] : false
 			);
 	}
-	public function add($item,$priority=null)
+	public function add($item, $priority=null)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		return $this->insertAtIndexInPriority($item,false,$priority,true);
+			throw new TInvalidOperationException('list_readonly', get_class($this));
+		return $this->insertAtIndexInPriority($item, false, $priority, true);
 	}
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		if(($priority=$this->priorityAt($index,true))!==false)
-			$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
+			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if(($priority=$this->priorityAt($index, true))!==false)
+			$this->insertAtIndexInPriority($item, $priority[1], $priority[0]);
 		else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+			throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
-	public function insertAtIndexInPriority($item,$index=false,$priority=null,$preserveCache=false)
+	public function insertAtIndexInPriority($item, $index=false, $priority=null, $preserveCache=false)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 		if($preserveCache) {
 			$this->sortPriorities();
 			$cc=0;
 			foreach($this->_d as $prioritykey=>$items)
-				if($prioritykey>=$priority)
+				if($prioritykey >= $priority)
 					break;
 				else
 					$cc+=count($items);
-			if($index===false&&isset($this->_d[$priority])) {
+			if($index===false && isset($this->_d[$priority])) {
 				$c=count($this->_d[$priority]);
 				$c+=$cc;
 				$this->_d[$priority][]=$item;
 			} else if(isset($this->_d[$priority])) {
-				$c=$index+$cc;
-				array_splice($this->_d[$priority],$index,0,array($item));
+				$c=$index + $cc;
+				array_splice($this->_d[$priority], $index, 0, array($item));
 			} else {
-				$c = $cc;
-				$this->_o = false;
+				$c=$cc;
+				$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])) {
+			if($index===false && isset($this->_d[$priority])) {
 				$cc=count($this->_d[$priority]);
 				$this->_d[$priority][]=$item;
 			} else if(isset($this->_d[$priority])) {
 				$cc=$index;
-				array_splice($this->_d[$priority],$index,0,array($item));
+				array_splice($this->_d[$priority], $index, 0, array($item));
 			} else {
 				$cc=0;
 				$this->_o=false;
 				$this->_d[$priority]=array($item);
 			}
-			if($this->_fd&&is_array($this->_fd)&&count($this->_d)==1)
-				array_splice($this->_fd,$cc,0,array($item));
+			if($this->_fd && is_array($this->_fd) && count($this->_d)==1)
+				array_splice($this->_fd, $cc, 0, array($item));
 			else
 				$this->_fd=null;
 		}
 		$this->_c++;
 		return $c;
 	}
-	public function remove($item,$priority=false)
+	public function remove($item, $priority=false)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		if(($p=$this->priorityOf($item,true))!==false)
+			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if(($p=$this->priorityOf($item, true))!==false)
 		{
 			if($priority!==false) {
 				if($priority===null)
 					$priority=$this->getDefaultPriority();
-				$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+				$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 				if($p[0]!=$priority)
 					throw new TInvalidDataValueException('list_item_inexistent');
 			}
-			$this->removeAtIndexInPriority($p[1],$p[0]);
+			$this->removeAtIndexInPriority($p[1], $p[0]);
 			return $p[2];
 		}
 		else
@@ -1400,21 +1400,21 @@ 
 	public function removeAt($index)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			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);
+			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));
+			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]))
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+		if(!isset($this->_d[$priority]) || $index < 0 || $index >= count($this->_d[$priority]))
 			throw new TInvalidDataValueException('list_item_inexistent');
-				$value=array_splice($this->_d[$priority],$index,1);
+				$value=array_splice($this->_d[$priority], $index, 1);
 		$value=$value[0];
 		if(!count($this->_d[$priority]))
 			unset($this->_d[$priority]);
@@ -1425,71 +1425,71 @@ 
 	public function clear()
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		$d=array_reverse($this->_d,true);
+			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]);
 		}
 	}
 	public function contains($item)
 	{
-		return $this->indexOf($item)>=0;
+		return $this->indexOf($item) >= 0;
 	}
 	public function indexOf($item)
 	{
-		if(($index=array_search($item,$this->flattenPriorities(),true))===false)
+		if(($index=array_search($item, $this->flattenPriorities(), true))===false)
 			return -1;
 		else
 			return $index;
 	}
-	public function priorityOf($item,$withindex = false)
+	public function priorityOf($item, $withindex=false)
 	{
 		$this->sortPriorities();
-		$absindex = 0;
+		$absindex=0;
 		foreach($this->_d as $priority=>$items) {
-			if(($index=array_search($item,$items,true))!==false) {
+			if(($index=array_search($item, $items, true))!==false) {
 				$absindex+=$index;
-				return $withindex?array($priority,$index,$absindex,
-						'priority'=>$priority,'index'=>$index,'absindex'=>$absindex):$priority;
+				return $withindex ? array($priority, $index, $absindex,
+						'priority'=>$priority, 'index'=>$index, 'absindex'=>$absindex) : $priority;
 			} else
 				$absindex+=count($items);
 		}
 		return false;
 	}
-	public function priorityAt($index,$withindex = false)
+	public function priorityAt($index, $withindex=false)
 	{
-		if($index<0||$index>=$this->getCount())
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+		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)))
+			if($index >= ($c=count($items)))
 				$index-=$c;
 			else
-				return $withindex?array($priority,$index,$absindex,
-						'priority'=>$priority,'index'=>$index,'absindex'=>$absindex):$priority;
+				return $withindex ? array($priority, $index, $absindex,
+						'priority'=>$priority, 'index'=>$index, 'absindex'=>$absindex) : $priority;
 		}
 		return false;
 	}
 	public function insertBefore($indexitem, $item)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		if(($priority=$this->priorityOf($indexitem,true))===false)
+			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if(($priority=$this->priorityOf($indexitem, true))===false)
 			throw new TInvalidDataValueException('list_item_inexistent');
-		$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
+		$this->insertAtIndexInPriority($item, $priority[1], $priority[0]);
 		return $priority[2];
 	}
 	public function insertAfter($indexitem, $item)
 	{
 		if($this->getReadOnly())
-			throw new TInvalidOperationException('list_readonly',get_class($this));
-		if(($priority=$this->priorityOf($indexitem,true))===false)
+			throw new TInvalidOperationException('list_readonly', get_class($this));
+		if(($priority=$this->priorityOf($indexitem, true))===false)
 			throw new TInvalidDataValueException('list_item_inexistent');
-		$this->insertAtIndexInPriority($item,$priority[1]+1,$priority[0]);
-		return $priority[2]+1;
+		$this->insertAtIndexInPriority($item, $priority[1] + 1, $priority[0]);
+		return $priority[2] + 1;
 	}
 	public function toArray()
 	{
@@ -1500,27 +1500,27 @@ 
 		$this->sortPriorities();
 		return $this->_d;
 	}
-	public function toArrayBelowPriority($priority,$inclusive=false)
+	public function toArrayBelowPriority($priority, $inclusive=false)
 	{
 		$this->sortPriorities();
 		$items=array();
 		foreach($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority>=$priority)||$itemspriority>$priority)
+			if((!$inclusive && $itemspriority >= $priority) || $itemspriority > $priority)
 				break;
-			$items=array_merge($items,$itemsatpriority);
+			$items=array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
-	public function toArrayAbovePriority($priority,$inclusive=true)
+	public function toArrayAbovePriority($priority, $inclusive=true)
 	{
 		$this->sortPriorities();
 		$items=array();
 		foreach($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority<=$priority)||$itemspriority<$priority)
+			if((!$inclusive && $itemspriority <= $priority) || $itemspriority < $priority)
 				continue;
-			$items=array_merge($items,$itemsatpriority);
+			$items=array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
@@ -1528,15 +1528,15 @@ 
 	{
 		if($data instanceof TPriorityList)
 		{
-			if($this->getCount()>0)
+			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data->getPriorities() as $priority)
 			{
 				foreach($data->itemsAtPriority($priority) as $index=>$item)
-					$this->insertAtIndexInPriority($item,$index,$priority);
+					$this->insertAtIndexInPriority($item, $index, $priority);
 			}
-		} else if(is_array($data)||$data instanceof Traversable) {
-			if($this->getCount()>0)
+		} else if(is_array($data) || $data instanceof Traversable) {
+			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data as $key=>$item)
 				$this->add($item);
@@ -1550,10 +1550,10 @@ 
 			foreach($data->getPriorities() as $priority)
 			{
 				foreach($data->itemsAtPriority($priority) as $index=>$item)
-					$this->insertAtIndexInPriority($item,false,$priority);
+					$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);
@@ -1563,43 +1563,43 @@ 
 	}
 	public function offsetExists($offset)
 	{
-		return ($offset>=0&&$offset<$this->getCount());
+		return ($offset >= 0 && $offset < $this->getCount());
 	}
 	public function offsetGet($offset)
 	{
 		return $this->itemAt($offset);
 	}
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
 		if($offset===null)
 			return $this->add($item);
 		if($offset===$this->getCount()) {
-			$priority=$this->priorityAt($offset-1,true);
+			$priority=$this->priorityAt($offset - 1, true);
 			$priority[1]++;
 		} else {
-			$priority=$this->priorityAt($offset,true);
-			$this->removeAtIndexInPriority($priority[1],$priority[0]);
+			$priority=$this->priorityAt($offset, true);
+			$this->removeAtIndexInPriority($priority[1], $priority[0]);
 		}
-		$this->insertAtIndexInPriority($item,$priority[1],$priority[0]);
+		$this->insertAtIndexInPriority($item, $priority[1], $priority[0]);
 	}
 	public function offsetUnset($offset)
 	{
 		$this->removeAt($offset);
 	}
 }
-class TMap extends TComponent implements IteratorAggregate,ArrayAccess,Countable
+class TMap extends TComponent implements IteratorAggregate, ArrayAccess, Countable
 {
 	private $_d=array();
 	private $_r=false;
 	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)
+	public function __construct($data=null, $readOnly=false)
 	{
 		if($data!==null)
 			$this->copyFrom($data);
@@ -1615,7 +1615,7 @@ 
 	}
 	public function getIterator()
 	{
-		return new ArrayIterator( $this->_d );
+		return new ArrayIterator($this->_d);
 	}
 	public function count()
 	{
@@ -1633,18 +1633,18 @@ 
 	{
 		return isset($this->_d[$key]) ? $this->_d[$key] : null;
 	}
-	public function add($key,$value)
+	public function add($key, $value)
 	{
 		if(!$this->_r)
 			$this->_d[$key]=$value;
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 	public function remove($key)
 	{
 		if(!$this->_r)
 		{
-			if(isset($this->_d[$key]) || array_key_exists($key,$this->_d))
+			if(isset($this->_d[$key]) || array_key_exists($key, $this->_d))
 			{
 				$value=$this->_d[$key];
 				unset($this->_d[$key]);
@@ -1654,7 +1654,7 @@ 
 				return null;
 		}
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 	public function clear()
 	{
@@ -1663,7 +1663,7 @@ 
 	}
 	public function contains($key)
 	{
-		return isset($this->_d[$key]) || array_key_exists($key,$this->_d);
+		return isset($this->_d[$key]) || array_key_exists($key, $this->_d);
 	}
 	public function toArray()
 	{
@@ -1673,10 +1673,10 @@ 
 	{
 		if(is_array($data) || $data instanceof Traversable)
 		{
-			if($this->getCount()>0)
+			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data as $key=>$value)
-				$this->add($key,$value);
+				$this->add($key, $value);
 		}
 		else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
@@ -1686,7 +1686,7 @@ 
 		if(is_array($data) || $data instanceof Traversable)
 		{
 			foreach($data as $key=>$value)
-				$this->add($key,$value);
+				$this->add($key, $value);
 		}
 		else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
@@ -1699,9 +1699,9 @@ 
 	{
 		return $this->itemAt($offset);
 	}
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		$this->add($offset,$item);
+		$this->add($offset, $item);
 	}
 	public function offsetUnset($offset)
 	{
@@ -1720,7 +1720,7 @@ 
 	private $_c=0;
 	private $_dp=10;
 	private $_p=8;
-	public function __construct($data=null,$readOnly=false,$defaultPriority=10,$precision=8)
+	public function __construct($data=null, $readOnly=false, $defaultPriority=10, $precision=8)
 	{
 		if($data!==null)
 			$this->copyFrom($data);
@@ -1742,7 +1742,7 @@ 
 	}
 	protected function setDefaultPriority($value)
 	{
-		$this->_dp = (string)round(TPropertyValue::ensureFloat($value), $this->_p);
+		$this->_dp=(string) round(TPropertyValue::ensureFloat($value), $this->_p);
 	}
 	public function getPrecision()
 	{
@@ -1766,9 +1766,9 @@ 
 		if(is_array($this->_fd))
 			return $this->_fd;
 		$this->sortPriorities();
-		$this->_fd = array();
+		$this->_fd=array();
 		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd = array_merge($this->_fd, $itemsatpriority);
+			$this->_fd=array_merge($this->_fd, $itemsatpriority);
 		return $this->_fd;
 	}
 	public function count()
@@ -1783,8 +1783,8 @@ 
 	{
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-		if(!isset($this->_d[$priority])||!is_array($this->_d[$priority]))
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+		if(!isset($this->_d[$priority]) || !is_array($this->_d[$priority]))
 			return false;
 		return count($this->_d[$priority]);
 	}
@@ -1797,27 +1797,27 @@ 
 	{
 		return array_keys($this->flattenPriorities());
 	}
-	public function itemAt($key,$priority=false)
+	public function itemAt($key, $priority=false)
 	{
-		if($priority===false){
+		if($priority===false) {
 			$map=$this->flattenPriorities();
-			return isset($map[$key])?$map[$key]:null;
+			return isset($map[$key]) ? $map[$key] : null;
 		} else {
 			if($priority===null)
 				$priority=$this->getDefaultPriority();
-			$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-			return (isset($this->_d[$priority])&&isset($this->_d[$priority][$key]))?$this->_d[$priority][$key]:null;
+			$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+			return (isset($this->_d[$priority]) && isset($this->_d[$priority][$key])) ? $this->_d[$priority][$key] : null;
 		}
 	}
-	public function setPriorityAt($key,$priority=null)
+	public function setPriorityAt($key, $priority=null)
 	{
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 		$oldpriority=$this->priorityAt($key);
-		if($oldpriority!==false&&$oldpriority!=$priority) {
-			$value=$this->remove($key,$oldpriority);
-			$this->add($key,$value,$priority);
+		if($oldpriority!==false && $oldpriority!=$priority) {
+			$value=$this->remove($key, $oldpriority);
+			$this->add($key, $value, $priority);
 		}
 		return $oldpriority;
 	}
@@ -1825,14 +1825,14 @@ 
 	{
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-		return isset($this->_d[$priority])?$this->_d[$priority]:null;
+		$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)
+			if(($index=array_search($item, $items, true))!==false)
 				return $priority;
 		return false;
 	}
@@ -1840,19 +1840,19 @@ 
 	{
 		$this->sortPriorities();
 		foreach($this->_d as $priority=>$items)
-			if(array_key_exists($key,$items))
+			if(array_key_exists($key, $items))
 				return $priority;
 		return false;
 	}
-	public function add($key,$value,$priority=null)
+	public function add($key, $value, $priority=null)
 	{
 		if($priority===null)
 			$priority=$this->getDefaultPriority();
-		$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 		if(!$this->_r)
 		{
 			foreach($this->_d as $innerpriority=>$items)
-				if(array_key_exists($key,$items))
+				if(array_key_exists($key, $items))
 				{
 					unset($this->_d[$innerpriority][$key]);
 					$this->_c--;
@@ -1869,10 +1869,10 @@ 
 			$this->_fd=null;
 		}
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 		return $priority;
 	}
-	public function remove($key,$priority=false)
+	public function remove($key, $priority=false)
 	{
 		if(!$this->_r)
 		{
@@ -1882,7 +1882,7 @@ 
 			{
 				$this->sortPriorities();
 				foreach($this->_d as $priority=>$items)
-					if(array_key_exists($key,$items))
+					if(array_key_exists($key, $items))
 					{
 						$value=$this->_d[$priority][$key];
 						unset($this->_d[$priority][$key]);
@@ -1899,8 +1899,8 @@ 
 			}
 			else
 			{
-				$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
-				if(isset($this->_d[$priority])&&(isset($this->_d[$priority][$key])||array_key_exists($key,$this->_d[$priority])))
+				$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+				if(isset($this->_d[$priority]) && (isset($this->_d[$priority][$key]) || array_key_exists($key, $this->_d[$priority])))
 				{
 					$value=$this->_d[$priority][$key];
 					unset($this->_d[$priority][$key]);
@@ -1917,7 +1917,7 @@ 
 			}
 		}
 		else
-			throw new TInvalidOperationException('map_readonly',get_class($this));
+			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 	public function clear()
 	{
@@ -1928,33 +1928,33 @@ 
 	public function contains($key)
 	{
 		$map=$this->flattenPriorities();
-		return isset($map[$key])||array_key_exists($key,$map);
+		return isset($map[$key]) || array_key_exists($key, $map);
 	}
 	public function toArray()
 	{
 		return $this->flattenPriorities();
 	}
-	public function toArrayBelowPriority($priority,$inclusive=false)
+	public function toArrayBelowPriority($priority, $inclusive=false)
 	{
 		$this->sortPriorities();
 		$items=array();
 		foreach($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority>=$priority)||$itemspriority>$priority)
+			if((!$inclusive && $itemspriority >= $priority) || $itemspriority > $priority)
 				break;
-			$items=array_merge($items,$itemsatpriority);
+			$items=array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
-	public function toArrayAbovePriority($priority,$inclusive=true)
+	public function toArrayAbovePriority($priority, $inclusive=true)
 	{
 		$this->sortPriorities();
 		$items=array();
 		foreach($this->_d as $itemspriority=>$itemsatpriority)
 		{
-			if((!$inclusive&&$itemspriority<=$priority)||$itemspriority<$priority)
+			if((!$inclusive && $itemspriority <= $priority) || $itemspriority < $priority)
 				continue;
-			$items=array_merge($items,$itemsatpriority);
+			$items=array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
@@ -1962,20 +1962,20 @@ 
 	{
 		if($data instanceof TPriorityMap)
 		{
-			if($this->getCount()>0)
+			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data->getPriorities() as $priority) {
 				foreach($data->itemsAtPriority($priority) as $key => $value) {
-					$this->add($key,$value,$priority);
+					$this->add($key, $value, $priority);
 				}
 			}
 		}
-		else if(is_array($data)||$data instanceof Traversable)
+		else if(is_array($data) || $data instanceof Traversable)
 		{
-			if($this->getCount()>0)
+			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data as $key=>$value)
-				$this->add($key,$value);
+				$this->add($key, $value);
 		}
 		else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
@@ -1987,13 +1987,13 @@ 
 			foreach($data->getPriorities() as $priority)
 			{
 				foreach($data->itemsAtPriority($priority) as $key => $value)
-					$this->add($key,$value,$priority);
+					$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);
+				$this->add($key, $value);
 		}
 		else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
@@ -2006,16 +2006,16 @@ 
 	{
 		return $this->itemAt($offset);
 	}
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		$this->add($offset,$item);
+		$this->add($offset, $item);
 	}
 	public function offsetUnset($offset)
 	{
 		$this->remove($offset);
 	}
 }
-class TStack extends TComponent implements IteratorAggregate,Countable
+class TStack extends TComponent implements IteratorAggregate, Countable
 {
 	private $_d=array();
 	private $_c=0;
@@ -2049,14 +2049,14 @@ 
 	}
 	public function contains($item)
 	{
-		return array_search($item,$this->_d,true)!==false;
+		return array_search($item, $this->_d, true)!==false;
 	}
 	public function peek()
 	{
 		if($this->_c===0)
 			throw new TInvalidOperationException('stack_empty');
 		else
-			return $this->_d[$this->_c-1];
+			return $this->_d[$this->_c - 1];
 	}
 	public function pop()
 	{
@@ -2071,11 +2071,11 @@ 
 	public function push($item)
 	{
 		++$this->_c;
-		$this->_d[] = $item;
+		$this->_d[]=$item;
 	}
 	public function getIterator()
 	{
-		return new ArrayIterator( $this->_d );
+		return new ArrayIterator($this->_d);
 	}
 	public function getCount()
 	{
@@ -2115,7 +2115,7 @@ 
 	}
 	public function valid()
 	{
-		return $this->_i<$this->_c;
+		return $this->_i < $this->_c;
 	}
 }
 class TXmlElement extends TComponent
@@ -2155,11 +2155,11 @@ 
 	}
 	public function getHasElement()
 	{
-		return $this->_elements!==null && $this->_elements->getCount()>0;
+		return $this->_elements!==null && $this->_elements->getCount() > 0;
 	}
 	public function getHasAttribute()
 	{
-		return $this->_attributes!==null && $this->_attributes->getCount()>0;
+		return $this->_attributes!==null && $this->_attributes->getCount() > 0;
 	}
 	public function getAttribute($name)
 	{
@@ -2168,9 +2168,9 @@ 
 		else
 			return null;
 	}
-	public function setAttribute($name,$value)
+	public function setAttribute($name, $value)
 	{
-		$this->getAttributes()->add($name,TPropertyValue::ensureString($value));
+		$this->getAttributes()->add($name, TPropertyValue::ensureString($value));
 	}
 	public function getElements()
 	{
@@ -2216,12 +2216,12 @@ 
 				$attr.=" $name=\"$value\"";
 			}
 		}
-		$prefix=str_repeat(' ',$indent*4);
+		$prefix=str_repeat(' ', $indent * 4);
 		if($this->getHasElement())
 		{
 			$str=$prefix."<{$this->_tagName}$attr>\n";
 			foreach($this->getElements() as $element)
-				$str.=$element->toString($indent+1)."\n";
+				$str.=$element->toString($indent + 1)."\n";
 			$str.=$prefix."</{$this->_tagName}>";
 			return $str;
 		}
@@ -2239,7 +2239,7 @@ 
 	}
 	private function xmlEncode($str)
 	{
-		return strtr($str,array(
+		return strtr($str, array(
 			'>'=>'&gt;',
 			'<'=>'&lt;',
 			'&'=>'&amp;',
@@ -2253,7 +2253,7 @@ 
 {
 	private $_version;
 	private $_encoding;
-	public function __construct($version='1.0',$encoding='')
+	public function __construct($version='1.0', $encoding='')
 	{
 		parent::__construct('');
 		$this->setVersion($version);
@@ -2280,7 +2280,7 @@ 
 		if(($str=@file_get_contents($file))!==false)
 			return $this->loadFromString($str);
 		else
-			throw new TIOException('xmldocument_file_read_failed',$file);
+			throw new TIOException('xmldocument_file_read_failed', $file);
 	}
 	public function loadFromString($string)
 	{
@@ -2297,23 +2297,23 @@ 
 		$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);
-			$docNamespaces = $simpleDoc->getDocNamespaces(false);
-			$simpleDoc = null;
+			$simpleDoc=simplexml_load_string($string);
+			$docNamespaces=$simpleDoc->getDocNamespaces(false);
+			$simpleDoc=null;
 			foreach($docNamespaces as $prefix => $uri)
 			{
- 				if($prefix === '')
+ 				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);
+			$attributes->add(($attr->prefix==='' ? '' : $attr->prefix.':').$name, $attr->value);
 		foreach($element->childNodes as $child)
 		{
 			if($child instanceof DOMElement)
@@ -2323,18 +2323,18 @@ 
 	}
 	public function saveToFile($file)
 	{
-		if(($fw=fopen($file,'w'))!==false)
+		if(($fw=fopen($file, 'w'))!==false)
 		{
-			fwrite($fw,$this->saveToString());
+			fwrite($fw, $this->saveToString());
 			fclose($fw);
 		}
 		else
-			throw new TIOException('xmldocument_file_write_failed',$file);
+			throw new TIOException('xmldocument_file_write_failed', $file);
 	}
 	public function saveToString()
 	{
-		$version=empty($this->_version)?' version="1.0"':' version="'.$this->_version.'"';
-		$encoding=empty($this->_encoding)?'':' encoding="'.$this->_encoding.'"';
+		$version=empty($this->_version) ? ' version="1.0"' : ' version="'.$this->_version.'"';
+		$encoding=empty($this->_encoding) ? '' : ' encoding="'.$this->_encoding.'"';
 		return "<?xml{$version}{$encoding}?>\n".$this->toString(0);
 	}
 	public function __toString()
@@ -2346,7 +2346,7 @@ 
 		$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);
+			$element->getAttributes()->add(($attr->prefix==='' ? '' : $attr->prefix.':').$name, $attr->value);
 		foreach($node->childNodes as $child)
 		{
 			if($child instanceof DOMElement)
@@ -2366,11 +2366,11 @@ 
 	{
 		return $this->_o;
 	}
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TXmlElement)
 		{
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 			if($item->getParent()!==null)
 				$item->getParent()->getElements()->remove($item);
 			$item->setParent($this->_o);
@@ -2396,13 +2396,13 @@ 
 	private $_everyone;
 	private $_guest;
 	private $_authenticated;
-	public function __construct($action,$users,$roles,$verb='',$ipRules='')
+	public function __construct($action, $users, $roles, $verb='', $ipRules='')
 	{
 		$action=strtolower(trim($action));
 		if($action==='allow' || $action==='deny')
 			$this->_action=$action;
 		else
-			throw new TInvalidDataValueException('authorizationrule_action_invalid',$action);
+			throw new TInvalidDataValueException('authorizationrule_action_invalid', $action);
 		$this->_users=array();
 		$this->_roles=array();
 		$this->_ipRules=array();
@@ -2411,7 +2411,7 @@ 
 		$this->_authenticated=false;
 		if(trim($users)==='')
 			$users='*';
-		foreach(explode(',',$users) as $user)
+		foreach(explode(',', $users) as $user)
 		{
 			if(($user=trim(strtolower($user)))!=='')
 			{
@@ -2430,7 +2430,7 @@ 
 		}
 		if(trim($roles)==='')
 			$roles='*';
-		foreach(explode(',',$roles) as $role)
+		foreach(explode(',', $roles) as $role)
 		{
 			if(($role=trim(strtolower($role)))!=='')
 				$this->_roles[]=$role;
@@ -2440,10 +2440,10 @@ 
 		if($verb==='*' || $verb==='get' || $verb==='post')
 			$this->_verb=$verb;
 		else
-			throw new TInvalidDataValueException('authorizationrule_verb_invalid',$verb);
+			throw new TInvalidDataValueException('authorizationrule_verb_invalid', $verb);
 		if(trim($ipRules)==='')
 			$ipRules='*';
-		foreach(explode(',',$ipRules) as $ipRule)
+		foreach(explode(',', $ipRules) as $ipRule)
 		{
 			if(($ipRule=trim($ipRule))!=='')
 				$this->_ipRules[]=$ipRule;
@@ -2481,10 +2481,10 @@ 
 	{
 		return $this->_authenticated || $this->_everyone;
 	}
-	public function isUserAllowed(IUser $user,$verb,$ip)
+	public function isUserAllowed(IUser $user, $verb, $ip)
 	{
 		if($this->isVerbMatched($verb) && $this->isIpMatched($ip) && $this->isUserMatched($user) && $this->isRoleMatched($user))
-			return ($this->_action==='allow')?1:-1;
+			return ($this->_action==='allow') ? 1 : -1;
 		else
 			return 0;
 	}
@@ -2494,14 +2494,14 @@ 
 			return 1;
 		foreach($this->_ipRules as $rule)
 		{
-			if($rule==='*' || $rule===$ip || (($pos=strpos($rule,'*'))!==false && strncmp($ip,$rule,$pos)===0))
+			if($rule==='*' || $rule===$ip || (($pos=strpos($rule, '*'))!==false && strncmp($ip, $rule, $pos)===0))
 				return 1;
 		}
 		return 0;
 	}
 	private function isUserMatched($user)
 	{
-		return ($this->_everyone || ($this->_guest && $user->getIsGuest()) || ($this->_authenticated && !$user->getIsGuest()) || in_array(strtolower($user->getName()),$this->_users));
+		return ($this->_everyone || ($this->_guest && $user->getIsGuest()) || ($this->_authenticated && !$user->getIsGuest()) || in_array(strtolower($user->getName()), $this->_users));
 	}
 	private function isRoleMatched($user)
 	{
@@ -2514,42 +2514,42 @@ 
 	}
 	private function isVerbMatched($verb)
 	{
-		return ($this->_verb==='*' || strcasecmp($verb,$this->_verb)===0);
+		return ($this->_verb==='*' || strcasecmp($verb, $this->_verb)===0);
 	}
 }
 class TAuthorizationRuleCollection extends TList
 {
-	public function isUserAllowed($user,$verb,$ip)
+	public function isUserAllowed($user, $verb, $ip)
 	{
 		if($user instanceof IUser)
 		{
 			$verb=strtolower(trim($verb));
 			foreach($this as $rule)
 			{
-				if(($decision=$rule->isUserAllowed($user,$verb,$ip))!==0)
-					return ($decision>0);
+				if(($decision=$rule->isUserAllowed($user, $verb, $ip))!==0)
+					return ($decision > 0);
 			}
 			return true;
 		}
 		else
 			return false;
 	}
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TAuthorizationRule)
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('authorizationrulecollection_authorizationrule_required');
 	}
 }
 class TSecurityManager extends TModule
 {
-	const STATE_VALIDATION_KEY = 'prado:securitymanager:validationkey';
-	const STATE_ENCRYPTION_KEY = 'prado:securitymanager:encryptionkey';
-	private $_validationKey = null;
-	private $_encryptionKey = null;
-	private $_hashAlgorithm = 'sha1';
-	private $_cryptAlgorithm = 'rijndael-256';
+	const STATE_VALIDATION_KEY='prado:securitymanager:validationkey';
+	const STATE_ENCRYPTION_KEY='prado:securitymanager:encryptionkey';
+	private $_validationKey=null;
+	private $_encryptionKey=null;
+	private $_hashAlgorithm='sha1';
+	private $_cryptAlgorithm='rijndael-256';
 	private $_mbstring;
 	public function init($config)
 	{
@@ -2558,13 +2558,13 @@ 
 	}
 	protected function generateRandomKey()
 	{
-		return sprintf('%08x%08x%08x%08x',mt_rand(),mt_rand(),mt_rand(),mt_rand());
+		return sprintf('%08x%08x%08x%08x', mt_rand(), mt_rand(), mt_rand(), mt_rand());
 	}
 	public function getValidationKey()
 	{
-		if(null === $this->_validationKey) {
-			if(null === ($this->_validationKey = $this->getApplication()->getGlobalState(self::STATE_VALIDATION_KEY))) {
-				$this->_validationKey = $this->generateRandomKey();
+		if(null===$this->_validationKey) {
+			if(null===($this->_validationKey=$this->getApplication()->getGlobalState(self::STATE_VALIDATION_KEY))) {
+				$this->_validationKey=$this->generateRandomKey();
 				$this->getApplication()->setGlobalState(self::STATE_VALIDATION_KEY, $this->_validationKey, null, true);
 			}
 		}
@@ -2572,15 +2572,15 @@ 
 	}
 	public function setValidationKey($value)
 	{
-		if('' === $value)
+		if(''===$value)
 			throw new TInvalidDataValueException('securitymanager_validationkey_invalid');
-		$this->_validationKey = $value;
+		$this->_validationKey=$value;
 	}
 	public function getEncryptionKey()
 	{
-		if(null === $this->_encryptionKey) {
-			if(null === ($this->_encryptionKey = $this->getApplication()->getGlobalState(self::STATE_ENCRYPTION_KEY))) {
-				$this->_encryptionKey = $this->generateRandomKey();
+		if(null===$this->_encryptionKey) {
+			if(null===($this->_encryptionKey=$this->getApplication()->getGlobalState(self::STATE_ENCRYPTION_KEY))) {
+				$this->_encryptionKey=$this->generateRandomKey();
 				$this->getApplication()->setGlobalState(self::STATE_ENCRYPTION_KEY, $this->_encryptionKey, null, true);
 			}
 		}
@@ -2588,9 +2588,9 @@ 
 	}
 	public function setEncryptionKey($value)
 	{
-		if('' === $value)
+		if(''===$value)
 			throw new TInvalidDataValueException('securitymanager_encryptionkey_invalid');
-		$this->_encryptionKey = $value;
+		$this->_encryptionKey=$value;
 	}
 	public function getValidation()
 	{
@@ -2602,11 +2602,11 @@ 
 	}
 	public function setValidation($value)
 	{
-		$this->_hashAlgorithm = TPropertyValue::ensureEnum($value, 'TSecurityManagerValidationMode');
+		$this->_hashAlgorithm=TPropertyValue::ensureEnum($value, 'TSecurityManagerValidationMode');
 	}
 	public function setHashAlgorithm($value)
 	{
-		$this->_hashAlgorithm = TPropertyValue::ensureString($value);
+		$this->_hashAlgorithm=TPropertyValue::ensureString($value);
 	}
 	public function getEncryption()
 	{
@@ -2616,7 +2616,7 @@ 
 	}
 	public function setEncryption($value)
 	{
-		$this->_cryptAlgorithm = $value;
+		$this->_cryptAlgorithm=$value;
 	}
 	public function getCryptAlgorithm()
 	{
@@ -2624,16 +2624,16 @@ 
 	}
 	public function setCryptAlgorithm($value)
 	{
-		$this->_cryptAlgorithm = $value;
+		$this->_cryptAlgorithm=$value;
 	}
 	public function encrypt($data)
 	{
 		$module=$this->openCryptModule();
-		$key = $this->substr(md5($this->getEncryptionKey()), 0, mcrypt_enc_get_key_size($module));
+		$key=$this->substr(md5($this->getEncryptionKey()), 0, mcrypt_enc_get_key_size($module));
 		srand();
-		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($module), MCRYPT_RAND);
+		$iv=mcrypt_create_iv(mcrypt_enc_get_iv_size($module), MCRYPT_RAND);
 		mcrypt_generic_init($module, $key, $iv);
-		$encrypted = $iv.mcrypt_generic($module, $data);
+		$encrypted=$iv.mcrypt_generic($module, $data);
 		mcrypt_generic_deinit($module);
 		mcrypt_module_close($module);
 		return $encrypted;
@@ -2641,11 +2641,11 @@ 
 	public function decrypt($data)
 	{
 		$module=$this->openCryptModule();
-		$key = $this->substr(md5($this->getEncryptionKey()), 0, mcrypt_enc_get_key_size($module));
-		$ivSize = mcrypt_enc_get_iv_size($module);
-		$iv = $this->substr($data, 0, $ivSize);
+		$key=$this->substr(md5($this->getEncryptionKey()), 0, mcrypt_enc_get_key_size($module));
+		$ivSize=mcrypt_enc_get_iv_size($module);
+		$iv=$this->substr($data, 0, $ivSize);
 		mcrypt_generic_init($module, $key, $iv);
-		$decrypted = mdecrypt_generic($module, $this->substr($data, $ivSize, $this->strlen($data)));
+		$decrypted=mdecrypt_generic($module, $this->substr($data, $ivSize, $this->strlen($data)));
 		mcrypt_generic_deinit($module);
 		mcrypt_module_close($module);
 		return $decrypted;
@@ -2655,9 +2655,9 @@ 
 		if(extension_loaded('mcrypt'))
 		{
 			if(is_array($this->_cryptAlgorithm))
-				$module=@call_user_func_array('mcrypt_module_open',$this->_cryptAlgorithm);
+				$module=@call_user_func_array('mcrypt_module_open', $this->_cryptAlgorithm);
 			else
-				$module=@mcrypt_module_open($this->_cryptAlgorithm,'', MCRYPT_MODE_CBC,'');
+				$module=@mcrypt_module_open($this->_cryptAlgorithm, '', MCRYPT_MODE_CBC, '');
 			if($module===false)
 				throw new TNotSupportedException('securitymanager_mcryptextension_initfailed');
 			return $module;
@@ -2667,7 +2667,7 @@ 
 	}
 	public function hashData($data)
 	{
-		$hmac = $this->computeHMAC($data);
+		$hmac=$this->computeHMAC($data);
 		return $hmac.$data;
 	}
 	public function validateData($data)
@@ -2675,56 +2675,56 @@ 
 		$len=$this->strlen($this->computeHMAC('test'));
 		if($this->strlen($data) < $len)
 			return false;
-		$hmac = $this->substr($data, 0, $len);
+		$hmac=$this->substr($data, 0, $len);
 		$data2=$this->substr($data, $len, $this->strlen($data));
-		return $hmac === $this->computeHMAC($data2) ? $data2 : false;
+		return $hmac===$this->computeHMAC($data2) ? $data2 : false;
 	}
 	protected function computeHMAC($data)
 	{
-		$key = $this->getValidationKey();
+		$key=$this->getValidationKey();
 		if(function_exists('hash_hmac'))
 			return hash_hmac($this->_hashAlgorithm, $data, $key);
-		if(!strcasecmp($this->_hashAlgorithm,'sha1'))
+		if(!strcasecmp($this->_hashAlgorithm, 'sha1'))
 		{
-			$pack = 'H40';
-			$func = 'sha1';
+			$pack='H40';
+			$func='sha1';
 		} else {
-			$pack = 'H32';
-			$func = 'md5';
+			$pack='H32';
+			$func='md5';
 		}
-		$key = str_pad($func($key), 64, chr(0));
-		return $func((str_repeat(chr(0x5C), 64) ^ substr($key, 0, 64)) . pack($pack, $func((str_repeat(chr(0x36), 64) ^ substr($key, 0, 64)) . $data)));
+		$key=str_pad($func($key), 64, chr(0));
+		return $func((str_repeat(chr(0x5C), 64) ^ substr($key, 0, 64)).pack($pack, $func((str_repeat(chr(0x36), 64) ^ substr($key, 0, 64)).$data)));
 	}
 	private function strlen($string)
 	{
-		return $this->_mbstring ? mb_strlen($string,'8bit') : strlen($string);
+		return $this->_mbstring ? mb_strlen($string, '8bit') : strlen($string);
 	}
-	private function substr($string,$start,$length)
+	private function substr($string, $start, $length)
 	{
-		return $this->_mbstring ? mb_substr($string,$start,$length,'8bit') : substr($string,$start,$length);
+		return $this->_mbstring ? mb_substr($string, $start, $length, '8bit') : substr($string, $start, $length);
 	}
 }
 class TSecurityManagerValidationMode extends TEnumerable
 {
-	const MD5 = 'MD5';
-	const SHA1 = 'SHA1';
+	const MD5='MD5';
+	const SHA1='SHA1';
 }
 class THttpUtility
 {
-	private static $_encodeTable=array('<'=>'&lt;','>'=>'&gt;','"'=>'&quot;');
-	private static $_decodeTable=array('&lt;'=>'<','&gt;'=>'>','&quot;'=>'"');
-	private static $_stripTable=array('&lt;'=>'','&gt;'=>'','&quot;'=>'');
+	private static $_encodeTable=array('<'=>'&lt;', '>'=>'&gt;', '"'=>'&quot;');
+	private static $_decodeTable=array('&lt;'=>'<', '&gt;'=>'>', '&quot;'=>'"');
+	private static $_stripTable=array('&lt;'=>'', '&gt;'=>'', '&quot;'=>'');
 	public static function htmlEncode($s)
 	{
-		return strtr($s,self::$_encodeTable);
+		return strtr($s, self::$_encodeTable);
 	}
 	public static function htmlDecode($s)
 	{
-		return strtr($s,self::$_decodeTable);
+		return strtr($s, self::$_decodeTable);
 	}
 	public static function htmlStrip($s)
 	{
-		return strtr($s,self::$_stripTable);
+		return strtr($s, self::$_stripTable);
 	}
 }
 class TJavaScript
@@ -2733,7 +2733,7 @@ 
 	{
 		$str='';
 		foreach($files as $file)
-			$str.= self::renderScriptFile($file);
+			$str.=self::renderScriptFile($file);
 		return $str;
 	}
 	public static function renderScriptFile($file)
@@ -2743,14 +2743,14 @@ 
 	public static function renderScriptBlocks($scripts)
 	{
 		if(count($scripts))
-			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n".implode("\n",$scripts)."\n/*]]>*/\n</script>\n";
+			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";
+			return implode("\n", $scripts)."\n";
 		else
 			return '';
 	}
@@ -2760,7 +2760,7 @@ 
 	}
 	public static function quoteString($js)
 	{
-		return self::jsonEncode($js,JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
+		return self::jsonEncode($js, JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
 	}
 	public static function quoteJsLiteral($js)
 	{
@@ -2781,16 +2781,16 @@ 
 	{
 		return self::isJsLiteral($js);
 	}
-	public static function encode($value,$toMap=true,$encodeEmptyStrings=false)
+	public static function encode($value, $toMap=true, $encodeEmptyStrings=false)
 	{
 		if(is_string($value))
 			return self::quoteString($value);
 		else if(is_bool($value))
-			return $value?'true':'false';
+			return $value ? 'true' : 'false';
 		else if(is_array($value))
 		{
 			$results='';
-			if(($n=count($value))>0 && array_keys($value)!==range(0,$n-1))
+			if(($n=count($value)) > 0 && array_keys($value)!==range(0, $n - 1))
 			{
 				foreach($value as $k=>$v)
 				{
@@ -2798,7 +2798,7 @@ 
 					{
 						if($results!=='')
 							$results.=',';
-						$results.="'$k':".self::encode($v,$toMap,$encodeEmptyStrings);
+						$results.="'$k':".self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
 				return '{'.$results.'}';
@@ -2811,7 +2811,7 @@ 
 					{
 						if($results!=='')
 							$results.=',';
-						$results.=self::encode($v,$toMap, $encodeEmptyStrings);
+						$results.=self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
 				return '['.$results.']';
@@ -2839,64 +2839,64 @@ 
 			}
 		}
 		else if(is_object($value))
-			if ($value instanceof TJavaScriptLiteral)
+			if($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
 			else
-				return self::encode(get_object_vars($value),$toMap);
+				return self::encode(get_object_vars($value), $toMap);
 		else if($value===null)
 			return 'null';
 		else
 			return '';
 	}
-	public static function jsonEncode($value, $options = 0)
+	public static function jsonEncode($value, $options=0)
 	{
-		if (($g=Prado::getApplication()->getGlobalization(false))!==null &&
+		if(($g=Prado::getApplication()->getGlobalization(false))!==null &&
 			strtoupper($enc=$g->getCharset())!='UTF-8') {
 			self::convertToUtf8($value, $enc);
 		}
-		$s = @json_encode($value,$options);
+		$s=@json_encode($value, $options);
 		self::checkJsonError();
 		return $s;
 	}
 	private static function convertToUtf8(&$value, $sourceEncoding) {
 		if(is_string($value))
 			$value=iconv($sourceEncoding, 'UTF-8', $value);
-		else if (is_array($value))
+		else if(is_array($value))
 		{
 			foreach($value as &$element)
 				self::convertToUtf8($element, $sourceEncoding);
 		}
 	}
-	public static function jsonDecode($value, $assoc = false, $depth = 512)
+	public static function jsonDecode($value, $assoc=false, $depth=512)
 	{
-		$s= @json_decode($value, $assoc, $depth);
+		$s=@json_decode($value, $assoc, $depth);
 		self::checkJsonError();
 		return $s;
 	}
 	private static function checkJsonError()
 	{
-		switch ($err = json_last_error())
+		switch($err=json_last_error())
 		{
 			case JSON_ERROR_NONE:
 				return;
 				break;
 			case JSON_ERROR_DEPTH:
-				$msg = 'Maximum stack depth exceeded';
+				$msg='Maximum stack depth exceeded';
 				break;
 			case JSON_ERROR_STATE_MISMATCH:
-				$msg = 'Underflow or the modes mismatch';
+				$msg='Underflow or the modes mismatch';
 				break;
 			case JSON_ERROR_CTRL_CHAR:
-				$msg = 'Unexpected control character found';
+				$msg='Unexpected control character found';
 				break;
 			case JSON_ERROR_SYNTAX:
-				$msg = 'Syntax error, malformed JSON';
+				$msg='Syntax error, malformed JSON';
 				break;
 			case JSON_ERROR_UTF8:
-				$msg = 'Malformed UTF-8 characters, possibly incorrectly encoded';
+				$msg='Malformed UTF-8 characters, possibly incorrectly encoded';
 				break;
 			default:
-				$msg = 'Unknown error';
+				$msg='Unknown error';
 				break;
 		}
 		throw new Exception("JSON error ($err): $msg");
@@ -2909,10 +2909,10 @@ 
 }
 class TUrlManager extends TModule
 {
-	public function constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems)
+	public function constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems)
 	{
 		$url=$serviceID.'='.urlencode($serviceParam);
-		$amp=$encodeAmpersand?'&amp;':'&';
+		$amp=$encodeAmpersand ? '&amp;' : '&';
 		$request=$this->getRequest();
 		if(is_array($getItems) || $getItems instanceof Traversable)
 		{
@@ -2947,9 +2947,9 @@ 
 		switch($request->getUrlFormat())
 		{
 			case THttpRequestUrlFormat::Path:
-				return $request->getApplicationUrl().'/'.strtr($url,array($amp=>'/','?'=>'/','='=>$request->getUrlParamSeparator()));
+				return $request->getApplicationUrl().'/'.strtr($url, array($amp=>'/', '?'=>'/', '='=>$request->getUrlParamSeparator()));
 			case THttpRequestUrlFormat::HiddenPath:
-				return rtrim(dirname($request->getApplicationUrl()), '/').'/'.strtr($url,array($amp=>'/','?'=>'/','='=>$request->getUrlParamSeparator()));
+				return rtrim(dirname($request->getApplicationUrl()), '/').'/'.strtr($url, array($amp=>'/', '?'=>'/', '='=>$request->getUrlParamSeparator()));
 			default:
 				return $request->getApplicationUrl().'?'.$url;
 		}
@@ -2957,24 +2957,24 @@ 
 	public function parseUrl()
 	{
 		$request=$this->getRequest();
-		$pathInfo=trim($request->getPathInfo(),'/');
+		$pathInfo=trim($request->getPathInfo(), '/');
 		if(($request->getUrlFormat()===THttpRequestUrlFormat::Path ||
 			$request->getUrlFormat()===THttpRequestUrlFormat::HiddenPath) &&
 			$pathInfo!=='')
 		{
 			$separator=$request->getUrlParamSeparator();
-			$paths=explode('/',$pathInfo);
+			$paths=explode('/', $pathInfo);
 			$getVariables=array();
 			foreach($paths as $path)
 			{
 				if(($path=trim($path))!=='')
 				{
-					if(($pos=strpos($path,$separator))!==false)
+					if(($pos=strpos($path, $separator))!==false)
 					{
-						$name=substr($path,0,$pos);
-						$value=substr($path,$pos+1);
-						if(($pos=strpos($name,'[]'))!==false)
-							$getVariables[substr($name,0,$pos)][]=$value;
+						$name=substr($path, 0, $pos);
+						$value=substr($path, $pos + 1);
+						if(($pos=strpos($name, '[]'))!==false)
+							$getVariables[substr($name, 0, $pos)][]=$value;
 						else
 							$getVariables[$name]=$value;
 					}
@@ -2988,10 +2988,10 @@ 
 			return array();
 	}
 }
-class THttpRequest extends TApplicationComponent implements IteratorAggregate,ArrayAccess,Countable,IModule
+class THttpRequest extends TApplicationComponent implements IteratorAggregate, ArrayAccess, Countable, IModule
 {
-	const CGIFIX__PATH_INFO		= 1;
-	const CGIFIX__SCRIPT_NAME	= 2;
+	const CGIFIX__PATH_INFO=1;
+	const CGIFIX__SCRIPT_NAME=2;
 	private $_urlManager=null;
 	private $_urlManagerID='';
 	private $_separator=',';
@@ -3030,13 +3030,13 @@ 
 		}
 														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']))
+		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 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())
@@ -3054,14 +3054,14 @@ 
 	}
 	public function stripSlashes(&$data)
 	{
-		return is_array($data)?array_map(array($this,'stripSlashes'),$data):stripslashes($data);
+		return is_array($data) ? array_map(array($this, 'stripSlashes'), $data) : stripslashes($data);
 	}
 	public function getUrl()
 	{
 		if($this->_url===null)
 		{
 			$secure=$this->getIsSecureConnection();
-			$url=$secure?'https://':'http://';
+			$url=$secure ? 'https://' : 'http://';
 			if(empty($_SERVER['HTTP_HOST']))
 			{
 				$url.=$_SERVER['SERVER_NAME'];
@@ -3078,7 +3078,7 @@ 
 	}
 	public function setEnableCache($value)
 	{
-		$this->_enableCache = TPropertyValue::ensureBoolean($value);
+		$this->_enableCache=TPropertyValue::ensureBoolean($value);
 	}
 	public function getEnableCache()
 	{
@@ -3092,15 +3092,15 @@ 
 	{
 		if($this->getEnableCache())
 		{
-			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			$cache=$this->getApplication()->getCache();
+			if($cache!==null)
 			{
-				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
-					if ($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
+				$dependencies=null;
+				if($this->getApplication()->getMode()!==TApplicationMode::Performance)
+					if($manager instanceof TUrlMapping && $fn=$manager->getConfigFile())
 					{
-						$fn = Prado::getPathOfNamespace($fn,$this->getApplication()->getConfigurationFileExt());
-						$dependencies = new TFileCacheDependency($fn);
+						$fn=Prado::getPathOfNamespace($fn, $this->getApplication()->getConfigurationFileExt());
+						$dependencies=new TFileCacheDependency($fn);
 					}
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
 			}
@@ -3111,10 +3111,10 @@ 
 	{
 		if($this->getEnableCache())
 		{
-			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			$cache=$this->getApplication()->getCache();
+			if($cache!==null)
 			{
-				$manager = $cache->get($this->getCacheKey());
+				$manager=$cache->get($this->getCacheKey());
 				if($manager instanceof TUrlManager)
 					return $manager;
 			}
@@ -3133,7 +3133,7 @@ 
 	{
 		if($this->_urlManager===null)
 		{
-			if(($this->_urlManager = $this->loadCachedUrlManager())===null)
+			if(($this->_urlManager=$this->loadCachedUrlManager())===null)
 			{
 				if(empty($this->_urlManagerID))
 				{
@@ -3144,9 +3144,9 @@ 
 				{
 					$this->_urlManager=$this->getApplication()->getModule($this->_urlManagerID);
 					if($this->_urlManager===null)
-						throw new TConfigurationException('httprequest_urlmanager_inexist',$this->_urlManagerID);
+						throw new TConfigurationException('httprequest_urlmanager_inexist', $this->_urlManagerID);
 					if(!($this->_urlManager instanceof TUrlManager))
-						throw new TConfigurationException('httprequest_urlmanager_invalid',$this->_urlManagerID);
+						throw new TConfigurationException('httprequest_urlmanager_invalid', $this->_urlManagerID);
 				}
 				$this->cacheUrlManager($this->_urlManager);
 			}
@@ -3159,7 +3159,7 @@ 
 	}
 	public function setUrlFormat($value)
 	{
-		$this->_urlFormat=TPropertyValue::ensureEnum($value,'THttpRequestUrlFormat');
+		$this->_urlFormat=TPropertyValue::ensureEnum($value, 'THttpRequestUrlFormat');
 	}
 	public function getUrlParamSeparator()
 	{
@@ -3174,19 +3174,19 @@ 
 	}
 	public function getRequestType()
 	{
-		return isset($_SERVER['REQUEST_METHOD'])?$_SERVER['REQUEST_METHOD']:null;
+		return isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : null;
 	}
-	public function getContentType($mimetypeOnly = true)
+	public function getContentType($mimetypeOnly=true)
 	{
 		if(!isset($_SERVER['CONTENT_TYPE']))
 			return null;
-		if($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false)
+		if($mimetypeOnly===true && ($_pos=strpos(';', $_SERVER['CONTENT_TYPE']))!==false)
 			return substr($_SERVER['CONTENT_TYPE'], 0, $_pos);
 		return $_SERVER['CONTENT_TYPE'];
 	}
 	public function getIsSecureConnection()
 	{
-			return isset($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'],'off');
+			return isset($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'off');
 	}
 	public function getPathInfo()
 	{
@@ -3194,27 +3194,27 @@ 
 	}
 	public function getQueryString()
 	{
-		return isset($_SERVER['QUERY_STRING'])?$_SERVER['QUERY_STRING']:null;
+		return isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : null;
 	}
 	public function getHttpProtocolVersion()
 	{
-		return isset($_SERVER['SERVER_PROTOCOL'])?$_SERVER['SERVER_PROTOCOL']:null;
+		return isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : null;
 	}
 	public function getHeaders($case=null)
 	{
 		static $result;
-		if($result === null && function_exists('apache_request_headers')) {
-			$result = apache_request_headers();
+		if($result===null && function_exists('apache_request_headers')) {
+			$result=apache_request_headers();
 		}
-		elseif($result === null) {
-			$result = array();
+		elseif($result===null) {
+			$result=array();
 			foreach($_SERVER as $key=>$value) {
-				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
-					$key = str_replace(' ','-', ucwords(strtolower(str_replace('_',' ', substr($key, 5)))));
-					$result[$key] = $value;
+				if(strncasecmp($key, 'HTTP_', 5)!==0) continue;
+					$key=str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($key, 5)))));
+					$result[$key]=$value;
 			}
 		}
-		if($case !== null)
+		if($case!==null)
 			return array_change_key_case($result, $case);
 		return $result;
 	}
@@ -3225,36 +3225,36 @@ 
 	public function getBaseUrl($forceSecureConnection=null)
 	{
 		$url=$this->getUrl();
-		$scheme=($forceSecureConnection)?"https": (($forceSecureConnection === null)?$url->getScheme():'http');
+		$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']))
+		if($this->_cgiFix & self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
 			return $_SERVER['ORIG_SCRIPT_NAME'];
-		return isset($_SERVER['SCRIPT_NAME'])?$_SERVER['SCRIPT_NAME']:null;
+		return isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : null;
 	}
 	public function getAbsoluteApplicationUrl($forceSecureConnection=null)
 	{
-		return $this->getBaseUrl($forceSecureConnection) . $this->getApplicationUrl();
+		return $this->getBaseUrl($forceSecureConnection).$this->getApplicationUrl();
 	}
 	public function getApplicationFilePath()
 	{
-		return realpath(isset($_SERVER['SCRIPT_FILENAME'])?$_SERVER['SCRIPT_FILENAME']:null);
+		return realpath(isset($_SERVER['SCRIPT_FILENAME']) ? $_SERVER['SCRIPT_FILENAME'] : null);
 	}
 	public function getServerName()
 	{
-		return isset($_SERVER['SERVER_NAME'])?$_SERVER['SERVER_NAME']:null;
+		return isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
 	}
 	public function getServerPort()
 	{
-		return isset($_SERVER['SERVER_PORT'])?$_SERVER['SERVER_PORT']:null;
+		return isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : null;
 	}
 	public function getUrlReferrer()
 	{
-		return isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:null;
+		return isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
 	}
 	public function getBrowser()
 	{
@@ -3269,19 +3269,19 @@ 
 	}
 	public function getUserAgent()
 	{
-		return isset($_SERVER['HTTP_USER_AGENT'])?$_SERVER['HTTP_USER_AGENT']:null;
+		return isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
 	}
 	public function getUserHostAddress()
 	{
-		return isset($_SERVER['REMOTE_ADDR'])?$_SERVER['REMOTE_ADDR']:null;
+		return isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null;
 	}
 	public function getUserHost()
 	{
-		return isset($_SERVER['REMOTE_HOST'])?$_SERVER['REMOTE_HOST']:null;
+		return isset($_SERVER['REMOTE_HOST']) ? $_SERVER['REMOTE_HOST'] : null;
 	}
 	public function getAcceptTypes()
 	{
-				return isset($_SERVER['HTTP_ACCEPT'])?$_SERVER['HTTP_ACCEPT']:null;
+				return isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
 	}
 	public function getUserLanguages()
 	{
@@ -3314,13 +3314,13 @@ 
 				foreach($_COOKIE as $key=>$value)
 				{
 					if(($value=$sm->validateData($value))!==false)
-						$this->_cookies->add(new THttpCookie($key,$value));
+						$this->_cookies->add(new THttpCookie($key, $value));
 				}
 			}
 			else
 			{
 				foreach($_COOKIE as $key=>$value)
-					$this->_cookies->add(new THttpCookie($key,$value));
+					$this->_cookies->add(new THttpCookie($key, $value));
 			}
 		}
 		return $this->_cookies;
@@ -3337,13 +3337,13 @@ 
 	{
 		return $_ENV;
 	}
-	public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=true,$encodeGetItems=true)
+	public function constructUrl($serviceID, $serviceParam, $getItems=null, $encodeAmpersand=true, $encodeGetItems=true)
 	{
-		if ($this->_cookieOnly===null)
-				$this->_cookieOnly=(int)ini_get('session.use_cookies') && (int)ini_get('session.use_only_cookies');
-		$url=$this->getUrlManagerModule()->constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems);
-		if(defined('SID') && SID != '' && !$this->_cookieOnly)
-			return $url . (strpos($url,'?')===false? '?' : ($encodeAmpersand?'&amp;':'&')) . SID;
+		if($this->_cookieOnly===null)
+				$this->_cookieOnly=(int) ini_get('session.use_cookies') && (int) ini_get('session.use_only_cookies');
+		$url=$this->getUrlManagerModule()->constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems);
+		if(defined('SID') && SID!='' && !$this->_cookieOnly)
+			return $url.(strpos($url, '?')===false ? '?' : ($encodeAmpersand ? '&amp;' : '&')).SID;
 		else
 			return $url;
 	}
@@ -3356,7 +3356,7 @@ 
 		$getParams=$this->parseUrl();
 		foreach($getParams as $name=>$value)
 			$_GET[$name]=$value;
-		$this->_items=array_merge($_GET,$_POST);
+		$this->_items=array_merge($_GET, $_POST);
 		$this->_requestResolved=true;
 		foreach($serviceIDs as $serviceID)
 		{
@@ -3409,13 +3409,13 @@ 
 	{
 		return isset($this->_items[$key]) ? $this->_items[$key] : null;
 	}
-	public function add($key,$value)
+	public function add($key, $value)
 	{
 		$this->_items[$key]=$value;
 	}
 	public function remove($key)
 	{
-		if(isset($this->_items[$key]) || array_key_exists($key,$this->_items))
+		if(isset($this->_items[$key]) || array_key_exists($key, $this->_items))
 		{
 			$value=$this->_items[$key];
 			unset($this->_items[$key]);
@@ -3431,7 +3431,7 @@ 
 	}
 	public function contains($key)
 	{
-		return isset($this->_items[$key]) || array_key_exists($key,$this->_items);
+		return isset($this->_items[$key]) || array_key_exists($key, $this->_items);
 	}
 	public function toArray()
 	{
@@ -3445,9 +3445,9 @@ 
 	{
 		return $this->itemAt($offset);
 	}
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		$this->add($offset,$item);
+		$this->add($offset, $item);
 	}
 	public function offsetUnset($offset)
 	{
@@ -3461,11 +3461,11 @@ 
 	{
 		$this->_o=$owner;
 	}
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof THttpCookie)
 		{
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 			if($this->_o instanceof THttpResponse)
 				$this->_o->addCookie($item);
 		}
@@ -3503,7 +3503,7 @@ 
 	private $_path='/';
 	private $_secure=false;
 	private $_httpOnly=false;
-	public function __construct($name,$value)
+	public function __construct($name, $value)
 	{
 		$this->_name=$name;
 		$this->_value=$value;
@@ -3530,7 +3530,7 @@ 
 	}
 	public function setHttpOnly($value)
 	{
-		$this->_httpOnly = TPropertyValue::ensureBoolean($value);
+		$this->_httpOnly=TPropertyValue::ensureBoolean($value);
 	}
 	public function getName()
 	{
@@ -3590,19 +3590,19 @@ 
 	{
 		if(($ret=@parse_url($uri))!==false)
 		{
-						$this->_scheme=isset($ret['scheme'])?$ret['scheme']:'';
-			$this->_host=isset($ret['host'])?$ret['host']:'';
-			$this->_port=isset($ret['port'])?$ret['port']:'';
-			$this->_user=isset($ret['user'])?$ret['user']:'';
-			$this->_pass=isset($ret['pass'])?$ret['pass']:'';
-			$this->_path=isset($ret['path'])?$ret['path']:'';
-			$this->_query=isset($ret['query'])?$ret['query']:'';
-			$this->_fragment=isset($ret['fragment'])?$ret['fragment']:'';
+						$this->_scheme=isset($ret['scheme']) ? $ret['scheme'] : '';
+			$this->_host=isset($ret['host']) ? $ret['host'] : '';
+			$this->_port=isset($ret['port']) ? $ret['port'] : '';
+			$this->_user=isset($ret['user']) ? $ret['user'] : '';
+			$this->_pass=isset($ret['pass']) ? $ret['pass'] : '';
+			$this->_path=isset($ret['path']) ? $ret['path'] : '';
+			$this->_query=isset($ret['query']) ? $ret['query'] : '';
+			$this->_fragment=isset($ret['fragment']) ? $ret['fragment'] : '';
 			$this->_uri=$uri;
 		}
 		else
 		{
-			throw new TInvalidDataValueException('uri_format_invalid',$uri);
+			throw new TInvalidDataValueException('uri_format_invalid', $uri);
 		}
 	}
 	public function getUri()
@@ -3669,14 +3669,14 @@ 
 	}
 	public function createNewHtmlWriter($type, $writer)
 	{
-		return $this->_response->createNewHtmlWriter($type,$writer);
+		return $this->_response->createNewHtmlWriter($type, $writer);
 	}
 }
 class THttpResponse extends TModule implements ITextWriter
 {
-	const DEFAULT_CONTENTTYPE	= 'text/html';
-	const DEFAULT_CHARSET		= 'UTF-8';
-	private static $HTTP_STATUS_CODES = array(
+	const DEFAULT_CONTENTTYPE='text/html';
+	const DEFAULT_CHARSET='UTF-8';
+	private static $HTTP_STATUS_CODES=array(
 		100 => 'Continue', 101 => 'Switching Protocols',
 		200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content',
 		300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 307 => 'Temporary Redirect',
@@ -3730,13 +3730,13 @@ 
 	}
 	public function setCacheControl($value)
 	{
-		session_cache_limiter(TPropertyValue::ensureEnum($value,array('none','nocache','private','private_no_expire','public')));
+		session_cache_limiter(TPropertyValue::ensureEnum($value, array('none', 'nocache', 'private', 'private_no_expire', 'public')));
 	}
 	public function setContentType($type)
 	{
-		if ($this->_contentTypeHeaderSent)
+		if($this->_contentTypeHeaderSent)
 			throw new Exception('Unable to alter content-type as it has been already sent');
-		$this->_contentType = $type;
+		$this->_contentType=$type;
 	}
 	public function getContentType()
 	{
@@ -3748,7 +3748,7 @@ 
 	}
 	public function setCharset($charset)
 	{
-		$this->_charset = (strToLower($charset) === 'false') ? false : (string)$charset;
+		$this->_charset=(strToLower($charset)==='false') ? false : (string) $charset;
 	}
 	public function getBufferOutput()
 	{
@@ -3767,12 +3767,12 @@ 
 	}
 	public function setStatusCode($status, $reason=null)
 	{
-		if ($this->_httpHeaderSent)
+		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");
 			}
@@ -3795,11 +3795,11 @@ 
 	}
 	public function write($str)
 	{
-				if (!$this->_bufferOutput and !$this->_httpHeaderSent)
+				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)
+	public function writeFile($fileName, $content=null, $mimeType=null, $headers=null, $forceDownload=true, $clientFileName=null, $fileSize=null)
 	{
 		static $defaultMimeTypes=array(
 			'css'=>'text/css',
@@ -3818,9 +3818,9 @@ 
 			$mimeType='text/plain';
 			if(function_exists('mime_content_type'))
 				$mimeType=mime_content_type($fileName);
-			else if(($ext=strrchr($fileName,'.'))!==false)
+			else if(($ext=strrchr($fileName, '.'))!==false)
 			{
-				$ext=substr($ext,1);
+				$ext=substr($ext, 1);
 				if(isset($defaultMimeTypes[$ext]))
 					$mimeType=$defaultMimeTypes[$ext];
 			}
@@ -3830,7 +3830,7 @@ 
 		else
 			$clientFileName=basename($clientFileName);
 		if($fileSize===null || $fileSize < 0)
-			$fileSize = ($content===null?filesize($fileName):strlen($content));
+			$fileSize=($content===null ? filesize($fileName) : strlen($content));
 		$this->sendHttpHeader();
 		if(is_array($headers))
 		{
@@ -3843,10 +3843,10 @@ 
 			header('Expires: 0');
 			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 			header("Content-Type: $mimeType");
-			$this->_contentTypeHeaderSent = true;
+			$this->_contentTypeHeaderSent=true;
 		}
 		header('Content-Length: '.$fileSize);
-		header("Content-Disposition: " . ($forceDownload ? 'attachment' : 'inline') . "; filename=\"$clientFileName\"");
+		header("Content-Disposition: ".($forceDownload ? 'attachment' : 'inline')."; filename=\"$clientFileName\"");
 		header('Content-Transfer-Encoding: binary');
 		if($content===null)
 			readfile($fileName);
@@ -3865,10 +3865,10 @@ 
 		$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);
+		if($this->_status >= 300 && $this->_status < 400)
+						header('Location: '.str_replace('&amp;', '&', $url), true, $this->_status);
 		else
-			header('Location: '.str_replace('&amp;','&',$url));
+			header('Location: '.str_replace('&amp;', '&', $url));
 		if(!$this->getApplication()->getRequestCompleted())
 			$this->getApplication()->onEndRequest();
 		exit();
@@ -3877,7 +3877,7 @@ 
 	{
 		$this->redirect($this->getRequest()->getRequestUri());
 	}
-	public function flush($continueBuffering = true)
+	public function flush($continueBuffering=true)
 	{
 		if($this->getHasAdapter())
 			$this->_adapter->flushContent($continueBuffering);
@@ -3889,16 +3889,16 @@ 
 		$this->ensureHttpHeaderSent();
 		$this->ensureContentTypeHeaderSent();
 	}
-	public function flushContent($continueBuffering = true)
+	public function flushContent($continueBuffering=true)
 	{
 		$this->ensureHeadersSent();
 		if($this->_bufferOutput)
 		{
-						if (ob_get_length()>0)
+						if(ob_get_length() > 0)
 			{
-				if (!$continueBuffering)
+				if(!$continueBuffering)
 				{
-					$this->_bufferOutput = false;
+					$this->_bufferOutput=false;
 					ob_end_flush();
 				}
 				else
@@ -3911,41 +3911,41 @@ 
 	}
 	protected function ensureHttpHeaderSent()
 	{
-		if (!$this->_httpHeaderSent)
+		if(!$this->_httpHeaderSent)
 			$this->sendHttpHeader();
 	}
 	protected function sendHttpHeader()
 	{
 		$protocol=$this->getRequest()->getHttpProtocolVersion();
-		if($this->getRequest()->getHttpProtocolVersion() === null)
+		if($this->getRequest()->getHttpProtocolVersion()===null)
 			$protocol='HTTP/1.1';
-		$phpSapiName = substr(php_sapi_name(), 0, 3);
-		$cgi = $phpSapiName == 'cgi' || $phpSapiName == 'fpm';
+		$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));
-		$this->_httpHeaderSent = true;
+		$this->_httpHeaderSent=true;
 	}
 	protected function ensureContentTypeHeaderSent()
 	{
-		if (!$this->_contentTypeHeaderSent)
+		if(!$this->_contentTypeHeaderSent)
 			$this->sendContentTypeHeader();
 	}
 	protected function sendContentTypeHeader()
 	{
-		$contentType=$this->_contentType===null?self::DEFAULT_CONTENTTYPE:$this->_contentType;
+		$contentType=$this->_contentType===null ? self::DEFAULT_CONTENTTYPE : $this->_contentType;
 		$charset=$this->getCharset();
-		if($charset === false) {
+		if($charset===false) {
 			$this->appendHeader('Content-Type: '.$contentType);
 			return;
 		}
 		if($charset==='' && ($globalization=$this->getApplication()->getGlobalization(false))!==null)
 			$charset=$globalization->getCharset();
-		if($charset==='') $charset = self::DEFAULT_CHARSET;
+		if($charset==='') $charset=self::DEFAULT_CHARSET;
 		$this->appendHeader('Content-Type: '.$contentType.';charset='.$charset);
-		$this->_contentTypeHeaderSent = true;
+		$this->_contentTypeHeaderSent=true;
 	}
 	public function getContents()
 	{
-		return $this->_bufferOutput?ob_get_contents():'';
+		return $this->_bufferOutput ? ob_get_contents() : '';
 	}
 	public function clear()
 	{
@@ -3954,18 +3954,18 @@ 
 	}
 	public function getHeaders($case=null)
 	{
-		$result = array();
-		$headers = headers_list();
+		$result=array();
+		$headers=headers_list();
 		foreach($headers as $header) {
-			$tmp = explode(':', $header);
-			$key = trim(array_shift($tmp));
-			$value = trim(implode(':', $tmp));
+			$tmp=explode(':', $header);
+			$key=trim(array_shift($tmp));
+			$value=trim(implode(':', $tmp));
 			if(isset($result[$key]))
-				$result[$key] .= ', ' . $value;
+				$result[$key].=', '.$value;
 			else
-				$result[$key] = $value;
+				$result[$key]=$value;
 		}
-		if($case !== null)
+		if($case!==null)
 			return array_change_key_case($result, $case);
 		return $result;
 	}
@@ -3973,9 +3973,9 @@ 
 	{
 		header($value, $replace);
 	}
-	public function appendLog($message,$messageType=0,$destination='',$extraHeaders='')
+	public function appendLog($message, $messageType=0, $destination='', $extraHeaders='')
 	{
-		error_log($message,$messageType,$destination,$extraHeaders);
+		error_log($message, $messageType, $destination, $extraHeaders);
 	}
 	public function addCookie($cookie)
 	{
@@ -4039,7 +4039,7 @@ 
 		return Prado::createComponent($type, $writer);
 	}
 }
-class THttpSession extends TApplicationComponent implements IteratorAggregate,ArrayAccess,Countable,IModule
+class THttpSession extends TApplicationComponent implements IteratorAggregate, ArrayAccess, Countable, IModule
 {
 	private $_initialized=false;
 	private $_started=false;
@@ -4068,9 +4068,9 @@ 
 		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'));
+				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());
+				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;
@@ -4094,7 +4094,7 @@ 
 	}
 	public function regenerate($deleteOld=false)
 	{
-		$old = $this->getSessionID();
+		$old=$this->getSessionID();
 		session_regenerate_id($deleteOld);
 		return $old;
 	}
@@ -4124,7 +4124,7 @@ 
 		else if(ctype_alnum($value))
 			session_name($value);
 		else
-			throw new TInvalidDataValueException('httpsession_sessionname_invalid',$value);
+			throw new TInvalidDataValueException('httpsession_sessionname_invalid', $value);
 	}
 	public function getSavePath()
 	{
@@ -4137,7 +4137,7 @@ 
 		else if(is_dir($value))
 			session_save_path($value);
 		else
-			throw new TInvalidDataValueException('httpsession_savepath_invalid',$value);
+			throw new TInvalidDataValueException('httpsession_savepath_invalid', $value);
 	}
 	public function getUseCustomStorage()
 	{
@@ -4150,7 +4150,7 @@ 
 	public function getCookie()
 	{
 		if($this->_cookie===null)
-			$this->_cookie=new THttpCookie($this->getSessionName(),$this->getSessionID());
+			$this->_cookie=new THttpCookie($this->getSessionName(), $this->getSessionID());
 		return $this->_cookie;
 	}
 	public function getCookieMode()
@@ -4168,21 +4168,21 @@ 
 			throw new TInvalidOperationException('httpsession_cookiemode_unchangeable');
 		else
 		{
-			$value=TPropertyValue::ensureEnum($value,'THttpSessionCookieMode');
+			$value=TPropertyValue::ensureEnum($value, 'THttpSessionCookieMode');
 			if($value===THttpSessionCookieMode::None) 
       {
-				ini_set('session.use_cookies','0');
-			  ini_set('session.use_only_cookies','0');
+				ini_set('session.use_cookies', '0');
+			  ini_set('session.use_only_cookies', '0');
       }
 			else if($value===THttpSessionCookieMode::Allow)
 			{
-				ini_set('session.use_cookies','1');
-				ini_set('session.use_only_cookies','0');
+				ini_set('session.use_cookies', '1');
+				ini_set('session.use_only_cookies', '0');
 			}
 			else
 			{
-				ini_set('session.use_cookies','1');
-				ini_set('session.use_only_cookies','1');
+				ini_set('session.use_cookies', '1');
+				ini_set('session.use_only_cookies', '1');
 				ini_set('session.use_trans_sid', 0);
 			}
 		}
@@ -4209,13 +4209,13 @@ 
 		else
 		{
 			$value=TPropertyValue::ensureInteger($value);
-			if($value>=0 && $value<=100)
+			if($value >= 0 && $value <= 100)
 			{
-				ini_set('session.gc_probability',$value);
-				ini_set('session.gc_divisor','100');
+				ini_set('session.gc_probability', $value);
+				ini_set('session.gc_divisor', '100');
 			}
 			else
-				throw new TInvalidDataValueException('httpsession_gcprobability_invalid',$value);
+				throw new TInvalidDataValueException('httpsession_gcprobability_invalid', $value);
 		}
 	}
 	public function getUseTransparentSessionID()
@@ -4229,9 +4229,9 @@ 
 		else
 		{
 			$value=TPropertyValue::ensureBoolean($value);
-			if ($value && $this->getCookieMode()==THttpSessionCookieMode::Only)
+			if($value && $this->getCookieMode()==THttpSessionCookieMode::Only)
 					throw new TInvalidOperationException('httpsession_transid_cookieonly');
-			ini_set('session.use_trans_sid',$value?'1':'0');
+			ini_set('session.use_trans_sid', $value ? '1' : '0');
 		}
 	}
 	public function getTimeout()
@@ -4243,9 +4243,9 @@ 
 		if($this->_started)
 			throw new TInvalidOperationException('httpsession_maxlifetime_unchangeable');
 		else
-			ini_set('session.gc_maxlifetime',$value);
+			ini_set('session.gc_maxlifetime', $value);
 	}
-	public function _open($savePath,$sessionName)
+	public function _open($savePath, $sessionName)
 	{
 		return true;
 	}
@@ -4257,7 +4257,7 @@ 
 	{
 		return '';
 	}
-	public function _write($id,$data)
+	public function _write($id, $data)
 	{
 		return true;
 	}
@@ -4289,7 +4289,7 @@ 
 	{
 		return isset($_SESSION[$key]) ? $_SESSION[$key] : null;
 	}
-	public function add($key,$value)
+	public function add($key, $value)
 	{
 		$_SESSION[$key]=$value;
 	}
@@ -4325,7 +4325,7 @@ 
 	{
 		return isset($_SESSION[$offset]) ? $_SESSION[$offset] : null;
 	}
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
 		$_SESSION[$offset]=$item;
 	}
@@ -4352,7 +4352,7 @@ 
 	}
 	public function current()
 	{
-		return isset($_SESSION[$this->_key])?$_SESSION[$this->_key]:null;
+		return isset($_SESSION[$this->_key]) ? $_SESSION[$this->_key] : null;
 	}
 	public function next()
 	{
@@ -4380,16 +4380,16 @@ 
 	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)
 	{
-		return $this->contains($name)?$this->itemAt($name):parent::__get($name);
+		return $this->contains($name) ? $this->itemAt($name) : parent::__get($name);
 	}
-	public function __set($name,$value)
+	public function __set($name, $value)
 	{
-		$this->add($name,$value);
+		$this->add($name, $value);
 	}
 	public function getCaseSensitive()
 	{
@@ -4401,19 +4401,19 @@ 
 	}
 	public function itemAt($key)
 	{
-		return parent::itemAt($this->_caseSensitive?$key:strtolower($key));
+		return parent::itemAt($this->_caseSensitive ? $key : strtolower($key));
 	}
-	public function add($key,$value)
+	public function add($key, $value)
 	{
-		parent::add($this->_caseSensitive?$key:strtolower($key),$value);
+		parent::add($this->_caseSensitive ? $key : strtolower($key), $value);
 	}
 	public function remove($key)
 	{
-		return parent::remove($this->_caseSensitive?$key:strtolower($key));
+		return parent::remove($this->_caseSensitive ? $key : strtolower($key));
 	}
 	public function contains($key)
 	{
-		return parent::contains($this->_caseSensitive?$key:strtolower($key));
+		return parent::contains($this->_caseSensitive ? $key : strtolower($key));
 	}
 	public function hasProperty($name)
 	{
@@ -4441,7 +4441,7 @@ 
 	}
 	public function getPage()
 	{
-		return $this->_control?$this->_control->getPage():null;
+		return $this->_control ? $this->_control->getPage() : null;
 	}
 	public function createChildControls()
 	{
@@ -4499,7 +4499,7 @@ 
 	const IS_DISABLE_THEMING=0x10;
 	const IS_CHILD_CREATED=0x20;
 	const IS_CREATING_CHILD=0x40;
-	const RF_CONTROLS=0;				const RF_CHILD_STATE=1;				const RF_NAMED_CONTROLS=2;			const RF_NAMED_CONTROLS_ID=3;		const RF_SKIN_ID=4;					const RF_DATA_BINDINGS=5;			const RF_EVENTS=6;					const RF_CONTROLSTATE=7;			const RF_NAMED_OBJECTS=8;			const RF_ADAPTER=9;					const RF_AUTO_BINDINGS=10;		
+	const RF_CONTROLS=0; const RF_CHILD_STATE=1; const RF_NAMED_CONTROLS=2; const RF_NAMED_CONTROLS_ID=3; const RF_SKIN_ID=4; const RF_DATA_BINDINGS=5; const RF_EVENTS=6; const RF_CONTROLSTATE=7; const RF_NAMED_OBJECTS=8; const RF_ADAPTER=9; const RF_AUTO_BINDINGS=10;		
 	private $_id='';
 	private $_uid;
 	private $_parent;
@@ -4525,7 +4525,7 @@ 
 	}
 	public function getAdapter()
 	{
-		return isset($this->_rf[self::RF_ADAPTER])?$this->_rf[self::RF_ADAPTER]:null;
+		return isset($this->_rf[self::RF_ADAPTER]) ? $this->_rf[self::RF_ADAPTER] : null;
 	}
 	public function setAdapter(TControlAdapter $adapter)
 	{
@@ -4598,18 +4598,18 @@ 
 	}
 	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->_flags|=self::IS_ID_SET;
 		$this->clearCachedUniqueID($this instanceof INamingContainer);
 		if($this->_namingContainer)
 			$this->_namingContainer->clearNameTable();
 	}
 	public function getUniqueID()
 	{
-		if($this->_uid==='' || $this->_uid===null)			{
-			$this->_uid='';  			if($namingContainer=$this->getNamingContainer())
+		if($this->_uid==='' || $this->_uid===null) {
+			$this->_uid=''; if($namingContainer=$this->getNamingContainer())
 			{
 				if($this->getPage()===$namingContainer)
 					return ($this->_uid=$this->_id);
@@ -4629,20 +4629,20 @@ 
 	}
 	public function getClientID()
 	{
-		return strtr($this->getUniqueID(),self::ID_SEPARATOR,self::CLIENT_ID_SEPARATOR);
+		return strtr($this->getUniqueID(), self::ID_SEPARATOR, self::CLIENT_ID_SEPARATOR);
 	}
 	public static function convertUniqueIdToClientId($uniqueID)
 	{
-		return strtr($uniqueID,self::ID_SEPARATOR,self::CLIENT_ID_SEPARATOR);
+		return strtr($uniqueID, self::ID_SEPARATOR, self::CLIENT_ID_SEPARATOR);
 	}
 	public function getSkinID()
 	{
-		return isset($this->_rf[self::RF_SKIN_ID])?$this->_rf[self::RF_SKIN_ID]:'';
+		return isset($this->_rf[self::RF_SKIN_ID]) ? $this->_rf[self::RF_SKIN_ID] : '';
 	}
 	public function setSkinID($value)
 	{
-		if(($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage>=self::CS_CHILD_INITIALIZED)
-			throw new TInvalidOperationException('control_skinid_unchangeable',get_class($this));
+		if(($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage >= self::CS_CHILD_INITIALIZED)
+			throw new TInvalidOperationException('control_skinid_unchangeable', get_class($this));
 		else
 			$this->_rf[self::RF_SKIN_ID]=$value;
 	}
@@ -4655,28 +4655,28 @@ 
 		if($this->_flags & self::IS_DISABLE_THEMING)
 			return false;
 		else
-			return $this->_parent?$this->_parent->getEnableTheming():true;
+			return $this->_parent ? $this->_parent->getEnableTheming() : true;
 	}
 	public function setEnableTheming($value)
 	{
-		if($this->_stage>=self::CS_CHILD_INITIALIZED)
-			throw new TInvalidOperationException('control_enabletheming_unchangeable',get_class($this),$this->getUniqueID());
+		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;
+			$this->_flags&=~self::IS_DISABLE_THEMING;
 		else
-			$this->_flags |= self::IS_DISABLE_THEMING;
+			$this->_flags|=self::IS_DISABLE_THEMING;
 	}
 	public function getCustomData()
 	{
-		return $this->getViewState('CustomData',null);
+		return $this->getViewState('CustomData', null);
 	}
 	public function setCustomData($value)
 	{
-		$this->setViewState('CustomData',$value,null);
+		$this->setViewState('CustomData', $value, null);
 	}
 	public function getHasControls()
 	{
-		return isset($this->_rf[self::RF_CONTROLS]) && $this->_rf[self::RF_CONTROLS]->getCount()>0;
+		return isset($this->_rf[self::RF_CONTROLS]) && $this->_rf[self::RF_CONTROLS]->getCount() > 0;
 	}
 	public function getControls()
 	{
@@ -4686,79 +4686,79 @@ 
 	}
 	protected function createControlCollection()
 	{
-		return $this->getAllowChildControls()?new TControlCollection($this):new TEmptyControlCollection($this);
+		return $this->getAllowChildControls() ? new TControlCollection($this) : new TEmptyControlCollection($this);
 	}
 	public function getVisible($checkParents=true)
 	{
 		if($checkParents)
 		{
-			for($control=$this;$control;$control=$control->_parent)
+			for($control=$this; $control; $control=$control->_parent)
 				if(!$control->getVisible(false))
 					return false;
 			return true;
 		}
 		else
-			return $this->getViewState('Visible',true);
+			return $this->getViewState('Visible', true);
 	}
 	public function setVisible($value)
 	{
-		$this->setViewState('Visible',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('Visible', TPropertyValue::ensureBoolean($value), true);
 	}
 	public function getEnabled($checkParents=false)
 	{
 		if($checkParents)
 		{
-			for($control=$this;$control;$control=$control->_parent)
-				if(!$control->getViewState('Enabled',true))
+			for($control=$this; $control; $control=$control->_parent)
+				if(!$control->getViewState('Enabled', true))
 					return false;
 			return true;
 		}
 		else
-			return $this->getViewState('Enabled',true);
+			return $this->getViewState('Enabled', true);
 	}
 	public function setEnabled($value)
 	{
-		$this->setViewState('Enabled',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('Enabled', TPropertyValue::ensureBoolean($value), true);
 	}
 	public function getHasAttributes()
 	{
-		if($attributes=$this->getViewState('Attributes',null))
-			return $attributes->getCount()>0;
+		if($attributes=$this->getViewState('Attributes', null))
+			return $attributes->getCount() > 0;
 		else
 			return false;
 	}
 	public function getAttributes()
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes;
 		else
 		{
 			$attributes=new TAttributeCollection;
-			$this->setViewState('Attributes',$attributes,null);
+			$this->setViewState('Attributes', $attributes, null);
 			return $attributes;
 		}
 	}
 	public function hasAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->contains($name);
 		else
 			return false;
 	}
 	public function getAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->itemAt($name);
 		else
 			return null;
 	}
-	public function setAttribute($name,$value)
+	public function setAttribute($name, $value)
 	{
-		$this->getAttributes()->add($name,$value);
+		$this->getAttributes()->add($name, $value);
 	}
 	public function removeAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->remove($name);
 		else
 			return null;
@@ -4767,7 +4767,7 @@ 
 	{
 		if($checkParents)
 		{
-			for($control=$this;$control!==null;$control=$control->getParent())
+			for($control=$this; $control!==null; $control=$control->getParent())
 				if($control->_flags & self::IS_DISABLE_VIEWSTATE)
 					return false;
 			return true;
@@ -4778,15 +4778,15 @@ 
 	public function setEnableViewState($value)
 	{
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags &= ~self::IS_DISABLE_VIEWSTATE;
+			$this->_flags&=~self::IS_DISABLE_VIEWSTATE;
 		else
-			$this->_flags |= self::IS_DISABLE_VIEWSTATE;
+			$this->_flags|=self::IS_DISABLE_VIEWSTATE;
 	}
-	protected function getControlState($key,$defaultValue=null)
+	protected function getControlState($key, $defaultValue=null)
 	{
-		return isset($this->_rf[self::RF_CONTROLSTATE][$key])?$this->_rf[self::RF_CONTROLSTATE][$key]:$defaultValue;
+		return isset($this->_rf[self::RF_CONTROLSTATE][$key]) ? $this->_rf[self::RF_CONTROLSTATE][$key] : $defaultValue;
 	}
-	protected function setControlState($key,$value,$defaultValue=null)
+	protected function setControlState($key, $value, $defaultValue=null)
 	{
 		if($value===$defaultValue)
 			unset($this->_rf[self::RF_CONTROLSTATE][$key]);
@@ -4801,10 +4801,10 @@ 
 	{
 		$this->_trackViewState=TPropertyValue::ensureBoolean($enabled);
 	}
-	public function getViewState($key,$defaultValue=null)
+	public function getViewState($key, $defaultValue=null)
 	{
 		if(isset($this->_viewState[$key]))
-			return $this->_viewState[$key]!==null?$this->_viewState[$key]:$defaultValue;
+			return $this->_viewState[$key]!==null ? $this->_viewState[$key] : $defaultValue;
 		else if(isset($this->_tempState[$key]))
 		{
 			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
@@ -4814,7 +4814,7 @@ 
 		else
 			return $defaultValue;
 	}
-	public function setViewState($key,$value,$defaultValue=null)
+	public function setViewState($key, $value, $defaultValue=null)
 	{
 		if($this->_trackViewState)
 		{
@@ -4838,7 +4838,7 @@ 
 		unset($this->_viewState[$key]);
 		unset($this->_tempState[$key]);
 	}
-	public function bindProperty($name,$expression)
+	public function bindProperty($name, $expression)
 	{
 		$this->_rf[self::RF_DATA_BINDINGS][$name]=$expression;
 	}
@@ -4846,7 +4846,7 @@ 
 	{
 		unset($this->_rf[self::RF_DATA_BINDINGS][$name]);
 	}
-	public function autoBindProperty($name,$expression)
+	public function autoBindProperty($name, $expression)
 	{
 		$this->_rf[self::RF_AUTO_BINDINGS][$name]=$expression;
 	}
@@ -4863,7 +4863,7 @@ 
 			if(($context=$this->getTemplateControl())===null)
 				$context=$this;
 			foreach($this->_rf[self::RF_DATA_BINDINGS] as $property=>$expression)
-				$this->setSubProperty($property,$context->evaluateExpression($expression));
+				$this->setSubProperty($property, $context->evaluateExpression($expression));
 		}
 	}
 	protected function autoDataBindProperties()
@@ -4873,7 +4873,7 @@ 
 			if(($context=$this->getTemplateControl())===null)
 				$context=$this;
 			foreach($this->_rf[self::RF_AUTO_BINDINGS] as $property=>$expression)
-				$this->setSubProperty($property,$context->evaluateExpression($expression));
+				$this->setSubProperty($property, $context->evaluateExpression($expression));
 		}
 	}
 	protected function dataBindChildren()
@@ -4892,12 +4892,12 @@ 
 	final protected function setChildControlsCreated($value)
 	{
 		if($value)
-			$this->_flags |= self::IS_CHILD_CREATED;
+			$this->_flags|=self::IS_CHILD_CREATED;
 		else
 		{
 			if($this->getHasControls() && ($this->_flags & self::IS_CHILD_CREATED))
 				$this->getControls()->clear();
-			$this->_flags &= ~self::IS_CHILD_CREATED;
+			$this->_flags&=~self::IS_CHILD_CREATED;
 		}
 	}
 	public function ensureChildControls()
@@ -4906,18 +4906,18 @@ 
 		{
 			try
 			{
-				$this->_flags |= self::IS_CREATING_CHILD;
+				$this->_flags|=self::IS_CREATING_CHILD;
 				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;
+				$this->_flags&=~self::IS_CREATING_CHILD;
+				$this->_flags|=self::IS_CHILD_CREATED;
 			}
 			catch(Exception $e)
 			{
-				$this->_flags &= ~self::IS_CREATING_CHILD;
-				$this->_flags |= self::IS_CHILD_CREATED;
+				$this->_flags&=~self::IS_CREATING_CHILD;
+				$this->_flags|=self::IS_CHILD_CREATED;
 				throw $e;
 			}
 		}
@@ -4927,28 +4927,28 @@ 
 	}
 	public function findControl($id)
 	{
-		$id=strtr($id,'.',self::ID_SEPARATOR);
-		$container=($this instanceof INamingContainer)?$this:$this->getNamingContainer();
+		$id=strtr($id, '.', self::ID_SEPARATOR);
+		$container=($this instanceof INamingContainer) ? $this : $this->getNamingContainer();
 		if(!$container || !$container->getHasControls())
 			return null;
 		if(!isset($container->_rf[self::RF_NAMED_CONTROLS]))
 		{
 			$container->_rf[self::RF_NAMED_CONTROLS]=array();
-			$container->fillNameTable($container,$container->_rf[self::RF_CONTROLS]);
+			$container->fillNameTable($container, $container->_rf[self::RF_CONTROLS]);
 		}
-		if(($pos=strpos($id,self::ID_SEPARATOR))===false)
-			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id])?$container->_rf[self::RF_NAMED_CONTROLS][$id]:null;
+		if(($pos=strpos($id, self::ID_SEPARATOR))===false)
+			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id]) ? $container->_rf[self::RF_NAMED_CONTROLS][$id] : null;
 		else
 		{
-			$cid=substr($id,0,$pos);
-			$sid=substr($id,$pos+1);
+			$cid=substr($id, 0, $pos);
+			$sid=substr($id, $pos + 1);
 			if(isset($container->_rf[self::RF_NAMED_CONTROLS][$cid]))
 				return $container->_rf[self::RF_NAMED_CONTROLS][$cid]->findControl($sid);
 			else
 				return null;
 		}
 	}
-	public function findControlsByType($type,$strict=true)
+	public function findControlsByType($type, $strict=true)
 	{
 		$controls=array();
 		if($this->getHasControls())
@@ -4958,7 +4958,7 @@ 
 				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));
+					$controls=array_merge($controls, $control->findControlsByType($type, $strict));
 			}
 		}
 		return $controls;
@@ -4974,7 +4974,7 @@ 
 				{
 					if($control->_id===$id)
 						$controls[]=$control;
-					$controls=array_merge($controls,$control->findControlsByID($id));
+					$controls=array_merge($controls, $control->findControlsByID($id));
 				}
 			}
 		}
@@ -4985,10 +4985,10 @@ 
 		unset($this->_rf[self::RF_NAMED_CONTROLS_ID]);
 		$this->clearNameTable();
 	}
-	public function registerObject($name,$object)
+	public function registerObject($name, $object)
 	{
 		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
-			throw new TInvalidOperationException('control_object_reregistered',$name);
+			throw new TInvalidOperationException('control_object_reregistered', $name);
 		$this->_rf[self::RF_NAMED_OBJECTS][$name]=$object;
 	}
 	public function unregisterObject($name)
@@ -5021,7 +5021,7 @@ 
 	}
 	public function getRegisteredObject($name)
 	{
-		return isset($this->_rf[self::RF_NAMED_OBJECTS][$name])?$this->_rf[self::RF_NAMED_OBJECTS][$name]:null;
+		return isset($this->_rf[self::RF_NAMED_OBJECTS][$name]) ? $this->_rf[self::RF_NAMED_OBJECTS][$name] : null;
 	}
 	public function getAllowChildControls()
 	{
@@ -5048,7 +5048,7 @@ 
 			$control->_parent->getControls()->remove($control);
 		$control->_parent=$this;
 		$control->_page=$this->getPage();
-		$namingContainer=($this instanceof INamingContainer)?$this:$this->_namingContainer;
+		$namingContainer=($this instanceof INamingContainer) ? $this : $this->_namingContainer;
 		if($namingContainer)
 		{
 			$control->_namingContainer=$namingContainer;
@@ -5058,10 +5058,10 @@ 
 				$namingContainer->clearNameTable();
 			$control->clearCachedUniqueID($control instanceof INamingContainer);
 		}
-		if($this->_stage>=self::CS_CHILD_INITIALIZED)
+		if($this->_stage >= self::CS_CHILD_INITIALIZED)
 		{
 			$control->initRecursive($namingContainer);
-			if($this->_stage>=self::CS_STATE_LOADED)
+			if($this->_stage >= self::CS_STATE_LOADED)
 			{
 				if(isset($this->_rf[self::RF_CHILD_STATE][$control->_id]))
 				{
@@ -5070,11 +5070,11 @@ 
 				}
 				else
 					$state=null;
-				$control->loadStateRecursive($state,!($this->_flags & self::IS_DISABLE_VIEWSTATE));
-				if($this->_stage>=self::CS_LOADED)
+				$control->loadStateRecursive($state, !($this->_flags & self::IS_DISABLE_VIEWSTATE));
+				if($this->_stage >= self::CS_LOADED)
 				{
 					$control->loadRecursive();
-					if($this->_stage>=self::CS_PRERENDERED)
+					if($this->_stage >= self::CS_PRERENDERED)
 						$control->preRenderRecursive();
 				}
 			}
@@ -5115,13 +5115,13 @@ 
 				}
 			}
 		}
-		if($this->_stage<self::CS_INITIALIZED)
+		if($this->_stage < self::CS_INITIALIZED)
 		{
 			$this->_stage=self::CS_CHILD_INITIALIZED;
 			if(($page=$this->getPage()) && $this->getEnableTheming() && !($this->_flags & self::IS_SKIN_APPLIED))
 			{
 				$page->applyControlSkin($this);
-				$this->_flags |= self::IS_SKIN_APPLIED;
+				$this->_flags|=self::IS_SKIN_APPLIED;
 			}
 			if(isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onInit(null);
@@ -5132,7 +5132,7 @@ 
 	}
 	protected function loadRecursive()
 	{
-		if($this->_stage<self::CS_LOADED)
+		if($this->_stage < self::CS_LOADED)
 		{
 			if(isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onLoad(null);
@@ -5147,7 +5147,7 @@ 
 					$control->loadRecursive();
 			}
 		}
-		if($this->_stage<self::CS_LOADED)
+		if($this->_stage < self::CS_LOADED)
 			$this->_stage=self::CS_LOADED;
 	}
 	protected function preRenderRecursive()
@@ -5189,73 +5189,73 @@ 
 	}
 	public function onInit($param)
 	{
-		$this->raiseEvent('OnInit',$this,$param);
+		$this->raiseEvent('OnInit', $this, $param);
 	}
 	public function onLoad($param)
 	{
-		$this->raiseEvent('OnLoad',$this,$param);
+		$this->raiseEvent('OnLoad', $this, $param);
 	}
 	public function onDataBinding($param)
 	{
-		$this->raiseEvent('OnDataBinding',$this,$param);
+		$this->raiseEvent('OnDataBinding', $this, $param);
 	}
 	public function onUnload($param)
 	{
-		$this->raiseEvent('OnUnload',$this,$param);
+		$this->raiseEvent('OnUnload', $this, $param);
 	}
 	public function onPreRender($param)
 	{
-		$this->raiseEvent('OnPreRender',$this,$param);
+		$this->raiseEvent('OnPreRender', $this, $param);
 	}
-	protected function raiseBubbleEvent($sender,$param)
+	protected function raiseBubbleEvent($sender, $param)
 	{
 		$control=$this;
 		while($control=$control->_parent)
 		{
-			if($control->bubbleEvent($sender,$param))
+			if($control->bubbleEvent($sender, $param))
 				break;
 		}
 	}
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		return false;
 	}
-	public function broadcastEvent($name,$sender,$param)
+	public function broadcastEvent($name, $sender, $param)
 	{
-		$rootControl=(($page=$this->getPage())===null)?$this:$page;
-		$rootControl->broadcastEventInternal($name,$sender,new TBroadcastEventParameter($name,$param));
+		$rootControl=(($page=$this->getPage())===null) ? $this : $page;
+		$rootControl->broadcastEventInternal($name, $sender, new TBroadcastEventParameter($name, $param));
 	}
-	private function broadcastEventInternal($name,$sender,$param)
+	private function broadcastEventInternal($name, $sender, $param)
 	{
 		if($this->hasEvent($name))
-			$this->raiseEvent($name,$sender,$param->getParameter());
+			$this->raiseEvent($name, $sender, $param->getParameter());
 		if($this instanceof IBroadcastEventReceiver)
-			$this->broadcastEventReceived($sender,$param);
+			$this->broadcastEventReceived($sender, $param);
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
 				if($control instanceof TControl)
-					$control->broadcastEventInternal($name,$sender,$param);
+					$control->broadcastEventInternal($name, $sender, $param);
 			}
 		}
 	}
-	protected function traverseChildControls($param,$preCallback=null,$postCallback=null)
+	protected function traverseChildControls($param, $preCallback=null, $postCallback=null)
 	{
 		if($preCallback!==null)
-			call_user_func($preCallback,$this,$param);
+			call_user_func($preCallback, $this, $param);
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
 				if($control instanceof TControl)
 				{
-					$control->traverseChildControls($param,$preCallback,$postCallback);
+					$control->traverseChildControls($param, $preCallback, $postCallback);
 				}
 			}
 		}
 		if($postCallback!==null)
-			call_user_func($postCallback,$this,$param);
+			call_user_func($postCallback, $this, $param);
 	}
 	public function renderControl($writer)
 	{
@@ -5292,7 +5292,7 @@ 
 	public function loadState()
 	{
 	}
-	protected function loadStateRecursive(&$state,$needViewState=true)
+	protected function loadStateRecursive(&$state, $needViewState=true)
 	{
 		if(is_array($state))
 		{
@@ -5320,7 +5320,7 @@ 
 					{
 						if(isset($state[$control->_id]))
 						{
-							$control->loadStateRecursive($state[$control->_id],$needViewState);
+							$control->loadStateRecursive($state[$control->_id], $needViewState);
 							unset($state[$control->_id]);
 						}
 					}
@@ -5349,7 +5349,7 @@ 
 			{
 				if($control instanceof TControl)
 				{
-					if(count($tmp = &$control->saveStateRecursive($needViewState)))
+					if(count($tmp=&$control->saveStateRecursive($needViewState)))
 						$state[$control->_id]=$tmp;
 				}
 			}
@@ -5365,10 +5365,10 @@ 
 		if($page && !($this->_flags & self::IS_STYLESHEET_APPLIED))
 		{
 			$page->applyControlStyleSheet($this);
-			$this->_flags |= self::IS_STYLESHEET_APPLIED;
+			$this->_flags|=self::IS_STYLESHEET_APPLIED;
 		}
 		else if($this->_flags & self::IS_STYLESHEET_APPLIED)
-			throw new TInvalidOperationException('control_stylesheet_applied',get_class($this));
+			throw new TInvalidOperationException('control_stylesheet_applied', get_class($this));
 	}
 	private function clearCachedUniqueID($recursive)
 	{
@@ -5382,18 +5382,18 @@ 
 	}
 	private function generateAutomaticID()
 	{
-		$this->_flags &= ~self::IS_ID_SET;
+		$this->_flags&=~self::IS_ID_SET;
 		if(!isset($this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]))
 			$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]=0;
 		$id=$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]++;
-		$this->_id=self::AUTOMATIC_ID_PREFIX . $id;
+		$this->_id=self::AUTOMATIC_ID_PREFIX.$id;
 		$this->_namingContainer->clearNameTable();
 	}
 	private function clearNameTable()
 	{
 		unset($this->_rf[self::RF_NAMED_CONTROLS]);
 	}
-	private function fillNameTable($container,$controls)
+	private function fillNameTable($container, $controls)
 	{
 		foreach($controls as $control)
 		{
@@ -5402,12 +5402,12 @@ 
 				if($control->_id!=='')
 				{
 					if(isset($container->_rf[self::RF_NAMED_CONTROLS][$control->_id]))
-						throw new TInvalidDataValueException('control_id_nonunique',get_class($control),$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]);
+					$this->fillNameTable($container, $control->_rf[self::RF_CONTROLS]);
 			}
 		}
 	}
@@ -5415,24 +5415,24 @@ 
 class TControlCollection extends TList
 {
 	private $_o;
-	public function __construct(TControl $owner,$readOnly=false)
+	public function __construct(TControl $owner, $readOnly=false)
 	{
 		$this->_o=$owner;
-		parent::__construct(null,$readOnly);
+		parent::__construct(null, $readOnly);
 	}
 	protected function getOwner()
 	{
 		return $this->_o;
 	}
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TControl)
 		{
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 			$this->_o->addedControl($item);
 		}
 		else if(is_string($item) || ($item instanceof IRenderable))
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('controlcollection_control_required');
 	}
@@ -5454,11 +5454,11 @@ 
 {
 	public function __construct(TControl $owner)
 	{
-		parent::__construct($owner,true);
+		parent::__construct($owner, true);
 	}
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if(!is_string($item))  			parent::insertAt($index,$item);  	}
+		if(!is_string($item))  			parent::insertAt($index, $item); }
 }
 interface INamingContainer
 {
@@ -5469,7 +5469,7 @@ 
 }
 interface IPostBackDataHandler
 {
-	public function loadPostData($key,$values);
+	public function loadPostData($key, $values);
 	public function raisePostDataChangedEvent();
 	public function getDataChanged();
 }
@@ -5489,7 +5489,7 @@ 
 }
 interface IBroadcastEventReceiver
 {
-	public function broadcastEventReceived($sender,$param);
+	public function broadcastEventReceived($sender, $param);
 }
 interface ITheme
 {
@@ -5525,7 +5525,7 @@ 
 {
 	private $_name;
 	private $_param;
-	public function __construct($name='',$parameter=null)
+	public function __construct($name='', $parameter=null)
 	{
 		$this->_name=$name;
 		$this->_param=$parameter;
@@ -5551,7 +5551,7 @@ 
 {
 	private $_name;
 	private $_param;
-	public function __construct($name='',$parameter='')
+	public function __construct($name='', $parameter='')
 	{
 		$this->_name=$name;
 		$this->_param=$parameter;
@@ -5606,7 +5606,7 @@ 
 	}
 	public function evaluateDynamicContent()
 	{
-		$context=$this->_container===null?$this:$this->_container;
+		$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)
@@ -5614,13 +5614,13 @@ 
 	}
 	public function dataBind()
 	{
-		$context=$this->_container===null?$this:$this->_container;
+		$context=$this->_container===null ? $this : $this->_container;
 		foreach($this->_bindings as $id=>$binding)
 			$this->_items[$id]=$context->evaluateExpression($binding);
 	}
 	public function render($writer)
 	{
-		$writer->write(implode('',$this->_items));
+		$writer->write(implode('', $this->_items));
 	}
 }
 class TFont extends TComponent
@@ -5643,12 +5643,12 @@ 
 	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()
 	{
@@ -5656,11 +5656,11 @@ 
 	}
 	public function setBold($value)
 	{
-		$this->_flags |= self::IS_SET_BOLD;
+		$this->_flags|=self::IS_SET_BOLD;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_BOLD;
+			$this->_flags|=self::IS_BOLD;
 		else
-			$this->_flags &= ~self::IS_BOLD;
+			$this->_flags&=~self::IS_BOLD;
 	}
 	public function getItalic()
 	{
@@ -5668,11 +5668,11 @@ 
 	}
 	public function setItalic($value)
 	{
-		$this->_flags |= self::IS_SET_ITALIC;
+		$this->_flags|=self::IS_SET_ITALIC;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_ITALIC;
+			$this->_flags|=self::IS_ITALIC;
 		else
-			$this->_flags &= ~self::IS_ITALIC;
+			$this->_flags&=~self::IS_ITALIC;
 	}
 	public function getOverline()
 	{
@@ -5680,11 +5680,11 @@ 
 	}
 	public function setOverline($value)
 	{
-		$this->_flags |= self::IS_SET_OVERLINE;
+		$this->_flags|=self::IS_SET_OVERLINE;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_OVERLINE;
+			$this->_flags|=self::IS_OVERLINE;
 		else
-			$this->_flags &= ~self::IS_OVERLINE;
+			$this->_flags&=~self::IS_OVERLINE;
 	}
 	public function getSize()
 	{
@@ -5692,7 +5692,7 @@ 
 	}
 	public function setSize($value)
 	{
-		$this->_flags |= self::IS_SET_SIZE;
+		$this->_flags|=self::IS_SET_SIZE;
 		$this->_size=$value;
 	}
 	public function getStrikeout()
@@ -5701,11 +5701,11 @@ 
 	}
 	public function setStrikeout($value)
 	{
-		$this->_flags |= self::IS_SET_STRIKEOUT;
+		$this->_flags|=self::IS_SET_STRIKEOUT;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_STRIKEOUT;
+			$this->_flags|=self::IS_STRIKEOUT;
 		else
-			$this->_flags &= ~self::IS_STRIKEOUT;
+			$this->_flags&=~self::IS_STRIKEOUT;
 	}
 	public function getUnderline()
 	{
@@ -5713,11 +5713,11 @@ 
 	}
 	public function setUnderline($value)
 	{
-		$this->_flags |= self::IS_SET_UNDERLINE;
+		$this->_flags|=self::IS_SET_UNDERLINE;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_UNDERLINE;
+			$this->_flags|=self::IS_UNDERLINE;
 		else
-			$this->_flags &= ~self::IS_UNDERLINE;
+			$this->_flags&=~self::IS_UNDERLINE;
 	}
 	public function getName()
 	{
@@ -5725,7 +5725,7 @@ 
 	}
 	public function setName($value)
 	{
-		$this->_flags |= self::IS_SET_NAME;
+		$this->_flags|=self::IS_SET_NAME;
 		$this->_name=$value;
 	}
 	public function getIsEmpty()
@@ -5782,9 +5782,9 @@ 
 			return '';
 		$str='';
 		if($this->_flags & self::IS_SET_BOLD)
-			$str.='font-weight:'.(($this->_flags & self::IS_BOLD)?'bold;':'normal;');
+			$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;');
+			$str.='font-style:'.(($this->_flags & self::IS_ITALIC) ? 'italic;' : 'normal;');
 		$textDec='';
 		if($this->_flags & self::IS_UNDERLINE)
 			$textDec.='underline';
@@ -5806,9 +5806,9 @@ 
 		if($this->_flags===0)
 			return;
 		if($this->_flags & self::IS_SET_BOLD)
-			$writer->addStyleAttribute('font-weight',(($this->_flags & self::IS_BOLD)?'bold':'normal'));
+			$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'));
+			$writer->addStyleAttribute('font-style', (($this->_flags & self::IS_ITALIC) ? 'italic' : 'normal'));
 		$textDec='';
 		if($this->_flags & self::IS_UNDERLINE)
 			$textDec.='underline';
@@ -5818,11 +5818,11 @@ 
 			$textDec.=' line-through';
 		$textDec=ltrim($textDec);
 		if($textDec!=='')
-			$writer->addStyleAttribute('text-decoration',$textDec);
+			$writer->addStyleAttribute('text-decoration', $textDec);
 		if($this->_size!=='')
-			$writer->addStyleAttribute('font-size',$this->_size);
+			$writer->addStyleAttribute('font-size', $this->_size);
 		if($this->_name!=='')
-			$writer->addStyleAttribute('font-family',$this->_name);
+			$writer->addStyleAttribute('font-family', $this->_name);
 	}
 }
 class TStyle extends TComponent
@@ -5835,16 +5835,16 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_fields===array())
-			$exprops[] = "\0TStyle\0_fields";
+		if($this->_fields===array())
+			$exprops[]="\0TStyle\0_fields";
 		if($this->_font===null)
-			$exprops[] = "\0TStyle\0_font";
+			$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";
+			$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)
 	{
@@ -5854,11 +5854,11 @@ 
 	public function __clone()
 	{
 		if($this->_font!==null)
-			$this->_font = clone($this->_font);
+			$this->_font=clone($this->_font);
 	}
 	public function getBackColor()
 	{
-		return isset($this->_fields['background-color'])?$this->_fields['background-color']:'';
+		return isset($this->_fields['background-color']) ? $this->_fields['background-color'] : '';
 	}
 	public function setBackColor($value)
 	{
@@ -5869,7 +5869,7 @@ 
 	}
 	public function getBorderColor()
 	{
-		return isset($this->_fields['border-color'])?$this->_fields['border-color']:'';
+		return isset($this->_fields['border-color']) ? $this->_fields['border-color'] : '';
 	}
 	public function setBorderColor($value)
 	{
@@ -5880,7 +5880,7 @@ 
 	}
 	public function getBorderStyle()
 	{
-		return isset($this->_fields['border-style'])?$this->_fields['border-style']:'';
+		return isset($this->_fields['border-style']) ? $this->_fields['border-style'] : '';
 	}
 	public function setBorderStyle($value)
 	{
@@ -5891,7 +5891,7 @@ 
 	}
 	public function getBorderWidth()
 	{
-		return isset($this->_fields['border-width'])?$this->_fields['border-width']:'';
+		return isset($this->_fields['border-width']) ? $this->_fields['border-width'] : '';
 	}
 	public function setBorderWidth($value)
 	{
@@ -5902,7 +5902,7 @@ 
 	}
 	public function getCssClass()
 	{
-		return $this->_class===null?'':$this->_class;
+		return $this->_class===null ? '' : $this->_class;
 	}
 	public function hasCssClass()
 	{
@@ -5920,23 +5920,23 @@ 
 	}
 	public function hasFont()
 	{
-		return $this->_font !== null;
+		return $this->_font!==null;
 	}
 	public function setDisplayStyle($value)
 	{
-		$this->_displayStyle = TPropertyValue::ensureEnum($value, 'TDisplayStyle');
+		$this->_displayStyle=TPropertyValue::ensureEnum($value, 'TDisplayStyle');
 		switch($this->_displayStyle)
 		{
 			case TDisplayStyle::None:
-				$this->_fields['display'] = 'none';
+				$this->_fields['display']='none';
 				break;
 			case TDisplayStyle::Dynamic:
-				$this->_fields['display'] = ''; 				break;
+				$this->_fields['display']=''; break;
 			case TDisplayStyle::Fixed:
-				$this->_fields['visibility'] = 'visible';
+				$this->_fields['visibility']='visible';
 				break;
 			case TDisplayStyle::Hidden:
-				$this->_fields['visibility'] = 'hidden';
+				$this->_fields['visibility']='hidden';
 				break;
 		}
 	}
@@ -5946,7 +5946,7 @@ 
 	}
 	public function getForeColor()
 	{
-		return isset($this->_fields['color'])?$this->_fields['color']:'';
+		return isset($this->_fields['color']) ? $this->_fields['color'] : '';
 	}
 	public function setForeColor($value)
 	{
@@ -5957,7 +5957,7 @@ 
 	}
 	public function getHeight()
 	{
-		return isset($this->_fields['height'])?$this->_fields['height']:'';
+		return isset($this->_fields['height']) ? $this->_fields['height'] : '';
 	}
 	public function setHeight($value)
 	{
@@ -5968,7 +5968,7 @@ 
 	}
 	public function getCustomStyle()
 	{
-		return $this->_customStyle===null?'':$this->_customStyle;
+		return $this->_customStyle===null ? '' : $this->_customStyle;
 	}
 	public function setCustomStyle($value)
 	{
@@ -5976,9 +5976,9 @@ 
 	}
 	public function getStyleField($name)
 	{
-		return isset($this->_fields[$name])?$this->_fields[$name]:'';
+		return isset($this->_fields[$name]) ? $this->_fields[$name] : '';
 	}
-	public function setStyleField($name,$value)
+	public function setStyleField($name, $value)
 	{
 		$this->_fields[$name]=$value;
 	}
@@ -5992,7 +5992,7 @@ 
 	}
 	public function getWidth()
 	{
-		return isset($this->_fields['width'])?$this->_fields['width']:'';
+		return isset($this->_fields['width']) ? $this->_fields['width'] : '';
 	}
 	public function setWidth($value)
 	{
@@ -6009,7 +6009,7 @@ 
 	{
 		if($style instanceof TStyle)
 		{
-			$this->_fields=array_merge($this->_fields,$style->_fields);
+			$this->_fields=array_merge($this->_fields, $style->_fields);
 			if($style->_class!==null)
 				$this->_class=$style->_class;
 			if($style->_customStyle!==null)
@@ -6022,7 +6022,7 @@ 
 	{
 		if($style instanceof TStyle)
 		{
-			$this->_fields=array_merge($style->_fields,$this->_fields);
+			$this->_fields=array_merge($style->_fields, $this->_fields);
 			if($this->_class===null)
 				$this->_class=$style->_class;
 			if($this->_customStyle===null)
@@ -6035,18 +6035,18 @@ 
 	{
 		if($this->_customStyle!==null)
 		{
-			foreach(explode(';',$this->_customStyle) as $style)
+			foreach(explode(';', $this->_customStyle) as $style)
 			{
-				$arr=explode(':',$style,2);
+				$arr=explode(':', $style, 2);
 				if(isset($arr[1]) && trim($arr[0])!=='')
-					$writer->addStyleAttribute(trim($arr[0]),trim($arr[1]));
+					$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);
+			$writer->addAttribute('class', $this->_class);
 	}
 	public function getStyleFields()
 	{
@@ -6071,18 +6071,18 @@ 
 	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()
 	{
@@ -6134,26 +6134,26 @@ 
 	public function addAttributesToRender($writer)
 	{
 		if(($url=trim($this->getBackImageUrl()))!=='')
-			$writer->addStyleAttribute('background-image','url('.$url.')');
+			$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");
+			$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');
+			$writer->addStyleAttribute('border-collapse', 'collapse');
 		switch($this->getGridLines())
 		{
-			case TTableGridLines::Horizontal : $writer->addAttribute('rules','rows'); break;
-			case TTableGridLines::Vertical : $writer->addAttribute('rules','cols'); break;
-			case TTableGridLines::Both : $writer->addAttribute('rules','all'); break;
+			case TTableGridLines::Horizontal : $writer->addAttribute('rules', 'rows'); break;
+			case TTableGridLines::Vertical : $writer->addAttribute('rules', 'cols'); break;
+			case TTableGridLines::Both : $writer->addAttribute('rules', 'all'); break;
 		}
 		parent::addAttributesToRender($writer);
 	}
 	public function getBackImageUrl()
 	{
-		return $this->_backImageUrl===null?'':$this->_backImageUrl;
+		return $this->_backImageUrl===null ? '' : $this->_backImageUrl;
 	}
 	public function setBackImageUrl($value)
 	{
@@ -6161,41 +6161,41 @@ 
 	}
 	public function getHorizontalAlign()
 	{
-		return $this->_horizontalAlign===null?THorizontalAlign::NotSet:$this->_horizontalAlign;
+		return $this->_horizontalAlign===null ? THorizontalAlign::NotSet : $this->_horizontalAlign;
 	}
 	public function setHorizontalAlign($value)
 	{
-		$this->_horizontalAlign=TPropertyValue::ensureEnum($value,'THorizontalAlign');
+		$this->_horizontalAlign=TPropertyValue::ensureEnum($value, 'THorizontalAlign');
 	}
 	public function getCellPadding()
 	{
-		return $this->_cellPadding===null?-1:$this->_cellPadding;
+		return $this->_cellPadding===null ?-1 : $this->_cellPadding;
 	}
 	public function setCellPadding($value)
 	{
-		if(($this->_cellPadding=TPropertyValue::ensureInteger($value))<-1)
+		if(($this->_cellPadding=TPropertyValue::ensureInteger($value)) < -1)
 			throw new TInvalidDataValueException('tablestyle_cellpadding_invalid');
 	}
 	public function getCellSpacing()
 	{
-		return $this->_cellSpacing===null?-1:$this->_cellSpacing;
+		return $this->_cellSpacing===null ?-1 : $this->_cellSpacing;
 	}
 	public function setCellSpacing($value)
 	{
-		if(($this->_cellSpacing=TPropertyValue::ensureInteger($value))<-1)
+		if(($this->_cellSpacing=TPropertyValue::ensureInteger($value)) < -1)
 			throw new TInvalidDataValueException('tablestyle_cellspacing_invalid');
 	}
 	public function getGridLines()
 	{
-		return $this->_gridLines===null?TTableGridLines::None:$this->_gridLines;
+		return $this->_gridLines===null ? TTableGridLines::None : $this->_gridLines;
 	}
 	public function setGridLines($value)
 	{
-		$this->_gridLines=TPropertyValue::ensureEnum($value,'TTableGridLines');
+		$this->_gridLines=TPropertyValue::ensureEnum($value, 'TTableGridLines');
 	}
 	public function getBorderCollapse()
 	{
-		return $this->_borderCollapse===null?false:$this->_borderCollapse;
+		return $this->_borderCollapse===null ? false : $this->_borderCollapse;
 	}
 	public function setBorderCollapse($value)
 	{
@@ -6210,12 +6210,12 @@ 
 	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()
 	{
@@ -6253,32 +6253,32 @@ 
 	public function addAttributesToRender($writer)
 	{
 		if(!$this->getWrap())
-			$writer->addStyleAttribute('white-space','nowrap');
+			$writer->addStyleAttribute('white-space', 'nowrap');
 		if(($horizontalAlign=$this->getHorizontalAlign())!==THorizontalAlign::NotSet)
-			$writer->addAttribute('align',strtolower($horizontalAlign));
+			$writer->addAttribute('align', strtolower($horizontalAlign));
 		if(($verticalAlign=$this->getVerticalAlign())!==TVerticalAlign::NotSet)
-			$writer->addAttribute('valign',strtolower($verticalAlign));
+			$writer->addAttribute('valign', strtolower($verticalAlign));
 		parent::addAttributesToRender($writer);
 	}
 	public function getHorizontalAlign()
 	{
-		return $this->_horizontalAlign===null?THorizontalAlign::NotSet:$this->_horizontalAlign;
+		return $this->_horizontalAlign===null ? THorizontalAlign::NotSet : $this->_horizontalAlign;
 	}
 	public function setHorizontalAlign($value)
 	{
-		$this->_horizontalAlign=TPropertyValue::ensureEnum($value,'THorizontalAlign');
+		$this->_horizontalAlign=TPropertyValue::ensureEnum($value, 'THorizontalAlign');
 	}
 	public function getVerticalAlign()
 	{
-		return $this->_verticalAlign===null?TVerticalAlign::NotSet:$this->_verticalAlign;
+		return $this->_verticalAlign===null ? TVerticalAlign::NotSet : $this->_verticalAlign;
 	}
 	public function setVerticalAlign($value)
 	{
-		$this->_verticalAlign=TPropertyValue::ensureEnum($value,'TVerticalAlign');
+		$this->_verticalAlign=TPropertyValue::ensureEnum($value, 'TVerticalAlign');
 	}
 	public function getWrap()
 	{
-		return $this->_wrap===null?true:$this->_wrap;
+		return $this->_wrap===null ? true : $this->_wrap;
 	}
 	public function setWrap($value)
 	{
@@ -6330,21 +6330,21 @@ 
 }
 class TWebControlDecorator extends TComponent {
 	private $_internalonly;
-	private $_usestate = false;
+	private $_usestate=false;
 	private $_control;
 	private $_outercontrol;
 	private $_addedTemplateDecoration=false;
-	private $_pretagtext = '';
-	private $_precontentstext = '';
-	private $_postcontentstext = '';
-	private $_posttagtext = '';
+	private $_pretagtext='';
+	private $_precontentstext='';
+	private $_postcontentstext='';
+	private $_posttagtext='';
 	private $_pretagtemplate;
 	private $_precontentstemplate;
 	private $_postcontentstemplate;
 	private $_posttagtemplate;
-	public function __construct($control, $onlyinternal = false) {
-		$this->_control = $control;
-		$this->_internalonly = $onlyinternal;
+	public function __construct($control, $onlyinternal=false) {
+		$this->_control=$control;
+		$this->_internalonly=$onlyinternal;
 	}
 	public function getUseState()
 	{
@@ -6352,91 +6352,91 @@ 
 	}
 	public function setUseState($value)
 	{
-		$this->_usestate = TPropertyValue::ensureBoolean($value);
+		$this->_usestate=TPropertyValue::ensureBoolean($value);
 	}
 	public function getPreTagText() {
 		return $this->_pretagtext;
 	}
 	public function setPreTagText($value) {
 		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
-			$this->_pretagtext = TPropertyValue::ensureString($value);
+			$this->_pretagtext=TPropertyValue::ensureString($value);
 	}
 	public function getPreContentsText() {
 		return $this->_precontentstext;
 	}
 	public function setPreContentsText($value) {
 		if(!$this->_control->getIsSkinApplied())
-			$this->_precontentstext = TPropertyValue::ensureString($value);
+			$this->_precontentstext=TPropertyValue::ensureString($value);
 	}
 	public function getPostContentsText() {
 		return $this->_postcontentstext;
 	}
 	public function setPostContentsText($value) {
 		if(!$this->_control->getIsSkinApplied())
-			$this->_postcontentstext = TPropertyValue::ensureString($value);
+			$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);
+			$this->_posttagtext=TPropertyValue::ensureString($value);
 	}
 	public function getPreTagTemplate() {
 		return $this->_pretagtemplate;
 	}
 	public function setPreTagTemplate($value) {
 		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
-			$this->_pretagtemplate = $value;
+			$this->_pretagtemplate=$value;
 	}
 	public function getPreContentsTemplate() {
 		return $this->_precontentstemplate;
 	}
 	public function setPreContentsTemplate($value) {
 		if(!$this->_control->getIsSkinApplied())
-			$this->_precontentstemplate = $value;
+			$this->_precontentstemplate=$value;
 	}
 	public function getPostContentsTemplate() {
 		return $this->_postcontentstemplate;
 	}
 	public function setPostContentsTemplate($value) {
 		if(!$this->_control->getIsSkinApplied())
-			$this->_postcontentstemplate = $value;
+			$this->_postcontentstemplate=$value;
 	}
 	public function getPostTagTemplate() {
 		return $this->_posttagtemplate;
 	}
 	public function setPostTagTemplate($value) {
 		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
-			$this->_posttagtemplate = $value;
+			$this->_posttagtemplate=$value;
 	}
-	public function instantiate($outercontrol = null) {
+	public function instantiate($outercontrol=null) {
 		if($this->getPreTagTemplate() || $this->getPreContentsTemplate() ||
 			$this->getPostContentsTemplate() || $this->getPostTagTemplate()) {
-			$this->_outercontrol = $outercontrol;
+			$this->_outercontrol=$outercontrol;
 			if($this->getUseState())
 				$this->ensureTemplateDecoration();
 			else
-				$this->_control->getPage()->onSaveStateComplete[] = array($this, 'ensureTemplateDecoration');
+				$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;
+		$control=$this->_control;
+		$outercontrol=$this->_outercontrol;
+		if($outercontrol===null)
+			$outercontrol=$control;
 		if($this->_addedTemplateDecoration)
 			return $this->_addedTemplateDecoration;
-		$this->_addedTemplateDecoration = true;
+		$this->_addedTemplateDecoration=true;
 		if($this->getPreContentsTemplate())
 		{
-			$precontents = Prado::createComponent('TCompositeControl');
+			$precontents=Prado::createComponent('TCompositeControl');
 			$this->getPreContentsTemplate()->instantiateIn($precontents);
 			$control->getControls()->insertAt(0, $precontents);
 		}
 		if($this->getPostContentsTemplate())
 		{
-			$postcontents = Prado::createComponent('TCompositeControl');
+			$postcontents=Prado::createComponent('TCompositeControl');
 			$this->getPostContentsTemplate()->instantiateIn($postcontents);
 			$control->getControls()->add($postcontents);
 		}
@@ -6444,13 +6444,13 @@ 
 			return $this->_addedTemplateDecoration;
 		if($this->getPreTagTemplate())
 		{
-			$pretag = Prado::createComponent('TCompositeControl');
+			$pretag=Prado::createComponent('TCompositeControl');
 			$this->getPreTagTemplate()->instantiateIn($pretag);
 			$outercontrol->getParent()->getControls()->insertBefore($outercontrol, $pretag);
 		}
 		if($this->getPostTagTemplate())
 		{
-			$posttag = Prado::createComponent('TCompositeControl');
+			$posttag=Prado::createComponent('TCompositeControl');
 			$this->getPostTagTemplate()->instantiateIn($posttag);
 			$outercontrol->getParent()->getControls()->insertAfter($outercontrol, $posttag);
 		}
@@ -6475,7 +6475,7 @@ 
 	protected $_decorator;
 	public function setEnsureId($value)
 	{
-		$this->_ensureid |= TPropertyValue::ensureBoolean($value);
+		$this->_ensureid|=TPropertyValue::ensureBoolean($value);
 	}
 	public function getEnsureId()
 	{
@@ -6484,7 +6484,7 @@ 
 	public function getDecorator($create=true)
 	{
 		if($create && !$this->_decorator)
-			$this->_decorator = Prado::createComponent('TWebControlDecorator', $this);
+			$this->_decorator=Prado::createComponent('TWebControlDecorator', $this);
 		return $this->_decorator;
 	}
 	public function copyBaseAttributes(TWebControl $control)
@@ -6499,17 +6499,17 @@ 
 	}
 	public function getAccessKey()
 	{
-		return $this->getViewState('AccessKey','');
+		return $this->getViewState('AccessKey', '');
 	}
 	public function setAccessKey($value)
 	{
-		if(strlen($value)>1)
-			throw new TInvalidDataValueException('webcontrol_accesskey_invalid',get_class($this),$value);
-		$this->setViewState('AccessKey',$value,'');
+		if(strlen($value) > 1)
+			throw new TInvalidDataValueException('webcontrol_accesskey_invalid', get_class($this), $value);
+		$this->setViewState('AccessKey', $value, '');
 	}
 	public function getBackColor()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getBackColor();
 		else
 			return '';
@@ -6520,7 +6520,7 @@ 
 	}
 	public function getBorderColor()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getBorderColor();
 		else
 			return '';
@@ -6531,7 +6531,7 @@ 
 	}
 	public function getBorderStyle()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getBorderStyle();
 		else
 			return '';
@@ -6542,7 +6542,7 @@ 
 	}
 	public function getBorderWidth()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getBorderWidth();
 		else
 			return '';
@@ -6557,7 +6557,7 @@ 
 	}
 	public function getForeColor()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getForeColor();
 		else
 			return '';
@@ -6568,7 +6568,7 @@ 
 	}
 	public function getHeight()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getHeight();
 		else
 			return '';
@@ -6587,7 +6587,7 @@ 
 	}
 	public function getCssClass()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getCssClass();
 		else
 			return '';
@@ -6598,7 +6598,7 @@ 
 	}
 	public function getHasStyle()
 	{
-		return $this->getViewState('Style',null)!==null;
+		return $this->getViewState('Style', null)!==null;
 	}
 	protected function createStyle()
 	{
@@ -6606,12 +6606,12 @@ 
 	}
 	public function getStyle()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style;
 		else
 		{
 			$style=$this->createStyle();
-			$this->setViewState('Style',$style,null);
+			$this->setViewState('Style', $style, null);
 			return $style;
 		}
 	}
@@ -6620,7 +6620,7 @@ 
 		if(is_string($value))
 			$this->getStyle()->setCustomStyle($value);
 		else
-			throw new TInvalidDataValueException('webcontrol_style_invalid',get_class($this));
+			throw new TInvalidDataValueException('webcontrol_style_invalid', get_class($this));
 	}
 	public function clearStyle()
 	{
@@ -6628,11 +6628,11 @@ 
 	}
 	public function getTabIndex()
 	{
-		return $this->getViewState('TabIndex',0);
+		return $this->getViewState('TabIndex', 0);
 	}
 	public function setTabIndex($value)
 	{
-		$this->setViewState('TabIndex',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('TabIndex', TPropertyValue::ensureInteger($value), 0);
 	}
 	protected function getTagName()
 	{
@@ -6640,15 +6640,15 @@ 
 	}
 	public function getToolTip()
 	{
-		return $this->getViewState('ToolTip','');
+		return $this->getViewState('ToolTip', '');
 	}
 	public function setToolTip($value)
 	{
-		$this->setViewState('ToolTip',$value,'');
+		$this->setViewState('ToolTip', $value, '');
 	}
 	public function getWidth()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getWidth();
 		else
 			return '';
@@ -6658,28 +6658,28 @@ 
 		$this->getStyle()->setWidth($value);
 	}
 	public function onPreRender($param) {
-		if($decorator = $this->getDecorator(false))
+		if($decorator=$this->getDecorator(false))
 			$decorator->instantiate();
 		parent::onPreRender($param);
 	}
 	protected function addAttributesToRender($writer)
 	{
 		if($this->getID()!=='' || $this->getEnsureId())
-			$writer->addAttribute('id',$this->getClientID());
+			$writer->addAttribute('id', $this->getClientID());
 		if(($accessKey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accessKey);
+			$writer->addAttribute('accesskey', $accessKey);
 		if(!$this->getEnabled())
-			$writer->addAttribute('disabled','disabled');
-		if(($tabIndex=$this->getTabIndex())>0)
-			$writer->addAttribute('tabindex',"$tabIndex");
+			$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))
+			$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);
+				$writer->addAttribute($name, $value);
 		}
 	}
 	public function render($writer)
@@ -6690,7 +6690,7 @@ 
 	}
 	public function renderBeginTag($writer)
 	{
-		if($decorator = $this->getDecorator(false)) {
+		if($decorator=$this->getDecorator(false)) {
 			$decorator->renderPreTagText($writer);
 			$this->addAttributesToRender($writer);
 			$writer->renderBeginTag($this->getTagName());
@@ -6706,7 +6706,7 @@ 
 	}
 	public function renderEndTag($writer)
 	{
-		if($decorator = $this->getDecorator(false)) {
+		if($decorator=$this->getDecorator(false)) {
 			$decorator->renderPostContentsText($writer);
 			$writer->renderEndTag();
 			$decorator->renderPostTagText($writer);
@@ -6773,24 +6773,24 @@ 
 			foreach($tpl->getDirective() as $name=>$value)
 			{
 				if(is_string($value))
-					$this->setSubProperty($name,$value);
+					$this->setSubProperty($name, $value);
 				else
-					throw new TConfigurationException('templatecontrol_directive_invalid',get_class($this),$name);
+					throw new TConfigurationException('templatecontrol_directive_invalid', get_class($this), $name);
 			}
 			$tpl->instantiateIn($this);
 		}
 	}
-	public function registerContent($id,TContent $object)
+	public function registerContent($id, TContent $object)
 	{
 		if(isset($this->_contents[$id]))
-			throw new TConfigurationException('templatecontrol_contentid_duplicated',$id);
+			throw new TConfigurationException('templatecontrol_contentid_duplicated', $id);
 		else
 			$this->_contents[$id]=$object;
 	}
-	public function registerContentPlaceHolder($id,TContentPlaceHolder $object)
+	public function registerContentPlaceHolder($id, TContentPlaceHolder $object)
 	{
 		if(isset($this->_placeholders[$id]))
-			throw new TConfigurationException('templatecontrol_placeholderid_duplicated',$id);
+			throw new TConfigurationException('templatecontrol_placeholderid_duplicated', $id);
 		else
 			$this->_placeholders[$id]=$object;
 	}
@@ -6806,17 +6806,17 @@ 
 	{
 		return $this->_master;
 	}
-	public function injectContent($id,$content)
+	public function injectContent($id, $content)
 	{
 		if(isset($this->_placeholders[$id]))
 		{
 			$placeholder=$this->_placeholders[$id];
 			$controls=$placeholder->getParent()->getControls();
 			$loc=$controls->remove($placeholder);
-			$controls->insertAt($loc,$content);
+			$controls->insertAt($loc, $content);
 		}
 		else
-			throw new TConfigurationException('templatecontrol_placeholder_inexistent',$id);
+			throw new TConfigurationException('templatecontrol_placeholder_inexistent', $id);
 	}
 	protected function initRecursive($namingContainer=null)
 	{
@@ -6831,44 +6831,44 @@ 
 			$this->getControls()->add($master);
 			$master->ensureChildControls();
 			foreach($this->_contents as $id=>$content)
-				$master->injectContent($id,$content);
+				$master->injectContent($id, $content);
 		}
 		else if(!empty($this->_contents))
-			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
+			throw new TConfigurationException('templatecontrol_mastercontrol_required', get_class($this));
 		parent::initRecursive($namingContainer);
 	}
-        public function tryToUpdateView($arObj, $throwExceptions = false)
+        public function tryToUpdateView($arObj, $throwExceptions=false)
         {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
+                $objAttrs=get_class_vars(get_class($arObj));
+                foreach(array_keys($objAttrs) as $key)
                 {
                         try
                         {
-                                if ($key != "RELATIONS")
+                                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};
+                                        $control=$this->{$key};
+                                        if($control instanceof TTextBox)
+                                                $control->Text=$arObj->{$key};
+                                        elseif($control instanceof TCheckBox)
+                                                $control->Checked=(boolean) $arObj->{$key};
+                                        elseif($control instanceof TDatePicker)
+                                                $control->Date=$arObj->{$key};
                                 }
                                 else
                                 {
-                                        foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
+                                        foreach($objAttrs["RELATIONS"] as $relKey => $relValues)
                                         {
-                                                $relControl = $this->{$relKey};
-                                                switch ($relValues[0])
+                                                $relControl=$this->{$relKey};
+                                                switch($relValues[0])
                                                 {
                                                         case TActiveRecord::BELONGS_TO:
                                                         case TActiveRecord::HAS_ONE:
-                                                                $relControl->Text = $arObj->{$relKey};
+                                                                $relControl->Text=$arObj->{$relKey};
                                                                 break;
                                                         case TActiveRecord::HAS_MANY:
-                                                                if ($relControl instanceof TListControl)
+                                                                if($relControl instanceof TListControl)
                                                                 {
-                                                                        $relControl->DataSource = $arObj->{$relKey};
+                                                                        $relControl->DataSource=$arObj->{$relKey};
                                                                         $relControl->dataBind();
                                                                 }
                                                                 break;
@@ -6877,33 +6877,33 @@ 
                                         break;
                                 }
                         } 
-                        catch (Exception $ex)
+                        catch(Exception $ex)
                         {
-                                if ($throwExceptions)
+                                if($throwExceptions)
                                         throw $ex;
                         }
                 }
         }
-        public function tryToUpdateAR($arObj, $throwExceptions = false)
+        public function tryToUpdateAR($arObj, $throwExceptions=false)
         {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
+                $objAttrs=get_class_vars(get_class($arObj));
+                foreach(array_keys($objAttrs) as $key)
                 {
                         try
                         {
-                                if ($key == "RELATIONS")
+                                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;
+                                $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)
+                        catch(Exception $ex)
                         {
-                                if ($throwExceptions)
+                                if($throwExceptions)
                                         throw $ex;
                         }
                 }
@@ -6918,12 +6918,12 @@ 
 	}
 	protected function addAttributesToRender($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
-		$writer->addAttribute('method',$this->getMethod());
+		$writer->addAttribute('id', $this->getClientID());
+		$writer->addAttribute('method', $this->getMethod());
 		$uri=$this->getRequest()->getRequestURI();
-		$writer->addAttribute('action',str_replace('&','&amp;',str_replace('&amp;','&',$uri)));
+		$writer->addAttribute('action', str_replace('&', '&amp;', str_replace('&amp;', '&', $uri)));
 		if(($enctype=$this->getEnctype())!=='')
-			$writer->addAttribute('enctype',$enctype);
+			$writer->addAttribute('enctype', $enctype);
 		$attributes=$this->getAttributes();
 		$attributes->remove('action');
 		$writer->addAttributes($attributes);
@@ -6932,7 +6932,7 @@ 
 			if(($button=$this->findControl($butt))!==null)
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 			else
-				throw new TInvalidDataValueException('form_defaultbutton_invalid',$butt);
+				throw new TInvalidDataValueException('form_defaultbutton_invalid', $butt);
 		}
 	}
 	public function render($writer)
@@ -6965,27 +6965,27 @@ 
 	}
 	public function getDefaultButton()
 	{
-		return $this->getViewState('DefaultButton','');
+		return $this->getViewState('DefaultButton', '');
 	}
 	public function setDefaultButton($value)
 	{
-		$this->setViewState('DefaultButton',$value,'');
+		$this->setViewState('DefaultButton', $value, '');
 	}
 	public function getMethod()
 	{
-		return $this->getViewState('Method','post');
+		return $this->getViewState('Method', 'post');
 	}
 	public function setMethod($value)
 	{
-		$this->setViewState('Method',TPropertyValue::ensureEnum($value,'post','get'),'post');
+		$this->setViewState('Method', TPropertyValue::ensureEnum($value, 'post', 'get'), 'post');
 	}
 	public function getEnctype()
 	{
-		return $this->getViewState('Enctype','');
+		return $this->getViewState('Enctype', '');
 	}
 	public function setEnctype($value)
 	{
-		$this->setViewState('Enctype',$value,'');
+		$this->setViewState('Enctype', $value, '');
 	}
 	public function getName()
 	{
@@ -7032,43 +7032,43 @@ 
 	{
 		$this->registerPradoScriptInternal($name);
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPradoScript',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPradoScript', $params);
 	}
 	protected function registerPradoScriptInternal($name)
 	{
 				if(!isset($this->_registeredPradoScripts[$name]))
 		{
-			if(self::$_pradoScripts === null)
+			if(self::$_pradoScripts===null)
 			{
-				$packageFile = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::PACKAGES_FILE;
-				list($packages,$deps)= include($packageFile);
-				self::$_pradoScripts = $deps;
-				self::$_pradoPackages = $packages;
+				$packageFile=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::PACKAGES_FILE;
+				list($packages, $deps)=include($packageFile);
+				self::$_pradoScripts=$deps;
+				self::$_pradoPackages=$packages;
 			}
-			if (isset(self::$_pradoScripts[$name]))
+			if(isset(self::$_pradoScripts[$name]))
 				$this->_registeredPradoScripts[$name]=true;
 			else
-				throw new TInvalidOperationException('csmanager_pradoscript_invalid',$name);
+				throw new TInvalidOperationException('csmanager_pradoscript_invalid', $name);
 			if(($packages=array_keys($this->_registeredPradoScripts))!==array())
 			{
-				$base = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
-				list($path,$baseUrl)=$this->getPackagePathUrl($base);
+				$base=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
+				list($path, $baseUrl)=$this->getPackagePathUrl($base);
 				$packagesUrl=array();
 				$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
-				foreach ($packages as $p)
+				foreach($packages as $p)
 				{
-					foreach (self::$_pradoScripts[$p] as $dep)
+					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;
+							$this->_expandedPradoScripts[$script]=true;
 							if($isDebug)
 							{
-								if (!in_array($url=$baseUrl.'/'.$script,$packagesUrl))
+								if(!in_array($url=$baseUrl.'/'.$script, $packagesUrl))
 									$packagesUrl[]=$url;
 							} else {
-								if (!in_array($url=$baseUrl.'/min/'.$script,$packagesUrl))
+								if(!in_array($url=$baseUrl.'/min/'.$script, $packagesUrl))
 								{
 									if(!is_file($filePath=$path.'/min/'.$script))
 									{
@@ -7085,47 +7085,47 @@ 
 					}
 				}
 				foreach($packagesUrl as $url)
-					$this->registerScriptFile($url,$url);
+					$this->registerScriptFile($url, $url);
 			}
 		}
 	}
 	public function getPradoScriptAssetUrl()
 	{
-		$base = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
-		$assets = Prado::getApplication()->getAssetManager();
+		$base=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
+		$assets=Prado::getApplication()->getAssetManager();
 		return $assets->getPublishedUrl($base);
 	}
 	public function getScriptUrls()
 	{
-		$scripts = array_values($this->_headScriptFiles);
-		$scripts = array_merge($scripts, array_values($this->_scriptFiles));
-		$scripts = array_unique($scripts);
+		$scripts=array_values($this->_headScriptFiles);
+		$scripts=array_merge($scripts, array_values($this->_scriptFiles));
+		$scripts=array_unique($scripts);
 		return $scripts;
 	}
 	protected function getPackagePathUrl($base)
 	{
-		$assets = Prado::getApplication()->getAssetManager();
+		$assets=Prado::getApplication()->getAssetManager();
 		if(strpos($base, $assets->getBaseUrl())===false)
 		{
-			if(($dir = Prado::getPathOfNameSpace($base)) !== null) {
-				$base = $dir;
+			if(($dir=Prado::getPathOfNameSpace($base))!==null) {
+				$base=$dir;
 			}
 			return array($assets->getPublishedPath($base), $assets->publishFilePath($base));
 		}
 		else
 		{
-			return array($assets->getBasePath().str_replace($assets->getBaseUrl(),'',$base), $base);
+			return array($assets->getBasePath().str_replace($assets->getBaseUrl(), '', $base), $base);
 		}
 	}
 	public function getCallbackReference(ICallbackEventHandler $callbackHandler, $options=null)
 	{
-		$options = !is_array($options) ? array() : $options;
-		$class = new ReflectionClass($callbackHandler);
-		$clientSide = $callbackHandler->getActiveControl()->getClientSide();
-		$options = array_merge($options, $clientSide->getOptions()->toArray());
-		$optionString = TJavaScript::encode($options);
+		$options=!is_array($options) ? array() : $options;
+		$class=new ReflectionClass($callbackHandler);
+		$clientSide=$callbackHandler->getActiveControl()->getClientSide();
+		$options=array_merge($options, $clientSide->getOptions()->toArray());
+		$optionString=TJavaScript::encode($options);
 		$this->registerPradoScriptInternal('ajax');
-		$id = $callbackHandler->getUniqueID();
+		$id=$callbackHandler->getUniqueID();
 		return "new Prado.CallbackRequest('{$id}',{$optionString})";
 	}
 	public function registerCallbackControl($class, $options)
@@ -7135,11 +7135,11 @@ 
 		$this->_endScripts[sprintf('%08X', crc32($code))]=$code;
 		$this->registerPradoScriptInternal('ajax');
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerCallbackControl',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerCallbackControl', $params);
 	}
-	public function registerPostBackControl($class,$options)
+	public function registerPostBackControl($class, $options)
 	{
-		if($class === null) {
+		if($class===null) {
 			return;
 		}
 		if(!isset($options['FormID']) && ($form=$this->_page->getForm())!==null)
@@ -7149,11 +7149,11 @@ 
 		$this->_endScripts[sprintf('%08X', crc32($code))]=$code;
 		$this->registerPradoScriptInternal('prado');
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPostBackControl',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPostBackControl', $params);
 	}
 	public function registerDefaultButton($panel, $button)
 	{
-		$panelID=is_string($panel)?$panel:$panel->getUniqueID();
+		$panelID=is_string($panel) ? $panel : $panel->getUniqueID();
 		if(is_string($button))
 			$buttonID=$button;
 		else
@@ -7161,20 +7161,20 @@ 
 			$button->setIsDefaultButton(true);
 			$buttonID=$button->getUniqueID();
 		}
-		$options = TJavaScript::encode($this->getDefaultButtonOptions($panelID, $buttonID));
-		$code = "new Prado.WebUI.DefaultButton($options);";
+		$options=TJavaScript::encode($this->getDefaultButtonOptions($panelID, $buttonID));
+		$code="new Prado.WebUI.DefaultButton($options);";
 		$this->_endScripts['prado:'.$panelID]=$code;
 		$this->registerPradoScriptInternal('prado');
-		$params=array($panelID,$buttonID);
-		$this->_page->registerCachingAction('Page.ClientScript','registerDefaultButton',$params);
+		$params=array($panelID, $buttonID);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerDefaultButton', $params);
 	}
 	protected function getDefaultButtonOptions($panelID, $buttonID)
 	{
-		$options['ID'] = TControl::convertUniqueIdToClientId($panelID);
-		$options['Panel'] = TControl::convertUniqueIdToClientId($panelID);
-		$options['Target'] = TControl::convertUniqueIdToClientId($buttonID);
-		$options['EventTarget'] = $buttonID;
-		$options['Event'] = 'click';
+		$options['ID']=TControl::convertUniqueIdToClientId($panelID);
+		$options['Panel']=TControl::convertUniqueIdToClientId($panelID);
+		$options['Target']=TControl::convertUniqueIdToClientId($buttonID);
+		$options['EventTarget']=$buttonID;
+		$options['Event']='click';
 		return $options;
 	}
 	public function registerFocusControl($target)
@@ -7182,80 +7182,80 @@ 
 		$this->registerPradoScriptInternal('jquery');
 		if($target instanceof TControl)
 			$target=$target->getClientID();
-		$this->_endScripts['prado:focus'] = 'jQuery(\'#'.$target.'\').focus();';
+		$this->_endScripts['prado:focus']='jQuery(\'#'.$target.'\').focus();';
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerFocusControl',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerFocusControl', $params);
 	}
-	public function registerStyleSheetFile($key,$url,$media='')
+	public function registerStyleSheetFile($key, $url, $media='')
 	{
 		if($media==='')
 			$this->_styleSheetFiles[$key]=$url;
 		else
-			$this->_styleSheetFiles[$key]=array($url,$media);
+			$this->_styleSheetFiles[$key]=array($url, $media);
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerStyleSheetFile',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheetFile', $params);
 	}
-	public function registerStyleSheet($key,$css,$media='')
+	public function registerStyleSheet($key, $css, $media='')
 	{
 		$this->_styleSheets[$key]=$css;
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerStyleSheet',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheet', $params);
 	}
 	public function getStyleSheetUrls()
 	{
-		$stylesheets = array_values(
+		$stylesheets=array_values(
 			array_map(function($e) {
 				return is_array($e) ? $e[0] : $e;
 			}, $this->_styleSheetFiles)
 		);
 		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path=>$url)
-			if (substr($url,strlen($url)-4)=='.css')
-				$stylesheets[] = $url;
-		$stylesheets = array_unique($stylesheets);
+			if(substr($url, strlen($url) - 4)=='.css')
+				$stylesheets[]=$url;
+		$stylesheets=array_unique($stylesheets);
 		return $stylesheets;
 	}
 	public function getStyleSheetCodes()
 	{
 		return array_unique(array_values($this->_styleSheets));
 	}
-	public function registerHeadScriptFile($key,$url)
+	public function registerHeadScriptFile($key, $url)
 	{
 		$this->checkIfNotInRender();
 		$this->_headScriptFiles[$key]=$url;
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHeadScriptFile',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHeadScriptFile', $params);
 	}
-	public function registerHeadScript($key,$script)
+	public function registerHeadScript($key, $script)
 	{
 		$this->checkIfNotInRender();
 		$this->_headScripts[$key]=$script;
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHeadScript',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHeadScript', $params);
 	}
 	public function registerScriptFile($key, $url)
 	{
 		$this->_scriptFiles[$key]=$url;
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerScriptFile',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerScriptFile', $params);
 	}
-	public function registerBeginScript($key,$script)
+	public function registerBeginScript($key, $script)
 	{
 		$this->checkIfNotInRender();
 		$this->_beginScripts[$key]=$script;
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerBeginScript',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerBeginScript', $params);
 	}
-	public function registerEndScript($key,$script)
+	public function registerEndScript($key, $script)
 	{
 		$this->_endScripts[$key]=$script;
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerEndScript',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerEndScript', $params);
 	}
-	public function registerHiddenField($name,$value)
+	public function registerHiddenField($name, $value)
 	{
 		$this->_hiddenFields[$name]=$value;
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHiddenField',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHiddenField', $params);
 	}
 	public function isStyleSheetFileRegistered($key)
 	{
@@ -7312,11 +7312,11 @@ 
 	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");
+			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n".implode("\n", $this->_styleSheets)."\n/*]]>*/\n</style>\n");
 	}
 	public function renderHeadScriptFiles($writer)
 	{
-		$this->renderScriptFiles($writer,$this->_headScriptFiles);
+		$this->renderScriptFiles($writer, $this->_headScriptFiles);
 	}
 	public function renderHeadScripts($writer)
 	{
@@ -7332,9 +7332,9 @@ 
 	}
 	public function markScriptFileAsRendered($url)
 	{
-		$this->_renderedScriptFiles[$url] = $url;
+		$this->_renderedScriptFiles[$url]=$url;
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','markScriptFileAsRendered',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'markScriptFileAsRendered', $params);
 	}
 	protected function renderScriptFiles($writer, Array $scripts)
 	{
@@ -7352,8 +7352,8 @@ 
 	{
 		if(!empty($this->_scriptFiles))
 		{
-			$addedScripts = array_diff($this->_scriptFiles,$this->getRenderedScriptFiles());
-			$this->renderScriptFiles($writer,$addedScripts);
+			$addedScripts=array_diff($this->_scriptFiles, $this->getRenderedScriptFiles());
+			$this->renderScriptFiles($writer, $addedScripts);
 		}
 	}
 	public function renderBeginScripts($writer)
@@ -7374,11 +7374,11 @@ 
 	}
 	public function renderHiddenFieldsBegin($writer)
 	{
-		$this->renderHiddenFieldsInt($writer,true);
+		$this->renderHiddenFieldsInt($writer, true);
 	}
 	public function renderHiddenFieldsEnd($writer)
 	{
-		$this->renderHiddenFieldsInt($writer,false);
+		$this->renderHiddenFieldsInt($writer, false);
 	}
 	public function flushScriptFiles($writer, $control=null)
 	{
@@ -7390,12 +7390,12 @@ 
 	}
 	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;
-			$id=strtr($name,':','_');
+			if(in_array($name, $this->_renderedHiddenFields)) continue;
+			$id=strtr($name, ':', '_');
 			if(is_array($value))
 			{
 				foreach($value as $v)
@@ -7405,7 +7405,7 @@ 
 			{
 				$str.='<input type="hidden" name="'.$name.'" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
 			}
-			$this->_renderedHiddenFields[] = $name;
+			$this->_renderedHiddenFields[]=$name;
 		}
 		if($str!=='')
 			$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
@@ -7416,7 +7416,7 @@ 
 	}
 	protected function checkIfNotInRender()
 	{
-		if ($form = $this->_page->InFormRender)
+		if($form=$this->_page->InFormRender)
 			throw new Exception('Operation invalid when page is already rendering');
 	}
 }
@@ -7426,12 +7426,12 @@ 
 	protected function setFunction($name, $code)
 	{
 		if(!TJavaScript::isJsLiteral($code))
-			$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
+			$code=TJavaScript::quoteJsLiteral($this->ensureFunction($code));
 		$this->setOption($name, $code);
 	}
 	protected function getOption($name)
 	{
-		if ($this->_options)
+		if($this->_options)
 			return $this->_options->itemAt($name);
 		else
 			return null;
@@ -7442,8 +7442,8 @@ 
 	}
 	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)
@@ -7502,7 +7502,7 @@ 
 	}
 	public function run($writer)
 	{
-		$this->_writer = $writer;
+		$this->_writer=$writer;
 		$this->determinePostBackMode();
 		if($this->getIsPostBack())
 		{
@@ -7513,7 +7513,7 @@ 
 		}
 		else
 			$this->processNormalRequest($writer);
-		$this->_writer = null;
+		$this->_writer=null;
 	}
 	protected function processNormalRequest($writer)
 	{
@@ -7537,10 +7537,10 @@ 
 		$this->onInitComplete(null);
 		$this->_restPostData=new TMap;
 		$this->loadPageState();
-		$this->processPostData($this->_postData,true);
+		$this->processPostData($this->_postData, true);
 		$this->onPreLoad(null);
 		$this->loadRecursive();
-		$this->processPostData($this->_restPostData,false);
+		$this->processPostData($this->_restPostData, false);
 		$this->raiseChangedEvents();
 		$this->raisePostBackEvent();
 		$this->onLoadComplete(null);
@@ -7559,7 +7559,7 @@ 
 				$data[$k]=self::decodeUTF8($v, $enc);
 			return $data;
 		} elseif(is_string($data)) {
-			return iconv('UTF-8',$enc.'//IGNORE',$data);
+			return iconv('UTF-8', $enc.'//IGNORE', $data);
 		} else {
 			return $data;
 		}
@@ -7569,22 +7569,22 @@ 
 		Prado::using('System.Web.UI.ActiveControls.TActivePageAdapter');
 		Prado::using('System.Web.UI.JuiControls.TJuiControlOptions');
 		$this->setAdapter(new TActivePageAdapter($this));
-        $callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
+        $callbackEventParameter=$this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
         if(strlen($callbackEventParameter) > 0)
-            $this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
-                if (($g=$this->getApplication()->getGlobalization(false))!==null &&
+            $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)
+                foreach($this->_postData as $k=>$v)
                 	$this->_postData[$k]=self::decodeUTF8($v, $enc);
 		$this->onPreInit(null);
 		$this->initRecursive();
 		$this->onInitComplete(null);
 		$this->_restPostData=new TMap;
 		$this->loadPageState();
-		$this->processPostData($this->_postData,true);
+		$this->processPostData($this->_postData, true);
 		$this->onPreLoad(null);
 		$this->loadRecursive();
-		$this->processPostData($this->_restPostData,false);
+		$this->processPostData($this->_restPostData, false);
 		$this->raiseChangedEvents();
 		$this->getAdapter()->processCallbackEvent($writer);
 		$this->onLoadComplete(null);
@@ -7597,7 +7597,7 @@ 
 	}
 	public function getCallbackClient()
 	{
-		if($this->getAdapter() !== null)
+		if($this->getAdapter()!==null)
 			return $this->getAdapter()->getCallbackClientHandler();
 		else
 			return new TCallbackClientScript();
@@ -7637,7 +7637,7 @@ 
 	{
 		if(!$this->_validators)
 			$this->_validators=new TList;
-		if(empty($validationGroup) === true)
+		if(empty($validationGroup)===true)
 			return $this->_validators;
 		else
 		{
@@ -7691,7 +7691,7 @@ 
 	}
 	public function setTheme($value)
 	{
-		$this->_theme=empty($value)?null:$value;
+		$this->_theme=empty($value) ? null : $value;
 	}
 	public function getStyleSheetTheme()
 	{
@@ -7701,7 +7701,7 @@ 
 	}
 	public function setStyleSheetTheme($value)
 	{
-		$this->_styleSheet=empty($value)?null:$value;
+		$this->_styleSheet=empty($value) ? null : $value;
 	}
 	public function applyControlSkin($control)
 	{
@@ -7716,66 +7716,66 @@ 
 	public function getClientScript()
 	{
 		if(!$this->_clientScript) {
-			$className = $classPath = $this->getService()->getClientScriptManagerClass();
+			$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;
 	}
 	public function onPreInit($param)
 	{
-		$this->raiseEvent('OnPreInit',$this,$param);
+		$this->raiseEvent('OnPreInit', $this, $param);
 	}
 	public function onInitComplete($param)
 	{
-		$this->raiseEvent('OnInitComplete',$this,$param);
+		$this->raiseEvent('OnInitComplete', $this, $param);
 	}
 	public function onPreLoad($param)
 	{
-		$this->raiseEvent('OnPreLoad',$this,$param);
+		$this->raiseEvent('OnPreLoad', $this, $param);
 	}
 	public function onLoadComplete($param)
 	{
-		$this->raiseEvent('OnLoadComplete',$this,$param);
+		$this->raiseEvent('OnLoadComplete', $this, $param);
 	}
 	public function onPreRenderComplete($param)
 	{
-		$this->raiseEvent('OnPreRenderComplete',$this,$param);
+		$this->raiseEvent('OnPreRenderComplete', $this, $param);
 		$cs=$this->getClientScript();
 		$theme=$this->getTheme();
 		if($theme instanceof ITheme)
 		{
 			foreach($theme->getStyleSheetFiles() as $url)
-				$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
+				$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
 			foreach($theme->getJavaScriptFiles() as $url)
-				$cs->registerHeadScriptFile($url,$url);
+				$cs->registerHeadScriptFile($url, $url);
 		}
 		$styleSheet=$this->getStyleSheetTheme();
 		if($styleSheet instanceof ITheme)
 		{
 			foreach($styleSheet->getStyleSheetFiles() as $url)
-				$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
+				$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
 			foreach($styleSheet->getJavaScriptFiles() as $url)
-				$cs->registerHeadScriptFile($url,$url);
+				$cs->registerHeadScriptFile($url, $url);
 		}
 		if($cs->getRequiresHead() && $this->getHead()===null)
 			throw new TConfigurationException('page_head_required');
 	}
 	private function getCssMediaType($url)
 	{
-		$segs=explode('.',basename($url));
+		$segs=explode('.', basename($url));
 		if(isset($segs[2]))
-			return $segs[count($segs)-2];
+			return $segs[count($segs) - 2];
 		else
 			return '';
 	}
 	public function onSaveStateComplete($param)
 	{
-		$this->raiseEvent('OnSaveStateComplete',$this,$param);
+		$this->raiseEvent('OnSaveStateComplete', $this, $param);
 	}
 	private function determinePostBackMode()
 	{
@@ -7794,17 +7794,17 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		$this->setViewState('ControlsRequiringPostBack',$this->_controlsRegisteredForPostData,array());
+		$this->setViewState('ControlsRequiringPostBack', $this->_controlsRegisteredForPostData, array());
 	}
 	public function loadState()
 	{
 		parent::loadState();
-		$this->_controlsRequiringPostData=$this->getViewState('ControlsRequiringPostBack',array());
+		$this->_controlsRequiringPostData=$this->getViewState('ControlsRequiringPostBack', array());
 	}
 	protected function loadPageState()
 	{
 		$state=$this->getStatePersister()->load();
-		$this->loadStateRecursive($state,$this->getEnableViewState());
+		$this->loadStateRecursive($state, $this->getEnableViewState());
 	}
 	protected function savePageState()
 	{
@@ -7817,11 +7817,11 @@ 
 	}
 	public function registerRequiresPostData($control)
 	{
-		$id=is_string($control)?$control:$control->getUniqueID();
+		$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));
+			$item->registerAction('Page', 'registerRequiresPostData', array($id));
 	}
 	public function getPostBackEventTarget()
 	{
@@ -7850,7 +7850,7 @@ 
 	{
 		$this->_postBackEventParameter=$value;
 	}
-	protected function processPostData($postData,$beforeLoad)
+	protected function processPostData($postData, $beforeLoad)
 	{
 		$this->_isLoadingPostData=true;
 		if($beforeLoad)
@@ -7863,17 +7863,17 @@ 
 			{
 				if($control instanceof IPostBackDataHandler)
 				{
-					if($control->loadPostData($key,$postData))
+					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);  				}
+					$this->_postData->add(self::FIELD_POSTBACK_TARGET, $key); }
 				unset($this->_controlsRequiringPostData[$key]);
 			}
 			else if($beforeLoad)
-				$this->_restPostData->add($key,$value);
+				$this->_restPostData->add($key, $value);
 		}
 		foreach($this->_controlsRequiringPostData as $key=>$value)
 		{
@@ -7881,11 +7881,11 @@ 
 			{
 				if($control instanceof IPostBackDataHandler)
 				{
-					if($control->loadPostData($key,$this->_postData))
+					if($control->loadPostData($key, $this->_postData))
 						$this->_controlsPostDataChanged[]=$control;
 				}
 				else
-					throw new TInvalidDataValueException('page_postbackcontrol_invalid',$key);
+					throw new TInvalidDataValueException('page_postbackcontrol_invalid', $key);
 				unset($this->_controlsRequiringPostData[$key]);
 			}
 		}
@@ -7914,14 +7914,14 @@ 
 	public function ensureRenderInForm($control)
 	{
 		if(!$this->getIsCallback() && !$this->_inFormRender)
-			throw new TConfigurationException('page_control_outofform',get_class($control), $control ? $control->getUniqueID() : null);
+			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');
 		$this->_formRendered=true;
-		$this->getClientScript()->registerHiddenField(self::FIELD_PAGESTATE,$this->getClientState());
+		$this->getClientScript()->registerHiddenField(self::FIELD_PAGESTATE, $this->getClientState());
 		$this->_inFormRender=true;
 	}
 	public function endFormRender($writer)
@@ -8042,12 +8042,12 @@ 
 	{
 		$this->_pagePath=$value;
 	}
-	public function registerCachingAction($context,$funcName,$funcParams)
+	public function registerCachingAction($context, $funcName, $funcParams)
 	{
 		if($this->_cachingStack)
 		{
 			foreach($this->_cachingStack as $cache)
-				$cache->registerAction($context,$funcName,$funcParams);
+				$cache->registerAction($context, $funcName, $funcParams);
 		}
 	}
 	public function getCachingStack()
@@ -8058,7 +8058,7 @@ 
 	}
 	public function flushWriter()
 	{
-		if ($this->_writer)
+		if($this->_writer)
 			$this->Response->write($this->_writer->flush());
 	}
 }
@@ -8071,7 +8071,7 @@ 
 }
 class TPageStateFormatter
 {
-	public static function serialize($page,$data)
+	public static function serialize($page, $data)
 	{
 		$sm=$page->getApplication()->getSecurityManager();
 		if($page->getEnableStateValidation())
@@ -8084,7 +8084,7 @@ 
 			$str=$sm->encrypt($str);
 		return base64_encode($str);
 	}
-	public static function unserialize($page,$data)
+	public static function unserialize($page, $data)
 	{
 		$str=base64_decode($data);
 		if($str==='')
@@ -8135,13 +8135,13 @@ 
 		if(!$this->_cacheChecked)
 		{
 			$this->_cacheChecked=true;
-			if($this->_duration>0 && ($this->_cachePostBack || !$this->getPage()->getIsPostBack()))
+			if($this->_duration > 0 && ($this->_cachePostBack || !$this->getPage()->getIsPostBack()))
 			{
 				if($this->_cacheModuleID!=='')
 				{
 					$this->_cache=$this->getApplication()->getModule($this->_cacheModuleID);
 					if(!($this->_cache instanceof ICache))
-						throw new TConfigurationException('outputcache_cachemoduleid_invalid',$this->_cacheModuleID);
+						throw new TConfigurationException('outputcache_cachemoduleid_invalid', $this->_cacheModuleID);
 				}
 				else
 					$this->_cache=$this->getApplication()->getCache();
@@ -8152,14 +8152,14 @@ 
 					if(is_array($data))
 					{
 						$param=new TOutputCacheCheckDependencyEventParameter;
-						$param->setCacheTime(isset($data[3])?$data[3]:0);
+						$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;
+						list($this->_contents, $this->_state, $this->_actions, $this->_cacheTime)=$data;
 				}
 			}
 		}
@@ -8199,11 +8199,11 @@ 
 		foreach($this->_actions as $action)
 		{
 			if($action[0]==='Page.ClientScript')
-				call_user_func_array(array($cs,$action[1]),$action[2]);
+				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]);
+				call_user_func_array(array($page, $action[1]), $action[2]);
 			else
-				call_user_func_array(array($this->getSubProperty($action[0]),$action[1]),$action[2]);
+				call_user_func_array(array($this->getSubProperty($action[0]), $action[1]), $action[2]);
 		}
 	}
 	protected function preRenderRecursive()
@@ -8218,10 +8218,10 @@ 
 		else
 			parent::preRenderRecursive();
 	}
-	protected function loadStateRecursive(&$state,$needViewState=true)
+	protected function loadStateRecursive(&$state, $needViewState=true)
 	{
 		$st=unserialize($state);
-		parent::loadStateRecursive($st,$needViewState);
+		parent::loadStateRecursive($st, $needViewState);
 	}
 	protected function &saveStateRecursive($needViewState=true)
 	{
@@ -8234,9 +8234,9 @@ 
 			return $this->_state;
 		}
 	}
-	public function registerAction($context,$funcName,$funcParams)
+	public function registerAction($context, $funcName, $funcParams)
 	{
-		$this->_actions[]=array($context,$funcName,$funcParams);
+		$this->_actions[]=array($context, $funcName, $funcParams);
 	}
 	public function getCacheKey()
 	{
@@ -8253,7 +8253,7 @@ 
 		{
 			$params=array();
 			$request=$this->getRequest();
-			foreach(explode(',',$this->_varyByParam) as $name)
+			foreach(explode(',', $this->_varyByParam) as $name)
 			{
 				$name=trim($name);
 				$params[$name]=$request->itemAt($name);
@@ -8299,8 +8299,8 @@ 
 	}
 	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()
@@ -8329,11 +8329,11 @@ 
 	}
 	public function onCheckDependency($param)
 	{
-		$this->raiseEvent('OnCheckDependency',$this,$param);
+		$this->raiseEvent('OnCheckDependency', $this, $param);
 	}
 	public function onCalculateKey($param)
 	{
-		$this->raiseEvent('OnCalculateKey',$this,$param);
+		$this->raiseEvent('OnCalculateKey', $this, $param);
 	}
 	public function render($writer)
 	{
@@ -8341,16 +8341,16 @@ 
 			$writer->write($this->_contents);
 		else if($this->_cacheAvailable)
 		{
-			$textwriter = new TTextWriter();
-			$multiwriter = new TOutputCacheTextWriterMulti(array($writer->getWriter(),$textwriter));
-			$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), $multiwriter);
+			$textwriter=new TTextWriter();
+			$multiwriter=new TOutputCacheTextWriterMulti(array($writer->getWriter(), $textwriter));
+			$htmlWriter=Prado::createComponent($this->GetResponse()->getHtmlWriterType(), $multiwriter);
 			$stack=$this->getPage()->getCachingStack();
 			$stack->push($this);
 			parent::render($htmlWriter);
 			$stack->pop();
 			$content=$textwriter->flush();
-			$data=array($content,$this->_state,$this->_actions,time());
-			$this->_cache->set($this->getCacheKey(),$data,$this->getDuration(),$this->getCacheDependency());
+			$data=array($content, $this->_state, $this->_actions, time());
+			$this->_cache->set($this->getCacheKey(), $data, $this->getDuration(), $this->getCacheDependency());
 		}
 		else
 			parent::render($writer);
@@ -8394,7 +8394,7 @@ 
 	protected $_writers;
 	public function __construct(Array $writers)
 	{
-				$this->_writers = $writers;
+				$this->_writers=$writers;
 	}
 	public function write($s)
 	{
@@ -8404,7 +8404,7 @@ 
 	public function flush()
 	{
 		foreach($this->_writers as $writer)
-			$s = $writer->flush();
+			$s=$writer->flush();
 		return $s;
 	}
 }
@@ -8427,19 +8427,19 @@ 
 		if(($fileName=$this->getLocalizedTemplate($fileName))!==null)
 		{
 			if(($cache=$this->getApplication()->getCache())===null)
-				return new TTemplate(file_get_contents($fileName),dirname($fileName),$fileName);
+				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;
+					list($template, $timestamps)=$array;
 					if($this->getApplication()->getMode()===TApplicationMode::Performance)
 						return $template;
 					$cacheValid=true;
 					foreach($timestamps as $tplFile=>$timestamp)
 					{
-						if(!is_file($tplFile) || filemtime($tplFile)>$timestamp)
+						if(!is_file($tplFile) || filemtime($tplFile) > $timestamp)
 						{
 							$cacheValid=false;
 							break;
@@ -8448,13 +8448,13 @@ 
 					if($cacheValid)
 						return $template;
 				}
-				$template=new TTemplate(file_get_contents($fileName),dirname($fileName),$fileName);
+				$template=new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
 				$includedFiles=$template->getIncludedFiles();
 				$timestamps=array();
 				$timestamps[$fileName]=filemtime($fileName);
 				foreach($includedFiles as $includedFile)
 					$timestamps[$includedFile]=filemtime($includedFile);
-				$cache->set(self::TEMPLATE_CACHE_PREFIX.$fileName,array($template,$timestamps));
+				$cache->set(self::TEMPLATE_CACHE_PREFIX.$fileName, array($template, $timestamps));
 				return $template;
 			}
 		}
@@ -8464,7 +8464,7 @@ 
 	protected function getLocalizedTemplate($filename)
 	{
 		if(($app=$this->getApplication()->getGlobalization(false))===null)
-			return is_file($filename)?$filename:null;
+			return is_file($filename) ? $filename : null;
 		foreach($app->getLocalizedResource($filename) as $file)
 		{
 			if(($file=realpath($file))!==false && is_file($file))
@@ -8494,7 +8494,7 @@ 
 	private $_includedFiles=array();
 	private $_includeAtLine=array();
 	private $_includeLines=array();
-	public function __construct($template,$contextPath,$tplFile=null,$startingLine=0,$sourceTemplate=true)
+	public function __construct($template, $contextPath, $tplFile=null, $startingLine=0, $sourceTemplate=true)
 	{
 		$this->_sourceTemplate=$sourceTemplate;
 		$this->_contextPath=$contextPath;
@@ -8503,7 +8503,7 @@ 
 		$this->_content=$template;
 		$this->_hashCode=md5($template);
 		$this->parse($template);
-		$this->_content=null; 	}
+		$this->_content=null; }
 	public function getTemplateFile()
 	{
 		return $this->_tplFile;
@@ -8528,7 +8528,7 @@ 
 	{
 		return $this->_tpl;
 	}
-	public function instantiateIn($tplControl,$parentControl=null)
+	public function instantiateIn($tplControl, $parentControl=null)
 	{
 		$this->_tplControl=$tplControl;
 		if($parentControl===null)
@@ -8545,7 +8545,7 @@ 
 				$parent=$controls[$object[0]];
 			else
 				continue;
-			if(isset($object[2]))				{
+			if(isset($object[2])) {
 				$component=Prado::createComponent($object[1]);
 				$properties=&$object[2];
 				if($component instanceof TControl)
@@ -8557,7 +8557,7 @@ 
 					{
 						if(is_array($properties['id']))
 							$properties['id']=$component->evaluateExpression($properties['id'][1]);
-						$tplControl->registerObject($properties['id'],$component);
+						$tplControl->registerObject($properties['id'], $component);
 					}
 					if(isset($properties['skinid']))
 					{
@@ -8570,7 +8570,7 @@ 
 					$component->trackViewState(false);
 					$component->applyStyleSheetSkin($page);
 					foreach($properties as $name=>$value)
-						$this->configureControl($component,$name,$value);
+						$this->configureControl($component, $name, $value);
 					$component->trackViewState(true);
 					if($parent===$parentControl)
 						$directChildren[]=$component;
@@ -8586,12 +8586,12 @@ 
 					{
 						if(is_array($properties['id']))
 							$properties['id']=$component->evaluateExpression($properties['id'][1]);
-						$tplControl->registerObject($properties['id'],$component);
+						$tplControl->registerObject($properties['id'], $component);
 						if(!$component->hasProperty('id'))
 							unset($properties['id']);
 					}
 					foreach($properties as $name=>$value)
-						$this->configureComponent($component,$name,$value);
+						$this->configureComponent($component, $name, $value);
 					if($parent===$parentControl)
 						$directChildren[]=$component;
 					else
@@ -8626,36 +8626,36 @@ 
 				$parentControl->addParsedObject($control);
 		}
 	}
-	protected function configureControl($control,$name,$value)
+	protected function configureControl($control, $name, $value)
 	{
-		if(strncasecmp($name,'on',2)===0)					$this->configureEvent($control,$name,$value,$control);
-		else if(($pos=strrpos($name,'.'))===false)				$this->configureProperty($control,$name,$value);
-		else				$this->configureSubProperty($control,$name,$value);
+		if(strncasecmp($name, 'on', 2)===0)					$this->configureEvent($control, $name, $value, $control);
+		else if(($pos=strrpos($name, '.'))===false)				$this->configureProperty($control, $name, $value);
+		else				$this->configureSubProperty($control, $name, $value);
 	}
-	protected function configureComponent($component,$name,$value)
+	protected function configureComponent($component, $name, $value)
 	{
-		if(strpos($name,'.')===false)				$this->configureProperty($component,$name,$value);
-		else				$this->configureSubProperty($component,$name,$value);
+		if(strpos($name, '.')===false)				$this->configureProperty($component, $name, $value);
+		else				$this->configureSubProperty($component, $name, $value);
 	}
-	protected function configureEvent($control,$name,$value,$contextControl)
+	protected function configureEvent($control, $name, $value, $contextControl)
 	{
-		if(strpos($value,'.')===false)
-			$control->attachEventHandler($name,array($contextControl,'TemplateControl.'.$value));
+		if(strpos($value, '.')===false)
+			$control->attachEventHandler($name, array($contextControl, 'TemplateControl.'.$value));
 		else
-			$control->attachEventHandler($name,array($contextControl,$value));
+			$control->attachEventHandler($name, array($contextControl, $value));
 	}
-	protected function configureProperty($component,$name,$value)
+	protected function configureProperty($component, $name, $value)
 	{
 		if(is_array($value))
 		{
 			switch($value[0])
 			{
 				case self::CONFIG_DATABIND:
-					$component->bindProperty($name,$value[1]);
+					$component->bindProperty($name, $value[1]);
 					break;
 				case self::CONFIG_EXPRESSION:
 					if($component instanceof TControl)
-						$component->autoBindProperty($name,$value[1]);
+						$component->autoBindProperty($name, $value[1]);
 					else
 					{
 						$setter='set'.$name;
@@ -8677,55 +8677,55 @@ 
 					$setter='set'.$name;
 					$component->$setter(Prado::localize($value[1]));
 					break;
-				default:						throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
+				default:						throw new TConfigurationException('template_tag_unexpected', $name, $value[1]);
 					break;
 			}
 		}
 		else
 		{
-			if (substr($name,0,2)=='js')
-				if ($value and !($value instanceof TJavaScriptLiteral))
-					$value = new TJavaScriptLiteral($value);
+			if(substr($name, 0, 2)=='js')
+				if($value and !($value instanceof TJavaScriptLiteral))
+					$value=new TJavaScriptLiteral($value);
 			$setter='set'.$name;
 			$component->$setter($value);
 		}
 	}
-	protected function configureSubProperty($component,$name,$value)
+	protected function configureSubProperty($component, $name, $value)
 	{
 		if(is_array($value))
 		{
 			switch($value[0])
 			{
-				case self::CONFIG_DATABIND:							$component->bindProperty($name,$value[1]);
+				case self::CONFIG_DATABIND:							$component->bindProperty($name, $value[1]);
 					break;
 				case self::CONFIG_EXPRESSION:							if($component instanceof TControl)
-						$component->autoBindProperty($name,$value[1]);
+						$component->autoBindProperty($name, $value[1]);
 					else
-						$component->setSubProperty($name,$this->_tplControl->evaluateExpression($value[1]));
+						$component->setSubProperty($name, $this->_tplControl->evaluateExpression($value[1]));
 					break;
 				case self::CONFIG_TEMPLATE:
-					$component->setSubProperty($name,$value[1]);
+					$component->setSubProperty($name, $value[1]);
 					break;
 				case self::CONFIG_ASSET:							$url=$this->publishFilePath($this->_contextPath.DIRECTORY_SEPARATOR.$value[1]);
-					$component->setSubProperty($name,$url);
+					$component->setSubProperty($name, $url);
 					break;
-				case self::CONFIG_PARAMETER:							$component->setSubProperty($name,$this->getApplication()->getParameters()->itemAt($value[1]));
+				case self::CONFIG_PARAMETER:							$component->setSubProperty($name, $this->getApplication()->getParameters()->itemAt($value[1]));
 					break;
 				case self::CONFIG_LOCALIZATION:
-					$component->setSubProperty($name,Prado::localize($value[1]));
+					$component->setSubProperty($name, Prado::localize($value[1]));
 					break;
-				default:						throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
+				default:						throw new TConfigurationException('template_tag_unexpected', $name, $value[1]);
 					break;
 			}
 		}
 		else
-			$component->setSubProperty($name,$value);
+			$component->setSubProperty($name, $value);
 	}
 	protected function parse($input)
 	{
 		$input=$this->preprocess($input);
 		$tpl=&$this->_tpl;
-		$n=preg_match_all(self::REGEX_RULES,$input,$matches,PREG_SET_ORDER|PREG_OFFSET_CAPTURE);
+		$n=preg_match_all(self::REGEX_RULES, $input, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
 		$expectPropEnd=false;
 		$textStart=0;
 				$stack=array();
@@ -8735,171 +8735,171 @@ 
 		$this->_directive=null;
 		try
 		{
-			for($i=0;$i<$n;++$i)
+			for($i=0; $i < $n; ++$i)
 			{
 				$match=&$matches[$i];
 				$str=$match[0][0];
 				$matchStart=$match[0][1];
-				$matchEnd=$matchStart+strlen($str)-1;
-				if(strpos($str,'<com:')===0)					{
+				$matchEnd=$matchStart + strlen($str) - 1;
+				if(strpos($str, '<com:')===0) {
 					if($expectPropEnd)
 						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
+					if($matchStart > $textStart)
+						$tpl[$c++]=array($container, substr($input, $textStart, $matchStart - $textStart));
+					$textStart=$matchEnd + 1;
 					$type=$match[1][0];
-					$attributes=$this->parseAttributes($match[2][0],$match[2][1]);
-					$this->validateAttributes($type,$attributes);
-					$tpl[$c++]=array($container,$type,$attributes);
-					if($str[strlen($str)-2]!=='/')  					{
-						$stack[] = $type;
-						$container=$c-1;
+					$attributes=$this->parseAttributes($match[2][0], $match[2][1]);
+					$this->validateAttributes($type, $attributes);
+					$tpl[$c++]=array($container, $type, $attributes);
+					if($str[strlen($str) - 2]!=='/') {
+						$stack[]=$type;
+						$container=$c - 1;
 					}
 				}
-				else if(strpos($str,'</com:')===0)					{
+				else if(strpos($str, '</com:')===0) {
 					if($expectPropEnd)
 						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
+					if($matchStart > $textStart)
+						$tpl[$c++]=array($container, substr($input, $textStart, $matchStart - $textStart));
+					$textStart=$matchEnd + 1;
 					$type=$match[1][0];
 					if(empty($stack))
-						throw new TConfigurationException('template_closingtag_unexpected',"</com:$type>");
+						throw new TConfigurationException('template_closingtag_unexpected', "</com:$type>");
 					$name=array_pop($stack);
 					if($name!==$type)
 					{
-						$tag=$name[0]==='@' ? '</prop:'.substr($name,1).'>' : "</com:$name>";
-						throw new TConfigurationException('template_closingtag_expected',$tag);
+						$tag=$name[0]==='@' ? '</prop:'.substr($name, 1).'>' : "</com:$name>";
+						throw new TConfigurationException('template_closingtag_expected', $tag);
 					}
 					$container=$tpl[$container][0];
 				}
-				else if(strpos($str,'<%@')===0)					{
+				else if(strpos($str, '<%@')===0) {
 					if($expectPropEnd)
 						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
+					if($matchStart > $textStart)
+						$tpl[$c++]=array($container, substr($input, $textStart, $matchStart - $textStart));
+					$textStart=$matchEnd + 1;
 					if(isset($tpl[0]) || $this->_directive!==null)
 						throw new TConfigurationException('template_directive_nonunique');
-					$this->_directive=$this->parseAttributes($match[4][0],$match[4][1]);
+					$this->_directive=$this->parseAttributes($match[4][0], $match[4][1]);
 				}
-				else if(strpos($str,'<%')===0)					{
+				else if(strpos($str, '<%')===0) {
 					if($expectPropEnd)
 						continue;
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
+					if($matchStart > $textStart)
+						$tpl[$c++]=array($container, substr($input, $textStart, $matchStart - $textStart));
+					$textStart=$matchEnd + 1;
 					$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));
+					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));
+						$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')"));
+						$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')"));
+						$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'"));
+						$tpl[$c++]=array($container, array(TCompositeLiteral::TYPE_EXPRESSION, "rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '/').'/$literal'"));
 					else if($str[2]==='[')
 					{
-						$literal=strtr(trim(substr($literal,0,strlen($literal)-1)),array("'"=>"\'","\\"=>"\\\\"));
-						$tpl[$c++]=array($container,array(TCompositeLiteral::TYPE_EXPRESSION,"Prado::localize('$literal')"));
+						$literal=strtr(trim(substr($literal, 0, strlen($literal) - 1)), array("'"=>"\'", "\\"=>"\\\\"));
+						$tpl[$c++]=array($container, array(TCompositeLiteral::TYPE_EXPRESSION, "Prado::localize('$literal')"));
 					}
 				}
-				else if(strpos($str,'<prop:')===0)					{
-					if(strrpos($str,'/>')===strlen($str)-2)  					{
+				else if(strpos($str, '<prop:')===0) {
+					if(strrpos($str, '/>')===strlen($str) - 2) {
 						if($expectPropEnd)
 							continue;
-						if($matchStart>$textStart)
-							$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-						$textStart=$matchEnd+1;
+						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]);
+						$attrs=$this->parseAttributes($match[7][0], $match[7][1]);
 						$attributes=array();
 						foreach($attrs as $name=>$value)
 							$attributes[$prop.'.'.$name]=$value;
 						$type=$tpl[$container][1];
-						$this->validateAttributes($type,$attributes);
+						$this->validateAttributes($type, $attributes);
 						foreach($attributes as $name=>$value)
 						{
 							if(isset($tpl[$container][2][$name]))
-								throw new TConfigurationException('template_property_duplicated',$name);
+								throw new TConfigurationException('template_property_duplicated', $name);
 							$tpl[$container][2][$name]=$value;
 						}
 					}
-					else  					{
+					else {
 						$prop=strtolower($match[3][0]);
-						$stack[] = '@'.$prop;
+						$stack[]='@'.$prop;
 						if(!$expectPropEnd)
 						{
-							if($matchStart>$textStart)
-								$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-							$textStart=$matchEnd+1;
+							if($matchStart > $textStart)
+								$tpl[$c++]=array($container, substr($input, $textStart, $matchStart - $textStart));
+							$textStart=$matchEnd + 1;
 							$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>");
+						throw new TConfigurationException('template_closingtag_unexpected', "</prop:$prop>");
 					$name=array_pop($stack);
 					if($name!=='@'.$prop)
 					{
-						$tag=$name[0]==='@' ? '</prop:'.substr($name,1).'>' : "</com:$name>";
-						throw new TConfigurationException('template_closingtag_expected',$tag);
+						$tag=$name[0]==='@' ? '</prop:'.substr($name, 1).'>' : "</com:$name>";
+						throw new TConfigurationException('template_closingtag_expected', $tag);
 					}
-					if(($last=count($stack))<1 || $stack[$last-1][0]!=='@')
+					if(($last=count($stack)) < 1 || $stack[$last - 1][0]!=='@')
 					{
-						if($matchStart>$textStart)
+						if($matchStart > $textStart)
 						{
-							$value=substr($input,$textStart,$matchStart-$textStart);
-							if(substr($prop,-8,8)==='template')
-								$value=$this->parseTemplateProperty($value,$textStart);
+							$value=substr($input, $textStart, $matchStart - $textStart);
+							if(substr($prop, -8, 8)==='template')
+								$value=$this->parseTemplateProperty($value, $textStart);
 							else
 								$value=$this->parseAttribute($value);
-							if($container>=0)
+							if($container >= 0)
 							{
 								$type=$tpl[$container][1];
-								$this->validateAttributes($type,array($prop=>$value));
+								$this->validateAttributes($type, array($prop=>$value));
 								if(isset($tpl[$container][2][$prop]))
-									throw new TConfigurationException('template_property_duplicated',$prop);
+									throw new TConfigurationException('template_property_duplicated', $prop);
 								$tpl[$container][2][$prop]=$value;
 							}
 							else									$this->_directive[$prop]=$value;
-							$textStart=$matchEnd+1;
+							$textStart=$matchEnd + 1;
 						}
 						$expectPropEnd=false;
 					}
 				}
-				else if(strpos($str,'<!--')===0)					{
+				else if(strpos($str, '<!--')===0) {
 					if($expectPropEnd)
 						throw new TConfigurationException('template_comments_forbidden');
-					if($matchStart>$textStart)
-						$tpl[$c++]=array($container,substr($input,$textStart,$matchStart-$textStart));
-					$textStart=$matchEnd+1;
+					if($matchStart > $textStart)
+						$tpl[$c++]=array($container, substr($input, $textStart, $matchStart - $textStart));
+					$textStart=$matchEnd + 1;
 				}
 				else
-					throw new TConfigurationException('template_matching_unexpected',$match);
+					throw new TConfigurationException('template_matching_unexpected', $match);
 			}
 			if(!empty($stack))
 			{
 				$name=array_pop($stack);
-				$tag=$name[0]==='@' ? '</prop:'.substr($name,1).'>' : "</com:$name>";
-				throw new TConfigurationException('template_closingtag_expected',$tag);
+				$tag=$name[0]==='@' ? '</prop:'.substr($name, 1).'>' : "</com:$name>";
+				throw new TConfigurationException('template_closingtag_expected', $tag);
 			}
-			if($textStart<strlen($input))
-				$tpl[$c++]=array($container,substr($input,$textStart));
+			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;
+				$line=$this->_startingLine + 1;
 			else
-				$line=$this->_startingLine+count(explode("\n",substr($input,0,$matchEnd+1)));
-			$this->handleException($e,$line,$input);
+				$line=$this->_startingLine + count(explode("\n", substr($input, 0, $matchEnd + 1)));
+			$this->handleException($e, $line, $input);
 		}
 		if($this->_directive===null)
 			$this->_directive=array();
@@ -8913,9 +8913,9 @@ 
 				if($parent!==null)
 				{
 					if(count($merged[1])===1 && is_string($merged[1][0]))
-						$objects[$id-1]=array($merged[0],$merged[1][0]);
+						$objects[$id - 1]=array($merged[0], $merged[1][0]);
 					else
-						$objects[$id-1]=array($merged[0],new TCompositeLiteral($merged[1]));
+						$objects[$id - 1]=array($merged[0], new TCompositeLiteral($merged[1]));
 				}
 				if(isset($object[2]))
 				{
@@ -8925,7 +8925,7 @@ 
 				else
 				{
 					$parent=$object[0];
-					$merged=array($parent,array($object[1]));
+					$merged=array($parent, array($object[1]));
 				}
 			}
 			else
@@ -8934,57 +8934,57 @@ 
 		if($parent!==null)
 		{
 			if(count($merged[1])===1 && is_string($merged[1][0]))
-				$objects[$id]=array($merged[0],$merged[1][0]);
+				$objects[$id]=array($merged[0], $merged[1][0]);
 			else
-				$objects[$id]=array($merged[0],new TCompositeLiteral($merged[1]));
+				$objects[$id]=array($merged[0], new TCompositeLiteral($merged[1]));
 		}
 		$tpl=$objects;
 		return $objects;
 	}
-	protected function parseAttributes($str,$offset)
+	protected function parseAttributes($str, $offset)
 	{
 		if($str==='')
 			return array();
 		$pattern='/([\w\.\-]+)\s*=\s*(\'.*?\'|".*?"|<%.*?%>)/msS';
 		$attributes=array();
-		$n=preg_match_all($pattern,$str,$matches,PREG_SET_ORDER|PREG_OFFSET_CAPTURE);
-		for($i=0;$i<$n;++$i)
+		$n=preg_match_all($pattern, $str, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
+		for($i=0; $i < $n; ++$i)
 		{
 			$match=&$matches[$i];
 			$name=strtolower($match[1][0]);
 			if(isset($attributes[$name]))
-				throw new TConfigurationException('template_property_duplicated',$name);
+				throw new TConfigurationException('template_property_duplicated', $name);
 			$value=$match[2][0];
-			if(substr($name,-8,8)==='template')
+			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);
+					$attributes[$name]=$this->parseTemplateProperty(substr($value, 1, strlen($value) - 2), $match[2][1] + 1);
 				else
-					$attributes[$name]=$this->parseTemplateProperty($value,$match[2][1]);
+					$attributes[$name]=$this->parseTemplateProperty($value, $match[2][1]);
 			}
 			else
 			{
 				if($value[0]==='\'' || $value[0]==='"')
-					$attributes[$name]=$this->parseAttribute(substr($value,1,strlen($value)-2));
+					$attributes[$name]=$this->parseAttribute(substr($value, 1, strlen($value) - 2));
 				else
 					$attributes[$name]=$this->parseAttribute($value);
 			}
 		}
 		return $attributes;
 	}
-	protected function parseTemplateProperty($content,$offset)
+	protected function parseTemplateProperty($content, $offset)
 	{
-		$line=$this->_startingLine+count(explode("\n",substr($this->_content,0,$offset)))-1;
-		return array(self::CONFIG_TEMPLATE,new TTemplate($content,$this->_contextPath,$this->_tplFile,$line,false));
+		$line=$this->_startingLine + count(explode("\n", substr($this->_content, 0, $offset))) - 1;
+		return array(self::CONFIG_TEMPLATE, new TTemplate($content, $this->_contextPath, $this->_tplFile, $line, false));
 	}
 	protected function parseAttribute($value)
 	{
-		if(($n=preg_match_all('/<%[#=].*?%>/msS',$value,$matches,PREG_OFFSET_CAPTURE))>0)
+		if(($n=preg_match_all('/<%[#=].*?%>/msS', $value, $matches, PREG_OFFSET_CAPTURE)) > 0)
 		{
 			$isDataBind=false;
 			$textStart=0;
 			$expr='';
-			for($i=0;$i<$n;++$i)
+			for($i=0; $i < $n; ++$i)
 			{
 				$match=$matches[0][$i];
 				$token=$match[0];
@@ -8992,133 +8992,133 @@ 
 				$length=strlen($token);
 				if($token[2]==='#')
 					$isDataBind=true;
-				if($offset>$textStart)
-					$expr.=".'".strtr(substr($value,$textStart,$offset-$textStart),array("'"=>"\\'","\\"=>"\\\\"))."'";
-				$expr.='.('.substr($token,3,$length-5).')';
-				$textStart=$offset+$length;
+				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($length > $textStart)
+				$expr.=".'".strtr(substr($value, $textStart, $length - $textStart), array("'"=>"\\'", "\\"=>"\\\\"))."'";
 			if($isDataBind)
-				return array(self::CONFIG_DATABIND,ltrim($expr,'.'));
+				return array(self::CONFIG_DATABIND, ltrim($expr, '.'));
 			else
-				return array(self::CONFIG_EXPRESSION,ltrim($expr,'.'));
+				return array(self::CONFIG_EXPRESSION, ltrim($expr, '.'));
 		}
-		else if(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS',$value,$matches) && $matches[0]===$value)
+		else if(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS', $value, $matches) && $matches[0]===$value)
 		{
 			$value=$matches[1];
 			if($value[2]==='~')
-				return array(self::CONFIG_ASSET,trim(substr($value,3,strlen($value)-5)));
+				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)));
+				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)));
+				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'");
+				$literal=trim(substr($value, 3, strlen($value) - 5));
+				return array(self::CONFIG_EXPRESSION, "rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '/').'/$literal'");
 			}
 		}
 		else
 			return $value;
 	}
-	protected function validateAttributes($type,$attributes)
+	protected function validateAttributes($type, $attributes)
 	{
 		Prado::using($type);
-		if(($pos=strrpos($type,'.'))!==false)
-			$className=substr($type,$pos+1);
+		if(($pos=strrpos($type, '.'))!==false)
+			$className=substr($type, $pos + 1);
 		else
 			$className=$type;
 		$class=new ReflectionClass($className);
-		if(is_subclass_of($className,'TControl') || $className==='TControl')
+		if(is_subclass_of($className, 'TControl') || $className==='TControl')
 		{
 			foreach($attributes as $name=>$att)
 			{
-				if(($pos=strpos($name,'.'))!==false)
+				if(($pos=strpos($name, '.'))!==false)
 				{
-										$subname=substr($name,0,$pos);
+										$subname=substr($name, 0, $pos);
 					if(!$class->hasMethod('get'.$subname))
-						throw new TConfigurationException('template_property_unknown',$type,$subname);
+						throw new TConfigurationException('template_property_unknown', $type, $subname);
 				}
-				else if(strncasecmp($name,'on',2)===0)
+				else if(strncasecmp($name, 'on', 2)===0)
 				{
 										if(!$class->hasMethod($name))
-						throw new TConfigurationException('template_event_unknown',$type,$name);
+						throw new TConfigurationException('template_event_unknown', $type, $name);
 					else if(!is_string($att))
-						throw new TConfigurationException('template_eventhandler_invalid',$type,$name);
+						throw new TConfigurationException('template_eventhandler_invalid', $type, $name);
 				}
 				else
 				{
-										if (! ($class->hasMethod('set'.$name) || $class->hasMethod('setjs'.$name) || $this->isClassBehaviorMethod($class,'set'.$name)) )
+										if(!($class->hasMethod('set'.$name) || $class->hasMethod('setjs'.$name) || $this->isClassBehaviorMethod($class, 'set'.$name)))
 					{
-						if ($class->hasMethod('get'.$name) || $class->hasMethod('getjs'.$name))
-							throw new TConfigurationException('template_property_readonly',$type,$name);
+						if($class->hasMethod('get'.$name) || $class->hasMethod('getjs'.$name))
+							throw new TConfigurationException('template_property_readonly', $type, $name);
 						else
-							throw new TConfigurationException('template_property_unknown',$type,$name);
+							throw new TConfigurationException('template_property_unknown', $type, $name);
 					}
 					else if(is_array($att) && $att[0]!==self::CONFIG_EXPRESSION)
 					{
-						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(($pos=strpos($name,'.'))!==false)
+					throw new TConfigurationException('template_databind_forbidden', $type, $name);
+				if(($pos=strpos($name, '.'))!==false)
 				{
-										$subname=substr($name,0,$pos);
+										$subname=substr($name, 0, $pos);
 					if(!$class->hasMethod('get'.$subname))
-						throw new TConfigurationException('template_property_unknown',$type,$subname);
+						throw new TConfigurationException('template_property_unknown', $type, $subname);
 				}
-				else if(strncasecmp($name,'on',2)===0)
-					throw new TConfigurationException('template_event_forbidden',$type,$name);
+				else if(strncasecmp($name, 'on', 2)===0)
+					throw new TConfigurationException('template_event_forbidden', $type, $name);
 				else
 				{
-										if(strcasecmp($name,'id')!==0 && !($class->hasMethod('set'.$name) || $this->isClassBehaviorMethod($class,'set'.$name)))
+										if(strcasecmp($name, 'id')!==0 && !($class->hasMethod('set'.$name) || $this->isClassBehaviorMethod($class, 'set'.$name)))
 					{
 						if($class->hasMethod('get'.$name))
-							throw new TConfigurationException('template_property_readonly',$type,$name);
+							throw new TConfigurationException('template_property_readonly', $type, $name);
 						else
-							throw new TConfigurationException('template_property_unknown',$type,$name);
+							throw new TConfigurationException('template_property_unknown', $type, $name);
 					}
 				}
 			}
 		}
 		else
-			throw new TConfigurationException('template_component_required',$type);
+			throw new TConfigurationException('template_component_required', $type);
 	}
 	public function getIncludedFiles()
 	{
 		return $this->_includedFiles;
 	}
-	protected function handleException($e,$line,$input=null)
+	protected function handleException($e, $line, $input=null)
 	{
 		$srcFile=$this->_tplFile;
-		if(($n=count($this->_includedFiles))>0) 		{
-			for($i=$n-1;$i>=0;--$i)
+		if(($n=count($this->_includedFiles)) > 0) {
+			for($i=$n - 1; $i >= 0; --$i)
 			{
-				if($this->_includeAtLine[$i]<=$line)
+				if($this->_includeAtLine[$i] <= $line)
 				{
-					if($line<$this->_includeAtLine[$i]+$this->_includeLines[$i])
+					if($line < $this->_includeAtLine[$i] + $this->_includeLines[$i])
 					{
-						$line=$line-$this->_includeAtLine[$i]+1;
+						$line=$line - $this->_includeAtLine[$i] + 1;
 						$srcFile=$this->_includedFiles[$i];
 						break;
 					}
 					else
-						$line=$line-$this->_includeLines[$i]+1;
+						$line=$line - $this->_includeLines[$i] + 1;
 				}
 			}
 		}
-		$exception=new TTemplateException('template_format_invalid',$e->getMessage());
+		$exception=new TTemplateException('template_format_invalid', $e->getMessage());
 		$exception->setLineNumber($line);
 		if(!empty($srcFile))
 			$exception->setTemplateFile($srcFile);
@@ -9128,34 +9128,34 @@ 
 	}
 	protected function preprocess($input)
 	{
-		if($n=preg_match_all('/<%include(.*?)%>/',$input,$matches,PREG_SET_ORDER|PREG_OFFSET_CAPTURE))
+		if($n=preg_match_all('/<%include(.*?)%>/', $input, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
 		{
-			for($i=0;$i<$n;++$i)
+			for($i=0; $i < $n; ++$i)
 			{
-				$filePath=Prado::getPathOfNamespace(trim($matches[$i][1][0]),TTemplateManager::TEMPLATE_FILE_EXT);
+				$filePath=Prado::getPathOfNamespace(trim($matches[$i][1][0]), TTemplateManager::TEMPLATE_FILE_EXT);
 				if($filePath!==null && is_file($filePath))
 					$this->_includedFiles[]=$filePath;
 				else
 				{
-					$errorLine=count(explode("\n",substr($input,0,$matches[$i][0][1]+1)));
-					$this->handleException(new TConfigurationException('template_include_invalid',trim($matches[$i][1][0])),$errorLine,$input);
+					$errorLine=count(explode("\n", substr($input, 0, $matches[$i][0][1] + 1)));
+					$this->handleException(new TConfigurationException('template_include_invalid', trim($matches[$i][1][0])), $errorLine, $input);
 				}
 			}
 			$base=0;
-			for($i=0;$i<$n;++$i)
+			for($i=0; $i < $n; ++$i)
 			{
 				$ext=file_get_contents($this->_includedFiles[$i]);
 				$length=strlen($matches[$i][0][0]);
-				$offset=$base+$matches[$i][0][1];
-				$this->_includeAtLine[$i]=count(explode("\n",substr($input,0,$offset)));
-				$this->_includeLines[$i]=count(explode("\n",$ext));
-				$input=substr_replace($input,$ext,$offset,$length);
-				$base+=strlen($ext)-$length;
+				$offset=$base + $matches[$i][0][1];
+				$this->_includeAtLine[$i]=count(explode("\n", substr($input, 0, $offset)));
+				$this->_includeLines[$i]=count(explode("\n", $ext));
+				$input=substr_replace($input, $ext, $offset, $length);
+				$base+=strlen($ext) - $length;
 			}
 		}
 		return $input;
 	}
-	protected function isClassBehaviorMethod(ReflectionClass $class,$method)
+	protected function isClassBehaviorMethod(ReflectionClass $class, $method)
 	{
 	  $component=new ReflectionClass('TComponent');
 	  $behaviors=$component->getStaticProperties();
@@ -9166,7 +9166,7 @@ 
 	    if(strtolower($class->getShortName())!==$name && !$class->isSubclassOf($name)) continue;
 	    foreach($list as $param)
 	    {
-	      if(method_exists($param->getBehavior(),$method))
+	      if(method_exists($param->getBehavior(), $method))
 	        return true;
 	    }
 	  }
@@ -9176,7 +9176,7 @@ 
 class TThemeManager extends TModule
 {
 	const DEFAULT_BASEPATH='themes';
-	const DEFAULT_THEMECLASS = 'TTheme';
+	const DEFAULT_THEMECLASS='TTheme';
 	private $_themeClass=self::DEFAULT_THEMECLASS;
 	private $_initialized=false;
 	private $_basePath=null;
@@ -9193,11 +9193,11 @@ 
 	public function getTheme($name)
 	{
 		$themePath=$this->getBasePath().DIRECTORY_SEPARATOR.$name;
-		$themeUrl=rtrim($this->getBaseUrl(),'/').'/'.$name;
+		$themeUrl=rtrim($this->getBaseUrl(), '/').'/'.$name;
 		return Prado::createComponent($this->getThemeClass(), $themePath, $themeUrl);
 	}
 	public function setThemeClass($class) {
-		$this->_themeClass = $class===null ? self::DEFAULT_THEMECLASS : (string)$class;
+		$this->_themeClass=$class===null ? self::DEFAULT_THEMECLASS : (string) $class;
 	}
 	public function getThemeClass() {
 		return $this->_themeClass;
@@ -9221,7 +9221,7 @@ 
 		{
 			$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);
+				throw new TConfigurationException('thememanager_basepath_invalid2', $this->_basePath);
 			$this->_basePath=$basePath;
 		}
 		return $this->_basePath;
@@ -9234,7 +9234,7 @@ 
 		{
 			$this->_basePath=Prado::getPathOfNamespace($value);
 			if($this->_basePath===null || !is_dir($this->_basePath))
-				throw new TInvalidDataValueException('thememanager_basepath_invalid',$value);
+				throw new TInvalidDataValueException('thememanager_basepath_invalid', $value);
 		}
 	}
 	public function getBaseUrl()
@@ -9243,16 +9243,16 @@ 
 		{
 			$appPath=dirname($this->getRequest()->getApplicationFilePath());
 			$basePath=$this->getBasePath();
-			if(strpos($basePath,$appPath)===false)
+			if(strpos($basePath, $appPath)===false)
 				throw new TConfigurationException('thememanager_baseurl_required');
-			$appUrl=rtrim(dirname($this->getRequest()->getApplicationUrl()),'/\\');
-			$this->_baseUrl=$appUrl.strtr(substr($basePath,strlen($appPath)),'\\','/');
+			$appUrl=rtrim(dirname($this->getRequest()->getApplicationUrl()), '/\\');
+			$this->_baseUrl=$appUrl.strtr(substr($basePath, strlen($appPath)), '\\', '/');
 		}
 		return $this->_baseUrl;
 	}
 	public function setBaseUrl($value)
 	{
-		$this->_baseUrl=rtrim($value,'/');
+		$this->_baseUrl=rtrim($value, '/');
 	}
 }
 class TTheme extends TApplicationComponent implements ITheme
@@ -9265,7 +9265,7 @@ 
 	private $_name='';
 	private $_cssFiles=array();
 	private $_jsFiles=array();
-	public function __construct($themePath,$themeUrl)
+	public function __construct($themePath, $themeUrl)
 	{
 		$this->_themeUrl=$themeUrl;
 		$this->_themePath=realpath($themePath);
@@ -9276,21 +9276,21 @@ 
 			$array=$cache->get(self::THEME_CACHE_PREFIX.$themePath);
 			if(is_array($array))
 			{
-				list($skins,$cssFiles,$jsFiles,$timestamp)=$array;
+				list($skins, $cssFiles, $jsFiles, $timestamp)=$array;
 				if($this->getApplication()->getMode()!==TApplicationMode::Performance)
 				{
 					if(($dir=opendir($themePath))===false)
-						throw new TIOException('theme_path_inexistent',$themePath);
+						throw new TIOException('theme_path_inexistent', $themePath);
 					$cacheValid=true;
 					while(($file=readdir($dir))!==false)
 					{
 						if($file==='.' || $file==='..')
 							continue;
-						else if(basename($file,'.css')!==$file)
+						else if(basename($file, '.css')!==$file)
 							$this->_cssFiles[]=$themeUrl.'/'.$file;
-						else if(basename($file,'.js')!==$file)
+						else if(basename($file, '.js')!==$file)
 							$this->_jsFiles[]=$themeUrl.'/'.$file;
-						else if(basename($file,self::SKIN_FILE_EXT)!==$file && filemtime($themePath.DIRECTORY_SEPARATOR.$file)>$timestamp)
+						else if(basename($file, self::SKIN_FILE_EXT)!==$file && filemtime($themePath.DIRECTORY_SEPARATOR.$file) > $timestamp)
 						{
 							$cacheValid=false;
 							break;
@@ -9315,28 +9315,28 @@ 
 			$this->_jsFiles=array();
 			$this->_skins=array();
 			if(($dir=opendir($themePath))===false)
-				throw new TIOException('theme_path_inexistent',$themePath);
+				throw new TIOException('theme_path_inexistent', $themePath);
 			while(($file=readdir($dir))!==false)
 			{
 				if($file==='.' || $file==='..')
 					continue;
-				else if(basename($file,'.css')!==$file)
+				else if(basename($file, '.css')!==$file)
 					$this->_cssFiles[]=$themeUrl.'/'.$file;
-				else if(basename($file,'.js')!==$file)
+				else if(basename($file, '.js')!==$file)
 					$this->_jsFiles[]=$themeUrl.'/'.$file;
-				else if(basename($file,self::SKIN_FILE_EXT)!==$file)
+				else if(basename($file, self::SKIN_FILE_EXT)!==$file)
 				{
-					$template=new TTemplate(file_get_contents($themePath.'/'.$file),$themePath,$themePath.'/'.$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));
+							throw new TConfigurationException('theme_control_nested', $skin[1], dirname($themePath));
 						$type=$skin[1];
-						$id=isset($skin[2]['skinid'])?$skin[2]['skinid']:0;
+						$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));
+							throw new TConfigurationException('theme_skinid_duplicated', $type, $id, dirname($themePath));
 						$this->_skins[$type][$id]=$skin[2];
 					}
 				}
@@ -9345,7 +9345,7 @@ 
 			sort($this->_cssFiles);
 			sort($this->_jsFiles);
 			if($cache!==null)
-				$cache->set(self::THEME_CACHE_PREFIX.$themePath,array($this->_skins,$this->_cssFiles,$this->_jsFiles,time()));
+				$cache->set(self::THEME_CACHE_PREFIX.$themePath, array($this->_skins, $this->_cssFiles, $this->_jsFiles, time()));
 		}
 	}
 	public function getName()
@@ -9354,7 +9354,7 @@ 
 	}
 	protected function setName($value)
 	{
-		$this->_name = $value;
+		$this->_name=$value;
 	}
 	public function getBaseUrl()
 	{
@@ -9362,7 +9362,7 @@ 
 	}
 	protected function setBaseUrl($value)
 	{
-		$this->_themeUrl=rtrim($value,'/');
+		$this->_themeUrl=rtrim($value, '/');
 	}
 	public function getBasePath()
 	{
@@ -9378,7 +9378,7 @@ 
 	}
 	protected function setSkins($value)
 	{
-		$this->_skins = $value;
+		$this->_skins=$value;
 	}
 	public function applySkin($control)
 	{
@@ -9397,28 +9397,28 @@ 
 							$value=$this->evaluateExpression($value[1]);
 							break;
 						case TTemplate::CONFIG_ASSET:
-							$value=$this->_themeUrl.'/'.ltrim($value[1],'/');
+							$value=$this->_themeUrl.'/'.ltrim($value[1], '/');
 							break;
 						case TTemplate::CONFIG_DATABIND:
-							$control->bindProperty($name,$value[1]);
+							$control->bindProperty($name, $value[1]);
 							break;
 						case TTemplate::CONFIG_PARAMETER:
-							$control->setSubProperty($name,$this->getApplication()->getParameters()->itemAt($value[1]));
+							$control->setSubProperty($name, $this->getApplication()->getParameters()->itemAt($value[1]));
 							break;
 						case TTemplate::CONFIG_TEMPLATE:
-							$control->setSubProperty($name,$value[1]);
+							$control->setSubProperty($name, $value[1]);
 							break;
 						case TTemplate::CONFIG_LOCALIZATION:
-							$control->setSubProperty($name,Prado::localize($value[1]));
+							$control->setSubProperty($name, Prado::localize($value[1]));
 							break;
 						default:
-							throw new TConfigurationException('theme_tag_unexpected',$name,$value[0]);
+							throw new TConfigurationException('theme_tag_unexpected', $name, $value[0]);
 							break;
 					}
 				}
 				if(!is_array($value))
 				{
-					if(strpos($name,'.')===false)						{
+					if(strpos($name, '.')===false) {
 						if($control->hasProperty($name))
 						{
 							if($control->canSetProperty($name))
@@ -9427,12 +9427,12 @@ 
 								$control->$setter($value);
 							}
 							else
-								throw new TConfigurationException('theme_property_readonly',$type,$name);
+								throw new TConfigurationException('theme_property_readonly', $type, $name);
 						}
 						else
-							throw new TConfigurationException('theme_property_undefined',$type,$name);
+							throw new TConfigurationException('theme_property_undefined', $type, $name);
 					}
-					else							$control->setSubProperty($name,$value);
+					else							$control->setSubProperty($name, $value);
 				}
 			}
 			return true;
@@ -9495,15 +9495,15 @@ 
 		$pagePath=$this->getRequestedPagePath();
 				foreach($config->getExternalConfigurations() as $filePath=>$params)
 		{
-			list($configPagePath,$condition)=$params;
+			list($configPagePath, $condition)=$params;
 			if($condition!==true)
 				$condition=$this->evaluateExpression($condition);
 			if($condition)
 			{
-				if(($path=Prado::getPathOfNamespace($filePath,Prado::getApplication()->getConfigurationFileExt()))===null || !is_file($path))
-					throw new TConfigurationException('pageservice_includefile_invalid',$filePath);
+				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);
+				$c->loadFromFile($path, $configPagePath);
 				$this->applyConfiguration($c);
 			}
 		}
@@ -9525,9 +9525,9 @@ 
 			if($config!==null)
 			{
 				if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-					$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
+					$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
 				else
-					$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
+					$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
 			}
 			$pageConfig->loadFromFiles($this->getBasePath());
 		}
@@ -9538,21 +9538,21 @@ 
 			$arr=$cache->get(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath);
 			if(is_array($arr))
 			{
-				list($pageConfig,$timestamps)=$arr;
+				list($pageConfig, $timestamps)=$arr;
 				if($application->getMode()!==TApplicationMode::Performance)
 				{
 					foreach($timestamps as $fileName=>$timestamp)
 					{
-						if($fileName===0) 						{
+						if($fileName===0) {
 							$appConfigFile=$application->getConfigurationFile();
-							$currentTimestamp[0]=$appConfigFile===null?0:@filemtime($appConfigFile);
-							if($currentTimestamp[0]>$timestamp || ($timestamp>0 && !$currentTimestamp[0]))
+							$currentTimestamp[0]=$appConfigFile===null ? 0 : @filemtime($appConfigFile);
+							if($currentTimestamp[0] > $timestamp || ($timestamp > 0 && !$currentTimestamp[0]))
 								$configCached=false;
 						}
 						else
 						{
 							$currentTimestamp[$fileName]=@filemtime($fileName);
-							if($currentTimestamp[$fileName]>$timestamp || ($timestamp>0 && !$currentTimestamp[$fileName]))
+							if($currentTimestamp[$fileName] > $timestamp || ($timestamp > 0 && !$currentTimestamp[$fileName]))
 								$configCached=false;
 						}
 					}
@@ -9561,9 +9561,9 @@ 
 			else
 			{
 				$configCached=false;
-				$paths=explode('.',$pagePath);
+				$paths=explode('.', $pagePath);
 				$configPath=$this->getBasePath();
-				$fileName = $this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
+				$fileName=$this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
 					? self::CONFIG_FILE_PHP
 					: self::CONFIG_FILE_XML;
 				foreach($paths as $path)
@@ -9573,7 +9573,7 @@ 
 					$configPath.=DIRECTORY_SEPARATOR.$path;
 				}
 				$appConfigFile=$application->getConfigurationFile();
-				$currentTimestamp[0]=$appConfigFile===null?0:@filemtime($appConfigFile);
+				$currentTimestamp[0]=$appConfigFile===null ? 0 : @filemtime($appConfigFile);
 			}
 			if(!$configCached)
 			{
@@ -9581,12 +9581,12 @@ 
 				if($config!==null)
 				{
 					if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-						$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
+						$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
 					else
-						$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
+						$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
 				}
 				$pageConfig->loadFromFiles($this->getBasePath());
-				$cache->set(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath,array($pageConfig,$currentTimestamp));
+				$cache->set(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath, array($pageConfig, $currentTimestamp));
 			}
 		}
 		return $pageConfig;
@@ -9621,9 +9621,9 @@ 
 	{
 		if($this->_pagePath===null)
 		{
-			$this->_pagePath=strtr($this->determineRequestedPagePath(),'/\\','..');
+			$this->_pagePath=strtr($this->determineRequestedPagePath(), '/\\', '..');
 			if(empty($this->_pagePath))
-				throw new THttpException(404,'pageservice_page_required');
+				throw new THttpException(404, 'pageservice_page_required');
 		}
 		return $this->_pagePath;
 	}
@@ -9655,7 +9655,7 @@ 
 			{
 				$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);
+					throw new TConfigurationException('pageservice_basepath_invalid', $basePath);
 			}
 		}
 		return $this->_basePath;
@@ -9665,7 +9665,7 @@ 
 		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);
+			throw new TConfigurationException('pageservice_basepath_invalid', $value);
 		$this->_basePath=realpath($path);
 	}
 	public function setBasePageClass($value)
@@ -9687,45 +9687,45 @@ 
 	public function run()
 	{
 		$this->_page=$this->createPage($this->getRequestedPagePath());
-		$this->runPage($this->_page,$this->_properties);
+		$this->runPage($this->_page, $this->_properties);
 	}
 	protected function createPage($pagePath)
 	{
-		$path=$this->getBasePath().DIRECTORY_SEPARATOR.strtr($pagePath,'.',DIRECTORY_SEPARATOR);
+		$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);
+			throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
 		if($hasClassFile)
 		{
 			$className=basename($path);
-			if(!class_exists($className,false))
+			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));
 		return $page;
 	}
-	protected function runPage($page,$properties)
+	protected function runPage($page, $properties)
 	{
 		foreach($properties as $name=>$value)
-			$page->setSubProperty($name,$value);
+			$page->setSubProperty($name, $value);
 		$page->run($this->getResponse()->createHtmlWriter());
 	}
-	public function constructUrl($pagePath,$getParams=null,$encodeAmpersand=true,$encodeGetItems=true)
+	public function constructUrl($pagePath, $getParams=null, $encodeAmpersand=true, $encodeGetItems=true)
 	{
-		return $this->getRequest()->constructUrl($this->getID(),$pagePath,$getParams,$encodeAmpersand,$encodeGetItems);
+		return $this->getRequest()->constructUrl($this->getID(), $pagePath, $getParams, $encodeAmpersand, $encodeGetItems);
 	}
 }
 class TPageConfiguration extends TComponent
@@ -9757,89 +9757,89 @@ 
 	}
 	public function loadFromFiles($basePath)
 	{
-		$paths=explode('.',$this->_pagePath);
+		$paths=explode('.', $this->_pagePath);
 		$page=array_pop($paths);
 		$path=$basePath;
 		$configPagePath='';
-		$fileName = Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
+		$fileName=Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
 			? TPageService::CONFIG_FILE_PHP
 			: TPageService::CONFIG_FILE_XML;
 		foreach($paths as $p)
 		{
-			$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName,$configPagePath);
+			$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName, $configPagePath);
 			$path.=DIRECTORY_SEPARATOR.$p;
 			if($configPagePath==='')
 				$configPagePath=$p;
 			else
 				$configPagePath.='.'.$p;
 		}
-		$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName,$configPagePath);
+		$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName, $configPagePath);
 		$this->_rules=new TAuthorizationRuleCollection($this->_rules);
 	}
-	public function loadFromFile($fname,$configPagePath)
+	public function loadFromFile($fname, $configPagePath)
 	{
 		if(empty($fname) || !is_file($fname))
 			return;
 		if(Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
-			$fcontent = include $fname;
-			$this->loadFromPhp($fcontent,dirname($fname),$configPagePath);
+			$fcontent=include $fname;
+			$this->loadFromPhp($fcontent, dirname($fname), $configPagePath);
 		}
 		else
 		{
 			$dom=new TXmlDocument;
 			if($dom->loadFromFile($fname))
-				$this->loadFromXml($dom,dirname($fname),$configPagePath);
+				$this->loadFromXml($dom, dirname($fname), $configPagePath);
 			else
-				throw new TConfigurationException('pageserviceconf_file_invalid',$fname);
+				throw new TConfigurationException('pageserviceconf_file_invalid', $fname);
 		}
 	}
-	public function loadFromPhp($config,$configPath,$configPagePath)
+	public function loadFromPhp($config, $configPath, $configPagePath)
 	{
-		$this->loadApplicationConfigurationFromPhp($config,$configPath);
-		$this->loadPageConfigurationFromPhp($config,$configPath,$configPagePath);
+		$this->loadApplicationConfigurationFromPhp($config, $configPath);
+		$this->loadPageConfigurationFromPhp($config, $configPath, $configPagePath);
 	}
-	public function loadFromXml($dom,$configPath,$configPagePath)
+	public function loadFromXml($dom, $configPath, $configPagePath)
 	{
-		$this->loadApplicationConfigurationFromXml($dom,$configPath);
-		$this->loadPageConfigurationFromXml($dom,$configPath,$configPagePath);
+		$this->loadApplicationConfigurationFromXml($dom, $configPath);
+		$this->loadPageConfigurationFromXml($dom, $configPath, $configPagePath);
 	}
-	public function loadApplicationConfigurationFromPhp($config,$configPath)
+	public function loadApplicationConfigurationFromPhp($config, $configPath)
 	{
 		$appConfig=new TApplicationConfiguration;
-		$appConfig->loadFromPhp($config,$configPath);
+		$appConfig->loadFromPhp($config, $configPath);
 		$this->_appConfigs[]=$appConfig;
 	}
-	public function loadApplicationConfigurationFromXml($dom,$configPath)
+	public function loadApplicationConfigurationFromXml($dom, $configPath)
 	{
 		$appConfig=new TApplicationConfiguration;
-		$appConfig->loadFromXml($dom,$configPath);
+		$appConfig->loadFromXml($dom, $configPath);
 		$this->_appConfigs[]=$appConfig;
 	}
 	public function loadPageConfigurationFromPhp($config, $configPath, $configPagePath)
 	{
 				if(isset($config['authorization']) && is_array($config['authorization']))
 		{
-			$rules = array();
+			$rules=array();
 			foreach($config['authorization'] as $authorization)
 			{
-				$patterns=isset($authorization['pages'])?$authorization['pages']:'';
+				$patterns=isset($authorization['pages']) ? $authorization['pages'] : '';
 				$ruleApplies=false;
 				if(empty($patterns) || trim($patterns)==='*') 					$ruleApplies=true;
 				else
 				{
-					foreach(explode(',',$patterns) as $pattern)
+					foreach(explode(',', $patterns) as $pattern)
 					{
 						if(($pattern=trim($pattern))!=='')
 						{
 														if($configPagePath!=='')  								$pattern=$configPagePath.'.'.$pattern;
-							if(strcasecmp($pattern,$this->_pagePath)===0)
+							if(strcasecmp($pattern, $this->_pagePath)===0)
 							{
 								$ruleApplies=true;
 								break;
 							}
-							if($pattern[strlen($pattern)-1]==='*') 							{
-								if(strncasecmp($this->_pagePath,$pattern,strlen($pattern)-1)===0)
+							if($pattern[strlen($pattern) - 1]==='*') {
+								if(strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1)===0)
 								{
 									$ruleApplies=true;
 									break;
@@ -9850,56 +9850,56 @@ 
 				}
 				if($ruleApplies)
 				{
-					$action = isset($authorization['action'])?$authorization['action']:'';
-					$users = isset($authorization['users'])?$authorization['users']:'';
-					$roles = isset($authorization['roles'])?$authorization['roles']:'';
-					$verb = isset($authorization['verb'])?$authorization['verb']:'';
-					$ips = isset($authorization['ips'])?$authorization['ips']:'';
-					$rules[]=new TAuthorizationRule($action,$users,$roles,$verb,$ips);
+					$action=isset($authorization['action']) ? $authorization['action'] : '';
+					$users=isset($authorization['users']) ? $authorization['users'] : '';
+					$roles=isset($authorization['roles']) ? $authorization['roles'] : '';
+					$verb=isset($authorization['verb']) ? $authorization['verb'] : '';
+					$ips=isset($authorization['ips']) ? $authorization['ips'] : '';
+					$rules[]=new TAuthorizationRule($action, $users, $roles, $verb, $ips);
 				}
 			}
-			$this->_rules=array_merge($rules,$this->_rules);
+			$this->_rules=array_merge($rules, $this->_rules);
 		}
 				if(isset($config['pages']) && is_array($config['pages']))
 		{
 			if(isset($config['pages']['properties']))
 			{
-				$this->_properties = array_merge($this->_properties, $config['pages']['properties']);
+				$this->_properties=array_merge($this->_properties, $config['pages']['properties']);
 				unset($config['pages']['properties']);
 			}
 			foreach($config['pages'] as $id => $page)
 			{
-				$properties = array();
+				$properties=array();
 				if(isset($page['properties']))
 				{
 					$properties=$page['properties'];
 					unset($page['properties']);
 				}
 				$matching=false;
-				$id=($configPagePath==='')?$id:$configPagePath.'.'.$id;
-				if(strcasecmp($id,$this->_pagePath)===0)
+				$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;
+				else if($id[strlen($id) - 1]==='*') 					$matching=strncasecmp($this->_pagePath, $id, strlen($id) - 1)===0;
 				if($matching)
-					$this->_properties=array_merge($this->_properties,$properties);
+					$this->_properties=array_merge($this->_properties, $properties);
 			}
 		}
 				if(isset($config['includes']) && is_array($config['includes']))
 		{
 			foreach($config['includes'] as $include)
 			{
-				$when = isset($include['when'])?true:false;
+				$when=isset($include['when']) ? true : false;
 				if(!isset($include['file']))
 					throw new TConfigurationException('pageserviceconf_includefile_required');
-				$filePath = $include['file'];
+				$filePath=$include['file'];
 				if(isset($this->_includes[$filePath]))
-					$this->_includes[$filePath]=array($configPagePath,'('.$this->_includes[$filePath][1].') || ('.$when.')');
+					$this->_includes[$filePath]=array($configPagePath, '('.$this->_includes[$filePath][1].') || ('.$when.')');
 				else
-					$this->_includes[$filePath]=array($configPagePath,$when);
+					$this->_includes[$filePath]=array($configPagePath, $when);
 			}
 		}
 	}
-	public function loadPageConfigurationFromXml($dom,$configPath,$configPagePath)
+	public function loadPageConfigurationFromXml($dom, $configPath, $configPagePath)
 	{
 				if(($authorizationNode=$dom->getElementByTagName('authorization'))!==null)
 		{
@@ -9911,18 +9911,18 @@ 
 				if(empty($patterns) || trim($patterns)==='*') 					$ruleApplies=true;
 				else
 				{
-					foreach(explode(',',$patterns) as $pattern)
+					foreach(explode(',', $patterns) as $pattern)
 					{
 						if(($pattern=trim($pattern))!=='')
 						{
 														if($configPagePath!=='')  								$pattern=$configPagePath.'.'.$pattern;
-							if(strcasecmp($pattern,$this->_pagePath)===0)
+							if(strcasecmp($pattern, $this->_pagePath)===0)
 							{
 								$ruleApplies=true;
 								break;
 							}
-							if($pattern[strlen($pattern)-1]==='*') 							{
-								if(strncasecmp($this->_pagePath,$pattern,strlen($pattern)-1)===0)
+							if($pattern[strlen($pattern) - 1]==='*') {
+								if(strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1)===0)
 								{
 									$ruleApplies=true;
 									break;
@@ -9932,26 +9932,26 @@ 
 					}
 				}
 				if($ruleApplies)
-					$rules[]=new TAuthorizationRule($node->getTagName(),$node->getAttribute('users'),$node->getAttribute('roles'),$node->getAttribute('verb'),$node->getAttribute('ips'));
+					$rules[]=new TAuthorizationRule($node->getTagName(), $node->getAttribute('users'), $node->getAttribute('roles'), $node->getAttribute('verb'), $node->getAttribute('ips'));
 			}
-			$this->_rules=array_merge($rules,$this->_rules);
+			$this->_rules=array_merge($rules, $this->_rules);
 		}
 				if(($pagesNode=$dom->getElementByTagName('pages'))!==null)
 		{
-			$this->_properties=array_merge($this->_properties,$pagesNode->getAttributes()->toArray());
+			$this->_properties=array_merge($this->_properties, $pagesNode->getAttributes()->toArray());
 						foreach($pagesNode->getElementsByTagName('page') as $node)
 			{
 				$properties=$node->getAttributes();
 				$id=$properties->remove('id');
 				if(empty($id))
-					throw new TConfigurationException('pageserviceconf_page_invalid',$configPath);
+					throw new TConfigurationException('pageserviceconf_page_invalid', $configPath);
 				$matching=false;
-				$id=($configPagePath==='')?$id:$configPagePath.'.'.$id;
-				if(strcasecmp($id,$this->_pagePath)===0)
+				$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;
+				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());
+					$this->_properties=array_merge($this->_properties, $properties->toArray());
 			}
 		}
 				foreach($dom->getElementsByTagName('include') as $node)
@@ -9961,9 +9961,9 @@ 
 			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.')');
+				$this->_includes[$filePath]=array($configPagePath, '('.$this->_includes[$filePath][1].') || ('.$when.')');
 			else
-				$this->_includes[$filePath]=array($configPagePath,$when);
+				$this->_includes[$filePath]=array($configPagePath, $when);
 		}
 	}
 }
@@ -9982,9 +9982,9 @@ 
 		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);
+			throw new TConfigurationException('assetmanager_basepath_invalid', $this->_basePath);
 		if($this->_baseUrl===null)
-			$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationUrl()),'/\\').'/'.self::DEFAULT_BASEPATH;
+			$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationUrl()), '/\\').'/'.self::DEFAULT_BASEPATH;
 		$application->setAssetManager($this);
 		$this->_initialized=true;
 	}
@@ -10000,7 +10000,7 @@ 
 		{
 			$this->_basePath=Prado::getPathOfNamespace($value);
 			if($this->_basePath===null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
-				throw new TInvalidDataValueException('assetmanager_basepath_invalid',$value);
+				throw new TInvalidDataValueException('assetmanager_basepath_invalid', $value);
 		}
 	}
 	public function getBaseUrl()
@@ -10012,21 +10012,21 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
 		else
-			$this->_baseUrl=rtrim($value,'/');
+			$this->_baseUrl=rtrim($value, '/');
 	}
-	public function publishFilePath($path,$checkTimestamp=false)
+	public function publishFilePath($path, $checkTimestamp=false)
 	{
 		if(isset($this->_published[$path]))
 			return $this->_published[$path];
 		else if(empty($path) || ($fullpath=realpath($path))===false)
-			throw new TInvalidDataValueException('assetmanager_filepath_invalid',$path);
+			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);
+				$this->copyFile($fullpath, $dst);
 			return $this->_published[$path]=$this->_baseUrl.'/'.$dir.'/'.$fileName;
 		}
 		else
@@ -10034,7 +10034,7 @@ 
 			$dir=$this->hash($fullpath);
 			if(!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 			{
-				$this->copyDirectory($fullpath,$this->_basePath.DIRECTORY_SEPARATOR.$dir);
+				$this->copyDirectory($fullpath, $this->_basePath.DIRECTORY_SEPARATOR.$dir);
 			}
 			return $this->_published[$path]=$this->_baseUrl.'/'.$dir;
 		}
@@ -10045,7 +10045,7 @@ 
 	}
 	protected function setPublished($values=array())
 	{
-		$this->_published = $values;
+		$this->_published=$values;
 	}
 	public function getPublishedPath($path)
 	{
@@ -10065,9 +10065,9 @@ 
 	}
 	protected function hash($dir)
 	{
-		return sprintf('%x',crc32($dir.Prado::getVersion()));
+		return sprintf('%x', crc32($dir.Prado::getVersion()));
 	}
-	protected function copyFile($src,$dst)
+	protected function copyFile($src, $dst)
 	{
 		if(!is_dir($dst))
 		{
@@ -10075,12 +10075,12 @@ 
 			@chmod($dst, PRADO_CHMOD);
 		}
 		$dstFile=$dst.DIRECTORY_SEPARATOR.basename($src);
-		if(@filemtime($dstFile)<@filemtime($src))
+		if(@filemtime($dstFile) < @filemtime($src))
 		{
-			@copy($src,$dstFile);
+			@copy($src, $dstFile);
 		}
 	}
-	public function copyDirectory($src,$dst)
+	public function copyDirectory($src, $dst)
 	{
 		if(!is_dir($dst))
 		{
@@ -10095,14 +10095,14 @@ 
 					continue;
 				else if(is_file($src.DIRECTORY_SEPARATOR.$file))
 				{
-					if(@filemtime($dst.DIRECTORY_SEPARATOR.$file)<@filemtime($src.DIRECTORY_SEPARATOR.$file))
+					if(@filemtime($dst.DIRECTORY_SEPARATOR.$file) < @filemtime($src.DIRECTORY_SEPARATOR.$file))
 					{
-						@copy($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
+						@copy($src.DIRECTORY_SEPARATOR.$file, $dst.DIRECTORY_SEPARATOR.$file);
 						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
 					}
 				}
 				else
-					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
+					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file, $dst.DIRECTORY_SEPARATOR.$file);
 			}
 			closedir($folder);
 		} else {
@@ -10114,7 +10114,7 @@ 
 		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);
+			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid', $md5sum);
 		else
 		{
 			$dir=$this->hash(dirname($fullpath));
@@ -10122,31 +10122,31 @@ 
 			$dst=$this->_basePath.DIRECTORY_SEPARATOR.$dir;
 			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 			{
-				if(@filemtime($dst.DIRECTORY_SEPARATOR.$fileName)<@filemtime($fullpath))
+				if(@filemtime($dst.DIRECTORY_SEPARATOR.$fileName) < @filemtime($fullpath))
 				{
-					$this->copyFile($fullpath,$dst);
-					$this->deployTarFile($tarfile,$dst);
+					$this->copyFile($fullpath, $dst);
+					$this->deployTarFile($tarfile, $dst);
 				}
 			}
 			return $this->_published[$md5sum]=$this->_baseUrl.'/'.$dir;
 		}
 	}
-	protected function deployTarFile($path,$destination)
+	protected function deployTarFile($path, $destination)
 	{
 		if(($fullpath=realpath($path))===false || !is_file($fullpath))
-			throw new TIOException('assetmanager_tarfile_invalid',$path);
+			throw new TIOException('assetmanager_tarfile_invalid', $path);
 		else
 		{
 			Prado::using('System.IO.TTarFileExtractor');
-			$tar = new TTarFileExtractor($fullpath);
+			$tar=new TTarFileExtractor($fullpath);
 			return $tar->extract($destination);
 		}
 	}
 }
 class TGlobalization extends TModule
 {
-	private $_defaultCharset = 'UTF-8';
-	private $_defaultCulture = 'en';
+	private $_defaultCharset='UTF-8';
+	private $_defaultCulture='en';
 	private $_charset=null;
 	private $_culture=null;
 	private $_translation;
@@ -10160,11 +10160,11 @@ 
 		if($config!==null)
 		{
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-				$translation = isset($config['translate'])?$config['translate']:null;
+				$translation=isset($config['translate']) ? $config['translate'] : null;
 			else
 			{
-				$t = $config->getElementByTagName('translation');
-				$translation = ($t)?$t->getAttributes():null;
+				$t=$config->getElementByTagName('translation');
+				$translation=($t) ? $t->getAttributes() : null;
 			}
 			if($translation)
 				$this->setTranslationConfiguration($translation);
@@ -10177,7 +10177,7 @@ 
 	}
 	public function setTranslateDefaultCulture($value)
 	{
-		$this->_translateDefaultCulture = TPropertyValue::ensureBoolean($value);
+		$this->_translateDefaultCulture=TPropertyValue::ensureBoolean($value);
 	}
 	public function getDefaultCulture()
 	{
@@ -10185,7 +10185,7 @@ 
 	}
 	public function setDefaultCulture($culture)
 	{
-		$this->_defaultCulture = str_replace('-','_',$culture);
+		$this->_defaultCulture=str_replace('-', '_', $culture);
 	}
 	public function getDefaultCharset()
 	{
@@ -10193,7 +10193,7 @@ 
 	}
 	public function setDefaultCharset($charset)
 	{
-		$this->_defaultCharset = $charset;
+		$this->_defaultCharset=$charset;
 	}
 	public function getCulture()
 	{
@@ -10201,7 +10201,7 @@ 
 	}
 	public function setCulture($culture)
 	{
-		$this->_culture = str_replace('-','_',$culture);
+		$this->_culture=str_replace('-', '_', $culture);
 	}
 	public function getCharset()
 	{
@@ -10209,27 +10209,27 @@ 
 	}
 	public function setCharset($charset)
 	{
-		$this->_charset = $charset;
+		$this->_charset=$charset;
 	}
 	public function getTranslationConfiguration()
 	{
-		return (!$this->_translateDefaultCulture && ($this->getDefaultCulture() == $this->getCulture()))
+		return (!$this->_translateDefaultCulture && ($this->getDefaultCulture()==$this->getCulture()))
 			? null
 			: $this->_translation;
 	}
 	protected function setTranslationConfiguration($config)
 	{
-		if($config['type'] == 'XLIFF' || $config['type'] == 'gettext')
+		if($config['type']=='XLIFF' || $config['type']=='gettext')
 		{
 			if($config['source'])
 			{
-				$config['source'] = Prado::getPathOfNamespace($config['source']);
+				$config['source']=Prado::getPathOfNamespace($config['source']);
 				if(!is_dir($config['source']))
 				{
 					if(@mkdir($config['source'])===false)
 					throw new TConfigurationException('globalization_source_path_failed',
 						$config['source']);
-					chmod($config['source'], PRADO_CHMOD); 				}
+					chmod($config['source'], PRADO_CHMOD); }
 			}
 			else
 			{
@@ -10238,15 +10238,15 @@ 
 		}
 		if($config['cache'])
 		{
-			$config['cache'] = $this->getApplication()->getRunTimePath().'/i18n';
+			$config['cache']=$this->getApplication()->getRunTimePath().'/i18n';
 			if(!is_dir($config['cache']))
 			{
 				if(@mkdir($config['cache'])===false)
 					throw new TConfigurationException('globalization_cache_path_failed',
 						$config['cache']);
-				chmod($config['cache'], PRADO_CHMOD); 			}
+				chmod($config['cache'], PRADO_CHMOD); }
 		}
-		$this->_translation = $config;
+		$this->_translation=$config;
 	}
 	public function getTranslationCatalogue()
 	{
@@ -10254,28 +10254,28 @@ 
 	}
 	public function setTranslationCatalogue($value)
 	{
-		$this->_translation['catalogue'] = $value;
+		$this->_translation['catalogue']=$value;
 	}
 	public function getCultureVariants($culture=null)
 	{
-		if($culture===null) $culture = $this->getCulture();
-		$variants = explode('_', $culture);
-		$result = array();
+		if($culture===null) $culture=$this->getCulture();
+		$variants=explode('_', $culture);
+		$result=array();
 		for(; count($variants) > 0; array_pop($variants))
-			$result[] = implode('_', $variants);
+			$result[]=implode('_', $variants);
 		return $result;
 	}
-	public function getLocalizedResource($file,$culture=null)
+	public function getLocalizedResource($file, $culture=null)
 	{
-		$files = array();
-		$variants = $this->getCultureVariants($culture);
-		$path = pathinfo($file);
+		$files=array();
+		$variants=$this->getCultureVariants($culture);
+		$path=pathinfo($file);
 		foreach($variants as $variant)
-			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$variant.DIRECTORY_SEPARATOR.$path['basename'];
-		$filename = substr($path['basename'],0,strrpos($path['basename'],'.'));
+			$files[]=$path['dirname'].DIRECTORY_SEPARATOR.$variant.DIRECTORY_SEPARATOR.$path['basename'];
+		$filename=substr($path['basename'], 0, strrpos($path['basename'], '.'));
 		foreach($variants as $variant)
-			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$filename.'.'.$variant.'.'.$path['extension'];
-		$files[] = $file;
+			$files[]=$path['dirname'].DIRECTORY_SEPARATOR.$filename.'.'.$variant.'.'.$path['extension'];
+		$files[]=$file;
 		return $files;
 	}
 }
@@ -10288,10 +10288,10 @@ 
 	const PAGE_SERVICE_ID='page';
 	const CONFIG_FILE_XML='application.xml';
 	const CONFIG_FILE_EXT_XML='.xml';
-	const CONFIG_TYPE_XML = 'xml';
+	const CONFIG_TYPE_XML='xml';
 	const CONFIG_FILE_PHP='application.php';
 	const CONFIG_FILE_EXT_PHP='.php';
-	const CONFIG_TYPE_PHP = 'php';
+	const CONFIG_TYPE_PHP='php';
 	const RUNTIME_PATH='runtime';
 	const CONFIGCACHE_FILE='config.cache';
 	const GLOBAL_FILE='global.cache';
@@ -10339,8 +10339,8 @@ 
 	private $_assetManager;
 	private $_authRules;
 	private $_mode=TApplicationMode::Debug;
-	private $_pageServiceID = self::PAGE_SERVICE_ID;
-	public function __construct($basePath='protected',$cacheConfig=true, $configType=self::CONFIG_TYPE_XML)
+	private $_pageServiceID=self::PAGE_SERVICE_ID;
+	public function __construct($basePath='protected', $cacheConfig=true, $configType=self::CONFIG_TYPE_XML)
 	{
 				Prado::setApplication($this);
 		$this->setConfigurationType($configType);
@@ -10349,13 +10349,13 @@ 
 			$this->_cacheFile=$this->_runtimePath.DIRECTORY_SEPARATOR.self::CONFIGCACHE_FILE;
 				$this->_uniqueID=md5($this->_runtimePath);
 		$this->_parameters=new TMap;
-		$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
-		Prado::setPathOfAlias('Application',$this->_basePath);
+		$this->_services=array($this->getPageServiceID()=>array('TPageService', array(), null));
+		Prado::setPathOfAlias('Application', $this->_basePath);
 	}
 	protected function resolvePaths($basePath)
 	{
 				if(empty($basePath) || ($basePath=realpath($basePath))===false)
-			throw new TConfigurationException('application_basepath_invalid',$basePath);
+			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))
@@ -10374,15 +10374,15 @@ 
 				if(!is_dir($runtimePath))
 				{
 					if(@mkdir($runtimePath)===false)
-						throw new TConfigurationException('application_runtimepath_failed',$runtimePath);
-					@chmod($runtimePath, PRADO_CHMOD); 				}
+						throw new TConfigurationException('application_runtimepath_failed', $runtimePath);
+					@chmod($runtimePath, PRADO_CHMOD); }
 				$this->setConfigurationFile($configFile);
 			}
 			$this->setBasePath($basePath);
 			$this->setRuntimePath($runtimePath);
 		}
 		else
-			throw new TConfigurationException('application_runtimepath_invalid',$runtimePath);
+			throw new TConfigurationException('application_runtimepath_invalid', $runtimePath);
 	}
 	public function run()
 	{
@@ -10392,10 +10392,10 @@ 
 			$n=count(self::$_steps);
 			$this->_step=0;
 			$this->_requestCompleted=false;
-			while($this->_step<$n)
+			while($this->_step < $n)
 			{
 				if($this->_mode===self::STATE_OFF)
-					throw new THttpException(503,'application_unavailable');
+					throw new THttpException(503, 'application_unavailable');
 				if($this->_requestCompleted)
 					break;
 				$method=self::$_steps[$this->_step];
@@ -10417,11 +10417,11 @@ 
 	{
 		return $this->_requestCompleted;
 	}
-	public function getGlobalState($key,$defaultValue=null)
+	public function getGlobalState($key, $defaultValue=null)
 	{
-		return isset($this->_globals[$key])?$this->_globals[$key]:$defaultValue;
+		return isset($this->_globals[$key]) ? $this->_globals[$key] : $defaultValue;
 	}
-	public function setGlobalState($key,$value,$defaultValue=null,$forceSave=false)
+	public function setGlobalState($key, $value, $defaultValue=null, $forceSave=false)
 	{
 		$this->_stateChanged=true;
 		if($value===$defaultValue)
@@ -10474,7 +10474,7 @@ 
 	}
 	public function setMode($value)
 	{
-		$this->_mode=TPropertyValue::ensureEnum($value,'TApplicationMode');
+		$this->_mode=TPropertyValue::ensureEnum($value, 'TApplicationMode');
 	}
 	public function getBasePath()
 	{
@@ -10498,7 +10498,7 @@ 
 	}
 	public function setConfigurationType($value)
 	{
-		$this->_configType = $value;
+		$this->_configType=$value;
 	}
 	public function getConfigurationFileExt()
 	{
@@ -10507,10 +10507,10 @@ 
 			switch($this->_configType)
 			{
 				case TApplication::CONFIG_TYPE_PHP:
-					$this->_configFileExt = TApplication::CONFIG_FILE_EXT_PHP;
+					$this->_configFileExt=TApplication::CONFIG_FILE_EXT_PHP;
 					break;
 				default:
-					$this->_configFileExt = TApplication::CONFIG_FILE_EXT_XML;
+					$this->_configFileExt=TApplication::CONFIG_FILE_EXT_XML;
 			}
 		}
 		return $this->_configFileExt;
@@ -10518,15 +10518,15 @@ 
 	public function getConfigurationFileName()
 	{
 		static $fileName;
-		if($fileName == null)
+		if($fileName==null)
 		{
 			switch($this->_configType)
 			{
 				case TApplication::CONFIG_TYPE_PHP:
-					$fileName = TApplication::CONFIG_FILE_PHP;
+					$fileName=TApplication::CONFIG_FILE_PHP;
 					break;
 				default:
-					$fileName = TApplication::CONFIG_FILE_XML;
+					$fileName=TApplication::CONFIG_FILE_XML;
 			}
 		}
 		return $fileName;
@@ -10550,10 +10550,10 @@ 
 	{
 		$this->_service=$value;
 	}
-	public function setModule($id,IModule $module=null)
+	public function setModule($id, IModule $module=null)
 	{
 		if(isset($this->_modules[$id]))
-			throw new TConfigurationException('application_moduleid_duplicated',$id);
+			throw new TConfigurationException('application_moduleid_duplicated', $id);
 		else
 			$this->_modules[$id]=$module;
 	}
@@ -10563,7 +10563,7 @@ 
 			return null;
 				if($this->_modules[$id]===null)
 		{
-			$module = $this->internalLoadModule($id, true);
+			$module=$this->internalLoadModule($id, true);
 			$module[0]->init($module[1]);
 		}
 		return $this->_modules[$id];
@@ -10718,38 +10718,38 @@ 
 		foreach($initProperties as $name=>$value)
 		{
 			if($name==='lazy') continue;
-			$module->setSubProperty($name,$value);
+			$module->setSubProperty($name, $value);
 		}
-		$this->setModule($id,$module);
+		$this->setModule($id, $module);
 				$this->_lazyModules[$id]=null;
-		return array($module,$configElement);
+		return array($module, $configElement);
 	}
-	public function applyConfiguration($config,$withinService=false)
+	public function applyConfiguration($config, $withinService=false)
 	{
 		if($config->getIsEmpty())
 			return;
 				foreach($config->getAliases() as $alias=>$path)
-			Prado::setPathOfAlias($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);
+				$this->setSubProperty($name, $value);
 		}
 		if(empty($this->_services))
-			$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
+			$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);
-				$this->_parameters->add($id,$component);
+					$component->setSubProperty($name, $value);
+				$this->_parameters->add($id, $component);
 			}
 			else
-				$this->_parameters->add($id,$parameter);
+				$this->_parameters->add($id, $parameter);
 		}
 				$modules=array();
 		foreach($config->getModules() as $id=>$moduleConfig)
@@ -10757,7 +10757,7 @@ 
 			if(!is_string($id))
 				$id='_module'.count($this->_lazyModules);
 			$this->_lazyModules[$id]=$moduleConfig;
-			if($module = $this->internalLoadModule($id))
+			if($module=$this->internalLoadModule($id))
 				$modules[]=$module;
 		}
 		foreach($modules as $module)
@@ -10770,12 +10770,12 @@ 
 				$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);
-				$this->applyConfiguration($c,$withinService);
+				$this->applyConfiguration($c, $withinService);
 			}
 		}
 	}
@@ -10783,16 +10783,16 @@ 
 	{
 		if($this->_configFile!==null)
 		{
-			if($this->_cacheFile===null || @filemtime($this->_cacheFile)<filemtime($this->_configFile))
+			if($this->_cacheFile===null || @filemtime($this->_cacheFile) < filemtime($this->_configFile))
 			{
 				$config=new TApplicationConfiguration;
 				$config->loadFromFile($this->_configFile);
 				if($this->_cacheFile!==null)
-					file_put_contents($this->_cacheFile,serialize($config),LOCK_EX);
+					file_put_contents($this->_cacheFile, serialize($config), LOCK_EX);
 			}
 			else
 				$config=unserialize(file_get_contents($this->_cacheFile));
-			$this->applyConfiguration($config,false);
+			$this->applyConfiguration($config, false);
 		}
 		if(($serviceID=$this->getRequest()->resolveRequest(array_keys($this->_services)))===null)
 			$serviceID=$this->getPageServiceID();
@@ -10802,68 +10802,68 @@ 
 	{
 		if(isset($this->_services[$serviceID]))
 		{
-			list($serviceClass,$initProperties,$configElement)=$this->_services[$serviceID];
+			list($serviceClass, $initProperties, $configElement)=$this->_services[$serviceID];
 			$service=Prado::createComponent($serviceClass);
 			if(!($service instanceof IService))
-				throw new THttpException(500,'application_service_invalid',$serviceClass);
+				throw new THttpException(500, 'application_service_invalid', $serviceClass);
 			if(!$service->getEnabled())
-				throw new THttpException(500,'application_service_unavailable',$serviceClass);
+				throw new THttpException(500, 'application_service_unavailable', $serviceClass);
 			$service->setID($serviceID);
 			$this->setService($service);
 			foreach($initProperties as $name=>$value)
-				$service->setSubProperty($name,$value);
+				$service->setSubProperty($name, $value);
 			if($configElement!==null)
 			{
 				$config=new TApplicationConfiguration;
 				if($this->getConfigurationType()==self::CONFIG_TYPE_PHP)
-					$config->loadFromPhp($configElement,$this->getBasePath());
+					$config->loadFromPhp($configElement, $this->getBasePath());
 				else
-					$config->loadFromXml($configElement,$this->getBasePath());
-				$this->applyConfiguration($config,true);
+					$config->loadFromXml($configElement, $this->getBasePath());
+				$this->applyConfiguration($config, true);
 			}
 			$service->init($configElement);
 		}
 		else
-			throw new THttpException(500,'application_service_unknown',$serviceID);
+			throw new THttpException(500, 'application_service_unknown', $serviceID);
 	}
 	public function onError($param)
 	{
-		Prado::log($param->getMessage(),TLogger::ERROR,'System.TApplication');
-		$this->raiseEvent('OnError',$this,$param);
-		$this->getErrorHandler()->handleError($this,$param);
+		Prado::log($param->getMessage(), TLogger::ERROR, 'System.TApplication');
+		$this->raiseEvent('OnError', $this, $param);
+		$this->getErrorHandler()->handleError($this, $param);
 	}
 	public function onBeginRequest()
 	{
-		$this->raiseEvent('OnBeginRequest',$this,null);
+		$this->raiseEvent('OnBeginRequest', $this, null);
 	}
 	public function onAuthentication()
 	{
-		$this->raiseEvent('OnAuthentication',$this,null);
+		$this->raiseEvent('OnAuthentication', $this, null);
 	}
 	public function onAuthenticationComplete()
 	{
-		$this->raiseEvent('OnAuthenticationComplete',$this,null);
+		$this->raiseEvent('OnAuthenticationComplete', $this, null);
 	}
 	public function onAuthorization()
 	{
-		$this->raiseEvent('OnAuthorization',$this,null);
+		$this->raiseEvent('OnAuthorization', $this, null);
 	}
 	public function onAuthorizationComplete()
 	{
-		$this->raiseEvent('OnAuthorizationComplete',$this,null);
+		$this->raiseEvent('OnAuthorizationComplete', $this, null);
 	}
 	public function onLoadState()
 	{
 		$this->loadGlobals();
-		$this->raiseEvent('OnLoadState',$this,null);
+		$this->raiseEvent('OnLoadState', $this, null);
 	}
 	public function onLoadStateComplete()
 	{
-		$this->raiseEvent('OnLoadStateComplete',$this,null);
+		$this->raiseEvent('OnLoadStateComplete', $this, null);
 	}
 	public function onPreRunService()
 	{
-		$this->raiseEvent('OnPreRunService',$this,null);
+		$this->raiseEvent('OnPreRunService', $this, null);
 	}
 	public function runService()
 	{
@@ -10872,24 +10872,24 @@ 
 	}
 	public function onSaveState()
 	{
-		$this->raiseEvent('OnSaveState',$this,null);
+		$this->raiseEvent('OnSaveState', $this, null);
 		$this->saveGlobals();
 	}
 	public function onSaveStateComplete()
 	{
-		$this->raiseEvent('OnSaveStateComplete',$this,null);
+		$this->raiseEvent('OnSaveStateComplete', $this, null);
 	}
 	public function onPreFlushOutput()
 	{
-		$this->raiseEvent('OnPreFlushOutput',$this,null);
+		$this->raiseEvent('OnPreFlushOutput', $this, null);
 	}
-	public function flushOutput($continueBuffering = true)
+	public function flushOutput($continueBuffering=true)
 	{
 		$this->getResponse()->flush($continueBuffering);
 	}
 	public function onEndRequest()
 	{
-		$this->flushOutput(false); 		$this->saveGlobals();  		$this->raiseEvent('OnEndRequest',$this,null);
+		$this->flushOutput(false); $this->saveGlobals(); $this->raiseEvent('OnEndRequest', $this, null);
 	}
 }
 class TApplicationMode extends TEnumerable
@@ -10913,14 +10913,14 @@ 
 	{
 		if(Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
-			$fcontent = include $fname;
-			$this->loadFromPhp($fcontent,dirname($fname));
+			$fcontent=include $fname;
+			$this->loadFromPhp($fcontent, dirname($fname));
 		}
 		else
 		{
 			$dom=new TXmlDocument;
 			$dom->loadFromFile($fname);
-			$this->loadFromXml($dom,dirname($fname));
+			$this->loadFromXml($dom, dirname($fname));
 		}
 	}
 	public function getIsEmpty()
@@ -10935,20 +10935,20 @@ 
 			{
 				$this->_properties[$name]=$value;
 			}
-			$this->_empty = false;
+			$this->_empty=false;
 		}
 		if(isset($config['paths']) && is_array($config['paths']))
-			$this->loadPathsPhp($config['paths'],$configPath);
+			$this->loadPathsPhp($config['paths'], $configPath);
 		if(isset($config['modules']) && is_array($config['modules']))
-			$this->loadModulesPhp($config['modules'],$configPath);
+			$this->loadModulesPhp($config['modules'], $configPath);
 		if(isset($config['services']) && is_array($config['services']))
-			$this->loadServicesPhp($config['services'],$configPath);
+			$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);
+			$this->loadExternalXml($config['includes'], $configPath);
 	}
-	public function loadFromXml($dom,$configPath)
+	public function loadFromXml($dom, $configPath)
 	{
 				foreach($dom->getAttributes() as $name=>$value)
 		{
@@ -10960,19 +10960,19 @@ 
 			switch($element->getTagName())
 			{
 				case 'paths':
-					$this->loadPathsXml($element,$configPath);
+					$this->loadPathsXml($element, $configPath);
 					break;
 				case 'modules':
-					$this->loadModulesXml($element,$configPath);
+					$this->loadModulesXml($element, $configPath);
 					break;
 				case 'services':
-					$this->loadServicesXml($element,$configPath);
+					$this->loadServicesXml($element, $configPath);
 					break;
 				case 'parameters':
-					$this->loadParametersXml($element,$configPath);
+					$this->loadParametersXml($element, $configPath);
 					break;
 				case 'include':
-					$this->loadExternalXml($element,$configPath);
+					$this->loadExternalXml($element, $configPath);
 					break;
 				default:
 										break;
@@ -10985,14 +10985,14 @@ 
 		{
 			foreach($pathsNode['aliases'] as $id=>$path)
 			{
-				$path=str_replace('\\','/',$path);
-				if(preg_match('/^\\/|.:\\/|.:\\\\/',$path))						$p=realpath($path);
+				$path=str_replace('\\', '/', $path);
+				if(preg_match('/^\\/|.:\\/|.:\\\\/', $path))						$p=realpath($path);
 				else
 					$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
 				if($p===false || !is_dir($p))
-					throw new TConfigurationException('appconfig_aliaspath_invalid',$id,$path);
+					throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
 				if(isset($this->_aliases[$id]))
-					throw new TConfigurationException('appconfig_alias_redefined',$id);
+					throw new TConfigurationException('appconfig_alias_redefined', $id);
 				$this->_aliases[$id]=$p;
 			}
 		}
@@ -11000,11 +11000,11 @@ 
 		{
 			foreach($pathsNode['using'] as $namespace)
 			{
-				$this->_usings[] = $namespace;
+				$this->_usings[]=$namespace;
 			}
 		}
 	}
-	protected function loadPathsXml($pathsNode,$configPath)
+	protected function loadPathsXml($pathsNode, $configPath)
 	{
 		foreach($pathsNode->getElements() as $element)
 		{
@@ -11014,14 +11014,14 @@ 
 				{
 					if(($id=$element->getAttribute('id'))!==null && ($path=$element->getAttribute('path'))!==null)
 					{
-						$path=str_replace('\\','/',$path);
-						if(preg_match('/^\\/|.:\\/|.:\\\\/',$path))								$p=realpath($path);
+						$path=str_replace('\\', '/', $path);
+						if(preg_match('/^\\/|.:\\/|.:\\\\/', $path))								$p=realpath($path);
 						else
 							$p=realpath($configPath.DIRECTORY_SEPARATOR.$path);
 						if($p===false || !is_dir($p))
-							throw new TConfigurationException('appconfig_aliaspath_invalid',$id,$path);
+							throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
 						if(isset($this->_aliases[$id]))
-							throw new TConfigurationException('appconfig_alias_redefined',$id);
+							throw new TConfigurationException('appconfig_alias_redefined', $id);
 						$this->_aliases[$id]=$p;
 					}
 					else
@@ -11039,7 +11039,7 @@ 
 					break;
 				}
 				default:
-					throw new TConfigurationException('appconfig_paths_invalid',$element->getTagName());
+					throw new TConfigurationException('appconfig_paths_invalid', $element->getTagName());
 			}
 		}
 	}
@@ -11048,21 +11048,21 @@ 
 		foreach($modulesNode as $id=>$module)
 		{
 			if(!isset($module['class']))
-				throw new TConfigurationException('appconfig_moduletype_required',$id);
-			$type = $module['class'];
+				throw new TConfigurationException('appconfig_moduletype_required', $id);
+			$type=$module['class'];
 			unset($module['class']);
-			$properties = array();
+			$properties=array();
 			if(isset($module['properties']))
 			{
-				$properties = $module['properties'];
+				$properties=$module['properties'];
 				unset($module['properties']);
 			}
-			$properties['id'] = $id;
-			$this->_modules[$id]=array($type,$properties,$module);
+			$properties['id']=$id;
+			$this->_modules[$id]=array($type, $properties, $module);
 			$this->_empty=false;
 		}
 	}
-	protected function loadModulesXml($modulesNode,$configPath)
+	protected function loadModulesXml($modulesNode, $configPath)
 	{
 		foreach($modulesNode->getElements() as $element)
 		{
@@ -11072,33 +11072,33 @@ 
 				$id=$properties->itemAt('id');
 				$type=$properties->remove('class');
 				if($type===null)
-					throw new TConfigurationException('appconfig_moduletype_required',$id);
+					throw new TConfigurationException('appconfig_moduletype_required', $id);
 				$element->setParent(null);
 				if($id===null)
-					$this->_modules[]=array($type,$properties->toArray(),$element);
+					$this->_modules[]=array($type, $properties->toArray(), $element);
 				else
-					$this->_modules[$id]=array($type,$properties->toArray(),$element);
+					$this->_modules[$id]=array($type, $properties->toArray(), $element);
 				$this->_empty=false;
 			}
 			else
-				throw new TConfigurationException('appconfig_modules_invalid',$element->getTagName());
+				throw new TConfigurationException('appconfig_modules_invalid', $element->getTagName());
 		}
 	}
-	protected function loadServicesPhp($servicesNode,$configPath)
+	protected function loadServicesPhp($servicesNode, $configPath)
 	{
 		foreach($servicesNode as $id => $service)
 		{
 			if(!isset($service['class']))
 				throw new TConfigurationException('appconfig_servicetype_required');
-			$type = $service['class'];
-			$properties = isset($service['properties']) ? $service['properties'] : array();
+			$type=$service['class'];
+			$properties=isset($service['properties']) ? $service['properties'] : array();
 			unset($service['properties']);
-			$properties['id'] = $id;
-			$this->_services[$id] = array($type,$properties,$service);
-			$this->_empty = false;
+			$properties['id']=$id;
+			$this->_services[$id]=array($type, $properties, $service);
+			$this->_empty=false;
 		}
 	}
-	protected function loadServicesXml($servicesNode,$configPath)
+	protected function loadServicesXml($servicesNode, $configPath)
 	{
 		foreach($servicesNode->getElements() as $element)
 		{
@@ -11108,16 +11108,16 @@ 
 				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);
+					throw new TConfigurationException('appconfig_servicetype_required', $id);
 				$element->setParent(null);
-				$this->_services[$id]=array($type,$properties->toArray(),$element);
+				$this->_services[$id]=array($type, $properties->toArray(), $element);
 				$this->_empty=false;
 			}
 			else
-				throw new TConfigurationException('appconfig_services_invalid',$element->getTagName());
+				throw new TConfigurationException('appconfig_services_invalid', $element->getTagName());
 		}
 	}
-	protected function loadParametersPhp($parametersNode,$configPath)
+	protected function loadParametersPhp($parametersNode, $configPath)
 	{
 		foreach($parametersNode as $id => $parameter)
 		{
@@ -11125,20 +11125,20 @@ 
 			{
 				if(isset($parameter['class']))
 				{
-					$type = $parameter['class'];
+					$type=$parameter['class'];
 					unset($parameter['class']);
-					$properties = isset($service['properties']) ? $service['properties'] : array();
-					$properties['id'] = $id;
-					$this->_parameters[$id] = array($type,$properties);
+					$properties=isset($service['properties']) ? $service['properties'] : array();
+					$properties['id']=$id;
+					$this->_parameters[$id]=array($type, $properties);
 				}
 			}
 			else
 			{
-				$this->_parameters[$id] = $parameter;
+				$this->_parameters[$id]=$parameter;
 			}
 		}
 	}
-	protected function loadParametersXml($parametersNode,$configPath)
+	protected function loadParametersXml($parametersNode, $configPath)
 	{
 		foreach($parametersNode->getElements() as $element)
 		{
@@ -11155,21 +11155,21 @@ 
 						$this->_parameters[$id]=$value;
 				}
 				else
-					$this->_parameters[$id]=array($type,$properties->toArray());
+					$this->_parameters[$id]=array($type, $properties->toArray());
 				$this->_empty=false;
 			}
 			else
-				throw new TConfigurationException('appconfig_parameters_invalid',$element->getTagName());
+				throw new TConfigurationException('appconfig_parameters_invalid', $element->getTagName());
 		}
 	}
-	protected function loadExternalPhp($includeNode,$configPath)
+	protected function loadExternalPhp($includeNode, $configPath)
 	{
 		foreach($includeNode as $include)
 		{
-			$when = isset($include['when'])?true:false;
+			$when=isset($include['when']) ? true : false;
 			if(!isset($include['file']))
 				throw new TConfigurationException('appconfig_includefile_required');
-			$filePath = $include['file'];
+			$filePath=$include['file'];
 			if(isset($this->_includes[$filePath]))
 				$this->_includes[$filePath]='('.$this->_includes[$filePath].') || ('.$when.')';
 			else
@@ -11177,7 +11177,7 @@ 
 			$this->_empty=false;
 		}
 	}
-	protected function loadExternalXml($includeNode,$configPath)
+	protected function loadExternalXml($includeNode, $configPath)
 	{
 		if(($when=$includeNode->getAttribute('when'))===null)
 			$when=true;
@@ -11250,12 +11250,12 @@ 
 			if($cache->get(self::CACHE_NAME)===$content)
 				$saveFile=false;
 			else
-				$cache->set(self::CACHE_NAME,$content);
+				$cache->set(self::CACHE_NAME, $content);
 		}
 		if($saveFile)
 		{
 			$fileName=$this->getStateFilePath();
-			file_put_contents($fileName,$content,LOCK_EX);
+			file_put_contents($fileName, $content, LOCK_EX);
 		}
 	}
 }

Braces +169 added lines, -333 removed lines

@@ -46,8 +46,7 @@ 
 		{
 			$am=self::$_application->getAssetManager();
 			$url=$am->publishFilePath(self::getPathOfNamespace('System.'.$logoName,'.gif'));
-		}
-		else
+		} 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>';
 	}
@@ -71,8 +70,7 @@ 
 		if(self::$_application!==null && ($errorHandler=self::$_application->getErrorHandler())!==null)
 		{
 			$errorHandler->handleError(null,$exception);
-		}
-		else
+		} else
 		{
 			echo $exception;
 		}
@@ -126,8 +124,7 @@ 
 					return $component;
 				break;
 			}
-		}
-		else
+		} else
 			return new $type;
 	}
 	public static function using($namespace,$checkClassExistence=true)
@@ -138,31 +135,27 @@ 
 			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;
 			}
-		}
-		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());
@@ -171,8 +164,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('prado_using_invalid',$namespace);
 	}
 	public static function getPathOfNamespace($namespace, $ext='')
@@ -208,8 +200,7 @@ 
 				self::$_aliases[$alias]=$rp;
 			else
 				throw new TInvalidDataValueException('prado_aliasname_invalid',$alias);
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('prado_alias_invalid',$alias,$path);
 	}
 	public static function fatalError($msg)
@@ -246,8 +237,7 @@ 
 							echo "'". substr($str, 0, 70) . "...'";
 						else
 							echo "'" . $str . "'";
-					}
-					else if (is_int($item) || is_float($item))
+					} else if (is_int($item) || is_float($item))
 						echo $item;
 					else if (is_object($item))
 						echo get_class($item);
@@ -316,8 +306,7 @@ 
 			if(isset($trace[0]['file']) && isset($trace[0]['line']))
 				$msg.=" (line {$trace[0]['line']}, {$trace[0]['file']})";
 			$level=TLogger::DEBUG;
-		}
-		else
+		} else
 			$level=TLogger::INFO;
 		self::log($msg,$level,$category,$ctl);
 	}
@@ -622,8 +611,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');
@@ -645,15 +633,13 @@ 
 			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();
@@ -712,8 +698,7 @@ 
 				$result=$trace[0];
 			elseif(isset($trace[1]))
 				$result=$trace[1];
-		}
-		else if($exception instanceof TInvalidOperationException)
+		} else if($exception instanceof TInvalidOperationException)
 		{
 						if(($result=$this->getPropertyAccessTrace($trace,'__get'))===null)
 				$result=$this->getPropertyAccessTrace($trace,'__set');
@@ -745,8 +730,7 @@ 
 			{
 				$line=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
 				$source.="<div class=\"error\">".$line."</div>";
-			}
-			else
+			} else
 				$source.=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
 		}
 		return $source;
@@ -810,11 +794,9 @@ 
 			{
 				array_splice($this->_d,$index,0,array($item));
 				$this->_c++;
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('list_index_invalid',$index);
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 	public function remove($item)
@@ -825,11 +807,9 @@ 
 			{
 				$this->removeAt($index);
 				return $index;
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('list_item_inexistent');
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 	public function removeAt($index)
@@ -847,11 +827,9 @@ 
 					array_splice($this->_d,$index,1);
 					return $item;
 				}
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('list_index_invalid',$index);
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 	public function clear()
@@ -878,8 +856,7 @@ 
 				throw new TInvalidDataValueException('list_item_inexistent');
 			$this->insertAt($index, $item);
 			return $index;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 	public function insertAfter($baseitem, $item)
@@ -890,8 +867,7 @@ 
 				throw new TInvalidDataValueException('list_item_inexistent');
 			$this->insertAt($index + 1, $item);
 			return $index + 1;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 	public function toArray()
@@ -906,8 +882,7 @@ 
 				$this->clear();
 			foreach($data as $item)
 				$this->add($item);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 	public function mergeWith($data)
@@ -916,8 +891,7 @@ 
 		{
 			foreach($data as $item)
 				$this->add($item);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 	public function offsetExists($offset)
@@ -1131,8 +1105,7 @@ 
 			{
 				if(($this->_recursiveLevel<0 || $level<$this->_recursiveLevel) && $this->validateDirectory($path))
 					$timestamps=array_merge($this->generateTimestamps($path,$level+1));
-			}
-			else if($this->validateFile($path))
+			} else if($this->validateFile($path))
 				$timestamps[$path]=filemtime($path);
 		}
 		closedir($dir);
@@ -1393,8 +1366,7 @@ 
 			}
 			$this->removeAtIndexInPriority($p[1],$p[0]);
 			return $p[2];
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('list_item_inexistent');
 	}
 	public function removeAt($index)
@@ -1552,13 +1524,11 @@ 
 				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);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function offsetExists($offset)
@@ -1649,11 +1619,9 @@ 
 				$value=$this->_d[$key];
 				unset($this->_d[$key]);
 				return $value;
-			}
-			else
+			} else
 				return null;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('map_readonly',get_class($this));
 	}
 	public function clear()
@@ -1677,8 +1645,7 @@ 
 				$this->clear();
 			foreach($data as $key=>$value)
 				$this->add($key,$value);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function mergeWith($data)
@@ -1687,8 +1654,7 @@ 
 		{
 			foreach($data as $key=>$value)
 				$this->add($key,$value);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function offsetExists($offset)
@@ -1862,13 +1828,11 @@ 
 			if(!isset($this->_d[$priority])) {
 				$this->_d[$priority]=array($key=>$value);
 				$this->_o=false;
-			}
-			else
+			} else
 				$this->_d[$priority][$key]=$value;
 			$this->_c++;
 			$this->_fd=null;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('map_readonly',get_class($this));
 		return $priority;
 	}
@@ -1896,8 +1860,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,12 +1874,10 @@ 
 					}
 					$this->_fd=null;
 					return $value;
-				}
-				else
+				} else
 					return null;
 			}
-		}
-		else
+		} else
 			throw new TInvalidOperationException('map_readonly',get_class($this));
 	}
 	public function clear()
@@ -1969,15 +1930,13 @@ 
 					$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);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function mergeWith($data)
@@ -1989,13 +1948,11 @@ 
 				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);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 	public function offsetExists($offset)
@@ -2038,8 +1995,7 @@ 
 				$this->_d[]=$item;
 				++$this->_c;
 			}
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('stack_data_not_iterable');
 	}
 	public function clear()
@@ -2224,13 +2180,11 @@ 
 				$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
+		} else
 			return $prefix."<{$this->_tagName}$attr />";
 	}
 	public function __toString()
@@ -2327,8 +2281,7 @@ 
 		{
 			fwrite($fw,$this->saveToString());
 			fclose($fw);
-		}
-		else
+		} else
 			throw new TIOException('xmldocument_file_write_failed',$file);
 	}
 	public function saveToString()
@@ -2374,8 +2327,7 @@ 
 			if($item->getParent()!==null)
 				$item->getParent()->getElements()->remove($item);
 			$item->setParent($this->_o);
-		}
-		else
+		} else
 			throw new TInvalidDataTypeException('xmlelementlist_xmlelement_required');
 	}
 	public function removeAt($index)
@@ -2419,8 +2371,7 @@ 
 				{
 					$this->_everyone=true;
 					break;
-				}
-				else if($user==='?')
+				} else if($user==='?')
 					$this->_guest=true;
 				else if($user==='@')
 					$this->_authenticated=true;
@@ -2530,8 +2481,7 @@ 
 					return ($decision>0);
 			}
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 	public function insertAt($index,$item)
@@ -2661,8 +2611,7 @@ 
 			if($module===false)
 				throw new TNotSupportedException('securitymanager_mcryptextension_initfailed');
 			return $module;
-		}
-		else
+		} else
 			throw new TNotSupportedException('securitymanager_mcryptextension_required');
 	}
 	public function hashData($data)
@@ -2802,8 +2751,7 @@ 
 					}
 				}
 				return '{'.$results.'}';
-			}
-			else
+			} else
 			{
 				foreach($value as $v)
 				{
@@ -2816,8 +2764,7 @@ 
 				}
 				return '['.$results.']';
 			}
-		}
-		else if(is_integer($value))
+		} else if(is_integer($value))
 			return "$value";
 		else if(is_float($value))
 		{
@@ -2837,8 +2784,7 @@ 
 						return str_replace($locale['decimal_point'], '.', "$value");
 					break;
 			}
-		}
-		else if(is_object($value))
+		} else if(is_object($value))
 			if ($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
 			else
@@ -2925,12 +2871,10 @@ 
 						$name=urlencode($name.'[]');
 						foreach($value as $v)
 							$url.=$amp.$name.'='.urlencode($v);
-					}
-					else
+					} else
 						$url.=$amp.urlencode($name).'='.urlencode($value);
 				}
-			}
-			else
+			} else
 			{
 				foreach($getItems as $name=>$value)
 				{
@@ -2938,8 +2882,7 @@ 
 					{
 						foreach($value as $v)
 							$url.=$amp.$name.'[]='.$v;
-					}
-					else
+					} else
 						$url.=$amp.$name.'='.$value;
 				}
 			}
@@ -2977,14 +2920,12 @@ 
 							$getVariables[substr($name,0,$pos)][]=$value;
 						else
 							$getVariables[$name]=$value;
-					}
-					else
+					} else
 						$getVariables[$path]='';
 				}
 			}
 			return $getVariables;
-		}
-		else
+		} else
 			return array();
 	}
 }
@@ -3068,8 +3009,7 @@ 
 				$port=$_SERVER['SERVER_PORT'];
 				if(($port!=80 && !$secure) || ($port!=443 && $secure))
 					$url.=':'.$port;
-			}
-			else
+			} else
 				$url.=$_SERVER['HTTP_HOST'];
 			$url.=$this->getRequestUri();
 			$this->_url=new TUri($url);
@@ -3139,8 +3079,7 @@ 
 				{
 					$this->_urlManager=new TUrlManager;
 					$this->_urlManager->init(null);
-				}
-				else
+				} else
 				{
 					$this->_urlManager=$this->getApplication()->getModule($this->_urlManagerID);
 					if($this->_urlManager===null)
@@ -3205,8 +3144,7 @@ 
 		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;
@@ -3261,8 +3199,7 @@ 
 		try
 		{
 			return get_browser();
-		}
-		catch(TPhpErrorException $e)
+		} catch(TPhpErrorException $e)
 		{
 			throw new TConfigurationException('httprequest_browscap_required');
 		}
@@ -3316,8 +3253,7 @@ 
 					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));
@@ -3420,8 +3356,7 @@ 
 			$value=$this->_items[$key];
 			unset($this->_items[$key]);
 			return $value;
-		}
-		else
+		} else
 			return null;
 	}
 	public function clear()
@@ -3468,8 +3403,7 @@ 
 			parent::insertAt($index,$item);
 			if($this->_o instanceof THttpResponse)
 				$this->_o->addCookie($item);
-		}
-		else
+		} else
 			throw new TInvalidDataTypeException('httpcookiecollection_httpcookie_required');
 	}
 	public function removeAt($index)
@@ -3599,8 +3533,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);
 		}
@@ -3772,7 +3705,7 @@ 
 		$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");
 			}
@@ -3836,8 +3769,7 @@ 
 		{
 			foreach($headers as $h)
 				header($h);
-		}
-		else
+		} else
 		{
 			header('Pragma: public');
 			header('Expires: 0');
@@ -3900,13 +3832,11 @@ 
 				{
 					$this->_bufferOutput = false;
 					ob_end_flush();
-				}
-				else
+				} else
 					ob_flush();
 				flush();
 			}
-		}
-		else
+		} else
 			flush();
 	}
 	protected function ensureHttpHeaderSent()
@@ -3992,8 +3922,7 @@ 
 				$cookie->getSecure(),
 				$cookie->getHttpOnly()
 			);
-		}
-		else {
+		} else {
 			setcookie(
 				$cookie->getName(),
 				$cookie->getValue(),
@@ -4173,13 +4102,11 @@ 
       {
 				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');
@@ -4213,8 +4140,7 @@ 
 			{
 				ini_set('session.gc_probability',$value);
 				ini_set('session.gc_divisor','100');
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('httpsession_gcprobability_invalid',$value);
 		}
 	}
@@ -4300,8 +4226,7 @@ 
 			$value=$_SESSION[$key];
 			unset($_SESSION[$key]);
 			return $value;
-		}
-		else
+		} else
 			return null;
 	}
 	public function clear()
@@ -4617,10 +4542,8 @@ 
 					return $this->_id;
 				else
 					return ($this->_uid=$prefix.self::ID_SEPARATOR.$this->_id);
-			}
-			else					return $this->_id;
-		}
-		else
+			} else					return $this->_id;
+		} else
 			return $this->_uid;
 	}
 	public function focus()
@@ -4696,8 +4619,7 @@ 
 				if(!$control->getVisible(false))
 					return false;
 			return true;
-		}
-		else
+		} else
 			return $this->getViewState('Visible',true);
 	}
 	public function setVisible($value)
@@ -4712,8 +4634,7 @@ 
 				if(!$control->getViewState('Enabled',true))
 					return false;
 			return true;
-		}
-		else
+		} else
 			return $this->getViewState('Enabled',true);
 	}
 	public function setEnabled($value)
@@ -4771,8 +4692,7 @@ 
 				if($control->_flags & self::IS_DISABLE_VIEWSTATE)
 					return false;
 			return true;
-		}
-		else
+		} else
 			return !($this->_flags & self::IS_DISABLE_VIEWSTATE);
 	}
 	public function setEnableViewState($value)
@@ -4810,8 +4730,7 @@ 
 			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
 				$this->_viewState[$key]=$this->_tempState[$key];
 			return $this->_tempState[$key];
-		}
-		else
+		} else
 			return $defaultValue;
 	}
 	public function setViewState($key,$value,$defaultValue=null)
@@ -4823,8 +4742,7 @@ 
 				unset($this->_viewState[$key]);
 			else
 				$this->_viewState[$key]=$value;
-		}
-		else
+		} else
 		{
 			unset($this->_viewState[$key]);
 			if($value===$defaultValue)
@@ -4913,8 +4831,7 @@ 
 					$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;
@@ -5038,8 +4955,9 @@ 
 	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)
@@ -5067,8 +4985,7 @@ 
 				{
 					$state=$this->_rf[self::RF_CHILD_STATE][$control->_id];
 					unset($this->_rf[self::RF_CHILD_STATE][$control->_id]);
-				}
-				else
+				} else
 					$state=null;
 				$control->loadStateRecursive($state,!($this->_flags & self::IS_DISABLE_VIEWSTATE));
 				if($this->_stage>=self::CS_LOADED)
@@ -5301,8 +5218,7 @@ 
 			{
 				$this->_rf[self::RF_CONTROLSTATE]=&$state[1];
 				unset($state[1]);
-			}
-			else
+			} else
 				unset($this->_rf[self::RF_CONTROLSTATE]);
 			if($needViewState)
 			{
@@ -5366,8 +5282,7 @@ 
 		{
 			$page->applyControlStyleSheet($this);
 			$this->_flags |= self::IS_STYLESHEET_APPLIED;
-		}
-		else if($this->_flags & self::IS_STYLESHEET_APPLIED)
+		} else if($this->_flags & self::IS_STYLESHEET_APPLIED)
 			throw new TInvalidOperationException('control_stylesheet_applied',get_class($this));
 	}
 	private function clearCachedUniqueID($recursive)
@@ -5430,8 +5345,7 @@ 
 		{
 			parent::insertAt($index,$item);
 			$this->_o->addedControl($item);
-		}
-		else if(is_string($item) || ($item instanceof IRenderable))
+		} else if(is_string($item) || ($item instanceof IRenderable))
 			parent::insertAt($index,$item);
 		else
 			throw new TInvalidDataTypeException('controlcollection_control_required');
@@ -5591,8 +5505,7 @@ 
 				else if($item[0]===self::TYPE_DATABINDING)
 					$this->_bindings[$id]=$item[1];
 				$this->_items[$id]='';
-			}
-			else
+			} else
 				$this->_items[$id]=$item;
 		}
 	}
@@ -6739,8 +6652,7 @@ 
 			if(!isset(self::$_template[$class]))
 				self::$_template[$class]=$this->loadTemplate();
 			return self::$_template[$class];
-		}
-		else
+		} else
 			return $this->_localTemplate;
 	}
 	public function setTemplate($value)
@@ -6814,8 +6726,7 @@ 
 			$controls=$placeholder->getParent()->getControls();
 			$loc=$controls->remove($placeholder);
 			$controls->insertAt($loc,$content);
-		}
-		else
+		} else
 			throw new TConfigurationException('templatecontrol_placeholder_inexistent',$id);
 	}
 	protected function initRecursive($namingContainer=null)
@@ -6832,8 +6743,7 @@ 
 			$master->ensureChildControls();
 			foreach($this->_contents as $id=>$content)
 				$master->injectContent($id,$content);
-		}
-		else if(!empty($this->_contents))
+		} else if(!empty($this->_contents))
 			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
 		parent::initRecursive($namingContainer);
 	}
@@ -6853,8 +6763,7 @@ 
                                                 $control->Checked = (boolean) $arObj->{$key};
                                         elseif ($control instanceof TDatePicker)
                                                 $control->Date = $arObj->{$key};
-                                }
-                                else
+                                } else
                                 {
                                         foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
                                         {
@@ -6876,8 +6785,7 @@ 
                                         }
                                         break;
                                 }
-                        } 
-                        catch (Exception $ex)
+                        } catch (Exception $ex)
                         {
                                 if ($throwExceptions)
                                         throw $ex;
@@ -6900,8 +6808,7 @@ 
                                         $arObj->{$key} = $control->Checked;
                                 elseif ($control instanceof TDatePicker)
                                         $arObj->{$key} = $control->Date;
-                        } 
-                        catch (Exception $ex)
+                        } catch (Exception $ex)
                         {
                                 if ($throwExceptions)
                                         throw $ex;
@@ -6952,8 +6859,7 @@ 
  			$page->endFormRender($writer);
 			$cs->renderScriptFilesEnd($writer);
 			$cs->renderEndScripts($writer);
-		}
-		else
+		} else
 		{
 			$cs->renderHiddenFieldsBegin($writer);
 			$page->beginFormRender($writer);
@@ -7111,8 +7017,7 @@ 
 				$base = $dir;
 			}
 			return array($assets->getPublishedPath($base), $assets->publishFilePath($base));
-		}
-		else
+		} else
 		{
 			return array($assets->getBasePath().str_replace($assets->getBaseUrl(),'',$base), $base);
 		}
@@ -7400,8 +7305,7 @@ 
 			{
 				foreach($value as $v)
 					$str.='<input type="hidden" name="'.$name.'[]" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
-			}
-			else
+			} else
 			{
 				$str.='<input type="hidden" name="'.$name.'" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
 			}
@@ -7510,8 +7414,7 @@ 
 				$this->processCallbackRequest($writer);
 			else
 				$this->processPostBackRequest($writer);
-		}
-		else
+		} else
 			$this->processNormalRequest($writer);
 		$this->_writer = null;
 	}
@@ -7657,8 +7560,7 @@ 
 			{
 				foreach($this->_validators as $validator)
 					$validator->validate();
-			}
-			else
+			} else
 			{
 				foreach($this->_validators as $validator)
 				{
@@ -7679,8 +7581,7 @@ 
 						return false;
 			}
 			return true;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('page_isvalid_unknown');
 	}
 	public function getTheme()
@@ -7865,14 +7766,12 @@ 
 				{
 					if($control->loadPostData($key,$postData))
 						$this->_controlsPostDataChanged[]=$control;
-				}
-				else if($control instanceof IPostBackEventHandler &&
+				} else if($control instanceof IPostBackEventHandler &&
 					empty($this->_postData[self::FIELD_POSTBACK_TARGET]))
 				{
 					$this->_postData->add(self::FIELD_POSTBACK_TARGET,$key);  				}
 				unset($this->_controlsRequiringPostData[$key]);
-			}
-			else if($beforeLoad)
+			} else if($beforeLoad)
 				$this->_restPostData->add($key,$value);
 		}
 		foreach($this->_controlsRequiringPostData as $key=>$value)
@@ -7883,8 +7782,7 @@ 
 				{
 					if($control->loadPostData($key,$this->_postData))
 						$this->_controlsPostDataChanged[]=$control;
-				}
-				else
+				} else
 					throw new TInvalidDataValueException('page_postbackcontrol_invalid',$key);
 				unset($this->_controlsRequiringPostData[$key]);
 			}
@@ -7933,8 +7831,7 @@ 
 			else
 				$focus=$this->_focus;
 			$this->getClientScript()->registerFocusControl($focus);
-		}
-		else if($this->_postData && ($lastFocus=$this->_postData->itemAt(self::FIELD_LASTFOCUS))!==null)
+		} else if($this->_postData && ($lastFocus=$this->_postData->itemAt(self::FIELD_LASTFOCUS))!==null)
 			$this->getClientScript()->registerFocusControl($lastFocus);
 		$this->_inFormRender=false;
 	}
@@ -8100,8 +7997,7 @@ 
 			{
 				if(($str=$sm->validateData($str))!==false)
 					return unserialize($str);
-			}
-			else
+			} else
 				return unserialize($str);
 		}
 		return null;
@@ -8142,8 +8038,7 @@ 
 					$this->_cache=$this->getApplication()->getModule($this->_cacheModuleID);
 					if(!($this->_cache instanceof ICache))
 						throw new TConfigurationException('outputcache_cachemoduleid_invalid',$this->_cacheModuleID);
-				}
-				else
+				} else
 					$this->_cache=$this->getApplication()->getCache();
 				if($this->_cache!==null)
 				{
@@ -8155,8 +8050,7 @@ 
 						$param->setCacheTime(isset($data[3])?$data[3]:0);
 						$this->onCheckDependency($param);
 						$this->_dataCached=$param->getIsValid();
-					}
-					else
+					} else
 						$this->_dataCached=false;
 					if($this->_dataCached)
 						list($this->_contents,$this->_state,$this->_actions,$this->_cacheTime)=$data;
@@ -8172,8 +8066,7 @@ 
 			$stack->push($this);
 			parent::initRecursive($namingContainer);
 			$stack->pop();
-		}
-		else
+		} else
 			parent::initRecursive($namingContainer);
 	}
 	protected function loadRecursive()
@@ -8184,8 +8077,7 @@ 
 			$stack->push($this);
 			parent::loadRecursive();
 			$stack->pop();
-		}
-		else
+		} else
 		{
 			if($this->_dataCached)
 				$this->performActions();
@@ -8214,8 +8106,7 @@ 
 			$stack->push($this);
 			parent::preRenderRecursive();
 			$stack->pop();
-		}
-		else
+		} else
 			parent::preRenderRecursive();
 	}
 	protected function loadStateRecursive(&$state,$needViewState=true)
@@ -8351,8 +8242,7 @@ 
 			$content=$textwriter->flush();
 			$data=array($content,$this->_state,$this->_actions,time());
 			$this->_cache->set($this->getCacheKey(),$data,$this->getDuration(),$this->getCacheDependency());
-		}
-		else
+		} else
 			parent::render($writer);
 	}
 }
@@ -8457,8 +8347,7 @@ 
 				$cache->set(self::TEMPLATE_CACHE_PREFIX.$fileName,array($template,$timestamps));
 				return $template;
 			}
-		}
-		else
+		} else
 			return null;
 	}
 	protected function getLocalizedTemplate($filename)
@@ -8578,8 +8467,7 @@ 
 						$component->createdOnTemplate($parent);
 					if($component->getAllowChildControls())
 						$controls[$key]=$component;
-				}
-				else if($component instanceof TComponent)
+				} else if($component instanceof TComponent)
 				{
 					$controls[$key]=$component;
 					if(isset($properties['id']))
@@ -8597,8 +8485,7 @@ 
 					else
 						$component->createdOnTemplate($parent);
 				}
-			}
-			else
+			} else
 			{
 				if($object[1] instanceof TCompositeLiteral)
 				{
@@ -8608,8 +8495,7 @@ 
 						$directChildren[]=$o;
 					else
 						$parent->addParsedObject($o);
-				}
-				else
+				} else
 				{
 					if($parent===$parentControl)
 						$directChildren[]=$object[1];
@@ -8680,8 +8566,7 @@ 
 				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))
@@ -8717,8 +8602,7 @@ 
 				default:						throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
 					break;
 			}
-		}
-		else
+		} else
 			$component->setSubProperty($name,$value);
 	}
 	protected function parse($input)
@@ -8755,8 +8639,7 @@ 
 						$stack[] = $type;
 						$container=$c-1;
 					}
-				}
-				else if(strpos($str,'</com:')===0)					{
+				} else if(strpos($str,'</com:')===0)					{
 					if($expectPropEnd)
 						continue;
 					if($matchStart>$textStart)
@@ -8772,8 +8655,7 @@ 
 						throw new TConfigurationException('template_closingtag_expected',$tag);
 					}
 					$container=$tpl[$container][0];
-				}
-				else if(strpos($str,'<%@')===0)					{
+				} else if(strpos($str,'<%@')===0)					{
 					if($expectPropEnd)
 						continue;
 					if($matchStart>$textStart)
@@ -8782,8 +8664,7 @@ 
 					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)					{
+				} else if(strpos($str,'<%')===0)					{
 					if($expectPropEnd)
 						continue;
 					if($matchStart>$textStart)
@@ -8805,8 +8686,7 @@ 
 						$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;
@@ -8826,8 +8706,7 @@ 
 								throw new TConfigurationException('template_property_duplicated',$name);
 							$tpl[$container][2][$name]=$value;
 						}
-					}
-					else  					{
+					} else  					{
 						$prop=strtolower($match[3][0]);
 						$stack[] = '@'.$prop;
 						if(!$expectPropEnd)
@@ -8838,8 +8717,7 @@ 
 							$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>");
@@ -8865,21 +8743,18 @@ 
 								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)					{
+				} 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
+				} else
 					throw new TConfigurationException('template_matching_unexpected',$match);
 			}
 			if(!empty($stack))
@@ -8890,8 +8765,7 @@ 
 			}
 			if($textStart<strlen($input))
 				$tpl[$c++]=array($container,substr($input,$textStart));
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			if(($e instanceof TException) && ($e instanceof TTemplateException))
 				throw $e;
@@ -8921,14 +8795,12 @@ 
 				{
 					$parent=null;
 					$objects[$id]=$object;
-				}
-				else
+				} else
 				{
 					$parent=$object[0];
 					$merged=array($parent,array($object[1]));
 				}
-			}
-			else
+			} else
 				$merged[1][]=$object[1];
 		}
 		if($parent!==null)
@@ -8961,8 +8833,7 @@ 
 					$attributes[$name]=$this->parseTemplateProperty(substr($value,1,strlen($value)-2),$match[2][1]+1);
 				else
 					$attributes[$name]=$this->parseTemplateProperty($value,$match[2][1]);
-			}
-			else
+			} else
 			{
 				if($value[0]==='\'' || $value[0]==='"')
 					$attributes[$name]=$this->parseAttribute(substr($value,1,strlen($value)-2));
@@ -9004,8 +8875,7 @@ 
 				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)
+		} else if(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS',$value,$matches) && $matches[0]===$value)
 		{
 			$value=$matches[1];
 			if($value[2]==='~')
@@ -9018,8 +8888,7 @@ 
 				$literal = trim(substr($value,3,strlen($value)-5));
 				return array(self::CONFIG_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '/').'/$literal'");
 			}
-		}
-		else
+		} else
 			return $value;
 	}
 	protected function validateAttributes($type,$attributes)
@@ -9039,15 +8908,13 @@ 
 										$subname=substr($name,0,$pos);
 					if(!$class->hasMethod('get'.$subname))
 						throw new TConfigurationException('template_property_unknown',$type,$subname);
-				}
-				else if(strncasecmp($name,'on',2)===0)
+				} else if(strncasecmp($name,'on',2)===0)
 				{
 										if(!$class->hasMethod($name))
 						throw new TConfigurationException('template_event_unknown',$type,$name);
 					else if(!is_string($att))
 						throw new TConfigurationException('template_eventhandler_invalid',$type,$name);
-				}
-				else
+				} else
 				{
 										if (! ($class->hasMethod('set'.$name) || $class->hasMethod('setjs'.$name) || $this->isClassBehaviorMethod($class,'set'.$name)) )
 					{
@@ -9055,8 +8922,7 @@ 
 							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)
+					} else if(is_array($att) && $att[0]!==self::CONFIG_EXPRESSION)
 					{
 						if(strcasecmp($name,'id')===0)
 							throw new TConfigurationException('template_controlid_invalid',$type);
@@ -9065,8 +8931,7 @@ 
 					}
 				}
 			}
-		}
-		else if(is_subclass_of($className,'TComponent') || $className==='TComponent')
+		} else if(is_subclass_of($className,'TComponent') || $className==='TComponent')
 		{
 			foreach($attributes as $name=>$att)
 			{
@@ -9077,8 +8942,7 @@ 
 										$subname=substr($name,0,$pos);
 					if(!$class->hasMethod('get'.$subname))
 						throw new TConfigurationException('template_property_unknown',$type,$subname);
-				}
-				else if(strncasecmp($name,'on',2)===0)
+				} else if(strncasecmp($name,'on',2)===0)
 					throw new TConfigurationException('template_event_forbidden',$type,$name);
 				else
 				{
@@ -9091,8 +8955,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 			throw new TConfigurationException('template_component_required',$type);
 	}
 	public function getIncludedFiles()
@@ -9112,8 +8975,7 @@ 
 						$line=$line-$this->_includeAtLine[$i]+1;
 						$srcFile=$this->_includedFiles[$i];
 						break;
-					}
-					else
+					} else
 						$line=$line-$this->_includeLines[$i]+1;
 				}
 			}
@@ -9299,8 +9161,7 @@ 
 					closedir($dir);
 					if($cacheValid)
 						$this->_skins=$skins;
-				}
-				else
+				} else
 				{
 					$cacheValid=true;
 					$this->_cssFiles=$cssFiles;
@@ -9425,19 +9286,15 @@ 
 							{
 								$setter='set'.$name;
 								$control->$setter($value);
-							}
-							else
+							} else
 								throw new TConfigurationException('theme_property_readonly',$type,$name);
-						}
-						else
+						} else
 							throw new TConfigurationException('theme_property_undefined',$type,$name);
-					}
-					else							$control->setSubProperty($name,$value);
+					} else							$control->setSubProperty($name,$value);
 				}
 			}
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 	public function getStyleSheetFiles()
@@ -9530,8 +9387,7 @@ 
 					$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
 			}
 			$pageConfig->loadFromFiles($this->getBasePath());
-		}
-		else
+		} else
 		{
 			$configCached=true;
 			$currentTimestamp=array();
@@ -9548,8 +9404,7 @@ 
 							$currentTimestamp[0]=$appConfigFile===null?0:@filemtime($appConfigFile);
 							if($currentTimestamp[0]>$timestamp || ($timestamp>0 && !$currentTimestamp[0]))
 								$configCached=false;
-						}
-						else
+						} else
 						{
 							$currentTimestamp[$fileName]=@filemtime($fileName);
 							if($currentTimestamp[$fileName]>$timestamp || ($timestamp>0 && !$currentTimestamp[$fileName]))
@@ -9557,8 +9412,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				$configCached=false;
 				$paths=explode('.',$pagePath);
@@ -9701,8 +9555,7 @@ 
 			$className=basename($path);
 			if(!class_exists($className,false))
 				include_once($path.Prado::CLASS_FILE_EXT);
-		}
-		else
+		} else
 		{
 			$className=$this->getBasePageClass();
 			Prado::using($className);
@@ -9784,8 +9637,7 @@ 
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent,dirname($fname),$configPagePath);
-		}
-		else
+		} else
 		{
 			$dom=new TXmlDocument;
 			if($dom->loadFromFile($fname))
@@ -10028,8 +9880,7 @@ 
 			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)
@@ -10100,8 +9951,7 @@ 
 						@copy($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
 					}
-				}
-				else
+				} else
 					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 			}
 			closedir($folder);
@@ -10230,8 +10080,7 @@ 
 					throw new TConfigurationException('globalization_source_path_failed',
 						$config['source']);
 					chmod($config['source'], PRADO_CHMOD); 				}
-			}
-			else
+			} else
 			{
 				throw new TConfigurationException("invalid source dir '{$config['source']}'");
 			}
@@ -10362,8 +10211,7 @@ 
 		{
 			$configFile=$basePath;
 			$basePath=dirname($configFile);
-		}
-		else
+		} else
 			$configFile=null;
 				$runtimePath=$basePath.DIRECTORY_SEPARATOR.self::RUNTIME_PATH;
 		if(is_writable($runtimePath))
@@ -10380,8 +10228,7 @@ 
 			}
 			$this->setBasePath($basePath);
 			$this->setRuntimePath($runtimePath);
-		}
-		else
+		} else
 			throw new TConfigurationException('application_runtimepath_invalid',$runtimePath);
 	}
 	public function run()
@@ -10402,8 +10249,7 @@ 
 				$this->$method();
 				$this->_step++;
 			}
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$this->onError($e);
 		}
@@ -10747,8 +10593,7 @@ 
 				foreach($parameter[1] as $name=>$value)
 					$component->setSubProperty($name,$value);
 				$this->_parameters->add($id,$component);
-			}
-			else
+			} else
 				$this->_parameters->add($id,$parameter);
 		}
 				$modules=array();
@@ -10789,8 +10634,7 @@ 
 				$config->loadFromFile($this->_configFile);
 				if($this->_cacheFile!==null)
 					file_put_contents($this->_cacheFile,serialize($config),LOCK_EX);
-			}
-			else
+			} else
 				$config=unserialize(file_get_contents($this->_cacheFile));
 			$this->applyConfiguration($config,false);
 		}
@@ -10822,8 +10666,7 @@ 
 				$this->applyConfiguration($config,true);
 			}
 			$service->init($configElement);
-		}
-		else
+		} else
 			throw new THttpException(500,'application_service_unknown',$serviceID);
 	}
 	public function onError($param)
@@ -10915,8 +10758,7 @@ 
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent,dirname($fname));
-		}
-		else
+		} else
 		{
 			$dom=new TXmlDocument;
 			$dom->loadFromFile($fname);
@@ -11023,8 +10865,7 @@ 
 						if(isset($this->_aliases[$id]))
 							throw new TConfigurationException('appconfig_alias_redefined',$id);
 						$this->_aliases[$id]=$p;
-					}
-					else
+					} else
 						throw new TConfigurationException('appconfig_alias_invalid');
 					$this->_empty=false;
 					break;
@@ -11079,8 +10920,7 @@ 
 				else
 					$this->_modules[$id]=array($type,$properties->toArray(),$element);
 				$this->_empty=false;
-			}
-			else
+			} else
 				throw new TConfigurationException('appconfig_modules_invalid',$element->getTagName());
 		}
 	}
@@ -11112,8 +10952,7 @@ 
 				$element->setParent(null);
 				$this->_services[$id]=array($type,$properties->toArray(),$element);
 				$this->_empty=false;
-			}
-			else
+			} else
 				throw new TConfigurationException('appconfig_services_invalid',$element->getTagName());
 		}
 	}
@@ -11131,8 +10970,7 @@ 
 					$properties['id'] = $id;
 					$this->_parameters[$id] = array($type,$properties);
 				}
-			}
-			else
+			} else
 			{
 				$this->_parameters[$id] = $parameter;
 			}
@@ -11153,12 +10991,10 @@ 
 						$this->_parameters[$id]=$element;
 					else
 						$this->_parameters[$id]=$value;
-				}
-				else
+				} else
 					$this->_parameters[$id]=array($type,$properties->toArray());
 				$this->_empty=false;
-			}
-			else
+			} else
 				throw new TConfigurationException('appconfig_parameters_invalid',$element->getTagName());
 		}
 	}

framework/Web/UI/ActiveControls/TCallbackClientSide.php

Doc Comments +4 added lines, -3 removed lines

@@ -199,7 +199,7 @@ 
 	}
 
 	/**
-	 * @return boolean true to post the inputs of the form on callback, default
+	 * @return string true to post the inputs of the form on callback, default
 	 * is post the inputs on callback.
 	 */
 	public function getPostState()
@@ -217,7 +217,7 @@ 
 	}
 
 	/**
-	 * @return integer callback request timeout.
+	 * @return string callback request timeout.
 	 */
 	public function getRequestTimeOut()
 	{
@@ -261,6 +261,7 @@ 
 	 * update. This will automatically set HasPrority to true.
 	 * @param boolean true enables the callback response to update the
 	 * viewstate.
+	 * @param boolean $value
 	 */
 	public function setEnablePageStateUpdate($value)
 	{
@@ -269,7 +270,7 @@ 
 	}
 
 	/**
-	 * @return boolean client-side viewstate will be updated on callback
+	 * @return boolean|string client-side viewstate will be updated on callback
 	 * response if true. Default is true.
 	 */
 	public function getEnablePageStateUpdate()

Spacing +3 added lines, -3 removed lines

@@ -264,7 +264,7 @@ 
 	 */
 	public function setEnablePageStateUpdate($value)
 	{
-		$enabled = TPropertyValue::ensureBoolean($value);
+		$enabled=TPropertyValue::ensureBoolean($value);
 		$this->setOption('EnablePageStateUpdate', $enabled);
 	}
 
@@ -274,7 +274,7 @@ 
 	 */
 	public function getEnablePageStateUpdate()
 	{
-		$option = $this->getOption('EnablePageStateUpdate');
+		$option=$this->getOption('EnablePageStateUpdate');
 		return ($option===null) ? true : $option;
 	}
 
@@ -292,7 +292,7 @@ 
 	public function setPostBackTarget($value)
 	{
 		if($value instanceof TControl)
-			$value = $value->getUniqueID();
+			$value=$value->getUniqueID();
 		$this->setOption('EventTarget', $value);
 	}
 

framework/PradoBase.php

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 if(!defined('PRADO_DIR'))
 	define('PRADO_DIR',dirname(__FILE__));
 /**
- * Defines the default permission for writable directories and files
- */
+	 * Defines the default permission for writable directories and files
+	 */
 if(!defined('PRADO_CHMOD'))
 	define('PRADO_CHMOD',0777);
 

framework/Collections/TList.php

Spacing +30 added lines, -30 removed lines

@@ -34,7 +34,7 @@ 
  * @package System.Collections
  * @since 3.0
  */
-class TList extends TComponent implements IteratorAggregate,ArrayAccess,Countable
+class TList extends TComponent implements IteratorAggregate, ArrayAccess, Countable
 {
 	/**
 	 * internal data storage
@@ -58,7 +58,7 @@ 
 	 * @param boolean whether the list is read-only
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
-	public function __construct($data=null,$readOnly=false)
+	public function __construct($data=null, $readOnly=false)
 	{
 		if($data!==null)
 			$this->copyFrom($data);
@@ -88,7 +88,7 @@ 
 	 */
 	public function getIterator()
 	{
-		return new ArrayIterator( $this->_d );
+		return new ArrayIterator($this->_d);
 	}
 
 	/**
@@ -118,10 +118,10 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if($index>=0 && $index<$this->_c)
+		if($index >= 0 && $index < $this->_c)
 			return $this->_d[$index];
 		else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+			throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
 
 	/**
@@ -132,8 +132,8 @@ 
 	 */
 	public function add($item)
 	{
-		$this->insertAt($this->_c,$item);
-		return $this->_c-1;
+		$this->insertAt($this->_c, $item);
+		return $this->_c - 1;
 	}
 
 	/**
@@ -145,22 +145,22 @@ 
 	 * @throws TInvalidDataValueException If the index specified exceeds the bound
 	 * @throws TInvalidOperationException if the list is read-only
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if(!$this->_r)
 		{
 			if($index===$this->_c)
 				$this->_d[$this->_c++]=$item;
-			else if($index>=0 && $index<$this->_c)
+			else if($index >= 0 && $index < $this->_c)
 			{
-				array_splice($this->_d,$index,0,array($item));
+				array_splice($this->_d, $index, 0, array($item));
 				$this->_c++;
 			}
 			else
-				throw new TInvalidDataValueException('list_index_invalid',$index);
+				throw new TInvalidDataValueException('list_index_invalid', $index);
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(($index=$this->indexOf($item))>=0)
+			if(($index=$this->indexOf($item)) >= 0)
 			{
 				$this->removeAt($index);
 				return $index;
@@ -185,7 +185,7 @@ 
 				throw new TInvalidDataValueException('list_item_inexistent');
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -199,7 +199,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if($index>=0 && $index<$this->_c)
+			if($index >= 0 && $index < $this->_c)
 			{
 				$this->_c--;
 				if($index===$this->_c)
@@ -207,15 +207,15 @@ 
 				else
 				{
 					$item=$this->_d[$index];
-					array_splice($this->_d,$index,1);
+					array_splice($this->_d, $index, 1);
 					return $item;
 				}
 			}
 			else
-				throw new TInvalidDataValueException('list_index_invalid',$index);
+				throw new TInvalidDataValueException('list_index_invalid', $index);
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -224,7 +224,7 @@ 
 	 */
 	public function clear()
 	{
-		for($i=$this->_c-1;$i>=0;--$i)
+		for($i=$this->_c - 1; $i >= 0; --$i)
 			$this->removeAt($i);
 	}
 
@@ -234,7 +234,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return $this->indexOf($item)>=0;
+		return $this->indexOf($item) >= 0;
 	}
 
 	/**
@@ -243,7 +243,7 @@ 
 	 */
 	public function indexOf($item)
 	{
-		if(($index=array_search($item,$this->_d,true))===false)
+		if(($index=array_search($item, $this->_d, true))===false)
 			return -1;
 		else
 			return $index;
@@ -262,7 +262,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
+			if(($index=$this->indexOf($baseitem))==-1)
 				throw new TInvalidDataValueException('list_item_inexistent');
 
 			$this->insertAt($index, $item);
@@ -270,7 +270,7 @@ 
 			return $index;
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -286,7 +286,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
+			if(($index=$this->indexOf($baseitem))==-1)
 				throw new TInvalidDataValueException('list_item_inexistent');
 
 			$this->insertAt($index + 1, $item);
@@ -294,7 +294,7 @@ 
 			return $index + 1;
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -315,7 +315,7 @@ 
 	{
 		if(is_array($data) || ($data instanceof Traversable))
 		{
-			if($this->_c>0)
+			if($this->_c > 0)
 				$this->clear();
 			foreach($data as $item)
 				$this->add($item);
@@ -349,7 +349,7 @@ 
 	 */
 	public function offsetExists($offset)
 	{
-		return ($offset>=0 && $offset<$this->_c);
+		return ($offset >= 0 && $offset < $this->_c);
 	}
 
 	/**
@@ -370,14 +370,14 @@ 
 	 * @param integer the offset to set item
 	 * @param mixed the item value
 	 */
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
 		if($offset===null || $offset===$this->_c)
-			$this->insertAt($this->_c,$item);
+			$this->insertAt($this->_c, $item);
 		else
 		{
 			$this->removeAt($offset);
-			$this->insertAt($offset,$item);
+			$this->insertAt($offset, $item);
 		}
 	}
 

framework/Collections/TMap.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TMap, TMapIterator classes
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2016 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Collections
- */
+	 * TMap, TMapIterator classes
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2016 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Collections
+	 */
 
 /**
  * TMap class

framework/Web/UI/WebControls/TDataGridPagerStyle.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TDataGridPagerStyle class file.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2016 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.WebControls
- */
+	 * TDataGridPagerStyle class file.
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2016 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.WebControls
+	 */
 
 Prado::using('System.Web.UI.WebControls.TDataGrid');
 

framework/I18N/core/TCache_Lite.php

Indentation +567 added lines, -567 removed lines

@@ -46,575 +46,575 @@
 class TCache_Lite
 {
 
-    // --- Private properties ---
-
-    /**
-    * Directory where to put the cache files
-    * (make sure to add a trailing slash)
-    *
-    * @var string $_cacheDir
-    */
-    protected $_cacheDir = '/tmp/';
-
-    /**
-    * Enable / disable caching
-    *
-    * (can be very usefull for the debug of cached scripts)
-    *
-    * @var boolean $_caching
-    */
-    protected $_caching = true;
-
-    /**
-    * Cache lifetime (in seconds)
-    *
-    * @var int $_lifeTime
-    */
-    protected $_lifeTime = 3600;
-
-    /**
-    * Enable / disable fileLocking
-    *
-    * (can avoid cache corruption under bad circumstances)
-    *
-    * @var boolean $_fileLocking
-    */
-    protected $_fileLocking = true;
-
-    /**
-    * Timestamp of the last valid cache
-    *
-    * @var int $_refreshTime
-    */
-    protected $_refreshTime;
-
-    /**
-    * File name (with path)
-    *
-    * @var string $_file
-    */
-    protected $_file;
-
-    /**
-    * Enable / disable write control (the cache is read just after writing
-    * to detect corrupt entries)
-    *
-    * Enable write control will lightly slow the cache writing but not the
-    * cache reading. Write control can detect some corrupt cache files but
-    * maybe it's not a perfect control
-    *
-    * @var boolean $_writeControl
-    */
-    protected $_writeControl = true;
-
-    /**
-    * Enable / disable read control
-    *
-    * If enabled, a control key is embeded in cache file and this key is
-    * compared with the one calculated after the reading.
-    *
-    * @var boolean $_writeControl
-    */
-    protected $_readControl = true;
-
-    /**
-    * Type of read control (only if read control is enabled)
-    *
-    * Available values are :
-    * 'md5' for a md5 hash control (best but slowest)
-    * 'crc32' for a crc32 hash control (lightly less safe but faster,
-    * better choice)
-    * 'strlen' for a length only test (fastest)
-    *
-    * @var boolean $_readControlType
-    */
-    protected $_readControlType = 'crc32';
-
-    /**
-    * Current cache id
-    *
-    * @var string $_id
-    */
-    protected $_id;
-
-    /**
-    * Current cache group
-    *
-    * @var string $_group
-    */
-    protected $_group;
-
-    /**
-    * Enable / Disable "Memory Caching"
-    *
-    * NB : There is no lifetime for memory caching !
-    *
-    * @var boolean $_memoryCaching
-    */
-    protected $_memoryCaching = false;
-
-    /**
-    * Enable / Disable "Only Memory Caching"
-    * (be carefull, memory caching is "beta quality")
-    *
-    * @var boolean $_onlyMemoryCaching
-    */
-    protected $_onlyMemoryCaching = false;
-
-    /**
-    * Memory caching array
-    *
-    * @var array $_memoryCachingArray
-    */
-    protected $_memoryCachingArray = array();
-
-    /**
-    * Memory caching counter
-    *
-    * @var int $memoryCachingCounter
-    */
-    protected $_memoryCachingCounter = 0;
-
-    /**
-    * Memory caching limit
-    *
-    * @var int $memoryCachingLimit
-    */
-    protected $_memoryCachingLimit = 1000;
-
-    /**
-    * File Name protection
-    *
-    * if set to true, you can use any cache id or group name
-    * if set to false, it can be faster but cache ids and group names
-    * will be used directly in cache file names so be carefull with
-    * special characters...
-    *
-    * @var boolean $fileNameProtection
-    */
-    protected $_fileNameProtection = true;
-
-    /**
-    * Enable / disable automatic serialization
-    *
-    * it can be used to save directly datas which aren't strings
-    * (but it's slower)
-    *
-    * @var boolean $_serialize
-    */
-    protected $_automaticSerialization = false;
-
-    // --- Public methods ---
-
-    /**
-    * Constructor
-    *
-    * $options is an assoc. Available options are :
-    * $options = array(
-    * 'cacheDir' => directory where to put the cache files (string),
-    * 'caching' => enable / disable caching (boolean),
-    * 'lifeTime' => cache lifetime in seconds (int),
-    * 'fileLocking' => enable / disable fileLocking (boolean),
-    * 'writeControl' => enable / disable write control (boolean),
-    * 'readControl' => enable / disable read control (boolean),
-    * 'readControlType' => type of read control 'crc32', 'md5', 'strlen',
-    * 'memoryCaching' => enable / disable memory caching (boolean),
-    * 'onlyMemoryCaching' => enable / disable only memory caching (boolean),
-    * 'memoryCachingLimit' => max nbr of records in memory caching (int),
-    * 'fileNameProtection' => enable / disable file name protection (boolean),
-    * 'automaticSerialization' => enable / disable serialization (boolean)
-    * );
-    *
-    * @param array $options options
-    * @access public
-    */
-    function __construct($options = array(null))
-    {
-        $availableOptions = array(	'automaticSerialization',
-        							'fileNameProtection',
-        							'memoryCaching',
-        							'onlyMemoryCaching',
-        							'memoryCachingLimit',
-        							'cacheDir',
-        							'caching',
-        							'lifeTime',
-        							'fileLocking',
-        							'writeControl',
-        							'readControl',
-        							'readControlType');
-        foreach($options as $key => $value) {
-            if(in_array($key, $availableOptions)) {
-                $property = '_'.$key;
-                $this->$property = $value;
-            }
-        }
-        $this->_refreshTime = time() - $this->_lifeTime;
+	// --- Private properties ---
+
+	/**
+	 * Directory where to put the cache files
+	 * (make sure to add a trailing slash)
+	 *
+	 * @var string $_cacheDir
+	 */
+	protected $_cacheDir = '/tmp/';
+
+	/**
+	 * Enable / disable caching
+	 *
+	 * (can be very usefull for the debug of cached scripts)
+	 *
+	 * @var boolean $_caching
+	 */
+	protected $_caching = true;
+
+	/**
+	 * Cache lifetime (in seconds)
+	 *
+	 * @var int $_lifeTime
+	 */
+	protected $_lifeTime = 3600;
+
+	/**
+	 * Enable / disable fileLocking
+	 *
+	 * (can avoid cache corruption under bad circumstances)
+	 *
+	 * @var boolean $_fileLocking
+	 */
+	protected $_fileLocking = true;
+
+	/**
+	 * Timestamp of the last valid cache
+	 *
+	 * @var int $_refreshTime
+	 */
+	protected $_refreshTime;
+
+	/**
+	 * File name (with path)
+	 *
+	 * @var string $_file
+	 */
+	protected $_file;
+
+	/**
+	 * Enable / disable write control (the cache is read just after writing
+	 * to detect corrupt entries)
+	 *
+	 * Enable write control will lightly slow the cache writing but not the
+	 * cache reading. Write control can detect some corrupt cache files but
+	 * maybe it's not a perfect control
+	 *
+	 * @var boolean $_writeControl
+	 */
+	protected $_writeControl = true;
+
+	/**
+	 * Enable / disable read control
+	 *
+	 * If enabled, a control key is embeded in cache file and this key is
+	 * compared with the one calculated after the reading.
+	 *
+	 * @var boolean $_writeControl
+	 */
+	protected $_readControl = true;
+
+	/**
+	 * Type of read control (only if read control is enabled)
+	 *
+	 * Available values are :
+	 * 'md5' for a md5 hash control (best but slowest)
+	 * 'crc32' for a crc32 hash control (lightly less safe but faster,
+	 * better choice)
+	 * 'strlen' for a length only test (fastest)
+	 *
+	 * @var boolean $_readControlType
+	 */
+	protected $_readControlType = 'crc32';
+
+	/**
+	 * Current cache id
+	 *
+	 * @var string $_id
+	 */
+	protected $_id;
+
+	/**
+	 * Current cache group
+	 *
+	 * @var string $_group
+	 */
+	protected $_group;
+
+	/**
+	 * Enable / Disable "Memory Caching"
+	 *
+	 * NB : There is no lifetime for memory caching !
+	 *
+	 * @var boolean $_memoryCaching
+	 */
+	protected $_memoryCaching = false;
+
+	/**
+	 * Enable / Disable "Only Memory Caching"
+	 * (be carefull, memory caching is "beta quality")
+	 *
+	 * @var boolean $_onlyMemoryCaching
+	 */
+	protected $_onlyMemoryCaching = false;
+
+	/**
+	 * Memory caching array
+	 *
+	 * @var array $_memoryCachingArray
+	 */
+	protected $_memoryCachingArray = array();
+
+	/**
+	 * Memory caching counter
+	 *
+	 * @var int $memoryCachingCounter
+	 */
+	protected $_memoryCachingCounter = 0;
+
+	/**
+	 * Memory caching limit
+	 *
+	 * @var int $memoryCachingLimit
+	 */
+	protected $_memoryCachingLimit = 1000;
+
+	/**
+	 * File Name protection
+	 *
+	 * if set to true, you can use any cache id or group name
+	 * if set to false, it can be faster but cache ids and group names
+	 * will be used directly in cache file names so be carefull with
+	 * special characters...
+	 *
+	 * @var boolean $fileNameProtection
+	 */
+	protected $_fileNameProtection = true;
+
+	/**
+	 * Enable / disable automatic serialization
+	 *
+	 * it can be used to save directly datas which aren't strings
+	 * (but it's slower)
+	 *
+	 * @var boolean $_serialize
+	 */
+	protected $_automaticSerialization = false;
+
+	// --- Public methods ---
+
+	/**
+	 * Constructor
+	 *
+	 * $options is an assoc. Available options are :
+	 * $options = array(
+	 * 'cacheDir' => directory where to put the cache files (string),
+	 * 'caching' => enable / disable caching (boolean),
+	 * 'lifeTime' => cache lifetime in seconds (int),
+	 * 'fileLocking' => enable / disable fileLocking (boolean),
+	 * 'writeControl' => enable / disable write control (boolean),
+	 * 'readControl' => enable / disable read control (boolean),
+	 * 'readControlType' => type of read control 'crc32', 'md5', 'strlen',
+	 * 'memoryCaching' => enable / disable memory caching (boolean),
+	 * 'onlyMemoryCaching' => enable / disable only memory caching (boolean),
+	 * 'memoryCachingLimit' => max nbr of records in memory caching (int),
+	 * 'fileNameProtection' => enable / disable file name protection (boolean),
+	 * 'automaticSerialization' => enable / disable serialization (boolean)
+	 * );
+	 *
+	 * @param array $options options
+	 * @access public
+	 */
+	function __construct($options = array(null))
+	{
+		$availableOptions = array(	'automaticSerialization',
+									'fileNameProtection',
+									'memoryCaching',
+									'onlyMemoryCaching',
+									'memoryCachingLimit',
+									'cacheDir',
+									'caching',
+									'lifeTime',
+									'fileLocking',
+									'writeControl',
+									'readControl',
+									'readControlType');
+		foreach($options as $key => $value) {
+			if(in_array($key, $availableOptions)) {
+				$property = '_'.$key;
+				$this->$property = $value;
+			}
+		}
+		$this->_refreshTime = time() - $this->_lifeTime;
 	}
 
-    /**
-    * Test if a cache is available and (if yes) return it
-    *
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @param boolean $doNotTestCacheValidity if set to true, the cache
-    * validity won't be tested
-    * @return string data of the cache (or false if no cache available)
-    * @access public
-    */
-    function get($id, $group = 'default', $doNotTestCacheValidity = false)
-    {
-        $this->_id = $id;
-        $this->_group = $group;
-        $data = false;
-        if ($this->_caching) {
-            $this->_setFileName($id, $group);
-            if ($this->_memoryCaching) {
-                if (isset($this->_memoryCachingArray[$this->_file])) {
-                    if ($this->_automaticSerialization) {
-                        return unserialize(
-                        			$this->_memoryCachingArray[$this->_file]);
-                    } else {
-                        return $this->_memoryCachingArray[$this->_file];
-                    }
-                } else {
-                    if ($this->_onlyMemoryCaching) {
-                        return false;
-                    }
-                }
-            }
-            if ($doNotTestCacheValidity) {
-                if (file_exists($this->_file)) {
-                    $data = $this->_read();
-                }
-            } else {
-                if (@filemtime($this->_file) > $this->_refreshTime) {
-                    $data = $this->_read();
-                }
-            }
-            if (($data) and ($this->_memoryCaching)) {
-                $this->_memoryCacheAdd($this->_file, $data);
-            }
-            if ($this->_automaticSerialization && is_string($data)) {
-                $data = unserialize($data);
-            }
-            return $data;
-        }
-        return false;
-    }
-
-    /**
-    * Save some data in a cache file
-    *
-    * @param string $data data to put in cache (can be another type than strings
-    * if automaticSerialization is on)
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @return boolean true if no problem
-    * @access public
-    */
-    function save($data, $id = null, $group = 'default')
-    {
-        if ($this->_caching) {
-            if ($this->_automaticSerialization) {
-                $data = serialize($data);
-            }
-            if (isset($id)) {
-                $this->_setFileName($id, $group);
-            }
-            if ($this->_memoryCaching) {
-                $this->_memoryCacheAdd($this->_file, $data);
-                if ($this->_onlyMemoryCaching) {
-                    return true;
-                }
-            }
-            if ($this->_writeControl) {
-                if (!$this->_writeAndControl($data)) {
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
-                    return false;
-                } else {
-                    return true;
-                }
-            } else {
-                return $this->_write($data);
-            }
-        }
-        return false;
-    }
-
-    /**
-    * Remove a cache file
-    *
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @return boolean true if no problem
-    * @access public
-    */
-    function remove($id, $group = 'default')
-    {
-        $this->_setFileName($id, $group);
-        if (!@unlink($this->_file)) {
-            $this->raiseError('TCache_Lite : Unable to remove cache !', -3);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-    * Clean the cache
-    *
-    * if no group is specified all cache files will be destroyed
-    * else only cache files of the specified group will be destroyed
-    *
-    * @param string $group name of the cache group
-    * @return boolean true if no problem
-    * @access public
-    */
-    function clean($group = false)
-    {
-        if ($this->_fileNameProtection) {
-            $motif = ($group) ? 'cache_'.md5($group).'_' : 'cache_';
-        } else {
-            $motif = ($group) ? 'cache_'.$group.'_' : 'cache_';
-        }
-        if ($this->_memoryCaching) {
-            while (list($key, $value) = each($this->_memoryCaching)) {
-                if (strpos($key, $motif, 0)) {
-                    unset($this->_memoryCaching[$key]);
-                    $this->_memoryCachingCounter =
-                    		$this->_memoryCachingCounter - 1;
-                }
-            }
-            if ($this->_onlyMemoryCaching) {
-                return true;
-            }
-        }
-        if (!($dh = opendir($this->_cacheDir))) {
-            $this->raiseError('TCache_Lite : Unable to open cache directory !');
-            return false;
-        }
-        while ($file = readdir($dh)) {
-            if (($file != '.') && ($file != '..')) {
-                $file = $this->_cacheDir . $file;
-                if (is_file($file)) {
-                    if (strpos($file, $motif, 0)) {
-                        if (!@unlink($file)) {
-             $this->raiseError('Cache_Lite : Unable to remove cache !', -3);
-                            return false;
-                        }
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-	    /**
-    * Set a new life time
-    *
-    * @param int $newLifeTime new life time (in seconds)
-    * @access public
-    */
-    function setLifeTime($newLifeTime)
-    {
-        $this->_lifeTime = $newLifeTime;
-        $this->_refreshTime = time() - $newLifeTime;
-    }
-
-    /**
-    *
-    * @access public
-    */
-    function saveMemoryCachingState($id, $group = 'default')
-    {
-        if ($this->_caching) {
-            $array = array(
-                'counter' => $this->_memoryCachingCounter,
-                'array' => $this->_memoryCachingState
-            );
-            $data = serialize($array);
-            $this->save($data, $id, $group);
-        }
-    }
-
-    /**
-    *
-    * @access public
-    */
-    function getMemoryCachingState($id, $group = 'default',
-    								$doNotTestCacheValidity = false)
-    {
-        if ($this->_caching) {
-            if ($data = $this->get($id, $group, $doNotTestCacheValidity))
-            {
-                $array = unserialize($data);
-                $this->_memoryCachingCounter = $array['counter'];
-                $this->_memoryCachingArray = $array['array'];
-            }
-        }
-    }
-
-    /**
-    * Return the cache last modification time
-    *
-    * BE CAREFUL : THIS METHOD IS FOR HACKING ONLY !
-    *
-    * @return int last modification time
-    */
-    function lastModified() {
-        return filemtime($this->cache->_file);
-    }
-
-    /**
-    * Trigger a PEAR error
-    *
-    * To improve performances, the PEAR.php file is included dynamically.
-    * The file is so included only when an error is triggered. So, in most
-    * cases, the file isn't included and perfs are much better.
-    *
-    * @param string $msg error message
-    * @param int $code error code
-    * @access public
-    */
-    function raiseError($msg, $code)
-    {
-       throw new Exception($msg);
-    }
-
-    // --- Private methods ---
-
-    /**
-    *
-    * @access private
-    */
-    function _memoryCacheAdd($id, $data)
-    {
-        $this->_memoryCachingArray[$this->_file] = $data;
-        if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
-            list($key, $value) = each($this->_memoryCachingArray);
-            unset($this->_memoryCachingArray[$key]);
-        } else {
-            $this->_memoryCachingCounter = $this->_memoryCachingCounter + 1;
-        }
-    }
-
-    /**
-    * Make a file name (with path)
-    *
-    * @param string $id cache id
-    * @param string $group name of the group
-    * @access private
-    */
-    function _setFileName($id, $group)
-    {
-        if ($this->_fileNameProtection) {
-            $this->_file = ($this->_cacheDir.'cache_'.md5($group).'_'
-            						.md5($id));
-        } else {
-            $this->_file = $this->_cacheDir.'cache_'.$group.'_'.$id;
-        }
-    }
-
-    function getCacheFile()
-    {
-    	return $this->_file;
-    }
-
-    /**
-    * Read the cache file and return the content
-    *
-    * @return string content of the cache file
-    * @access private
-    */
-    function _read()
-    {
-        $fp = @fopen($this->_file, "rb");
-        if ($this->_fileLocking) @flock($fp, LOCK_SH);
-        if ($fp) {
-        	// because the filesize can be cached by PHP itself...
-            clearstatcache();
-            $length = @filesize($this->_file);
-            if ($this->_readControl) {
-                $hashControl = @fread($fp, 32);
-                $length = $length - 32;
-            }
-            $data = @fread($fp, $length);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
-            @fclose($fp);
-            if ($this->_readControl) {
-                $hashData = $this->_hash($data, $this->_readControlType);
-                if ($hashData != $hashControl) {
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
-                    return false;
-                }
-            }
-            return $data;
-        }
-        $this->raiseError('Cache_Lite : Unable to read cache !', -2);
-        return false;
-    }
-
-    /**
-    * Write the given data in the cache file
-    *
-    * @param string $data data to put in cache
-    * @return boolean true if ok
-    * @access private
-    */
-    function _write($data)
-    {
-        $fp = @fopen($this->_file, "wb");
-        if ($fp) {
-            if ($this->_fileLocking) @flock($fp, LOCK_EX);
-            if ($this->_readControl) {
-                @fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
-            }
-            $len = strlen($data);
-            @fwrite($fp, $data, $len);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
-            @fclose($fp);
-            return true;
-        }
-        $this->raiseError('Cache_Lite : Unable to write cache !', -1);
-        return false;
-    }
-
-    /**
-    * Write the given data in the cache file and control it just after to avoid
-    * corrupted cache entries
-    *
-    * @param string $data data to put in cache
-    * @return boolean true if the test is ok
-    * @access private
-    */
-    function _writeAndControl($data)
-    {
-        $this->_write($data);
-        $dataRead = $this->_read($data);
-        return ($dataRead==$data);
-    }
-
-    /**
-    * Make a control key with the string containing datas
-    *
-    * @param string $data data
-    * @param string $controlType type of control 'md5', 'crc32' or 'strlen'
-    * @return string control key
-    * @access private
-    */
-    function _hash($data, $controlType)
-    {
-        switch ($controlType) {
-        case 'md5':
-            return md5($data);
-        case 'crc32':
-            return sprintf('% 32d', crc32($data));
-        case 'strlen':
-            return sprintf('% 32d', strlen($data));
-        default:
-            $this->raiseError('Unknown controlType ! '.
-            '(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
-        }
-    }
+	/**
+	 * Test if a cache is available and (if yes) return it
+	 *
+	 * @param string $id cache id
+	 * @param string $group name of the cache group
+	 * @param boolean $doNotTestCacheValidity if set to true, the cache
+	 * validity won't be tested
+	 * @return string data of the cache (or false if no cache available)
+	 * @access public
+	 */
+	function get($id, $group = 'default', $doNotTestCacheValidity = false)
+	{
+		$this->_id = $id;
+		$this->_group = $group;
+		$data = false;
+		if ($this->_caching) {
+			$this->_setFileName($id, $group);
+			if ($this->_memoryCaching) {
+				if (isset($this->_memoryCachingArray[$this->_file])) {
+					if ($this->_automaticSerialization) {
+						return unserialize(
+									$this->_memoryCachingArray[$this->_file]);
+					} else {
+						return $this->_memoryCachingArray[$this->_file];
+					}
+				} else {
+					if ($this->_onlyMemoryCaching) {
+						return false;
+					}
+				}
+			}
+			if ($doNotTestCacheValidity) {
+				if (file_exists($this->_file)) {
+					$data = $this->_read();
+				}
+			} else {
+				if (@filemtime($this->_file) > $this->_refreshTime) {
+					$data = $this->_read();
+				}
+			}
+			if (($data) and ($this->_memoryCaching)) {
+				$this->_memoryCacheAdd($this->_file, $data);
+			}
+			if ($this->_automaticSerialization && is_string($data)) {
+				$data = unserialize($data);
+			}
+			return $data;
+		}
+		return false;
+	}
+
+	/**
+	 * Save some data in a cache file
+	 *
+	 * @param string $data data to put in cache (can be another type than strings
+	 * if automaticSerialization is on)
+	 * @param string $id cache id
+	 * @param string $group name of the cache group
+	 * @return boolean true if no problem
+	 * @access public
+	 */
+	function save($data, $id = null, $group = 'default')
+	{
+		if ($this->_caching) {
+			if ($this->_automaticSerialization) {
+				$data = serialize($data);
+			}
+			if (isset($id)) {
+				$this->_setFileName($id, $group);
+			}
+			if ($this->_memoryCaching) {
+				$this->_memoryCacheAdd($this->_file, $data);
+				if ($this->_onlyMemoryCaching) {
+					return true;
+				}
+			}
+			if ($this->_writeControl) {
+				if (!$this->_writeAndControl($data)) {
+					@touch($this->_file, time() - 2*abs($this->_lifeTime));
+					return false;
+				} else {
+					return true;
+				}
+			} else {
+				return $this->_write($data);
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Remove a cache file
+	 *
+	 * @param string $id cache id
+	 * @param string $group name of the cache group
+	 * @return boolean true if no problem
+	 * @access public
+	 */
+	function remove($id, $group = 'default')
+	{
+		$this->_setFileName($id, $group);
+		if (!@unlink($this->_file)) {
+			$this->raiseError('TCache_Lite : Unable to remove cache !', -3);
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Clean the cache
+	 *
+	 * if no group is specified all cache files will be destroyed
+	 * else only cache files of the specified group will be destroyed
+	 *
+	 * @param string $group name of the cache group
+	 * @return boolean true if no problem
+	 * @access public
+	 */
+	function clean($group = false)
+	{
+		if ($this->_fileNameProtection) {
+			$motif = ($group) ? 'cache_'.md5($group).'_' : 'cache_';
+		} else {
+			$motif = ($group) ? 'cache_'.$group.'_' : 'cache_';
+		}
+		if ($this->_memoryCaching) {
+			while (list($key, $value) = each($this->_memoryCaching)) {
+				if (strpos($key, $motif, 0)) {
+					unset($this->_memoryCaching[$key]);
+					$this->_memoryCachingCounter =
+							$this->_memoryCachingCounter - 1;
+				}
+			}
+			if ($this->_onlyMemoryCaching) {
+				return true;
+			}
+		}
+		if (!($dh = opendir($this->_cacheDir))) {
+			$this->raiseError('TCache_Lite : Unable to open cache directory !');
+			return false;
+		}
+		while ($file = readdir($dh)) {
+			if (($file != '.') && ($file != '..')) {
+				$file = $this->_cacheDir . $file;
+				if (is_file($file)) {
+					if (strpos($file, $motif, 0)) {
+						if (!@unlink($file)) {
+			 $this->raiseError('Cache_Lite : Unable to remove cache !', -3);
+							return false;
+						}
+					}
+				}
+			}
+		}
+		return true;
+	}
+
+		/**
+		 * Set a new life time
+		 *
+		 * @param int $newLifeTime new life time (in seconds)
+		 * @access public
+		 */
+	function setLifeTime($newLifeTime)
+	{
+		$this->_lifeTime = $newLifeTime;
+		$this->_refreshTime = time() - $newLifeTime;
+	}
+
+	/**
+	 *
+	 * @access public
+	 */
+	function saveMemoryCachingState($id, $group = 'default')
+	{
+		if ($this->_caching) {
+			$array = array(
+				'counter' => $this->_memoryCachingCounter,
+				'array' => $this->_memoryCachingState
+			);
+			$data = serialize($array);
+			$this->save($data, $id, $group);
+		}
+	}
+
+	/**
+	 *
+	 * @access public
+	 */
+	function getMemoryCachingState($id, $group = 'default',
+									$doNotTestCacheValidity = false)
+	{
+		if ($this->_caching) {
+			if ($data = $this->get($id, $group, $doNotTestCacheValidity))
+			{
+				$array = unserialize($data);
+				$this->_memoryCachingCounter = $array['counter'];
+				$this->_memoryCachingArray = $array['array'];
+			}
+		}
+	}
+
+	/**
+	 * Return the cache last modification time
+	 *
+	 * BE CAREFUL : THIS METHOD IS FOR HACKING ONLY !
+	 *
+	 * @return int last modification time
+	 */
+	function lastModified() {
+		return filemtime($this->cache->_file);
+	}
+
+	/**
+	 * Trigger a PEAR error
+	 *
+	 * To improve performances, the PEAR.php file is included dynamically.
+	 * The file is so included only when an error is triggered. So, in most
+	 * cases, the file isn't included and perfs are much better.
+	 *
+	 * @param string $msg error message
+	 * @param int $code error code
+	 * @access public
+	 */
+	function raiseError($msg, $code)
+	{
+	   throw new Exception($msg);
+	}
+
+	// --- Private methods ---
+
+	/**
+	 *
+	 * @access private
+	 */
+	function _memoryCacheAdd($id, $data)
+	{
+		$this->_memoryCachingArray[$this->_file] = $data;
+		if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
+			list($key, $value) = each($this->_memoryCachingArray);
+			unset($this->_memoryCachingArray[$key]);
+		} else {
+			$this->_memoryCachingCounter = $this->_memoryCachingCounter + 1;
+		}
+	}
+
+	/**
+	 * Make a file name (with path)
+	 *
+	 * @param string $id cache id
+	 * @param string $group name of the group
+	 * @access private
+	 */
+	function _setFileName($id, $group)
+	{
+		if ($this->_fileNameProtection) {
+			$this->_file = ($this->_cacheDir.'cache_'.md5($group).'_'
+									.md5($id));
+		} else {
+			$this->_file = $this->_cacheDir.'cache_'.$group.'_'.$id;
+		}
+	}
+
+	function getCacheFile()
+	{
+		return $this->_file;
+	}
+
+	/**
+	 * Read the cache file and return the content
+	 *
+	 * @return string content of the cache file
+	 * @access private
+	 */
+	function _read()
+	{
+		$fp = @fopen($this->_file, "rb");
+		if ($this->_fileLocking) @flock($fp, LOCK_SH);
+		if ($fp) {
+			// because the filesize can be cached by PHP itself...
+			clearstatcache();
+			$length = @filesize($this->_file);
+			if ($this->_readControl) {
+				$hashControl = @fread($fp, 32);
+				$length = $length - 32;
+			}
+			$data = @fread($fp, $length);
+			if ($this->_fileLocking) @flock($fp, LOCK_UN);
+			@fclose($fp);
+			if ($this->_readControl) {
+				$hashData = $this->_hash($data, $this->_readControlType);
+				if ($hashData != $hashControl) {
+					@touch($this->_file, time() - 2*abs($this->_lifeTime));
+					return false;
+				}
+			}
+			return $data;
+		}
+		$this->raiseError('Cache_Lite : Unable to read cache !', -2);
+		return false;
+	}
+
+	/**
+	 * Write the given data in the cache file
+	 *
+	 * @param string $data data to put in cache
+	 * @return boolean true if ok
+	 * @access private
+	 */
+	function _write($data)
+	{
+		$fp = @fopen($this->_file, "wb");
+		if ($fp) {
+			if ($this->_fileLocking) @flock($fp, LOCK_EX);
+			if ($this->_readControl) {
+				@fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
+			}
+			$len = strlen($data);
+			@fwrite($fp, $data, $len);
+			if ($this->_fileLocking) @flock($fp, LOCK_UN);
+			@fclose($fp);
+			return true;
+		}
+		$this->raiseError('Cache_Lite : Unable to write cache !', -1);
+		return false;
+	}
+
+	/**
+	 * Write the given data in the cache file and control it just after to avoid
+	 * corrupted cache entries
+	 *
+	 * @param string $data data to put in cache
+	 * @return boolean true if the test is ok
+	 * @access private
+	 */
+	function _writeAndControl($data)
+	{
+		$this->_write($data);
+		$dataRead = $this->_read($data);
+		return ($dataRead==$data);
+	}
+
+	/**
+	 * Make a control key with the string containing datas
+	 *
+	 * @param string $data data
+	 * @param string $controlType type of control 'md5', 'crc32' or 'strlen'
+	 * @return string control key
+	 * @access private
+	 */
+	function _hash($data, $controlType)
+	{
+		switch ($controlType) {
+		case 'md5':
+			return md5($data);
+		case 'crc32':
+			return sprintf('% 32d', crc32($data));
+		case 'strlen':
+			return sprintf('% 32d', strlen($data));
+		default:
+			$this->raiseError('Unknown controlType ! '.
+			'(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
+		}
+	}
 
 }
 

Spacing +105 added lines, -105 removed lines

@@ -54,7 +54,7 @@ 
     *
     * @var string $_cacheDir
     */
-    protected $_cacheDir = '/tmp/';
+    protected $_cacheDir='/tmp/';
 
     /**
     * Enable / disable caching
@@ -63,14 +63,14 @@ 
     *
     * @var boolean $_caching
     */
-    protected $_caching = true;
+    protected $_caching=true;
 
     /**
     * Cache lifetime (in seconds)
     *
     * @var int $_lifeTime
     */
-    protected $_lifeTime = 3600;
+    protected $_lifeTime=3600;
 
     /**
     * Enable / disable fileLocking
@@ -79,7 +79,7 @@ 
     *
     * @var boolean $_fileLocking
     */
-    protected $_fileLocking = true;
+    protected $_fileLocking=true;
 
     /**
     * Timestamp of the last valid cache
@@ -105,7 +105,7 @@ 
     *
     * @var boolean $_writeControl
     */
-    protected $_writeControl = true;
+    protected $_writeControl=true;
 
     /**
     * Enable / disable read control
@@ -115,7 +115,7 @@ 
     *
     * @var boolean $_writeControl
     */
-    protected $_readControl = true;
+    protected $_readControl=true;
 
     /**
     * Type of read control (only if read control is enabled)
@@ -128,7 +128,7 @@ 
     *
     * @var boolean $_readControlType
     */
-    protected $_readControlType = 'crc32';
+    protected $_readControlType='crc32';
 
     /**
     * Current cache id
@@ -151,7 +151,7 @@ 
     *
     * @var boolean $_memoryCaching
     */
-    protected $_memoryCaching = false;
+    protected $_memoryCaching=false;
 
     /**
     * Enable / Disable "Only Memory Caching"
@@ -159,28 +159,28 @@ 
     *
     * @var boolean $_onlyMemoryCaching
     */
-    protected $_onlyMemoryCaching = false;
+    protected $_onlyMemoryCaching=false;
 
     /**
     * Memory caching array
     *
     * @var array $_memoryCachingArray
     */
-    protected $_memoryCachingArray = array();
+    protected $_memoryCachingArray=array();
 
     /**
     * Memory caching counter
     *
     * @var int $memoryCachingCounter
     */
-    protected $_memoryCachingCounter = 0;
+    protected $_memoryCachingCounter=0;
 
     /**
     * Memory caching limit
     *
     * @var int $memoryCachingLimit
     */
-    protected $_memoryCachingLimit = 1000;
+    protected $_memoryCachingLimit=1000;
 
     /**
     * File Name protection
@@ -192,7 +192,7 @@ 
     *
     * @var boolean $fileNameProtection
     */
-    protected $_fileNameProtection = true;
+    protected $_fileNameProtection=true;
 
     /**
     * Enable / disable automatic serialization
@@ -202,7 +202,7 @@ 
     *
     * @var boolean $_serialize
     */
-    protected $_automaticSerialization = false;
+    protected $_automaticSerialization=false;
 
     // --- Public methods ---
 
@@ -228,9 +228,9 @@ 
     * @param array $options options
     * @access public
     */
-    function __construct($options = array(null))
+    function __construct($options=array(null))
     {
-        $availableOptions = array(	'automaticSerialization',
+        $availableOptions=array('automaticSerialization',
         							'fileNameProtection',
         							'memoryCaching',
         							'onlyMemoryCaching',
@@ -244,11 +244,11 @@ 
         							'readControlType');
         foreach($options as $key => $value) {
             if(in_array($key, $availableOptions)) {
-                $property = '_'.$key;
-                $this->$property = $value;
+                $property='_'.$key;
+                $this->$property=$value;
             }
         }
-        $this->_refreshTime = time() - $this->_lifeTime;
+        $this->_refreshTime=time() - $this->_lifeTime;
 	}
 
     /**
@@ -261,41 +261,41 @@ 
     * @return string data of the cache (or false if no cache available)
     * @access public
     */
-    function get($id, $group = 'default', $doNotTestCacheValidity = false)
+    function get($id, $group='default', $doNotTestCacheValidity=false)
     {
-        $this->_id = $id;
-        $this->_group = $group;
-        $data = false;
-        if ($this->_caching) {
+        $this->_id=$id;
+        $this->_group=$group;
+        $data=false;
+        if($this->_caching) {
             $this->_setFileName($id, $group);
-            if ($this->_memoryCaching) {
-                if (isset($this->_memoryCachingArray[$this->_file])) {
-                    if ($this->_automaticSerialization) {
+            if($this->_memoryCaching) {
+                if(isset($this->_memoryCachingArray[$this->_file])) {
+                    if($this->_automaticSerialization) {
                         return unserialize(
                         			$this->_memoryCachingArray[$this->_file]);
                     } else {
                         return $this->_memoryCachingArray[$this->_file];
                     }
                 } else {
-                    if ($this->_onlyMemoryCaching) {
+                    if($this->_onlyMemoryCaching) {
                         return false;
                     }
                 }
             }
-            if ($doNotTestCacheValidity) {
-                if (file_exists($this->_file)) {
-                    $data = $this->_read();
+            if($doNotTestCacheValidity) {
+                if(file_exists($this->_file)) {
+                    $data=$this->_read();
                 }
             } else {
-                if (@filemtime($this->_file) > $this->_refreshTime) {
-                    $data = $this->_read();
+                if(@filemtime($this->_file) > $this->_refreshTime) {
+                    $data=$this->_read();
                 }
             }
-            if (($data) and ($this->_memoryCaching)) {
+            if(($data) and ($this->_memoryCaching)) {
                 $this->_memoryCacheAdd($this->_file, $data);
             }
-            if ($this->_automaticSerialization && is_string($data)) {
-                $data = unserialize($data);
+            if($this->_automaticSerialization && is_string($data)) {
+                $data=unserialize($data);
             }
             return $data;
         }
@@ -312,24 +312,24 @@ 
     * @return boolean true if no problem
     * @access public
     */
-    function save($data, $id = null, $group = 'default')
+    function save($data, $id=null, $group='default')
     {
-        if ($this->_caching) {
-            if ($this->_automaticSerialization) {
-                $data = serialize($data);
+        if($this->_caching) {
+            if($this->_automaticSerialization) {
+                $data=serialize($data);
             }
-            if (isset($id)) {
+            if(isset($id)) {
                 $this->_setFileName($id, $group);
             }
-            if ($this->_memoryCaching) {
+            if($this->_memoryCaching) {
                 $this->_memoryCacheAdd($this->_file, $data);
-                if ($this->_onlyMemoryCaching) {
+                if($this->_onlyMemoryCaching) {
                     return true;
                 }
             }
-            if ($this->_writeControl) {
-                if (!$this->_writeAndControl($data)) {
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
+            if($this->_writeControl) {
+                if(!$this->_writeAndControl($data)) {
+                    @touch($this->_file, time() - 2 * abs($this->_lifeTime));
                     return false;
                 } else {
                     return true;
@@ -349,10 +349,10 @@ 
     * @return boolean true if no problem
     * @access public
     */
-    function remove($id, $group = 'default')
+    function remove($id, $group='default')
     {
         $this->_setFileName($id, $group);
-        if (!@unlink($this->_file)) {
+        if(!@unlink($this->_file)) {
             $this->raiseError('TCache_Lite : Unable to remove cache !', -3);
             return false;
         }
@@ -369,35 +369,35 @@ 
     * @return boolean true if no problem
     * @access public
     */
-    function clean($group = false)
+    function clean($group=false)
     {
-        if ($this->_fileNameProtection) {
-            $motif = ($group) ? 'cache_'.md5($group).'_' : 'cache_';
+        if($this->_fileNameProtection) {
+            $motif=($group) ? 'cache_'.md5($group).'_' : 'cache_';
         } else {
-            $motif = ($group) ? 'cache_'.$group.'_' : 'cache_';
+            $motif=($group) ? 'cache_'.$group.'_' : 'cache_';
         }
-        if ($this->_memoryCaching) {
-            while (list($key, $value) = each($this->_memoryCaching)) {
-                if (strpos($key, $motif, 0)) {
+        if($this->_memoryCaching) {
+            while(list($key, $value)=each($this->_memoryCaching)) {
+                if(strpos($key, $motif, 0)) {
                     unset($this->_memoryCaching[$key]);
-                    $this->_memoryCachingCounter =
+                    $this->_memoryCachingCounter=
                     		$this->_memoryCachingCounter - 1;
                 }
             }
-            if ($this->_onlyMemoryCaching) {
+            if($this->_onlyMemoryCaching) {
                 return true;
             }
         }
-        if (!($dh = opendir($this->_cacheDir))) {
+        if(!($dh=opendir($this->_cacheDir))) {
             $this->raiseError('TCache_Lite : Unable to open cache directory !');
             return false;
         }
-        while ($file = readdir($dh)) {
-            if (($file != '.') && ($file != '..')) {
-                $file = $this->_cacheDir . $file;
-                if (is_file($file)) {
-                    if (strpos($file, $motif, 0)) {
-                        if (!@unlink($file)) {
+        while($file=readdir($dh)) {
+            if(($file!='.') && ($file!='..')) {
+                $file=$this->_cacheDir.$file;
+                if(is_file($file)) {
+                    if(strpos($file, $motif, 0)) {
+                        if(!@unlink($file)) {
              $this->raiseError('Cache_Lite : Unable to remove cache !', -3);
                             return false;
                         }
@@ -416,22 +416,22 @@ 
     */
     function setLifeTime($newLifeTime)
     {
-        $this->_lifeTime = $newLifeTime;
-        $this->_refreshTime = time() - $newLifeTime;
+        $this->_lifeTime=$newLifeTime;
+        $this->_refreshTime=time() - $newLifeTime;
     }
 
     /**
     *
     * @access public
     */
-    function saveMemoryCachingState($id, $group = 'default')
+    function saveMemoryCachingState($id, $group='default')
     {
-        if ($this->_caching) {
-            $array = array(
+        if($this->_caching) {
+            $array=array(
                 'counter' => $this->_memoryCachingCounter,
                 'array' => $this->_memoryCachingState
             );
-            $data = serialize($array);
+            $data=serialize($array);
             $this->save($data, $id, $group);
         }
     }
@@ -440,15 +440,15 @@ 
     *
     * @access public
     */
-    function getMemoryCachingState($id, $group = 'default',
-    								$doNotTestCacheValidity = false)
+    function getMemoryCachingState($id, $group='default',
+    								$doNotTestCacheValidity=false)
     {
-        if ($this->_caching) {
-            if ($data = $this->get($id, $group, $doNotTestCacheValidity))
+        if($this->_caching) {
+            if($data=$this->get($id, $group, $doNotTestCacheValidity))
             {
-                $array = unserialize($data);
-                $this->_memoryCachingCounter = $array['counter'];
-                $this->_memoryCachingArray = $array['array'];
+                $array=unserialize($data);
+                $this->_memoryCachingCounter=$array['counter'];
+                $this->_memoryCachingArray=$array['array'];
             }
         }
     }
@@ -488,12 +488,12 @@ 
     */
     function _memoryCacheAdd($id, $data)
     {
-        $this->_memoryCachingArray[$this->_file] = $data;
-        if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
-            list($key, $value) = each($this->_memoryCachingArray);
+        $this->_memoryCachingArray[$this->_file]=$data;
+        if($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
+            list($key, $value)=each($this->_memoryCachingArray);
             unset($this->_memoryCachingArray[$key]);
         } else {
-            $this->_memoryCachingCounter = $this->_memoryCachingCounter + 1;
+            $this->_memoryCachingCounter=$this->_memoryCachingCounter + 1;
         }
     }
 
@@ -506,11 +506,11 @@ 
     */
     function _setFileName($id, $group)
     {
-        if ($this->_fileNameProtection) {
-            $this->_file = ($this->_cacheDir.'cache_'.md5($group).'_'
+        if($this->_fileNameProtection) {
+            $this->_file=($this->_cacheDir.'cache_'.md5($group).'_'
             						.md5($id));
         } else {
-            $this->_file = $this->_cacheDir.'cache_'.$group.'_'.$id;
+            $this->_file=$this->_cacheDir.'cache_'.$group.'_'.$id;
         }
     }
 
@@ -527,23 +527,23 @@ 
     */
     function _read()
     {
-        $fp = @fopen($this->_file, "rb");
-        if ($this->_fileLocking) @flock($fp, LOCK_SH);
-        if ($fp) {
+        $fp=@fopen($this->_file, "rb");
+        if($this->_fileLocking) @flock($fp, LOCK_SH);
+        if($fp) {
         	// because the filesize can be cached by PHP itself...
             clearstatcache();
-            $length = @filesize($this->_file);
-            if ($this->_readControl) {
-                $hashControl = @fread($fp, 32);
-                $length = $length - 32;
+            $length=@filesize($this->_file);
+            if($this->_readControl) {
+                $hashControl=@fread($fp, 32);
+                $length=$length - 32;
             }
-            $data = @fread($fp, $length);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
+            $data=@fread($fp, $length);
+            if($this->_fileLocking) @flock($fp, LOCK_UN);
             @fclose($fp);
-            if ($this->_readControl) {
-                $hashData = $this->_hash($data, $this->_readControlType);
-                if ($hashData != $hashControl) {
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
+            if($this->_readControl) {
+                $hashData=$this->_hash($data, $this->_readControlType);
+                if($hashData!=$hashControl) {
+                    @touch($this->_file, time() - 2 * abs($this->_lifeTime));
                     return false;
                 }
             }
@@ -562,15 +562,15 @@ 
     */
     function _write($data)
     {
-        $fp = @fopen($this->_file, "wb");
-        if ($fp) {
-            if ($this->_fileLocking) @flock($fp, LOCK_EX);
-            if ($this->_readControl) {
+        $fp=@fopen($this->_file, "wb");
+        if($fp) {
+            if($this->_fileLocking) @flock($fp, LOCK_EX);
+            if($this->_readControl) {
                 @fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
             }
-            $len = strlen($data);
+            $len=strlen($data);
             @fwrite($fp, $data, $len);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
+            if($this->_fileLocking) @flock($fp, LOCK_UN);
             @fclose($fp);
             return true;
         }
@@ -589,7 +589,7 @@ 
     function _writeAndControl($data)
     {
         $this->_write($data);
-        $dataRead = $this->_read($data);
+        $dataRead=$this->_read($data);
         return ($dataRead==$data);
     }
 
@@ -603,7 +603,7 @@ 
     */
     function _hash($data, $controlType)
     {
-        switch ($controlType) {
+        switch($controlType) {
         case 'md5':
             return md5($data);
         case 'crc32':

framework/Web/Javascripts/css-packages.php

Spacing +4 added lines, -4 removed lines

@@ -3,11 +3,11 @@ 
 //$Id: packages.php 3319 2013-09-08 20:59:44Z ctrlaltca $
 
 // To make future upgrades easier
-if (!defined('JQUERY_DIR')) define ('JQUERY_DIR', 'jquery');
-if (!defined('BOOTSTRAP_DIR')) define ('BOOTSTRAP_DIR', 'bootstrap3');
+if(!defined('JQUERY_DIR')) define('JQUERY_DIR', 'jquery');
+if(!defined('BOOTSTRAP_DIR')) define('BOOTSTRAP_DIR', 'bootstrap3');
 
 //package names and its contents (files relative to the current directory)
-$packages = array(
+$packages=array(
 	'jquery-ui' => array(
 		JQUERY_DIR.'/css/base/jquery-ui.css',
 	),
@@ -68,7 +68,7 @@ 
 
 
 //package names and their dependencies
-$dependencies = array(
+$dependencies=array(
 		'jquery-ui'				=> array('jquery-ui'),
 		'jquery.ui.accordion'	=> array('jquery.ui.core', 'jquery.ui.accordion'),
 		'jquery.ui.autocomplete'	=> array('jquery.ui.core', 'jquery.ui.autocomplete'),

framework/Web/UI/TClientScriptManager.php

Spacing +104 added lines, -104 removed lines

@@ -144,7 +144,7 @@ 
 	{
 		$this->registerPradoScriptInternal($name);
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPradoScript',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPradoScript', $params);
 	}
 
 	/**
@@ -155,39 +155,39 @@ 
 		// $this->checkIfNotInRender();
 		if(!isset($this->_registeredPradoScripts[$name]))
 		{
-			if(self::$_pradoScripts === null)
+			if(self::$_pradoScripts===null)
 			{
-				$packageFile = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::PACKAGES_FILE;
-				list($packages,$deps)= include($packageFile);
-				self::$_pradoScripts = $deps;
-				self::$_pradoPackages = $packages;
+				$packageFile=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::PACKAGES_FILE;
+				list($packages, $deps)=include($packageFile);
+				self::$_pradoScripts=$deps;
+				self::$_pradoPackages=$packages;
 			}
 
-			if (isset(self::$_pradoScripts[$name]))
+			if(isset(self::$_pradoScripts[$name]))
 				$this->_registeredPradoScripts[$name]=true;
 			else
-				throw new TInvalidOperationException('csmanager_pradoscript_invalid',$name);
+				throw new TInvalidOperationException('csmanager_pradoscript_invalid', $name);
 
 			if(($packages=array_keys($this->_registeredPradoScripts))!==array())
 			{
-				$base = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
-				list($path,$baseUrl)=$this->getPackagePathUrl($base);
+				$base=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
+				list($path, $baseUrl)=$this->getPackagePathUrl($base);
 				$packagesUrl=array();
 				$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
-				foreach ($packages as $p)
+				foreach($packages as $p)
 				{
-					foreach (self::$_pradoScripts[$p] as $dep)
+					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;
+							$this->_expandedPradoScripts[$script]=true;
 							if($isDebug)
 							{
-								if (!in_array($url=$baseUrl.'/'.$script,$packagesUrl))
+								if(!in_array($url=$baseUrl.'/'.$script, $packagesUrl))
 									$packagesUrl[]=$url;
 							} else {
-								if (!in_array($url=$baseUrl.'/min/'.$script,$packagesUrl))
+								if(!in_array($url=$baseUrl.'/min/'.$script, $packagesUrl))
 								{
 									if(!is_file($filePath=$path.'/min/'.$script))
 									{
@@ -204,7 +204,7 @@ 
 					}
 				}
 				foreach($packagesUrl as $url)
-					$this->registerScriptFile($url,$url);
+					$this->registerScriptFile($url, $url);
 			}
 		}
 	}
@@ -214,8 +214,8 @@ 
 	 */
 	public function getPradoScriptAssetUrl()
 	{
-		$base = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
-		$assets = Prado::getApplication()->getAssetManager();
+		$base=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
+		$assets=Prado::getApplication()->getAssetManager();
 		return $assets->getPublishedUrl($base);
 	}
 
@@ -225,9 +225,9 @@ 
 	 */
 	public function getScriptUrls()
 	{
-		$scripts = array_values($this->_headScriptFiles);
-		$scripts = array_merge($scripts, array_values($this->_scriptFiles));
-		$scripts = array_unique($scripts);
+		$scripts=array_values($this->_headScriptFiles);
+		$scripts=array_merge($scripts, array_values($this->_scriptFiles));
+		$scripts=array_unique($scripts);
 
 		return $scripts;
 	}
@@ -238,17 +238,17 @@ 
 	 */
 	protected function getPackagePathUrl($base)
 	{
-		$assets = Prado::getApplication()->getAssetManager();
+		$assets=Prado::getApplication()->getAssetManager();
 		if(strpos($base, $assets->getBaseUrl())===false)
 		{
-			if(($dir = Prado::getPathOfNameSpace($base)) !== null) {
-				$base = $dir;
+			if(($dir=Prado::getPathOfNameSpace($base))!==null) {
+				$base=$dir;
 			}
 			return array($assets->getPublishedPath($base), $assets->publishFilePath($base));
 		}
 		else
 		{
-			return array($assets->getBasePath().str_replace($assets->getBaseUrl(),'',$base), $base);
+			return array($assets->getBasePath().str_replace($assets->getBaseUrl(), '', $base), $base);
 		}
 	}
 
@@ -260,13 +260,13 @@ 
 	 */
 	public function getCallbackReference(ICallbackEventHandler $callbackHandler, $options=null)
 	{
-		$options = !is_array($options) ? array() : $options;
-		$class = new ReflectionClass($callbackHandler);
-		$clientSide = $callbackHandler->getActiveControl()->getClientSide();
-		$options = array_merge($options, $clientSide->getOptions()->toArray());
-		$optionString = TJavaScript::encode($options);
+		$options=!is_array($options) ? array() : $options;
+		$class=new ReflectionClass($callbackHandler);
+		$clientSide=$callbackHandler->getActiveControl()->getClientSide();
+		$options=array_merge($options, $clientSide->getOptions()->toArray());
+		$optionString=TJavaScript::encode($options);
 		$this->registerPradoScriptInternal('ajax');
-		$id = $callbackHandler->getUniqueID();
+		$id=$callbackHandler->getUniqueID();
 		return "new Prado.CallbackRequest('{$id}',{$optionString})";
 	}
 
@@ -283,7 +283,7 @@ 
 		$this->registerPradoScriptInternal('ajax');
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerCallbackControl',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerCallbackControl', $params);
 	}
 
 	/**
@@ -292,9 +292,9 @@ 
 	 * @param string javascript class responsible for the control being registered for postback
 	 * @param array postback options
 	 */
-	public function registerPostBackControl($class,$options)
+	public function registerPostBackControl($class, $options)
 	{
-		if($class === null) {
+		if($class===null) {
 			return;
 		}
 		if(!isset($options['FormID']) && ($form=$this->_page->getForm())!==null)
@@ -306,7 +306,7 @@ 
 		$this->registerPradoScriptInternal('prado');
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPostBackControl',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPostBackControl', $params);
 	}
 
 	/**
@@ -317,7 +317,7 @@ 
 	 */
 	public function registerDefaultButton($panel, $button)
 	{
-		$panelID=is_string($panel)?$panel:$panel->getUniqueID();
+		$panelID=is_string($panel) ? $panel : $panel->getUniqueID();
 
 		if(is_string($button))
 			$buttonID=$button;
@@ -326,14 +326,14 @@ 
 			$button->setIsDefaultButton(true);
 			$buttonID=$button->getUniqueID();
 		}
-		$options = TJavaScript::encode($this->getDefaultButtonOptions($panelID, $buttonID));
-		$code = "new Prado.WebUI.DefaultButton($options);";
+		$options=TJavaScript::encode($this->getDefaultButtonOptions($panelID, $buttonID));
+		$code="new Prado.WebUI.DefaultButton($options);";
 
 		$this->_endScripts['prado:'.$panelID]=$code;
 		$this->registerPradoScriptInternal('prado');
 
-		$params=array($panelID,$buttonID);
-		$this->_page->registerCachingAction('Page.ClientScript','registerDefaultButton',$params);
+		$params=array($panelID, $buttonID);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerDefaultButton', $params);
 	}
 
 	/**
@@ -343,11 +343,11 @@ 
 	 */
 	protected function getDefaultButtonOptions($panelID, $buttonID)
 	{
-		$options['ID'] = TControl::convertUniqueIdToClientId($panelID);
-		$options['Panel'] = TControl::convertUniqueIdToClientId($panelID);
-		$options['Target'] = TControl::convertUniqueIdToClientId($buttonID);
-		$options['EventTarget'] = $buttonID;
-		$options['Event'] = 'click';
+		$options['ID']=TControl::convertUniqueIdToClientId($panelID);
+		$options['Panel']=TControl::convertUniqueIdToClientId($panelID);
+		$options['Target']=TControl::convertUniqueIdToClientId($buttonID);
+		$options['EventTarget']=$buttonID;
+		$options['Event']='click';
 		return $options;
 	}
 
@@ -360,10 +360,10 @@ 
 		$this->registerPradoScriptInternal('jquery');
 		if($target instanceof TControl)
 			$target=$target->getClientID();
-		$this->_endScripts['prado:focus'] = 'jQuery(\'#'.$target.'\').focus();';
+		$this->_endScripts['prado:focus']='jQuery(\'#'.$target.'\').focus();';
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerFocusControl',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerFocusControl', $params);
 	}
 
 	/**
@@ -375,7 +375,7 @@ 
 	{
 		$this->registerPradoStyleInternal($name);
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPradoStyle',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPradoStyle', $params);
 	}
 
 	/**
@@ -386,43 +386,43 @@ 
 		// $this->checkIfNotInRender();
 		if(!isset($this->_registeredPradoStyles[$name]))
 		{
-			$base = $this->getPradoScriptAssetUrl();
+			$base=$this->getPradoScriptAssetUrl();
 
-			if(self::$_pradoStyles === null)
+			if(self::$_pradoStyles===null)
 			{
-				$packageFile = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::CSS_PACKAGES_FILE;
-				list($packages,$deps)= include($packageFile);
-				self::$_pradoStyles = $deps;
-				self::$_pradoStylePackages = $packages;
+				$packageFile=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::CSS_PACKAGES_FILE;
+				list($packages, $deps)=include($packageFile);
+				self::$_pradoStyles=$deps;
+				self::$_pradoStylePackages=$packages;
 			}
 
-			if (isset(self::$_pradoStyles[$name]))
+			if(isset(self::$_pradoStyles[$name]))
 				$this->_registeredPradoStyles[$name]=true;
 			else
-				throw new TInvalidOperationException('csmanager_pradostyle_invalid',$name);
+				throw new TInvalidOperationException('csmanager_pradostyle_invalid', $name);
 
 			if(($packages=array_keys($this->_registeredPradoStyles))!==array())
 			{
-				$base = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
-				list($path,$baseUrl)=$this->getPackagePathUrl($base);
+				$base=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
+				list($path, $baseUrl)=$this->getPackagePathUrl($base);
 				$packagesUrl=array();
 				$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
-				foreach ($packages as $p)
+				foreach($packages as $p)
 				{
-					foreach (self::$_pradoStyles[$p] as $dep)
+					foreach(self::$_pradoStyles[$p] as $dep)
 					{
-						foreach (self::$_pradoStylePackages[$dep] as $style)
-						if (!isset($this->_expandedPradoStyles[$style]))
+						foreach(self::$_pradoStylePackages[$dep] as $style)
+						if(!isset($this->_expandedPradoStyles[$style]))
 						{
-							$this->_expandedPradoStyles[$style] = true;
+							$this->_expandedPradoStyles[$style]=true;
 							// TODO minify css?
-							if (!in_array($url=$baseUrl.'/'.$style,$packagesUrl))
+							if(!in_array($url=$baseUrl.'/'.$style, $packagesUrl))
 								$packagesUrl[]=$url;
 						}
 					}
 				}
 				foreach($packagesUrl as $url)
-					$this->registerStyleSheetFile($url,$url);
+					$this->registerStyleSheetFile($url, $url);
 			}
 		}
 	}
@@ -449,15 +449,15 @@ 
 	 * @param string URL to the CSS file
 	 * @param string media type of the CSS (such as 'print', 'screen', etc.). Defaults to empty, meaning the CSS applies to all media types.
 	 */
-	public function registerStyleSheetFile($key,$url,$media='')
+	public function registerStyleSheetFile($key, $url, $media='')
 	{
 		if($media==='')
 			$this->_styleSheetFiles[$key]=$url;
 		else
-			$this->_styleSheetFiles[$key]=array($url,$media);
+			$this->_styleSheetFiles[$key]=array($url, $media);
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerStyleSheetFile',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheetFile', $params);
 	}
 
 	/**
@@ -465,12 +465,12 @@ 
 	 * @param string a unique key identifying the CSS block
 	 * @param string CSS block
 	 */
-	public function registerStyleSheet($key,$css,$media='')
+	public function registerStyleSheet($key, $css, $media='')
 	{
 		$this->_styleSheets[$key]=$css;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerStyleSheet',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheet', $params);
 	}
 
 	/**
@@ -479,17 +479,17 @@ 
 	 */
 	public function getStyleSheetUrls()
 	{
-		$stylesheets = array_values(
+		$stylesheets=array_values(
 			array_map(
 				create_function('$e', 'return is_array($e) ? $e[0] : $e;'),
 				$this->_styleSheetFiles)
 		);
 
 		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path=>$url)
-			if (substr($url,strlen($url)-4)=='.css')
-				$stylesheets[] = $url;
+			if(substr($url, strlen($url) - 4)=='.css')
+				$stylesheets[]=$url;
 
-		$stylesheets = array_unique($stylesheets);
+		$stylesheets=array_unique($stylesheets);
 
 		return $stylesheets;
 	}
@@ -508,13 +508,13 @@ 
 	 * @param string a unique key identifying the file
 	 * @param string URL to the javascript file
 	 */
-	public function registerHeadScriptFile($key,$url)
+	public function registerHeadScriptFile($key, $url)
 	{
 		$this->checkIfNotInRender();
 		$this->_headScriptFiles[$key]=$url;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHeadScriptFile',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHeadScriptFile', $params);
 	}
 
 	/**
@@ -522,13 +522,13 @@ 
 	 * @param string a unique key identifying the script block
 	 * @param string javascript block
 	 */
-	public function registerHeadScript($key,$script)
+	public function registerHeadScript($key, $script)
 	{
 		$this->checkIfNotInRender();
 		$this->_headScripts[$key]=$script;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHeadScript',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHeadScript', $params);
 	}
 
 	/**
@@ -541,7 +541,7 @@ 
 		$this->_scriptFiles[$key]=$url;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerScriptFile',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerScriptFile', $params);
 	}
 
 	/**
@@ -549,13 +549,13 @@ 
 	 * @param string a unique key identifying the script block
 	 * @param string javascript block
 	 */
-	public function registerBeginScript($key,$script)
+	public function registerBeginScript($key, $script)
 	{
 		$this->checkIfNotInRender();
 		$this->_beginScripts[$key]=$script;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerBeginScript',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerBeginScript', $params);
 	}
 
 	/**
@@ -563,12 +563,12 @@ 
 	 * @param string a unique key identifying the script block
 	 * @param string javascript block
 	 */
-	public function registerEndScript($key,$script)
+	public function registerEndScript($key, $script)
 	{
 		$this->_endScripts[$key]=$script;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerEndScript',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerEndScript', $params);
 	}
 
 	/**
@@ -577,12 +577,12 @@ 
 	 * @param string|array hidden field value, if the value is an array, every element
 	 * in the array will be rendered as a hidden field value.
 	 */
-	public function registerHiddenField($name,$value)
+	public function registerHiddenField($name, $value)
 	{
 		$this->_hiddenFields[$name]=$value;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHiddenField',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHiddenField', $params);
 	}
 
 	/**
@@ -695,7 +695,7 @@ 
 	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");
+			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n".implode("\n", $this->_styleSheets)."\n/*]]>*/\n</style>\n");
 	}
 
 	/**
@@ -703,7 +703,7 @@ 
 	 */
 	public function renderHeadScriptFiles($writer)
 	{
-		$this->renderScriptFiles($writer,$this->_headScriptFiles);
+		$this->renderScriptFiles($writer, $this->_headScriptFiles);
 	}
 
 	/**
@@ -726,9 +726,9 @@ 
 
 	public function markScriptFileAsRendered($url)
 	{
-		$this->_renderedScriptFiles[$url] = $url;
+		$this->_renderedScriptFiles[$url]=$url;
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','markScriptFileAsRendered',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'markScriptFileAsRendered', $params);
 	}
 
 	protected function renderScriptFiles($writer, Array $scripts)
@@ -752,8 +752,8 @@ 
 	{
 		if(!empty($this->_scriptFiles))
 		{
-			$addedScripts = array_diff($this->_scriptFiles,$this->getRenderedScriptFiles());
-			$this->renderScriptFiles($writer,$addedScripts);
+			$addedScripts=array_diff($this->_scriptFiles, $this->getRenderedScriptFiles());
+			$this->renderScriptFiles($writer, $addedScripts);
 		}
 	}
 
@@ -791,12 +791,12 @@ 
 
 	public function renderHiddenFieldsBegin($writer)
 	{
-		$this->renderHiddenFieldsInt($writer,true);
+		$this->renderHiddenFieldsInt($writer, true);
 	}
 
 	public function renderHiddenFieldsEnd($writer)
 	{
-		$this->renderHiddenFieldsInt($writer,false);
+		$this->renderHiddenFieldsInt($writer, false);
 	}
 
 	/**
@@ -818,12 +818,12 @@ 
 	 */
 	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;
-			$id=strtr($name,':','_');
+			if(in_array($name, $this->_renderedHiddenFields)) continue;
+			$id=strtr($name, ':', '_');
 			if(is_array($value))
 			{
 				foreach($value as $v)
@@ -833,7 +833,7 @@ 
 			{
 				$str.='<input type="hidden" name="'.$name.'" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
 			}
-			$this->_renderedHiddenFields[] = $name;
+			$this->_renderedHiddenFields[]=$name;
 		}
 		if($str!=='')
 			$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
@@ -849,7 +849,7 @@ 
 	 */
 	protected function checkIfNotInRender()
 	{
-		if ($form = $this->_page->InFormRender)
+		if($form=$this->_page->InFormRender)
 			throw new Exception('Operation invalid when page is already rendering');
 	}
 }
@@ -883,7 +883,7 @@ 
 	protected function setFunction($name, $code)
 	{
 		if(!TJavaScript::isJsLiteral($code))
-			$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
+			$code=TJavaScript::quoteJsLiteral($this->ensureFunction($code));
 		$this->setOption($name, $code);
 	}
 
@@ -892,7 +892,7 @@ 
 	 */
 	protected function getOption($name)
 	{
-		if ($this->_options)
+		if($this->_options)
 			return $this->_options->itemAt($name);
 		else
 			return null;
@@ -912,8 +912,8 @@ 
 	 */
 	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;
 	}