pradosoft / prado

framework/Web/UI/WebControls/TOutputCache.php

Spacing +30 added lines, -30 removed lines

@@ -107,33 +107,33 @@ 
 
 	private function determineCacheability()
 	{
-		if(!$this->_cacheChecked)
+		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 !== '')
+				if ($this->_cacheModuleID !== '')
 				{
 					$this->_cache = $this->getApplication()->getModule($this->_cacheModuleID);
-					if(!($this->_cache instanceof ICache))
+					if (!($this->_cache instanceof ICache))
 						throw new TConfigurationException('outputcache_cachemoduleid_invalid', $this->_cacheModuleID);
 				}
 				else
 					$this->_cache = $this->getApplication()->getCache();
-				if($this->_cache !== null)
+				if ($this->_cache !== null)
 				{
 					$this->_cacheAvailable = true;
 					$data = $this->_cache->get($this->getCacheKey());
-					if(is_array($data))
+					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)
+					if ($this->_dataCached)
 						list($this->_contents, $this->_state, $this->_actions, $this->_cacheTime) = $data;
 				}
 			}
@@ -149,7 +149,7 @@ 
 	 */
 	protected function initRecursive($namingContainer = null)
 	{
-		if($this->_cacheAvailable && !$this->_dataCached)
+		if ($this->_cacheAvailable && !$this->_dataCached)
 		{
 			$stack = $this->getPage()->getCachingStack();
 			$stack->push($this);
@@ -170,7 +170,7 @@ 
 	 */
 	protected function loadRecursive()
 	{
-		if($this->_cacheAvailable && !$this->_dataCached)
+		if ($this->_cacheAvailable && !$this->_dataCached)
 		{
 			$stack = $this->getPage()->getCachingStack();
 			$stack->push($this);
@@ -179,7 +179,7 @@ 
 		}
 		else
 		{
-			if($this->_dataCached)
+			if ($this->_dataCached)
 				$this->performActions();
 			parent::loadRecursive();
 		}
@@ -189,14 +189,14 @@ 
 	{
 		$page = $this->getPage();
 		$cs = $page->getClientScript();
-		foreach($this->_actions as $action)
+		foreach ($this->_actions as $action)
 		{
-			if($action[0] === 'Page.ClientScript')
-				call_user_func_array([$cs,$action[1]], $action[2]);
-			elseif($action[0] === 'Page')
-				call_user_func_array([$page,$action[1]], $action[2]);
+			if ($action[0] === 'Page.ClientScript')
+				call_user_func_array([$cs, $action[1]], $action[2]);
+			elseif ($action[0] === 'Page')
+				call_user_func_array([$page, $action[1]], $action[2]);
 			else
-				call_user_func_array([$this->getSubProperty($action[0]),$action[1]], $action[2]);
+				call_user_func_array([$this->getSubProperty($action[0]), $action[1]], $action[2]);
 		}
 	}
 
@@ -209,7 +209,7 @@ 
 	 */
 	protected function preRenderRecursive()
 	{
-		if($this->_cacheAvailable && !$this->_dataCached)
+		if ($this->_cacheAvailable && !$this->_dataCached)
 		{
 			$stack = $this->getPage()->getCachingStack();
 			$stack->push($this);
@@ -244,7 +244,7 @@ 
 	 */
 	protected function &saveStateRecursive($needViewState = true)
 	{
-		if($this->_dataCached)
+		if ($this->_dataCached)
 			return $this->_state;
 		else
 		{
@@ -266,12 +266,12 @@ 
 	 */
 	public function registerAction($context, $funcName, $funcParams)
 	{
-		$this->_actions[] = [$context,$funcName,$funcParams];
+		$this->_actions[] = [$context, $funcName, $funcParams];
 	}
 
 	public function getCacheKey()
 	{
-		if($this->_cacheKey === null)
+		if ($this->_cacheKey === null)
 			$this->_cacheKey = $this->calculateCacheKey();
 		return $this->_cacheKey;
 	}
@@ -289,13 +289,13 @@ 
 	protected function calculateCacheKey()
 	{
 		$key = $this->getBaseCacheKey();
-		if($this->_varyBySession)
+		if ($this->_varyBySession)
 			$key .= $this->getSession()->getSessionID();
-		if($this->_varyByParam !== '')
+		if ($this->_varyByParam !== '')
 		{
 			$params = [];
 			$request = $this->getRequest();
-			foreach(explode(',', $this->_varyByParam) as $name)
+			foreach (explode(',', $this->_varyByParam) as $name)
 			{
 				$name = trim($name);
 				$params[$name] = $request->itemAt($name);
@@ -313,7 +313,7 @@ 
 	 */
 	protected function getBaseCacheKey()
 	{
-		return self::CACHE_ID_PREFIX . $this->_keyPrefix . $this->getPage()->getPagePath() . $this->getUniqueID();
+		return self::CACHE_ID_PREFIX.$this->_keyPrefix.$this->getPage()->getPagePath().$this->getUniqueID();
 	}
 
 	/**
@@ -387,7 +387,7 @@ 
 	 */
 	public function setDuration($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			throw new TInvalidDataValueException('outputcache_duration_invalid', get_class($this));
 		$this->_duration = $value;
 	}
@@ -481,12 +481,12 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->_dataCached)
+		if ($this->_dataCached)
 			$writer->write($this->_contents);
-		elseif($this->_cacheAvailable)
+		elseif ($this->_cacheAvailable)
 		{
 			$textwriter = new TTextWriter();
-			$multiwriter = new TOutputCacheTextWriterMulti([$writer->getWriter(),$textwriter]);
+			$multiwriter = new TOutputCacheTextWriterMulti([$writer->getWriter(), $textwriter]);
 			$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), $multiwriter);
 
 			$stack = $this->getPage()->getCachingStack();
@@ -495,7 +495,7 @@ 
 			$stack->pop();
 
 			$content = $textwriter->flush();
-			$data = [$content,$this->_state,$this->_actions,time()];
+			$data = [$content, $this->_state, $this->_actions, time()];
 			$this->_cache->set($this->getCacheKey(), $data, $this->getDuration(), $this->getCacheDependency());
 		}
 		else

Braces +42 added lines, -36 removed lines

@@ -115,11 +115,12 @@ 
 				if($this->_cacheModuleID !== '')
 				{
 					$this->_cache = $this->getApplication()->getModule($this->_cacheModuleID);
-					if(!($this->_cache instanceof ICache))
-						throw new TConfigurationException('outputcache_cachemoduleid_invalid', $this->_cacheModuleID);
+					if(!($this->_cache instanceof ICache)) {
+											throw new TConfigurationException('outputcache_cachemoduleid_invalid', $this->_cacheModuleID);
+					}
+				} else {
+									$this->_cache = $this->getApplication()->getCache();
 				}
-				else
-					$this->_cache = $this->getApplication()->getCache();
 				if($this->_cache !== null)
 				{
 					$this->_cacheAvailable = true;
@@ -130,11 +131,12 @@ 
 						$param->setCacheTime(isset($data[3])?$data[3]:0);
 						$this->onCheckDependency($param);
 						$this->_dataCached = $param->getIsValid();
+					} else {
+											$this->_dataCached = false;
+					}
+					if($this->_dataCached) {
+											list($this->_contents, $this->_state, $this->_actions, $this->_cacheTime) = $data;
 					}
-					else
-						$this->_dataCached = false;
-					if($this->_dataCached)
-						list($this->_contents, $this->_state, $this->_actions, $this->_cacheTime) = $data;
 				}
 			}
 		}
@@ -155,9 +157,9 @@ 
 			$stack->push($this);
 			parent::initRecursive($namingContainer);
 			$stack->pop();
+		} else {
+					parent::initRecursive($namingContainer);
 		}
-		else
-			parent::initRecursive($namingContainer);
 	}
 
 	/**
@@ -176,11 +178,11 @@ 
 			$stack->push($this);
 			parent::loadRecursive();
 			$stack->pop();
-		}
-		else
+		} else
 		{
-			if($this->_dataCached)
-				$this->performActions();
+			if($this->_dataCached) {
+							$this->performActions();
+			}
 			parent::loadRecursive();
 		}
 	}
@@ -191,12 +193,13 @@ 
 		$cs = $page->getClientScript();
 		foreach($this->_actions as $action)
 		{
-			if($action[0] === 'Page.ClientScript')
-				call_user_func_array([$cs,$action[1]], $action[2]);
-			elseif($action[0] === 'Page')
-				call_user_func_array([$page,$action[1]], $action[2]);
-			else
-				call_user_func_array([$this->getSubProperty($action[0]),$action[1]], $action[2]);
+			if($action[0] === 'Page.ClientScript') {
+							call_user_func_array([$cs,$action[1]], $action[2]);
+			} elseif($action[0] === 'Page') {
+							call_user_func_array([$page,$action[1]], $action[2]);
+			} else {
+							call_user_func_array([$this->getSubProperty($action[0]),$action[1]], $action[2]);
+			}
 		}
 	}
 
@@ -215,9 +218,9 @@ 
 			$stack->push($this);
 			parent::preRenderRecursive();
 			$stack->pop();
+		} else {
+					parent::preRenderRecursive();
 		}
-		else
-			parent::preRenderRecursive();
 	}
 
 	/**
@@ -244,9 +247,9 @@ 
 	 */
 	protected function &saveStateRecursive($needViewState = true)
 	{
-		if($this->_dataCached)
-			return $this->_state;
-		else
+		if($this->_dataCached) {
+					return $this->_state;
+		} else
 		{
 			$st = parent::saveStateRecursive($needViewState);
 			// serialization is needed to avoid undefined classes when loading state
@@ -271,8 +274,9 @@ 
 
 	public function getCacheKey()
 	{
-		if($this->_cacheKey === null)
-			$this->_cacheKey = $this->calculateCacheKey();
+		if($this->_cacheKey === null) {
+					$this->_cacheKey = $this->calculateCacheKey();
+		}
 		return $this->_cacheKey;
 	}
 
@@ -289,8 +293,9 @@ 
 	protected function calculateCacheKey()
 	{
 		$key = $this->getBaseCacheKey();
-		if($this->_varyBySession)
-			$key .= $this->getSession()->getSessionID();
+		if($this->_varyBySession) {
+					$key .= $this->getSession()->getSessionID();
+		}
 		if($this->_varyByParam !== '')
 		{
 			$params = [];
@@ -387,8 +392,9 @@ 
 	 */
 	public function setDuration($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			throw new TInvalidDataValueException('outputcache_duration_invalid', get_class($this));
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					throw new TInvalidDataValueException('outputcache_duration_invalid', get_class($this));
+		}
 		$this->_duration = $value;
 	}
 
@@ -481,9 +487,9 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->_dataCached)
-			$writer->write($this->_contents);
-		elseif($this->_cacheAvailable)
+		if($this->_dataCached) {
+					$writer->write($this->_contents);
+		} elseif($this->_cacheAvailable)
 		{
 			$textwriter = new TTextWriter();
 			$multiwriter = new TOutputCacheTextWriterMulti([$writer->getWriter(),$textwriter]);
@@ -497,8 +503,8 @@ 
 			$content = $textwriter->flush();
 			$data = [$content,$this->_state,$this->_actions,time()];
 			$this->_cache->set($this->getCacheKey(), $data, $this->getDuration(), $this->getCacheDependency());
+		} else {
+					parent::render($writer);
 		}
-		else
-			parent::render($writer);
 	}
 }
\ No newline at end of file

framework/Web/UI/TTemplateManager.php

Spacing +15 added lines, -15 removed lines

@@ -63,7 +63,7 @@ 
 	public function getTemplateByClassName($className)
 	{
 		$class = new \ReflectionClass($className);
-		$tplFile = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . $class->getShortName() . self::TEMPLATE_FILE_EXT;
+		$tplFile = dirname($class->getFileName()).DIRECTORY_SEPARATOR.$class->getShortName().self::TEMPLATE_FILE_EXT;
 		return $this->getTemplateByFileName($tplFile);
 	}
 
@@ -73,38 +73,38 @@ 
 	 */
 	public function getTemplateByFileName($fileName)
 	{
-		if(($fileName = $this->getLocalizedTemplate($fileName)) !== null)
+		if (($fileName = $this->getLocalizedTemplate($fileName)) !== null)
 		{
 			Prado::trace("Loading template $fileName", '\Prado\Web\UI\TTemplateManager');
-			if(($cache = $this->getApplication()->getCache()) === null)
+			if (($cache = $this->getApplication()->getCache()) === null)
 				return new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
 			else
 			{
-				$array = $cache->get(self::TEMPLATE_CACHE_PREFIX . $fileName);
-				if(is_array($array))
+				$array = $cache->get(self::TEMPLATE_CACHE_PREFIX.$fileName);
+				if (is_array($array))
 				{
 					list($template, $timestamps) = $array;
-					if($this->getApplication()->getMode() === TApplicationMode::Performance)
+					if ($this->getApplication()->getMode() === TApplicationMode::Performance)
 						return $template;
 					$cacheValid = true;
-					foreach($timestamps as $tplFile => $timestamp)
+					foreach ($timestamps as $tplFile => $timestamp)
 					{
-						if(!is_file($tplFile) || filemtime($tplFile) > $timestamp)
+						if (!is_file($tplFile) || filemtime($tplFile) > $timestamp)
 						{
 							$cacheValid = false;
 							break;
 						}
 					}
-					if($cacheValid)
+					if ($cacheValid)
 						return $template;
 				}
 				$template = new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
 				$includedFiles = $template->getIncludedFiles();
 				$timestamps = [];
 				$timestamps[$fileName] = filemtime($fileName);
-				foreach($includedFiles as $includedFile)
+				foreach ($includedFiles as $includedFile)
 					$timestamps[$includedFile] = filemtime($includedFile);
-				$cache->set(self::TEMPLATE_CACHE_PREFIX . $fileName, [$template,$timestamps]);
+				$cache->set(self::TEMPLATE_CACHE_PREFIX.$fileName, [$template, $timestamps]);
 				return $template;
 			}
 		}
@@ -119,11 +119,11 @@ 
 	 */
 	protected function getLocalizedTemplate($filename)
 	{
-		if(($app = $this->getApplication()->getGlobalization(false)) === null)
-			return is_file($filename)?$filename:null;
-		foreach($app->getLocalizedResource($filename) as $file)
+		if (($app = $this->getApplication()->getGlobalization(false)) === null)
+			return is_file($filename) ? $filename : null;
+		foreach ($app->getLocalizedResource($filename) as $file)
 		{
-			if(($file = realpath($file)) !== false && is_file($file))
+			if (($file = realpath($file)) !== false && is_file($file))
 				return $file;
 		}
 		return null;

Braces +20 added lines, -15 removed lines

@@ -76,16 +76,17 @@ 
 		if(($fileName = $this->getLocalizedTemplate($fileName)) !== null)
 		{
 			Prado::trace("Loading template $fileName", '\Prado\Web\UI\TTemplateManager');
-			if(($cache = $this->getApplication()->getCache()) === null)
-				return new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
-			else
+			if(($cache = $this->getApplication()->getCache()) === null) {
+							return new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
+			} else
 			{
 				$array = $cache->get(self::TEMPLATE_CACHE_PREFIX . $fileName);
 				if(is_array($array))
 				{
 					list($template, $timestamps) = $array;
-					if($this->getApplication()->getMode() === TApplicationMode::Performance)
-						return $template;
+					if($this->getApplication()->getMode() === TApplicationMode::Performance) {
+											return $template;
+					}
 					$cacheValid = true;
 					foreach($timestamps as $tplFile => $timestamp)
 					{
@@ -95,21 +96,23 @@ 
 							break;
 						}
 					}
-					if($cacheValid)
-						return $template;
+					if($cacheValid) {
+											return $template;
+					}
 				}
 				$template = new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
 				$includedFiles = $template->getIncludedFiles();
 				$timestamps = [];
 				$timestamps[$fileName] = filemtime($fileName);
-				foreach($includedFiles as $includedFile)
-					$timestamps[$includedFile] = filemtime($includedFile);
+				foreach($includedFiles as $includedFile) {
+									$timestamps[$includedFile] = filemtime($includedFile);
+				}
 				$cache->set(self::TEMPLATE_CACHE_PREFIX . $fileName, [$template,$timestamps]);
 				return $template;
 			}
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	/**
@@ -119,12 +122,14 @@ 
 	 */
 	protected function getLocalizedTemplate($filename)
 	{
-		if(($app = $this->getApplication()->getGlobalization(false)) === null)
-			return is_file($filename)?$filename:null;
+		if(($app = $this->getApplication()->getGlobalization(false)) === null) {
+					return is_file($filename)?$filename:null;
+		}
 		foreach($app->getLocalizedResource($filename) as $file)
 		{
-			if(($file = realpath($file)) !== false && is_file($file))
-				return $file;
+			if(($file = realpath($file)) !== false && is_file($file)) {
+							return $file;
+			}
 		}
 		return null;
 	}

framework/Web/UI/TPageStatePersister.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 	 */
 	public function load()
 	{
-		if(($data = TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState())) !== null)
+		if (($data = TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState())) !== null)
 			return $data;
 		else
 			throw new THttpException(400, 'pagestatepersister_pagestate_corrupted');

Braces +5 added lines, -4 removed lines

@@ -64,10 +64,11 @@
 	 */
 	public function load()
 	{
-		if(($data = TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState())) !== null)
-			return $data;
-		else
-			throw new THttpException(400, 'pagestatepersister_pagestate_corrupted');
+		if(($data = TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState())) !== null) {
+					return $data;
+		} else {
+					throw new THttpException(400, 'pagestatepersister_pagestate_corrupted');
+		}
 	}
 }
 

framework/Web/UI/TPage.php

Spacing +76 added lines, -76 removed lines

@@ -198,9 +198,9 @@ 
 
 		$this->determinePostBackMode();
 
-		if($this->getIsPostBack())
+		if ($this->getIsPostBack())
 		{
-			if($this->getIsCallback())
+			if ($this->getIsCallback())
 				$this->processCallbackRequest($writer);
 			else
 				$this->processPostBackRequest($writer);
@@ -292,13 +292,13 @@ 
 
 	protected static function decodeUTF8($data, $enc)
 	{
-		if(is_array($data))
+		if (is_array($data))
 		{
-			foreach($data as $k => $v)
+			foreach ($data as $k => $v)
 				$data[$k] = self::decodeUTF8($v, $enc);
 			return $data;
-		} elseif(is_string($data)) {
-			return iconv('UTF-8', $enc . '//IGNORE', $data);
+		} elseif (is_string($data)) {
+			return iconv('UTF-8', $enc.'//IGNORE', $data);
 		} else {
 			return $data;
 		}
@@ -313,8 +313,8 @@ 
 		$this->setAdapter(new TActivePageAdapter($this));
 
 		$callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
-		if(strlen($callbackEventParameter) > 0)
-			$this->_postData[TPage::FIELD_CALLBACK_PARAMETER] = TJavaScript::jsonDecode((string)$callbackEventParameter);
+		if (strlen($callbackEventParameter) > 0)
+			$this->_postData[TPage::FIELD_CALLBACK_PARAMETER] = TJavaScript::jsonDecode((string) $callbackEventParameter);
 
 		// Decode Callback postData from UTF-8 to current Charset
 		if (($g = $this->getApplication()->getGlobalization(false)) !== null &&
@@ -384,7 +384,7 @@ 
 	 */
 	public function getCallbackClient()
 	{
-		if($this->getAdapter() !== null)
+		if ($this->getAdapter() !== null)
 			return $this->getAdapter()->getCallbackClientHandler();
 		else
 			return new TCallbackClientScript();
@@ -450,7 +450,7 @@ 
 	 */
 	public function setForm(TForm $form)
 	{
-		if($this->_form === null)
+		if ($this->_form === null)
 			$this->_form = $form;
 		else
 			throw new TInvalidOperationException('page_form_duplicated');
@@ -464,15 +464,15 @@ 
 	 */
 	public function getValidators($validationGroup = null)
 	{
-		if(!$this->_validators)
+		if (!$this->_validators)
 			$this->_validators = new TList;
-		if(empty($validationGroup) === true)
+		if (empty($validationGroup) === true)
 			return $this->_validators;
 		else
 		{
 			$list = new TList;
-			foreach($this->_validators as $validator)
-				if($validator->getValidationGroup() === $validationGroup)
+			foreach ($this->_validators as $validator)
+				if ($validator->getValidationGroup() === $validationGroup)
 					$list->add($validator);
 			return $list;
 		}
@@ -488,18 +488,18 @@ 
 	{
 		Prado::trace("Page validate()", 'Prado\Web\UI\TPage');
 		$this->_validated = true;
-		if($this->_validators && $this->_validators->getCount())
+		if ($this->_validators && $this->_validators->getCount())
 		{
-			if($validationGroup === null)
+			if ($validationGroup === null)
 			{
-				foreach($this->_validators as $validator)
+				foreach ($this->_validators as $validator)
 					$validator->validate();
 			}
 			else
 			{
-				foreach($this->_validators as $validator)
+				foreach ($this->_validators as $validator)
 				{
-					if($validator->getValidationGroup() === $validationGroup)
+					if ($validator->getValidationGroup() === $validationGroup)
 						$validator->validate();
 				}
 			}
@@ -514,12 +514,12 @@ 
 	 */
 	public function getIsValid()
 	{
-		if($this->_validated)
+		if ($this->_validated)
 		{
-			if($this->_validators && $this->_validators->getCount())
+			if ($this->_validators && $this->_validators->getCount())
 			{
-				foreach($this->_validators as $validator)
-					if(!$validator->getIsValid())
+				foreach ($this->_validators as $validator)
+					if (!$validator->getIsValid())
 						return false;
 			}
 			return true;
@@ -533,7 +533,7 @@ 
 	 */
 	public function getTheme()
 	{
-		if(is_string($this->_theme))
+		if (is_string($this->_theme))
 			$this->_theme = $this->getService()->getThemeManager()->getTheme($this->_theme);
 		return $this->_theme;
 	}
@@ -544,7 +544,7 @@ 
 	 */
 	public function setTheme($value)
 	{
-		$this->_theme = empty($value)?null:$value;
+		$this->_theme = empty($value) ?null:$value;
 	}
 
 
@@ -553,7 +553,7 @@ 
 	 */
 	public function getStyleSheetTheme()
 	{
-		if(is_string($this->_styleSheet))
+		if (is_string($this->_styleSheet))
 			$this->_styleSheet = $this->getService()->getThemeManager()->getTheme($this->_styleSheet);
 		return $this->_styleSheet;
 	}
@@ -564,7 +564,7 @@ 
 	 */
 	public function setStyleSheetTheme($value)
 	{
-		$this->_styleSheet = empty($value)?null:$value;
+		$this->_styleSheet = empty($value) ?null:$value;
 	}
 
 	/**
@@ -574,7 +574,7 @@ 
 	 */
 	public function applyControlSkin($control)
 	{
-		if(($theme = $this->getTheme()) !== null)
+		if (($theme = $this->getTheme()) !== null)
 			$theme->applySkin($control);
 	}
 
@@ -585,7 +585,7 @@ 
 	 */
 	public function applyControlStyleSheet($control)
 	{
-		if(($theme = $this->getStyleSheetTheme()) !== null)
+		if (($theme = $this->getStyleSheetTheme()) !== null)
 			$theme->applySkin($control);
 	}
 
@@ -594,10 +594,10 @@ 
 	 */
 	public function getClientScript()
 	{
-		if(!$this->_clientScript) {
+		if (!$this->_clientScript) {
 			$className = $classPath = $this->getService()->getClientScriptManagerClass();
 
-			if($className !== '\Prado\Web\UI\TClientScriptManager' && !is_subclass_of($className, '\Prado\Web\UI\TClientScriptManager'))
+			if ($className !== '\Prado\Web\UI\TClientScriptManager' && !is_subclass_of($className, '\Prado\Web\UI\TClientScriptManager'))
 				throw new THttpException(404, 'page_csmanagerclass_invalid', $className);
 
 			$this->_clientScript = new $className($this);
@@ -671,23 +671,23 @@ 
 		$this->raiseEvent('OnPreRenderComplete', $this, $param);
 		$cs = $this->getClientScript();
 		$theme = $this->getTheme();
-		if($theme instanceof ITheme)
+		if ($theme instanceof ITheme)
 		{
-			foreach($theme->getStyleSheetFiles() as $url)
+			foreach ($theme->getStyleSheetFiles() as $url)
 				$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
-			foreach($theme->getJavaScriptFiles() as $url)
+			foreach ($theme->getJavaScriptFiles() as $url)
 				$cs->registerHeadScriptFile($url, $url);
 		}
 		$styleSheet = $this->getStyleSheetTheme();
-		if($styleSheet instanceof ITheme)
+		if ($styleSheet instanceof ITheme)
 		{
-			foreach($styleSheet->getStyleSheetFiles() as $url)
+			foreach ($styleSheet->getStyleSheetFiles() as $url)
 				$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
-			foreach($styleSheet->getJavaScriptFiles() as $url)
+			foreach ($styleSheet->getJavaScriptFiles() as $url)
 				$cs->registerHeadScriptFile($url, $url);
 		}
 
-		if($cs->getRequiresHead() && $this->getHead() === null)
+		if ($cs->getRequiresHead() && $this->getHead() === null)
 			throw new TConfigurationException('page_head_required');
 	}
 
@@ -702,7 +702,7 @@ 
 	private function getCssMediaType($url)
 	{
 		$segs = explode('.', basename($url));
-		if(isset($segs[2]))
+		if (isset($segs[2]))
 			return $segs[count($segs) - 2];
 		else
 			return '';
@@ -727,7 +727,7 @@ 
 	private function determinePostBackMode()
 	{
 		$postData = $this->getRequest();
-		if($postData->contains(self::FIELD_PAGESTATE) || $postData->contains(self::FIELD_POSTBACK_TARGET))
+		if ($postData->contains(self::FIELD_PAGESTATE) || $postData->contains(self::FIELD_POSTBACK_TARGET))
 			$this->_postData = $postData;
 	}
 
@@ -807,10 +807,10 @@ 
 	 */
 	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)
+		foreach ($this->getCachingStack() as $item)
 			$item->registerAction('Page', 'registerRequiresPostData', [$id]);
 	}
 
@@ -819,10 +819,10 @@ 
 	 */
 	public function getPostBackEventTarget()
 	{
-		if($this->_postBackEventTarget === null && $this->_postData !== null)
+		if ($this->_postBackEventTarget === null && $this->_postData !== null)
 		{
 			$eventTarget = $this->_postData->itemAt(self::FIELD_POSTBACK_TARGET);
-			if(!empty($eventTarget))
+			if (!empty($eventTarget))
 				$this->_postBackEventTarget = $this->findControl($eventTarget);
 		}
 		return $this->_postBackEventTarget;
@@ -842,9 +842,9 @@ 
 	 */
 	public function getPostBackEventParameter()
 	{
-		if($this->_postBackEventParameter === null && $this->_postData !== null)
+		if ($this->_postBackEventParameter === null && $this->_postData !== null)
 		{
-			if(($this->_postBackEventParameter = $this->_postData->itemAt(self::FIELD_POSTBACK_PARAMETER)) === null)
+			if (($this->_postBackEventParameter = $this->_postData->itemAt(self::FIELD_POSTBACK_PARAMETER)) === null)
 				$this->_postBackEventParameter = '';
 		}
 		return $this->_postBackEventParameter;
@@ -866,37 +866,37 @@ 
 	protected function processPostData($postData, $beforeLoad)
 	{
 		$this->_isLoadingPostData = true;
-		if($beforeLoad)
+		if ($beforeLoad)
 			$this->_restPostData = new TMap;
-		foreach($postData as $key => $value)
+		foreach ($postData as $key => $value)
 		{
-			if($this->isSystemPostField($key))
+			if ($this->isSystemPostField($key))
 				continue;
-			elseif($control = $this->findControl($key))
+			elseif ($control = $this->findControl($key))
 			{
-				if($control instanceof \Prado\Web\UI\IPostBackDataHandler)
+				if ($control instanceof \Prado\Web\UI\IPostBackDataHandler)
 				{
-					if($control->loadPostData($key, $postData))
+					if ($control->loadPostData($key, $postData))
 						$this->_controlsPostDataChanged[] = $control;
 				}
-				elseif($control instanceof IPostBackEventHandler &&
+				elseif ($control instanceof IPostBackEventHandler &&
 					empty($this->_postData[self::FIELD_POSTBACK_TARGET]))
 				{
-					$this->_postData->add(self::FIELD_POSTBACK_TARGET, $key);  // not calling setPostBackEventTarget() because the control may be removed later
+					$this->_postData->add(self::FIELD_POSTBACK_TARGET, $key); // not calling setPostBackEventTarget() because the control may be removed later
 				}
 				unset($this->_controlsRequiringPostData[$key]);
 			}
-			elseif($beforeLoad)
+			elseif ($beforeLoad)
 				$this->_restPostData->add($key, $value);
 		}
 
-		foreach($this->_controlsRequiringPostData as $key => $value)
+		foreach ($this->_controlsRequiringPostData as $key => $value)
 		{
-			if($control = $this->findControl($key))
+			if ($control = $this->findControl($key))
 			{
-				if($control instanceof \Prado\Web\UI\IPostBackDataHandler)
+				if ($control instanceof \Prado\Web\UI\IPostBackDataHandler)
 				{
-					if($control->loadPostData($key, $this->_postData))
+					if ($control->loadPostData($key, $this->_postData))
 						$this->_controlsPostDataChanged[] = $control;
 				}
 				else
@@ -920,7 +920,7 @@ 
 	 */
 	protected function raiseChangedEvents()
 	{
-		foreach($this->_controlsPostDataChanged as $control)
+		foreach ($this->_controlsPostDataChanged as $control)
 			$control->raisePostDataChangedEvent();
 	}
 
@@ -929,9 +929,9 @@ 
 	 */
 	protected function raisePostBackEvent()
 	{
-		if(($postBackHandler = $this->getPostBackEventTarget()) === null)
+		if (($postBackHandler = $this->getPostBackEventTarget()) === null)
 			$this->validate();
-		elseif($postBackHandler instanceof IPostBackEventHandler)
+		elseif ($postBackHandler instanceof IPostBackEventHandler)
 			$postBackHandler->raisePostBackEvent($this->getPostBackEventParameter());
 	}
 
@@ -950,7 +950,7 @@ 
 	 */
 	public function ensureRenderInForm($control)
 	{
-		if(!$this->getIsCallback() && !$this->_inFormRender)
+		if (!$this->getIsCallback() && !$this->_inFormRender)
 			throw new TConfigurationException('page_control_outofform', get_class($control), $control ? $control->getUniqueID() : null);
 	}
 
@@ -959,7 +959,7 @@ 
 	 */
 	public function beginFormRender($writer)
 	{
-		if($this->_formRendered)
+		if ($this->_formRendered)
 			throw new TConfigurationException('page_form_duplicated');
 		$this->_formRendered = true;
 		$this->getClientScript()->registerHiddenField(self::FIELD_PAGESTATE, $this->getClientState());
@@ -971,15 +971,15 @@ 
 	 */
 	public function endFormRender($writer)
 	{
-		if($this->_focus)
+		if ($this->_focus)
 		{
-			if(($this->_focus instanceof TControl) && $this->_focus->getVisible(true))
+			if (($this->_focus instanceof TControl) && $this->_focus->getVisible(true))
 				$focus = $this->_focus->getClientID();
 			else
 				$focus = $this->_focus;
 			$this->getClientScript()->registerFocusControl($focus);
 		}
-		elseif($this->_postData && ($lastFocus = $this->_postData->itemAt(self::FIELD_LASTFOCUS)) !== null)
+		elseif ($this->_postData && ($lastFocus = $this->_postData->itemAt(self::FIELD_LASTFOCUS)) !== null)
 			$this->getClientScript()->registerFocusControl($lastFocus);
 		$this->_inFormRender = false;
 	}
@@ -1023,10 +1023,10 @@ 
 	 */
 	public function setHead(THead $value)
 	{
-		if($this->_head)
+		if ($this->_head)
 			throw new TInvalidOperationException('page_head_duplicated');
 		$this->_head = $value;
-		if($this->_title !== null)
+		if ($this->_title !== null)
 		{
 			$this->_head->setTitle($this->_title);
 			$this->_title = null;
@@ -1038,7 +1038,7 @@ 
 	 */
 	public function getTitle()
 	{
-		if($this->_head)
+		if ($this->_head)
 			return $this->_head->getTitle();
 		else
 			return $this->_title === null ? '' : $this->_title;
@@ -1052,7 +1052,7 @@ 
 	 */
 	public function setTitle($value)
 	{
-		if($this->_head)
+		if ($this->_head)
 			$this->_head->setTitle($value);
 		else
 			$this->_title = $value;
@@ -1107,10 +1107,10 @@ 
 	 */
 	public function getStatePersister()
 	{
-		if($this->_statePersister === null)
+		if ($this->_statePersister === null)
 		{
 			$this->_statePersister = Prado::createComponent($this->_statePersisterClass);
-			if(!($this->_statePersister instanceof IPageStatePersister))
+			if (!($this->_statePersister instanceof IPageStatePersister))
 				throw new TInvalidDataTypeException('page_statepersister_invalid');
 			$this->_statePersister->setPage($this);
 		}
@@ -1194,9 +1194,9 @@ 
 	 */
 	public function registerCachingAction($context, $funcName, $funcParams)
 	{
-		if($this->_cachingStack)
+		if ($this->_cachingStack)
 		{
-			foreach($this->_cachingStack as $cache)
+			foreach ($this->_cachingStack as $cache)
 				$cache->registerAction($context, $funcName, $funcParams);
 		}
 	}
@@ -1206,7 +1206,7 @@ 
 	 */
 	public function getCachingStack()
 	{
-		if(!$this->_cachingStack)
+		if (!$this->_cachingStack)
 			$this->_cachingStack = new TStack;
 		return $this->_cachingStack;
 	}

Braces +157 added lines, -118 removed lines

@@ -200,13 +200,14 @@ 
 
 		if($this->getIsPostBack())
 		{
-			if($this->getIsCallback())
-				$this->processCallbackRequest($writer);
-			else
-				$this->processPostBackRequest($writer);
+			if($this->getIsCallback()) {
+							$this->processCallbackRequest($writer);
+			} else {
+							$this->processPostBackRequest($writer);
+			}
+		} else {
+					$this->processNormalRequest($writer);
 		}
-		else
-			$this->processNormalRequest($writer);
 
 		$this->_writer = null;
 	}
@@ -294,8 +295,9 @@ 
 	{
 		if(is_array($data))
 		{
-			foreach($data as $k => $v)
-				$data[$k] = self::decodeUTF8($v, $enc);
+			foreach($data as $k => $v) {
+							$data[$k] = self::decodeUTF8($v, $enc);
+			}
 			return $data;
 		} elseif(is_string($data)) {
 			return iconv('UTF-8', $enc . '//IGNORE', $data);
@@ -313,14 +315,16 @@ 
 		$this->setAdapter(new TActivePageAdapter($this));
 
 		$callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
-		if(strlen($callbackEventParameter) > 0)
-			$this->_postData[TPage::FIELD_CALLBACK_PARAMETER] = TJavaScript::jsonDecode((string)$callbackEventParameter);
+		if(strlen($callbackEventParameter) > 0) {
+					$this->_postData[TPage::FIELD_CALLBACK_PARAMETER] = TJavaScript::jsonDecode((string)$callbackEventParameter);
+		}
 
 		// Decode Callback postData from UTF-8 to current Charset
 		if (($g = $this->getApplication()->getGlobalization(false)) !== null &&
-			strtoupper($enc = $g->getCharset()) != 'UTF-8')
-				foreach ($this->_postData as $k => $v)
+			strtoupper($enc = $g->getCharset()) != 'UTF-8') {
+						foreach ($this->_postData as $k => $v)
 					$this->_postData[$k] = self::decodeUTF8($v, $enc);
+		}
 
 		Prado::trace("Page onPreInit()", 'Prado\Web\UI\TPage');
 		$this->onPreInit(null);
@@ -384,10 +388,11 @@ 
 	 */
 	public function getCallbackClient()
 	{
-		if($this->getAdapter() !== null)
-			return $this->getAdapter()->getCallbackClientHandler();
-		else
-			return new TCallbackClientScript();
+		if($this->getAdapter() !== null) {
+					return $this->getAdapter()->getCallbackClientHandler();
+		} else {
+					return new TCallbackClientScript();
+		}
 	}
 
 	/**
@@ -450,10 +455,11 @@ 
 	 */
 	public function setForm(TForm $form)
 	{
-		if($this->_form === null)
-			$this->_form = $form;
-		else
-			throw new TInvalidOperationException('page_form_duplicated');
+		if($this->_form === null) {
+					$this->_form = $form;
+		} else {
+					throw new TInvalidOperationException('page_form_duplicated');
+		}
 	}
 
 	/**
@@ -464,16 +470,18 @@ 
 	 */
 	public function getValidators($validationGroup = null)
 	{
-		if(!$this->_validators)
-			$this->_validators = new TList;
-		if(empty($validationGroup) === true)
-			return $this->_validators;
-		else
+		if(!$this->_validators) {
+					$this->_validators = new TList;
+		}
+		if(empty($validationGroup) === true) {
+					return $this->_validators;
+		} else
 		{
 			$list = new TList;
-			foreach($this->_validators as $validator)
-				if($validator->getValidationGroup() === $validationGroup)
+			foreach($this->_validators as $validator) {
+							if($validator->getValidationGroup() === $validationGroup)
 					$list->add($validator);
+			}
 			return $list;
 		}
 	}
@@ -492,15 +500,16 @@ 
 		{
 			if($validationGroup === null)
 			{
-				foreach($this->_validators as $validator)
-					$validator->validate();
-			}
-			else
+				foreach($this->_validators as $validator) {
+									$validator->validate();
+				}
+			} else
 			{
 				foreach($this->_validators as $validator)
 				{
-					if($validator->getValidationGroup() === $validationGroup)
-						$validator->validate();
+					if($validator->getValidationGroup() === $validationGroup) {
+											$validator->validate();
+					}
 				}
 			}
 		}
@@ -518,14 +527,15 @@ 
 		{
 			if($this->_validators && $this->_validators->getCount())
 			{
-				foreach($this->_validators as $validator)
-					if(!$validator->getIsValid())
+				foreach($this->_validators as $validator) {
+									if(!$validator->getIsValid())
 						return false;
+				}
 			}
 			return true;
+		} else {
+					throw new TInvalidOperationException('page_isvalid_unknown');
 		}
-		else
-			throw new TInvalidOperationException('page_isvalid_unknown');
 	}
 
 	/**
@@ -533,8 +543,9 @@ 
 	 */
 	public function getTheme()
 	{
-		if(is_string($this->_theme))
-			$this->_theme = $this->getService()->getThemeManager()->getTheme($this->_theme);
+		if(is_string($this->_theme)) {
+					$this->_theme = $this->getService()->getThemeManager()->getTheme($this->_theme);
+		}
 		return $this->_theme;
 	}
 
@@ -553,8 +564,9 @@ 
 	 */
 	public function getStyleSheetTheme()
 	{
-		if(is_string($this->_styleSheet))
-			$this->_styleSheet = $this->getService()->getThemeManager()->getTheme($this->_styleSheet);
+		if(is_string($this->_styleSheet)) {
+					$this->_styleSheet = $this->getService()->getThemeManager()->getTheme($this->_styleSheet);
+		}
 		return $this->_styleSheet;
 	}
 
@@ -574,8 +586,9 @@ 
 	 */
 	public function applyControlSkin($control)
 	{
-		if(($theme = $this->getTheme()) !== null)
-			$theme->applySkin($control);
+		if(($theme = $this->getTheme()) !== null) {
+					$theme->applySkin($control);
+		}
 	}
 
 	/**
@@ -585,8 +598,9 @@ 
 	 */
 	public function applyControlStyleSheet($control)
 	{
-		if(($theme = $this->getStyleSheetTheme()) !== null)
-			$theme->applySkin($control);
+		if(($theme = $this->getStyleSheetTheme()) !== null) {
+					$theme->applySkin($control);
+		}
 	}
 
 	/**
@@ -597,8 +611,9 @@ 
 		if(!$this->_clientScript) {
 			$className = $classPath = $this->getService()->getClientScriptManagerClass();
 
-			if($className !== '\Prado\Web\UI\TClientScriptManager' && !is_subclass_of($className, '\Prado\Web\UI\TClientScriptManager'))
-				throw new THttpException(404, 'page_csmanagerclass_invalid', $className);
+			if($className !== '\Prado\Web\UI\TClientScriptManager' && !is_subclass_of($className, '\Prado\Web\UI\TClientScriptManager')) {
+							throw new THttpException(404, 'page_csmanagerclass_invalid', $className);
+			}
 
 			$this->_clientScript = new $className($this);
 		}
@@ -673,22 +688,27 @@ 
 		$theme = $this->getTheme();
 		if($theme instanceof ITheme)
 		{
-			foreach($theme->getStyleSheetFiles() as $url)
-				$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
-			foreach($theme->getJavaScriptFiles() as $url)
-				$cs->registerHeadScriptFile($url, $url);
+			foreach($theme->getStyleSheetFiles() as $url) {
+							$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
+			}
+			foreach($theme->getJavaScriptFiles() as $url) {
+							$cs->registerHeadScriptFile($url, $url);
+			}
 		}
 		$styleSheet = $this->getStyleSheetTheme();
 		if($styleSheet instanceof ITheme)
 		{
-			foreach($styleSheet->getStyleSheetFiles() as $url)
-				$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
-			foreach($styleSheet->getJavaScriptFiles() as $url)
-				$cs->registerHeadScriptFile($url, $url);
+			foreach($styleSheet->getStyleSheetFiles() as $url) {
+							$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
+			}
+			foreach($styleSheet->getJavaScriptFiles() as $url) {
+							$cs->registerHeadScriptFile($url, $url);
+			}
 		}
 
-		if($cs->getRequiresHead() && $this->getHead() === null)
-			throw new TConfigurationException('page_head_required');
+		if($cs->getRequiresHead() && $this->getHead() === null) {
+					throw new TConfigurationException('page_head_required');
+		}
 	}
 
 	/**
@@ -702,10 +722,11 @@ 
 	private function getCssMediaType($url)
 	{
 		$segs = explode('.', basename($url));
-		if(isset($segs[2]))
-			return $segs[count($segs) - 2];
-		else
-			return '';
+		if(isset($segs[2])) {
+					return $segs[count($segs) - 2];
+		} else {
+					return '';
+		}
 	}
 
 	/**
@@ -727,8 +748,9 @@ 
 	private function determinePostBackMode()
 	{
 		$postData = $this->getRequest();
-		if($postData->contains(self::FIELD_PAGESTATE) || $postData->contains(self::FIELD_POSTBACK_TARGET))
-			$this->_postData = $postData;
+		if($postData->contains(self::FIELD_PAGESTATE) || $postData->contains(self::FIELD_POSTBACK_TARGET)) {
+					$this->_postData = $postData;
+		}
 	}
 
 	/**
@@ -810,8 +832,9 @@ 
 		$id = is_string($control)?$control:$control->getUniqueID();
 		$this->_controlsRegisteredForPostData[$id] = true;
 		$params = func_get_args();
-		foreach($this->getCachingStack() as $item)
-			$item->registerAction('Page', 'registerRequiresPostData', [$id]);
+		foreach($this->getCachingStack() as $item) {
+					$item->registerAction('Page', 'registerRequiresPostData', [$id]);
+		}
 	}
 
 	/**
@@ -822,8 +845,9 @@ 
 		if($this->_postBackEventTarget === null && $this->_postData !== null)
 		{
 			$eventTarget = $this->_postData->itemAt(self::FIELD_POSTBACK_TARGET);
-			if(!empty($eventTarget))
-				$this->_postBackEventTarget = $this->findControl($eventTarget);
+			if(!empty($eventTarget)) {
+							$this->_postBackEventTarget = $this->findControl($eventTarget);
+			}
 		}
 		return $this->_postBackEventTarget;
 	}
@@ -844,8 +868,9 @@ 
 	{
 		if($this->_postBackEventParameter === null && $this->_postData !== null)
 		{
-			if(($this->_postBackEventParameter = $this->_postData->itemAt(self::FIELD_POSTBACK_PARAMETER)) === null)
-				$this->_postBackEventParameter = '';
+			if(($this->_postBackEventParameter = $this->_postData->itemAt(self::FIELD_POSTBACK_PARAMETER)) === null) {
+							$this->_postBackEventParameter = '';
+			}
 		}
 		return $this->_postBackEventParameter;
 	}
@@ -866,28 +891,29 @@ 
 	protected function processPostData($postData, $beforeLoad)
 	{
 		$this->_isLoadingPostData = true;
-		if($beforeLoad)
-			$this->_restPostData = new TMap;
+		if($beforeLoad) {
+					$this->_restPostData = new TMap;
+		}
 		foreach($postData as $key => $value)
 		{
-			if($this->isSystemPostField($key))
-				continue;
-			elseif($control = $this->findControl($key))
+			if($this->isSystemPostField($key)) {
+							continue;
+			} elseif($control = $this->findControl($key))
 			{
 				if($control instanceof \Prado\Web\UI\IPostBackDataHandler)
 				{
-					if($control->loadPostData($key, $postData))
-						$this->_controlsPostDataChanged[] = $control;
-				}
-				elseif($control instanceof IPostBackEventHandler &&
+					if($control->loadPostData($key, $postData)) {
+											$this->_controlsPostDataChanged[] = $control;
+					}
+				} elseif($control instanceof IPostBackEventHandler &&
 					empty($this->_postData[self::FIELD_POSTBACK_TARGET]))
 				{
 					$this->_postData->add(self::FIELD_POSTBACK_TARGET, $key);  // not calling setPostBackEventTarget() because the control may be removed later
 				}
 				unset($this->_controlsRequiringPostData[$key]);
+			} elseif($beforeLoad) {
+							$this->_restPostData->add($key, $value);
 			}
-			elseif($beforeLoad)
-				$this->_restPostData->add($key, $value);
 		}
 
 		foreach($this->_controlsRequiringPostData as $key => $value)
@@ -896,11 +922,12 @@ 
 			{
 				if($control instanceof \Prado\Web\UI\IPostBackDataHandler)
 				{
-					if($control->loadPostData($key, $this->_postData))
-						$this->_controlsPostDataChanged[] = $control;
+					if($control->loadPostData($key, $this->_postData)) {
+											$this->_controlsPostDataChanged[] = $control;
+					}
+				} else {
+									throw new TInvalidDataValueException('page_postbackcontrol_invalid', $key);
 				}
-				else
-					throw new TInvalidDataValueException('page_postbackcontrol_invalid', $key);
 				unset($this->_controlsRequiringPostData[$key]);
 			}
 		}
@@ -920,8 +947,9 @@ 
 	 */
 	protected function raiseChangedEvents()
 	{
-		foreach($this->_controlsPostDataChanged as $control)
-			$control->raisePostDataChangedEvent();
+		foreach($this->_controlsPostDataChanged as $control) {
+					$control->raisePostDataChangedEvent();
+		}
 	}
 
 	/**
@@ -929,10 +957,11 @@ 
 	 */
 	protected function raisePostBackEvent()
 	{
-		if(($postBackHandler = $this->getPostBackEventTarget()) === null)
-			$this->validate();
-		elseif($postBackHandler instanceof IPostBackEventHandler)
-			$postBackHandler->raisePostBackEvent($this->getPostBackEventParameter());
+		if(($postBackHandler = $this->getPostBackEventTarget()) === null) {
+					$this->validate();
+		} elseif($postBackHandler instanceof IPostBackEventHandler) {
+					$postBackHandler->raisePostBackEvent($this->getPostBackEventParameter());
+		}
 	}
 
 	/**
@@ -950,8 +979,9 @@ 
 	 */
 	public function ensureRenderInForm($control)
 	{
-		if(!$this->getIsCallback() && !$this->_inFormRender)
-			throw new TConfigurationException('page_control_outofform', get_class($control), $control ? $control->getUniqueID() : null);
+		if(!$this->getIsCallback() && !$this->_inFormRender) {
+					throw new TConfigurationException('page_control_outofform', get_class($control), $control ? $control->getUniqueID() : null);
+		}
 	}
 
 	/**
@@ -959,8 +989,9 @@ 
 	 */
 	public function beginFormRender($writer)
 	{
-		if($this->_formRendered)
-			throw new TConfigurationException('page_form_duplicated');
+		if($this->_formRendered) {
+					throw new TConfigurationException('page_form_duplicated');
+		}
 		$this->_formRendered = true;
 		$this->getClientScript()->registerHiddenField(self::FIELD_PAGESTATE, $this->getClientState());
 		$this->_inFormRender = true;
@@ -973,14 +1004,15 @@ 
 	{
 		if($this->_focus)
 		{
-			if(($this->_focus instanceof TControl) && $this->_focus->getVisible(true))
-				$focus = $this->_focus->getClientID();
-			else
-				$focus = $this->_focus;
+			if(($this->_focus instanceof TControl) && $this->_focus->getVisible(true)) {
+							$focus = $this->_focus->getClientID();
+			} else {
+							$focus = $this->_focus;
+			}
 			$this->getClientScript()->registerFocusControl($focus);
+		} elseif($this->_postData && ($lastFocus = $this->_postData->itemAt(self::FIELD_LASTFOCUS)) !== null) {
+					$this->getClientScript()->registerFocusControl($lastFocus);
 		}
-		elseif($this->_postData && ($lastFocus = $this->_postData->itemAt(self::FIELD_LASTFOCUS)) !== null)
-			$this->getClientScript()->registerFocusControl($lastFocus);
 		$this->_inFormRender = false;
 	}
 
@@ -1023,8 +1055,9 @@ 
 	 */
 	public function setHead(THead $value)
 	{
-		if($this->_head)
-			throw new TInvalidOperationException('page_head_duplicated');
+		if($this->_head) {
+					throw new TInvalidOperationException('page_head_duplicated');
+		}
 		$this->_head = $value;
 		if($this->_title !== null)
 		{
@@ -1038,10 +1071,11 @@ 
 	 */
 	public function getTitle()
 	{
-		if($this->_head)
-			return $this->_head->getTitle();
-		else
-			return $this->_title === null ? '' : $this->_title;
+		if($this->_head) {
+					return $this->_head->getTitle();
+		} else {
+					return $this->_title === null ? '' : $this->_title;
+		}
 	}
 
 	/**
@@ -1052,10 +1086,11 @@ 
 	 */
 	public function setTitle($value)
 	{
-		if($this->_head)
-			$this->_head->setTitle($value);
-		else
-			$this->_title = $value;
+		if($this->_head) {
+					$this->_head->setTitle($value);
+		} else {
+					$this->_title = $value;
+		}
 	}
 
 	/**
@@ -1110,8 +1145,9 @@ 
 		if($this->_statePersister === null)
 		{
 			$this->_statePersister = Prado::createComponent($this->_statePersisterClass);
-			if(!($this->_statePersister instanceof IPageStatePersister))
-				throw new TInvalidDataTypeException('page_statepersister_invalid');
+			if(!($this->_statePersister instanceof IPageStatePersister)) {
+							throw new TInvalidDataTypeException('page_statepersister_invalid');
+			}
 			$this->_statePersister->setPage($this);
 		}
 		return $this->_statePersister;
@@ -1196,8 +1232,9 @@ 
 	{
 		if($this->_cachingStack)
 		{
-			foreach($this->_cachingStack as $cache)
-				$cache->registerAction($context, $funcName, $funcParams);
+			foreach($this->_cachingStack as $cache) {
+							$cache->registerAction($context, $funcName, $funcParams);
+			}
 		}
 	}
 
@@ -1206,8 +1243,9 @@ 
 	 */
 	public function getCachingStack()
 	{
-		if(!$this->_cachingStack)
-			$this->_cachingStack = new TStack;
+		if(!$this->_cachingStack) {
+					$this->_cachingStack = new TStack;
+		}
 		return $this->_cachingStack;
 	}
 
@@ -1216,7 +1254,8 @@ 
 	 */
 	public function flushWriter()
 	{
-		if ($this->_writer)
-			$this->Response->write($this->_writer->flush());
+		if ($this->_writer) {
+					$this->Response->write($this->_writer->flush());
+		}
 	}
 }
\ No newline at end of file

framework/Web/UI/TThemeManager.php

Spacing +14 added lines, -14 removed lines

@@ -81,7 +81,7 @@ 
 	{
 		$this->_initialized = true;
 		$service = $this->getService();
-		if($service instanceof TPageService)
+		if ($service instanceof TPageService)
 			$service->setThemeManager($this);
 		else
 			throw new TConfigurationException('thememanager_service_unavailable');
@@ -93,8 +93,8 @@ 
 	 */
 	public function getTheme($name)
 	{
-		$themePath = $this->getBasePath() . DIRECTORY_SEPARATOR . $name;
-		$themeUrl = rtrim($this->getBaseUrl(), '/') . '/' . $name;
+		$themePath = $this->getBasePath().DIRECTORY_SEPARATOR.$name;
+		$themeUrl = rtrim($this->getBaseUrl(), '/').'/'.$name;
 		return Prado::createComponent($this->getThemeClass(), $themePath, $themeUrl);
 	}
 
@@ -102,7 +102,7 @@ 
 	 * @param string|null $class Theme class name in namespace format
 	 */
 	public function setThemeClass($class) {
-		$this->_themeClass = $class === null ? self::DEFAULT_THEMECLASS : (string)$class;
+		$this->_themeClass = $class === null ? self::DEFAULT_THEMECLASS : (string) $class;
 	}
 
 	/**
@@ -120,9 +120,9 @@ 
 		$themes = [];
 		$basePath = $this->getBasePath();
 		$folder = @opendir($basePath);
-		while($file = @readdir($folder))
+		while ($file = @readdir($folder))
 		{
-			if($file !== '.' && $file !== '..' && $file !== '.svn' && is_dir($basePath . DIRECTORY_SEPARATOR . $file))
+			if ($file !== '.' && $file !== '..' && $file !== '.svn' && is_dir($basePath.DIRECTORY_SEPARATOR.$file))
 				$themes[] = $file;
 		}
 		closedir($folder);
@@ -135,10 +135,10 @@ 
 	 */
 	public function getBasePath()
 	{
-		if($this->_basePath === null)
+		if ($this->_basePath === null)
 		{
-			$this->_basePath = dirname($this->getRequest()->getApplicationFilePath()) . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
-			if(($basePath = realpath($this->_basePath)) === false || !is_dir($basePath))
+			$this->_basePath = dirname($this->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
+			if (($basePath = realpath($this->_basePath)) === false || !is_dir($basePath))
 				throw new TConfigurationException('thememanager_basepath_invalid2', $this->_basePath);
 			$this->_basePath = $basePath;
 		}
@@ -151,12 +151,12 @@ 
 	 */
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('thememanager_basepath_unchangeable');
 		else
 		{
 			$this->_basePath = Prado::getPathOfNamespace($value);
-			if($this->_basePath === null || !is_dir($this->_basePath))
+			if ($this->_basePath === null || !is_dir($this->_basePath))
 				throw new TInvalidDataValueException('thememanager_basepath_invalid', $value);
 		}
 	}
@@ -167,14 +167,14 @@ 
 	 */
 	public function getBaseUrl()
 	{
-		if($this->_baseUrl === null)
+		if ($this->_baseUrl === null)
 		{
 			$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)), '\\', '/');
+			$this->_baseUrl = $appUrl.strtr(substr($basePath, strlen($appPath)), '\\', '/');
 		}
 		return $this->_baseUrl;
 	}

Braces +20 added lines, -15 removed lines

@@ -81,10 +81,11 @@ 
 	{
 		$this->_initialized = true;
 		$service = $this->getService();
-		if($service instanceof TPageService)
-			$service->setThemeManager($this);
-		else
-			throw new TConfigurationException('thememanager_service_unavailable');
+		if($service instanceof TPageService) {
+					$service->setThemeManager($this);
+		} else {
+					throw new TConfigurationException('thememanager_service_unavailable');
+		}
 	}
 
 	/**
@@ -122,8 +123,9 @@ 
 		$folder = @opendir($basePath);
 		while($file = @readdir($folder))
 		{
-			if($file !== '.' && $file !== '..' && $file !== '.svn' && is_dir($basePath . DIRECTORY_SEPARATOR . $file))
-				$themes[] = $file;
+			if($file !== '.' && $file !== '..' && $file !== '.svn' && is_dir($basePath . DIRECTORY_SEPARATOR . $file)) {
+							$themes[] = $file;
+			}
 		}
 		closedir($folder);
 		return $themes;
@@ -138,8 +140,9 @@ 
 		if($this->_basePath === null)
 		{
 			$this->_basePath = dirname($this->getRequest()->getApplicationFilePath()) . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
-			if(($basePath = realpath($this->_basePath)) === false || !is_dir($basePath))
-				throw new TConfigurationException('thememanager_basepath_invalid2', $this->_basePath);
+			if(($basePath = realpath($this->_basePath)) === false || !is_dir($basePath)) {
+							throw new TConfigurationException('thememanager_basepath_invalid2', $this->_basePath);
+			}
 			$this->_basePath = $basePath;
 		}
 		return $this->_basePath;
@@ -151,13 +154,14 @@ 
 	 */
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('thememanager_basepath_unchangeable');
-		else
+		if($this->_initialized) {
+					throw new TInvalidOperationException('thememanager_basepath_unchangeable');
+		} else
 		{
 			$this->_basePath = Prado::getPathOfNamespace($value);
-			if($this->_basePath === null || !is_dir($this->_basePath))
-				throw new TInvalidDataValueException('thememanager_basepath_invalid', $value);
+			if($this->_basePath === null || !is_dir($this->_basePath)) {
+							throw new TInvalidDataValueException('thememanager_basepath_invalid', $value);
+			}
 		}
 	}
 
@@ -171,8 +175,9 @@ 
 		{
 			$appPath = dirname($this->getRequest()->getApplicationFilePath());
 			$basePath = $this->getBasePath();
-			if(strpos($basePath, $appPath) === false)
-				throw new TConfigurationException('thememanager_baseurl_required');
+			if(strpos($basePath, $appPath) === false) {
+							throw new TConfigurationException('thememanager_baseurl_required');
+			}
 			$appUrl = rtrim(dirname($this->getRequest()->getApplicationUrl()), '/\\');
 			$this->_baseUrl = $appUrl . strtr(substr($basePath, strlen($appPath)), '\\', '/');
 		}

framework/Web/UI/THtmlWriter.php

Spacing +12 added lines, -12 removed lines

@@ -100,7 +100,7 @@ 
 	 */
 	public function addAttributes($attrs)
 	{
-		foreach($attrs as $name => $value)
+		foreach ($attrs as $name => $value)
 			$this->_attributes[THttpUtility::htmlStrip($name)] = THttpUtility::htmlEncode($value);
 	}
 
@@ -129,7 +129,7 @@ 
 	 */
 	public function addStyleAttributes($attrs)
 	{
-		foreach($attrs as $name => $value)
+		foreach ($attrs as $name => $value)
 			$this->_styles[THttpUtility::htmlStrip($name)] = THttpUtility::htmlEncode($value);
 	}
 
@@ -177,7 +177,7 @@ 
 	 */
 	public function writeLine($str = '')
 	{
-		$this->_writer->write($str . "\n");
+		$this->_writer->write($str."\n");
 	}
 
 	/**
@@ -194,17 +194,17 @@ 
 	 */
 	public function renderBeginTag($tagName)
 	{
-		$str = '<' . $tagName;
-		foreach($this->_attributes as $name => $value)
-			$str .= ' ' . $name . '="' . $value . '"';
-		if(!empty($this->_styles))
+		$str = '<'.$tagName;
+		foreach ($this->_attributes as $name => $value)
+			$str .= ' '.$name.'="'.$value.'"';
+		if (!empty($this->_styles))
 		{
 			$str .= ' style="';
-			foreach($this->_styles as $name => $value)
-				$str .= $name . ':' . $value . ';';
+			foreach ($this->_styles as $name => $value)
+				$str .= $name.':'.$value.';';
 			$str .= '"';
 		}
-		if(isset(self::$_simpleTags[$tagName]))
+		if (isset(self::$_simpleTags[$tagName]))
 		{
 			$str .= ' />';
 			$this->_openTags[] = '';
@@ -224,8 +224,8 @@ 
 	 */
 	public function renderEndTag()
 	{
-		if(!empty($this->_openTags) && ($tagName = array_pop($this->_openTags)) !== '')
-			$this->_writer->write('</' . $tagName . '>');
+		if (!empty($this->_openTags) && ($tagName = array_pop($this->_openTags)) !== '')
+			$this->_writer->write('</'.$tagName.'>');
 	}
 }
 

Braces +16 added lines, -12 removed lines

@@ -100,8 +100,9 @@ 
 	 */
 	public function addAttributes($attrs)
 	{
-		foreach($attrs as $name => $value)
-			$this->_attributes[THttpUtility::htmlStrip($name)] = THttpUtility::htmlEncode($value);
+		foreach($attrs as $name => $value) {
+					$this->_attributes[THttpUtility::htmlStrip($name)] = THttpUtility::htmlEncode($value);
+		}
 	}
 
 	/**
@@ -129,8 +130,9 @@ 
 	 */
 	public function addStyleAttributes($attrs)
 	{
-		foreach($attrs as $name => $value)
-			$this->_styles[THttpUtility::htmlStrip($name)] = THttpUtility::htmlEncode($value);
+		foreach($attrs as $name => $value) {
+					$this->_styles[THttpUtility::htmlStrip($name)] = THttpUtility::htmlEncode($value);
+		}
 	}
 
 	/**
@@ -195,21 +197,22 @@ 
 	public function renderBeginTag($tagName)
 	{
 		$str = '<' . $tagName;
-		foreach($this->_attributes as $name => $value)
-			$str .= ' ' . $name . '="' . $value . '"';
+		foreach($this->_attributes as $name => $value) {
+					$str .= ' ' . $name . '="' . $value . '"';
+		}
 		if(!empty($this->_styles))
 		{
 			$str .= ' style="';
-			foreach($this->_styles as $name => $value)
-				$str .= $name . ':' . $value . ';';
+			foreach($this->_styles as $name => $value) {
+							$str .= $name . ':' . $value . ';';
+			}
 			$str .= '"';
 		}
 		if(isset(self::$_simpleTags[$tagName]))
 		{
 			$str .= ' />';
 			$this->_openTags[] = '';
-		}
-		else
+		} else
 		{
 			$str .= '>';
 			$this->_openTags[] = $tagName;
@@ -224,8 +227,9 @@ 
 	 */
 	public function renderEndTag()
 	{
-		if(!empty($this->_openTags) && ($tagName = array_pop($this->_openTags)) !== '')
-			$this->_writer->write('</' . $tagName . '>');
+		if(!empty($this->_openTags) && ($tagName = array_pop($this->_openTags)) !== '') {
+					$this->_writer->write('</' . $tagName . '>');
+		}
 	}
 }
 

framework/Web/UI/TControl.php

Spacing +178 added lines, -178 removed lines

@@ -114,17 +114,17 @@ 
 	 * Indexes for the rare fields.
 	 * In order to save memory, rare fields will only be created if they are needed.
 	 */
-	const RF_CONTROLS = 0;			// child controls
-	const RF_CHILD_STATE = 1;			// child state field
-	const RF_NAMED_CONTROLS = 2;		// list of controls whose namingcontainer is this control
-	const RF_NAMED_CONTROLS_ID = 3;	// counter for automatic id
-	const RF_SKIN_ID = 4;				// skin ID
-	const RF_DATA_BINDINGS = 5;		// data bindings
-	const RF_EVENTS = 6;				// event handlers
-	const RF_CONTROLSTATE = 7;		// controlstate
-	const RF_NAMED_OBJECTS = 8;		// controls declared with ID on template
-	const RF_ADAPTER = 9;				// adapter
-	const RF_AUTO_BINDINGS = 10;		// auto data bindings
+	const RF_CONTROLS = 0; // child controls
+	const RF_CHILD_STATE = 1; // child state field
+	const RF_NAMED_CONTROLS = 2; // list of controls whose namingcontainer is this control
+	const RF_NAMED_CONTROLS_ID = 3; // counter for automatic id
+	const RF_SKIN_ID = 4; // skin ID
+	const RF_DATA_BINDINGS = 5; // data bindings
+	const RF_EVENTS = 6; // event handlers
+	const RF_CONTROLSTATE = 7; // controlstate
+	const RF_NAMED_OBJECTS = 8; // controls declared with ID on template
+	const RF_ADAPTER = 9; // adapter
+	const RF_AUTO_BINDINGS = 10; // auto data bindings
 
 	/**
 	 * @var string control ID
@@ -193,7 +193,7 @@ 
 	 */
 	public function __get($name)
 	{
-		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
+		if (isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
 			return $this->_rf[self::RF_NAMED_OBJECTS][$name];
 		else
 			return parent::__get($name);
@@ -217,7 +217,7 @@ 
 	 * @see __get
 	 */
 	public function __isset($name) {
-		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name])) {
+		if (isset($this->_rf[self::RF_NAMED_OBJECTS][$name])) {
 			return true;
 		} else {
 			return parent::__isset($name);
@@ -237,7 +237,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;
 	}
 
 	/**
@@ -261,9 +261,9 @@ 
 	 */
 	public function getNamingContainer()
 	{
-		if(!$this->_namingContainer && $this->_parent)
+		if (!$this->_namingContainer && $this->_parent)
 		{
-			if($this->_parent instanceof INamingContainer)
+			if ($this->_parent instanceof INamingContainer)
 				$this->_namingContainer = $this->_parent;
 			else
 				$this->_namingContainer = $this->_parent->getNamingContainer();
@@ -276,11 +276,11 @@ 
 	 */
 	public function getPage()
 	{
-		if(!$this->_page)
+		if (!$this->_page)
 		{
-			if($this->_parent)
+			if ($this->_parent)
 				$this->_page = $this->_parent->getPage();
-			elseif($this->_tplControl)
+			elseif ($this->_tplControl)
 				$this->_page = $this->_tplControl->getPage();
 		}
 		return $this->_page;
@@ -311,7 +311,7 @@ 
 	 */
 	public function getTemplateControl()
 	{
-		if(!$this->_tplControl && $this->_parent)
+		if (!$this->_tplControl && $this->_parent)
 			$this->_tplControl = $this->_parent->getTemplateControl();
 		return $this->_tplControl;
 	}
@@ -324,9 +324,9 @@ 
 	public function getSourceTemplateControl()
 	{
 		$control = $this;
-		while(($control instanceof TControl) && ($control = $control->getTemplateControl()) !== null)
+		while (($control instanceof TControl) && ($control = $control->getTemplateControl()) !== null)
 		{
-			if(($control instanceof TTemplateControl) && $control->getIsSourceTemplateControl())
+			if (($control instanceof TTemplateControl) && $control->getIsSourceTemplateControl())
 				return $control;
 		}
 		return $this->getPage();
@@ -365,7 +365,7 @@ 
 	 */
 	public function getID($hideAutoID = true)
 	{
-		if($hideAutoID)
+		if ($hideAutoID)
 			return ($this->_flags & self::IS_ID_SET) ? $this->_id : '';
 		else
 			return $this->_id;
@@ -377,12 +377,12 @@ 
 	 */
 	public function setID($id)
 	{
-		if(!preg_match(self::ID_FORMAT, $id))
+		if (!preg_match(self::ID_FORMAT, $id))
 			throw new TInvalidDataValueException('control_id_invalid', get_class($this), $id);
 		$this->_id = $id;
 		$this->_flags |= self::IS_ID_SET;
 		$this->clearCachedUniqueID($this instanceof INamingContainer);
-		if($this->_namingContainer)
+		if ($this->_namingContainer)
 			$this->_namingContainer->clearNameTable();
 	}
 
@@ -395,17 +395,17 @@ 
 	 */
 	public function getUniqueID()
 	{
-		if($this->_uid === '' || $this->_uid === null)	// need to build the UniqueID
+		if ($this->_uid === '' || $this->_uid === null)	// need to build the UniqueID
 		{
-			$this->_uid = '';  // set to not-null, so that clearCachedUniqueID() may take action
-			if($namingContainer = $this->getNamingContainer())
+			$this->_uid = ''; // set to not-null, so that clearCachedUniqueID() may take action
+			if ($namingContainer = $this->getNamingContainer())
 			{
-				if($this->getPage() === $namingContainer)
+				if ($this->getPage() === $namingContainer)
 					return ($this->_uid = $this->_id);
-				elseif(($prefix = $namingContainer->getUniqueID()) === '')
+				elseif (($prefix = $namingContainer->getUniqueID()) === '')
 					return $this->_id;
 				else
-					return ($this->_uid = $prefix . self::ID_SEPARATOR . $this->_id);
+					return ($this->_uid = $prefix.self::ID_SEPARATOR.$this->_id);
 			}
 			else	// no naming container
 				return $this->_id;
@@ -449,7 +449,7 @@ 
 	 */
 	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] : '';
 	}
 
 	/**
@@ -458,7 +458,7 @@ 
 	 */
 	public function setSkinID($value)
 	{
-		if(($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage >= self::CS_CHILD_INITIALIZED)
+		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;
@@ -479,10 +479,10 @@ 
 	 */
 	public function getEnableTheming()
 	{
-		if($this->_flags & self::IS_DISABLE_THEMING)
+		if ($this->_flags & self::IS_DISABLE_THEMING)
 			return false;
 		else
-			return $this->_parent?$this->_parent->getEnableTheming():true;
+			return $this->_parent ? $this->_parent->getEnableTheming() : true;
 	}
 
 	/**
@@ -491,9 +491,9 @@ 
 	 */
 	public function setEnableTheming($value)
 	{
-		if($this->_stage >= self::CS_CHILD_INITIALIZED)
+		if ($this->_stage >= self::CS_CHILD_INITIALIZED)
 			throw new TInvalidOperationException('control_enabletheming_unchangeable', get_class($this), $this->getUniqueID());
-		elseif(TPropertyValue::ensureBoolean($value))
+		elseif (TPropertyValue::ensureBoolean($value))
 			$this->_flags &= ~self::IS_DISABLE_THEMING;
 		else
 			$this->_flags |= self::IS_DISABLE_THEMING;
@@ -534,7 +534,7 @@ 
 	 */
 	public function getControls()
 	{
-		if(!isset($this->_rf[self::RF_CONTROLS]))
+		if (!isset($this->_rf[self::RF_CONTROLS]))
 			$this->_rf[self::RF_CONTROLS] = $this->createControlCollection();
 		return $this->_rf[self::RF_CONTROLS];
 	}
@@ -546,7 +546,7 @@ 
 	 */
 	protected function createControlCollection()
 	{
-		return $this->getAllowChildControls()?new TControlCollection($this):new TEmptyControlCollection($this);
+		return $this->getAllowChildControls() ? new TControlCollection($this) : new TEmptyControlCollection($this);
 	}
 
 	/**
@@ -558,10 +558,10 @@ 
 	 */
 	public function getVisible($checkParents = true)
 	{
-		if($checkParents)
+		if ($checkParents)
 		{
-			for($control = $this;$control;$control = $control->_parent)
-				if(!$control->getVisible(false))
+			for ($control = $this; $control; $control = $control->_parent)
+				if (!$control->getVisible(false))
 					return false;
 			return true;
 		}
@@ -589,10 +589,10 @@ 
 	 */
 	public function getEnabled($checkParents = false)
 	{
-		if($checkParents)
+		if ($checkParents)
 		{
-			for($control = $this;$control;$control = $control->_parent)
-				if(!$control->getViewState('Enabled', true))
+			for ($control = $this; $control; $control = $control->_parent)
+				if (!$control->getViewState('Enabled', true))
 					return false;
 			return true;
 		}
@@ -613,7 +613,7 @@ 
 	 */
 	public function getHasAttributes()
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if ($attributes = $this->getViewState('Attributes', null))
 			return $attributes->getCount() > 0;
 		else
 			return false;
@@ -627,7 +627,7 @@ 
 	 */
 	public function getAttributes()
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if ($attributes = $this->getViewState('Attributes', null))
 			return $attributes;
 		else
 		{
@@ -642,7 +642,7 @@ 
 	 */
 	public function hasAttribute($name)
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if ($attributes = $this->getViewState('Attributes', null))
 			return $attributes->contains($name);
 		else
 			return false;
@@ -653,7 +653,7 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if ($attributes = $this->getViewState('Attributes', null))
 			return $attributes->itemAt($name);
 		else
 			return null;
@@ -676,7 +676,7 @@ 
 	 */
 	public function removeAttribute($name)
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if ($attributes = $this->getViewState('Attributes', null))
 			return $attributes->remove($name);
 		else
 			return null;
@@ -687,10 +687,10 @@ 
 	 */
 	public function getEnableViewState($checkParents = false)
 	{
-		if($checkParents)
+		if ($checkParents)
 		{
-			for($control = $this;$control !== null;$control = $control->getParent())
-				if($control->_flags & self::IS_DISABLE_VIEWSTATE)
+			for ($control = $this; $control !== null; $control = $control->getParent())
+				if ($control->_flags & self::IS_DISABLE_VIEWSTATE)
 					return false;
 			return true;
 		}
@@ -703,7 +703,7 @@ 
 	 */
 	public function setEnableViewState($value)
 	{
-		if(TPropertyValue::ensureBoolean($value))
+		if (TPropertyValue::ensureBoolean($value))
 			$this->_flags &= ~self::IS_DISABLE_VIEWSTATE;
 		else
 			$this->_flags |= self::IS_DISABLE_VIEWSTATE;
@@ -720,7 +720,7 @@ 
 	 */
 	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;
 	}
 
 	/**
@@ -735,7 +735,7 @@ 
 	 */
 	protected function setControlState($key, $value, $defaultValue = null)
 	{
-		if($value === $defaultValue)
+		if ($value === $defaultValue)
 			unset($this->_rf[self::RF_CONTROLSTATE][$key]);
 		else
 			$this->_rf[self::RF_CONTROLSTATE][$key] = $value;
@@ -772,11 +772,11 @@ 
 	 */
 	public function getViewState($key, $defaultValue = null)
 	{
-		if(isset($this->_viewState[$key]))
-			return $this->_viewState[$key] !== null?$this->_viewState[$key]:$defaultValue;
-		elseif(isset($this->_tempState[$key]))
+		if (isset($this->_viewState[$key]))
+			return $this->_viewState[$key] !== null ? $this->_viewState[$key] : $defaultValue;
+		elseif (isset($this->_tempState[$key]))
 		{
-			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
+			if (is_object($this->_tempState[$key]) && $this->_trackViewState)
 				$this->_viewState[$key] = $this->_tempState[$key];
 			return $this->_tempState[$key];
 		}
@@ -796,7 +796,7 @@ 
 	 */
 	public function setViewState($key, $value, $defaultValue = null)
 	{
-		if($this->_trackViewState)
+		if ($this->_trackViewState)
 		{
 			unset($this->_tempState[$key]);
 			$this->_viewState[$key] = $value;
@@ -804,7 +804,7 @@ 
 		else
 		{
 			unset($this->_viewState[$key]);
-			if($value === $defaultValue)
+			if ($value === $defaultValue)
 				unset($this->_tempState[$key]);
 			else
 				$this->_tempState[$key] = $value;
@@ -870,11 +870,11 @@ 
 	protected function dataBindProperties()
 	{
 		Prado::trace("Data bind properties", 'Prado\Web\UI\TControl');
-		if(isset($this->_rf[self::RF_DATA_BINDINGS]))
+		if (isset($this->_rf[self::RF_DATA_BINDINGS]))
 		{
-			if(($context = $this->getTemplateControl()) === null)
+			if (($context = $this->getTemplateControl()) === null)
 				$context = $this;
-			foreach($this->_rf[self::RF_DATA_BINDINGS] as $property => $expression)
+			foreach ($this->_rf[self::RF_DATA_BINDINGS] as $property => $expression)
 				$this->setSubProperty($property, $context->evaluateExpression($expression));
 		}
 	}
@@ -884,11 +884,11 @@ 
 	 */
 	protected function autoDataBindProperties()
 	{
-		if(isset($this->_rf[self::RF_AUTO_BINDINGS]))
+		if (isset($this->_rf[self::RF_AUTO_BINDINGS]))
 		{
-			if(($context = $this->getTemplateControl()) === null)
+			if (($context = $this->getTemplateControl()) === null)
 				$context = $this;
-			foreach($this->_rf[self::RF_AUTO_BINDINGS] as $property => $expression)
+			foreach ($this->_rf[self::RF_AUTO_BINDINGS] as $property => $expression)
 				$this->setSubProperty($property, $context->evaluateExpression($expression));
 		}
 	}
@@ -899,10 +899,10 @@ 
 	protected function dataBindChildren()
 	{
 		Prado::trace("dataBindChildren()", 'Prado\Web\UI\TControl');
-		if(isset($this->_rf[self::RF_CONTROLS]))
+		if (isset($this->_rf[self::RF_CONTROLS]))
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof IBindable)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
+				if ($control instanceof IBindable)
 					$control->dataBind();
 		}
 	}
@@ -922,11 +922,11 @@ 
 	 */
 	final protected function setChildControlsCreated($value)
 	{
-		if($value)
+		if ($value)
 			$this->_flags |= self::IS_CHILD_CREATED;
 		else
 		{
-			if($this->getHasControls() && ($this->_flags & self::IS_CHILD_CREATED))
+			if ($this->getHasControls() && ($this->_flags & self::IS_CHILD_CREATED))
 				$this->getControls()->clear();
 			$this->_flags &= ~self::IS_CHILD_CREATED;
 		}
@@ -939,19 +939,19 @@ 
 	 */
 	public function ensureChildControls()
 	{
-		if(!($this->_flags & self::IS_CHILD_CREATED) && !($this->_flags & self::IS_CREATING_CHILD))
+		if (!($this->_flags & self::IS_CHILD_CREATED) && !($this->_flags & self::IS_CREATING_CHILD))
 		{
 			try
 			{
 				$this->_flags |= self::IS_CREATING_CHILD;
-				if(isset($this->_rf[self::RF_ADAPTER]))
+				if (isset($this->_rf[self::RF_ADAPTER]))
 					$this->_rf[self::RF_ADAPTER]->createChildControls();
 				else
 					$this->createChildControls();
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
@@ -984,21 +984,21 @@ 
 	public function findControl($id)
 	{
 		$id = strtr($id, '.', self::ID_SEPARATOR);
-		$container = ($this instanceof INamingContainer)?$this:$this->getNamingContainer();
-		if(!$container || !$container->getHasControls())
+		$container = ($this instanceof INamingContainer) ? $this : $this->getNamingContainer();
+		if (!$container || !$container->getHasControls())
 			return null;
-		if(!isset($container->_rf[self::RF_NAMED_CONTROLS]))
+		if (!isset($container->_rf[self::RF_NAMED_CONTROLS]))
 		{
 			$container->_rf[self::RF_NAMED_CONTROLS] = [];
 			$container->fillNameTable($container, $container->_rf[self::RF_CONTROLS]);
 		}
-		if(($pos = strpos($id, self::ID_SEPARATOR)) === false)
-			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id])?$container->_rf[self::RF_NAMED_CONTROLS][$id]:null;
+		if (($pos = strpos($id, self::ID_SEPARATOR)) === false)
+			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id]) ? $container->_rf[self::RF_NAMED_CONTROLS][$id] : null;
 		else
 		{
 			$cid = substr($id, 0, $pos);
 			$sid = substr($id, $pos + 1);
-			if(isset($container->_rf[self::RF_NAMED_CONTROLS][$cid]))
+			if (isset($container->_rf[self::RF_NAMED_CONTROLS][$cid]))
 				return $container->_rf[self::RF_NAMED_CONTROLS][$cid]->findControl($sid);
 			else
 				return null;
@@ -1014,13 +1014,13 @@ 
 	public function findControlsByType($type, $strict = true)
 	{
 		$controls = [];
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if(is_object($control) && (get_class($control) === $type || (!$strict && ($control instanceof $type))))
+				if (is_object($control) && (get_class($control) === $type || (!$strict && ($control instanceof $type))))
 					$controls[] = $control;
-				if(($control instanceof TControl) && $control->getHasControls())
+				if (($control instanceof TControl) && $control->getHasControls())
 					$controls = array_merge($controls, $control->findControlsByType($type, $strict));
 			}
 		}
@@ -1039,13 +1039,13 @@ 
 	public function findControlsByID($id)
 	{
 		$controls = [];
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 				{
-					if($control->_id === $id)
+					if ($control->_id === $id)
 						$controls[] = $control;
 					$controls = array_merge($controls, $control->findControlsByID($id));
 				}
@@ -1074,7 +1074,7 @@ 
 	 */
 	public function registerObject($name, $object)
 	{
-		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
+		if (isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
 			throw new TInvalidOperationException('control_object_reregistered', $name);
 		$this->_rf[self::RF_NAMED_OBJECTS][$name] = $object;
 	}
@@ -1147,7 +1147,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;
 	}
 
 	/**
@@ -1190,7 +1190,7 @@ 
 	final protected function isDescendentOf($ancestor)
 	{
 		$control = $this;
-		while($control !== $ancestor && $control->_parent)
+		while ($control !== $ancestor && $control->_parent)
 			$control = $control->_parent;
 		return $control === $ancestor;
 	}
@@ -1203,27 +1203,27 @@ 
 	 */
 	public function addedControl($control)
 	{
-		if($control->_parent)
+		if ($control->_parent)
 			$control->_parent->getControls()->remove($control);
 		$control->_parent = $this;
 		$control->_page = $this->getPage();
-		$namingContainer = ($this instanceof INamingContainer)?$this:$this->_namingContainer;
-		if($namingContainer)
+		$namingContainer = ($this instanceof INamingContainer) ? $this : $this->_namingContainer;
+		if ($namingContainer)
 		{
 			$control->_namingContainer = $namingContainer;
-			if($control->_id === '')
+			if ($control->_id === '')
 				$control->generateAutomaticID();
 			else
 				$namingContainer->clearNameTable();
 			$control->clearCachedUniqueID($control instanceof INamingContainer);
 		}
 
-		if($this->_stage >= self::CS_CHILD_INITIALIZED)
+		if ($this->_stage >= self::CS_CHILD_INITIALIZED)
 		{
 			$control->initRecursive($namingContainer);
-			if($this->_stage >= self::CS_STATE_LOADED)
+			if ($this->_stage >= self::CS_STATE_LOADED)
 			{
-				if(isset($this->_rf[self::RF_CHILD_STATE][$control->_id]))
+				if (isset($this->_rf[self::RF_CHILD_STATE][$control->_id]))
 				{
 					$state = $this->_rf[self::RF_CHILD_STATE][$control->_id];
 					unset($this->_rf[self::RF_CHILD_STATE][$control->_id]);
@@ -1231,10 +1231,10 @@ 
 				else
 					$state = null;
 				$control->loadStateRecursive($state, !($this->_flags & self::IS_DISABLE_VIEWSTATE));
-				if($this->_stage >= self::CS_LOADED)
+				if ($this->_stage >= self::CS_LOADED)
 				{
 					$control->loadRecursive();
-					if($this->_stage >= self::CS_PRERENDERED)
+					if ($this->_stage >= self::CS_PRERENDERED)
 						$control->preRenderRecursive();
 				}
 			}
@@ -1248,7 +1248,7 @@ 
 	 */
 	public function removedControl($control)
 	{
-		if($this->_namingContainer)
+		if ($this->_namingContainer)
 			$this->_namingContainer->clearNameTable();
 		$control->unloadRecursive();
 		$control->_parent = null;
@@ -1256,7 +1256,7 @@ 
 		$control->_namingContainer = null;
 		$control->_tplControl = null;
 		//$control->_stage=self::CS_CONSTRUCTED;
-		if(!($control->_flags & self::IS_ID_SET))
+		if (!($control->_flags & self::IS_ID_SET))
 			$control->_id = '';
 		else
 			unset($this->_rf[self::RF_NAMED_OBJECTS][$control->_id]);
@@ -1271,32 +1271,32 @@ 
 	protected function initRecursive($namingContainer = null)
 	{
 		$this->ensureChildControls();
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			if($this instanceof INamingContainer)
+			if ($this instanceof INamingContainer)
 				$namingContainer = $this;
 			$page = $this->getPage();
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 				{
 					$control->_namingContainer = $namingContainer;
 					$control->_page = $page;
-					if($control->_id === '' && $namingContainer)
+					if ($control->_id === '' && $namingContainer)
 						$control->generateAutomaticID();
 					$control->initRecursive($namingContainer);
 				}
 			}
 		}
-		if($this->_stage < self::CS_INITIALIZED)
+		if ($this->_stage < self::CS_INITIALIZED)
 		{
 			$this->_stage = self::CS_CHILD_INITIALIZED;
-			if(($page = $this->getPage()) && $this->getEnableTheming() && !($this->_flags & self::IS_SKIN_APPLIED))
+			if (($page = $this->getPage()) && $this->getEnableTheming() && !($this->_flags & self::IS_SKIN_APPLIED))
 			{
 				$page->applyControlSkin($this);
 				$this->_flags |= self::IS_SKIN_APPLIED;
 			}
-			if(isset($this->_rf[self::RF_ADAPTER]))
+			if (isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onInit(null);
 			else
 				$this->onInit(null);
@@ -1310,22 +1310,22 @@ 
 	 */
 	protected function loadRecursive()
 	{
-		if($this->_stage < self::CS_LOADED)
+		if ($this->_stage < self::CS_LOADED)
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
+			if (isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onLoad(null);
 			else
 				$this->onLoad(null);
 		}
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 					$control->loadRecursive();
 			}
 		}
-		if($this->_stage < self::CS_LOADED)
+		if ($this->_stage < self::CS_LOADED)
 			$this->_stage = self::CS_LOADED;
 	}
 
@@ -1337,19 +1337,19 @@ 
 	{
 		$this->autoDataBindProperties();
 
-		if($this->getVisible(false))
+		if ($this->getVisible(false))
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
+			if (isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onPreRender(null);
 			else
 				$this->onPreRender(null);
-			if($this->getHasControls())
+			if ($this->getHasControls())
 			{
-				foreach($this->_rf[self::RF_CONTROLS] as $control)
+				foreach ($this->_rf[self::RF_CONTROLS] as $control)
 				{
-					if($control instanceof TControl)
+					if ($control instanceof TControl)
 						$control->preRenderRecursive();
-					elseif($control instanceof TCompositeLiteral)
+					elseif ($control instanceof TCompositeLiteral)
 						$control->evaluateDynamicContent();
 				}
 			}
@@ -1363,15 +1363,15 @@ 
 	 */
 	protected function unloadRecursive()
 	{
-		if(!($this->_flags & self::IS_ID_SET))
+		if (!($this->_flags & self::IS_ID_SET))
 			$this->_id = '';
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof TControl)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
+				if ($control instanceof TControl)
 					$control->unloadRecursive();
 		}
-		if(isset($this->_rf[self::RF_ADAPTER]))
+		if (isset($this->_rf[self::RF_ADAPTER]))
 			$this->_rf[self::RF_ADAPTER]->onUnload(null);
 		else
 			$this->onUnload(null);
@@ -1447,9 +1447,9 @@ 
 	protected function raiseBubbleEvent($sender, $param)
 	{
 		$control = $this;
-		while($control = $control->_parent)
+		while ($control = $control->_parent)
 		{
-			if($control->bubbleEvent($sender, $param))
+			if ($control->bubbleEvent($sender, $param))
 				break;
 		}
 	}
@@ -1486,7 +1486,7 @@ 
 	 */
 	public function broadcastEvent($name, $sender, $param)
 	{
-		$rootControl = (($page = $this->getPage()) === null)?$this:$page;
+		$rootControl = (($page = $this->getPage()) === null) ? $this : $page;
 		$rootControl->broadcastEventInternal($name, $sender, new TBroadcastEventParameter($name, $param));
 	}
 
@@ -1499,15 +1499,15 @@ 
 	 */
 	private function broadcastEventInternal($name, $sender, $param)
 	{
-		if($this->hasEvent($name))
+		if ($this->hasEvent($name))
 			$this->raiseEvent($name, $sender, $param->getParameter());
-		if($this instanceof IBroadcastEventReceiver)
+		if ($this instanceof IBroadcastEventReceiver)
 			$this->broadcastEventReceived($sender, $param);
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 					$control->broadcastEventInternal($name, $sender, $param);
 			}
 		}
@@ -1532,19 +1532,19 @@ 
 	 */
 	protected function traverseChildControls($param, $preCallback = null, $postCallback = null)
 	{
-		if($preCallback !== null)
+		if ($preCallback !== null)
 			call_user_func($preCallback, $this, $param);
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 				{
 					$control->traverseChildControls($param, $preCallback, $postCallback);
 				}
 			}
 		}
-		if($postCallback !== null)
+		if ($postCallback !== null)
 			call_user_func($postCallback, $this, $param);
 	}
 
@@ -1555,9 +1555,9 @@ 
 	 */
 	public function renderControl($writer)
 	{
-		if($this instanceof IActiveControl || $this->getVisible(false))
+		if ($this instanceof IActiveControl || $this->getVisible(false))
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
+			if (isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->render($writer);
 			else
 				$this->render($writer);
@@ -1584,15 +1584,15 @@ 
 	 */
 	public function renderChildren($writer)
 	{
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if(is_string($control))
+				if (is_string($control))
 					$writer->write($control);
-				elseif($control instanceof TControl)
+				elseif ($control instanceof TControl)
 					$control->renderControl($writer);
-				elseif($control instanceof IRenderable)
+				elseif ($control instanceof IRenderable)
 					$control->render($writer);
 			}
 		}
@@ -1624,33 +1624,33 @@ 
 	 */
 	protected function loadStateRecursive(&$state, $needViewState = true)
 	{
-		if(is_array($state))
+		if (is_array($state))
 		{
 			// A null state means the stateful properties all take default values.
 			// So if the state is enabled, we have to assign the null value.
 			$needViewState = ($needViewState && !($this->_flags & self::IS_DISABLE_VIEWSTATE));
-			if(isset($state[1]))
+			if (isset($state[1]))
 			{
 				$this->_rf[self::RF_CONTROLSTATE] = &$state[1];
 				unset($state[1]);
 			}
 			else
 				unset($this->_rf[self::RF_CONTROLSTATE]);
-			if($needViewState)
+			if ($needViewState)
 			{
-				if(isset($state[0]))
+				if (isset($state[0]))
 					$this->_viewState = &$state[0];
 				else
 					$this->_viewState = [];
 			}
 			unset($state[0]);
-			if($this->getHasControls())
+			if ($this->getHasControls())
 			{
-				foreach($this->_rf[self::RF_CONTROLS] as $control)
+				foreach ($this->_rf[self::RF_CONTROLS] as $control)
 				{
-					if($control instanceof TControl)
+					if ($control instanceof TControl)
 					{
-						if(isset($state[$control->_id]))
+						if (isset($state[$control->_id]))
 						{
 							$control->loadStateRecursive($state[$control->_id], $needViewState);
 							unset($state[$control->_id]);
@@ -1658,11 +1658,11 @@ 
 					}
 				}
 			}
-			if(!empty($state))
+			if (!empty($state))
 				$this->_rf[self::RF_CHILD_STATE] = &$state;
 		}
 		$this->_stage = self::CS_STATE_LOADED;
-		if(isset($this->_rf[self::RF_ADAPTER]))
+		if (isset($this->_rf[self::RF_ADAPTER]))
 			$this->_rf[self::RF_ADAPTER]->loadState();
 		else
 			$this->loadState();
@@ -1676,26 +1676,26 @@ 
 	 */
 	protected function &saveStateRecursive($needViewState = true)
 	{
-		if(isset($this->_rf[self::RF_ADAPTER]))
+		if (isset($this->_rf[self::RF_ADAPTER]))
 			$this->_rf[self::RF_ADAPTER]->saveState();
 		else
 			$this->saveState();
 		$needViewState = ($needViewState && !($this->_flags & self::IS_DISABLE_VIEWSTATE));
 		$state = [];
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 				{
-					if(count($tmp = &$control->saveStateRecursive($needViewState)))
+					if (count($tmp = &$control->saveStateRecursive($needViewState)))
 						$state[$control->_id] = $tmp;
 				}
 			}
 		}
-		if($needViewState && !empty($this->_viewState))
+		if ($needViewState && !empty($this->_viewState))
 			$state[0] = &$this->_viewState;
-		if(isset($this->_rf[self::RF_CONTROLSTATE]))
+		if (isset($this->_rf[self::RF_CONTROLSTATE]))
 			$state[1] = &$this->_rf[self::RF_CONTROLSTATE];
 		return $state;
 	}
@@ -1707,12 +1707,12 @@ 
 	 */
 	public function applyStyleSheetSkin($page)
 	{
-		if($page && !($this->_flags & self::IS_STYLESHEET_APPLIED))
+		if ($page && !($this->_flags & self::IS_STYLESHEET_APPLIED))
 		{
 			$page->applyControlStyleSheet($this);
 			$this->_flags |= self::IS_STYLESHEET_APPLIED;
 		}
-		elseif($this->_flags & self::IS_STYLESHEET_APPLIED)
+		elseif ($this->_flags & self::IS_STYLESHEET_APPLIED)
 			throw new TInvalidOperationException('control_stylesheet_applied', get_class($this));
 	}
 
@@ -1723,10 +1723,10 @@ 
 	 */
 	private function clearCachedUniqueID($recursive)
 	{
-		if($recursive && $this->_uid !== null && isset($this->_rf[self::RF_CONTROLS]))
+		if ($recursive && $this->_uid !== null && isset($this->_rf[self::RF_CONTROLS]))
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof TControl)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
+				if ($control instanceof TControl)
 					$control->clearCachedUniqueID($recursive);
 		}
 		$this->_uid = null;
@@ -1738,10 +1738,10 @@ 
 	private function generateAutomaticID()
 	{
 		$this->_flags &= ~self::IS_ID_SET;
-		if(!isset($this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]))
+		if (!isset($this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]))
 			$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID] = 0;
 		$id = $this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]++;
-		$this->_id = self::AUTOMATIC_ID_PREFIX . $id;
+		$this->_id = self::AUTOMATIC_ID_PREFIX.$id;
 		$this->_namingContainer->clearNameTable();
 	}
 
@@ -1761,18 +1761,18 @@ 
 	 */
 	private function fillNameTable($container, $controls)
 	{
-		foreach($controls as $control)
+		foreach ($controls as $control)
 		{
-			if($control instanceof TControl)
+			if ($control instanceof TControl)
 			{
-				if($control->_id !== '')
+				if ($control->_id !== '')
 				{
-					if(isset($container->_rf[self::RF_NAMED_CONTROLS][$control->_id]))
+					if (isset($container->_rf[self::RF_NAMED_CONTROLS][$control->_id]))
 						throw new TInvalidDataValueException('control_id_nonunique', get_class($control), $control->_id);
 					else
 						$container->_rf[self::RF_NAMED_CONTROLS][$control->_id] = $control;
 				}
-				if(!($control instanceof INamingContainer) && $control->getHasControls())
+				if (!($control instanceof INamingContainer) && $control->getHasControls())
 					$this->fillNameTable($container, $control->_rf[self::RF_CONTROLS]);
 			}
 		}

Braces +323 added lines, -248 removed lines

@@ -193,10 +193,11 @@ 
 	 */
 	public function __get($name)
 	{
-		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
-			return $this->_rf[self::RF_NAMED_OBJECTS][$name];
-		else
-			return parent::__get($name);
+		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name])) {
+					return $this->_rf[self::RF_NAMED_OBJECTS][$name];
+		} else {
+					return parent::__get($name);
+		}
 	}
 
 	/**
@@ -263,10 +264,11 @@ 
 	{
 		if(!$this->_namingContainer && $this->_parent)
 		{
-			if($this->_parent instanceof INamingContainer)
-				$this->_namingContainer = $this->_parent;
-			else
-				$this->_namingContainer = $this->_parent->getNamingContainer();
+			if($this->_parent instanceof INamingContainer) {
+							$this->_namingContainer = $this->_parent;
+			} else {
+							$this->_namingContainer = $this->_parent->getNamingContainer();
+			}
 		}
 		return $this->_namingContainer;
 	}
@@ -278,10 +280,11 @@ 
 	{
 		if(!$this->_page)
 		{
-			if($this->_parent)
-				$this->_page = $this->_parent->getPage();
-			elseif($this->_tplControl)
-				$this->_page = $this->_tplControl->getPage();
+			if($this->_parent) {
+							$this->_page = $this->_parent->getPage();
+			} elseif($this->_tplControl) {
+							$this->_page = $this->_tplControl->getPage();
+			}
 		}
 		return $this->_page;
 	}
@@ -311,8 +314,9 @@ 
 	 */
 	public function getTemplateControl()
 	{
-		if(!$this->_tplControl && $this->_parent)
-			$this->_tplControl = $this->_parent->getTemplateControl();
+		if(!$this->_tplControl && $this->_parent) {
+					$this->_tplControl = $this->_parent->getTemplateControl();
+		}
 		return $this->_tplControl;
 	}
 
@@ -326,8 +330,9 @@ 
 		$control = $this;
 		while(($control instanceof TControl) && ($control = $control->getTemplateControl()) !== null)
 		{
-			if(($control instanceof TTemplateControl) && $control->getIsSourceTemplateControl())
-				return $control;
+			if(($control instanceof TTemplateControl) && $control->getIsSourceTemplateControl()) {
+							return $control;
+			}
 		}
 		return $this->getPage();
 	}
@@ -365,10 +370,11 @@ 
 	 */
 	public function getID($hideAutoID = true)
 	{
-		if($hideAutoID)
-			return ($this->_flags & self::IS_ID_SET) ? $this->_id : '';
-		else
-			return $this->_id;
+		if($hideAutoID) {
+					return ($this->_flags & self::IS_ID_SET) ? $this->_id : '';
+		} else {
+					return $this->_id;
+		}
 	}
 
 	/**
@@ -377,13 +383,15 @@ 
 	 */
 	public function setID($id)
 	{
-		if(!preg_match(self::ID_FORMAT, $id))
-			throw new TInvalidDataValueException('control_id_invalid', get_class($this), $id);
+		if(!preg_match(self::ID_FORMAT, $id)) {
+					throw new TInvalidDataValueException('control_id_invalid', get_class($this), $id);
+		}
 		$this->_id = $id;
 		$this->_flags |= self::IS_ID_SET;
 		$this->clearCachedUniqueID($this instanceof INamingContainer);
-		if($this->_namingContainer)
-			$this->_namingContainer->clearNameTable();
+		if($this->_namingContainer) {
+					$this->_namingContainer->clearNameTable();
+		}
 	}
 
 	/**
@@ -395,23 +403,28 @@ 
 	 */
 	public function getUniqueID()
 	{
-		if($this->_uid === '' || $this->_uid === null)	// need to build the UniqueID
+		if($this->_uid === '' || $this->_uid === null) {
+			// need to build the UniqueID
 		{
-			$this->_uid = '';  // set to not-null, so that clearCachedUniqueID() may take action
+			$this->_uid = '';
+		}
+		// set to not-null, so that clearCachedUniqueID() may take action
 			if($namingContainer = $this->getNamingContainer())
 			{
-				if($this->getPage() === $namingContainer)
-					return ($this->_uid = $this->_id);
-				elseif(($prefix = $namingContainer->getUniqueID()) === '')
-					return $this->_id;
-				else
-					return ($this->_uid = $prefix . self::ID_SEPARATOR . $this->_id);
-			}
-			else	// no naming container
+				if($this->getPage() === $namingContainer) {
+									return ($this->_uid = $this->_id);
+				} elseif(($prefix = $namingContainer->getUniqueID()) === '') {
+									return $this->_id;
+				} else {
+									return ($this->_uid = $prefix . self::ID_SEPARATOR . $this->_id);
+				}
+			} else {
+				// no naming container
 				return $this->_id;
+			}
+		} else {
+					return $this->_uid;
 		}
-		else
-			return $this->_uid;
 	}
 
 	/**
@@ -458,10 +471,11 @@ 
 	 */
 	public function setSkinID($value)
 	{
-		if(($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage >= self::CS_CHILD_INITIALIZED)
-			throw new TInvalidOperationException('control_skinid_unchangeable', get_class($this));
-		else
-			$this->_rf[self::RF_SKIN_ID] = $value;
+		if(($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage >= self::CS_CHILD_INITIALIZED) {
+					throw new TInvalidOperationException('control_skinid_unchangeable', get_class($this));
+		} else {
+					$this->_rf[self::RF_SKIN_ID] = $value;
+		}
 	}
 
 	/**
@@ -479,10 +493,11 @@ 
 	 */
 	public function getEnableTheming()
 	{
-		if($this->_flags & self::IS_DISABLE_THEMING)
-			return false;
-		else
-			return $this->_parent?$this->_parent->getEnableTheming():true;
+		if($this->_flags & self::IS_DISABLE_THEMING) {
+					return false;
+		} else {
+					return $this->_parent?$this->_parent->getEnableTheming():true;
+		}
 	}
 
 	/**
@@ -491,12 +506,13 @@ 
 	 */
 	public function setEnableTheming($value)
 	{
-		if($this->_stage >= self::CS_CHILD_INITIALIZED)
-			throw new TInvalidOperationException('control_enabletheming_unchangeable', get_class($this), $this->getUniqueID());
-		elseif(TPropertyValue::ensureBoolean($value))
-			$this->_flags &= ~self::IS_DISABLE_THEMING;
-		else
-			$this->_flags |= self::IS_DISABLE_THEMING;
+		if($this->_stage >= self::CS_CHILD_INITIALIZED) {
+					throw new TInvalidOperationException('control_enabletheming_unchangeable', get_class($this), $this->getUniqueID());
+		} elseif(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags &= ~self::IS_DISABLE_THEMING;
+		} else {
+					$this->_flags |= self::IS_DISABLE_THEMING;
+		}
 	}
 
 	/**
@@ -534,8 +550,9 @@ 
 	 */
 	public function getControls()
 	{
-		if(!isset($this->_rf[self::RF_CONTROLS]))
-			$this->_rf[self::RF_CONTROLS] = $this->createControlCollection();
+		if(!isset($this->_rf[self::RF_CONTROLS])) {
+					$this->_rf[self::RF_CONTROLS] = $this->createControlCollection();
+		}
 		return $this->_rf[self::RF_CONTROLS];
 	}
 
@@ -560,13 +577,14 @@ 
 	{
 		if($checkParents)
 		{
-			for($control = $this;$control;$control = $control->_parent)
-				if(!$control->getVisible(false))
+			for($control = $this;$control;$control = $control->_parent) {
+							if(!$control->getVisible(false))
 					return false;
+			}
 			return true;
+		} else {
+					return $this->getViewState('Visible', true);
 		}
-		else
-			return $this->getViewState('Visible', true);
 	}
 
 	/**
@@ -591,13 +609,14 @@ 
 	{
 		if($checkParents)
 		{
-			for($control = $this;$control;$control = $control->_parent)
-				if(!$control->getViewState('Enabled', true))
+			for($control = $this;$control;$control = $control->_parent) {
+							if(!$control->getViewState('Enabled', true))
 					return false;
+			}
 			return true;
+		} else {
+					return $this->getViewState('Enabled', true);
 		}
-		else
-			return $this->getViewState('Enabled', true);
 	}
 
 	/**
@@ -613,10 +632,11 @@ 
 	 */
 	public function getHasAttributes()
 	{
-		if($attributes = $this->getViewState('Attributes', null))
-			return $attributes->getCount() > 0;
-		else
-			return false;
+		if($attributes = $this->getViewState('Attributes', null)) {
+					return $attributes->getCount() > 0;
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -627,9 +647,9 @@ 
 	 */
 	public function getAttributes()
 	{
-		if($attributes = $this->getViewState('Attributes', null))
-			return $attributes;
-		else
+		if($attributes = $this->getViewState('Attributes', null)) {
+					return $attributes;
+		} else
 		{
 			$attributes = new TAttributeCollection;
 			$this->setViewState('Attributes', $attributes, null);
@@ -642,10 +662,11 @@ 
 	 */
 	public function hasAttribute($name)
 	{
-		if($attributes = $this->getViewState('Attributes', null))
-			return $attributes->contains($name);
-		else
-			return false;
+		if($attributes = $this->getViewState('Attributes', null)) {
+					return $attributes->contains($name);
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -653,10 +674,11 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($attributes = $this->getViewState('Attributes', null))
-			return $attributes->itemAt($name);
-		else
-			return null;
+		if($attributes = $this->getViewState('Attributes', null)) {
+					return $attributes->itemAt($name);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -676,10 +698,11 @@ 
 	 */
 	public function removeAttribute($name)
 	{
-		if($attributes = $this->getViewState('Attributes', null))
-			return $attributes->remove($name);
-		else
-			return null;
+		if($attributes = $this->getViewState('Attributes', null)) {
+					return $attributes->remove($name);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -689,13 +712,14 @@ 
 	{
 		if($checkParents)
 		{
-			for($control = $this;$control !== null;$control = $control->getParent())
-				if($control->_flags & self::IS_DISABLE_VIEWSTATE)
+			for($control = $this;$control !== null;$control = $control->getParent()) {
+							if($control->_flags & self::IS_DISABLE_VIEWSTATE)
 					return false;
+			}
 			return true;
+		} else {
+					return !($this->_flags & self::IS_DISABLE_VIEWSTATE);
 		}
-		else
-			return !($this->_flags & self::IS_DISABLE_VIEWSTATE);
 	}
 
 	/**
@@ -703,10 +727,11 @@ 
 	 */
 	public function setEnableViewState($value)
 	{
-		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags &= ~self::IS_DISABLE_VIEWSTATE;
-		else
-			$this->_flags |= self::IS_DISABLE_VIEWSTATE;
+		if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags &= ~self::IS_DISABLE_VIEWSTATE;
+		} else {
+					$this->_flags |= self::IS_DISABLE_VIEWSTATE;
+		}
 	}
 
 	/**
@@ -735,10 +760,11 @@ 
 	 */
 	protected function setControlState($key, $value, $defaultValue = null)
 	{
-		if($value === $defaultValue)
-			unset($this->_rf[self::RF_CONTROLSTATE][$key]);
-		else
-			$this->_rf[self::RF_CONTROLSTATE][$key] = $value;
+		if($value === $defaultValue) {
+					unset($this->_rf[self::RF_CONTROLSTATE][$key]);
+		} else {
+					$this->_rf[self::RF_CONTROLSTATE][$key] = $value;
+		}
 	}
 
 	/**
@@ -772,16 +798,17 @@ 
 	 */
 	public function getViewState($key, $defaultValue = null)
 	{
-		if(isset($this->_viewState[$key]))
-			return $this->_viewState[$key] !== null?$this->_viewState[$key]:$defaultValue;
-		elseif(isset($this->_tempState[$key]))
+		if(isset($this->_viewState[$key])) {
+					return $this->_viewState[$key] !== null?$this->_viewState[$key]:$defaultValue;
+		} elseif(isset($this->_tempState[$key]))
 		{
-			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
-				$this->_viewState[$key] = $this->_tempState[$key];
+			if(is_object($this->_tempState[$key]) && $this->_trackViewState) {
+							$this->_viewState[$key] = $this->_tempState[$key];
+			}
 			return $this->_tempState[$key];
+		} else {
+					return $defaultValue;
 		}
-		else
-			return $defaultValue;
 	}
 
 	/**
@@ -800,14 +827,14 @@ 
 		{
 			unset($this->_tempState[$key]);
 			$this->_viewState[$key] = $value;
-		}
-		else
+		} else
 		{
 			unset($this->_viewState[$key]);
-			if($value === $defaultValue)
-				unset($this->_tempState[$key]);
-			else
-				$this->_tempState[$key] = $value;
+			if($value === $defaultValue) {
+							unset($this->_tempState[$key]);
+			} else {
+							$this->_tempState[$key] = $value;
+			}
 		}
 	}
 
@@ -872,10 +899,12 @@ 
 		Prado::trace("Data bind properties", 'Prado\Web\UI\TControl');
 		if(isset($this->_rf[self::RF_DATA_BINDINGS]))
 		{
-			if(($context = $this->getTemplateControl()) === null)
-				$context = $this;
-			foreach($this->_rf[self::RF_DATA_BINDINGS] as $property => $expression)
-				$this->setSubProperty($property, $context->evaluateExpression($expression));
+			if(($context = $this->getTemplateControl()) === null) {
+							$context = $this;
+			}
+			foreach($this->_rf[self::RF_DATA_BINDINGS] as $property => $expression) {
+							$this->setSubProperty($property, $context->evaluateExpression($expression));
+			}
 		}
 	}
 
@@ -886,10 +915,12 @@ 
 	{
 		if(isset($this->_rf[self::RF_AUTO_BINDINGS]))
 		{
-			if(($context = $this->getTemplateControl()) === null)
-				$context = $this;
-			foreach($this->_rf[self::RF_AUTO_BINDINGS] as $property => $expression)
-				$this->setSubProperty($property, $context->evaluateExpression($expression));
+			if(($context = $this->getTemplateControl()) === null) {
+							$context = $this;
+			}
+			foreach($this->_rf[self::RF_AUTO_BINDINGS] as $property => $expression) {
+							$this->setSubProperty($property, $context->evaluateExpression($expression));
+			}
 		}
 	}
 
@@ -901,9 +932,10 @@ 
 		Prado::trace("dataBindChildren()", 'Prado\Web\UI\TControl');
 		if(isset($this->_rf[self::RF_CONTROLS]))
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof IBindable)
+			foreach($this->_rf[self::RF_CONTROLS] as $control) {
+							if($control instanceof IBindable)
 					$control->dataBind();
+			}
 		}
 	}
 
@@ -922,12 +954,13 @@ 
 	 */
 	final protected function setChildControlsCreated($value)
 	{
-		if($value)
-			$this->_flags |= self::IS_CHILD_CREATED;
-		else
+		if($value) {
+					$this->_flags |= self::IS_CHILD_CREATED;
+		} else
 		{
-			if($this->getHasControls() && ($this->_flags & self::IS_CHILD_CREATED))
-				$this->getControls()->clear();
+			if($this->getHasControls() && ($this->_flags & self::IS_CHILD_CREATED)) {
+							$this->getControls()->clear();
+			}
 			$this->_flags &= ~self::IS_CHILD_CREATED;
 		}
 	}
@@ -944,14 +977,14 @@ 
 			try
 			{
 				$this->_flags |= self::IS_CREATING_CHILD;
-				if(isset($this->_rf[self::RF_ADAPTER]))
-					$this->_rf[self::RF_ADAPTER]->createChildControls();
-				else
-					$this->createChildControls();
+				if(isset($this->_rf[self::RF_ADAPTER])) {
+									$this->_rf[self::RF_ADAPTER]->createChildControls();
+				} else {
+									$this->createChildControls();
+				}
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
@@ -985,23 +1018,25 @@ 
 	{
 		$id = strtr($id, '.', self::ID_SEPARATOR);
 		$container = ($this instanceof INamingContainer)?$this:$this->getNamingContainer();
-		if(!$container || !$container->getHasControls())
-			return null;
+		if(!$container || !$container->getHasControls()) {
+					return null;
+		}
 		if(!isset($container->_rf[self::RF_NAMED_CONTROLS]))
 		{
 			$container->_rf[self::RF_NAMED_CONTROLS] = [];
 			$container->fillNameTable($container, $container->_rf[self::RF_CONTROLS]);
 		}
-		if(($pos = strpos($id, self::ID_SEPARATOR)) === false)
-			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id])?$container->_rf[self::RF_NAMED_CONTROLS][$id]:null;
-		else
+		if(($pos = strpos($id, self::ID_SEPARATOR)) === false) {
+					return isset($container->_rf[self::RF_NAMED_CONTROLS][$id])?$container->_rf[self::RF_NAMED_CONTROLS][$id]:null;
+		} else
 		{
 			$cid = substr($id, 0, $pos);
 			$sid = substr($id, $pos + 1);
-			if(isset($container->_rf[self::RF_NAMED_CONTROLS][$cid]))
-				return $container->_rf[self::RF_NAMED_CONTROLS][$cid]->findControl($sid);
-			else
-				return null;
+			if(isset($container->_rf[self::RF_NAMED_CONTROLS][$cid])) {
+							return $container->_rf[self::RF_NAMED_CONTROLS][$cid]->findControl($sid);
+			} else {
+							return null;
+			}
 		}
 	}
 
@@ -1018,10 +1053,12 @@ 
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if(is_object($control) && (get_class($control) === $type || (!$strict && ($control instanceof $type))))
-					$controls[] = $control;
-				if(($control instanceof TControl) && $control->getHasControls())
-					$controls = array_merge($controls, $control->findControlsByType($type, $strict));
+				if(is_object($control) && (get_class($control) === $type || (!$strict && ($control instanceof $type)))) {
+									$controls[] = $control;
+				}
+				if(($control instanceof TControl) && $control->getHasControls()) {
+									$controls = array_merge($controls, $control->findControlsByType($type, $strict));
+				}
 			}
 		}
 		return $controls;
@@ -1045,8 +1082,9 @@ 
 			{
 				if($control instanceof TControl)
 				{
-					if($control->_id === $id)
-						$controls[] = $control;
+					if($control->_id === $id) {
+											$controls[] = $control;
+					}
 					$controls = array_merge($controls, $control->findControlsByID($id));
 				}
 			}
@@ -1074,8 +1112,9 @@ 
 	 */
 	public function registerObject($name, $object)
 	{
-		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
-			throw new TInvalidOperationException('control_object_reregistered', $name);
+		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name])) {
+					throw new TInvalidOperationException('control_object_reregistered', $name);
+		}
 		$this->_rf[self::RF_NAMED_OBJECTS][$name] = $object;
 	}
 
@@ -1190,8 +1229,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;
 	}
 
@@ -1203,18 +1243,20 @@ 
 	 */
 	public function addedControl($control)
 	{
-		if($control->_parent)
-			$control->_parent->getControls()->remove($control);
+		if($control->_parent) {
+					$control->_parent->getControls()->remove($control);
+		}
 		$control->_parent = $this;
 		$control->_page = $this->getPage();
 		$namingContainer = ($this instanceof INamingContainer)?$this:$this->_namingContainer;
 		if($namingContainer)
 		{
 			$control->_namingContainer = $namingContainer;
-			if($control->_id === '')
-				$control->generateAutomaticID();
-			else
-				$namingContainer->clearNameTable();
+			if($control->_id === '') {
+							$control->generateAutomaticID();
+			} else {
+							$namingContainer->clearNameTable();
+			}
 			$control->clearCachedUniqueID($control instanceof INamingContainer);
 		}
 
@@ -1227,15 +1269,16 @@ 
 				{
 					$state = $this->_rf[self::RF_CHILD_STATE][$control->_id];
 					unset($this->_rf[self::RF_CHILD_STATE][$control->_id]);
+				} else {
+									$state = null;
 				}
-				else
-					$state = null;
 				$control->loadStateRecursive($state, !($this->_flags & self::IS_DISABLE_VIEWSTATE));
 				if($this->_stage >= self::CS_LOADED)
 				{
 					$control->loadRecursive();
-					if($this->_stage >= self::CS_PRERENDERED)
-						$control->preRenderRecursive();
+					if($this->_stage >= self::CS_PRERENDERED) {
+											$control->preRenderRecursive();
+					}
 				}
 			}
 		}
@@ -1248,18 +1291,20 @@ 
 	 */
 	public function removedControl($control)
 	{
-		if($this->_namingContainer)
-			$this->_namingContainer->clearNameTable();
+		if($this->_namingContainer) {
+					$this->_namingContainer->clearNameTable();
+		}
 		$control->unloadRecursive();
 		$control->_parent = null;
 		$control->_page = null;
 		$control->_namingContainer = null;
 		$control->_tplControl = null;
 		//$control->_stage=self::CS_CONSTRUCTED;
-		if(!($control->_flags & self::IS_ID_SET))
-			$control->_id = '';
-		else
-			unset($this->_rf[self::RF_NAMED_OBJECTS][$control->_id]);
+		if(!($control->_flags & self::IS_ID_SET)) {
+					$control->_id = '';
+		} else {
+					unset($this->_rf[self::RF_NAMED_OBJECTS][$control->_id]);
+		}
 		$control->clearCachedUniqueID(true);
 	}
 
@@ -1273,8 +1318,9 @@ 
 		$this->ensureChildControls();
 		if($this->getHasControls())
 		{
-			if($this instanceof INamingContainer)
-				$namingContainer = $this;
+			if($this instanceof INamingContainer) {
+							$namingContainer = $this;
+			}
 			$page = $this->getPage();
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
@@ -1282,8 +1328,9 @@ 
 				{
 					$control->_namingContainer = $namingContainer;
 					$control->_page = $page;
-					if($control->_id === '' && $namingContainer)
-						$control->generateAutomaticID();
+					if($control->_id === '' && $namingContainer) {
+											$control->generateAutomaticID();
+					}
 					$control->initRecursive($namingContainer);
 				}
 			}
@@ -1296,10 +1343,11 @@ 
 				$page->applyControlSkin($this);
 				$this->_flags |= self::IS_SKIN_APPLIED;
 			}
-			if(isset($this->_rf[self::RF_ADAPTER]))
-				$this->_rf[self::RF_ADAPTER]->onInit(null);
-			else
-				$this->onInit(null);
+			if(isset($this->_rf[self::RF_ADAPTER])) {
+							$this->_rf[self::RF_ADAPTER]->onInit(null);
+			} else {
+							$this->onInit(null);
+			}
 			$this->_stage = self::CS_INITIALIZED;
 		}
 	}
@@ -1312,21 +1360,24 @@ 
 	{
 		if($this->_stage < self::CS_LOADED)
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
-				$this->_rf[self::RF_ADAPTER]->onLoad(null);
-			else
-				$this->onLoad(null);
+			if(isset($this->_rf[self::RF_ADAPTER])) {
+							$this->_rf[self::RF_ADAPTER]->onLoad(null);
+			} else {
+							$this->onLoad(null);
+			}
 		}
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
-					$control->loadRecursive();
+				if($control instanceof TControl) {
+									$control->loadRecursive();
+				}
 			}
 		}
-		if($this->_stage < self::CS_LOADED)
-			$this->_stage = self::CS_LOADED;
+		if($this->_stage < self::CS_LOADED) {
+					$this->_stage = self::CS_LOADED;
+		}
 	}
 
 	/**
@@ -1339,18 +1390,20 @@ 
 
 		if($this->getVisible(false))
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
-				$this->_rf[self::RF_ADAPTER]->onPreRender(null);
-			else
-				$this->onPreRender(null);
+			if(isset($this->_rf[self::RF_ADAPTER])) {
+							$this->_rf[self::RF_ADAPTER]->onPreRender(null);
+			} else {
+							$this->onPreRender(null);
+			}
 			if($this->getHasControls())
 			{
 				foreach($this->_rf[self::RF_CONTROLS] as $control)
 				{
-					if($control instanceof TControl)
-						$control->preRenderRecursive();
-					elseif($control instanceof TCompositeLiteral)
-						$control->evaluateDynamicContent();
+					if($control instanceof TControl) {
+											$control->preRenderRecursive();
+					} elseif($control instanceof TCompositeLiteral) {
+											$control->evaluateDynamicContent();
+					}
 				}
 			}
 		}
@@ -1363,18 +1416,21 @@ 
 	 */
 	protected function unloadRecursive()
 	{
-		if(!($this->_flags & self::IS_ID_SET))
-			$this->_id = '';
+		if(!($this->_flags & self::IS_ID_SET)) {
+					$this->_id = '';
+		}
 		if($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof TControl)
+			foreach($this->_rf[self::RF_CONTROLS] as $control) {
+							if($control instanceof TControl)
 					$control->unloadRecursive();
+			}
+		}
+		if(isset($this->_rf[self::RF_ADAPTER])) {
+					$this->_rf[self::RF_ADAPTER]->onUnload(null);
+		} else {
+					$this->onUnload(null);
 		}
-		if(isset($this->_rf[self::RF_ADAPTER]))
-			$this->_rf[self::RF_ADAPTER]->onUnload(null);
-		else
-			$this->onUnload(null);
 	}
 
 	/**
@@ -1449,8 +1505,9 @@ 
 		$control = $this;
 		while($control = $control->_parent)
 		{
-			if($control->bubbleEvent($sender, $param))
-				break;
+			if($control->bubbleEvent($sender, $param)) {
+							break;
+			}
 		}
 	}
 
@@ -1499,16 +1556,19 @@ 
 	 */
 	private function broadcastEventInternal($name, $sender, $param)
 	{
-		if($this->hasEvent($name))
-			$this->raiseEvent($name, $sender, $param->getParameter());
-		if($this instanceof IBroadcastEventReceiver)
-			$this->broadcastEventReceived($sender, $param);
+		if($this->hasEvent($name)) {
+					$this->raiseEvent($name, $sender, $param->getParameter());
+		}
+		if($this instanceof IBroadcastEventReceiver) {
+					$this->broadcastEventReceived($sender, $param);
+		}
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
-					$control->broadcastEventInternal($name, $sender, $param);
+				if($control instanceof TControl) {
+									$control->broadcastEventInternal($name, $sender, $param);
+				}
 			}
 		}
 	}
@@ -1532,8 +1592,9 @@ 
 	 */
 	protected function traverseChildControls($param, $preCallback = null, $postCallback = null)
 	{
-		if($preCallback !== null)
-			call_user_func($preCallback, $this, $param);
+		if($preCallback !== null) {
+					call_user_func($preCallback, $this, $param);
+		}
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
@@ -1544,8 +1605,9 @@ 
 				}
 			}
 		}
-		if($postCallback !== null)
-			call_user_func($postCallback, $this, $param);
+		if($postCallback !== null) {
+					call_user_func($postCallback, $this, $param);
+		}
 	}
 
 	/**
@@ -1557,10 +1619,11 @@ 
 	{
 		if($this instanceof IActiveControl || $this->getVisible(false))
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
-				$this->_rf[self::RF_ADAPTER]->render($writer);
-			else
-				$this->render($writer);
+			if(isset($this->_rf[self::RF_ADAPTER])) {
+							$this->_rf[self::RF_ADAPTER]->render($writer);
+			} else {
+							$this->render($writer);
+			}
 		}
 	}
 
@@ -1588,12 +1651,13 @@ 
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if(is_string($control))
-					$writer->write($control);
-				elseif($control instanceof TControl)
-					$control->renderControl($writer);
-				elseif($control instanceof IRenderable)
-					$control->render($writer);
+				if(is_string($control)) {
+									$writer->write($control);
+				} elseif($control instanceof TControl) {
+									$control->renderControl($writer);
+				} elseif($control instanceof IRenderable) {
+									$control->render($writer);
+				}
 			}
 		}
 	}
@@ -1633,15 +1697,16 @@ 
 			{
 				$this->_rf[self::RF_CONTROLSTATE] = &$state[1];
 				unset($state[1]);
+			} else {
+							unset($this->_rf[self::RF_CONTROLSTATE]);
 			}
-			else
-				unset($this->_rf[self::RF_CONTROLSTATE]);
 			if($needViewState)
 			{
-				if(isset($state[0]))
-					$this->_viewState = &$state[0];
-				else
-					$this->_viewState = [];
+				if(isset($state[0])) {
+									$this->_viewState = &$state[0];
+				} else {
+									$this->_viewState = [];
+				}
 			}
 			unset($state[0]);
 			if($this->getHasControls())
@@ -1658,14 +1723,16 @@ 
 					}
 				}
 			}
-			if(!empty($state))
-				$this->_rf[self::RF_CHILD_STATE] = &$state;
+			if(!empty($state)) {
+							$this->_rf[self::RF_CHILD_STATE] = &$state;
+			}
 		}
 		$this->_stage = self::CS_STATE_LOADED;
-		if(isset($this->_rf[self::RF_ADAPTER]))
-			$this->_rf[self::RF_ADAPTER]->loadState();
-		else
-			$this->loadState();
+		if(isset($this->_rf[self::RF_ADAPTER])) {
+					$this->_rf[self::RF_ADAPTER]->loadState();
+		} else {
+					$this->loadState();
+		}
 	}
 
 	/**
@@ -1676,10 +1743,11 @@ 
 	 */
 	protected function &saveStateRecursive($needViewState = true)
 	{
-		if(isset($this->_rf[self::RF_ADAPTER]))
-			$this->_rf[self::RF_ADAPTER]->saveState();
-		else
-			$this->saveState();
+		if(isset($this->_rf[self::RF_ADAPTER])) {
+					$this->_rf[self::RF_ADAPTER]->saveState();
+		} else {
+					$this->saveState();
+		}
 		$needViewState = ($needViewState && !($this->_flags & self::IS_DISABLE_VIEWSTATE));
 		$state = [];
 		if($this->getHasControls())
@@ -1688,15 +1756,18 @@ 
 			{
 				if($control instanceof TControl)
 				{
-					if(count($tmp = &$control->saveStateRecursive($needViewState)))
-						$state[$control->_id] = $tmp;
+					if(count($tmp = &$control->saveStateRecursive($needViewState))) {
+											$state[$control->_id] = $tmp;
+					}
 				}
 			}
 		}
-		if($needViewState && !empty($this->_viewState))
-			$state[0] = &$this->_viewState;
-		if(isset($this->_rf[self::RF_CONTROLSTATE]))
-			$state[1] = &$this->_rf[self::RF_CONTROLSTATE];
+		if($needViewState && !empty($this->_viewState)) {
+					$state[0] = &$this->_viewState;
+		}
+		if(isset($this->_rf[self::RF_CONTROLSTATE])) {
+					$state[1] = &$this->_rf[self::RF_CONTROLSTATE];
+		}
 		return $state;
 	}
 
@@ -1711,9 +1782,9 @@ 
 		{
 			$page->applyControlStyleSheet($this);
 			$this->_flags |= self::IS_STYLESHEET_APPLIED;
+		} elseif($this->_flags & self::IS_STYLESHEET_APPLIED) {
+					throw new TInvalidOperationException('control_stylesheet_applied', get_class($this));
 		}
-		elseif($this->_flags & self::IS_STYLESHEET_APPLIED)
-			throw new TInvalidOperationException('control_stylesheet_applied', get_class($this));
 	}
 
 	/**
@@ -1725,9 +1796,10 @@ 
 	{
 		if($recursive && $this->_uid !== null && isset($this->_rf[self::RF_CONTROLS]))
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof TControl)
+			foreach($this->_rf[self::RF_CONTROLS] as $control) {
+							if($control instanceof TControl)
 					$control->clearCachedUniqueID($recursive);
+			}
 		}
 		$this->_uid = null;
 	}
@@ -1738,8 +1810,9 @@ 
 	private function generateAutomaticID()
 	{
 		$this->_flags &= ~self::IS_ID_SET;
-		if(!isset($this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]))
-			$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID] = 0;
+		if(!isset($this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID])) {
+					$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID] = 0;
+		}
 		$id = $this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]++;
 		$this->_id = self::AUTOMATIC_ID_PREFIX . $id;
 		$this->_namingContainer->clearNameTable();
@@ -1767,13 +1840,15 @@ 
 			{
 				if($control->_id !== '')
 				{
-					if(isset($container->_rf[self::RF_NAMED_CONTROLS][$control->_id]))
-						throw new TInvalidDataValueException('control_id_nonunique', get_class($control), $control->_id);
-					else
-						$container->_rf[self::RF_NAMED_CONTROLS][$control->_id] = $control;
+					if(isset($container->_rf[self::RF_NAMED_CONTROLS][$control->_id])) {
+											throw new TInvalidDataValueException('control_id_nonunique', get_class($control), $control->_id);
+					} else {
+											$container->_rf[self::RF_NAMED_CONTROLS][$control->_id] = $control;
+					}
+				}
+				if(!($control instanceof INamingContainer) && $control->getHasControls()) {
+									$this->fillNameTable($container, $control->_rf[self::RF_CONTROLS]);
 				}
-				if(!($control instanceof INamingContainer) && $control->getHasControls())
-					$this->fillNameTable($container, $control->_rf[self::RF_CONTROLS]);
 			}
 		}
 	}

framework/Web/UI/TSessionPageStatePersister.php

Spacing +8 added lines, -8 removed lines

@@ -85,7 +85,7 @@ 
 	 */
 	public function setHistorySize($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) > 0)
+		if (($value = TPropertyValue::ensureInteger($value)) > 0)
 			$this->_historySize = $value;
 		else
 			throw new TInvalidDataValueException('sessionpagestatepersister_historysize_invalid');
@@ -99,13 +99,13 @@ 
 		$session = $this->_page->getSession();
 		$session->open();
 		$data = serialize($state);
-		$timestamp = (string)microtime(true);
-		$key = self::STATE_SESSION_KEY . $timestamp;
+		$timestamp = (string) microtime(true);
+		$key = self::STATE_SESSION_KEY.$timestamp;
 		$session->add($key, $data);
-		if(($queue = $session->itemAt(self::QUEUE_SESSION_KEY)) === null)
+		if (($queue = $session->itemAt(self::QUEUE_SESSION_KEY)) === null)
 			$queue = [];
 		$queue[] = $key;
-		if(count($queue) > $this->getHistorySize())
+		if (count($queue) > $this->getHistorySize())
 		{
 			$expiredKey = array_shift($queue);
 			$session->remove($expiredKey);
@@ -121,12 +121,12 @@ 
 	 */
 	public function load()
 	{
-		if(($timestamp = TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState())) !== null)
+		if (($timestamp = TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState())) !== null)
 		{
 			$session = $this->_page->getSession();
 			$session->open();
-			$key = self::STATE_SESSION_KEY . $timestamp;
-			if(($data = $session->itemAt($key)) !== null)
+			$key = self::STATE_SESSION_KEY.$timestamp;
+			if (($data = $session->itemAt($key)) !== null)
 				return unserialize($data);
 		}
 		throw new THttpException(400, 'sessionpagestatepersister_pagestate_corrupted');

Braces +11 added lines, -8 removed lines

@@ -85,10 +85,11 @@ 
 	 */
 	public function setHistorySize($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) > 0)
-			$this->_historySize = $value;
-		else
-			throw new TInvalidDataValueException('sessionpagestatepersister_historysize_invalid');
+		if(($value = TPropertyValue::ensureInteger($value)) > 0) {
+					$this->_historySize = $value;
+		} else {
+					throw new TInvalidDataValueException('sessionpagestatepersister_historysize_invalid');
+		}
 	}
 	/**
 	 * Saves state in session.
@@ -102,8 +103,9 @@ 
 		$timestamp = (string)microtime(true);
 		$key = self::STATE_SESSION_KEY . $timestamp;
 		$session->add($key, $data);
-		if(($queue = $session->itemAt(self::QUEUE_SESSION_KEY)) === null)
-			$queue = [];
+		if(($queue = $session->itemAt(self::QUEUE_SESSION_KEY)) === null) {
+					$queue = [];
+		}
 		$queue[] = $key;
 		if(count($queue) > $this->getHistorySize())
 		{
@@ -126,8 +128,9 @@ 
 			$session = $this->_page->getSession();
 			$session->open();
 			$key = self::STATE_SESSION_KEY . $timestamp;
-			if(($data = $session->itemAt($key)) !== null)
-				return unserialize($data);
+			if(($data = $session->itemAt($key)) !== null) {
+							return unserialize($data);
+			}
 		}
 		throw new THttpException(400, 'sessionpagestatepersister_pagestate_corrupted');
 	}

framework/Web/UI/TClientScriptManager.php

Spacing +51 added lines, -51 removed lines

@@ -168,11 +168,11 @@ 
 	protected function registerPradoScriptInternal($name)
 	{
 		// $this->checkIfNotInRender();
-		if(!isset($this->_registeredScripts[$name]))
+		if (!isset($this->_registeredScripts[$name]))
 		{
-			if(self::$_scripts === null)
+			if (self::$_scripts === null)
 			{
-				$packageFile = Prado::getFrameworkPath() . DIRECTORY_SEPARATOR . self::PACKAGES_FILE;
+				$packageFile = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::PACKAGES_FILE;
 				list($folders, $packages, $deps) = include($packageFile);
 				self::$_scriptsFolders = $folders;
 				self::$_scripts = $deps;
@@ -184,7 +184,7 @@ 
 			else
 				throw new TInvalidOperationException('csmanager_pradoscript_invalid', $name);
 
-			if(($packages = array_keys($this->_registeredScripts)) !== [])
+			if (($packages = array_keys($this->_registeredScripts)) !== [])
 			{
 				$packagesUrl = [];
 				$isDebug = $this->getApplication()->getMode() === TApplicationMode::Debug;
@@ -200,17 +200,17 @@ 
 								list($path, $baseUrl) = $this->getPackagePathUrl($base);
 
 								$this->_expandedScripts[$script] = true;
-								if($isDebug)
+								if ($isDebug)
 								{
-									if (!in_array($url = $baseUrl . '/' . $subPath, $packagesUrl))
+									if (!in_array($url = $baseUrl.'/'.$subPath, $packagesUrl))
 										$packagesUrl[] = $url;
 								} else {
 								  $minPath = preg_replace('/^(.*)(?<!\.min)\.js$/', "\\1.min.js", $subPath);
-								  if (!in_array($url = $baseUrl . '/' . $minPath, $packagesUrl))
+								  if (!in_array($url = $baseUrl.'/'.$minPath, $packagesUrl))
 									{
-										if(!is_file($filePath = $path . DIRECTORY_SEPARATOR . $minPath))
+										if (!is_file($filePath = $path.DIRECTORY_SEPARATOR.$minPath))
 										{
-											file_put_contents($filePath, TJavaScript::JSMin(file_get_contents($base . '/' . $subPath)));
+											file_put_contents($filePath, TJavaScript::JSMin(file_get_contents($base.'/'.$subPath)));
 											chmod($filePath, PRADO_CHMOD);
 										}
 										$packagesUrl[] = $url;
@@ -220,7 +220,7 @@ 
 						}
 					}
 				}
-				foreach($packagesUrl as $url)
+				foreach ($packagesUrl as $url)
 					$this->registerScriptFile($url, $url);
 			}
 		}
@@ -231,7 +231,7 @@ 
 	 */
 	public function getPradoScriptAssetUrl($script = 'prado')
 	{
-		if(!isset(self::$_scriptsFolders[$script]))
+		if (!isset(self::$_scriptsFolders[$script]))
 			$this->registerPradoScriptInternal($script);
 
 		$base = Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
@@ -244,7 +244,7 @@ 
 	 */
 	public function getPradoScriptAssetPath($script = 'prado')
 	{
-		if(!isset(self::$_scriptsFolders[$script]))
+		if (!isset(self::$_scriptsFolders[$script]))
 			$this->registerPradoScriptInternal($script);
 
 		$base = Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
@@ -272,13 +272,13 @@ 
 	protected function getPackagePathUrl($base)
 	{
 		$assets = Prado::getApplication()->getAssetManager();
-		if(strpos($base, $assets->getBaseUrl()) === false)
+		if (strpos($base, $assets->getBaseUrl()) === false)
 		{
 			return [$assets->getPublishedPath($base), $assets->publishFilePath($base)];
 		}
 		else
 		{
-			return [$assets->getBasePath() . str_replace($assets->getBaseUrl(), '', $base), $base];
+			return [$assets->getBasePath().str_replace($assets->getBaseUrl(), '', $base), $base];
 		}
 	}
 
@@ -290,11 +290,11 @@ 
 	{
 		list($base, $subPath) = explode("/", $script, 2);
 
-		if(!array_key_exists($base, self::$_scriptsFolders))
+		if (!array_key_exists($base, self::$_scriptsFolders))
 			throw new TInvalidOperationException('csmanager_pradostyle_invalid', $base);
 
 		$namespace = self::$_scriptsFolders[$base];
-		if(($dir = Prado::getPathOfNameSpace($namespace)) !== null) {
+		if (($dir = Prado::getPathOfNameSpace($namespace)) !== null) {
 		  $namespace = $dir;
 		}
 
@@ -309,11 +309,11 @@ 
 	{
 		list($base, $subPath) = explode("/", $script, 2);
 
-		if(!array_key_exists($base, self::$_stylesFolders))
+		if (!array_key_exists($base, self::$_stylesFolders))
 			throw new TInvalidOperationException('csmanager_pradostyle_invalid', $base);
 
 		$namespace = self::$_stylesFolders[$base];
-		if(($dir = Prado::getPathOfNameSpace($namespace)) !== null) {
+		if (($dir = Prado::getPathOfNameSpace($namespace)) !== null) {
 		  $namespace = $dir;
 		}
 
@@ -362,10 +362,10 @@ 
 	 */
 	public function registerPostBackControl($class, $options)
 	{
-		if($class === null) {
+		if ($class === null) {
 			return;
 		}
-		if(!isset($options['FormID']) && ($form = $this->_page->getForm()) !== null)
+		if (!isset($options['FormID']) && ($form = $this->_page->getForm()) !== null)
 			$options['FormID'] = $form->getClientID();
 		$optionString = TJavaScript::encode($options);
 		$code = "new {$class}({$optionString});";
@@ -385,9 +385,9 @@ 
 	 */
 	public function registerDefaultButton($panel, $button)
 	{
-		$panelID = is_string($panel)?$panel:$panel->getUniqueID();
+		$panelID = is_string($panel) ? $panel : $panel->getUniqueID();
 
-		if(is_string($button))
+		if (is_string($button))
 			$buttonID = $button;
 		else
 		{
@@ -397,10 +397,10 @@ 
 		$options = TJavaScript::encode($this->getDefaultButtonOptions($panelID, $buttonID));
 		$code = "new Prado.WebUI.DefaultButton($options);";
 
-		$this->_endScripts['prado:' . $panelID] = $code;
+		$this->_endScripts['prado:'.$panelID] = $code;
 		$this->registerPradoScriptInternal('prado');
 
-		$params = [$panelID,$buttonID];
+		$params = [$panelID, $buttonID];
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerDefaultButton', $params);
 	}
 
@@ -426,9 +426,9 @@ 
 	public function registerFocusControl($target)
 	{
 		$this->registerPradoScriptInternal('jquery');
-		if($target instanceof TControl)
+		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);
@@ -452,11 +452,11 @@ 
 	protected function registerPradoStyleInternal($name)
 	{
 		// $this->checkIfNotInRender();
-		if(!isset($this->_registeredStyles[$name]))
+		if (!isset($this->_registeredStyles[$name]))
 		{
-			if(self::$_styles === null)
+			if (self::$_styles === null)
 			{
-				$packageFile = Prado::getFrameworkPath() . DIRECTORY_SEPARATOR . self::CSS_PACKAGES_FILE;
+				$packageFile = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::CSS_PACKAGES_FILE;
 				list($folders, $packages, $deps) = include($packageFile);
 				self::$_stylesFolders = $folders;
 				self::$_styles = $deps;
@@ -468,7 +468,7 @@ 
 			else
 				throw new TInvalidOperationException('csmanager_pradostyle_invalid', $name);
 
-			if(($packages = array_keys($this->_registeredStyles)) !== [])
+			if (($packages = array_keys($this->_registeredStyles)) !== [])
 			{
 				$packagesUrl = [];
 				$isDebug = $this->getApplication()->getMode() === TApplicationMode::Debug;
@@ -485,13 +485,13 @@ 
 
 								$this->_expandedStyles[$style] = true;
 								// TODO minify css?
-								if (!in_array($url = $baseUrl . '/' . $subPath, $packagesUrl))
+								if (!in_array($url = $baseUrl.'/'.$subPath, $packagesUrl))
 									$packagesUrl[] = $url;
 							}
 						}
 					}
 				}
-				foreach($packagesUrl as $url)
+				foreach ($packagesUrl as $url)
 					$this->registerStyleSheetFile($url, $url);
 			}
 		}
@@ -521,10 +521,10 @@ 
 	 */
 	public function registerStyleSheetFile($key, $url, $media = '')
 	{
-		if($media === '')
+		if ($media === '')
 			$this->_styleSheetFiles[$key] = $url;
 		else
-			$this->_styleSheetFiles[$key] = [$url,$media];
+			$this->_styleSheetFiles[$key] = [$url, $media];
 
 		$params = func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheetFile', $params);
@@ -555,7 +555,7 @@ 
 			}, $this->_styleSheetFiles)
 		);
 
-		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path => $url)
+		foreach (Prado::getApplication()->getAssetManager()->getPublished() as $path => $url)
 			if (substr($url, strlen($url) - 4) == '.css')
 				$stylesheets[] = $url;
 
@@ -749,12 +749,12 @@ 
 	public function renderStyleSheetFiles($writer)
 	{
 		$str = '';
-		foreach($this->_styleSheetFiles as $url)
+		foreach ($this->_styleSheetFiles as $url)
 		{
-			if(is_array($url))
-				$str .= "<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"" . THttpUtility::htmlEncode($url[0]) . "\" />\n";
+			if (is_array($url))
+				$str .= "<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"".THttpUtility::htmlEncode($url[0])."\" />\n";
 			else
-				$str .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" . THttpUtility::htmlEncode($url) . "\" />\n";
+				$str .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"".THttpUtility::htmlEncode($url)."\" />\n";
 		}
 		$writer->write($str);
 	}
@@ -764,8 +764,8 @@ 
 	 */
 	public function renderStyleSheets($writer)
 	{
-		if(count($this->_styleSheets))
-			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n" . implode("\n", $this->_styleSheets) . "\n/*]]>*/\n</style>\n");
+		if (count($this->_styleSheets))
+			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n".implode("\n", $this->_styleSheets)."\n/*]]>*/\n</style>\n");
 	}
 
 	/**
@@ -803,7 +803,7 @@ 
 
 	protected function renderScriptFiles($writer, array $scripts)
 	{
-		foreach($scripts as $script)
+		foreach ($scripts as $script)
 		{
 			$writer->write(TJavaScript::renderScriptFile($script));
 			$this->markScriptFileAsRendered($script);
@@ -820,7 +820,7 @@ 
 	 */
 	public function renderAllPendingScriptFiles($writer)
 	{
-		if(!empty($this->_scriptFiles))
+		if (!empty($this->_scriptFiles))
 		{
 			$addedScripts = array_diff($this->_scriptFiles, $this->getRenderedScriptFiles());
 			$this->renderScriptFiles($writer, $addedScripts);
@@ -876,7 +876,7 @@ 
 	 */
 	public function flushScriptFiles($writer, $control = null)
 	{
-		if(!$this->_page->getIsCallback())
+		if (!$this->_page->getIsCallback())
 		{
 			$this->_page->ensureRenderInForm($control);
 			$this->renderAllPendingScriptFiles($writer);
@@ -895,23 +895,23 @@ 
 	{
 		if ($initial) $this->_renderedHiddenFields = [];
 		$str = '';
-		foreach($this->_hiddenFields as $name => $value)
+		foreach ($this->_hiddenFields as $name => $value)
 		{
 			if (in_array($name, $this->_renderedHiddenFields)) continue;
 			$id = strtr($name, ':', '_');
-			if(is_array($value))
+			if (is_array($value))
 			{
-				foreach($value as $v)
-					$str .= '<input type="text" style="display:none" autocomplete="off" name="' . $name . '[]" id="' . $id . '" value="' . THttpUtility::htmlEncode($value) . "\" />\n";
+				foreach ($value as $v)
+					$str .= '<input type="text" style="display:none" autocomplete="off" name="'.$name.'[]" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
 			}
 			else
 			{
-				$str .= '<input type="text" style="display:none" autocomplete="off" name="' . $name . '" id="' . $id . '" value="' . THttpUtility::htmlEncode($value) . "\" />\n";
+				$str .= '<input type="text" style="display:none" autocomplete="off" name="'.$name.'" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
 			}
 			$this->_renderedHiddenFields[] = $name;
 		}
-		if($str !== '')
-			$writer->write("<div style=\"visibility:hidden;\">\n" . $str . "</div>\n");
+		if ($str !== '')
+			$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
 	}
 
 	public function getHiddenFields()

Braces +76 added lines, -55 removed lines

@@ -179,10 +179,11 @@ 
 				self::$_scriptsPackages = $packages;
 			}
 
-			if (isset(self::$_scripts[$name]))
-				$this->_registeredScripts[$name] = true;
-			else
-				throw new TInvalidOperationException('csmanager_pradoscript_invalid', $name);
+			if (isset(self::$_scripts[$name])) {
+							$this->_registeredScripts[$name] = true;
+			} else {
+							throw new TInvalidOperationException('csmanager_pradoscript_invalid', $name);
+			}
 
 			if(($packages = array_keys($this->_registeredScripts)) !== [])
 			{
@@ -202,8 +203,9 @@ 
 								$this->_expandedScripts[$script] = true;
 								if($isDebug)
 								{
-									if (!in_array($url = $baseUrl . '/' . $subPath, $packagesUrl))
-										$packagesUrl[] = $url;
+									if (!in_array($url = $baseUrl . '/' . $subPath, $packagesUrl)) {
+																			$packagesUrl[] = $url;
+									}
 								} else {
 								  $minPath = preg_replace('/^(.*)(?<!\.min)\.js$/', "\\1.min.js", $subPath);
 								  if (!in_array($url = $baseUrl . '/' . $minPath, $packagesUrl))
@@ -220,8 +222,9 @@ 
 						}
 					}
 				}
-				foreach($packagesUrl as $url)
-					$this->registerScriptFile($url, $url);
+				foreach($packagesUrl as $url) {
+									$this->registerScriptFile($url, $url);
+				}
 			}
 		}
 	}
@@ -231,8 +234,9 @@ 
 	 */
 	public function getPradoScriptAssetUrl($script = 'prado')
 	{
-		if(!isset(self::$_scriptsFolders[$script]))
-			$this->registerPradoScriptInternal($script);
+		if(!isset(self::$_scriptsFolders[$script])) {
+					$this->registerPradoScriptInternal($script);
+		}
 
 		$base = Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
 		$assets = Prado::getApplication()->getAssetManager();
@@ -244,8 +248,9 @@ 
 	 */
 	public function getPradoScriptAssetPath($script = 'prado')
 	{
-		if(!isset(self::$_scriptsFolders[$script]))
-			$this->registerPradoScriptInternal($script);
+		if(!isset(self::$_scriptsFolders[$script])) {
+					$this->registerPradoScriptInternal($script);
+		}
 
 		$base = Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
 		$assets = Prado::getApplication()->getAssetManager();
@@ -275,8 +280,7 @@ 
 		if(strpos($base, $assets->getBaseUrl()) === false)
 		{
 			return [$assets->getPublishedPath($base), $assets->publishFilePath($base)];
-		}
-		else
+		} else
 		{
 			return [$assets->getBasePath() . str_replace($assets->getBaseUrl(), '', $base), $base];
 		}
@@ -290,8 +294,9 @@ 
 	{
 		list($base, $subPath) = explode("/", $script, 2);
 
-		if(!array_key_exists($base, self::$_scriptsFolders))
-			throw new TInvalidOperationException('csmanager_pradostyle_invalid', $base);
+		if(!array_key_exists($base, self::$_scriptsFolders)) {
+					throw new TInvalidOperationException('csmanager_pradostyle_invalid', $base);
+		}
 
 		$namespace = self::$_scriptsFolders[$base];
 		if(($dir = Prado::getPathOfNameSpace($namespace)) !== null) {
@@ -309,8 +314,9 @@ 
 	{
 		list($base, $subPath) = explode("/", $script, 2);
 
-		if(!array_key_exists($base, self::$_stylesFolders))
-			throw new TInvalidOperationException('csmanager_pradostyle_invalid', $base);
+		if(!array_key_exists($base, self::$_stylesFolders)) {
+					throw new TInvalidOperationException('csmanager_pradostyle_invalid', $base);
+		}
 
 		$namespace = self::$_stylesFolders[$base];
 		if(($dir = Prado::getPathOfNameSpace($namespace)) !== null) {
@@ -365,8 +371,9 @@ 
 		if($class === null) {
 			return;
 		}
-		if(!isset($options['FormID']) && ($form = $this->_page->getForm()) !== null)
-			$options['FormID'] = $form->getClientID();
+		if(!isset($options['FormID']) && ($form = $this->_page->getForm()) !== null) {
+					$options['FormID'] = $form->getClientID();
+		}
 		$optionString = TJavaScript::encode($options);
 		$code = "new {$class}({$optionString});";
 
@@ -387,9 +394,9 @@ 
 	{
 		$panelID = is_string($panel)?$panel:$panel->getUniqueID();
 
-		if(is_string($button))
-			$buttonID = $button;
-		else
+		if(is_string($button)) {
+					$buttonID = $button;
+		} else
 		{
 			$button->setIsDefaultButton(true);
 			$buttonID = $button->getUniqueID();
@@ -426,8 +433,9 @@ 
 	public function registerFocusControl($target)
 	{
 		$this->registerPradoScriptInternal('jquery');
-		if($target instanceof TControl)
-			$target = $target->getClientID();
+		if($target instanceof TControl) {
+					$target = $target->getClientID();
+		}
 		$this->_endScripts['prado:focus'] = 'jQuery(\'#' . $target . '\').focus();';
 
 		$params = func_get_args();
@@ -463,10 +471,11 @@ 
 				self::$_stylesPackages = $packages;
 			}
 
-			if (isset(self::$_styles[$name]))
-				$this->_registeredStyles[$name] = true;
-			else
-				throw new TInvalidOperationException('csmanager_pradostyle_invalid', $name);
+			if (isset(self::$_styles[$name])) {
+							$this->_registeredStyles[$name] = true;
+			} else {
+							throw new TInvalidOperationException('csmanager_pradostyle_invalid', $name);
+			}
 
 			if(($packages = array_keys($this->_registeredStyles)) !== [])
 			{
@@ -485,14 +494,16 @@ 
 
 								$this->_expandedStyles[$style] = true;
 								// TODO minify css?
-								if (!in_array($url = $baseUrl . '/' . $subPath, $packagesUrl))
-									$packagesUrl[] = $url;
+								if (!in_array($url = $baseUrl . '/' . $subPath, $packagesUrl)) {
+																	$packagesUrl[] = $url;
+								}
 							}
 						}
 					}
 				}
-				foreach($packagesUrl as $url)
-					$this->registerStyleSheetFile($url, $url);
+				foreach($packagesUrl as $url) {
+									$this->registerStyleSheetFile($url, $url);
+				}
 			}
 		}
 	}
@@ -521,10 +532,11 @@ 
 	 */
 	public function registerStyleSheetFile($key, $url, $media = '')
 	{
-		if($media === '')
-			$this->_styleSheetFiles[$key] = $url;
-		else
-			$this->_styleSheetFiles[$key] = [$url,$media];
+		if($media === '') {
+					$this->_styleSheetFiles[$key] = $url;
+		} else {
+					$this->_styleSheetFiles[$key] = [$url,$media];
+		}
 
 		$params = func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheetFile', $params);
@@ -555,9 +567,10 @@ 
 			}, $this->_styleSheetFiles)
 		);
 
-		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path => $url)
-			if (substr($url, strlen($url) - 4) == '.css')
+		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path => $url) {
+					if (substr($url, strlen($url) - 4) == '.css')
 				$stylesheets[] = $url;
+		}
 
 		$stylesheets = array_unique($stylesheets);
 
@@ -751,10 +764,11 @@ 
 		$str = '';
 		foreach($this->_styleSheetFiles as $url)
 		{
-			if(is_array($url))
-				$str .= "<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"" . THttpUtility::htmlEncode($url[0]) . "\" />\n";
-			else
-				$str .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" . THttpUtility::htmlEncode($url) . "\" />\n";
+			if(is_array($url)) {
+							$str .= "<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"" . THttpUtility::htmlEncode($url[0]) . "\" />\n";
+			} else {
+							$str .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" . THttpUtility::htmlEncode($url) . "\" />\n";
+			}
 		}
 		$writer->write($str);
 	}
@@ -764,8 +778,9 @@ 
 	 */
 	public function renderStyleSheets($writer)
 	{
-		if(count($this->_styleSheets))
-			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n" . implode("\n", $this->_styleSheets) . "\n/*]]>*/\n</style>\n");
+		if(count($this->_styleSheets)) {
+					$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n" . implode("\n", $this->_styleSheets) . "\n/*]]>*/\n</style>\n");
+		}
 	}
 
 	/**
@@ -893,25 +908,30 @@ 
 
 	protected function renderHiddenFieldsInt($writer, $initial)
 	{
-		if ($initial) $this->_renderedHiddenFields = [];
+		if ($initial) {
+			$this->_renderedHiddenFields = [];
+		}
 		$str = '';
 		foreach($this->_hiddenFields as $name => $value)
 		{
-			if (in_array($name, $this->_renderedHiddenFields)) continue;
+			if (in_array($name, $this->_renderedHiddenFields)) {
+				continue;
+			}
 			$id = strtr($name, ':', '_');
 			if(is_array($value))
 			{
-				foreach($value as $v)
-					$str .= '<input type="text" style="display:none" autocomplete="off" name="' . $name . '[]" id="' . $id . '" value="' . THttpUtility::htmlEncode($value) . "\" />\n";
-			}
-			else
+				foreach($value as $v) {
+									$str .= '<input type="text" style="display:none" autocomplete="off" name="' . $name . '[]" id="' . $id . '" value="' . THttpUtility::htmlEncode($value) . "\" />\n";
+				}
+			} else
 			{
 				$str .= '<input type="text" style="display:none" autocomplete="off" name="' . $name . '" id="' . $id . '" value="' . THttpUtility::htmlEncode($value) . "\" />\n";
 			}
 			$this->_renderedHiddenFields[] = $name;
 		}
-		if($str !== '')
-			$writer->write("<div style=\"visibility:hidden;\">\n" . $str . "</div>\n");
+		if($str !== '') {
+					$writer->write("<div style=\"visibility:hidden;\">\n" . $str . "</div>\n");
+		}
 	}
 
 	public function getHiddenFields()
@@ -924,7 +944,8 @@ 
 	 */
 	protected function checkIfNotInRender()
 	{
-		if ($form = $this->_page->InFormRender)
-			throw new \Exception('Operation invalid when page is already rendering');
+		if ($form = $this->_page->InFormRender) {
+					throw new \Exception('Operation invalid when page is already rendering');
+		}
 	}
 }