pradosoft / prado

framework/Web/UI/ActiveControls/TActiveTableCell.php

Doc Comments +2 added lines

@@ -111,6 +111,7 @@ 
 	 * method, be sure to call the parent implementation so that the event
 	 * handler can be invoked.
 	 * @param TActiveTableCellEventParameter event parameter to be passed to the event handlers
+	 * @param TActiveTableCellEventParameter $param
 	 */
 	public function onCellSelected($param)
 	{
@@ -232,6 +233,7 @@ 
 
 	/**
 	 * Creates a new TActiveTableRowEventParameter.
+	 * @param THttpResponse $response
 	 */
 	public function __construct($response, $parameter, $index=-1)
 	{

Braces +18 added lines, -12 removed lines

@@ -127,8 +127,9 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('id', $this->getClientID());
-		if ($this->hasEventHandler('OnCellSelected'))
-			$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(), $this->getPostBackOptions());
+		if ($this->hasEventHandler('OnCellSelected')) {
+					$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(), $this->getPostBackOptions());
+		}
 	}
 
 	/**
@@ -143,17 +144,18 @@ 
 		if ($this->getHasPreRendered())
 		{
 			parent::render($writer);
-			if ($this->getActiveControl()->canUpdateClientSide())
-				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
-		}
-		else {
+			if ($this->getActiveControl()->canUpdateClientSide()) {
+							$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
+			}
+		} else {
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 			// If we update a TActiveTableCell on callback, we shouldn't update all childs,
 			// because the whole content will be replaced by the parent.
 			if ($this->getHasControls())
 			{
-				foreach ($this->findControlsByType('IActiveControl', false) as $control)
-					$control->getActiveControl()->setEnableUpdate(false);
+				foreach ($this->findControlsByType('IActiveControl', false) as $control) {
+									$control->getActiveControl()->setEnableUpdate(false);
+				}
 			}
 		}
 	}
@@ -178,8 +180,9 @@ 
 	 */
 	public function getCellIndex()
 	{
-		foreach ($this->getRow()->getCells() as $key => $row)
-			if ($row == $this) return $key;
+		foreach ($this->getRow()->getCells() as $key => $row) {
+					if ($row == $this) return $key;
+		}
 		throw new TConfigurationException('tactivetablecell_control_notincollection', get_class($this), $this->getUniqueID());
 	}
 
@@ -197,8 +200,11 @@ 
 			{
 				$row = $row->getParent();
 			}
-			if ($row instanceof TTableRow) $this->_row = $row;
-			else throw new TConfigurationException('tactivetablecell_control_outoftable', get_class($this), $this->getUniqueID());
+			if ($row instanceof TTableRow) {
+				$this->_row = $row;
+			} else {
+				throw new TConfigurationException('tactivetablecell_control_outoftable', get_class($this), $this->getUniqueID());
+			}
 		}
 		return $this->_row;
 	}

Indentation +13 added lines, -13 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 /**
- * TActiveTableCell class file
- *
- * @author LANDWEHR Computer und Software GmbH <programmierung@landwehr-software.de>
- * @link http://www.landwehr-software.de/
- * @copyright Copyright &copy; 2009 LANDWEHR Computer und Software GmbH
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.ActiveControls
- * @version $Id$
- */
+	 * TActiveTableCell class file
+	 *
+	 * @author LANDWEHR Computer und Software GmbH <programmierung@landwehr-software.de>
+	 * @link http://www.landwehr-software.de/
+	 * @copyright Copyright &copy; 2009 LANDWEHR Computer und Software GmbH
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.ActiveControls
+	 * @version $Id$
+	 */
 
 /**
  * Includes the following used classes
@@ -53,8 +53,8 @@ 
 {
 
 	/**
-	* @var TTable parent row control containing the cell
-	*/
+	 * @var TTable parent row control containing the cell
+	 */
 	private $_row;
 
 	/**
@@ -226,8 +226,8 @@ 
 {
 
 	/**
-	* @var integer the zero-based index of the cell.
-	*/
+	 * @var integer the zero-based index of the cell.
+	 */
 	private $_selectedCellIndex = -1;
 
 	/**

Spacing +1 added lines, -1 removed lines

@@ -251,7 +251,7 @@
 	/**
 	 * Creates a new TActiveTableRowEventParameter.
 	 */
-	public function __construct($response, $parameter, $index=-1)
+	public function __construct($response, $parameter, $index = -1)
 	{
 		parent::__construct($response, $parameter);
 		$this->_selectedRowIndex = $index;

framework/Web/UI/ActiveControls/TActiveTableRow.php

Doc Comments +3 added lines

@@ -98,6 +98,7 @@ 
 	 * TActiveTableRow.
 	 * This method is mainly used by framework and control developers.
 	 * @param TCallbackEventParameter the event parameter
+	 * @param TActiveTableCellEventParameter $param
 	 */
 	public function raiseCallbackEvent($param)
 	{
@@ -129,6 +130,7 @@ 
 	 * method, be sure to call the parent implementation so that the event
 	 * handler can be invoked.
 	 * @param TActiveTableRowEventParameter event parameter to be passed to the event handlers
+	 * @param TActiveTableRowEventParameter $param
 	 */
 	public function onRowSelected($param)
 	{
@@ -250,6 +252,7 @@ 
 
 	/**
 	 * Creates a new TActiveTableRowEventParameter.
+	 * @param THttpResponse $response
 	 */
 	public function __construct($response, $parameter, $index=-1)
 	{

Indentation +2 added lines, -2 removed lines

@@ -244,8 +244,8 @@
 class TActiveTableRowEventParameter extends TCallbackEventParameter
 {
 	/**
-	* @var integer the zero-based index of the row.
-	*/
+	 * @var integer the zero-based index of the row.
+	 */
 	private $_selectedRowIndex = -1;
 
 	/**

Spacing +1 added lines, -1 removed lines

@@ -251,7 +251,7 @@
 	/**
 	 * Creates a new TActiveTableRowEventParameter.
 	 */
-	public function __construct($response, $parameter, $index=-1)
+	public function __construct($response, $parameter, $index = -1)
 	{
 		parent::__construct($response, $parameter);
 		$this->_selectedRowIndex = $index;

Braces +20 added lines, -13 removed lines

@@ -119,8 +119,9 @@ 
 		{
 			$this->raiseCallbackEvent($param);
 			return true;
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -145,8 +146,9 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('id', $this->getClientID());
-		if ($this->hasEventHandler('OnRowSelected'))
-			$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(), $this->getPostBackOptions());
+		if ($this->hasEventHandler('OnRowSelected')) {
+					$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(), $this->getPostBackOptions());
+		}
 	}
 
 	/**
@@ -161,18 +163,19 @@ 
 		if ($this->getHasPreRendered())
 		{
 			parent::render($writer);
-			if ($this->getActiveControl()->canUpdateClientSide())
-				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
-		}
-		else
+			if ($this->getActiveControl()->canUpdateClientSide()) {
+							$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
+			}
+		} else
 		{
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 			// If we update a TActiveTableRow on callback, we shouldn't update all childs,
 			// because the whole content will be replaced by the parent.
 			if ($this->getHasControls())
 			{
-				foreach ($this->findControlsByType('IActiveControl', false) as $control)
-					$control->getActiveControl()->setEnableUpdate(false);
+				foreach ($this->findControlsByType('IActiveControl', false) as $control) {
+									$control->getActiveControl()->setEnableUpdate(false);
+				}
 			}
 		}
 	}
@@ -197,8 +200,9 @@ 
 	 */
 	public function getRowIndex()
 	{
-		foreach ($this->getTable()->getRows() as $key => $row)
-			if ($row == $this) return $key;
+		foreach ($this->getTable()->getRows() as $key => $row) {
+					if ($row == $this) return $key;
+		}
 		throw new TConfigurationException('tactivetablerow_control_notincollection', get_class($this), $this->getUniqueID());
 	}
 
@@ -216,8 +220,11 @@ 
 			{
 				$table = $table->getParent();
 			}
-			if ($table instanceof TTable) $this->_table = $table;
-			else throw new TConfigurationException('tactivetablerow_control_outoftable', get_class($this), $this->getUniqueID());
+			if ($table instanceof TTable) {
+				$this->_table = $table;
+			} else {
+				throw new TConfigurationException('tactivetablerow_control_outoftable', get_class($this), $this->getUniqueID());
+			}
 		}
 		return $this->_table;
 	}

framework/Web/UI/ActiveControls/TAutoComplete.php

Doc Comments +6 added lines

@@ -191,6 +191,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 TAutoCompleteEventParameter $param
 	 */
 	public function onSuggest($param)
 	{
@@ -203,6 +204,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 TAutoCompleteEventParameter $param
 	 */
 	public function onSuggestionSelected($param)
 	{
@@ -383,6 +385,7 @@ 
 
 	/**
 	 * Creates a new TCallbackEventParameter.
+	 * @param THttpResponse $response
 	 */
 	public function __construct($response, $parameter, $index=-1)
 	{
@@ -421,6 +424,9 @@ 
 {
 	private $_template;
 
+	/**
+	 * @param string $template
+	 */
 	public function __construct($template)
 	{
 		$this->_template = $template;

Spacing +24 added lines, -24 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;
 
 	/**
 	 * @return string word or token separators (delimiters).
@@ -120,7 +120,7 @@ 
 	 */
 	public function setFrequency($value)
 	{
-		$this->setViewState('frequency', TPropertyValue::ensureFloat($value),'');
+		$this->setViewState('frequency', TPropertyValue::ensureFloat($value), '');
 	}
 
 	/**
@@ -128,7 +128,7 @@ 
 	 */
 	public function getMinChars()
 	{
-		return $this->getViewState('minChars','');
+		return $this->getViewState('minChars', '');
 	}
 
 	/**
@@ -168,20 +168,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] === '__TAutoComplete_onSuggest__')
+			if ($token[1] === '__TAutoComplete_onSuggest__')
 			{
 				$parameter = new TAutoCompleteEventParameter($this->getResponse(), $token[0]);
 				$this->onSuggest($parameter);
 			}
-			else if($token[1] === '__TAutoComplete_onSuggestionSelected__')
+			else if ($token[1] === '__TAutoComplete_onSuggestionSelected__')
 			{
 				$parameter = new TAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
 				$this->onSuggestionSelected($parameter);
 			}
 		}
-		else if($this->getAutoPostBack())
+		else if ($this->getAutoPostBack())
 			parent::raiseCallbackEvent($param);
 	}
 
@@ -224,7 +224,7 @@ 
 	public function dataBind()
 	{
 		parent::dataBind();
-		if($this->getPage()->getIsCallback())
+		if ($this->getPage()->getIsCallback())
 			$this->renderSuggestions($this->getResponse()->createHtmlWriter());
 	}
 
@@ -233,7 +233,7 @@ 
 	 */
 	public function getResultPanel()
 	{
-		if($this->_resultPanel===null)
+		if ($this->_resultPanel === null)
 			$this->_resultPanel = $this->createResultPanel();
 		return $this->_resultPanel;
 	}
@@ -254,7 +254,7 @@ 
 	 */
 	public function getSuggestions()
 	{
-		if($this->_repeater===null)
+		if ($this->_repeater === null)
 			$this->_repeater = $this->createRepeater();
 		return $this->_repeater;
 	}
@@ -267,7 +267,7 @@ 
 		$repeater = Prado::createComponent('System.Web.UI.WebControls.TRepeater');
 		$repeater->setHeaderTemplate(new TAutoCompleteTemplate('<ul>'));
 		$repeater->setFooterTemplate(new TAutoCompleteTemplate('</ul>'));
-		$repeater->setItemTemplate(new TTemplate('<li><%# $this->DataItem %></li>',null));
+		$repeater->setItemTemplate(new TTemplate('<li><%# $this->DataItem %></li>', null));
 		$repeater->setEmptyTemplate(new TAutoCompleteTemplate('<ul></ul>'));
 		$this->getControls()->add($repeater);
 		return $repeater;
@@ -278,7 +278,7 @@ 
 	 */
 	public function renderEndTag($writer)
 	{
-		$cs=$this->getPage()->getClientScript();
+		$cs = $this->getPage()->getClientScript();
 		$cs->registerPradoScript('autocomplete');
 		parent::renderEndTag($writer);
 		$this->renderResultPanel($writer);
@@ -308,7 +308,7 @@ 
 	 */
 	public function renderSuggestions($writer)
 	{
-		if($this->getActiveControl()->canUpdateClientSide())
+		if ($this->getActiveControl()->canUpdateClientSide())
 		{
 			$this->getSuggestions()->render($writer);
 			$boundary = $writer->getWriter()->getBoundary();
@@ -324,25 +324,25 @@ 
 		//disallow page state update ?
 		//$this->getActiveControl()->getClientSide()->setEnablePageStateUpdate(false);
 		$options = array();
-		if(strlen($string = $this->getSeparator()))
+		if (strlen($string = $this->getSeparator()))
 		{
-			$string = strtr($string,array('\t'=>"\t",'\n'=>"\n",'\r'=>"\r"));
+			$string = strtr($string, array('\t'=>"\t", '\n'=>"\n", '\r'=>"\r"));
 			$token = preg_split('//', $string, -1, PREG_SPLIT_NO_EMPTY);
 			$options['tokens'] = $token;
 		}
-		if($this->getAutoPostBack())
+		if ($this->getAutoPostBack())
 		{
-			$options = array_merge($options,parent::getPostBackOptions());
+			$options = array_merge($options, parent::getPostBackOptions());
 			$options['AutoPostBack'] = true;
 		}
-		if(strlen($select = $this->getTextCssClass()))
+		if (strlen($select = $this->getTextCssClass()))
 			$options['select'] = $select;
 		$options['ResultPanel'] = $this->getResultPanel()->getClientID();
 		$options['ID'] = $this->getClientID();
 		$options['EventTarget'] = $this->getUniqueID();
-		if(($minchars=$this->getMinChars())!=='')
+		if (($minchars = $this->getMinChars()) !== '')
 			$options['minChars'] = $minchars;
-		if(($frequency=$this->getFrequency())!=='')
+		if (($frequency = $this->getFrequency()) !== '')
 			$options['frequency'] = $frequency;
 		$options['CausesValidation'] = $this->getCausesValidation();
 		$options['ValidationGroup'] = $this->getValidationGroup();
@@ -379,15 +379,15 @@ 
  */
 class TAutoCompleteEventParameter extends TCallbackEventParameter
 {
-	private $_selectedIndex=-1;
+	private $_selectedIndex = -1;
 
 	/**
 	 * Creates a new TCallbackEventParameter.
 	 */
-	public function __construct($response, $parameter, $index=-1)
+	public function __construct($response, $parameter, $index = -1)
 	{
 		parent::__construct($response, $parameter);
-		$this->_selectedIndex=$index;
+		$this->_selectedIndex = $index;
 	}
 
 	/**

Braces +21 added lines, -16 removed lines

@@ -174,15 +174,14 @@ 
 			{
 				$parameter = new TAutoCompleteEventParameter($this->getResponse(), $token[0]);
 				$this->onSuggest($parameter);
-			}
-			else if($token[1] === '__TAutoComplete_onSuggestionSelected__')
+			} else if($token[1] === '__TAutoComplete_onSuggestionSelected__')
 			{
 				$parameter = new TAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
 				$this->onSuggestionSelected($parameter);
 			}
+		} else if($this->getAutoPostBack()) {
+					parent::raiseCallbackEvent($param);
 		}
-		else if($this->getAutoPostBack())
-			parent::raiseCallbackEvent($param);
 	}
 
 	/**
@@ -224,8 +223,9 @@ 
 	public function dataBind()
 	{
 		parent::dataBind();
-		if($this->getPage()->getIsCallback())
-			$this->renderSuggestions($this->getResponse()->createHtmlWriter());
+		if($this->getPage()->getIsCallback()) {
+					$this->renderSuggestions($this->getResponse()->createHtmlWriter());
+		}
 	}
 
 	/**
@@ -233,8 +233,9 @@ 
 	 */
 	public function getResultPanel()
 	{
-		if($this->_resultPanel===null)
-			$this->_resultPanel = $this->createResultPanel();
+		if($this->_resultPanel===null) {
+					$this->_resultPanel = $this->createResultPanel();
+		}
 		return $this->_resultPanel;
 	}
 
@@ -254,8 +255,9 @@ 
 	 */
 	public function getSuggestions()
 	{
-		if($this->_repeater===null)
-			$this->_repeater = $this->createRepeater();
+		if($this->_repeater===null) {
+					$this->_repeater = $this->createRepeater();
+		}
 		return $this->_repeater;
 	}
 
@@ -335,15 +337,18 @@ 
 			$options = array_merge($options,parent::getPostBackOptions());
 			$options['AutoPostBack'] = true;
 		}
-		if(strlen($select = $this->getTextCssClass()))
-			$options['select'] = $select;
+		if(strlen($select = $this->getTextCssClass())) {
+					$options['select'] = $select;
+		}
 		$options['ResultPanel'] = $this->getResultPanel()->getClientID();
 		$options['ID'] = $this->getClientID();
 		$options['EventTarget'] = $this->getUniqueID();
-		if(($minchars=$this->getMinChars())!=='')
-			$options['minChars'] = $minchars;
-		if(($frequency=$this->getFrequency())!=='')
-			$options['frequency'] = $frequency;
+		if(($minchars=$this->getMinChars())!=='') {
+					$options['minChars'] = $minchars;
+		}
+		if(($frequency=$this->getFrequency())!=='') {
+					$options['frequency'] = $frequency;
+		}
 		$options['CausesValidation'] = $this->getCausesValidation();
 		$options['ValidationGroup'] = $this->getValidationGroup();
 		return $options;

framework/Web/UI/ActiveControls/TBaseActiveControl.php

Doc Comments +6 added lines

@@ -52,6 +52,8 @@ 
 	 * @param string option name.
 	 * @param mixed new value.
 	 * @param mixed default value.
+	 * @param string $name
+	 * @param boolean|string $default
 	 * @return mixed options value.
 	 */
 	protected function setOption($name,$value,$default=null)
@@ -66,6 +68,8 @@ 
 	 * named values for the base active controls.
 	 * @param string option name.
 	 * @param mixed default value.
+	 * @param string $name
+	 * @param boolean|string $default
 	 * @return mixed options value.
 	 */
 	protected function getOption($name,$default=null)
@@ -177,6 +181,7 @@ 
 	/**
 	 * Sets the client side options. Can only be set when client side is null.
 	 * @param TCallbackClientSide client side options.
+	 * @param TActiveCustomValidatorClientSide $client
 	 */
 	public function setClientSide($client)
 	{
@@ -343,6 +348,7 @@ 
 	 * {@link getClientSide ClientSide} property.
 	 * @param string client side javascript class name.
 	 * @param array additional callback options.
+	 * @param string $class
 	 */
 	public function registerCallbackClientScript($class,$options=null)
 	{

Spacing +34 added lines, -34 removed lines

@@ -54,11 +54,11 @@ 
 	 * @param mixed default value.
 	 * @return mixed options value.
 	 */
-	protected function setOption($name,$value,$default=null)
+	protected function setOption($name, $value, $default = null)
 	{
-		$value = ($value===null) ? $default : $value;
-		if($value!==null)
-			$this->_options->add($name,$value);
+		$value = ($value === null) ? $default : $value;
+		if ($value !== null)
+			$this->_options->add($name, $value);
 	}
 
 	/**
@@ -68,10 +68,10 @@ 
 	 * @param mixed default value.
 	 * @return mixed options value.
 	 */
-	protected function getOption($name,$default=null)
+	protected function getOption($name, $default = null)
 	{
 		$item = $this->_options->itemAt($name);
-		return ($item===null) ? $default : $item;
+		return ($item === null) ? $default : $item;
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 * @return boolean true if the callback response is allowed update
 	 * client-side contents.
 	 */
-	public function canUpdateClientSide($bDontRequireVisibility=false)
+	public function canUpdateClientSide($bDontRequireVisibility = false)
 	{
 		return 	$this->getControl()->getHasChildInitialized()
 				&& $this->getPage()->getIsLoadingPostData() == false
@@ -166,7 +166,7 @@ 
 	 */
 	public function getClientSide()
 	{
-		if(($client = $this->getOption('ClientSide'))===null)
+		if (($client = $this->getOption('ClientSide')) === null)
 		{
 			$client = $this->createClientSide();
 			$this->setOption('ClientSide', $client);
@@ -180,7 +180,7 @@ 
 	 */
 	public function setClientSide($client)
 	{
-		if( $this->getOption('ClientSide')===null)
+		if ($this->getOption('ClientSide') === null)
 			$this->setOption('ClientSide', $client);
 		else
 			throw new TConfigurationException(
@@ -225,23 +225,23 @@ 
 	 */
 	protected function getDefaultClientSideOptions()
 	{
-		if(($id=$this->getCallbackOptions())!=='')
+		if (($id = $this->getCallbackOptions()) !== '')
 		{
-			if(($pos=strrpos($id,'.'))!==false)
+			if (($pos = strrpos($id, '.')) !== false)
 			{
-				$control=$this->getControl()->getSubProperty(substr($id,0,$pos));
-				$newid=substr($id,$pos+1);
-				if ($control!==null)
-					$control=$control->$newid;
+				$control = $this->getControl()->getSubProperty(substr($id, 0, $pos));
+				$newid = substr($id, $pos + 1);
+				if ($control !== null)
+					$control = $control->$newid;
 			}
 			else
 			{
 				// TCheckBoxList overrides findControl() with a fake implementation
 				// but accepts a second parameter to use the standard one
-				$control=$this->getControl()->findControl($id, true);
+				$control = $this->getControl()->findControl($id, true);
 			}
 
-			if($control instanceof TCallbackOptions)
+			if ($control instanceof TCallbackOptions)
 				return $control->getClientSide()->getOptions()->toArray();
 			else
 				throw new TConfigurationException('callback_invalid_callback_options', $this->getControl()->getID(), $id);
@@ -256,7 +256,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getOption('CausesValidation',true);
+		return $this->getOption('CausesValidation', true);
 	}
 
 	/**
@@ -265,7 +265,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setOption('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setOption('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -274,7 +274,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getOption('ValidationGroup','');
+		return $this->getOption('ValidationGroup', '');
 	}
 
 	/**
@@ -283,7 +283,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setOption('ValidationGroup',$value,'');
+		$this->setOption('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -292,10 +292,10 @@ 
 	 */
 	public function canCauseValidation()
 	{
-		if($this->getCausesValidation())
+		if ($this->getCausesValidation())
 		{
-			$group=$this->getValidationGroup();
-			return $this->getPage()->getValidators($group)->getCount()>0;
+			$group = $this->getValidationGroup();
+			return $this->getPage()->getValidators($group)->getCount() > 0;
 		}
 		else
 			return false;
@@ -324,13 +324,13 @@ 
 	protected function getClientSideOptions()
 	{
 		$default = $this->getDefaultClientSideOptions();
-		$options = array_merge($default,$this->getClientSide()->getOptions()->toArray());
+		$options = array_merge($default, $this->getClientSide()->getOptions()->toArray());
 		$validate = $this->getCausesValidation();
-		$options['CausesValidation']= $validate ? '' : false;
-		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['CausesValidation'] = $validate ? '' : false;
+		$options['ValidationGroup'] = $this->getValidationGroup();
 		$options['CallbackParameter'] = $this->getCallbackParameter();
 		// needed for TCallback
-		if(!isset($options['EventTarget']))
+		if (!isset($options['EventTarget']))
 			$options['EventTarget'] = $this->getControl()->getUniqueID();
 		return $options;
 	}
@@ -344,17 +344,17 @@ 
 	 * @param string client side javascript class name.
 	 * @param array additional callback options.
 	 */
-	public function registerCallbackClientScript($class,$options=null)
+	public function registerCallbackClientScript($class, $options = null)
 	{
 		$cs = $this->getPage()->getClientScript();
-		if(is_array($options))
-			$options = array_merge($this->getClientSideOptions(),$options);
+		if (is_array($options))
+			$options = array_merge($this->getClientSideOptions(), $options);
 		else
 			$options = $this->getClientSideOptions();
 
 		//remove true as default to save bytes
-		if($options['CausesValidation']===true)
-			$options['CausesValidation']='';
+		if ($options['CausesValidation'] === true)
+			$options['CausesValidation'] = '';
 		$cs->registerCallbackControl($class, $options);
 	}
 
@@ -380,7 +380,7 @@ 
 	public function getJavascript()
 	{
 		$client = $this->getPage()->getClientScript();
-		return $client->getCallbackReference($this->getControl(),$this->getClientSideOptions());
+		return $client->getCallbackReference($this->getControl(), $this->getClientSideOptions());
 	}
 
 	/**

Braces +30 added lines, -24 removed lines

@@ -57,8 +57,9 @@ 
 	protected function setOption($name,$value,$default=null)
 	{
 		$value = ($value===null) ? $default : $value;
-		if($value!==null)
-			$this->_options->add($name,$value);
+		if($value!==null) {
+					$this->_options->add($name,$value);
+		}
 	}
 
 	/**
@@ -180,11 +181,12 @@ 
 	 */
 	public function setClientSide($client)
 	{
-		if( $this->getOption('ClientSide')===null)
-			$this->setOption('ClientSide', $client);
-		else
-			throw new TConfigurationException(
+		if( $this->getOption('ClientSide')===null) {
+					$this->setOption('ClientSide', $client);
+		} else {
+					throw new TConfigurationException(
 				'active_controls_client_side_exists', $this->getControl()->getID());
+		}
 	}
 
 	/**
@@ -231,20 +233,21 @@ 
 			{
 				$control=$this->getControl()->getSubProperty(substr($id,0,$pos));
 				$newid=substr($id,$pos+1);
-				if ($control!==null)
-					$control=$control->$newid;
-			}
-			else
+				if ($control!==null) {
+									$control=$control->$newid;
+				}
+			} else
 			{
 				// TCheckBoxList overrides findControl() with a fake implementation
 				// but accepts a second parameter to use the standard one
 				$control=$this->getControl()->findControl($id, true);
 			}
 
-			if($control instanceof TCallbackOptions)
-				return $control->getClientSide()->getOptions()->toArray();
-			else
-				throw new TConfigurationException('callback_invalid_callback_options', $this->getControl()->getID(), $id);
+			if($control instanceof TCallbackOptions) {
+							return $control->getClientSide()->getOptions()->toArray();
+			} else {
+							throw new TConfigurationException('callback_invalid_callback_options', $this->getControl()->getID(), $id);
+			}
 		}
 
 		return array();
@@ -296,9 +299,9 @@ 
 		{
 			$group=$this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount()>0;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -330,8 +333,9 @@ 
 		$options['ValidationGroup']=$this->getValidationGroup();
 		$options['CallbackParameter'] = $this->getCallbackParameter();
 		// needed for TCallback
-		if(!isset($options['EventTarget']))
-			$options['EventTarget'] = $this->getControl()->getUniqueID();
+		if(!isset($options['EventTarget'])) {
+					$options['EventTarget'] = $this->getControl()->getUniqueID();
+		}
 		return $options;
 	}
 
@@ -347,14 +351,16 @@ 
 	public function registerCallbackClientScript($class,$options=null)
 	{
 		$cs = $this->getPage()->getClientScript();
-		if(is_array($options))
-			$options = array_merge($this->getClientSideOptions(),$options);
-		else
-			$options = $this->getClientSideOptions();
+		if(is_array($options)) {
+					$options = array_merge($this->getClientSideOptions(),$options);
+		} else {
+					$options = $this->getClientSideOptions();
+		}
 
 		//remove true as default to save bytes
-		if($options['CausesValidation']===true)
-			$options['CausesValidation']='';
+		if($options['CausesValidation']===true) {
+					$options['CausesValidation']='';
+		}
 		$cs->registerCallbackControl($class, $options);
 	}
 

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TBaseActiveControl and TBaseActiveCallbackControl class file.
- *
- * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.ActiveControls
- */
+	 * TBaseActiveControl and TBaseActiveCallbackControl class file.
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.ActiveControls
+	 */
 
 Prado::using('System.Web.UI.ActiveControls.TCallbackClientSide');
 

framework/Web/UI/ActiveControls/TCallbackClientScript.php

Doc Comments +10 added lines

@@ -84,6 +84,7 @@ 
 	 * Executes a client-side statement.
 	 * @param string javascript function name
 	 * @param array list of arguments for the function
+	 * @param string $function
 	 */
 	public function callClientFunction($function, $params=array())
 	{
@@ -144,6 +145,7 @@ 
 	 * @param string selection method
 	 * @param string|int the value or index to select/check.
 	 * @param string selection control type, either 'check' or 'select'
+	 * @param boolean $value
 	 */
 	public function select($control, $method='Value', $value=null, $type=null)
 	{
@@ -210,6 +212,7 @@ 
 	 * @param TControl control element or element id
 	 * @param string attribute name
 	 * @param string attribute value
+	 * @param TControl $control
 	 */
 	public function setAttribute($control, $name, $value)
 	{
@@ -359,6 +362,7 @@ 
 	 * key is the style property and the value is the style value.
 	 * @param TControl control element or element id
 	 * @param array list of key-value pairs as style property and style value.
+	 * @param TControl $element
 	 */
 	public function setStyle($element, $styles)
 	{
@@ -413,6 +417,7 @@ 
 	 * @param TControl control element or HTML element id.
 	 * @param string HTML fragement or the control to be rendered.
 	 * @param boolean whether to fully replace the element or just its inner content.
+	 * @param boolean $self
 	 * @see insertAbout
 	 * @see insertBelow
 	 * @see insertBefore
@@ -441,6 +446,7 @@ 
 	 * @param TControl control element or HTML element id.
 	 * @param string HTML fragement or the control to be rendered.
 	 * @param boolean whether to fully replace the element or just its inner content, defaults to true.
+	 * @param TControl $element
 	 */
 	public function replaceContent($element, $content, $self=true)
 	{
@@ -492,6 +498,7 @@ 
 	 * component developers. The render() method is defered to be called in the
 	 * TActivePageAdapter class.
 	 * @param TControl control to be rendered on callback response.
+	 * @param TControl $control
 	 * @return string the boundary for which the rendered content is wrapped.
 	 */
 	private function getRenderedContentBoundary($control)
@@ -504,6 +511,7 @@ 
 
 	/**
 	 * @param THtmlWriter the writer responsible for rendering html content.
+	 * @param THtmlWriter $html
 	 * @return string content boundary.
 	 */
 	private function getResponseContentBoundary($html)
@@ -523,6 +531,7 @@ 
 	 * @param string visual effect function name.
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
+	 * @param string $type
 	 */
 	public function visualEffect($type, $element, $options=array())
 	{
@@ -630,6 +639,7 @@ 
 	 * @param string visual effect function name.
 	 * @param TControl control element or element id
 	 * @param array effect options.
+	 * @param string $effect
 	 */
 	public function juiEffect($element, $effect, $options=array())
 	{

Spacing +74 added lines, -74 removed lines

@@ -85,16 +85,16 @@ 
 	 * @param string javascript function name
 	 * @param array list of arguments for the function
 	 */
-	public function callClientFunction($function, $params=array())
+	public function callClientFunction($function, $params = array())
 	{
-		if(!is_array($params))
+		if (!is_array($params))
 			$params = array($params);
 
-		if(count($params) > 0)
+		if (count($params) > 0)
 		{
 			if ($params[0] instanceof ISurroundable)
 				$params[0] = $params[0]->getSurroundingTagID();
-			elseif($params[0] instanceof TControl)
+			elseif ($params[0] instanceof TControl)
 				$params[0] = $params[0]->getClientID();
 		}
 		$this->_actions->add(array($function => $params));
@@ -106,14 +106,14 @@ 
 	 * @param string jQuery method name
 	 * @param array list of arguments for the function
 	 */
-	public function jQuery($element, $method, $params=array())
+	public function jQuery($element, $method, $params = array())
 	{
 		if ($element instanceof ISurroundable)
 			$element = $element->getSurroundingTagID();
-		elseif($element instanceof TControl)
+		elseif ($element instanceof TControl)
 			$element = $element->getClientID();
 
-		if(!is_array($params))
+		if (!is_array($params))
 			$params = array($params);
 
 		$this->_actions->add(array('Prado.Element.j' => array($element, $method, $params)));
@@ -145,27 +145,27 @@ 
 	 * @param string|int the value or index to select/check.
 	 * @param string selection control type, either 'check' or 'select'
 	 */
-	public function select($control, $method='Value', $value=null, $type=null)
+	public function select($control, $method = 'Value', $value = null, $type = null)
 	{
 		$method = TPropertyValue::ensureEnum($method,
 				'Value', 'Index', 'Clear', 'Indices', 'Values', 'All', 'Invert');
-		$type = ($type===null) ? $this->getSelectionControlType($control) : $type;
+		$type = ($type === null) ? $this->getSelectionControlType($control) : $type;
 		$total = $this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;
 
 		// pass the ID to avoid getting the surrounding elements (ISurroundable)
-		if($control instanceof TControl)
+		if ($control instanceof TControl)
 			$control = $control->getClientID();
 
 		$this->callClientFunction('Prado.Element.select',
-				array($control, $type.$method, $value, $total));
+				array($control, $type . $method, $value, $total));
 	}
 
 	private function getSelectionControlType($control)
 	{
-		if(is_string($control)) return 'check';
-		if($control instanceof TCheckBoxList)
+		if (is_string($control)) return 'check';
+		if ($control instanceof TCheckBoxList)
 			return 'check';
-		if($control instanceof TCheckBox)
+		if ($control instanceof TCheckBox)
 			return 'check';
 		return 'select';
 	}
@@ -190,7 +190,7 @@ 
 	 * @param TControl control element or element id
 	 * @param boolean check or uncheck the checkbox or radio button.
 	 */
-	public function check($checkbox, $checked=true)
+	public function check($checkbox, $checked = true)
 	{
 		$this->select($checkbox, "Value", $checked);
 	}
@@ -214,9 +214,9 @@ 
 	public function setAttribute($control, $name, $value)
 	{
 		// Attributes should be applied on Surrounding tag, except for 'disabled' attribute
-		if ($control instanceof ISurroundable && strtolower($name)!=='disabled')
-			$control=$control->getSurroundingTagID();
-		$this->callClientFunction('Prado.Element.setAttribute',array($control, $name, $value));
+		if ($control instanceof ISurroundable && strtolower($name) !== 'disabled')
+			$control = $control->getSurroundingTagID();
+		$this->callClientFunction('Prado.Element.setAttribute', array($control, $name, $value));
 	}
 
 	/**
@@ -227,24 +227,24 @@ 
 	public function setListItems($control, $items)
 	{
 		$options = array();
-		if($control instanceof TListControl)
+		if ($control instanceof TListControl)
 		{
 			$promptText		= $control->getPromptText();
 			$promptValue	= $control->getPromptValue();
 
-			if($promptValue==='')
+			if ($promptValue === '')
 				$promptValue = $promptText;
 
-			if($promptValue!=='')
+			if ($promptValue !== '')
 				$options[] = array($promptText, $promptValue);
 		}
 
-		foreach($items as $item)
+		foreach ($items as $item)
 		{
-			if($item->getHasAttributes())
-				$options[] =  array($item->getText(),$item->getValue(), $item->getAttributes()->itemAt('Group'));
+			if ($item->getHasAttributes())
+				$options[] = array($item->getText(), $item->getValue(), $item->getAttributes()->itemAt('Group'));
 			else
-				$options[] = array($item->getText(),$item->getValue());
+				$options[] = array($item->getText(), $item->getValue());
 		}
 		$this->callClientFunction('Prado.Element.setOptions', array($control, $options));
 	}
@@ -273,21 +273,21 @@ 
 	 * @param string visual effect, such as, 'fade' or 'slide'.
 	 * @param array additional options.
 	 */
-	public function toggle($element, $effect=null, $options=array())
+	public function toggle($element, $effect = null, $options = array())
 	{
-		switch(strtolower($effect))
+		switch (strtolower($effect))
 		{
 			case 'fade':
-				$method='fadeToggle';
+				$method = 'fadeToggle';
 				break;
 			case 'slide':
-				$method='slideToggle';
+				$method = 'slideToggle';
 				break;
 			default:
-				$method='toggle';
+				$method = 'toggle';
 				// avoid fancy effect by default
-				if(!array_key_exists('duration', $options))
-					$options['duration']=0;
+				if (!array_key_exists('duration', $options))
+					$options['duration'] = 0;
 				break;
 		}
 		$this->jQuery($element, $method, $options);
@@ -340,7 +340,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array additional options: 'duration' in ms, 'offset' from the top in pixels
 	 */
-	public function scrollTo($element, $options=array())
+	public function scrollTo($element, $options = array())
 	{
 		$this->callClientFunction('Prado.Element.scrollTo', array($element, $options));
 	}
@@ -420,12 +420,12 @@ 
 	 */
 	protected function replace($element, $content, $self)
 	{
-		if($content instanceof TControl)
+		if ($content instanceof TControl)
 		{
 			$boundary = $this->getRenderedContentBoundary($content);
 			$content = null;
 		}
-		else if($content instanceof THtmlWriter)
+		else if ($content instanceof THtmlWriter)
 		{
 			$boundary = $this->getResponseContentBoundary($content);
 			$content = null;
@@ -442,7 +442,7 @@ 
 	 * @param string HTML fragement or the control to be rendered.
 	 * @param boolean whether to fully replace the element or just its inner content, defaults to true.
 	 */
-	public function replaceContent($element, $content, $self=true)
+	public function replaceContent($element, $content, $self = true)
 	{
 		$this->replace($element, $content, $self);
 	}
@@ -454,7 +454,7 @@ 
 	 */
 	public function evaluateScript($writer)
 	{
-		if($writer instanceof THtmlWriter)
+		if ($writer instanceof THtmlWriter)
 		{
 			$boundary = $this->getResponseContentBoundary($writer);
 			$content = null;
@@ -474,11 +474,11 @@ 
 	 */
 	public function appendScriptBlock($content)
 	{
-		if($content instanceof TControl)
+		if ($content instanceof TControl)
 		{
 			$boundary = $this->getRenderedContentBoundary($content);
 		}
-		elseif($content instanceof THtmlWriter)
+		elseif ($content instanceof THtmlWriter)
 		{
 			$boundary = $this->getResponseContentBoundary($content);
 		}
@@ -508,9 +508,9 @@ 
 	 */
 	private function getResponseContentBoundary($html)
 	{
-		if($html instanceof THtmlWriter)
+		if ($html instanceof THtmlWriter)
 		{
-			if($html->getWriter() instanceof TCallbackResponseWriter)
+			if ($html->getWriter() instanceof TCallbackResponseWriter)
 				return $html->getWriter()->getBoundary();
 		}
 		return null;
@@ -524,7 +524,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function visualEffect($type, $element, $options=array())
+	public function visualEffect($type, $element, $options = array())
 	{
 		$this->jQuery($element, $type, $options);
 	}
@@ -537,7 +537,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function fadeIn($element, $options=array())
+	public function fadeIn($element, $options = array())
 	{
 		$this->visualEffect('fadeIn', $element, $options);
 	}
@@ -548,7 +548,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function fadeOut($element, $options=array())
+	public function fadeOut($element, $options = array())
 	{
 		$this->visualEffect('fadeOut', $element, $options);
 	}
@@ -559,7 +559,7 @@ 
 	 * @param TControl control element or element id
 	 * @param float opacity value between 1 and 0
 	 */
-	public function fadeTo($element, $value, $duration=500)
+	public function fadeTo($element, $value, $duration = 500)
 	{
 		$value = TPropertyValue::ensureFloat($value);
 		$this->visualEffect('fadeTo', $element, array($duration, $value));
@@ -571,7 +571,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function slideDown($element, $options=array())
+	public function slideDown($element, $options = array())
 	{
 		$this->visualEffect('slideDown', $element, $options);
 	}
@@ -582,7 +582,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function slideUp($element, $options=array())
+	public function slideUp($element, $options = array())
 	{
 		$this->visualEffect('slideUp', $element, $options);
 	}
@@ -595,7 +595,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function appear($element, $options=array())
+	public function appear($element, $options = array())
 	{
 		$this->fadeIn($element, $options);
 	}
@@ -606,7 +606,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function fade($element, $options=array())
+	public function fade($element, $options = array())
 	{
 		$this->fadeOut($element, $options);
 	}
@@ -631,9 +631,9 @@ 
 	 * @param TControl control element or element id
 	 * @param array effect options.
 	 */
-	public function juiEffect($element, $effect, $options=array())
+	public function juiEffect($element, $effect, $options = array())
 	{
-		$options['effect']=$effect;
+		$options['effect'] = $effect;
 		$this->jQuery($element, 'effect', array($options));
 	}
 
@@ -643,7 +643,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function blind($element, $options=array())
+	public function blind($element, $options = array())
 	{
 		$this->juiEffect($element, 'blind', $options);
 	}
@@ -654,7 +654,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function drop($element, $options=array())
+	public function drop($element, $options = array())
 	{
 		$this->juiEffect($element, 'drop', $options);
 	}
@@ -665,7 +665,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function fold($element, $options=array())
+	public function fold($element, $options = array())
 	{
 		$this->juiEffect($element, 'fold', $options);
 	}
@@ -676,7 +676,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function size($element, $options=array())
+	public function size($element, $options = array())
 	{
 		$this->juiEffect($element, 'size', $options);
 	}
@@ -687,7 +687,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function puff($element, $options=array())
+	public function puff($element, $options = array())
 	{
 		$this->juiEffect($element, 'puff', $options);
 	}
@@ -698,7 +698,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function pulsate($element, $options=array())
+	public function pulsate($element, $options = array())
 	{
 		$this->juiEffect($element, 'pulsate', $options);
 	}
@@ -709,7 +709,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function shake($element, $options=array())
+	public function shake($element, $options = array())
 	{
 		$this->juiEffect($element, 'shake', $options);
 	}
@@ -720,7 +720,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function scale($element, $options=array())
+	public function scale($element, $options = array())
 	{
 		$this->juiEffect($element, 'scale', $options);
 	}
@@ -731,7 +731,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function highlight($element, $options=array())
+	public function highlight($element, $options = array())
 	{
 		$this->juiEffect($element, 'highlight', $options);
 	}
@@ -744,9 +744,9 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function blindDown($element, $options=array())
+	public function blindDown($element, $options = array())
 	{
-		$options['direction']='down';
+		$options['direction'] = 'down';
 		$this->blind($element, $options);
 	}
 
@@ -756,9 +756,9 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function blindUp($element, $options=array())
+	public function blindUp($element, $options = array())
 	{
-		$options['direction']='up';
+		$options['direction'] = 'up';
 		$this->blind($element, $options);
 	}
 
@@ -768,7 +768,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function dropOut($element, $options=array())
+	public function dropOut($element, $options = array())
 	{
 		$this->drop($element, $options);
 	}
@@ -779,7 +779,7 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function grow($element, $options=array())
+	public function grow($element, $options = array())
 	{
 		$this->size($element, $options);
 	}
@@ -790,9 +790,9 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function shrink($element, $options=array())
+	public function shrink($element, $options = array())
 	{
-		$options['percent']=0;
+		$options['percent'] = 0;
 		$this->scale($element, $options);
 	}
 
@@ -802,10 +802,10 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function squish($element, $options=array())
+	public function squish($element, $options = array())
 	{
-		$options['origin']=array('top', 'left');
-		$options['percent']=0;
+		$options['origin'] = array('top', 'left');
+		$options['percent'] = 0;
 		$this->scale($element, $options);
 	}
 
@@ -815,10 +815,10 @@ 
 	 * @param TControl control element or element id
 	 * @param array visual effect key-value pair options.
 	 */
-	public function switchOff($element, $options=array())
+	public function switchOff($element, $options = array())
 	{
-		$options['direction']='vertical';
-		$options['percent']=0;
+		$options['direction'] = 'vertical';
+		$options['percent'] = 0;
 		$this->scale($element, $options);
 	}
 

Braces +51 added lines, -38 removed lines

@@ -87,15 +87,17 @@ 
 	 */
 	public function callClientFunction($function, $params=array())
 	{
-		if(!is_array($params))
-			$params = array($params);
+		if(!is_array($params)) {
+					$params = array($params);
+		}
 
 		if(count($params) > 0)
 		{
-			if ($params[0] instanceof ISurroundable)
-				$params[0] = $params[0]->getSurroundingTagID();
-			elseif($params[0] instanceof TControl)
-				$params[0] = $params[0]->getClientID();
+			if ($params[0] instanceof ISurroundable) {
+							$params[0] = $params[0]->getSurroundingTagID();
+			} elseif($params[0] instanceof TControl) {
+							$params[0] = $params[0]->getClientID();
+			}
 		}
 		$this->_actions->add(array($function => $params));
 	}
@@ -108,13 +110,15 @@ 
 	 */
 	public function jQuery($element, $method, $params=array())
 	{
-		if ($element instanceof ISurroundable)
-			$element = $element->getSurroundingTagID();
-		elseif($element instanceof TControl)
-			$element = $element->getClientID();
+		if ($element instanceof ISurroundable) {
+					$element = $element->getSurroundingTagID();
+		} elseif($element instanceof TControl) {
+					$element = $element->getClientID();
+		}
 
-		if(!is_array($params))
-			$params = array($params);
+		if(!is_array($params)) {
+					$params = array($params);
+		}
 
 		$this->_actions->add(array('Prado.Element.j' => array($element, $method, $params)));
 	}
@@ -153,8 +157,9 @@ 
 		$total = $this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;
 
 		// pass the ID to avoid getting the surrounding elements (ISurroundable)
-		if($control instanceof TControl)
-			$control = $control->getClientID();
+		if($control instanceof TControl) {
+					$control = $control->getClientID();
+		}
 
 		$this->callClientFunction('Prado.Element.select',
 				array($control, $type.$method, $value, $total));
@@ -162,11 +167,15 @@ 
 
 	private function getSelectionControlType($control)
 	{
-		if(is_string($control)) return 'check';
-		if($control instanceof TCheckBoxList)
-			return 'check';
-		if($control instanceof TCheckBox)
+		if(is_string($control)) {
 			return 'check';
+		}
+		if($control instanceof TCheckBoxList) {
+					return 'check';
+		}
+		if($control instanceof TCheckBox) {
+					return 'check';
+		}
 		return 'select';
 	}
 
@@ -214,8 +223,9 @@ 
 	public function setAttribute($control, $name, $value)
 	{
 		// Attributes should be applied on Surrounding tag, except for 'disabled' attribute
-		if ($control instanceof ISurroundable && strtolower($name)!=='disabled')
-			$control=$control->getSurroundingTagID();
+		if ($control instanceof ISurroundable && strtolower($name)!=='disabled') {
+					$control=$control->getSurroundingTagID();
+		}
 		$this->callClientFunction('Prado.Element.setAttribute',array($control, $name, $value));
 	}
 
@@ -232,19 +242,22 @@ 
 			$promptText		= $control->getPromptText();
 			$promptValue	= $control->getPromptValue();
 
-			if($promptValue==='')
-				$promptValue = $promptText;
+			if($promptValue==='') {
+							$promptValue = $promptText;
+			}
 
-			if($promptValue!=='')
-				$options[] = array($promptText, $promptValue);
+			if($promptValue!=='') {
+							$options[] = array($promptText, $promptValue);
+			}
 		}
 
 		foreach($items as $item)
 		{
-			if($item->getHasAttributes())
-				$options[] =  array($item->getText(),$item->getValue(), $item->getAttributes()->itemAt('Group'));
-			else
-				$options[] = array($item->getText(),$item->getValue());
+			if($item->getHasAttributes()) {
+							$options[] =  array($item->getText(),$item->getValue(), $item->getAttributes()->itemAt('Group'));
+			} else {
+							$options[] = array($item->getText(),$item->getValue());
+			}
 		}
 		$this->callClientFunction('Prado.Element.setOptions', array($control, $options));
 	}
@@ -286,8 +299,9 @@ 
 			default:
 				$method='toggle';
 				// avoid fancy effect by default
-				if(!array_key_exists('duration', $options))
-					$options['duration']=0;
+				if(!array_key_exists('duration', $options)) {
+									$options['duration']=0;
+				}
 				break;
 		}
 		$this->jQuery($element, $method, $options);
@@ -424,14 +438,13 @@ 
 		{
 			$boundary = $this->getRenderedContentBoundary($content);
 			$content = null;
-		}
-		else if($content instanceof THtmlWriter)
+		} else if($content instanceof THtmlWriter)
 		{
 			$boundary = $this->getResponseContentBoundary($content);
 			$content = null;
+		} else {
+					$boundary = null;
 		}
-		else
-			$boundary = null;
 
 		$this->callClientFunction('Prado.Element.replace', array($element, $content, $boundary, $self));
 	}
@@ -477,8 +490,7 @@ 
 		if($content instanceof TControl)
 		{
 			$boundary = $this->getRenderedContentBoundary($content);
-		}
-		elseif($content instanceof THtmlWriter)
+		} elseif($content instanceof THtmlWriter)
 		{
 			$boundary = $this->getResponseContentBoundary($content);
 		}
@@ -510,8 +522,9 @@ 
 	{
 		if($html instanceof THtmlWriter)
 		{
-			if($html->getWriter() instanceof TCallbackResponseWriter)
-				return $html->getWriter()->getBoundary();
+			if($html->getWriter() instanceof TCallbackResponseWriter) {
+							return $html->getWriter()->getBoundary();
+			}
 		}
 		return null;
 	}

framework/Web/UI/ActiveControls/TCallbackClientSide.php

Doc Comments +6 added lines, -4 removed lines

@@ -199,7 +199,7 @@ 
 	}
 
 	/**
-	 * @return boolean true to post the inputs of the form on callback, default
+	 * @return string true to post the inputs of the form on callback, default
 	 * is post the inputs on callback.
 	 */
 	public function getPostState()
@@ -217,7 +217,7 @@ 
 	}
 
 	/**
-	 * @return integer callback request timeout.
+	 * @return string callback request timeout.
 	 */
 	public function getRequestTimeOut()
 	{
@@ -233,7 +233,7 @@ 
 	}
 
 	/**
-	 * @return boolean true if the callback request has priority and will abort
+	 * @return boolean|string true if the callback request has priority and will abort
 	 * existing prioritized request in order to send immediately. It does not
 	 * affect callbacks that are not prioritized. Default is true.
 	 * @deprecated since 3.3.0
@@ -248,6 +248,7 @@ 
 	 * @param boolean true to ensure that the callback request will be sent
 	 * immediately and will abort existing prioritized requests. It does not
 	 * affect callbacks that are not prioritized.
+	 * @param boolean $value
 	 * @deprecated since 3.3.0
 	 */
 	public function setHasPriority($value)
@@ -263,6 +264,7 @@ 
 	 * update. This will automatically set HasPrority to true.
 	 * @param boolean true enables the callback response to update the
 	 * viewstate.
+	 * @param boolean $value
 	 */
 	public function setEnablePageStateUpdate($value)
 	{
@@ -273,7 +275,7 @@ 
 	}
 
 	/**
-	 * @return boolean client-side viewstate will be updated on callback
+	 * @return boolean|string client-side viewstate will be updated on callback
 	 * response if true. Default is true.
 	 */
 	public function getEnablePageStateUpdate()

Spacing +6 added lines, -6 removed lines

@@ -240,8 +240,8 @@ 
 	 */
 	public function getHasPriority()
 	{
-		$option =  $this->getOption('HasPriority');
-		return ($option===null) ? true : $option;
+		$option = $this->getOption('HasPriority');
+		return ($option === null) ? true : $option;
 	}
 
 	/**
@@ -254,7 +254,7 @@ 
 	{
 		$hasPriority = TPropertyValue::ensureBoolean($value);
 		$this->setOption('HasPriority', $hasPriority);
-		if(!$hasPriority)
+		if (!$hasPriority)
 			$this->setEnablePageStateUpdate(false);
 	}
 
@@ -268,7 +268,7 @@ 
 	{
 		$enabled = TPropertyValue::ensureBoolean($value);
 		$this->setOption('EnablePageStateUpdate', $enabled);
-		if($enabled)
+		if ($enabled)
 			$this->setHasPriority(true);
 	}
 
@@ -279,7 +279,7 @@ 
 	public function getEnablePageStateUpdate()
 	{
 		$option = $this->getOption('EnablePageStateUpdate');
-		return ($option===null) ? true : $option;
+		return ($option === null) ? true : $option;
 	}
 
 	/**
@@ -295,7 +295,7 @@ 
 	 */
 	public function setPostBackTarget($value)
 	{
-		if($value instanceof TControl)
+		if ($value instanceof TControl)
 			$value = $value->getUniqueID();
 		$this->setOption('EventTarget', $value);
 	}

Braces +9 added lines, -6 removed lines

@@ -254,8 +254,9 @@ 
 	{
 		$hasPriority = TPropertyValue::ensureBoolean($value);
 		$this->setOption('HasPriority', $hasPriority);
-		if(!$hasPriority)
-			$this->setEnablePageStateUpdate(false);
+		if(!$hasPriority) {
+					$this->setEnablePageStateUpdate(false);
+		}
 	}
 
 	/**
@@ -268,8 +269,9 @@ 
 	{
 		$enabled = TPropertyValue::ensureBoolean($value);
 		$this->setOption('EnablePageStateUpdate', $enabled);
-		if($enabled)
-			$this->setHasPriority(true);
+		if($enabled) {
+					$this->setHasPriority(true);
+		}
 	}
 
 	/**
@@ -295,8 +297,9 @@ 
 	 */
 	public function setPostBackTarget($value)
 	{
-		if($value instanceof TControl)
-			$value = $value->getUniqueID();
+		if($value instanceof TControl) {
+					$value = $value->getUniqueID();
+		}
 		$this->setOption('EventTarget', $value);
 	}
 

Indentation +8 added lines, -8 removed lines

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

framework/Web/UI/ActiveControls/TDraggable.php

Doc Comments +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
 	 *   o 'True' or 'Revert' : The draggable will revert to it's original position
 	 *   o 'False' or 'None' : The draggable won't revert to it's original position
 	 *   o 'Failure' : The draggable will only revert if it's dropped on a non droppable area
-	 * @return TDraggableRevertOption true to revert
+	 * @return string true to revert
 	 */
 	public function getRevert()
 	{
@@ -118,7 +118,7 @@ 
 
 	/**
 	 * Determine if the element should be constrainted in one direction or not
-	 * @return CDraggableConstraint
+	 * @return string
 	 */
 	public function getConstraint()
 	{

Spacing +37 added lines, -37 removed lines

@@ -32,7 +32,7 @@ 
 	 * Set the handle id or css class
 	 * @param string
 	 */
-	public function setHandle ($value)
+	public function setHandle($value)
 	{
 		$this->setViewState('DragHandle', TPropertyValue::ensureString($value), null);
 	}
@@ -41,7 +41,7 @@ 
 	 * Get the handle id or css class
 	 * @return string
 	 */
-	public function getHandle ()
+	public function getHandle()
 	{
 		return $this->getViewState('DragHandle', null);
 	}
@@ -71,10 +71,10 @@ 
 	 */
 	public function setRevert($value)
 	{
-		if (strcasecmp($value,'true')==0 || $value===true)
-			$value=TDraggableRevertOptions::Revert;
-		elseif (strcasecmp($value,'false')==0 || $value===false)
-			$value=TDraggableRevertOptions::None;
+		if (strcasecmp($value, 'true') == 0 || $value === true)
+			$value = TDraggableRevertOptions::Revert;
+		elseif (strcasecmp($value, 'false') == 0 || $value === false)
+			$value = TDraggableRevertOptions::None;
 		$this->setViewState('Revert', TPropertyValue::ensureEnum($value, 'TDraggableRevertOptions'), true);
 	}
 
@@ -90,7 +90,7 @@ 
 	 *
 	 * @return TDraggableGhostingOption to clone the element
 	 */
-	public function getGhosting ()
+	public function getGhosting()
 	{
 		return $this->getViewState('Ghosting', TDraggableGhostingOptions::None);
 	}
@@ -107,12 +107,12 @@ 
 	 *  o "False" or "None" means no Ghosting options
 	 *
 	 */
-	public function setGhosting ($value)
+	public function setGhosting($value)
 	{
-		if (strcasecmp($value,'true')==0 || $value===true)
-			$value=TDraggableGhostingOptions::Ghosting;
-		elseif (strcasecmp($value,'false')==0 || $value===false)
-			$value=TDraggableGhostingOptions::None;
+		if (strcasecmp($value, 'true') == 0 || $value === true)
+			$value = TDraggableGhostingOptions::Ghosting;
+		elseif (strcasecmp($value, 'false') == 0 || $value === false)
+			$value = TDraggableGhostingOptions::None;
 		$this->setViewState('Ghosting', TPropertyValue::ensureEnum($value, 'TDraggableGhostingOptions'), TDraggableGhostingOptions::None);
 	}
 
@@ -153,15 +153,15 @@ 
 	{
 		parent::addAttributesToRender($writer);
 
-		$cs=$this->getPage()->getClientScript();
-		if ($this->getGhosting()==TDraggableGhostingOptions::SuperGhosting)
+		$cs = $this->getPage()->getClientScript();
+		if ($this->getGhosting() == TDraggableGhostingOptions::SuperGhosting)
 			$cs->registerPradoScript('dragdropextra');
 		else
 			$cs->registerPradoScript('dragdrop');
-		$writer->addAttribute('id',$this->getClientID());
-		$options=TJavascript::encode($this->getPostBackOptions());
-		$class=$this->getClientClassName();
-		$code="new {$class}('{$this->getClientId()}', {$options}) ";
+		$writer->addAttribute('id', $this->getClientID());
+		$options = TJavascript::encode($this->getPostBackOptions());
+		$class = $this->getClientClassName();
+		$code = "new {$class}('{$this->getClientId()}', {$options}) ";
 		$cs->registerEndScript(sprintf('%08X', crc32($code)), $code);
 	}
 
@@ -170,7 +170,7 @@ 
 	 * This method overrides the parent implementation.
 	 * @return string the javascript class name
 	 */
-	protected function getClientClassName ()
+	protected function getClientClassName()
 	{
 		return 'Draggable';
 	}
@@ -183,21 +183,21 @@ 
 	{
 		$options['ID'] = $this->getClientID();
 
-		if (($handle=$this->getHandle())!== null) $options['handle']=$handle;
-		if (($revert=$this->getRevert())===TDraggableRevertOptions::None)
-			$options['revert']=false;
-		elseif ($revert==TDraggableRevertOptions::Revert)
-			$options['revert']=true;
+		if (($handle = $this->getHandle()) !== null) $options['handle'] = $handle;
+		if (($revert = $this->getRevert()) === TDraggableRevertOptions::None)
+			$options['revert'] = false;
+		elseif ($revert == TDraggableRevertOptions::Revert)
+			$options['revert'] = true;
 		else
-			$options['revert']=strtolower($revert);
-		if (($constraint=$this->getConstraint())!==TDraggableConstraint::None) $options['constraint']=strtolower($constraint);
+			$options['revert'] = strtolower($revert);
+		if (($constraint = $this->getConstraint()) !== TDraggableConstraint::None) $options['constraint'] = strtolower($constraint);
 		switch ($this->getGhosting())
 		{
 			case TDraggableGhostingOptions::SuperGhosting:
-				$options['superghosting']=true;
+				$options['superghosting'] = true;
 				break;
 			case TDraggableGhostingOptions::Ghosting:
-				$options['ghosting']=true;
+				$options['ghosting'] = true;
 				break;
 		}
 
@@ -214,9 +214,9 @@ 
  */
 class TDraggableConstraint extends TEnumerable
 {
-	const None='None';
-	const Horizontal='Horizontal';
-	const Vertical='Vertical';
+	const None = 'None';
+	const Horizontal = 'Horizontal';
+	const Vertical = 'Vertical';
 }
 
 /**
@@ -227,9 +227,9 @@ 
  */
 class TDraggableGhostingOptions extends TEnumerable
 {
-	const None='None';
-	const Ghosting='Ghosting';
-	const SuperGhosting='SuperGhosting';
+	const None = 'None';
+	const Ghosting = 'Ghosting';
+	const SuperGhosting = 'SuperGhosting';
 }
 
 /**
@@ -240,7 +240,7 @@ 
  */
 class TDraggableRevertOptions extends TEnumerable
 {
-	const None='None';
-	const Revert='Revert';
-	const Failure='Failure';
+	const None = 'None';
+	const Revert = 'Revert';
+	const Failure = 'Failure';
 }

Braces +28 added lines, -20 removed lines

@@ -71,10 +71,11 @@ 
 	 */
 	public function setRevert($value)
 	{
-		if (strcasecmp($value,'true')==0 || $value===true)
-			$value=TDraggableRevertOptions::Revert;
-		elseif (strcasecmp($value,'false')==0 || $value===false)
-			$value=TDraggableRevertOptions::None;
+		if (strcasecmp($value,'true')==0 || $value===true) {
+					$value=TDraggableRevertOptions::Revert;
+		} elseif (strcasecmp($value,'false')==0 || $value===false) {
+					$value=TDraggableRevertOptions::None;
+		}
 		$this->setViewState('Revert', TPropertyValue::ensureEnum($value, 'TDraggableRevertOptions'), true);
 	}
 
@@ -109,10 +110,11 @@ 
 	 */
 	public function setGhosting ($value)
 	{
-		if (strcasecmp($value,'true')==0 || $value===true)
-			$value=TDraggableGhostingOptions::Ghosting;
-		elseif (strcasecmp($value,'false')==0 || $value===false)
-			$value=TDraggableGhostingOptions::None;
+		if (strcasecmp($value,'true')==0 || $value===true) {
+					$value=TDraggableGhostingOptions::Ghosting;
+		} elseif (strcasecmp($value,'false')==0 || $value===false) {
+					$value=TDraggableGhostingOptions::None;
+		}
 		$this->setViewState('Ghosting', TPropertyValue::ensureEnum($value, 'TDraggableGhostingOptions'), TDraggableGhostingOptions::None);
 	}
 
@@ -154,10 +156,11 @@ 
 		parent::addAttributesToRender($writer);
 
 		$cs=$this->getPage()->getClientScript();
-		if ($this->getGhosting()==TDraggableGhostingOptions::SuperGhosting)
-			$cs->registerPradoScript('dragdropextra');
-		else
-			$cs->registerPradoScript('dragdrop');
+		if ($this->getGhosting()==TDraggableGhostingOptions::SuperGhosting) {
+					$cs->registerPradoScript('dragdropextra');
+		} else {
+					$cs->registerPradoScript('dragdrop');
+		}
 		$writer->addAttribute('id',$this->getClientID());
 		$options=TJavascript::encode($this->getPostBackOptions());
 		$class=$this->getClientClassName();
@@ -183,14 +186,19 @@ 
 	{
 		$options['ID'] = $this->getClientID();
 
-		if (($handle=$this->getHandle())!== null) $options['handle']=$handle;
-		if (($revert=$this->getRevert())===TDraggableRevertOptions::None)
-			$options['revert']=false;
-		elseif ($revert==TDraggableRevertOptions::Revert)
-			$options['revert']=true;
-		else
-			$options['revert']=strtolower($revert);
-		if (($constraint=$this->getConstraint())!==TDraggableConstraint::None) $options['constraint']=strtolower($constraint);
+		if (($handle=$this->getHandle())!== null) {
+			$options['handle']=$handle;
+		}
+		if (($revert=$this->getRevert())===TDraggableRevertOptions::None) {
+					$options['revert']=false;
+		} elseif ($revert==TDraggableRevertOptions::Revert) {
+					$options['revert']=true;
+		} else {
+					$options['revert']=strtolower($revert);
+		}
+		if (($constraint=$this->getConstraint())!==TDraggableConstraint::None) {
+			$options['constraint']=strtolower($constraint);
+		}
 		switch ($this->getGhosting())
 		{
 			case TDraggableGhostingOptions::SuperGhosting:

framework/Web/UI/ActiveControls/TDropContainer.php

Doc Comments -1 removed lines

@@ -127,7 +127,6 @@
 	 * Raises the onDrop event.
 	 * The drop parameters are encapsulated into a {@link TDropContainerEventParameter}
 	 *
-	 * @param object $dropControlId
 	 */
 	public function onDrop ($dropParams)
 	{

Spacing +28 added lines, -28 removed lines

@@ -42,7 +42,7 @@ 
  */
 class TDropContainer extends TPanel implements IActiveControl, ICallbackEventHandler
 {
-	private $_container=null;
+	private $_container = null;
 
 	/**
 	 * Creates a new callback control, sets the adapter to
@@ -129,9 +129,9 @@ 
 	 *
 	 * @param object $dropControlId
 	 */
-	public function onDrop ($dropParams)
+	public function onDrop($dropParams)
 	{
-		$this->raiseEvent('OnDrop', $this, new TDropContainerEventParameter ($dropParams));
+		$this->raiseEvent('OnDrop', $this, new TDropContainerEventParameter($dropParams));
 
 	}
 
@@ -189,7 +189,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 
 		$this->getPage()->getClientScript()->registerPradoScript('dragdrop');
 		$this->getActiveControl()->registerCallbackClientScript(
@@ -202,12 +202,12 @@ 
 	 * child controls. This container will be a TActivePanel, in order to allow user
 	 * to update its content on callback.
 	 */
-	public function createChildControls ()
+	public function createChildControls()
 	{
-		if ($this->_container===null)
+		if ($this->_container === null)
 		{
-			$this->_container=Prado::CreateComponent('System.Web.UI.ActiveControls.TActivePanel');
-			$this->_container->setId($this->getId(false).'_content');
+			$this->_container = Prado::CreateComponent('System.Web.UI.ActiveControls.TActivePanel');
+			$this->_container->setId($this->getId(false) . '_content');
 			parent::getControls()->add($this->_container);
 		}
 	}
@@ -230,17 +230,17 @@ 
 	 * is defered until OnPreRender event is raised.
 	 * @param THtmlWriter html writer
 	 */
-	public function render ($writer)
+	public function render($writer)
 	{
-		if($this->getHasPreRendered())
+		if ($this->getHasPreRendered())
 		{
 			parent::render($writer);
-			if($this->getActiveControl()->canUpdateClientSide())
-				$this->getPage()->getCallbackClient()->replaceContent($this->_container,$writer);
+			if ($this->getActiveControl()->canUpdateClientSide())
+				$this->getPage()->getCallbackClient()->replaceContent($this->_container, $writer);
 		}
 		else
 		{
-			$this->getPage()->getAdapter()->registerControlToRender($this->_container,$writer);
+			$this->getPage()->getAdapter()->registerControlToRender($this->_container, $writer);
 		}
 	}
 
@@ -284,16 +284,16 @@ 
 		$this->_altKey = TPropertyValue::ensureBoolean($dropParams->AltKey);
 	}
 
-	public function getDragElementId()			{ return $this->_dragElementId; }
-	public function getScreenX()				{ return $this->_screenX; }
-	public function getScreenY()				{ return $this->_screenY; }
-	public function getOffsetX()				{ return $this->_offsetX; }
-	public function geOffsetY()					{ return $this->_offsetY; }
-	public function getClientX()				{ return $this->_clientX; }
-	public function getClientY()				{ return $this->_clientY; }
-	public function getShiftKey()				{ return $this->_shiftKey; }
-	public function getCtrlKey()				{ return $this->_ctrlKey; }
-	public function getAltKey()					{ return $this->_altKey; }
+	public function getDragElementId() { return $this->_dragElementId; }
+	public function getScreenX() { return $this->_screenX; }
+	public function getScreenY() { return $this->_screenY; }
+	public function getOffsetX() { return $this->_offsetX; }
+	public function geOffsetY() { return $this->_offsetY; }
+	public function getClientX() { return $this->_clientX; }
+	public function getClientY() { return $this->_clientY; }
+	public function getShiftKey() { return $this->_shiftKey; }
+	public function getCtrlKey() { return $this->_ctrlKey; }
+	public function getAltKey() { return $this->_altKey; }
 
 	/**
 	 * GetDroppedControl
@@ -301,16 +301,16 @@ 
 	 * Compatibility method to get the dropped control
 	 * @return TControl dropped control, or null if not found
 	 */
-	 public function getDroppedControl ()
+	 public function getDroppedControl()
 	 {
-		 $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 !
-			$dropControlId=str_replace(TControl::CLIENT_ID_SEPARATOR,TControl::ID_SEPARATOR,$this->_dragElementId);
-			$control=$service->getRequestedPage()->findControl($dropControlId);
+			$dropControlId = str_replace(TControl::CLIENT_ID_SEPARATOR, TControl::ID_SEPARATOR, $this->_dragElementId);
+			$control = $service->getRequestedPage()->findControl($dropControlId);
 		 }
 		 return $control;
 	 }

Braces +4 added lines, -4 removed lines

@@ -235,10 +235,10 @@
 		if($this->getHasPreRendered())
 		{
 			parent::render($writer);
-			if($this->getActiveControl()->canUpdateClientSide())
-				$this->getPage()->getCallbackClient()->replaceContent($this->_container,$writer);
-		}
-		else
+			if($this->getActiveControl()->canUpdateClientSide()) {
+							$this->getPage()->getCallbackClient()->replaceContent($this->_container,$writer);
+			}
+		} else
 		{
 			$this->getPage()->getAdapter()->registerControlToRender($this->_container,$writer);
 		}

framework/Web/UI/ActiveControls/TInPlaceTextBox.php

Doc Comments +3 added lines

@@ -92,6 +92,8 @@ 
 	 * Calls the client-side static method for this control class.
 	 * @param string static method name
 	 * @param mixed method parmaeter
+	 * @param string $func
+	 * @param boolean $value
 	 */
 	protected function callClientFunction($func,$value)
 	{
@@ -239,6 +241,7 @@ 
 	 * Raised when editing the content is requsted to be loaded from the
 	 * server side.
 	 * @param TCallbackEventParameter event parameter to be passed to the event handlers
+	 * @param TCallbackEventParameter $param
 	 */
 	public function onLoadingText($param)
 	{

Spacing +21 added lines, -21 removed lines

@@ -75,9 +75,9 @@ 
 	public function setDisplayTextBox($value)
 	{
 		$value = TPropertyValue::ensureBoolean($value);
-		$this->setViewState('DisplayTextBox', $value,false);
-		if($this->getActiveControl()->canUpdateClientSide())
-			$this->callClientFunction('setDisplayTextBox',$value);
+		$this->setViewState('DisplayTextBox', $value, false);
+		if ($this->getActiveControl()->canUpdateClientSide())
+			$this->callClientFunction('setDisplayTextBox', $value);
 	}
 
 	/**
@@ -93,11 +93,11 @@ 
 	 * @param string static method name
 	 * @param mixed method parmaeter
 	 */
-	protected function callClientFunction($func,$value)
+	protected function callClientFunction($func, $value)
 	{
 		$client = $this->getPage()->getCallbackClient();
-		$code = $this->getClientClassName().'.'.$func;
-		$client->callClientFunction($code,array($this,$value));
+		$code = $this->getClientClassName() . '.' . $func;
+		$client->callClientFunction($code, array($this, $value));
 	}
 
 	/**
@@ -122,8 +122,8 @@ 
 	protected function getExternalControlID()
 	{
 		$extID = $this->getEditTriggerControlID();
-		if($extID===null) return '';
-		if(($control = $this->findControl($extID))!==null)
+		if ($extID === null) return '';
+		if (($control = $this->findControl($extID)) !== null)
 			return $control->getClientID();
 		return $extID;
 	}
@@ -136,7 +136,7 @@ 
 	public function setText($value)
 	{
 		TTextBox::setText($value);
-		if($this->getActiveControl()->canUpdateClientSide())
+		if ($this->getActiveControl()->canUpdateClientSide())
 		{
 			$client = $this->getPage()->getCallbackClient();
 			$client->update($this->getLabelClientID(), $value);
@@ -149,9 +149,9 @@ 
 	 * @param boolean value
 	 * @since 3.1.2
 	 */
-	public function setReadOnly ($value)
+	public function setReadOnly($value)
 	{
-		$value=TPropertyValue::ensureBoolean($value);
+		$value = TPropertyValue::ensureBoolean($value);
 		TTextBox::setReadOnly($value);
 		if ($this->getActiveControl()->canUpdateClientSide())
 		{
@@ -173,7 +173,7 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text=$this->getText())==='')
+		if (($text = $this->getText()) === '')
 			parent::renderContents($writer);
 		else
 			$writer->write($text);
@@ -184,7 +184,7 @@ 
 	 */
 	protected function getLabelClientID()
 	{
-		return $this->getClientID().'__label';
+		return $this->getClientID() . '__label';
 	}
 
 	/**
@@ -197,7 +197,7 @@ 
 	public function onCallback($param)
 	{
 		$action = $param->getCallbackParameter();
-		if(is_array($action) && $action[0] === '__InlineEditor_loadExternalText__')
+		if (is_array($action) && $action[0] === '__InlineEditor_loadExternalText__')
 		{
 			$parameter = new TCallbackEventParameter($this->getResponse(), $action[1]);
 			$this->onLoadingText($parameter);
@@ -217,10 +217,10 @@ 
 		$options['AutoHide'] = $this->getAutoHideTextBox() == false ? '' : true;
 		$options['AutoPostBack'] = $this->getAutoPostBack() == false ? '' : true;
 		$options['Columns'] = $this->getColumns();
-		if($this->getTextMode()==='MultiLine')
+		if ($this->getTextMode() === 'MultiLine')
 		{
 			$options['Rows'] = $this->getRows();
-			$options['Wrap'] = $this->getWrap()== false ? '' : true;
+			$options['Wrap'] = $this->getWrap() == false ? '' : true;
 		}
 		else
 		{
@@ -228,10 +228,10 @@ 
 			$options['MaxLength'] = $length > 0 ? $length : '';
 		}
 
-		if($this->hasEventHandler('OnLoadingText'))
+		if ($this->hasEventHandler('OnLoadingText'))
 			$options['LoadTextOnEdit'] = true;
 
-		$options['ReadOnly']=$this->getReadOnly();
+		$options['ReadOnly'] = $this->getReadOnly();
 		return $options;
 	}
 
@@ -242,7 +242,7 @@ 
 	 */
 	public function onLoadingText($param)
 	{
-		$this->raiseEvent('OnLoadingText',$this,$param);
+		$this->raiseEvent('OnLoadingText', $this, $param);
 	}
 
 	/**
@@ -261,7 +261,7 @@ 
 	{
 		//calls the TWebControl to avoid rendering other attribute normally render for a textbox.
 		TWebControl::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getLabelClientID());
+		$writer->addAttribute('id', $this->getLabelClientID());
 		$this->getActiveControl()->registerCallbackClientScript(
 			$this->getClientClassName(), $this->getPostBackOptions());
 	}
@@ -282,7 +282,7 @@ 
 	 */
 	protected function registerClientScript()
 	{
-		$cs=$this->getPage()->getClientScript();
+		$cs = $this->getPage()->getClientScript();
 		$cs->registerPradoScript('inlineeditor');
 	}
 }

Braces +18 added lines, -13 removed lines

@@ -76,8 +76,9 @@ 
 	{
 		$value = TPropertyValue::ensureBoolean($value);
 		$this->setViewState('DisplayTextBox', $value,false);
-		if($this->getActiveControl()->canUpdateClientSide())
-			$this->callClientFunction('setDisplayTextBox',$value);
+		if($this->getActiveControl()->canUpdateClientSide()) {
+					$this->callClientFunction('setDisplayTextBox',$value);
+		}
 	}
 
 	/**
@@ -122,9 +123,12 @@ 
 	protected function getExternalControlID()
 	{
 		$extID = $this->getEditTriggerControlID();
-		if($extID===null) return '';
-		if(($control = $this->findControl($extID))!==null)
-			return $control->getClientID();
+		if($extID===null) {
+			return '';
+		}
+		if(($control = $this->findControl($extID))!==null) {
+					return $control->getClientID();
+		}
 		return $extID;
 	}
 
@@ -173,10 +177,11 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text=$this->getText())==='')
-			parent::renderContents($writer);
-		else
-			$writer->write($text);
+		if(($text=$this->getText())==='') {
+					parent::renderContents($writer);
+		} else {
+					$writer->write($text);
+		}
 	}
 
 	/**
@@ -221,15 +226,15 @@ 
 		{
 			$options['Rows'] = $this->getRows();
 			$options['Wrap'] = $this->getWrap()== false ? '' : true;
-		}
-		else
+		} else
 		{
 			$length = $this->getMaxLength();
 			$options['MaxLength'] = $length > 0 ? $length : '';
 		}
 
-		if($this->hasEventHandler('OnLoadingText'))
-			$options['LoadTextOnEdit'] = true;
+		if($this->hasEventHandler('OnLoadingText')) {
+					$options['LoadTextOnEdit'] = true;
+		}
 
 		$options['ReadOnly']=$this->getReadOnly();
 		return $options;