pradosoft / prado

framework/Web/UI/ActiveControls/TActiveListItemCollection.php

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
 	public function insertAt($index, $value)
 	{
 		parent::insertAt($index, $value);
-		if($this->canUpdateClientSide())
+		if ($this->canUpdateClientSide())
 			$this->_hasChanged = true;
 	}
 
@@ -105,7 +105,7 @@ 
 	public function removeAt($index)
 	{
 		parent::removeAt($index);
-		if($this->canUpdateClientSide())
+		if ($this->canUpdateClientSide())
 			$this->_hasChanged = true;
 	}
 }
\ No newline at end of file

Braces +6 added lines, -4 removed lines

@@ -94,8 +94,9 @@ 
 	public function insertAt($index, $value)
 	{
 		parent::insertAt($index, $value);
-		if($this->canUpdateClientSide())
-			$this->_hasChanged = true;
+		if($this->canUpdateClientSide()) {
+					$this->_hasChanged = true;
+		}
 	}
 
 	/**
@@ -105,7 +106,8 @@ 
 	public function removeAt($index)
 	{
 		parent::removeAt($index);
-		if($this->canUpdateClientSide())
-			$this->_hasChanged = true;
+		if($this->canUpdateClientSide()) {
+					$this->_hasChanged = true;
+		}
 	}
 }
\ No newline at end of file

framework/Web/UI/ActiveControls/TActiveListControlAdapter.php

Spacing +18 added lines, -18 removed lines

@@ -44,18 +44,18 @@ 
 	 */
 	public function setSelectedIndex($index)
 	{
-		if($this->canUpdateClientSide())
+		if ($this->canUpdateClientSide())
 		{
 			$this->updateListItems();
 			// if a prompt is set, we mimic the postback behaviour of not counting it
 			// in the index. We assume the prompt is _always_ the first item (Issue #368)
 			$promptValue = $this->getControl()->getPromptValue();
-			if($promptValue === '')
+			if ($promptValue === '')
 				$promptValue = $this->getControl()->getPromptText();
-			if($promptValue !== '')
+			if ($promptValue !== '')
 				$index++;
 
-			if($index >= 0 && $index <= $this->getControl()->getItemCount())
+			if ($index >= 0 && $index <= $this->getControl()->getItemCount())
 			$this->getPage()->getCallbackClient()->select(
 					$this->getControl(), 'Index', $index);
 		}
@@ -67,25 +67,25 @@ 
 	 */
 	public function setSelectedIndices($indices)
 	{
-		if($this->canUpdateClientSide())
+		if ($this->canUpdateClientSide())
 		{
 			$this->updateListItems();
 			$n = $this->getControl()->getItemCount();
 
 			$promptValue = $this->getControl()->getPromptValue();
-			if($promptValue === '')
+			if ($promptValue === '')
 				$promptValue = $this->getControl()->getPromptText();
 
 			$list = [];
-			foreach($indices as $index)
+			foreach ($indices as $index)
 			{
 				$index = intval($index);
-				if($promptValue !== '')
+				if ($promptValue !== '')
 					$index++;
-				if($index >= 0 && $index <= $n)
+				if ($index >= 0 && $index <= $n)
 					$list[] = $index;
 			}
-			if(count($list) > 0)
+			if (count($list) > 0)
 				$this->getPage()->getCallbackClient()->select(
 					$this->getControl(), 'Indices', $list);
 		}
@@ -97,7 +97,7 @@ 
 	 */
 	public function setSelectedValue($value)
 	{
-		if($this->canUpdateClientSide())
+		if ($this->canUpdateClientSide())
 		{
 			$this->updateListItems();
 			$this->getPage()->getCallbackClient()->select(
@@ -111,13 +111,13 @@ 
 	 */
 	public function setSelectedValues($values)
 	{
-		if($this->canUpdateClientSide())
+		if ($this->canUpdateClientSide())
 		{
 			$this->updateListItems();
 			$list = [];
-			foreach($values as $value)
+			foreach ($values as $value)
 				$list[] = $value;
-			if(count($list) > 0)
+			if (count($list) > 0)
 				$this->getPage()->getCallbackClient()->select(
 					$this->getControl(), 'Values', $list);
 		}
@@ -128,10 +128,10 @@ 
 	 */
 	public function clearSelection()
 	{
-		if($this->canUpdateClientSide())
+		if ($this->canUpdateClientSide())
 		{
 			$this->updateListItems();
-			if($this->getControl() instanceof TActiveDropDownList)
+			if ($this->getControl() instanceof TActiveDropDownList)
 			{
 				// clearing a TActiveDropDownList's selection actually doesn't select the first item;
 				// we mimic the postback behaviour selecting it (Issue #368)
@@ -147,10 +147,10 @@ 
 	 */
 	public function updateListItems()
 	{
-		if($this->canUpdateClientSide())
+		if ($this->canUpdateClientSide())
 		{
 			$items = $this->getControl()->getItems();
-			if($items instanceof TActiveListItemCollection
+			if ($items instanceof TActiveListItemCollection
 				&& $items->getListHasChanged())
 			{
 				$items->updateClientSide();

Braces +27 added lines, -18 removed lines

@@ -50,14 +50,17 @@ 
 			// if a prompt is set, we mimic the postback behaviour of not counting it
 			// in the index. We assume the prompt is _always_ the first item (Issue #368)
 			$promptValue = $this->getControl()->getPromptValue();
-			if($promptValue === '')
-				$promptValue = $this->getControl()->getPromptText();
-			if($promptValue !== '')
-				$index++;
+			if($promptValue === '') {
+							$promptValue = $this->getControl()->getPromptText();
+			}
+			if($promptValue !== '') {
+							$index++;
+			}
 
-			if($index >= 0 && $index <= $this->getControl()->getItemCount())
-			$this->getPage()->getCallbackClient()->select(
+			if($index >= 0 && $index <= $this->getControl()->getItemCount()) {
+						$this->getPage()->getCallbackClient()->select(
 					$this->getControl(), 'Index', $index);
+			}
 		}
 	}
 
@@ -73,21 +76,25 @@ 
 			$n = $this->getControl()->getItemCount();
 
 			$promptValue = $this->getControl()->getPromptValue();
-			if($promptValue === '')
-				$promptValue = $this->getControl()->getPromptText();
+			if($promptValue === '') {
+							$promptValue = $this->getControl()->getPromptText();
+			}
 
 			$list = [];
 			foreach($indices as $index)
 			{
 				$index = intval($index);
-				if($promptValue !== '')
-					$index++;
-				if($index >= 0 && $index <= $n)
-					$list[] = $index;
+				if($promptValue !== '') {
+									$index++;
+				}
+				if($index >= 0 && $index <= $n) {
+									$list[] = $index;
+				}
 			}
-			if(count($list) > 0)
-				$this->getPage()->getCallbackClient()->select(
+			if(count($list) > 0) {
+							$this->getPage()->getCallbackClient()->select(
 					$this->getControl(), 'Indices', $list);
+			}
 		}
 	}
 
@@ -115,11 +122,13 @@ 
 		{
 			$this->updateListItems();
 			$list = [];
-			foreach($values as $value)
-				$list[] = $value;
-			if(count($list) > 0)
-				$this->getPage()->getCallbackClient()->select(
+			foreach($values as $value) {
+							$list[] = $value;
+			}
+			if(count($list) > 0) {
+							$this->getPage()->getCallbackClient()->select(
 					$this->getControl(), 'Values', $list);
+			}
 		}
 	}
 

framework/Web/UI/ActiveControls/TActiveDataList.php

Spacing +7 added lines, -7 removed lines

@@ -57,7 +57,7 @@ 
   public function setDataSource($value)
   {
 	parent::setDataSource($value);
-	if($this->getActiveControl()->canUpdateClientSide()) {
+	if ($this->getActiveControl()->canUpdateClientSide()) {
 	  $this->renderPager();
 	  $this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
 	}
@@ -69,7 +69,7 @@ 
    */
   protected function getContainerID()
   {
-	return $this->ClientID . '_Container';
+	return $this->ClientID.'_Container';
   }
 
   /**
@@ -80,9 +80,9 @@ 
    */
   public function render($writer)
   {
-	if($this->getHasPreRendered()) {
+	if ($this->getHasPreRendered()) {
 	  $this->renderDataList($writer);
-	  if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(), $writer);
+	  if ($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(), $writer);
 	}
 	else {
 	  $this->getPage()->getAdapter()->registerControlToRender($this, $writer);
@@ -97,9 +97,9 @@ 
   private function renderPager()
   {
 	$pager = $this->getPage()->findControlsByType('Prado\Web\UI\ActiveControls\TActivePager', false);
-	foreach($pager as $item)
+	foreach ($pager as $item)
 	{
-	  if($item->ControlToPaginate == $this->ID) {
+	  if ($item->ControlToPaginate == $this->ID) {
 		$writer = $this->getResponse()->createHtmlWriter();
 		$this->getPage()->getAdapter()->registerControlToRender($item, $writer);
 	  }
@@ -113,7 +113,7 @@ 
    */
   private function renderDataList($writer)
   {
-	$writer->write('<span id="' . $this->getContainerID() . '">');
+	$writer->write('<span id="'.$this->getContainerID().'">');
 	parent::render($writer);
 	$writer->write('</span>');
   }

Braces +4 added lines, -3 removed lines

@@ -82,9 +82,10 @@
   {
 	if($this->getHasPreRendered()) {
 	  $this->renderDataList($writer);
-	  if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(), $writer);
-	}
-	else {
+	  if($this->getActiveControl()->canUpdateClientSide()) {
+	  	$this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(), $writer);
+	  }
+	} else {
 	  $this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 	}
   }

framework/Web/UI/ActiveControls/TActiveHtmlArea.php

Spacing +2 added lines, -2 removed lines

@@ -64,9 +64,9 @@
    */
   public function setText($value) {
 	parent::setText($value);
-	if($this->getActiveControl()->canUpdateClientSide() && $this->getHasLoadedPostData())
+	if ($this->getActiveControl()->canUpdateClientSide() && $this->getHasLoadedPostData())
 	{
-	  if($this->getEnableVisualEdit())
+	  if ($this->getEnableVisualEdit())
 	  {
 		$value = str_ireplace(["\r\n", "\n"], "", $value);
 		$command = "tinyMCE.getInstanceById('{$this->getClientID()}').execCommand('mceSetContent',false,'{$value}')";

Braces +2 added lines, -2 removed lines

@@ -71,9 +71,9 @@
 		$value = str_ireplace(["\r\n", "\n"], "", $value);
 		$command = "tinyMCE.getInstanceById('{$this->getClientID()}').execCommand('mceSetContent',false,'{$value}')";
 		$this->getPage()->getCallbackClient()->evaluateScript($command);
+	  } else {
+	  		$this->getPage()->getCallbackClient()->setValue($this, $value);
 	  }
-	  else
-		$this->getPage()->getCallbackClient()->setValue($this, $value);
 	}
   }
 

framework/Web/UI/ActiveControls/TInPlaceTextBox.php

Spacing +14 added lines, -14 removed lines

@@ -82,7 +82,7 @@ 
 	{
 		$value = TPropertyValue::ensureBoolean($value);
 		$this->setViewState('DisplayTextBox', $value, false);
-		if($this->getActiveControl()->canUpdateClientSide())
+		if ($this->getActiveControl()->canUpdateClientSide())
 			$this->callClientFunction('setDisplayTextBox', $value);
 	}
 
@@ -102,8 +102,8 @@ 
 	protected function callClientFunction($func, $value)
 	{
 		$client = $this->getPage()->getCallbackClient();
-		$code = $this->getClientClassName() . '.' . $func;
-		$client->callClientFunction($code, [$this,$value]);
+		$code = $this->getClientClassName().'.'.$func;
+		$client->callClientFunction($code, [$this, $value]);
 	}
 
 	/**
@@ -128,8 +128,8 @@ 
 	protected function getExternalControlID()
 	{
 		$extID = $this->getEditTriggerControlID();
-		if($extID === null) return '';
-		if(($control = $this->findControl($extID)) !== null)
+		if ($extID === null) return '';
+		if (($control = $this->findControl($extID)) !== null)
 			return $control->getClientID();
 		return $extID;
 	}
@@ -141,11 +141,11 @@ 
 	 */
 	public function setText($value)
 	{
-		if(TTextBox::getText() === $value)
+		if (TTextBox::getText() === $value)
 			return;
 
 		TTextBox::setText($value);
-		if($this->getActiveControl()->canUpdateClientSide())
+		if ($this->getActiveControl()->canUpdateClientSide())
 		{
 			$client = $this->getPage()->getCallbackClient();
 			$client->update($this->getLabelClientID(), $value);
@@ -158,10 +158,10 @@ 
 	 * @param boolean value
 	 * @since 3.1.2
 	 */
-	public function setReadOnly ($value)
+	public function setReadOnly($value)
 	{
 		$value = TPropertyValue::ensureBoolean($value);
-		if(TTextBox::getReadOnly() === $value)
+		if (TTextBox::getReadOnly() === $value)
 			return;
 
 		TTextBox::setReadOnly($value);
@@ -185,7 +185,7 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) === '')
+		if (($text = $this->getText()) === '')
 			parent::renderContents($writer);
 		else
 			$writer->write($text);
@@ -196,7 +196,7 @@ 
 	 */
 	protected function getLabelClientID()
 	{
-		return $this->getClientID() . '__label';
+		return $this->getClientID().'__label';
 	}
 
 	/**
@@ -209,7 +209,7 @@ 
 	public function onCallback($param)
 	{
 		$action = $param->getCallbackParameter();
-		if(is_array($action) && $action[0] === '__InlineEditor_loadExternalText__')
+		if (is_array($action) && $action[0] === '__InlineEditor_loadExternalText__')
 		{
 			$parameter = new TCallbackEventParameter($this->getResponse(), $action[1]);
 			$this->onLoadingText($parameter);
@@ -229,7 +229,7 @@ 
 		$options['AutoHide'] = $this->getAutoHideTextBox() == false ? '' : true;
 		$options['AutoPostBack'] = $this->getAutoPostBack() == false ? '' : true;
 		$options['Columns'] = $this->getColumns();
-		if($this->getTextMode() === 'MultiLine')
+		if ($this->getTextMode() === 'MultiLine')
 		{
 			$options['Rows'] = $this->getRows();
 			$options['Wrap'] = $this->getWrap() == false ? '' : true;
@@ -240,7 +240,7 @@ 
 			$options['MaxLength'] = $length > 0 ? $length : '';
 		}
 
-		if($this->hasEventHandler('OnLoadingText'))
+		if ($this->hasEventHandler('OnLoadingText'))
 			$options['LoadTextOnEdit'] = true;
 
 		$options['ReadOnly'] = $this->getReadOnly();

Braces +24 added lines, -17 removed lines

@@ -82,8 +82,9 @@ 
 	{
 		$value = TPropertyValue::ensureBoolean($value);
 		$this->setViewState('DisplayTextBox', $value, false);
-		if($this->getActiveControl()->canUpdateClientSide())
-			$this->callClientFunction('setDisplayTextBox', $value);
+		if($this->getActiveControl()->canUpdateClientSide()) {
+					$this->callClientFunction('setDisplayTextBox', $value);
+		}
 	}
 
 	/**
@@ -128,9 +129,12 @@ 
 	protected function getExternalControlID()
 	{
 		$extID = $this->getEditTriggerControlID();
-		if($extID === null) return '';
-		if(($control = $this->findControl($extID)) !== null)
-			return $control->getClientID();
+		if($extID === null) {
+			return '';
+		}
+		if(($control = $this->findControl($extID)) !== null) {
+					return $control->getClientID();
+		}
 		return $extID;
 	}
 
@@ -141,8 +145,9 @@ 
 	 */
 	public function setText($value)
 	{
-		if(TTextBox::getText() === $value)
-			return;
+		if(TTextBox::getText() === $value) {
+					return;
+		}
 
 		TTextBox::setText($value);
 		if($this->getActiveControl()->canUpdateClientSide())
@@ -161,8 +166,9 @@ 
 	public function setReadOnly ($value)
 	{
 		$value = TPropertyValue::ensureBoolean($value);
-		if(TTextBox::getReadOnly() === $value)
-			return;
+		if(TTextBox::getReadOnly() === $value) {
+					return;
+		}
 
 		TTextBox::setReadOnly($value);
 		if ($this->getActiveControl()->canUpdateClientSide())
@@ -185,10 +191,11 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) === '')
-			parent::renderContents($writer);
-		else
-			$writer->write($text);
+		if(($text = $this->getText()) === '') {
+					parent::renderContents($writer);
+		} else {
+					$writer->write($text);
+		}
 	}
 
 	/**
@@ -233,15 +240,15 @@ 
 		{
 			$options['Rows'] = $this->getRows();
 			$options['Wrap'] = $this->getWrap() == false ? '' : true;
-		}
-		else
+		} else
 		{
 			$length = $this->getMaxLength();
 			$options['MaxLength'] = $length > 0 ? $length : '';
 		}
 
-		if($this->hasEventHandler('OnLoadingText'))
-			$options['LoadTextOnEdit'] = true;
+		if($this->hasEventHandler('OnLoadingText')) {
+					$options['LoadTextOnEdit'] = true;
+		}
 
 		$options['ReadOnly'] = $this->getReadOnly();
 		return $options;

framework/Web/UI/ActiveControls/TActiveRepeater.php

Spacing +6 added lines, -6 removed lines

@@ -61,7 +61,7 @@ 
 	 */
 	public function setDataSource($value) {
 		parent::setDataSource($value);
-		if($this->getActiveControl()->canUpdateClientSide()) {
+		if ($this->getActiveControl()->canUpdateClientSide()) {
 			$this->renderPager();
 			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
 		}
@@ -88,7 +88,7 @@ 
 	 * @return string container id
 	 */
 	public function getSurroundingTagID() {
-		return $this->getClientID() . '_Container';
+		return $this->getClientID().'_Container';
 	}
 
 	/**
@@ -98,9 +98,9 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 */
 	public function render($writer) {
-		if($this->getHasPreRendered()) {
+		if ($this->getHasPreRendered()) {
 			$this->renderRepeater($writer);
-			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
+			if ($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
 		}
 		else {
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
@@ -114,8 +114,8 @@ 
 	 */
 	private function renderPager() {
 		$pager = $this->getPage()->findControlsByType('Prado\Web\UI\ActiveControls\TActivePager', false);
-		foreach($pager as $item) {
-			if($item->ControlToPaginate == $this->ID) {
+		foreach ($pager as $item) {
+			if ($item->ControlToPaginate == $this->ID) {
 				$writer = $this->getResponse()->createHtmlWriter();
 				$this->getPage()->getAdapter()->registerControlToRender($item, $writer);
 			}

Braces +4 added lines, -3 removed lines

@@ -100,9 +100,10 @@
 	public function render($writer) {
 		if($this->getHasPreRendered()) {
 			$this->renderRepeater($writer);
-			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
-		}
-		else {
+			if($this->getActiveControl()->canUpdateClientSide()) {
+				$this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
+			}
+		} else {
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 		}
 	}

framework/Web/UI/ActiveControls/TActiveDataGrid.php

Spacing +9 added lines, -9 removed lines

@@ -88,7 +88,7 @@ 
 	 */
 	public function setDataSource($value) {
 		parent::setDataSource($value);
-		if($this->getActiveControl()->canUpdateClientSide()) {
+		if ($this->getActiveControl()->canUpdateClientSide()) {
 			$this->renderPager();
 			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
 		}
@@ -115,7 +115,7 @@ 
 	 * @return string container id
 	 */
 	public function getSurroundingTagID() {
-		return $this->getClientID() . '_Container';
+		return $this->getClientID().'_Container';
 	}
 
 	/**
@@ -133,8 +133,8 @@ 
 	 * @return mixed the button instance
 	 */
 	protected function createPagerButton($pager, $buttonType, $enabled, $text, $commandName, $commandParameter) {
-		if($buttonType === TDataGridPagerButtonType::LinkButton) {
-			if($enabled)
+		if ($buttonType === TDataGridPagerButtonType::LinkButton) {
+			if ($enabled)
 				$button = new TActiveLinkButton;
 			else {
 				$button = new TLabel;
@@ -144,7 +144,7 @@ 
 		}
 		else {
 			$button = new TActiveButton;
-			if(!$enabled)
+			if (!$enabled)
 				$button->setEnabled(false);
 		}
 		$button->setText($text);
@@ -173,9 +173,9 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 */
 	public function render($writer) {
-		if($this->getHasPreRendered()) {
+		if ($this->getHasPreRendered()) {
 			$this->renderDataGrid($writer);
-			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
+			if ($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
 		}
 		else {
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
@@ -189,8 +189,8 @@ 
 	 */
 	private function renderPager() {
 		$pager = $this->getPage()->findControlsByType('Prado\Web\UI\ActiveControls\TActivePager', false);
-		foreach($pager as $item) {
-			if($item->ControlToPaginate == $this->ID) {
+		foreach ($pager as $item) {
+			if ($item->ControlToPaginate == $this->ID) {
 				$writer = $this->getResponse()->createHtmlWriter();
 				$this->getPage()->getAdapter()->registerControlToRender($item, $writer);
 			}

Braces +11 added lines, -10 removed lines

@@ -134,18 +134,18 @@ 
 	 */
 	protected function createPagerButton($pager, $buttonType, $enabled, $text, $commandName, $commandParameter) {
 		if($buttonType === TDataGridPagerButtonType::LinkButton) {
-			if($enabled)
-				$button = new TActiveLinkButton;
-			else {
+			if($enabled) {
+							$button = new TActiveLinkButton;
+			} else {
 				$button = new TLabel;
 				$button->setText($text);
 				return $button;
 			}
-		}
-		else {
+		} else {
 			$button = new TActiveButton;
-			if(!$enabled)
-				$button->setEnabled(false);
+			if(!$enabled) {
+							$button->setEnabled(false);
+			}
 		}
 		$button->setText($text);
 		$button->setCommandName($commandName);
@@ -175,9 +175,10 @@ 
 	public function render($writer) {
 		if($this->getHasPreRendered()) {
 			$this->renderDataGrid($writer);
-			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
-		}
-		else {
+			if($this->getActiveControl()->canUpdateClientSide()) {
+				$this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
+			}
+		} else {
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 		}
 	}

framework/Web/UI/ActiveControls/TStyleDiff.php

Spacing +8 added lines, -8 removed lines

@@ -30,11 +30,11 @@ 
 	 */
 	protected function getCombinedStyle($obj)
 	{
-		if(!($obj instanceof TStyle))
+		if (!($obj instanceof TStyle))
 			return [];
 		$style = $obj->getStyleFields();
 		$style = array_merge($style, $this->getStyleFromString($obj->getCustomStyle()));
-		if($obj->hasFont())
+		if ($obj->hasFont())
 			$style = array_merge($style, $this->getStyleFromString($obj->getFont()->toString()));
 		return $style;
 	}
@@ -46,12 +46,12 @@ 
 	protected function getStyleFromString($string)
 	{
 		$style = [];
-		if(!is_string($string)) return $style;
+		if (!is_string($string)) return $style;
 
-		foreach(explode(';', $string) as $sub)
+		foreach (explode(';', $string) as $sub)
 		{
 			$arr = explode(':', $sub);
-			if(isset($arr[1]) && trim($arr[0]) !== '')
+			if (isset($arr[1]) && trim($arr[0]) !== '')
 				$style[trim($arr[0])] = trim($arr[1]);
 		}
 		return $style;
@@ -62,7 +62,7 @@ 
 	 */
 	protected function getCssClassDiff()
 	{
-		if($this->_old === null)
+		if ($this->_old === null)
 		{
 			return ($this->_new !== null) && $this->_new->hasCssClass()
 						? $this->_new->getCssClass() : null;
@@ -90,13 +90,13 @@ 
 	 */
 	public function getDifference()
 	{
-		if($this->_new === null)
+		if ($this->_new === null)
 			return $this->_null;
 		else
 		{
 			$css = $this->getCssClassDiff();
 			$style = $this->getStyleDiff();
-			if(($css !== null) || ($style !== null))
+			if (($css !== null) || ($style !== null))
 				return ['CssClass' => $css, 'Style' => $style];
 			else
 				$this->_null;

Braces +21 added lines, -16 removed lines

@@ -30,12 +30,14 @@ 
 	 */
 	protected function getCombinedStyle($obj)
 	{
-		if(!($obj instanceof TStyle))
-			return [];
+		if(!($obj instanceof TStyle)) {
+					return [];
+		}
 		$style = $obj->getStyleFields();
 		$style = array_merge($style, $this->getStyleFromString($obj->getCustomStyle()));
-		if($obj->hasFont())
-			$style = array_merge($style, $this->getStyleFromString($obj->getFont()->toString()));
+		if($obj->hasFont()) {
+					$style = array_merge($style, $this->getStyleFromString($obj->getFont()->toString()));
+		}
 		return $style;
 	}
 
@@ -46,13 +48,16 @@ 
 	protected function getStyleFromString($string)
 	{
 		$style = [];
-		if(!is_string($string)) return $style;
+		if(!is_string($string)) {
+			return $style;
+		}
 
 		foreach(explode(';', $string) as $sub)
 		{
 			$arr = explode(':', $sub);
-			if(isset($arr[1]) && trim($arr[0]) !== '')
-				$style[trim($arr[0])] = trim($arr[1]);
+			if(isset($arr[1]) && trim($arr[0]) !== '') {
+							$style[trim($arr[0])] = trim($arr[1]);
+			}
 		}
 		return $style;
 	}
@@ -66,8 +71,7 @@ 
 		{
 			return ($this->_new !== null) && $this->_new->hasCssClass()
 						? $this->_new->getCssClass() : null;
-		}
-		else
+		} else
 		{
 			return $this->_old->getCssClass() !== $this->_new->getCssClass() ?
 				$this->_new->getCssClass() : null;
@@ -90,16 +94,17 @@ 
 	 */
 	public function getDifference()
 	{
-		if($this->_new === null)
-			return $this->_null;
-		else
+		if($this->_new === null) {
+					return $this->_null;
+		} else
 		{
 			$css = $this->getCssClassDiff();
 			$style = $this->getStyleDiff();
-			if(($css !== null) || ($style !== null))
-				return ['CssClass' => $css, 'Style' => $style];
-			else
-				$this->_null;
+			if(($css !== null) || ($style !== null)) {
+							return ['CssClass' => $css, 'Style' => $style];
+			} else {
+							$this->_null;
+			}
 		}
 	}
 }

framework/Web/UI/ActiveControls/TActivePager.php

Spacing +12 added lines, -12 removed lines

@@ -107,7 +107,7 @@ 
 		$list->dataBind();
 		$list->setSelectedIndex($this->getCurrentPageIndex());
 		$list->setAutoPostBack(true);
-		$list->attachEventHandler('OnSelectedIndexChanged', [$this,'listIndexChanged']);
+		$list->attachEventHandler('OnSelectedIndexChanged', [$this, 'listIndexChanged']);
 		$list->attachEventHandler('OnCallback', [$this, 'handleCallback']);
 	}
 
@@ -125,9 +125,9 @@ 
 	 */
 	protected function createPagerButton($buttonType, $enabled, $text, $commandName, $commandParameter)
 	{
-		if($buttonType === TPagerButtonType::LinkButton)
+		if ($buttonType === TPagerButtonType::LinkButton)
 		{
-			if($enabled)
+			if ($enabled)
 				$button = new TActiveLinkButton;
 			else
 			{
@@ -137,11 +137,11 @@ 
 				return $button;
 			}
 		}
-		elseif($buttonType === TPagerButtonType::ImageButton)
+		elseif ($buttonType === TPagerButtonType::ImageButton)
 		{
 			$button = new TActiveImageButton;
 			$button->setImageUrl($this->getPageImageUrl($text, $commandName));
-			if($enabled)
+			if ($enabled)
 				$button->Visible = true;
 			else
 				$button->Visible = false;
@@ -149,11 +149,11 @@ 
 		else
 		{
 			$button = new TActiveButton;
-			if(!$enabled)
+			if (!$enabled)
 				$button->setEnabled(false);
 		}
 
-		if($buttonType === TPagerButtonType::ImageButton)
+		if ($buttonType === TPagerButtonType::ImageButton)
 		{
 			$button->ImageUrl = $text;
 		}
@@ -179,7 +179,7 @@ 
 	 * @param mixed $sender
 	 * @param TCallbackEventParameter $param
 	 */
-	public function handleCallback ($sender, $param)
+	public function handleCallback($sender, $param)
 	{
 		// Update all the buttons pagers attached to the same control.
 		// Dropdown pagers doesn't need to be re-rendered.
@@ -198,13 +198,13 @@ 
 		$this->onCallback($param);
 	}
 
-	public function render ($writer)
+	public function render($writer)
 	{
-		if($this->getHasPreRendered())
+		if ($this->getHasPreRendered())
 		{
-			$this->setDisplay(($this->getPageCount() == 1)?TDisplayStyle::None:TDisplayStyle::Dynamic);
+			$this->setDisplay(($this->getPageCount() == 1) ?TDisplayStyle::None : TDisplayStyle::Dynamic);
 			TWebControl::render($writer);
-			if($this->getActiveControl()->canUpdateClientSide())
+			if ($this->getActiveControl()->canUpdateClientSide())
 				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
 		}
 		else

Braces +17 added lines, -17 removed lines

@@ -127,30 +127,30 @@ 
 	{
 		if($buttonType === TPagerButtonType::LinkButton)
 		{
-			if($enabled)
-				$button = new TActiveLinkButton;
-			else
+			if($enabled) {
+							$button = new TActiveLinkButton;
+			} else
 			{
 				$button = new TLabel;
 				$button->setText($text);
 				$button->setCssClass($this->getButtonCssClass());
 				return $button;
 			}
-		}
-		elseif($buttonType === TPagerButtonType::ImageButton)
+		} elseif($buttonType === TPagerButtonType::ImageButton)
 		{
 			$button = new TActiveImageButton;
 			$button->setImageUrl($this->getPageImageUrl($text, $commandName));
-			if($enabled)
-				$button->Visible = true;
-			else
-				$button->Visible = false;
-		}
-		else
+			if($enabled) {
+							$button->Visible = true;
+			} else {
+							$button->Visible = false;
+			}
+		} else
 		{
 			$button = new TActiveButton;
-			if(!$enabled)
-				$button->setEnabled(false);
+			if(!$enabled) {
+							$button->setEnabled(false);
+			}
 		}
 
 		if($buttonType === TPagerButtonType::ImageButton)
@@ -204,10 +204,10 @@ 
 		{
 			$this->setDisplay(($this->getPageCount() == 1)?TDisplayStyle::None:TDisplayStyle::Dynamic);
 			TWebControl::render($writer);
-			if($this->getActiveControl()->canUpdateClientSide())
-				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
-		}
-		else
+			if($this->getActiveControl()->canUpdateClientSide()) {
+							$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
+			}
+		} else
 		{
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 		}