pradosoft / prado

framework/Web/UI/WebControls/TImageMap.php

Spacing +20 added lines, -20 removed lines

@@ -46,7 +46,7 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof THotSpot)
+		if ($object instanceof THotSpot)
 			$this->getHotSpots()->add($object);
 	}
 
@@ -58,12 +58,12 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		if($this->getHotSpots()->getCount() > 0)
+		if ($this->getHotSpots()->getCount() > 0)
 		{
-			$writer->addAttribute('usemap', '#' . self::MAP_NAME_PREFIX . $this->getClientID());
+			$writer->addAttribute('usemap', '#'.self::MAP_NAME_PREFIX.$this->getClientID());
 			$writer->addAttribute('id', $this->getUniqueID());
 		}
-		if($this->getEnabled() && !$this->getEnabled(true))
+		if ($this->getEnabled() && !$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 	}
 
@@ -77,32 +77,32 @@ 
 
 		$hotspots = $this->getHotSpots();
 
-		if($hotspots->getCount() > 0)
+		if ($hotspots->getCount() > 0)
 		{
 			$clientID = $this->getClientID();
 			$cs = $this->getPage()->getClientScript();
 			$writer->writeLine();
-			$writer->addAttribute('name', self::MAP_NAME_PREFIX . $clientID);
+			$writer->addAttribute('name', self::MAP_NAME_PREFIX.$clientID);
 			$writer->renderBeginTag('map');
 			$writer->writeLine();
-			if(($mode = $this->getHotSpotMode()) === THotSpotMode::NotSet)
+			if (($mode = $this->getHotSpotMode()) === THotSpotMode::NotSet)
 				$mode = THotSpotMode::Navigate;
 			$target = $this->getTarget();
 			$i = 0;
 			$options['EventTarget'] = $this->getUniqueID();
 			$options['StopEvent'] = true;
 			$cs = $this->getPage()->getClientScript();
-			foreach($hotspots as $hotspot)
+			foreach ($hotspots as $hotspot)
 			{
-				if($hotspot->getHotSpotMode() === THotSpotMode::NotSet)
+				if ($hotspot->getHotSpotMode() === THotSpotMode::NotSet)
 					$hotspot->setHotSpotMode($mode);
-				if($target !== '' && $hotspot->getTarget() === '')
+				if ($target !== '' && $hotspot->getTarget() === '')
 					$hotspot->setTarget($target);
-				if($hotspot->getHotSpotMode() === THotSpotMode::PostBack)
+				if ($hotspot->getHotSpotMode() === THotSpotMode::PostBack)
 				{
-					$id = $clientID . '_' . $i;
+					$id = $clientID.'_'.$i;
 					$writer->addAttribute('id', $id);
-					$writer->addAttribute('href', '#' . $id); //create unique no-op url references
+					$writer->addAttribute('href', '#'.$id); //create unique no-op url references
 					$options['ID'] = $id;
 					$options['EventParameter'] = "$i";
 					$options['CausesValidation'] = $hotspot->getCausesValidation();
@@ -136,24 +136,24 @@ 
 	public function raisePostBackEvent($param)
 	{
 		$postBackValue = null;
-		if($param !== '')
+		if ($param !== '')
 		{
 			$index = TPropertyValue::ensureInteger($param);
 			$hotspots = $this->getHotSpots();
-			if($index >= 0 && $index < $hotspots->getCount())
+			if ($index >= 0 && $index < $hotspots->getCount())
 			{
 				$hotspot = $hotspots->itemAt($index);
-				if(($mode = $hotspot->getHotSpotMode()) === THotSpotMode::NotSet)
+				if (($mode = $hotspot->getHotSpotMode()) === THotSpotMode::NotSet)
 					$mode = $this->getHotSpotMode();
-				if($mode === THotSpotMode::PostBack)
+				if ($mode === THotSpotMode::PostBack)
 				{
 					$postBackValue = $hotspot->getPostBackValue();
-					if($hotspot->getCausesValidation())
+					if ($hotspot->getCausesValidation())
 						$this->getPage()->validate($hotspot->getValidationGroup());
 				}
 			}
 		}
-		if($postBackValue !== null)
+		if ($postBackValue !== null)
 			$this->onClick(new TImageMapEventParameter($postBackValue));
 	}
 
@@ -181,7 +181,7 @@ 
 	 */
 	public function getHotSpots()
 	{
-		if(($hotspots = $this->getViewState('HotSpots', null)) === null)
+		if (($hotspots = $this->getViewState('HotSpots', null)) === null)
 		{
 			$hotspots = new THotSpotCollection;
 			$this->setViewState('HotSpots', $hotspots);

Braces +24 added lines, -16 removed lines

@@ -46,8 +46,9 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof THotSpot)
-			$this->getHotSpots()->add($object);
+		if($object instanceof THotSpot) {
+					$this->getHotSpots()->add($object);
+		}
 	}
 
 	/**
@@ -63,8 +64,9 @@ 
 			$writer->addAttribute('usemap', '#' . self::MAP_NAME_PREFIX . $this->getClientID());
 			$writer->addAttribute('id', $this->getUniqueID());
 		}
-		if($this->getEnabled() && !$this->getEnabled(true))
-			$writer->addAttribute('disabled', 'disabled');
+		if($this->getEnabled() && !$this->getEnabled(true)) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 	}
 
 	/**
@@ -85,8 +87,9 @@ 
 			$writer->addAttribute('name', self::MAP_NAME_PREFIX . $clientID);
 			$writer->renderBeginTag('map');
 			$writer->writeLine();
-			if(($mode = $this->getHotSpotMode()) === THotSpotMode::NotSet)
-				$mode = THotSpotMode::Navigate;
+			if(($mode = $this->getHotSpotMode()) === THotSpotMode::NotSet) {
+							$mode = THotSpotMode::Navigate;
+			}
 			$target = $this->getTarget();
 			$i = 0;
 			$options['EventTarget'] = $this->getUniqueID();
@@ -94,10 +97,12 @@ 
 			$cs = $this->getPage()->getClientScript();
 			foreach($hotspots as $hotspot)
 			{
-				if($hotspot->getHotSpotMode() === THotSpotMode::NotSet)
-					$hotspot->setHotSpotMode($mode);
-				if($target !== '' && $hotspot->getTarget() === '')
-					$hotspot->setTarget($target);
+				if($hotspot->getHotSpotMode() === THotSpotMode::NotSet) {
+									$hotspot->setHotSpotMode($mode);
+				}
+				if($target !== '' && $hotspot->getTarget() === '') {
+									$hotspot->setTarget($target);
+				}
 				if($hotspot->getHotSpotMode() === THotSpotMode::PostBack)
 				{
 					$id = $clientID . '_' . $i;
@@ -143,18 +148,21 @@ 
 			if($index >= 0 && $index < $hotspots->getCount())
 			{
 				$hotspot = $hotspots->itemAt($index);
-				if(($mode = $hotspot->getHotSpotMode()) === THotSpotMode::NotSet)
-					$mode = $this->getHotSpotMode();
+				if(($mode = $hotspot->getHotSpotMode()) === THotSpotMode::NotSet) {
+									$mode = $this->getHotSpotMode();
+				}
 				if($mode === THotSpotMode::PostBack)
 				{
 					$postBackValue = $hotspot->getPostBackValue();
-					if($hotspot->getCausesValidation())
-						$this->getPage()->validate($hotspot->getValidationGroup());
+					if($hotspot->getCausesValidation()) {
+											$this->getPage()->validate($hotspot->getValidationGroup());
+					}
 				}
 			}
 		}
-		if($postBackValue !== null)
-			$this->onClick(new TImageMapEventParameter($postBackValue));
+		if($postBackValue !== null) {
+					$this->onClick(new TImageMapEventParameter($postBackValue));
+		}
 	}
 
 	/**

framework/Web/UI/WebControls/TRepeatInfo.php

Spacing +69 added lines, -69 removed lines

@@ -100,7 +100,7 @@ 
 	 */
 	public function setRepeatColumns($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			throw new TInvalidDataValueException('repeatinfo_repeatcolumns_invalid');
 		$this->_repeatColumns = $value;
 	}
@@ -144,16 +144,16 @@ 
 	 */
 	public function renderRepeater($writer, IRepeatInfoUser $user)
 	{
-		if($this->_repeatLayout === TRepeatLayout::Table)
+		if ($this->_repeatLayout === TRepeatLayout::Table)
 		{
 			$control = new TTable;
-			if($this->_caption !== '')
+			if ($this->_caption !== '')
 			{
 				$control->setCaption($this->_caption);
 				$control->setCaptionAlign($this->_captionAlign);
 			}
 		}
-		elseif($this->_repeatLayout === TRepeatLayout::Raw)
+		elseif ($this->_repeatLayout === TRepeatLayout::Raw)
 		{
 			$this->renderRawContents($writer, $user);
 			return;
@@ -162,12 +162,12 @@ 
 			$control = new TWebControl;
 		$control->setID($user->getClientID());
 		$control->copyBaseAttributes($user);
-		if($user->getHasStyle())
+		if ($user->getHasStyle())
 			$control->getStyle()->copyFrom($user->getStyle());
 		$control->renderBeginTag($writer);
 		$writer->writeLine();
 
-		if($this->_repeatDirection === TRepeatDirection::Vertical)
+		if ($this->_repeatDirection === TRepeatDirection::Vertical)
 			$this->renderVerticalContents($writer, $user);
 		else
 			$this->renderHorizontalContents($writer, $user);
@@ -182,19 +182,19 @@ 
 	 */
 	protected function renderRawContents($writer, $user)
 	{
-		if($user->getHasHeader())
+		if ($user->getHasHeader())
 			$user->renderItem($writer, $this, 'Header', -1);
 
 		// render items
 		$hasSeparators = $user->getHasSeparators();
 		$itemCount = $user->getItemCount();
-		for($i = 0;$i < $itemCount;++$i)
+		for ($i = 0; $i < $itemCount; ++$i)
 		{
 			$user->renderItem($writer, $this, 'Item', $i);
-			if($hasSeparators && $i != $itemCount - 1)
+			if ($hasSeparators && $i != $itemCount - 1)
 				$user->renderItem($writer, $this, 'Separator', $i);
 		}
-		if($user->getHasFooter())
+		if ($user->getHasFooter())
 			$user->renderItem($writer, $this, 'Footer', -1);
 	}
 
@@ -208,31 +208,31 @@ 
 		$tableLayout = ($this->_repeatLayout === TRepeatLayout::Table);
 		$hasSeparators = $user->getHasSeparators();
 		$itemCount = $user->getItemCount();
-		$columns = $this->_repeatColumns === 0?$itemCount:$this->_repeatColumns;
-		$totalColumns = $hasSeparators?$columns + $columns:$columns;
+		$columns = $this->_repeatColumns === 0 ? $itemCount : $this->_repeatColumns;
+		$totalColumns = $hasSeparators ? $columns + $columns : $columns;
 		$needBreak = $columns < $itemCount;
 
-		if($user->getHasHeader())
+		if ($user->getHasHeader())
 			$this->renderHeader($writer, $user, $tableLayout, $totalColumns, $needBreak);
 
 		// render items
-		if($tableLayout)
+		if ($tableLayout)
 		{
 			$writer->renderBeginTag('tbody');
 			$column = 0;
-			for($i = 0;$i < $itemCount;++$i)
+			for ($i = 0; $i < $itemCount; ++$i)
 			{
-				if($column == 0)
+				if ($column == 0)
 					$writer->renderBeginTag('tr');
-				if(($style = $user->generateItemStyle('Item', $i)) !== null)
+				if (($style = $user->generateItemStyle('Item', $i)) !== null)
 					$style->addAttributesToRender($writer);
 				$writer->renderBeginTag('td');
 				$user->renderItem($writer, $this, 'Item', $i);
 				$writer->renderEndTag();
 				$writer->writeLine();
-				if($hasSeparators && $i != $itemCount - 1)
+				if ($hasSeparators && $i != $itemCount - 1)
 				{
-					if(($style = $user->generateItemStyle('Separator', $i)) !== null)
+					if (($style = $user->generateItemStyle('Separator', $i)) !== null)
 						$style->addAttributesToRender($writer);
 					$writer->renderBeginTag('td');
 					$user->renderItem($writer, $this, 'Separator', $i);
@@ -240,15 +240,15 @@ 
 					$writer->writeLine();
 				}
 				$column++;
-				if($i == $itemCount - 1)
+				if ($i == $itemCount - 1)
 				{
 					$restColumns = $columns - $column;
-					if($hasSeparators)
-						$restColumns = $restColumns?$restColumns + $restColumns + 1:1;
-					for($j = 0;$j < $restColumns;++$j)
+					if ($hasSeparators)
+						$restColumns = $restColumns ? $restColumns + $restColumns + 1 : 1;
+					for ($j = 0; $j < $restColumns; ++$j)
 						$writer->write("<td></td>\n");
 				}
-				if($column == $columns || $i == $itemCount - 1)
+				if ($column == $columns || $i == $itemCount - 1)
 				{
 					$writer->renderEndTag();
 					$writer->writeLine();
@@ -260,15 +260,15 @@ 
 		else
 		{
 			$column = 0;
-			for($i = 0;$i < $itemCount;++$i)
+			for ($i = 0; $i < $itemCount; ++$i)
 			{
 				$user->renderItem($writer, $this, 'Item', $i);
-				if($hasSeparators && $i != $itemCount - 1)
+				if ($hasSeparators && $i != $itemCount - 1)
 					$user->renderItem($writer, $this, 'Separator', $i);
 				$column++;
-				if($column == $columns || $i == $itemCount - 1)
+				if ($column == $columns || $i == $itemCount - 1)
 				{
-					if($needBreak)
+					if ($needBreak)
 						$writer->writeBreak();
 					$column = 0;
 				}
@@ -276,7 +276,7 @@ 
 			}
 		}
 
-		if($user->getHasFooter())
+		if ($user->getHasFooter())
 			$this->renderFooter($writer, $user, $tableLayout, $totalColumns, $needBreak);
 	}
 
@@ -290,7 +290,7 @@ 
 		$tableLayout = ($this->_repeatLayout === TRepeatLayout::Table);
 		$hasSeparators = $user->getHasSeparators();
 		$itemCount = $user->getItemCount();
-		if($this->_repeatColumns <= 1)
+		if ($this->_repeatColumns <= 1)
 		{
 			$rows = $itemCount;
 			$columns = 1;
@@ -299,69 +299,69 @@ 
 		else
 		{
 			$columns = $this->_repeatColumns;
-			$rows = (int)(($itemCount + $columns - 1) / $columns);
-			if($rows == 0 && $itemCount > 0)
+			$rows = (int) (($itemCount + $columns - 1) / $columns);
+			if ($rows == 0 && $itemCount > 0)
 				$rows = 1;
-			if(($lastColumns = $itemCount % $columns) == 0)
+			if (($lastColumns = $itemCount % $columns) == 0)
 				$lastColumns = $columns;
 		}
-		$totalColumns = $hasSeparators?$columns + $columns:$columns;
+		$totalColumns = $hasSeparators ? $columns + $columns : $columns;
 
-		if($user->getHasHeader())
+		if ($user->getHasHeader())
 			$this->renderHeader($writer, $user, $tableLayout, $totalColumns, false);
 
-		if($tableLayout)
+		if ($tableLayout)
 		{
 			$writer->renderBeginTag('tbody');
 			$renderedItems = 0;
-			for($row = 0;$row < $rows;++$row)
+			for ($row = 0; $row < $rows; ++$row)
 			{
 				$index = $row;
 				$writer->renderBeginTag('tr');
-				for($col = 0;$col < $columns;++$col)
+				for ($col = 0; $col < $columns; ++$col)
 				{
-					if($renderedItems >= $itemCount)
+					if ($renderedItems >= $itemCount)
 						break;
-					if($col > 0)
+					if ($col > 0)
 					{
 						$index += $rows;
-						if($col - 1 >= $lastColumns)
+						if ($col - 1 >= $lastColumns)
 							$index--;
 					}
-					if($index >= $itemCount)
+					if ($index >= $itemCount)
 						continue;
 					$renderedItems++;
-					if(($style = $user->generateItemStyle('Item', $index)) !== null)
+					if (($style = $user->generateItemStyle('Item', $index)) !== null)
 						$style->addAttributesToRender($writer);
 					$writer->renderBeginTag('td');
 					$user->renderItem($writer, $this, 'Item', $index);
 					$writer->renderEndTag();
 					$writer->writeLine();
-					if(!$hasSeparators)
+					if (!$hasSeparators)
 						continue;
-					if($renderedItems < $itemCount - 1)
+					if ($renderedItems < $itemCount - 1)
 					{
-						if($columns == 1)
+						if ($columns == 1)
 						{
 							$writer->renderEndTag();
 							$writer->renderBeginTag('tr');
 						}
-						if(($style = $user->generateItemStyle('Separator', $index)) !== null)
+						if (($style = $user->generateItemStyle('Separator', $index)) !== null)
 							$style->addAttributesToRender($writer);
 						$writer->renderBeginTag('td');
 						$user->renderItem($writer, $this, 'Separator', $index);
 						$writer->renderEndTag();
 						$writer->writeLine();
 					}
-					elseif($columns > 1)
+					elseif ($columns > 1)
 						$writer->write("<td></td>\n");
 				}
-				if($row == $rows - 1)
+				if ($row == $rows - 1)
 				{
 					$restColumns = $columns - $lastColumns;
-					if($hasSeparators)
+					if ($hasSeparators)
 						$restColumns += $restColumns;
-					for($col = 0;$col < $restColumns;++$col)
+					for ($col = 0; $col < $restColumns; ++$col)
 						$writer->write("<td></td>\n");
 				}
 				$writer->renderEndTag();
@@ -372,40 +372,40 @@ 
 		else
 		{
 			$renderedItems = 0;
-			for($row = 0;$row < $rows;++$row)
+			for ($row = 0; $row < $rows; ++$row)
 			{
 				$index = $row;
-				for($col = 0;$col < $columns;++$col)
+				for ($col = 0; $col < $columns; ++$col)
 				{
-					if($renderedItems >= $itemCount)
+					if ($renderedItems >= $itemCount)
 						break;
-					if($col > 0)
+					if ($col > 0)
 					{
 						$index += $rows;
-						if($col - 1 >= $lastColumns)
+						if ($col - 1 >= $lastColumns)
 							$index--;
 					}
-					if($index >= $itemCount)
+					if ($index >= $itemCount)
 						continue;
 					$renderedItems++;
 					$user->renderItem($writer, $this, 'Item', $index);
 					$writer->writeLine();
-					if(!$hasSeparators)
+					if (!$hasSeparators)
 						continue;
-					if($renderedItems < $itemCount - 1)
+					if ($renderedItems < $itemCount - 1)
 					{
-						if($columns == 1)
+						if ($columns == 1)
 							$writer->writeBreak();
 						$user->renderItem($writer, $this, 'Separator', $index);
 					}
 					$writer->writeLine();
 				}
-				if($row < $rows - 1 || $user->getHasFooter())
+				if ($row < $rows - 1 || $user->getHasFooter())
 					$writer->writeBreak();
 			}
 		}
 
-		if($user->getHasFooter())
+		if ($user->getHasFooter())
 			$this->renderFooter($writer, $user, $tableLayout, $totalColumns, false);
 
 	}
@@ -420,14 +420,14 @@ 
 	 */
 	protected function renderHeader($writer, $user, $tableLayout, $columns, $needBreak)
 	{
-		if($tableLayout)
+		if ($tableLayout)
 		{
 			$writer->renderBeginTag('thead');
 			$writer->renderBeginTag('tr');
-			if($columns > 1)
+			if ($columns > 1)
 				$writer->addAttribute('colspan', "$columns");
 			$writer->addAttribute('scope', 'col');
-			if(($style = $user->generateItemStyle('Header', -1)) !== null)
+			if (($style = $user->generateItemStyle('Header', -1)) !== null)
 				$style->addAttributesToRender($writer);
 			$writer->renderBeginTag('th');
 			$user->renderItem($writer, $this, 'Header', -1);
@@ -438,7 +438,7 @@ 
 		else
 		{
 			$user->renderItem($writer, $this, 'Header', -1);
-			if($needBreak)
+			if ($needBreak)
 				$writer->writeBreak();
 		}
 		$writer->writeLine();
@@ -453,13 +453,13 @@ 
 	 */
 	protected function renderFooter($writer, $user, $tableLayout, $columns)
 	{
-		if($tableLayout)
+		if ($tableLayout)
 		{
 			$writer->renderBeginTag('tfoot');
 			$writer->renderBeginTag('tr');
-			if($columns > 1)
+			if ($columns > 1)
 				$writer->addAttribute('colspan', "$columns");
-			if(($style = $user->generateItemStyle('Footer', -1)) !== null)
+			if (($style = $user->generateItemStyle('Footer', -1)) !== null)
 				$style->addAttributesToRender($writer);
 			$writer->renderBeginTag('td');
 			$user->renderItem($writer, $this, 'Footer', -1);

Braces +127 added lines, -94 removed lines

@@ -100,8 +100,9 @@ 
 	 */
 	public function setRepeatColumns($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			throw new TInvalidDataValueException('repeatinfo_repeatcolumns_invalid');
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					throw new TInvalidDataValueException('repeatinfo_repeatcolumns_invalid');
+		}
 		$this->_repeatColumns = $value;
 	}
 
@@ -152,25 +153,26 @@ 
 				$control->setCaption($this->_caption);
 				$control->setCaptionAlign($this->_captionAlign);
 			}
-		}
-		elseif($this->_repeatLayout === TRepeatLayout::Raw)
+		} elseif($this->_repeatLayout === TRepeatLayout::Raw)
 		{
 			$this->renderRawContents($writer, $user);
 			return;
+		} else {
+					$control = new TWebControl;
 		}
-		else
-			$control = new TWebControl;
 		$control->setID($user->getClientID());
 		$control->copyBaseAttributes($user);
-		if($user->getHasStyle())
-			$control->getStyle()->copyFrom($user->getStyle());
+		if($user->getHasStyle()) {
+					$control->getStyle()->copyFrom($user->getStyle());
+		}
 		$control->renderBeginTag($writer);
 		$writer->writeLine();
 
-		if($this->_repeatDirection === TRepeatDirection::Vertical)
-			$this->renderVerticalContents($writer, $user);
-		else
-			$this->renderHorizontalContents($writer, $user);
+		if($this->_repeatDirection === TRepeatDirection::Vertical) {
+					$this->renderVerticalContents($writer, $user);
+		} else {
+					$this->renderHorizontalContents($writer, $user);
+		}
 
 		$control->renderEndTag($writer);
 	}
@@ -182,8 +184,9 @@ 
 	 */
 	protected function renderRawContents($writer, $user)
 	{
-		if($user->getHasHeader())
-			$user->renderItem($writer, $this, 'Header', -1);
+		if($user->getHasHeader()) {
+					$user->renderItem($writer, $this, 'Header', -1);
+		}
 
 		// render items
 		$hasSeparators = $user->getHasSeparators();
@@ -191,11 +194,13 @@ 
 		for($i = 0;$i < $itemCount;++$i)
 		{
 			$user->renderItem($writer, $this, 'Item', $i);
-			if($hasSeparators && $i != $itemCount - 1)
-				$user->renderItem($writer, $this, 'Separator', $i);
+			if($hasSeparators && $i != $itemCount - 1) {
+							$user->renderItem($writer, $this, 'Separator', $i);
+			}
+		}
+		if($user->getHasFooter()) {
+					$user->renderItem($writer, $this, 'Footer', -1);
 		}
-		if($user->getHasFooter())
-			$user->renderItem($writer, $this, 'Footer', -1);
 	}
 
 	/**
@@ -212,8 +217,9 @@ 
 		$totalColumns = $hasSeparators?$columns + $columns:$columns;
 		$needBreak = $columns < $itemCount;
 
-		if($user->getHasHeader())
-			$this->renderHeader($writer, $user, $tableLayout, $totalColumns, $needBreak);
+		if($user->getHasHeader()) {
+					$this->renderHeader($writer, $user, $tableLayout, $totalColumns, $needBreak);
+		}
 
 		// render items
 		if($tableLayout)
@@ -222,18 +228,21 @@ 
 			$column = 0;
 			for($i = 0;$i < $itemCount;++$i)
 			{
-				if($column == 0)
-					$writer->renderBeginTag('tr');
-				if(($style = $user->generateItemStyle('Item', $i)) !== null)
-					$style->addAttributesToRender($writer);
+				if($column == 0) {
+									$writer->renderBeginTag('tr');
+				}
+				if(($style = $user->generateItemStyle('Item', $i)) !== null) {
+									$style->addAttributesToRender($writer);
+				}
 				$writer->renderBeginTag('td');
 				$user->renderItem($writer, $this, 'Item', $i);
 				$writer->renderEndTag();
 				$writer->writeLine();
 				if($hasSeparators && $i != $itemCount - 1)
 				{
-					if(($style = $user->generateItemStyle('Separator', $i)) !== null)
-						$style->addAttributesToRender($writer);
+					if(($style = $user->generateItemStyle('Separator', $i)) !== null) {
+											$style->addAttributesToRender($writer);
+					}
 					$writer->renderBeginTag('td');
 					$user->renderItem($writer, $this, 'Separator', $i);
 					$writer->renderEndTag();
@@ -243,10 +252,12 @@ 
 				if($i == $itemCount - 1)
 				{
 					$restColumns = $columns - $column;
-					if($hasSeparators)
-						$restColumns = $restColumns?$restColumns + $restColumns + 1:1;
-					for($j = 0;$j < $restColumns;++$j)
-						$writer->write("<td></td>\n");
+					if($hasSeparators) {
+											$restColumns = $restColumns?$restColumns + $restColumns + 1:1;
+					}
+					for($j = 0;$j < $restColumns;++$j) {
+											$writer->write("<td></td>\n");
+					}
 				}
 				if($column == $columns || $i == $itemCount - 1)
 				{
@@ -256,28 +267,30 @@ 
 				}
 			}
 			$writer->renderEndTag();
-		}
-		else
+		} else
 		{
 			$column = 0;
 			for($i = 0;$i < $itemCount;++$i)
 			{
 				$user->renderItem($writer, $this, 'Item', $i);
-				if($hasSeparators && $i != $itemCount - 1)
-					$user->renderItem($writer, $this, 'Separator', $i);
+				if($hasSeparators && $i != $itemCount - 1) {
+									$user->renderItem($writer, $this, 'Separator', $i);
+				}
 				$column++;
 				if($column == $columns || $i == $itemCount - 1)
 				{
-					if($needBreak)
-						$writer->writeBreak();
+					if($needBreak) {
+											$writer->writeBreak();
+					}
 					$column = 0;
 				}
 				$writer->writeLine();
 			}
 		}
 
-		if($user->getHasFooter())
-			$this->renderFooter($writer, $user, $tableLayout, $totalColumns, $needBreak);
+		if($user->getHasFooter()) {
+					$this->renderFooter($writer, $user, $tableLayout, $totalColumns, $needBreak);
+		}
 	}
 
 	/**
@@ -295,20 +308,22 @@ 
 			$rows = $itemCount;
 			$columns = 1;
 			$lastColumns = 1;
-		}
-		else
+		} else
 		{
 			$columns = $this->_repeatColumns;
 			$rows = (int)(($itemCount + $columns - 1) / $columns);
-			if($rows == 0 && $itemCount > 0)
-				$rows = 1;
-			if(($lastColumns = $itemCount % $columns) == 0)
-				$lastColumns = $columns;
+			if($rows == 0 && $itemCount > 0) {
+							$rows = 1;
+			}
+			if(($lastColumns = $itemCount % $columns) == 0) {
+							$lastColumns = $columns;
+			}
 		}
 		$totalColumns = $hasSeparators?$columns + $columns:$columns;
 
-		if($user->getHasHeader())
-			$this->renderHeader($writer, $user, $tableLayout, $totalColumns, false);
+		if($user->getHasHeader()) {
+					$this->renderHeader($writer, $user, $tableLayout, $totalColumns, false);
+		}
 
 		if($tableLayout)
 		{
@@ -320,25 +335,30 @@ 
 				$writer->renderBeginTag('tr');
 				for($col = 0;$col < $columns;++$col)
 				{
-					if($renderedItems >= $itemCount)
-						break;
+					if($renderedItems >= $itemCount) {
+											break;
+					}
 					if($col > 0)
 					{
 						$index += $rows;
-						if($col - 1 >= $lastColumns)
-							$index--;
+						if($col - 1 >= $lastColumns) {
+													$index--;
+						}
+					}
+					if($index >= $itemCount) {
+											continue;
 					}
-					if($index >= $itemCount)
-						continue;
 					$renderedItems++;
-					if(($style = $user->generateItemStyle('Item', $index)) !== null)
-						$style->addAttributesToRender($writer);
+					if(($style = $user->generateItemStyle('Item', $index)) !== null) {
+											$style->addAttributesToRender($writer);
+					}
 					$writer->renderBeginTag('td');
 					$user->renderItem($writer, $this, 'Item', $index);
 					$writer->renderEndTag();
 					$writer->writeLine();
-					if(!$hasSeparators)
-						continue;
+					if(!$hasSeparators) {
+											continue;
+					}
 					if($renderedItems < $itemCount - 1)
 					{
 						if($columns == 1)
@@ -346,30 +366,32 @@ 
 							$writer->renderEndTag();
 							$writer->renderBeginTag('tr');
 						}
-						if(($style = $user->generateItemStyle('Separator', $index)) !== null)
-							$style->addAttributesToRender($writer);
+						if(($style = $user->generateItemStyle('Separator', $index)) !== null) {
+													$style->addAttributesToRender($writer);
+						}
 						$writer->renderBeginTag('td');
 						$user->renderItem($writer, $this, 'Separator', $index);
 						$writer->renderEndTag();
 						$writer->writeLine();
+					} elseif($columns > 1) {
+											$writer->write("<td></td>\n");
 					}
-					elseif($columns > 1)
-						$writer->write("<td></td>\n");
 				}
 				if($row == $rows - 1)
 				{
 					$restColumns = $columns - $lastColumns;
-					if($hasSeparators)
-						$restColumns += $restColumns;
-					for($col = 0;$col < $restColumns;++$col)
-						$writer->write("<td></td>\n");
+					if($hasSeparators) {
+											$restColumns += $restColumns;
+					}
+					for($col = 0;$col < $restColumns;++$col) {
+											$writer->write("<td></td>\n");
+					}
 				}
 				$writer->renderEndTag();
 				$writer->writeLine();
 			}
 			$writer->renderEndTag();
-		}
-		else
+		} else
 		{
 			$renderedItems = 0;
 			for($row = 0;$row < $rows;++$row)
@@ -377,36 +399,43 @@ 
 				$index = $row;
 				for($col = 0;$col < $columns;++$col)
 				{
-					if($renderedItems >= $itemCount)
-						break;
+					if($renderedItems >= $itemCount) {
+											break;
+					}
 					if($col > 0)
 					{
 						$index += $rows;
-						if($col - 1 >= $lastColumns)
-							$index--;
+						if($col - 1 >= $lastColumns) {
+													$index--;
+						}
+					}
+					if($index >= $itemCount) {
+											continue;
 					}
-					if($index >= $itemCount)
-						continue;
 					$renderedItems++;
 					$user->renderItem($writer, $this, 'Item', $index);
 					$writer->writeLine();
-					if(!$hasSeparators)
-						continue;
+					if(!$hasSeparators) {
+											continue;
+					}
 					if($renderedItems < $itemCount - 1)
 					{
-						if($columns == 1)
-							$writer->writeBreak();
+						if($columns == 1) {
+													$writer->writeBreak();
+						}
 						$user->renderItem($writer, $this, 'Separator', $index);
 					}
 					$writer->writeLine();
 				}
-				if($row < $rows - 1 || $user->getHasFooter())
-					$writer->writeBreak();
+				if($row < $rows - 1 || $user->getHasFooter()) {
+									$writer->writeBreak();
+				}
 			}
 		}
 
-		if($user->getHasFooter())
-			$this->renderFooter($writer, $user, $tableLayout, $totalColumns, false);
+		if($user->getHasFooter()) {
+					$this->renderFooter($writer, $user, $tableLayout, $totalColumns, false);
+		}
 
 	}
 
@@ -424,22 +453,24 @@ 
 		{
 			$writer->renderBeginTag('thead');
 			$writer->renderBeginTag('tr');
-			if($columns > 1)
-				$writer->addAttribute('colspan', "$columns");
+			if($columns > 1) {
+							$writer->addAttribute('colspan', "$columns");
+			}
 			$writer->addAttribute('scope', 'col');
-			if(($style = $user->generateItemStyle('Header', -1)) !== null)
-				$style->addAttributesToRender($writer);
+			if(($style = $user->generateItemStyle('Header', -1)) !== null) {
+							$style->addAttributesToRender($writer);
+			}
 			$writer->renderBeginTag('th');
 			$user->renderItem($writer, $this, 'Header', -1);
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 			$writer->renderEndTag();
-		}
-		else
+		} else
 		{
 			$user->renderItem($writer, $this, 'Header', -1);
-			if($needBreak)
-				$writer->writeBreak();
+			if($needBreak) {
+							$writer->writeBreak();
+			}
 		}
 		$writer->writeLine();
 	}
@@ -457,18 +488,20 @@ 
 		{
 			$writer->renderBeginTag('tfoot');
 			$writer->renderBeginTag('tr');
-			if($columns > 1)
-				$writer->addAttribute('colspan', "$columns");
-			if(($style = $user->generateItemStyle('Footer', -1)) !== null)
-				$style->addAttributesToRender($writer);
+			if($columns > 1) {
+							$writer->addAttribute('colspan', "$columns");
+			}
+			if(($style = $user->generateItemStyle('Footer', -1)) !== null) {
+							$style->addAttributesToRender($writer);
+			}
 			$writer->renderBeginTag('td');
 			$user->renderItem($writer, $this, 'Footer', -1);
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 			$writer->renderEndTag();
+		} else {
+					$user->renderItem($writer, $this, 'Footer', -1);
 		}
-		else
-			$user->renderItem($writer, $this, 'Footer', -1);
 		$writer->writeLine();
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TDataGridColumn.php

Spacing +26 added lines, -26 removed lines

@@ -89,7 +89,7 @@ 
 	 */
 	public function setID($value)
 	{
-		if(!preg_match(TControl::ID_FORMAT, $value))
+		if (!preg_match(TControl::ID_FORMAT, $value))
 			throw new TInvalidDataValueException('datagridcolumn_id_invalid', get_class($this), $value);
 		$this->_id = $value;
 	}
@@ -156,7 +156,7 @@ 
 	 */
 	public function getHeaderStyle($createStyle = true)
 	{
-		if(($style = $this->getViewState('HeaderStyle', null)) === null && $createStyle)
+		if (($style = $this->getViewState('HeaderStyle', null)) === null && $createStyle)
 		{
 			$style = new TTableItemStyle;
 			$this->setViewState('HeaderStyle', $style, null);
@@ -210,7 +210,7 @@ 
 	 */
 	public function getFooterStyle($createStyle = true)
 	{
-		if(($style = $this->getViewState('FooterStyle', null)) === null && $createStyle)
+		if (($style = $this->getViewState('FooterStyle', null)) === null && $createStyle)
 		{
 			$style = new TTableItemStyle;
 			$this->setViewState('FooterStyle', $style, null);
@@ -224,7 +224,7 @@ 
 	 */
 	public function getItemStyle($createStyle = true)
 	{
-		if(($style = $this->getViewState('ItemStyle', null)) === null && $createStyle)
+		if (($style = $this->getViewState('ItemStyle', null)) === null && $createStyle)
 		{
 			$style = new TTableItemStyle;
 			$this->setViewState('ItemStyle', $style, null);
@@ -291,7 +291,7 @@ 
 	 */
 	protected function getViewState($key, $defaultValue = null)
 	{
-		return isset($this->_viewState[$key])?$this->_viewState[$key]:$defaultValue;
+		return isset($this->_viewState[$key]) ? $this->_viewState[$key] : $defaultValue;
 	}
 
 	/**
@@ -304,7 +304,7 @@ 
 	 */
 	protected function setViewState($key, $value, $defaultValue = null)
 	{
-		if($value === $defaultValue)
+		if ($value === $defaultValue)
 			unset($this->_viewState[$key]);
 		else
 			$this->_viewState[$key] = $value;
@@ -384,9 +384,9 @@ 
 	 */
 	public function initializeCell($cell, $columnIndex, $itemType)
 	{
-		if($itemType === TListItemType::Header)
+		if ($itemType === TListItemType::Header)
 			$this->initializeHeaderCell($cell, $columnIndex);
-		elseif($itemType === TListItemType::Footer)
+		elseif ($itemType === TListItemType::Footer)
 			$this->initializeFooterCell($cell, $columnIndex);
 	}
 
@@ -419,13 +419,13 @@ 
 	{
 		$text = $this->getHeaderText();
 
-		if(($classPath = $this->getHeaderRenderer()) !== '')
+		if (($classPath = $this->getHeaderRenderer()) !== '')
 		{
 			$control = Prado::createComponent($classPath);
 			$cell->getControls()->add($control);
-			if($control instanceof \Prado\IDataRenderer)
+			if ($control instanceof \Prado\IDataRenderer)
 			{
-				if($control instanceof IItemDataRenderer)
+				if ($control instanceof IItemDataRenderer)
 				{
 					$item = $cell->getParent();
 					$control->setItemIndex($item->getItemIndex());
@@ -434,21 +434,21 @@ 
 				$control->setData($text);
 			}
 		}
-		elseif($this->getAllowSorting())
+		elseif ($this->getAllowSorting())
 		{
 			$sortExpression = $this->getSortExpression();
-			if(($url = $this->getHeaderImageUrl()) !== '')
+			if (($url = $this->getHeaderImageUrl()) !== '')
 			{
 				$button = new TImageButton;
 				$button->setImageUrl($url);
 				$button->setCommandName(TDataGrid::CMD_SORT);
 				$button->setCommandParameter($sortExpression);
-				if($text !== '')
+				if ($text !== '')
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
 			}
-			elseif($text !== '')
+			elseif ($text !== '')
 			{
 				$button = new TLinkButton;
 				$button->setText($text);
@@ -462,15 +462,15 @@ 
 		}
 		else
 		{
-			if(($url = $this->getHeaderImageUrl()) !== '')
+			if (($url = $this->getHeaderImageUrl()) !== '')
 			{
 				$image = new TImage;
 				$image->setImageUrl($url);
-				if($text !== '')
+				if ($text !== '')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
 			}
-			elseif($text !== '')
+			elseif ($text !== '')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');
@@ -490,13 +490,13 @@ 
 	protected function initializeFooterCell($cell, $columnIndex)
 	{
 		$text = $this->getFooterText();
-		if(($classPath = $this->getFooterRenderer()) !== '')
+		if (($classPath = $this->getFooterRenderer()) !== '')
 		{
 			$control = Prado::createComponent($classPath);
 			$cell->getControls()->add($control);
-			if($control instanceof \Prado\IDataRenderer)
+			if ($control instanceof \Prado\IDataRenderer)
 			{
-				if($control instanceof IItemDataRenderer)
+				if ($control instanceof IItemDataRenderer)
 				{
 					$item = $cell->getParent();
 					$control->setItemIndex($item->getItemIndex());
@@ -505,7 +505,7 @@ 
 				$control->setData($text);
 			}
 		}
-		elseif($text !== '')
+		elseif ($text !== '')
 			$cell->setText($text);
 		else
 			$cell->setText(' ');
@@ -525,18 +525,18 @@ 
 	 */
 	protected function formatDataValue($formatString, $value)
 	{
-		if($formatString === '')
+		if ($formatString === '')
 			return TPropertyValue::ensureString($value);
-		elseif($formatString[0] === '#')
+		elseif ($formatString[0] === '#')
 		{
 			$expression = strtr(substr($formatString, 1), ['{0}' => '$value']);
 			try
 			{
-				if(eval("\$result=$expression;") === false)
+				if (eval("\$result=$expression;") === false)
 					throw new Exception('');
 				return $result;
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				throw new TInvalidDataValueException('datagridcolumn_expression_invalid', get_class($this), $expression, $e->getMessage());
 			}

Braces +41 added lines, -39 removed lines

@@ -89,8 +89,9 @@ 
 	 */
 	public function setID($value)
 	{
-		if(!preg_match(TControl::ID_FORMAT, $value))
-			throw new TInvalidDataValueException('datagridcolumn_id_invalid', get_class($this), $value);
+		if(!preg_match(TControl::ID_FORMAT, $value)) {
+					throw new TInvalidDataValueException('datagridcolumn_id_invalid', get_class($this), $value);
+		}
 		$this->_id = $value;
 	}
 
@@ -304,10 +305,11 @@ 
 	 */
 	protected function setViewState($key, $value, $defaultValue = null)
 	{
-		if($value === $defaultValue)
-			unset($this->_viewState[$key]);
-		else
-			$this->_viewState[$key] = $value;
+		if($value === $defaultValue) {
+					unset($this->_viewState[$key]);
+		} else {
+					$this->_viewState[$key] = $value;
+		}
 	}
 
 	/**
@@ -384,10 +386,11 @@ 
 	 */
 	public function initializeCell($cell, $columnIndex, $itemType)
 	{
-		if($itemType === TListItemType::Header)
-			$this->initializeHeaderCell($cell, $columnIndex);
-		elseif($itemType === TListItemType::Footer)
-			$this->initializeFooterCell($cell, $columnIndex);
+		if($itemType === TListItemType::Header) {
+					$this->initializeHeaderCell($cell, $columnIndex);
+		} elseif($itemType === TListItemType::Footer) {
+					$this->initializeFooterCell($cell, $columnIndex);
+		}
 	}
 
 	/**
@@ -433,8 +436,7 @@ 
 				}
 				$control->setData($text);
 			}
-		}
-		elseif($this->getAllowSorting())
+		} elseif($this->getAllowSorting())
 		{
 			$sortExpression = $this->getSortExpression();
 			if(($url = $this->getHeaderImageUrl()) !== '')
@@ -443,12 +445,12 @@ 
 				$button->setImageUrl($url);
 				$button->setCommandName(TDataGrid::CMD_SORT);
 				$button->setCommandParameter($sortExpression);
-				if($text !== '')
-					$button->setAlternateText($text);
+				if($text !== '') {
+									$button->setAlternateText($text);
+				}
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			elseif($text !== '')
+			} elseif($text !== '')
 			{
 				$button = new TLinkButton;
 				$button->setText($text);
@@ -456,24 +458,24 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
+			} else {
+							$cell->setText(' ');
 			}
-			else
-				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url = $this->getHeaderImageUrl()) !== '')
 			{
 				$image = new TImage;
 				$image->setImageUrl($url);
-				if($text !== '')
-					$image->setAlternateText($text);
+				if($text !== '') {
+									$image->setAlternateText($text);
+				}
 				$cell->getControls()->add($image);
+			} elseif($text !== '') {
+							$cell->setText($text);
+			} else {
+							$cell->setText(' ');
 			}
-			elseif($text !== '')
-				$cell->setText($text);
-			else
-				$cell->setText(' ');
 		}
 	}
 
@@ -504,11 +506,11 @@ 
 				}
 				$control->setData($text);
 			}
+		} elseif($text !== '') {
+					$cell->setText($text);
+		} else {
+					$cell->setText(' ');
 		}
-		elseif($text !== '')
-			$cell->setText($text);
-		else
-			$cell->setText(' ');
 	}
 
 	/**
@@ -525,23 +527,23 @@ 
 	 */
 	protected function formatDataValue($formatString, $value)
 	{
-		if($formatString === '')
-			return TPropertyValue::ensureString($value);
-		elseif($formatString[0] === '#')
+		if($formatString === '') {
+					return TPropertyValue::ensureString($value);
+		} elseif($formatString[0] === '#')
 		{
 			$expression = strtr(substr($formatString, 1), ['{0}' => '$value']);
 			try
 			{
-				if(eval("\$result=$expression;") === false)
-					throw new Exception('');
+				if(eval("\$result=$expression;") === false) {
+									throw new Exception('');
+				}
 				return $result;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				throw new TInvalidDataValueException('datagridcolumn_expression_invalid', get_class($this), $expression, $e->getMessage());
 			}
+		} else {
+					return sprintf($formatString, $value);
 		}
-		else
-			return sprintf($formatString, $value);
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TXmlTransform.php

Spacing +12 added lines, -12 removed lines

@@ -56,7 +56,7 @@ 
    * @throws TConfigurationException If XSL extension is not available
    */
   public function __construct() {
-	if(!class_exists('XSLTProcessor', false)) {
+	if (!class_exists('XSLTProcessor', false)) {
 	  throw new TConfigurationException('xmltransform_xslextension_required');
 	}
   }
@@ -72,9 +72,9 @@ 
    * @param string The path to the XML style sheet.  It must be in namespace format.
    */
   public function setTransformPath($value) {
-	if(!is_file($value)) {
+	if (!is_file($value)) {
 	  $value = Prado::getPathOfNamespace($value, self::EXT_XSL_FILE);
-	  if($value === null) {
+	  if ($value === null) {
 	throw new TInvalidDataValueException('xmltransform_transformpath_invalid', $value);
 	  }
 	}
@@ -107,9 +107,9 @@ 
    * @throws TInvalidDataValueException
    */
   public function setDocumentPath($value) {
-	if(!is_file($value)) {
+	if (!is_file($value)) {
 	  $value = Prado::getPathOfNamespace($value, self::EXT_XML_FILE);
-	  if($value === null) {
+	  if ($value === null) {
 	throw new TInvalidDataValueException('xmltransform_documentpath_invalid', $value);
 	  }
 	}
@@ -135,7 +135,7 @@ 
    * @return TAttributeCollection the list of custom parameters
    */
   public function getParameters() {
-	if($params = $this->getViewState('Parameters', null)) {
+	if ($params = $this->getViewState('Parameters', null)) {
 	  return $params;
 	} else {
 	  $params = new TAttributeCollection();
@@ -145,11 +145,11 @@ 
   }
 
   private function getTransformXmlDocument() {
-	if(($content = $this->getTransformContent()) !== '') {
+	if (($content = $this->getTransformContent()) !== '') {
 	  $document = new DOMDocument();
 	  $document->loadXML($content);
 	  return $document;
-	} elseif(($path = $this->getTransformPath()) !== '') {
+	} elseif (($path = $this->getTransformPath()) !== '') {
 	  $document = new DOMDocument();
 	  $document->load($path);
 	  return $document;
@@ -159,11 +159,11 @@ 
   }
 
   private function getSourceXmlDocument() {
-	if(($content = $this->getDocumentContent()) !== '') {
+	if (($content = $this->getDocumentContent()) !== '') {
 	  $document = new DOMDocument();
 	  $document->loadXML($content);
 	  return $document;
-	} elseif(($path = $this->getDocumentPath()) !== '') {
+	} elseif (($path = $this->getDocumentPath()) !== '') {
 	  $document = new DOMDocument();
 	  $document->load($path);
 	  return $document;
@@ -177,7 +177,7 @@ 
    * @param THtmlWriter The writer used for the rendering purpose
    */
   public function render($writer) {
-	if(($document = $this->getSourceXmlDocument()) === null) {
+	if (($document = $this->getSourceXmlDocument()) === null) {
 	  $htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
 	  parent::render($htmlWriter);
 	  $document = new DOMDocument();
@@ -191,7 +191,7 @@ 
 
 	// Check for parameters
 	$parameters = $this->getParameters();
-	foreach($parameters as $name => $value) {
+	foreach ($parameters as $name => $value) {
 	  $xslt->setParameter('', $name, $value);
 	}
 	$output = $xslt->transformToXML($document);

framework/Web/UI/WebControls/TListControlValidator.php

Spacing +15 added lines, -15 removed lines

@@ -84,7 +84,7 @@ 
 	 */
 	public function setMinSelection($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			$value = -1;
 		$this->setViewState('MinSelection', $value, -1);
 	}
@@ -102,7 +102,7 @@ 
 	 */
 	public function setMaxSelection($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			$value = -1;
 		$this->setViewState('MaxSelection', $value, -1);
 	}
@@ -141,22 +141,22 @@ 
 		$required = $this->getRequiredValues();
 
 		//if required, check the values
-		if(!empty($required))
+		if (!empty($required))
 		{
-			if($count < count($required))
+			if ($count < count($required))
 				return false;
-			foreach($required as $require)
+			foreach ($required as $require)
 				$exists = $exists && in_array($require, $values);
 		}
 
 		$min = $this->getMinSelection();
 		$max = $this->getMaxSelection();
 
-		if($min !== -1 && $max !== -1)
+		if ($min !== -1 && $max !== -1)
 			return $exists && $count >= $min && $count <= $max;
-		elseif($min === -1 && $max !== -1)
+		elseif ($min === -1 && $max !== -1)
 			return $exists && $count <= $max;
-		elseif($min !== -1 && $max === -1)
+		elseif ($min !== -1 && $max === -1)
 			return $exists && $count >= $min;
 		else
 			return $exists;
@@ -171,9 +171,9 @@ 
 		$values = [];
 
 		//get the data
-		foreach($control->getItems() as $item)
+		foreach ($control->getItems() as $item)
 		{
-			if($item->getSelected())
+			if ($item->getSelected())
 				$values[] = $item->getValue();
 		}
 		return $values;
@@ -186,7 +186,7 @@ 
 	{
 		$required = [];
 		$string = $this->getRequiredSelections();
-		if(!empty($string))
+		if (!empty($string))
 			$required = preg_split('/,\s*/', $string);
 		return $required;
 	}
@@ -200,7 +200,7 @@ 
 		$options = parent::getClientScriptOptions();
 		$control = $this->getValidationTarget();
 
-		if(!$control instanceof TListControl)
+		if (!$control instanceof TListControl)
 		{
 			throw new TConfigurationException(
 				'listcontrolvalidator_invalid_control',
@@ -209,12 +209,12 @@ 
 
 		$min = $this->getMinSelection();
 		$max = $this->getMaxSelection();
-		if($min !== -1)
+		if ($min !== -1)
 			$options['Min'] = $min;
-		if($max !== -1)
+		if ($max !== -1)
 			$options['Max'] = $max;
 		$required = $this->getRequiredSelections();
-		if(strlen($required) > 0)
+		if (strlen($required) > 0)
 			$options['Required'] = $required;
 		$options['TotalItems'] = $control->getItemCount();
 

Braces +36 added lines, -26 removed lines

@@ -84,8 +84,9 @@ 
 	 */
 	public function setMinSelection($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					$value = -1;
+		}
 		$this->setViewState('MinSelection', $value, -1);
 	}
 
@@ -102,8 +103,9 @@ 
 	 */
 	public function setMaxSelection($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					$value = -1;
+		}
 		$this->setViewState('MaxSelection', $value, -1);
 	}
 
@@ -143,23 +145,26 @@ 
 		//if required, check the values
 		if(!empty($required))
 		{
-			if($count < count($required))
-				return false;
-			foreach($required as $require)
-				$exists = $exists && in_array($require, $values);
+			if($count < count($required)) {
+							return false;
+			}
+			foreach($required as $require) {
+							$exists = $exists && in_array($require, $values);
+			}
 		}
 
 		$min = $this->getMinSelection();
 		$max = $this->getMaxSelection();
 
-		if($min !== -1 && $max !== -1)
-			return $exists && $count >= $min && $count <= $max;
-		elseif($min === -1 && $max !== -1)
-			return $exists && $count <= $max;
-		elseif($min !== -1 && $max === -1)
-			return $exists && $count >= $min;
-		else
-			return $exists;
+		if($min !== -1 && $max !== -1) {
+					return $exists && $count >= $min && $count <= $max;
+		} elseif($min === -1 && $max !== -1) {
+					return $exists && $count <= $max;
+		} elseif($min !== -1 && $max === -1) {
+					return $exists && $count >= $min;
+		} else {
+					return $exists;
+		}
 	}
 
 	/**
@@ -173,8 +178,9 @@ 
 		//get the data
 		foreach($control->getItems() as $item)
 		{
-			if($item->getSelected())
-				$values[] = $item->getValue();
+			if($item->getSelected()) {
+							$values[] = $item->getValue();
+			}
 		}
 		return $values;
 	}
@@ -186,8 +192,9 @@ 
 	{
 		$required = [];
 		$string = $this->getRequiredSelections();
-		if(!empty($string))
-			$required = preg_split('/,\s*/', $string);
+		if(!empty($string)) {
+					$required = preg_split('/,\s*/', $string);
+		}
 		return $required;
 	}
 
@@ -209,13 +216,16 @@ 
 
 		$min = $this->getMinSelection();
 		$max = $this->getMaxSelection();
-		if($min !== -1)
-			$options['Min'] = $min;
-		if($max !== -1)
-			$options['Max'] = $max;
+		if($min !== -1) {
+					$options['Min'] = $min;
+		}
+		if($max !== -1) {
+					$options['Max'] = $max;
+		}
 		$required = $this->getRequiredSelections();
-		if(strlen($required) > 0)
-			$options['Required'] = $required;
+		if(strlen($required) > 0) {
+					$options['Required'] = $required;
+		}
 		$options['TotalItems'] = $control->getItemCount();
 
 		return $options;

framework/Web/UI/WebControls/TTabPanel.php

Spacing +30 added lines, -30 removed lines

@@ -83,7 +83,7 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TTabView)
+		if ($object instanceof TTabView)
 			$this->getControls()->add($object);
 	}
 
@@ -137,32 +137,32 @@ 
 	{
 		$activeView = null;
 		$views = $this->getViews();
-		if(($id = $this->getActiveViewID()) !== '')
+		if (($id = $this->getActiveViewID()) !== '')
 		{
-			if(($index = $views->findIndexByID($id)) >= 0)
+			if (($index = $views->findIndexByID($id)) >= 0)
 				$activeView = $views->itemAt($index);
 			else
 				throw new TInvalidDataValueException('tabpanel_activeviewid_invalid', $id);
 		}
-		elseif(($index = $this->getActiveViewIndex()) >= 0)
+		elseif (($index = $this->getActiveViewIndex()) >= 0)
 		{
-			if($index < $views->getCount())
+			if ($index < $views->getCount())
 				$activeView = $views->itemAt($index);
 			else
 				throw new TInvalidDataValueException('tabpanel_activeviewindex_invalid', $index);
 		}
 		else
 		{
-			foreach($views as $index => $view)
+			foreach ($views as $index => $view)
 			{
-				if($view->getActive())
+				if ($view->getActive())
 				{
 					$activeView = $view;
 					break;
 				}
 			}
 		}
-		if($activeView !== null)
+		if ($activeView !== null)
 			$this->activateView($activeView);
 		return $activeView;
 	}
@@ -173,7 +173,7 @@ 
 	 */
 	public function setActiveView($view)
 	{
-		if($this->getViews()->indexOf($view) >= 0)
+		if ($this->getViews()->indexOf($view) >= 0)
 			$this->activateView($view);
 		else
 			throw new TInvalidOperationException('tabpanel_view_inexistent');
@@ -218,7 +218,7 @@ 
 	public function getCssClass()
 	{
 		$cssClass = parent::getCssClass();
-		return $cssClass === ''?'tab-panel':$cssClass;
+		return $cssClass === '' ? 'tab-panel' : $cssClass;
 	}
 
 	/**
@@ -242,7 +242,7 @@ 
 	 */
 	public function getViewStyle()
 	{
-		if(($style = $this->getViewState('ViewStyle', null)) === null)
+		if (($style = $this->getViewState('ViewStyle', null)) === null)
 		{
 			$style = new TStyle;
 			$style->setCssClass('tab-view');
@@ -272,7 +272,7 @@ 
 	 */
 	public function getTabStyle()
 	{
-		if(($style = $this->getViewState('TabStyle', null)) === null)
+		if (($style = $this->getViewState('TabStyle', null)) === null)
 		{
 			$style = new TStyle;
 			$style->setCssClass('tab-normal');
@@ -302,7 +302,7 @@ 
 	 */
 	public function getActiveTabStyle()
 	{
-		if(($style = $this->getViewState('ActiveTabStyle', null)) === null)
+		if (($style = $this->getViewState('ActiveTabStyle', null)) === null)
 		{
 			$style = new TStyle;
 			$style->setCssClass('tab-active');
@@ -320,9 +320,9 @@ 
 	{
 		$this->setActiveViewIndex(-1);
 		$this->setActiveViewID('');
-		foreach($this->getViews() as $index => $v)
+		foreach ($this->getViews() as $index => $v)
 		{
-			if($view === $v)
+			if ($view === $v)
 			{
 				$this->setActiveViewIndex($index);
 				$this->setActiveViewID($view->getID(false));
@@ -342,11 +342,11 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		if(($index = $values[$this->getClientID() . '_1']) !== null)
+		if (($index = $values[$this->getClientID().'_1']) !== null)
 		{
-			$index = (int)$index;
+			$index = (int) $index;
 			$currentIndex = $this->getActiveViewIndex();
-			if($currentIndex !== $index)
+			if ($currentIndex !== $index)
 			{
 				$this->setActiveViewID(''); // clear up view ID
 				$this->setActiveViewIndex($index);
@@ -397,12 +397,12 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		$this->getActiveView();  // determine the active view
+		$this->getActiveView(); // determine the active view
 		$this->registerStyleSheet();
 
 		$page = $this->getPage();
 		$page->registerRequiresPostData($this);
-		$page->registerRequiresPostData($this->getClientID() . "_1");
+		$page->registerRequiresPostData($this->getClientID()."_1");
 	}
 
 	/**
@@ -414,15 +414,15 @@ 
 	{
 		$url = $this->getCssUrl();
 
-		if($url === '') {
+		if ($url === '') {
 			return;
 		}
 
-		if($url === 'default') {
-			$url = $this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'tabpanel.css');
+		if ($url === 'default') {
+			$url = $this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'tabpanel.css');
 		}
 
-		if($url !== '') {
+		if ($url !== '') {
 			$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 		}
 	}
@@ -441,9 +441,9 @@ 
 		$cs->registerEndScript("prado:$id", $code);
 		// ensure an item is always active and visible
 		$index = $this->getActiveViewIndex();
-		if(!$this->getViews()->itemAt($index)->Visible)
+		if (!$this->getViews()->itemAt($index)->Visible)
 			$index = 0;
-		$cs->registerHiddenField($id . '_1', $index);
+		$cs->registerHiddenField($id.'_1', $index);
 	}
 
 	/**
@@ -466,7 +466,7 @@ 
 		$options['NormalCssClass'] = $this->getTabCssClass();
 		$viewIDs = [];
 		$viewVis = [];
-		foreach($this->getViews() as $view)
+		foreach ($this->getViews() as $view)
 		{
 			$viewIDs[] = $view->getClientID();
 			$viewVis[] = $view->getVisible();
@@ -508,17 +508,17 @@ 
 	public function renderContents($writer)
 	{
 		$views = $this->getViews();
-		if($views->getCount() > 0)
+		if ($views->getCount() > 0)
 		{
 			$writer->writeLine();
 			// render tab bar
-			foreach($views as $view)
+			foreach ($views as $view)
 			{
 				$view->renderTab($writer);
 				$writer->writeLine();
 			}
 			// render tab views
-			foreach($views as $view)
+			foreach ($views as $view)
 			{
 				$view->renderControl($writer);
 				$writer->writeLine();

Braces +28 added lines, -24 removed lines

@@ -83,8 +83,9 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TTabView)
-			$this->getControls()->add($object);
+		if($object instanceof TTabView) {
+					$this->getControls()->add($object);
+		}
 	}
 
 	/**
@@ -139,19 +140,19 @@ 
 		$views = $this->getViews();
 		if(($id = $this->getActiveViewID()) !== '')
 		{
-			if(($index = $views->findIndexByID($id)) >= 0)
-				$activeView = $views->itemAt($index);
-			else
-				throw new TInvalidDataValueException('tabpanel_activeviewid_invalid', $id);
-		}
-		elseif(($index = $this->getActiveViewIndex()) >= 0)
+			if(($index = $views->findIndexByID($id)) >= 0) {
+							$activeView = $views->itemAt($index);
+			} else {
+							throw new TInvalidDataValueException('tabpanel_activeviewid_invalid', $id);
+			}
+		} elseif(($index = $this->getActiveViewIndex()) >= 0)
 		{
-			if($index < $views->getCount())
-				$activeView = $views->itemAt($index);
-			else
-				throw new TInvalidDataValueException('tabpanel_activeviewindex_invalid', $index);
-		}
-		else
+			if($index < $views->getCount()) {
+							$activeView = $views->itemAt($index);
+			} else {
+							throw new TInvalidDataValueException('tabpanel_activeviewindex_invalid', $index);
+			}
+		} else
 		{
 			foreach($views as $index => $view)
 			{
@@ -162,8 +163,9 @@ 
 				}
 			}
 		}
-		if($activeView !== null)
-			$this->activateView($activeView);
+		if($activeView !== null) {
+					$this->activateView($activeView);
+		}
 		return $activeView;
 	}
 
@@ -173,10 +175,11 @@ 
 	 */
 	public function setActiveView($view)
 	{
-		if($this->getViews()->indexOf($view) >= 0)
-			$this->activateView($view);
-		else
-			throw new TInvalidOperationException('tabpanel_view_inexistent');
+		if($this->getViews()->indexOf($view) >= 0) {
+					$this->activateView($view);
+		} else {
+					throw new TInvalidOperationException('tabpanel_view_inexistent');
+		}
 	}
 
 	/**
@@ -327,9 +330,9 @@ 
 				$this->setActiveViewIndex($index);
 				$this->setActiveViewID($view->getID(false));
 				$view->setActive(true);
+			} else {
+							$v->setActive(false);
 			}
-			else
-				$v->setActive(false);
 		}
 	}
 
@@ -441,8 +444,9 @@ 
 		$cs->registerEndScript("prado:$id", $code);
 		// ensure an item is always active and visible
 		$index = $this->getActiveViewIndex();
-		if(!$this->getViews()->itemAt($index)->Visible)
-			$index = 0;
+		if(!$this->getViews()->itemAt($index)->Visible) {
+					$index = 0;
+		}
 		$cs->registerHiddenField($id . '_1', $index);
 	}
 

framework/Web/UI/WebControls/TReCaptchaValidator.php

Spacing +9 added lines, -9 removed lines

@@ -93,12 +93,12 @@ 
 
 		// communicate validation status to the client side
 		$value = $this->_isvalid === false ? '0' : '1';
-		$cs->registerHiddenField($this->getClientID() . '_1', $value);
+		$cs->registerHiddenField($this->getClientID().'_1', $value);
 		
 		// update validator display
 		if ($control = $this->getValidationTarget())
 		{
-			$fn = 'captchaUpdateValidatorStatus_' . $this->getClientID();
+			$fn = 'captchaUpdateValidatorStatus_'.$this->getClientID();
 
 			// check if we need to request a new captcha too
 			if ($this->Page->IsCallback)
@@ -114,21 +114,21 @@ 
 					}
 			}
 
-			$cs->registerEndScript($this->getClientID() . '::validate', implode(' ', [
+			$cs->registerEndScript($this->getClientID().'::validate', implode(' ', [
 				// this function will be used to update the validator
-				'function ' . $fn . '(valid)',
+				'function '.$fn.'(valid)',
 				'{',
-				'  jQuery(' . TJavaScript::quoteString('#' . $this->getClientID() . '_1') . ').val(valid);',
-				'  Prado.Validation.validateControl(' . TJavaScript::quoteString($control->ClientID) . '); ',
+				'  jQuery('.TJavaScript::quoteString('#'.$this->getClientID().'_1').').val(valid);',
+				'  Prado.Validation.validateControl('.TJavaScript::quoteString($control->ClientID).'); ',
 				'}',
 				'',
 				// update the validator to the result if we're in a callback
 				// (if we're in initial rendering or a postback then the result will be rendered directly to the page html anyway)
-				$this->Page->IsCallback ? $fn . '(' . $value . ');' : '',
+				$this->Page->IsCallback ? $fn.'('.$value.');' : '',
 				'',
 				// install event handler that clears the validation error when user changes the captcha response field
-				'jQuery("#' . $control->getClientID() . '").on("keyup", ' . TJavaScript::quoteString('#' . $control->getResponseFieldName()) . ', function() { ',
-					$fn . '("1");',
+				'jQuery("#'.$control->getClientID().'").on("keyup", '.TJavaScript::quoteString('#'.$control->getResponseFieldName()).', function() { ',
+					$fn.'("1");',
 				'});',
 			]));
 		}

Braces +9 added lines, -6 removed lines

@@ -52,10 +52,12 @@ 
 	protected function getCaptchaControl()
 	{
 		$control = $this->getValidationTarget();
-		if (!$control)
-			throw new Exception('No target control specified for TReCaptchaValidator');
-		if (!($control instanceof TReCaptcha))
-			throw new Exception('TReCaptchaValidator only works with TReCaptcha controls');
+		if (!$control) {
+					throw new Exception('No target control specified for TReCaptchaValidator');
+		}
+		if (!($control instanceof TReCaptcha)) {
+					throw new Exception('TReCaptchaValidator only works with TReCaptcha controls');
+		}
 		return $control;
 	}
 
@@ -103,14 +105,15 @@ 
 			// check if we need to request a new captcha too
 			if ($this->Page->IsCallback)
 			{
-				if ($control->getVisible(true))
-					if (null !== $this->_isvalid)
+				if ($control->getVisible(true)) {
+									if (null !== $this->_isvalid)
 					{
 						// if the response has been tested and we reach the pre-render phase
 						// then we need to regenerate the token, because it won't test positive
 						// anymore, even if solves correctly
 
 						$control->regenerateToken();
+				}
 					}
 			}
 

framework/Web/UI/WebControls/TBaseValidator.php

Spacing +32 added lines, -32 removed lines

@@ -124,7 +124,7 @@ 
 	 */
 	public function onUnload($param)
 	{
-		if($this->_registered && ($page = $this->getPage()) !== null)
+		if ($this->_registered && ($page = $this->getPage()) !== null)
 			$page->getValidators()->remove($this);
 		$this->_registered = false;
 		parent::onUnload($param);
@@ -139,9 +139,9 @@ 
 	{
 		$display = $this->getDisplay();
 		$visible = $this->getEnabled(true) && !$this->getIsValid();
-		if($display === TValidatorDisplayStyle::None || (!$visible && $display === TValidatorDisplayStyle::Dynamic))
+		if ($display === TValidatorDisplayStyle::None || (!$visible && $display === TValidatorDisplayStyle::Dynamic))
 			$writer->addStyleAttribute('display', 'none');
-		elseif(!$visible)
+		elseif (!$visible)
 			$writer->addStyleAttribute('visibility', 'hidden');
 		$writer->addAttribute('id', $this->getClientID());
 		parent::addAttributesToRender($writer);
@@ -159,13 +159,13 @@ 
 		$options['FormID'] = $this->getPage()->getForm()->getClientID();
 		$options['Display'] = $this->getDisplay();
 		$options['ErrorMessage'] = $this->getErrorMessage();
-		if($this->getFocusOnError())
+		if ($this->getFocusOnError())
 		{
 			$options['FocusOnError'] = $this->getFocusOnError();
 			$options['FocusElementID'] = $this->getFocusElementID();
 		}
 		$options['ValidationGroup'] = $this->getValidationGroup();
-		if($control)
+		if ($control)
 			$options['ControlToValidate'] = $control->getClientID();
 		$options['ControlCssClass'] = $this->getControlCssClass();
 
@@ -173,7 +173,7 @@ 
 		$options['Enabled'] = $this->getEnabled(true);
 
 		//get date format from date picker target control
-		if($control instanceof TDatePicker)
+		if ($control instanceof TDatePicker)
 			$options['DateFormat'] = $control->getDateFormat();
 
 		$options = array_merge($options, $this->getClientSide()->getOptions()->toArray());
@@ -190,8 +190,8 @@ 
 	 */
 	private function getClientControlClass($control)
 	{
-		foreach(self::$_clientClass as $type)
-			if($control instanceof $type)
+		foreach (self::$_clientClass as $type)
+			if ($control instanceof $type)
 				return $type;
 		$reflectionClass = new \ReflectionClass($control);
 		return $reflectionClass->getShortName();
@@ -215,7 +215,7 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientSide === null)
+		if ($this->_clientSide === null)
 			$this->_clientSide = $this->createClientSide();
 		return $this->_clientSide;
 	}
@@ -241,13 +241,13 @@ 
 			$scripts->registerPradoScript('validator');
 		$formID = $this->getPage()->getForm()->getClientID();
 		$scriptKey = "TBaseValidator:$formID";
-		if($this->getEnableClientScript() && !$scripts->isEndScriptRegistered($scriptKey))
+		if ($this->getEnableClientScript() && !$scripts->isEndScriptRegistered($scriptKey))
 		{
 			$manager['FormID'] = $formID;
 			$options = TJavaScript::encode($manager);
 			$scripts->registerEndScript($scriptKey, "new Prado.ValidationManager({$options});");
 		}
-		if($this->getEnableClientScript())
+		if ($this->getEnableClientScript())
 			$this->registerClientScriptValidator();
 	}
 
@@ -255,7 +255,7 @@ 
 	 * Override parent implementation to update the control CSS Class before
 	 * the validated control is rendered
 	 */
-	public function onPreRender ($param)
+	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
 		$this->updateControlCssClass();
@@ -268,15 +268,15 @@ 
 	 */
 	protected function updateControlCssClass()
 	{
-		if(($cssClass = $this->getControlCssClass()) !== '')
+		if (($cssClass = $this->getControlCssClass()) !== '')
 		{
 			$control = $this->getValidationTarget();
-			if($control instanceof TWebControl)
+			if ($control instanceof TWebControl)
 			{
-				$class = preg_replace('/ ' . preg_quote($cssClass) . '/', '', $control->getCssClass());
-				if(!$this->getIsValid())
+				$class = preg_replace('/ '.preg_quote($cssClass).'/', '', $control->getCssClass());
+				if (!$this->getIsValid())
 				{
-					$class .= ' ' . $cssClass;
+					$class .= ' '.$cssClass;
 					$control->setCssClass($class);
 				} elseif ($control->getIsValid())
 					$control->setCssClass($class);
@@ -289,11 +289,11 @@ 
 	 */
 	protected function registerClientScriptValidator()
 	{
-		$key = 'prado:' . $this->getClientID();
-		if(!$this->getPage()->getClientScript()->isEndScriptRegistered($key))
+		$key = 'prado:'.$this->getClientID();
+		if (!$this->getPage()->getClientScript()->isEndScriptRegistered($key))
 		{
 			$options = TJavaScript::encode($this->getClientScriptOptions());
-			$script = 'new ' . $this->getClientClassName() . '(' . $options . ');';
+			$script = 'new '.$this->getClientClassName().'('.$options.');';
 			$this->getPage()->getClientScript()->registerEndScript($key, $script);
 		}
 	}
@@ -323,7 +323,7 @@ 
 	{
 		$value = TPropertyValue::ensureBoolean($value);
 		parent::setEnabled($value);
-		if(!$value)
+		if (!$value)
 			$this->_isValid = true;
 	}
 
@@ -418,15 +418,15 @@ 
 	 */
 	public function getFocusElementID()
 	{
-		if(($id = $this->getViewState('FocusElementID', '')) === '')
+		if (($id = $this->getViewState('FocusElementID', '')) === '')
 		{
 			$target = $this->getValidationTarget();
 			/* Workaround: TCheckBoxList and TRadioButtonList nests the actual
 			 * inputs inside a table; we ensure the first input gets focused
 			 */
-			if($target instanceof TCheckBoxList && $target->getItemCount() > 0)
+			if ($target instanceof TCheckBoxList && $target->getItemCount() > 0)
 			{
-				$id = $target->getClientID() . '_c0';
+				$id = $target->getClientID().'_c0';
 			} else {
 				$id = $target->getClientID();
 			}
@@ -483,7 +483,7 @@ 
 	 */
 	public function getValidationTarget()
 	{
-		if(($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null)
+		if (($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null)
 			return $control;
 		else
 			throw new TConfigurationException('basevalidator_controltovalidate_invalid', get_class($this));
@@ -497,7 +497,7 @@ 
 	 */
 	protected function getValidationValue($control)
 	{
-		if($control instanceof \Prado\Web\UI\IValidatable)
+		if ($control instanceof \Prado\Web\UI\IValidatable)
 			return $control->getValidationPropertyValue();
 		else
 			throw new TInvalidDataTypeException('basevalidator_validatable_required', get_class($this));
@@ -511,22 +511,22 @@ 
 	public function validate()
 	{
 		$this->onValidate();
-		if($this->getVisible(true) && $this->getEnabled(true))
+		if ($this->getVisible(true) && $this->getEnabled(true))
 		{
 			$target = $this->getValidationTarget();
 			// if the target is not a disabled web control
-			if($target === null ||
+			if ($target === null ||
 				($target !== null &&
 				!($target instanceof TWebControl && !$target->getEnabled(true))))
 			{
-				if($this->evaluateIsValid())
+				if ($this->evaluateIsValid())
 				{
 					$this->setIsValid(true);
 					$this->onValidationSuccess();
 				}
 				else
 				{
-					if($target)
+					if ($target)
 						$target->setIsValid(false);
 					$this->setIsValid(false);
 					$this->onValidationError();
@@ -600,9 +600,9 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) !== '')
+		if (($text = $this->getText()) !== '')
 			$writer->write($text);
-		elseif(($text = $this->getErrorMessage()) !== '')
+		elseif (($text = $this->getErrorMessage()) !== '')
 			$writer->write($text);
 		else
 			parent::renderContents($writer);

Braces +54 added lines, -42 removed lines

@@ -124,8 +124,9 @@ 
 	 */
 	public function onUnload($param)
 	{
-		if($this->_registered && ($page = $this->getPage()) !== null)
-			$page->getValidators()->remove($this);
+		if($this->_registered && ($page = $this->getPage()) !== null) {
+					$page->getValidators()->remove($this);
+		}
 		$this->_registered = false;
 		parent::onUnload($param);
 	}
@@ -139,10 +140,11 @@ 
 	{
 		$display = $this->getDisplay();
 		$visible = $this->getEnabled(true) && !$this->getIsValid();
-		if($display === TValidatorDisplayStyle::None || (!$visible && $display === TValidatorDisplayStyle::Dynamic))
-			$writer->addStyleAttribute('display', 'none');
-		elseif(!$visible)
-			$writer->addStyleAttribute('visibility', 'hidden');
+		if($display === TValidatorDisplayStyle::None || (!$visible && $display === TValidatorDisplayStyle::Dynamic)) {
+					$writer->addStyleAttribute('display', 'none');
+		} elseif(!$visible) {
+					$writer->addStyleAttribute('visibility', 'hidden');
+		}
 		$writer->addAttribute('id', $this->getClientID());
 		parent::addAttributesToRender($writer);
 		$this->renderClientControlScript($writer);
@@ -165,16 +167,18 @@ 
 			$options['FocusElementID'] = $this->getFocusElementID();
 		}
 		$options['ValidationGroup'] = $this->getValidationGroup();
-		if($control)
-			$options['ControlToValidate'] = $control->getClientID();
+		if($control) {
+					$options['ControlToValidate'] = $control->getClientID();
+		}
 		$options['ControlCssClass'] = $this->getControlCssClass();
 
 		$options['ControlType'] = $this->getClientControlClass($control);
 		$options['Enabled'] = $this->getEnabled(true);
 
 		//get date format from date picker target control
-		if($control instanceof TDatePicker)
-			$options['DateFormat'] = $control->getDateFormat();
+		if($control instanceof TDatePicker) {
+					$options['DateFormat'] = $control->getDateFormat();
+		}
 
 		$options = array_merge($options, $this->getClientSide()->getOptions()->toArray());
 
@@ -190,9 +194,10 @@ 
 	 */
 	private function getClientControlClass($control)
 	{
-		foreach(self::$_clientClass as $type)
-			if($control instanceof $type)
+		foreach(self::$_clientClass as $type) {
+					if($control instanceof $type)
 				return $type;
+		}
 		$reflectionClass = new \ReflectionClass($control);
 		return $reflectionClass->getShortName();
 	}
@@ -215,8 +220,9 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientSide === null)
-			$this->_clientSide = $this->createClientSide();
+		if($this->_clientSide === null) {
+					$this->_clientSide = $this->createClientSide();
+		}
 		return $this->_clientSide;
 	}
 
@@ -237,8 +243,9 @@ 
 	public function renderClientControlScript($writer)
 	{
 		$scripts = $this->getPage()->getClientScript();
-		if ($this->getEnableClientScript())
-			$scripts->registerPradoScript('validator');
+		if ($this->getEnableClientScript()) {
+					$scripts->registerPradoScript('validator');
+		}
 		$formID = $this->getPage()->getForm()->getClientID();
 		$scriptKey = "TBaseValidator:$formID";
 		if($this->getEnableClientScript() && !$scripts->isEndScriptRegistered($scriptKey))
@@ -247,8 +254,9 @@ 
 			$options = TJavaScript::encode($manager);
 			$scripts->registerEndScript($scriptKey, "new Prado.ValidationManager({$options});");
 		}
-		if($this->getEnableClientScript())
-			$this->registerClientScriptValidator();
+		if($this->getEnableClientScript()) {
+					$this->registerClientScriptValidator();
+		}
 	}
 
 	/**
@@ -278,8 +286,9 @@ 
 				{
 					$class .= ' ' . $cssClass;
 					$control->setCssClass($class);
-				} elseif ($control->getIsValid())
-					$control->setCssClass($class);
+				} elseif ($control->getIsValid()) {
+									$control->setCssClass($class);
+				}
 			}
 		}
 	}
@@ -323,8 +332,9 @@ 
 	{
 		$value = TPropertyValue::ensureBoolean($value);
 		parent::setEnabled($value);
-		if(!$value)
-			$this->_isValid = true;
+		if(!$value) {
+					$this->_isValid = true;
+		}
 	}
 
 	/**
@@ -483,10 +493,11 @@ 
 	 */
 	public function getValidationTarget()
 	{
-		if(($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null)
-			return $control;
-		else
-			throw new TConfigurationException('basevalidator_controltovalidate_invalid', get_class($this));
+		if(($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null) {
+					return $control;
+		} else {
+					throw new TConfigurationException('basevalidator_controltovalidate_invalid', get_class($this));
+		}
 	}
 
 	/**
@@ -497,10 +508,11 @@ 
 	 */
 	protected function getValidationValue($control)
 	{
-		if($control instanceof \Prado\Web\UI\IValidatable)
-			return $control->getValidationPropertyValue();
-		else
-			throw new TInvalidDataTypeException('basevalidator_validatable_required', get_class($this));
+		if($control instanceof \Prado\Web\UI\IValidatable) {
+					return $control->getValidationPropertyValue();
+		} else {
+					throw new TInvalidDataTypeException('basevalidator_validatable_required', get_class($this));
+		}
 	}
 
 	/**
@@ -523,16 +535,15 @@ 
 				{
 					$this->setIsValid(true);
 					$this->onValidationSuccess();
-				}
-				else
+				} else
 				{
-					if($target)
-						$target->setIsValid(false);
+					if($target) {
+											$target->setIsValid(false);
+					}
 					$this->setIsValid(false);
 					$this->onValidationError();
 				}
-			}
-			else
+			} else
 			{
 				$this->evaluateIsValid();
 				$this->setIsValid(true);
@@ -600,11 +611,12 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) !== '')
-			$writer->write($text);
-		elseif(($text = $this->getErrorMessage()) !== '')
-			$writer->write($text);
-		else
-			parent::renderContents($writer);
+		if(($text = $this->getText()) !== '') {
+					$writer->write($text);
+		} elseif(($text = $this->getErrorMessage()) !== '') {
+					$writer->write($text);
+		} else {
+					parent::renderContents($writer);
+		}
 	}
 }

framework/Web/UI/WebControls/TTabViewCollection.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TTabView)
+		if ($item instanceof TTabView)
 			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('tabviewcollection_tabview_required');
@@ -47,9 +47,9 @@ 
 	 */
 	public function findIndexByID($id)
 	{
-		foreach($this as $index => $view)
+		foreach ($this as $index => $view)
 		{
-			if($view->getID(false) === $id)
+			if ($view->getID(false) === $id)
 				return $index;
 		}
 		return -1;

Braces +8 added lines, -6 removed lines

@@ -34,10 +34,11 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TTabView)
-			parent::insertAt($index, $item);
-		else
-			throw new TInvalidDataTypeException('tabviewcollection_tabview_required');
+		if($item instanceof TTabView) {
+					parent::insertAt($index, $item);
+		} else {
+					throw new TInvalidDataTypeException('tabviewcollection_tabview_required');
+		}
 	}
 
 	/**
@@ -49,8 +50,9 @@ 
 	{
 		foreach($this as $index => $view)
 		{
-			if($view->getID(false) === $id)
-				return $index;
+			if($view->getID(false) === $id) {
+							return $index;
+			}
 		}
 		return -1;
 	}