pradosoft / prado

framework/Web/UI/ActiveControls/TTriggeredCallback.php

Doc Comments +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 	}
 
 	/**
-	 * @return array list of trigger callback options.
+	 * @return string list of trigger callback options.
 	 */
 	protected function getTriggerOptions()
 	{

Spacing +2 added lines, -2 removed lines

@@ -45,9 +45,9 @@
 	protected function getTargetControl()
 	{
 		$id = $this->getControlID();
-		if(($control=$this->findControl($id)) instanceof TControl)
+		if (($control = $this->findControl($id)) instanceof TControl)
 			return $control->getClientID();
-		if($id==='')
+		if ($id === '')
 		{
 			throw new TConfigurationException(
 				'ttriggeredcallback_invalid_controlid', get_class($this));

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)
 	{

Braces +2 added lines, -4 removed lines

@@ -235,14 +235,12 @@
 			{
 				$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);
 	}
 

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(true))
+		if ($this->getActiveControl()->canUpdateClientSide(true))
 		{
-			$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;
 	}
 
 	/**

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)
 	{

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);

Indentation +11 added lines, -11 removed lines

@@ -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

Braces +3 added lines, -1 removed lines

@@ -195,7 +195,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)
 				);

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;
 	}
 

Braces +3 added lines, -2 removed lines

@@ -152,9 +152,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;
 	}

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();

Braces +4 added lines, -4 removed lines

@@ -108,9 +108,10 @@ 
 		if(!isset($options['appendTo']))
 			$options['appendTo'] = 'form:first';
 
-		foreach($this->getControls() as $control)
-			if($control instanceof TJuiDialogButton)
+		foreach($this->getControls() as $control) {
+					if($control instanceof TJuiDialogButton)
 				$options['buttons'][] = $control->getPostBackOptions();
+		}
 
 		return $options;
 	}
@@ -193,8 +194,7 @@ 
 		{
 		  parent::renderContents($writer);
 			$this->getPage()->getCallbackClient()->replaceContent($this, $writer, false);
-		}
-		else
+		} else
 			parent::render($writer);
 	}
 }

Spacing +18 added lines, -18 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,11 +101,11 @@ 
 	{
 		$options = $this->getOptions()->toArray();
 		// always make the dialog a child of the form, or its inner inputs won't be collected
-		if(!isset($options['appendTo']))
+		if (!isset($options['appendTo']))
 			$options['appendTo'] = 'form:first';
 
-		foreach($this->getControls() as $control)
-			if($control instanceof TJuiDialogButton)
+		foreach ($this->getControls() as $control)
+			if ($control instanceof TJuiDialogButton)
 				$options['buttons'][] = $control->getPostBackOptions();
 
 		return $options;
@@ -119,10 +119,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);
 	}
 
@@ -140,7 +140,7 @@ 
 	 * Raises the OnCreate event
 	 * @param object $params event parameters
 	 */
-	public function onOpen ($params)
+	public function onOpen($params)
 	{
 		$this->raiseEvent('OnOpen', $this, $params);
 	}
@@ -164,7 +164,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);
 	}
 
@@ -185,7 +185,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);
@@ -243,8 +243,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');}"
+			));
 	}
 
 	/**
@@ -252,7 +252,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -260,14 +260,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);
 	}
@@ -279,7 +279,7 @@ 
 	 */
 	public function raiseCallbackEvent($param)
 	{
-		if($param->CallbackParameter === 'onClick')
+		if ($param->CallbackParameter === 'onClick')
 			$this->onClick($param);
 	}
 

framework/Web/UI/JuiControls/TJuiSelectable.php

Doc Comments +3 added lines

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

Spacing +20 added lines, -20 removed lines

@@ -74,9 +74,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;
@@ -107,9 +107,9 @@ 
 	{
 		$options = $this->getOptions()->toArray();
 		// overload the "OnStop" event to add information about the current selected items
-		if(isset($options['stop']))
+		if (isset($options['stop']))
 		{
-			$options['stop']=new TJavaScriptLiteral('function( event, ui ) { ui.index = new Array(); jQuery(\'#'.$this->getClientID().' .ui-selected\').each(function(idx, item){ ui.index.push(item.id) }); Prado.JuiCallback('.TJavascript::encode($this->getUniqueID()).', \'stop\', event, ui, this); }');
+			$options['stop'] = new TJavaScriptLiteral('function( event, ui ) { ui.index = new Array(); jQuery(\'#' . $this->getClientID() . ' .ui-selected\').each(function(idx, item){ ui.index.push(item.id) }); Prado.JuiCallback(' . TJavascript::encode($this->getUniqueID()) . ', \'stop\', event, ui, this); }');
 		}
 		return $options;
 	}
@@ -121,10 +121,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);
 	}
 
@@ -142,7 +142,7 @@ 
 	 * Raises the OnCreate event
 	 * @param object $params event parameters
 	 */
-	public function onCreate ($params)
+	public function onCreate($params)
 	{
 		$this->raiseEvent('OnCreate', $this, $params);
 	}
@@ -151,7 +151,7 @@ 
 	 * Raises the OnSelected event
 	 * @param object $params event parameters
 	 */
-	public function onSelected ($params)
+	public function onSelected($params)
 	{
 		$this->raiseEvent('OnSelected', $this, $params);
 	}
@@ -160,7 +160,7 @@ 
 	 * Raises the OnSelecting event
 	 * @param object $params event parameters
 	 */
-	public function onSelecting ($params)
+	public function onSelecting($params)
 	{
 		$this->raiseEvent('OnSelecting', $this, $params);
 	}
@@ -169,7 +169,7 @@ 
 	 * Raises the OnStart event
 	 * @param object $params event parameters
 	 */
-	public function onStart ($params)
+	public function onStart($params)
 	{
 		$this->raiseEvent('OnStart', $this, $params);
 	}
@@ -178,7 +178,7 @@ 
 	 * Raises the OnStop event
 	 * @param object $params event parameters
 	 */
-	public function onStop ($params)
+	public function onStop($params)
 	{
 		$this->raiseEvent('OnStop', $this, $params);
 	}
@@ -187,7 +187,7 @@ 
 	 * Raises the OnUnselected event
 	 * @param object $params event parameters
 	 */
-	public function onUnselected ($params)
+	public function onUnselected($params)
 	{
 		$this->raiseEvent('OnUnselected', $this, $params);
 	}
@@ -196,7 +196,7 @@ 
 	 * Raises the OnUnselecting event
 	 * @param object $params event parameters
 	 */
-	public function onUnselecting ($params)
+	public function onUnselecting($params)
 	{
 		$this->raiseEvent('OnUnselecting', $this, $params);
 	}
@@ -204,7 +204,7 @@ 
 	/**
 	 * @var ITemplate template for repeater items
 	 */
-	private $_repeater=null;
+	private $_repeater = null;
 
 	/**
 	 * @param array data source for Selectables.
@@ -221,7 +221,7 @@ 
 	public function dataBind()
 	{
 		parent::dataBind();
-		if($this->getPage()->getIsCallback())
+		if ($this->getPage()->getIsCallback())
 			$this->renderSelectables($this->getResponse()->createHtmlWriter());
 	}
 
@@ -230,7 +230,7 @@ 
 	 */
 	public function getSelectables()
 	{
-		if($this->_repeater===null)
+		if ($this->_repeater === null)
 			$this->_repeater = $this->createRepeater();
 		return $this->_repeater;
 	}
@@ -241,9 +241,9 @@ 
 	protected function createRepeater()
 	{
 		$repeater = Prado::createComponent('System.Web.UI.WebControls.TRepeater');
-		$repeater->setHeaderTemplate(new TJuiSelectableTemplate('<ul id="'.$this->getWidgetID().'">'));
+		$repeater->setHeaderTemplate(new TJuiSelectableTemplate('<ul id="' . $this->getWidgetID() . '">'));
 		$repeater->setFooterTemplate(new TJuiSelectableTemplate('</ul>'));
-		$repeater->setItemTemplate(new TTemplate('<li id="<%# $this->ItemIndex %>"><%# $this->DataItem %></li>',null));
+		$repeater->setItemTemplate(new TTemplate('<li id="<%# $this->ItemIndex %>"><%# $this->DataItem %></li>', null));
 		$repeater->setEmptyTemplate(new TJuiSelectableTemplate('<ul></ul>'));
 		$this->getControls()->add($repeater);
 		return $repeater;

framework/Web/UI/TForm.php

Doc Comments +1 added lines

@@ -152,6 +152,7 @@
 	 * - application/x-www-form-urlencoded : Form data is encoded as name/value pairs. This is the standard encoding format.
 	 * - multipart/form-data : Form data is encoded as a message with a separate part for each control on the page.
 	 * - text/plain : Form data is encoded in plain text, without any control or formatting characters.
+	 * @param string $value
 	 */
 	public function setEnctype($value)
 	{

Spacing +20 added lines, -20 removed lines

@@ -43,23 +43,23 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
-		$writer->addAttribute('method',$this->getMethod());
-		$uri=$this->getRequest()->getRequestURI();
-		$writer->addAttribute('action',str_replace('&','&',str_replace('&','&',$uri)));
-		if(($enctype=$this->getEnctype())!=='')
-			$writer->addAttribute('enctype',$enctype);
-
-		$attributes=$this->getAttributes();
+		$writer->addAttribute('id', $this->getClientID());
+		$writer->addAttribute('method', $this->getMethod());
+		$uri = $this->getRequest()->getRequestURI();
+		$writer->addAttribute('action', str_replace('&', '&', str_replace('&', '&', $uri)));
+		if (($enctype = $this->getEnctype()) !== '')
+			$writer->addAttribute('enctype', $enctype);
+
+		$attributes = $this->getAttributes();
 		$attributes->remove('action');
 		$writer->addAttributes($attributes);
 
-		if(($butt=$this->getDefaultButton())!=='')
+		if (($butt = $this->getDefaultButton()) !== '')
 		{
-			if(($button=$this->findControl($butt))!==null)
+			if (($button = $this->findControl($butt)) !== null)
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 			else
-				throw new TInvalidDataValueException('form_defaultbutton_invalid',$butt);
+				throw new TInvalidDataValueException('form_defaultbutton_invalid', $butt);
 		}
 	}
 
@@ -69,13 +69,13 @@ 
 	 */
 	public function render($writer)
 	{
-		$page=$this->getPage();
+		$page = $this->getPage();
 
 		$this->addAttributesToRender($writer);
 		$writer->renderBeginTag('form');
 
-		$cs=$page->getClientScript();
-		if($page->getClientSupportsJavaScript())
+		$cs = $page->getClientScript();
+		if ($page->getClientSupportsJavaScript())
 		{
 			$cs->renderHiddenFieldsBegin($writer);
 			$cs->renderScriptFilesBegin($writer);
@@ -108,7 +108,7 @@ 
 	 */
 	public function getDefaultButton()
 	{
-		return $this->getViewState('DefaultButton','');
+		return $this->getViewState('DefaultButton', '');
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 */
 	public function setDefaultButton($value)
 	{
-		$this->setViewState('DefaultButton',$value,'');
+		$this->setViewState('DefaultButton', $value, '');
 	}
 
 	/**
@@ -127,7 +127,7 @@ 
 	 */
 	public function getMethod()
 	{
-		return $this->getViewState('Method','post');
+		return $this->getViewState('Method', 'post');
 	}
 
 	/**
@@ -135,7 +135,7 @@ 
 	 */
 	public function setMethod($value)
 	{
-		$this->setViewState('Method',TPropertyValue::ensureEnum($value,'post','get'),'post');
+		$this->setViewState('Method', TPropertyValue::ensureEnum($value, 'post', 'get'), 'post');
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 */
 	public function getEnctype()
 	{
-		return $this->getViewState('Enctype','');
+		return $this->getViewState('Enctype', '');
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 */
 	public function setEnctype($value)
 	{
-		$this->setViewState('Enctype',$value,'');
+		$this->setViewState('Enctype', $value, '');
 	}
 
 	/**

Braces +1 added lines, -2 removed lines

@@ -92,8 +92,7 @@
 
 			$cs->renderScriptFilesEnd($writer);
 			$cs->renderEndScripts($writer);
-		}
-		else
+		} else
 		{
 			$cs->renderHiddenFieldsBegin($writer);
 

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);

Braces +44 added lines, -40 removed lines

@@ -192,8 +192,7 @@ 
 				$this->processCallbackRequest($writer);
 			else
 				$this->processPostBackRequest($writer);
-		}
-		else
+		} else
 			$this->processNormalRequest($writer);
 
 		$this->_writer = null;
@@ -282,8 +281,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);
@@ -310,8 +310,9 @@ 
         // 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);
+                foreach ($this->_postData as $k=>$v) {
+                                	$this->_postData[$k]=self::decodeUTF8($v, $enc);
+                }
 
 		Prado::trace("Page onPreInit()",'System.Web.UI.TPage');
 		$this->onPreInit(null);
@@ -462,9 +463,10 @@ 
 		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,10 +485,10 @@ 
 		{
 			if($validationGroup===null)
 			{
-				foreach($this->_validators as $validator)
-					$validator->validate();
-			}
-			else
+				foreach($this->_validators as $validator) {
+									$validator->validate();
+				}
+			} else
 			{
 				foreach($this->_validators as $validator)
 				{
@@ -509,13 +511,13 @@ 
 		{
 			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
+		} else
 			throw new TInvalidOperationException('page_isvalid_unknown');
 	}
 
@@ -667,18 +669,22 @@ 
 		$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)
@@ -804,8 +810,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));
+		}
 	}
 
 	/**
@@ -872,15 +879,13 @@ 
 				{
 					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
 				}
 				unset($this->_controlsRequiringPostData[$key]);
-			}
-			else if($beforeLoad)
+			} else if($beforeLoad)
 				$this->_restPostData->add($key,$value);
 		}
 
@@ -892,8 +897,7 @@ 
 				{
 					if($control->loadPostData($key,$this->_postData))
 						$this->_controlsPostDataChanged[]=$control;
-				}
-				else
+				} else
 					throw new TInvalidDataValueException('page_postbackcontrol_invalid',$key);
 				unset($this->_controlsRequiringPostData[$key]);
 			}
@@ -914,8 +918,9 @@ 
 	 */
 	protected function raiseChangedEvents()
 	{
-		foreach($this->_controlsPostDataChanged as $control)
-			$control->raisePostDataChangedEvent();
+		foreach($this->_controlsPostDataChanged as $control) {
+					$control->raisePostDataChangedEvent();
+		}
 	}
 
 	/**
@@ -972,8 +977,7 @@ 
 			else
 				$focus=$this->_focus;
 			$this->getClientScript()->registerFocusControl($focus);
-		}
-		else if($this->_postData && ($lastFocus=$this->_postData->itemAt(self::FIELD_LASTFOCUS))!==null)
+		} else if($this->_postData && ($lastFocus=$this->_postData->itemAt(self::FIELD_LASTFOCUS))!==null)
 			$this->getClientScript()->registerFocusControl($lastFocus);
 		$this->_inFormRender=false;
 	}
@@ -1190,8 +1194,9 @@ 
 	{
 		if($this->_cachingStack)
 		{
-			foreach($this->_cachingStack as $cache)
-				$cache->registerAction($context,$funcName,$funcParams);
+			foreach($this->_cachingStack as $cache) {
+							$cache->registerAction($context,$funcName,$funcParams);
+			}
 		}
 	}
 
@@ -1309,8 +1314,7 @@ 
 			{
 				if(($str=$sm->validateData($str))!==false)
 					return unserialize($str);
-			}
-			else
+			} else
 				return unserialize($str);
 		}
 		return 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

framework/Web/UI/TTemplateControl.php

Doc Comments +3 added lines, -1 removed lines

@@ -144,6 +144,7 @@ 
 	 * Registers a content control.
 	 * @param string ID of the content
 	 * @param TContent
+	 * @param string $id
 	 */
 	public function registerContent($id,TContent $object)
 	{
@@ -158,6 +159,7 @@ 
 	 * This method should only be used by framework and control developers.
 	 * @param string placeholder ID
 	 * @param TContentPlaceHolder placeholder control
+	 * @param string $id
 	 */
 	public function registerContentPlaceHolder($id,TContentPlaceHolder $object)
 	{
@@ -184,7 +186,7 @@ 
 	}
 
 	/**
-	 * @return TTemplateControl|null master control associated with this control, null if none
+	 * @return TTemplateControl master control associated with this control, null if none
 	 */
 	public function getMaster()
 	{

Indentation +84 added lines, -84 removed lines

@@ -238,90 +238,90 @@
 		parent::initRecursive($namingContainer);
 	}
         
-        /**
-         * Function to update view controls with data in a given AR object.
-         * View controls and AR object need to have the same name in IDs and Attrs respectively.
-         * @param TActiveRecord $arObj
-         * @param Boolean $throwExceptions Wheter or not to throw exceptions
-         * @author Daniel Sampedro <darthdaniel85@gmail.com>
-         */
-        public function tryToUpdateView($arObj, $throwExceptions = false)
-        {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
-                {
-                        try
-                        {
-                                if ($key != "RELATIONS")
-                                {
-                                        $control = $this->{$key};
-                                        if ($control instanceof TTextBox)
-                                                $control->Text = $arObj->{$key};
-                                        elseif ($control instanceof TCheckBox)
-                                                $control->Checked = (boolean) $arObj->{$key};
-                                        elseif ($control instanceof TDatePicker)
-                                                $control->Date = $arObj->{$key};
-                                }
-                                else
-                                {
-                                        foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
-                                        {
-                                                $relControl = $this->{$relKey};
-                                                switch ($relValues[0])
-                                                {
-                                                        case TActiveRecord::BELONGS_TO:
-                                                        case TActiveRecord::HAS_ONE:
-                                                                $relControl->Text = $arObj->{$relKey};
-                                                                break;
-                                                        case TActiveRecord::HAS_MANY:
-                                                                if ($relControl instanceof TListControl)
-                                                                {
-                                                                        $relControl->DataSource = $arObj->{$relKey};
-                                                                        $relControl->dataBind();
-                                                                }
-                                                                break;
-                                                }
-                                        }
-                                        break;
-                                }
-                        } 
-                        catch (Exception $ex)
-                        {
-                                if ($throwExceptions)
-                                        throw $ex;
-                        }
-                }
-        }
+		/**
+		 * Function to update view controls with data in a given AR object.
+		 * View controls and AR object need to have the same name in IDs and Attrs respectively.
+		 * @param TActiveRecord $arObj
+		 * @param Boolean $throwExceptions Wheter or not to throw exceptions
+		 * @author Daniel Sampedro <darthdaniel85@gmail.com>
+		 */
+		public function tryToUpdateView($arObj, $throwExceptions = false)
+		{
+				$objAttrs = get_class_vars(get_class($arObj));
+				foreach (array_keys($objAttrs) as $key)
+				{
+						try
+						{
+								if ($key != "RELATIONS")
+								{
+										$control = $this->{$key};
+										if ($control instanceof TTextBox)
+												$control->Text = $arObj->{$key};
+										elseif ($control instanceof TCheckBox)
+												$control->Checked = (boolean) $arObj->{$key};
+										elseif ($control instanceof TDatePicker)
+												$control->Date = $arObj->{$key};
+								}
+								else
+								{
+										foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
+										{
+												$relControl = $this->{$relKey};
+												switch ($relValues[0])
+												{
+														case TActiveRecord::BELONGS_TO:
+														case TActiveRecord::HAS_ONE:
+																$relControl->Text = $arObj->{$relKey};
+																break;
+														case TActiveRecord::HAS_MANY:
+																if ($relControl instanceof TListControl)
+																{
+																		$relControl->DataSource = $arObj->{$relKey};
+																		$relControl->dataBind();
+																}
+																break;
+												}
+										}
+										break;
+								}
+						} 
+						catch (Exception $ex)
+						{
+								if ($throwExceptions)
+										throw $ex;
+						}
+				}
+		}
 
-        /**
-         * Function to try to update an AR object with data in view controls.
-         * @param TActiveRecord $arObj
-         * @param Boolean $throwExceptions Wheter or not to throw exceptions
-         * @author Daniel Sampedro <darthdaniel85@gmail.com>
-         */
-        public function tryToUpdateAR($arObj, $throwExceptions = false)
-        {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
-                {
-                        try
-                        {
-                                if ($key == "RELATIONS")
-                                        break;
-                                $control = $this->{$key};
-                                if ($control instanceof TTextBox)
-                                        $arObj->{$key} = $control->Text;
-                                elseif ($control instanceof TCheckBox)
-                                        $arObj->{$key} = $control->Checked;
-                                elseif ($control instanceof TDatePicker)
-                                        $arObj->{$key} = $control->Date;
-                        } 
-                        catch (Exception $ex)
-                        {
-                                if ($throwExceptions)
-                                        throw $ex;
-                        }
-                }
-        }
+		/**
+		 * Function to try to update an AR object with data in view controls.
+		 * @param TActiveRecord $arObj
+		 * @param Boolean $throwExceptions Wheter or not to throw exceptions
+		 * @author Daniel Sampedro <darthdaniel85@gmail.com>
+		 */
+		public function tryToUpdateAR($arObj, $throwExceptions = false)
+		{
+				$objAttrs = get_class_vars(get_class($arObj));
+				foreach (array_keys($objAttrs) as $key)
+				{
+						try
+						{
+								if ($key == "RELATIONS")
+										break;
+								$control = $this->{$key};
+								if ($control instanceof TTextBox)
+										$arObj->{$key} = $control->Text;
+								elseif ($control instanceof TCheckBox)
+										$arObj->{$key} = $control->Checked;
+								elseif ($control instanceof TDatePicker)
+										$arObj->{$key} = $control->Date;
+						} 
+						catch (Exception $ex)
+						{
+								if ($throwExceptions)
+										throw $ex;
+						}
+				}
+		}
 }
 

Spacing +46 added lines, -46 removed lines

@@ -30,32 +30,32 @@ 
 	/**
 	 * template file extension.
 	 */
-	const EXT_TEMPLATE='.tpl';
+	const EXT_TEMPLATE = '.tpl';
 
 	/**
 	 * @var ITemplate the parsed template structure shared by the same control class
 	 */
-	private static $_template=array();
+	private static $_template = array();
 	/**
 	 * @var ITemplate the parsed template structure specific for this control instance
 	 */
-	private $_localTemplate=null;
+	private $_localTemplate = null;
 	/**
 	 * @var TTemplateControl the master control if any
 	 */
-	private $_master=null;
+	private $_master = null;
 	/**
 	 * @var string master control class name
 	 */
-	private $_masterClass='';
+	private $_masterClass = '';
 	/**
 	 * @var array list of TContent controls
 	 */
-	private $_contents=array();
+	private $_contents = array();
 	/**
 	 * @var array list of TContentPlaceHolder controls
 	 */
-	private $_placeholders=array();
+	private $_placeholders = array();
 
 	/**
 	 * Returns the template object associated with this control object.
@@ -63,11 +63,11 @@ 
 	 */
 	public function getTemplate()
 	{
-		if($this->_localTemplate===null)
+		if ($this->_localTemplate === null)
 		{
-			$class=get_class($this);
-			if(!isset(self::$_template[$class]))
-				self::$_template[$class]=$this->loadTemplate();
+			$class = get_class($this);
+			if (!isset(self::$_template[$class]))
+				self::$_template[$class] = $this->loadTemplate();
 			return self::$_template[$class];
 		}
 		else
@@ -82,7 +82,7 @@ 
 	 */
 	public function setTemplate($value)
 	{
-		$this->_localTemplate=$value;
+		$this->_localTemplate = $value;
 	}
 
 	/**
@@ -92,7 +92,7 @@ 
 	 */
 	public function getIsSourceTemplateControl()
 	{
-		if(($template=$this->getTemplate())!==null)
+		if (($template = $this->getTemplate()) !== null)
 			return $template->getIsSourceTemplate();
 		else
 			return false;
@@ -103,7 +103,7 @@ 
 	 */
 	public function getTemplateDirectory()
 	{
-		if(($template=$this->getTemplate())!==null)
+		if (($template = $this->getTemplate()) !== null)
 			return $template->getContextPath();
 		else
 			return '';
@@ -115,8 +115,8 @@ 
 	 */
 	protected function loadTemplate()
 	{
-		Prado::trace("Loading template ".get_class($this),'System.Web.UI.TTemplateControl');
-		$template=$this->getService()->getTemplateManager()->getTemplateByClassName(get_class($this));
+		Prado::trace("Loading template " . get_class($this), 'System.Web.UI.TTemplateControl');
+		$template = $this->getService()->getTemplateManager()->getTemplateByClassName(get_class($this));
 		return $template;
 	}
 
@@ -127,14 +127,14 @@ 
 	 */
 	public function createChildControls()
 	{
-		if($tpl=$this->getTemplate())
+		if ($tpl = $this->getTemplate())
 		{
-			foreach($tpl->getDirective() as $name=>$value)
+			foreach ($tpl->getDirective() as $name=>$value)
 			{
-				if(is_string($value))
-					$this->setSubProperty($name,$value);
+				if (is_string($value))
+					$this->setSubProperty($name, $value);
 				else
-					throw new TConfigurationException('templatecontrol_directive_invalid',get_class($this),$name);
+					throw new TConfigurationException('templatecontrol_directive_invalid', get_class($this), $name);
 			}
 			$tpl->instantiateIn($this);
 		}
@@ -145,12 +145,12 @@ 
 	 * @param string ID of the content
 	 * @param TContent
 	 */
-	public function registerContent($id,TContent $object)
+	public function registerContent($id, TContent $object)
 	{
-		if(isset($this->_contents[$id]))
-			throw new TConfigurationException('templatecontrol_contentid_duplicated',$id);
+		if (isset($this->_contents[$id]))
+			throw new TConfigurationException('templatecontrol_contentid_duplicated', $id);
 		else
-			$this->_contents[$id]=$object;
+			$this->_contents[$id] = $object;
 	}
 
 	/**
@@ -159,12 +159,12 @@ 
 	 * @param string placeholder ID
 	 * @param TContentPlaceHolder placeholder control
 	 */
-	public function registerContentPlaceHolder($id,TContentPlaceHolder $object)
+	public function registerContentPlaceHolder($id, TContentPlaceHolder $object)
 	{
-		if(isset($this->_placeholders[$id]))
-			throw new TConfigurationException('templatecontrol_placeholderid_duplicated',$id);
+		if (isset($this->_placeholders[$id]))
+			throw new TConfigurationException('templatecontrol_placeholderid_duplicated', $id);
 		else
-			$this->_placeholders[$id]=$object;
+			$this->_placeholders[$id] = $object;
 	}
 
 	/**
@@ -180,7 +180,7 @@ 
 	 */
 	public function setMasterClass($value)
 	{
-		$this->_masterClass=$value;
+		$this->_masterClass = $value;
 	}
 
 	/**
@@ -197,17 +197,17 @@ 
 	 * @param string ID of the content control
 	 * @param TContent the content to be injected
 	 */
-	public function injectContent($id,$content)
+	public function injectContent($id, $content)
 	{
-		if(isset($this->_placeholders[$id]))
+		if (isset($this->_placeholders[$id]))
 		{
-			$placeholder=$this->_placeholders[$id];
-			$controls=$placeholder->getParent()->getControls();
-			$loc=$controls->remove($placeholder);
-			$controls->insertAt($loc,$content);
+			$placeholder = $this->_placeholders[$id];
+			$controls = $placeholder->getParent()->getControls();
+			$loc = $controls->remove($placeholder);
+			$controls->insertAt($loc, $content);
 		}
 		else
-			throw new TConfigurationException('templatecontrol_placeholder_inexistent',$id);
+			throw new TConfigurationException('templatecontrol_placeholder_inexistent', $id);
 	}
 
 	/**
@@ -218,23 +218,23 @@ 
 	 * 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->_masterClass!=='')
+		if ($this->_masterClass !== '')
 		{
-			$master=Prado::createComponent($this->_masterClass);
-			if(!($master instanceof TTemplateControl))
+			$master = Prado::createComponent($this->_masterClass);
+			if (!($master instanceof TTemplateControl))
 				throw new TInvalidDataValueException('templatecontrol_mastercontrol_invalid');
-			$this->_master=$master;
+			$this->_master = $master;
 			$this->getControls()->clear();
 			$this->getControls()->add($master);
 			$master->ensureChildControls();
-			foreach($this->_contents as $id=>$content)
-				$master->injectContent($id,$content);
+			foreach ($this->_contents as $id=>$content)
+				$master->injectContent($id, $content);
 		}
-		else if(!empty($this->_contents))
-			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
+		else if (!empty($this->_contents))
+			throw new TConfigurationException('templatecontrol_mastercontrol_required', get_class($this));
 		parent::initRecursive($namingContainer);
 	}
         

Braces +9 added lines, -14 removed lines

@@ -69,8 +69,7 @@ 
 			if(!isset(self::$_template[$class]))
 				self::$_template[$class]=$this->loadTemplate();
 			return self::$_template[$class];
-		}
-		else
+		} else
 			return $this->_localTemplate;
 	}
 
@@ -205,8 +204,7 @@ 
 			$controls=$placeholder->getParent()->getControls();
 			$loc=$controls->remove($placeholder);
 			$controls->insertAt($loc,$content);
-		}
-		else
+		} else
 			throw new TConfigurationException('templatecontrol_placeholder_inexistent',$id);
 	}
 
@@ -230,10 +228,10 @@ 
 			$this->getControls()->clear();
 			$this->getControls()->add($master);
 			$master->ensureChildControls();
-			foreach($this->_contents as $id=>$content)
-				$master->injectContent($id,$content);
-		}
-		else if(!empty($this->_contents))
+			foreach($this->_contents as $id=>$content) {
+							$master->injectContent($id,$content);
+			}
+		} else if(!empty($this->_contents))
 			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
 		parent::initRecursive($namingContainer);
 	}
@@ -261,8 +259,7 @@ 
                                                 $control->Checked = (boolean) $arObj->{$key};
                                         elseif ($control instanceof TDatePicker)
                                                 $control->Date = $arObj->{$key};
-                                }
-                                else
+                                } else
                                 {
                                         foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
                                         {
@@ -284,8 +281,7 @@ 
                                         }
                                         break;
                                 }
-                        } 
-                        catch (Exception $ex)
+                        } catch (Exception $ex)
                         {
                                 if ($throwExceptions)
                                         throw $ex;
@@ -315,8 +311,7 @@ 
                                         $arObj->{$key} = $control->Checked;
                                 elseif ($control instanceof TDatePicker)
                                         $arObj->{$key} = $control->Date;
-                        } 
-                        catch (Exception $ex)
+                        } catch (Exception $ex)
                         {
                                 if ($throwExceptions)
                                         throw $ex;