pradosoft / prado

framework/Web/UI/ActiveControls/TCallbackPageStateTracker.php

Spacing +11 added lines, -11 removed lines

@@ -89,7 +89,7 @@ 
 	 */
 	public function trackChanges()
 	{
-		foreach($this->_states as $name => $value)
+		foreach ($this->_states as $name => $value)
 		{
 			$obj = $this->_control->getViewState($name);
 			$this->_existingState[$name] = is_object($obj) ? clone($obj) : $obj;
@@ -102,15 +102,15 @@ 
 	protected function getChanges()
 	{
 		$changes = [];
-		foreach($this->_states as $name => $details)
+		foreach ($this->_states as $name => $details)
 		{
 			$new = $this->_control->getViewState($name);
 			$old = $this->_existingState[$name];
-			if($new !== $old)
+			if ($new !== $old)
 			{
 				$diff = new $details[0]($new, $old, $this->_nullObject);
-				if(($change = $diff->getDifference()) !== $this->_nullObject)
-					$changes[] = [$details[1],[$change]];
+				if (($change = $diff->getDifference()) !== $this->_nullObject)
+					$changes[] = [$details[1], [$change]];
 			}
 		}
 		return $changes;
@@ -121,7 +121,7 @@ 
 	 */
 	public function respondToChanges()
 	{
-		foreach($this->getChanges() as $change)
+		foreach ($this->getChanges() as $change)
 			call_user_func_array($change[0], $change[1]);
 	}
 
@@ -167,8 +167,8 @@ 
 	 */
 	protected function updateVisible($visible)
 	{
-		if($visible === false)
-			$this->client()->replaceContent($this->_control, "<span id=\"" . $this->_control->getClientID() . "\" style=\"display:none\" ></span>");
+		if ($visible === false)
+			$this->client()->replaceContent($this->_control, "<span id=\"".$this->_control->getClientID()."\" style=\"display:none\" ></span>");
 		else
 			$this->client()->replaceContent($this->_control, $this->_control);
 	}
@@ -188,9 +188,9 @@ 
 	 */
 	protected function updateStyle($style)
 	{
-		if($style['CssClass'] !== null)
+		if ($style['CssClass'] !== null)
 			$this->client()->setAttribute($this->_control, 'class', $style['CssClass']);
-		if(is_array($style['Style']) && count($style['Style']) > 0)
+		if (is_array($style['Style']) && count($style['Style']) > 0)
 			$this->client()->setStyle($this->_control, $style['Style']);
 	}
 
@@ -200,7 +200,7 @@ 
 	 */
 	protected function updateAttributes($attributes)
 	{
-		foreach($attributes as $name => $value)
+		foreach ($attributes as $name => $value)
 			$this->client()->setAttribute($this->_control, $name, $value);
 	}
 }

Braces +20 added lines, -14 removed lines

@@ -109,8 +109,9 @@ 
 			if($new !== $old)
 			{
 				$diff = new $details[0]($new, $old, $this->_nullObject);
-				if(($change = $diff->getDifference()) !== $this->_nullObject)
-					$changes[] = [$details[1],[$change]];
+				if(($change = $diff->getDifference()) !== $this->_nullObject) {
+									$changes[] = [$details[1],[$change]];
+				}
 			}
 		}
 		return $changes;
@@ -121,8 +122,9 @@ 
 	 */
 	public function respondToChanges()
 	{
-		foreach($this->getChanges() as $change)
-			call_user_func_array($change[0], $change[1]);
+		foreach($this->getChanges() as $change) {
+					call_user_func_array($change[0], $change[1]);
+		}
 	}
 
 	/**
@@ -167,10 +169,11 @@ 
 	 */
 	protected function updateVisible($visible)
 	{
-		if($visible === false)
-			$this->client()->replaceContent($this->_control, "<span id=\"" . $this->_control->getClientID() . "\" style=\"display:none\" ></span>");
-		else
-			$this->client()->replaceContent($this->_control, $this->_control);
+		if($visible === false) {
+					$this->client()->replaceContent($this->_control, "<span id=\"" . $this->_control->getClientID() . "\" style=\"display:none\" ></span>");
+		} else {
+					$this->client()->replaceContent($this->_control, $this->_control);
+		}
 	}
 
 	/**
@@ -188,10 +191,12 @@ 
 	 */
 	protected function updateStyle($style)
 	{
-		if($style['CssClass'] !== null)
-			$this->client()->setAttribute($this->_control, 'class', $style['CssClass']);
-		if(is_array($style['Style']) && count($style['Style']) > 0)
-			$this->client()->setStyle($this->_control, $style['Style']);
+		if($style['CssClass'] !== null) {
+					$this->client()->setAttribute($this->_control, 'class', $style['CssClass']);
+		}
+		if(is_array($style['Style']) && count($style['Style']) > 0) {
+					$this->client()->setStyle($this->_control, $style['Style']);
+		}
 	}
 
 	/**
@@ -200,7 +205,8 @@ 
 	 */
 	protected function updateAttributes($attributes)
 	{
-		foreach($attributes as $name => $value)
-			$this->client()->setAttribute($this->_control, $name, $value);
+		foreach($attributes as $name => $value) {
+					$this->client()->setAttribute($this->_control, $name, $value);
+		}
 	}
 }

framework/Web/UI/ActiveControls/TCallbackOptions.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientSide === null)
+		if ($this->_clientSide === null)
 			$this->_clientSide = $this->createClientSide();
 		return $this->_clientSide;
 	}

Braces +3 added lines, -2 removed lines

@@ -40,8 +40,9 @@
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientSide === null)
-			$this->_clientSide = $this->createClientSide();
+		if($this->_clientSide === null) {
+					$this->_clientSide = $this->createClientSide();
+		}
 		return $this->_clientSide;
 	}
 

framework/Web/UI/ActiveControls/TActiveCheckBox.php

Spacing +6 added lines, -6 removed lines

@@ -93,11 +93,11 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if (parent::getText() === $value)
 			return;
 
 		parent::setText($value);
-		if($this->getActiveControl()->canUpdateClientSide())
+		if ($this->getActiveControl()->canUpdateClientSide())
 			$this->getPage()->getCallbackClient()->update(
 				$this->getDefaultLabelID(), $value);
 	}
@@ -111,11 +111,11 @@ 
 	public function setChecked($value)
 	{
 		$value = TPropertyValue::ensureBoolean($value);
-		if(parent::getChecked() === $value)
+		if (parent::getChecked() === $value)
 			return;
 
 		parent::setChecked($value);
-		if($this->getActiveControl()->canUpdateClientSide())
+		if ($this->getActiveControl()->canUpdateClientSide())
 			$this->getPage()->getCallbackClient()->check($this, $value);
 	}
 
@@ -181,10 +181,10 @@ 
 	 */
 	protected function getDefaultLabelID()
 	{
-		if($attributes = $this->getViewState('LabelAttributes', null))
+		if ($attributes = $this->getViewState('LabelAttributes', null))
 			return TCheckBox::getLabelAttributes()->itemAt('id');
 		else
-			return $this->getClientID() . '_label';
+			return $this->getClientID().'_label';
 	}
 }
 

Braces +20 added lines, -14 removed lines

@@ -93,13 +93,15 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
-			return;
+		if(parent::getText() === $value) {
+					return;
+		}
 
 		parent::setText($value);
-		if($this->getActiveControl()->canUpdateClientSide())
-			$this->getPage()->getCallbackClient()->update(
+		if($this->getActiveControl()->canUpdateClientSide()) {
+					$this->getPage()->getCallbackClient()->update(
 				$this->getDefaultLabelID(), $value);
+		}
 	}
 
 	/**
@@ -111,12 +113,14 @@ 
 	public function setChecked($value)
 	{
 		$value = TPropertyValue::ensureBoolean($value);
-		if(parent::getChecked() === $value)
-			return;
+		if(parent::getChecked() === $value) {
+					return;
+		}
 
 		parent::setChecked($value);
-		if($this->getActiveControl()->canUpdateClientSide())
-			$this->getPage()->getCallbackClient()->check($this, $value);
+		if($this->getActiveControl()->canUpdateClientSide()) {
+					$this->getPage()->getCallbackClient()->check($this, $value);
+		}
 	}
 
 	/**
@@ -140,9 +144,10 @@ 
 	protected function renderInputTag($writer, $clientID, $onclick)
 	{
 		parent::renderInputTag($writer, $clientID, $onclick);
-		if ($this->getAutoPostBack())
-			$this->getActiveControl()->registerCallbackClientScript(
+		if ($this->getAutoPostBack()) {
+					$this->getActiveControl()->registerCallbackClientScript(
 				$this->getClientClassName(), $this->getPostBackOptions());
+		}
 	}
 
 	/**
@@ -181,10 +186,11 @@ 
 	 */
 	protected function getDefaultLabelID()
 	{
-		if($attributes = $this->getViewState('LabelAttributes', null))
-			return TCheckBox::getLabelAttributes()->itemAt('id');
-		else
-			return $this->getClientID() . '_label';
+		if($attributes = $this->getViewState('LabelAttributes', null)) {
+					return TCheckBox::getLabelAttributes()->itemAt('id');
+		} else {
+					return $this->getClientID() . '_label';
+		}
 	}
 }
 

framework/Web/UI/ActiveControls/TBaseActiveControl.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 	protected function setOption($name, $value, $default = null)
 	{
 		$value = ($value === null) ? $default : $value;
-		if($value !== null)
+		if ($value !== null)
 			$this->_options->add($name, $value);
 	}
 

Braces +3 added lines, -2 removed lines

@@ -63,8 +63,9 @@
 	protected function setOption($name, $value, $default = null)
 	{
 		$value = ($value === null) ? $default : $value;
-		if($value !== null)
-			$this->_options->add($name, $value);
+		if($value !== null) {
+					$this->_options->add($name, $value);
+		}
 	}
 
 	/**

framework/Web/UI/ActiveControls/TActiveTemplateColumn.php

Spacing +10 added lines, -10 removed lines

@@ -38,10 +38,10 @@ 
 	protected function initializeHeaderCell($cell, $columnIndex) {
 		$text = $this->getHeaderText();
 
-		if(($classPath = $this->getHeaderRenderer()) !== '') {
+		if (($classPath = $this->getHeaderRenderer()) !== '') {
 			$control = Prado::createComponent($classPath);
-			if($control instanceof \Prado\IDataRenderer) {
-				if($control instanceof IItemDataRenderer) {
+			if ($control instanceof \Prado\IDataRenderer) {
+				if ($control instanceof IItemDataRenderer) {
 					$item = $cell->getParent();
 					$control->setItemIndex($item->getItemIndex());
 					$control->setItemType($item->getItemType());
@@ -50,19 +50,19 @@ 
 			}
 			$cell->getControls()->add($control);
 		}
-		elseif($this->getAllowSorting()) {
+		elseif ($this->getAllowSorting()) {
 				$sortExpression = $this->getSortExpression();
-				if(($url = $this->getHeaderImageUrl()) !== '') {
+				if (($url = $this->getHeaderImageUrl()) !== '') {
 					$button = new TActiveImageButton;
 					$button->setImageUrl($url);
 					$button->setCommandName(TDataGrid::CMD_SORT);
 					$button->setCommandParameter($sortExpression);
-					if($text !== '')
+					if ($text !== '')
 						$button->setAlternateText($text);
 					$button->setCausesValidation(false);
 					$cell->getControls()->add($button);
 				}
-				elseif($text !== '') {
+				elseif ($text !== '') {
 						$button = new TActiveLinkButton;
 						$button->setText($text);
 						$button->setCommandName(TDataGrid::CMD_SORT);
@@ -74,14 +74,14 @@ 
 						$cell->setText(' ');
 			}
 			else {
-				if(($url = $this->getHeaderImageUrl()) !== '') {
+				if (($url = $this->getHeaderImageUrl()) !== '') {
 					$image = new TActiveImage;
 					$image->setImageUrl($url);
-					if($text !== '')
+					if ($text !== '')
 						$image->setAlternateText($text);
 					$cell->getControls()->add($image);
 				}
-				elseif($text !== '')
+				elseif ($text !== '')
 						$cell->setText($text);
 					else
 						$cell->setText(' ');

Braces +16 added lines, -17 removed lines

@@ -49,42 +49,41 @@
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		elseif($this->getAllowSorting()) {
+		} elseif($this->getAllowSorting()) {
 				$sortExpression = $this->getSortExpression();
 				if(($url = $this->getHeaderImageUrl()) !== '') {
 					$button = new TActiveImageButton;
 					$button->setImageUrl($url);
 					$button->setCommandName(TDataGrid::CMD_SORT);
 					$button->setCommandParameter($sortExpression);
-					if($text !== '')
-						$button->setAlternateText($text);
+					if($text !== '') {
+											$button->setAlternateText($text);
+					}
 					$button->setCausesValidation(false);
 					$cell->getControls()->add($button);
-				}
-				elseif($text !== '') {
+				} elseif($text !== '') {
 						$button = new TActiveLinkButton;
 						$button->setText($text);
 						$button->setCommandName(TDataGrid::CMD_SORT);
 						$button->setCommandParameter($sortExpression);
 						$button->setCausesValidation(false);
 						$cell->getControls()->add($button);
+					} else {
+											$cell->setText(' ');
 					}
-					else
-						$cell->setText(' ');
-			}
-			else {
+			} else {
 				if(($url = $this->getHeaderImageUrl()) !== '') {
 					$image = new TActiveImage;
 					$image->setImageUrl($url);
-					if($text !== '')
-						$image->setAlternateText($text);
+					if($text !== '') {
+											$image->setAlternateText($text);
+					}
 					$cell->getControls()->add($image);
-				}
-				elseif($text !== '')
-						$cell->setText($text);
-					else
-						$cell->setText(' ');
+				} elseif($text !== '') {
+										$cell->setText($text);
+				} else {
+											$cell->setText(' ');
+					}
 			}
 	}
 }
\ No newline at end of file

framework/Web/UI/ActiveControls/TActiveButtonColumn.php

Spacing +5 added lines, -5 removed lines

@@ -32,11 +32,11 @@ 
  */
 class TActiveButtonColumn extends TButtonColumn {
 	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) {
 			$buttonType = $this->getButtonType();
-			if($buttonType === TButtonColumnType::LinkButton)
+			if ($buttonType === TButtonColumnType::LinkButton)
 				$button = new TActiveLinkButton;
-			elseif($buttonType === TButtonColumnType::PushButton)
+			elseif ($buttonType === TButtonColumnType::PushButton)
 					$button = new TActiveButton;
 				else // image button
 				{
@@ -48,8 +48,8 @@ 
 			$button->setCommandName($this->getCommandName());
 			$button->setCausesValidation($this->getCausesValidation());
 			$button->setValidationGroup($this->getValidationGroup());
-			if($this->getDataTextField() !== '' || ($buttonType === TButtonColumnType::ImageButton && $this->getDataImageUrlField() !== ''))
-				$button->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+			if ($this->getDataTextField() !== '' || ($buttonType === TButtonColumnType::ImageButton && $this->getDataImageUrlField() !== ''))
+				$button->attachEventHandler('OnDataBinding', [$this, 'dataBindColumn']);
 			$cell->getControls()->add($button);
 			$cell->registerObject('Button', $button);
 		}

Braces +10 added lines, -9 removed lines

@@ -34,11 +34,11 @@ 
 	public function initializeCell($cell, $columnIndex, $itemType) {
 		if($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem || $itemType === TListItemType::EditItem) {
 			$buttonType = $this->getButtonType();
-			if($buttonType === TButtonColumnType::LinkButton)
-				$button = new TActiveLinkButton;
-			elseif($buttonType === TButtonColumnType::PushButton)
-					$button = new TActiveButton;
-				else // image button
+			if($buttonType === TButtonColumnType::LinkButton) {
+							$button = new TActiveLinkButton;
+			} elseif($buttonType === TButtonColumnType::PushButton) {
+								$button = new TActiveButton;
+			} else // image button
 				{
 					$button = new TActiveImageButton;
 					$button->setImageUrl($this->getImageUrl());
@@ -48,12 +48,13 @@ 
 			$button->setCommandName($this->getCommandName());
 			$button->setCausesValidation($this->getCausesValidation());
 			$button->setValidationGroup($this->getValidationGroup());
-			if($this->getDataTextField() !== '' || ($buttonType === TButtonColumnType::ImageButton && $this->getDataImageUrlField() !== ''))
-				$button->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+			if($this->getDataTextField() !== '' || ($buttonType === TButtonColumnType::ImageButton && $this->getDataImageUrlField() !== '')) {
+							$button->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+			}
 			$cell->getControls()->add($button);
 			$cell->registerObject('Button', $button);
+		} else {
+					parent::initializeCell($cell, $columnIndex, $itemType);
 		}
-		else
-			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 }
\ No newline at end of file

framework/Web/UI/ActiveControls/TActiveRadioButton.php

Spacing +6 added lines, -6 removed lines

@@ -92,11 +92,11 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if (parent::getText() === $value)
 			return;
 
 		parent::setText($value);
-		if($this->getActiveControl()->canUpdateClientSide())
+		if ($this->getActiveControl()->canUpdateClientSide())
 			$this->getPage()->getCallbackClient()->update(
 				$this->getDefaultLabelID(), $value);
 	}
@@ -110,11 +110,11 @@ 
 	public function setChecked($value)
 	{
 		$value = TPropertyValue::ensureBoolean($value);
-		if(parent::getChecked() === $value)
+		if (parent::getChecked() === $value)
 			return;
 
 		parent::setChecked($value);
-		if($this->getActiveControl()->canUpdateClientSide())
+		if ($this->getActiveControl()->canUpdateClientSide())
 			$this->getPage()->getCallbackClient()->check($this, $value);
 	}
 
@@ -176,10 +176,10 @@ 
 	 */
 	protected function getDefaultLabelID()
 	{
-		if($attributes = $this->getViewState('LabelAttributes', null))
+		if ($attributes = $this->getViewState('LabelAttributes', null))
 			return $this->getLabelAttributes()->itemAt('id');
 		else
-			return $this->getClientID() . '_label';
+			return $this->getClientID().'_label';
 	}
 }
 

Braces +20 added lines, -14 removed lines

@@ -92,13 +92,15 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
-			return;
+		if(parent::getText() === $value) {
+					return;
+		}
 
 		parent::setText($value);
-		if($this->getActiveControl()->canUpdateClientSide())
-			$this->getPage()->getCallbackClient()->update(
+		if($this->getActiveControl()->canUpdateClientSide()) {
+					$this->getPage()->getCallbackClient()->update(
 				$this->getDefaultLabelID(), $value);
+		}
 	}
 
 	/**
@@ -110,12 +112,14 @@ 
 	public function setChecked($value)
 	{
 		$value = TPropertyValue::ensureBoolean($value);
-		if(parent::getChecked() === $value)
-			return;
+		if(parent::getChecked() === $value) {
+					return;
+		}
 
 		parent::setChecked($value);
-		if($this->getActiveControl()->canUpdateClientSide())
-			$this->getPage()->getCallbackClient()->check($this, $value);
+		if($this->getActiveControl()->canUpdateClientSide()) {
+					$this->getPage()->getCallbackClient()->check($this, $value);
+		}
 	}
 
 	/**
@@ -135,9 +139,10 @@ 
 	protected function renderInputTag($writer, $clientID, $onclick)
 	{
 		parent::renderInputTag($writer, $clientID, $onclick);
-		if ($this->getAutoPostBack())
-			$this->getActiveControl()->registerCallbackClientScript(
+		if ($this->getAutoPostBack()) {
+					$this->getActiveControl()->registerCallbackClientScript(
 				$this->getClientClassName(), $this->getPostBackOptions());
+		}
 	}
 
 	/**
@@ -176,10 +181,11 @@ 
 	 */
 	protected function getDefaultLabelID()
 	{
-		if($attributes = $this->getViewState('LabelAttributes', null))
-			return $this->getLabelAttributes()->itemAt('id');
-		else
-			return $this->getClientID() . '_label';
+		if($attributes = $this->getViewState('LabelAttributes', null)) {
+					return $this->getLabelAttributes()->itemAt('id');
+		} else {
+					return $this->getClientID() . '_label';
+		}
 	}
 }
 

framework/Web/UI/ActiveControls/TActiveCheckBoxColumn.php

Spacing +14 added lines, -14 removed lines

@@ -45,16 +45,16 @@ 
 	 */
 	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)
 		{
 			$checkBox = new TActiveCheckBox;
-			if($this->getReadOnly() || $itemType !== TListItemType::EditItem)
+			if ($this->getReadOnly() || $itemType !== TListItemType::EditItem)
 				$checkBox->setEnabled(false);
 			$cell->setHorizontalAlign('Center');
 			$cell->getControls()->add($checkBox);
 			$cell->registerObject('CheckBox', $checkBox);
-			if($this->getDataField() !== '')
-				$checkBox->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+			if ($this->getDataField() !== '')
+				$checkBox->attachEventHandler('OnDataBinding', [$this, 'dataBindColumn']);
 		}
 		else
 			parent::initializeCell($cell, $columnIndex, $itemType);
@@ -64,12 +64,12 @@ 
 	{
 		$text = $this->getHeaderText();
 
-		if(($classPath = $this->getHeaderRenderer()) !== '')
+		if (($classPath = $this->getHeaderRenderer()) !== '')
 		{
 			$control = Prado::createComponent($classPath);
-			if($control instanceof \Prado\IDataRenderer)
+			if ($control instanceof \Prado\IDataRenderer)
 			{
-				if($control instanceof IItemDataRenderer)
+				if ($control instanceof IItemDataRenderer)
 				{
 					$item = $cell->getParent();
 					$control->setItemIndex($item->getItemIndex());
@@ -79,21 +79,21 @@ 
 			}
 			$cell->getControls()->add($control);
 		}
-		elseif($this->getAllowSorting())
+		elseif ($this->getAllowSorting())
 		{
 			$sortExpression = $this->getSortExpression();
-			if(($url = $this->getHeaderImageUrl()) !== '')
+			if (($url = $this->getHeaderImageUrl()) !== '')
 			{
 				$button = new TActiveImageButton;
 				$button->setImageUrl($url);
 				$button->setCommandName(TDataGrid::CMD_SORT);
 				$button->setCommandParameter($sortExpression);
-				if($text !== '')
+				if ($text !== '')
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
 			}
-			elseif($text !== '')
+			elseif ($text !== '')
 			{
 				$button = new TActiveLinkButton;
 				$button->setText($text);
@@ -107,15 +107,15 @@ 
 		}
 		else
 		{
-			if(($url = $this->getHeaderImageUrl()) !== '')
+			if (($url = $this->getHeaderImageUrl()) !== '')
 			{
 				$image = new TActiveImage;
 				$image->setImageUrl($url);
-				if($text !== '')
+				if ($text !== '')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
 			}
-			elseif($text !== '')
+			elseif ($text !== '')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');

Braces +23 added lines, -22 removed lines

@@ -48,16 +48,18 @@ 
 		if($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem || $itemType === TListItemType::EditItem)
 		{
 			$checkBox = new TActiveCheckBox;
-			if($this->getReadOnly() || $itemType !== TListItemType::EditItem)
-				$checkBox->setEnabled(false);
+			if($this->getReadOnly() || $itemType !== TListItemType::EditItem) {
+							$checkBox->setEnabled(false);
+			}
 			$cell->setHorizontalAlign('Center');
 			$cell->getControls()->add($checkBox);
 			$cell->registerObject('CheckBox', $checkBox);
-			if($this->getDataField() !== '')
-				$checkBox->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+			if($this->getDataField() !== '') {
+							$checkBox->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+			}
+		} else {
+					parent::initializeCell($cell, $columnIndex, $itemType);
 		}
-		else
-			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
 	protected function initializeHeaderCell($cell, $columnIndex)
@@ -78,8 +80,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		elseif($this->getAllowSorting())
+		} elseif($this->getAllowSorting())
 		{
 			$sortExpression = $this->getSortExpression();
 			if(($url = $this->getHeaderImageUrl()) !== '')
@@ -88,12 +89,12 @@ 
 				$button->setImageUrl($url);
 				$button->setCommandName(TDataGrid::CMD_SORT);
 				$button->setCommandParameter($sortExpression);
-				if($text !== '')
-					$button->setAlternateText($text);
+				if($text !== '') {
+									$button->setAlternateText($text);
+				}
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			elseif($text !== '')
+			} elseif($text !== '')
 			{
 				$button = new TActiveLinkButton;
 				$button->setText($text);
@@ -101,24 +102,24 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
+			} else {
+							$cell->setText(' ');
 			}
-			else
-				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url = $this->getHeaderImageUrl()) !== '')
 			{
 				$image = new TActiveImage;
 				$image->setImageUrl($url);
-				if($text !== '')
-					$image->setAlternateText($text);
+				if($text !== '') {
+									$image->setAlternateText($text);
+				}
 				$cell->getControls()->add($image);
+			} elseif($text !== '') {
+							$cell->setText($text);
+			} else {
+							$cell->setText(' ');
 			}
-			elseif($text !== '')
-				$cell->setText($text);
-			else
-				$cell->setText(' ');
 		}
 	}
 }
\ No newline at end of file

framework/Web/UI/ActiveControls/TCallbackClientScript.php

Spacing +26 added lines, -26 removed lines

@@ -98,14 +98,14 @@ 
 	 */
 	public function callClientFunction($function, $params = [])
 	{
-		if(!is_array($params))
+		if (!is_array($params))
 			$params = [$params];
 
-		if(count($params) > 0)
+		if (count($params) > 0)
 		{
 			if ($params[0] instanceof ISurroundable)
 				$params[0] = $params[0]->getSurroundingTagID();
-			elseif($params[0] instanceof TControl)
+			elseif ($params[0] instanceof TControl)
 				$params[0] = $params[0]->getClientID();
 		}
 		$this->_actions->add([$function => $params]);
@@ -121,10 +121,10 @@ 
 	{
 		if ($element instanceof ISurroundable)
 			$element = $element->getSurroundingTagID();
-		elseif($element instanceof TControl)
+		elseif ($element instanceof TControl)
 			$element = $element->getClientID();
 
-		if(!is_array($params))
+		if (!is_array($params))
 			$params = [$params];
 
 		$this->_actions->add(['Prado.Element.j' => [$element, $method, $params]]);
@@ -164,19 +164,19 @@ 
 		$total = $this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;
 
 		// pass the ID to avoid getting the surrounding elements (ISurroundable)
-		if($control instanceof TControl)
+		if ($control instanceof TControl)
 			$control = $control->getClientID();
 
 		$this->callClientFunction('Prado.Element.select',
-				[$control, $type . $method, $value, $total]);
+				[$control, $type.$method, $value, $total]);
 	}
 
 	private function getSelectionControlType($control)
 	{
-		if(is_string($control)) return 'check';
-		if($control instanceof TCheckBoxList)
+		if (is_string($control)) return 'check';
+		if ($control instanceof TCheckBoxList)
 			return 'check';
-		if($control instanceof TCheckBox)
+		if ($control instanceof TCheckBox)
 			return 'check';
 		return 'select';
 	}
@@ -238,24 +238,24 @@ 
 	public function setListItems($control, $items)
 	{
 		$options = [];
-		if($control instanceof TListControl)
+		if ($control instanceof TListControl)
 		{
 			$promptText = $control->getPromptText();
 			$promptValue = $control->getPromptValue();
 
-			if($promptValue === '')
+			if ($promptValue === '')
 				$promptValue = $promptText;
 
-			if($promptValue !== '')
+			if ($promptValue !== '')
 				$options[] = [$promptText, $promptValue];
 		}
 
-		foreach($items as $item)
+		foreach ($items as $item)
 		{
-			if($item->getHasAttributes())
-				$options[] = [$item->getText(),$item->getValue(), $item->getAttributes()->itemAt('Group')];
+			if ($item->getHasAttributes())
+				$options[] = [$item->getText(), $item->getValue(), $item->getAttributes()->itemAt('Group')];
 			else
-				$options[] = [$item->getText(),$item->getValue()];
+				$options[] = [$item->getText(), $item->getValue()];
 		}
 		$this->callClientFunction('Prado.Element.setOptions', [$control, $options]);
 	}
@@ -286,7 +286,7 @@ 
 	 */
 	public function toggle($element, $effect = null, $options = [])
 	{
-		switch(strtolower($effect))
+		switch (strtolower($effect))
 		{
 			case 'fade':
 				$method = 'fadeToggle';
@@ -297,7 +297,7 @@ 
 			default:
 				$method = 'toggle';
 				// avoid fancy effect by default
-				if(!array_key_exists('duration', $options))
+				if (!array_key_exists('duration', $options))
 					$options['duration'] = 0;
 				break;
 		}
@@ -431,12 +431,12 @@ 
 	 */
 	protected function replace($element, $content, $self)
 	{
-		if($content instanceof TControl)
+		if ($content instanceof TControl)
 		{
 			$boundary = $this->getRenderedContentBoundary($content);
 			$content = null;
 		}
-		elseif($content instanceof THtmlWriter)
+		elseif ($content instanceof THtmlWriter)
 		{
 			$boundary = $this->getResponseContentBoundary($content);
 			$content = null;
@@ -465,7 +465,7 @@ 
 	 */
 	public function evaluateScript($writer)
 	{
-		if($writer instanceof THtmlWriter)
+		if ($writer instanceof THtmlWriter)
 		{
 			$boundary = $this->getResponseContentBoundary($writer);
 			$content = null;
@@ -485,11 +485,11 @@ 
 	 */
 	public function appendScriptBlock($content)
 	{
-		if($content instanceof TControl)
+		if ($content instanceof TControl)
 		{
 			$boundary = $this->getRenderedContentBoundary($content);
 		}
-		elseif($content instanceof THtmlWriter)
+		elseif ($content instanceof THtmlWriter)
 		{
 			$boundary = $this->getResponseContentBoundary($content);
 		}
@@ -519,9 +519,9 @@ 
 	 */
 	private function getResponseContentBoundary($html)
 	{
-		if($html instanceof THtmlWriter)
+		if ($html instanceof THtmlWriter)
 		{
-			if($html->getWriter() instanceof TCallbackResponseWriter)
+			if ($html->getWriter() instanceof TCallbackResponseWriter)
 				return $html->getWriter()->getBoundary();
 		}
 		return null;

Braces +51 added lines, -38 removed lines

@@ -98,15 +98,17 @@ 
 	 */
 	public function callClientFunction($function, $params = [])
 	{
-		if(!is_array($params))
-			$params = [$params];
+		if(!is_array($params)) {
+					$params = [$params];
+		}
 
 		if(count($params) > 0)
 		{
-			if ($params[0] instanceof ISurroundable)
-				$params[0] = $params[0]->getSurroundingTagID();
-			elseif($params[0] instanceof TControl)
-				$params[0] = $params[0]->getClientID();
+			if ($params[0] instanceof ISurroundable) {
+							$params[0] = $params[0]->getSurroundingTagID();
+			} elseif($params[0] instanceof TControl) {
+							$params[0] = $params[0]->getClientID();
+			}
 		}
 		$this->_actions->add([$function => $params]);
 	}
@@ -119,13 +121,15 @@ 
 	 */
 	public function jQuery($element, $method, $params = [])
 	{
-		if ($element instanceof ISurroundable)
-			$element = $element->getSurroundingTagID();
-		elseif($element instanceof TControl)
-			$element = $element->getClientID();
+		if ($element instanceof ISurroundable) {
+					$element = $element->getSurroundingTagID();
+		} elseif($element instanceof TControl) {
+					$element = $element->getClientID();
+		}
 
-		if(!is_array($params))
-			$params = [$params];
+		if(!is_array($params)) {
+					$params = [$params];
+		}
 
 		$this->_actions->add(['Prado.Element.j' => [$element, $method, $params]]);
 	}
@@ -164,8 +168,9 @@ 
 		$total = $this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;
 
 		// pass the ID to avoid getting the surrounding elements (ISurroundable)
-		if($control instanceof TControl)
-			$control = $control->getClientID();
+		if($control instanceof TControl) {
+					$control = $control->getClientID();
+		}
 
 		$this->callClientFunction('Prado.Element.select',
 				[$control, $type . $method, $value, $total]);
@@ -173,11 +178,15 @@ 
 
 	private function getSelectionControlType($control)
 	{
-		if(is_string($control)) return 'check';
-		if($control instanceof TCheckBoxList)
-			return 'check';
-		if($control instanceof TCheckBox)
+		if(is_string($control)) {
 			return 'check';
+		}
+		if($control instanceof TCheckBoxList) {
+					return 'check';
+		}
+		if($control instanceof TCheckBox) {
+					return 'check';
+		}
 		return 'select';
 	}
 
@@ -225,8 +234,9 @@ 
 	public function setAttribute($control, $name, $value)
 	{
 		// Attributes should be applied on Surrounding tag, except for 'disabled' attribute
-		if ($control instanceof ISurroundable && strtolower($name) !== 'disabled')
-			$control = $control->getSurroundingTagID();
+		if ($control instanceof ISurroundable && strtolower($name) !== 'disabled') {
+					$control = $control->getSurroundingTagID();
+		}
 		$this->callClientFunction('Prado.Element.setAttribute', [$control, $name, $value]);
 	}
 
@@ -243,19 +253,22 @@ 
 			$promptText = $control->getPromptText();
 			$promptValue = $control->getPromptValue();
 
-			if($promptValue === '')
-				$promptValue = $promptText;
+			if($promptValue === '') {
+							$promptValue = $promptText;
+			}
 
-			if($promptValue !== '')
-				$options[] = [$promptText, $promptValue];
+			if($promptValue !== '') {
+							$options[] = [$promptText, $promptValue];
+			}
 		}
 
 		foreach($items as $item)
 		{
-			if($item->getHasAttributes())
-				$options[] = [$item->getText(),$item->getValue(), $item->getAttributes()->itemAt('Group')];
-			else
-				$options[] = [$item->getText(),$item->getValue()];
+			if($item->getHasAttributes()) {
+							$options[] = [$item->getText(),$item->getValue(), $item->getAttributes()->itemAt('Group')];
+			} else {
+							$options[] = [$item->getText(),$item->getValue()];
+			}
 		}
 		$this->callClientFunction('Prado.Element.setOptions', [$control, $options]);
 	}
@@ -297,8 +310,9 @@ 
 			default:
 				$method = 'toggle';
 				// avoid fancy effect by default
-				if(!array_key_exists('duration', $options))
-					$options['duration'] = 0;
+				if(!array_key_exists('duration', $options)) {
+									$options['duration'] = 0;
+				}
 				break;
 		}
 		$this->jQuery($element, $method, $options);
@@ -435,14 +449,13 @@ 
 		{
 			$boundary = $this->getRenderedContentBoundary($content);
 			$content = null;
-		}
-		elseif($content instanceof THtmlWriter)
+		} elseif($content instanceof THtmlWriter)
 		{
 			$boundary = $this->getResponseContentBoundary($content);
 			$content = null;
+		} else {
+					$boundary = null;
 		}
-		else
-			$boundary = null;
 
 		$this->callClientFunction('Prado.Element.replace', [$element, $content, $boundary, $self]);
 	}
@@ -488,8 +501,7 @@ 
 		if($content instanceof TControl)
 		{
 			$boundary = $this->getRenderedContentBoundary($content);
-		}
-		elseif($content instanceof THtmlWriter)
+		} elseif($content instanceof THtmlWriter)
 		{
 			$boundary = $this->getResponseContentBoundary($content);
 		}
@@ -521,8 +533,9 @@ 
 	{
 		if($html instanceof THtmlWriter)
 		{
-			if($html->getWriter() instanceof TCallbackResponseWriter)
-				return $html->getWriter()->getBoundary();
+			if($html->getWriter() instanceof TCallbackResponseWriter) {
+							return $html->getWriter()->getBoundary();
+			}
 		}
 		return null;
 	}