pradosoft / prado

framework/Web/UI/JuiControls/TJuiAutoComplete.php

Doc Comments +3 added lines

@@ -252,6 +252,7 @@ 
 	 * method, be sure to call the parent implementation so that the event
 	 * handler can be invoked.
 	 * @param TCallbackEventParameter event parameter to be passed to the event handlers
+	 * @param TJuiAutoCompleteEventParameter $param
 	 */
 	public function onSuggest($param)
 	{
@@ -264,6 +265,7 @@ 
 	 * method, be sure to call the parent implementation so that the event
 	 * handler can be invoked.
 	 * @param TCallbackEventParameter event parameter to be passed to the event handlers
+	 * @param TJuiAutoCompleteEventParameter $param
 	 */
 	public function onSuggestionSelected($param)
 	{
@@ -441,6 +443,7 @@ 
 
 	/**
 	 * Creates a new TCallbackEventParameter.
+	 * @param THttpResponse $response
 	 */
 	public function __construct($response, $parameter, $index=-1)
 	{

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TJuiAutoComplete class file.
- *
- * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.ActiveControls
- */
+	 * TJuiAutoComplete class file.
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.ActiveControls
+	 */
 
 /**
  * Load active text box.

Spacing +28 added lines, -28 removed lines

@@ -84,11 +84,11 @@ 
 	/**
 	 * @var ITemplate template for repeater items
 	 */
-	private $_repeater=null;
+	private $_repeater = null;
 	/**
 	 * @var TPanel result panel holding the suggestion items.
 	 */
-	private $_resultPanel=null;
+	private $_resultPanel = null;
 
 	/**
 	 * Creates a new callback control, sets the adapter to
@@ -123,9 +123,9 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if (($options = $this->getViewState('JuiOptions')) === null)
 		{
-		  $options=new TJuiControlOptions($this);
+		  $options = new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
 		}
 		return $options;
@@ -204,7 +204,7 @@ 
 	 */
 	public function getMinChars()
 	{
-		return $this->getViewState('minChars','');
+		return $this->getViewState('minChars', '');
 	}
 
 	/**
@@ -229,20 +229,20 @@ 
  	public function raiseCallbackEvent($param)
 	{
 		$token = $param->getCallbackParameter();
-		if(is_array($token) && count($token) == 2)
+		if (is_array($token) && count($token) == 2)
 		{
-			if($token[1] === '__TJuiAutoComplete_onSuggest__')
+			if ($token[1] === '__TJuiAutoComplete_onSuggest__')
 			{
 				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), $token[0]);
 				$this->onSuggest($parameter);
 			}
-			else if($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
+			else if ($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
 			{
 				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
 				$this->onSuggestionSelected($parameter);
 			}
 		}
-		else if($this->getAutoPostBack())
+		else if ($this->getAutoPostBack())
 			parent::raiseCallbackEvent($param);
 	}
 
@@ -285,7 +285,7 @@ 
 	public function dataBind()
 	{
 		parent::dataBind();
-		if($this->getPage()->getIsCallback())
+		if ($this->getPage()->getIsCallback())
 			$this->renderSuggestions($this->getResponse()->createHtmlWriter());
 	}
 
@@ -294,7 +294,7 @@ 
 	 */
 	public function getResultPanel()
 	{
-		if($this->_resultPanel===null)
+		if ($this->_resultPanel === null)
 			$this->_resultPanel = $this->createResultPanel();
 		return $this->_resultPanel;
 	}
@@ -315,7 +315,7 @@ 
 	 */
 	public function getSuggestions()
 	{
-		if($this->_repeater===null)
+		if ($this->_repeater === null)
 			$this->_repeater = $this->createRepeater();
 		return $this->_repeater;
 	}
@@ -326,7 +326,7 @@ 
 	protected function createRepeater()
 	{
 		$repeater = Prado::createComponent('System.Web.UI.WebControls.TRepeater');
-		$repeater->setItemTemplate(new TTemplate('<%# $this->Data %>',null));
+		$repeater->setItemTemplate(new TTemplate('<%# $this->Data %>', null));
 		$this->getControls()->add($repeater);
 		return $repeater;
 	}
@@ -364,16 +364,16 @@ 
 	 */
 	public function renderSuggestions($writer)
 	{
-		if($this->getActiveControl()->canUpdateClientSide())
+		if ($this->getActiveControl()->canUpdateClientSide())
 		{
-			$data=array();
-			$items=$this->getSuggestions()->getItems();
+			$data = array();
+			$items = $this->getSuggestions()->getItems();
 			$writer = new TTextWriter;
-			for($i=0; $i<$items->Count; $i++)
+			for ($i = 0; $i < $items->Count; $i++)
 			{
 				$items->itemAt($i)->render($writer);
-				$item=$writer->flush();
-				$data[]=array( 'id' => $i, 'label' => $item);
+				$item = $writer->flush();
+				$data[] = array('id' => $i, 'label' => $item);
 			}
 
 			$this->getResponse()->getAdapter()->setResponseData($data);
@@ -387,19 +387,19 @@ 
 	{
 		$options = $this->getOptions()->toArray();
 
-		if(strlen($separator = $this->getSeparator()))
+		if (strlen($separator = $this->getSeparator()))
 			$options['Separators'] = $separator;
 
-		if($this->getAutoPostBack())
+		if ($this->getAutoPostBack())
 		{
-			$options = array_merge($options,parent::getPostBackOptions());
+			$options = array_merge($options, parent::getPostBackOptions());
 			$options['AutoPostBack'] = true;
 		}
-		if(strlen($textCssClass = $this->getTextCssClass()))
+		if (strlen($textCssClass = $this->getTextCssClass()))
 			$options['textCssClass'] = $textCssClass;
 		$options['minLength'] = $this->getMinChars();
-		$options['delay'] = $this->getFrequency()*1000.0;
-		$options['appendTo'] = '#'.$this->getResultPanel()->getClientID();
+		$options['delay'] = $this->getFrequency() * 1000.0;
+		$options['appendTo'] = '#' . $this->getResultPanel()->getClientID();
 		$options['ID'] = $this->getClientID();
 		$options['EventTarget'] = $this->getUniqueID();
 		$options['CausesValidation'] = $this->getCausesValidation();
@@ -437,15 +437,15 @@ 
  */
 class TJuiAutoCompleteEventParameter extends TCallbackEventParameter
 {
-	private $_selectedIndex=-1;
+	private $_selectedIndex = -1;
 
 	/**
 	 * Creates a new TCallbackEventParameter.
 	 */
-	public function __construct($response, $parameter, $index=-1)
+	public function __construct($response, $parameter, $index = -1)
 	{
 		parent::__construct($response, $parameter);
-		$this->_selectedIndex=$index;
+		$this->_selectedIndex = $index;
 	}
 
 	/**

Braces +18 added lines, -14 removed lines

@@ -235,15 +235,14 @@ 
 			{
 				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), $token[0]);
 				$this->onSuggest($parameter);
-			}
-			else if($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
+			} else if($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
 			{
 				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
 				$this->onSuggestionSelected($parameter);
 			}
+		} else if($this->getAutoPostBack()) {
+					parent::raiseCallbackEvent($param);
 		}
-		else if($this->getAutoPostBack())
-			parent::raiseCallbackEvent($param);
 	}
 
 	/**
@@ -285,8 +284,9 @@ 
 	public function dataBind()
 	{
 		parent::dataBind();
-		if($this->getPage()->getIsCallback())
-			$this->renderSuggestions($this->getResponse()->createHtmlWriter());
+		if($this->getPage()->getIsCallback()) {
+					$this->renderSuggestions($this->getResponse()->createHtmlWriter());
+		}
 	}
 
 	/**
@@ -294,8 +294,9 @@ 
 	 */
 	public function getResultPanel()
 	{
-		if($this->_resultPanel===null)
-			$this->_resultPanel = $this->createResultPanel();
+		if($this->_resultPanel===null) {
+					$this->_resultPanel = $this->createResultPanel();
+		}
 		return $this->_resultPanel;
 	}
 
@@ -315,8 +316,9 @@ 
 	 */
 	public function getSuggestions()
 	{
-		if($this->_repeater===null)
-			$this->_repeater = $this->createRepeater();
+		if($this->_repeater===null) {
+					$this->_repeater = $this->createRepeater();
+		}
 		return $this->_repeater;
 	}
 
@@ -387,16 +389,18 @@ 
 	{
 		$options = $this->getOptions()->toArray();
 
-		if(strlen($separator = $this->getSeparator()))
-			$options['Separators'] = $separator;
+		if(strlen($separator = $this->getSeparator())) {
+					$options['Separators'] = $separator;
+		}
 
 		if($this->getAutoPostBack())
 		{
 			$options = array_merge($options,parent::getPostBackOptions());
 			$options['AutoPostBack'] = true;
 		}
-		if(strlen($textCssClass = $this->getTextCssClass()))
-			$options['textCssClass'] = $textCssClass;
+		if(strlen($textCssClass = $this->getTextCssClass())) {
+					$options['textCssClass'] = $textCssClass;
+		}
 		$options['minLength'] = $this->getMinChars();
 		$options['delay'] = $this->getFrequency()*1000.0;
 		$options['appendTo'] = '#'.$this->getResultPanel()->getClientID();

framework/Web/UI/JuiControls/TJuiControlAdapter.php

Doc Comments +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
 
 	/**
 	 * Publish the jQuery-ui style Css asset file.
-	 * @param file name
+	 * @param file string
 	 * @return string Css file url.
 	 */
 	public function publishJuiStyle($file)
@@ -153,7 +153,7 @@ 
 	 * Gets a control instance named after a returned control id.
 	 * Example: if a $param->draggable control id is returned from clientside,
 	 * calling $param->DraggableControl will return the control instance
-	 * @return mixed control or null if not set.
+	 * @return null|TControl control or null if not set.
 	 */
 	public function __get($name)
 	{

Indentation +19 added lines, -19 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * TJuiControlAdapter class file.
- *
- * @author Fabio Bas <ctrlaltca@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2013-2015 PradoSoft
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.JuiControls
- */
+	 * TJuiControlAdapter class file.
+	 *
+	 * @author Fabio Bas <ctrlaltca@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2013-2015 PradoSoft
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.JuiControls
+	 */
 
 Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 Prado::using('System.Web.UI.JuiControls.TJuiControlOptions');
@@ -96,7 +96,7 @@ 
 	 */
 	public function loadState() {
 	  parent::loadState();
-    $this->getControl()->getOptions()->setControl($this->getControl());
+	$this->getControl()->getOptions()->setControl($this->getControl());
 	}
 
 }
@@ -130,10 +130,10 @@ 
 class TJuiEventParameter extends TCallbackEventParameter
 {
  	/**
-	 * getControl
-	 *
-	 * Compatibility method to get a control from its clientside id
-	 * @return TControl control, or null if not found
+ 	 * getControl
+ 	 *
+ 	 * Compatibility method to get a control from its clientside id
+ 	 * @return TControl control, or null if not found
  	 */
 	public function getControl($id)
 	{
@@ -184,9 +184,9 @@ 
    */
   protected function addStatesToTrack()
   {
-    parent::addStatesToTrack();
-    $states = $this->getStatesToTrack();
-    $states['JuiOptions'] = array('TMapCollectionDiff', array($this, 'updateJuiOptions'));
+	parent::addStatesToTrack();
+	$states = $this->getStatesToTrack();
+	$states['JuiOptions'] = array('TMapCollectionDiff', array($this, 'updateJuiOptions'));
   }
 
 	/**
@@ -195,9 +195,9 @@ 
 	 */
   protected function updateJuiOptions($options)
   {
-    foreach ($options as $key => $value) $options[$key] = $key . ': ' . (is_string($value) ? "'{$value}'" : TPropertyValue::ensureString($value));
-    $code = "jQuery('#{$this->_control->getWidgetID()}').{$this->_control->getWidget()}('option', { " . implode(', ', $options) . " });";
-    $this->_control->getPage()->getClientScript()->registerEndScript(sprintf('%08X', crc32($code)), $code);
+	foreach ($options as $key => $value) $options[$key] = $key . ': ' . (is_string($value) ? "'{$value}'" : TPropertyValue::ensureString($value));
+	$code = "jQuery('#{$this->_control->getWidgetID()}').{$this->_control->getWidget()}('option', { " . implode(', ', $options) . " });";
+	$this->_control->getPage()->getClientScript()->registerEndScript(sprintf('%08X', crc32($code)), $code);
   }
 
 }
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -27,7 +27,7 @@ 
 {
 	const SCRIPT_PATH = 'jquery';
 	const CSS_PATH = 'css';
-	const BASE_CSS_FILENAME ='jquery-ui.css';
+	const BASE_CSS_FILENAME = 'jquery-ui.css';
 
 	/**
 	 * Replace default StateTracker with {@link TJuiCallbackPageStateTracker} for
@@ -70,10 +70,10 @@ 
 	 * @param string jQuery asset file in the self::SCRIPT_PATH directory.
 	 * @return string jQuery asset url.
 	 */
-	protected function getAssetUrl($file='')
+	protected function getAssetUrl($file = '')
 	{
 		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
-		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
+		return $base . '/' . self::SCRIPT_PATH . '/' . $file;
 	}
 
 	/**
@@ -83,9 +83,9 @@ 
 	 */
 	public function publishJuiStyle($file)
 	{
-		$url = $this->getAssetUrl(self::CSS_PATH.'/'.$this->getJuiBaseStyle().'/'.$file);
+		$url = $this->getAssetUrl(self::CSS_PATH . '/' . $this->getJuiBaseStyle() . '/' . $file);
 		$cs = $this->getPage()->getClientScript();
-		if(!$cs->isStyleSheetFileRegistered($url))
+		if (!$cs->isStyleSheetFileRegistered($url))
 			$cs->registerStyleSheetFile($url, $url);
 		return $url;
 	}
@@ -137,14 +137,14 @@ 
  	 */
 	public function getControl($id)
 	{
-		$control=null;
-		$service=prado::getApplication()->getService();
+		$control = null;
+		$service = prado::getApplication()->getService();
 		if ($service instanceof TPageService)
 		{
 			// Find the control
 			// Warning, this will not work if you have a '_' in your control Id !
-			$controlId=str_replace(TControl::CLIENT_ID_SEPARATOR,TControl::ID_SEPARATOR,$id);
-			$control=$service->getRequestedPage()->findControl($controlId);
+			$controlId = str_replace(TControl::CLIENT_ID_SEPARATOR, TControl::ID_SEPARATOR, $id);
+			$control = $service->getRequestedPage()->findControl($controlId);
 		}
 		return $control;
 	}
@@ -157,11 +157,11 @@ 
 	 */
 	public function __get($name)
 	{
-		$pos=strpos($name, 'Control',1);
-		$name=strtolower(substr($name, 0, $pos));
+		$pos = strpos($name, 'Control', 1);
+		$name = strtolower(substr($name, 0, $pos));
 
-		$cp=$this->getCallbackParameter();
-		if(!isset($cp->$name) || $cp->$name=='')
+		$cp = $this->getCallbackParameter();
+		if (!isset($cp->$name) || $cp->$name == '')
 			return null;
 
 		return $this->getControl($cp->$name);

Braces +9 added lines, -5 removed lines

@@ -85,8 +85,9 @@ 
 	{
 		$url = $this->getAssetUrl(self::CSS_PATH.'/'.$this->getJuiBaseStyle().'/'.$file);
 		$cs = $this->getPage()->getClientScript();
-		if(!$cs->isStyleSheetFileRegistered($url))
-			$cs->registerStyleSheetFile($url, $url);
+		if(!$cs->isStyleSheetFileRegistered($url)) {
+					$cs->registerStyleSheetFile($url, $url);
+		}
 		return $url;
 	}
 
@@ -161,8 +162,9 @@ 
 		$name=strtolower(substr($name, 0, $pos));
 
 		$cp=$this->getCallbackParameter();
-		if(!isset($cp->$name) || $cp->$name=='')
-			return null;
+		if(!isset($cp->$name) || $cp->$name=='') {
+					return null;
+		}
 
 		return $this->getControl($cp->$name);
 	}
@@ -195,7 +197,9 @@ 
 	 */
   protected function updateJuiOptions($options)
   {
-    foreach ($options as $key => $value) $options[$key] = $key . ': ' . (is_string($value) ? "'{$value}'" : TPropertyValue::ensureString($value));
+    foreach ($options as $key => $value) {
+    	$options[$key] = $key . ': ' . (is_string($value) ? "'{$value}'" : TPropertyValue::ensureString($value));
+    }
     $code = "jQuery('#{$this->_control->getWidgetID()}').{$this->_control->getWidget()}('option', { " . implode(', ', $options) . " });";
     $this->_control->getPage()->getClientScript()->registerEndScript(sprintf('%08X', crc32($code)), $code);
   }

framework/Web/UI/JuiControls/TJuiControlOptions.php

Doc Comments +16 added lines, -1 removed lines

@@ -21,9 +21,24 @@ 
  */
 interface IJuiOptions
 {
+	/**
+	 * @return string
+	 */
 	public function getWidget();
+
+	/**
+	 * @return string
+	 */
 	public function getWidgetID();
+
+	/**
+	 * @return TJuiControlOptions
+	 */
 	public function getOptions();
+
+	/**
+	 * @return string[]
+	 */
 	public function getValidOptions();
 	public function getValidEvents();
 }
@@ -139,7 +154,7 @@ 
 
 	/**
 	 * Only serialize the options itself, not the corresponding parent control.
-	 * @return mixed array with the names of all variables of that object that should be serialized.
+	 * @return string[] array with the names of all variables of that object that should be serialized.
 	 */
 	public function __sleep() {
 	  return array('_options');

Spacing +27 added lines, -27 removed lines

@@ -71,9 +71,9 @@ 
 	 */
 	public function setControl($control)
 	{
-	  if(!$control instanceof IJuiOptions)
-	    throw new THttpException(500,'juioptions_control_invalid',$control->ID);
-	  $this->_control=$control;
+	  if (!$control instanceof IJuiOptions)
+	    throw new THttpException(500, 'juioptions_control_invalid', $control->ID);
+	  $this->_control = $control;
 	}
 
 	/**
@@ -83,27 +83,27 @@ 
 	 * @param mixed option value.
 	 * @throws THttpException
 	 */
-	public function __set($name,$value)
+	public function __set($name, $value)
 	{
-		if($this->_options===null)
-			$this->_options=array();
+		if ($this->_options === null)
+			$this->_options = array();
 
-		foreach($this->_control->getValidOptions() as $option)
+		foreach ($this->_control->getValidOptions() as $option)
 		{
-			if(0 == strcasecmp($name, $option))
+			if (0 == strcasecmp($name, $option))
 			{
 				$low = strtolower($value);
-				if($low === 'null')
+				if ($low === 'null')
 				{
 					$this->_options[$option] = null;
-				} elseif($low === 'true') {
+				} elseif ($low === 'true') {
 					$this->_options[$option] = true;
-				} elseif($low === 'false') {
+				} elseif ($low === 'false') {
 					$this->_options[$option] = false;
-				} elseif(is_numeric($value)) {
+				} elseif (is_numeric($value)) {
 					// trick to get float or integer automatically when needed
 					$this->_options[$option] = $value + 0;
-				} elseif(substr($low,0,8)=='function') {
+				} elseif (substr($low, 0, 8) == 'function') {
 					$this->_options[$option] = new TJavaScriptLiteral($value);
 				} else {
 					$this->_options[$option] = $value;
@@ -112,7 +112,7 @@ 
 			}
 		}
 
-		throw new TConfigurationException('juioptions_option_invalid',$this->_control->ID, $name);
+		throw new TConfigurationException('juioptions_option_invalid', $this->_control->ID, $name);
 	}
 
 	/**
@@ -123,12 +123,12 @@ 
 	 */
 	public function __get($name)
 	{
-		if($this->_options===null)
-			$this->_options=array();
+		if ($this->_options === null)
+			$this->_options = array();
 
-		foreach($this->_control->getValidOptions() as $option)
+		foreach ($this->_control->getValidOptions() as $option)
 		{
-			if(0 == strcasecmp($name, $option) && isset($this->_options[$option]))
+			if (0 == strcasecmp($name, $option) && isset($this->_options[$option]))
 			{
 				return $this->_options[$option];
 			}
@@ -150,11 +150,11 @@ 
 	 */
 	public function toArray()
 	{
-		$ret= ($this->_options===null) ? array() : $this->_options;
+		$ret = ($this->_options === null) ? array() : $this->_options;
 
-		foreach($this->_control->getValidEvents() as $event)
-			if($this->_control->hasEventHandler('on'.$event))
-				$ret[$event]=new TJavaScriptLiteral("function( event, ui ) { Prado.JuiCallback(".TJavascript::encode($this->_control->getUniqueID()).", ".TJavascript::encode($event).", event, ui, this); }");
+		foreach ($this->_control->getValidEvents() as $event)
+			if ($this->_control->hasEventHandler('on' . $event))
+				$ret[$event] = new TJavaScriptLiteral("function( event, ui ) { Prado.JuiCallback(" . TJavascript::encode($this->_control->getUniqueID()) . ", " . TJavascript::encode($event) . ", event, ui, this); }");
 
 		return $ret;
 	}
@@ -165,13 +165,13 @@ 
 	 */
 	public function raiseCallbackEvent($param)
 	{
-		$callbackParam=$param->CallbackParameter;
-		if(isset($callbackParam->event))
+		$callbackParam = $param->CallbackParameter;
+		if (isset($callbackParam->event))
 		{
-			$eventName = 'On'.ucfirst($callbackParam->event);
-			if($this->_control->hasEventHandler($eventName))
+			$eventName = 'On' . ucfirst($callbackParam->event);
+			if ($this->_control->hasEventHandler($eventName))
 			{
-				$this->_control->$eventName( new TJuiEventParameter(
+				$this->_control->$eventName(new TJuiEventParameter(
 					$this->_control->getResponse(),
 					isset($callbackParam->ui) ? $callbackParam->ui : null)
 				);

Braces +12 added lines, -8 removed lines

@@ -71,8 +71,9 @@ 
 	 */
 	public function setControl($control)
 	{
-	  if(!$control instanceof IJuiOptions)
-	    throw new THttpException(500,'juioptions_control_invalid',$control->ID);
+	  if(!$control instanceof IJuiOptions) {
+	  	    throw new THttpException(500,'juioptions_control_invalid',$control->ID);
+	  }
 	  $this->_control=$control;
 	}
 
@@ -85,8 +86,9 @@ 
 	 */
 	public function __set($name,$value)
 	{
-		if($this->_options===null)
-			$this->_options=array();
+		if($this->_options===null) {
+					$this->_options=array();
+		}
 
 		foreach($this->_control->getValidOptions() as $option)
 		{
@@ -123,8 +125,9 @@ 
 	 */
 	public function __get($name)
 	{
-		if($this->_options===null)
-			$this->_options=array();
+		if($this->_options===null) {
+					$this->_options=array();
+		}
 
 		foreach($this->_control->getValidOptions() as $option)
 		{
@@ -152,9 +155,10 @@ 
 	{
 		$ret= ($this->_options===null) ? array() : $this->_options;
 
-		foreach($this->_control->getValidEvents() as $event)
-			if($this->_control->hasEventHandler('on'.$event))
+		foreach($this->_control->getValidEvents() as $event) {
+					if($this->_control->hasEventHandler('on'.$event))
 				$ret[$event]=new TJavaScriptLiteral("function( event, ui ) { Prado.JuiCallback(".TJavascript::encode($this->_control->getUniqueID()).", ".TJavascript::encode($event).", event, ui, this); }");
+		}
 
 		return $ret;
 	}

Indentation +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
 	 */
 	public function __construct($control)
 	{
-    $this->setControl($control);
+	$this->setControl($control);
 	}
 
 	/**
@@ -72,7 +72,7 @@ 
 	public function setControl($control)
 	{
 	  if(!$control instanceof IJuiOptions)
-	    throw new THttpException(500,'juioptions_control_invalid',$control->ID);
+		throw new THttpException(500,'juioptions_control_invalid',$control->ID);
 	  $this->_control=$control;
 	}
 

framework/Web/UI/JuiControls/TJuiDialog.php

Doc Comments +3 added lines

@@ -158,6 +158,9 @@
 		$this->triggerClientMethod('close');
 	}
 
+	/**
+	 * @param string $method
+	 */
 	private function triggerClientMethod($method)
 	{
 		$cs = $this->getPage()->getClientScript();

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TJuiDialog class file.
- *
- * @author  David Otto <ottodavid[at]gmx[dot]net>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2013-2015 PradoSoft
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.JuiControls
- */
+	 * TJuiDialog class file.
+	 *
+	 * @author  David Otto <ottodavid[at]gmx[dot]net>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2013-2015 PradoSoft
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.JuiControls
+	 */
 
 Prado::using('System.Web.UI.JuiControls.TJuiControlAdapter');
 Prado::using('System.Web.UI.ActiveControls.TActivePanel');

Spacing +17 added lines, -17 removed lines

@@ -68,9 +68,9 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if (($options = $this->getViewState('JuiOptions')) === null)
 		{
-		  $options=new TJuiControlOptions($this);
+		  $options = new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
 		}
 		return $options;
@@ -101,8 +101,8 @@ 
 	{
 		$options = $this->getOptions()->toArray();
 
-		foreach($this->getControls() as $control)
-			if($control instanceof TJuiDialogButton)
+		foreach ($this->getControls() as $control)
+			if ($control instanceof TJuiDialogButton)
 				$options['buttons'][] = $control->getPostBackOptions();
 
 		return $options;
@@ -116,10 +116,10 @@ 
 	{
 		parent::addAttributesToRender($writer);
 
-		$writer->addAttribute('id',$this->getClientID());
-		$options=TJavascript::encode($this->getPostBackOptions());
-		$cs=$this->getPage()->getClientScript();
-		$code="jQuery('#".$this->getWidgetID()."').".$this->getWidget()."(".$options.");";
+		$writer->addAttribute('id', $this->getClientID());
+		$options = TJavascript::encode($this->getPostBackOptions());
+		$cs = $this->getPage()->getClientScript();
+		$code = "jQuery('#" . $this->getWidgetID() . "')." . $this->getWidget() . "(" . $options . ");";
 		$cs->registerEndScript(sprintf('%08X', crc32($code)), $code);
 	}
 
@@ -137,7 +137,7 @@ 
 	 * Raises the OnCreate event
 	 * @param object $params event parameters
 	 */
-	public function onOpen ($params)
+	public function onOpen($params)
 	{
 		$this->raiseEvent('OnOpen', $this, $params);
 	}
@@ -161,7 +161,7 @@ 
 	private function triggerClientMethod($method)
 	{
 		$cs = $this->getPage()->getClientScript();
-		$code = "jQuery(document).ready(function() { jQuery('#".$this->getClientId()."').dialog('".$method."'); })";
+		$code = "jQuery(document).ready(function() { jQuery('#" . $this->getClientId() . "').dialog('" . $method . "'); })";
 		$cs->registerEndScript(sprintf('%08X', crc32($code)), $code);
 	}
 
@@ -182,7 +182,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getHasPreRendered() && $this->getActiveControl()->canUpdateClientSide())
+		if ($this->getHasPreRendered() && $this->getActiveControl()->canUpdateClientSide())
 		{
 		  parent::renderContents($writer);
 			$this->getPage()->getCallbackClient()->replaceContent($this, $writer, false);
@@ -240,8 +240,8 @@ 
 	{
 		return array(
 			'text' => $this->getText(),
-			'click' => new TJavaScriptLiteral("function(){new Prado.Callback('".$this->getUniqueID()."', 'onClick');}"
-			)) ;
+			'click' => new TJavaScriptLiteral("function(){new Prado.Callback('" . $this->getUniqueID() . "', 'onClick');}"
+			));
 	}
 
 	/**
@@ -249,7 +249,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -257,14 +257,14 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
 	 * Raises the OnClick event
 	 * @param object $params event parameters
 	 */
-	public function onClick ($params)
+	public function onClick($params)
 	{
 		$this->raiseEvent('OnClick', $this, $params);
 	}
@@ -276,7 +276,7 @@ 
 	 */
 	public function raiseCallbackEvent($param)
 	{
-		if($param->CallbackParameter === 'onClick')
+		if ($param->CallbackParameter === 'onClick')
 			$this->onClick($param);
 	}
 

Braces +8 added lines, -6 removed lines

@@ -101,9 +101,10 @@ 
 	{
 		$options = $this->getOptions()->toArray();
 
-		foreach($this->getControls() as $control)
-			if($control instanceof TJuiDialogButton)
+		foreach($this->getControls() as $control) {
+					if($control instanceof TJuiDialogButton)
 				$options['buttons'][] = $control->getPostBackOptions();
+		}
 
 		return $options;
 	}
@@ -186,9 +187,9 @@ 
 		{
 		  parent::renderContents($writer);
 			$this->getPage()->getCallbackClient()->replaceContent($this, $writer, false);
+		} else {
+					parent::render($writer);
 		}
-		else
-			parent::render($writer);
 	}
 }
 
@@ -276,8 +277,9 @@ 
 	 */
 	public function raiseCallbackEvent($param)
 	{
-		if($param->CallbackParameter === 'onClick')
-			$this->onClick($param);
+		if($param->CallbackParameter === 'onClick') {
+					$this->onClick($param);
+		}
 	}
 
 }
\ No newline at end of file

framework/Web/UI/JuiControls/TJuiSortable.php

Doc Comments +3 added lines

@@ -317,6 +317,9 @@
 {
 	private $_template;
 
+	/**
+	 * @param string $template
+	 */
 	public function __construct($template)
 	{
 		$this->_template = $template;

Spacing +27 added lines, -27 removed lines

@@ -71,9 +71,9 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if (($options = $this->getViewState('JuiOptions')) === null)
 		{
-		  $options=new TJuiControlOptions($this);
+		  $options = new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
 		}
 		return $options;
@@ -104,10 +104,10 @@ 
 	{
 		$options = $this->getOptions()->toArray();
 		// overload some events to add information about the items order
-		foreach($options as $event => $implementation)
+		foreach ($options as $event => $implementation)
 		{
-			if($event=='sort' || $event=='stop')
-				$options[$event]=new TJavaScriptLiteral('function( event, ui ) { ui.index = jQuery(this).sortable(\'toArray\'); Prado.JuiCallback('.TJavascript::encode($this->getUniqueID()).', \''.$event.'\', event, ui, this); }');
+			if ($event == 'sort' || $event == 'stop')
+				$options[$event] = new TJavaScriptLiteral('function( event, ui ) { ui.index = jQuery(this).sortable(\'toArray\'); Prado.JuiCallback(' . TJavascript::encode($this->getUniqueID()) . ', \'' . $event . '\', event, ui, this); }');
 		}
 		return $options;
 	}
@@ -119,10 +119,10 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
-		$options=TJavascript::encode($this->getPostBackOptions());
-		$cs=$this->getPage()->getClientScript();
-		$code="jQuery('#".$this->getWidgetID()."').".$this->getWidget()."(".$options.");";
+		$writer->addAttribute('id', $this->getClientID());
+		$options = TJavascript::encode($this->getPostBackOptions());
+		$cs = $this->getPage()->getClientScript();
+		$code = "jQuery('#" . $this->getWidgetID() . "')." . $this->getWidget() . "(" . $options . ");";
 		$cs->registerEndScript(sprintf('%08X', crc32($code)), $code);
 	}
 
@@ -140,7 +140,7 @@ 
 	 * Raises the OnActivate event
 	 * @param object $params event parameters
 	 */
-	public function onActivate ($params)
+	public function onActivate($params)
 	{
 		$this->raiseEvent('OnActivate', $this, $params);
 	}
@@ -149,7 +149,7 @@ 
 	 * Raises the OnBeforeStop event
 	 * @param object $params event parameters
 	 */
-	public function onBeforeStop ($params)
+	public function onBeforeStop($params)
 	{
 		$this->raiseEvent('OnBeforeStop', $this, $params);
 	}
@@ -158,7 +158,7 @@ 
 	 * Raises the OnChange event
 	 * @param object $params event parameters
 	 */
-	public function onChange ($params)
+	public function onChange($params)
 	{
 		$this->raiseEvent('OnChange', $this, $params);
 	}
@@ -167,7 +167,7 @@ 
 	 * Raises the OnCreate event
 	 * @param object $params event parameters
 	 */
-	public function onCreate ($params)
+	public function onCreate($params)
 	{
 		$this->raiseEvent('OnCreate', $this, $params);
 	}
@@ -176,7 +176,7 @@ 
 	 * Raises the OnDeactivate event
 	 * @param object $params event parameters
 	 */
-	public function onDeactivate ($params)
+	public function onDeactivate($params)
 	{
 		$this->raiseEvent('OnDeactivate', $this, $params);
 	}
@@ -185,7 +185,7 @@ 
 	 * Raises the OnOut event
 	 * @param object $params event parameters
 	 */
-	public function onOut ($params)
+	public function onOut($params)
 	{
 		$this->raiseEvent('OnOut', $this, $params);
 	}
@@ -194,7 +194,7 @@ 
 	 * Raises the OnOver event
 	 * @param object $params event parameters
 	 */
-	public function onOver ($params)
+	public function onOver($params)
 	{
 		$this->raiseEvent('OnOver', $this, $params);
 	}
@@ -203,7 +203,7 @@ 
 	 * Raises the OnReceive event
 	 * @param object $params event parameters
 	 */
-	public function onReceive ($params)
+	public function onReceive($params)
 	{
 		$this->raiseEvent('OnReceive', $this, $params);
 	}
@@ -212,7 +212,7 @@ 
 	 * Raises the OnRemove event
 	 * @param object $params event parameters
 	 */
-	public function onRemove ($params)
+	public function onRemove($params)
 	{
 		$this->raiseEvent('OnRemove', $this, $params);
 	}
@@ -221,7 +221,7 @@ 
 	 * Raises the OnSort event
 	 * @param object $params event parameters
 	 */
-	public function onSort ($params)
+	public function onSort($params)
 	{
 		$this->raiseEvent('OnSort', $this, $params);
 	}
@@ -230,7 +230,7 @@ 
 	 * Raises the OnStart event
 	 * @param object $params event parameters
 	 */
-	public function onStart ($params)
+	public function onStart($params)
 	{
 		$this->raiseEvent('OnStart', $this, $params);
 	}
@@ -239,7 +239,7 @@ 
 	 * Raises the OnStop event
 	 * @param object $params event parameters
 	 */
-	public function OnStop ($params)
+	public function OnStop($params)
 	{
 		$this->raiseEvent('OnStop', $this, $params);
 	}
@@ -248,7 +248,7 @@ 
 	 * Raises the OnUpdate event
 	 * @param object $params event parameters
 	 */
-	public function onUpdate ($params)
+	public function onUpdate($params)
 	{
 		$this->raiseEvent('OnUpdate', $this, $params);
 	}
@@ -256,7 +256,7 @@ 
 	/**
 	 * @var ITemplate template for repeater items
 	 */
-	private $_repeater=null;
+	private $_repeater = null;
 
 	/**
 	 * @param array data source for Sortables.
@@ -273,7 +273,7 @@ 
 	public function dataBind()
 	{
 		parent::dataBind();
-		if($this->getPage()->getIsCallback())
+		if ($this->getPage()->getIsCallback())
 			$this->renderSortables($this->getResponse()->createHtmlWriter());
 	}
 
@@ -282,7 +282,7 @@ 
 	 */
 	public function getSortables()
 	{
-		if($this->_repeater===null)
+		if ($this->_repeater === null)
 			$this->_repeater = $this->createRepeater();
 		return $this->_repeater;
 	}
@@ -293,9 +293,9 @@ 
 	protected function createRepeater()
 	{
 		$repeater = Prado::createComponent('System.Web.UI.WebControls.TRepeater');
-		$repeater->setHeaderTemplate(new TJuiSortableTemplate('<ul id="'.$this->getWidgetID().'">'));
+		$repeater->setHeaderTemplate(new TJuiSortableTemplate('<ul id="' . $this->getWidgetID() . '">'));
 		$repeater->setFooterTemplate(new TJuiSortableTemplate('</ul>'));
-		$repeater->setItemTemplate(new TTemplate('<li id="<%# $this->ItemIndex %>"><%# $this->Data %></li>',null));
+		$repeater->setItemTemplate(new TTemplate('<li id="<%# $this->ItemIndex %>"><%# $this->Data %></li>', null));
 		$repeater->setEmptyTemplate(new TJuiSortableTemplate('<ul></ul>'));
 		$this->getControls()->add($repeater);
 		return $repeater;

Braces +9 added lines, -6 removed lines

@@ -106,8 +106,9 @@ 
 		// overload some events to add information about the items order
 		foreach($options as $event => $implementation)
 		{
-			if($event=='sort' || $event=='stop')
-				$options[$event]=new TJavaScriptLiteral('function( event, ui ) { ui.index = jQuery(this).sortable(\'toArray\'); Prado.JuiCallback('.TJavascript::encode($this->getUniqueID()).', \''.$event.'\', event, ui, this); }');
+			if($event=='sort' || $event=='stop') {
+							$options[$event]=new TJavaScriptLiteral('function( event, ui ) { ui.index = jQuery(this).sortable(\'toArray\'); Prado.JuiCallback('.TJavascript::encode($this->getUniqueID()).', \''.$event.'\', event, ui, this); }');
+			}
 		}
 		return $options;
 	}
@@ -273,8 +274,9 @@ 
 	public function dataBind()
 	{
 		parent::dataBind();
-		if($this->getPage()->getIsCallback())
-			$this->renderSortables($this->getResponse()->createHtmlWriter());
+		if($this->getPage()->getIsCallback()) {
+					$this->renderSortables($this->getResponse()->createHtmlWriter());
+		}
 	}
 
 	/**
@@ -282,8 +284,9 @@ 
 	 */
 	public function getSortables()
 	{
-		if($this->_repeater===null)
-			$this->_repeater = $this->createRepeater();
+		if($this->_repeater===null) {
+					$this->_repeater = $this->createRepeater();
+		}
 		return $this->_repeater;
 	}
 

framework/Web/UI/TClientScriptManager.php

Doc Comments +6 added lines

@@ -215,6 +215,7 @@ 
 
 	/**
 	 * @param string javascript package path.
+	 * @param string $base
 	 * @return array tuple($path,$url).
 	 */
 	protected function getPackagePathUrl($base)
@@ -496,6 +497,8 @@ 
 	 * @param string a unique key identifying the hidden field
 	 * @param string|array hidden field value, if the value is an array, every element
 	 * in the array will be rendered as a hidden field value.
+	 * @param string $name
+	 * @param string $value
 	 */
 	public function registerHiddenField($name,$value)
 	{
@@ -735,6 +738,7 @@ 
 
 	/**
 	 * @param THtmlWriter writer for the rendering purpose
+	 * @param boolean $initial
 	 */
 	protected function renderHiddenFieldsInt($writer, $initial)
  	{
@@ -799,6 +803,7 @@ 
 	 * javascript statements.
 	 * @param string option name
 	 * @param string javascript statements.
+	 * @param string $name
 	 */
 	protected function setFunction($name, $code)
 	{
@@ -808,6 +813,7 @@ 
 	}
 
 	/**
+	 * @param string $name
 	 * @return string gets a particular option, null if not set.
 	 */
 	protected function getOption($name)

Spacing +132 added lines, -132 removed lines

@@ -25,11 +25,11 @@ 
 	/**
 	 * directory containing Prado javascript files
 	 */
-	const SCRIPT_PATH='Web/Javascripts/source';
+	const SCRIPT_PATH = 'Web/Javascripts/source';
 	/**
 	 * file containing javascript packages and their cross dependencies
 	 */
-	const PACKAGES_FILE='Web/Javascripts/packages.php';
+	const PACKAGES_FILE = 'Web/Javascripts/packages.php';
 	/**
 	 * @var TPage page who owns this manager
 	 */
@@ -37,39 +37,39 @@ 
 	/**
 	 * @var array registered hidden fields, indexed by hidden field names
 	 */
-	private $_hiddenFields=array();
+	private $_hiddenFields = array();
 	/**
 	 * @var array javascript blocks to be rendered at the beginning of the form
 	 */
-	private $_beginScripts=array();
+	private $_beginScripts = array();
 	/**
 	 * @var array javascript blocks to be rendered at the end of the form
 	 */
-	private $_endScripts=array();
+	private $_endScripts = array();
 	/**
 	 * @var array javascript files to be rendered in the form
 	 */
-	private $_scriptFiles=array();
+	private $_scriptFiles = array();
 	/**
 	 * @var array javascript files to be rendered in page head section
 	 */
-	private $_headScriptFiles=array();
+	private $_headScriptFiles = array();
 	/**
 	 * @var array javascript blocks to be rendered in page head section
 	 */
-	private $_headScripts=array();
+	private $_headScripts = array();
 	/**
 	 * @var array CSS files
 	 */
-	private $_styleSheetFiles=array();
+	private $_styleSheetFiles = array();
 	/**
 	 * @var array CSS declarations
 	 */
-	private $_styleSheets=array();
+	private $_styleSheets = array();
 	/**
 	 * @var array registered PRADO script libraries
 	 */
-	private $_registeredPradoScripts=array();
+	private $_registeredPradoScripts = array();
 	/**
 	 * Client-side javascript library dependencies, loads from PACKAGES_FILE;
 	 * @var array
@@ -83,7 +83,7 @@ 
 
 	private $_renderedHiddenFields;
 
-	private $_renderedScriptFiles=array();
+	private $_renderedScriptFiles = array();
 
 	private $_expandedPradoScripts;
 
@@ -93,7 +93,7 @@ 
 	 */
 	public function __construct(TPage $owner)
 	{
-		$this->_page=$owner;
+		$this->_page = $owner;
 	}
 
 	/**
@@ -124,8 +124,8 @@ 
 	public function registerPradoScript($name)
 	{
 		$this->registerPradoScriptInternal($name);
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPradoScript',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPradoScript', $params);
 	}
 
 	/**
@@ -134,27 +134,27 @@ 
 	protected function registerPradoScriptInternal($name)
 	{
 		// $this->checkIfNotInRender();
-		if(!isset($this->_registeredPradoScripts[$name]))
+		if (!isset($this->_registeredPradoScripts[$name]))
 		{
-			if(self::$_pradoScripts === null)
+			if (self::$_pradoScripts === null)
 			{
-				$packageFile = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::PACKAGES_FILE;
-				list($packages,$deps)= include($packageFile);
+				$packageFile = Prado::getFrameworkPath() . DIRECTORY_SEPARATOR . self::PACKAGES_FILE;
+				list($packages, $deps) = include($packageFile);
 				self::$_pradoScripts = $deps;
 				self::$_pradoPackages = $packages;
 			}
 
 			if (isset(self::$_pradoScripts[$name]))
-				$this->_registeredPradoScripts[$name]=true;
+				$this->_registeredPradoScripts[$name] = true;
 			else
-				throw new TInvalidOperationException('csmanager_pradoscript_invalid',$name);
+				throw new TInvalidOperationException('csmanager_pradoscript_invalid', $name);
 
-			if(($packages=array_keys($this->_registeredPradoScripts))!==array())
+			if (($packages = array_keys($this->_registeredPradoScripts)) !== array())
 			{
-				$base = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
-				list($path,$baseUrl)=$this->getPackagePathUrl($base);
-				$packagesUrl=array();
-				$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
+				$base = Prado::getFrameworkPath() . DIRECTORY_SEPARATOR . self::SCRIPT_PATH;
+				list($path, $baseUrl) = $this->getPackagePathUrl($base);
+				$packagesUrl = array();
+				$isDebug = $this->getApplication()->getMode() === TApplicationMode::Debug;
 				foreach ($packages as $p)
 				{
 					foreach (self::$_pradoScripts[$p] as $dep)
@@ -163,29 +163,29 @@ 
 						if (!isset($this->_expandedPradoScripts[$script]))
 						{
 							$this->_expandedPradoScripts[$script] = true;
-							if($isDebug)
+							if ($isDebug)
 							{
-								if (!in_array($url=$baseUrl.'/'.$script,$packagesUrl))
-									$packagesUrl[]=$url;
+								if (!in_array($url = $baseUrl . '/' . $script, $packagesUrl))
+									$packagesUrl[] = $url;
 							} else {
-								if (!in_array($url=$baseUrl.'/min/'.$script,$packagesUrl))
+								if (!in_array($url = $baseUrl . '/min/' . $script, $packagesUrl))
 								{
-									if(!is_file($filePath=$path.'/min/'.$script))
+									if (!is_file($filePath = $path . '/min/' . $script))
 									{
-										$dirPath=dirname($filePath);
-										if(!is_dir($dirPath))
+										$dirPath = dirname($filePath);
+										if (!is_dir($dirPath))
 											mkdir($dirPath, PRADO_CHMOD, true);
-										file_put_contents($filePath, TJavaScript::JSMin(file_get_contents($base.'/'.$script)));
+										file_put_contents($filePath, TJavaScript::JSMin(file_get_contents($base . '/' . $script)));
 										chmod($filePath, PRADO_CHMOD);
 									}
-									$packagesUrl[]=$url;
+									$packagesUrl[] = $url;
 								}
 							}
 						}
 					}
 				}
-				foreach($packagesUrl as $url)
-					$this->registerScriptFile($url,$url);
+				foreach ($packagesUrl as $url)
+					$this->registerScriptFile($url, $url);
 			}
 		}
 	}
@@ -195,7 +195,7 @@ 
 	 */
 	public function getPradoScriptAssetUrl()
 	{
-		$base = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
+		$base = Prado::getFrameworkPath() . DIRECTORY_SEPARATOR . self::SCRIPT_PATH;
 		$assets = Prado::getApplication()->getAssetManager();
 		return $assets->getPublishedUrl($base);
 	}
@@ -220,16 +220,16 @@ 
 	protected function getPackagePathUrl($base)
 	{
 		$assets = Prado::getApplication()->getAssetManager();
-		if(strpos($base, $assets->getBaseUrl())===false)
+		if (strpos($base, $assets->getBaseUrl()) === false)
 		{
-			if(($dir = Prado::getPathOfNameSpace($base)) !== null) {
+			if (($dir = Prado::getPathOfNameSpace($base)) !== null) {
 				$base = $dir;
 			}
 			return array($assets->getPublishedPath($base), $assets->publishFilePath($base));
 		}
 		else
 		{
-			return array($assets->getBasePath().str_replace($assets->getBaseUrl(),'',$base), $base);
+			return array($assets->getBasePath() . str_replace($assets->getBaseUrl(), '', $base), $base);
 		}
 	}
 
@@ -239,7 +239,7 @@ 
 	 * @param array additional callback options
 	 * @return string javascript statement that creates a new callback request.
 	 */
-	public function getCallbackReference(ICallbackEventHandler $callbackHandler, $options=null)
+	public function getCallbackReference(ICallbackEventHandler $callbackHandler, $options = null)
 	{
 		$options = !is_array($options) ? array() : $options;
 		$class = new ReflectionClass($callbackHandler);
@@ -258,13 +258,13 @@ 
 	 */
 	public function registerCallbackControl($class, $options)
 	{
-		$optionString=TJavaScript::encode($options);
-		$code="new {$class}({$optionString});";
-		$this->_endScripts[sprintf('%08X', crc32($code))]=$code;
+		$optionString = TJavaScript::encode($options);
+		$code = "new {$class}({$optionString});";
+		$this->_endScripts[sprintf('%08X', crc32($code))] = $code;
 		$this->registerPradoScriptInternal('ajax');
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerCallbackControl',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerCallbackControl', $params);
 	}
 
 	/**
@@ -273,21 +273,21 @@ 
 	 * @param string javascript class responsible for the control being registered for postback
 	 * @param array postback options
 	 */
-	public function registerPostBackControl($class,$options)
+	public function registerPostBackControl($class, $options)
 	{
-		if($class === null) {
+		if ($class === null) {
 			return;
 		}
-		if(!isset($options['FormID']) && ($form=$this->_page->getForm())!==null)
-			$options['FormID']=$form->getClientID();
-		$optionString=TJavaScript::encode($options);
-		$code="new {$class}({$optionString});";
+		if (!isset($options['FormID']) && ($form = $this->_page->getForm()) !== null)
+			$options['FormID'] = $form->getClientID();
+		$optionString = TJavaScript::encode($options);
+		$code = "new {$class}({$optionString});";
 
-		$this->_endScripts[sprintf('%08X', crc32($code))]=$code;
+		$this->_endScripts[sprintf('%08X', crc32($code))] = $code;
 		$this->registerPradoScriptInternal('prado');
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPostBackControl',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPostBackControl', $params);
 	}
 
 	/**
@@ -298,23 +298,23 @@ 
 	 */
 	public function registerDefaultButton($panel, $button)
 	{
-		$panelID=is_string($panel)?$panel:$panel->getUniqueID();
+		$panelID = is_string($panel) ? $panel : $panel->getUniqueID();
 
-		if(is_string($button))
-			$buttonID=$button;
+		if (is_string($button))
+			$buttonID = $button;
 		else
 		{
 			$button->setIsDefaultButton(true);
-			$buttonID=$button->getUniqueID();
+			$buttonID = $button->getUniqueID();
 		}
 		$options = TJavaScript::encode($this->getDefaultButtonOptions($panelID, $buttonID));
 		$code = "new Prado.WebUI.DefaultButton($options);";
 
-		$this->_endScripts['prado:'.$panelID]=$code;
+		$this->_endScripts['prado:' . $panelID] = $code;
 		$this->registerPradoScriptInternal('prado');
 
-		$params=array($panelID,$buttonID);
-		$this->_page->registerCachingAction('Page.ClientScript','registerDefaultButton',$params);
+		$params = array($panelID, $buttonID);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerDefaultButton', $params);
 	}
 
 	/**
@@ -339,12 +339,12 @@ 
 	public function registerFocusControl($target)
 	{
 		$this->registerPradoScriptInternal('jquery');
-		if($target instanceof TControl)
-			$target=$target->getClientID();
-		$this->_endScripts['prado:focus'] = 'jQuery(\'#'.$target.'\').focus();';
+		if ($target instanceof TControl)
+			$target = $target->getClientID();
+		$this->_endScripts['prado:focus'] = 'jQuery(\'#' . $target . '\').focus();';
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerFocusControl',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerFocusControl', $params);
 	}
 
 	/**
@@ -369,15 +369,15 @@ 
 	 * @param string URL to the CSS file
 	 * @param string media type of the CSS (such as 'print', 'screen', etc.). Defaults to empty, meaning the CSS applies to all media types.
 	 */
-	public function registerStyleSheetFile($key,$url,$media='')
+	public function registerStyleSheetFile($key, $url, $media = '')
 	{
-		if($media==='')
-			$this->_styleSheetFiles[$key]=$url;
+		if ($media === '')
+			$this->_styleSheetFiles[$key] = $url;
 		else
-			$this->_styleSheetFiles[$key]=array($url,$media);
+			$this->_styleSheetFiles[$key] = array($url, $media);
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerStyleSheetFile',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheetFile', $params);
 	}
 
 	/**
@@ -385,12 +385,12 @@ 
 	 * @param string a unique key identifying the CSS block
 	 * @param string CSS block
 	 */
-	public function registerStyleSheet($key,$css,$media='')
+	public function registerStyleSheet($key, $css, $media = '')
 	{
-		$this->_styleSheets[$key]=$css;
+		$this->_styleSheets[$key] = $css;
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerStyleSheet',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheet', $params);
 	}
 
 	/**
@@ -405,8 +405,8 @@ 
 				$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);
@@ -428,13 +428,13 @@ 
 	 * @param string a unique key identifying the file
 	 * @param string URL to the javascript file
 	 */
-	public function registerHeadScriptFile($key,$url)
+	public function registerHeadScriptFile($key, $url)
 	{
 		$this->checkIfNotInRender();
-		$this->_headScriptFiles[$key]=$url;
+		$this->_headScriptFiles[$key] = $url;
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHeadScriptFile',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHeadScriptFile', $params);
 	}
 
 	/**
@@ -442,13 +442,13 @@ 
 	 * @param string a unique key identifying the script block
 	 * @param string javascript block
 	 */
-	public function registerHeadScript($key,$script)
+	public function registerHeadScript($key, $script)
 	{
 		$this->checkIfNotInRender();
-		$this->_headScripts[$key]=$script;
+		$this->_headScripts[$key] = $script;
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHeadScript',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHeadScript', $params);
 	}
 
 	/**
@@ -458,10 +458,10 @@ 
 	 */
 	public function registerScriptFile($key, $url)
 	{
-		$this->_scriptFiles[$key]=$url;
+		$this->_scriptFiles[$key] = $url;
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerScriptFile',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerScriptFile', $params);
 	}
 
 	/**
@@ -469,13 +469,13 @@ 
 	 * @param string a unique key identifying the script block
 	 * @param string javascript block
 	 */
-	public function registerBeginScript($key,$script)
+	public function registerBeginScript($key, $script)
 	{
 		$this->checkIfNotInRender();
-		$this->_beginScripts[$key]=$script;
+		$this->_beginScripts[$key] = $script;
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerBeginScript',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerBeginScript', $params);
 	}
 
 	/**
@@ -483,12 +483,12 @@ 
 	 * @param string a unique key identifying the script block
 	 * @param string javascript block
 	 */
-	public function registerEndScript($key,$script)
+	public function registerEndScript($key, $script)
 	{
-		$this->_endScripts[$key]=$script;
+		$this->_endScripts[$key] = $script;
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerEndScript',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerEndScript', $params);
 	}
 
 	/**
@@ -497,12 +497,12 @@ 
 	 * @param string|array hidden field value, if the value is an array, every element
 	 * in the array will be rendered as a hidden field value.
 	 */
-	public function registerHiddenField($name,$value)
+	public function registerHiddenField($name, $value)
 	{
-		$this->_hiddenFields[$name]=$value;
+		$this->_hiddenFields[$name] = $value;
 
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHiddenField',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHiddenField', $params);
 	}
 
 	/**
@@ -598,13 +598,13 @@ 
 	 */
 	public function renderStyleSheetFiles($writer)
 	{
-		$str='';
-		foreach($this->_styleSheetFiles as $url)
+		$str = '';
+		foreach ($this->_styleSheetFiles as $url)
 		{
-			if(is_array($url))
-				$str.="<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"".THttpUtility::htmlEncode($url[0])."\" />\n";
+			if (is_array($url))
+				$str .= "<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"" . THttpUtility::htmlEncode($url[0]) . "\" />\n";
 			else
-				$str.="<link rel=\"stylesheet\" type=\"text/css\" href=\"".THttpUtility::htmlEncode($url)."\" />\n";
+				$str .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" . THttpUtility::htmlEncode($url) . "\" />\n";
 		}
 		$writer->write($str);
 	}
@@ -614,8 +614,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");
 	}
 
 	/**
@@ -623,7 +623,7 @@ 
 	 */
 	public function renderHeadScriptFiles($writer)
 	{
-		$this->renderScriptFiles($writer,$this->_headScriptFiles);
+		$this->renderScriptFiles($writer, $this->_headScriptFiles);
 	}
 
 	/**
@@ -647,13 +647,13 @@ 
 	public function markScriptFileAsRendered($url)
 	{
 		$this->_renderedScriptFiles[$url] = $url;
-		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','markScriptFileAsRendered',$params);
+		$params = func_get_args();
+		$this->_page->registerCachingAction('Page.ClientScript', 'markScriptFileAsRendered', $params);
 	}
 
 	protected function renderScriptFiles($writer, Array $scripts)
 	{
-		foreach($scripts as $script)
+		foreach ($scripts as $script)
 		{
 			$writer->write(TJavaScript::renderScriptFile($script));
 			$this->markScriptFileAsRendered($script);
@@ -670,10 +670,10 @@ 
 	 */
 	public function renderAllPendingScriptFiles($writer)
 	{
-		if(!empty($this->_scriptFiles))
+		if (!empty($this->_scriptFiles))
 		{
-			$addedScripts = array_diff($this->_scriptFiles,$this->getRenderedScriptFiles());
-			$this->renderScriptFiles($writer,$addedScripts);
+			$addedScripts = array_diff($this->_scriptFiles, $this->getRenderedScriptFiles());
+			$this->renderScriptFiles($writer, $addedScripts);
 		}
 	}
 
@@ -711,12 +711,12 @@ 
 
 	public function renderHiddenFieldsBegin($writer)
 	{
-		$this->renderHiddenFieldsInt($writer,true);
+		$this->renderHiddenFieldsInt($writer, true);
 	}
 
 	public function renderHiddenFieldsEnd($writer)
 	{
-		$this->renderHiddenFieldsInt($writer,false);
+		$this->renderHiddenFieldsInt($writer, false);
 	}
 
 	/**
@@ -724,9 +724,9 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param TControl the control forcing the flush (used only in error messages)
 	 */
-	public function flushScriptFiles($writer, $control=null)
+	public function flushScriptFiles($writer, $control = null)
 	{
-		if(!$this->_page->getIsCallback())
+		if (!$this->_page->getIsCallback())
 		{
 			$this->_page->ensureRenderInForm($control);
 			$this->renderAllPendingScriptFiles($writer);
@@ -739,24 +739,24 @@ 
 	protected function renderHiddenFieldsInt($writer, $initial)
  	{
 		if ($initial) $this->_renderedHiddenFields = array();
-		$str='';
-		foreach($this->_hiddenFields as $name=>$value)
+		$str = '';
+		foreach ($this->_hiddenFields as $name=>$value)
 		{
-			if (in_array($name,$this->_renderedHiddenFields)) continue;
-			$id=strtr($name,':','_');
-			if(is_array($value))
+			if (in_array($name, $this->_renderedHiddenFields)) continue;
+			$id = strtr($name, ':', '_');
+			if (is_array($value))
 			{
-				foreach($value as $v)
-					$str.='<input type="hidden" name="'.$name.'[]" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
+				foreach ($value as $v)
+					$str .= '<input type="hidden" name="' . $name . '[]" id="' . $id . '" value="' . THttpUtility::htmlEncode($value) . "\" />\n";
 			}
 			else
 			{
-				$str.='<input type="hidden" name="'.$name.'" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
+				$str .= '<input type="hidden" name="' . $name . '" id="' . $id . '" value="' . THttpUtility::htmlEncode($value) . "\" />\n";
 			}
 			$this->_renderedHiddenFields[] = $name;
 		}
-		if($str!=='')
-			$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
+		if ($str !== '')
+			$writer->write("<div style=\"visibility:hidden;\">\n" . $str . "</div>\n");
 	}
 
 	public function getHiddenFields()
@@ -802,7 +802,7 @@ 
 	 */
 	protected function setFunction($name, $code)
 	{
-		if(!TJavaScript::isJsLiteral($code))
+		if (!TJavaScript::isJsLiteral($code))
 			$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
 		$this->setOption($name, $code);
 	}

Braces +70 added lines, -51 removed lines

@@ -144,10 +144,11 @@ 
 				self::$_pradoPackages = $packages;
 			}
 
-			if (isset(self::$_pradoScripts[$name]))
-				$this->_registeredPradoScripts[$name]=true;
-			else
-				throw new TInvalidOperationException('csmanager_pradoscript_invalid',$name);
+			if (isset(self::$_pradoScripts[$name])) {
+							$this->_registeredPradoScripts[$name]=true;
+			} else {
+							throw new TInvalidOperationException('csmanager_pradoscript_invalid',$name);
+			}
 
 			if(($packages=array_keys($this->_registeredPradoScripts))!==array())
 			{
@@ -159,22 +160,25 @@ 
 				{
 					foreach (self::$_pradoScripts[$p] as $dep)
 					{
-						foreach (self::$_pradoPackages[$dep] as $script)
-						if (!isset($this->_expandedPradoScripts[$script]))
+						foreach (self::$_pradoPackages[$dep] as $script) {
+												if (!isset($this->_expandedPradoScripts[$script]))
 						{
 							$this->_expandedPradoScripts[$script] = true;
+						}
 							if($isDebug)
 							{
-								if (!in_array($url=$baseUrl.'/'.$script,$packagesUrl))
-									$packagesUrl[]=$url;
+								if (!in_array($url=$baseUrl.'/'.$script,$packagesUrl)) {
+																	$packagesUrl[]=$url;
+								}
 							} else {
 								if (!in_array($url=$baseUrl.'/min/'.$script,$packagesUrl))
 								{
 									if(!is_file($filePath=$path.'/min/'.$script))
 									{
 										$dirPath=dirname($filePath);
-										if(!is_dir($dirPath))
-											mkdir($dirPath, PRADO_CHMOD, true);
+										if(!is_dir($dirPath)) {
+																					mkdir($dirPath, PRADO_CHMOD, true);
+										}
 										file_put_contents($filePath, TJavaScript::JSMin(file_get_contents($base.'/'.$script)));
 										chmod($filePath, PRADO_CHMOD);
 									}
@@ -184,8 +188,9 @@ 
 						}
 					}
 				}
-				foreach($packagesUrl as $url)
-					$this->registerScriptFile($url,$url);
+				foreach($packagesUrl as $url) {
+									$this->registerScriptFile($url,$url);
+				}
 			}
 		}
 	}
@@ -226,8 +231,7 @@ 
 				$base = $dir;
 			}
 			return array($assets->getPublishedPath($base), $assets->publishFilePath($base));
-		}
-		else
+		} else
 		{
 			return array($assets->getBasePath().str_replace($assets->getBaseUrl(),'',$base), $base);
 		}
@@ -278,8 +282,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});";
 
@@ -300,9 +305,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();
@@ -339,8 +344,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();
@@ -371,10 +377,11 @@ 
 	 */
 	public function registerStyleSheetFile($key,$url,$media='')
 	{
-		if($media==='')
-			$this->_styleSheetFiles[$key]=$url;
-		else
-			$this->_styleSheetFiles[$key]=array($url,$media);
+		if($media==='') {
+					$this->_styleSheetFiles[$key]=$url;
+		} else {
+					$this->_styleSheetFiles[$key]=array($url,$media);
+		}
 
 		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript','registerStyleSheetFile',$params);
@@ -405,9 +412,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);
 
@@ -601,10 +609,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);
 	}
@@ -614,8 +623,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");
+		}
 	}
 
 	/**
@@ -738,25 +748,30 @@ 
 	 */
 	protected function renderHiddenFieldsInt($writer, $initial)
  	{
-		if ($initial) $this->_renderedHiddenFields = array();
+		if ($initial) {
+			$this->_renderedHiddenFields = array();
+		}
 		$str='';
 		foreach($this->_hiddenFields as $name=>$value)
 		{
-			if (in_array($name,$this->_renderedHiddenFields)) continue;
+			if (in_array($name,$this->_renderedHiddenFields)) {
+				continue;
+			}
 			$id=strtr($name,':','_');
 			if(is_array($value))
 			{
-				foreach($value as $v)
-					$str.='<input type="hidden" name="'.$name.'[]" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
-			}
-			else
+				foreach($value as $v) {
+									$str.='<input type="hidden" name="'.$name.'[]" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
+				}
+			} else
 			{
 				$str.='<input type="hidden" name="'.$name.'" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
 			}
 			$this->_renderedHiddenFields[] = $name;
 		}
-		if($str!=='')
-			$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
+		if($str!=='') {
+					$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
+		}
 	}
 
 	public function getHiddenFields()
@@ -769,8 +784,9 @@ 
 	 */
 	protected function checkIfNotInRender()
 	{
-		if ($form = $this->_page->InFormRender)
-			throw new Exception('Operation invalid when page is already rendering');
+		if ($form = $this->_page->InFormRender) {
+					throw new Exception('Operation invalid when page is already rendering');
+		}
 	}
 }
 
@@ -802,8 +818,9 @@ 
 	 */
 	protected function setFunction($name, $code)
 	{
-		if(!TJavaScript::isJsLiteral($code))
-			$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
+		if(!TJavaScript::isJsLiteral($code)) {
+					$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
+		}
 		$this->setOption($name, $code);
 	}
 
@@ -812,10 +829,11 @@ 
 	 */
 	protected function getOption($name)
 	{
-		if ($this->_options)
-			return $this->_options->itemAt($name);
-		else
-			return null;
+		if ($this->_options) {
+					return $this->_options->itemAt($name);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -832,8 +850,9 @@ 
 	 */
 	public function getOptions()
 	{
-		if (!$this->_options)
-			$this->_options = Prado::createComponent('System.Collections.TMap');
+		if (!$this->_options) {
+					$this->_options = Prado::createComponent('System.Collections.TMap');
+		}
 		return $this->_options;
 	}
 

framework/Web/UI/TControl.php

Doc Comments +35 added lines

@@ -261,6 +261,7 @@ 
 	 * Sets the page for a control.
 	 * Only framework developers should use this method.
 	 * @param TPage the page that contains this control
+	 * @param TPage $page
 	 */
 	public function setPage($page)
 	{
@@ -542,6 +543,7 @@ 
 
 	/**
 	 * @param boolean whether the control is visible
+	 * @param boolean $value
 	 */
 	public function setVisible($value)
 	{
@@ -609,6 +611,7 @@ 
 	}
 
 	/**
+	 * @param string $name
 	 * @return boolean whether the named attribute exists
 	 */
 	public function hasAttribute($name)
@@ -620,6 +623,7 @@ 
 	}
 
 	/**
+	 * @param string $name
 	 * @return string attribute value, null if attribute does not exist
 	 */
 	public function getAttribute($name)
@@ -634,6 +638,7 @@ 
 	 * Sets a custom control attribute.
 	 * @param string attribute name
 	 * @param string value of the attribute
+	 * @param string $name
 	 */
 	public function setAttribute($name,$value)
 	{
@@ -671,6 +676,7 @@ 
 
 	/**
 	 * @param boolean set whether to enable viewstate
+	 * @param boolean $value
 	 */
 	public function setEnableViewState($value)
 	{
@@ -687,6 +693,7 @@ 
 	 * that must be kept in controlstate.
 	 * @param string the name of the controlstate value to be returned
 	 * @param mixed the default value. If $key is not found in controlstate, $defaultValue will be returned
+	 * @param string $key
 	 * @return mixed the controlstate value corresponding to $key
 	 */
 	protected function getControlState($key,$defaultValue=null)
@@ -703,6 +710,8 @@ 
 	 * @param string the name of the controlstate value
 	 * @param mixed the controlstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from controlstate
+	 * @param string $key
+	 * @param integer $defaultValue
 	 */
 	protected function setControlState($key,$value,$defaultValue=null)
 	{
@@ -726,6 +735,7 @@ 
 	 * When it is false, data saved via setViewState() will not be persisted.
 	 * By default, it is true, meaning data will be persisted across postbacks.
 	 * @param boolean whether data should be persisted
+	 * @param boolean $enabled
 	 */
 	public function trackViewState($enabled)
 	{
@@ -764,6 +774,7 @@ 
 	 * @param string the name of the viewstate value
 	 * @param mixed the viewstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from the viewstate.
+	 * @param string $key
 	 */
 	public function setViewState($key,$value,$defaultValue=null)
 	{
@@ -788,6 +799,7 @@ 
 	/**
 	 * Clears a viewstate value.
 	 * @param string the name of the viewstate value to be cleared
+	 * @param string $key
 	 */
 	public function clearViewState($key)
 	{
@@ -893,6 +905,7 @@ 
 	 * Sets a value indicating whether child controls are created.
 	 * If false, any existing child controls will be cleared up.
 	 * @param boolean whether child controls are created
+	 * @param boolean $value
 	 */
 	final protected function setChildControlsCreated($value)
 	{
@@ -983,6 +996,7 @@ 
 	 * Finds all child and grand-child controls that are of the specified type.
 	 * @param string the class name
 	 * @param boolean whether the type comparison is strict or not. If false, controls of the parent classes of the specified class will also be returned.
+	 * @param string $type
 	 * @return array list of controls found
 	 */
 	public function findControlsByType($type,$strict=true)
@@ -1117,6 +1131,7 @@ 
 	 * A component with explicit ID on a template will be registered to
 	 * the template owner. This method allows you to obtain this component
 	 * with the ID.
+	 * @param string $name
 	 * @return mixed the named registered object. Null if object is not found.
 	 */
 	public function getRegisteredObject($name)
@@ -1174,6 +1189,7 @@ 
 	 * Control lifecycles will be caught up during the addition.
 	 * Only framework developers should use this method.
 	 * @param TControl the new child control
+	 * @param TControl $control
 	 */
 	public function addedControl($control)
 	{
@@ -1219,6 +1235,7 @@ 
 	 * Removes a control from the child collection of the control.
 	 * Only framework developers should use this method.
 	 * @param TControl the child control removed
+	 * @param TControl $control
 	 */
 	public function removedControl($control)
 	{
@@ -1470,6 +1487,7 @@ 
 	 * @param string name of the broadcast event
 	 * @param TControl sender of the event
 	 * @param TBroadcastEventParameter event parameter
+	 * @param TBroadcastEventParameter $param
 	 */
 	private function broadcastEventInternal($name,$sender,$param)
 	{
@@ -1694,6 +1712,7 @@ 
 	 * Clears the cached UniqueID.
 	 * If $recursive=true, all children's cached UniqueID will be cleared as well.
 	 * @param boolean whether the clearing is recursive.
+	 * @param boolean $recursive
 	 */
 	private function clearCachedUniqueID($recursive)
 	{
@@ -1731,6 +1750,7 @@ 
 	 * Updates the list of the controls whose IDs are managed by the specified naming container.
 	 * @param TControl the naming container
 	 * @param TControlCollection list of controls
+	 * @param TControl $container
 	 * @throws TInvalidDataValueException if a control's ID is not unique within its naming container.
 	 */
 	private function fillNameTable($container,$controls)
@@ -1900,6 +1920,7 @@ 
 	 * The implementation of this function should raise appropriate event(s) (e.g. OnClick, OnCommand)
 	 * indicating the component is responsible for the postback event.
 	 * @param string the parameter associated with the postback event
+	 * @return void
 	 */
 	public function raisePostBackEvent($param);
 }
@@ -1928,6 +1949,7 @@ 
 	 * Raises postdata changed event.
 	 * The implementation of this function should raise appropriate event(s) (e.g. OnTextChanged)
 	 * indicating the control data is changed.
+	 * @return void
 	 */
 	public function raisePostDataChangedEvent();
 	/**
@@ -1961,6 +1983,7 @@ 
 	public function getIsValid();
 	/**
 	 * @param boolean whether the validator validates successfully
+	 * @return void
 	 */
 	public function setIsValid($value);
 	/**
@@ -1969,6 +1992,7 @@ 
 	public function getErrorMessage();
 	/**
 	 * @param string error message for the validation
+	 * @return void
 	 */
 	public function setErrorMessage($value);
 }
@@ -2036,6 +2060,7 @@ 
 	/**
 	 * Applies this theme to the specified control.
 	 * @param TControl the control to be applied with this theme
+	 * @return boolean
 	 */
 	public function applySkin($control);
 }
@@ -2057,6 +2082,7 @@ 
 	 * Content in the template will be instantiated as components and text strings
 	 * and passed to the specified parent control.
 	 * @param TControl the parent control
+	 * @return void
 	 */
 	public function instantiateIn($parent);
 }
@@ -2081,6 +2107,8 @@ 
 
 	/**
 	 * @param string caption of the button
+	 * @param string $value
+	 * @return void
 	 */
 	public function setText($value);
 
@@ -2091,6 +2119,7 @@ 
 
 	/**
 	 * @param boolean whether postback event trigger by this button will cause input validation
+	 * @return void
 	 */
 	public function setCausesValidation($value);
 
@@ -2101,6 +2130,7 @@ 
 
 	/**
 	 * @param string the command name associated with the {@link onCommand OnCommand} event.
+	 * @return void
 	 */
 	public function setCommandName($value);
 
@@ -2111,6 +2141,7 @@ 
 
 	/**
 	 * @param string the parameter associated with the {@link onCommand OnCommand} event.
+	 * @return void
 	 */
 	public function setCommandParameter($value);
 
@@ -2121,23 +2152,27 @@ 
 
 	/**
 	 * @param string the group of validators which the button causes validation upon postback
+	 * @return void
 	 */
 	public function setValidationGroup($value);
 
 	/**
 	 * Raises <b>OnClick</b> event.
 	 * @param TEventParameter event parameter to be passed to the event handlers
+	 * @return void
 	 */
 	public function onClick($param);
 
 	/**
 	 * Raises <b>OnCommand</b> event.
 	 * @param TCommandEventParameter event parameter to be passed to the event handlers
+	 * @return void
 	 */
 	public function onCommand($param);
 
 	/**
 	 * @param boolean set by a panel to register this button as the default button for the panel.
+	 * @return void
 	 */
 	public function setIsDefaultButton($value);
 

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TControl, TControlCollection, TEventParameter and INamingContainer class file
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI
- */
+	 * TControl, TControlCollection, TEventParameter and INamingContainer class file
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI
+	 */
 
 /**
  * Includes TAttributeCollection and TControlAdapter class

Spacing +393 added lines, -393 removed lines

@@ -71,61 +71,61 @@ 
 	/**
 	 * format of control ID
 	 */
-	const ID_FORMAT='/^[a-zA-Z_]\\w*$/';
+	const ID_FORMAT = '/^[a-zA-Z_]\\w*$/';
 	/**
 	 * separator char between IDs in a UniqueID
 	 */
-	const ID_SEPARATOR='$';
+	const ID_SEPARATOR = '$';
 	/**
 	 * separator char between IDs in a ClientID
 	 */
-	const CLIENT_ID_SEPARATOR='_';
+	const CLIENT_ID_SEPARATOR = '_';
 	/**
 	 * prefix to an ID automatically generated
 	 */
-	const AUTOMATIC_ID_PREFIX='ctl';
+	const AUTOMATIC_ID_PREFIX = 'ctl';
 
 	/**
 	 * the stage of lifecycles that the control is currently at
 	 */
-	const CS_CONSTRUCTED=0;
-	const CS_CHILD_INITIALIZED=1;
-	const CS_INITIALIZED=2;
-	const CS_STATE_LOADED=3;
-	const CS_LOADED=4;
-	const CS_PRERENDERED=5;
+	const CS_CONSTRUCTED = 0;
+	const CS_CHILD_INITIALIZED = 1;
+	const CS_INITIALIZED = 2;
+	const CS_STATE_LOADED = 3;
+	const CS_LOADED = 4;
+	const CS_PRERENDERED = 5;
 
 	/**
 	 * State bits.
 	 */
-	const IS_ID_SET=0x01;
-	const IS_DISABLE_VIEWSTATE=0x02;
-	const IS_SKIN_APPLIED=0x04;
-	const IS_STYLESHEET_APPLIED=0x08;
-	const IS_DISABLE_THEMING=0x10;
-	const IS_CHILD_CREATED=0x20;
-	const IS_CREATING_CHILD=0x40;
+	const IS_ID_SET = 0x01;
+	const IS_DISABLE_VIEWSTATE = 0x02;
+	const IS_SKIN_APPLIED = 0x04;
+	const IS_STYLESHEET_APPLIED = 0x08;
+	const IS_DISABLE_THEMING = 0x10;
+	const IS_CHILD_CREATED = 0x20;
+	const IS_CREATING_CHILD = 0x40;
 
 	/**
 	 * 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
 	 */
-	private $_id='';
+	private $_id = '';
 	/**
 	 * @var string control unique ID
 	 */
@@ -149,27 +149,27 @@ 
 	/**
 	 * @var array viewstate data
 	 */
-	private $_viewState=array();
+	private $_viewState = array();
 	/**
 	 * @var array temporary state (usually set in template)
 	 */
-	private $_tempState=array();
+	private $_tempState = array();
 	/**
 	 * @var boolean whether we should keep state in viewstate
 	 */
-	private $_trackViewState=true;
+	private $_trackViewState = true;
 	/**
 	 * @var integer the current stage of the control lifecycles
 	 */
-	private $_stage=0;
+	private $_stage = 0;
 	/**
 	 * @var integer representation of the state bits
 	 */
-	private $_flags=0;
+	private $_flags = 0;
 	/**
 	 * @var array a collection of rare control data
 	 */
-	private $_rf=array();
+	private $_rf = array();
 
 	/**
 	 * Returns a property value by name or a control by ID.
@@ -189,7 +189,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);
@@ -208,7 +208,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;
 	}
 
 	/**
@@ -216,7 +216,7 @@ 
 	 */
 	public function setAdapter(TControlAdapter $adapter)
 	{
-		$this->_rf[self::RF_ADAPTER]=$adapter;
+		$this->_rf[self::RF_ADAPTER] = $adapter;
 	}
 
 	/**
@@ -232,12 +232,12 @@ 
 	 */
 	public function getNamingContainer()
 	{
-		if(!$this->_namingContainer && $this->_parent)
+		if (!$this->_namingContainer && $this->_parent)
 		{
-			if($this->_parent instanceof INamingContainer)
-				$this->_namingContainer=$this->_parent;
+			if ($this->_parent instanceof INamingContainer)
+				$this->_namingContainer = $this->_parent;
 			else
-				$this->_namingContainer=$this->_parent->getNamingContainer();
+				$this->_namingContainer = $this->_parent->getNamingContainer();
 		}
 		return $this->_namingContainer;
 	}
@@ -247,12 +247,12 @@ 
 	 */
 	public function getPage()
 	{
-		if(!$this->_page)
+		if (!$this->_page)
 		{
-			if($this->_parent)
-				$this->_page=$this->_parent->getPage();
-			else if($this->_tplControl)
-				$this->_page=$this->_tplControl->getPage();
+			if ($this->_parent)
+				$this->_page = $this->_parent->getPage();
+			else if ($this->_tplControl)
+				$this->_page = $this->_tplControl->getPage();
 		}
 		return $this->_page;
 	}
@@ -264,7 +264,7 @@ 
 	 */
 	public function setPage($page)
 	{
-		$this->_page=$page;
+		$this->_page = $page;
 	}
 
 	/**
@@ -274,7 +274,7 @@ 
 	 */
 	public function setTemplateControl($control)
 	{
-		$this->_tplControl=$control;
+		$this->_tplControl = $control;
 	}
 
 	/**
@@ -282,8 +282,8 @@ 
 	 */
 	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;
 	}
 
@@ -294,10 +294,10 @@ 
 	 */
 	public function getSourceTemplateControl()
 	{
-		$control=$this;
-		while(($control instanceof TControl) && ($control=$control->getTemplateControl())!==null)
+		$control = $this;
+		while (($control instanceof TControl) && ($control = $control->getTemplateControl()) !== null)
 		{
-			if(($control instanceof TTemplateControl) && $control->getIsSourceTemplateControl())
+			if (($control instanceof TTemplateControl) && $control->getIsSourceTemplateControl())
 				return $control;
 		}
 		return $this->getPage();
@@ -324,7 +324,7 @@ 
 	 */
 	protected function setControlStage($value)
 	{
-		$this->_stage=$value;
+		$this->_stage = $value;
 	}
 
 	/**
@@ -334,9 +334,9 @@ 
 	 * @param boolean whether to hide automatically generated ID
 	 * @return string the ID of the control
 	 */
-	public function getID($hideAutoID=true)
+	public function getID($hideAutoID = true)
 	{
-		if($hideAutoID)
+		if ($hideAutoID)
 			return ($this->_flags & self::IS_ID_SET) ? $this->_id : '';
 		else
 			return $this->_id;
@@ -348,12 +348,12 @@ 
 	 */
 	public function setID($id)
 	{
-		if(!preg_match(self::ID_FORMAT,$id))
-			throw new TInvalidDataValueException('control_id_invalid',get_class($this),$id);
-		$this->_id=$id;
+		if (!preg_match(self::ID_FORMAT, $id))
+			throw new TInvalidDataValueException('control_id_invalid', get_class($this), $id);
+		$this->_id = $id;
 		$this->_flags |= self::IS_ID_SET;
 		$this->clearCachedUniqueID($this instanceof INamingContainer);
-		if($this->_namingContainer)
+		if ($this->_namingContainer)
 			$this->_namingContainer->clearNameTable();
 	}
 
@@ -366,17 +366,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)
-					return ($this->_uid=$this->_id);
-				else if(($prefix=$namingContainer->getUniqueID())==='')
+				if ($this->getPage() === $namingContainer)
+					return ($this->_uid = $this->_id);
+				else if (($prefix = $namingContainer->getUniqueID()) === '')
 					return $this->_id;
 				else
-					return ($this->_uid=$prefix.self::ID_SEPARATOR.$this->_id);
+					return ($this->_uid = $prefix . self::ID_SEPARATOR . $this->_id);
 			}
 			else	// no naming container
 				return $this->_id;
@@ -402,7 +402,7 @@ 
 	 */
 	public function getClientID()
 	{
-		return strtr($this->getUniqueID(),self::ID_SEPARATOR,self::CLIENT_ID_SEPARATOR);
+		return strtr($this->getUniqueID(), self::ID_SEPARATOR, self::CLIENT_ID_SEPARATOR);
 	}
 
 	/**
@@ -412,7 +412,7 @@ 
 	 */
 	public static function convertUniqueIdToClientId($uniqueID)
 	{
-		return strtr($uniqueID,self::ID_SEPARATOR,self::CLIENT_ID_SEPARATOR);
+		return strtr($uniqueID, self::ID_SEPARATOR, self::CLIENT_ID_SEPARATOR);
 	}
 
 	/**
@@ -420,7 +420,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] : '';
 	}
 
 	/**
@@ -429,10 +429,10 @@ 
 	 */
 	public function setSkinID($value)
 	{
-		if(($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage>=self::CS_CHILD_INITIALIZED)
-			throw new TInvalidOperationException('control_skinid_unchangeable',get_class($this));
+		if (($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage >= self::CS_CHILD_INITIALIZED)
+			throw new TInvalidOperationException('control_skinid_unchangeable', get_class($this));
 		else
-			$this->_rf[self::RF_SKIN_ID]=$value;
+			$this->_rf[self::RF_SKIN_ID] = $value;
 	}
 
 	/**
@@ -450,10 +450,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;
 	}
 
 	/**
@@ -462,9 +462,9 @@ 
 	 */
 	public function setEnableTheming($value)
 	{
-		if($this->_stage>=self::CS_CHILD_INITIALIZED)
-			throw new TInvalidOperationException('control_enabletheming_unchangeable',get_class($this),$this->getUniqueID());
-		else if(TPropertyValue::ensureBoolean($value))
+		if ($this->_stage >= self::CS_CHILD_INITIALIZED)
+			throw new TInvalidOperationException('control_enabletheming_unchangeable', get_class($this), $this->getUniqueID());
+		else if (TPropertyValue::ensureBoolean($value))
 			$this->_flags &= ~self::IS_DISABLE_THEMING;
 		else
 			$this->_flags |= self::IS_DISABLE_THEMING;
@@ -479,7 +479,7 @@ 
 	 */
 	public function getCustomData()
 	{
-		return $this->getViewState('CustomData',null);
+		return $this->getViewState('CustomData', null);
 	}
 
 	/**
@@ -489,7 +489,7 @@ 
 	 */
 	public function setCustomData($value)
 	{
-		$this->setViewState('CustomData',$value,null);
+		$this->setViewState('CustomData', $value, null);
 	}
 
 	/**
@@ -497,7 +497,7 @@ 
 	 */
 	public function getHasControls()
 	{
-		return isset($this->_rf[self::RF_CONTROLS]) && $this->_rf[self::RF_CONTROLS]->getCount()>0;
+		return isset($this->_rf[self::RF_CONTROLS]) && $this->_rf[self::RF_CONTROLS]->getCount() > 0;
 	}
 
 	/**
@@ -505,8 +505,8 @@ 
 	 */
 	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];
 	}
 
@@ -517,7 +517,7 @@ 
 	 */
 	protected function createControlCollection()
 	{
-		return $this->getAllowChildControls()?new TControlCollection($this):new TEmptyControlCollection($this);
+		return $this->getAllowChildControls() ? new TControlCollection($this) : new TEmptyControlCollection($this);
 	}
 
 	/**
@@ -527,17 +527,17 @@ 
 	 * @param boolean whether the parents should also be checked if visible
 	 * @return boolean whether the control is visible (default=true).
 	 */
-	public function getVisible($checkParents=true)
+	public function getVisible($checkParents = true)
 	{
-		if($checkParents)
+		if ($checkParents)
 		{
-			for($control=$this;$control;$control=$control->_parent)
-				if(!$control->getVisible(false))
+			for ($control = $this; $control; $control = $control->_parent)
+				if (!$control->getVisible(false))
 					return false;
 			return true;
 		}
 		else
-			return $this->getViewState('Visible',true);
+			return $this->getViewState('Visible', true);
 	}
 
 	/**
@@ -545,7 +545,7 @@ 
 	 */
 	public function setVisible($value)
 	{
-		$this->setViewState('Visible',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('Visible', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -558,17 +558,17 @@ 
 	 * @param boolean whether the parents should also be checked enabled
 	 * @return boolean whether the control is enabled.
 	 */
-	public function getEnabled($checkParents=false)
+	public function getEnabled($checkParents = false)
 	{
-		if($checkParents)
+		if ($checkParents)
 		{
-			for($control=$this;$control;$control=$control->_parent)
-				if(!$control->getViewState('Enabled',true))
+			for ($control = $this; $control; $control = $control->_parent)
+				if (!$control->getViewState('Enabled', true))
 					return false;
 			return true;
 		}
 		else
-			return $this->getViewState('Enabled',true);
+			return $this->getViewState('Enabled', true);
 	}
 
 	/**
@@ -576,7 +576,7 @@ 
 	 */
 	public function setEnabled($value)
 	{
-		$this->setViewState('Enabled',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('Enabled', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -584,8 +584,8 @@ 
 	 */
 	public function getHasAttributes()
 	{
-		if($attributes=$this->getViewState('Attributes',null))
-			return $attributes->getCount()>0;
+		if ($attributes = $this->getViewState('Attributes', null))
+			return $attributes->getCount() > 0;
 		else
 			return false;
 	}
@@ -598,12 +598,12 @@ 
 	 */
 	public function getAttributes()
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if ($attributes = $this->getViewState('Attributes', null))
 			return $attributes;
 		else
 		{
-			$attributes=new TAttributeCollection;
-			$this->setViewState('Attributes',$attributes,null);
+			$attributes = new TAttributeCollection;
+			$this->setViewState('Attributes', $attributes, null);
 			return $attributes;
 		}
 	}
@@ -613,7 +613,7 @@ 
 	 */
 	public function hasAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if ($attributes = $this->getViewState('Attributes', null))
 			return $attributes->contains($name);
 		else
 			return false;
@@ -624,7 +624,7 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if ($attributes = $this->getViewState('Attributes', null))
 			return $attributes->itemAt($name);
 		else
 			return null;
@@ -635,9 +635,9 @@ 
 	 * @param string attribute name
 	 * @param string value of the attribute
 	 */
-	public function setAttribute($name,$value)
+	public function setAttribute($name, $value)
 	{
-		$this->getAttributes()->add($name,$value);
+		$this->getAttributes()->add($name, $value);
 	}
 
 	/**
@@ -647,7 +647,7 @@ 
 	 */
 	public function removeAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if ($attributes = $this->getViewState('Attributes', null))
 			return $attributes->remove($name);
 		else
 			return null;
@@ -656,12 +656,12 @@ 
 	/**
 	 * @return boolean whether viewstate is enabled
 	 */
-	public function getEnableViewState($checkParents=false)
+	public function getEnableViewState($checkParents = false)
 	{
-		if($checkParents)
+		if ($checkParents)
 		{
-			for($control=$this;$control!==null;$control=$control->getParent())
-				if($control->_flags & self::IS_DISABLE_VIEWSTATE)
+			for ($control = $this; $control !== null; $control = $control->getParent())
+				if ($control->_flags & self::IS_DISABLE_VIEWSTATE)
 					return false;
 			return true;
 		}
@@ -674,7 +674,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;
@@ -689,9 +689,9 @@ 
 	 * @param mixed the default value. If $key is not found in controlstate, $defaultValue will be returned
 	 * @return mixed the controlstate value corresponding to $key
 	 */
-	protected function getControlState($key,$defaultValue=null)
+	protected function getControlState($key, $defaultValue = null)
 	{
-		return isset($this->_rf[self::RF_CONTROLSTATE][$key])?$this->_rf[self::RF_CONTROLSTATE][$key]:$defaultValue;
+		return isset($this->_rf[self::RF_CONTROLSTATE][$key]) ? $this->_rf[self::RF_CONTROLSTATE][$key] : $defaultValue;
 	}
 
 	/**
@@ -704,12 +704,12 @@ 
 	 * @param mixed the controlstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from controlstate
 	 */
-	protected function setControlState($key,$value,$defaultValue=null)
+	protected function setControlState($key, $value, $defaultValue = null)
 	{
-		if($value===$defaultValue)
+		if ($value === $defaultValue)
 			unset($this->_rf[self::RF_CONTROLSTATE][$key]);
 		else
-			$this->_rf[self::RF_CONTROLSTATE][$key]=$value;
+			$this->_rf[self::RF_CONTROLSTATE][$key] = $value;
 	}
 
 	/**
@@ -729,7 +729,7 @@ 
 	 */
 	public function trackViewState($enabled)
 	{
-		$this->_trackViewState=TPropertyValue::ensureBoolean($enabled);
+		$this->_trackViewState = TPropertyValue::ensureBoolean($enabled);
 	}
 
 	/**
@@ -741,14 +741,14 @@ 
 	 * @param mixed the default value. If $key is not found in viewstate, $defaultValue will be returned
 	 * @return mixed the viewstate value corresponding to $key
 	 */
-	public function getViewState($key,$defaultValue=null)
+	public function getViewState($key, $defaultValue = null)
 	{
-		if(isset($this->_viewState[$key]))
-			return $this->_viewState[$key]!==null?$this->_viewState[$key]:$defaultValue;
-		else if(isset($this->_tempState[$key]))
+		if (isset($this->_viewState[$key]))
+			return $this->_viewState[$key] !== null ? $this->_viewState[$key] : $defaultValue;
+		else if (isset($this->_tempState[$key]))
 		{
-			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
-				$this->_viewState[$key]=$this->_tempState[$key];
+			if (is_object($this->_tempState[$key]) && $this->_trackViewState)
+				$this->_viewState[$key] = $this->_tempState[$key];
 			return $this->_tempState[$key];
 		}
 		else
@@ -765,23 +765,23 @@ 
 	 * @param mixed the viewstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from the viewstate.
 	 */
-	public function setViewState($key,$value,$defaultValue=null)
+	public function setViewState($key, $value, $defaultValue = null)
 	{
-		if($this->_trackViewState)
+		if ($this->_trackViewState)
 		{
 			unset($this->_tempState[$key]);
-			if($value===$defaultValue)
+			if ($value === $defaultValue)
 				unset($this->_viewState[$key]);
 			else
-				$this->_viewState[$key]=$value;
+				$this->_viewState[$key] = $value;
 		}
 		else
 		{
 			unset($this->_viewState[$key]);
-			if($value===$defaultValue)
+			if ($value === $defaultValue)
 				unset($this->_tempState[$key]);
 			else
-				$this->_tempState[$key]=$value;
+				$this->_tempState[$key] = $value;
 		}
 	}
 
@@ -801,9 +801,9 @@ 
 	 * @param string the property name, or property path
 	 * @param string the expression
 	 */
-	public function bindProperty($name,$expression)
+	public function bindProperty($name, $expression)
 	{
-		$this->_rf[self::RF_DATA_BINDINGS][$name]=$expression;
+		$this->_rf[self::RF_DATA_BINDINGS][$name] = $expression;
 	}
 
 	/**
@@ -823,9 +823,9 @@ 
 	 * @param string the property name, or property path
 	 * @param string the expression
 	 */
-	public function autoBindProperty($name,$expression)
+	public function autoBindProperty($name, $expression)
 	{
-		$this->_rf[self::RF_AUTO_BINDINGS][$name]=$expression;
+		$this->_rf[self::RF_AUTO_BINDINGS][$name] = $expression;
 	}
 
 	/**
@@ -843,13 +843,13 @@ 
 	 */
 	protected function dataBindProperties()
 	{
-		Prado::trace("Data bind properties",'System.Web.UI.TControl');
-		if(isset($this->_rf[self::RF_DATA_BINDINGS]))
+		Prado::trace("Data bind properties", 'System.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));
 		}
 	}
 
@@ -858,12 +858,12 @@ 
 	 */
 	protected function autoDataBindProperties()
 	{
-		if(isset($this->_rf[self::RF_AUTO_BINDINGS]))
+		if (isset($this->_rf[self::RF_AUTO_BINDINGS]))
 		{
-			if(($context=$this->getTemplateControl())===null)
-				$context=$this;
-			foreach($this->_rf[self::RF_AUTO_BINDINGS] as $property=>$expression)
-				$this->setSubProperty($property,$context->evaluateExpression($expression));
+			if (($context = $this->getTemplateControl()) === null)
+				$context = $this;
+			foreach ($this->_rf[self::RF_AUTO_BINDINGS] as $property=>$expression)
+				$this->setSubProperty($property, $context->evaluateExpression($expression));
 		}
 	}
 
@@ -872,11 +872,11 @@ 
 	 */
 	protected function dataBindChildren()
 	{
-		Prado::trace("dataBindChildren()",'System.Web.UI.TControl');
-		if(isset($this->_rf[self::RF_CONTROLS]))
+		Prado::trace("dataBindChildren()", 'System.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();
 		}
 	}
@@ -886,7 +886,7 @@ 
 	 */
 	final protected function getChildControlsCreated()
 	{
-		return ($this->_flags & self::IS_CHILD_CREATED)!==0;
+		return ($this->_flags & self::IS_CHILD_CREATED) !== 0;
 	}
 
 	/**
@@ -896,11 +896,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;
 		}
@@ -913,19 +913,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;
@@ -957,22 +957,22 @@ 
 	 */
 	public function findControl($id)
 	{
-		$id=strtr($id,'.',self::ID_SEPARATOR);
-		$container=($this instanceof INamingContainer)?$this:$this->getNamingContainer();
-		if(!$container || !$container->getHasControls())
+		$id = strtr($id, '.', self::ID_SEPARATOR);
+		$container = ($this instanceof INamingContainer) ? $this : $this->getNamingContainer();
+		if (!$container || !$container->getHasControls())
 			return null;
-		if(!isset($container->_rf[self::RF_NAMED_CONTROLS]))
+		if (!isset($container->_rf[self::RF_NAMED_CONTROLS]))
 		{
-			$container->_rf[self::RF_NAMED_CONTROLS]=array();
-			$container->fillNameTable($container,$container->_rf[self::RF_CONTROLS]);
+			$container->_rf[self::RF_NAMED_CONTROLS] = array();
+			$container->fillNameTable($container, $container->_rf[self::RF_CONTROLS]);
 		}
-		if(($pos=strpos($id,self::ID_SEPARATOR))===false)
-			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id])?$container->_rf[self::RF_NAMED_CONTROLS][$id]:null;
+		if (($pos = strpos($id, self::ID_SEPARATOR)) === false)
+			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id]) ? $container->_rf[self::RF_NAMED_CONTROLS][$id] : null;
 		else
 		{
-			$cid=substr($id,0,$pos);
-			$sid=substr($id,$pos+1);
-			if(isset($container->_rf[self::RF_NAMED_CONTROLS][$cid]))
+			$cid = substr($id, 0, $pos);
+			$sid = substr($id, $pos + 1);
+			if (isset($container->_rf[self::RF_NAMED_CONTROLS][$cid]))
 				return $container->_rf[self::RF_NAMED_CONTROLS][$cid]->findControl($sid);
 			else
 				return null;
@@ -985,17 +985,17 @@ 
 	 * @param boolean whether the type comparison is strict or not. If false, controls of the parent classes of the specified class will also be returned.
 	 * @return array list of controls found
 	 */
-	public function findControlsByType($type,$strict=true)
+	public function findControlsByType($type, $strict = true)
 	{
-		$controls=array();
-		if($this->getHasControls())
+		$controls = array();
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if(is_object($control) && (get_class($control)===$type || (!$strict && ($control instanceof $type))))
-					$controls[]=$control;
-				if(($control instanceof TControl) && $control->getHasControls())
-					$controls=array_merge($controls,$control->findControlsByType($type,$strict));
+				if (is_object($control) && (get_class($control) === $type || (!$strict && ($control instanceof $type))))
+					$controls[] = $control;
+				if (($control instanceof TControl) && $control->getHasControls())
+					$controls = array_merge($controls, $control->findControlsByType($type, $strict));
 			}
 		}
 		return $controls;
@@ -1012,16 +1012,16 @@ 
 	 */
 	public function findControlsByID($id)
 	{
-		$controls=array();
-		if($this->getHasControls())
+		$controls = array();
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 				{
-					if($control->_id===$id)
-						$controls[]=$control;
-					$controls=array_merge($controls,$control->findControlsByID($id));
+					if ($control->_id === $id)
+						$controls[] = $control;
+					$controls = array_merge($controls, $control->findControlsByID($id));
 				}
 			}
 		}
@@ -1046,11 +1046,11 @@ 
 	 * @param object object to be declared
 	 * @see __get
 	 */
-	public function registerObject($name,$object)
+	public function registerObject($name, $object)
 	{
-		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
-			throw new TInvalidOperationException('control_object_reregistered',$name);
-		$this->_rf[self::RF_NAMED_OBJECTS][$name]=$object;
+		if (isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
+			throw new TInvalidOperationException('control_object_reregistered', $name);
+		$this->_rf[self::RF_NAMED_OBJECTS][$name] = $object;
 	}
 
 	/**
@@ -1121,7 +1121,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;
 	}
 
 	/**
@@ -1163,10 +1163,10 @@ 
 	 */
 	final protected function isDescendentOf($ancestor)
 	{
-		$control=$this;
-		while($control!==$ancestor && $control->_parent)
-			$control=$control->_parent;
-		return $control===$ancestor;
+		$control = $this;
+		while ($control !== $ancestor && $control->_parent)
+			$control = $control->_parent;
+		return $control === $ancestor;
 	}
 
 	/**
@@ -1177,38 +1177,38 @@ 
 	 */
 	public function addedControl($control)
 	{
-		if($control->_parent)
+		if ($control->_parent)
 			$control->_parent->getControls()->remove($control);
-		$control->_parent=$this;
-		$control->_page=$this->getPage();
-		$namingContainer=($this instanceof INamingContainer)?$this:$this->_namingContainer;
-		if($namingContainer)
+		$control->_parent = $this;
+		$control->_page = $this->getPage();
+		$namingContainer = ($this instanceof INamingContainer) ? $this : $this->_namingContainer;
+		if ($namingContainer)
 		{
-			$control->_namingContainer=$namingContainer;
-			if($control->_id==='')
+			$control->_namingContainer = $namingContainer;
+			if ($control->_id === '')
 				$control->generateAutomaticID();
 			else
 				$namingContainer->clearNameTable();
 			$control->clearCachedUniqueID($control instanceof INamingContainer);
 		}
 
-		if($this->_stage>=self::CS_CHILD_INITIALIZED)
+		if ($this->_stage >= self::CS_CHILD_INITIALIZED)
 		{
 			$control->initRecursive($namingContainer);
-			if($this->_stage>=self::CS_STATE_LOADED)
+			if ($this->_stage >= self::CS_STATE_LOADED)
 			{
-				if(isset($this->_rf[self::RF_CHILD_STATE][$control->_id]))
+				if (isset($this->_rf[self::RF_CHILD_STATE][$control->_id]))
 				{
-					$state=$this->_rf[self::RF_CHILD_STATE][$control->_id];
+					$state = $this->_rf[self::RF_CHILD_STATE][$control->_id];
 					unset($this->_rf[self::RF_CHILD_STATE][$control->_id]);
 				}
 				else
-					$state=null;
-				$control->loadStateRecursive($state,!($this->_flags & self::IS_DISABLE_VIEWSTATE));
-				if($this->_stage>=self::CS_LOADED)
+					$state = null;
+				$control->loadStateRecursive($state, !($this->_flags & self::IS_DISABLE_VIEWSTATE));
+				if ($this->_stage >= self::CS_LOADED)
 				{
 					$control->loadRecursive();
-					if($this->_stage>=self::CS_PRERENDERED)
+					if ($this->_stage >= self::CS_PRERENDERED)
 						$control->preRenderRecursive();
 				}
 			}
@@ -1222,16 +1222,16 @@ 
 	 */
 	public function removedControl($control)
 	{
-		if($this->_namingContainer)
+		if ($this->_namingContainer)
 			$this->_namingContainer->clearNameTable();
 		$control->unloadRecursive();
-		$control->_parent=null;
-		$control->_page=null;
-		$control->_namingContainer=null;
-		$control->_tplControl=null;
+		$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='';
+		if (!($control->_flags & self::IS_ID_SET))
+			$control->_id = '';
 		else
 			unset($this->_rf[self::RF_NAMED_OBJECTS][$control->_id]);
 		$control->clearCachedUniqueID(true);
@@ -1242,39 +1242,39 @@ 
 	 * Only framework developers should use this method.
 	 * @param TControl the naming container control
 	 */
-	protected function initRecursive($namingContainer=null)
+	protected function initRecursive($namingContainer = null)
 	{
 		$this->ensureChildControls();
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			if($this instanceof INamingContainer)
-				$namingContainer=$this;
-			$page=$this->getPage();
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			if ($this instanceof INamingContainer)
+				$namingContainer = $this;
+			$page = $this->getPage();
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 				{
-					$control->_namingContainer=$namingContainer;
-					$control->_page=$page;
-					if($control->_id==='' && $namingContainer)
+					$control->_namingContainer = $namingContainer;
+					$control->_page = $page;
+					if ($control->_id === '' && $namingContainer)
 						$control->generateAutomaticID();
 					$control->initRecursive($namingContainer);
 				}
 			}
 		}
-		if($this->_stage<self::CS_INITIALIZED)
+		if ($this->_stage < self::CS_INITIALIZED)
 		{
-			$this->_stage=self::CS_CHILD_INITIALIZED;
-			if(($page=$this->getPage()) && $this->getEnableTheming() && !($this->_flags & self::IS_SKIN_APPLIED))
+			$this->_stage = self::CS_CHILD_INITIALIZED;
+			if (($page = $this->getPage()) && $this->getEnableTheming() && !($this->_flags & self::IS_SKIN_APPLIED))
 			{
 				$page->applyControlSkin($this);
 				$this->_flags |= self::IS_SKIN_APPLIED;
 			}
-			if(isset($this->_rf[self::RF_ADAPTER]))
+			if (isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onInit(null);
 			else
 				$this->onInit(null);
-			$this->_stage=self::CS_INITIALIZED;
+			$this->_stage = self::CS_INITIALIZED;
 		}
 	}
 
@@ -1284,23 +1284,23 @@ 
 	 */
 	protected function loadRecursive()
 	{
-		if($this->_stage<self::CS_LOADED)
+		if ($this->_stage < self::CS_LOADED)
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
+			if (isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onLoad(null);
 			else
 				$this->onLoad(null);
 		}
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 					$control->loadRecursive();
 			}
 		}
-		if($this->_stage<self::CS_LOADED)
-			$this->_stage=self::CS_LOADED;
+		if ($this->_stage < self::CS_LOADED)
+			$this->_stage = self::CS_LOADED;
 	}
 
 	/**
@@ -1311,24 +1311,24 @@ 
 	{
 		$this->autoDataBindProperties();
 
-		if($this->getVisible(false))
+		if ($this->getVisible(false))
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
+			if (isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onPreRender(null);
 			else
 				$this->onPreRender(null);
-			if($this->getHasControls())
+			if ($this->getHasControls())
 			{
-				foreach($this->_rf[self::RF_CONTROLS] as $control)
+				foreach ($this->_rf[self::RF_CONTROLS] as $control)
 				{
-					if($control instanceof TControl)
+					if ($control instanceof TControl)
 						$control->preRenderRecursive();
-					else if($control instanceof TCompositeLiteral)
+					else if ($control instanceof TCompositeLiteral)
 						$control->evaluateDynamicContent();
 				}
 			}
 		}
-		$this->_stage=self::CS_PRERENDERED;
+		$this->_stage = self::CS_PRERENDERED;
 	}
 
 	/**
@@ -1337,15 +1337,15 @@ 
 	 */
 	protected function unloadRecursive()
 	{
-		if(!($this->_flags & self::IS_ID_SET))
-			$this->_id='';
-		if($this->getHasControls())
+		if (!($this->_flags & self::IS_ID_SET))
+			$this->_id = '';
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof TControl)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
+				if ($control instanceof TControl)
 					$control->unloadRecursive();
 		}
-		if(isset($this->_rf[self::RF_ADAPTER]))
+		if (isset($this->_rf[self::RF_ADAPTER]))
 			$this->_rf[self::RF_ADAPTER]->onUnload(null);
 		else
 			$this->onUnload(null);
@@ -1360,7 +1360,7 @@ 
 	 */
 	public function onInit($param)
 	{
-		$this->raiseEvent('OnInit',$this,$param);
+		$this->raiseEvent('OnInit', $this, $param);
 	}
 
 	/**
@@ -1372,7 +1372,7 @@ 
 	 */
 	public function onLoad($param)
 	{
-		$this->raiseEvent('OnLoad',$this,$param);
+		$this->raiseEvent('OnLoad', $this, $param);
 	}
 
 	/**
@@ -1382,8 +1382,8 @@ 
 	 */
 	public function onDataBinding($param)
 	{
-		Prado::trace("onDataBinding()",'System.Web.UI.TControl');
-		$this->raiseEvent('OnDataBinding',$this,$param);
+		Prado::trace("onDataBinding()", 'System.Web.UI.TControl');
+		$this->raiseEvent('OnDataBinding', $this, $param);
 	}
 
 
@@ -1396,7 +1396,7 @@ 
 	 */
 	public function onUnload($param)
 	{
-		$this->raiseEvent('OnUnload',$this,$param);
+		$this->raiseEvent('OnUnload', $this, $param);
 	}
 
 	/**
@@ -1408,7 +1408,7 @@ 
 	 */
 	public function onPreRender($param)
 	{
-		$this->raiseEvent('OnPreRender',$this,$param);
+		$this->raiseEvent('OnPreRender', $this, $param);
 	}
 
 	/**
@@ -1418,12 +1418,12 @@ 
 	 * @param TEventParameter event parameter
 	 * @see bubbleEvent
 	 */
-	protected function raiseBubbleEvent($sender,$param)
+	protected function raiseBubbleEvent($sender, $param)
 	{
-		$control=$this;
-		while($control=$control->_parent)
+		$control = $this;
+		while ($control = $control->_parent)
 		{
-			if($control->bubbleEvent($sender,$param))
+			if ($control->bubbleEvent($sender, $param))
 				break;
 		}
 	}
@@ -1437,7 +1437,7 @@ 
 	 * @return boolean true if the event bubbling is handled and no more bubbling.
 	 * @see raiseBubbleEvent
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		return false;
 	}
@@ -1458,10 +1458,10 @@ 
 	 * @param TControl sender of this event
 	 * @param TEventParameter event parameter
 	 */
-	public function broadcastEvent($name,$sender,$param)
+	public function broadcastEvent($name, $sender, $param)
 	{
-		$rootControl=(($page=$this->getPage())===null)?$this:$page;
-		$rootControl->broadcastEventInternal($name,$sender,new TBroadcastEventParameter($name,$param));
+		$rootControl = (($page = $this->getPage()) === null) ? $this : $page;
+		$rootControl->broadcastEventInternal($name, $sender, new TBroadcastEventParameter($name, $param));
 	}
 
 	/**
@@ -1471,18 +1471,18 @@ 
 	 * @param TControl sender of the event
 	 * @param TBroadcastEventParameter event parameter
 	 */
-	private function broadcastEventInternal($name,$sender,$param)
+	private function broadcastEventInternal($name, $sender, $param)
 	{
-		if($this->hasEvent($name))
-			$this->raiseEvent($name,$sender,$param->getParameter());
-		if($this instanceof IBroadcastEventReceiver)
-			$this->broadcastEventReceived($sender,$param);
-		if($this->getHasControls())
+		if ($this->hasEvent($name))
+			$this->raiseEvent($name, $sender, $param->getParameter());
+		if ($this instanceof IBroadcastEventReceiver)
+			$this->broadcastEventReceived($sender, $param);
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
-					$control->broadcastEventInternal($name,$sender,$param);
+				if ($control instanceof TControl)
+					$control->broadcastEventInternal($name, $sender, $param);
 			}
 		}
 	}
@@ -1504,22 +1504,22 @@ 
 	 * @param callback callback invoked before traversing child controls. If null, it is ignored.
 	 * @param callback callback invoked after traversing child controls. If null, it is ignored.
 	 */
-	protected function traverseChildControls($param,$preCallback=null,$postCallback=null)
+	protected function traverseChildControls($param, $preCallback = null, $postCallback = null)
 	{
-		if($preCallback!==null)
-			call_user_func($preCallback,$this,$param);
-		if($this->getHasControls())
+		if ($preCallback !== null)
+			call_user_func($preCallback, $this, $param);
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 				{
-					$control->traverseChildControls($param,$preCallback,$postCallback);
+					$control->traverseChildControls($param, $preCallback, $postCallback);
 				}
 			}
 		}
-		if($postCallback!==null)
-			call_user_func($postCallback,$this,$param);
+		if ($postCallback !== null)
+			call_user_func($postCallback, $this, $param);
 	}
 
 	/**
@@ -1529,9 +1529,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);
@@ -1558,15 +1558,15 @@ 
 	 */
 	public function renderChildren($writer)
 	{
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if(is_string($control))
+				if (is_string($control))
 					$writer->write($control);
-				else if($control instanceof TControl)
+				else if ($control instanceof TControl)
 					$control->renderControl($writer);
-				else if($control instanceof IRenderable)
+				else if ($control instanceof IRenderable)
 					$control->render($writer);
 			}
 		}
@@ -1596,47 +1596,47 @@ 
 	 * @param array the collection of the state
 	 * @param boolean whether the viewstate should be loaded
 	 */
-	protected function loadStateRecursive(&$state,$needViewState=true)
+	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]))
+			$needViewState = ($needViewState && !($this->_flags & self::IS_DISABLE_VIEWSTATE));
+			if (isset($state[1]))
 			{
-				$this->_rf[self::RF_CONTROLSTATE]=&$state[1];
+				$this->_rf[self::RF_CONTROLSTATE] = &$state[1];
 				unset($state[1]);
 			}
 			else
 				unset($this->_rf[self::RF_CONTROLSTATE]);
-			if($needViewState)
+			if ($needViewState)
 			{
-				if(isset($state[0]))
-					$this->_viewState=&$state[0];
+				if (isset($state[0]))
+					$this->_viewState = &$state[0];
 				else
-					$this->_viewState=array();
+					$this->_viewState = array();
 			}
 			unset($state[0]);
-			if($this->getHasControls())
+			if ($this->getHasControls())
 			{
-				foreach($this->_rf[self::RF_CONTROLS] as $control)
+				foreach ($this->_rf[self::RF_CONTROLS] as $control)
 				{
-					if($control instanceof TControl)
+					if ($control instanceof TControl)
 					{
-						if(isset($state[$control->_id]))
+						if (isset($state[$control->_id]))
 						{
-							$control->loadStateRecursive($state[$control->_id],$needViewState);
+							$control->loadStateRecursive($state[$control->_id], $needViewState);
 							unset($state[$control->_id]);
 						}
 					}
 				}
 			}
-			if(!empty($state))
-				$this->_rf[self::RF_CHILD_STATE]=&$state;
+			if (!empty($state))
+				$this->_rf[self::RF_CHILD_STATE] = &$state;
 		}
-		$this->_stage=self::CS_STATE_LOADED;
-		if(isset($this->_rf[self::RF_ADAPTER]))
+		$this->_stage = self::CS_STATE_LOADED;
+		if (isset($this->_rf[self::RF_ADAPTER]))
 			$this->_rf[self::RF_ADAPTER]->loadState();
 		else
 			$this->loadState();
@@ -1648,29 +1648,29 @@ 
 	 * @param boolean whether the viewstate should be saved
 	 * @return array the collection of the control state (including its children's state).
 	 */
-	protected function &saveStateRecursive($needViewState=true)
+	protected function &saveStateRecursive($needViewState = true)
 	{
-		if(isset($this->_rf[self::RF_ADAPTER]))
+		if (isset($this->_rf[self::RF_ADAPTER]))
 			$this->_rf[self::RF_ADAPTER]->saveState();
 		else
 			$this->saveState();
-		$needViewState=($needViewState && !($this->_flags & self::IS_DISABLE_VIEWSTATE));
-		$state=array();
-		if($this->getHasControls())
+		$needViewState = ($needViewState && !($this->_flags & self::IS_DISABLE_VIEWSTATE));
+		$state = array();
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				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;
 	}
 
@@ -1681,13 +1681,13 @@ 
 	 */
 	public function applyStyleSheetSkin($page)
 	{
-		if($page && !($this->_flags & self::IS_STYLESHEET_APPLIED))
+		if ($page && !($this->_flags & self::IS_STYLESHEET_APPLIED))
 		{
 			$page->applyControlStyleSheet($this);
 			$this->_flags |= self::IS_STYLESHEET_APPLIED;
 		}
-		else if($this->_flags & self::IS_STYLESHEET_APPLIED)
-			throw new TInvalidOperationException('control_stylesheet_applied',get_class($this));
+		else if ($this->_flags & self::IS_STYLESHEET_APPLIED)
+			throw new TInvalidOperationException('control_stylesheet_applied', get_class($this));
 	}
 
 	/**
@@ -1697,13 +1697,13 @@ 
 	 */
 	private function clearCachedUniqueID($recursive)
 	{
-		if($recursive && $this->_uid!==null && isset($this->_rf[self::RF_CONTROLS]))
+		if ($recursive && $this->_uid !== null && isset($this->_rf[self::RF_CONTROLS]))
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof TControl)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
+				if ($control instanceof TControl)
 					$control->clearCachedUniqueID($recursive);
 		}
-		$this->_uid=null;
+		$this->_uid = null;
 	}
 
 	/**
@@ -1712,10 +1712,10 @@ 
 	private function generateAutomaticID()
 	{
 		$this->_flags &= ~self::IS_ID_SET;
-		if(!isset($this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]))
-			$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]=0;
-		$id=$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]++;
-		$this->_id=self::AUTOMATIC_ID_PREFIX . $id;
+		if (!isset($this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]))
+			$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID] = 0;
+		$id = $this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]++;
+		$this->_id = self::AUTOMATIC_ID_PREFIX . $id;
 		$this->_namingContainer->clearNameTable();
 	}
 
@@ -1733,21 +1733,21 @@ 
 	 * @param TControlCollection list of controls
 	 * @throws TInvalidDataValueException if a control's ID is not unique within its naming container.
 	 */
-	private function fillNameTable($container,$controls)
+	private function fillNameTable($container, $controls)
 	{
-		foreach($controls as $control)
+		foreach ($controls as $control)
 		{
-			if($control instanceof TControl)
+			if ($control instanceof TControl)
 			{
-				if($control->_id!=='')
+				if ($control->_id !== '')
 				{
-					if(isset($container->_rf[self::RF_NAMED_CONTROLS][$control->_id]))
-						throw new TInvalidDataValueException('control_id_nonunique',get_class($control),$control->_id);
+					if (isset($container->_rf[self::RF_NAMED_CONTROLS][$control->_id]))
+						throw new TInvalidDataValueException('control_id_nonunique', get_class($control), $control->_id);
 					else
-						$container->_rf[self::RF_NAMED_CONTROLS][$control->_id]=$control;
+						$container->_rf[self::RF_NAMED_CONTROLS][$control->_id] = $control;
 				}
-				if(!($control instanceof INamingContainer) && $control->getHasControls())
-					$this->fillNameTable($container,$control->_rf[self::RF_CONTROLS]);
+				if (!($control instanceof INamingContainer) && $control->getHasControls())
+					$this->fillNameTable($container, $control->_rf[self::RF_CONTROLS]);
 			}
 		}
 	}
@@ -1777,10 +1777,10 @@ 
 	 * @param TControl the control that owns this collection.
 	 * @param boolean whether the list is read-only
 	 */
-	public function __construct(TControl $owner,$readOnly=false)
+	public function __construct(TControl $owner, $readOnly = false)
 	{
-		$this->_o=$owner;
-		parent::__construct(null,$readOnly);
+		$this->_o = $owner;
+		parent::__construct(null, $readOnly);
 	}
 
 	/**
@@ -1799,15 +1799,15 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is neither a string nor a TControl.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if($item instanceof TControl)
+		if ($item instanceof TControl)
 		{
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 			$this->_o->addedControl($item);
 		}
-		else if(is_string($item) || ($item instanceof IRenderable))
-			parent::insertAt($index,$item);
+		else if (is_string($item) || ($item instanceof IRenderable))
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('controlcollection_control_required');
 	}
@@ -1821,8 +1821,8 @@ 
 	 */
 	public function removeAt($index)
 	{
-		$item=parent::removeAt($index);
-		if($item instanceof TControl)
+		$item = parent::removeAt($index);
+		if ($item instanceof TControl)
 			$this->_o->removedControl($item);
 		return $item;
 	}
@@ -1833,7 +1833,7 @@ 
 	public function clear()
 	{
 		parent::clear();
-		if($this->_o instanceof INamingContainer)
+		if ($this->_o instanceof INamingContainer)
 			$this->_o->clearNamingContainer();
 	}
 }
@@ -1856,7 +1856,7 @@ 
 	 */
 	public function __construct(TControl $owner)
 	{
-		parent::__construct($owner,true);
+		parent::__construct($owner, true);
 	}
 
 	/**
@@ -1865,10 +1865,10 @@ 
 	 * @param integer the speicified position.
 	 * @param mixed new item
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
-		if(!is_string($item))  // string is possible if property tag is used. we simply ignore it in this case
-			parent::insertAt($index,$item);  // this will generate an exception in parent implementation
+		if (!is_string($item))  // string is possible if property tag is used. we simply ignore it in this case
+			parent::insertAt($index, $item); // this will generate an exception in parent implementation
 	}
 }
 
@@ -1923,7 +1923,7 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the control has been changed
 	 */
-	public function loadPostData($key,$values);
+	public function loadPostData($key, $values);
 	/**
 	 * Raises postdata changed event.
 	 * The implementation of this function should raise appropriate event(s) (e.g. OnTextChanged)
@@ -2019,7 +2019,7 @@ 
 	 * @param TControl sender of the event
 	 * @param TBroadCastEventParameter event parameter
 	 */
-	public function broadcastEventReceived($sender,$param);
+	public function broadcastEventReceived($sender, $param);
 }
 
 /**
@@ -2192,10 +2192,10 @@ 
 	 * @param string name of the broadcast event
 	 * @param mixed parameter of the broadcast event
 	 */
-	public function __construct($name='',$parameter=null)
+	public function __construct($name = '', $parameter = null)
 	{
-		$this->_name=$name;
-		$this->_param=$parameter;
+		$this->_name = $name;
+		$this->_param = $parameter;
 	}
 
 	/**
@@ -2211,7 +2211,7 @@ 
 	 */
 	public function setName($value)
 	{
-		$this->_name=$value;
+		$this->_name = $value;
 	}
 
 	/**
@@ -2227,7 +2227,7 @@ 
 	 */
 	public function setParameter($value)
 	{
-		$this->_param=$value;
+		$this->_param = $value;
 	}
 }
 
@@ -2253,10 +2253,10 @@ 
 	 * @param string name of the command
 	 * @param string parameter of the command
 	 */
-	public function __construct($name='',$parameter='')
+	public function __construct($name = '', $parameter = '')
 	{
-		$this->_name=$name;
-		$this->_param=$parameter;
+		$this->_name = $name;
+		$this->_param = $parameter;
 	}
 
 	/**
@@ -2289,14 +2289,14 @@ 
  */
 class TCompositeLiteral extends TComponent implements IRenderable, IBindable
 {
-	const TYPE_EXPRESSION=0;
-	const TYPE_STATEMENTS=1;
-	const TYPE_DATABINDING=2;
-	private $_container=null;
-	private $_items=array();
-	private $_expressions=array();
-	private $_statements=array();
-	private $_bindings=array();
+	const TYPE_EXPRESSION = 0;
+	const TYPE_STATEMENTS = 1;
+	const TYPE_DATABINDING = 2;
+	private $_container = null;
+	private $_items = array();
+	private $_expressions = array();
+	private $_statements = array();
+	private $_bindings = array();
 
 	/**
 	 * Constructor.
@@ -2304,23 +2304,23 @@ 
 	 */
 	public function __construct($items)
 	{
-		$this->_items=array();
-		$this->_expressions=array();
-		$this->_statements=array();
-		foreach($items as $id=>$item)
+		$this->_items = array();
+		$this->_expressions = array();
+		$this->_statements = array();
+		foreach ($items as $id=>$item)
 		{
-			if(is_array($item))
+			if (is_array($item))
 			{
-				if($item[0]===self::TYPE_EXPRESSION)
-					$this->_expressions[$id]=$item[1];
-				else if($item[0]===self::TYPE_STATEMENTS)
-					$this->_statements[$id]=$item[1];
-				else if($item[0]===self::TYPE_DATABINDING)
-					$this->_bindings[$id]=$item[1];
-				$this->_items[$id]='';
+				if ($item[0] === self::TYPE_EXPRESSION)
+					$this->_expressions[$id] = $item[1];
+				else if ($item[0] === self::TYPE_STATEMENTS)
+					$this->_statements[$id] = $item[1];
+				else if ($item[0] === self::TYPE_DATABINDING)
+					$this->_bindings[$id] = $item[1];
+				$this->_items[$id] = '';
 			}
 			else
-				$this->_items[$id]=$item;
+				$this->_items[$id] = $item;
 		}
 	}
 
@@ -2337,7 +2337,7 @@ 
 	 */
 	public function setContainer(TComponent $value)
 	{
-		$this->_container=$value;
+		$this->_container = $value;
 	}
 
 	/**
@@ -2345,11 +2345,11 @@ 
 	 */
 	public function evaluateDynamicContent()
 	{
-		$context=$this->_container===null?$this:$this->_container;
-		foreach($this->_expressions as $id=>$expression)
-			$this->_items[$id]=$context->evaluateExpression($expression);
-		foreach($this->_statements as $id=>$statement)
-			$this->_items[$id]=$context->evaluateStatements($statement);
+		$context = $this->_container === null ? $this : $this->_container;
+		foreach ($this->_expressions as $id=>$expression)
+			$this->_items[$id] = $context->evaluateExpression($expression);
+		foreach ($this->_statements as $id=>$statement)
+			$this->_items[$id] = $context->evaluateStatements($statement);
 	}
 
 	/**
@@ -2358,9 +2358,9 @@ 
 	 */
 	public function dataBind()
 	{
-		$context=$this->_container===null?$this:$this->_container;
-		foreach($this->_bindings as $id=>$binding)
-			$this->_items[$id]=$context->evaluateExpression($binding);
+		$context = $this->_container === null ? $this : $this->_container;
+		foreach ($this->_bindings as $id=>$binding)
+			$this->_items[$id] = $context->evaluateExpression($binding);
 	}
 
 	/**
@@ -2370,7 +2370,7 @@ 
 	 */
 	public function render($writer)
 	{
-		$writer->write(implode('',$this->_items));
+		$writer->write(implode('', $this->_items));
 	}
 }
 

Braces +361 added lines, -276 removed lines

@@ -189,10 +189,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);
+		}
 	}
 
 	/**
@@ -234,10 +235,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;
 	}
@@ -249,10 +251,11 @@ 
 	{
 		if(!$this->_page)
 		{
-			if($this->_parent)
-				$this->_page=$this->_parent->getPage();
-			else if($this->_tplControl)
-				$this->_page=$this->_tplControl->getPage();
+			if($this->_parent) {
+							$this->_page=$this->_parent->getPage();
+			} else if($this->_tplControl) {
+							$this->_page=$this->_tplControl->getPage();
+			}
 		}
 		return $this->_page;
 	}
@@ -282,8 +285,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;
 	}
 
@@ -297,8 +301,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();
 	}
@@ -336,10 +341,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;
+		}
 	}
 
 	/**
@@ -348,13 +354,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();
+		}
 	}
 
 	/**
@@ -366,23 +374,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);
-				else if(($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);
+				} else if(($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;
 	}
 
 	/**
@@ -429,10 +442,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;
+		}
 	}
 
 	/**
@@ -450,10 +464,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;
+		}
 	}
 
 	/**
@@ -462,12 +477,13 @@ 
 	 */
 	public function setEnableTheming($value)
 	{
-		if($this->_stage>=self::CS_CHILD_INITIALIZED)
-			throw new TInvalidOperationException('control_enabletheming_unchangeable',get_class($this),$this->getUniqueID());
-		else if(TPropertyValue::ensureBoolean($value))
-			$this->_flags &= ~self::IS_DISABLE_THEMING;
-		else
-			$this->_flags |= self::IS_DISABLE_THEMING;
+		if($this->_stage>=self::CS_CHILD_INITIALIZED) {
+					throw new TInvalidOperationException('control_enabletheming_unchangeable',get_class($this),$this->getUniqueID());
+		} else if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags &= ~self::IS_DISABLE_THEMING;
+		} else {
+					$this->_flags |= self::IS_DISABLE_THEMING;
+		}
 	}
 
 	/**
@@ -505,8 +521,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];
 	}
 
@@ -531,13 +548,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);
 	}
 
 	/**
@@ -562,13 +580,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);
 	}
 
 	/**
@@ -584,10 +603,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;
+		}
 	}
 
 	/**
@@ -598,9 +618,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);
@@ -613,10 +633,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;
+		}
 	}
 
 	/**
@@ -624,10 +645,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;
+		}
 	}
 
 	/**
@@ -647,10 +669,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;
+		}
 	}
 
 	/**
@@ -660,13 +683,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);
 	}
 
 	/**
@@ -674,10 +698,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;
+		}
 	}
 
 	/**
@@ -706,10 +731,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;
+		}
 	}
 
 	/**
@@ -743,16 +769,17 @@ 
 	 */
 	public function getViewState($key,$defaultValue=null)
 	{
-		if(isset($this->_viewState[$key]))
-			return $this->_viewState[$key]!==null?$this->_viewState[$key]:$defaultValue;
-		else if(isset($this->_tempState[$key]))
+		if(isset($this->_viewState[$key])) {
+					return $this->_viewState[$key]!==null?$this->_viewState[$key]:$defaultValue;
+		} else if(isset($this->_tempState[$key]))
 		{
-			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
-				$this->_viewState[$key]=$this->_tempState[$key];
+			if(is_object($this->_tempState[$key]) && $this->_trackViewState) {
+							$this->_viewState[$key]=$this->_tempState[$key];
+			}
 			return $this->_tempState[$key];
+		} else {
+					return $defaultValue;
 		}
-		else
-			return $defaultValue;
 	}
 
 	/**
@@ -770,18 +797,19 @@ 
 		if($this->_trackViewState)
 		{
 			unset($this->_tempState[$key]);
-			if($value===$defaultValue)
-				unset($this->_viewState[$key]);
-			else
-				$this->_viewState[$key]=$value;
-		}
-		else
+			if($value===$defaultValue) {
+							unset($this->_viewState[$key]);
+			} else {
+							$this->_viewState[$key]=$value;
+			}
+		} else
 		{
 			unset($this->_viewState[$key]);
-			if($value===$defaultValue)
-				unset($this->_tempState[$key]);
-			else
-				$this->_tempState[$key]=$value;
+			if($value===$defaultValue) {
+							unset($this->_tempState[$key]);
+			} else {
+							$this->_tempState[$key]=$value;
+			}
 		}
 	}
 
@@ -846,10 +874,12 @@ 
 		Prado::trace("Data bind properties",'System.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));
+			}
 		}
 	}
 
@@ -860,10 +890,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));
+			}
 		}
 	}
 
@@ -875,9 +907,10 @@ 
 		Prado::trace("dataBindChildren()",'System.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();
+			}
 		}
 	}
 
@@ -896,12 +929,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;
 		}
 	}
@@ -918,14 +952,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;
@@ -959,23 +993,25 @@ 
 	{
 		$id=strtr($id,'.',self::ID_SEPARATOR);
 		$container=($this instanceof INamingContainer)?$this:$this->getNamingContainer();
-		if(!$container || !$container->getHasControls())
-			return null;
+		if(!$container || !$container->getHasControls()) {
+					return null;
+		}
 		if(!isset($container->_rf[self::RF_NAMED_CONTROLS]))
 		{
 			$container->_rf[self::RF_NAMED_CONTROLS]=array();
 			$container->fillNameTable($container,$container->_rf[self::RF_CONTROLS]);
 		}
-		if(($pos=strpos($id,self::ID_SEPARATOR))===false)
-			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id])?$container->_rf[self::RF_NAMED_CONTROLS][$id]:null;
-		else
+		if(($pos=strpos($id,self::ID_SEPARATOR))===false) {
+					return isset($container->_rf[self::RF_NAMED_CONTROLS][$id])?$container->_rf[self::RF_NAMED_CONTROLS][$id]:null;
+		} else
 		{
 			$cid=substr($id,0,$pos);
 			$sid=substr($id,$pos+1);
-			if(isset($container->_rf[self::RF_NAMED_CONTROLS][$cid]))
-				return $container->_rf[self::RF_NAMED_CONTROLS][$cid]->findControl($sid);
-			else
-				return null;
+			if(isset($container->_rf[self::RF_NAMED_CONTROLS][$cid])) {
+							return $container->_rf[self::RF_NAMED_CONTROLS][$cid]->findControl($sid);
+			} else {
+							return null;
+			}
 		}
 	}
 
@@ -992,10 +1028,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;
@@ -1019,8 +1057,9 @@ 
 			{
 				if($control instanceof TControl)
 				{
-					if($control->_id===$id)
-						$controls[]=$control;
+					if($control->_id===$id) {
+											$controls[]=$control;
+					}
 					$controls=array_merge($controls,$control->findControlsByID($id));
 				}
 			}
@@ -1048,8 +1087,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;
 	}
 
@@ -1164,8 +1204,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;
 	}
 
@@ -1177,18 +1218,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);
 		}
 
@@ -1201,15 +1244,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();
+					}
 				}
 			}
 		}
@@ -1222,18 +1266,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);
 	}
 
@@ -1247,8 +1293,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)
 			{
@@ -1256,8 +1303,9 @@ 
 				{
 					$control->_namingContainer=$namingContainer;
 					$control->_page=$page;
-					if($control->_id==='' && $namingContainer)
-						$control->generateAutomaticID();
+					if($control->_id==='' && $namingContainer) {
+											$control->generateAutomaticID();
+					}
 					$control->initRecursive($namingContainer);
 				}
 			}
@@ -1270,10 +1318,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;
 		}
 	}
@@ -1286,21 +1335,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;
+		}
 	}
 
 	/**
@@ -1313,18 +1365,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();
-					else if($control instanceof TCompositeLiteral)
-						$control->evaluateDynamicContent();
+					if($control instanceof TControl) {
+											$control->preRenderRecursive();
+					} else if($control instanceof TCompositeLiteral) {
+											$control->evaluateDynamicContent();
+					}
 				}
 			}
 		}
@@ -1337,18 +1391,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);
 	}
 
 	/**
@@ -1423,8 +1480,9 @@ 
 		$control=$this;
 		while($control=$control->_parent)
 		{
-			if($control->bubbleEvent($sender,$param))
-				break;
+			if($control->bubbleEvent($sender,$param)) {
+							break;
+			}
 		}
 	}
 
@@ -1473,16 +1531,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);
+				}
 			}
 		}
 	}
@@ -1506,8 +1567,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)
@@ -1518,8 +1580,9 @@ 
 				}
 			}
 		}
-		if($postCallback!==null)
-			call_user_func($postCallback,$this,$param);
+		if($postCallback!==null) {
+					call_user_func($postCallback,$this,$param);
+		}
 	}
 
 	/**
@@ -1531,10 +1594,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);
+			}
 		}
 	}
 
@@ -1562,12 +1626,13 @@ 
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if(is_string($control))
-					$writer->write($control);
-				else if($control instanceof TControl)
-					$control->renderControl($writer);
-				else if($control instanceof IRenderable)
-					$control->render($writer);
+				if(is_string($control)) {
+									$writer->write($control);
+				} else if($control instanceof TControl) {
+									$control->renderControl($writer);
+				} else if($control instanceof IRenderable) {
+									$control->render($writer);
+				}
 			}
 		}
 	}
@@ -1607,15 +1672,16 @@ 
 			{
 				$this->_rf[self::RF_CONTROLSTATE]=&$state[1];
 				unset($state[1]);
+			} else {
+							unset($this->_rf[self::RF_CONTROLSTATE]);
 			}
-			else
-				unset($this->_rf[self::RF_CONTROLSTATE]);
 			if($needViewState)
 			{
-				if(isset($state[0]))
-					$this->_viewState=&$state[0];
-				else
-					$this->_viewState=array();
+				if(isset($state[0])) {
+									$this->_viewState=&$state[0];
+				} else {
+									$this->_viewState=array();
+				}
 			}
 			unset($state[0]);
 			if($this->getHasControls())
@@ -1632,14 +1698,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();
+		}
 	}
 
 	/**
@@ -1650,10 +1718,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=array();
 		if($this->getHasControls())
@@ -1662,15 +1731,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;
 	}
 
@@ -1685,9 +1757,9 @@ 
 		{
 			$page->applyControlStyleSheet($this);
 			$this->_flags |= self::IS_STYLESHEET_APPLIED;
+		} else if($this->_flags & self::IS_STYLESHEET_APPLIED) {
+					throw new TInvalidOperationException('control_stylesheet_applied',get_class($this));
 		}
-		else if($this->_flags & self::IS_STYLESHEET_APPLIED)
-			throw new TInvalidOperationException('control_stylesheet_applied',get_class($this));
 	}
 
 	/**
@@ -1699,9 +1771,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;
 	}
@@ -1712,8 +1785,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();
@@ -1741,13 +1815,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]);
 			}
 		}
 	}
@@ -1805,11 +1881,11 @@ 
 		{
 			parent::insertAt($index,$item);
 			$this->_o->addedControl($item);
+		} else if(is_string($item) || ($item instanceof IRenderable)) {
+					parent::insertAt($index,$item);
+		} else {
+					throw new TInvalidDataTypeException('controlcollection_control_required');
 		}
-		else if(is_string($item) || ($item instanceof IRenderable))
-			parent::insertAt($index,$item);
-		else
-			throw new TInvalidDataTypeException('controlcollection_control_required');
 	}
 
 	/**
@@ -1822,8 +1898,9 @@ 
 	public function removeAt($index)
 	{
 		$item=parent::removeAt($index);
-		if($item instanceof TControl)
-			$this->_o->removedControl($item);
+		if($item instanceof TControl) {
+					$this->_o->removedControl($item);
+		}
 		return $item;
 	}
 
@@ -1833,8 +1910,9 @@ 
 	public function clear()
 	{
 		parent::clear();
-		if($this->_o instanceof INamingContainer)
-			$this->_o->clearNamingContainer();
+		if($this->_o instanceof INamingContainer) {
+					$this->_o->clearNamingContainer();
+		}
 	}
 }
 
@@ -1867,8 +1945,11 @@ 
 	 */
 	public function insertAt($index,$item)
 	{
-		if(!is_string($item))  // string is possible if property tag is used. we simply ignore it in this case
-			parent::insertAt($index,$item);  // this will generate an exception in parent implementation
+		if(!is_string($item)) {
+			// string is possible if property tag is used. we simply ignore it in this case
+			parent::insertAt($index,$item);
+		}
+		// this will generate an exception in parent implementation
 	}
 }
 
@@ -2311,16 +2392,17 @@ 
 		{
 			if(is_array($item))
 			{
-				if($item[0]===self::TYPE_EXPRESSION)
-					$this->_expressions[$id]=$item[1];
-				else if($item[0]===self::TYPE_STATEMENTS)
-					$this->_statements[$id]=$item[1];
-				else if($item[0]===self::TYPE_DATABINDING)
-					$this->_bindings[$id]=$item[1];
+				if($item[0]===self::TYPE_EXPRESSION) {
+									$this->_expressions[$id]=$item[1];
+				} else if($item[0]===self::TYPE_STATEMENTS) {
+									$this->_statements[$id]=$item[1];
+				} else if($item[0]===self::TYPE_DATABINDING) {
+									$this->_bindings[$id]=$item[1];
+				}
 				$this->_items[$id]='';
+			} else {
+							$this->_items[$id]=$item;
 			}
-			else
-				$this->_items[$id]=$item;
 		}
 	}
 
@@ -2346,10 +2428,12 @@ 
 	public function evaluateDynamicContent()
 	{
 		$context=$this->_container===null?$this:$this->_container;
-		foreach($this->_expressions as $id=>$expression)
-			$this->_items[$id]=$context->evaluateExpression($expression);
-		foreach($this->_statements as $id=>$statement)
-			$this->_items[$id]=$context->evaluateStatements($statement);
+		foreach($this->_expressions as $id=>$expression) {
+					$this->_items[$id]=$context->evaluateExpression($expression);
+		}
+		foreach($this->_statements as $id=>$statement) {
+					$this->_items[$id]=$context->evaluateStatements($statement);
+		}
 	}
 
 	/**
@@ -2359,8 +2443,9 @@ 
 	public function dataBind()
 	{
 		$context=$this->_container===null?$this:$this->_container;
-		foreach($this->_bindings as $id=>$binding)
-			$this->_items[$id]=$context->evaluateExpression($binding);
+		foreach($this->_bindings as $id=>$binding) {
+					$this->_items[$id]=$context->evaluateExpression($binding);
+		}
 	}
 
 	/**

framework/Web/UI/THtmlWriter.php

Doc Comments +11 added lines

@@ -86,6 +86,9 @@ 
 		return $this->_writer;
 	}
 
+	/**
+	 * @param TestWriter $writer
+	 */
 	public function setWriter($writer)
 	{
 		$this->_writer = $writer;
@@ -104,6 +107,8 @@ 
 	 * Adds an attribute to be rendered.
 	 * @param string name of the attribute
 	 * @param string value of the attribute
+	 * @param string $name
+	 * @param string $value
 	 */
 	public function addAttribute($name,$value)
 	{
@@ -113,6 +118,7 @@ 
 	/**
 	 * Removes the named attribute from rendering
 	 * @param string name of the attribute to be removed
+	 * @param string $name
 	 */
 	public function removeAttribute($name)
 	{
@@ -133,6 +139,8 @@ 
 	 * Adds a stylesheet attribute to be rendered
 	 * @param string stylesheet attribute name
 	 * @param string stylesheet attribute value
+	 * @param string $name
+	 * @param string $value
 	 */
 	public function addStyleAttribute($name,$value)
 	{
@@ -142,6 +150,7 @@ 
 	/**
 	 * Removes the named stylesheet attribute from rendering
 	 * @param string name of the stylesheet attribute to be removed
+	 * @param string $name
 	 */
 	public function removeStyleAttribute($name)
 	{
@@ -161,6 +170,7 @@ 
 	/**
 	 * Renders a string.
 	 * @param string string to be rendered
+	 * @param string $str
 	 */
 	public function write($str)
 	{
@@ -187,6 +197,7 @@ 
 	/**
 	 * Renders the openning tag.
 	 * @param string tag name
+	 * @param string $tagName
 	 */
 	public function renderBeginTag($tagName)
 	{

Spacing +31 added lines, -31 removed lines

@@ -39,7 +39,7 @@ 
 	/**
 	 * @var array list of tags are do not need a closing tag
 	 */
-	private static $_simpleTags=array(
+	private static $_simpleTags = array(
 		'area'=>true,
 		'base'=>true,
 		'basefont'=>true,
@@ -58,19 +58,19 @@ 
 	/**
 	 * @var array list of attributes to be rendered for a tag
 	 */
-	private $_attributes=array();
+	private $_attributes = array();
 	/**
 	 * @var array list of openning tags
 	 */
-	private $_openTags=array();
+	private $_openTags = array();
 	/**
 	 * @var array list of style attributes
 	 */
-	private $_styles=array();
+	private $_styles = array();
 	/**
 	 * @var ITextWriter writer
 	 */
-	private $_writer=null;
+	private $_writer = null;
 
 	/**
 	 * Constructor.
@@ -78,7 +78,7 @@ 
 	 */
 	public function __construct($writer)
 	{
-		$this->_writer=$writer;
+		$this->_writer = $writer;
 	}
 
 	public function getWriter()
@@ -96,8 +96,8 @@ 
 	 */
 	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);
 	}
 
 	/**
@@ -105,9 +105,9 @@ 
 	 * @param string name of the attribute
 	 * @param string value of the attribute
 	 */
-	public function addAttribute($name,$value)
+	public function addAttribute($name, $value)
 	{
-		$this->_attributes[THttpUtility::htmlStrip($name)]=THttpUtility::htmlEncode($value);
+		$this->_attributes[THttpUtility::htmlStrip($name)] = THttpUtility::htmlEncode($value);
 	}
 
 	/**
@@ -125,8 +125,8 @@ 
 	 */
 	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);
 	}
 
 	/**
@@ -134,9 +134,9 @@ 
 	 * @param string stylesheet attribute name
 	 * @param string stylesheet attribute value
 	 */
-	public function addStyleAttribute($name,$value)
+	public function addStyleAttribute($name, $value)
 	{
-		$this->_styles[THttpUtility::htmlStrip($name)]=THttpUtility::htmlEncode($value);
+		$this->_styles[THttpUtility::htmlStrip($name)] = THttpUtility::htmlEncode($value);
 	}
 
 	/**
@@ -171,9 +171,9 @@ 
 	 * Renders a string and appends a newline to it.
 	 * @param string string to be rendered
 	 */
-	public function writeLine($str='')
+	public function writeLine($str = '')
 	{
-		$this->_writer->write($str."\n");
+		$this->_writer->write($str . "\n");
 	}
 
 	/**
@@ -190,29 +190,29 @@ 
 	 */
 	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.';';
-			$str.='"';
+			$str .= ' style="';
+			foreach ($this->_styles as $name=>$value)
+				$str .= $name . ':' . $value . ';';
+			$str .= '"';
 		}
-		if(isset(self::$_simpleTags[$tagName]))
+		if (isset(self::$_simpleTags[$tagName]))
 		{
-			$str.=' />';
+			$str .= ' />';
 			$this->_openTags[] = '';
 		}
 		else
 		{
-			$str.='>';
+			$str .= '>';
 			$this->_openTags[] = $tagName;
 		}
 		$this->_writer->write($str);
-		$this->_attributes=array();
-		$this->_styles=array();
+		$this->_attributes = array();
+		$this->_styles = array();
 	}
 
 	/**
@@ -220,8 +220,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

@@ -96,8 +96,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);
+		}
 	}
 
 	/**
@@ -125,8 +126,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);
+		}
 	}
 
 	/**
@@ -191,21 +193,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;
@@ -220,8 +223,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/TPage.php

Doc Comments +15 added lines

@@ -278,6 +278,9 @@ 
 		$this->unloadRecursive();
 	}
 
+	/**
+	 * @param string $enc
+	 */
 	protected static function decodeUTF8($data, $enc)
 	{
 		if(is_array($data))
@@ -451,6 +454,7 @@ 
 	 * Returns a list of registered validators.
 	 * If validation group is specified, only the validators in that group will be returned.
 	 * @param string validation group
+	 * @param string $validationGroup
 	 * @return TList registered validators in the requested group. If the group is null, all validators will be returned.
 	 */
 	public function getValidators($validationGroup=null)
@@ -562,6 +566,7 @@ 
 	 * Applies a skin in the current theme to a control.
 	 * This method should only be used by framework developers.
 	 * @param TControl a control to be applied skin with
+	 * @param TControl $control
 	 */
 	public function applyControlSkin($control)
 	{
@@ -856,6 +861,7 @@ 
 	 * Processes post data.
 	 * @param TMap post data to be processed
 	 * @param boolean whether this method is invoked before {@link onLoad OnLoad}.
+	 * @param boolean $beforeLoad
 	 */
 	protected function processPostData($postData,$beforeLoad)
 	{
@@ -981,6 +987,7 @@ 
 	/**
 	 * Sets input focus on a control after the page is rendered to users.
 	 * @param TControl|string control to receive focus, or the ID of the element on the page to receive focus
+	 * @param TControl $value
 	 */
 	public function setFocus($value)
 	{
@@ -1066,6 +1073,7 @@ 
 	 * Sets the state to be stored on the client side.
 	 * This method should only be used by framework and control developers.
 	 * @param string the state to be stored on the client side
+	 * @param string $state
 	 */
 	public function setClientState($state)
 	{
@@ -1185,6 +1193,8 @@ 
 	 * referring to the context object (e.g. Page, Page.ClientScript).
 	 * @param string method name of the context object
 	 * @param array list of parameters to be passed to the action method
+	 * @param string $context
+	 * @param string $funcName
 	 */
 	public function registerCachingAction($context,$funcName,$funcParams)
 	{
@@ -1230,15 +1240,18 @@ 
 {
 	/**
 	 * @param TPage the page that this persister works for
+	 * @return TPage
 	 */
 	public function getPage();
 	/**
 	 * @param TPage the page that this persister works for
+	 * @return void
 	 */
 	public function setPage(TPage $page);
 	/**
 	 * Saves state to persistent storage.
 	 * @param mixed state to be stored
+	 * @return void
 	 */
 	public function save($state);
 	/**
@@ -1272,6 +1285,7 @@ 
 	/**
 	 * @param TPage
 	 * @param mixed state data
+	 * @param TPage $page
 	 * @return string serialized data
 	 */
 	public static function serialize($page,$data)
@@ -1291,6 +1305,7 @@ 
 	/**
 	 * @param TPage
 	 * @param string serialized data
+	 * @param TPage $page
 	 * @return mixed unserialized state data, null if data is corrupted
 	 */
 	public static function unserialize($page,$data)

Indentation +9 added lines, -9 removed lines

@@ -303,15 +303,15 @@
 
 		$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);
-
-        // 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)
-                	$this->_postData[$k]=self::decodeUTF8($v, $enc);
+		$callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
+		if(strlen($callbackEventParameter) > 0)
+			$this->_postData[TPage::FIELD_CALLBACK_PARAMETER]=TJavaScript::jsonDecode((string)$callbackEventParameter);
+
+		// 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)
+					$this->_postData[$k]=self::decodeUTF8($v, $enc);
 
 		Prado::trace("Page onPreInit()",'System.Web.UI.TPage');
 		$this->onPreInit(null);

Spacing +250 added lines, -250 removed lines

@@ -29,17 +29,17 @@ 
 	/**
 	 * system post fields
 	 */
-	const FIELD_POSTBACK_TARGET='PRADO_POSTBACK_TARGET';
-	const FIELD_POSTBACK_PARAMETER='PRADO_POSTBACK_PARAMETER';
-	const FIELD_LASTFOCUS='PRADO_LASTFOCUS';
-	const FIELD_PAGESTATE='PRADO_PAGESTATE';
-	const FIELD_CALLBACK_TARGET='PRADO_CALLBACK_TARGET';
-	const FIELD_CALLBACK_PARAMETER='PRADO_CALLBACK_PARAMETER';
+	const FIELD_POSTBACK_TARGET = 'PRADO_POSTBACK_TARGET';
+	const FIELD_POSTBACK_PARAMETER = 'PRADO_POSTBACK_PARAMETER';
+	const FIELD_LASTFOCUS = 'PRADO_LASTFOCUS';
+	const FIELD_PAGESTATE = 'PRADO_PAGESTATE';
+	const FIELD_CALLBACK_TARGET = 'PRADO_CALLBACK_TARGET';
+	const FIELD_CALLBACK_PARAMETER = 'PRADO_CALLBACK_PARAMETER';
 
 	/**
 	 * @var array system post fields
 	 */
-	private static $_systemPostFields=array(
+	private static $_systemPostFields = array(
 		'PRADO_POSTBACK_TARGET'=>true,
 		'PRADO_POSTBACK_PARAMETER'=>true,
 		'PRADO_LASTFOCUS'=>true,
@@ -58,11 +58,11 @@ 
 	/**
 	 * @var array list of registered validators
 	 */
-	private $_validators=array();
+	private $_validators = array();
 	/**
 	 * @var boolean if validation has been performed
 	 */
-	private $_validated=false;
+	private $_validated = false;
 	/**
 	 * @var TTheme page theme
 	 */
@@ -90,15 +90,15 @@ 
 	/**
 	 * @var array list of controls whose data have been changed due to the postback
 	 */
-	protected $_controlsPostDataChanged=array();
+	protected $_controlsPostDataChanged = array();
 	/**
 	 * @var array list of controls that need to load post data in the current request
 	 */
-	protected $_controlsRequiringPostData=array();
+	protected $_controlsRequiringPostData = array();
 	/**
 	 * @var array list of controls that need to load post data in the next postback
 	 */
-	protected $_controlsRegisteredForPostData=array();
+	protected $_controlsRegisteredForPostData = array();
 	/**
 	 * @var TControl control that needs to raise postback event
 	 */
@@ -110,11 +110,11 @@ 
 	/**
 	 * @var boolean whether the form has been rendered
 	 */
-	protected $_formRendered=false;
+	protected $_formRendered = false;
 	/**
 	 * @var boolean whether the current rendering is within a form
 	 */
-	protected $_inFormRender=false;
+	protected $_inFormRender = false;
 	/**
 	 * @var TControl|string the control or the ID of the element on the page to be focused when the page is sent back to user
 	 */
@@ -122,24 +122,24 @@ 
 	/**
 	 * @var string page path to this page
 	 */
-	private $_pagePath='';
+	private $_pagePath = '';
 	/**
 	 * @var boolean whether page state should be HMAC validated
 	 */
-	private $_enableStateValidation=true;
+	private $_enableStateValidation = true;
 	/**
 	 * @var boolean whether page state should be encrypted
 	 */
-	private $_enableStateEncryption=false;
+	private $_enableStateEncryption = false;
 	/**
 	 * @var boolean whether page state should be compressed
 	 * @since 3.1.6
 	 */
-	private $_enableStateCompression=true;
+	private $_enableStateCompression = true;
 	/**
 	 * @var string page state persister class name
 	 */
-	private $_statePersisterClass='System.Web.UI.TPageStatePersister';
+	private $_statePersisterClass = 'System.Web.UI.TPageStatePersister';
 	/**
 	 * @var mixed page state persister
 	 */
@@ -151,15 +151,15 @@ 
 	/**
 	 * @var string state string to be stored on the client side
 	 */
-	private $_clientState='';
+	private $_clientState = '';
 	/**
 	 * @var boolean true if loading post data.
 	 */
-	protected $_isLoadingPostData=false;
+	protected $_isLoadingPostData = false;
 	/**
 	 * @var boolean whether client supports javascript
 	 */
-	private $_enableJavaScript=true;
+	private $_enableJavaScript = true;
 	/**
 	 * @var THtmlWriter current html render writer
 	 */
@@ -181,14 +181,14 @@ 
 	 */
 	public function run($writer)
 	{
-		Prado::trace("Running page life cycles",'System.Web.UI.TPage');
+		Prado::trace("Running page life cycles", 'System.Web.UI.TPage');
 		$this->_writer = $writer;
 
 		$this->determinePostBackMode();
 
-		if($this->getIsPostBack())
+		if ($this->getIsPostBack())
 		{
-			if($this->getIsCallback())
+			if ($this->getIsCallback())
 				$this->processCallbackRequest($writer);
 			else
 				$this->processPostBackRequest($writer);
@@ -201,92 +201,92 @@ 
 
 	protected function processNormalRequest($writer)
 	{
-		Prado::trace("Page onPreInit()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreInit()", 'System.Web.UI.TPage');
 		$this->onPreInit(null);
 
-		Prado::trace("Page initRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page initRecursive()", 'System.Web.UI.TPage');
 		$this->initRecursive();
 
-		Prado::trace("Page onInitComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onInitComplete()", 'System.Web.UI.TPage');
 		$this->onInitComplete(null);
 
-		Prado::trace("Page onPreLoad()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreLoad()", 'System.Web.UI.TPage');
 		$this->onPreLoad(null);
-		Prado::trace("Page loadRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page loadRecursive()", 'System.Web.UI.TPage');
 		$this->loadRecursive();
-		Prado::trace("Page onLoadComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onLoadComplete()", 'System.Web.UI.TPage');
 		$this->onLoadComplete(null);
 
-		Prado::trace("Page preRenderRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page preRenderRecursive()", 'System.Web.UI.TPage');
 		$this->preRenderRecursive();
-		Prado::trace("Page onPreRenderComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreRenderComplete()", 'System.Web.UI.TPage');
 		$this->onPreRenderComplete(null);
 
-		Prado::trace("Page savePageState()",'System.Web.UI.TPage');
+		Prado::trace("Page savePageState()", 'System.Web.UI.TPage');
 		$this->savePageState();
-		Prado::trace("Page onSaveStateComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onSaveStateComplete()", 'System.Web.UI.TPage');
 		$this->onSaveStateComplete(null);
 
-		Prado::trace("Page renderControl()",'System.Web.UI.TPage');
+		Prado::trace("Page renderControl()", 'System.Web.UI.TPage');
 		$this->renderControl($writer);
-		Prado::trace("Page unloadRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page unloadRecursive()", 'System.Web.UI.TPage');
 		$this->unloadRecursive();
 	}
 
 	protected function processPostBackRequest($writer)
 	{
-		Prado::trace("Page onPreInit()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreInit()", 'System.Web.UI.TPage');
 		$this->onPreInit(null);
 
-		Prado::trace("Page initRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page initRecursive()", 'System.Web.UI.TPage');
 		$this->initRecursive();
 
-		Prado::trace("Page onInitComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onInitComplete()", 'System.Web.UI.TPage');
 		$this->onInitComplete(null);
 
-		$this->_restPostData=new TMap;
-		Prado::trace("Page loadPageState()",'System.Web.UI.TPage');
+		$this->_restPostData = new TMap;
+		Prado::trace("Page loadPageState()", 'System.Web.UI.TPage');
 		$this->loadPageState();
-		Prado::trace("Page processPostData()",'System.Web.UI.TPage');
-		$this->processPostData($this->_postData,true);
-		Prado::trace("Page onPreLoad()",'System.Web.UI.TPage');
+		Prado::trace("Page processPostData()", 'System.Web.UI.TPage');
+		$this->processPostData($this->_postData, true);
+		Prado::trace("Page onPreLoad()", 'System.Web.UI.TPage');
 		$this->onPreLoad(null);
-		Prado::trace("Page loadRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page loadRecursive()", 'System.Web.UI.TPage');
 		$this->loadRecursive();
-		Prado::trace("Page processPostData()",'System.Web.UI.TPage');
-		$this->processPostData($this->_restPostData,false);
-		Prado::trace("Page raiseChangedEvents()",'System.Web.UI.TPage');
+		Prado::trace("Page processPostData()", 'System.Web.UI.TPage');
+		$this->processPostData($this->_restPostData, false);
+		Prado::trace("Page raiseChangedEvents()", 'System.Web.UI.TPage');
 		$this->raiseChangedEvents();
-		Prado::trace("Page raisePostBackEvent()",'System.Web.UI.TPage');
+		Prado::trace("Page raisePostBackEvent()", 'System.Web.UI.TPage');
 		$this->raisePostBackEvent();
-		Prado::trace("Page onLoadComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onLoadComplete()", 'System.Web.UI.TPage');
 		$this->onLoadComplete(null);
 
-		Prado::trace("Page preRenderRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page preRenderRecursive()", 'System.Web.UI.TPage');
 		$this->preRenderRecursive();
-		Prado::trace("Page onPreRenderComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreRenderComplete()", 'System.Web.UI.TPage');
 		$this->onPreRenderComplete(null);
 
-		Prado::trace("Page savePageState()",'System.Web.UI.TPage');
+		Prado::trace("Page savePageState()", 'System.Web.UI.TPage');
 		$this->savePageState();
-		Prado::trace("Page onSaveStateComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onSaveStateComplete()", 'System.Web.UI.TPage');
 		$this->onSaveStateComplete(null);
 
-		Prado::trace("Page renderControl()",'System.Web.UI.TPage');
+		Prado::trace("Page renderControl()", 'System.Web.UI.TPage');
 		$this->renderControl($writer);
-		Prado::trace("Page unloadRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page unloadRecursive()", 'System.Web.UI.TPage');
 		$this->unloadRecursive();
 	}
 
 	protected static function decodeUTF8($data, $enc)
 	{
-		if(is_array($data))
+		if (is_array($data))
 		{
-			foreach($data as $k=>$v)
-				$data[$k]=self::decodeUTF8($v, $enc);
+			foreach ($data as $k=>$v)
+				$data[$k] = self::decodeUTF8($v, $enc);
 			return $data;
-		} elseif(is_string($data)) {
-			return iconv('UTF-8',$enc.'//IGNORE',$data);
+		} elseif (is_string($data)) {
+			return iconv('UTF-8', $enc . '//IGNORE', $data);
 		} else {
 			return $data;
 		}
@@ -304,38 +304,38 @@ 
 		$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')
+        if (($g = $this->getApplication()->getGlobalization(false)) !== null &&
+            strtoupper($enc = $g->getCharset()) != 'UTF-8')
                 foreach ($this->_postData as $k=>$v)
-                	$this->_postData[$k]=self::decodeUTF8($v, $enc);
+                	$this->_postData[$k] = self::decodeUTF8($v, $enc);
 
-		Prado::trace("Page onPreInit()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreInit()", 'System.Web.UI.TPage');
 		$this->onPreInit(null);
 
-		Prado::trace("Page initRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page initRecursive()", 'System.Web.UI.TPage');
 		$this->initRecursive();
 
-		Prado::trace("Page onInitComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onInitComplete()", 'System.Web.UI.TPage');
 		$this->onInitComplete(null);
 
-		$this->_restPostData=new TMap;
-		Prado::trace("Page loadPageState()",'System.Web.UI.TPage');
+		$this->_restPostData = new TMap;
+		Prado::trace("Page loadPageState()", 'System.Web.UI.TPage');
 		$this->loadPageState();
-		Prado::trace("Page processPostData()",'System.Web.UI.TPage');
-		$this->processPostData($this->_postData,true);
-		Prado::trace("Page onPreLoad()",'System.Web.UI.TPage');
+		Prado::trace("Page processPostData()", 'System.Web.UI.TPage');
+		$this->processPostData($this->_postData, true);
+		Prado::trace("Page onPreLoad()", 'System.Web.UI.TPage');
 		$this->onPreLoad(null);
-		Prado::trace("Page loadRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page loadRecursive()", 'System.Web.UI.TPage');
 		$this->loadRecursive();
 
-		Prado::trace("Page processPostData()",'System.Web.UI.TPage');
-		$this->processPostData($this->_restPostData,false);
+		Prado::trace("Page processPostData()", 'System.Web.UI.TPage');
+		$this->processPostData($this->_restPostData, false);
 
-		Prado::trace("Page raiseChangedEvents()",'System.Web.UI.TPage');
+		Prado::trace("Page raiseChangedEvents()", 'System.Web.UI.TPage');
 		$this->raiseChangedEvents();
 
 
@@ -345,17 +345,17 @@ 
 		Prado::trace("Page raisePostBackEvent()",'System.Web.UI.TPage');
 		$this->raisePostBackEvent();
 */
-		Prado::trace("Page onLoadComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onLoadComplete()", 'System.Web.UI.TPage');
 		$this->onLoadComplete(null);
 
-		Prado::trace("Page preRenderRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page preRenderRecursive()", 'System.Web.UI.TPage');
 		$this->preRenderRecursive();
-		Prado::trace("Page onPreRenderComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onPreRenderComplete()", 'System.Web.UI.TPage');
 		$this->onPreRenderComplete(null);
 
-		Prado::trace("Page savePageState()",'System.Web.UI.TPage');
+		Prado::trace("Page savePageState()", 'System.Web.UI.TPage');
 		$this->savePageState();
-		Prado::trace("Page onSaveStateComplete()",'System.Web.UI.TPage');
+		Prado::trace("Page onSaveStateComplete()", 'System.Web.UI.TPage');
 		$this->onSaveStateComplete(null);
 
 /*
@@ -364,7 +364,7 @@ 
 */
 		$this->getAdapter()->renderCallbackResponse($writer);
 
-		Prado::trace("Page unloadRecursive()",'System.Web.UI.TPage');
+		Prado::trace("Page unloadRecursive()", 'System.Web.UI.TPage');
 		$this->unloadRecursive();
 	}
 
@@ -375,7 +375,7 @@ 
 	 */
 	public function getCallbackClient()
 	{
-		if($this->getAdapter() !== null)
+		if ($this->getAdapter() !== null)
 			return $this->getAdapter()->getCallbackClientHandler();
 		else
 			return new TCallbackClientScript();
@@ -441,8 +441,8 @@ 
 	 */
 	public function setForm(TForm $form)
 	{
-		if($this->_form===null)
-			$this->_form=$form;
+		if ($this->_form === null)
+			$this->_form = $form;
 		else
 			throw new TInvalidOperationException('page_form_duplicated');
 	}
@@ -453,17 +453,17 @@ 
 	 * @param string validation group
 	 * @return TList registered validators in the requested group. If the group is null, all validators will be returned.
 	 */
-	public function getValidators($validationGroup=null)
+	public function getValidators($validationGroup = null)
 	{
-		if(!$this->_validators)
-			$this->_validators=new TList;
-		if(empty($validationGroup) === true)
+		if (!$this->_validators)
+			$this->_validators = new TList;
+		if (empty($validationGroup) === true)
 			return $this->_validators;
 		else
 		{
-			$list=new TList;
-			foreach($this->_validators as $validator)
-				if($validator->getValidationGroup()===$validationGroup)
+			$list = new TList;
+			foreach ($this->_validators as $validator)
+				if ($validator->getValidationGroup() === $validationGroup)
 					$list->add($validator);
 			return $list;
 		}
@@ -475,22 +475,22 @@ 
 	 * If validation group is specified, only the validators in that group will be invoked.
 	 * @param string validation group. If null, all validators will perform validation.
 	 */
-	public function validate($validationGroup=null)
+	public function validate($validationGroup = null)
 	{
-		Prado::trace("Page validate()",'System.Web.UI.TPage');
-		$this->_validated=true;
-		if($this->_validators && $this->_validators->getCount())
+		Prado::trace("Page validate()", 'System.Web.UI.TPage');
+		$this->_validated = true;
+		if ($this->_validators && $this->_validators->getCount())
 		{
-			if($validationGroup===null)
+			if ($validationGroup === null)
 			{
-				foreach($this->_validators as $validator)
+				foreach ($this->_validators as $validator)
 					$validator->validate();
 			}
 			else
 			{
-				foreach($this->_validators as $validator)
+				foreach ($this->_validators as $validator)
 				{
-					if($validator->getValidationGroup()===$validationGroup)
+					if ($validator->getValidationGroup() === $validationGroup)
 						$validator->validate();
 				}
 			}
@@ -505,12 +505,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;
@@ -524,8 +524,8 @@ 
 	 */
 	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;
 	}
 
@@ -535,7 +535,7 @@ 
 	 */
 	public function setTheme($value)
 	{
-		$this->_theme=empty($value)?null:$value;
+		$this->_theme = empty($value) ? null : $value;
 	}
 
 
@@ -544,8 +544,8 @@ 
 	 */
 	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;
 	}
 
@@ -555,7 +555,7 @@ 
 	 */
 	public function setStyleSheetTheme($value)
 	{
-		$this->_styleSheet=empty($value)?null:$value;
+		$this->_styleSheet = empty($value) ? null : $value;
 	}
 
 	/**
@@ -565,7 +565,7 @@ 
 	 */
 	public function applyControlSkin($control)
 	{
-		if(($theme=$this->getTheme())!==null)
+		if (($theme = $this->getTheme()) !== null)
 			$theme->applySkin($control);
 	}
 
@@ -576,7 +576,7 @@ 
 	 */
 	public function applyControlStyleSheet($control)
 	{
-		if(($theme=$this->getStyleSheetTheme())!==null)
+		if (($theme = $this->getStyleSheetTheme()) !== null)
 			$theme->applySkin($control);
 	}
 
@@ -585,16 +585,16 @@ 
 	 */
 	public function getClientScript()
 	{
-		if(!$this->_clientScript) {
+		if (!$this->_clientScript) {
 			$className = $classPath = $this->getService()->getClientScriptManagerClass();
 			Prado::using($className);
-			if(($pos=strrpos($className,'.'))!==false)
-				$className=substr($className,$pos+1);
+			if (($pos = strrpos($className, '.')) !== false)
+				$className = substr($className, $pos + 1);
 
- 			if(!class_exists($className,false) || ($className!=='TClientScriptManager' && !is_subclass_of($className,'TClientScriptManager')))
-				throw new THttpException(404,'page_csmanagerclass_invalid',$classPath);
+ 			if (!class_exists($className, false) || ($className !== 'TClientScriptManager' && !is_subclass_of($className, 'TClientScriptManager')))
+				throw new THttpException(404, 'page_csmanagerclass_invalid', $classPath);
 
-			$this->_clientScript=new $className($this);
+			$this->_clientScript = new $className($this);
 		}
 		return $this->_clientScript;
 	}
@@ -610,7 +610,7 @@ 
 	 */
 	public function onPreInit($param)
 	{
-		$this->raiseEvent('OnPreInit',$this,$param);
+		$this->raiseEvent('OnPreInit', $this, $param);
 	}
 
 	/**
@@ -623,7 +623,7 @@ 
 	 */
 	public function onInitComplete($param)
 	{
-		$this->raiseEvent('OnInitComplete',$this,$param);
+		$this->raiseEvent('OnInitComplete', $this, $param);
 	}
 
 	/**
@@ -636,7 +636,7 @@ 
 	 */
 	public function onPreLoad($param)
 	{
-		$this->raiseEvent('OnPreLoad',$this,$param);
+		$this->raiseEvent('OnPreLoad', $this, $param);
 	}
 
 	/**
@@ -649,7 +649,7 @@ 
 	 */
 	public function onLoadComplete($param)
 	{
-		$this->raiseEvent('OnLoadComplete',$this,$param);
+		$this->raiseEvent('OnLoadComplete', $this, $param);
 	}
 
 	/**
@@ -662,26 +662,26 @@ 
 	 */
 	public function onPreRenderComplete($param)
 	{
-		$this->raiseEvent('OnPreRenderComplete',$this,$param);
-		$cs=$this->getClientScript();
-		$theme=$this->getTheme();
-		if($theme instanceof ITheme)
+		$this->raiseEvent('OnPreRenderComplete', $this, $param);
+		$cs = $this->getClientScript();
+		$theme = $this->getTheme();
+		if ($theme instanceof ITheme)
 		{
-			foreach($theme->getStyleSheetFiles() as $url)
-				$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
-			foreach($theme->getJavaScriptFiles() as $url)
-				$cs->registerHeadScriptFile($url,$url);
+			foreach ($theme->getStyleSheetFiles() as $url)
+				$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
+			foreach ($theme->getJavaScriptFiles() as $url)
+				$cs->registerHeadScriptFile($url, $url);
 		}
-		$styleSheet=$this->getStyleSheetTheme();
-		if($styleSheet instanceof ITheme)
+		$styleSheet = $this->getStyleSheetTheme();
+		if ($styleSheet instanceof ITheme)
 		{
-			foreach($styleSheet->getStyleSheetFiles() as $url)
-				$cs->registerStyleSheetFile($url,$url,$this->getCssMediaType($url));
-			foreach($styleSheet->getJavaScriptFiles() as $url)
-				$cs->registerHeadScriptFile($url,$url);
+			foreach ($styleSheet->getStyleSheetFiles() as $url)
+				$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
+			foreach ($styleSheet->getJavaScriptFiles() as $url)
+				$cs->registerHeadScriptFile($url, $url);
 		}
 
-		if($cs->getRequiresHead() && $this->getHead()===null)
+		if ($cs->getRequiresHead() && $this->getHead() === null)
 			throw new TConfigurationException('page_head_required');
 	}
 
@@ -695,9 +695,9 @@ 
 	 */
 	private function getCssMediaType($url)
 	{
-		$segs=explode('.',basename($url));
-		if(isset($segs[2]))
-			return $segs[count($segs)-2];
+		$segs = explode('.', basename($url));
+		if (isset($segs[2]))
+			return $segs[count($segs) - 2];
 		else
 			return '';
 	}
@@ -711,7 +711,7 @@ 
 	 */
 	public function onSaveStateComplete($param)
 	{
-		$this->raiseEvent('OnSaveStateComplete',$this,$param);
+		$this->raiseEvent('OnSaveStateComplete', $this, $param);
 	}
 
 	/**
@@ -720,9 +720,9 @@ 
 	 */
 	private function determinePostBackMode()
 	{
-		$postData=$this->getRequest();
-		if($postData->contains(self::FIELD_PAGESTATE) || $postData->contains(self::FIELD_POSTBACK_TARGET))
-			$this->_postData=$postData;
+		$postData = $this->getRequest();
+		if ($postData->contains(self::FIELD_PAGESTATE) || $postData->contains(self::FIELD_POSTBACK_TARGET))
+			$this->_postData = $postData;
 	}
 
 	/**
@@ -730,7 +730,7 @@ 
 	 */
 	public function getIsPostBack()
 	{
-		return $this->_postData!==null;
+		return $this->_postData !== null;
 	}
 
 	/**
@@ -749,7 +749,7 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		$this->setViewState('ControlsRequiringPostBack',$this->_controlsRegisteredForPostData,array());
+		$this->setViewState('ControlsRequiringPostBack', $this->_controlsRegisteredForPostData, array());
 	}
 
 	/**
@@ -760,7 +760,7 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		$this->_controlsRequiringPostData=$this->getViewState('ControlsRequiringPostBack',array());
+		$this->_controlsRequiringPostData = $this->getViewState('ControlsRequiringPostBack', array());
 	}
 
 	/**
@@ -768,9 +768,9 @@ 
 	 */
 	protected function loadPageState()
 	{
-		Prado::trace("Loading state",'System.Web.UI.TPage');
-		$state=$this->getStatePersister()->load();
-		$this->loadStateRecursive($state,$this->getEnableViewState());
+		Prado::trace("Loading state", 'System.Web.UI.TPage');
+		$state = $this->getStatePersister()->load();
+		$this->loadStateRecursive($state, $this->getEnableViewState());
 	}
 
 	/**
@@ -778,8 +778,8 @@ 
 	 */
 	protected function savePageState()
 	{
-		Prado::trace("Saving state",'System.Web.UI.TPage');
-		$state=&$this->saveStateRecursive($this->getEnableViewState());
+		Prado::trace("Saving state", 'System.Web.UI.TPage');
+		$state = &$this->saveStateRecursive($this->getEnableViewState());
 		$this->getStatePersister()->save($state);
 	}
 
@@ -801,11 +801,11 @@ 
 	 */
 	public function registerRequiresPostData($control)
 	{
-		$id=is_string($control)?$control:$control->getUniqueID();
-		$this->_controlsRegisteredForPostData[$id]=true;
-		$params=func_get_args();
-		foreach($this->getCachingStack() as $item)
-			$item->registerAction('Page','registerRequiresPostData',array($id));
+		$id = is_string($control) ? $control : $control->getUniqueID();
+		$this->_controlsRegisteredForPostData[$id] = true;
+		$params = func_get_args();
+		foreach ($this->getCachingStack() as $item)
+			$item->registerAction('Page', 'registerRequiresPostData', array($id));
 	}
 
 	/**
@@ -813,11 +813,11 @@ 
 	 */
 	public function getPostBackEventTarget()
 	{
-		if($this->_postBackEventTarget===null && $this->_postData!==null)
+		if ($this->_postBackEventTarget === null && $this->_postData !== null)
 		{
-			$eventTarget=$this->_postData->itemAt(self::FIELD_POSTBACK_TARGET);
-			if(!empty($eventTarget))
-				$this->_postBackEventTarget=$this->findControl($eventTarget);
+			$eventTarget = $this->_postData->itemAt(self::FIELD_POSTBACK_TARGET);
+			if (!empty($eventTarget))
+				$this->_postBackEventTarget = $this->findControl($eventTarget);
 		}
 		return $this->_postBackEventTarget;
 	}
@@ -828,7 +828,7 @@ 
 	 */
 	public function setPostBackEventTarget(TControl $control)
 	{
-		$this->_postBackEventTarget=$control;
+		$this->_postBackEventTarget = $control;
 	}
 
 	/**
@@ -836,10 +836,10 @@ 
 	 */
 	public function getPostBackEventParameter()
 	{
-		if($this->_postBackEventParameter===null && $this->_postData!==null)
+		if ($this->_postBackEventParameter === null && $this->_postData !== null)
 		{
-			if(($this->_postBackEventParameter=$this->_postData->itemAt(self::FIELD_POSTBACK_PARAMETER))===null)
-				$this->_postBackEventParameter='';
+			if (($this->_postBackEventParameter = $this->_postData->itemAt(self::FIELD_POSTBACK_PARAMETER)) === null)
+				$this->_postBackEventParameter = '';
 		}
 		return $this->_postBackEventParameter;
 	}
@@ -849,7 +849,7 @@ 
 	 */
 	public function setPostBackEventParameter($value)
 	{
-		$this->_postBackEventParameter=$value;
+		$this->_postBackEventParameter = $value;
 	}
 
 	/**
@@ -857,48 +857,48 @@ 
 	 * @param TMap post data to be processed
 	 * @param boolean whether this method is invoked before {@link onLoad OnLoad}.
 	 */
-	protected function processPostData($postData,$beforeLoad)
+	protected function processPostData($postData, $beforeLoad)
 	{
-		$this->_isLoadingPostData=true;
-		if($beforeLoad)
-			$this->_restPostData=new TMap;
-		foreach($postData as $key=>$value)
+		$this->_isLoadingPostData = true;
+		if ($beforeLoad)
+			$this->_restPostData = new TMap;
+		foreach ($postData as $key=>$value)
 		{
-			if($this->isSystemPostField($key))
+			if ($this->isSystemPostField($key))
 				continue;
-			else if($control=$this->findControl($key))
+			else if ($control = $this->findControl($key))
 			{
-				if($control instanceof IPostBackDataHandler)
+				if ($control instanceof IPostBackDataHandler)
 				{
-					if($control->loadPostData($key,$postData))
-						$this->_controlsPostDataChanged[]=$control;
+					if ($control->loadPostData($key, $postData))
+						$this->_controlsPostDataChanged[] = $control;
 				}
-				else if($control instanceof IPostBackEventHandler &&
+				else if ($control instanceof IPostBackEventHandler &&
 					empty($this->_postData[self::FIELD_POSTBACK_TARGET]))
 				{
-					$this->_postData->add(self::FIELD_POSTBACK_TARGET,$key);  // 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]);
 			}
-			else if($beforeLoad)
-				$this->_restPostData->add($key,$value);
+			else if ($beforeLoad)
+				$this->_restPostData->add($key, $value);
 		}
 
-		foreach($this->_controlsRequiringPostData as $key=>$value)
+		foreach ($this->_controlsRequiringPostData as $key=>$value)
 		{
-			if($control=$this->findControl($key))
+			if ($control = $this->findControl($key))
 			{
-				if($control instanceof IPostBackDataHandler)
+				if ($control instanceof IPostBackDataHandler)
 				{
-					if($control->loadPostData($key,$this->_postData))
-						$this->_controlsPostDataChanged[]=$control;
+					if ($control->loadPostData($key, $this->_postData))
+						$this->_controlsPostDataChanged[] = $control;
 				}
 				else
-					throw new TInvalidDataValueException('page_postbackcontrol_invalid',$key);
+					throw new TInvalidDataValueException('page_postbackcontrol_invalid', $key);
 				unset($this->_controlsRequiringPostData[$key]);
 			}
 		}
-		$this->_isLoadingPostData=false;
+		$this->_isLoadingPostData = false;
 	}
 
 	/**
@@ -914,7 +914,7 @@ 
 	 */
 	protected function raiseChangedEvents()
 	{
-		foreach($this->_controlsPostDataChanged as $control)
+		foreach ($this->_controlsPostDataChanged as $control)
 			$control->raisePostDataChangedEvent();
 	}
 
@@ -923,9 +923,9 @@ 
 	 */
 	protected function raisePostBackEvent()
 	{
-		if(($postBackHandler=$this->getPostBackEventTarget())===null)
+		if (($postBackHandler = $this->getPostBackEventTarget()) === null)
 			$this->validate();
-		else if($postBackHandler instanceof IPostBackEventHandler)
+		else if ($postBackHandler instanceof IPostBackEventHandler)
 			$postBackHandler->raisePostBackEvent($this->getPostBackEventParameter());
 	}
 
@@ -944,8 +944,8 @@ 
 	 */
 	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);
 	}
 
 	/**
@@ -953,11 +953,11 @@ 
 	 */
 	public function beginFormRender($writer)
 	{
-		if($this->_formRendered)
+		if ($this->_formRendered)
 			throw new TConfigurationException('page_form_duplicated');
-		$this->_formRendered=true;
-		$this->getClientScript()->registerHiddenField(self::FIELD_PAGESTATE,$this->getClientState());
-		$this->_inFormRender=true;
+		$this->_formRendered = true;
+		$this->getClientScript()->registerHiddenField(self::FIELD_PAGESTATE, $this->getClientState());
+		$this->_inFormRender = true;
 	}
 
 	/**
@@ -965,17 +965,17 @@ 
 	 */
 	public function endFormRender($writer)
 	{
-		if($this->_focus)
+		if ($this->_focus)
 		{
-			if(($this->_focus instanceof TControl) && $this->_focus->getVisible(true))
-				$focus=$this->_focus->getClientID();
+			if (($this->_focus instanceof TControl) && $this->_focus->getVisible(true))
+				$focus = $this->_focus->getClientID();
 			else
-				$focus=$this->_focus;
+				$focus = $this->_focus;
 			$this->getClientScript()->registerFocusControl($focus);
 		}
-		else if($this->_postData && ($lastFocus=$this->_postData->itemAt(self::FIELD_LASTFOCUS))!==null)
+		else if ($this->_postData && ($lastFocus = $this->_postData->itemAt(self::FIELD_LASTFOCUS)) !== null)
 			$this->getClientScript()->registerFocusControl($lastFocus);
-		$this->_inFormRender=false;
+		$this->_inFormRender = false;
 	}
 
 	/**
@@ -984,7 +984,7 @@ 
 	 */
 	public function setFocus($value)
 	{
-		$this->_focus=$value;
+		$this->_focus = $value;
 	}
 
 	/**
@@ -1000,7 +1000,7 @@ 
 	 */
 	public function setClientSupportsJavaScript($value)
 	{
-		$this->_enableJavaScript=TPropertyValue::ensureBoolean($value);
+		$this->_enableJavaScript = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -1017,13 +1017,13 @@ 
 	 */
 	public function setHead(THead $value)
 	{
-		if($this->_head)
+		if ($this->_head)
 			throw new TInvalidOperationException('page_head_duplicated');
-		$this->_head=$value;
-		if($this->_title!==null)
+		$this->_head = $value;
+		if ($this->_title !== null)
 		{
 			$this->_head->setTitle($this->_title);
-			$this->_title=null;
+			$this->_title = null;
 		}
 	}
 
@@ -1032,10 +1032,10 @@ 
 	 */
 	public function getTitle()
 	{
-		if($this->_head)
+		if ($this->_head)
 			return $this->_head->getTitle();
 		else
-			return $this->_title===null ? '' : $this->_title;
+			return $this->_title === null ? '' : $this->_title;
 	}
 
 	/**
@@ -1046,10 +1046,10 @@ 
 	 */
 	public function setTitle($value)
 	{
-		if($this->_head)
+		if ($this->_head)
 			$this->_head->setTitle($value);
 		else
-			$this->_title=$value;
+			$this->_title = $value;
 	}
 
 	/**
@@ -1069,7 +1069,7 @@ 
 	 */
 	public function setClientState($state)
 	{
-		$this->_clientState=$state;
+		$this->_clientState = $state;
 	}
 
 	/**
@@ -1093,7 +1093,7 @@ 
 	 */
 	public function setStatePersisterClass($value)
 	{
-		$this->_statePersisterClass=$value;
+		$this->_statePersisterClass = $value;
 	}
 
 	/**
@@ -1101,10 +1101,10 @@ 
 	 */
 	public function getStatePersister()
 	{
-		if($this->_statePersister===null)
+		if ($this->_statePersister === null)
 		{
-			$this->_statePersister=Prado::createComponent($this->_statePersisterClass);
-			if(!($this->_statePersister instanceof IPageStatePersister))
+			$this->_statePersister = Prado::createComponent($this->_statePersisterClass);
+			if (!($this->_statePersister instanceof IPageStatePersister))
 				throw new TInvalidDataTypeException('page_statepersister_invalid');
 			$this->_statePersister->setPage($this);
 		}
@@ -1124,7 +1124,7 @@ 
 	 */
 	public function setEnableStateValidation($value)
 	{
-		$this->_enableStateValidation=TPropertyValue::ensureBoolean($value);
+		$this->_enableStateValidation = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -1140,7 +1140,7 @@ 
 	 */
 	public function setEnableStateEncryption($value)
 	{
-		$this->_enableStateEncryption=TPropertyValue::ensureBoolean($value);
+		$this->_enableStateEncryption = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -1158,7 +1158,7 @@ 
 	 */
 	public function setEnableStateCompression($value)
 	{
-		$this->_enableStateCompression=TPropertyValue::ensureBoolean($value);
+		$this->_enableStateCompression = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -1174,7 +1174,7 @@ 
 	 */
 	public function setPagePath($value)
 	{
-		$this->_pagePath=$value;
+		$this->_pagePath = $value;
 	}
 
 	/**
@@ -1186,12 +1186,12 @@ 
 	 * @param string method name of the context object
 	 * @param array list of parameters to be passed to the action method
 	 */
-	public function registerCachingAction($context,$funcName,$funcParams)
+	public function registerCachingAction($context, $funcName, $funcParams)
 	{
-		if($this->_cachingStack)
+		if ($this->_cachingStack)
 		{
-			foreach($this->_cachingStack as $cache)
-				$cache->registerAction($context,$funcName,$funcParams);
+			foreach ($this->_cachingStack as $cache)
+				$cache->registerAction($context, $funcName, $funcParams);
 		}
 	}
 
@@ -1200,8 +1200,8 @@ 
 	 */
 	public function getCachingStack()
 	{
-		if(!$this->_cachingStack)
-			$this->_cachingStack=new TStack;
+		if (!$this->_cachingStack)
+			$this->_cachingStack = new TStack;
 		return $this->_cachingStack;
 	}
 
@@ -1274,17 +1274,17 @@ 
 	 * @param mixed state data
 	 * @return string serialized data
 	 */
-	public static function serialize($page,$data)
+	public static function serialize($page, $data)
 	{
-		$sm=$page->getApplication()->getSecurityManager();
-		if($page->getEnableStateValidation())
-			$str=$sm->hashData(serialize($data));
+		$sm = $page->getApplication()->getSecurityManager();
+		if ($page->getEnableStateValidation())
+			$str = $sm->hashData(serialize($data));
 		else
-			$str=serialize($data);
-		if($page->getEnableStateCompression() && extension_loaded('zlib'))
-			$str=gzcompress($str);
-		if($page->getEnableStateEncryption())
-			$str=$sm->encrypt($str);
+			$str = serialize($data);
+		if ($page->getEnableStateCompression() && extension_loaded('zlib'))
+			$str = gzcompress($str);
+		if ($page->getEnableStateEncryption())
+			$str = $sm->encrypt($str);
 		return base64_encode($str);
 	}
 
@@ -1293,21 +1293,21 @@ 
 	 * @param string serialized data
 	 * @return mixed unserialized state data, null if data is corrupted
 	 */
-	public static function unserialize($page,$data)
+	public static function unserialize($page, $data)
 	{
-		$str=base64_decode($data);
-		if($str==='')
+		$str = base64_decode($data);
+		if ($str === '')
 			return null;
-		if($str!==false)
+		if ($str !== false)
 		{
-			$sm=$page->getApplication()->getSecurityManager();
-			if($page->getEnableStateEncryption())
-				$str=$sm->decrypt($str);
-			if($page->getEnableStateCompression() && extension_loaded('zlib'))
-				$str=@gzuncompress($str);
-			if($page->getEnableStateValidation())
+			$sm = $page->getApplication()->getSecurityManager();
+			if ($page->getEnableStateEncryption())
+				$str = $sm->decrypt($str);
+			if ($page->getEnableStateCompression() && extension_loaded('zlib'))
+				$str = @gzuncompress($str);
+			if ($page->getEnableStateValidation())
 			{
-				if(($str=$sm->validateData($str))!==false)
+				if (($str = $sm->validateData($str)) !== false)
 					return unserialize($str);
 			}
 			else

Braces +185 added lines, -138 removed lines

@@ -188,13 +188,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;
 	}
@@ -282,8 +283,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);
@@ -304,14 +306,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()",'System.Web.UI.TPage');
 		$this->onPreInit(null);
@@ -375,10 +379,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();
+		}
 	}
 
 	/**
@@ -441,10 +446,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');
+		}
 	}
 
 	/**
@@ -455,16 +461,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;
 		}
 	}
@@ -483,15 +491,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();
+					}
 				}
 			}
 		}
@@ -509,14 +518,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');
 	}
 
 	/**
@@ -524,8 +534,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;
 	}
 
@@ -544,8 +555,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;
 	}
 
@@ -565,8 +577,9 @@ 
 	 */
 	public function applyControlSkin($control)
 	{
-		if(($theme=$this->getTheme())!==null)
-			$theme->applySkin($control);
+		if(($theme=$this->getTheme())!==null) {
+					$theme->applySkin($control);
+		}
 	}
 
 	/**
@@ -576,8 +589,9 @@ 
 	 */
 	public function applyControlStyleSheet($control)
 	{
-		if(($theme=$this->getStyleSheetTheme())!==null)
-			$theme->applySkin($control);
+		if(($theme=$this->getStyleSheetTheme())!==null) {
+					$theme->applySkin($control);
+		}
 	}
 
 	/**
@@ -588,11 +602,13 @@ 
 		if(!$this->_clientScript) {
 			$className = $classPath = $this->getService()->getClientScriptManagerClass();
 			Prado::using($className);
-			if(($pos=strrpos($className,'.'))!==false)
-				$className=substr($className,$pos+1);
+			if(($pos=strrpos($className,'.'))!==false) {
+							$className=substr($className,$pos+1);
+			}
 
- 			if(!class_exists($className,false) || ($className!=='TClientScriptManager' && !is_subclass_of($className,'TClientScriptManager')))
-				throw new THttpException(404,'page_csmanagerclass_invalid',$classPath);
+ 			if(!class_exists($className,false) || ($className!=='TClientScriptManager' && !is_subclass_of($className,'TClientScriptManager'))) {
+ 							throw new THttpException(404,'page_csmanagerclass_invalid',$classPath);
+ 			}
 
 			$this->_clientScript=new $className($this);
 		}
@@ -667,22 +683,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');
+		}
 	}
 
 	/**
@@ -696,10 +717,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 '';
+		}
 	}
 
 	/**
@@ -721,8 +743,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;
+		}
 	}
 
 	/**
@@ -804,8 +827,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',array($id));
+		foreach($this->getCachingStack() as $item) {
+					$item->registerAction('Page','registerRequiresPostData',array($id));
+		}
 	}
 
 	/**
@@ -816,8 +840,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;
 	}
@@ -838,8 +863,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;
 	}
@@ -860,28 +886,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;
-			else if($control=$this->findControl($key))
+			if($this->isSystemPostField($key)) {
+							continue;
+			} else if($control=$this->findControl($key))
 			{
 				if($control instanceof IPostBackDataHandler)
 				{
-					if($control->loadPostData($key,$postData))
-						$this->_controlsPostDataChanged[]=$control;
-				}
-				else if($control instanceof IPostBackEventHandler &&
+					if($control->loadPostData($key,$postData)) {
+											$this->_controlsPostDataChanged[]=$control;
+					}
+				} else if($control instanceof IPostBackEventHandler &&
 					empty($this->_postData[self::FIELD_POSTBACK_TARGET]))
 				{
 					$this->_postData->add(self::FIELD_POSTBACK_TARGET,$key);  // not calling setPostBackEventTarget() because the control may be removed later
 				}
 				unset($this->_controlsRequiringPostData[$key]);
+			} else if($beforeLoad) {
+							$this->_restPostData->add($key,$value);
 			}
-			else if($beforeLoad)
-				$this->_restPostData->add($key,$value);
 		}
 
 		foreach($this->_controlsRequiringPostData as $key=>$value)
@@ -890,11 +917,12 @@ 
 			{
 				if($control instanceof IPostBackDataHandler)
 				{
-					if($control->loadPostData($key,$this->_postData))
-						$this->_controlsPostDataChanged[]=$control;
+					if($control->loadPostData($key,$this->_postData)) {
+											$this->_controlsPostDataChanged[]=$control;
+					}
+				} else {
+									throw new TInvalidDataValueException('page_postbackcontrol_invalid',$key);
 				}
-				else
-					throw new TInvalidDataValueException('page_postbackcontrol_invalid',$key);
 				unset($this->_controlsRequiringPostData[$key]);
 			}
 		}
@@ -914,8 +942,9 @@ 
 	 */
 	protected function raiseChangedEvents()
 	{
-		foreach($this->_controlsPostDataChanged as $control)
-			$control->raisePostDataChangedEvent();
+		foreach($this->_controlsPostDataChanged as $control) {
+					$control->raisePostDataChangedEvent();
+		}
 	}
 
 	/**
@@ -923,10 +952,11 @@ 
 	 */
 	protected function raisePostBackEvent()
 	{
-		if(($postBackHandler=$this->getPostBackEventTarget())===null)
-			$this->validate();
-		else if($postBackHandler instanceof IPostBackEventHandler)
-			$postBackHandler->raisePostBackEvent($this->getPostBackEventParameter());
+		if(($postBackHandler=$this->getPostBackEventTarget())===null) {
+					$this->validate();
+		} else if($postBackHandler instanceof IPostBackEventHandler) {
+					$postBackHandler->raisePostBackEvent($this->getPostBackEventParameter());
+		}
 	}
 
 	/**
@@ -944,8 +974,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);
+		}
 	}
 
 	/**
@@ -953,8 +984,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;
@@ -967,14 +999,15 @@ 
 	{
 		if($this->_focus)
 		{
-			if(($this->_focus instanceof TControl) && $this->_focus->getVisible(true))
-				$focus=$this->_focus->getClientID();
-			else
-				$focus=$this->_focus;
+			if(($this->_focus instanceof TControl) && $this->_focus->getVisible(true)) {
+							$focus=$this->_focus->getClientID();
+			} else {
+							$focus=$this->_focus;
+			}
 			$this->getClientScript()->registerFocusControl($focus);
+		} else if($this->_postData && ($lastFocus=$this->_postData->itemAt(self::FIELD_LASTFOCUS))!==null) {
+					$this->getClientScript()->registerFocusControl($lastFocus);
 		}
-		else if($this->_postData && ($lastFocus=$this->_postData->itemAt(self::FIELD_LASTFOCUS))!==null)
-			$this->getClientScript()->registerFocusControl($lastFocus);
 		$this->_inFormRender=false;
 	}
 
@@ -1017,8 +1050,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)
 		{
@@ -1032,10 +1066,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;
+		}
 	}
 
 	/**
@@ -1046,10 +1081,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;
+		}
 	}
 
 	/**
@@ -1104,8 +1140,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;
@@ -1190,8 +1227,9 @@ 
 	{
 		if($this->_cachingStack)
 		{
-			foreach($this->_cachingStack as $cache)
-				$cache->registerAction($context,$funcName,$funcParams);
+			foreach($this->_cachingStack as $cache) {
+							$cache->registerAction($context,$funcName,$funcParams);
+			}
 		}
 	}
 
@@ -1200,8 +1238,9 @@ 
 	 */
 	public function getCachingStack()
 	{
-		if(!$this->_cachingStack)
-			$this->_cachingStack=new TStack;
+		if(!$this->_cachingStack) {
+					$this->_cachingStack=new TStack;
+		}
 		return $this->_cachingStack;
 	}
 
@@ -1210,8 +1249,9 @@ 
 	 */
 	public function flushWriter()
 	{
-		if ($this->_writer)
-			$this->Response->write($this->_writer->flush());
+		if ($this->_writer) {
+					$this->Response->write($this->_writer->flush());
+		}
 	}
 
 }
@@ -1277,14 +1317,17 @@ 
 	public static function serialize($page,$data)
 	{
 		$sm=$page->getApplication()->getSecurityManager();
-		if($page->getEnableStateValidation())
-			$str=$sm->hashData(serialize($data));
-		else
-			$str=serialize($data);
-		if($page->getEnableStateCompression() && extension_loaded('zlib'))
-			$str=gzcompress($str);
-		if($page->getEnableStateEncryption())
-			$str=$sm->encrypt($str);
+		if($page->getEnableStateValidation()) {
+					$str=$sm->hashData(serialize($data));
+		} else {
+					$str=serialize($data);
+		}
+		if($page->getEnableStateCompression() && extension_loaded('zlib')) {
+					$str=gzcompress($str);
+		}
+		if($page->getEnableStateEncryption()) {
+					$str=$sm->encrypt($str);
+		}
 		return base64_encode($str);
 	}
 
@@ -1296,22 +1339,26 @@ 
 	public static function unserialize($page,$data)
 	{
 		$str=base64_decode($data);
-		if($str==='')
-			return null;
+		if($str==='') {
+					return null;
+		}
 		if($str!==false)
 		{
 			$sm=$page->getApplication()->getSecurityManager();
-			if($page->getEnableStateEncryption())
-				$str=$sm->decrypt($str);
-			if($page->getEnableStateCompression() && extension_loaded('zlib'))
-				$str=@gzuncompress($str);
+			if($page->getEnableStateEncryption()) {
+							$str=$sm->decrypt($str);
+			}
+			if($page->getEnableStateCompression() && extension_loaded('zlib')) {
+							$str=@gzuncompress($str);
+			}
 			if($page->getEnableStateValidation())
 			{
-				if(($str=$sm->validateData($str))!==false)
-					return unserialize($str);
+				if(($str=$sm->validateData($str))!==false) {
+									return unserialize($str);
+				}
+			} else {
+							return unserialize($str);
 			}
-			else
-				return unserialize($str);
 		}
 		return null;
 	}