pradosoft / prado

framework/Web/UI/WebControls/THyperLinkColumn.php

Spacing +30 added lines, -30 removed lines

@@ -54,7 +54,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -63,7 +63,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	 */
 	public function getDataTextField()
 	{
-		return $this->getViewState('DataTextField','');
+		return $this->getViewState('DataTextField', '');
 	}
 
 	/**
@@ -79,7 +79,7 @@ 
 	 */
 	public function setDataTextField($value)
 	{
-		$this->setViewState('DataTextField',$value,'');
+		$this->setViewState('DataTextField', $value, '');
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 */
 	public function getDataTextFormatString()
 	{
-		return $this->getViewState('DataTextFormatString','');
+		return $this->getViewState('DataTextFormatString', '');
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 */
 	public function setDataTextFormatString($value)
 	{
-		$this->setViewState('DataTextFormatString',$value,'');
+		$this->setViewState('DataTextFormatString', $value, '');
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 	 */
 	public function getImageHeight()
 	{
-		return $this->getViewState('ImageHeight','');
+		return $this->getViewState('ImageHeight', '');
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 */
 	public function setImageHeight($value)
 	{
-		$this->setViewState('ImageHeight',$value,'');
+		$this->setViewState('ImageHeight', $value, '');
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 */
 	public function getImageUrl()
 	{
-		return $this->getViewState('ImageUrl','');
+		return $this->getViewState('ImageUrl', '');
 	}
 
 	/**
@@ -127,7 +127,7 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		$this->setViewState('ImageUrl',$value,'');
+		$this->setViewState('ImageUrl', $value, '');
 	}
 
 	/**
@@ -135,7 +135,7 @@ 
 	 */
 	public function getImageWidth()
 	{
-		return $this->getViewState('ImageWidth','');
+		return $this->getViewState('ImageWidth', '');
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 */
 	public function setImageWidth($value)
 	{
-		$this->setViewState('ImageWidth',$value,'');
+		$this->setViewState('ImageWidth', $value, '');
 	}
 
 	/**
@@ -151,7 +151,7 @@ 
 	 */
 	public function getNavigateUrl()
 	{
-		return $this->getViewState('NavigateUrl','');
+		return $this->getViewState('NavigateUrl', '');
 	}
 
 	/**
@@ -160,7 +160,7 @@ 
 	 */
 	public function setNavigateUrl($value)
 	{
-		$this->setViewState('NavigateUrl',$value,'');
+		$this->setViewState('NavigateUrl', $value, '');
 	}
 
 	/**
@@ -168,7 +168,7 @@ 
 	 */
 	public function getDataNavigateUrlField()
 	{
-		return $this->getViewState('DataNavigateUrlField','');
+		return $this->getViewState('DataNavigateUrlField', '');
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 */
 	public function setDataNavigateUrlField($value)
 	{
-		$this->setViewState('DataNavigateUrlField',$value,'');
+		$this->setViewState('DataNavigateUrlField', $value, '');
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	 */
 	public function getDataNavigateUrlFormatString()
 	{
-		return $this->getViewState('DataNavigateUrlFormatString','');
+		return $this->getViewState('DataNavigateUrlFormatString', '');
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	 */
 	public function setDataNavigateUrlFormatString($value)
 	{
-		$this->setViewState('DataNavigateUrlFormatString',$value,'');
+		$this->setViewState('DataNavigateUrlFormatString', $value, '');
 	}
 
 	/**
@@ -200,7 +200,7 @@ 
 	 */
 	public function getTarget()
 	{
-		return $this->getViewState('Target','');
+		return $this->getViewState('Target', '');
 	}
 
 	/**
@@ -209,7 +209,7 @@ 
 	 */
 	public function setTarget($value)
 	{
-		$this->setViewState('Target',$value,'');
+		$this->setViewState('Target', $value, '');
 	}
 
 	/**
@@ -220,12 +220,12 @@ 
 	 * @param integer the index to the Columns property that the cell resides in.
 	 * @param string the type of cell (Header,Footer,Item,AlternatingItem,EditItem,SelectedItem)
 	 */
-	public function initializeCell($cell,$columnIndex,$itemType)
+	public function initializeCell($cell, $columnIndex, $itemType)
 	{
 		if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::SelectedItem || $itemType===TListItemType::EditItem)
 		{
 			$link=new THyperLink;
-			if(($url = $this->getImageUrl())!=='')
+			if(($url=$this->getImageUrl())!=='')
 			{
 				$link->setImageUrl($url);
 				if(($width=$this->getImageWidth())!=='')
@@ -237,12 +237,12 @@ 
 			$link->setNavigateUrl($this->getNavigateUrl());
 			$link->setTarget($this->getTarget());
 			if($this->getDataTextField()!=='' || $this->getDataNavigateUrlField()!=='')
-				$link->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				$link->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 			$cell->getControls()->add($link);
-			$cell->registerObject('HyperLink',$link);
+			$cell->registerObject('HyperLink', $link);
 		}
 		else
-			parent::initializeCell($cell,$columnIndex,$itemType);
+			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
 	/**
@@ -250,20 +250,20 @@ 
 	 * 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();
 		if(($field=$this->getDataTextField())!=='')
 		{
-			$value=$this->getDataFieldValue($data,$field);
-			$text=$this->formatDataValue($this->getDataTextFormatString(),$value);
+			$value=$this->getDataFieldValue($data, $field);
+			$text=$this->formatDataValue($this->getDataTextFormatString(), $value);
 			$sender->setText($text);
 		}
 		if(($field=$this->getDataNavigateUrlField())!=='')
 		{
-			$value=$this->getDataFieldValue($data,$field);
-			$url=$this->formatDataValue($this->getDataNavigateUrlFormatString(),$value);
+			$value=$this->getDataFieldValue($data, $field);
+			$url=$this->formatDataValue($this->getDataNavigateUrlFormatString(), $value);
 			$sender->setNavigateUrl($url);
 		}
 	}

Braces +1 added lines, -2 removed lines

@@ -233,8 +233,7 @@
 				$link->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
 			$cell->getControls()->add($link);
 			$cell->registerObject('HyperLink',$link);
-		}
-		else
+		} else
 			parent::initializeCell($cell,$columnIndex,$itemType);
 	}
 

framework/Web/UI/WebControls/THtmlElement.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 	 */
 	public function getTagName()
 	{
-		return ($this->_tagName !== null) ? $this->_tagName : ($this->_tagName = $this->getDefaultTagName());
+		return ($this->_tagName!==null) ? $this->_tagName : ($this->_tagName=$this->getDefaultTagName());
 	}
 
 	/**
@@ -61,6 +61,6 @@ 
 	 * @return boolean true if TagName has deviated from the default.
 	 */
 	public function getIsMutated() {
-		return $this->_tagName !== null && $this->_tagName != $this->getDefaultTagName();
+		return $this->_tagName!==null && $this->_tagName!=$this->getDefaultTagName();
 	}
 }

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

Braces +1 added lines, -2 removed lines

@@ -116,8 +116,7 @@
 					$text=THttpUtility::htmlEncode($text);
 				$cell->setText($text);
 			}
-		}
-		else
+		} else
 			parent::initializeCell($cell,$columnIndex,$itemType);
 	}
 

framework/Web/UI/WebControls/TRepeatInfo.php

Braces +8 added lines, -16 removed lines

@@ -191,13 +191,11 @@ 
 				$control->setCaption($this->_caption);
 				$control->setCaptionAlign($this->_captionAlign);
 			}
-		}
-		else if($this->_repeatLayout===TRepeatLayout::Raw)
+		} else if($this->_repeatLayout===TRepeatLayout::Raw)
 		{
 			$this->renderRawContents($writer,$user);
 			return;
-		}
-		else
+		} else
 			$control=new TWebControl;
 		$control->setID($user->getClientID());
 		$control->copyBaseAttributes($user);
@@ -295,8 +293,7 @@ 
 				}
 			}
 			$writer->renderEndTag();
-		}
-		else
+		} else
 		{
 			$column=0;
 			for($i=0;$i<$itemCount;++$i)
@@ -334,8 +331,7 @@ 
 			$rows=$itemCount;
 			$columns=1;
 			$lastColumns=1;
-		}
-		else
+		} else
 		{
 			$columns=$this->_repeatColumns;
 			$rows=(int)(($itemCount+$columns-1)/$columns);
@@ -391,8 +387,7 @@ 
 						$user->renderItem($writer,$this,'Separator',$index);
 						$writer->renderEndTag();
 						$writer->writeLine();
-					}
-					else if($columns>1)
+					} else if($columns>1)
 						$writer->write("<td></td>\n");
 				}
 				if($row==$rows-1)
@@ -407,8 +402,7 @@ 
 				$writer->writeLine();
 			}
 			$writer->renderEndTag();
-		}
-		else
+		} else
 		{
 			$renderedItems=0;
 			for($row=0;$row<$rows;++$row)
@@ -473,8 +467,7 @@ 
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 			$writer->renderEndTag();
-		}
-		else
+		} else
 		{
 			$user->renderItem($writer,$this,'Header',-1);
 			if($needBreak)
@@ -505,8 +498,7 @@ 
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 			$writer->renderEndTag();
-		}
-		else
+		} else
 			$user->renderItem($writer,$this,'Footer',-1);
 		$writer->writeLine();
 	}

Doc Comments +6 added lines

@@ -178,6 +178,7 @@ 
 	 * Renders contents in raw format.
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param IRepeatInfoUser repeat information user
+	 * @param IRepeatInfoUser $user
 	 */
 	protected function renderRawContents($writer,$user)
 	{
@@ -201,6 +202,7 @@ 
 	 * Renders contents in horizontal repeat direction.
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param IRepeatInfoUser repeat information user
+	 * @param IRepeatInfoUser $user
 	 */
 	protected function renderHorizontalContents($writer,$user)
 	{
@@ -283,6 +285,7 @@ 
 	 * Renders contents in veritcal repeat direction.
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param IRepeatInfoUser repeat information user
+	 * @param IRepeatInfoUser $user
 	 */
 	protected function renderVerticalContents($writer,$user)
 	{
@@ -416,6 +419,8 @@ 
 	 * @param boolean whether to render using table layout
 	 * @param integer number of columns to be rendered
 	 * @param boolean if a line break is needed at the end
+	 * @param boolean $tableLayout
+	 * @param boolean $needBreak
 	 */
 	protected function renderHeader($writer,$user,$tableLayout,$columns,$needBreak)
 	{
@@ -449,6 +454,7 @@ 
 	 * @param IRepeatInfoUser repeat information user
 	 * @param boolean whether to render using table layout
 	 * @param integer number of columns to be rendered
+	 * @param boolean $tableLayout
 	 */
 	protected function renderFooter($writer,$user,$tableLayout,$columns)
 	{

Spacing +82 added lines, -82 removed lines

@@ -83,7 +83,7 @@ 
 	 */
 	public function setCaptionAlign($value)
 	{
-		$this->_captionAlign=TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TTableCaptionAlign');
+		$this->_captionAlign=TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TTableCaptionAlign');
 	}
 
 	/**
@@ -99,7 +99,7 @@ 
 	 */
 	public function setRepeatColumns($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			throw new TInvalidDataValueException('repeatinfo_repeatcolumns_invalid');
 		$this->_repeatColumns=$value;
 	}
@@ -117,7 +117,7 @@ 
 	 */
 	public function setRepeatDirection($value)
 	{
-		$this->_repeatDirection=TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TRepeatDirection');
+		$this->_repeatDirection=TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TRepeatDirection');
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 	 */
 	public function setRepeatLayout($value)
 	{
-		$this->_repeatLayout=TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TRepeatLayout');
+		$this->_repeatLayout=TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TRepeatLayout');
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 		}
 		else if($this->_repeatLayout===TRepeatLayout::Raw)
 		{
-			$this->renderRawContents($writer,$user);
+			$this->renderRawContents($writer, $user);
 			return;
 		}
 		else
@@ -167,9 +167,9 @@ 
 		$writer->writeLine();
 
 		if($this->_repeatDirection===TRepeatDirection::Vertical)
-			$this->renderVerticalContents($writer,$user);
+			$this->renderVerticalContents($writer, $user);
 		else
-			$this->renderHorizontalContents($writer,$user);
+			$this->renderHorizontalContents($writer, $user);
 
 		$control->renderEndTag($writer);
 	}
@@ -179,22 +179,22 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param IRepeatInfoUser repeat information user
 	 */
-	protected function renderRawContents($writer,$user)
+	protected function renderRawContents($writer, $user)
 	{
 		if($user->getHasHeader())
-			$user->renderItem($writer,$this,'Header',-1);
+			$user->renderItem($writer, $this, 'Header', -1);
 
 		// render items
 		$hasSeparators=$user->getHasSeparators();
 		$itemCount=$user->getItemCount();
-		for($i=0;$i<$itemCount;++$i)
+		for($i=0; $i < $itemCount; ++$i)
 		{
-			$user->renderItem($writer,$this,'Item',$i);
-			if($hasSeparators && $i!=$itemCount-1)
-				$user->renderItem($writer,$this,'Separator',$i);
+			$user->renderItem($writer, $this, 'Item', $i);
+			if($hasSeparators && $i!=$itemCount - 1)
+				$user->renderItem($writer, $this, 'Separator', $i);
 		}
 		if($user->getHasFooter())
-			$user->renderItem($writer,$this,'Footer',-1);
+			$user->renderItem($writer, $this, 'Footer', -1);
 	}
 
 	/**
@@ -202,52 +202,52 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param IRepeatInfoUser repeat information user
 	 */
-	protected function renderHorizontalContents($writer,$user)
+	protected function renderHorizontalContents($writer, $user)
 	{
 		$tableLayout=($this->_repeatLayout===TRepeatLayout::Table);
 		$hasSeparators=$user->getHasSeparators();
 		$itemCount=$user->getItemCount();
-		$columns=$this->_repeatColumns===0?$itemCount:$this->_repeatColumns;
-		$totalColumns=$hasSeparators?$columns+$columns:$columns;
-		$needBreak=$columns<$itemCount;
+		$columns=$this->_repeatColumns===0 ? $itemCount : $this->_repeatColumns;
+		$totalColumns=$hasSeparators ? $columns + $columns : $columns;
+		$needBreak=$columns < $itemCount;
 
 		if($user->getHasHeader())
-			$this->renderHeader($writer,$user,$tableLayout,$totalColumns,$needBreak);
+			$this->renderHeader($writer, $user, $tableLayout, $totalColumns, $needBreak);
 
 		// render items
 		if($tableLayout)
 		{
 			$writer->renderBeginTag('tbody');
 			$column=0;
-			for($i=0;$i<$itemCount;++$i)
+			for($i=0; $i < $itemCount; ++$i)
 			{
 				if($column==0)
 					$writer->renderBeginTag('tr');
-				if(($style=$user->generateItemStyle('Item',$i))!==null)
+				if(($style=$user->generateItemStyle('Item', $i))!==null)
 					$style->addAttributesToRender($writer);
 				$writer->renderBeginTag('td');
-				$user->renderItem($writer,$this,'Item',$i);
+				$user->renderItem($writer, $this, 'Item', $i);
 				$writer->renderEndTag();
 				$writer->writeLine();
-				if($hasSeparators && $i!=$itemCount-1)
+				if($hasSeparators && $i!=$itemCount - 1)
 				{
-					if(($style=$user->generateItemStyle('Separator',$i))!==null)
+					if(($style=$user->generateItemStyle('Separator', $i))!==null)
 						$style->addAttributesToRender($writer);
 					$writer->renderBeginTag('td');
-					$user->renderItem($writer,$this,'Separator',$i);
+					$user->renderItem($writer, $this, 'Separator', $i);
 					$writer->renderEndTag();
 					$writer->writeLine();
 				}
 				$column++;
-				if($i==$itemCount-1)
+				if($i==$itemCount - 1)
 				{
-					$restColumns=$columns-$column;
+					$restColumns=$columns - $column;
 					if($hasSeparators)
-						$restColumns=$restColumns?$restColumns+$restColumns+1:1;
-					for($j=0;$j<$restColumns;++$j)
+						$restColumns=$restColumns ? $restColumns + $restColumns + 1 : 1;
+					for($j=0; $j < $restColumns; ++$j)
 						$writer->write("<td></td>\n");
 				}
-				if($column==$columns || $i==$itemCount-1)
+				if($column==$columns || $i==$itemCount - 1)
 				{
 					$writer->renderEndTag();
 					$writer->writeLine();
@@ -259,13 +259,13 @@ 
 		else
 		{
 			$column=0;
-			for($i=0;$i<$itemCount;++$i)
+			for($i=0; $i < $itemCount; ++$i)
 			{
-				$user->renderItem($writer,$this,'Item',$i);
-				if($hasSeparators && $i!=$itemCount-1)
-					$user->renderItem($writer,$this,'Separator',$i);
+				$user->renderItem($writer, $this, 'Item', $i);
+				if($hasSeparators && $i!=$itemCount - 1)
+					$user->renderItem($writer, $this, 'Separator', $i);
 				$column++;
-				if($column==$columns || $i==$itemCount-1)
+				if($column==$columns || $i==$itemCount - 1)
 				{
 					if($needBreak)
 						$writer->writeBreak();
@@ -276,7 +276,7 @@ 
 		}
 
 		if($user->getHasFooter())
-			$this->renderFooter($writer,$user,$tableLayout,$totalColumns,$needBreak);
+			$this->renderFooter($writer, $user, $tableLayout, $totalColumns, $needBreak);
 	}
 
 	/**
@@ -284,12 +284,12 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param IRepeatInfoUser repeat information user
 	 */
-	protected function renderVerticalContents($writer,$user)
+	protected function renderVerticalContents($writer, $user)
 	{
 		$tableLayout=($this->_repeatLayout===TRepeatLayout::Table);
 		$hasSeparators=$user->getHasSeparators();
 		$itemCount=$user->getItemCount();
-		if($this->_repeatColumns<=1)
+		if($this->_repeatColumns <= 1)
 		{
 			$rows=$itemCount;
 			$columns=1;
@@ -298,69 +298,69 @@ 
 		else
 		{
 			$columns=$this->_repeatColumns;
-			$rows=(int)(($itemCount+$columns-1)/$columns);
-			if($rows==0 && $itemCount>0)
+			$rows=(int) (($itemCount + $columns - 1) / $columns);
+			if($rows==0 && $itemCount > 0)
 				$rows=1;
-			if(($lastColumns=$itemCount%$columns)==0)
+			if(($lastColumns=$itemCount % $columns)==0)
 				$lastColumns=$columns;
 		}
-		$totalColumns=$hasSeparators?$columns+$columns:$columns;
+		$totalColumns=$hasSeparators ? $columns + $columns : $columns;
 
 		if($user->getHasHeader())
-			$this->renderHeader($writer,$user,$tableLayout,$totalColumns,false);
+			$this->renderHeader($writer, $user, $tableLayout, $totalColumns, false);
 
 		if($tableLayout)
 		{
 			$writer->renderBeginTag('tbody');
 			$renderedItems=0;
-			for($row=0;$row<$rows;++$row)
+			for($row=0; $row < $rows; ++$row)
 			{
 				$index=$row;
 				$writer->renderBeginTag('tr');
-				for($col=0;$col<$columns;++$col)
+				for($col=0; $col < $columns; ++$col)
 				{
-					if($renderedItems>=$itemCount)
+					if($renderedItems >= $itemCount)
 						break;
-					if($col>0)
+					if($col > 0)
 					{
 						$index+=$rows;
-						if($col-1>=$lastColumns)
+						if($col - 1 >= $lastColumns)
 							$index--;
 					}
-					if($index>=$itemCount)
+					if($index >= $itemCount)
 						continue;
 					$renderedItems++;
-					if(($style=$user->generateItemStyle('Item',$index))!==null)
+					if(($style=$user->generateItemStyle('Item', $index))!==null)
 						$style->addAttributesToRender($writer);
 					$writer->renderBeginTag('td');
-					$user->renderItem($writer,$this,'Item',$index);
+					$user->renderItem($writer, $this, 'Item', $index);
 					$writer->renderEndTag();
 					$writer->writeLine();
 					if(!$hasSeparators)
 						continue;
-					if($renderedItems<$itemCount-1)
+					if($renderedItems < $itemCount - 1)
 					{
 						if($columns==1)
 						{
 							$writer->renderEndTag();
 							$writer->renderBeginTag('tr');
 						}
-						if(($style=$user->generateItemStyle('Separator',$index))!==null)
+						if(($style=$user->generateItemStyle('Separator', $index))!==null)
 							$style->addAttributesToRender($writer);
 						$writer->renderBeginTag('td');
-						$user->renderItem($writer,$this,'Separator',$index);
+						$user->renderItem($writer, $this, 'Separator', $index);
 						$writer->renderEndTag();
 						$writer->writeLine();
 					}
-					else if($columns>1)
+					else if($columns > 1)
 						$writer->write("<td></td>\n");
 				}
-				if($row==$rows-1)
+				if($row==$rows - 1)
 				{
-					$restColumns=$columns-$lastColumns;
+					$restColumns=$columns - $lastColumns;
 					if($hasSeparators)
 						$restColumns+=$restColumns;
-					for($col=0;$col<$restColumns;++$col)
+					for($col=0; $col < $restColumns; ++$col)
 						$writer->write("<td></td>\n");
 				}
 				$writer->renderEndTag();
@@ -371,41 +371,41 @@ 
 		else
 		{
 			$renderedItems=0;
-			for($row=0;$row<$rows;++$row)
+			for($row=0; $row < $rows; ++$row)
 			{
 				$index=$row;
-				for($col=0;$col<$columns;++$col)
+				for($col=0; $col < $columns; ++$col)
 				{
-					if($renderedItems>=$itemCount)
+					if($renderedItems >= $itemCount)
 						break;
-					if($col>0)
+					if($col > 0)
 					{
 						$index+=$rows;
-						if($col-1>=$lastColumns)
+						if($col - 1 >= $lastColumns)
 							$index--;
 					}
-					if($index>=$itemCount)
+					if($index >= $itemCount)
 						continue;
 					$renderedItems++;
-					$user->renderItem($writer,$this,'Item',$index);
+					$user->renderItem($writer, $this, 'Item', $index);
 					$writer->writeLine();
 					if(!$hasSeparators)
 						continue;
-					if($renderedItems<$itemCount-1)
+					if($renderedItems < $itemCount - 1)
 					{
 						if($columns==1)
 							$writer->writeBreak();
-						$user->renderItem($writer,$this,'Separator',$index);
+						$user->renderItem($writer, $this, 'Separator', $index);
 					}
 					$writer->writeLine();
 				}
-				if($row<$rows-1 || $user->getHasFooter())
+				if($row < $rows - 1 || $user->getHasFooter())
 					$writer->writeBreak();
 			}
 		}
 
 		if($user->getHasFooter())
-			$this->renderFooter($writer,$user,$tableLayout,$totalColumns,false);
+			$this->renderFooter($writer, $user, $tableLayout, $totalColumns, false);
 
 	}
 
@@ -417,26 +417,26 @@ 
 	 * @param integer number of columns to be rendered
 	 * @param boolean if a line break is needed at the end
 	 */
-	protected function renderHeader($writer,$user,$tableLayout,$columns,$needBreak)
+	protected function renderHeader($writer, $user, $tableLayout, $columns, $needBreak)
 	{
 		if($tableLayout)
 		{
 			$writer->renderBeginTag('thead');
 			$writer->renderBeginTag('tr');
-			if($columns>1)
-				$writer->addAttribute('colspan',"$columns");
-			$writer->addAttribute('scope','col');
-			if(($style=$user->generateItemStyle('Header',-1))!==null)
+			if($columns > 1)
+				$writer->addAttribute('colspan', "$columns");
+			$writer->addAttribute('scope', 'col');
+			if(($style=$user->generateItemStyle('Header', -1))!==null)
 				$style->addAttributesToRender($writer);
 			$writer->renderBeginTag('th');
-			$user->renderItem($writer,$this,'Header',-1);
+			$user->renderItem($writer, $this, 'Header', -1);
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 		}
 		else
 		{
-			$user->renderItem($writer,$this,'Header',-1);
+			$user->renderItem($writer, $this, 'Header', -1);
 			if($needBreak)
 				$writer->writeBreak();
 		}
@@ -450,24 +450,24 @@ 
 	 * @param boolean whether to render using table layout
 	 * @param integer number of columns to be rendered
 	 */
-	protected function renderFooter($writer,$user,$tableLayout,$columns)
+	protected function renderFooter($writer, $user, $tableLayout, $columns)
 	{
 		if($tableLayout)
 		{
 			$writer->renderBeginTag('tfoot');
 			$writer->renderBeginTag('tr');
-			if($columns>1)
-				$writer->addAttribute('colspan',"$columns");
-			if(($style=$user->generateItemStyle('Footer',-1))!==null)
+			if($columns > 1)
+				$writer->addAttribute('colspan', "$columns");
+			if(($style=$user->generateItemStyle('Footer', -1))!==null)
 				$style->addAttributesToRender($writer);
 			$writer->renderBeginTag('td');
-			$user->renderItem($writer,$this,'Footer',-1);
+			$user->renderItem($writer, $this, 'Footer', -1);
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 		}
 		else
-			$user->renderItem($writer,$this,'Footer',-1);
+			$user->renderItem($writer, $this, 'Footer', -1);
 		$writer->writeLine();
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TRequiredFieldValidator.php

Spacing +15 added lines, -15 removed lines

@@ -51,7 +51,7 @@ 
 	 */
 	public function getInitialValue()
 	{
-		return $this->getViewState('InitialValue',$this->getControlPromptValue());
+		return $this->getViewState('InitialValue', $this->getControlPromptValue());
 	}
 
 	/**
@@ -61,7 +61,7 @@ 
 	 */
 	protected function getControlPromptValue()
 	{
-		$control = $this->getValidationTarget();
+		$control=$this->getValidationTarget();
 		if($control instanceof TListControl)
 			return $control->getPromptValue();
 		return '';
@@ -73,7 +73,7 @@ 
 	 */
 	public function setInitialValue($value)
 	{
-		$this->setViewState('InitialValue',TPropertyValue::ensureString($value),'');
+		$this->setViewState('InitialValue', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -89,7 +89,7 @@ 
 	 */
 	protected function evaluateIsValid()
 	{
-		$control = $this->getValidationTarget();
+		$control=$this->getValidationTarget();
 		if($control instanceof TListControl)
 			return $this->validateListControl($control);
 		else if($control instanceof TRadioButton && strlen($control->getGroupName()) > 0)
@@ -100,11 +100,11 @@ 
 
 	private function validateListControl($control)
 	{
-		$initial = trim($this->getInitialValue());
-		$count = 0;
+		$initial=trim($this->getInitialValue());
+		$count=0;
 		foreach($control->getItems() as $item)
 		{
-			if($item->getSelected() && $item->getValue() != $initial)
+			if($item->getSelected() && $item->getValue()!=$initial)
 				$count++;
 		}
 		return $count > 0;
@@ -112,13 +112,13 @@ 
 
 	private function validateRadioButtonGroup($control)
 	{
-		$initial = trim($this->getInitialValue());
+		$initial=trim($this->getInitialValue());
 		foreach($control->getRadioButtonsInGroup() as $radio)
 		{
 			if($radio->getChecked())
 			{
-				if(strlen($value = $radio->getValue()) > 0)
-					return $value !== $initial;
+				if(strlen($value=$radio->getValue()) > 0)
+					return $value!==$initial;
 				else
 					return true;
 			}
@@ -128,7 +128,7 @@ 
 
 	private function validateStandardControl($control)
 	{
-		$initial = trim($this->getInitialValue());
+		$initial=trim($this->getInitialValue());
 		$value=$this->getValidationValue($control);
 		return (is_bool($value) && $value) || trim($value)!==$initial;
 	}
@@ -139,13 +139,13 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options = parent::getClientScriptOptions();
+		$options=parent::getClientScriptOptions();
 		$options['InitialValue']=$this->getInitialValue();
-		$control = $this->getValidationTarget();
+		$control=$this->getValidationTarget();
 		if($control instanceof TListControl)
-			$options['TotalItems'] = $control->getItemCount();
+			$options['TotalItems']=$control->getItemCount();
 		if($control instanceof TRadioButton && strlen($control->getGroupName()) > 0)
-			$options['GroupName'] = $control->getGroupName();
+			$options['GroupName']=$control->getGroupName();
 		return $options;
 	}
 }

Doc Comments +9 added lines

@@ -96,6 +96,9 @@ 
 			return $this->validateStandardControl($control);
 	}
 
+	/**
+	 * @param TListControl $control
+	 */
 	private function validateListControl($control)
 	{
 		$initial = trim($this->getInitialValue());
@@ -108,6 +111,9 @@ 
 		return $count > 0;
 	}
 
+	/**
+	 * @param TRadioButton $control
+	 */
 	private function validateRadioButtonGroup($control)
 	{
 		$initial = trim($this->getInitialValue());
@@ -124,6 +130,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param \Prado\Web\UI\TControl $control
+	 */
 	private function validateStandardControl($control)
 	{
 		$initial = trim($this->getInitialValue());

framework/Web/UI/WebControls/TReCaptchaValidator.php

Spacing +18 added lines, -18 removed lines

@@ -30,7 +30,7 @@ 
  */
 class TReCaptchaValidator extends TBaseValidator
 {
-	protected $_isvalid = null;
+	protected $_isvalid=null;
 
 	/**
 	 * Gets the name of the javascript class responsible for performing validation for this control.
@@ -49,18 +49,18 @@ 
 
 	protected function getCaptchaControl()
 	{
-		$control = $this->getValidationTarget();
-		if (!$control)
+		$control=$this->getValidationTarget();
+		if(!$control)
 			throw new Exception('No target control specified for TReCaptchaValidator');
-		if (!($control instanceof TReCaptcha))
+		if(!($control instanceof TReCaptcha))
 			throw new Exception('TReCaptchaValidator only works with TReCaptcha controls');
 		return $control;
 	}
 
 	public function getClientScriptOptions()
 	{
-		$options = parent::getClientScriptOptions();
-		$options['ResponseFieldName'] = $this->getCaptchaControl()->getResponseFieldName();
+		$options=parent::getClientScriptOptions();
+		$options['ResponseFieldName']=$this->getCaptchaControl()->getResponseFieldName();
 		return $options;
 	}
 
@@ -74,10 +74,10 @@ 
 	protected function evaluateIsValid()
 	{
 		// check validity only once (if trying to evaulate multiple times, all redundant checks would fail)
-		if (is_null($this->_isvalid))
+		if(is_null($this->_isvalid))
 		{
-			$control = $this->getCaptchaControl();
-			$this->_isvalid = $control->validate();
+			$control=$this->getCaptchaControl();
+			$this->_isvalid=$control->validate();
 		}
 		return ($this->_isvalid==true);
 	}
@@ -86,23 +86,23 @@ 
 	{
 		parent::onPreRender($param);
 
-		$cs = $this->Page->getClientScript();
+		$cs=$this->Page->getClientScript();
 		$cs->registerPradoScript('validator');
 
 		// communicate validation status to the client side
-		$value = $this->_isvalid===false ? '0' : '1';
-		$cs->registerHiddenField($this->getClientID().'_1',$value);
+		$value=$this->_isvalid===false ? '0' : '1';
+		$cs->registerHiddenField($this->getClientID().'_1', $value);
 		
 		// update validator display
-		if ($control = $this->getValidationTarget())
+		if($control=$this->getValidationTarget())
 		{
-			$fn = 'captchaUpdateValidatorStatus_'.$this->getClientID();
+			$fn='captchaUpdateValidatorStatus_'.$this->getClientID();
 
 			// check if we need to request a new captcha too
-			if ($this->Page->IsCallback)
+			if($this->Page->IsCallback)
 			{
-				if ($control->getVisible(true))
-					if (!is_null($this->_isvalid))
+				if($control->getVisible(true))
+					if(!is_null($this->_isvalid))
 					{
 						// if the response has been tested and we reach the pre-render phase 
 						// then we need to regenerate the token, because it won't test positive
@@ -112,7 +112,7 @@ 
 					}
 			}
 
-			$cs->registerEndScript($this->getClientID().'::validate', implode(' ',array(
+			$cs->registerEndScript($this->getClientID().'::validate', implode(' ', array(
 				// this function will be used to update the validator
 				'function '.$fn.'(valid)',
 				'{',

framework/Web/UI/WebControls/TCheckBoxColumn.php

Spacing +10 added lines, -10 removed lines

@@ -47,7 +47,7 @@ 
 	 */
 	public function getDataField()
 	{
-		return $this->getViewState('DataField','');
+		return $this->getViewState('DataField', '');
 	}
 
 	/**
@@ -55,7 +55,7 @@ 
 	 */
 	public function setDataField($value)
 	{
-		$this->setViewState('DataField',$value,'');
+		$this->setViewState('DataField', $value, '');
 	}
 
 	/**
@@ -63,7 +63,7 @@ 
 	 */
 	public function getReadOnly()
 	{
-		return $this->getViewState('ReadOnly',false);
+		return $this->getViewState('ReadOnly', false);
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	 */
 	public function setReadOnly($value)
 	{
-		$this->setViewState('ReadOnly',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ReadOnly', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	 * @param integer the index to the Columns property that the cell resides in.
 	 * @param string the type of cell (Header,Footer,Item,AlternatingItem,EditItem,SelectedItem)
 	 */
-	public function initializeCell($cell,$columnIndex,$itemType)
+	public function initializeCell($cell, $columnIndex, $itemType)
 	{
 		if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::SelectedItem || $itemType===TListItemType::EditItem)
 		{
@@ -93,12 +93,12 @@ 
 				$checkBox->setEnabled(false);
 			$cell->setHorizontalAlign('Center');
 			$cell->getControls()->add($checkBox);
-			$cell->registerObject('CheckBox',$checkBox);
+			$cell->registerObject('CheckBox', $checkBox);
 			if($this->getDataField()!=='')
-				$checkBox->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				$checkBox->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 		}
 		else
-			parent::initializeCell($cell,$columnIndex,$itemType);
+			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
 	/**
@@ -106,12 +106,12 @@ 
 	 * 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();
 		if(($field=$this->getDataField())!=='')
-			$value=TPropertyValue::ensureBoolean($this->getDataFieldValue($data,$field));
+			$value=TPropertyValue::ensureBoolean($this->getDataFieldValue($data, $field));
 		else
 			$value=TPropertyValue::ensureBoolean($data);
 		if($sender instanceof TCheckBox)

Braces +1 added lines, -2 removed lines

@@ -90,8 +90,7 @@
 			$cell->registerObject('CheckBox',$checkBox);
 			if($this->getDataField()!=='')
 				$checkBox->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
-		}
-		else
+		} else
 			parent::initializeCell($cell,$columnIndex,$itemType);
 	}