pradosoft / prado

framework/Web/UI/WebControls/TCheckBoxList.php

Spacing +20 added lines, -20 removed lines

@@ -121,7 +121,7 @@ 
 	 */
 	protected function getRepeatInfo()
 	{
-		if(($repeatInfo = $this->getViewState('RepeatInfo', null)) === null)
+		if (($repeatInfo = $this->getViewState('RepeatInfo', null)) === null)
 		{
 			$repeatInfo = new TRepeatInfo;
 			$this->setViewState('RepeatInfo', $repeatInfo, null);
@@ -182,7 +182,7 @@ 
 	 */
 	public function getCellSpacing()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getCellSpacing();
 		else
 			return -1;
@@ -202,7 +202,7 @@ 
 	 */
 	public function getCellPadding()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getCellPadding();
 		else
 			return -1;
@@ -258,16 +258,16 @@ 
 		// and it's a callback,
 		// and we can update clientside,
 		// then update the 'disabled' attribute of the items.
-		if(($this instanceof IActiveControl) &&
+		if (($this instanceof IActiveControl) &&
 				$this->getPage()->getIsCallBack() &&
 				$this->getActiveControl()->canUpdateClientSide())
 		{
 			$items = $this->getItems();
 			$cs = $this->getPage()->getCallbackClient();
-			$baseClientID = $this->getClientID() . '_c';
-			foreach($items as $index => $item)
+			$baseClientID = $this->getClientID().'_c';
+			foreach ($items as $index => $item)
 			{
-				$cs->setAttribute($baseClientID . $index, 'disabled', $value);
+				$cs->setAttribute($baseClientID.$index, 'disabled', $value);
 			}
 		}
 	}
@@ -296,9 +296,9 @@ 
 	{
 		$repeatedControl = $this->_repeatedControl;
 		$item = $this->getItems()->itemAt($index);
-		if($item->getHasAttributes())
+		if ($item->getHasAttributes())
 			$repeatedControl->getAttributes()->copyFrom($item->getAttributes());
-		elseif($repeatedControl->getHasAttributes())
+		elseif ($repeatedControl->getHasAttributes())
 			$repeatedControl->getAttributes()->clear();
 		$repeatedControl->setID("c$index");
 		$repeatedControl->setText($item->getText());
@@ -318,20 +318,20 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		if($this->getEnabled(true))
+		if ($this->getEnabled(true))
 		{
-			$index = (int)substr($key, strlen($this->getUniqueID()) + 2);
+			$index = (int) substr($key, strlen($this->getUniqueID()) + 2);
 			$this->ensureDataBound();
-			if($index >= 0 && $index < $this->getItemCount())
+			if ($index >= 0 && $index < $this->getItemCount())
 			{
 				$item = $this->getItems()->itemAt($index);
-				if($item->getEnabled())
+				if ($item->getEnabled())
 				{
 					$checked = isset($values[$key]);
-					if($item->getSelected() !== $checked)
+					if ($item->getSelected() !== $checked)
 					{
 						$item->setSelected($checked);
-						if(!$this->_changedEventRaised)
+						if (!$this->_changedEventRaised)
 						{
 							$this->_changedEventRaised = true;
 							return $this->_dataChanged = true;
@@ -352,7 +352,7 @@ 
 	 */
 	public function raisePostDataChangedEvent()
 	{
-		if($this->getAutoPostBack() && $this->getCausesValidation())
+		if ($this->getAutoPostBack() && $this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
 		$this->onSelectedIndexChanged(null);
 	}
@@ -370,7 +370,7 @@ 
 		$this->_repeatedControl->setValidationGroup($this->getValidationGroup());
 		$page = $this->getPage();
 		$n = $this->getItemCount();
-		for($i = 0;$i < $n;++$i)
+		for ($i = 0; $i < $n; ++$i)
 		{
 			$this->_repeatedControl->setID("c$i");
 			$page->registerRequiresPostData($this->_repeatedControl);
@@ -382,7 +382,7 @@ 
 	 *
 	 *@return boolean true if we need a span
 	 */
-	protected function getSpanNeeded ()
+	protected function getSpanNeeded()
 	{
 		return $this->getRepeatLayout() === TRepeatLayout::Raw;
 	}
@@ -399,7 +399,7 @@ 
 		$writer->addAttribute('id', $this->getClientId());
 		$writer->renderBeginTag('span');
 	  }
-		if($this->getItemCount() > 0)
+		if ($this->getItemCount() > 0)
 		{
 			$this->_isEnabled = $this->getEnabled(true);
 			$repeatInfo = $this->getRepeatInfo();
@@ -419,7 +419,7 @@ 
 		  $writer->renderEndTag();
 
 		//checkbox skipped the client control script in addAttributesToRender
-		if($this->getEnabled(true)
+		if ($this->getEnabled(true)
 			&& $this->getEnableClientScript()
 			&& $this->getAutoPostBack()
 			&& $this->getPage()->getClientSupportsJavaScript())

Braces +24 added lines, -18 removed lines

@@ -76,8 +76,9 @@ 
 	 */
 	public function findControl($id, $real = false)
 	{
-		if ($real === true)
-			return parent::findControl($id);
+		if ($real === true) {
+					return parent::findControl($id);
+		}
 		return $this;
 	}
 
@@ -182,10 +183,11 @@ 
 	 */
 	public function getCellSpacing()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getCellSpacing();
-		else
-			return -1;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getCellSpacing();
+		} else {
+					return -1;
+		}
 	}
 
 	/**
@@ -202,10 +204,11 @@ 
 	 */
 	public function getCellPadding()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getCellPadding();
-		else
-			return -1;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getCellPadding();
+		} else {
+					return -1;
+		}
 	}
 
 	/**
@@ -296,10 +299,11 @@ 
 	{
 		$repeatedControl = $this->_repeatedControl;
 		$item = $this->getItems()->itemAt($index);
-		if($item->getHasAttributes())
-			$repeatedControl->getAttributes()->copyFrom($item->getAttributes());
-		elseif($repeatedControl->getHasAttributes())
-			$repeatedControl->getAttributes()->clear();
+		if($item->getHasAttributes()) {
+					$repeatedControl->getAttributes()->copyFrom($item->getAttributes());
+		} elseif($repeatedControl->getHasAttributes()) {
+					$repeatedControl->getAttributes()->clear();
+		}
 		$repeatedControl->setID("c$index");
 		$repeatedControl->setText($item->getText());
 		$repeatedControl->setChecked($item->getSelected());
@@ -352,8 +356,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);
 	}
 
@@ -415,8 +420,9 @@ 
 			$this->setAccessKey($accessKey);
 			$this->setTabIndex($tabIndex);
 		}
-		if ($needSpan)
-		  $writer->renderEndTag();
+		if ($needSpan) {
+				  $writer->renderEndTag();
+		}
 
 		//checkbox skipped the client control script in addAttributesToRender
 		if($this->getEnabled(true)

framework/Web/UI/WebControls/TPanel.php

Spacing +5 added lines, -5 removed lines

@@ -70,7 +70,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		if(($butt = $this->getDefaultButton()) !== '')
+		if (($butt = $this->getDefaultButton()) !== '')
 			$writer->addAttribute('id', $this->getClientID());
 	}
 
@@ -203,7 +203,7 @@ 
 	public function renderBeginTag($writer)
 	{
 		parent::renderBeginTag($writer);
-		if(($text = $this->getGroupingText()) !== '')
+		if (($text = $this->getGroupingText()) !== '')
 		{
 			$writer->renderBeginTag('fieldset');
 			$writer->renderBeginTag('legend');
@@ -218,7 +218,7 @@ 
 	 */
 	public function renderEndTag($writer)
 	{
-		if($this->getGroupingText() !== '')
+		if ($this->getGroupingText() !== '')
 			$writer->renderEndTag();
 		parent::renderEndTag($writer);
 	}
@@ -227,9 +227,9 @@ 
 	{
 		parent::render($writer);
 
-		if(($butt = $this->getDefaultButton()) !== '')
+		if (($butt = $this->getDefaultButton()) !== '')
 		{
-			if(($button = $this->findControl($butt)) === null)
+			if (($button = $this->findControl($butt)) === null)
 				throw new TInvalidDataValueException('panel_defaultbutton_invalid', $butt);
 			else
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);

Braces +11 added lines, -8 removed lines

@@ -70,8 +70,9 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		if(($butt = $this->getDefaultButton()) !== '')
-			$writer->addAttribute('id', $this->getClientID());
+		if(($butt = $this->getDefaultButton()) !== '') {
+					$writer->addAttribute('id', $this->getClientID());
+		}
 	}
 
 	/**
@@ -218,8 +219,9 @@ 
 	 */
 	public function renderEndTag($writer)
 	{
-		if($this->getGroupingText() !== '')
-			$writer->renderEndTag();
+		if($this->getGroupingText() !== '') {
+					$writer->renderEndTag();
+		}
 		parent::renderEndTag($writer);
 	}
 
@@ -229,10 +231,11 @@ 
 
 		if(($butt = $this->getDefaultButton()) !== '')
 		{
-			if(($button = $this->findControl($butt)) === null)
-				throw new TInvalidDataValueException('panel_defaultbutton_invalid', $butt);
-			else
-				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
+			if(($button = $this->findControl($butt)) === null) {
+							throw new TInvalidDataValueException('panel_defaultbutton_invalid', $butt);
+			} else {
+							$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
+			}
 		}
 	}
 }

framework/Web/UI/WebControls/TWebControlDecorator.php

Spacing +17 added lines, -17 removed lines

@@ -163,7 +163,7 @@ 
 	 * @param string sets the text before the open tag in the TWebControl
 	 */
 	public function setPreTagText($value) {
-		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
+		if (!$this->_internalonly && !$this->_control->getIsSkinApplied())
 			$this->_pretagtext = TPropertyValue::ensureString($value);
 	}
 
@@ -179,7 +179,7 @@ 
 	 * @param string sets the text after the open tag in the TWebControl
 	 */
 	public function setPreContentsText($value) {
-		if(!$this->_control->getIsSkinApplied())
+		if (!$this->_control->getIsSkinApplied())
 			$this->_precontentstext = TPropertyValue::ensureString($value);
 	}
 
@@ -195,7 +195,7 @@ 
 	 * @param string sets the text before the close tag in the TWebControl
 	 */
 	public function setPostContentsText($value) {
-		if(!$this->_control->getIsSkinApplied())
+		if (!$this->_control->getIsSkinApplied())
 			$this->_postcontentstext = TPropertyValue::ensureString($value);
 	}
 
@@ -211,7 +211,7 @@ 
 	 * @param string sets the text after the close tag in the TWebControl
 	 */
 	public function setPostTagText($value) {
-		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
+		if (!$this->_internalonly && !$this->_control->getIsSkinApplied())
 			$this->_posttagtext = TPropertyValue::ensureString($value);
 	}
 
@@ -227,7 +227,7 @@ 
 	 * @param TTemplate sets the template before the open tag in the TWebControl
 	 */
 	public function setPreTagTemplate($value) {
-		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
+		if (!$this->_internalonly && !$this->_control->getIsSkinApplied())
 			$this->_pretagtemplate = $value;
 	}
 
@@ -243,7 +243,7 @@ 
 	 * @param TTemplate sets the template after the open tag in the TWebControl
 	 */
 	public function setPreContentsTemplate($value) {
-		if(!$this->_control->getIsSkinApplied())
+		if (!$this->_control->getIsSkinApplied())
 			$this->_precontentstemplate = $value;
 	}
 
@@ -259,7 +259,7 @@ 
 	 * @param TTemplate sets the template before the close tag in the TWebControl
 	 */
 	public function setPostContentsTemplate($value) {
-		if(!$this->_control->getIsSkinApplied())
+		if (!$this->_control->getIsSkinApplied())
 			$this->_postcontentstemplate = $value;
 	}
 
@@ -275,7 +275,7 @@ 
 	 * @param TTemplate sets the template before the close tag in the TWebControl
 	 */
 	public function setPostTagTemplate($value) {
-		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
+		if (!$this->_internalonly && !$this->_control->getIsSkinApplied())
 			$this->_posttagtemplate = $value;
 	}
 
@@ -286,11 +286,11 @@ 
 	 * these controls don't have page states.  This is as close to not influencing the page as possible.
 	 */
 	public function instantiate($outercontrol = null) {
-		if($this->getPreTagTemplate() || $this->getPreContentsTemplate() ||
+		if ($this->getPreTagTemplate() || $this->getPreContentsTemplate() ||
 			$this->getPostContentsTemplate() || $this->getPostTagTemplate()) {
 
 			$this->_outercontrol = $outercontrol;
-			if($this->getUseState())
+			if ($this->getUseState())
 				$this->ensureTemplateDecoration();
 			else
 				$this->_control->getPage()->onSaveStateComplete[] = [$this, 'ensureTemplateDecoration'];
@@ -310,40 +310,40 @@ 
 
 		$control = $this->_control;
 		$outercontrol = $this->_outercontrol;
-		if($outercontrol === null)
+		if ($outercontrol === null)
 			$outercontrol = $control;
 
-		if($this->_addedTemplateDecoration)
+		if ($this->_addedTemplateDecoration)
 			return $this->_addedTemplateDecoration;
 
 		$this->_addedTemplateDecoration = true;
 
-		if($this->getPreContentsTemplate())
+		if ($this->getPreContentsTemplate())
 		{
 			$precontents = new TCompositeControl;
 			$this->getPreContentsTemplate()->instantiateIn($precontents);
 			$control->getControls()->insertAt(0, $precontents);
 		}
 
-		if($this->getPostContentsTemplate())
+		if ($this->getPostContentsTemplate())
 		{
 			$postcontents = new TCompositeControl;
 			$this->getPostContentsTemplate()->instantiateIn($postcontents);
 			$control->getControls()->add($postcontents);
 		}
 
-		if(!$outercontrol->getParent())
+		if (!$outercontrol->getParent())
 			return $this->_addedTemplateDecoration;
 
 
-		if($this->getPreTagTemplate())
+		if ($this->getPreTagTemplate())
 		{
 			$pretag = new TCompositeControl;
 			$this->getPreTagTemplate()->instantiateIn($pretag);
 			$outercontrol->getParent()->getControls()->insertBefore($outercontrol, $pretag);
 		}
 
-		if($this->getPostTagTemplate())
+		if ($this->getPostTagTemplate())
 		{
 			$posttag = new TCompositeControl;
 			$this->getPostTagTemplate()->instantiateIn($posttag);

Braces +38 added lines, -26 removed lines

@@ -163,8 +163,9 @@ 
 	 * @param string sets the text before the open tag in the TWebControl
 	 */
 	public function setPreTagText($value) {
-		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
-			$this->_pretagtext = TPropertyValue::ensureString($value);
+		if(!$this->_internalonly && !$this->_control->getIsSkinApplied()) {
+					$this->_pretagtext = TPropertyValue::ensureString($value);
+		}
 	}
 
 
@@ -179,8 +180,9 @@ 
 	 * @param string sets the text after the open tag in the TWebControl
 	 */
 	public function setPreContentsText($value) {
-		if(!$this->_control->getIsSkinApplied())
-			$this->_precontentstext = TPropertyValue::ensureString($value);
+		if(!$this->_control->getIsSkinApplied()) {
+					$this->_precontentstext = TPropertyValue::ensureString($value);
+		}
 	}
 
 
@@ -195,8 +197,9 @@ 
 	 * @param string sets the text before the close tag in the TWebControl
 	 */
 	public function setPostContentsText($value) {
-		if(!$this->_control->getIsSkinApplied())
-			$this->_postcontentstext = TPropertyValue::ensureString($value);
+		if(!$this->_control->getIsSkinApplied()) {
+					$this->_postcontentstext = TPropertyValue::ensureString($value);
+		}
 	}
 
 
@@ -211,8 +214,9 @@ 
 	 * @param string sets the text after the close tag in the TWebControl
 	 */
 	public function setPostTagText($value) {
-		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
-			$this->_posttagtext = TPropertyValue::ensureString($value);
+		if(!$this->_internalonly && !$this->_control->getIsSkinApplied()) {
+					$this->_posttagtext = TPropertyValue::ensureString($value);
+		}
 	}
 
 
@@ -227,8 +231,9 @@ 
 	 * @param TTemplate sets the template before the open tag in the TWebControl
 	 */
 	public function setPreTagTemplate($value) {
-		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
-			$this->_pretagtemplate = $value;
+		if(!$this->_internalonly && !$this->_control->getIsSkinApplied()) {
+					$this->_pretagtemplate = $value;
+		}
 	}
 
 
@@ -243,8 +248,9 @@ 
 	 * @param TTemplate sets the template after the open tag in the TWebControl
 	 */
 	public function setPreContentsTemplate($value) {
-		if(!$this->_control->getIsSkinApplied())
-			$this->_precontentstemplate = $value;
+		if(!$this->_control->getIsSkinApplied()) {
+					$this->_precontentstemplate = $value;
+		}
 	}
 
 
@@ -259,8 +265,9 @@ 
 	 * @param TTemplate sets the template before the close tag in the TWebControl
 	 */
 	public function setPostContentsTemplate($value) {
-		if(!$this->_control->getIsSkinApplied())
-			$this->_postcontentstemplate = $value;
+		if(!$this->_control->getIsSkinApplied()) {
+					$this->_postcontentstemplate = $value;
+		}
 	}
 
 
@@ -275,8 +282,9 @@ 
 	 * @param TTemplate sets the template before the close tag in the TWebControl
 	 */
 	public function setPostTagTemplate($value) {
-		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
-			$this->_posttagtemplate = $value;
+		if(!$this->_internalonly && !$this->_control->getIsSkinApplied()) {
+					$this->_posttagtemplate = $value;
+		}
 	}
 
 	/**
@@ -290,10 +298,11 @@ 
 			$this->getPostContentsTemplate() || $this->getPostTagTemplate()) {
 
 			$this->_outercontrol = $outercontrol;
-			if($this->getUseState())
-				$this->ensureTemplateDecoration();
-			else
-				$this->_control->getPage()->onSaveStateComplete[] = [$this, 'ensureTemplateDecoration'];
+			if($this->getUseState()) {
+							$this->ensureTemplateDecoration();
+			} else {
+							$this->_control->getPage()->onSaveStateComplete[] = [$this, 'ensureTemplateDecoration'];
+			}
 		}
 	}
 
@@ -310,11 +319,13 @@ 
 
 		$control = $this->_control;
 		$outercontrol = $this->_outercontrol;
-		if($outercontrol === null)
-			$outercontrol = $control;
+		if($outercontrol === null) {
+					$outercontrol = $control;
+		}
 
-		if($this->_addedTemplateDecoration)
-			return $this->_addedTemplateDecoration;
+		if($this->_addedTemplateDecoration) {
+					return $this->_addedTemplateDecoration;
+		}
 
 		$this->_addedTemplateDecoration = true;
 
@@ -332,8 +343,9 @@ 
 			$control->getControls()->add($postcontents);
 		}
 
-		if(!$outercontrol->getParent())
-			return $this->_addedTemplateDecoration;
+		if(!$outercontrol->getParent()) {
+					return $this->_addedTemplateDecoration;
+		}
 
 
 		if($this->getPreTagTemplate())

framework/Web/UI/WebControls/TStatements.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 	 */
 	public function render($writer)
 	{
-		if($this->_s !== '')
+		if ($this->_s !== '')
 			$writer->write($this->evaluateStatements($this->_s));
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -56,8 +56,9 @@
 	 */
 	public function render($writer)
 	{
-		if($this->_s !== '')
-			$writer->write($this->evaluateStatements($this->_s));
+		if($this->_s !== '') {
+					$writer->write($this->evaluateStatements($this->_s));
+		}
 	}
 }
 

framework/Web/UI/WebControls/TEmailAddressValidator.php

Spacing +5 added lines, -5 removed lines

@@ -49,7 +49,7 @@ 
 	public function getRegularExpression()
 	{
 		$regex = parent::getRegularExpression();
-		return $regex === ''?self::EMAIL_REGEXP:$regex;
+		return $regex === '' ?self::EMAIL_REGEXP : $regex;
 	}
 
 	/**
@@ -61,14 +61,14 @@ 
 		$value = $this->getValidationValue($this->getValidationTarget());
 		$valid = $valid = is_string($value) && strlen($value) <= 254 && parent::evaluateIsValid();
 
-		if($valid && $this->getCheckMXRecord() && function_exists('checkdnsrr'))
+		if ($valid && $this->getCheckMXRecord() && function_exists('checkdnsrr'))
 		{
-			if($value !== '')
+			if ($value !== '')
 			{
-				if(($pos = strpos($value, '@')) !== false)
+				if (($pos = strpos($value, '@')) !== false)
 				{
 					$domain = substr($value, $pos + 1);
-					return $domain === ''?false:checkdnsrr($domain, 'MX');
+					return $domain === '' ?false:checkdnsrr($domain, 'MX');
 				}
 				else
 					return false;

Braces +2 added lines, -2 removed lines

@@ -69,9 +69,9 @@
 				{
 					$domain = substr($value, $pos + 1);
 					return $domain === ''?false:checkdnsrr($domain, 'MX');
+				} else {
+									return false;
 				}
-				else
-					return false;
 			}
 		}
 		return $valid;

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);
+			}
 		}
 	}