pradosoft / prado

framework/Web/UI/WebControls/TDataGrid.php

Spacing +169 added lines, -169 removed lines

@@ -224,10 +224,10 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TDataGridColumn)
+		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
 	}
 
 	/**
@@ -235,7 +235,7 @@ 
 	 */
 	public function getColumns()
 	{
-		if(!$this->_columns)
+		if (!$this->_columns)
 			$this->_columns = new TDataGridColumnCollection($this);
 		return $this->_columns;
 	}
@@ -245,7 +245,7 @@ 
 	 */
 	public function getAutoColumns()
 	{
-		if(!$this->_autoColumns)
+		if (!$this->_autoColumns)
 			$this->_autoColumns = new TDataGridColumnCollection($this);
 		return $this->_autoColumns;
 	}
@@ -255,7 +255,7 @@ 
 	 */
 	public function getItems()
 	{
-		if(!$this->_items)
+		if (!$this->_items)
 			$this->_items = new TDataGridItemCollection;
 		return $this->_items;
 	}
@@ -265,7 +265,7 @@ 
 	 */
 	public function getItemCount()
 	{
-		return $this->_items?$this->_items->getCount():0;
+		return $this->_items ? $this->_items->getCount() : 0;
 	}
 
 	/**
@@ -299,7 +299,7 @@ 
 	 */
 	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);
@@ -312,7 +312,7 @@ 
 	 */
 	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);
@@ -325,7 +325,7 @@ 
 	 */
 	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);
@@ -338,7 +338,7 @@ 
 	 */
 	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);
@@ -351,7 +351,7 @@ 
 	 */
 	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);
@@ -364,7 +364,7 @@ 
 	 */
 	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);
@@ -377,7 +377,7 @@ 
 	 */
 	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);
@@ -391,7 +391,7 @@ 
 	 */
 	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);
@@ -405,7 +405,7 @@ 
 	 */
 	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);
@@ -419,7 +419,7 @@ 
 	 */
 	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);
@@ -498,7 +498,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;
@@ -522,23 +522,23 @@ 
 	 */
 	public function setSelectedItemIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			$value = -1;
-		if(($current = $this->getSelectedItemIndex()) !== $value)
+		if (($current = $this->getSelectedItemIndex()) !== $value)
 		{
 			$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);
+				if ($item->getItemType() !== TListItemType::EditItem)
+					$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)
+				if ($item->getItemType() !== TListItemType::EditItem)
 					$item->setItemType(TListItemType::SelectedItem);
 			}
 		}
@@ -551,7 +551,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;
@@ -574,16 +574,16 @@ 
 	 */
 	public function setEditItemIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			$value = -1;
-		if(($current = $this->getEditItemIndex()) !== $value)
+		if (($current = $this->getEditItemIndex()) !== $value)
 		{
 			$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);
 		}
 	}
@@ -666,7 +666,7 @@ 
 	 */
 	public function setEmptyTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
+		if ($value instanceof ITemplate || $value === null)
 			$this->_emptyTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('datagrid_template_required', 'EmptyTemplate');
@@ -687,51 +687,51 @@ 
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		if($param instanceof TDataGridCommandEventParameter)
+		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;
 			}
-			elseif(strcasecmp($command, self::CMD_EDIT) === 0)
+			elseif (strcasecmp($command, self::CMD_EDIT) === 0)
 			{
 				$this->onEditCommand($param);
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_DELETE) === 0)
+			elseif (strcasecmp($command, self::CMD_DELETE) === 0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_UPDATE) === 0)
+			elseif (strcasecmp($command, self::CMD_UPDATE) === 0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_CANCEL) === 0)
+			elseif (strcasecmp($command, self::CMD_CANCEL) === 0)
 			{
 				$this->onCancelCommand($param);
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_SORT) === 0)
+			elseif (strcasecmp($command, self::CMD_SORT) === 0)
 			{
 				$this->onSortCommand(new TDataGridSortCommandEventParameter($sender, $param));
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_PAGE) === 0)
+			elseif (strcasecmp($command, self::CMD_PAGE) === 0)
 			{
 				$p = $param->getCommandParameter();
-				if(strcasecmp($p, self::CMD_PAGE_NEXT) === 0)
+				if (strcasecmp($p, self::CMD_PAGE_NEXT) === 0)
 					$pageIndex = $this->getCurrentPageIndex() + 1;
-				elseif(strcasecmp($p, self::CMD_PAGE_PREV) === 0)
+				elseif (strcasecmp($p, self::CMD_PAGE_PREV) === 0)
 					$pageIndex = $this->getCurrentPageIndex() - 1;
-				elseif(strcasecmp($p, self::CMD_PAGE_FIRST) === 0)
+				elseif (strcasecmp($p, self::CMD_PAGE_FIRST) === 0)
 					$pageIndex = 0;
-				elseif(strcasecmp($p, self::CMD_PAGE_LAST) === 0)
+				elseif (strcasecmp($p, self::CMD_PAGE_LAST) === 0)
 					$pageIndex = $this->getPageCount() - 1;
 				else
 					$pageIndex = TPropertyValue::ensureInteger($p) - 1;
@@ -857,25 +857,25 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		if(!$this->getEnableViewState(true))
+		if (!$this->getEnableViewState(true))
 			return;
-		if($this->_items)
+		if ($this->_items)
 			$this->setViewState('ItemCount', $this->_items->getCount(), 0);
 		else
 			$this->clearViewState('ItemCount');
-		if($this->_autoColumns)
+		if ($this->_autoColumns)
 		{
 			$state = [];
-			foreach($this->_autoColumns as $column)
+			foreach ($this->_autoColumns as $column)
 				$state[] = $column->saveState();
 			$this->setViewState('AutoColumns', $state, []);
 		}
 		else
 			$this->clearViewState('AutoColumns');
-		if($this->_columns)
+		if ($this->_columns)
 		{
 			$state = [];
-			foreach($this->_columns as $column)
+			foreach ($this->_columns as $column)
 				$state[] = $column->saveState();
 			$this->setViewState('Columns', $state, []);
 		}
@@ -890,15 +890,15 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		if(!$this->getEnableViewState(true))
+		if (!$this->getEnableViewState(true))
 			return;
-		if(!$this->getIsDataBound())
+		if (!$this->getIsDataBound())
 		{
 			$state = $this->getViewState('AutoColumns', []);
-			if(!empty($state))
+			if (!empty($state))
 			{
 				$this->_autoColumns = new TDataGridColumnCollection($this);
-				foreach($state as $st)
+				foreach ($state as $st)
 				{
 					$column = new $this->AutoGenerateColumnName;
 					$column->loadState($st);
@@ -908,10 +908,10 @@ 
 			else
 				$this->_autoColumns = null;
 			$state = $this->getViewState('Columns', []);
-			if($this->_columns && $this->_columns->getCount() === count($state))
+			if ($this->_columns && $this->_columns->getCount() === count($state))
 			{
 				$i = 0;
-				foreach($this->_columns as $column)
+				foreach ($this->_columns as $column)
 				{
 					$column->loadState($state[$i]);
 					$i++;
@@ -953,39 +953,39 @@ 
 
 		$items = $this->getItems();
 
-		if($columns->getCount())
+		if ($columns->getCount())
 		{
-			foreach($columns as $column)
+			foreach ($columns as $column)
 				$column->initialize();
 			$selectedIndex = $this->getSelectedItemIndex();
 			$editIndex = $this->getEditItemIndex();
-			for($index = 0;$index < $itemCount;++$index)
+			for ($index = 0; $index < $itemCount; ++$index)
 			{
-				if($index === 0)
+				if ($index === 0)
 				{
-					if($allowPaging)
+					if ($allowPaging)
 						$this->_topPager = $this->createPager();
 					$this->_header = $this->createItemInternal(-1, -1, TListItemType::Header, false, null, $columns);
 				}
-				if($index === $editIndex)
+				if ($index === $editIndex)
 					$itemType = TListItemType::EditItem;
-				elseif($index === $selectedIndex)
+				elseif ($index === $selectedIndex)
 					$itemType = TListItemType::SelectedItem;
-				elseif($index % 2)
+				elseif ($index % 2)
 					$itemType = TListItemType::AlternatingItem;
 				else
 					$itemType = TListItemType::Item;
 				$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);
-				if($allowPaging)
+				if ($allowPaging)
 					$this->_bottomPager = $this->createPager();
 			}
 		}
-		if(!$dsIndex && $this->_emptyTemplate !== null)
+		if (!$dsIndex && $this->_emptyTemplate !== null)
 		{
 			$this->_useEmptyTemplate = true;
 			$this->_emptyTemplate->instantiateIn($this);
@@ -1006,7 +1006,7 @@ 
 		$keyField = $this->getDataKeyField();
 
 		// get all columns
-		if($this->getAutoGenerateColumns())
+		if ($this->getAutoGenerateColumns())
 		{
 			$columns = new TList($this->getColumns());
 			$autoColumns = $this->createAutoColumns($data);
@@ -1020,32 +1020,32 @@ 
 
 		$index = 0;
 		$allowPaging = $this->getAllowPaging() && ($data instanceof TPagedDataSource);
-		$dsIndex = $allowPaging?$data->getFirstIndexInPage():0;
+		$dsIndex = $allowPaging ? $data->getFirstIndexInPage() : 0;
 		$this->setViewState('DataSourceIndex', $dsIndex, 0);
-		if($columns->getCount())
+		if ($columns->getCount())
 		{
-			foreach($columns as $column)
+			foreach ($columns as $column)
 				$column->initialize();
 
 			$selectedIndex = $this->getSelectedItemIndex();
 			$editIndex = $this->getEditItemIndex();
-			foreach($data as $key => $row)
+			foreach ($data as $key => $row)
 			{
-				if($keyField !== '')
+				if ($keyField !== '')
 					$keys->add($this->getDataFieldValue($row, $keyField));
 				else
 					$keys->add($key);
-				if($index === 0)
+				if ($index === 0)
 				{
-					if($allowPaging)
+					if ($allowPaging)
 						$this->_topPager = $this->createPager();
 					$this->_header = $this->createItemInternal(-1, -1, TListItemType::Header, true, null, $columns);
 				}
-				if($index === $editIndex)
+				if ($index === $editIndex)
 					$itemType = TListItemType::EditItem;
-				elseif($index === $selectedIndex)
+				elseif ($index === $selectedIndex)
 					$itemType = TListItemType::SelectedItem;
-				elseif($index % 2)
+				elseif ($index % 2)
 					$itemType = TListItemType::AlternatingItem;
 				else
 					$itemType = TListItemType::Item;
@@ -1053,15 +1053,15 @@ 
 				$index++;
 				$dsIndex++;
 			}
-			if($index > 0)
+			if ($index > 0)
 			{
 				$this->_footer = $this->createItemInternal(-1, -1, TListItemType::Footer, true, null, $columns);
-				if($allowPaging)
+				if ($allowPaging)
 					$this->_bottomPager = $this->createPager();
 			}
 		}
 		$this->setViewState('ItemCount', $index, 0);
-		if(!$dsIndex && $this->_emptyTemplate !== null)
+		if (!$dsIndex && $this->_emptyTemplate !== null)
 		{
 			$this->_useEmptyTemplate = true;
 			$this->_emptyTemplate->instantiateIn($this);
@@ -1075,37 +1075,37 @@ 
 	 */
 	private function groupCells()
 	{
-		if(($columns = $this->_allColumns) === null)
+		if (($columns = $this->_allColumns) === null)
 			return;
 		$items = $this->getItems();
-		foreach($columns as $id => $column)
+		foreach ($columns as $id => $column)
 		{
-			if(!$column->getEnableCellGrouping())
+			if (!$column->getEnableCellGrouping())
 				continue;
 			$prevCell = null;
 			$prevCellText = null;
-			foreach($items as $item)
+			foreach ($items as $item)
 			{
 				$itemType = $item->getItemType();
 				$cell = $item->getCells()->itemAt($id);
-				if(!$cell->getVisible())
+				if (!$cell->getVisible())
 					continue;
-				if($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem)
+				if ($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem)
 				{
-					if(($cellText = $this->getCellText($cell)) === '')
+					if (($cellText = $this->getCellText($cell)) === '')
 					{
 						$prevCell = null;
 						$prevCellText = null;
 						continue;
 					}
-					if($prevCell === null || $prevCellText !== $cellText)
+					if ($prevCell === null || $prevCellText !== $cellText)
 					{
 						$prevCell = $cell;
 						$prevCellText = $cellText;
 					}
 					else
 					{
-						if(($rowSpan = $prevCell->getRowSpan()) === 0)
+						if (($rowSpan = $prevCell->getRowSpan()) === 0)
 							$rowSpan = 1;
 						$prevCell->setRowSpan($rowSpan + 1);
 						$cell->setVisible(false);
@@ -1117,12 +1117,12 @@ 
 
 	private function getCellText($cell)
 	{
-		if(($data = $cell->getText()) === '' && $cell->getHasControls())
+		if (($data = $cell->getText()) === '' && $cell->getHasControls())
 		{
 			$controls = $cell->getControls();
-			foreach($controls as $control)
+			foreach ($controls as $control)
 			{
-				if($control instanceof \Prado\IDataRenderer)
+				if ($control instanceof \Prado\IDataRenderer)
 					return $control->getData();
 			}
 		}
@@ -1145,7 +1145,7 @@ 
 		$item = $this->createItem($itemIndex, $dataSourceIndex, $itemType);
 		$this->initializeItem($item, $columns);
 		$param = new TDataGridItemEventParameter($item);
-		if($dataBind)
+		if ($dataBind)
 		{
 			$item->setData($dataItem);
 			$this->onItemCreated($param);
@@ -1171,13 +1171,13 @@ 
 		$cells = $item->getCells();
 		$itemType = $item->getItemType();
 		$index = 0;
-		foreach($columns as $column)
+		foreach ($columns as $column)
 		{
-			if($itemType === TListItemType::Header)
+			if ($itemType === TListItemType::Header)
 				$cell = new TTableHeaderCell;
 			else
 				$cell = new TTableCell;
-			if(($id = $column->getID()) !== '')
+			if (($id = $column->getID()) !== '')
 				$item->registerObject($id, $cell);
 			$cells->add($cell);
 			$column->initializeCell($cell, $index, $itemType);
@@ -1200,7 +1200,7 @@ 
 	 */
 	protected function buildPager($pager)
 	{
-		switch($this->getPagerStyle()->getMode())
+		switch ($this->getPagerStyle()->getMode())
 		{
 			case TDataGridPagerMode::NextPrev:
 				$this->buildNextPrevPager($pager);
@@ -1226,9 +1226,9 @@ 
 	 */
 	protected function createPagerButton($pager, $buttonType, $enabled, $text, $commandName, $commandParameter)
 	{
-		if($buttonType === TDataGridPagerButtonType::LinkButton)
+		if ($buttonType === TDataGridPagerButtonType::LinkButton)
 		{
-			if($enabled)
+			if ($enabled)
 				$button = new TLinkButton;
 			else
 			{
@@ -1240,7 +1240,7 @@ 
 		else
 		{
 			$button = new TButton;
-			if(!$enabled)
+			if (!$enabled)
 				$button->setEnabled(false);
 		}
 		$button->setText($text);
@@ -1260,9 +1260,9 @@ 
 		$buttonType = $style->getButtonType();
 		$controls = $pager->getControls();
 		$currentPageIndex = $this->getCurrentPageIndex();
-		if($currentPageIndex === 0)
+		if ($currentPageIndex === 0)
 		{
-			if(($text = $style->getFirstPageText()) !== '')
+			if (($text = $style->getFirstPageText()) !== '')
 			{
 				$label = $this->createPagerButton($pager, $buttonType, false, $text, '', '');
 				$controls->add($label);
@@ -1274,7 +1274,7 @@ 
 		}
 		else
 		{
-			if(($text = $style->getFirstPageText()) !== '')
+			if (($text = $style->getFirstPageText()) !== '')
 			{
 				$button = $this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_FIRST);
 				$controls->add($button);
@@ -1285,11 +1285,11 @@ 
 			$controls->add($button);
 		}
 		$controls->add("\n");
-		if($currentPageIndex === $this->getPageCount() - 1)
+		if ($currentPageIndex === $this->getPageCount() - 1)
 		{
 			$label = $this->createPagerButton($pager, $buttonType, false, $style->getNextPageText(), '', '');
 			$controls->add($label);
-			if(($text = $style->getLastPageText()) !== '')
+			if (($text = $style->getLastPageText()) !== '')
 			{
 				$controls->add("\n");
 				$label = $this->createPagerButton($pager, $buttonType, false, $text, '', '');
@@ -1300,7 +1300,7 @@ 
 		{
 			$button = $this->createPagerButton($pager, $buttonType, true, $style->getNextPageText(), self::CMD_PAGE, self::CMD_PAGE_NEXT);
 			$controls->add($button);
-			if(($text = $style->getLastPageText()) !== '')
+			if (($text = $style->getLastPageText()) !== '')
 			{
 				$controls->add("\n");
 				$button = $this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_LAST);
@@ -1321,24 +1321,24 @@ 
 		$pageCount = $this->getPageCount();
 		$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()) !== '')
+			if (($text = $style->getFirstPageText()) !== '')
 			{
 				$button = $this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_FIRST);
 				$controls->add($button);
@@ -1350,9 +1350,9 @@ 
 			$controls->add("\n");
 		}
 
-		for($i = $startPageIndex;$i <= $endPageIndex;++$i)
+		for ($i = $startPageIndex; $i <= $endPageIndex; ++$i)
 		{
-			if($i === $pageIndex)
+			if ($i === $pageIndex)
 			{
 				$label = $this->createPagerButton($pager, $buttonType, false, "$i", '', '');
 				$controls->add($label);
@@ -1362,17 +1362,17 @@ 
 				$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");
 			$controls->add($button);
-			if(($text = $style->getLastPageText()) !== '')
+			if (($text = $style->getLastPageText()) !== '')
 			{
 				$controls->add("\n");
 				$button = $this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_LAST);
@@ -1388,16 +1388,16 @@ 
 	 */
 	protected function createAutoColumns($dataSource)
 	{
-		if(!$dataSource)
+		if (!$dataSource)
 			return null;
 		$autoColumns = $this->getAutoColumns();
 		$autoColumns->clear();
-		foreach($dataSource as $row)
+		foreach ($dataSource as $row)
 		{
-			foreach($row as $key => $value)
+			foreach ($row as $key => $value)
 			{
 				$column = new $this->AutoGenerateColumnName;
-				if(is_string($key))
+				if (is_string($key))
 				{
 					$column->setHeaderText($key);
 					$column->setDataField($key);
@@ -1433,9 +1433,9 @@ 
 		$itemStyle = $this->getViewState('ItemStyle', null);
 
 		$alternatingItemStyle = $this->getViewState('AlternatingItemStyle', null);
-		if($itemStyle !== null)
+		if ($itemStyle !== null)
 		{
-			if($alternatingItemStyle === null)
+			if ($alternatingItemStyle === null)
 				$alternatingItemStyle = $itemStyle;
 			else
 				$alternatingItemStyle->mergeWith($itemStyle);
@@ -1444,9 +1444,9 @@ 
 		$selectedItemStyle = $this->getViewState('SelectedItemStyle', null);
 
 		$editItemStyle = $this->getViewState('EditItemStyle', null);
-		if($selectedItemStyle !== null)
+		if ($selectedItemStyle !== null)
 		{
-			if($editItemStyle === null)
+			if ($editItemStyle === null)
 				$editItemStyle = $selectedItemStyle;
 			else
 				$editItemStyle->mergeWith($selectedItemStyle);
@@ -1457,77 +1457,77 @@ 
 		$pagerStyle = $this->getViewState('PagerStyle', null);
 		$separatorStyle = $this->getViewState('SeparatorStyle', null);
 
-		foreach($this->getControls() as $index => $item)
+		foreach ($this->getControls() as $index => $item)
 		{
-			if(!($item instanceof TDataGridItem) && !($item instanceof TDataGridPager))
+			if (!($item instanceof TDataGridItem) && !($item instanceof TDataGridPager))
 				continue;
 			$itemType = $item->getItemType();
-			switch($itemType)
+			switch ($itemType)
 			{
 				case TListItemType::Header:
-					if($headerStyle)
+					if ($headerStyle)
 						$item->getStyle()->mergeWith($headerStyle);
-					if(!$this->getShowHeader())
+					if (!$this->getShowHeader())
 						$item->setVisible(false);
 					break;
 				case TListItemType::Footer:
-					if($footerStyle)
+					if ($footerStyle)
 						$item->getStyle()->mergeWith($footerStyle);
-					if(!$this->getShowFooter())
+					if (!$this->getShowFooter())
 						$item->setVisible(false);
 					break;
 				case TListItemType::Separator:
-					if($separatorStyle)
+					if ($separatorStyle)
 						$item->getStyle()->mergeWith($separatorStyle);
 					break;
 				case TListItemType::Item:
-					if($itemStyle)
+					if ($itemStyle)
 						$item->getStyle()->mergeWith($itemStyle);
 					break;
 				case TListItemType::AlternatingItem:
-					if($alternatingItemStyle)
+					if ($alternatingItemStyle)
 						$item->getStyle()->mergeWith($alternatingItemStyle);
 					break;
 				case TListItemType::SelectedItem:
-					if($selectedItemStyle)
+					if ($selectedItemStyle)
 						$item->getStyle()->mergeWith($selectedItemStyle);
-					if($index % 2 == 1)
+					if ($index % 2 == 1)
 					{
-						if($itemStyle)
+						if ($itemStyle)
 							$item->getStyle()->mergeWith($itemStyle);
 					}
 					else
 					{
-						if($alternatingItemStyle)
+						if ($alternatingItemStyle)
 							$item->getStyle()->mergeWith($alternatingItemStyle);
 					}
 					break;
 				case TListItemType::EditItem:
-					if($editItemStyle)
+					if ($editItemStyle)
 						$item->getStyle()->mergeWith($editItemStyle);
-					if($index % 2 == 1)
+					if ($index % 2 == 1)
 					{
-						if($itemStyle)
+						if ($itemStyle)
 							$item->getStyle()->mergeWith($itemStyle);
 					}
 					else
 					{
-						if($alternatingItemStyle)
+						if ($alternatingItemStyle)
 							$item->getStyle()->mergeWith($alternatingItemStyle);
 					}
 					break;
 				case TListItemType::Pager:
-					if($pagerStyle)
+					if ($pagerStyle)
 					{
 						$item->getStyle()->mergeWith($pagerStyle);
-						if($index === 0)
+						if ($index === 0)
 						{
-							if($pagerStyle->getPosition() === TDataGridPagerPosition::Bottom || !$pagerStyle->getVisible())
+							if ($pagerStyle->getPosition() === TDataGridPagerPosition::Bottom || !$pagerStyle->getVisible())
 								$item->setVisible(false);
 						}
 						else
 						{
-							if($pagerStyle->getPosition() === TDataGridPagerPosition::Top || !$pagerStyle->getVisible())
+							if ($pagerStyle->getPosition() === TDataGridPagerPosition::Top || !$pagerStyle->getVisible())
 								$item->setVisible(false);
 						}
 					}
@@ -1535,25 +1535,25 @@ 
 				default:
 					break;
 			}
-			if($this->_columns && $itemType !== TListItemType::Pager)
+			if ($this->_columns && $itemType !== TListItemType::Pager)
 			{
 				$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);
-					if(!$column->getVisible())
+					if (!$column->getVisible())
 						$cell->setVisible(false);
 					else
 					{
-						if($itemType === TListItemType::Header)
+						if ($itemType === TListItemType::Header)
 							$style = $column->getHeaderStyle(false);
-						elseif($itemType === TListItemType::Footer)
+						elseif ($itemType === TListItemType::Footer)
 							$style = $column->getFooterStyle(false);
 						else
 							$style = $column->getItemStyle(false);
-						if($style !== null)
+						if ($style !== null)
 							$cell->getStyle()->mergeWith($style);
 					}
 				}
@@ -1568,9 +1568,9 @@ 
 	public function renderBeginTag($writer)
 	{
 		parent::renderBeginTag($writer);
-		if(($caption = $this->getCaption()) !== '')
+		if (($caption = $this->getCaption()) !== '')
 		{
-			if(($align = $this->getCaptionAlign()) !== TTableCaptionAlign::NotSet)
+			if (($align = $this->getCaptionAlign()) !== TTableCaptionAlign::NotSet)
 				$writer->addAttribute('align', strtolower($align));
 			$writer->renderBeginTag('caption');
 			$writer->write($caption);
@@ -1584,30 +1584,30 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
 			$this->groupCells();
-			if($this->_useEmptyTemplate)
+			if ($this->_useEmptyTemplate)
 			{
 				$control = new TWebControl;
 				$control->setID($this->getClientID());
 				$control->copyBaseAttributes($this);
-				if($this->getHasStyle())
+				if ($this->getHasStyle())
 					$control->getStyle()->copyFrom($this->getStyle());
 				$control->renderBeginTag($writer);
 				$this->renderContents($writer);
 				$control->renderEndTag($writer);
 			}
-			elseif($this->getViewState('ItemCount', 0) > 0)
+			elseif ($this->getViewState('ItemCount', 0) > 0)
 			{
 				$this->applyItemStyles();
-				if($this->_topPager)
+				if ($this->_topPager)
 				{
 					$this->_topPager->renderControl($writer);
 					$writer->writeLine();
 				}
 				$this->renderTable($writer);
-				if($this->_bottomPager)
+				if ($this->_bottomPager)
 				{
 					$writer->writeLine();
 					$this->_bottomPager->renderControl($writer);
@@ -1623,27 +1623,27 @@ 
 	protected function renderTable($writer)
 	{
 		$this->renderBeginTag($writer);
-		if($this->_header && $this->_header->getVisible())
+		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)
+		foreach ($this->getItems() as $item)
 			$item->renderControl($writer);
 		$writer->renderEndTag();
 
-		if($this->_footer && $this->_footer->getVisible())
+		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);

Braces +272 added lines, -222 removed lines

@@ -224,10 +224,12 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TDataGridColumn)
-			$this->getColumns()->add($object);
-		else
-			parent::addParsedObject($object);  // this is needed by EmptyTemplate
+		if($object instanceof TDataGridColumn) {
+					$this->getColumns()->add($object);
+		} else {
+					parent::addParsedObject($object);
+		}
+		// this is needed by EmptyTemplate
 	}
 
 	/**
@@ -235,8 +237,9 @@ 
 	 */
 	public function getColumns()
 	{
-		if(!$this->_columns)
-			$this->_columns = new TDataGridColumnCollection($this);
+		if(!$this->_columns) {
+					$this->_columns = new TDataGridColumnCollection($this);
+		}
 		return $this->_columns;
 	}
 
@@ -245,8 +248,9 @@ 
 	 */
 	public function getAutoColumns()
 	{
-		if(!$this->_autoColumns)
-			$this->_autoColumns = new TDataGridColumnCollection($this);
+		if(!$this->_autoColumns) {
+					$this->_autoColumns = new TDataGridColumnCollection($this);
+		}
 		return $this->_autoColumns;
 	}
 
@@ -255,8 +259,9 @@ 
 	 */
 	public function getItems()
 	{
-		if(!$this->_items)
-			$this->_items = new TDataGridItemCollection;
+		if(!$this->_items) {
+					$this->_items = new TDataGridItemCollection;
+		}
 		return $this->_items;
 	}
 
@@ -498,10 +503,11 @@ 
 	{
 		$index = $this->getSelectedItemIndex();
 		$items = $this->getItems();
-		if($index >= 0 && $index < $items->getCount())
-			return $items->itemAt($index);
-		else
-			return null;
+		if($index >= 0 && $index < $items->getCount()) {
+					return $items->itemAt($index);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -522,8 +528,9 @@ 
 	 */
 	public function setSelectedItemIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					$value = -1;
+		}
 		if(($current = $this->getSelectedItemIndex()) !== $value)
 		{
 			$this->setViewState('SelectedItemIndex', $value, -1);
@@ -532,14 +539,16 @@ 
 			if($current >= 0 && $current < $itemCount)
 			{
 				$item = $items->itemAt($current);
-				if($item->getItemType() !== TListItemType::EditItem)
-					$item->setItemType($current % 2?TListItemType::AlternatingItem:TListItemType::Item);
+				if($item->getItemType() !== TListItemType::EditItem) {
+									$item->setItemType($current % 2?TListItemType::AlternatingItem:TListItemType::Item);
+				}
 			}
 			if($value >= 0 && $value < $itemCount)
 			{
 				$item = $items->itemAt($value);
-				if($item->getItemType() !== TListItemType::EditItem)
-					$item->setItemType(TListItemType::SelectedItem);
+				if($item->getItemType() !== TListItemType::EditItem) {
+									$item->setItemType(TListItemType::SelectedItem);
+				}
 			}
 		}
 	}
@@ -551,10 +560,11 @@ 
 	{
 		$index = $this->getEditItemIndex();
 		$items = $this->getItems();
-		if($index >= 0 && $index < $items->getCount())
-			return $items->itemAt($index);
-		else
-			return null;
+		if($index >= 0 && $index < $items->getCount()) {
+					return $items->itemAt($index);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -574,17 +584,20 @@ 
 	 */
 	public function setEditItemIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					$value = -1;
+		}
 		if(($current = $this->getEditItemIndex()) !== $value)
 		{
 			$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)
-				$items->itemAt($value)->setItemType(TListItemType::EditItem);
+			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);
+			}
 		}
 	}
 
@@ -666,10 +679,11 @@ 
 	 */
 	public function setEmptyTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
-			$this->_emptyTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('datagrid_template_required', 'EmptyTemplate');
+		if($value instanceof ITemplate || $value === null) {
+					$this->_emptyTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('datagrid_template_required', 'EmptyTemplate');
+		}
 	}
 
 	/**
@@ -696,45 +710,40 @@ 
 				$this->setSelectedItemIndex($param->getItem()->getItemIndex());
 				$this->onSelectedIndexChanged($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_EDIT) === 0)
+			} elseif(strcasecmp($command, self::CMD_EDIT) === 0)
 			{
 				$this->onEditCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_DELETE) === 0)
+			} elseif(strcasecmp($command, self::CMD_DELETE) === 0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_UPDATE) === 0)
+			} elseif(strcasecmp($command, self::CMD_UPDATE) === 0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_CANCEL) === 0)
+			} elseif(strcasecmp($command, self::CMD_CANCEL) === 0)
 			{
 				$this->onCancelCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_SORT) === 0)
+			} elseif(strcasecmp($command, self::CMD_SORT) === 0)
 			{
 				$this->onSortCommand(new TDataGridSortCommandEventParameter($sender, $param));
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_PAGE) === 0)
+			} elseif(strcasecmp($command, self::CMD_PAGE) === 0)
 			{
 				$p = $param->getCommandParameter();
-				if(strcasecmp($p, self::CMD_PAGE_NEXT) === 0)
-					$pageIndex = $this->getCurrentPageIndex() + 1;
-				elseif(strcasecmp($p, self::CMD_PAGE_PREV) === 0)
-					$pageIndex = $this->getCurrentPageIndex() - 1;
-				elseif(strcasecmp($p, self::CMD_PAGE_FIRST) === 0)
-					$pageIndex = 0;
-				elseif(strcasecmp($p, self::CMD_PAGE_LAST) === 0)
-					$pageIndex = $this->getPageCount() - 1;
-				else
-					$pageIndex = TPropertyValue::ensureInteger($p) - 1;
+				if(strcasecmp($p, self::CMD_PAGE_NEXT) === 0) {
+									$pageIndex = $this->getCurrentPageIndex() + 1;
+				} elseif(strcasecmp($p, self::CMD_PAGE_PREV) === 0) {
+									$pageIndex = $this->getCurrentPageIndex() - 1;
+				} elseif(strcasecmp($p, self::CMD_PAGE_FIRST) === 0) {
+									$pageIndex = 0;
+				} elseif(strcasecmp($p, self::CMD_PAGE_LAST) === 0) {
+									$pageIndex = $this->getPageCount() - 1;
+				} else {
+									$pageIndex = TPropertyValue::ensureInteger($p) - 1;
+				}
 				$this->onPageIndexChanged(new TDataGridPageChangedEventParameter($sender, $pageIndex));
 				return true;
 			}
@@ -857,30 +866,34 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		if(!$this->getEnableViewState(true))
-			return;
-		if($this->_items)
-			$this->setViewState('ItemCount', $this->_items->getCount(), 0);
-		else
-			$this->clearViewState('ItemCount');
+		if(!$this->getEnableViewState(true)) {
+					return;
+		}
+		if($this->_items) {
+					$this->setViewState('ItemCount', $this->_items->getCount(), 0);
+		} else {
+					$this->clearViewState('ItemCount');
+		}
 		if($this->_autoColumns)
 		{
 			$state = [];
-			foreach($this->_autoColumns as $column)
-				$state[] = $column->saveState();
+			foreach($this->_autoColumns as $column) {
+							$state[] = $column->saveState();
+			}
 			$this->setViewState('AutoColumns', $state, []);
+		} else {
+					$this->clearViewState('AutoColumns');
 		}
-		else
-			$this->clearViewState('AutoColumns');
 		if($this->_columns)
 		{
 			$state = [];
-			foreach($this->_columns as $column)
-				$state[] = $column->saveState();
+			foreach($this->_columns as $column) {
+							$state[] = $column->saveState();
+			}
 			$this->setViewState('Columns', $state, []);
+		} else {
+					$this->clearViewState('Columns');
 		}
-		else
-			$this->clearViewState('Columns');
 	}
 
 	/**
@@ -890,8 +903,9 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		if(!$this->getEnableViewState(true))
-			return;
+		if(!$this->getEnableViewState(true)) {
+					return;
+		}
 		if(!$this->getIsDataBound())
 		{
 			$state = $this->getViewState('AutoColumns', []);
@@ -904,9 +918,9 @@ 
 					$column->loadState($st);
 					$this->_autoColumns->add($column);
 				}
+			} else {
+							$this->_autoColumns = null;
 			}
-			else
-				$this->_autoColumns = null;
 			$state = $this->getViewState('Columns', []);
 			if($this->_columns && $this->_columns->getCount() === count($state))
 			{
@@ -955,34 +969,38 @@ 
 
 		if($columns->getCount())
 		{
-			foreach($columns as $column)
-				$column->initialize();
+			foreach($columns as $column) {
+							$column->initialize();
+			}
 			$selectedIndex = $this->getSelectedItemIndex();
 			$editIndex = $this->getEditItemIndex();
 			for($index = 0;$index < $itemCount;++$index)
 			{
 				if($index === 0)
 				{
-					if($allowPaging)
-						$this->_topPager = $this->createPager();
+					if($allowPaging) {
+											$this->_topPager = $this->createPager();
+					}
 					$this->_header = $this->createItemInternal(-1, -1, TListItemType::Header, false, null, $columns);
 				}
-				if($index === $editIndex)
-					$itemType = TListItemType::EditItem;
-				elseif($index === $selectedIndex)
-					$itemType = TListItemType::SelectedItem;
-				elseif($index % 2)
-					$itemType = TListItemType::AlternatingItem;
-				else
-					$itemType = TListItemType::Item;
+				if($index === $editIndex) {
+									$itemType = TListItemType::EditItem;
+				} elseif($index === $selectedIndex) {
+									$itemType = TListItemType::SelectedItem;
+				} elseif($index % 2) {
+									$itemType = TListItemType::AlternatingItem;
+				} else {
+									$itemType = TListItemType::Item;
+				}
 				$items->add($this->createItemInternal($index, $dsIndex, $itemType, false, null, $columns));
 				$dsIndex++;
 			}
 			if($index > 0)
 			{
 				$this->_footer = $this->createItemInternal(-1, -1, TListItemType::Footer, false, null, $columns);
-				if($allowPaging)
-					$this->_bottomPager = $this->createPager();
+				if($allowPaging) {
+									$this->_bottomPager = $this->createPager();
+				}
 			}
 		}
 		if(!$dsIndex && $this->_emptyTemplate !== null)
@@ -1011,9 +1029,9 @@ 
 			$columns = new TList($this->getColumns());
 			$autoColumns = $this->createAutoColumns($data);
 			$columns->mergeWith($autoColumns);
+		} else {
+					$columns = $this->getColumns();
 		}
-		else
-			$columns = $this->getColumns();
 		$this->_allColumns = $columns;
 
 		$items = $this->getItems();
@@ -1024,31 +1042,35 @@ 
 		$this->setViewState('DataSourceIndex', $dsIndex, 0);
 		if($columns->getCount())
 		{
-			foreach($columns as $column)
-				$column->initialize();
+			foreach($columns as $column) {
+							$column->initialize();
+			}
 
 			$selectedIndex = $this->getSelectedItemIndex();
 			$editIndex = $this->getEditItemIndex();
 			foreach($data as $key => $row)
 			{
-				if($keyField !== '')
-					$keys->add($this->getDataFieldValue($row, $keyField));
-				else
-					$keys->add($key);
+				if($keyField !== '') {
+									$keys->add($this->getDataFieldValue($row, $keyField));
+				} else {
+									$keys->add($key);
+				}
 				if($index === 0)
 				{
-					if($allowPaging)
-						$this->_topPager = $this->createPager();
+					if($allowPaging) {
+											$this->_topPager = $this->createPager();
+					}
 					$this->_header = $this->createItemInternal(-1, -1, TListItemType::Header, true, null, $columns);
 				}
-				if($index === $editIndex)
-					$itemType = TListItemType::EditItem;
-				elseif($index === $selectedIndex)
-					$itemType = TListItemType::SelectedItem;
-				elseif($index % 2)
-					$itemType = TListItemType::AlternatingItem;
-				else
-					$itemType = TListItemType::Item;
+				if($index === $editIndex) {
+									$itemType = TListItemType::EditItem;
+				} elseif($index === $selectedIndex) {
+									$itemType = TListItemType::SelectedItem;
+				} elseif($index % 2) {
+									$itemType = TListItemType::AlternatingItem;
+				} else {
+									$itemType = TListItemType::Item;
+				}
 				$items->add($this->createItemInternal($index, $dsIndex, $itemType, true, $row, $columns));
 				$index++;
 				$dsIndex++;
@@ -1056,8 +1078,9 @@ 
 			if($index > 0)
 			{
 				$this->_footer = $this->createItemInternal(-1, -1, TListItemType::Footer, true, null, $columns);
-				if($allowPaging)
-					$this->_bottomPager = $this->createPager();
+				if($allowPaging) {
+									$this->_bottomPager = $this->createPager();
+				}
 			}
 		}
 		$this->setViewState('ItemCount', $index, 0);
@@ -1075,21 +1098,24 @@ 
 	 */
 	private function groupCells()
 	{
-		if(($columns = $this->_allColumns) === null)
-			return;
+		if(($columns = $this->_allColumns) === null) {
+					return;
+		}
 		$items = $this->getItems();
 		foreach($columns as $id => $column)
 		{
-			if(!$column->getEnableCellGrouping())
-				continue;
+			if(!$column->getEnableCellGrouping()) {
+							continue;
+			}
 			$prevCell = null;
 			$prevCellText = null;
 			foreach($items as $item)
 			{
 				$itemType = $item->getItemType();
 				$cell = $item->getCells()->itemAt($id);
-				if(!$cell->getVisible())
-					continue;
+				if(!$cell->getVisible()) {
+									continue;
+				}
 				if($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem)
 				{
 					if(($cellText = $this->getCellText($cell)) === '')
@@ -1102,11 +1128,11 @@ 
 					{
 						$prevCell = $cell;
 						$prevCellText = $cellText;
-					}
-					else
+					} else
 					{
-						if(($rowSpan = $prevCell->getRowSpan()) === 0)
-							$rowSpan = 1;
+						if(($rowSpan = $prevCell->getRowSpan()) === 0) {
+													$rowSpan = 1;
+						}
 						$prevCell->setRowSpan($rowSpan + 1);
 						$cell->setVisible(false);
 					}
@@ -1122,8 +1148,9 @@ 
 			$controls = $cell->getControls();
 			foreach($controls as $control)
 			{
-				if($control instanceof \Prado\IDataRenderer)
-					return $control->getData();
+				if($control instanceof \Prado\IDataRenderer) {
+									return $control->getData();
+				}
 			}
 		}
 		return $data;
@@ -1152,8 +1179,7 @@ 
 			$this->getControls()->add($item);
 			$item->dataBind();
 			$this->onItemDataBound($param);
-		}
-		else
+		} else
 		{
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
@@ -1173,12 +1199,14 @@ 
 		$index = 0;
 		foreach($columns as $column)
 		{
-			if($itemType === TListItemType::Header)
-				$cell = new TTableHeaderCell;
-			else
-				$cell = new TTableCell;
-			if(($id = $column->getID()) !== '')
-				$item->registerObject($id, $cell);
+			if($itemType === TListItemType::Header) {
+							$cell = new TTableHeaderCell;
+			} else {
+							$cell = new TTableCell;
+			}
+			if(($id = $column->getID()) !== '') {
+							$item->registerObject($id, $cell);
+			}
 			$cells->add($cell);
 			$column->initializeCell($cell, $index, $itemType);
 			$index++;
@@ -1228,20 +1256,20 @@ 
 	{
 		if($buttonType === TDataGridPagerButtonType::LinkButton)
 		{
-			if($enabled)
-				$button = new TLinkButton;
-			else
+			if($enabled) {
+							$button = new TLinkButton;
+			} else
 			{
 				$button = new TLabel;
 				$button->setText($text);
 				return $button;
 			}
-		}
-		else
+		} else
 		{
 			$button = new TButton;
-			if(!$enabled)
-				$button->setEnabled(false);
+			if(!$enabled) {
+							$button->setEnabled(false);
+			}
 		}
 		$button->setText($text);
 		$button->setCommandName($commandName);
@@ -1271,8 +1299,7 @@ 
 
 			$label = $this->createPagerButton($pager, $buttonType, false, $style->getPrevPageText(), '', '');
 			$controls->add($label);
-		}
-		else
+		} else
 		{
 			if(($text = $style->getFirstPageText()) !== '')
 			{
@@ -1295,8 +1322,7 @@ 
 				$label = $this->createPagerButton($pager, $buttonType, false, $text, '', '');
 				$controls->add($label);
 			}
-		}
-		else
+		} else
 		{
 			$button = $this->createPagerButton($pager, $buttonType, true, $style->getNextPageText(), self::CMD_PAGE, self::CMD_PAGE_NEXT);
 			$controls->add($button);
@@ -1327,12 +1353,14 @@ 
 		if($pageIndex > $endPageIndex)
 		{
 			$startPageIndex = ((int)(($pageIndex - 1) / $maxButtonCount)) * $maxButtonCount + 1;
-			if(($endPageIndex = $startPageIndex + $maxButtonCount - 1) > $pageCount)
-				$endPageIndex = $pageCount;
+			if(($endPageIndex = $startPageIndex + $maxButtonCount - 1) > $pageCount) {
+							$endPageIndex = $pageCount;
+			}
 			if($endPageIndex - $startPageIndex + 1 < $maxButtonCount)
 			{
-				if(($startPageIndex = $endPageIndex - $maxButtonCount + 1) < 1)
-					$startPageIndex = 1;
+				if(($startPageIndex = $endPageIndex - $maxButtonCount + 1) < 1) {
+									$startPageIndex = 1;
+				}
 			}
 		}
 
@@ -1356,14 +1384,14 @@ 
 			{
 				$label = $this->createPagerButton($pager, $buttonType, false, "$i", '', '');
 				$controls->add($label);
-			}
-			else
+			} else
 			{
 				$button = $this->createPagerButton($pager, $buttonType, true, "$i", self::CMD_PAGE, "$i");
 				$controls->add($button);
 			}
-			if($i < $endPageIndex)
-				$controls->add("\n");
+			if($i < $endPageIndex) {
+							$controls->add("\n");
+			}
 		}
 
 		if($pageCount > $endPageIndex)
@@ -1388,8 +1416,9 @@ 
 	 */
 	protected function createAutoColumns($dataSource)
 	{
-		if(!$dataSource)
-			return null;
+		if(!$dataSource) {
+					return null;
+		}
 		$autoColumns = $this->getAutoColumns();
 		$autoColumns->clear();
 		foreach($dataSource as $row)
@@ -1403,8 +1432,7 @@ 
 					$column->setDataField($key);
 					$column->setSortExpression($key);
 					$autoColumns->add($column);
-				}
-				else
+				} else
 				{
 					$column->setHeaderText(TListItemType::Item);
 					$column->setDataField($key);
@@ -1435,10 +1463,11 @@ 
 		$alternatingItemStyle = $this->getViewState('AlternatingItemStyle', null);
 		if($itemStyle !== null)
 		{
-			if($alternatingItemStyle === null)
-				$alternatingItemStyle = $itemStyle;
-			else
-				$alternatingItemStyle->mergeWith($itemStyle);
+			if($alternatingItemStyle === null) {
+							$alternatingItemStyle = $itemStyle;
+			} else {
+							$alternatingItemStyle->mergeWith($itemStyle);
+			}
 		}
 
 		$selectedItemStyle = $this->getViewState('SelectedItemStyle', null);
@@ -1446,10 +1475,11 @@ 
 		$editItemStyle = $this->getViewState('EditItemStyle', null);
 		if($selectedItemStyle !== null)
 		{
-			if($editItemStyle === null)
-				$editItemStyle = $selectedItemStyle;
-			else
-				$editItemStyle->mergeWith($selectedItemStyle);
+			if($editItemStyle === null) {
+							$editItemStyle = $selectedItemStyle;
+			} else {
+							$editItemStyle->mergeWith($selectedItemStyle);
+			}
 		}
 
 		$headerStyle = $this->getViewState('HeaderStyle', null);
@@ -1459,61 +1489,73 @@ 
 
 		foreach($this->getControls() as $index => $item)
 		{
-			if(!($item instanceof TDataGridItem) && !($item instanceof TDataGridPager))
-				continue;
+			if(!($item instanceof TDataGridItem) && !($item instanceof TDataGridPager)) {
+							continue;
+			}
 			$itemType = $item->getItemType();
 			switch($itemType)
 			{
 				case TListItemType::Header:
-					if($headerStyle)
-						$item->getStyle()->mergeWith($headerStyle);
-					if(!$this->getShowHeader())
-						$item->setVisible(false);
+					if($headerStyle) {
+											$item->getStyle()->mergeWith($headerStyle);
+					}
+					if(!$this->getShowHeader()) {
+											$item->setVisible(false);
+					}
 					break;
 				case TListItemType::Footer:
-					if($footerStyle)
-						$item->getStyle()->mergeWith($footerStyle);
-					if(!$this->getShowFooter())
-						$item->setVisible(false);
+					if($footerStyle) {
+											$item->getStyle()->mergeWith($footerStyle);
+					}
+					if(!$this->getShowFooter()) {
+											$item->setVisible(false);
+					}
 					break;
 				case TListItemType::Separator:
-					if($separatorStyle)
-						$item->getStyle()->mergeWith($separatorStyle);
+					if($separatorStyle) {
+											$item->getStyle()->mergeWith($separatorStyle);
+					}
 					break;
 				case TListItemType::Item:
-					if($itemStyle)
-						$item->getStyle()->mergeWith($itemStyle);
+					if($itemStyle) {
+											$item->getStyle()->mergeWith($itemStyle);
+					}
 					break;
 				case TListItemType::AlternatingItem:
-					if($alternatingItemStyle)
-						$item->getStyle()->mergeWith($alternatingItemStyle);
+					if($alternatingItemStyle) {
+											$item->getStyle()->mergeWith($alternatingItemStyle);
+					}
 					break;
 				case TListItemType::SelectedItem:
-					if($selectedItemStyle)
-						$item->getStyle()->mergeWith($selectedItemStyle);
+					if($selectedItemStyle) {
+											$item->getStyle()->mergeWith($selectedItemStyle);
+					}
 					if($index % 2 == 1)
 					{
-						if($itemStyle)
-							$item->getStyle()->mergeWith($itemStyle);
-					}
-					else
+						if($itemStyle) {
+													$item->getStyle()->mergeWith($itemStyle);
+						}
+					} else
 					{
-						if($alternatingItemStyle)
-							$item->getStyle()->mergeWith($alternatingItemStyle);
+						if($alternatingItemStyle) {
+													$item->getStyle()->mergeWith($alternatingItemStyle);
+						}
 					}
 					break;
 				case TListItemType::EditItem:
-					if($editItemStyle)
-						$item->getStyle()->mergeWith($editItemStyle);
+					if($editItemStyle) {
+											$item->getStyle()->mergeWith($editItemStyle);
+					}
 					if($index % 2 == 1)
 					{
-						if($itemStyle)
-							$item->getStyle()->mergeWith($itemStyle);
-					}
-					else
+						if($itemStyle) {
+													$item->getStyle()->mergeWith($itemStyle);
+						}
+					} else
 					{
-						if($alternatingItemStyle)
-							$item->getStyle()->mergeWith($alternatingItemStyle);
+						if($alternatingItemStyle) {
+													$item->getStyle()->mergeWith($alternatingItemStyle);
+						}
 					}
 					break;
 				case TListItemType::Pager:
@@ -1522,13 +1564,14 @@ 
 						$item->getStyle()->mergeWith($pagerStyle);
 						if($index === 0)
 						{
-							if($pagerStyle->getPosition() === TDataGridPagerPosition::Bottom || !$pagerStyle->getVisible())
-								$item->setVisible(false);
-						}
-						else
+							if($pagerStyle->getPosition() === TDataGridPagerPosition::Bottom || !$pagerStyle->getVisible()) {
+															$item->setVisible(false);
+							}
+						} else
 						{
-							if($pagerStyle->getPosition() === TDataGridPagerPosition::Top || !$pagerStyle->getVisible())
-								$item->setVisible(false);
+							if($pagerStyle->getPosition() === TDataGridPagerPosition::Top || !$pagerStyle->getVisible()) {
+															$item->setVisible(false);
+							}
 						}
 					}
 					break;
@@ -1543,18 +1586,20 @@ 
 				{
 					$cell = $cells->itemAt($i);
 					$column = $this->_columns->itemAt($i);
-					if(!$column->getVisible())
-						$cell->setVisible(false);
-					else
+					if(!$column->getVisible()) {
+											$cell->setVisible(false);
+					} else
 					{
-						if($itemType === TListItemType::Header)
-							$style = $column->getHeaderStyle(false);
-						elseif($itemType === TListItemType::Footer)
-							$style = $column->getFooterStyle(false);
-						else
-							$style = $column->getItemStyle(false);
-						if($style !== null)
-							$cell->getStyle()->mergeWith($style);
+						if($itemType === TListItemType::Header) {
+													$style = $column->getHeaderStyle(false);
+						} elseif($itemType === TListItemType::Footer) {
+													$style = $column->getFooterStyle(false);
+						} else {
+													$style = $column->getItemStyle(false);
+						}
+						if($style !== null) {
+													$cell->getStyle()->mergeWith($style);
+						}
 					}
 				}
 			}
@@ -1570,8 +1615,9 @@ 
 		parent::renderBeginTag($writer);
 		if(($caption = $this->getCaption()) !== '')
 		{
-			if(($align = $this->getCaptionAlign()) !== TTableCaptionAlign::NotSet)
-				$writer->addAttribute('align', strtolower($align));
+			if(($align = $this->getCaptionAlign()) !== TTableCaptionAlign::NotSet) {
+							$writer->addAttribute('align', strtolower($align));
+			}
 			$writer->renderBeginTag('caption');
 			$writer->write($caption);
 			$writer->renderEndTag();
@@ -1592,13 +1638,13 @@ 
 				$control = new TWebControl;
 				$control->setID($this->getClientID());
 				$control->copyBaseAttributes($this);
-				if($this->getHasStyle())
-					$control->getStyle()->copyFrom($this->getStyle());
+				if($this->getHasStyle()) {
+									$control->getStyle()->copyFrom($this->getStyle());
+				}
 				$control->renderBeginTag($writer);
 				$this->renderContents($writer);
 				$control->renderEndTag($writer);
-			}
-			elseif($this->getViewState('ItemCount', 0) > 0)
+			} elseif($this->getViewState('ItemCount', 0) > 0)
 			{
 				$this->applyItemStyles();
 				if($this->_topPager)
@@ -1626,25 +1672,29 @@ 
 		if($this->_header && $this->_header->getVisible())
 		{
 			$writer->writeLine();
-			if($style = $this->getViewState('TableHeadStyle', null))
-				$style->addAttributesToRender($writer);
+			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))
-			$style->addAttributesToRender($writer);
+		if($style = $this->getViewState('TableBodyStyle', null)) {
+					$style->addAttributesToRender($writer);
+		}
 		$writer->renderBeginTag('tbody');
-		foreach($this->getItems() as $item)
-			$item->renderControl($writer);
+		foreach($this->getItems() as $item) {
+					$item->renderControl($writer);
+		}
 		$writer->renderEndTag();
 
 		if($this->_footer && $this->_footer->getVisible())
 		{
 			$writer->writeLine();
-			if($style = $this->getViewState('TableFootStyle', null))
-				$style->addAttributesToRender($writer);
+			if($style = $this->getViewState('TableFootStyle', null)) {
+							$style->addAttributesToRender($writer);
+			}
 			$writer->renderBeginTag('tfoot');
 			$this->_footer->render($writer);
 			$writer->renderEndTag();

framework/Web/UI/WebControls/TCompareValidator.php

Spacing +12 added lines, -12 removed lines

@@ -151,21 +151,21 @@ 
 	 */
 	public function evaluateIsValid()
 	{
-		if(($value = $this->getValidationValue($this->getValidationTarget())) === '')
+		if (($value = $this->getValidationValue($this->getValidationTarget())) === '')
 			return true;
 
-		if(($controlToCompare = $this->getControlToCompare()) !== '')
+		if (($controlToCompare = $this->getControlToCompare()) !== '')
 		{
-			if(($control2 = $this->findControl($controlToCompare)) === null)
+			if (($control2 = $this->findControl($controlToCompare)) === null)
 				throw new TInvalidDataValueException('comparevalidator_controltocompare_invalid');
-			if(($value2 = $this->getValidationValue($control2)) === '')
+			if (($value2 = $this->getValidationValue($control2)) === '')
 				return false;
 		}
 		else
 			$value2 = $this->getValueToCompare();
 
 		$values = $this->getComparisonValues($value, $value2);
-		switch($this->getOperator())
+		switch ($this->getOperator())
 		{
 			case TValidationCompareOperator::Equal:
 				return $values[0] == $values[1];
@@ -192,7 +192,7 @@ 
 	 */
 	protected function getComparisonValues($value1, $value2)
 	{
-		switch($this->getDataType())
+		switch ($this->getDataType())
 		{
 			case TValidationDataType::Integer:
 				return [intval($value1), intval($value2)];
@@ -200,7 +200,7 @@ 
 				return [floatval($value1), floatval($value2)];
 			case TValidationDataType::Date:
 				$dateFormat = $this->getDateFormat();
-				if($dateFormat !== '')
+				if ($dateFormat !== '')
 				{
 					$formatter = new TSimpleDateFormatter($dateFormat);
 					return [$formatter->parse($value1), $formatter->parse($value2)];
@@ -218,17 +218,17 @@ 
 	protected function getClientScriptOptions()
 	{
 		$options = parent::getClientScriptOptions();
-		if(($name = $this->getControlToCompare()) !== '')
+		if (($name = $this->getControlToCompare()) !== '')
 		{
-			if(($control = $this->findControl($name)) !== null)
+			if (($control = $this->findControl($name)) !== null)
 				$options['ControlToCompare'] = $control->getClientID();
 		}
-		if(($value = $this->getValueToCompare()) !== '')
+		if (($value = $this->getValueToCompare()) !== '')
 			$options['ValueToCompare'] = $value;
-		if(($operator = $this->getOperator()) !== TValidationCompareOperator::Equal)
+		if (($operator = $this->getOperator()) !== TValidationCompareOperator::Equal)
 			$options['Operator'] = $operator;
 		$options['DataType'] = $this->getDataType();
-		if(($dateFormat = $this->getDateFormat()) !== '')
+		if (($dateFormat = $this->getDateFormat()) !== '')
 			$options['DateFormat'] = $dateFormat;
 		return $options;
 	}

Braces +25 added lines, -18 removed lines

@@ -151,18 +151,21 @@ 
 	 */
 	public function evaluateIsValid()
 	{
-		if(($value = $this->getValidationValue($this->getValidationTarget())) === '')
-			return true;
+		if(($value = $this->getValidationValue($this->getValidationTarget())) === '') {
+					return true;
+		}
 
 		if(($controlToCompare = $this->getControlToCompare()) !== '')
 		{
-			if(($control2 = $this->findControl($controlToCompare)) === null)
-				throw new TInvalidDataValueException('comparevalidator_controltocompare_invalid');
-			if(($value2 = $this->getValidationValue($control2)) === '')
-				return false;
+			if(($control2 = $this->findControl($controlToCompare)) === null) {
+							throw new TInvalidDataValueException('comparevalidator_controltocompare_invalid');
+			}
+			if(($value2 = $this->getValidationValue($control2)) === '') {
+							return false;
+			}
+		} else {
+					$value2 = $this->getValueToCompare();
 		}
-		else
-			$value2 = $this->getValueToCompare();
 
 		$values = $this->getComparisonValues($value, $value2);
 		switch($this->getOperator())
@@ -204,9 +207,9 @@ 
 				{
 					$formatter = new TSimpleDateFormatter($dateFormat);
 					return [$formatter->parse($value1), $formatter->parse($value2)];
+				} else {
+									return [strtotime($value1), strtotime($value2)];
 				}
-				else
-					return [strtotime($value1), strtotime($value2)];
 		}
 		return [$value1, $value2];
 	}
@@ -220,16 +223,20 @@ 
 		$options = parent::getClientScriptOptions();
 		if(($name = $this->getControlToCompare()) !== '')
 		{
-			if(($control = $this->findControl($name)) !== null)
-				$options['ControlToCompare'] = $control->getClientID();
+			if(($control = $this->findControl($name)) !== null) {
+							$options['ControlToCompare'] = $control->getClientID();
+			}
+		}
+		if(($value = $this->getValueToCompare()) !== '') {
+					$options['ValueToCompare'] = $value;
+		}
+		if(($operator = $this->getOperator()) !== TValidationCompareOperator::Equal) {
+					$options['Operator'] = $operator;
 		}
-		if(($value = $this->getValueToCompare()) !== '')
-			$options['ValueToCompare'] = $value;
-		if(($operator = $this->getOperator()) !== TValidationCompareOperator::Equal)
-			$options['Operator'] = $operator;
 		$options['DataType'] = $this->getDataType();
-		if(($dateFormat = $this->getDateFormat()) !== '')
-			$options['DateFormat'] = $dateFormat;
+		if(($dateFormat = $this->getDateFormat()) !== '') {
+					$options['DateFormat'] = $dateFormat;
+		}
 		return $options;
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TTableCell.php

Spacing +7 added lines, -7 removed lines

@@ -59,7 +59,7 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getHorizontalAlign();
 		else
 			return 'NotSet';
@@ -80,7 +80,7 @@ 
 	 */
 	public function getVerticalAlign()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getVerticalAlign();
 		else
 			return 'NotSet';
@@ -135,7 +135,7 @@ 
 	 */
 	public function getWrap()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getWrap();
 		else
 			return true;
@@ -201,9 +201,9 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		if(($colspan = $this->getColumnSpan()) > 0)
+		if (($colspan = $this->getColumnSpan()) > 0)
 			$writer->addAttribute('colspan', "$colspan");
-		if(($rowspan = $this->getRowSpan()) > 0)
+		if (($rowspan = $this->getRowSpan()) > 0)
 			$writer->addAttribute('rowspan', "$rowspan");
 	}
 
@@ -213,9 +213,9 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) !== '')
+		if (($text = $this->getText()) !== '')
 			$writer->write($text);
-		elseif($this->getHasControls())
+		elseif ($this->getHasControls())
 			parent::renderContents($writer);
 		else
 			$writer->write(' ');

Braces +28 added lines, -22 removed lines

@@ -59,10 +59,11 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getHorizontalAlign();
-		else
-			return 'NotSet';
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getHorizontalAlign();
+		} else {
+					return 'NotSet';
+		}
 	}
 
 	/**
@@ -80,10 +81,11 @@ 
 	 */
 	public function getVerticalAlign()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getVerticalAlign();
-		else
-			return 'NotSet';
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getVerticalAlign();
+		} else {
+					return 'NotSet';
+		}
 	}
 
 	/**
@@ -135,10 +137,11 @@ 
 	 */
 	public function getWrap()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getWrap();
-		else
-			return true;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getWrap();
+		} else {
+					return true;
+		}
 	}
 
 	/**
@@ -201,10 +204,12 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		if(($colspan = $this->getColumnSpan()) > 0)
-			$writer->addAttribute('colspan', "$colspan");
-		if(($rowspan = $this->getRowSpan()) > 0)
-			$writer->addAttribute('rowspan', "$rowspan");
+		if(($colspan = $this->getColumnSpan()) > 0) {
+					$writer->addAttribute('colspan', "$colspan");
+		}
+		if(($rowspan = $this->getRowSpan()) > 0) {
+					$writer->addAttribute('rowspan', "$rowspan");
+		}
 	}
 
 	/**
@@ -213,12 +218,13 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) !== '')
-			$writer->write($text);
-		elseif($this->getHasControls())
-			parent::renderContents($writer);
-		else
-			$writer->write(' ');
+		if(($text = $this->getText()) !== '') {
+					$writer->write($text);
+		} elseif($this->getHasControls()) {
+					parent::renderContents($writer);
+		} else {
+					$writer->write(' ');
+		}
 	}
 }
 

framework/Web/UI/WebControls/TTextHighlighterWriter.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	 */
 	public function write($str)
 	{
-		if($this->firstLine)
+		if ($this->firstLine)
 		{
 			$this->firstLine = false;
 			$this->_writer->write(THttpUtility::htmlEncode(ltrim($str)));

framework/Web/UI/WebControls/TOutputCache.php

Spacing +30 added lines, -30 removed lines

@@ -107,33 +107,33 @@ 
 
 	private function determineCacheability()
 	{
-		if(!$this->_cacheChecked)
+		if (!$this->_cacheChecked)
 		{
 			$this->_cacheChecked = true;
-			if($this->_duration > 0 && ($this->_cachePostBack || !$this->getPage()->getIsPostBack()))
+			if ($this->_duration > 0 && ($this->_cachePostBack || !$this->getPage()->getIsPostBack()))
 			{
-				if($this->_cacheModuleID !== '')
+				if ($this->_cacheModuleID !== '')
 				{
 					$this->_cache = $this->getApplication()->getModule($this->_cacheModuleID);
-					if(!($this->_cache instanceof ICache))
+					if (!($this->_cache instanceof ICache))
 						throw new TConfigurationException('outputcache_cachemoduleid_invalid', $this->_cacheModuleID);
 				}
 				else
 					$this->_cache = $this->getApplication()->getCache();
-				if($this->_cache !== null)
+				if ($this->_cache !== null)
 				{
 					$this->_cacheAvailable = true;
 					$data = $this->_cache->get($this->getCacheKey());
-					if(is_array($data))
+					if (is_array($data))
 					{
 						$param = new TOutputCacheCheckDependencyEventParameter;
-						$param->setCacheTime(isset($data[3])?$data[3]:0);
+						$param->setCacheTime(isset($data[3]) ? $data[3] : 0);
 						$this->onCheckDependency($param);
 						$this->_dataCached = $param->getIsValid();
 					}
 					else
 						$this->_dataCached = false;
-					if($this->_dataCached)
+					if ($this->_dataCached)
 						list($this->_contents, $this->_state, $this->_actions, $this->_cacheTime) = $data;
 				}
 			}
@@ -149,7 +149,7 @@ 
 	 */
 	protected function initRecursive($namingContainer = null)
 	{
-		if($this->_cacheAvailable && !$this->_dataCached)
+		if ($this->_cacheAvailable && !$this->_dataCached)
 		{
 			$stack = $this->getPage()->getCachingStack();
 			$stack->push($this);
@@ -170,7 +170,7 @@ 
 	 */
 	protected function loadRecursive()
 	{
-		if($this->_cacheAvailable && !$this->_dataCached)
+		if ($this->_cacheAvailable && !$this->_dataCached)
 		{
 			$stack = $this->getPage()->getCachingStack();
 			$stack->push($this);
@@ -179,7 +179,7 @@ 
 		}
 		else
 		{
-			if($this->_dataCached)
+			if ($this->_dataCached)
 				$this->performActions();
 			parent::loadRecursive();
 		}
@@ -189,14 +189,14 @@ 
 	{
 		$page = $this->getPage();
 		$cs = $page->getClientScript();
-		foreach($this->_actions as $action)
+		foreach ($this->_actions as $action)
 		{
-			if($action[0] === 'Page.ClientScript')
-				call_user_func_array([$cs,$action[1]], $action[2]);
-			elseif($action[0] === 'Page')
-				call_user_func_array([$page,$action[1]], $action[2]);
+			if ($action[0] === 'Page.ClientScript')
+				call_user_func_array([$cs, $action[1]], $action[2]);
+			elseif ($action[0] === 'Page')
+				call_user_func_array([$page, $action[1]], $action[2]);
 			else
-				call_user_func_array([$this->getSubProperty($action[0]),$action[1]], $action[2]);
+				call_user_func_array([$this->getSubProperty($action[0]), $action[1]], $action[2]);
 		}
 	}
 
@@ -209,7 +209,7 @@ 
 	 */
 	protected function preRenderRecursive()
 	{
-		if($this->_cacheAvailable && !$this->_dataCached)
+		if ($this->_cacheAvailable && !$this->_dataCached)
 		{
 			$stack = $this->getPage()->getCachingStack();
 			$stack->push($this);
@@ -244,7 +244,7 @@ 
 	 */
 	protected function &saveStateRecursive($needViewState = true)
 	{
-		if($this->_dataCached)
+		if ($this->_dataCached)
 			return $this->_state;
 		else
 		{
@@ -266,12 +266,12 @@ 
 	 */
 	public function registerAction($context, $funcName, $funcParams)
 	{
-		$this->_actions[] = [$context,$funcName,$funcParams];
+		$this->_actions[] = [$context, $funcName, $funcParams];
 	}
 
 	public function getCacheKey()
 	{
-		if($this->_cacheKey === null)
+		if ($this->_cacheKey === null)
 			$this->_cacheKey = $this->calculateCacheKey();
 		return $this->_cacheKey;
 	}
@@ -289,13 +289,13 @@ 
 	protected function calculateCacheKey()
 	{
 		$key = $this->getBaseCacheKey();
-		if($this->_varyBySession)
+		if ($this->_varyBySession)
 			$key .= $this->getSession()->getSessionID();
-		if($this->_varyByParam !== '')
+		if ($this->_varyByParam !== '')
 		{
 			$params = [];
 			$request = $this->getRequest();
-			foreach(explode(',', $this->_varyByParam) as $name)
+			foreach (explode(',', $this->_varyByParam) as $name)
 			{
 				$name = trim($name);
 				$params[$name] = $request->itemAt($name);
@@ -313,7 +313,7 @@ 
 	 */
 	protected function getBaseCacheKey()
 	{
-		return self::CACHE_ID_PREFIX . $this->_keyPrefix . $this->getPage()->getPagePath() . $this->getUniqueID();
+		return self::CACHE_ID_PREFIX.$this->_keyPrefix.$this->getPage()->getPagePath().$this->getUniqueID();
 	}
 
 	/**
@@ -387,7 +387,7 @@ 
 	 */
 	public function setDuration($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			throw new TInvalidDataValueException('outputcache_duration_invalid', get_class($this));
 		$this->_duration = $value;
 	}
@@ -481,12 +481,12 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->_dataCached)
+		if ($this->_dataCached)
 			$writer->write($this->_contents);
-		elseif($this->_cacheAvailable)
+		elseif ($this->_cacheAvailable)
 		{
 			$textwriter = new TTextWriter();
-			$multiwriter = new TOutputCacheTextWriterMulti([$writer->getWriter(),$textwriter]);
+			$multiwriter = new TOutputCacheTextWriterMulti([$writer->getWriter(), $textwriter]);
 			$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), $multiwriter);
 
 			$stack = $this->getPage()->getCachingStack();
@@ -495,7 +495,7 @@ 
 			$stack->pop();
 
 			$content = $textwriter->flush();
-			$data = [$content,$this->_state,$this->_actions,time()];
+			$data = [$content, $this->_state, $this->_actions, time()];
 			$this->_cache->set($this->getCacheKey(), $data, $this->getDuration(), $this->getCacheDependency());
 		}
 		else

Braces +42 added lines, -36 removed lines

@@ -115,11 +115,12 @@ 
 				if($this->_cacheModuleID !== '')
 				{
 					$this->_cache = $this->getApplication()->getModule($this->_cacheModuleID);
-					if(!($this->_cache instanceof ICache))
-						throw new TConfigurationException('outputcache_cachemoduleid_invalid', $this->_cacheModuleID);
+					if(!($this->_cache instanceof ICache)) {
+											throw new TConfigurationException('outputcache_cachemoduleid_invalid', $this->_cacheModuleID);
+					}
+				} else {
+									$this->_cache = $this->getApplication()->getCache();
 				}
-				else
-					$this->_cache = $this->getApplication()->getCache();
 				if($this->_cache !== null)
 				{
 					$this->_cacheAvailable = true;
@@ -130,11 +131,12 @@ 
 						$param->setCacheTime(isset($data[3])?$data[3]:0);
 						$this->onCheckDependency($param);
 						$this->_dataCached = $param->getIsValid();
+					} else {
+											$this->_dataCached = false;
+					}
+					if($this->_dataCached) {
+											list($this->_contents, $this->_state, $this->_actions, $this->_cacheTime) = $data;
 					}
-					else
-						$this->_dataCached = false;
-					if($this->_dataCached)
-						list($this->_contents, $this->_state, $this->_actions, $this->_cacheTime) = $data;
 				}
 			}
 		}
@@ -155,9 +157,9 @@ 
 			$stack->push($this);
 			parent::initRecursive($namingContainer);
 			$stack->pop();
+		} else {
+					parent::initRecursive($namingContainer);
 		}
-		else
-			parent::initRecursive($namingContainer);
 	}
 
 	/**
@@ -176,11 +178,11 @@ 
 			$stack->push($this);
 			parent::loadRecursive();
 			$stack->pop();
-		}
-		else
+		} else
 		{
-			if($this->_dataCached)
-				$this->performActions();
+			if($this->_dataCached) {
+							$this->performActions();
+			}
 			parent::loadRecursive();
 		}
 	}
@@ -191,12 +193,13 @@ 
 		$cs = $page->getClientScript();
 		foreach($this->_actions as $action)
 		{
-			if($action[0] === 'Page.ClientScript')
-				call_user_func_array([$cs,$action[1]], $action[2]);
-			elseif($action[0] === 'Page')
-				call_user_func_array([$page,$action[1]], $action[2]);
-			else
-				call_user_func_array([$this->getSubProperty($action[0]),$action[1]], $action[2]);
+			if($action[0] === 'Page.ClientScript') {
+							call_user_func_array([$cs,$action[1]], $action[2]);
+			} elseif($action[0] === 'Page') {
+							call_user_func_array([$page,$action[1]], $action[2]);
+			} else {
+							call_user_func_array([$this->getSubProperty($action[0]),$action[1]], $action[2]);
+			}
 		}
 	}
 
@@ -215,9 +218,9 @@ 
 			$stack->push($this);
 			parent::preRenderRecursive();
 			$stack->pop();
+		} else {
+					parent::preRenderRecursive();
 		}
-		else
-			parent::preRenderRecursive();
 	}
 
 	/**
@@ -244,9 +247,9 @@ 
 	 */
 	protected function &saveStateRecursive($needViewState = true)
 	{
-		if($this->_dataCached)
-			return $this->_state;
-		else
+		if($this->_dataCached) {
+					return $this->_state;
+		} else
 		{
 			$st = parent::saveStateRecursive($needViewState);
 			// serialization is needed to avoid undefined classes when loading state
@@ -271,8 +274,9 @@ 
 
 	public function getCacheKey()
 	{
-		if($this->_cacheKey === null)
-			$this->_cacheKey = $this->calculateCacheKey();
+		if($this->_cacheKey === null) {
+					$this->_cacheKey = $this->calculateCacheKey();
+		}
 		return $this->_cacheKey;
 	}
 
@@ -289,8 +293,9 @@ 
 	protected function calculateCacheKey()
 	{
 		$key = $this->getBaseCacheKey();
-		if($this->_varyBySession)
-			$key .= $this->getSession()->getSessionID();
+		if($this->_varyBySession) {
+					$key .= $this->getSession()->getSessionID();
+		}
 		if($this->_varyByParam !== '')
 		{
 			$params = [];
@@ -387,8 +392,9 @@ 
 	 */
 	public function setDuration($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			throw new TInvalidDataValueException('outputcache_duration_invalid', get_class($this));
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					throw new TInvalidDataValueException('outputcache_duration_invalid', get_class($this));
+		}
 		$this->_duration = $value;
 	}
 
@@ -481,9 +487,9 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->_dataCached)
-			$writer->write($this->_contents);
-		elseif($this->_cacheAvailable)
+		if($this->_dataCached) {
+					$writer->write($this->_contents);
+		} elseif($this->_cacheAvailable)
 		{
 			$textwriter = new TTextWriter();
 			$multiwriter = new TOutputCacheTextWriterMulti([$writer->getWriter(),$textwriter]);
@@ -497,8 +503,8 @@ 
 			$content = $textwriter->flush();
 			$data = [$content,$this->_state,$this->_actions,time()];
 			$this->_cache->set($this->getCacheKey(), $data, $this->getDuration(), $this->getCacheDependency());
+		} else {
+					parent::render($writer);
 		}
-		else
-			parent::render($writer);
 	}
 }
\ No newline at end of file

framework/Web/UI/TTemplateManager.php

Spacing +15 added lines, -15 removed lines

@@ -63,7 +63,7 @@ 
 	public function getTemplateByClassName($className)
 	{
 		$class = new \ReflectionClass($className);
-		$tplFile = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . $class->getShortName() . self::TEMPLATE_FILE_EXT;
+		$tplFile = dirname($class->getFileName()).DIRECTORY_SEPARATOR.$class->getShortName().self::TEMPLATE_FILE_EXT;
 		return $this->getTemplateByFileName($tplFile);
 	}
 
@@ -73,38 +73,38 @@ 
 	 */
 	public function getTemplateByFileName($fileName)
 	{
-		if(($fileName = $this->getLocalizedTemplate($fileName)) !== null)
+		if (($fileName = $this->getLocalizedTemplate($fileName)) !== null)
 		{
 			Prado::trace("Loading template $fileName", '\Prado\Web\UI\TTemplateManager');
-			if(($cache = $this->getApplication()->getCache()) === null)
+			if (($cache = $this->getApplication()->getCache()) === null)
 				return new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
 			else
 			{
-				$array = $cache->get(self::TEMPLATE_CACHE_PREFIX . $fileName);
-				if(is_array($array))
+				$array = $cache->get(self::TEMPLATE_CACHE_PREFIX.$fileName);
+				if (is_array($array))
 				{
 					list($template, $timestamps) = $array;
-					if($this->getApplication()->getMode() === TApplicationMode::Performance)
+					if ($this->getApplication()->getMode() === TApplicationMode::Performance)
 						return $template;
 					$cacheValid = true;
-					foreach($timestamps as $tplFile => $timestamp)
+					foreach ($timestamps as $tplFile => $timestamp)
 					{
-						if(!is_file($tplFile) || filemtime($tplFile) > $timestamp)
+						if (!is_file($tplFile) || filemtime($tplFile) > $timestamp)
 						{
 							$cacheValid = false;
 							break;
 						}
 					}
-					if($cacheValid)
+					if ($cacheValid)
 						return $template;
 				}
 				$template = new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
 				$includedFiles = $template->getIncludedFiles();
 				$timestamps = [];
 				$timestamps[$fileName] = filemtime($fileName);
-				foreach($includedFiles as $includedFile)
+				foreach ($includedFiles as $includedFile)
 					$timestamps[$includedFile] = filemtime($includedFile);
-				$cache->set(self::TEMPLATE_CACHE_PREFIX . $fileName, [$template,$timestamps]);
+				$cache->set(self::TEMPLATE_CACHE_PREFIX.$fileName, [$template, $timestamps]);
 				return $template;
 			}
 		}
@@ -119,11 +119,11 @@ 
 	 */
 	protected function getLocalizedTemplate($filename)
 	{
-		if(($app = $this->getApplication()->getGlobalization(false)) === null)
-			return is_file($filename)?$filename:null;
-		foreach($app->getLocalizedResource($filename) as $file)
+		if (($app = $this->getApplication()->getGlobalization(false)) === null)
+			return is_file($filename) ? $filename : null;
+		foreach ($app->getLocalizedResource($filename) as $file)
 		{
-			if(($file = realpath($file)) !== false && is_file($file))
+			if (($file = realpath($file)) !== false && is_file($file))
 				return $file;
 		}
 		return null;

Braces +20 added lines, -15 removed lines

@@ -76,16 +76,17 @@ 
 		if(($fileName = $this->getLocalizedTemplate($fileName)) !== null)
 		{
 			Prado::trace("Loading template $fileName", '\Prado\Web\UI\TTemplateManager');
-			if(($cache = $this->getApplication()->getCache()) === null)
-				return new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
-			else
+			if(($cache = $this->getApplication()->getCache()) === null) {
+							return new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
+			} else
 			{
 				$array = $cache->get(self::TEMPLATE_CACHE_PREFIX . $fileName);
 				if(is_array($array))
 				{
 					list($template, $timestamps) = $array;
-					if($this->getApplication()->getMode() === TApplicationMode::Performance)
-						return $template;
+					if($this->getApplication()->getMode() === TApplicationMode::Performance) {
+											return $template;
+					}
 					$cacheValid = true;
 					foreach($timestamps as $tplFile => $timestamp)
 					{
@@ -95,21 +96,23 @@ 
 							break;
 						}
 					}
-					if($cacheValid)
-						return $template;
+					if($cacheValid) {
+											return $template;
+					}
 				}
 				$template = new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
 				$includedFiles = $template->getIncludedFiles();
 				$timestamps = [];
 				$timestamps[$fileName] = filemtime($fileName);
-				foreach($includedFiles as $includedFile)
-					$timestamps[$includedFile] = filemtime($includedFile);
+				foreach($includedFiles as $includedFile) {
+									$timestamps[$includedFile] = filemtime($includedFile);
+				}
 				$cache->set(self::TEMPLATE_CACHE_PREFIX . $fileName, [$template,$timestamps]);
 				return $template;
 			}
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	/**
@@ -119,12 +122,14 @@ 
 	 */
 	protected function getLocalizedTemplate($filename)
 	{
-		if(($app = $this->getApplication()->getGlobalization(false)) === null)
-			return is_file($filename)?$filename:null;
+		if(($app = $this->getApplication()->getGlobalization(false)) === null) {
+					return is_file($filename)?$filename:null;
+		}
 		foreach($app->getLocalizedResource($filename) as $file)
 		{
-			if(($file = realpath($file)) !== false && is_file($file))
-				return $file;
+			if(($file = realpath($file)) !== false && is_file($file)) {
+							return $file;
+			}
 		}
 		return null;
 	}

framework/Web/UI/TPageStatePersister.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 	 */
 	public function load()
 	{
-		if(($data = TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState())) !== null)
+		if (($data = TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState())) !== null)
 			return $data;
 		else
 			throw new THttpException(400, 'pagestatepersister_pagestate_corrupted');

Braces +5 added lines, -4 removed lines

@@ -64,10 +64,11 @@
 	 */
 	public function load()
 	{
-		if(($data = TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState())) !== null)
-			return $data;
-		else
-			throw new THttpException(400, 'pagestatepersister_pagestate_corrupted');
+		if(($data = TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState())) !== null) {
+					return $data;
+		} else {
+					throw new THttpException(400, 'pagestatepersister_pagestate_corrupted');
+		}
 	}
 }
 

framework/Web/UI/TPage.php

Spacing +76 added lines, -76 removed lines

@@ -198,9 +198,9 @@ 
 
 		$this->determinePostBackMode();
 
-		if($this->getIsPostBack())
+		if ($this->getIsPostBack())
 		{
-			if($this->getIsCallback())
+			if ($this->getIsCallback())
 				$this->processCallbackRequest($writer);
 			else
 				$this->processPostBackRequest($writer);
@@ -292,13 +292,13 @@ 
 
 	protected static function decodeUTF8($data, $enc)
 	{
-		if(is_array($data))
+		if (is_array($data))
 		{
-			foreach($data as $k => $v)
+			foreach ($data as $k => $v)
 				$data[$k] = self::decodeUTF8($v, $enc);
 			return $data;
-		} elseif(is_string($data)) {
-			return iconv('UTF-8', $enc . '//IGNORE', $data);
+		} elseif (is_string($data)) {
+			return iconv('UTF-8', $enc.'//IGNORE', $data);
 		} else {
 			return $data;
 		}
@@ -313,8 +313,8 @@ 
 		$this->setAdapter(new TActivePageAdapter($this));
 
 		$callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
-		if(strlen($callbackEventParameter) > 0)
-			$this->_postData[TPage::FIELD_CALLBACK_PARAMETER] = TJavaScript::jsonDecode((string)$callbackEventParameter);
+		if (strlen($callbackEventParameter) > 0)
+			$this->_postData[TPage::FIELD_CALLBACK_PARAMETER] = TJavaScript::jsonDecode((string) $callbackEventParameter);
 
 		// Decode Callback postData from UTF-8 to current Charset
 		if (($g = $this->getApplication()->getGlobalization(false)) !== null &&
@@ -384,7 +384,7 @@ 
 	 */
 	public function getCallbackClient()
 	{
-		if($this->getAdapter() !== null)
+		if ($this->getAdapter() !== null)
 			return $this->getAdapter()->getCallbackClientHandler();
 		else
 			return new TCallbackClientScript();
@@ -450,7 +450,7 @@ 
 	 */
 	public function setForm(TForm $form)
 	{
-		if($this->_form === null)
+		if ($this->_form === null)
 			$this->_form = $form;
 		else
 			throw new TInvalidOperationException('page_form_duplicated');
@@ -464,15 +464,15 @@ 
 	 */
 	public function getValidators($validationGroup = null)
 	{
-		if(!$this->_validators)
+		if (!$this->_validators)
 			$this->_validators = new TList;
-		if(empty($validationGroup) === true)
+		if (empty($validationGroup) === true)
 			return $this->_validators;
 		else
 		{
 			$list = new TList;
-			foreach($this->_validators as $validator)
-				if($validator->getValidationGroup() === $validationGroup)
+			foreach ($this->_validators as $validator)
+				if ($validator->getValidationGroup() === $validationGroup)
 					$list->add($validator);
 			return $list;
 		}
@@ -488,18 +488,18 @@ 
 	{
 		Prado::trace("Page validate()", 'Prado\Web\UI\TPage');
 		$this->_validated = true;
-		if($this->_validators && $this->_validators->getCount())
+		if ($this->_validators && $this->_validators->getCount())
 		{
-			if($validationGroup === null)
+			if ($validationGroup === null)
 			{
-				foreach($this->_validators as $validator)
+				foreach ($this->_validators as $validator)
 					$validator->validate();
 			}
 			else
 			{
-				foreach($this->_validators as $validator)
+				foreach ($this->_validators as $validator)
 				{
-					if($validator->getValidationGroup() === $validationGroup)
+					if ($validator->getValidationGroup() === $validationGroup)
 						$validator->validate();
 				}
 			}
@@ -514,12 +514,12 @@ 
 	 */
 	public function getIsValid()
 	{
-		if($this->_validated)
+		if ($this->_validated)
 		{
-			if($this->_validators && $this->_validators->getCount())
+			if ($this->_validators && $this->_validators->getCount())
 			{
-				foreach($this->_validators as $validator)
-					if(!$validator->getIsValid())
+				foreach ($this->_validators as $validator)
+					if (!$validator->getIsValid())
 						return false;
 			}
 			return true;
@@ -533,7 +533,7 @@ 
 	 */
 	public function getTheme()
 	{
-		if(is_string($this->_theme))
+		if (is_string($this->_theme))
 			$this->_theme = $this->getService()->getThemeManager()->getTheme($this->_theme);
 		return $this->_theme;
 	}
@@ -544,7 +544,7 @@ 
 	 */
 	public function setTheme($value)
 	{
-		$this->_theme = empty($value)?null:$value;
+		$this->_theme = empty($value) ?null:$value;
 	}
 
 
@@ -553,7 +553,7 @@ 
 	 */
 	public function getStyleSheetTheme()
 	{
-		if(is_string($this->_styleSheet))
+		if (is_string($this->_styleSheet))
 			$this->_styleSheet = $this->getService()->getThemeManager()->getTheme($this->_styleSheet);
 		return $this->_styleSheet;
 	}
@@ -564,7 +564,7 @@ 
 	 */
 	public function setStyleSheetTheme($value)
 	{
-		$this->_styleSheet = empty($value)?null:$value;
+		$this->_styleSheet = empty($value) ?null:$value;
 	}
 
 	/**
@@ -574,7 +574,7 @@ 
 	 */
 	public function applyControlSkin($control)
 	{
-		if(($theme = $this->getTheme()) !== null)
+		if (($theme = $this->getTheme()) !== null)
 			$theme->applySkin($control);
 	}
 
@@ -585,7 +585,7 @@ 
 	 */
 	public function applyControlStyleSheet($control)
 	{
-		if(($theme = $this->getStyleSheetTheme()) !== null)
+		if (($theme = $this->getStyleSheetTheme()) !== null)
 			$theme->applySkin($control);
 	}
 
@@ -594,10 +594,10 @@ 
 	 */
 	public function getClientScript()
 	{
-		if(!$this->_clientScript) {
+		if (!$this->_clientScript) {
 			$className = $classPath = $this->getService()->getClientScriptManagerClass();
 
-			if($className !== '\Prado\Web\UI\TClientScriptManager' && !is_subclass_of($className, '\Prado\Web\UI\TClientScriptManager'))
+			if ($className !== '\Prado\Web\UI\TClientScriptManager' && !is_subclass_of($className, '\Prado\Web\UI\TClientScriptManager'))
 				throw new THttpException(404, 'page_csmanagerclass_invalid', $className);
 
 			$this->_clientScript = new $className($this);
@@ -671,23 +671,23 @@ 
 		$this->raiseEvent('OnPreRenderComplete', $this, $param);
 		$cs = $this->getClientScript();
 		$theme = $this->getTheme();
-		if($theme instanceof ITheme)
+		if ($theme instanceof ITheme)
 		{
-			foreach($theme->getStyleSheetFiles() as $url)
+			foreach ($theme->getStyleSheetFiles() as $url)
 				$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
-			foreach($theme->getJavaScriptFiles() as $url)
+			foreach ($theme->getJavaScriptFiles() as $url)
 				$cs->registerHeadScriptFile($url, $url);
 		}
 		$styleSheet = $this->getStyleSheetTheme();
-		if($styleSheet instanceof ITheme)
+		if ($styleSheet instanceof ITheme)
 		{
-			foreach($styleSheet->getStyleSheetFiles() as $url)
+			foreach ($styleSheet->getStyleSheetFiles() as $url)
 				$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
-			foreach($styleSheet->getJavaScriptFiles() as $url)
+			foreach ($styleSheet->getJavaScriptFiles() as $url)
 				$cs->registerHeadScriptFile($url, $url);
 		}
 
-		if($cs->getRequiresHead() && $this->getHead() === null)
+		if ($cs->getRequiresHead() && $this->getHead() === null)
 			throw new TConfigurationException('page_head_required');
 	}
 
@@ -702,7 +702,7 @@ 
 	private function getCssMediaType($url)
 	{
 		$segs = explode('.', basename($url));
-		if(isset($segs[2]))
+		if (isset($segs[2]))
 			return $segs[count($segs) - 2];
 		else
 			return '';
@@ -727,7 +727,7 @@ 
 	private function determinePostBackMode()
 	{
 		$postData = $this->getRequest();
-		if($postData->contains(self::FIELD_PAGESTATE) || $postData->contains(self::FIELD_POSTBACK_TARGET))
+		if ($postData->contains(self::FIELD_PAGESTATE) || $postData->contains(self::FIELD_POSTBACK_TARGET))
 			$this->_postData = $postData;
 	}
 
@@ -807,10 +807,10 @@ 
 	 */
 	public function registerRequiresPostData($control)
 	{
-		$id = is_string($control)?$control:$control->getUniqueID();
+		$id = is_string($control) ? $control : $control->getUniqueID();
 		$this->_controlsRegisteredForPostData[$id] = true;
 		$params = func_get_args();
-		foreach($this->getCachingStack() as $item)
+		foreach ($this->getCachingStack() as $item)
 			$item->registerAction('Page', 'registerRequiresPostData', [$id]);
 	}
 
@@ -819,10 +819,10 @@ 
 	 */
 	public function getPostBackEventTarget()
 	{
-		if($this->_postBackEventTarget === null && $this->_postData !== null)
+		if ($this->_postBackEventTarget === null && $this->_postData !== null)
 		{
 			$eventTarget = $this->_postData->itemAt(self::FIELD_POSTBACK_TARGET);
-			if(!empty($eventTarget))
+			if (!empty($eventTarget))
 				$this->_postBackEventTarget = $this->findControl($eventTarget);
 		}
 		return $this->_postBackEventTarget;
@@ -842,9 +842,9 @@ 
 	 */
 	public function getPostBackEventParameter()
 	{
-		if($this->_postBackEventParameter === null && $this->_postData !== null)
+		if ($this->_postBackEventParameter === null && $this->_postData !== null)
 		{
-			if(($this->_postBackEventParameter = $this->_postData->itemAt(self::FIELD_POSTBACK_PARAMETER)) === null)
+			if (($this->_postBackEventParameter = $this->_postData->itemAt(self::FIELD_POSTBACK_PARAMETER)) === null)
 				$this->_postBackEventParameter = '';
 		}
 		return $this->_postBackEventParameter;
@@ -866,37 +866,37 @@ 
 	protected function processPostData($postData, $beforeLoad)
 	{
 		$this->_isLoadingPostData = true;
-		if($beforeLoad)
+		if ($beforeLoad)
 			$this->_restPostData = new TMap;
-		foreach($postData as $key => $value)
+		foreach ($postData as $key => $value)
 		{
-			if($this->isSystemPostField($key))
+			if ($this->isSystemPostField($key))
 				continue;
-			elseif($control = $this->findControl($key))
+			elseif ($control = $this->findControl($key))
 			{
-				if($control instanceof \Prado\Web\UI\IPostBackDataHandler)
+				if ($control instanceof \Prado\Web\UI\IPostBackDataHandler)
 				{
-					if($control->loadPostData($key, $postData))
+					if ($control->loadPostData($key, $postData))
 						$this->_controlsPostDataChanged[] = $control;
 				}
-				elseif($control instanceof IPostBackEventHandler &&
+				elseif ($control instanceof IPostBackEventHandler &&
 					empty($this->_postData[self::FIELD_POSTBACK_TARGET]))
 				{
-					$this->_postData->add(self::FIELD_POSTBACK_TARGET, $key);  // not calling setPostBackEventTarget() because the control may be removed later
+					$this->_postData->add(self::FIELD_POSTBACK_TARGET, $key); // not calling setPostBackEventTarget() because the control may be removed later
 				}
 				unset($this->_controlsRequiringPostData[$key]);
 			}
-			elseif($beforeLoad)
+			elseif ($beforeLoad)
 				$this->_restPostData->add($key, $value);
 		}
 
-		foreach($this->_controlsRequiringPostData as $key => $value)
+		foreach ($this->_controlsRequiringPostData as $key => $value)
 		{
-			if($control = $this->findControl($key))
+			if ($control = $this->findControl($key))
 			{
-				if($control instanceof \Prado\Web\UI\IPostBackDataHandler)
+				if ($control instanceof \Prado\Web\UI\IPostBackDataHandler)
 				{
-					if($control->loadPostData($key, $this->_postData))
+					if ($control->loadPostData($key, $this->_postData))
 						$this->_controlsPostDataChanged[] = $control;
 				}
 				else
@@ -920,7 +920,7 @@ 
 	 */
 	protected function raiseChangedEvents()
 	{
-		foreach($this->_controlsPostDataChanged as $control)
+		foreach ($this->_controlsPostDataChanged as $control)
 			$control->raisePostDataChangedEvent();
 	}
 
@@ -929,9 +929,9 @@ 
 	 */
 	protected function raisePostBackEvent()
 	{
-		if(($postBackHandler = $this->getPostBackEventTarget()) === null)
+		if (($postBackHandler = $this->getPostBackEventTarget()) === null)
 			$this->validate();
-		elseif($postBackHandler instanceof IPostBackEventHandler)
+		elseif ($postBackHandler instanceof IPostBackEventHandler)
 			$postBackHandler->raisePostBackEvent($this->getPostBackEventParameter());
 	}
 
@@ -950,7 +950,7 @@ 
 	 */
 	public function ensureRenderInForm($control)
 	{
-		if(!$this->getIsCallback() && !$this->_inFormRender)
+		if (!$this->getIsCallback() && !$this->_inFormRender)
 			throw new TConfigurationException('page_control_outofform', get_class($control), $control ? $control->getUniqueID() : null);
 	}
 
@@ -959,7 +959,7 @@ 
 	 */
 	public function beginFormRender($writer)
 	{
-		if($this->_formRendered)
+		if ($this->_formRendered)
 			throw new TConfigurationException('page_form_duplicated');
 		$this->_formRendered = true;
 		$this->getClientScript()->registerHiddenField(self::FIELD_PAGESTATE, $this->getClientState());
@@ -971,15 +971,15 @@ 
 	 */
 	public function endFormRender($writer)
 	{
-		if($this->_focus)
+		if ($this->_focus)
 		{
-			if(($this->_focus instanceof TControl) && $this->_focus->getVisible(true))
+			if (($this->_focus instanceof TControl) && $this->_focus->getVisible(true))
 				$focus = $this->_focus->getClientID();
 			else
 				$focus = $this->_focus;
 			$this->getClientScript()->registerFocusControl($focus);
 		}
-		elseif($this->_postData && ($lastFocus = $this->_postData->itemAt(self::FIELD_LASTFOCUS)) !== null)
+		elseif ($this->_postData && ($lastFocus = $this->_postData->itemAt(self::FIELD_LASTFOCUS)) !== null)
 			$this->getClientScript()->registerFocusControl($lastFocus);
 		$this->_inFormRender = false;
 	}
@@ -1023,10 +1023,10 @@ 
 	 */
 	public function setHead(THead $value)
 	{
-		if($this->_head)
+		if ($this->_head)
 			throw new TInvalidOperationException('page_head_duplicated');
 		$this->_head = $value;
-		if($this->_title !== null)
+		if ($this->_title !== null)
 		{
 			$this->_head->setTitle($this->_title);
 			$this->_title = null;
@@ -1038,7 +1038,7 @@ 
 	 */
 	public function getTitle()
 	{
-		if($this->_head)
+		if ($this->_head)
 			return $this->_head->getTitle();
 		else
 			return $this->_title === null ? '' : $this->_title;
@@ -1052,7 +1052,7 @@ 
 	 */
 	public function setTitle($value)
 	{
-		if($this->_head)
+		if ($this->_head)
 			$this->_head->setTitle($value);
 		else
 			$this->_title = $value;
@@ -1107,10 +1107,10 @@ 
 	 */
 	public function getStatePersister()
 	{
-		if($this->_statePersister === null)
+		if ($this->_statePersister === null)
 		{
 			$this->_statePersister = Prado::createComponent($this->_statePersisterClass);
-			if(!($this->_statePersister instanceof IPageStatePersister))
+			if (!($this->_statePersister instanceof IPageStatePersister))
 				throw new TInvalidDataTypeException('page_statepersister_invalid');
 			$this->_statePersister->setPage($this);
 		}
@@ -1194,9 +1194,9 @@ 
 	 */
 	public function registerCachingAction($context, $funcName, $funcParams)
 	{
-		if($this->_cachingStack)
+		if ($this->_cachingStack)
 		{
-			foreach($this->_cachingStack as $cache)
+			foreach ($this->_cachingStack as $cache)
 				$cache->registerAction($context, $funcName, $funcParams);
 		}
 	}
@@ -1206,7 +1206,7 @@ 
 	 */
 	public function getCachingStack()
 	{
-		if(!$this->_cachingStack)
+		if (!$this->_cachingStack)
 			$this->_cachingStack = new TStack;
 		return $this->_cachingStack;
 	}

Braces +157 added lines, -118 removed lines

@@ -200,13 +200,14 @@ 
 
 		if($this->getIsPostBack())
 		{
-			if($this->getIsCallback())
-				$this->processCallbackRequest($writer);
-			else
-				$this->processPostBackRequest($writer);
+			if($this->getIsCallback()) {
+							$this->processCallbackRequest($writer);
+			} else {
+							$this->processPostBackRequest($writer);
+			}
+		} else {
+					$this->processNormalRequest($writer);
 		}
-		else
-			$this->processNormalRequest($writer);
 
 		$this->_writer = null;
 	}
@@ -294,8 +295,9 @@ 
 	{
 		if(is_array($data))
 		{
-			foreach($data as $k => $v)
-				$data[$k] = self::decodeUTF8($v, $enc);
+			foreach($data as $k => $v) {
+							$data[$k] = self::decodeUTF8($v, $enc);
+			}
 			return $data;
 		} elseif(is_string($data)) {
 			return iconv('UTF-8', $enc . '//IGNORE', $data);
@@ -313,14 +315,16 @@ 
 		$this->setAdapter(new TActivePageAdapter($this));
 
 		$callbackEventParameter = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
-		if(strlen($callbackEventParameter) > 0)
-			$this->_postData[TPage::FIELD_CALLBACK_PARAMETER] = TJavaScript::jsonDecode((string)$callbackEventParameter);
+		if(strlen($callbackEventParameter) > 0) {
+					$this->_postData[TPage::FIELD_CALLBACK_PARAMETER] = TJavaScript::jsonDecode((string)$callbackEventParameter);
+		}
 
 		// Decode Callback postData from UTF-8 to current Charset
 		if (($g = $this->getApplication()->getGlobalization(false)) !== null &&
-			strtoupper($enc = $g->getCharset()) != 'UTF-8')
-				foreach ($this->_postData as $k => $v)
+			strtoupper($enc = $g->getCharset()) != 'UTF-8') {
+						foreach ($this->_postData as $k => $v)
 					$this->_postData[$k] = self::decodeUTF8($v, $enc);
+		}
 
 		Prado::trace("Page onPreInit()", 'Prado\Web\UI\TPage');
 		$this->onPreInit(null);
@@ -384,10 +388,11 @@ 
 	 */
 	public function getCallbackClient()
 	{
-		if($this->getAdapter() !== null)
-			return $this->getAdapter()->getCallbackClientHandler();
-		else
-			return new TCallbackClientScript();
+		if($this->getAdapter() !== null) {
+					return $this->getAdapter()->getCallbackClientHandler();
+		} else {
+					return new TCallbackClientScript();
+		}
 	}
 
 	/**
@@ -450,10 +455,11 @@ 
 	 */
 	public function setForm(TForm $form)
 	{
-		if($this->_form === null)
-			$this->_form = $form;
-		else
-			throw new TInvalidOperationException('page_form_duplicated');
+		if($this->_form === null) {
+					$this->_form = $form;
+		} else {
+					throw new TInvalidOperationException('page_form_duplicated');
+		}
 	}
 
 	/**
@@ -464,16 +470,18 @@ 
 	 */
 	public function getValidators($validationGroup = null)
 	{
-		if(!$this->_validators)
-			$this->_validators = new TList;
-		if(empty($validationGroup) === true)
-			return $this->_validators;
-		else
+		if(!$this->_validators) {
+					$this->_validators = new TList;
+		}
+		if(empty($validationGroup) === true) {
+					return $this->_validators;
+		} else
 		{
 			$list = new TList;
-			foreach($this->_validators as $validator)
-				if($validator->getValidationGroup() === $validationGroup)
+			foreach($this->_validators as $validator) {
+							if($validator->getValidationGroup() === $validationGroup)
 					$list->add($validator);
+			}
 			return $list;
 		}
 	}
@@ -492,15 +500,16 @@ 
 		{
 			if($validationGroup === null)
 			{
-				foreach($this->_validators as $validator)
-					$validator->validate();
-			}
-			else
+				foreach($this->_validators as $validator) {
+									$validator->validate();
+				}
+			} else
 			{
 				foreach($this->_validators as $validator)
 				{
-					if($validator->getValidationGroup() === $validationGroup)
-						$validator->validate();
+					if($validator->getValidationGroup() === $validationGroup) {
+											$validator->validate();
+					}
 				}
 			}
 		}
@@ -518,14 +527,15 @@ 
 		{
 			if($this->_validators && $this->_validators->getCount())
 			{
-				foreach($this->_validators as $validator)
-					if(!$validator->getIsValid())
+				foreach($this->_validators as $validator) {
+									if(!$validator->getIsValid())
 						return false;
+				}
 			}
 			return true;
+		} else {
+					throw new TInvalidOperationException('page_isvalid_unknown');
 		}
-		else
-			throw new TInvalidOperationException('page_isvalid_unknown');
 	}
 
 	/**
@@ -533,8 +543,9 @@ 
 	 */
 	public function getTheme()
 	{
-		if(is_string($this->_theme))
-			$this->_theme = $this->getService()->getThemeManager()->getTheme($this->_theme);
+		if(is_string($this->_theme)) {
+					$this->_theme = $this->getService()->getThemeManager()->getTheme($this->_theme);
+		}
 		return $this->_theme;
 	}
 
@@ -553,8 +564,9 @@ 
 	 */
 	public function getStyleSheetTheme()
 	{
-		if(is_string($this->_styleSheet))
-			$this->_styleSheet = $this->getService()->getThemeManager()->getTheme($this->_styleSheet);
+		if(is_string($this->_styleSheet)) {
+					$this->_styleSheet = $this->getService()->getThemeManager()->getTheme($this->_styleSheet);
+		}
 		return $this->_styleSheet;
 	}
 
@@ -574,8 +586,9 @@ 
 	 */
 	public function applyControlSkin($control)
 	{
-		if(($theme = $this->getTheme()) !== null)
-			$theme->applySkin($control);
+		if(($theme = $this->getTheme()) !== null) {
+					$theme->applySkin($control);
+		}
 	}
 
 	/**
@@ -585,8 +598,9 @@ 
 	 */
 	public function applyControlStyleSheet($control)
 	{
-		if(($theme = $this->getStyleSheetTheme()) !== null)
-			$theme->applySkin($control);
+		if(($theme = $this->getStyleSheetTheme()) !== null) {
+					$theme->applySkin($control);
+		}
 	}
 
 	/**
@@ -597,8 +611,9 @@ 
 		if(!$this->_clientScript) {
 			$className = $classPath = $this->getService()->getClientScriptManagerClass();
 
-			if($className !== '\Prado\Web\UI\TClientScriptManager' && !is_subclass_of($className, '\Prado\Web\UI\TClientScriptManager'))
-				throw new THttpException(404, 'page_csmanagerclass_invalid', $className);
+			if($className !== '\Prado\Web\UI\TClientScriptManager' && !is_subclass_of($className, '\Prado\Web\UI\TClientScriptManager')) {
+							throw new THttpException(404, 'page_csmanagerclass_invalid', $className);
+			}
 
 			$this->_clientScript = new $className($this);
 		}
@@ -673,22 +688,27 @@ 
 		$theme = $this->getTheme();
 		if($theme instanceof ITheme)
 		{
-			foreach($theme->getStyleSheetFiles() as $url)
-				$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
-			foreach($theme->getJavaScriptFiles() as $url)
-				$cs->registerHeadScriptFile($url, $url);
+			foreach($theme->getStyleSheetFiles() as $url) {
+							$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
+			}
+			foreach($theme->getJavaScriptFiles() as $url) {
+							$cs->registerHeadScriptFile($url, $url);
+			}
 		}
 		$styleSheet = $this->getStyleSheetTheme();
 		if($styleSheet instanceof ITheme)
 		{
-			foreach($styleSheet->getStyleSheetFiles() as $url)
-				$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
-			foreach($styleSheet->getJavaScriptFiles() as $url)
-				$cs->registerHeadScriptFile($url, $url);
+			foreach($styleSheet->getStyleSheetFiles() as $url) {
+							$cs->registerStyleSheetFile($url, $url, $this->getCssMediaType($url));
+			}
+			foreach($styleSheet->getJavaScriptFiles() as $url) {
+							$cs->registerHeadScriptFile($url, $url);
+			}
 		}
 
-		if($cs->getRequiresHead() && $this->getHead() === null)
-			throw new TConfigurationException('page_head_required');
+		if($cs->getRequiresHead() && $this->getHead() === null) {
+					throw new TConfigurationException('page_head_required');
+		}
 	}
 
 	/**
@@ -702,10 +722,11 @@ 
 	private function getCssMediaType($url)
 	{
 		$segs = explode('.', basename($url));
-		if(isset($segs[2]))
-			return $segs[count($segs) - 2];
-		else
-			return '';
+		if(isset($segs[2])) {
+					return $segs[count($segs) - 2];
+		} else {
+					return '';
+		}
 	}
 
 	/**
@@ -727,8 +748,9 @@ 
 	private function determinePostBackMode()
 	{
 		$postData = $this->getRequest();
-		if($postData->contains(self::FIELD_PAGESTATE) || $postData->contains(self::FIELD_POSTBACK_TARGET))
-			$this->_postData = $postData;
+		if($postData->contains(self::FIELD_PAGESTATE) || $postData->contains(self::FIELD_POSTBACK_TARGET)) {
+					$this->_postData = $postData;
+		}
 	}
 
 	/**
@@ -810,8 +832,9 @@ 
 		$id = is_string($control)?$control:$control->getUniqueID();
 		$this->_controlsRegisteredForPostData[$id] = true;
 		$params = func_get_args();
-		foreach($this->getCachingStack() as $item)
-			$item->registerAction('Page', 'registerRequiresPostData', [$id]);
+		foreach($this->getCachingStack() as $item) {
+					$item->registerAction('Page', 'registerRequiresPostData', [$id]);
+		}
 	}
 
 	/**
@@ -822,8 +845,9 @@ 
 		if($this->_postBackEventTarget === null && $this->_postData !== null)
 		{
 			$eventTarget = $this->_postData->itemAt(self::FIELD_POSTBACK_TARGET);
-			if(!empty($eventTarget))
-				$this->_postBackEventTarget = $this->findControl($eventTarget);
+			if(!empty($eventTarget)) {
+							$this->_postBackEventTarget = $this->findControl($eventTarget);
+			}
 		}
 		return $this->_postBackEventTarget;
 	}
@@ -844,8 +868,9 @@ 
 	{
 		if($this->_postBackEventParameter === null && $this->_postData !== null)
 		{
-			if(($this->_postBackEventParameter = $this->_postData->itemAt(self::FIELD_POSTBACK_PARAMETER)) === null)
-				$this->_postBackEventParameter = '';
+			if(($this->_postBackEventParameter = $this->_postData->itemAt(self::FIELD_POSTBACK_PARAMETER)) === null) {
+							$this->_postBackEventParameter = '';
+			}
 		}
 		return $this->_postBackEventParameter;
 	}
@@ -866,28 +891,29 @@ 
 	protected function processPostData($postData, $beforeLoad)
 	{
 		$this->_isLoadingPostData = true;
-		if($beforeLoad)
-			$this->_restPostData = new TMap;
+		if($beforeLoad) {
+					$this->_restPostData = new TMap;
+		}
 		foreach($postData as $key => $value)
 		{
-			if($this->isSystemPostField($key))
-				continue;
-			elseif($control = $this->findControl($key))
+			if($this->isSystemPostField($key)) {
+							continue;
+			} elseif($control = $this->findControl($key))
 			{
 				if($control instanceof \Prado\Web\UI\IPostBackDataHandler)
 				{
-					if($control->loadPostData($key, $postData))
-						$this->_controlsPostDataChanged[] = $control;
-				}
-				elseif($control instanceof IPostBackEventHandler &&
+					if($control->loadPostData($key, $postData)) {
+											$this->_controlsPostDataChanged[] = $control;
+					}
+				} elseif($control instanceof IPostBackEventHandler &&
 					empty($this->_postData[self::FIELD_POSTBACK_TARGET]))
 				{
 					$this->_postData->add(self::FIELD_POSTBACK_TARGET, $key);  // not calling setPostBackEventTarget() because the control may be removed later
 				}
 				unset($this->_controlsRequiringPostData[$key]);
+			} elseif($beforeLoad) {
+							$this->_restPostData->add($key, $value);
 			}
-			elseif($beforeLoad)
-				$this->_restPostData->add($key, $value);
 		}
 
 		foreach($this->_controlsRequiringPostData as $key => $value)
@@ -896,11 +922,12 @@ 
 			{
 				if($control instanceof \Prado\Web\UI\IPostBackDataHandler)
 				{
-					if($control->loadPostData($key, $this->_postData))
-						$this->_controlsPostDataChanged[] = $control;
+					if($control->loadPostData($key, $this->_postData)) {
+											$this->_controlsPostDataChanged[] = $control;
+					}
+				} else {
+									throw new TInvalidDataValueException('page_postbackcontrol_invalid', $key);
 				}
-				else
-					throw new TInvalidDataValueException('page_postbackcontrol_invalid', $key);
 				unset($this->_controlsRequiringPostData[$key]);
 			}
 		}
@@ -920,8 +947,9 @@ 
 	 */
 	protected function raiseChangedEvents()
 	{
-		foreach($this->_controlsPostDataChanged as $control)
-			$control->raisePostDataChangedEvent();
+		foreach($this->_controlsPostDataChanged as $control) {
+					$control->raisePostDataChangedEvent();
+		}
 	}
 
 	/**
@@ -929,10 +957,11 @@ 
 	 */
 	protected function raisePostBackEvent()
 	{
-		if(($postBackHandler = $this->getPostBackEventTarget()) === null)
-			$this->validate();
-		elseif($postBackHandler instanceof IPostBackEventHandler)
-			$postBackHandler->raisePostBackEvent($this->getPostBackEventParameter());
+		if(($postBackHandler = $this->getPostBackEventTarget()) === null) {
+					$this->validate();
+		} elseif($postBackHandler instanceof IPostBackEventHandler) {
+					$postBackHandler->raisePostBackEvent($this->getPostBackEventParameter());
+		}
 	}
 
 	/**
@@ -950,8 +979,9 @@ 
 	 */
 	public function ensureRenderInForm($control)
 	{
-		if(!$this->getIsCallback() && !$this->_inFormRender)
-			throw new TConfigurationException('page_control_outofform', get_class($control), $control ? $control->getUniqueID() : null);
+		if(!$this->getIsCallback() && !$this->_inFormRender) {
+					throw new TConfigurationException('page_control_outofform', get_class($control), $control ? $control->getUniqueID() : null);
+		}
 	}
 
 	/**
@@ -959,8 +989,9 @@ 
 	 */
 	public function beginFormRender($writer)
 	{
-		if($this->_formRendered)
-			throw new TConfigurationException('page_form_duplicated');
+		if($this->_formRendered) {
+					throw new TConfigurationException('page_form_duplicated');
+		}
 		$this->_formRendered = true;
 		$this->getClientScript()->registerHiddenField(self::FIELD_PAGESTATE, $this->getClientState());
 		$this->_inFormRender = true;
@@ -973,14 +1004,15 @@ 
 	{
 		if($this->_focus)
 		{
-			if(($this->_focus instanceof TControl) && $this->_focus->getVisible(true))
-				$focus = $this->_focus->getClientID();
-			else
-				$focus = $this->_focus;
+			if(($this->_focus instanceof TControl) && $this->_focus->getVisible(true)) {
+							$focus = $this->_focus->getClientID();
+			} else {
+							$focus = $this->_focus;
+			}
 			$this->getClientScript()->registerFocusControl($focus);
+		} elseif($this->_postData && ($lastFocus = $this->_postData->itemAt(self::FIELD_LASTFOCUS)) !== null) {
+					$this->getClientScript()->registerFocusControl($lastFocus);
 		}
-		elseif($this->_postData && ($lastFocus = $this->_postData->itemAt(self::FIELD_LASTFOCUS)) !== null)
-			$this->getClientScript()->registerFocusControl($lastFocus);
 		$this->_inFormRender = false;
 	}
 
@@ -1023,8 +1055,9 @@ 
 	 */
 	public function setHead(THead $value)
 	{
-		if($this->_head)
-			throw new TInvalidOperationException('page_head_duplicated');
+		if($this->_head) {
+					throw new TInvalidOperationException('page_head_duplicated');
+		}
 		$this->_head = $value;
 		if($this->_title !== null)
 		{
@@ -1038,10 +1071,11 @@ 
 	 */
 	public function getTitle()
 	{
-		if($this->_head)
-			return $this->_head->getTitle();
-		else
-			return $this->_title === null ? '' : $this->_title;
+		if($this->_head) {
+					return $this->_head->getTitle();
+		} else {
+					return $this->_title === null ? '' : $this->_title;
+		}
 	}
 
 	/**
@@ -1052,10 +1086,11 @@ 
 	 */
 	public function setTitle($value)
 	{
-		if($this->_head)
-			$this->_head->setTitle($value);
-		else
-			$this->_title = $value;
+		if($this->_head) {
+					$this->_head->setTitle($value);
+		} else {
+					$this->_title = $value;
+		}
 	}
 
 	/**
@@ -1110,8 +1145,9 @@ 
 		if($this->_statePersister === null)
 		{
 			$this->_statePersister = Prado::createComponent($this->_statePersisterClass);
-			if(!($this->_statePersister instanceof IPageStatePersister))
-				throw new TInvalidDataTypeException('page_statepersister_invalid');
+			if(!($this->_statePersister instanceof IPageStatePersister)) {
+							throw new TInvalidDataTypeException('page_statepersister_invalid');
+			}
 			$this->_statePersister->setPage($this);
 		}
 		return $this->_statePersister;
@@ -1196,8 +1232,9 @@ 
 	{
 		if($this->_cachingStack)
 		{
-			foreach($this->_cachingStack as $cache)
-				$cache->registerAction($context, $funcName, $funcParams);
+			foreach($this->_cachingStack as $cache) {
+							$cache->registerAction($context, $funcName, $funcParams);
+			}
 		}
 	}
 
@@ -1206,8 +1243,9 @@ 
 	 */
 	public function getCachingStack()
 	{
-		if(!$this->_cachingStack)
-			$this->_cachingStack = new TStack;
+		if(!$this->_cachingStack) {
+					$this->_cachingStack = new TStack;
+		}
 		return $this->_cachingStack;
 	}
 
@@ -1216,7 +1254,8 @@ 
 	 */
 	public function flushWriter()
 	{
-		if ($this->_writer)
-			$this->Response->write($this->_writer->flush());
+		if ($this->_writer) {
+					$this->Response->write($this->_writer->flush());
+		}
 	}
 }
\ No newline at end of file

framework/Web/UI/TThemeManager.php

Spacing +14 added lines, -14 removed lines

@@ -81,7 +81,7 @@ 
 	{
 		$this->_initialized = true;
 		$service = $this->getService();
-		if($service instanceof TPageService)
+		if ($service instanceof TPageService)
 			$service->setThemeManager($this);
 		else
 			throw new TConfigurationException('thememanager_service_unavailable');
@@ -93,8 +93,8 @@ 
 	 */
 	public function getTheme($name)
 	{
-		$themePath = $this->getBasePath() . DIRECTORY_SEPARATOR . $name;
-		$themeUrl = rtrim($this->getBaseUrl(), '/') . '/' . $name;
+		$themePath = $this->getBasePath().DIRECTORY_SEPARATOR.$name;
+		$themeUrl = rtrim($this->getBaseUrl(), '/').'/'.$name;
 		return Prado::createComponent($this->getThemeClass(), $themePath, $themeUrl);
 	}
 
@@ -102,7 +102,7 @@ 
 	 * @param string|null $class Theme class name in namespace format
 	 */
 	public function setThemeClass($class) {
-		$this->_themeClass = $class === null ? self::DEFAULT_THEMECLASS : (string)$class;
+		$this->_themeClass = $class === null ? self::DEFAULT_THEMECLASS : (string) $class;
 	}
 
 	/**
@@ -120,9 +120,9 @@ 
 		$themes = [];
 		$basePath = $this->getBasePath();
 		$folder = @opendir($basePath);
-		while($file = @readdir($folder))
+		while ($file = @readdir($folder))
 		{
-			if($file !== '.' && $file !== '..' && $file !== '.svn' && is_dir($basePath . DIRECTORY_SEPARATOR . $file))
+			if ($file !== '.' && $file !== '..' && $file !== '.svn' && is_dir($basePath.DIRECTORY_SEPARATOR.$file))
 				$themes[] = $file;
 		}
 		closedir($folder);
@@ -135,10 +135,10 @@ 
 	 */
 	public function getBasePath()
 	{
-		if($this->_basePath === null)
+		if ($this->_basePath === null)
 		{
-			$this->_basePath = dirname($this->getRequest()->getApplicationFilePath()) . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
-			if(($basePath = realpath($this->_basePath)) === false || !is_dir($basePath))
+			$this->_basePath = dirname($this->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
+			if (($basePath = realpath($this->_basePath)) === false || !is_dir($basePath))
 				throw new TConfigurationException('thememanager_basepath_invalid2', $this->_basePath);
 			$this->_basePath = $basePath;
 		}
@@ -151,12 +151,12 @@ 
 	 */
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('thememanager_basepath_unchangeable');
 		else
 		{
 			$this->_basePath = Prado::getPathOfNamespace($value);
-			if($this->_basePath === null || !is_dir($this->_basePath))
+			if ($this->_basePath === null || !is_dir($this->_basePath))
 				throw new TInvalidDataValueException('thememanager_basepath_invalid', $value);
 		}
 	}
@@ -167,14 +167,14 @@ 
 	 */
 	public function getBaseUrl()
 	{
-		if($this->_baseUrl === null)
+		if ($this->_baseUrl === null)
 		{
 			$appPath = dirname($this->getRequest()->getApplicationFilePath());
 			$basePath = $this->getBasePath();
-			if(strpos($basePath, $appPath) === false)
+			if (strpos($basePath, $appPath) === false)
 				throw new TConfigurationException('thememanager_baseurl_required');
 			$appUrl = rtrim(dirname($this->getRequest()->getApplicationUrl()), '/\\');
-			$this->_baseUrl = $appUrl . strtr(substr($basePath, strlen($appPath)), '\\', '/');
+			$this->_baseUrl = $appUrl.strtr(substr($basePath, strlen($appPath)), '\\', '/');
 		}
 		return $this->_baseUrl;
 	}

Braces +20 added lines, -15 removed lines

@@ -81,10 +81,11 @@ 
 	{
 		$this->_initialized = true;
 		$service = $this->getService();
-		if($service instanceof TPageService)
-			$service->setThemeManager($this);
-		else
-			throw new TConfigurationException('thememanager_service_unavailable');
+		if($service instanceof TPageService) {
+					$service->setThemeManager($this);
+		} else {
+					throw new TConfigurationException('thememanager_service_unavailable');
+		}
 	}
 
 	/**
@@ -122,8 +123,9 @@ 
 		$folder = @opendir($basePath);
 		while($file = @readdir($folder))
 		{
-			if($file !== '.' && $file !== '..' && $file !== '.svn' && is_dir($basePath . DIRECTORY_SEPARATOR . $file))
-				$themes[] = $file;
+			if($file !== '.' && $file !== '..' && $file !== '.svn' && is_dir($basePath . DIRECTORY_SEPARATOR . $file)) {
+							$themes[] = $file;
+			}
 		}
 		closedir($folder);
 		return $themes;
@@ -138,8 +140,9 @@ 
 		if($this->_basePath === null)
 		{
 			$this->_basePath = dirname($this->getRequest()->getApplicationFilePath()) . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
-			if(($basePath = realpath($this->_basePath)) === false || !is_dir($basePath))
-				throw new TConfigurationException('thememanager_basepath_invalid2', $this->_basePath);
+			if(($basePath = realpath($this->_basePath)) === false || !is_dir($basePath)) {
+							throw new TConfigurationException('thememanager_basepath_invalid2', $this->_basePath);
+			}
 			$this->_basePath = $basePath;
 		}
 		return $this->_basePath;
@@ -151,13 +154,14 @@ 
 	 */
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('thememanager_basepath_unchangeable');
-		else
+		if($this->_initialized) {
+					throw new TInvalidOperationException('thememanager_basepath_unchangeable');
+		} else
 		{
 			$this->_basePath = Prado::getPathOfNamespace($value);
-			if($this->_basePath === null || !is_dir($this->_basePath))
-				throw new TInvalidDataValueException('thememanager_basepath_invalid', $value);
+			if($this->_basePath === null || !is_dir($this->_basePath)) {
+							throw new TInvalidDataValueException('thememanager_basepath_invalid', $value);
+			}
 		}
 	}
 
@@ -171,8 +175,9 @@ 
 		{
 			$appPath = dirname($this->getRequest()->getApplicationFilePath());
 			$basePath = $this->getBasePath();
-			if(strpos($basePath, $appPath) === false)
-				throw new TConfigurationException('thememanager_baseurl_required');
+			if(strpos($basePath, $appPath) === false) {
+							throw new TConfigurationException('thememanager_baseurl_required');
+			}
 			$appUrl = rtrim(dirname($this->getRequest()->getApplicationUrl()), '/\\');
 			$this->_baseUrl = $appUrl . strtr(substr($basePath, strlen($appPath)), '\\', '/');
 		}