pradosoft / prado

framework/Web/UI/WebControls/THyperLinkColumn.php

Spacing +8 added lines, -8 removed lines

@@ -215,22 +215,22 @@ 
 	 */
 	public function initializeCell($cell, $columnIndex, $itemType)
 	{
-		if($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem || $itemType === TListItemType::EditItem)
+		if ($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem || $itemType === TListItemType::EditItem)
 		{
 			$link = new THyperLink;
-			if(($url = $this->getImageUrl()) !== '')
+			if (($url = $this->getImageUrl()) !== '')
 			{
 				$link->setImageUrl($url);
-				if(($width = $this->getImageWidth()) !== '')
+				if (($width = $this->getImageWidth()) !== '')
 					$link->setImageWidth($width);
-				if(($height = $this->getImageHeight()) !== '')
+				if (($height = $this->getImageHeight()) !== '')
 					$link->setImageHeight($height);
 			}
 			$link->setText($this->getText());
 			$link->setNavigateUrl($this->getNavigateUrl());
 			$link->setTarget($this->getTarget());
-			if($this->getDataTextField() !== '' || $this->getDataNavigateUrlField() !== '')
-				$link->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+			if ($this->getDataTextField() !== '' || $this->getDataNavigateUrlField() !== '')
+				$link->attachEventHandler('OnDataBinding', [$this, 'dataBindColumn']);
 			$cell->getControls()->add($link);
 			$cell->registerObject('HyperLink', $link);
 		}
@@ -247,13 +247,13 @@ 
 	{
 		$item = $sender->getNamingContainer();
 		$data = $item->getData();
-		if(($field = $this->getDataTextField()) !== '')
+		if (($field = $this->getDataTextField()) !== '')
 		{
 			$value = $this->getDataFieldValue($data, $field);
 			$text = $this->formatDataValue($this->getDataTextFormatString(), $value);
 			$sender->setText($text);
 		}
-		if(($field = $this->getDataNavigateUrlField()) !== '')
+		if (($field = $this->getDataNavigateUrlField()) !== '')
 		{
 			$value = $this->getDataFieldValue($data, $field);
 			$url = $this->formatDataValue($this->getDataNavigateUrlFormatString(), $value);

Braces +11 added lines, -8 removed lines

@@ -221,21 +221,24 @@
 			if(($url = $this->getImageUrl()) !== '')
 			{
 				$link->setImageUrl($url);
-				if(($width = $this->getImageWidth()) !== '')
-					$link->setImageWidth($width);
-				if(($height = $this->getImageHeight()) !== '')
-					$link->setImageHeight($height);
+				if(($width = $this->getImageWidth()) !== '') {
+									$link->setImageWidth($width);
+				}
+				if(($height = $this->getImageHeight()) !== '') {
+									$link->setImageHeight($height);
+				}
 			}
 			$link->setText($this->getText());
 			$link->setNavigateUrl($this->getNavigateUrl());
 			$link->setTarget($this->getTarget());
-			if($this->getDataTextField() !== '' || $this->getDataNavigateUrlField() !== '')
-				$link->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+			if($this->getDataTextField() !== '' || $this->getDataNavigateUrlField() !== '') {
+							$link->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+			}
 			$cell->getControls()->add($link);
 			$cell->registerObject('HyperLink', $link);
+		} else {
+					parent::initializeCell($cell, $columnIndex, $itemType);
 		}
-		else
-			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
 	/**

framework/Web/UI/WebControls/TInlineFrame.php

Spacing +12 added lines, -12 removed lines

@@ -162,7 +162,7 @@ 
 	 */
 	public function setWidth($value)
 	{
-	  if(($value = TPropertyValue::ensureInteger($value)) < 0)
+	  if (($value = TPropertyValue::ensureInteger($value)) < 0)
 		$value = -1;
 	  $this->setViewState('Width', $value, -1);
 	}
@@ -180,7 +180,7 @@ 
 	 */
 	public function setHeight($value)
 	{
-	  if(($value = TPropertyValue::ensureInteger($value)) < 0)
+	  if (($value = TPropertyValue::ensureInteger($value)) < 0)
 		$value = -1;
 	  $this->setViewState('Height', $value, -1);
 	}
@@ -200,7 +200,7 @@ 
 	 */
 	public function setMarginWidth($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			$value = -1;
 		$this->setViewState('MarginWidth', $value, -1);
 	}
@@ -220,7 +220,7 @@ 
 	 */
 	public function setMarginHeight($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			$value = -1;
 		$this->setViewState('MarginHeight', $value, -1);
 	}
@@ -232,25 +232,25 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if($this->getID() !== '')
+		if ($this->getID() !== '')
 			$writer->addAttribute('name', $this->getUniqueID());
 
-		if(($src = $this->getFrameUrl()) !== '')
+		if (($src = $this->getFrameUrl()) !== '')
 			$writer->addAttribute('src', $src);
 
-		if(($align = strtolower($this->getAlign())) !== 'notset')
+		if (($align = strtolower($this->getAlign())) !== 'notset')
 			$writer->addAttribute('align', $align);
 
 		$scrollBars = $this->getScrollBars();
-		if($scrollBars === TInlineFrameScrollBars::None)
+		if ($scrollBars === TInlineFrameScrollBars::None)
 			$writer->addAttribute('scrolling', 'no');
-		elseif($scrollBars === TInlineFrameScrollBars::Both)
+		elseif ($scrollBars === TInlineFrameScrollBars::Both)
 			$writer->addAttribute('scrolling', 'yes');
 
 		if (!$this->getShowBorder())
 			$writer->addAttribute('frameborder', '0');
 
-		if(($longdesc = $this->getDescriptionUrl()) !== '')
+		if (($longdesc = $this->getDescriptionUrl()) !== '')
 			$writer->addAttribute('longdesc', $longdesc);
 		
 		if (($width = $this->getWidth()) !== -1)
@@ -259,10 +259,10 @@ 
 		if (($height = $this->getHeight()) !== -1)
 		  $writer->addAttribute('height', $height);
 
-		if(($marginheight = $this->getMarginHeight()) !== -1)
+		if (($marginheight = $this->getMarginHeight()) !== -1)
 			$writer->addAttribute('marginheight', $marginheight);
 
-		if(($marginwidth = $this->getMarginWidth()) !== -1)
+		if (($marginwidth = $this->getMarginWidth()) !== -1)
 			$writer->addAttribute('marginwidth', $marginwidth);
 
 		parent::addAttributesToRender($writer);

Braces +44 added lines, -30 removed lines

@@ -162,8 +162,9 @@ 
 	 */
 	public function setWidth($value)
 	{
-	  if(($value = TPropertyValue::ensureInteger($value)) < 0)
-		$value = -1;
+	  if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+	  		$value = -1;
+	  }
 	  $this->setViewState('Width', $value, -1);
 	}
 	
@@ -180,8 +181,9 @@ 
 	 */
 	public function setHeight($value)
 	{
-	  if(($value = TPropertyValue::ensureInteger($value)) < 0)
-		$value = -1;
+	  if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+	  		$value = -1;
+	  }
 	  $this->setViewState('Height', $value, -1);
 	}
 	
@@ -200,8 +202,9 @@ 
 	 */
 	public function setMarginWidth($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					$value = -1;
+		}
 		$this->setViewState('MarginWidth', $value, -1);
 	}
 
@@ -220,8 +223,9 @@ 
 	 */
 	public function setMarginHeight($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					$value = -1;
+		}
 		$this->setViewState('MarginHeight', $value, -1);
 	}
 
@@ -232,38 +236,48 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if($this->getID() !== '')
-			$writer->addAttribute('name', $this->getUniqueID());
+		if($this->getID() !== '') {
+					$writer->addAttribute('name', $this->getUniqueID());
+		}
 
-		if(($src = $this->getFrameUrl()) !== '')
-			$writer->addAttribute('src', $src);
+		if(($src = $this->getFrameUrl()) !== '') {
+					$writer->addAttribute('src', $src);
+		}
 
-		if(($align = strtolower($this->getAlign())) !== 'notset')
-			$writer->addAttribute('align', $align);
+		if(($align = strtolower($this->getAlign())) !== 'notset') {
+					$writer->addAttribute('align', $align);
+		}
 
 		$scrollBars = $this->getScrollBars();
-		if($scrollBars === TInlineFrameScrollBars::None)
-			$writer->addAttribute('scrolling', 'no');
-		elseif($scrollBars === TInlineFrameScrollBars::Both)
-			$writer->addAttribute('scrolling', 'yes');
+		if($scrollBars === TInlineFrameScrollBars::None) {
+					$writer->addAttribute('scrolling', 'no');
+		} elseif($scrollBars === TInlineFrameScrollBars::Both) {
+					$writer->addAttribute('scrolling', 'yes');
+		}
 
-		if (!$this->getShowBorder())
-			$writer->addAttribute('frameborder', '0');
+		if (!$this->getShowBorder()) {
+					$writer->addAttribute('frameborder', '0');
+		}
 
-		if(($longdesc = $this->getDescriptionUrl()) !== '')
-			$writer->addAttribute('longdesc', $longdesc);
+		if(($longdesc = $this->getDescriptionUrl()) !== '') {
+					$writer->addAttribute('longdesc', $longdesc);
+		}
 		
-		if (($width = $this->getWidth()) !== -1)
-		  $writer->addAttribute('width', $width);
+		if (($width = $this->getWidth()) !== -1) {
+				  $writer->addAttribute('width', $width);
+		}
 		
-		if (($height = $this->getHeight()) !== -1)
-		  $writer->addAttribute('height', $height);
+		if (($height = $this->getHeight()) !== -1) {
+				  $writer->addAttribute('height', $height);
+		}
 
-		if(($marginheight = $this->getMarginHeight()) !== -1)
-			$writer->addAttribute('marginheight', $marginheight);
+		if(($marginheight = $this->getMarginHeight()) !== -1) {
+					$writer->addAttribute('marginheight', $marginheight);
+		}
 
-		if(($marginwidth = $this->getMarginWidth()) !== -1)
-			$writer->addAttribute('marginwidth', $marginwidth);
+		if(($marginwidth = $this->getMarginWidth()) !== -1) {
+					$writer->addAttribute('marginwidth', $marginwidth);
+		}
 
 		parent::addAttributesToRender($writer);
 	}

framework/Web/UI/WebControls/TKeyboard.php

Spacing +7 added lines, -7 removed lines

@@ -121,7 +121,7 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if($this->getPage()->getClientSupportsJavaScript())
+		if ($this->getPage()->getClientSupportsJavaScript())
 		{
 			$this->registerStyleSheet();
 			$this->registerClientScript();
@@ -136,7 +136,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		if($this->getPage()->getClientSupportsJavaScript())
+		if ($this->getPage()->getClientSupportsJavaScript())
 			$writer->addAttribute('id', $this->getClientID());
 	}
 
@@ -147,8 +147,8 @@ 
 	 */
 	protected function registerStyleSheet()
 	{
-		if(($url = $this->getCssUrl()) === '')
-			$url = $this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'keyboard.css');
+		if (($url = $this->getCssUrl()) === '')
+			$url = $this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'keyboard.css');
 		$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 	}
 
@@ -161,7 +161,7 @@ 
 		$className = $this->getClientClassName();
 		$cs = $this->getPage()->getClientScript();
 		$cs->registerPradoScript('keyboard');
-		$cs->registerEndScript('prado:' . $this->getClientID(), "new $className($options);");
+		$cs->registerEndScript('prado:'.$this->getClientID(), "new $className($options);");
 	}
 
 	/**
@@ -177,9 +177,9 @@ 
 	 */
 	protected function getClientOptions()
 	{
-		if(($forControl = $this->getForControl()) === '')
+		if (($forControl = $this->getForControl()) === '')
 			throw new TConfigurationException('keyboard_forcontrol_required');
-		if(($target = $this->findControl($forControl)) === null)
+		if (($target = $this->findControl($forControl)) === null)
 			throw new TConfigurationException('keyboard_forcontrol_invalid', $forControl);
 
 		$options['ID'] = $this->getClientID();

Braces +12 added lines, -8 removed lines

@@ -136,8 +136,9 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		if($this->getPage()->getClientSupportsJavaScript())
-			$writer->addAttribute('id', $this->getClientID());
+		if($this->getPage()->getClientSupportsJavaScript()) {
+					$writer->addAttribute('id', $this->getClientID());
+		}
 	}
 
 	/**
@@ -147,8 +148,9 @@ 
 	 */
 	protected function registerStyleSheet()
 	{
-		if(($url = $this->getCssUrl()) === '')
-			$url = $this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'keyboard.css');
+		if(($url = $this->getCssUrl()) === '') {
+					$url = $this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'keyboard.css');
+		}
 		$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 	}
 
@@ -177,10 +179,12 @@ 
 	 */
 	protected function getClientOptions()
 	{
-		if(($forControl = $this->getForControl()) === '')
-			throw new TConfigurationException('keyboard_forcontrol_required');
-		if(($target = $this->findControl($forControl)) === null)
-			throw new TConfigurationException('keyboard_forcontrol_invalid', $forControl);
+		if(($forControl = $this->getForControl()) === '') {
+					throw new TConfigurationException('keyboard_forcontrol_required');
+		}
+		if(($target = $this->findControl($forControl)) === null) {
+					throw new TConfigurationException('keyboard_forcontrol_invalid', $forControl);
+		}
 
 		$options['ID'] = $this->getClientID();
 		$options['ForControl'] = $target->getClientID();

framework/Web/UI/WebControls/TTemplateColumn.php

Spacing +19 added lines, -19 removed lines

@@ -112,7 +112,7 @@ 
 	 */
 	public function setEditItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
+		if ($value instanceof ITemplate || $value === null)
 			$this->_editItemTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('templatecolumn_template_required', 'EditItemTemplate');
@@ -132,7 +132,7 @@ 
 	 */
 	public function setItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
+		if ($value instanceof ITemplate || $value === null)
 			$this->_itemTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('templatecolumn_template_required', 'ItemTemplate');
@@ -152,7 +152,7 @@ 
 	 */
 	public function setHeaderTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
+		if ($value instanceof ITemplate || $value === null)
 			$this->_headerTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('templatecolumn_template_required', 'HeaderTemplate');
@@ -172,7 +172,7 @@ 
 	 */
 	public function setFooterTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
+		if ($value instanceof ITemplate || $value === null)
 			$this->_footerTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('templatecolumn_template_required', 'FooterTemplate');
@@ -189,11 +189,11 @@ 
 	 */
 	public function initializeCell($cell, $columnIndex, $itemType)
 	{
-		if($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem || $itemType === TListItemType::EditItem)
+		if ($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem || $itemType === TListItemType::EditItem)
 		{
-			if($itemType === TListItemType::EditItem)
+			if ($itemType === TListItemType::EditItem)
 			{
-				if(($classPath = $this->getEditItemRenderer()) === '' && ($template = $this->_editItemTemplate) === null)
+				if (($classPath = $this->getEditItemRenderer()) === '' && ($template = $this->_editItemTemplate) === null)
 				{
 					$classPath = $this->getItemRenderer();
 					$template = $this->_itemTemplate;
@@ -204,37 +204,37 @@ 
 				$template = $this->_itemTemplate;
 				$classPath = $this->getItemRenderer();
 			}
-			if($classPath !== '')
+			if ($classPath !== '')
 			{
 				$control = Prado::createComponent($classPath);
 				$cell->getControls()->add($control);
-				if($control instanceof IItemDataRenderer)
+				if ($control instanceof IItemDataRenderer)
 				{
 					$control->setItemIndex($cell->getParent()->getItemIndex());
 					$control->setItemType($itemType);
 				}
-				if($control instanceof \Prado\IDataRenderer)
-					$control->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+				if ($control instanceof \Prado\IDataRenderer)
+					$control->attachEventHandler('OnDataBinding', [$this, 'dataBindColumn']);
 			}
-			elseif($template !== null)
+			elseif ($template !== null)
 				$template->instantiateIn($cell);
-			elseif($itemType !== TListItemType::EditItem)
+			elseif ($itemType !== TListItemType::EditItem)
 				$cell->setText(' ');
 		}
-		elseif($itemType === TListItemType::Header)
+		elseif ($itemType === TListItemType::Header)
 		{
-			if(($classPath = $this->getHeaderRenderer()) !== '')
+			if (($classPath = $this->getHeaderRenderer()) !== '')
 				$this->initializeHeaderCell($cell, $columnIndex);
-			elseif($this->_headerTemplate !== null)
+			elseif ($this->_headerTemplate !== null)
 				$this->_headerTemplate->instantiateIn($cell);
 			else
 				$this->initializeHeaderCell($cell, $columnIndex);
 		}
-		elseif($itemType === TListItemType::Footer)
+		elseif ($itemType === TListItemType::Footer)
 		{
-			if(($classPath = $this->getFooterRenderer()) !== '')
+			if (($classPath = $this->getFooterRenderer()) !== '')
 				$this->initializeFooterCell($cell, $columnIndex);
-			elseif($this->_footerTemplate !== null)
+			elseif ($this->_footerTemplate !== null)
 				$this->_footerTemplate->instantiateIn($cell);
 			else
 				$this->initializeFooterCell($cell, $columnIndex);

Braces +44 added lines, -40 removed lines

@@ -112,10 +112,11 @@ 
 	 */
 	public function setEditItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
-			$this->_editItemTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('templatecolumn_template_required', 'EditItemTemplate');
+		if($value instanceof ITemplate || $value === null) {
+					$this->_editItemTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('templatecolumn_template_required', 'EditItemTemplate');
+		}
 	}
 
 	/**
@@ -132,10 +133,11 @@ 
 	 */
 	public function setItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
-			$this->_itemTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('templatecolumn_template_required', 'ItemTemplate');
+		if($value instanceof ITemplate || $value === null) {
+					$this->_itemTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('templatecolumn_template_required', 'ItemTemplate');
+		}
 	}
 
 	/**
@@ -152,10 +154,11 @@ 
 	 */
 	public function setHeaderTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
-			$this->_headerTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('templatecolumn_template_required', 'HeaderTemplate');
+		if($value instanceof ITemplate || $value === null) {
+					$this->_headerTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('templatecolumn_template_required', 'HeaderTemplate');
+		}
 	}
 
 	/**
@@ -172,10 +175,11 @@ 
 	 */
 	public function setFooterTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
-			$this->_footerTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('templatecolumn_template_required', 'FooterTemplate');
+		if($value instanceof ITemplate || $value === null) {
+					$this->_footerTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('templatecolumn_template_required', 'FooterTemplate');
+		}
 	}
 
 	/**
@@ -198,8 +202,7 @@ 
 					$classPath = $this->getItemRenderer();
 					$template = $this->_itemTemplate;
 				}
-			}
-			else
+			} else
 			{
 				$template = $this->_itemTemplate;
 				$classPath = $this->getItemRenderer();
@@ -213,31 +216,32 @@ 
 					$control->setItemIndex($cell->getParent()->getItemIndex());
 					$control->setItemType($itemType);
 				}
-				if($control instanceof \Prado\IDataRenderer)
-					$control->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+				if($control instanceof \Prado\IDataRenderer) {
+									$control->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+				}
+			} elseif($template !== null) {
+							$template->instantiateIn($cell);
+			} elseif($itemType !== TListItemType::EditItem) {
+							$cell->setText(' ');
 			}
-			elseif($template !== null)
-				$template->instantiateIn($cell);
-			elseif($itemType !== TListItemType::EditItem)
-				$cell->setText(' ');
-		}
-		elseif($itemType === TListItemType::Header)
+		} elseif($itemType === TListItemType::Header)
 		{
-			if(($classPath = $this->getHeaderRenderer()) !== '')
-				$this->initializeHeaderCell($cell, $columnIndex);
-			elseif($this->_headerTemplate !== null)
-				$this->_headerTemplate->instantiateIn($cell);
-			else
-				$this->initializeHeaderCell($cell, $columnIndex);
-		}
-		elseif($itemType === TListItemType::Footer)
+			if(($classPath = $this->getHeaderRenderer()) !== '') {
+							$this->initializeHeaderCell($cell, $columnIndex);
+			} elseif($this->_headerTemplate !== null) {
+							$this->_headerTemplate->instantiateIn($cell);
+			} else {
+							$this->initializeHeaderCell($cell, $columnIndex);
+			}
+		} elseif($itemType === TListItemType::Footer)
 		{
-			if(($classPath = $this->getFooterRenderer()) !== '')
-				$this->initializeFooterCell($cell, $columnIndex);
-			elseif($this->_footerTemplate !== null)
-				$this->_footerTemplate->instantiateIn($cell);
-			else
-				$this->initializeFooterCell($cell, $columnIndex);
+			if(($classPath = $this->getFooterRenderer()) !== '') {
+							$this->initializeFooterCell($cell, $columnIndex);
+			} elseif($this->_footerTemplate !== null) {
+							$this->_footerTemplate->instantiateIn($cell);
+			} else {
+							$this->initializeFooterCell($cell, $columnIndex);
+			}
 		}
 	}
 

framework/Web/UI/WebControls/TPanelStyle.php

Spacing +24 added lines, -24 removed lines

@@ -72,10 +72,10 @@ 
 	 */
 	public function addAttributesToRender($writer)
 	{
-		if(($url = trim($this->getBackImageUrl())) !== '')
-			$this->setStyleField('background-image', 'url(' . $url . ')');
+		if (($url = trim($this->getBackImageUrl())) !== '')
+			$this->setStyleField('background-image', 'url('.$url.')');
 
-		switch($this->getScrollBars())
+		switch ($this->getScrollBars())
 		{
 			case TScrollBars::Horizontal: $this->setStyleField('overflow-x', 'scroll'); break;
 			case TScrollBars::Vertical: $this->setStyleField('overflow-y', 'scroll'); break;
@@ -83,15 +83,15 @@ 
 			case TScrollBars::Auto: $this->setStyleField('overflow', 'auto'); break;
 		}
 
-		if(($align = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet)
+		if (($align = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet)
 			$this->setStyleField('text-align', strtolower($align));
 
-		if(!$this->getWrap())
+		if (!$this->getWrap())
 			$this->setStyleField('white-space', 'nowrap');
 
-		if(($direction = $this->getDirection()) !== TContentDirection::NotSet)
+		if (($direction = $this->getDirection()) !== TContentDirection::NotSet)
 		{
-			if($direction === TContentDirection::LeftToRight)
+			if ($direction === TContentDirection::LeftToRight)
 				$this->setStyleField('direction', 'ltr');
 			else
 				$this->setStyleField('direction', 'rtl');
@@ -105,7 +105,7 @@ 
 	 */
 	public function getBackImageUrl()
 	{
-		return $this->_backImageUrl === null?'':$this->_backImageUrl;
+		return $this->_backImageUrl === null ? '' : $this->_backImageUrl;
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function getDirection()
 	{
-		return $this->_direction === null?TContentDirection::NotSet:$this->_direction;
+		return $this->_direction === null ?TContentDirection::NotSet : $this->_direction;
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 	 */
 	public function getWrap()
 	{
-		return $this->_wrap === null?true:$this->_wrap;
+		return $this->_wrap === null ?true:$this->_wrap;
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		return $this->_horizontalAlign === null?THorizontalAlign::NotSet:$this->_horizontalAlign;
+		return $this->_horizontalAlign === null ?THorizontalAlign::NotSet : $this->_horizontalAlign;
 	}
 
 	/**
@@ -172,7 +172,7 @@ 
 	 */
 	public function getScrollBars()
 	{
-		return $this->_scrollBars === null?TScrollBars::None:$this->_scrollBars;
+		return $this->_scrollBars === null ?TScrollBars::None : $this->_scrollBars;
 	}
 
 	/**
@@ -207,17 +207,17 @@ 
 	public function copyFrom($style)
 	{
 		parent::copyFrom($style);
-		if($style instanceof TPanelStyle)
+		if ($style instanceof TPanelStyle)
 		{
-			if($style->_backImageUrl !== null)
+			if ($style->_backImageUrl !== null)
 				$this->_backImageUrl = $style->_backImageUrl;
-			if($style->_direction !== null)
+			if ($style->_direction !== null)
 				$this->_direction = $style->_direction;
-			if($style->_horizontalAlign !== null)
+			if ($style->_horizontalAlign !== null)
 				$this->_horizontalAlign = $style->_horizontalAlign;
-			if($style->_scrollBars !== null)
+			if ($style->_scrollBars !== null)
 				$this->_scrollBars = $style->_scrollBars;
-			if($style->_wrap !== null)
+			if ($style->_wrap !== null)
 				$this->_wrap = $style->_wrap;
 		}
 	}
@@ -231,17 +231,17 @@ 
 	public function mergeWith($style)
 	{
 		parent::mergeWith($style);
-		if($style instanceof TPanelStyle)
+		if ($style instanceof TPanelStyle)
 		{
-			if($this->_backImageUrl === null && $style->_backImageUrl !== null)
+			if ($this->_backImageUrl === null && $style->_backImageUrl !== null)
 				$this->_backImageUrl = $style->_backImageUrl;
-			if($this->_direction === null && $style->_direction !== null)
+			if ($this->_direction === null && $style->_direction !== null)
 				$this->_direction = $style->_direction;
-			if($this->_horizontalAlign === null && $style->_horizontalAlign !== null)
+			if ($this->_horizontalAlign === null && $style->_horizontalAlign !== null)
 				$this->_horizontalAlign = $style->_horizontalAlign;
-			if($this->_scrollBars === null && $style->_scrollBars !== null)
+			if ($this->_scrollBars === null && $style->_scrollBars !== null)
 				$this->_scrollBars = $style->_scrollBars;
-			if($this->_wrap === null && $style->_wrap !== null)
+			if ($this->_wrap === null && $style->_wrap !== null)
 				$this->_wrap = $style->_wrap;
 		}
 	}

Braces +59 added lines, -40 removed lines

@@ -53,16 +53,21 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_backImageUrl === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TPanelStyle\0_backImageUrl";
-		if ($this->_direction === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TPanelStyle\0_direction";
-		if ($this->_horizontalAlign === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TPanelStyle\0_horizontalAlign";
-		if ($this->_scrollBars === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TPanelStyle\0_scrollBars";
-		if ($this->_wrap === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TPanelStyle\0_wrap";
+		if ($this->_backImageUrl === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TPanelStyle\0_backImageUrl";
+		}
+		if ($this->_direction === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TPanelStyle\0_direction";
+		}
+		if ($this->_horizontalAlign === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TPanelStyle\0_horizontalAlign";
+		}
+		if ($this->_scrollBars === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TPanelStyle\0_scrollBars";
+		}
+		if ($this->_wrap === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TPanelStyle\0_wrap";
+		}
 	}
 
 	/**
@@ -72,8 +77,9 @@ 
 	 */
 	public function addAttributesToRender($writer)
 	{
-		if(($url = trim($this->getBackImageUrl())) !== '')
-			$this->setStyleField('background-image', 'url(' . $url . ')');
+		if(($url = trim($this->getBackImageUrl())) !== '') {
+					$this->setStyleField('background-image', 'url(' . $url . ')');
+		}
 
 		switch($this->getScrollBars())
 		{
@@ -83,18 +89,21 @@ 
 			case TScrollBars::Auto: $this->setStyleField('overflow', 'auto'); break;
 		}
 
-		if(($align = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet)
-			$this->setStyleField('text-align', strtolower($align));
+		if(($align = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet) {
+					$this->setStyleField('text-align', strtolower($align));
+		}
 
-		if(!$this->getWrap())
-			$this->setStyleField('white-space', 'nowrap');
+		if(!$this->getWrap()) {
+					$this->setStyleField('white-space', 'nowrap');
+		}
 
 		if(($direction = $this->getDirection()) !== TContentDirection::NotSet)
 		{
-			if($direction === TContentDirection::LeftToRight)
-				$this->setStyleField('direction', 'ltr');
-			else
-				$this->setStyleField('direction', 'rtl');
+			if($direction === TContentDirection::LeftToRight) {
+							$this->setStyleField('direction', 'ltr');
+			} else {
+							$this->setStyleField('direction', 'rtl');
+			}
 		}
 
 		parent::addAttributesToRender($writer);
@@ -209,16 +218,21 @@ 
 		parent::copyFrom($style);
 		if($style instanceof TPanelStyle)
 		{
-			if($style->_backImageUrl !== null)
-				$this->_backImageUrl = $style->_backImageUrl;
-			if($style->_direction !== null)
-				$this->_direction = $style->_direction;
-			if($style->_horizontalAlign !== null)
-				$this->_horizontalAlign = $style->_horizontalAlign;
-			if($style->_scrollBars !== null)
-				$this->_scrollBars = $style->_scrollBars;
-			if($style->_wrap !== null)
-				$this->_wrap = $style->_wrap;
+			if($style->_backImageUrl !== null) {
+							$this->_backImageUrl = $style->_backImageUrl;
+			}
+			if($style->_direction !== null) {
+							$this->_direction = $style->_direction;
+			}
+			if($style->_horizontalAlign !== null) {
+							$this->_horizontalAlign = $style->_horizontalAlign;
+			}
+			if($style->_scrollBars !== null) {
+							$this->_scrollBars = $style->_scrollBars;
+			}
+			if($style->_wrap !== null) {
+							$this->_wrap = $style->_wrap;
+			}
 		}
 	}
 
@@ -233,16 +247,21 @@ 
 		parent::mergeWith($style);
 		if($style instanceof TPanelStyle)
 		{
-			if($this->_backImageUrl === null && $style->_backImageUrl !== null)
-				$this->_backImageUrl = $style->_backImageUrl;
-			if($this->_direction === null && $style->_direction !== null)
-				$this->_direction = $style->_direction;
-			if($this->_horizontalAlign === null && $style->_horizontalAlign !== null)
-				$this->_horizontalAlign = $style->_horizontalAlign;
-			if($this->_scrollBars === null && $style->_scrollBars !== null)
-				$this->_scrollBars = $style->_scrollBars;
-			if($this->_wrap === null && $style->_wrap !== null)
-				$this->_wrap = $style->_wrap;
+			if($this->_backImageUrl === null && $style->_backImageUrl !== null) {
+							$this->_backImageUrl = $style->_backImageUrl;
+			}
+			if($this->_direction === null && $style->_direction !== null) {
+							$this->_direction = $style->_direction;
+			}
+			if($this->_horizontalAlign === null && $style->_horizontalAlign !== null) {
+							$this->_horizontalAlign = $style->_horizontalAlign;
+			}
+			if($this->_scrollBars === null && $style->_scrollBars !== null) {
+							$this->_scrollBars = $style->_scrollBars;
+			}
+			if($this->_wrap === null && $style->_wrap !== null) {
+							$this->_wrap = $style->_wrap;
+			}
 		}
 	}
 }
\ No newline at end of file

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