pradosoft / prado

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

framework/Web/UI/ActiveControls/TActivePageAdapter.php

Spacing +15 added lines, -15 removed lines

@@ -120,8 +120,8 @@ 
 	public function registerControlToRender($control, $writer)
 	{
 		$id = $control->getUniqueID();
-		if(!isset($this->_controlsToRender[$id]))
-			$this->_controlsToRender[$id] = [$control,$writer];
+		if (!isset($this->_controlsToRender[$id]))
+			$this->_controlsToRender[$id] = [$control, $writer];
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	public function renderCallbackResponse($writer)
 	{
 		Prado::trace("ActivePage renderCallbackResponse()", 'Prado\Web\UI\ActiveControls\TActivePageAdapter');
-		if(($url = $this->getResponse()->getAdapter()->getRedirectedUrl()) === null)
+		if (($url = $this->getResponse()->getAdapter()->getRedirectedUrl()) === null)
 			$this->renderResponse($writer);
 		else
 			$this->redirect($url);
@@ -164,16 +164,16 @@ 
 	{
 		Prado::trace("ActivePage renderResponse()", 'Prado\Web\UI\ActiveControls\TActivePageAdapter');
 		//renders all the defered render() calls.
-		foreach($this->_controlsToRender as $rid => $forRender)
+		foreach ($this->_controlsToRender as $rid => $forRender)
 			$forRender[0]->render($forRender[1]);
 
 		$response = $this->getResponse();
 
 		//send response data in header
-		if($response->getHasAdapter())
+		if ($response->getHasAdapter())
 		{
 			$responseData = $response->getAdapter()->getResponseData();
-			if($responseData !== null)
+			if ($responseData !== null)
 			{
 				$data = TJavaScript::jsonEncode($responseData);
 
@@ -182,9 +182,9 @@ 
 		}
 
 		//sends page state in header
-		if(($handler = $this->getCallbackEventTarget()) !== null)
+		if (($handler = $this->getCallbackEventTarget()) !== null)
 		{
-			if($handler->getActiveControl()->getClientSide()->getEnablePageStateUpdate())
+			if ($handler->getActiveControl()->getClientSide()->getEnablePageStateUpdate())
 			{
 				$pagestate = $this->getPage()->getClientState();
 				$this->appendContentPart($response, self::CALLBACK_PAGESTATE_HEADER, $pagestate);
@@ -195,7 +195,7 @@ 
 		$writer->write(" ");
 
 		//output the end javascript
-		if($this->getPage()->getClientScript()->hasEndScripts())
+		if ($this->getPage()->getClientScript()->hasEndScripts())
 		{
 			$writer = $response->createHtmlWriter();
 			$this->getPage()->getClientScript()->renderEndScriptsCallback($writer);
@@ -249,9 +249,9 @@ 
 	 */
 	private function raiseCallbackEvent()
 	{
-		 if(($callbackHandler = $this->getCallbackEventTarget()) !== null)
+		 if (($callbackHandler = $this->getCallbackEventTarget()) !== null)
 		 {
-			if($callbackHandler instanceof ICallbackEventHandler)
+			if ($callbackHandler instanceof ICallbackEventHandler)
 			{
 				$param = $this->getCallbackEventParameter();
 				$result = new TCallbackEventParameter($this->getResponse(), $param);
@@ -276,10 +276,10 @@ 
 	 */
 	public function getCallbackEventTarget()
 	{
-		if($this->_callbackEventTarget === null)
+		if ($this->_callbackEventTarget === null)
 		{
 			$eventTarget = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
-			if(!empty($eventTarget))
+			if (!empty($eventTarget))
 				$this->_callbackEventTarget = $this->getPage()->findControl($eventTarget);
 		}
 		return $this->_callbackEventTarget;
@@ -300,7 +300,7 @@ 
 	 */
 	public function getCallbackEventParameter()
 	{
-		if($this->_callbackEventParameter === null)
+		if ($this->_callbackEventParameter === null)
 		{
 			$param = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
 			$this->_callbackEventParameter = $param;
@@ -323,7 +323,7 @@ 
 	 */
 	public function getCallbackClientHandler()
 	{
-		if($this->_callbackClient === null)
+		if ($this->_callbackClient === null)
 			$this->_callbackClient = new TCallbackClientScript;
 		return $this->_callbackClient;
 	}

Braces +31 added lines, -24 removed lines

@@ -120,8 +120,9 @@ 
 	public function registerControlToRender($control, $writer)
 	{
 		$id = $control->getUniqueID();
-		if(!isset($this->_controlsToRender[$id]))
-			$this->_controlsToRender[$id] = [$control,$writer];
+		if(!isset($this->_controlsToRender[$id])) {
+					$this->_controlsToRender[$id] = [$control,$writer];
+		}
 	}
 
 	/**
@@ -139,10 +140,11 @@ 
 	public function renderCallbackResponse($writer)
 	{
 		Prado::trace("ActivePage renderCallbackResponse()", 'Prado\Web\UI\ActiveControls\TActivePageAdapter');
-		if(($url = $this->getResponse()->getAdapter()->getRedirectedUrl()) === null)
-			$this->renderResponse($writer);
-		else
-			$this->redirect($url);
+		if(($url = $this->getResponse()->getAdapter()->getRedirectedUrl()) === null) {
+					$this->renderResponse($writer);
+		} else {
+					$this->redirect($url);
+		}
 	}
 
 	/**
@@ -164,8 +166,9 @@ 
 	{
 		Prado::trace("ActivePage renderResponse()", 'Prado\Web\UI\ActiveControls\TActivePageAdapter');
 		//renders all the defered render() calls.
-		foreach($this->_controlsToRender as $rid => $forRender)
-			$forRender[0]->render($forRender[1]);
+		foreach($this->_controlsToRender as $rid => $forRender) {
+					$forRender[0]->render($forRender[1]);
+		}
 
 		$response = $this->getResponse();
 
@@ -212,23 +215,27 @@ 
 
 		// collect all stylesheet file references
 		$stylesheets = $cs->getStyleSheetUrls();
-		if (count($stylesheets) > 0)
-		$this->appendContentPart($response, self::CALLBACK_STYLESHEETLIST_HEADER, TJavaScript::jsonEncode($stylesheets));
+		if (count($stylesheets) > 0) {
+				$this->appendContentPart($response, self::CALLBACK_STYLESHEETLIST_HEADER, TJavaScript::jsonEncode($stylesheets));
+		}
 
 		// collect all stylesheet snippets references
 		$stylesheets = $cs->getStyleSheetCodes();
-		if (count($stylesheets) > 0)
-		$this->appendContentPart($response, self::CALLBACK_STYLESHEET_HEADER, TJavaScript::jsonEncode($stylesheets));
+		if (count($stylesheets) > 0) {
+				$this->appendContentPart($response, self::CALLBACK_STYLESHEET_HEADER, TJavaScript::jsonEncode($stylesheets));
+		}
 
 		// collect all script file references
 		$scripts = $cs->getScriptUrls();
-		if (count($scripts) > 0)
-		$this->appendContentPart($response, self::CALLBACK_SCRIPTLIST_HEADER, TJavaScript::jsonEncode($scripts));
+		if (count($scripts) > 0) {
+				$this->appendContentPart($response, self::CALLBACK_SCRIPTLIST_HEADER, TJavaScript::jsonEncode($scripts));
+		}
 
 		// collect all hidden field references
 		$fields = $cs->getHiddenFields();
-		if (count($fields) > 0)
-		$this->appendContentPart($response, self::CALLBACK_HIDDENFIELDLIST_HEADER, TJavaScript::jsonEncode($fields));
+		if (count($fields) > 0) {
+				$this->appendContentPart($response, self::CALLBACK_HIDDENFIELDLIST_HEADER, TJavaScript::jsonEncode($fields));
+		}
 	}
 
 	/**
@@ -256,14 +263,12 @@ 
 				$param = $this->getCallbackEventParameter();
 				$result = new TCallbackEventParameter($this->getResponse(), $param);
 				$callbackHandler->raiseCallbackEvent($result);
-			}
-			else
+			} else
 			{
 				throw new TInvalidCallbackException(
 					'callback_invalid_handler', $callbackHandler->getUniqueID());
 			}
-		 }
-		 else
+		 } else
 		 {
 			$target = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
 			throw new TInvalidCallbackException('callback_invalid_target', $target);
@@ -279,8 +284,9 @@ 
 		if($this->_callbackEventTarget === null)
 		{
 			$eventTarget = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
-			if(!empty($eventTarget))
-				$this->_callbackEventTarget = $this->getPage()->findControl($eventTarget);
+			if(!empty($eventTarget)) {
+							$this->_callbackEventTarget = $this->getPage()->findControl($eventTarget);
+			}
 		}
 		return $this->_callbackEventTarget;
 	}
@@ -323,8 +329,9 @@ 
 	 */
 	public function getCallbackClientHandler()
 	{
-		if($this->_callbackClient === null)
-			$this->_callbackClient = new TCallbackClientScript;
+		if($this->_callbackClient === null) {
+					$this->_callbackClient = new TCallbackClientScript;
+		}
 		return $this->_callbackClient;
 	}
 }
\ No newline at end of file

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