pradosoft / prado

framework/Web/UI/WebControls/TBulletedList.php

Spacing +43 added lines, -43 removed lines

@@ -61,7 +61,7 @@ 
 	{
 		if($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
-		$this->onClick(new TBulletedListEventParameter((int)$param));
+		$this->onClick(new TBulletedListEventParameter((int) $param));
 	}
 
 	/**
@@ -102,45 +102,45 @@ 
 		switch($this->getBulletStyle())
 		{
 			case TBulletStyle::None:
-				$writer->addStyleAttribute('list-style-type','none');
+				$writer->addStyleAttribute('list-style-type', 'none');
 				$needStart=true;
 				break;
 			case TBulletStyle::Numbered:
-				$writer->addStyleAttribute('list-style-type','decimal');
+				$writer->addStyleAttribute('list-style-type', 'decimal');
 				$needStart=true;
 				break;
 			case TBulletStyle::LowerAlpha:
-				$writer->addStyleAttribute('list-style-type','lower-alpha');
+				$writer->addStyleAttribute('list-style-type', 'lower-alpha');
 				$needStart=true;
 				break;
 			case TBulletStyle::UpperAlpha:
-				$writer->addStyleAttribute('list-style-type','upper-alpha');
+				$writer->addStyleAttribute('list-style-type', 'upper-alpha');
 				$needStart=true;
 				break;
 			case TBulletStyle::LowerRoman:
-				$writer->addStyleAttribute('list-style-type','lower-roman');
+				$writer->addStyleAttribute('list-style-type', 'lower-roman');
 				$needStart=true;
 				break;
 			case TBulletStyle::UpperRoman:
-				$writer->addStyleAttribute('list-style-type','upper-roman');
+				$writer->addStyleAttribute('list-style-type', 'upper-roman');
 				$needStart=true;
 				break;
 			case TBulletStyle::Disc:
-				$writer->addStyleAttribute('list-style-type','disc');
+				$writer->addStyleAttribute('list-style-type', 'disc');
 				break;
 			case TBulletStyle::Circle:
-				$writer->addStyleAttribute('list-style-type','circle');
+				$writer->addStyleAttribute('list-style-type', 'circle');
 				break;
 			case TBulletStyle::Square:
-				$writer->addStyleAttribute('list-style-type','square');
+				$writer->addStyleAttribute('list-style-type', 'square');
 				break;
 			case TBulletStyle::CustomImage:
 				$url=$this->getBulletImageUrl();
-				$writer->addStyleAttribute('list-style-image',"url($url)");
+				$writer->addStyleAttribute('list-style-image', "url($url)");
 				break;
 		}
 		if($needStart && ($start=$this->getFirstBulletNumber())!=1)
-			$writer->addAttribute('start',"$start");
+			$writer->addAttribute('start', "$start");
 		parent::addAttributesToRender($writer);
 	}
 
@@ -149,7 +149,7 @@ 
 	 */
 	public function getBulletImageUrl()
 	{
-		return $this->getViewState('BulletImageUrl','');
+		return $this->getViewState('BulletImageUrl', '');
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function setBulletImageUrl($value)
 	{
-		$this->setViewState('BulletImageUrl',$value,'');
+		$this->setViewState('BulletImageUrl', $value, '');
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	 */
 	public function getBulletStyle()
 	{
-		return $this->getViewState('BulletStyle',TBulletStyle::NotSet);
+		return $this->getViewState('BulletStyle', TBulletStyle::NotSet);
 	}
 
 	/**
@@ -173,7 +173,7 @@ 
 	 */
 	public function setBulletStyle($value)
 	{
-		$this->setViewState('BulletStyle',TPropertyValue::ensureEnum($value,'TBulletStyle'),TBulletStyle::NotSet);
+		$this->setViewState('BulletStyle', TPropertyValue::ensureEnum($value, 'TBulletStyle'), TBulletStyle::NotSet);
 	}
 
 	/**
@@ -181,7 +181,7 @@ 
 	 */
 	public function getDisplayMode()
 	{
-		return $this->getViewState('DisplayMode',TBulletedListDisplayMode::Text);
+		return $this->getViewState('DisplayMode', TBulletedListDisplayMode::Text);
 	}
 
 	/**
@@ -189,7 +189,7 @@ 
 	 */
 	public function setDisplayMode($value)
 	{
-		$this->setViewState('DisplayMode',TPropertyValue::ensureEnum($value,'TBulletedListDisplayMode'),TBulletedListDisplayMode::Text);
+		$this->setViewState('DisplayMode', TPropertyValue::ensureEnum($value, 'TBulletedListDisplayMode'), TBulletedListDisplayMode::Text);
 	}
 
 	/**
@@ -199,7 +199,7 @@ 
 	 */
 	public function getFirstBulletNumber()
 	{
-		return $this->getViewState('FirstBulletNumber',1);
+		return $this->getViewState('FirstBulletNumber', 1);
 	}
 
 	/**
@@ -208,7 +208,7 @@ 
 	 */
 	public function setFirstBulletNumber($value)
 	{
-		$this->setViewState('FirstBulletNumber',TPropertyValue::ensureInteger($value),1);
+		$this->setViewState('FirstBulletNumber', TPropertyValue::ensureInteger($value), 1);
 	}
 
 	/**
@@ -219,7 +219,7 @@ 
 	 */
 	public function onClick($param)
 	{
-		$this->raiseEvent('OnClick',$this,$param);
+		$this->raiseEvent('OnClick', $this, $param);
 	}
 
 	/**
@@ -229,7 +229,7 @@ 
 	 */
 	public function getTarget()
 	{
-		return $this->getViewState('Target','');
+		return $this->getViewState('Target', '');
 	}
 
 	/**
@@ -239,7 +239,7 @@ 
 	 */
 	public function setTarget($value)
 	{
-		$this->setViewState('Target',$value,'');
+		$this->setViewState('Target', $value, '');
 	}
 
 	/**
@@ -266,7 +266,7 @@ 
 			if($item->getHasAttributes())
 				$writer->addAttributes($item->getAttributes());
 			$writer->renderBeginTag('li');
-			$this->renderBulletText($writer,$item,$index);
+			$this->renderBulletText($writer, $item, $index);
 			$writer->renderEndTag();
 			$writer->writeLine();
 		}
@@ -278,7 +278,7 @@ 
 	 * @param TListItem item to be rendered
 	 * @param integer index of the item being rendered
 	 */
-	protected function renderBulletText($writer,$item,$index)
+	protected function renderBulletText($writer, $item, $index)
 	{
 		switch($this->getDisplayMode())
 		{
@@ -300,7 +300,7 @@ 
 			$writer->write(THttpUtility::htmlEncode($item->getText()));
 		else
 		{
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 			$writer->renderBeginTag('span');
 			$writer->write(THttpUtility::htmlEncode($item->getText()));
 			$writer->renderEndTag();
@@ -310,15 +310,15 @@ 
 	protected function renderHyperLinkItem($writer, $item, $index)
 	{
 		if(!$this->_isEnabled || !$item->getEnabled())
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 		else
 		{
-			$writer->addAttribute('href',$item->getValue());
+			$writer->addAttribute('href', $item->getValue());
 			if(($target=$this->getTarget())!=='')
-				$writer->addAttribute('target',$target);
+				$writer->addAttribute('target', $target);
 		}
 		if(($accesskey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accesskey);
+			$writer->addAttribute('accesskey', $accesskey);
 		$writer->renderBeginTag('a');
 		$writer->write(THttpUtility::htmlEncode($item->getText()));
 		$writer->renderEndTag();
@@ -327,17 +327,17 @@ 
 	protected function renderLinkButtonItem($writer, $item, $index)
 	{
 		if(!$this->_isEnabled || !$item->getEnabled())
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 		else
 		{
-			$this->_currentRenderItemIndex = $index;
+			$this->_currentRenderItemIndex=$index;
 			$writer->addAttribute('id', $this->getClientID().$index);
 			$writer->addAttribute('href', "javascript:;//".$this->getClientID().$index);
-			$cs = $this->getPage()->getClientScript();
-			$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+			$cs=$this->getPage()->getClientScript();
+			$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 		}
 		if(($accesskey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accesskey);
+			$writer->addAttribute('accesskey', $accesskey);
 		$writer->renderBeginTag('a');
 		$writer->write(THttpUtility::htmlEncode($item->getText()));
 		$writer->renderEndTag();
@@ -348,19 +348,19 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['EventParameter'] = $this->_currentRenderItemIndex;
-		$options['ID'] = $this->getClientID().$this->_currentRenderItemIndex;
-		$options['StopEvent'] = true;
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['EventParameter']=$this->_currentRenderItemIndex;
+		$options['ID']=$this->getClientID().$this->_currentRenderItemIndex;
+		$options['StopEvent']=true;
 		return $options;
 	}
 
 	protected function canCauseValidation()
 	{
-		$group = $this->getValidationGroup();
-		$hasValidators = $this->getPage()->getValidators($group)->getCount()>0;
+		$group=$this->getValidationGroup();
+		$hasValidators=$this->getPage()->getValidators($group)->getCount() > 0;
 		return $this->getCausesValidation() && $hasValidators;
 	}
 

framework/Web/UI/WebControls/THead.php

Spacing +16 added lines, -16 removed lines

@@ -80,7 +80,7 @@ 
 	 */
 	public function getTitle()
 	{
-		return $this->getViewState('Title','');
+		return $this->getViewState('Title', '');
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 */
 	public function setTitle($value)
 	{
-		$this->setViewState('Title',$value,'');
+		$this->setViewState('Title', $value, '');
 	}
 
 	/**
@@ -99,7 +99,7 @@ 
 	 */
 	public function getBaseUrl()
 	{
-		return $this->getViewState('BaseUrl','');
+		return $this->getViewState('BaseUrl', '');
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 */
 	public function setBaseUrl($url)
 	{
-		$this->setViewState('BaseUrl',$url,'');
+		$this->setViewState('BaseUrl', $url, '');
 	}
 
 	/**
@@ -115,7 +115,7 @@ 
 	 */
 	public function getShortcutIcon()
 	{
-		return $this->getViewState('ShortcutIcon','');
+		return $this->getViewState('ShortcutIcon', '');
 	}
 
 	/**
@@ -123,7 +123,7 @@ 
 	 */
 	public function setShortcutIcon($url)
 	{
-		$this->setViewState('ShortcutIcon',$url,'');
+		$this->setViewState('ShortcutIcon', $url, '');
 	}
 
 	/**
@@ -131,10 +131,10 @@ 
 	 */
 	public function getMetaTags()
 	{
-		if(($metaTags=$this->getViewState('MetaTags',null))===null)
+		if(($metaTags=$this->getViewState('MetaTags', null))===null)
 		{
 			$metaTags=new TMetaTagCollection;
-			$this->setViewState('MetaTags',$metaTags,null);
+			$this->setViewState('MetaTags', $metaTags, null);
 		}
 		return $metaTags;
 	}
@@ -297,14 +297,14 @@ 
 	public function render($writer)
 	{
 		if($this->_id!=='')
-			$writer->addAttribute('id',$this->_id);
+			$writer->addAttribute('id', $this->_id);
 		if($this->_name!=='')
-			$writer->addAttribute('name',$this->_name);
+			$writer->addAttribute('name', $this->_name);
 		if($this->_httpEquiv!=='')
-			$writer->addAttribute('http-equiv',$this->_httpEquiv);
+			$writer->addAttribute('http-equiv', $this->_httpEquiv);
 		if($this->_scheme!=='')
-			$writer->addAttribute('scheme',$this->_scheme);
-		$writer->addAttribute('content',$this->_content);
+			$writer->addAttribute('scheme', $this->_scheme);
+		$writer->addAttribute('content', $this->_content);
 		$writer->renderBeginTag('meta');
 		$writer->renderEndTag();
 	}
@@ -331,10 +331,10 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a {@link TMetaTag}
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TMetaTag)
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('metatagcollection_metatag_invalid');
 	}
@@ -363,7 +363,7 @@ 
 	 */
 	public function findMetaTagByID($id)
 	{
-		if(($index=$this->findIndexByID($id))>=0)
+		if(($index=$this->findIndexByID($id)) >= 0)
 			return $this->itemAt($index);
 		else
 			return null;

framework/Web/UI/WebControls/TBoundColumn.php

Spacing +19 added lines, -19 removed lines

@@ -52,7 +52,7 @@ 
 	 */
 	public function getItemRenderer()
 	{
-		return $this->getViewState('ItemRenderer','');
+		return $this->getViewState('ItemRenderer', '');
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	 */
 	public function setItemRenderer($value)
 	{
-		$this->setViewState('ItemRenderer',$value,'');
+		$this->setViewState('ItemRenderer', $value, '');
 	}
 
 	/**
@@ -80,7 +80,7 @@ 
 	 */
 	public function getEditItemRenderer()
 	{
-		return $this->getViewState('EditItemRenderer','');
+		return $this->getViewState('EditItemRenderer', '');
 	}
 
 	/**
@@ -99,7 +99,7 @@ 
 	 */
 	public function setEditItemRenderer($value)
 	{
-		$this->setViewState('EditItemRenderer',$value,'');
+		$this->setViewState('EditItemRenderer', $value, '');
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 */
 	public function getDataField()
 	{
-		return $this->getViewState('DataField','');
+		return $this->getViewState('DataField', '');
 	}
 
 	/**
@@ -115,7 +115,7 @@ 
 	 */
 	public function setDataField($value)
 	{
-		$this->setViewState('DataField',$value,'');
+		$this->setViewState('DataField', $value, '');
 	}
 
 	/**
@@ -123,7 +123,7 @@ 
 	 */
 	public function getDataFormatString()
 	{
-		return $this->getViewState('DataFormatString','');
+		return $this->getViewState('DataFormatString', '');
 	}
 
 	/**
@@ -131,7 +131,7 @@ 
 	 */
 	public function setDataFormatString($value)
 	{
-		$this->setViewState('DataFormatString',$value,'');
+		$this->setViewState('DataFormatString', $value, '');
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	 */
 	public function getReadOnly()
 	{
-		return $this->getViewState('ReadOnly',false);
+		return $this->getViewState('ReadOnly', false);
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 	 */
 	public function setReadOnly($value)
 	{
-		$this->setViewState('ReadOnly',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ReadOnly', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -161,7 +161,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)
 	{
 		$item=$cell->getParent();
 		switch($itemType)
@@ -181,7 +181,7 @@ 
 				}
 				else
 					$control=$cell;
-				$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				$control->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 				break;
 			case TListItemType::EditItem:
 				if(!$this->getReadOnly())
@@ -195,13 +195,13 @@ 
 							$control->setItemType($item->getItemType());
 						}
 						$cell->getControls()->add($control);
-						$cell->registerObject('EditControl',$control);
+						$cell->registerObject('EditControl', $control);
 					}
 					else
 					{
 						$control=Prado::createComponent('System.Web.UI.WebControls.TTextBox');
 						$cell->getControls()->add($control);
-						$cell->registerObject('TextBox',$control);
+						$cell->registerObject('TextBox', $control);
 					}
 				}
 				else
@@ -219,10 +219,10 @@ 
 					else
 						$control=$cell;
 				}
-				$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				$control->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 				break;
 			default:
-				parent::initializeCell($cell,$columnIndex,$itemType);
+				parent::initializeCell($cell, $columnIndex, $itemType);
 				break;
 		}
 	}
@@ -232,15 +232,15 @@ 
 	 * This method is invoked when datagrid performs databinding.
 	 * It populates the content of the cell with the relevant data from data source.
 	 */
-	public function dataBindColumn($sender,$param)
+	public function dataBindColumn($sender, $param)
 	{
 		$item=$sender->getNamingContainer();
 		$data=$item->getData();
 		$formatString=$this->getDataFormatString();
 		if(($field=$this->getDataField())!=='')
-			$value=$this->formatDataValue($formatString,$this->getDataFieldValue($data,$field));
+			$value=$this->formatDataValue($formatString, $this->getDataFieldValue($data, $field));
 		else
-			$value=$this->formatDataValue($formatString,$data);
+			$value=$this->formatDataValue($formatString, $data);
 		$sender->setData($value);
 	}
 }

framework/Web/UI/WebControls/TDataList.php

Spacing +131 added lines, -131 removed lines

@@ -198,7 +198,7 @@ 
 	 */
 	public function getItemCount()
 	{
-		return $this->_items?$this->_items->getCount():0;
+		return $this->_items ? $this->_items->getCount() : 0;
 	}
 
 	/**
@@ -207,7 +207,7 @@ 
 	 */
 	public function getItemRenderer()
 	{
-		return $this->getViewState('ItemRenderer','');
+		return $this->getViewState('ItemRenderer', '');
 	}
 
 	/**
@@ -222,7 +222,7 @@ 
 	 */
 	public function setItemRenderer($value)
 	{
-		$this->setViewState('ItemRenderer',$value,'');
+		$this->setViewState('ItemRenderer', $value, '');
 	}
 
 	/**
@@ -231,7 +231,7 @@ 
 	 */
 	public function getAlternatingItemRenderer()
 	{
-		return $this->getViewState('AlternatingItemRenderer','');
+		return $this->getViewState('AlternatingItemRenderer', '');
 	}
 
 	/**
@@ -246,7 +246,7 @@ 
 	 */
 	public function setAlternatingItemRenderer($value)
 	{
-		$this->setViewState('AlternatingItemRenderer',$value,'');
+		$this->setViewState('AlternatingItemRenderer', $value, '');
 	}
 
 	/**
@@ -255,7 +255,7 @@ 
 	 */
 	public function getEditItemRenderer()
 	{
-		return $this->getViewState('EditItemRenderer','');
+		return $this->getViewState('EditItemRenderer', '');
 	}
 
 	/**
@@ -270,7 +270,7 @@ 
 	 */
 	public function setEditItemRenderer($value)
 	{
-		$this->setViewState('EditItemRenderer',$value,'');
+		$this->setViewState('EditItemRenderer', $value, '');
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
 	 */
 	public function getSelectedItemRenderer()
 	{
-		return $this->getViewState('SelectedItemRenderer','');
+		return $this->getViewState('SelectedItemRenderer', '');
 	}
 
 	/**
@@ -294,7 +294,7 @@ 
 	 */
 	public function setSelectedItemRenderer($value)
 	{
-		$this->setViewState('SelectedItemRenderer',$value,'');
+		$this->setViewState('SelectedItemRenderer', $value, '');
 	}
 
 	/**
@@ -303,7 +303,7 @@ 
 	 */
 	public function getSeparatorRenderer()
 	{
-		return $this->getViewState('SeparatorRenderer','');
+		return $this->getViewState('SeparatorRenderer', '');
 	}
 
 	/**
@@ -318,7 +318,7 @@ 
 	 */
 	public function setSeparatorRenderer($value)
 	{
-		$this->setViewState('SeparatorRenderer',$value,'');
+		$this->setViewState('SeparatorRenderer', $value, '');
 	}
 
 	/**
@@ -327,7 +327,7 @@ 
 	 */
 	public function getHeaderRenderer()
 	{
-		return $this->getViewState('HeaderRenderer','');
+		return $this->getViewState('HeaderRenderer', '');
 	}
 
 	/**
@@ -342,7 +342,7 @@ 
 	 */
 	public function setHeaderRenderer($value)
 	{
-		$this->setViewState('HeaderRenderer',$value,'');
+		$this->setViewState('HeaderRenderer', $value, '');
 	}
 
 	/**
@@ -351,7 +351,7 @@ 
 	 */
 	public function getFooterRenderer()
 	{
-		return $this->getViewState('FooterRenderer','');
+		return $this->getViewState('FooterRenderer', '');
 	}
 
 	/**
@@ -366,7 +366,7 @@ 
 	 */
 	public function setFooterRenderer($value)
 	{
-		$this->setViewState('FooterRenderer',$value,'');
+		$this->setViewState('FooterRenderer', $value, '');
 	}
 
 	/**
@@ -375,7 +375,7 @@ 
 	 */
 	public function getEmptyRenderer()
 	{
-		return $this->getViewState('EmptyRenderer','');
+		return $this->getViewState('EmptyRenderer', '');
 	}
 
 	/**
@@ -391,7 +391,7 @@ 
 	 */
 	public function setEmptyRenderer($value)
 	{
-		$this->setViewState('EmptyRenderer',$value,'');
+		$this->setViewState('EmptyRenderer', $value, '');
 	}
 
 	/**
@@ -411,7 +411,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_itemTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','ItemTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'ItemTemplate');
 	}
 
 	/**
@@ -419,10 +419,10 @@ 
 	 */
 	public function getItemStyle()
 	{
-		if(($style=$this->getViewState('ItemStyle',null))===null)
+		if(($style=$this->getViewState('ItemStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('ItemStyle',$style,null);
+			$this->setViewState('ItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -444,7 +444,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_alternatingItemTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','AlternatingItemType');
+			throw new TInvalidDataTypeException('datalist_template_required', 'AlternatingItemType');
 	}
 
 	/**
@@ -452,10 +452,10 @@ 
 	 */
 	public function getAlternatingItemStyle()
 	{
-		if(($style=$this->getViewState('AlternatingItemStyle',null))===null)
+		if(($style=$this->getViewState('AlternatingItemStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('AlternatingItemStyle',$style,null);
+			$this->setViewState('AlternatingItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -477,7 +477,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_selectedItemTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','SelectedItemTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'SelectedItemTemplate');
 	}
 
 	/**
@@ -485,10 +485,10 @@ 
 	 */
 	public function getSelectedItemStyle()
 	{
-		if(($style=$this->getViewState('SelectedItemStyle',null))===null)
+		if(($style=$this->getViewState('SelectedItemStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('SelectedItemStyle',$style,null);
+			$this->setViewState('SelectedItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -510,7 +510,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_editItemTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','EditItemTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'EditItemTemplate');
 	}
 
 	/**
@@ -518,10 +518,10 @@ 
 	 */
 	public function getEditItemStyle()
 	{
-		if(($style=$this->getViewState('EditItemStyle',null))===null)
+		if(($style=$this->getViewState('EditItemStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('EditItemStyle',$style,null);
+			$this->setViewState('EditItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -543,7 +543,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_headerTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','HeaderTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'HeaderTemplate');
 	}
 
 	/**
@@ -551,10 +551,10 @@ 
 	 */
 	public function getHeaderStyle()
 	{
-		if(($style=$this->getViewState('HeaderStyle',null))===null)
+		if(($style=$this->getViewState('HeaderStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('HeaderStyle',$style,null);
+			$this->setViewState('HeaderStyle', $style, null);
 		}
 		return $style;
 	}
@@ -584,7 +584,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_footerTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','FooterTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'FooterTemplate');
 	}
 
 	/**
@@ -592,10 +592,10 @@ 
 	 */
 	public function getFooterStyle()
 	{
-		if(($style=$this->getViewState('FooterStyle',null))===null)
+		if(($style=$this->getViewState('FooterStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('FooterStyle',$style,null);
+			$this->setViewState('FooterStyle', $style, null);
 		}
 		return $style;
 	}
@@ -625,7 +625,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_emptyTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','EmptyTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'EmptyTemplate');
 	}
 
 	/**
@@ -645,7 +645,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_separatorTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('datalist_template_required','SeparatorTemplate');
+			throw new TInvalidDataTypeException('datalist_template_required', 'SeparatorTemplate');
 	}
 
 	/**
@@ -653,10 +653,10 @@ 
 	 */
 	public function getSeparatorStyle()
 	{
-		if(($style=$this->getViewState('SeparatorStyle',null))===null)
+		if(($style=$this->getViewState('SeparatorStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('SeparatorStyle',$style,null);
+			$this->setViewState('SeparatorStyle', $style, null);
 		}
 		return $style;
 	}
@@ -667,7 +667,7 @@ 
 	 */
 	public function getSelectedItemIndex()
 	{
-		return $this->getViewState('SelectedItemIndex',-1);
+		return $this->getViewState('SelectedItemIndex', -1);
 	}
 
 	/**
@@ -679,20 +679,20 @@ 
 	 */
 	public function setSelectedItemIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=-1;
 		if(($current=$this->getSelectedItemIndex())!==$value)
 		{
-			$this->setViewState('SelectedItemIndex',$value,-1);
+			$this->setViewState('SelectedItemIndex', $value, -1);
 			$items=$this->getItems();
 			$itemCount=$items->getCount();
-			if($current>=0 && $current<$itemCount)
+			if($current >= 0 && $current < $itemCount)
 			{
 				$item=$items->itemAt($current);
 				if(($item instanceof IItemDataRenderer) && $item->getItemType()!==TListItemType::EditItem)
-					$item->setItemType($current%2?TListItemType::AlternatingItem : TListItemType::Item);
+					$item->setItemType($current % 2 ? TListItemType::AlternatingItem : TListItemType::Item);
 			}
-			if($value>=0 && $value<$itemCount)
+			if($value >= 0 && $value < $itemCount)
 			{
 				$item=$items->itemAt($value);
 				if(($item instanceof IItemDataRenderer) && $item->getItemType()!==TListItemType::EditItem)
@@ -708,7 +708,7 @@ 
 	{
 		$index=$this->getSelectedItemIndex();
 		$items=$this->getItems();
-		if($index>=0 && $index<$items->getCount())
+		if($index >= 0 && $index < $items->getCount())
 			return $items->itemAt($index);
 		else
 			return null;
@@ -724,7 +724,7 @@ 
 			throw new TInvalidOperationException('datalist_datakeyfield_required');
 		$index=$this->getSelectedItemIndex();
 		$dataKeys=$this->getDataKeys();
-		if($index>=0 && $index<$dataKeys->getCount())
+		if($index >= 0 && $index < $dataKeys->getCount())
 			return $dataKeys->itemAt($index);
 		else
 			return null;
@@ -736,7 +736,7 @@ 
 	 */
 	public function getEditItemIndex()
 	{
-		return $this->getViewState('EditItemIndex',-1);
+		return $this->getViewState('EditItemIndex', -1);
 	}
 
 	/**
@@ -747,16 +747,16 @@ 
 	 */
 	public function setEditItemIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=-1;
 		if(($current=$this->getEditItemIndex())!==$value)
 		{
-			$this->setViewState('EditItemIndex',$value,-1);
+			$this->setViewState('EditItemIndex', $value, -1);
 			$items=$this->getItems();
 			$itemCount=$items->getCount();
-			if($current>=0 && $current<$itemCount)
-				$items->itemAt($current)->setItemType($current%2?TListItemType::AlternatingItem : TListItemType::Item);
-			if($value>=0 && $value<$itemCount)
+			if($current >= 0 && $current < $itemCount)
+				$items->itemAt($current)->setItemType($current % 2 ? TListItemType::AlternatingItem : TListItemType::Item);
+			if($value >= 0 && $value < $itemCount)
 				$items->itemAt($value)->setItemType(TListItemType::EditItem);
 		}
 	}
@@ -768,7 +768,7 @@ 
 	{
 		$index=$this->getEditItemIndex();
 		$items=$this->getItems();
-		if($index>=0 && $index<$items->getCount())
+		if($index >= 0 && $index < $items->getCount())
 			return $items->itemAt($index);
 		else
 			return null;
@@ -779,7 +779,7 @@ 
 	 */
 	public function getShowHeader()
 	{
-		return $this->getViewState('ShowHeader',true);
+		return $this->getViewState('ShowHeader', true);
 	}
 
 	/**
@@ -787,7 +787,7 @@ 
 	 */
 	public function setShowHeader($value)
 	{
-		$this->setViewState('ShowHeader',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('ShowHeader', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -795,7 +795,7 @@ 
 	 */
 	public function getShowFooter()
 	{
-		return $this->getViewState('ShowFooter',true);
+		return $this->getViewState('ShowFooter', true);
 	}
 
 	/**
@@ -803,7 +803,7 @@ 
 	 */
 	public function setShowFooter($value)
 	{
-		$this->setViewState('ShowFooter',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('ShowFooter', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -811,10 +811,10 @@ 
 	 */
 	protected function getRepeatInfo()
 	{
-		if(($repeatInfo=$this->getViewState('RepeatInfo',null))===null)
+		if(($repeatInfo=$this->getViewState('RepeatInfo', null))===null)
 		{
 			$repeatInfo=new TRepeatInfo;
-			$this->setViewState('RepeatInfo',$repeatInfo,null);
+			$this->setViewState('RepeatInfo', $repeatInfo, null);
 		}
 		return $repeatInfo;
 	}
@@ -912,35 +912,35 @@ 
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		if($param instanceof TDataListCommandEventParameter)
 		{
 			$this->onItemCommand($param);
 			$command=$param->getCommandName();
-			if(strcasecmp($command,self::CMD_SELECT)===0)
+			if(strcasecmp($command, self::CMD_SELECT)===0)
 			{
 				if(($item=$param->getItem()) instanceof IItemDataRenderer)
 					$this->setSelectedItemIndex($item->getItemIndex());
 				$this->onSelectedIndexChanged($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_EDIT)===0)
+			else if(strcasecmp($command, self::CMD_EDIT)===0)
 			{
 				$this->onEditCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_DELETE)===0)
+			else if(strcasecmp($command, self::CMD_DELETE)===0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_UPDATE)===0)
+			else if(strcasecmp($command, self::CMD_UPDATE)===0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_CANCEL)===0)
+			else if(strcasecmp($command, self::CMD_CANCEL)===0)
 			{
 				$this->onCancelCommand($param);
 				return true;
@@ -962,7 +962,7 @@ 
 	 */
 	public function onItemCreated($param)
 	{
-		$this->raiseEvent('OnItemCreated',$this,$param);
+		$this->raiseEvent('OnItemCreated', $this, $param);
 	}
 
 	/**
@@ -976,7 +976,7 @@ 
 	 */
 	public function onItemDataBound($param)
 	{
-		$this->raiseEvent('OnItemDataBound',$this,$param);
+		$this->raiseEvent('OnItemDataBound', $this, $param);
 	}
 
 	/**
@@ -987,7 +987,7 @@ 
 	 */
 	public function onItemCommand($param)
 	{
-		$this->raiseEvent('OnItemCommand',$this,$param);
+		$this->raiseEvent('OnItemCommand', $this, $param);
 	}
 
 	/**
@@ -998,7 +998,7 @@ 
 	 */
 	public function onEditCommand($param)
 	{
-		$this->raiseEvent('OnEditCommand',$this,$param);
+		$this->raiseEvent('OnEditCommand', $this, $param);
 	}
 
 	/**
@@ -1009,7 +1009,7 @@ 
 	 */
 	public function onDeleteCommand($param)
 	{
-		$this->raiseEvent('OnDeleteCommand',$this,$param);
+		$this->raiseEvent('OnDeleteCommand', $this, $param);
 	}
 
 	/**
@@ -1020,7 +1020,7 @@ 
 	 */
 	public function onUpdateCommand($param)
 	{
-		$this->raiseEvent('OnUpdateCommand',$this,$param);
+		$this->raiseEvent('OnUpdateCommand', $this, $param);
 	}
 
 	/**
@@ -1031,7 +1031,7 @@ 
 	 */
 	public function onCancelCommand($param)
 	{
-		$this->raiseEvent('OnCancelCommand',$this,$param);
+		$this->raiseEvent('OnCancelCommand', $this, $param);
 	}
 
 	/**
@@ -1071,9 +1071,9 @@ 
 	 * @param integer index of the item being rendered
 	 * @return TStyle item style
 	 */
-	public function generateItemStyle($itemType,$index)
+	public function generateItemStyle($itemType, $index)
 	{
-		if(($item=$this->getItem($itemType,$index))!==null && ($item instanceof IStyleable) && $item->getHasStyle())
+		if(($item=$this->getItem($itemType, $index))!==null && ($item instanceof IStyleable) && $item->getHasStyle())
 		{
 			$style=$item->getStyle();
 			$item->clearStyle();
@@ -1091,9 +1091,9 @@ 
 	 * @param string item type (Header,Footer,Item,AlternatingItem,SelectedItem,EditItem,Separator,Pager)
 	 * @param integer zero-based index of the item in the item list
 	 */
-	public function renderItem($writer,$repeatInfo,$itemType,$index)
+	public function renderItem($writer, $repeatInfo, $itemType, $index)
 	{
-		$item=$this->getItem($itemType,$index);
+		$item=$this->getItem($itemType, $index);
 		if($repeatInfo->getRepeatLayout()===TRepeatLayout::Raw && get_class($item)==='TDataListItem')
 			$item->setTagName('div');
 		$item->renderControl($writer);
@@ -1104,7 +1104,7 @@ 
 	 * @param integer item index
 	 * @return TControl data list item with the specified item type and index
 	 */
-	private function getItem($itemType,$index)
+	private function getItem($itemType, $index)
 	{
 		switch($itemType)
 		{
@@ -1116,9 +1116,9 @@ 
 			case TListItemType::Header:
 				return $this->getControls()->itemAt(0);
 			case TListItemType::Footer:
-				return $this->getControls()->itemAt($this->getControls()->getCount()-1);
+				return $this->getControls()->itemAt($this->getControls()->getCount() - 1);
 			case TListItemType::Separator:
-				$i=$index+$index+1;
+				$i=$index + $index + 1;
 				if($this->_headerTemplate!==null || $this->getHeaderRenderer()!=='')
 					$i++;
 				return $this->getControls()->itemAt($i);
@@ -1133,9 +1133,9 @@ 
 	 * @param TListItemType item type
 	 * @return TControl the created item, null if item is not created
 	 */
-	private function createItemInternal($itemIndex,$itemType)
+	private function createItemInternal($itemIndex, $itemType)
 	{
-		if(($item=$this->createItem($itemIndex,$itemType))!==null)
+		if(($item=$this->createItem($itemIndex, $itemType))!==null)
 		{
 			$param=new TDataListItemEventParameter($item);
 			$this->onItemCreated($param);
@@ -1154,9 +1154,9 @@ 
 	 * @param mixed data to be associated with the item
 	 * @return TControl the created item, null if item is not created
 	 */
-	private function createItemWithDataInternal($itemIndex,$itemType,$dataItem)
+	private function createItemWithDataInternal($itemIndex, $itemType, $dataItem)
 	{
-		if(($item=$this->createItem($itemIndex,$itemType))!==null)
+		if(($item=$this->createItem($itemIndex, $itemType))!==null)
 		{
 			$param=new TDataListItemEventParameter($item);
 			if($item instanceof IDataRenderer)
@@ -1174,22 +1174,22 @@ 
 	private function getAlternatingItemDisplay()
 	{
 		if(($classPath=$this->getAlternatingItemRenderer())==='' && $this->_alternatingItemTemplate===null)
-			return array($this->getItemRenderer(),$this->_itemTemplate);
+			return array($this->getItemRenderer(), $this->_itemTemplate);
 		else
-			return array($classPath,$this->_alternatingItemTemplate);
+			return array($classPath, $this->_alternatingItemTemplate);
 	}
 
 	private function getSelectedItemDisplay($itemIndex)
 	{
 		if(($classPath=$this->getSelectedItemRenderer())==='' && $this->_selectedItemTemplate===null)
 		{
-			if($itemIndex%2===0)
-				return array($this->getItemRenderer(),$this->_itemTemplate);
+			if($itemIndex % 2===0)
+				return array($this->getItemRenderer(), $this->_itemTemplate);
 			else
 				return $this->getAlternatingItemDisplay();
 		}
 		else
-			return array($classPath,$this->_selectedItemTemplate);
+			return array($classPath, $this->_selectedItemTemplate);
 	}
 
 	private function getEditItemDisplay($itemIndex)
@@ -1197,7 +1197,7 @@ 
 		if(($classPath=$this->getEditItemRenderer())==='' && $this->_editItemTemplate===null)
 			return $this->getSelectedItemDisplay($itemIndex);
 		else
-			return array($classPath,$this->_editItemTemplate);
+			return array($classPath, $this->_editItemTemplate);
 	}
 
 	/**
@@ -1206,7 +1206,7 @@ 
 	 * @param TListItemType item type
 	 * @return TControl created datalist item
 	 */
-	protected function createItem($itemIndex,$itemType)
+	protected function createItem($itemIndex, $itemType)
 	{
 		$template=null;
 		$classPath=null;
@@ -1217,13 +1217,13 @@ 
 				$template=$this->_itemTemplate;
 				break;
 			case TListItemType::AlternatingItem :
-				list($classPath,$template)=$this->getAlternatingItemDisplay();
+				list($classPath, $template)=$this->getAlternatingItemDisplay();
 				break;
 			case TListItemType::SelectedItem:
-				list($classPath,$template)=$this->getSelectedItemDisplay($itemIndex);
+				list($classPath, $template)=$this->getSelectedItemDisplay($itemIndex);
 				break;
 			case TListItemType::EditItem:
-				list($classPath,$template)=$this->getEditItemDisplay($itemIndex);
+				list($classPath, $template)=$this->getEditItemDisplay($itemIndex);
 				break;
 			case TListItemType::Header :
 				$classPath=$this->getHeaderRenderer();
@@ -1238,7 +1238,7 @@ 
 				$template=$this->_separatorTemplate;
 				break;
 			default:
-				throw new TInvalidDataValueException('datalist_itemtype_unknown',$itemType);
+				throw new TInvalidDataValueException('datalist_itemtype_unknown', $itemType);
 		}
 		if($classPath!=='')
 		{
@@ -1286,9 +1286,9 @@ 
 	 */
 	protected function applyItemStyles()
 	{
-		$itemStyle=$this->getViewState('ItemStyle',null);
+		$itemStyle=$this->getViewState('ItemStyle', null);
 
-		$alternatingItemStyle=$this->getViewState('AlternatingItemStyle',null);
+		$alternatingItemStyle=$this->getViewState('AlternatingItemStyle', null);
 		if($itemStyle!==null)
 		{
 			if($alternatingItemStyle===null)
@@ -1297,9 +1297,9 @@ 
 				$alternatingItemStyle->mergeWith($itemStyle);
 		}
 
-		$selectedItemStyle=$this->getViewState('SelectedItemStyle',null);
+		$selectedItemStyle=$this->getViewState('SelectedItemStyle', null);
 
-		$editItemStyle=$this->getViewState('EditItemStyle',null);
+		$editItemStyle=$this->getViewState('EditItemStyle', null);
 		if($selectedItemStyle!==null)
 		{
 			if($editItemStyle===null)
@@ -1311,14 +1311,14 @@ 
 		// apply header style if any
 		if($this->_header!==null && $this->_header instanceof IStyleable)
 		{
-			if($headerStyle=$this->getViewState('HeaderStyle',null))
+			if($headerStyle=$this->getViewState('HeaderStyle', null))
 				$this->_header->getStyle()->mergeWith($headerStyle);
 		}
 
 		// apply footer style if any
 		if($this->_footer!==null && $this->_footer instanceof IStyleable)
 		{
-			if($footerStyle=$this->getViewState('FooterStyle',null))
+			if($footerStyle=$this->getViewState('FooterStyle', null))
 				$this->_footer->getStyle()->mergeWith($footerStyle);
 		}
 
@@ -1332,7 +1332,7 @@ 
 				$style=$editItemStyle;
 			else if($index===$selectedIndex)
 				$style=$selectedItemStyle;
-			else if($index%2===0)
+			else if($index % 2===0)
 				$style=$itemStyle;
 			else
 				$style=$alternatingItemStyle;
@@ -1341,11 +1341,11 @@ 
 		}
 
 		// apply separator style if any
-		if(($separatorStyle=$this->getViewState('SeparatorStyle',null))!==null && $this->getHasSeparators())
+		if(($separatorStyle=$this->getViewState('SeparatorStyle', null))!==null && $this->getHasSeparators())
 		{
 			$controls=$this->getControls();
 			$count=$controls->getCount();
-			for($i=$this->_header?2:1;$i<$count;$i+=2)
+			for($i=$this->_header ? 2 : 1; $i < $count; $i+=2)
 			{
 				if(($separator=$controls->itemAt($i)) instanceof IStyleable)
 					$separator->getStyle()->mergeWith($separatorStyle);
@@ -1361,7 +1361,7 @@ 
 	{
 		parent::saveState();
 		if($this->_items)
-			$this->setViewState('ItemCount',$this->_items->getCount(),0);
+			$this->setViewState('ItemCount', $this->_items->getCount(), 0);
 		else
 			$this->clearViewState('ItemCount');
 	}
@@ -1395,26 +1395,26 @@ 
 	protected function restoreItemsFromViewState()
 	{
 		$this->reset();
-		if(($itemCount=$this->getViewState('ItemCount',0))>0)
+		if(($itemCount=$this->getViewState('ItemCount', 0)) > 0)
 		{
 			$items=$this->getItems();
 			$selectedIndex=$this->getSelectedItemIndex();
 			$editIndex=$this->getEditItemIndex();
 			$hasSeparator=$this->_separatorTemplate!==null || $this->getSeparatorRenderer()!=='';
-			$this->_header=$this->createItemInternal(-1,TListItemType::Header);
-			for($i=0;$i<$itemCount;++$i)
+			$this->_header=$this->createItemInternal(-1, TListItemType::Header);
+			for($i=0; $i < $itemCount; ++$i)
 			{
-				if($hasSeparator && $i>0)
-					$this->createItemInternal($i-1,TListItemType::Separator);
+				if($hasSeparator && $i > 0)
+					$this->createItemInternal($i - 1, TListItemType::Separator);
 				if($i===$editIndex)
 					$itemType=TListItemType::EditItem;
 				else if($i===$selectedIndex)
 					$itemType=TListItemType::SelectedItem;
 				else
-					$itemType=$i%2?TListItemType::AlternatingItem : TListItemType::Item;
-				$items->add($this->createItemInternal($i,$itemType));
+					$itemType=$i % 2 ? TListItemType::AlternatingItem : TListItemType::Item;
+				$items->add($this->createItemInternal($i, $itemType));
 			}
-			$this->_footer=$this->createItemInternal(-1,TListItemType::Footer);
+			$this->_footer=$this->createItemInternal(-1, TListItemType::Footer);
 		}
 		else
 			$this->createEmptyContent();
@@ -1441,30 +1441,30 @@ 
 		foreach($data as $key=>$dataItem)
 		{
 			if($keyField!=='')
-				$keys->add($this->getDataFieldValue($dataItem,$keyField));
+				$keys->add($this->getDataFieldValue($dataItem, $keyField));
 			else
 				$keys->add($key);
 			if($itemIndex===0)
-				$this->_header=$this->createItemWithDataInternal(-1,TListItemType::Header,null);
-			if($hasSeparator && $itemIndex>0)
-				$this->createItemWithDataInternal($itemIndex-1,TListItemType::Separator,null);
+				$this->_header=$this->createItemWithDataInternal(-1, TListItemType::Header, null);
+			if($hasSeparator && $itemIndex > 0)
+				$this->createItemWithDataInternal($itemIndex - 1, TListItemType::Separator, null);
 			if($itemIndex===$editIndex)
 				$itemType=TListItemType::EditItem;
 			else if($itemIndex===$selectedIndex)
 				$itemType=TListItemType::SelectedItem;
 			else
-				$itemType=$itemIndex%2?TListItemType::AlternatingItem : TListItemType::Item;
-			$items->add($this->createItemWithDataInternal($itemIndex,$itemType,$dataItem));
+				$itemType=$itemIndex % 2 ? TListItemType::AlternatingItem : TListItemType::Item;
+			$items->add($this->createItemWithDataInternal($itemIndex, $itemType, $dataItem));
 			$itemIndex++;
 		}
-		if($itemIndex>0)
-			$this->_footer=$this->createItemWithDataInternal(-1,TListItemType::Footer,null);
+		if($itemIndex > 0)
+			$this->_footer=$this->createItemWithDataInternal(-1, TListItemType::Footer, null);
 		else
 		{
 			$this->createEmptyContent();
 			$this->dataBindChildren();
 		}
-		$this->setViewState('ItemCount',$itemIndex,0);
+		$this->setViewState('ItemCount', $itemIndex, 0);
 	}
 
 	/**
@@ -1476,11 +1476,11 @@ 
 	{
 		if($this->getHasControls())
 		{
-			if($this->getItemCount()>0)
+			if($this->getItemCount() > 0)
 			{
 				$this->applyItemStyles();
 				$repeatInfo=$this->getRepeatInfo();
-				$repeatInfo->renderRepeater($writer,$this);
+				$repeatInfo->renderRepeater($writer, $this);
 			}
 			else if($this->_emptyTemplate!==null || $this->getEmptyRenderer()!=='')
 				parent::render($writer);
@@ -1557,11 +1557,11 @@ 
 	 * @param TControl original event sender
 	 * @param TCommandEventParameter original event parameter
 	 */
-	public function __construct($item,$source,TCommandEventParameter $param)
+	public function __construct($item, $source, TCommandEventParameter $param)
 	{
 		$this->_item=$item;
 		$this->_source=$source;
-		parent::__construct($param->getCommandName(),$param->getCommandParameter());
+		parent::__construct($param->getCommandName(), $param->getCommandParameter());
 	}
 
 	/**
@@ -1653,7 +1653,7 @@ 
 	 */
 	public function setItemType($value)
 	{
-		$this->_itemType=TPropertyValue::ensureEnum($value,'TListItemType');
+		$this->_itemType=TPropertyValue::ensureEnum($value, 'TListItemType');
 	}
 
 	/**
@@ -1719,11 +1719,11 @@ 
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		if($param instanceof TCommandEventParameter)
 		{
-			$this->raiseBubbleEvent($this,new TDataListCommandEventParameter($this,$sender,$param));
+			$this->raiseBubbleEvent($this, new TDataListCommandEventParameter($this, $sender, $param));
 			return true;
 		}
 		else
@@ -1749,10 +1749,10 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a TControl descendant.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TControl)
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('datalistitemcollection_datalistitem_required');
 	}

framework/Web/UI/WebControls/TDataGrid.php

Spacing +163 added lines, -163 removed lines

@@ -242,7 +242,7 @@ 
 		if($object instanceof TDataGridColumn)
 			$this->getColumns()->add($object);
 		else
-			parent::addParsedObject($object);  // this is needed by EmptyTemplate
+			parent::addParsedObject($object); // this is needed by EmptyTemplate
 	}
 
 	/**
@@ -280,7 +280,7 @@ 
 	 */
 	public function getItemCount()
 	{
-		return $this->_items?$this->_items->getCount():0;
+		return $this->_items ? $this->_items->getCount() : 0;
 	}
 
 	/**
@@ -314,10 +314,10 @@ 
 	 */
 	public function getItemStyle()
 	{
-		if(($style=$this->getViewState('ItemStyle',null))===null)
+		if(($style=$this->getViewState('ItemStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('ItemStyle',$style,null);
+			$this->setViewState('ItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -327,10 +327,10 @@ 
 	 */
 	public function getAlternatingItemStyle()
 	{
-		if(($style=$this->getViewState('AlternatingItemStyle',null))===null)
+		if(($style=$this->getViewState('AlternatingItemStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('AlternatingItemStyle',$style,null);
+			$this->setViewState('AlternatingItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -340,10 +340,10 @@ 
 	 */
 	public function getSelectedItemStyle()
 	{
-		if(($style=$this->getViewState('SelectedItemStyle',null))===null)
+		if(($style=$this->getViewState('SelectedItemStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('SelectedItemStyle',$style,null);
+			$this->setViewState('SelectedItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -353,10 +353,10 @@ 
 	 */
 	public function getEditItemStyle()
 	{
-		if(($style=$this->getViewState('EditItemStyle',null))===null)
+		if(($style=$this->getViewState('EditItemStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('EditItemStyle',$style,null);
+			$this->setViewState('EditItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -366,10 +366,10 @@ 
 	 */
 	public function getHeaderStyle()
 	{
-		if(($style=$this->getViewState('HeaderStyle',null))===null)
+		if(($style=$this->getViewState('HeaderStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('HeaderStyle',$style,null);
+			$this->setViewState('HeaderStyle', $style, null);
 		}
 		return $style;
 	}
@@ -379,10 +379,10 @@ 
 	 */
 	public function getFooterStyle()
 	{
-		if(($style=$this->getViewState('FooterStyle',null))===null)
+		if(($style=$this->getViewState('FooterStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('FooterStyle',$style,null);
+			$this->setViewState('FooterStyle', $style, null);
 		}
 		return $style;
 	}
@@ -392,10 +392,10 @@ 
 	 */
 	public function getPagerStyle()
 	{
-		if(($style=$this->getViewState('PagerStyle',null))===null)
+		if(($style=$this->getViewState('PagerStyle', null))===null)
 		{
 			$style=new TDataGridPagerStyle;
-			$this->setViewState('PagerStyle',$style,null);
+			$this->setViewState('PagerStyle', $style, null);
 		}
 		return $style;
 	}
@@ -406,10 +406,10 @@ 
 	 */
 	public function getTableHeadStyle()
 	{
-		if(($style=$this->getViewState('TableHeadStyle',null))===null)
+		if(($style=$this->getViewState('TableHeadStyle', null))===null)
 		{
 			$style=new TStyle;
-			$this->setViewState('TableHeadStyle',$style,null);
+			$this->setViewState('TableHeadStyle', $style, null);
 		}
 		return $style;
 	}
@@ -420,10 +420,10 @@ 
 	 */
 	public function getTableBodyStyle()
 	{
-		if(($style=$this->getViewState('TableBodyStyle',null))===null)
+		if(($style=$this->getViewState('TableBodyStyle', null))===null)
 		{
 			$style=new TStyle;
-			$this->setViewState('TableBodyStyle',$style,null);
+			$this->setViewState('TableBodyStyle', $style, null);
 		}
 		return $style;
 	}
@@ -434,10 +434,10 @@ 
 	 */
 	public function getTableFootStyle()
 	{
-		if(($style=$this->getViewState('TableFootStyle',null))===null)
+		if(($style=$this->getViewState('TableFootStyle', null))===null)
 		{
 			$style=new TStyle;
-			$this->setViewState('TableFootStyle',$style,null);
+			$this->setViewState('TableFootStyle', $style, null);
 		}
 		return $style;
 	}
@@ -447,7 +447,7 @@ 
 	 */
 	public function getCaption()
 	{
-		return $this->getViewState('Caption','');
+		return $this->getViewState('Caption', '');
 	}
 
 	/**
@@ -455,7 +455,7 @@ 
 	 */
 	public function setCaption($value)
 	{
-		$this->setViewState('Caption',$value,'');
+		$this->setViewState('Caption', $value, '');
 	}
 
 	/**
@@ -463,7 +463,7 @@ 
 	 */
 	public function getCaptionAlign()
 	{
-		return $this->getViewState('CaptionAlign',TTableCaptionAlign::NotSet);
+		return $this->getViewState('CaptionAlign', TTableCaptionAlign::NotSet);
 	}
 
 	/**
@@ -471,7 +471,7 @@ 
 	 */
 	public function setCaptionAlign($value)
 	{
-		$this->setViewState('CaptionAlign',TPropertyValue::ensureEnum($value,'TTableCaptionAlign'),TTableCaptionAlign::NotSet);
+		$this->setViewState('CaptionAlign', TPropertyValue::ensureEnum($value, 'TTableCaptionAlign'), TTableCaptionAlign::NotSet);
 	}
 
 	/**
@@ -513,7 +513,7 @@ 
 	{
 		$index=$this->getSelectedItemIndex();
 		$items=$this->getItems();
-		if($index>=0 && $index<$items->getCount())
+		if($index >= 0 && $index < $items->getCount())
 			return $items->itemAt($index);
 		else
 			return null;
@@ -525,7 +525,7 @@ 
 	 */
 	public function getSelectedItemIndex()
 	{
-		return $this->getViewState('SelectedItemIndex',-1);
+		return $this->getViewState('SelectedItemIndex', -1);
 	}
 
 	/**
@@ -537,20 +537,20 @@ 
 	 */
 	public function setSelectedItemIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=-1;
 		if(($current=$this->getSelectedItemIndex())!==$value)
 		{
-			$this->setViewState('SelectedItemIndex',$value,-1);
+			$this->setViewState('SelectedItemIndex', $value, -1);
 			$items=$this->getItems();
 			$itemCount=$items->getCount();
-			if($current>=0 && $current<$itemCount)
+			if($current >= 0 && $current < $itemCount)
 			{
 				$item=$items->itemAt($current);
 				if($item->getItemType()!==TListItemType::EditItem)
-					$item->setItemType($current%2?TListItemType::AlternatingItem:TListItemType::Item);
+					$item->setItemType($current % 2 ? TListItemType::AlternatingItem : TListItemType::Item);
 			}
-			if($value>=0 && $value<$itemCount)
+			if($value >= 0 && $value < $itemCount)
 			{
 				$item=$items->itemAt($value);
 				if($item->getItemType()!==TListItemType::EditItem)
@@ -566,7 +566,7 @@ 
 	{
 		$index=$this->getEditItemIndex();
 		$items=$this->getItems();
-		if($index>=0 && $index<$items->getCount())
+		if($index >= 0 && $index < $items->getCount())
 			return $items->itemAt($index);
 		else
 			return null;
@@ -578,7 +578,7 @@ 
 	 */
 	public function getEditItemIndex()
 	{
-		return $this->getViewState('EditItemIndex',-1);
+		return $this->getViewState('EditItemIndex', -1);
 	}
 
 	/**
@@ -589,16 +589,16 @@ 
 	 */
 	public function setEditItemIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=-1;
 		if(($current=$this->getEditItemIndex())!==$value)
 		{
-			$this->setViewState('EditItemIndex',$value,-1);
+			$this->setViewState('EditItemIndex', $value, -1);
 			$items=$this->getItems();
 			$itemCount=$items->getCount();
-			if($current>=0 && $current<$itemCount)
-				$items->itemAt($current)->setItemType($current%2?TListItemType::AlternatingItem:TListItemType::Item);
-			if($value>=0 && $value<$itemCount)
+			if($current >= 0 && $current < $itemCount)
+				$items->itemAt($current)->setItemType($current % 2 ? TListItemType::AlternatingItem : TListItemType::Item);
+			if($value >= 0 && $value < $itemCount)
 				$items->itemAt($value)->setItemType(TListItemType::EditItem);
 		}
 	}
@@ -608,7 +608,7 @@ 
 	 */
 	public function getAllowSorting()
 	{
-		return $this->getViewState('AllowSorting',false);
+		return $this->getViewState('AllowSorting', false);
 	}
 
 	/**
@@ -616,7 +616,7 @@ 
 	 */
 	public function setAllowSorting($value)
 	{
-		$this->setViewState('AllowSorting',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('AllowSorting', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -624,7 +624,7 @@ 
 	 */
 	public function getAutoGenerateColumns()
 	{
-		return $this->getViewState('AutoGenerateColumns',true);
+		return $this->getViewState('AutoGenerateColumns', true);
 	}
 
 	/**
@@ -632,7 +632,7 @@ 
 	 */
 	public function setAutoGenerateColumns($value)
 	{
-		$this->setViewState('AutoGenerateColumns',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('AutoGenerateColumns', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -640,7 +640,7 @@ 
 	 */
 	public function getShowHeader()
 	{
-		return $this->getViewState('ShowHeader',true);
+		return $this->getViewState('ShowHeader', true);
 	}
 
 	/**
@@ -648,7 +648,7 @@ 
 	 */
 	public function setShowHeader($value)
 	{
-		$this->setViewState('ShowHeader',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('ShowHeader', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -656,7 +656,7 @@ 
 	 */
 	public function getShowFooter()
 	{
-		return $this->getViewState('ShowFooter',false);
+		return $this->getViewState('ShowFooter', false);
 	}
 
 	/**
@@ -664,7 +664,7 @@ 
 	 */
 	public function setShowFooter($value)
 	{
-		$this->setViewState('ShowFooter',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ShowFooter', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -684,7 +684,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_emptyTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('datagrid_template_required','EmptyTemplate');
+			throw new TInvalidDataTypeException('datagrid_template_required', 'EmptyTemplate');
 	}
 
 	/**
@@ -700,57 +700,57 @@ 
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		if($param instanceof TDataGridCommandEventParameter)
 		{
 			$this->onItemCommand($param);
 			$command=$param->getCommandName();
-			if(strcasecmp($command,self::CMD_SELECT)===0)
+			if(strcasecmp($command, self::CMD_SELECT)===0)
 			{
 				$this->setSelectedItemIndex($param->getItem()->getItemIndex());
 				$this->onSelectedIndexChanged($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_EDIT)===0)
+			else if(strcasecmp($command, self::CMD_EDIT)===0)
 			{
 				$this->onEditCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_DELETE)===0)
+			else if(strcasecmp($command, self::CMD_DELETE)===0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_UPDATE)===0)
+			else if(strcasecmp($command, self::CMD_UPDATE)===0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_CANCEL)===0)
+			else if(strcasecmp($command, self::CMD_CANCEL)===0)
 			{
 				$this->onCancelCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_SORT)===0)
+			else if(strcasecmp($command, self::CMD_SORT)===0)
 			{
-				$this->onSortCommand(new TDataGridSortCommandEventParameter($sender,$param));
+				$this->onSortCommand(new TDataGridSortCommandEventParameter($sender, $param));
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_PAGE)===0)
+			else if(strcasecmp($command, self::CMD_PAGE)===0)
 			{
 				$p=$param->getCommandParameter();
-				if(strcasecmp($p,self::CMD_PAGE_NEXT)===0)
-					$pageIndex=$this->getCurrentPageIndex()+1;
-				else if(strcasecmp($p,self::CMD_PAGE_PREV)===0)
-					$pageIndex=$this->getCurrentPageIndex()-1;
-				else if(strcasecmp($p,self::CMD_PAGE_FIRST)===0)
+				if(strcasecmp($p, self::CMD_PAGE_NEXT)===0)
+					$pageIndex=$this->getCurrentPageIndex() + 1;
+				else if(strcasecmp($p, self::CMD_PAGE_PREV)===0)
+					$pageIndex=$this->getCurrentPageIndex() - 1;
+				else if(strcasecmp($p, self::CMD_PAGE_FIRST)===0)
 					$pageIndex=0;
-				else if(strcasecmp($p,self::CMD_PAGE_LAST)===0)
-					$pageIndex=$this->getPageCount()-1;
+				else if(strcasecmp($p, self::CMD_PAGE_LAST)===0)
+					$pageIndex=$this->getPageCount() - 1;
 				else
-					$pageIndex=TPropertyValue::ensureInteger($p)-1;
-				$this->onPageIndexChanged(new TDataGridPageChangedEventParameter($sender,$pageIndex));
+					$pageIndex=TPropertyValue::ensureInteger($p) - 1;
+				$this->onPageIndexChanged(new TDataGridPageChangedEventParameter($sender, $pageIndex));
 				return true;
 			}
 		}
@@ -765,7 +765,7 @@ 
 	 */
 	public function onCancelCommand($param)
 	{
-		$this->raiseEvent('OnCancelCommand',$this,$param);
+		$this->raiseEvent('OnCancelCommand', $this, $param);
 	}
 
 	/**
@@ -776,7 +776,7 @@ 
 	 */
 	public function onDeleteCommand($param)
 	{
-		$this->raiseEvent('OnDeleteCommand',$this,$param);
+		$this->raiseEvent('OnDeleteCommand', $this, $param);
 	}
 
 	/**
@@ -787,7 +787,7 @@ 
 	 */
 	public function onEditCommand($param)
 	{
-		$this->raiseEvent('OnEditCommand',$this,$param);
+		$this->raiseEvent('OnEditCommand', $this, $param);
 	}
 
 	/**
@@ -797,7 +797,7 @@ 
 	 */
 	public function onItemCommand($param)
 	{
-		$this->raiseEvent('OnItemCommand',$this,$param);
+		$this->raiseEvent('OnItemCommand', $this, $param);
 	}
 
 	/**
@@ -808,7 +808,7 @@ 
 	 */
 	public function onSortCommand($param)
 	{
-		$this->raiseEvent('OnSortCommand',$this,$param);
+		$this->raiseEvent('OnSortCommand', $this, $param);
 	}
 
 	/**
@@ -819,7 +819,7 @@ 
 	 */
 	public function onUpdateCommand($param)
 	{
-		$this->raiseEvent('OnUpdateCommand',$this,$param);
+		$this->raiseEvent('OnUpdateCommand', $this, $param);
 	}
 
 	/**
@@ -830,7 +830,7 @@ 
 	 */
 	public function onItemCreated($param)
 	{
-		$this->raiseEvent('OnItemCreated',$this,$param);
+		$this->raiseEvent('OnItemCreated', $this, $param);
 	}
 
 	/**
@@ -841,7 +841,7 @@ 
 	 */
 	public function onPagerCreated($param)
 	{
-		$this->raiseEvent('OnPagerCreated',$this,$param);
+		$this->raiseEvent('OnPagerCreated', $this, $param);
 	}
 
 	/**
@@ -852,7 +852,7 @@ 
 	 */
 	public function onItemDataBound($param)
 	{
-		$this->raiseEvent('OnItemDataBound',$this,$param);
+		$this->raiseEvent('OnItemDataBound', $this, $param);
 	}
 
 	/**
@@ -862,7 +862,7 @@ 
 	 */
 	public function onPageIndexChanged($param)
 	{
-		$this->raiseEvent('OnPageIndexChanged',$this,$param);
+		$this->raiseEvent('OnPageIndexChanged', $this, $param);
 	}
 
 	/**
@@ -875,7 +875,7 @@ 
 		if(!$this->getEnableViewState(true))
 			return;
 		if($this->_items)
-			$this->setViewState('ItemCount',$this->_items->getCount(),0);
+			$this->setViewState('ItemCount', $this->_items->getCount(), 0);
 		else
 			$this->clearViewState('ItemCount');
 		if($this->_autoColumns)
@@ -883,7 +883,7 @@ 
 			$state=array();
 			foreach($this->_autoColumns as $column)
 				$state[]=$column->saveState();
-			$this->setViewState('AutoColumns',$state,array());
+			$this->setViewState('AutoColumns', $state, array());
 		}
 		else
 			$this->clearViewState('AutoColumns');
@@ -892,7 +892,7 @@ 
 			$state=array();
 			foreach($this->_columns as $column)
 				$state[]=$column->saveState();
-			$this->setViewState('Columns',$state,array());
+			$this->setViewState('Columns', $state, array());
 		}
 		else
 			$this->clearViewState('Columns');
@@ -909,7 +909,7 @@ 
 			return;
 		if(!$this->getIsDataBound())
 		{
-			$state=$this->getViewState('AutoColumns',array());
+			$state=$this->getViewState('AutoColumns', array());
 			if(!empty($state))
 			{
 				$this->_autoColumns=new TDataGridColumnCollection($this);
@@ -922,7 +922,7 @@ 
 			}
 			else
 				$this->_autoColumns=null;
-			$state=$this->getViewState('Columns',array());
+			$state=$this->getViewState('Columns', array());
 			if($this->_columns && $this->_columns->getCount()===count($state))
 			{
 				$i=0;
@@ -959,8 +959,8 @@ 
 
 		$allowPaging=$this->getAllowPaging();
 
-		$itemCount=$this->getViewState('ItemCount',0);
-		$dsIndex=$this->getViewState('DataSourceIndex',0);
+		$itemCount=$this->getViewState('ItemCount', 0);
+		$dsIndex=$this->getViewState('DataSourceIndex', 0);
 
 		$columns=new TList($this->getColumns());
 		$columns->mergeWith($this->_autoColumns);
@@ -974,13 +974,13 @@ 
 				$column->initialize();
 			$selectedIndex=$this->getSelectedItemIndex();
 			$editIndex=$this->getEditItemIndex();
-			for($index=0;$index<$itemCount;++$index)
+			for($index=0; $index < $itemCount; ++$index)
 			{
 				if($index===0)
 				{
 					if($allowPaging)
 						$this->_topPager=$this->createPager();
-					$this->_header=$this->createItemInternal(-1,-1,TListItemType::Header,false,null,$columns);
+					$this->_header=$this->createItemInternal(-1, -1, TListItemType::Header, false, null, $columns);
 				}
 				if($index===$editIndex)
 					$itemType=TListItemType::EditItem;
@@ -990,12 +990,12 @@ 
 					$itemType=TListItemType::AlternatingItem;
 				else
 					$itemType=TListItemType::Item;
-				$items->add($this->createItemInternal($index,$dsIndex,$itemType,false,null,$columns));
+				$items->add($this->createItemInternal($index, $dsIndex, $itemType, false, null, $columns));
 				$dsIndex++;
 			}
-			if($index>0)
+			if($index > 0)
 			{
-				$this->_footer=$this->createItemInternal(-1,-1,TListItemType::Footer,false,null,$columns);
+				$this->_footer=$this->createItemInternal(-1, -1, TListItemType::Footer, false, null, $columns);
 				if($allowPaging)
 					$this->_bottomPager=$this->createPager();
 			}
@@ -1035,8 +1035,8 @@ 
 
 		$index=0;
 		$allowPaging=$this->getAllowPaging() && ($data instanceof TPagedDataSource);
-		$dsIndex=$allowPaging?$data->getFirstIndexInPage():0;
-		$this->setViewState('DataSourceIndex',$dsIndex,0);
+		$dsIndex=$allowPaging ? $data->getFirstIndexInPage() : 0;
+		$this->setViewState('DataSourceIndex', $dsIndex, 0);
 		if($columns->getCount())
 		{
 			foreach($columns as $column)
@@ -1047,14 +1047,14 @@ 
 			foreach($data as $key=>$row)
 			{
 				if($keyField!=='')
-					$keys->add($this->getDataFieldValue($row,$keyField));
+					$keys->add($this->getDataFieldValue($row, $keyField));
 				else
 					$keys->add($key);
 				if($index===0)
 				{
 					if($allowPaging)
 						$this->_topPager=$this->createPager();
-					$this->_header=$this->createItemInternal(-1,-1,TListItemType::Header,true,null,$columns);
+					$this->_header=$this->createItemInternal(-1, -1, TListItemType::Header, true, null, $columns);
 				}
 				if($index===$editIndex)
 					$itemType=TListItemType::EditItem;
@@ -1064,18 +1064,18 @@ 
 					$itemType=TListItemType::AlternatingItem;
 				else
 					$itemType=TListItemType::Item;
-				$items->add($this->createItemInternal($index,$dsIndex,$itemType,true,$row,$columns));
+				$items->add($this->createItemInternal($index, $dsIndex, $itemType, true, $row, $columns));
 				$index++;
 				$dsIndex++;
 			}
-			if($index>0)
+			if($index > 0)
 			{
-				$this->_footer=$this->createItemInternal(-1,-1,TListItemType::Footer,true,null,$columns);
+				$this->_footer=$this->createItemInternal(-1, -1, TListItemType::Footer, true, null, $columns);
 				if($allowPaging)
 					$this->_bottomPager=$this->createPager();
 			}
 		}
-		$this->setViewState('ItemCount',$index,0);
+		$this->setViewState('ItemCount', $index, 0);
 		if(!$dsIndex && $this->_emptyTemplate!==null)
 		{
 			$this->_useEmptyTemplate=true;
@@ -1122,7 +1122,7 @@ 
 					{
 						if(($rowSpan=$prevCell->getRowSpan())===0)
 							$rowSpan=1;
-						$prevCell->setRowSpan($rowSpan+1);
+						$prevCell->setRowSpan($rowSpan + 1);
 						$cell->setVisible(false);
 					}
 				}
@@ -1150,15 +1150,15 @@ 
 	 * @param TListItemType item type
 	 * @return TDataGridItem created data list item
 	 */
-	protected function createItem($itemIndex,$dataSourceIndex,$itemType)
+	protected function createItem($itemIndex, $dataSourceIndex, $itemType)
 	{
-		return new TDataGridItem($itemIndex,$dataSourceIndex,$itemType);
+		return new TDataGridItem($itemIndex, $dataSourceIndex, $itemType);
 	}
 
-	private function createItemInternal($itemIndex,$dataSourceIndex,$itemType,$dataBind,$dataItem,$columns)
+	private function createItemInternal($itemIndex, $dataSourceIndex, $itemType, $dataBind, $dataItem, $columns)
 	{
-		$item=$this->createItem($itemIndex,$dataSourceIndex,$itemType);
-		$this->initializeItem($item,$columns);
+		$item=$this->createItem($itemIndex, $dataSourceIndex, $itemType);
+		$this->initializeItem($item, $columns);
 		$param=new TDataGridItemEventParameter($item);
 		if($dataBind)
 		{
@@ -1181,7 +1181,7 @@ 
 	 * @param TDataGrid datagrid item to be initialized
 	 * @param TDataGridColumnCollection datagrid columns to be used to initialize the cells in the item
 	 */
-	protected function initializeItem($item,$columns)
+	protected function initializeItem($item, $columns)
 	{
 		$cells=$item->getCells();
 		$itemType=$item->getItemType();
@@ -1193,9 +1193,9 @@ 
 			else
 				$cell=new TTableCell;
 			if(($id=$column->getID())!=='')
-				$item->registerObject($id,$cell);
+				$item->registerObject($id, $cell);
 			$cells->add($cell);
-			$column->initializeCell($cell,$index,$itemType);
+			$column->initializeCell($cell, $index, $itemType);
 			$index++;
 		}
 	}
@@ -1239,7 +1239,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)
 		{
@@ -1279,46 +1279,46 @@ 
 		{
 			if(($text=$style->getFirstPageText())!=='')
 			{
-				$label=$this->createPagerButton($pager,$buttonType,false,$text,'','');
+				$label=$this->createPagerButton($pager, $buttonType, false, $text, '', '');
 				$controls->add($label);
 				$controls->add("\n");
 			}
 
-			$label=$this->createPagerButton($pager,$buttonType,false,$style->getPrevPageText(),'','');
+			$label=$this->createPagerButton($pager, $buttonType, false, $style->getPrevPageText(), '', '');
 			$controls->add($label);
 		}
 		else
 		{
 			if(($text=$style->getFirstPageText())!=='')
 			{
-				$button=$this->createPagerButton($pager,$buttonType,true,$text,self::CMD_PAGE,self::CMD_PAGE_FIRST);
+				$button=$this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_FIRST);
 				$controls->add($button);
 				$controls->add("\n");
 			}
 
-			$button=$this->createPagerButton($pager,$buttonType,true,$style->getPrevPageText(),self::CMD_PAGE,self::CMD_PAGE_PREV);
+			$button=$this->createPagerButton($pager, $buttonType, true, $style->getPrevPageText(), self::CMD_PAGE, self::CMD_PAGE_PREV);
 			$controls->add($button);
 		}
 		$controls->add("\n");
-		if($currentPageIndex===$this->getPageCount()-1)
+		if($currentPageIndex===$this->getPageCount() - 1)
 		{
-			$label=$this->createPagerButton($pager,$buttonType,false,$style->getNextPageText(),'','');
+			$label=$this->createPagerButton($pager, $buttonType, false, $style->getNextPageText(), '', '');
 			$controls->add($label);
 			if(($text=$style->getLastPageText())!=='')
 			{
 				$controls->add("\n");
-				$label=$this->createPagerButton($pager,$buttonType,false,$text,'','');
+				$label=$this->createPagerButton($pager, $buttonType, false, $text, '', '');
 				$controls->add($label);
 			}
 		}
 		else
 		{
-			$button=$this->createPagerButton($pager,$buttonType,true,$style->getNextPageText(),self::CMD_PAGE,self::CMD_PAGE_NEXT);
+			$button=$this->createPagerButton($pager, $buttonType, true, $style->getNextPageText(), self::CMD_PAGE, self::CMD_PAGE_NEXT);
 			$controls->add($button);
 			if(($text=$style->getLastPageText())!=='')
 			{
 				$controls->add("\n");
-				$button=$this->createPagerButton($pager,$buttonType,true,$text,self::CMD_PAGE,self::CMD_PAGE_LAST);
+				$button=$this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_LAST);
 				$controls->add($button);
 			}
 		}
@@ -1334,63 +1334,63 @@ 
 		$buttonType=$style->getButtonType();
 		$controls=$pager->getControls();
 		$pageCount=$this->getPageCount();
-		$pageIndex=$this->getCurrentPageIndex()+1;
+		$pageIndex=$this->getCurrentPageIndex() + 1;
 		$maxButtonCount=$style->getPageButtonCount();
-		$buttonCount=$maxButtonCount>$pageCount?$pageCount:$maxButtonCount;
+		$buttonCount=$maxButtonCount > $pageCount ? $pageCount : $maxButtonCount;
 		$startPageIndex=1;
 		$endPageIndex=$buttonCount;
-		if($pageIndex>$endPageIndex)
+		if($pageIndex > $endPageIndex)
 		{
-			$startPageIndex=((int)(($pageIndex-1)/$maxButtonCount))*$maxButtonCount+1;
-			if(($endPageIndex=$startPageIndex+$maxButtonCount-1)>$pageCount)
+			$startPageIndex=((int) (($pageIndex - 1) / $maxButtonCount)) * $maxButtonCount + 1;
+			if(($endPageIndex=$startPageIndex + $maxButtonCount - 1) > $pageCount)
 				$endPageIndex=$pageCount;
-			if($endPageIndex-$startPageIndex+1<$maxButtonCount)
+			if($endPageIndex - $startPageIndex + 1 < $maxButtonCount)
 			{
-				if(($startPageIndex=$endPageIndex-$maxButtonCount+1)<1)
+				if(($startPageIndex=$endPageIndex - $maxButtonCount + 1) < 1)
 					$startPageIndex=1;
 			}
 		}
 
-		if($startPageIndex>1)
+		if($startPageIndex > 1)
 		{
 			if(($text=$style->getFirstPageText())!=='')
 			{
-				$button=$this->createPagerButton($pager,$buttonType,true,$text,self::CMD_PAGE,self::CMD_PAGE_FIRST);
+				$button=$this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_FIRST);
 				$controls->add($button);
 				$controls->add("\n");
 			}
-			$prevPageIndex=$startPageIndex-1;
-			$button=$this->createPagerButton($pager,$buttonType,true,$style->getPrevPageText(),self::CMD_PAGE,"$prevPageIndex");
+			$prevPageIndex=$startPageIndex - 1;
+			$button=$this->createPagerButton($pager, $buttonType, true, $style->getPrevPageText(), self::CMD_PAGE, "$prevPageIndex");
 			$controls->add($button);
 			$controls->add("\n");
 		}
 
-		for($i=$startPageIndex;$i<=$endPageIndex;++$i)
+		for($i=$startPageIndex; $i <= $endPageIndex; ++$i)
 		{
 			if($i===$pageIndex)
 			{
-				$label=$this->createPagerButton($pager,$buttonType,false,"$i",'','');
+				$label=$this->createPagerButton($pager, $buttonType, false, "$i", '', '');
 				$controls->add($label);
 			}
 			else
 			{
-				$button=$this->createPagerButton($pager,$buttonType,true,"$i",self::CMD_PAGE,"$i");
+				$button=$this->createPagerButton($pager, $buttonType, true, "$i", self::CMD_PAGE, "$i");
 				$controls->add($button);
 			}
-			if($i<$endPageIndex)
+			if($i < $endPageIndex)
 				$controls->add("\n");
 		}
 
-		if($pageCount>$endPageIndex)
+		if($pageCount > $endPageIndex)
 		{
 			$controls->add("\n");
-			$nextPageIndex=$endPageIndex+1;
-			$button=$this->createPagerButton($pager,$buttonType,true,$style->getNextPageText(),self::CMD_PAGE,"$nextPageIndex");
+			$nextPageIndex=$endPageIndex + 1;
+			$button=$this->createPagerButton($pager, $buttonType, true, $style->getNextPageText(), self::CMD_PAGE, "$nextPageIndex");
 			$controls->add($button);
 			if(($text=$style->getLastPageText())!=='')
 			{
 				$controls->add("\n");
-				$button=$this->createPagerButton($pager,$buttonType,true,$text,self::CMD_PAGE,self::CMD_PAGE_LAST);
+				$button=$this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_LAST);
 				$controls->add($button);
 			}
 		}
@@ -1445,9 +1445,9 @@ 
 	 */
 	protected function applyItemStyles()
 	{
-		$itemStyle=$this->getViewState('ItemStyle',null);
+		$itemStyle=$this->getViewState('ItemStyle', null);
 
-		$alternatingItemStyle=$this->getViewState('AlternatingItemStyle',null);
+		$alternatingItemStyle=$this->getViewState('AlternatingItemStyle', null);
 		if($itemStyle!==null)
 		{
 			if($alternatingItemStyle===null)
@@ -1456,9 +1456,9 @@ 
 				$alternatingItemStyle->mergeWith($itemStyle);
 		}
 
-		$selectedItemStyle=$this->getViewState('SelectedItemStyle',null);
+		$selectedItemStyle=$this->getViewState('SelectedItemStyle', null);
 
-		$editItemStyle=$this->getViewState('EditItemStyle',null);
+		$editItemStyle=$this->getViewState('EditItemStyle', null);
 		if($selectedItemStyle!==null)
 		{
 			if($editItemStyle===null)
@@ -1467,10 +1467,10 @@ 
 				$editItemStyle->mergeWith($selectedItemStyle);
 		}
 
-		$headerStyle=$this->getViewState('HeaderStyle',null);
-		$footerStyle=$this->getViewState('FooterStyle',null);
-		$pagerStyle=$this->getViewState('PagerStyle',null);
-		$separatorStyle=$this->getViewState('SeparatorStyle',null);
+		$headerStyle=$this->getViewState('HeaderStyle', null);
+		$footerStyle=$this->getViewState('FooterStyle', null);
+		$pagerStyle=$this->getViewState('PagerStyle', null);
+		$separatorStyle=$this->getViewState('SeparatorStyle', null);
 
 		foreach($this->getControls() as $index=>$item)
 		{
@@ -1554,7 +1554,7 @@ 
 			{
 				$n=$this->_columns->getCount();
 				$cells=$item->getCells();
-				for($i=0;$i<$n;++$i)
+				for($i=0; $i < $n; ++$i)
 				{
 					$cell=$cells->itemAt($i);
 					$column=$this->_columns->itemAt($i);
@@ -1586,7 +1586,7 @@ 
 		if(($caption=$this->getCaption())!=='')
 		{
 			if(($align=$this->getCaptionAlign())!==TTableCaptionAlign::NotSet)
-				$writer->addAttribute('align',strtolower($align));
+				$writer->addAttribute('align', strtolower($align));
 			$writer->renderBeginTag('caption');
 			$writer->write($caption);
 			$writer->renderEndTag();
@@ -1613,7 +1613,7 @@ 
 				$this->renderContents($writer);
 				$control->renderEndTag($writer);
 			}
-			else if($this->getViewState('ItemCount',0)>0)
+			else if($this->getViewState('ItemCount', 0) > 0)
 			{
 				$this->applyItemStyles();
 				if($this->_topPager)
@@ -1641,14 +1641,14 @@ 
 		if($this->_header && $this->_header->getVisible())
 		{
 			$writer->writeLine();
-			if($style=$this->getViewState('TableHeadStyle',null))
+			if($style=$this->getViewState('TableHeadStyle', null))
 				$style->addAttributesToRender($writer);
 			$writer->renderBeginTag('thead');
 			$this->_header->render($writer);
 			$writer->renderEndTag();
 		}
 		$writer->writeLine();
-		if($style=$this->getViewState('TableBodyStyle',null))
+		if($style=$this->getViewState('TableBodyStyle', null))
 			$style->addAttributesToRender($writer);
 		$writer->renderBeginTag('tbody');
 		foreach($this->getItems() as $item)
@@ -1658,7 +1658,7 @@ 
 		if($this->_footer && $this->_footer->getVisible())
 		{
 			$writer->writeLine();
-			if($style=$this->getViewState('TableFootStyle',null))
+			if($style=$this->getViewState('TableFootStyle', null))
 				$style->addAttributesToRender($writer);
 			$writer->renderBeginTag('tfoot');
 			$this->_footer->render($writer);
@@ -1775,11 +1775,11 @@ 
 	 * @param TControl original event sender
 	 * @param TCommandEventParameter original event parameter
 	 */
-	public function __construct($item,$source,TCommandEventParameter $param)
+	public function __construct($item, $source, TCommandEventParameter $param)
 	{
 		$this->_item=$item;
 		$this->_source=$source;
-		parent::__construct($param->getCommandName(),$param->getCommandParameter());
+		parent::__construct($param->getCommandName(), $param->getCommandParameter());
 	}
 
 	/**
@@ -1829,7 +1829,7 @@ 
 	 * @param TControl the control originally raises the <b>OnCommand</b> event.
 	 * @param TDataGridCommandEventParameter command event parameter
 	 */
-	public function __construct($source,TDataGridCommandEventParameter $param)
+	public function __construct($source, TDataGridCommandEventParameter $param)
 	{
 		$this->_source=$source;
 		$this->_sortExpression=$param->getCommandParameter();
@@ -1882,7 +1882,7 @@ 
 	 * @param TControl the control originally raises the <b>OnCommand</b> event.
 	 * @param integer new page index
 	 */
-	public function __construct($source,$newPageIndex)
+	public function __construct($source, $newPageIndex)
 	{
 		$this->_source=$source;
 		$this->_newIndex=$newPageIndex;
@@ -1945,7 +1945,7 @@ 
 	 * @param integer zero-based index of the item in the item collection of datagrid
 	 * @param TListItemType item type
 	 */
-	public function __construct($itemIndex,$dataSourceIndex,$itemType)
+	public function __construct($itemIndex, $dataSourceIndex, $itemType)
 	{
 		$this->_itemIndex=$itemIndex;
 		$this->_dataSourceIndex=$dataSourceIndex;
@@ -1969,7 +1969,7 @@ 
 	 */
 	public function setItemType($value)
 	{
-		$this->_itemType=TPropertyValue::ensureEnum($value,'TListItemType');
+		$this->_itemType=TPropertyValue::ensureEnum($value, 'TListItemType');
 	}
 
 	/**
@@ -2033,11 +2033,11 @@ 
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		if($param instanceof TCommandEventParameter)
 		{
-			$this->raiseBubbleEvent($this,new TDataGridCommandEventParameter($this,$sender,$param));
+			$this->raiseBubbleEvent($this, new TDataGridCommandEventParameter($this, $sender, $param));
 			return true;
 		}
 		else
@@ -2075,11 +2075,11 @@ 
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		if($param instanceof TCommandEventParameter)
 		{
-			$this->raiseBubbleEvent($this,new TDataGridCommandEventParameter($this,$sender,$param));
+			$this->raiseBubbleEvent($this, new TDataGridCommandEventParameter($this, $sender, $param));
 			return true;
 		}
 		else
@@ -2122,10 +2122,10 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a TDataGridItem.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TDataGridItem)
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('datagriditemcollection_datagriditem_required');
 	}
@@ -2172,12 +2172,12 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a TDataGridColumn.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TDataGridColumn)
 		{
 			$item->setOwner($this->_o);
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		}
 		else
 			throw new TInvalidDataTypeException('datagridcolumncollection_datagridcolumn_required');

framework/Web/UI/WebControls/TContentPlaceHolder.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 	{
 		if(($id=$this->getID())==='')
 			throw new TConfigurationException('contentplaceholder_id_required');
-		$this->getTemplateControl()->registerContentPlaceHolder($id,$this);
+		$this->getTemplateControl()->registerContentPlaceHolder($id, $this);
 		$parent->getControls()->add($this);
 	}
 }

framework/Web/UI/WebControls/TTextProcessor.php

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
 	public function addParsedObject($object)
 	{
 		if(is_string($object))
-			$object=html_entity_decode($object,ENT_QUOTES,'UTF-8');
+			$object=html_entity_decode($object, ENT_QUOTES, 'UTF-8');
 		parent::addParsedObject($object);
 	}
 
@@ -52,7 +52,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -60,7 +60,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value);
+		$this->setViewState('Text', $value);
 	}
 
 	/**
@@ -73,7 +73,7 @@ 
 	{
 		if(($text=$this->getText())==='' && $this->getHasControls())
 		{
-			$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
+			$htmlWriter=Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
 			parent::renderContents($htmlWriter);
 			$text=$htmlWriter->flush();
 		}

framework/Web/UI/WebControls/TLiteralColumn.php

Spacing +14 added lines, -14 removed lines

@@ -38,7 +38,7 @@ 
 	 */
 	public function getDataField()
 	{
-		return $this->getViewState('DataField','');
+		return $this->getViewState('DataField', '');
 	}
 
 	/**
@@ -46,7 +46,7 @@ 
 	 */
 	public function setDataField($value)
 	{
-		$this->setViewState('DataField',$value,'');
+		$this->setViewState('DataField', $value, '');
 	}
 
 	/**
@@ -54,7 +54,7 @@ 
 	 */
 	public function getDataFormatString()
 	{
-		return $this->getViewState('DataFormatString','');
+		return $this->getViewState('DataFormatString', '');
 	}
 
 	/**
@@ -62,7 +62,7 @@ 
 	 */
 	public function setDataFormatString($value)
 	{
-		$this->setViewState('DataFormatString',$value,'');
+		$this->setViewState('DataFormatString', $value, '');
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 	 */
 	public function getEncode()
 	{
-		return $this->getViewState('Encode',false);
+		return $this->getViewState('Encode', false);
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 */
 	public function setEncode($value)
 	{
-		$this->setViewState('Encode',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('Encode', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -104,13 +104,13 @@ 
 	 * @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::EditItem || $itemType===TListItemType::SelectedItem)
 		{
 			if($this->getDataField()!=='')
 			{
-				$cell->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				$cell->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 			} else {
 				$text=$this->getText();
 				if($this->getEncode())
@@ -119,7 +119,7 @@ 
 			}
 		}
 		else
-			parent::initializeCell($cell,$columnIndex,$itemType);
+			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
 	/**
@@ -127,15 +127,15 @@ 
 	 * This method is invoked when datagrid performs databinding.
 	 * It populates the content of the cell with the relevant data from data source.
 	 */
-	public function dataBindColumn($sender,$param)
+	public function dataBindColumn($sender, $param)
 	{
 		$item=$sender->getNamingContainer();
 		$data=$item->getData();
 		$formatString=$this->getDataFormatString();
 		if(($field=$this->getDataField())!=='')
-			$value=$this->formatDataValue($formatString,$this->getDataFieldValue($data,$field));
+			$value=$this->formatDataValue($formatString, $this->getDataFieldValue($data, $field));
 		else
-			$value=$this->formatDataValue($formatString,$data);
+			$value=$this->formatDataValue($formatString, $data);
 		if($sender instanceof TTableCell)
 		{
 			if($this->getEncode())

framework/Web/UI/WebControls/TCaptcha.php

Spacing +60 added lines, -60 removed lines

@@ -71,7 +71,7 @@ 
 	 */
 	public function getTokenImageTheme()
 	{
-		return $this->getViewState('TokenImageTheme',0);
+		return $this->getViewState('TokenImageTheme', 0);
 	}
 
 	/**
@@ -90,10 +90,10 @@ 
 	public function setTokenImageTheme($value)
 	{
 		$value=TPropertyValue::ensureInteger($value);
-		if($value>=0 && $value<=63)
-			$this->setViewState('TokenImageTheme',$value,0);
+		if($value >= 0 && $value <= 63)
+			$this->setViewState('TokenImageTheme', $value, 0);
 		else
-			throw new TConfigurationException('captcha_tokenimagetheme_invalid',0,63);
+			throw new TConfigurationException('captcha_tokenimagetheme_invalid', 0, 63);
 	}
 
 	/**
@@ -101,7 +101,7 @@ 
 	 */
 	public function getTokenFontSize()
 	{
-		return $this->getViewState('TokenFontSize',30);
+		return $this->getViewState('TokenFontSize', 30);
 	}
 
 	/**
@@ -113,10 +113,10 @@ 
 	public function setTokenFontSize($value)
 	{
 		$value=TPropertyValue::ensureInteger($value);
-		if($value>=20 && $value<=100)
-			$this->setViewState('TokenFontSize',$value,30);
+		if($value >= 20 && $value <= 100)
+			$this->setViewState('TokenFontSize', $value, 30);
 		else
-			throw new TConfigurationException('captcha_tokenfontsize_invalid',20,100);
+			throw new TConfigurationException('captcha_tokenfontsize_invalid', 20, 100);
 	}
 
 	/**
@@ -124,7 +124,7 @@ 
 	 */
 	public function getMinTokenLength()
 	{
-		return $this->getViewState('MinTokenLength',4);
+		return $this->getViewState('MinTokenLength', 4);
 	}
 
 	/**
@@ -133,10 +133,10 @@ 
 	public function setMinTokenLength($value)
 	{
 		$length=TPropertyValue::ensureInteger($value);
-		if($length>=self::MIN_TOKEN_LENGTH && $length<=self::MAX_TOKEN_LENGTH)
-			$this->setViewState('MinTokenLength',$length,4);
+		if($length >= self::MIN_TOKEN_LENGTH && $length <= self::MAX_TOKEN_LENGTH)
+			$this->setViewState('MinTokenLength', $length, 4);
 		else
-			throw new TConfigurationException('captcha_mintokenlength_invalid',self::MIN_TOKEN_LENGTH,self::MAX_TOKEN_LENGTH);
+			throw new TConfigurationException('captcha_mintokenlength_invalid', self::MIN_TOKEN_LENGTH, self::MAX_TOKEN_LENGTH);
 	}
 
 	/**
@@ -144,7 +144,7 @@ 
 	 */
 	public function getMaxTokenLength()
 	{
-		return $this->getViewState('MaxTokenLength',6);
+		return $this->getViewState('MaxTokenLength', 6);
 	}
 
 	/**
@@ -153,10 +153,10 @@ 
 	public function setMaxTokenLength($value)
 	{
 		$length=TPropertyValue::ensureInteger($value);
-		if($length>=self::MIN_TOKEN_LENGTH && $length<=self::MAX_TOKEN_LENGTH)
-			$this->setViewState('MaxTokenLength',$length,6);
+		if($length >= self::MIN_TOKEN_LENGTH && $length <= self::MAX_TOKEN_LENGTH)
+			$this->setViewState('MaxTokenLength', $length, 6);
 		else
-			throw new TConfigurationException('captcha_maxtokenlength_invalid',self::MIN_TOKEN_LENGTH,self::MAX_TOKEN_LENGTH);
+			throw new TConfigurationException('captcha_maxtokenlength_invalid', self::MIN_TOKEN_LENGTH, self::MAX_TOKEN_LENGTH);
 	}
 
 	/**
@@ -164,7 +164,7 @@ 
 	 */
 	public function getCaseSensitive()
 	{
-		return $this->getViewState('CaseSensitive',true);
+		return $this->getViewState('CaseSensitive', true);
 	}
 
 	/**
@@ -172,7 +172,7 @@ 
 	 */
 	public function setCaseSensitive($value)
 	{
-		$this->setViewState('CaseSensitive',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CaseSensitive', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -180,7 +180,7 @@ 
 	 */
 	public function getTokenAlphabet()
 	{
-		return $this->getViewState('TokenAlphabet','234578adefhijmnrtABDEFGHJLMNRT');
+		return $this->getViewState('TokenAlphabet', '234578adefhijmnrtABDEFGHJLMNRT');
 	}
 
 	/**
@@ -188,9 +188,9 @@ 
 	 */
 	public function setTokenAlphabet($value)
 	{
-		if(strlen($value)<2)
+		if(strlen($value) < 2)
 			throw new TConfigurationException('captcha_tokenalphabet_invalid');
-		$this->setViewState('TokenAlphabet',$value,'234578adefhijmnrtABDEFGHJLMNRT');
+		$this->setViewState('TokenAlphabet', $value, '234578adefhijmnrtABDEFGHJLMNRT');
 	}
 
 	/**
@@ -198,7 +198,7 @@ 
 	 */
 	public function getTokenExpiry()
 	{
-		return $this->getViewState('TokenExpiry',600);
+		return $this->getViewState('TokenExpiry', 600);
 	}
 
 	/**
@@ -206,7 +206,7 @@ 
 	 */
 	public function setTokenExpiry($value)
 	{
-		$this->setViewState('TokenExpiry',TPropertyValue::ensureInteger($value),600);
+		$this->setViewState('TokenExpiry', TPropertyValue::ensureInteger($value), 600);
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 	 */
 	public function getChangingTokenBackground()
 	{
-		return $this->getViewState('ChangingTokenBackground',false);
+		return $this->getViewState('ChangingTokenBackground', false);
 	}
 
 	/**
@@ -222,7 +222,7 @@ 
 	 */
 	public function setChangingTokenBackground($value)
 	{
-		$this->setViewState('ChangingTokenBackground',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ChangingTokenBackground', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 	 */
 	public function getTestLimit()
 	{
-		return $this->getViewState('TestLimit',5);
+		return $this->getViewState('TestLimit', 5);
 	}
 
 	/**
@@ -238,7 +238,7 @@ 
 	 */
 	public function setTestLimit($value)
 	{
-		$this->setViewState('TestLimit',TPropertyValue::ensureInteger($value),5);
+		$this->setViewState('TestLimit', TPropertyValue::ensureInteger($value), 5);
 	}
 
 	/**
@@ -246,8 +246,8 @@ 
 	 */
 	public function getIsTokenExpired()
 	{
-		if(($expiry=$this->getTokenExpiry())>0 && ($start=$this->getViewState('TokenGenerated',0))>0)
-			return $expiry+$start<time();
+		if(($expiry=$this->getTokenExpiry()) > 0 && ($start=$this->getViewState('TokenGenerated', 0)) > 0)
+			return $expiry + $start < time();
 		else
 			return false;
 	}
@@ -257,7 +257,7 @@ 
 	 */
 	public function getPublicKey()
 	{
-		if(($publicKey=$this->getViewState('PublicKey',''))==='')
+		if(($publicKey=$this->getViewState('PublicKey', ''))==='')
 		{
 			$publicKey=$this->generateRandomKey();
 			$this->setPublicKey($publicKey);
@@ -270,7 +270,7 @@ 
 	 */
 	public function setPublicKey($value)
 	{
-		$this->setViewState('PublicKey',$value,'');
+		$this->setViewState('PublicKey', $value, '');
 	}
 
 	/**
@@ -278,7 +278,7 @@ 
 	 */
 	public function getToken()
 	{
-		return $this->generateToken($this->getPublicKey(),$this->getPrivateKey(),$this->getTokenAlphabet(),$this->getTokenLength(),$this->getCaseSensitive());
+		return $this->generateToken($this->getPublicKey(), $this->getPrivateKey(), $this->getTokenAlphabet(), $this->getTokenLength(), $this->getCaseSensitive());
 	}
 
 	/**
@@ -290,13 +290,13 @@ 
 		{
 			$minLength=$this->getMinTokenLength();
 			$maxLength=$this->getMaxTokenLength();
-			if($minLength>$maxLength)
-				$tokenLength=rand($maxLength,$minLength);
-			else if($minLength<$maxLength)
-				$tokenLength=rand($minLength,$maxLength);
+			if($minLength > $maxLength)
+				$tokenLength=rand($maxLength, $minLength);
+			else if($minLength < $maxLength)
+				$tokenLength=rand($minLength, $maxLength);
 			else
 				$tokenLength=$minLength;
-			$this->setViewState('TokenLength',$tokenLength);
+			$this->setViewState('TokenLength', $tokenLength);
 		}
 		return $tokenLength;
 	}
@@ -311,7 +311,7 @@ 
 			$fileName=$this->generatePrivateKeyFile();
 			$content=file_get_contents($fileName);
 			$matches=array();
-			if(preg_match("/privateKey='(.*?)'/ms",$content,$matches)>0)
+			if(preg_match("/privateKey='(.*?)'/ms", $content, $matches) > 0)
 				$this->_privateKey=$matches[1];
 			else
 				throw new TConfigurationException('captcha_privatekey_unknown');
@@ -326,18 +326,18 @@ 
 	 */
 	public function validate($input)
 	{
-		$number=$this->getViewState('TestNumber',0);
+		$number=$this->getViewState('TestNumber', 0);
 		if(!$this->_validated)
 		{
-			$this->setViewState('TestNumber',++$number);
+			$this->setViewState('TestNumber', ++$number);
 			$this->_validated=true;
 		}
-		if($this->getIsTokenExpired() || (($limit=$this->getTestLimit())>0 && $number>$limit))
+		if($this->getIsTokenExpired() || (($limit=$this->getTestLimit()) > 0 && $number > $limit))
 		{
 			$this->regenerateToken();
 			return false;
 		}
-		return ($this->getToken()===($this->getCaseSensitive()?$input:strtoupper($input)));
+		return ($this->getToken()===($this->getCaseSensitive() ? $input : strtoupper($input)));
 	}
 
 	/**
@@ -351,7 +351,7 @@ 
 		$this->setPublicKey('');
 		$this->clearViewState('TokenGenerated');
 		$this->clearViewState('RandomSeed');
-		$this->clearViewState('TestNumber',0);
+		$this->clearViewState('TestNumber', 0);
 	}
 
 	/**
@@ -363,7 +363,7 @@ 
 		parent::onPreRender($param);
 		if(!self::checkRequirements())
 			throw new TConfigurationException('captcha_imagettftext_required');
-		if(!$this->getViewState('TokenGenerated',0))
+		if(!$this->getViewState('TokenGenerated', 0))
 		{
 			$manager=$this->getApplication()->getAssetManager();
 			$manager->publishFilePath($this->getFontFile());
@@ -371,7 +371,7 @@ 
 			$url.='?options='.urlencode($this->getTokenImageOptions());
 			$this->setImageUrl($url);
 
-			$this->setViewState('TokenGenerated',time());
+			$this->setViewState('TokenGenerated', time());
 		}
 	}
 
@@ -380,7 +380,7 @@ 
 	 */
 	protected function getTokenImageOptions()
 	{
-		$privateKey=$this->getPrivateKey();  // call this method to ensure private key is generated
+		$privateKey=$this->getPrivateKey(); // call this method to ensure private key is generated
 		$token=$this->getToken();
 		$options=array();
 		$options['publicKey']=$this->getPublicKey();
@@ -389,12 +389,12 @@ 
 		$options['alphabet']=$this->getTokenAlphabet();
 		$options['fontSize']=$this->getTokenFontSize();
 		$options['theme']=$this->getTokenImageTheme();
-		if(($randomSeed=$this->getViewState('RandomSeed',0))===0)
+		if(($randomSeed=$this->getViewState('RandomSeed', 0))===0)
 		{
-			$randomSeed=(int)(microtime()*1000000);
-			$this->setViewState('RandomSeed',$randomSeed);
+			$randomSeed=(int) (microtime() * 1000000);
+			$this->setViewState('RandomSeed', $randomSeed);
 		}
-		$options['randomSeed']=$this->getChangingTokenBackground()?0:$randomSeed;
+		$options['randomSeed']=$this->getChangingTokenBackground() ? 0 : $randomSeed;
 		$str=serialize($options);
 		return base64_encode(md5($privateKey.$str).$str);
 	}
@@ -428,7 +428,7 @@ 
 			$content="<?php
 \$privateKey='$key';
 ?>";
-			file_put_contents($fileName,$content);
+			file_put_contents($fileName, $content);
 		}
 		return $fileName;
 	}
@@ -449,10 +449,10 @@ 
 	 * @param boolean whether the token is case sensitive
 	 * @return string the token generated.
 	 */
-	protected function generateToken($publicKey,$privateKey,$alphabet,$tokenLength,$caseSensitive)
+	protected function generateToken($publicKey, $privateKey, $alphabet, $tokenLength, $caseSensitive)
 	{
-		$token=substr($this->hash2string(md5($publicKey.$privateKey),$alphabet).$this->hash2string(md5($privateKey.$publicKey),$alphabet),0,$tokenLength);
-		return $caseSensitive?$token:strtoupper($token);
+		$token=substr($this->hash2string(md5($publicKey.$privateKey), $alphabet).$this->hash2string(md5($privateKey.$publicKey), $alphabet), 0, $tokenLength);
+		return $caseSensitive ? $token : strtoupper($token);
 	}
 
 	/**
@@ -461,20 +461,20 @@ 
 	 * @param string the alphabet used to represent the converted string. If empty, it means '234578adefhijmnrtwyABDEFGHIJLMNQRTWY', which excludes those confusing characters.
 	 * @return string the converted string
 	 */
-	protected function hash2string($hex,$alphabet='')
+	protected function hash2string($hex, $alphabet='')
 	{
-		if(strlen($alphabet)<2)
+		if(strlen($alphabet) < 2)
 			$alphabet='234578adefhijmnrtABDEFGHJLMNQRT';
 		$hexLength=strlen($hex);
 		$base=strlen($alphabet);
 		$result='';
-		for($i=0;$i<$hexLength;$i+=6)
+		for($i=0; $i < $hexLength; $i+=6)
 		{
-			$number=hexdec(substr($hex,$i,6));
+			$number=hexdec(substr($hex, $i, 6));
 			while($number)
 			{
-				$result.=$alphabet[$number%$base];
-				$number=floor($number/$base);
+				$result.=$alphabet[$number % $base];
+				$number=floor($number / $base);
 			}
 		}
 		return $result;