pradosoft / prado

framework/Web/UI/WebControls/TListBox.php

Spacing +18 added lines, -18 removed lines

@@ -47,8 +47,8 @@ 
 	{
 		$rows = $this->getRows();
 		$writer->addAttribute('size', "$rows");
-		if($this->getSelectionMode() === TListSelectionMode::Multiple)
-			$writer->addAttribute('name', $this->getUniqueID() . '[]');
+		if ($this->getSelectionMode() === TListSelectionMode::Multiple)
+			$writer->addAttribute('name', $this->getUniqueID().'[]');
 		else
 			$writer->addAttribute('name', $this->getUniqueID());
 		parent::addAttributesToRender($writer);
@@ -72,7 +72,7 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if($this->getEnabled(true))
+		if ($this->getEnabled(true))
 			$this->getPage()->registerRequiresPostData($this);
 	}
 
@@ -85,18 +85,18 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		if(!$this->getEnabled(true))
+		if (!$this->getEnabled(true))
 			return false;
 		$this->ensureDataBound();
-		$selections = isset($values[$key])?$values[$key]:null;
-		if($selections !== null)
+		$selections = isset($values[$key]) ? $values[$key] : null;
+		if ($selections !== null)
 		{
 			$items = $this->getItems();
-			if($this->getSelectionMode() === TListSelectionMode::Single)
+			if ($this->getSelectionMode() === TListSelectionMode::Single)
 			{
-				$selection = is_array($selections)?$selections[0]:$selections;
+				$selection = is_array($selections) ? $selections[0] : $selections;
 				$index = $items->findIndexByValue($selection, false);
-				if($this->getSelectedIndex() !== $index)
+				if ($this->getSelectedIndex() !== $index)
 				{
 					$this->setSelectedIndex($index);
 					return $this->_dataChanged = true;
@@ -104,20 +104,20 @@ 
 				else
 					return false;
 			}
-			if(!is_array($selections))
+			if (!is_array($selections))
 				$selections = [$selections];
 			$list = [];
-			foreach($selections as $selection)
+			foreach ($selections as $selection)
 				$list[] = $items->findIndexByValue($selection, false);
 			$list2 = $this->getSelectedIndices();
 			$n = count($list);
 			$flag = false;
-			if($n === count($list2))
+			if ($n === count($list2))
 			{
 				sort($list, SORT_NUMERIC);
-				for($i = 0;$i < $n;++$i)
+				for ($i = 0; $i < $n; ++$i)
 				{
-					if($list[$i] !== $list2[$i])
+					if ($list[$i] !== $list2[$i])
 					{
 						$flag = true;
 						break;
@@ -126,14 +126,14 @@ 
 			}
 			else
 				$flag = true;
-			if($flag)
+			if ($flag)
 			{
 				$this->setSelectedIndices($list);
 				$this->_dataChanged = true;
 			}
 			return $flag;
 		}
-		elseif($this->getSelectedIndex() !== -1)
+		elseif ($this->getSelectedIndex() !== -1)
 		{
 			$this->clearSelection();
 			return $this->_dataChanged = true;
@@ -151,7 +151,7 @@ 
 	 */
 	public function raisePostDataChangedEvent()
 	{
-		if($this->getAutoPostBack() && $this->getCausesValidation())
+		if ($this->getAutoPostBack() && $this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
 		$this->onSelectedIndexChanged(null);
 	}
@@ -188,7 +188,7 @@ 
 	public function setRows($value)
 	{
 		$value = TPropertyValue::ensureInteger($value);
-		if($value <= 0)
+		if ($value <= 0)
 			$value = 4;
 		$this->setViewState('Rows', $value, 4);
 	}

Braces +30 added lines, -24 removed lines

@@ -47,10 +47,11 @@ 
 	{
 		$rows = $this->getRows();
 		$writer->addAttribute('size', "$rows");
-		if($this->getSelectionMode() === TListSelectionMode::Multiple)
-			$writer->addAttribute('name', $this->getUniqueID() . '[]');
-		else
-			$writer->addAttribute('name', $this->getUniqueID());
+		if($this->getSelectionMode() === TListSelectionMode::Multiple) {
+					$writer->addAttribute('name', $this->getUniqueID() . '[]');
+		} else {
+					$writer->addAttribute('name', $this->getUniqueID());
+		}
 		parent::addAttributesToRender($writer);
 	}
 
@@ -72,8 +73,9 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if($this->getEnabled(true))
-			$this->getPage()->registerRequiresPostData($this);
+		if($this->getEnabled(true)) {
+					$this->getPage()->registerRequiresPostData($this);
+		}
 	}
 
 	/**
@@ -85,8 +87,9 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		if(!$this->getEnabled(true))
-			return false;
+		if(!$this->getEnabled(true)) {
+					return false;
+		}
 		$this->ensureDataBound();
 		$selections = isset($values[$key])?$values[$key]:null;
 		if($selections !== null)
@@ -100,15 +103,17 @@ 
 				{
 					$this->setSelectedIndex($index);
 					return $this->_dataChanged = true;
+				} else {
+									return false;
 				}
-				else
-					return false;
 			}
-			if(!is_array($selections))
-				$selections = [$selections];
+			if(!is_array($selections)) {
+							$selections = [$selections];
+			}
 			$list = [];
-			foreach($selections as $selection)
-				$list[] = $items->findIndexByValue($selection, false);
+			foreach($selections as $selection) {
+							$list[] = $items->findIndexByValue($selection, false);
+			}
 			$list2 = $this->getSelectedIndices();
 			$n = count($list);
 			$flag = false;
@@ -123,23 +128,22 @@ 
 						break;
 					}
 				}
+			} else {
+							$flag = true;
 			}
-			else
-				$flag = true;
 			if($flag)
 			{
 				$this->setSelectedIndices($list);
 				$this->_dataChanged = true;
 			}
 			return $flag;
-		}
-		elseif($this->getSelectedIndex() !== -1)
+		} elseif($this->getSelectedIndex() !== -1)
 		{
 			$this->clearSelection();
 			return $this->_dataChanged = true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -151,8 +155,9 @@ 
 	 */
 	public function raisePostDataChangedEvent()
 	{
-		if($this->getAutoPostBack() && $this->getCausesValidation())
-			$this->getPage()->validate($this->getValidationGroup());
+		if($this->getAutoPostBack() && $this->getCausesValidation()) {
+					$this->getPage()->validate($this->getValidationGroup());
+		}
 		$this->onSelectedIndexChanged(null);
 	}
 
@@ -188,8 +193,9 @@ 
 	public function setRows($value)
 	{
 		$value = TPropertyValue::ensureInteger($value);
-		if($value <= 0)
-			$value = 4;
+		if($value <= 0) {
+					$value = 4;
+		}
 		$this->setViewState('Rows', $value, 4);
 	}
 

framework/Web/UI/WebControls/TView.php

Spacing +2 added lines, -2 removed lines

@@ -76,9 +76,9 @@
 	 */
 	public function getVisible($checkParents = true)
 	{
-		if(($parent = $this->getParent()) === null)
+		if (($parent = $this->getParent()) === null)
 			return $this->getActive();
-		elseif($this->getActive())
+		elseif ($this->getActive())
 			return $parent->getVisible($checkParents);
 		else
 			return false;

Braces +7 added lines, -6 removed lines

@@ -76,12 +76,13 @@
 	 */
 	public function getVisible($checkParents = true)
 	{
-		if(($parent = $this->getParent()) === null)
-			return $this->getActive();
-		elseif($this->getActive())
-			return $parent->getVisible($checkParents);
-		else
-			return false;
+		if(($parent = $this->getParent()) === null) {
+					return $this->getActive();
+		} elseif($this->getActive()) {
+					return $parent->getVisible($checkParents);
+		} else {
+					return false;
+		}
 	}
 
 	/**

framework/Web/UI/WebControls/TTableItemStyle.php

Spacing +14 added lines, -14 removed lines

@@ -75,13 +75,13 @@ 
 	public function copyFrom($style)
 	{
 		parent::copyFrom($style);
-		if($style instanceof TTableItemStyle)
+		if ($style instanceof TTableItemStyle)
 		{
-			if($this->_verticalAlign === null && $style->_verticalAlign !== null)
+			if ($this->_verticalAlign === null && $style->_verticalAlign !== null)
 				$this->_verticalAlign = $style->_verticalAlign;
-			if($this->_horizontalAlign === null && $style->_horizontalAlign !== null)
+			if ($this->_horizontalAlign === null && $style->_horizontalAlign !== null)
 				$this->_horizontalAlign = $style->_horizontalAlign;
-			if($this->_wrap === null && $style->_wrap !== null)
+			if ($this->_wrap === null && $style->_wrap !== null)
 				$this->_wrap = $style->_wrap;
 		}
 	}
@@ -95,13 +95,13 @@ 
 	public function mergeWith($style)
 	{
 		parent::mergeWith($style);
-		if($style instanceof TTableItemStyle)
+		if ($style instanceof TTableItemStyle)
 		{
-			if($style->_verticalAlign !== null)
+			if ($style->_verticalAlign !== null)
 				$this->_verticalAlign = $style->_verticalAlign;
-			if($style->_horizontalAlign !== null)
+			if ($style->_horizontalAlign !== null)
 				$this->_horizontalAlign = $style->_horizontalAlign;
-			if($style->_wrap !== null)
+			if ($style->_wrap !== null)
 				$this->_wrap = $style->_wrap;
 		}
 	}
@@ -113,13 +113,13 @@ 
 	 */
 	public function addAttributesToRender($writer)
 	{
-		if(!$this->getWrap())
+		if (!$this->getWrap())
 			$writer->addStyleAttribute('white-space', 'nowrap');
 
-		if(($horizontalAlign = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet)
+		if (($horizontalAlign = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet)
 			$writer->addAttribute('align', strtolower($horizontalAlign));
 
-		if(($verticalAlign = $this->getVerticalAlign()) !== TVerticalAlign::NotSet)
+		if (($verticalAlign = $this->getVerticalAlign()) !== TVerticalAlign::NotSet)
 			$writer->addAttribute('valign', strtolower($verticalAlign));
 
 		parent::addAttributesToRender($writer);
@@ -130,7 +130,7 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		return $this->_horizontalAlign === null?THorizontalAlign::NotSet:$this->_horizontalAlign;
+		return $this->_horizontalAlign === null ?THorizontalAlign::NotSet : $this->_horizontalAlign;
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 	 */
 	public function getVerticalAlign()
 	{
-		return $this->_verticalAlign === null?TVerticalAlign::NotSet:$this->_verticalAlign;
+		return $this->_verticalAlign === null ?TVerticalAlign::NotSet : $this->_verticalAlign;
 	}
 
 	/**
@@ -164,7 +164,7 @@ 
 	 */
 	public function getWrap()
 	{
-		return $this->_wrap === null?true:$this->_wrap;
+		return $this->_wrap === null ?true:$this->_wrap;
 	}
 
 	/**

Braces +36 added lines, -24 removed lines

@@ -45,12 +45,15 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_horizontalAlign === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableItemStyle\0_horizontalAlign";
-		if ($this->_verticalAlign === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableItemStyle\0_verticalAlign";
-		if ($this->_wrap === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableItemStyle\0_wrap";
+		if ($this->_horizontalAlign === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TTableItemStyle\0_horizontalAlign";
+		}
+		if ($this->_verticalAlign === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TTableItemStyle\0_verticalAlign";
+		}
+		if ($this->_wrap === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TTableItemStyle\0_wrap";
+		}
 	}
 
 	/**
@@ -77,12 +80,15 @@ 
 		parent::copyFrom($style);
 		if($style instanceof TTableItemStyle)
 		{
-			if($this->_verticalAlign === null && $style->_verticalAlign !== null)
-				$this->_verticalAlign = $style->_verticalAlign;
-			if($this->_horizontalAlign === null && $style->_horizontalAlign !== null)
-				$this->_horizontalAlign = $style->_horizontalAlign;
-			if($this->_wrap === null && $style->_wrap !== null)
-				$this->_wrap = $style->_wrap;
+			if($this->_verticalAlign === null && $style->_verticalAlign !== null) {
+							$this->_verticalAlign = $style->_verticalAlign;
+			}
+			if($this->_horizontalAlign === null && $style->_horizontalAlign !== null) {
+							$this->_horizontalAlign = $style->_horizontalAlign;
+			}
+			if($this->_wrap === null && $style->_wrap !== null) {
+							$this->_wrap = $style->_wrap;
+			}
 		}
 	}
 
@@ -97,12 +103,15 @@ 
 		parent::mergeWith($style);
 		if($style instanceof TTableItemStyle)
 		{
-			if($style->_verticalAlign !== null)
-				$this->_verticalAlign = $style->_verticalAlign;
-			if($style->_horizontalAlign !== null)
-				$this->_horizontalAlign = $style->_horizontalAlign;
-			if($style->_wrap !== null)
-				$this->_wrap = $style->_wrap;
+			if($style->_verticalAlign !== null) {
+							$this->_verticalAlign = $style->_verticalAlign;
+			}
+			if($style->_horizontalAlign !== null) {
+							$this->_horizontalAlign = $style->_horizontalAlign;
+			}
+			if($style->_wrap !== null) {
+							$this->_wrap = $style->_wrap;
+			}
 		}
 	}
 
@@ -113,14 +122,17 @@ 
 	 */
 	public function addAttributesToRender($writer)
 	{
-		if(!$this->getWrap())
-			$writer->addStyleAttribute('white-space', 'nowrap');
+		if(!$this->getWrap()) {
+					$writer->addStyleAttribute('white-space', 'nowrap');
+		}
 
-		if(($horizontalAlign = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet)
-			$writer->addAttribute('align', strtolower($horizontalAlign));
+		if(($horizontalAlign = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet) {
+					$writer->addAttribute('align', strtolower($horizontalAlign));
+		}
 
-		if(($verticalAlign = $this->getVerticalAlign()) !== TVerticalAlign::NotSet)
-			$writer->addAttribute('valign', strtolower($verticalAlign));
+		if(($verticalAlign = $this->getVerticalAlign()) !== TVerticalAlign::NotSet) {
+					$writer->addAttribute('valign', strtolower($verticalAlign));
+		}
 
 		parent::addAttributesToRender($writer);
 	}

framework/Web/UI/WebControls/TTableRow.php

Spacing +5 added lines, -5 removed lines

@@ -43,7 +43,7 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TTableCell)
+		if ($object instanceof TTableCell)
 			$this->getCells()->add($object);
 	}
 
@@ -80,7 +80,7 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getHorizontalAlign();
 		else
 			return 'NotSet';
@@ -101,7 +101,7 @@ 
 	 */
 	public function getVerticalAlign()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getVerticalAlign();
 		else
 			return 'NotSet';
@@ -139,10 +139,10 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
 			$writer->writeLine();
-			foreach($this->getControls() as $cell)
+			foreach ($this->getControls() as $cell)
 			{
 				$cell->renderControl($writer);
 				$writer->writeLine();

Braces +13 added lines, -10 removed lines

@@ -43,8 +43,9 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TTableCell)
-			$this->getCells()->add($object);
+		if($object instanceof TTableCell) {
+					$this->getCells()->add($object);
+		}
 	}
 
 	/**
@@ -80,10 +81,11 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getHorizontalAlign();
-		else
-			return 'NotSet';
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getHorizontalAlign();
+		} else {
+					return 'NotSet';
+		}
 	}
 
 	/**
@@ -101,10 +103,11 @@ 
 	 */
 	public function getVerticalAlign()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getVerticalAlign();
-		else
-			return 'NotSet';
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getVerticalAlign();
+		} else {
+					return 'NotSet';
+		}
 	}
 
 	/**

framework/Web/UI/WebControls/TTable.php

Spacing +25 added lines, -25 removed lines

@@ -81,7 +81,7 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TTableRow)
+		if ($object instanceof TTableRow)
 			$this->getRows()->add($object);
 	}
 
@@ -103,14 +103,14 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		$border = 0;
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 		{
-			if($this->getGridLines() !== TTableGridLines::None)
+			if ($this->getGridLines() !== TTableGridLines::None)
 			{
-				if(($border = $this->getBorderWidth()) === '')
+				if (($border = $this->getBorderWidth()) === '')
 					$border = 1;
 				else
-					$border = (int)$border;
+					$border = (int) $border;
 			}
 		}
 		$writer->addAttribute('border', "$border");
@@ -171,7 +171,7 @@ 
 	 */
 	public function getCellSpacing()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getCellSpacing();
 		else
 			return -1;
@@ -190,7 +190,7 @@ 
 	 */
 	public function getCellPadding()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getCellPadding();
 		else
 			return -1;
@@ -209,7 +209,7 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getHorizontalAlign();
 		else
 			return THorizontalAlign::NotSet;
@@ -228,7 +228,7 @@ 
 	 */
 	public function getGridLines()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getGridLines();
 		else
 			return TTableGridLines::None;
@@ -247,7 +247,7 @@ 
 	 */
 	public function getBackImageUrl()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getBackImageUrl();
 		else
 			return '';
@@ -269,9 +269,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);
@@ -285,44 +285,44 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
 			$renderTableSection = false;
-			foreach($this->getControls() as $row)
+			foreach ($this->getControls() as $row)
 			{
-				if($row->getTableSection() !== TTableRowSection::Body)
+				if ($row->getTableSection() !== TTableRowSection::Body)
 				{
 					$renderTableSection = true;
 					break;
 				}
 			}
-			if($renderTableSection)
+			if ($renderTableSection)
 			{
 				$currentSection = TTableRowSection::Header;
 				$writer->writeLine();
-				foreach($this->getControls() as $index => $row)
+				foreach ($this->getControls() as $index => $row)
 				{
-					if(($section = $row->getTableSection()) === $currentSection)
+					if (($section = $row->getTableSection()) === $currentSection)
 					{
-						if($index === 0 && $currentSection === TTableRowSection::Header)
+						if ($index === 0 && $currentSection === TTableRowSection::Header)
 							$writer->renderBeginTag('thead');
 					}
 					else
 					{
-						if($currentSection === TTableRowSection::Header)
+						if ($currentSection === TTableRowSection::Header)
 						{
-							if($index > 0)
+							if ($index > 0)
 								$writer->renderEndTag();
-							if($section === TTableRowSection::Body)
+							if ($section === TTableRowSection::Body)
 								$writer->renderBeginTag('tbody');
 							else
 								$writer->renderBeginTag('tfoot');
 							$currentSection = $section;
 						}
-						elseif($currentSection === TTableRowSection::Body)
+						elseif ($currentSection === TTableRowSection::Body)
 						{
 							$writer->renderEndTag();
-							if($section === TTableRowSection::Footer)
+							if ($section === TTableRowSection::Footer)
 								$writer->renderBeginTag('tfoot');
 							else
 								throw new TConfigurationException('table_tablesection_outoforder');
@@ -339,7 +339,7 @@ 
 			else
 			{
 				$writer->writeLine();
-				foreach($this->getControls() as $row)
+				foreach ($this->getControls() as $row)
 				{
 					$row->renderControl($writer);
 					$writer->writeLine();

Braces +58 added lines, -48 removed lines

@@ -81,8 +81,9 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TTableRow)
-			$this->getRows()->add($object);
+		if($object instanceof TTableRow) {
+					$this->getRows()->add($object);
+		}
 	}
 
 	/**
@@ -107,10 +108,11 @@ 
 		{
 			if($this->getGridLines() !== TTableGridLines::None)
 			{
-				if(($border = $this->getBorderWidth()) === '')
-					$border = 1;
-				else
-					$border = (int)$border;
+				if(($border = $this->getBorderWidth()) === '') {
+									$border = 1;
+				} else {
+									$border = (int)$border;
+				}
 			}
 		}
 		$writer->addAttribute('border', "$border");
@@ -171,10 +173,11 @@ 
 	 */
 	public function getCellSpacing()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getCellSpacing();
-		else
-			return -1;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getCellSpacing();
+		} else {
+					return -1;
+		}
 	}
 
 	/**
@@ -190,10 +193,11 @@ 
 	 */
 	public function getCellPadding()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getCellPadding();
-		else
-			return -1;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getCellPadding();
+		} else {
+					return -1;
+		}
 	}
 
 	/**
@@ -209,10 +213,11 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getHorizontalAlign();
-		else
-			return THorizontalAlign::NotSet;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getHorizontalAlign();
+		} else {
+					return THorizontalAlign::NotSet;
+		}
 	}
 
 	/**
@@ -228,10 +233,11 @@ 
 	 */
 	public function getGridLines()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getGridLines();
-		else
-			return TTableGridLines::None;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getGridLines();
+		} else {
+					return TTableGridLines::None;
+		}
 	}
 
 	/**
@@ -247,10 +253,11 @@ 
 	 */
 	public function getBackImageUrl()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getBackImageUrl();
-		else
-			return '';
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getBackImageUrl();
+		} else {
+					return '';
+		}
 	}
 
 	/**
@@ -271,8 +278,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();
@@ -304,39 +312,41 @@ 
 				{
 					if(($section = $row->getTableSection()) === $currentSection)
 					{
-						if($index === 0 && $currentSection === TTableRowSection::Header)
-							$writer->renderBeginTag('thead');
-					}
-					else
+						if($index === 0 && $currentSection === TTableRowSection::Header) {
+													$writer->renderBeginTag('thead');
+						}
+					} else
 					{
 						if($currentSection === TTableRowSection::Header)
 						{
-							if($index > 0)
-								$writer->renderEndTag();
-							if($section === TTableRowSection::Body)
-								$writer->renderBeginTag('tbody');
-							else
-								$writer->renderBeginTag('tfoot');
+							if($index > 0) {
+															$writer->renderEndTag();
+							}
+							if($section === TTableRowSection::Body) {
+															$writer->renderBeginTag('tbody');
+							} else {
+															$writer->renderBeginTag('tfoot');
+							}
 							$currentSection = $section;
-						}
-						elseif($currentSection === TTableRowSection::Body)
+						} elseif($currentSection === TTableRowSection::Body)
 						{
 							$writer->renderEndTag();
-							if($section === TTableRowSection::Footer)
-								$writer->renderBeginTag('tfoot');
-							else
-								throw new TConfigurationException('table_tablesection_outoforder');
+							if($section === TTableRowSection::Footer) {
+															$writer->renderBeginTag('tfoot');
+							} else {
+															throw new TConfigurationException('table_tablesection_outoforder');
+							}
 							$currentSection = $section;
-						}
-						else // Footer
+						} else {
+							// Footer
 							throw new TConfigurationException('table_tablesection_outoforder');
+						}
 					}
 					$row->renderControl($writer);
 					$writer->writeLine();
 				}
 				$writer->renderEndTag();
-			}
-			else
+			} else
 			{
 				$writer->writeLine();
 				foreach($this->getControls() as $row)

framework/Web/UI/WebControls/TRequiredFieldValidator.php

Spacing +10 added lines, -10 removed lines

@@ -61,7 +61,7 @@ 
 	protected function getControlPromptValue()
 	{
 		$control = $this->getValidationTarget();
-		if($control instanceof TListControl)
+		if ($control instanceof TListControl)
 			return $control->getPromptValue();
 		return '';
 	}
@@ -89,9 +89,9 @@ 
 	protected function evaluateIsValid()
 	{
 		$control = $this->getValidationTarget();
-		if($control instanceof TListControl)
+		if ($control instanceof TListControl)
 			return $this->validateListControl($control);
-		elseif($control instanceof TRadioButton && strlen($control->getGroupName()) > 0)
+		elseif ($control instanceof TRadioButton && strlen($control->getGroupName()) > 0)
 			return $this->validateRadioButtonGroup($control);
 		else
 			return $this->validateStandardControl($control);
@@ -101,9 +101,9 @@ 
 	{
 		$initial = trim($this->getInitialValue());
 		$count = 0;
-		foreach($control->getItems() as $item)
+		foreach ($control->getItems() as $item)
 		{
-			if($item->getSelected() && $item->getValue() != $initial)
+			if ($item->getSelected() && $item->getValue() != $initial)
 				$count++;
 		}
 		return $count > 0;
@@ -112,11 +112,11 @@ 
 	private function validateRadioButtonGroup($control)
 	{
 		$initial = trim($this->getInitialValue());
-		foreach($control->getRadioButtonsInGroup() as $radio)
+		foreach ($control->getRadioButtonsInGroup() as $radio)
 		{
-			if($radio->getChecked())
+			if ($radio->getChecked())
 			{
-				if(strlen($value = $radio->getValue()) > 0)
+				if (strlen($value = $radio->getValue()) > 0)
 					return $value !== $initial;
 				else
 					return true;
@@ -141,9 +141,9 @@ 
 		$options = parent::getClientScriptOptions();
 		$options['InitialValue'] = $this->getInitialValue();
 		$control = $this->getValidationTarget();
-		if($control instanceof TListControl)
+		if ($control instanceof TListControl)
 			$options['TotalItems'] = $control->getItemCount();
-		if($control instanceof TRadioButton && strlen($control->getGroupName()) > 0)
+		if ($control instanceof TRadioButton && strlen($control->getGroupName()) > 0)
 			$options['GroupName'] = $control->getGroupName();
 		return $options;
 	}

Braces +24 added lines, -18 removed lines

@@ -61,8 +61,9 @@ 
 	protected function getControlPromptValue()
 	{
 		$control = $this->getValidationTarget();
-		if($control instanceof TListControl)
-			return $control->getPromptValue();
+		if($control instanceof TListControl) {
+					return $control->getPromptValue();
+		}
 		return '';
 	}
 	/**
@@ -89,12 +90,13 @@ 
 	protected function evaluateIsValid()
 	{
 		$control = $this->getValidationTarget();
-		if($control instanceof TListControl)
-			return $this->validateListControl($control);
-		elseif($control instanceof TRadioButton && strlen($control->getGroupName()) > 0)
-			return $this->validateRadioButtonGroup($control);
-		else
-			return $this->validateStandardControl($control);
+		if($control instanceof TListControl) {
+					return $this->validateListControl($control);
+		} elseif($control instanceof TRadioButton && strlen($control->getGroupName()) > 0) {
+					return $this->validateRadioButtonGroup($control);
+		} else {
+					return $this->validateStandardControl($control);
+		}
 	}
 
 	private function validateListControl($control)
@@ -103,8 +105,9 @@ 
 		$count = 0;
 		foreach($control->getItems() as $item)
 		{
-			if($item->getSelected() && $item->getValue() != $initial)
-				$count++;
+			if($item->getSelected() && $item->getValue() != $initial) {
+							$count++;
+			}
 		}
 		return $count > 0;
 	}
@@ -116,10 +119,11 @@ 
 		{
 			if($radio->getChecked())
 			{
-				if(strlen($value = $radio->getValue()) > 0)
-					return $value !== $initial;
-				else
-					return true;
+				if(strlen($value = $radio->getValue()) > 0) {
+									return $value !== $initial;
+				} else {
+									return true;
+				}
 			}
 		}
 		return false;
@@ -141,10 +145,12 @@ 
 		$options = parent::getClientScriptOptions();
 		$options['InitialValue'] = $this->getInitialValue();
 		$control = $this->getValidationTarget();
-		if($control instanceof TListControl)
-			$options['TotalItems'] = $control->getItemCount();
-		if($control instanceof TRadioButton && strlen($control->getGroupName()) > 0)
-			$options['GroupName'] = $control->getGroupName();
+		if($control instanceof TListControl) {
+					$options['TotalItems'] = $control->getItemCount();
+		}
+		if($control instanceof TRadioButton && strlen($control->getGroupName()) > 0) {
+					$options['GroupName'] = $control->getGroupName();
+		}
 		return $options;
 	}
 }

framework/Web/UI/WebControls/TRadioButtonList.php

Spacing +4 added lines, -4 removed lines

@@ -54,14 +54,14 @@
 	 */
 	public function loadPostData($key, $values)
 	{
-		$value = isset($values[$key])?$values[$key]:'';
+		$value = isset($values[$key]) ? $values[$key] : '';
 		$oldSelection = $this->getSelectedIndex();
 		$this->ensureDataBound();
-		foreach($this->getItems() as $index => $item)
+		foreach ($this->getItems() as $index => $item)
 		{
-			if($item->getEnabled() && $item->getValue() === $value)
+			if ($item->getEnabled() && $item->getValue() === $value)
 			{
-				if($index === $oldSelection)
+				if ($index === $oldSelection)
 					return false;
 				else
 				{

Braces +3 added lines, -3 removed lines

@@ -61,9 +61,9 @@
 		{
 			if($item->getEnabled() && $item->getValue() === $value)
 			{
-				if($index === $oldSelection)
-					return false;
-				else
+				if($index === $oldSelection) {
+									return false;
+				} else
 				{
 					$this->setSelectedIndex($index);
 					return true;

framework/Web/UI/WebControls/TReCaptcha.php

Spacing +21 added lines, -22 removed lines

@@ -178,8 +178,7 @@ 
 
 	public function validate()
 	{
-		if (!
-			  (
+		if (!(
 			($challenge = @$_POST[$this->getChallengeFieldName()])
 			and
 			($response = @$_POST[$this->getResponseFieldName()])
@@ -203,9 +202,9 @@ 
 	{
 		parent::onPreRender($param);
 
-		if("" == $this->getPublicKey())
+		if ("" == $this->getPublicKey())
 			throw new TConfigurationException('recaptcha_publickey_unknown');
-		if("" == $this->getPrivateKey())
+		if ("" == $this->getPrivateKey())
 			throw new TConfigurationException('recaptcha_privatekey_unknown');
 
 		// need to register captcha fields so they will be sent back also in callbacks
@@ -225,21 +224,21 @@ 
 		// if we're in a callback, then schedule re-rendering of the control
 		// if not, don't do anything, because a new challenge will be rendered anyway
 		if ($this->Page->IsCallback)
-			$this->Page->CallbackClient->jQuery($this->getClientID() . ' #recaptcha_reload', 'click');
+			$this->Page->CallbackClient->jQuery($this->getClientID().' #recaptcha_reload', 'click');
 	}
 
 	public function renderContents($writer)
 	{
-		$readyscript = 'jQuery(document).trigger(' . TJavaScript::quoteString('captchaready:' . $this->getClientID()) . ')';
+		$readyscript = 'jQuery(document).trigger('.TJavaScript::quoteString('captchaready:'.$this->getClientID()).')';
 		$cs = $this->Page->ClientScript;
 		$id = $this->getClientID();
-		$divid = $id . '_1_recaptchadiv';
-		$writer->write('<div id="' . htmlspecialchars($divid) . '">');
+		$divid = $id.'_1_recaptchadiv';
+		$writer->write('<div id="'.htmlspecialchars($divid).'">');
 	
 		if (!$this->Page->IsCallback)
 			{
 				$writer->write(TJavaScript::renderScriptBlock(
-					'var RecaptchaOptions = ' . TJavaScript::jsonEncode($this->getClientSideOptions()) . ';'
+					'var RecaptchaOptions = '.TJavaScript::jsonEncode($this->getClientSideOptions()).';'
 				));
 	
 				$html = $this->recaptcha_get_html($this->getPublicKey());
@@ -253,20 +252,20 @@ 
 				*/
 				$writer->write($html);
 
-				$cs->registerEndScript('ReCaptcha::EventScript', 'jQuery(document).ready(function() { ' . $readyscript . '; } );');
+				$cs->registerEndScript('ReCaptcha::EventScript', 'jQuery(document).ready(function() { '.$readyscript.'; } );');
 			}
 		else
 			{
 				$options = $this->getClientSideOptions();
-				$options['callback'] = new TJavaScriptLiteral('function() { ' . $readyscript . '; ' . $this->getCallbackScript() . '; }');
+				$options['callback'] = new TJavaScriptLiteral('function() { '.$readyscript.'; '.$this->getCallbackScript().'; }');
 				$cs->registerScriptFile('ReCaptcha::AjaxScript', self::RECAPTCHA_JS);
-				$cs->registerEndScript('ReCaptcha::CreateScript::' . $id, implode(' ', [
-					'if (!jQuery(' . TJavaScript::quoteString('#' . $this->getResponseFieldName()) . '))',
+				$cs->registerEndScript('ReCaptcha::CreateScript::'.$id, implode(' ', [
+					'if (!jQuery('.TJavaScript::quoteString('#'.$this->getResponseFieldName()).'))',
 					'{',
 					'Recaptcha.destroy();',
 					'Recaptcha.create(',
-						TJavaScript::quoteString($this->getPublicKey()) . ', ',
-						TJavaScript::quoteString($divid) . ', ',
+						TJavaScript::quoteString($this->getPublicKey()).', ',
+						TJavaScript::quoteString($divid).', ',
 						TJavaScript::encode($options),
 					');',
 					'}',
@@ -291,11 +290,11 @@ 
 		$server = $use_ssl ? self::RECAPTCHA_API_SECURE_SERVER : $server = self::RECAPTCHA_API_SERVER;
 		$errorpart = '';
 		if ($error)
-			$errorpart = "&amp;error=" . $error;
+			$errorpart = "&amp;error=".$error;
 
-		return '<script type="text/javascript" src="' . $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
+		return '<script type="text/javascript" src="'.$server.'/challenge?k='.$pubkey.$errorpart.'"></script>
 		<noscript>
-		<iframe src="' . $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
+		<iframe src="' . $server.'/noscript?k='.$pubkey.$errorpart.'" height="300" width="500" frameborder="0"></iframe><br/>
 		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
 		<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
 		</noscript>';
@@ -306,10 +305,10 @@ 
 	 * @param $data - array of string elements to be encoded
 	 * @return string - encoded request
 	 */
-	private function recaptcha_qsencode ($data) {
+	private function recaptcha_qsencode($data) {
 		$req = "";
 		foreach ($data as $key => $value)
-			$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
+			$req .= $key.'='.urlencode(stripslashes($value)).'&';
 
 		// Cut the last '&'
 		$req = substr($req, 0, strlen($req) - 1);
@@ -331,13 +330,13 @@ 
 		$http_request = "POST $path HTTP/1.0\r\n";
 		$http_request .= "Host: $host\r\n";
 		$http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
-		$http_request .= "Content-Length: " . strlen($req) . "\r\n";
+		$http_request .= "Content-Length: ".strlen($req)."\r\n";
 		$http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
 		$http_request .= "\r\n";
 		$http_request .= $req;
 
 		$response = '';
-		if(false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10)))
+		if (false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10)))
 			die('Could not open socket');
 
 		fwrite($fs, $http_request);

Braces +43 added lines, -30 removed lines

@@ -167,12 +167,15 @@ 
 	public function getClientSideOptions()
 	{
 		$options = [];
-		if ($theme = $this->getThemeName())
-			$options['theme'] = $theme;
-		if ($lang = $this->getLanguage())
-			$options['lang'] = $lang;
-		if ($trans = $this->getCustomTranslations())
-			$options['custom_translations'] = $trans;
+		if ($theme = $this->getThemeName()) {
+					$options['theme'] = $theme;
+		}
+		if ($lang = $this->getLanguage()) {
+					$options['lang'] = $lang;
+		}
+		if ($trans = $this->getCustomTranslations()) {
+					$options['custom_translations'] = $trans;
+		}
 		return $options;
 	}
 
@@ -184,8 +187,9 @@ 
 			and
 			($response = @$_POST[$this->getResponseFieldName()])
 			  )
-				   )
-		   return false;
+				   ) {
+				   return false;
+		}
 
 		return $this->recaptcha_check_answer(
 			$this->getPrivateKey(),
@@ -203,10 +207,12 @@ 
 	{
 		parent::onPreRender($param);
 
-		if("" == $this->getPublicKey())
-			throw new TConfigurationException('recaptcha_publickey_unknown');
-		if("" == $this->getPrivateKey())
-			throw new TConfigurationException('recaptcha_privatekey_unknown');
+		if("" == $this->getPublicKey()) {
+					throw new TConfigurationException('recaptcha_publickey_unknown');
+		}
+		if("" == $this->getPrivateKey()) {
+					throw new TConfigurationException('recaptcha_privatekey_unknown');
+		}
 
 		// need to register captcha fields so they will be sent back also in callbacks
 		$page = $this->getPage();
@@ -224,8 +230,9 @@ 
 	{
 		// if we're in a callback, then schedule re-rendering of the control
 		// if not, don't do anything, because a new challenge will be rendered anyway
-		if ($this->Page->IsCallback)
-			$this->Page->CallbackClient->jQuery($this->getClientID() . ' #recaptcha_reload', 'click');
+		if ($this->Page->IsCallback) {
+					$this->Page->CallbackClient->jQuery($this->getClientID() . ' #recaptcha_reload', 'click');
+		}
 	}
 
 	public function renderContents($writer)
@@ -254,8 +261,7 @@ 
 				$writer->write($html);
 
 				$cs->registerEndScript('ReCaptcha::EventScript', 'jQuery(document).ready(function() { ' . $readyscript . '; } );');
-			}
-		else
+			} else
 			{
 				$options = $this->getClientSideOptions();
 				$options['callback'] = new TJavaScriptLiteral('function() { ' . $readyscript . '; ' . $this->getCallbackScript() . '; }');
@@ -290,8 +296,9 @@ 
 	{
 		$server = $use_ssl ? self::RECAPTCHA_API_SECURE_SERVER : $server = self::RECAPTCHA_API_SERVER;
 		$errorpart = '';
-		if ($error)
-			$errorpart = "&error=" . $error;
+		if ($error) {
+					$errorpart = "&error=" . $error;
+		}
 
 		return '<script type="text/javascript" src="' . $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
 		<noscript>
@@ -308,8 +315,9 @@ 
 	 */
 	private function recaptcha_qsencode ($data) {
 		$req = "";
-		foreach ($data as $key => $value)
-			$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
+		foreach ($data as $key => $value) {
+					$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
+		}
 
 		// Cut the last '&'
 		$req = substr($req, 0, strlen($req) - 1);
@@ -337,13 +345,16 @@ 
 		$http_request .= $req;
 
 		$response = '';
-		if(false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10)))
-			die('Could not open socket');
+		if(false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10))) {
+					die('Could not open socket');
+		}
 
 		fwrite($fs, $http_request);
 
-		while (!feof($fs))
-			$response .= fgets($fs, 1160); // One TCP-IP packet
+		while (!feof($fs)) {
+					$response .= fgets($fs, 1160);
+		}
+		// One TCP-IP packet
 		fclose($fs);
 		$response = explode("\r\n\r\n", $response, 2);
 
@@ -362,8 +373,9 @@ 
 	private function recaptcha_check_answer($privkey, $remoteip, $challenge, $response, $extra_params = [])
 	{
 		//discard spam submissions
-		if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0)
-			return false;
+		if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
+					return false;
+		}
 
 		$response = $this->recaptcha_http_post(self::RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
 		[
@@ -376,9 +388,10 @@ 
 
 		$answers = explode("\n", $response [1]);
 
-		if (trim($answers [0]) == 'true')
-			return true;
-		else
-			return false;
+		if (trim($answers [0]) == 'true') {
+					return true;
+		} else {
+					return false;
+		}
 	}
 }

framework/Web/UI/WebControls/TFont.php

Spacing +46 added lines, -46 removed lines

@@ -88,7 +88,7 @@ 
 	public function setBold($value)
 	{
 		$this->_flags |= self::IS_SET_BOLD;
-		if(TPropertyValue::ensureBoolean($value))
+		if (TPropertyValue::ensureBoolean($value))
 			$this->_flags |= self::IS_BOLD;
 		else
 			$this->_flags &= ~self::IS_BOLD;
@@ -108,7 +108,7 @@ 
 	public function setItalic($value)
 	{
 		$this->_flags |= self::IS_SET_ITALIC;
-		if(TPropertyValue::ensureBoolean($value))
+		if (TPropertyValue::ensureBoolean($value))
 			$this->_flags |= self::IS_ITALIC;
 		else
 			$this->_flags &= ~self::IS_ITALIC;
@@ -128,7 +128,7 @@ 
 	public function setOverline($value)
 	{
 		$this->_flags |= self::IS_SET_OVERLINE;
-		if(TPropertyValue::ensureBoolean($value))
+		if (TPropertyValue::ensureBoolean($value))
 			$this->_flags |= self::IS_OVERLINE;
 		else
 			$this->_flags &= ~self::IS_OVERLINE;
@@ -165,7 +165,7 @@ 
 	public function setStrikeout($value)
 	{
 		$this->_flags |= self::IS_SET_STRIKEOUT;
-		if(TPropertyValue::ensureBoolean($value))
+		if (TPropertyValue::ensureBoolean($value))
 			$this->_flags |= self::IS_STRIKEOUT;
 		else
 			$this->_flags &= ~self::IS_STRIKEOUT;
@@ -185,7 +185,7 @@ 
 	public function setUnderline($value)
 	{
 		$this->_flags |= self::IS_SET_UNDERLINE;
-		if(TPropertyValue::ensureBoolean($value))
+		if (TPropertyValue::ensureBoolean($value))
 			$this->_flags |= self::IS_UNDERLINE;
 		else
 			$this->_flags &= ~self::IS_UNDERLINE;
@@ -234,21 +234,21 @@ 
 	 */
 	public function mergeWith($font)
 	{
-		if($font === null || $font->_flags === 0)
+		if ($font === null || $font->_flags === 0)
 			return;
-		if(!($this->_flags & self::IS_SET_BOLD) && ($font->_flags & self::IS_SET_BOLD))
+		if (!($this->_flags & self::IS_SET_BOLD) && ($font->_flags & self::IS_SET_BOLD))
 			$this->setBold($font->getBold());
-		if(!($this->_flags & self::IS_SET_ITALIC) && ($font->_flags & self::IS_SET_ITALIC))
+		if (!($this->_flags & self::IS_SET_ITALIC) && ($font->_flags & self::IS_SET_ITALIC))
 			$this->setItalic($font->getItalic());
-		if(!($this->_flags & self::IS_SET_OVERLINE) && ($font->_flags & self::IS_SET_OVERLINE))
+		if (!($this->_flags & self::IS_SET_OVERLINE) && ($font->_flags & self::IS_SET_OVERLINE))
 			$this->setOverline($font->getOverline());
-		if(!($this->_flags & self::IS_SET_STRIKEOUT) && ($font->_flags & self::IS_SET_STRIKEOUT))
+		if (!($this->_flags & self::IS_SET_STRIKEOUT) && ($font->_flags & self::IS_SET_STRIKEOUT))
 			$this->setStrikeout($font->getStrikeout());
-		if(!($this->_flags & self::IS_SET_UNDERLINE) && ($font->_flags & self::IS_SET_UNDERLINE))
+		if (!($this->_flags & self::IS_SET_UNDERLINE) && ($font->_flags & self::IS_SET_UNDERLINE))
 			$this->setUnderline($font->getUnderline());
-		if(!($this->_flags & self::IS_SET_SIZE) && ($font->_flags & self::IS_SET_SIZE))
+		if (!($this->_flags & self::IS_SET_SIZE) && ($font->_flags & self::IS_SET_SIZE))
 			$this->setSize($font->getSize());
-		if(!($this->_flags & self::IS_SET_NAME) && ($font->_flags & self::IS_SET_NAME))
+		if (!($this->_flags & self::IS_SET_NAME) && ($font->_flags & self::IS_SET_NAME))
 			$this->setName($font->getName());
 	}
 
@@ -260,21 +260,21 @@ 
 	 */
 	public function copyFrom($font)
 	{
-		if($font === null || $font->_flags === 0)
+		if ($font === null || $font->_flags === 0)
 			return;
-		if($font->_flags & self::IS_SET_BOLD)
+		if ($font->_flags & self::IS_SET_BOLD)
 			$this->setBold($font->getBold());
-		if($font->_flags & self::IS_SET_ITALIC)
+		if ($font->_flags & self::IS_SET_ITALIC)
 			$this->setItalic($font->getItalic());
-		if($font->_flags & self::IS_SET_OVERLINE)
+		if ($font->_flags & self::IS_SET_OVERLINE)
 			$this->setOverline($font->getOverline());
-		if($font->_flags & self::IS_SET_STRIKEOUT)
+		if ($font->_flags & self::IS_SET_STRIKEOUT)
 			$this->setStrikeout($font->getStrikeout());
-		if($font->_flags & self::IS_SET_UNDERLINE)
+		if ($font->_flags & self::IS_SET_UNDERLINE)
 			$this->setUnderline($font->getUnderline());
-		if($font->_flags & self::IS_SET_SIZE)
+		if ($font->_flags & self::IS_SET_SIZE)
 			$this->setSize($font->getSize());
-		if($font->_flags & self::IS_SET_NAME)
+		if ($font->_flags & self::IS_SET_NAME)
 			$this->setName($font->getName());
 	}
 
@@ -283,27 +283,27 @@ 
 	 */
 	public function toString()
 	{
-		if($this->_flags === 0)
+		if ($this->_flags === 0)
 			return '';
 		$str = '';
-		if($this->_flags & self::IS_SET_BOLD)
-			$str .= 'font-weight:' . (($this->_flags & self::IS_BOLD)?'bold;':'normal;');
-		if($this->_flags & self::IS_SET_ITALIC)
-			$str .= 'font-style:' . (($this->_flags & self::IS_ITALIC)?'italic;':'normal;');
+		if ($this->_flags & self::IS_SET_BOLD)
+			$str .= 'font-weight:'.(($this->_flags & self::IS_BOLD) ? 'bold;' : 'normal;');
+		if ($this->_flags & self::IS_SET_ITALIC)
+			$str .= 'font-style:'.(($this->_flags & self::IS_ITALIC) ? 'italic;' : 'normal;');
 		$textDec = '';
-		if($this->_flags & self::IS_UNDERLINE)
+		if ($this->_flags & self::IS_UNDERLINE)
 			$textDec .= 'underline';
-		if($this->_flags & self::IS_OVERLINE)
+		if ($this->_flags & self::IS_OVERLINE)
 			$textDec .= ' overline';
-		if($this->_flags & self::IS_STRIKEOUT)
+		if ($this->_flags & self::IS_STRIKEOUT)
 			$textDec .= ' line-through';
 		$textDec = ltrim($textDec);
-		if($textDec !== '')
-			$str .= 'text-decoration:' . $textDec . ';';
-		if($this->_size !== '')
-			$str .= 'font-size:' . $this->_size . ';';
-		if($this->_name !== '')
-			$str .= 'font-family:' . $this->_name . ';';
+		if ($textDec !== '')
+			$str .= 'text-decoration:'.$textDec.';';
+		if ($this->_size !== '')
+			$str .= 'font-size:'.$this->_size.';';
+		if ($this->_name !== '')
+			$str .= 'font-family:'.$this->_name.';';
 		return $str;
 	}
 
@@ -313,25 +313,25 @@ 
 	 */
 	public function addAttributesToRender($writer)
 	{
-		if($this->_flags === 0)
+		if ($this->_flags === 0)
 			return;
-		if($this->_flags & self::IS_SET_BOLD)
-			$writer->addStyleAttribute('font-weight', (($this->_flags & self::IS_BOLD)?'bold':'normal'));
-		if($this->_flags & self::IS_SET_ITALIC)
-			$writer->addStyleAttribute('font-style', (($this->_flags & self::IS_ITALIC)?'italic':'normal'));
+		if ($this->_flags & self::IS_SET_BOLD)
+			$writer->addStyleAttribute('font-weight', (($this->_flags & self::IS_BOLD) ? 'bold' : 'normal'));
+		if ($this->_flags & self::IS_SET_ITALIC)
+			$writer->addStyleAttribute('font-style', (($this->_flags & self::IS_ITALIC) ? 'italic' : 'normal'));
 		$textDec = '';
-		if($this->_flags & self::IS_UNDERLINE)
+		if ($this->_flags & self::IS_UNDERLINE)
 			$textDec .= 'underline';
-		if($this->_flags & self::IS_OVERLINE)
+		if ($this->_flags & self::IS_OVERLINE)
 			$textDec .= ' overline';
-		if($this->_flags & self::IS_STRIKEOUT)
+		if ($this->_flags & self::IS_STRIKEOUT)
 			$textDec .= ' line-through';
 		$textDec = ltrim($textDec);
-		if($textDec !== '')
+		if ($textDec !== '')
 			$writer->addStyleAttribute('text-decoration', $textDec);
-		if($this->_size !== '')
+		if ($this->_size !== '')
 			$writer->addStyleAttribute('font-size', $this->_size);
-		if($this->_name !== '')
+		if ($this->_name !== '')
 			$writer->addStyleAttribute('font-family', $this->_name);
 	}
 }

Braces +136 added lines, -94 removed lines

@@ -66,12 +66,15 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_flags === 0)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TFont\0_flags";
-		if ($this->_name === '')
-			$exprops[] = "\0Prado\Web\UI\WebControls\TFont\0_name";
-		if ($this->_size === '')
-			$exprops[] = "\0Prado\Web\UI\WebControls\TFont\0_size";
+		if ($this->_flags === 0) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TFont\0_flags";
+		}
+		if ($this->_name === '') {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TFont\0_name";
+		}
+		if ($this->_size === '') {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TFont\0_size";
+		}
 	}
 
 	/**
@@ -88,10 +91,11 @@ 
 	public function setBold($value)
 	{
 		$this->_flags |= self::IS_SET_BOLD;
-		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_BOLD;
-		else
-			$this->_flags &= ~self::IS_BOLD;
+		if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags |= self::IS_BOLD;
+		} else {
+					$this->_flags &= ~self::IS_BOLD;
+		}
 	}
 
 	/**
@@ -108,10 +112,11 @@ 
 	public function setItalic($value)
 	{
 		$this->_flags |= self::IS_SET_ITALIC;
-		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_ITALIC;
-		else
-			$this->_flags &= ~self::IS_ITALIC;
+		if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags |= self::IS_ITALIC;
+		} else {
+					$this->_flags &= ~self::IS_ITALIC;
+		}
 	}
 
 	/**
@@ -128,10 +133,11 @@ 
 	public function setOverline($value)
 	{
 		$this->_flags |= self::IS_SET_OVERLINE;
-		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_OVERLINE;
-		else
-			$this->_flags &= ~self::IS_OVERLINE;
+		if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags |= self::IS_OVERLINE;
+		} else {
+					$this->_flags &= ~self::IS_OVERLINE;
+		}
 	}
 
 	/**
@@ -165,10 +171,11 @@ 
 	public function setStrikeout($value)
 	{
 		$this->_flags |= self::IS_SET_STRIKEOUT;
-		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_STRIKEOUT;
-		else
-			$this->_flags &= ~self::IS_STRIKEOUT;
+		if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags |= self::IS_STRIKEOUT;
+		} else {
+					$this->_flags &= ~self::IS_STRIKEOUT;
+		}
 	}
 
 	/**
@@ -185,10 +192,11 @@ 
 	public function setUnderline($value)
 	{
 		$this->_flags |= self::IS_SET_UNDERLINE;
-		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_UNDERLINE;
-		else
-			$this->_flags &= ~self::IS_UNDERLINE;
+		if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags |= self::IS_UNDERLINE;
+		} else {
+					$this->_flags &= ~self::IS_UNDERLINE;
+		}
 	}
 
 	/**
@@ -234,22 +242,30 @@ 
 	 */
 	public function mergeWith($font)
 	{
-		if($font === null || $font->_flags === 0)
-			return;
-		if(!($this->_flags & self::IS_SET_BOLD) && ($font->_flags & self::IS_SET_BOLD))
-			$this->setBold($font->getBold());
-		if(!($this->_flags & self::IS_SET_ITALIC) && ($font->_flags & self::IS_SET_ITALIC))
-			$this->setItalic($font->getItalic());
-		if(!($this->_flags & self::IS_SET_OVERLINE) && ($font->_flags & self::IS_SET_OVERLINE))
-			$this->setOverline($font->getOverline());
-		if(!($this->_flags & self::IS_SET_STRIKEOUT) && ($font->_flags & self::IS_SET_STRIKEOUT))
-			$this->setStrikeout($font->getStrikeout());
-		if(!($this->_flags & self::IS_SET_UNDERLINE) && ($font->_flags & self::IS_SET_UNDERLINE))
-			$this->setUnderline($font->getUnderline());
-		if(!($this->_flags & self::IS_SET_SIZE) && ($font->_flags & self::IS_SET_SIZE))
-			$this->setSize($font->getSize());
-		if(!($this->_flags & self::IS_SET_NAME) && ($font->_flags & self::IS_SET_NAME))
-			$this->setName($font->getName());
+		if($font === null || $font->_flags === 0) {
+					return;
+		}
+		if(!($this->_flags & self::IS_SET_BOLD) && ($font->_flags & self::IS_SET_BOLD)) {
+					$this->setBold($font->getBold());
+		}
+		if(!($this->_flags & self::IS_SET_ITALIC) && ($font->_flags & self::IS_SET_ITALIC)) {
+					$this->setItalic($font->getItalic());
+		}
+		if(!($this->_flags & self::IS_SET_OVERLINE) && ($font->_flags & self::IS_SET_OVERLINE)) {
+					$this->setOverline($font->getOverline());
+		}
+		if(!($this->_flags & self::IS_SET_STRIKEOUT) && ($font->_flags & self::IS_SET_STRIKEOUT)) {
+					$this->setStrikeout($font->getStrikeout());
+		}
+		if(!($this->_flags & self::IS_SET_UNDERLINE) && ($font->_flags & self::IS_SET_UNDERLINE)) {
+					$this->setUnderline($font->getUnderline());
+		}
+		if(!($this->_flags & self::IS_SET_SIZE) && ($font->_flags & self::IS_SET_SIZE)) {
+					$this->setSize($font->getSize());
+		}
+		if(!($this->_flags & self::IS_SET_NAME) && ($font->_flags & self::IS_SET_NAME)) {
+					$this->setName($font->getName());
+		}
 	}
 
 	/**
@@ -260,22 +276,30 @@ 
 	 */
 	public function copyFrom($font)
 	{
-		if($font === null || $font->_flags === 0)
-			return;
-		if($font->_flags & self::IS_SET_BOLD)
-			$this->setBold($font->getBold());
-		if($font->_flags & self::IS_SET_ITALIC)
-			$this->setItalic($font->getItalic());
-		if($font->_flags & self::IS_SET_OVERLINE)
-			$this->setOverline($font->getOverline());
-		if($font->_flags & self::IS_SET_STRIKEOUT)
-			$this->setStrikeout($font->getStrikeout());
-		if($font->_flags & self::IS_SET_UNDERLINE)
-			$this->setUnderline($font->getUnderline());
-		if($font->_flags & self::IS_SET_SIZE)
-			$this->setSize($font->getSize());
-		if($font->_flags & self::IS_SET_NAME)
-			$this->setName($font->getName());
+		if($font === null || $font->_flags === 0) {
+					return;
+		}
+		if($font->_flags & self::IS_SET_BOLD) {
+					$this->setBold($font->getBold());
+		}
+		if($font->_flags & self::IS_SET_ITALIC) {
+					$this->setItalic($font->getItalic());
+		}
+		if($font->_flags & self::IS_SET_OVERLINE) {
+					$this->setOverline($font->getOverline());
+		}
+		if($font->_flags & self::IS_SET_STRIKEOUT) {
+					$this->setStrikeout($font->getStrikeout());
+		}
+		if($font->_flags & self::IS_SET_UNDERLINE) {
+					$this->setUnderline($font->getUnderline());
+		}
+		if($font->_flags & self::IS_SET_SIZE) {
+					$this->setSize($font->getSize());
+		}
+		if($font->_flags & self::IS_SET_NAME) {
+					$this->setName($font->getName());
+		}
 	}
 
 	/**
@@ -283,27 +307,36 @@ 
 	 */
 	public function toString()
 	{
-		if($this->_flags === 0)
-			return '';
+		if($this->_flags === 0) {
+					return '';
+		}
 		$str = '';
-		if($this->_flags & self::IS_SET_BOLD)
-			$str .= 'font-weight:' . (($this->_flags & self::IS_BOLD)?'bold;':'normal;');
-		if($this->_flags & self::IS_SET_ITALIC)
-			$str .= 'font-style:' . (($this->_flags & self::IS_ITALIC)?'italic;':'normal;');
+		if($this->_flags & self::IS_SET_BOLD) {
+					$str .= 'font-weight:' . (($this->_flags & self::IS_BOLD)?'bold;':'normal;');
+		}
+		if($this->_flags & self::IS_SET_ITALIC) {
+					$str .= 'font-style:' . (($this->_flags & self::IS_ITALIC)?'italic;':'normal;');
+		}
 		$textDec = '';
-		if($this->_flags & self::IS_UNDERLINE)
-			$textDec .= 'underline';
-		if($this->_flags & self::IS_OVERLINE)
-			$textDec .= ' overline';
-		if($this->_flags & self::IS_STRIKEOUT)
-			$textDec .= ' line-through';
+		if($this->_flags & self::IS_UNDERLINE) {
+					$textDec .= 'underline';
+		}
+		if($this->_flags & self::IS_OVERLINE) {
+					$textDec .= ' overline';
+		}
+		if($this->_flags & self::IS_STRIKEOUT) {
+					$textDec .= ' line-through';
+		}
 		$textDec = ltrim($textDec);
-		if($textDec !== '')
-			$str .= 'text-decoration:' . $textDec . ';';
-		if($this->_size !== '')
-			$str .= 'font-size:' . $this->_size . ';';
-		if($this->_name !== '')
-			$str .= 'font-family:' . $this->_name . ';';
+		if($textDec !== '') {
+					$str .= 'text-decoration:' . $textDec . ';';
+		}
+		if($this->_size !== '') {
+					$str .= 'font-size:' . $this->_size . ';';
+		}
+		if($this->_name !== '') {
+					$str .= 'font-family:' . $this->_name . ';';
+		}
 		return $str;
 	}
 
@@ -313,25 +346,34 @@ 
 	 */
 	public function addAttributesToRender($writer)
 	{
-		if($this->_flags === 0)
-			return;
-		if($this->_flags & self::IS_SET_BOLD)
-			$writer->addStyleAttribute('font-weight', (($this->_flags & self::IS_BOLD)?'bold':'normal'));
-		if($this->_flags & self::IS_SET_ITALIC)
-			$writer->addStyleAttribute('font-style', (($this->_flags & self::IS_ITALIC)?'italic':'normal'));
+		if($this->_flags === 0) {
+					return;
+		}
+		if($this->_flags & self::IS_SET_BOLD) {
+					$writer->addStyleAttribute('font-weight', (($this->_flags & self::IS_BOLD)?'bold':'normal'));
+		}
+		if($this->_flags & self::IS_SET_ITALIC) {
+					$writer->addStyleAttribute('font-style', (($this->_flags & self::IS_ITALIC)?'italic':'normal'));
+		}
 		$textDec = '';
-		if($this->_flags & self::IS_UNDERLINE)
-			$textDec .= 'underline';
-		if($this->_flags & self::IS_OVERLINE)
-			$textDec .= ' overline';
-		if($this->_flags & self::IS_STRIKEOUT)
-			$textDec .= ' line-through';
+		if($this->_flags & self::IS_UNDERLINE) {
+					$textDec .= 'underline';
+		}
+		if($this->_flags & self::IS_OVERLINE) {
+					$textDec .= ' overline';
+		}
+		if($this->_flags & self::IS_STRIKEOUT) {
+					$textDec .= ' line-through';
+		}
 		$textDec = ltrim($textDec);
-		if($textDec !== '')
-			$writer->addStyleAttribute('text-decoration', $textDec);
-		if($this->_size !== '')
-			$writer->addStyleAttribute('font-size', $this->_size);
-		if($this->_name !== '')
-			$writer->addStyleAttribute('font-family', $this->_name);
+		if($textDec !== '') {
+					$writer->addStyleAttribute('text-decoration', $textDec);
+		}
+		if($this->_size !== '') {
+					$writer->addStyleAttribute('font-size', $this->_size);
+		}
+		if($this->_name !== '') {
+					$writer->addStyleAttribute('font-family', $this->_name);
+		}
 	}
 }