pradosoft / prado

framework/Web/UI/JuiControls/TJuiProgressbar.php

Indentation +8 added lines, -8 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -110,7 +110,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$options=TJavascript::encode($this->getPostBackOptions());
 		$cs=$this->getPage()->getClientScript();
 		$code="jQuery('#".$this->getWidgetID()."').".$this->getWidget()."(".$options.");";

framework/Web/UI/ActiveControls/TActiveListControlAdapter.php

Indentation +6 added lines, -6 removed lines

@@ -120,11 +120,11 @@ 
 		}
 	}
 
-    /**
-     * Clears all existing selections on the client side.
-     */
-    public function clearSelection()
-    {
+	/**
+	 * Clears all existing selections on the client side.
+	 */
+	public function clearSelection()
+	{
 		if($this->canUpdateClientSide())
 		{
 			$this->updateListItems();
@@ -137,7 +137,7 @@ 
 				$this->getPage()->getCallbackClient()->select($this->getControl(), 'Clear');
 			}
 		}
-    }
+	}
 
 	/**
 	 * Update the client-side list options.

Spacing +11 added lines, -11 removed lines

@@ -67,20 +67,20 @@ 
 		if($this->canUpdateClientSide())
 		{
 			$this->updateListItems();
-			$n = $this->getControl()->getItemCount();
+			$n=$this->getControl()->getItemCount();
 
 			$promptValue=$this->getControl()->getPromptValue();
 			if($promptValue==='')
 				$promptValue=$this->getControl()->getPromptText();
 
-			$list = array();
+			$list=array();
 			foreach($indices as $index)
 			{
-				$index = intval($index);
+				$index=intval($index);
 				if($promptValue!=='')
 					$index++;
 				if($index >= 0 && $index <= $n)
-					$list[] = $index;
+					$list[]=$index;
 			}
 			if(count($list) > 0)
 				$this->getPage()->getCallbackClient()->select(
@@ -111,9 +111,9 @@ 
 		if($this->canUpdateClientSide())
 		{
 			$this->updateListItems();
-			$list = array();
+			$list=array();
 			foreach($values as $value)
-				$list[] = $value;
+				$list[]=$value;
 			if(count($list) > 0)
 				$this->getPage()->getCallbackClient()->select(
 					$this->getControl(), 'Values', $list);
@@ -146,7 +146,7 @@ 
 	{
 		if($this->canUpdateClientSide())
 		{
-			$items = $this->getControl()->getItems();
+			$items=$this->getControl()->getItems();
 			if($items instanceof TActiveListItemCollection
 				&& $items->getListHasChanged())
 			{
@@ -197,7 +197,7 @@ 
 	 */
 	public function setControl(IActiveControl $control)
 	{
-		$this->_control = $control;
+		$this->_control=$control;
 	}
 
 	/**
@@ -221,7 +221,7 @@ 
 	 */
 	public function updateClientSide()
 	{
-		$client = $this->getControl()->getPage()->getCallbackClient();
+		$client=$this->getControl()->getPage()->getCallbackClient();
 		$client->setListItems($this->getControl(), $this);
 		$this->_hasChanged=false;
 	}
@@ -238,7 +238,7 @@ 
 	{
 		parent::insertAt($index, $value);
 		if($this->canUpdateClientSide())
-			$this->_hasChanged = true;
+			$this->_hasChanged=true;
 	}
 
 	/**
@@ -249,7 +249,7 @@ 
 	{
 		parent::removeAt($index);
 		if($this->canUpdateClientSide())
-			$this->_hasChanged = true;
+			$this->_hasChanged=true;
 	}
 }
 

framework/Web/UI/WebControls/TKeyboard.php

Indentation +7 added lines, -7 removed lines

@@ -173,15 +173,15 @@
 	{
 		if(($forControl=$this->getForControl())==='')
 			throw new TConfigurationException('keyboard_forcontrol_required');
-	    if(($target=$this->findControl($forControl))===null)
-	        throw new TConfigurationException('keyboard_forcontrol_invalid',$forControl);
+		if(($target=$this->findControl($forControl))===null)
+			throw new TConfigurationException('keyboard_forcontrol_invalid',$forControl);
 
-	    $options['ID'] = $this->getClientID();
-	    $options['ForControl'] = $target->getClientID();
-	    $options['AutoHide'] = $this->getAutoHide();
-	    $options['CssClass'] = $this->getKeyboardCssClass();
+		$options['ID'] = $this->getClientID();
+		$options['ForControl'] = $target->getClientID();
+		$options['AutoHide'] = $this->getAutoHide();
+		$options['CssClass'] = $this->getKeyboardCssClass();
 
-	    return $options;
+		return $options;
 	}
 }
 

Spacing +8 added lines, -8 removed lines

@@ -42,7 +42,7 @@ 
 	 */
 	public function getForControl()
 	{
-		return $this->getViewState('ForControl','');
+		return $this->getViewState('ForControl', '');
 	}
 
 	/**
@@ -131,7 +131,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		if($this->getPage()->getClientSupportsJavaScript())
-			$writer->addAttribute('id',$this->getClientID());
+			$writer->addAttribute('id', $this->getClientID());
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	{
 		if(($url=$this->getCssUrl())==='')
 			$url=$this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'keyboard.css');
-		$this->getPage()->getClientScript()->registerStyleSheetFile($url,$url);
+		$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 	}
 
 	/**
@@ -174,12 +174,12 @@ 
 		if(($forControl=$this->getForControl())==='')
 			throw new TConfigurationException('keyboard_forcontrol_required');
 	    if(($target=$this->findControl($forControl))===null)
-	        throw new TConfigurationException('keyboard_forcontrol_invalid',$forControl);
+	        throw new TConfigurationException('keyboard_forcontrol_invalid', $forControl);
 
-	    $options['ID'] = $this->getClientID();
-	    $options['ForControl'] = $target->getClientID();
-	    $options['AutoHide'] = $this->getAutoHide();
-	    $options['CssClass'] = $this->getKeyboardCssClass();
+	    $options['ID']=$this->getClientID();
+	    $options['ForControl']=$target->getClientID();
+	    $options['AutoHide']=$this->getAutoHide();
+	    $options['CssClass']=$this->getKeyboardCssClass();
 
 	    return $options;
 	}

framework/Web/UI/WebControls/TItemDataRenderer.php

Indentation -1 removed lines

@@ -19,7 +19,6 @@
  *
  * The following property is provided by TDataRenderer:
  * - {@link getData Data}: data associated with this renderer.
-
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @package System.Web.UI.WebControls
  * @since 3.1.2

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 	 */
 	public function setItemType($value)
 	{
-		$this->_itemType=TPropertyValue::ensureEnum($value,'TListItemType');
+		$this->_itemType=TPropertyValue::ensureEnum($value, 'TListItemType');
 	}
 
 	/**

framework/Web/UI/WebControls/TTableCell.php

Indentation +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
 
 	/**
 	 * Sets the horizontal alignment of the contents within the table item.
-     * Valid values include 'NotSet', 'Justify', 'Left', 'Right', 'Center'
+	 * Valid values include 'NotSet', 'Justify', 'Left', 'Right', 'Center'
 	 * @param string the horizontal alignment
 	 */
 	public function setHorizontalAlign($value)
@@ -110,7 +110,7 @@ 
 
 	/**
 	 * Sets the vertical alignment of the contents within the table item.
-     * Valid values include 'NotSet','Top','Bottom','Middle'
+	 * Valid values include 'NotSet','Top','Bottom','Middle'
 	 * @param string the horizontal alignment
 	 */
 	public function setVerticalAlign($value)

Spacing +6 added lines, -6 removed lines

@@ -151,7 +151,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -161,7 +161,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -197,10 +197,10 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		if(($colspan=$this->getColumnSpan())>0)
-			$writer->addAttribute('colspan',"$colspan");
-		if(($rowspan=$this->getRowSpan())>0)
-			$writer->addAttribute('rowspan',"$rowspan");
+		if(($colspan=$this->getColumnSpan()) > 0)
+			$writer->addAttribute('colspan', "$colspan");
+		if(($rowspan=$this->getRowSpan()) > 0)
+			$writer->addAttribute('rowspan', "$rowspan");
 	}
 
 	/**

framework/Web/UI/WebControls/TPanel.php

Indentation +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 
 	/**
 	 * Sets the horizontal alignment of the contents within the panel.
-     * Valid values include 'NotSet', 'Justify', 'Left', 'Right', 'Center'
+	 * Valid values include 'NotSet', 'Justify', 'Left', 'Right', 'Center'
 	 * @param string the horizontal alignment
 	 */
 	public function setHorizontalAlign($value)

Spacing +4 added lines, -4 removed lines

@@ -71,7 +71,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		if(($butt=$this->getDefaultButton())!=='')
-			$writer->addAttribute('id',$this->getClientID());
+			$writer->addAttribute('id', $this->getClientID());
 	}
 
 	/**
@@ -168,7 +168,7 @@ 
 	 */
 	public function getGroupingText()
 	{
-		return $this->getViewState('GroupingText','');
+		return $this->getViewState('GroupingText', '');
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 */
 	public function setGroupingText($value)
 	{
-		$this->setViewState('GroupingText',$value,'');
+		$this->setViewState('GroupingText', $value, '');
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 		if(($butt=$this->getDefaultButton())!=='')
 		{
 			if(($button=$this->findControl($butt))===null)
-				throw new TInvalidDataValueException('panel_defaultbutton_invalid',$butt);
+				throw new TInvalidDataValueException('panel_defaultbutton_invalid', $butt);
 			else
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 		}

framework/Web/UI/ActiveControls/TActiveLabel.php

Indentation +2 added lines, -2 removed lines

@@ -60,8 +60,8 @@
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 */
 	protected function addAttributesToRender($writer) {
-	    $writer->addAttribute('id',$this->getClientID());
-	    parent::addAttributesToRender($writer);
+		$writer->addAttribute('id',$this->getClientID());
+		parent::addAttributesToRender($writer);
 	}
 
 	/**

Spacing +3 added lines, -3 removed lines

@@ -55,7 +55,7 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
@@ -71,7 +71,7 @@ 
 	 */
 	public function setForControl($value)
 	{
-		if(parent::getForControl() === $value)
+		if(parent::getForControl()===$value)
 			return;
 
 		parent::setForControl($value);
@@ -87,7 +87,7 @@ 
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 */
 	protected function addAttributesToRender($writer) {
-	    $writer->addAttribute('id',$this->getClientID());
+	    $writer->addAttribute('id', $this->getClientID());
 	    parent::addAttributesToRender($writer);
 	}
 }

framework/Web/UI/ActiveControls/TCallbackClientSide.php

Doc Comments +4 added lines, -3 removed lines

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

Spacing +3 added lines, -3 removed lines

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

framework/Web/UI/ActiveControls/TActiveDataGrid.php

Indentation +4 added lines, -4 removed lines

@@ -68,9 +68,9 @@ 
 	}
 
 	/**
-	* Creates a new callback control, sets the adapter to
-	* TActiveControlAdapter.
-	*/
+	 * Creates a new callback control, sets the adapter to
+	 * TActiveControlAdapter.
+	 */
 	public function __construct() {
 		parent::__construct();
 		$this->setAdapter(new TActiveControlAdapter($this));
@@ -111,7 +111,7 @@ 
 	 * @param string $value container tag
 	 */
 	public function setSurroundingTag($value) {
-    $this->_surroundingTag=TPropertyValue::ensureString($value);
+	$this->_surroundingTag=TPropertyValue::ensureString($value);
 	}
 
 	/**

Braces +34 added lines, -68 removed lines

@@ -145,8 +145,7 @@ 
 				$button->setText($text);
 				return $button;
 			}
-		}
-		else {
+		} else {
 			$button=new TActiveButton;
 			if(!$enabled)
 				$button->setEnabled(false);
@@ -180,8 +179,7 @@ 
 		if($this->getHasPreRendered()) {
 			$this->renderDataGrid($writer);
 			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
-		}
-		else {
+		} else {
 			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
 		}
 	}
@@ -248,8 +246,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting()) {
+		} else if($this->getAllowSorting()) {
 				$sortExpression=$this->getSortExpression();
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$button=Prado::createComponent('System.Web.UI.WebControls.TActiveImageButton');
@@ -262,19 +259,16 @@ 
 					}
 					$button->setCausesValidation(false);
 					$cell->getControls()->add($button);
-				}
-				else if($text!=='') {
+				} else if($text!=='') {
 						$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 						$button->setText($text);
 						$button->setCommandName(TDataGrid::CMD_SORT);
 						$button->setCommandParameter($sortExpression);
 						$button->setCausesValidation(false);
 						$cell->getControls()->add($button);
-					}
-					else
+					} else
 						$cell->setText(' ');
-			}
-			else {
+			} else {
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$image=Prado::createComponent('System.Web.UI.WebControls.TActiveImage');
 					$image->setImageUrl($url);
@@ -283,8 +277,7 @@ 
 						$image->setToolTip($text);
 					}
 					$cell->getControls()->add($image);
-				}
-				else if($text!=='')
+				} else if($text!=='')
 						$cell->setText($text);
 					else
 						$cell->setText(' ');
@@ -376,8 +369,7 @@ 
 				$button->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
 			$cell->getControls()->add($button);
 			$cell->registerObject('Button',$button);
-		}
-		else
+		} else
 			parent::initializeCell($cell,$columnIndex,$itemType);
 	}
 }
@@ -416,8 +408,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting()) {
+		} else if($this->getAllowSorting()) {
 				$sortExpression=$this->getSortExpression();
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$button=Prado::createComponent('System.Web.UI.WebControls.TActiveImageButton');
@@ -428,27 +419,23 @@ 
 						$button->setAlternateText($text);
 					$button->setCausesValidation(false);
 					$cell->getControls()->add($button);
-				}
-				else if($text!=='') {
+				} else if($text!=='') {
 						$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 						$button->setText($text);
 						$button->setCommandName(TDataGrid::CMD_SORT);
 						$button->setCommandParameter($sortExpression);
 						$button->setCausesValidation(false);
 						$cell->getControls()->add($button);
-					}
-					else
+					} else
 						$cell->setText(' ');
-			}
-			else {
+			} else {
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$image=Prado::createComponent('System.Web.UI.WebControls.TActiveImage');
 					$image->setImageUrl($url);
 					if($text!=='')
 						$image->setAlternateText($text);
 					$cell->getControls()->add($image);
-				}
-				else if($text!=='')
+				} else if($text!=='')
 						$cell->setText($text);
 					else
 						$cell->setText(' ');
@@ -491,8 +478,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting())
+		} else if($this->getAllowSorting())
 		{
 			$sortExpression=$this->getSortExpression();
 			if(($url=$this->getHeaderImageUrl())!=='')
@@ -505,8 +491,7 @@ 
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 			{
 				$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 				$button->setText($text);
@@ -514,11 +499,9 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else
+			} else
 				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url=$this->getHeaderImageUrl())!=='')
 			{
@@ -527,8 +510,7 @@ 
 				if($text!=='')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');
@@ -574,8 +556,7 @@ 
 			$cell->registerObject('CheckBox',$checkBox);
 			if($this->getDataField()!=='')
 				$checkBox->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
-		}
-		else
+		} else
 			parent::initializeCell($cell,$columnIndex,$itemType);
 	}
 
@@ -597,8 +578,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting())
+		} else if($this->getAllowSorting())
 		{
 			$sortExpression=$this->getSortExpression();
 			if(($url=$this->getHeaderImageUrl())!=='')
@@ -611,8 +591,7 @@ 
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 			{
 				$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 				$button->setText($text);
@@ -620,11 +599,9 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else
+			} else
 				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url=$this->getHeaderImageUrl())!=='')
 			{
@@ -633,8 +610,7 @@ 
 				if($text!=='')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');
@@ -676,8 +652,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting())
+		} else if($this->getAllowSorting())
 		{
 			$sortExpression=$this->getSortExpression();
 			if(($url=$this->getHeaderImageUrl())!=='')
@@ -690,8 +665,7 @@ 
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 			{
 				$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 				$button->setText($text);
@@ -699,11 +673,9 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else
+			} else
 				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url=$this->getHeaderImageUrl())!=='')
 			{
@@ -712,8 +684,7 @@ 
 				if($text!=='')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');
@@ -759,8 +730,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		else if($this->getAllowSorting()) {
+		} else if($this->getAllowSorting()) {
 				$sortExpression=$this->getSortExpression();
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$button=Prado::createComponent('System.Web.UI.WebControls.TActiveImageButton');
@@ -773,19 +743,16 @@ 
 					}
 					$button->setCausesValidation(false);
 					$cell->getControls()->add($button);
-				}
-				else if($text!=='') {
+				} else if($text!=='') {
 						$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 						$button->setText($text);
 						$button->setCommandName(TDataGrid::CMD_SORT);
 						$button->setCommandParameter($sortExpression);
 						$button->setCausesValidation(false);
 						$cell->getControls()->add($button);
-					}
-					else
+					} else
 						$cell->setText(' ');
-			}
-			else {
+			} else {
 				if(($url=$this->getHeaderImageUrl())!=='') {
 					$image=Prado::createComponent('System.Web.UI.WebControls.TActiveImage');
 					$image->setImageUrl($url);
@@ -794,8 +761,7 @@ 
 						$image->setToolTip($text);
 					}
 					$cell->getControls()->add($image);
-				}
-				else if($text!=='')
+				} else if($text!=='')
 						$cell->setText($text);
 					else
 						$cell->setText(' ');

Spacing +25 added lines, -25 removed lines

@@ -94,7 +94,7 @@ 
 		parent::setDataSource($value);
 		if($this->getActiveControl()->canUpdateClientSide()) {
 			$this->renderPager();
-			$this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
 		}
 	}
 
@@ -136,7 +136,7 @@ 
 	 * @param string CommandParameter corresponding to the OnCommand event of the button
 	 * @return mixed the button instance
 	 */
-	protected function createPagerButton($pager,$buttonType,$enabled,$text,$commandName,$commandParameter) {
+	protected function createPagerButton($pager, $buttonType, $enabled, $text, $commandName, $commandParameter) {
 		if($buttonType===TDataGridPagerButtonType::LinkButton) {
 			if($enabled)
 				$button=new TActiveLinkButton;
@@ -179,10 +179,10 @@ 
 	public function render($writer) {
 		if($this->getHasPreRendered()) {
 			$this->renderDataGrid($writer);
-			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
+			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
 		}
 		else {
-			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 		}
 	}
 
@@ -196,7 +196,7 @@ 
 		foreach($pager as $item) {
 			if($item->ControlToPaginate==$this->ID) {
 				$writer=$this->getResponse()->createHtmlWriter();
-				$this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+				$this->getPage()->getAdapter()->registerControlToRender($item, $writer);
 			}
 		}
 	}
@@ -208,7 +208,7 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 */
 	private function renderDataGrid($writer) {
-	  $writer->addAttribute('id',$this->getSurroundingTagID());
+	  $writer->addAttribute('id', $this->getSurroundingTagID());
 	  $writer->renderBeginTag($this->getSurroundingTag());
 		parent::render($writer);
 		$writer->renderEndTag();
@@ -234,7 +234,7 @@ 
  * @since 3.1.9
  */
 class TActiveBoundColumn extends TBoundColumn {
-	protected function initializeHeaderCell($cell,$columnIndex) {
+	protected function initializeHeaderCell($cell, $columnIndex) {
 		$text=$this->getHeaderText();
 
 		if(($classPath=$this->getHeaderRenderer())!=='') {
@@ -313,7 +313,7 @@ 
  * @since 3.1.9
  */
 class TActiveEditCommandColumn extends TEditCommandColumn {
-	protected function createButton($commandName,$text,$causesValidation,$validationGroup) {
+	protected function createButton($commandName, $text, $causesValidation, $validationGroup) {
 		if($this->getButtonType()===TButtonColumnType::LinkButton)
 			$button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton');
 		else if($this->getButtonType()===TButtonColumnType::PushButton)
@@ -322,9 +322,9 @@ 
 			{
 				$button=Prado::createComponent('System.Web.UI.WebControls.TActiveImageButton');
 				$button->setToolTip($text);
-				if(strcasecmp($commandName,'Update')===0)
+				if(strcasecmp($commandName, 'Update')===0)
 					$url=$this->getUpdateImageUrl();
-				else if(strcasecmp($commandName,'Cancel')===0)
+				else if(strcasecmp($commandName, 'Cancel')===0)
 						$url=$this->getCancelImageUrl();
 					else
 						$url=$this->getEditImageUrl();
@@ -355,7 +355,7 @@ 
  * @since 3.1.9
  */
 class TActiveButtonColumn extends TButtonColumn {
-	public function initializeCell($cell,$columnIndex,$itemType) {
+	public function initializeCell($cell, $columnIndex, $itemType) {
 		if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::SelectedItem || $itemType===TListItemType::EditItem) {
 			$buttonType=$this->getButtonType();
 			if($buttonType===TButtonColumnType::LinkButton)
@@ -373,12 +373,12 @@ 
 			$button->setCausesValidation($this->getCausesValidation());
 			$button->setValidationGroup($this->getValidationGroup());
 			if($this->getDataTextField()!=='' || ($buttonType===TButtonColumnType::ImageButton && $this->getDataImageUrlField()!==''))
-				$button->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				$button->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 			$cell->getControls()->add($button);
-			$cell->registerObject('Button',$button);
+			$cell->registerObject('Button', $button);
 		}
 		else
-			parent::initializeCell($cell,$columnIndex,$itemType);
+			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 }
 
@@ -402,7 +402,7 @@ 
  * @since 3.1.9
  */
 class TActiveTemplateColumn extends TTemplateColumn {
-	protected function initializeHeaderCell($cell,$columnIndex) {
+	protected function initializeHeaderCell($cell, $columnIndex) {
 		$text=$this->getHeaderText();
 
 		if(($classPath=$this->getHeaderRenderer())!=='') {
@@ -473,7 +473,7 @@ 
 class TActiveHyperLinkColumn extends THyperLinkColumn
 {
 
-	protected function initializeHeaderCell($cell,$columnIndex)
+	protected function initializeHeaderCell($cell, $columnIndex)
 	{
 		$text=$this->getHeaderText();
 
@@ -562,7 +562,7 @@ 
 	 * @param integer the index to the Columns property that the cell resides in.
 	 * @param string the type of cell (Header,Footer,Item,AlternatingItem,EditItem,SelectedItem)
 	 */
-	public function initializeCell($cell,$columnIndex,$itemType)
+	public function initializeCell($cell, $columnIndex, $itemType)
 	{
 		if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::SelectedItem || $itemType===TListItemType::EditItem)
 		{
@@ -571,15 +571,15 @@ 
 				$checkBox->setEnabled(false);
 			$cell->setHorizontalAlign('Center');
 			$cell->getControls()->add($checkBox);
-			$cell->registerObject('CheckBox',$checkBox);
+			$cell->registerObject('CheckBox', $checkBox);
 			if($this->getDataField()!=='')
-				$checkBox->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				$checkBox->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 		}
 		else
-			parent::initializeCell($cell,$columnIndex,$itemType);
+			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
-	protected function initializeHeaderCell($cell,$columnIndex)
+	protected function initializeHeaderCell($cell, $columnIndex)
 	{
 		$text=$this->getHeaderText();
 
@@ -658,7 +658,7 @@ 
  */
 class TActiveDropDownListColumn extends TDropDownListColumn
 {
-	protected function initializeHeaderCell($cell,$columnIndex)
+	protected function initializeHeaderCell($cell, $columnIndex)
 	{
 		$text=$this->getHeaderText();
 
@@ -745,7 +745,7 @@ 
  * @since 3.1.9
  */
 class TActiveLiteralColumn extends TLiteralColumn {
-	protected function initializeHeaderCell($cell,$columnIndex) {
+	protected function initializeHeaderCell($cell, $columnIndex) {
 		$text=$this->getHeaderText();
 
 		if(($classPath=$this->getHeaderRenderer())!=='') {
@@ -821,8 +821,8 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_callbackoptions === null)
-			$this->_callbackoptions = new TCallbackOptions;
+		if($this->_callbackoptions===null)
+			$this->_callbackoptions=new TCallbackOptions;
 		return $this->_callbackoptions->getClientSide();
 	}
 }