pradosoft / prado

framework/Web/UI/WebControls/TReCaptchaValidator.php

Spacing +9 added lines, -9 removed lines

@@ -93,12 +93,12 @@ 
 
 		// communicate validation status to the client side
 		$value = $this->_isvalid === false ? '0' : '1';
-		$cs->registerHiddenField($this->getClientID() . '_1', $value);
+		$cs->registerHiddenField($this->getClientID().'_1', $value);
 		
 		// update validator display
 		if ($control = $this->getValidationTarget())
 		{
-			$fn = 'captchaUpdateValidatorStatus_' . $this->getClientID();
+			$fn = 'captchaUpdateValidatorStatus_'.$this->getClientID();
 
 			// check if we need to request a new captcha too
 			if ($this->Page->IsCallback)
@@ -114,21 +114,21 @@ 
 					}
 			}
 
-			$cs->registerEndScript($this->getClientID() . '::validate', implode(' ', [
+			$cs->registerEndScript($this->getClientID().'::validate', implode(' ', [
 				// this function will be used to update the validator
-				'function ' . $fn . '(valid)',
+				'function '.$fn.'(valid)',
 				'{',
-				'  jQuery(' . TJavaScript::quoteString('#' . $this->getClientID() . '_1') . ').val(valid);',
-				'  Prado.Validation.validateControl(' . TJavaScript::quoteString($control->ClientID) . '); ',
+				'  jQuery('.TJavaScript::quoteString('#'.$this->getClientID().'_1').').val(valid);',
+				'  Prado.Validation.validateControl('.TJavaScript::quoteString($control->ClientID).'); ',
 				'}',
 				'',
 				// update the validator to the result if we're in a callback
 				// (if we're in initial rendering or a postback then the result will be rendered directly to the page html anyway)
-				$this->Page->IsCallback ? $fn . '(' . $value . ');' : '',
+				$this->Page->IsCallback ? $fn.'('.$value.');' : '',
 				'',
 				// install event handler that clears the validation error when user changes the captcha response field
-				'jQuery("#' . $control->getClientID() . '").on("keyup", ' . TJavaScript::quoteString('#' . $control->getResponseFieldName()) . ', function() { ',
-					$fn . '("1");',
+				'jQuery("#'.$control->getClientID().'").on("keyup", '.TJavaScript::quoteString('#'.$control->getResponseFieldName()).', function() { ',
+					$fn.'("1");',
 				'});',
 			]));
 		}

Braces +9 added lines, -6 removed lines

@@ -52,10 +52,12 @@ 
 	protected function getCaptchaControl()
 	{
 		$control = $this->getValidationTarget();
-		if (!$control)
-			throw new Exception('No target control specified for TReCaptchaValidator');
-		if (!($control instanceof TReCaptcha))
-			throw new Exception('TReCaptchaValidator only works with TReCaptcha controls');
+		if (!$control) {
+					throw new Exception('No target control specified for TReCaptchaValidator');
+		}
+		if (!($control instanceof TReCaptcha)) {
+					throw new Exception('TReCaptchaValidator only works with TReCaptcha controls');
+		}
 		return $control;
 	}
 
@@ -103,14 +105,15 @@ 
 			// check if we need to request a new captcha too
 			if ($this->Page->IsCallback)
 			{
-				if ($control->getVisible(true))
-					if (null !== $this->_isvalid)
+				if ($control->getVisible(true)) {
+									if (null !== $this->_isvalid)
 					{
 						// if the response has been tested and we reach the pre-render phase
 						// then we need to regenerate the token, because it won't test positive
 						// anymore, even if solves correctly
 
 						$control->regenerateToken();
+				}
 					}
 			}
 

framework/Web/UI/WebControls/TBaseValidator.php

Spacing +32 added lines, -32 removed lines

@@ -124,7 +124,7 @@ 
 	 */
 	public function onUnload($param)
 	{
-		if($this->_registered && ($page = $this->getPage()) !== null)
+		if ($this->_registered && ($page = $this->getPage()) !== null)
 			$page->getValidators()->remove($this);
 		$this->_registered = false;
 		parent::onUnload($param);
@@ -139,9 +139,9 @@ 
 	{
 		$display = $this->getDisplay();
 		$visible = $this->getEnabled(true) && !$this->getIsValid();
-		if($display === TValidatorDisplayStyle::None || (!$visible && $display === TValidatorDisplayStyle::Dynamic))
+		if ($display === TValidatorDisplayStyle::None || (!$visible && $display === TValidatorDisplayStyle::Dynamic))
 			$writer->addStyleAttribute('display', 'none');
-		elseif(!$visible)
+		elseif (!$visible)
 			$writer->addStyleAttribute('visibility', 'hidden');
 		$writer->addAttribute('id', $this->getClientID());
 		parent::addAttributesToRender($writer);
@@ -159,13 +159,13 @@ 
 		$options['FormID'] = $this->getPage()->getForm()->getClientID();
 		$options['Display'] = $this->getDisplay();
 		$options['ErrorMessage'] = $this->getErrorMessage();
-		if($this->getFocusOnError())
+		if ($this->getFocusOnError())
 		{
 			$options['FocusOnError'] = $this->getFocusOnError();
 			$options['FocusElementID'] = $this->getFocusElementID();
 		}
 		$options['ValidationGroup'] = $this->getValidationGroup();
-		if($control)
+		if ($control)
 			$options['ControlToValidate'] = $control->getClientID();
 		$options['ControlCssClass'] = $this->getControlCssClass();
 
@@ -173,7 +173,7 @@ 
 		$options['Enabled'] = $this->getEnabled(true);
 
 		//get date format from date picker target control
-		if($control instanceof TDatePicker)
+		if ($control instanceof TDatePicker)
 			$options['DateFormat'] = $control->getDateFormat();
 
 		$options = array_merge($options, $this->getClientSide()->getOptions()->toArray());
@@ -190,8 +190,8 @@ 
 	 */
 	private function getClientControlClass($control)
 	{
-		foreach(self::$_clientClass as $type)
-			if($control instanceof $type)
+		foreach (self::$_clientClass as $type)
+			if ($control instanceof $type)
 				return $type;
 		$reflectionClass = new \ReflectionClass($control);
 		return $reflectionClass->getShortName();
@@ -215,7 +215,7 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientSide === null)
+		if ($this->_clientSide === null)
 			$this->_clientSide = $this->createClientSide();
 		return $this->_clientSide;
 	}
@@ -241,13 +241,13 @@ 
 			$scripts->registerPradoScript('validator');
 		$formID = $this->getPage()->getForm()->getClientID();
 		$scriptKey = "TBaseValidator:$formID";
-		if($this->getEnableClientScript() && !$scripts->isEndScriptRegistered($scriptKey))
+		if ($this->getEnableClientScript() && !$scripts->isEndScriptRegistered($scriptKey))
 		{
 			$manager['FormID'] = $formID;
 			$options = TJavaScript::encode($manager);
 			$scripts->registerEndScript($scriptKey, "new Prado.ValidationManager({$options});");
 		}
-		if($this->getEnableClientScript())
+		if ($this->getEnableClientScript())
 			$this->registerClientScriptValidator();
 	}
 
@@ -255,7 +255,7 @@ 
 	 * Override parent implementation to update the control CSS Class before
 	 * the validated control is rendered
 	 */
-	public function onPreRender ($param)
+	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
 		$this->updateControlCssClass();
@@ -268,15 +268,15 @@ 
 	 */
 	protected function updateControlCssClass()
 	{
-		if(($cssClass = $this->getControlCssClass()) !== '')
+		if (($cssClass = $this->getControlCssClass()) !== '')
 		{
 			$control = $this->getValidationTarget();
-			if($control instanceof TWebControl)
+			if ($control instanceof TWebControl)
 			{
-				$class = preg_replace('/ ' . preg_quote($cssClass) . '/', '', $control->getCssClass());
-				if(!$this->getIsValid())
+				$class = preg_replace('/ '.preg_quote($cssClass).'/', '', $control->getCssClass());
+				if (!$this->getIsValid())
 				{
-					$class .= ' ' . $cssClass;
+					$class .= ' '.$cssClass;
 					$control->setCssClass($class);
 				} elseif ($control->getIsValid())
 					$control->setCssClass($class);
@@ -289,11 +289,11 @@ 
 	 */
 	protected function registerClientScriptValidator()
 	{
-		$key = 'prado:' . $this->getClientID();
-		if(!$this->getPage()->getClientScript()->isEndScriptRegistered($key))
+		$key = 'prado:'.$this->getClientID();
+		if (!$this->getPage()->getClientScript()->isEndScriptRegistered($key))
 		{
 			$options = TJavaScript::encode($this->getClientScriptOptions());
-			$script = 'new ' . $this->getClientClassName() . '(' . $options . ');';
+			$script = 'new '.$this->getClientClassName().'('.$options.');';
 			$this->getPage()->getClientScript()->registerEndScript($key, $script);
 		}
 	}
@@ -323,7 +323,7 @@ 
 	{
 		$value = TPropertyValue::ensureBoolean($value);
 		parent::setEnabled($value);
-		if(!$value)
+		if (!$value)
 			$this->_isValid = true;
 	}
 
@@ -418,15 +418,15 @@ 
 	 */
 	public function getFocusElementID()
 	{
-		if(($id = $this->getViewState('FocusElementID', '')) === '')
+		if (($id = $this->getViewState('FocusElementID', '')) === '')
 		{
 			$target = $this->getValidationTarget();
 			/* Workaround: TCheckBoxList and TRadioButtonList nests the actual
 			 * inputs inside a table; we ensure the first input gets focused
 			 */
-			if($target instanceof TCheckBoxList && $target->getItemCount() > 0)
+			if ($target instanceof TCheckBoxList && $target->getItemCount() > 0)
 			{
-				$id = $target->getClientID() . '_c0';
+				$id = $target->getClientID().'_c0';
 			} else {
 				$id = $target->getClientID();
 			}
@@ -483,7 +483,7 @@ 
 	 */
 	public function getValidationTarget()
 	{
-		if(($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null)
+		if (($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null)
 			return $control;
 		else
 			throw new TConfigurationException('basevalidator_controltovalidate_invalid', get_class($this));
@@ -497,7 +497,7 @@ 
 	 */
 	protected function getValidationValue($control)
 	{
-		if($control instanceof \Prado\Web\UI\IValidatable)
+		if ($control instanceof \Prado\Web\UI\IValidatable)
 			return $control->getValidationPropertyValue();
 		else
 			throw new TInvalidDataTypeException('basevalidator_validatable_required', get_class($this));
@@ -511,22 +511,22 @@ 
 	public function validate()
 	{
 		$this->onValidate();
-		if($this->getVisible(true) && $this->getEnabled(true))
+		if ($this->getVisible(true) && $this->getEnabled(true))
 		{
 			$target = $this->getValidationTarget();
 			// if the target is not a disabled web control
-			if($target === null ||
+			if ($target === null ||
 				($target !== null &&
 				!($target instanceof TWebControl && !$target->getEnabled(true))))
 			{
-				if($this->evaluateIsValid())
+				if ($this->evaluateIsValid())
 				{
 					$this->setIsValid(true);
 					$this->onValidationSuccess();
 				}
 				else
 				{
-					if($target)
+					if ($target)
 						$target->setIsValid(false);
 					$this->setIsValid(false);
 					$this->onValidationError();
@@ -600,9 +600,9 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) !== '')
+		if (($text = $this->getText()) !== '')
 			$writer->write($text);
-		elseif(($text = $this->getErrorMessage()) !== '')
+		elseif (($text = $this->getErrorMessage()) !== '')
 			$writer->write($text);
 		else
 			parent::renderContents($writer);

Braces +54 added lines, -42 removed lines

@@ -124,8 +124,9 @@ 
 	 */
 	public function onUnload($param)
 	{
-		if($this->_registered && ($page = $this->getPage()) !== null)
-			$page->getValidators()->remove($this);
+		if($this->_registered && ($page = $this->getPage()) !== null) {
+					$page->getValidators()->remove($this);
+		}
 		$this->_registered = false;
 		parent::onUnload($param);
 	}
@@ -139,10 +140,11 @@ 
 	{
 		$display = $this->getDisplay();
 		$visible = $this->getEnabled(true) && !$this->getIsValid();
-		if($display === TValidatorDisplayStyle::None || (!$visible && $display === TValidatorDisplayStyle::Dynamic))
-			$writer->addStyleAttribute('display', 'none');
-		elseif(!$visible)
-			$writer->addStyleAttribute('visibility', 'hidden');
+		if($display === TValidatorDisplayStyle::None || (!$visible && $display === TValidatorDisplayStyle::Dynamic)) {
+					$writer->addStyleAttribute('display', 'none');
+		} elseif(!$visible) {
+					$writer->addStyleAttribute('visibility', 'hidden');
+		}
 		$writer->addAttribute('id', $this->getClientID());
 		parent::addAttributesToRender($writer);
 		$this->renderClientControlScript($writer);
@@ -165,16 +167,18 @@ 
 			$options['FocusElementID'] = $this->getFocusElementID();
 		}
 		$options['ValidationGroup'] = $this->getValidationGroup();
-		if($control)
-			$options['ControlToValidate'] = $control->getClientID();
+		if($control) {
+					$options['ControlToValidate'] = $control->getClientID();
+		}
 		$options['ControlCssClass'] = $this->getControlCssClass();
 
 		$options['ControlType'] = $this->getClientControlClass($control);
 		$options['Enabled'] = $this->getEnabled(true);
 
 		//get date format from date picker target control
-		if($control instanceof TDatePicker)
-			$options['DateFormat'] = $control->getDateFormat();
+		if($control instanceof TDatePicker) {
+					$options['DateFormat'] = $control->getDateFormat();
+		}
 
 		$options = array_merge($options, $this->getClientSide()->getOptions()->toArray());
 
@@ -190,9 +194,10 @@ 
 	 */
 	private function getClientControlClass($control)
 	{
-		foreach(self::$_clientClass as $type)
-			if($control instanceof $type)
+		foreach(self::$_clientClass as $type) {
+					if($control instanceof $type)
 				return $type;
+		}
 		$reflectionClass = new \ReflectionClass($control);
 		return $reflectionClass->getShortName();
 	}
@@ -215,8 +220,9 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientSide === null)
-			$this->_clientSide = $this->createClientSide();
+		if($this->_clientSide === null) {
+					$this->_clientSide = $this->createClientSide();
+		}
 		return $this->_clientSide;
 	}
 
@@ -237,8 +243,9 @@ 
 	public function renderClientControlScript($writer)
 	{
 		$scripts = $this->getPage()->getClientScript();
-		if ($this->getEnableClientScript())
-			$scripts->registerPradoScript('validator');
+		if ($this->getEnableClientScript()) {
+					$scripts->registerPradoScript('validator');
+		}
 		$formID = $this->getPage()->getForm()->getClientID();
 		$scriptKey = "TBaseValidator:$formID";
 		if($this->getEnableClientScript() && !$scripts->isEndScriptRegistered($scriptKey))
@@ -247,8 +254,9 @@ 
 			$options = TJavaScript::encode($manager);
 			$scripts->registerEndScript($scriptKey, "new Prado.ValidationManager({$options});");
 		}
-		if($this->getEnableClientScript())
-			$this->registerClientScriptValidator();
+		if($this->getEnableClientScript()) {
+					$this->registerClientScriptValidator();
+		}
 	}
 
 	/**
@@ -278,8 +286,9 @@ 
 				{
 					$class .= ' ' . $cssClass;
 					$control->setCssClass($class);
-				} elseif ($control->getIsValid())
-					$control->setCssClass($class);
+				} elseif ($control->getIsValid()) {
+									$control->setCssClass($class);
+				}
 			}
 		}
 	}
@@ -323,8 +332,9 @@ 
 	{
 		$value = TPropertyValue::ensureBoolean($value);
 		parent::setEnabled($value);
-		if(!$value)
-			$this->_isValid = true;
+		if(!$value) {
+					$this->_isValid = true;
+		}
 	}
 
 	/**
@@ -483,10 +493,11 @@ 
 	 */
 	public function getValidationTarget()
 	{
-		if(($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null)
-			return $control;
-		else
-			throw new TConfigurationException('basevalidator_controltovalidate_invalid', get_class($this));
+		if(($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null) {
+					return $control;
+		} else {
+					throw new TConfigurationException('basevalidator_controltovalidate_invalid', get_class($this));
+		}
 	}
 
 	/**
@@ -497,10 +508,11 @@ 
 	 */
 	protected function getValidationValue($control)
 	{
-		if($control instanceof \Prado\Web\UI\IValidatable)
-			return $control->getValidationPropertyValue();
-		else
-			throw new TInvalidDataTypeException('basevalidator_validatable_required', get_class($this));
+		if($control instanceof \Prado\Web\UI\IValidatable) {
+					return $control->getValidationPropertyValue();
+		} else {
+					throw new TInvalidDataTypeException('basevalidator_validatable_required', get_class($this));
+		}
 	}
 
 	/**
@@ -523,16 +535,15 @@ 
 				{
 					$this->setIsValid(true);
 					$this->onValidationSuccess();
-				}
-				else
+				} else
 				{
-					if($target)
-						$target->setIsValid(false);
+					if($target) {
+											$target->setIsValid(false);
+					}
 					$this->setIsValid(false);
 					$this->onValidationError();
 				}
-			}
-			else
+			} else
 			{
 				$this->evaluateIsValid();
 				$this->setIsValid(true);
@@ -600,11 +611,12 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) !== '')
-			$writer->write($text);
-		elseif(($text = $this->getErrorMessage()) !== '')
-			$writer->write($text);
-		else
-			parent::renderContents($writer);
+		if(($text = $this->getText()) !== '') {
+					$writer->write($text);
+		} elseif(($text = $this->getErrorMessage()) !== '') {
+					$writer->write($text);
+		} else {
+					parent::renderContents($writer);
+		}
 	}
 }

framework/Web/UI/WebControls/TTabViewCollection.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TTabView)
+		if ($item instanceof TTabView)
 			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('tabviewcollection_tabview_required');
@@ -47,9 +47,9 @@ 
 	 */
 	public function findIndexByID($id)
 	{
-		foreach($this as $index => $view)
+		foreach ($this as $index => $view)
 		{
-			if($view->getID(false) === $id)
+			if ($view->getID(false) === $id)
 				return $index;
 		}
 		return -1;

Braces +8 added lines, -6 removed lines

@@ -34,10 +34,11 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TTabView)
-			parent::insertAt($index, $item);
-		else
-			throw new TInvalidDataTypeException('tabviewcollection_tabview_required');
+		if($item instanceof TTabView) {
+					parent::insertAt($index, $item);
+		} else {
+					throw new TInvalidDataTypeException('tabviewcollection_tabview_required');
+		}
 	}
 
 	/**
@@ -49,8 +50,9 @@ 
 	{
 		foreach($this as $index => $view)
 		{
-			if($view->getID(false) === $id)
-				return $index;
+			if($view->getID(false) === $id) {
+							return $index;
+			}
 		}
 		return -1;
 	}

framework/Web/UI/WebControls/TCaptchaValidator.php

Spacing +5 added lines, -5 removed lines

@@ -86,11 +86,11 @@ 
 	 */
 	protected function findCaptchaControl()
 	{
-		if(($id = $this->getCaptchaControl()) === '')
+		if (($id = $this->getCaptchaControl()) === '')
 			throw new TConfigurationException('captchavalidator_captchacontrol_required');
-		elseif(($control = $this->findControl($id)) === null)
+		elseif (($control = $this->findControl($id)) === null)
 			throw new TConfigurationException('captchavalidator_captchacontrol_inexistent', $id);
-		elseif(!($control instanceof TCaptcha))
+		elseif (!($control instanceof TCaptcha))
 			throw new TConfigurationException('captchavalidator_captchacontrol_invalid', $id);
 		else
 			return $control;
@@ -104,7 +104,7 @@ 
 	{
 		$options = parent::getClientScriptOptions();
 		$control = $this->findCaptchaControl();
-		if($control->getCaseSensitive())
+		if ($control->getCaseSensitive())
 		{
 			$options['TokenHash'] = $this->generateTokenHash($control->getToken());
 			$options['CaseSensitive'] = true;
@@ -119,7 +119,7 @@ 
 
 	private function generateTokenHash($token)
 	{
-		for($h = 0,$i = strlen($token) - 1;$i >= 0;--$i)
+		for ($h = 0, $i = strlen($token) - 1; $i >= 0; --$i)
 			$h += ord($token[$i]);
 		return $h;
 	}

Braces +13 added lines, -12 removed lines

@@ -86,14 +86,15 @@ 
 	 */
 	protected function findCaptchaControl()
 	{
-		if(($id = $this->getCaptchaControl()) === '')
-			throw new TConfigurationException('captchavalidator_captchacontrol_required');
-		elseif(($control = $this->findControl($id)) === null)
-			throw new TConfigurationException('captchavalidator_captchacontrol_inexistent', $id);
-		elseif(!($control instanceof TCaptcha))
-			throw new TConfigurationException('captchavalidator_captchacontrol_invalid', $id);
-		else
-			return $control;
+		if(($id = $this->getCaptchaControl()) === '') {
+					throw new TConfigurationException('captchavalidator_captchacontrol_required');
+		} elseif(($control = $this->findControl($id)) === null) {
+					throw new TConfigurationException('captchavalidator_captchacontrol_inexistent', $id);
+		} elseif(!($control instanceof TCaptcha)) {
+					throw new TConfigurationException('captchavalidator_captchacontrol_invalid', $id);
+		} else {
+					return $control;
+		}
 	}
 
 	/**
@@ -108,8 +109,7 @@ 
 		{
 			$options['TokenHash'] = $this->generateTokenHash($control->getToken());
 			$options['CaseSensitive'] = true;
-		}
-		else
+		} else
 		{
 			$options['TokenHash'] = $this->generateTokenHash(strtoupper($control->getToken()));
 			$options['CaseSensitive'] = false;
@@ -119,8 +119,9 @@ 
 
 	private function generateTokenHash($token)
 	{
-		for($h = 0,$i = strlen($token) - 1;$i >= 0;--$i)
-			$h += ord($token[$i]);
+		for($h = 0,$i = strlen($token) - 1;$i >= 0;--$i) {
+					$h += ord($token[$i]);
+		}
 		return $h;
 	}
 }

framework/Web/UI/WebControls/TTableStyle.php

Spacing +29 added lines, -29 removed lines

@@ -96,19 +96,19 @@ 
 	public function copyFrom($style)
 	{
 		parent::copyFrom($style);
-		if($style instanceof TTableStyle)
+		if ($style instanceof TTableStyle)
 		{
-			if($style->_backImageUrl !== null)
+			if ($style->_backImageUrl !== null)
 				$this->_backImageUrl = $style->_backImageUrl;
-			if($style->_horizontalAlign !== null)
+			if ($style->_horizontalAlign !== null)
 				$this->_horizontalAlign = $style->_horizontalAlign;
-			if($style->_cellPadding !== null)
+			if ($style->_cellPadding !== null)
 				$this->_cellPadding = $style->_cellPadding;
-			if($style->_cellSpacing !== null)
+			if ($style->_cellSpacing !== null)
 				$this->_cellSpacing = $style->_cellSpacing;
-			if($style->_gridLines !== null)
+			if ($style->_gridLines !== null)
 				$this->_gridLines = $style->_gridLines;
-			if($style->_borderCollapse !== null)
+			if ($style->_borderCollapse !== null)
 				$this->_borderCollapse = $style->_borderCollapse;
 		}
 	}
@@ -122,19 +122,19 @@ 
 	public function mergeWith($style)
 	{
 		parent::mergeWith($style);
-		if($style instanceof TTableStyle)
+		if ($style instanceof TTableStyle)
 		{
-			if($this->_backImageUrl === null && $style->_backImageUrl !== null)
+			if ($this->_backImageUrl === null && $style->_backImageUrl !== null)
 				$this->_backImageUrl = $style->_backImageUrl;
-			if($this->_horizontalAlign === null && $style->_horizontalAlign !== null)
+			if ($this->_horizontalAlign === null && $style->_horizontalAlign !== null)
 				$this->_horizontalAlign = $style->_horizontalAlign;
-			if($this->_cellPadding === null && $style->_cellPadding !== null)
+			if ($this->_cellPadding === null && $style->_cellPadding !== null)
 				$this->_cellPadding = $style->_cellPadding;
-			if($this->_cellSpacing === null && $style->_cellSpacing !== null)
+			if ($this->_cellSpacing === null && $style->_cellSpacing !== null)
 				$this->_cellSpacing = $style->_cellSpacing;
-			if($this->_gridLines === null && $style->_gridLines !== null)
+			if ($this->_gridLines === null && $style->_gridLines !== null)
 				$this->_gridLines = $style->_gridLines;
-			if($this->_borderCollapse === null && $style->_borderCollapse !== null)
+			if ($this->_borderCollapse === null && $style->_borderCollapse !== null)
 				$this->_borderCollapse = $style->_borderCollapse;
 		}
 	}
@@ -147,22 +147,22 @@ 
 	 */
 	public function addAttributesToRender($writer)
 	{
-		if(($url = trim($this->getBackImageUrl())) !== '')
-			$writer->addStyleAttribute('background-image', 'url(' . $url . ')');
+		if (($url = trim($this->getBackImageUrl())) !== '')
+			$writer->addStyleAttribute('background-image', 'url('.$url.')');
 
-		if(($horizontalAlign = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet)
+		if (($horizontalAlign = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet)
 			$writer->addStyleAttribute('text-align', strtolower($horizontalAlign));
 
-		if(($cellPadding = $this->getCellPadding()) >= 0)
+		if (($cellPadding = $this->getCellPadding()) >= 0)
 			$writer->addAttribute('cellpadding', "$cellPadding");
 
-		if(($cellSpacing = $this->getCellSpacing()) >= 0)
+		if (($cellSpacing = $this->getCellSpacing()) >= 0)
 			$writer->addAttribute('cellspacing', "$cellSpacing");
 
-		if($this->getBorderCollapse())
+		if ($this->getBorderCollapse())
 			$writer->addStyleAttribute('border-collapse', 'collapse');
 
-		switch($this->getGridLines())
+		switch ($this->getGridLines())
 		{
 			case TTableGridLines::Horizontal : $writer->addAttribute('rules', 'rows'); break;
 			case TTableGridLines::Vertical : $writer->addAttribute('rules', 'cols'); break;
@@ -177,7 +177,7 @@ 
 	 */
 	public function getBackImageUrl()
 	{
-		return $this->_backImageUrl === null?'':$this->_backImageUrl;
+		return $this->_backImageUrl === null ? '' : $this->_backImageUrl;
 	}
 
 	/**
@@ -194,7 +194,7 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		return $this->_horizontalAlign === null?THorizontalAlign::NotSet:$this->_horizontalAlign;
+		return $this->_horizontalAlign === null ?THorizontalAlign::NotSet : $this->_horizontalAlign;
 	}
 
 	/**
@@ -211,7 +211,7 @@ 
 	 */
 	public function getCellPadding()
 	{
-		return $this->_cellPadding === null?-1:$this->_cellPadding;
+		return $this->_cellPadding === null ?-1 : $this->_cellPadding;
 	}
 
 	/**
@@ -220,7 +220,7 @@ 
 	 */
 	public function setCellPadding($value)
 	{
-		if(($this->_cellPadding = TPropertyValue::ensureInteger($value)) < -1)
+		if (($this->_cellPadding = TPropertyValue::ensureInteger($value)) < -1)
 			throw new TInvalidDataValueException('tablestyle_cellpadding_invalid');
 	}
 
@@ -229,7 +229,7 @@ 
 	 */
 	public function getCellSpacing()
 	{
-		return $this->_cellSpacing === null?-1:$this->_cellSpacing;
+		return $this->_cellSpacing === null ?-1 : $this->_cellSpacing;
 	}
 
 	/**
@@ -238,7 +238,7 @@ 
 	 */
 	public function setCellSpacing($value)
 	{
-		if(($this->_cellSpacing = TPropertyValue::ensureInteger($value)) < -1)
+		if (($this->_cellSpacing = TPropertyValue::ensureInteger($value)) < -1)
 			throw new TInvalidDataValueException('tablestyle_cellspacing_invalid');
 	}
 
@@ -247,7 +247,7 @@ 
 	 */
 	public function getGridLines()
 	{
-		return $this->_gridLines === null?TTableGridLines::None:$this->_gridLines;
+		return $this->_gridLines === null ?TTableGridLines::None : $this->_gridLines;
 	}
 
 	/**
@@ -265,7 +265,7 @@ 
 	 */
 	public function getBorderCollapse()
 	{
-		return $this->_borderCollapse === null?false:$this->_borderCollapse;
+		return $this->_borderCollapse === null ?false:$this->_borderCollapse;
 	}
 
 	/**

Braces +75 added lines, -50 removed lines

@@ -58,18 +58,24 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_backImageUrl === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_backImageUrl";
-		if ($this->_horizontalAlign === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_horizontalAlign";
-		if ($this->_cellPadding === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_cellPadding";
-		if ($this->_cellSpacing === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_cellSpacing";
-		if ($this->_gridLines === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_gridLines";
-		if ($this->_borderCollapse === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_borderCollapse";
+		if ($this->_backImageUrl === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_backImageUrl";
+		}
+		if ($this->_horizontalAlign === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_horizontalAlign";
+		}
+		if ($this->_cellPadding === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_cellPadding";
+		}
+		if ($this->_cellSpacing === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_cellSpacing";
+		}
+		if ($this->_gridLines === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_gridLines";
+		}
+		if ($this->_borderCollapse === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TTableStyle\0_borderCollapse";
+		}
 	}
 
 	/**
@@ -98,18 +104,24 @@ 
 		parent::copyFrom($style);
 		if($style instanceof TTableStyle)
 		{
-			if($style->_backImageUrl !== null)
-				$this->_backImageUrl = $style->_backImageUrl;
-			if($style->_horizontalAlign !== null)
-				$this->_horizontalAlign = $style->_horizontalAlign;
-			if($style->_cellPadding !== null)
-				$this->_cellPadding = $style->_cellPadding;
-			if($style->_cellSpacing !== null)
-				$this->_cellSpacing = $style->_cellSpacing;
-			if($style->_gridLines !== null)
-				$this->_gridLines = $style->_gridLines;
-			if($style->_borderCollapse !== null)
-				$this->_borderCollapse = $style->_borderCollapse;
+			if($style->_backImageUrl !== null) {
+							$this->_backImageUrl = $style->_backImageUrl;
+			}
+			if($style->_horizontalAlign !== null) {
+							$this->_horizontalAlign = $style->_horizontalAlign;
+			}
+			if($style->_cellPadding !== null) {
+							$this->_cellPadding = $style->_cellPadding;
+			}
+			if($style->_cellSpacing !== null) {
+							$this->_cellSpacing = $style->_cellSpacing;
+			}
+			if($style->_gridLines !== null) {
+							$this->_gridLines = $style->_gridLines;
+			}
+			if($style->_borderCollapse !== null) {
+							$this->_borderCollapse = $style->_borderCollapse;
+			}
 		}
 	}
 
@@ -124,18 +136,24 @@ 
 		parent::mergeWith($style);
 		if($style instanceof TTableStyle)
 		{
-			if($this->_backImageUrl === null && $style->_backImageUrl !== null)
-				$this->_backImageUrl = $style->_backImageUrl;
-			if($this->_horizontalAlign === null && $style->_horizontalAlign !== null)
-				$this->_horizontalAlign = $style->_horizontalAlign;
-			if($this->_cellPadding === null && $style->_cellPadding !== null)
-				$this->_cellPadding = $style->_cellPadding;
-			if($this->_cellSpacing === null && $style->_cellSpacing !== null)
-				$this->_cellSpacing = $style->_cellSpacing;
-			if($this->_gridLines === null && $style->_gridLines !== null)
-				$this->_gridLines = $style->_gridLines;
-			if($this->_borderCollapse === null && $style->_borderCollapse !== null)
-				$this->_borderCollapse = $style->_borderCollapse;
+			if($this->_backImageUrl === null && $style->_backImageUrl !== null) {
+							$this->_backImageUrl = $style->_backImageUrl;
+			}
+			if($this->_horizontalAlign === null && $style->_horizontalAlign !== null) {
+							$this->_horizontalAlign = $style->_horizontalAlign;
+			}
+			if($this->_cellPadding === null && $style->_cellPadding !== null) {
+							$this->_cellPadding = $style->_cellPadding;
+			}
+			if($this->_cellSpacing === null && $style->_cellSpacing !== null) {
+							$this->_cellSpacing = $style->_cellSpacing;
+			}
+			if($this->_gridLines === null && $style->_gridLines !== null) {
+							$this->_gridLines = $style->_gridLines;
+			}
+			if($this->_borderCollapse === null && $style->_borderCollapse !== null) {
+							$this->_borderCollapse = $style->_borderCollapse;
+			}
 		}
 	}
 
@@ -147,20 +165,25 @@ 
 	 */
 	public function addAttributesToRender($writer)
 	{
-		if(($url = trim($this->getBackImageUrl())) !== '')
-			$writer->addStyleAttribute('background-image', 'url(' . $url . ')');
+		if(($url = trim($this->getBackImageUrl())) !== '') {
+					$writer->addStyleAttribute('background-image', 'url(' . $url . ')');
+		}
 
-		if(($horizontalAlign = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet)
-			$writer->addStyleAttribute('text-align', strtolower($horizontalAlign));
+		if(($horizontalAlign = $this->getHorizontalAlign()) !== THorizontalAlign::NotSet) {
+					$writer->addStyleAttribute('text-align', strtolower($horizontalAlign));
+		}
 
-		if(($cellPadding = $this->getCellPadding()) >= 0)
-			$writer->addAttribute('cellpadding', "$cellPadding");
+		if(($cellPadding = $this->getCellPadding()) >= 0) {
+					$writer->addAttribute('cellpadding', "$cellPadding");
+		}
 
-		if(($cellSpacing = $this->getCellSpacing()) >= 0)
-			$writer->addAttribute('cellspacing', "$cellSpacing");
+		if(($cellSpacing = $this->getCellSpacing()) >= 0) {
+					$writer->addAttribute('cellspacing', "$cellSpacing");
+		}
 
-		if($this->getBorderCollapse())
-			$writer->addStyleAttribute('border-collapse', 'collapse');
+		if($this->getBorderCollapse()) {
+					$writer->addStyleAttribute('border-collapse', 'collapse');
+		}
 
 		switch($this->getGridLines())
 		{
@@ -220,8 +243,9 @@ 
 	 */
 	public function setCellPadding($value)
 	{
-		if(($this->_cellPadding = TPropertyValue::ensureInteger($value)) < -1)
-			throw new TInvalidDataValueException('tablestyle_cellpadding_invalid');
+		if(($this->_cellPadding = TPropertyValue::ensureInteger($value)) < -1) {
+					throw new TInvalidDataValueException('tablestyle_cellpadding_invalid');
+		}
 	}
 
 	/**
@@ -238,8 +262,9 @@ 
 	 */
 	public function setCellSpacing($value)
 	{
-		if(($this->_cellSpacing = TPropertyValue::ensureInteger($value)) < -1)
-			throw new TInvalidDataValueException('tablestyle_cellspacing_invalid');
+		if(($this->_cellSpacing = TPropertyValue::ensureInteger($value)) < -1) {
+					throw new TInvalidDataValueException('tablestyle_cellspacing_invalid');
+		}
 	}
 
 	/**

framework/Web/UI/WebControls/TAccordion.php

Spacing +30 added lines, -30 removed lines

@@ -89,7 +89,7 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TAccordionView)
+		if ($object instanceof TAccordionView)
 			$this->getControls()->add($object);
 	}
 
@@ -144,32 +144,32 @@ 
 	{
 		$activeView = null;
 		$views = $this->getViews();
-		if(($id = $this->getActiveViewID()) !== '')
+		if (($id = $this->getActiveViewID()) !== '')
 		{
-			if(($index = $views->findIndexByID($id)) >= 0)
+			if (($index = $views->findIndexByID($id)) >= 0)
 				$activeView = $views->itemAt($index);
 			else
 				throw new TInvalidDataValueException('accordion_activeviewid_invalid', $id);
 		}
-		elseif(($index = $this->getActiveViewIndex()) >= 0)
+		elseif (($index = $this->getActiveViewIndex()) >= 0)
 		{
-			if($index < $views->getCount())
+			if ($index < $views->getCount())
 				$activeView = $views->itemAt($index);
 			else
 				throw new TInvalidDataValueException('accordion_activeviewindex_invalid', $index);
 		}
 		else
 		{
-			foreach($views as $index => $view)
+			foreach ($views as $index => $view)
 			{
-				if($view->getActive())
+				if ($view->getActive())
 				{
 					$activeView = $view;
 					break;
 				}
 			}
 		}
-		if($activeView !== null)
+		if ($activeView !== null)
 			$this->activateView($activeView);
 		return $activeView;
 	}
@@ -180,7 +180,7 @@ 
 	 */
 	public function setActiveView($view)
 	{
-		if($this->getViews()->indexOf($view) >= 0)
+		if ($this->getViews()->indexOf($view) >= 0)
 			$this->activateView($view);
 		else
 			throw new TInvalidOperationException('accordion_view_inexistent');
@@ -208,7 +208,7 @@ 
 	public function getCssClass()
 	{
 		$cssClass = parent::getCssClass();
-			return $cssClass === ''?'accordion':$cssClass;
+			return $cssClass === '' ? 'accordion' : $cssClass;
 	}
 
 	/**
@@ -248,7 +248,7 @@ 
 	 */
 	public function getViewStyle()
 	{
-		if(($style = $this->getViewState('ViewStyle', null)) === null)
+		if (($style = $this->getViewState('ViewStyle', null)) === null)
 		{
 			$style = new TStyle;
 			$style->setCssClass('accordion-view');
@@ -278,7 +278,7 @@ 
 	 */
 	public function getHeaderStyle()
 	{
-		if(($style = $this->getViewState('HeaderStyle', null)) === null)
+		if (($style = $this->getViewState('HeaderStyle', null)) === null)
 		{
 			$style = new TStyle;
 			$style->setCssClass('accordion-header');
@@ -308,7 +308,7 @@ 
 	 */
 	public function getActiveHeaderStyle()
 	{
-		if(($style = $this->getViewState('ActiveHeaderStyle', null)) === null)
+		if (($style = $this->getViewState('ActiveHeaderStyle', null)) === null)
 		{
 			$style = new TStyle;
 			$style->setCssClass('accordion-header-active');
@@ -342,9 +342,9 @@ 
 	{
 		$this->setActiveViewIndex(-1);
 		$this->setActiveViewID('');
-		foreach($this->getViews() as $index => $v)
+		foreach ($this->getViews() as $index => $v)
 		{
-			if($view === $v)
+			if ($view === $v)
 			{
 				$this->setActiveViewIndex($index);
 				$this->setActiveViewID($view->getID(false));
@@ -364,11 +364,11 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		if(($index = $values[$this->getClientID() . '_1']) !== null)
+		if (($index = $values[$this->getClientID().'_1']) !== null)
 		{
-			$index = (int)$index;
+			$index = (int) $index;
 			$currentIndex = $this->getActiveViewIndex();
-			if($currentIndex !== $index)
+			if ($currentIndex !== $index)
 			{
 				$this->setActiveViewID(''); // clear up view ID
 				$this->setActiveViewIndex($index);
@@ -419,7 +419,7 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		$this->getActiveView();  // determine the active view
+		$this->getActiveView(); // determine the active view
 		$this->registerStyleSheet();
 	}
 
@@ -432,15 +432,15 @@ 
 	{
 		$url = $this->getCssUrl();
 
-		if($url === '') {
+		if ($url === '') {
 			return;
 		}
 
-		if($url === 'default') {
-			$url = $this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'accordion.css');
+		if ($url === 'default') {
+			$url = $this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'accordion.css');
 		}
 
-		if($url !== '') {
+		if ($url !== '') {
 			$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 		}
 	}
@@ -460,11 +460,11 @@ 
 		$cs->registerEndScript("prado:$id", $code);
 		// ensure an item is always active and visible
 		$index = $this->getActiveViewIndex();
-		if(!$this->getViews()->itemAt($index)->Visible)
+		if (!$this->getViews()->itemAt($index)->Visible)
 			$index = 0;
-		$cs->registerHiddenField($id . '_1', $index);
+		$cs->registerHiddenField($id.'_1', $index);
 		$page->registerRequiresPostData($this);
-		$page->registerRequiresPostData($id . "_1");
+		$page->registerRequiresPostData($id."_1");
 	}
 
 	/**
@@ -490,8 +490,8 @@ 
 		if (($viewheight = $this->getViewHeight()) > 0)
 			$options['maxHeight'] = $viewheight;
 		$views = [];
-		foreach($this->getViews() as $view)
-			$views[$view->getClientID()] = $view->getVisible() ? '1': '0';
+		foreach ($this->getViews() as $view)
+			$views[$view->getClientID()] = $view->getVisible() ? '1' : '0';
 		$options['Views'] = $views;
 
 		return $options;
@@ -527,10 +527,10 @@ 
 	public function renderContents($writer)
 	{
 		$views = $this->getViews();
-		if($views->getCount() > 0)
+		if ($views->getCount() > 0)
 		{
 			$writer->writeLine();
-			foreach($views as $view)
+			foreach ($views as $view)
 			{
 				$view->renderHeader($writer);
 				$view->renderControl($writer);

Braces +34 added lines, -28 removed lines

@@ -89,8 +89,9 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TAccordionView)
-			$this->getControls()->add($object);
+		if($object instanceof TAccordionView) {
+					$this->getControls()->add($object);
+		}
 	}
 
 	/**
@@ -146,19 +147,19 @@ 
 		$views = $this->getViews();
 		if(($id = $this->getActiveViewID()) !== '')
 		{
-			if(($index = $views->findIndexByID($id)) >= 0)
-				$activeView = $views->itemAt($index);
-			else
-				throw new TInvalidDataValueException('accordion_activeviewid_invalid', $id);
-		}
-		elseif(($index = $this->getActiveViewIndex()) >= 0)
+			if(($index = $views->findIndexByID($id)) >= 0) {
+							$activeView = $views->itemAt($index);
+			} else {
+							throw new TInvalidDataValueException('accordion_activeviewid_invalid', $id);
+			}
+		} elseif(($index = $this->getActiveViewIndex()) >= 0)
 		{
-			if($index < $views->getCount())
-				$activeView = $views->itemAt($index);
-			else
-				throw new TInvalidDataValueException('accordion_activeviewindex_invalid', $index);
-		}
-		else
+			if($index < $views->getCount()) {
+							$activeView = $views->itemAt($index);
+			} else {
+							throw new TInvalidDataValueException('accordion_activeviewindex_invalid', $index);
+			}
+		} else
 		{
 			foreach($views as $index => $view)
 			{
@@ -169,8 +170,9 @@ 
 				}
 			}
 		}
-		if($activeView !== null)
-			$this->activateView($activeView);
+		if($activeView !== null) {
+					$this->activateView($activeView);
+		}
 		return $activeView;
 	}
 
@@ -180,10 +182,11 @@ 
 	 */
 	public function setActiveView($view)
 	{
-		if($this->getViews()->indexOf($view) >= 0)
-			$this->activateView($view);
-		else
-			throw new TInvalidOperationException('accordion_view_inexistent');
+		if($this->getViews()->indexOf($view) >= 0) {
+					$this->activateView($view);
+		} else {
+					throw new TInvalidOperationException('accordion_view_inexistent');
+		}
 	}
 
 	/**
@@ -349,9 +352,9 @@ 
 				$this->setActiveViewIndex($index);
 				$this->setActiveViewID($view->getID(false));
 				$view->setActive(true);
+			} else {
+							$v->setActive(false);
 			}
-			else
-				$v->setActive(false);
 		}
 	}
 
@@ -460,8 +463,9 @@ 
 		$cs->registerEndScript("prado:$id", $code);
 		// ensure an item is always active and visible
 		$index = $this->getActiveViewIndex();
-		if(!$this->getViews()->itemAt($index)->Visible)
-			$index = 0;
+		if(!$this->getViews()->itemAt($index)->Visible) {
+					$index = 0;
+		}
 		$cs->registerHiddenField($id . '_1', $index);
 		$page->registerRequiresPostData($this);
 		$page->registerRequiresPostData($id . "_1");
@@ -487,11 +491,13 @@ 
 		$options['HeaderCssClass'] = $this->getHeaderCssClass();
 		$options['Duration'] = $this->getAnimationDuration();
 
-		if (($viewheight = $this->getViewHeight()) > 0)
-			$options['maxHeight'] = $viewheight;
+		if (($viewheight = $this->getViewHeight()) > 0) {
+					$options['maxHeight'] = $viewheight;
+		}
 		$views = [];
-		foreach($this->getViews() as $view)
-			$views[$view->getClientID()] = $view->getVisible() ? '1': '0';
+		foreach($this->getViews() as $view) {
+					$views[$view->getClientID()] = $view->getVisible() ? '1': '0';
+		}
 		$options['Views'] = $views;
 
 		return $options;

framework/Web/UI/WebControls/TLiteralColumn.php

Spacing +7 added lines, -7 removed lines

@@ -106,14 +106,14 @@ 
 	 */
 	public function initializeCell($cell, $columnIndex, $itemType)
 	{
-		if($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::EditItem || $itemType === TListItemType::SelectedItem)
+		if ($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::EditItem || $itemType === TListItemType::SelectedItem)
 		{
-			if($this->getDataField() !== '')
+			if ($this->getDataField() !== '')
 			{
-				$cell->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+				$cell->attachEventHandler('OnDataBinding', [$this, 'dataBindColumn']);
 			} else {
 				$text = $this->getText();
-				if($this->getEncode())
+				if ($this->getEncode())
 					$text = THttpUtility::htmlEncode($text);
 				$cell->setText($text);
 			}
@@ -132,13 +132,13 @@ 
 		$item = $sender->getNamingContainer();
 		$data = $item->getData();
 		$formatString = $this->getDataFormatString();
-		if(($field = $this->getDataField()) !== '')
+		if (($field = $this->getDataField()) !== '')
 			$value = $this->formatDataValue($formatString, $this->getDataFieldValue($data, $field));
 		else
 			$value = $this->formatDataValue($formatString, $data);
-		if($sender instanceof TTableCell)
+		if ($sender instanceof TTableCell)
 		{
-			if($this->getEncode())
+			if ($this->getEncode())
 				$value = THttpUtility::htmlEncode($value);
 			$sender->setText($value);
 		}

Braces +13 added lines, -10 removed lines

@@ -113,13 +113,14 @@ 
 				$cell->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
 			} else {
 				$text = $this->getText();
-				if($this->getEncode())
-					$text = THttpUtility::htmlEncode($text);
+				if($this->getEncode()) {
+									$text = THttpUtility::htmlEncode($text);
+				}
 				$cell->setText($text);
 			}
+		} else {
+					parent::initializeCell($cell, $columnIndex, $itemType);
 		}
-		else
-			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
 	/**
@@ -132,14 +133,16 @@ 
 		$item = $sender->getNamingContainer();
 		$data = $item->getData();
 		$formatString = $this->getDataFormatString();
-		if(($field = $this->getDataField()) !== '')
-			$value = $this->formatDataValue($formatString, $this->getDataFieldValue($data, $field));
-		else
-			$value = $this->formatDataValue($formatString, $data);
+		if(($field = $this->getDataField()) !== '') {
+					$value = $this->formatDataValue($formatString, $this->getDataFieldValue($data, $field));
+		} else {
+					$value = $this->formatDataValue($formatString, $data);
+		}
 		if($sender instanceof TTableCell)
 		{
-			if($this->getEncode())
-				$value = THttpUtility::htmlEncode($value);
+			if($this->getEncode()) {
+							$value = THttpUtility::htmlEncode($value);
+			}
 			$sender->setText($value);
 		}
 	}

framework/Web/UI/WebControls/TRadioButton.php

Spacing +23 added lines, -23 removed lines

@@ -112,10 +112,10 @@ 
 	public function loadPostData($key, $values)
 	{
 		$uniqueGroupName = $this->getUniqueGroupName();
-		$value = isset($values[$uniqueGroupName])?$values[$uniqueGroupName]:null;
-		if($value !== null && $value === $this->getValueAttribute())
+		$value = isset($values[$uniqueGroupName]) ? $values[$uniqueGroupName] : null;
+		if ($value !== null && $value === $this->getValueAttribute())
 		{
-			if(!$this->getChecked())
+			if (!$this->getChecked())
 			{
 				$this->setChecked(true);
 				return true;
@@ -123,7 +123,7 @@ 
 			else
 				return false;
 		}
-		elseif($this->getChecked())
+		elseif ($this->getChecked())
 			$this->setChecked(false);
 		return false;
 	}
@@ -153,22 +153,22 @@ 
 	 */
 	public function getUniqueGroupName()
 	{
-		if(($groupName = $this->getViewState('UniqueGroupName', '')) !== '')
+		if (($groupName = $this->getViewState('UniqueGroupName', '')) !== '')
 			return $groupName;
-		elseif(($uniqueID = $this->getUniqueID()) !== $this->_previousUniqueID || $this->_uniqueGroupName === null)
+		elseif (($uniqueID = $this->getUniqueID()) !== $this->_previousUniqueID || $this->_uniqueGroupName === null)
 		{
 			$groupName = $this->getGroupName();
 			$this->_previousUniqueID = $uniqueID;
-			if($uniqueID !== '')
+			if ($uniqueID !== '')
 			{
-				if(($pos = strrpos($uniqueID, \Prado\Web\UI\TControl::ID_SEPARATOR)) !== false)
+				if (($pos = strrpos($uniqueID, \Prado\Web\UI\TControl::ID_SEPARATOR)) !== false)
 				{
-					if($groupName !== '')
-						$groupName = substr($uniqueID, 0, $pos + 1) . $groupName;
-					elseif($this->getNamingContainer() instanceof TRadioButtonList)
+					if ($groupName !== '')
+						$groupName = substr($uniqueID, 0, $pos + 1).$groupName;
+					elseif ($this->getNamingContainer() instanceof TRadioButtonList)
 						$groupName = substr($uniqueID, 0, $pos);
 				}
-				if($groupName === '')
+				if ($groupName === '')
 					$groupName = $uniqueID;
 			}
 			$this->_uniqueGroupName = $groupName;
@@ -207,9 +207,9 @@ 
 	{
 		$group = $this->getUniqueGroupName();
 		$buttons = [];
-		foreach(self::$_activeButtons as $control)
+		foreach (self::$_activeButtons as $control)
 		{
-			if($control->getUniqueGroupName() === $group)
+			if ($control->getUniqueGroupName() === $group)
 				$buttons[] = $control;
 		}
 		return $buttons;
@@ -220,7 +220,7 @@ 
 	 */
 	protected function getValueAttribute()
 	{
-		if(($value = parent::getValueAttribute()) === '')
+		if (($value = parent::getValueAttribute()) === '')
 			return $this->getUniqueID();
 		else
 			return $value;
@@ -250,20 +250,20 @@ 
 	 */
 	protected function renderInputTag($writer, $clientID, $onclick)
 	{
-		if($clientID !== '')
+		if ($clientID !== '')
 			$writer->addAttribute('id', $clientID);
 		$writer->addAttribute('type', 'radio');
 		$writer->addAttribute('name', $this->getUniqueGroupName());
 		$writer->addAttribute('value', $this->getValueAttribute());
-		if(!empty($onclick))
+		if (!empty($onclick))
 			$writer->addAttribute('onclick', $onclick);
-		if($this->getChecked())
+		if ($this->getChecked())
 			$writer->addAttribute('checked', 'checked');
-		if(!$this->getEnabled(true))
+		if (!$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 
 		$page = $this->getPage();
-		if($this->getEnabled(true)
+		if ($this->getEnabled(true)
 			&& $this->getEnableClientScript()
 			&& $this->getAutoPostBack()
 			&& $page->getClientSupportsJavaScript())
@@ -271,11 +271,11 @@ 
 			$this->renderClientControlScript($writer);
 		}
 
-		if(($accesskey = $this->getAccessKey()) !== '')
+		if (($accesskey = $this->getAccessKey()) !== '')
 			$writer->addAttribute('accesskey', $accesskey);
-		if(($tabindex = $this->getTabIndex()) > 0)
+		if (($tabindex = $this->getTabIndex()) > 0)
 			$writer->addAttribute('tabindex', "$tabindex");
-		if($attributes = $this->getViewState('InputAttributes', null))
+		if ($attributes = $this->getViewState('InputAttributes', null))
 			$writer->addAttributes($attributes);
 		$writer->renderBeginTag('input');
 		$writer->renderEndTag();

Braces +44 added lines, -33 removed lines

@@ -119,12 +119,12 @@ 
 			{
 				$this->setChecked(true);
 				return true;
+			} else {
+							return false;
 			}
-			else
-				return false;
+		} elseif($this->getChecked()) {
+					$this->setChecked(false);
 		}
-		elseif($this->getChecked())
-			$this->setChecked(false);
 		return false;
 	}
 
@@ -153,9 +153,9 @@ 
 	 */
 	public function getUniqueGroupName()
 	{
-		if(($groupName = $this->getViewState('UniqueGroupName', '')) !== '')
-			return $groupName;
-		elseif(($uniqueID = $this->getUniqueID()) !== $this->_previousUniqueID || $this->_uniqueGroupName === null)
+		if(($groupName = $this->getViewState('UniqueGroupName', '')) !== '') {
+					return $groupName;
+		} elseif(($uniqueID = $this->getUniqueID()) !== $this->_previousUniqueID || $this->_uniqueGroupName === null)
 		{
 			$groupName = $this->getGroupName();
 			$this->_previousUniqueID = $uniqueID;
@@ -163,13 +163,15 @@ 
 			{
 				if(($pos = strrpos($uniqueID, \Prado\Web\UI\TControl::ID_SEPARATOR)) !== false)
 				{
-					if($groupName !== '')
-						$groupName = substr($uniqueID, 0, $pos + 1) . $groupName;
-					elseif($this->getNamingContainer() instanceof TRadioButtonList)
-						$groupName = substr($uniqueID, 0, $pos);
+					if($groupName !== '') {
+											$groupName = substr($uniqueID, 0, $pos + 1) . $groupName;
+					} elseif($this->getNamingContainer() instanceof TRadioButtonList) {
+											$groupName = substr($uniqueID, 0, $pos);
+					}
+				}
+				if($groupName === '') {
+									$groupName = $uniqueID;
 				}
-				if($groupName === '')
-					$groupName = $uniqueID;
 			}
 			$this->_uniqueGroupName = $groupName;
 		}
@@ -209,8 +211,9 @@ 
 		$buttons = [];
 		foreach(self::$_activeButtons as $control)
 		{
-			if($control->getUniqueGroupName() === $group)
-				$buttons[] = $control;
+			if($control->getUniqueGroupName() === $group) {
+							$buttons[] = $control;
+			}
 		}
 		return $buttons;
 	}
@@ -220,10 +223,11 @@ 
 	 */
 	protected function getValueAttribute()
 	{
-		if(($value = parent::getValueAttribute()) === '')
-			return $this->getUniqueID();
-		else
-			return $value;
+		if(($value = parent::getValueAttribute()) === '') {
+					return $this->getUniqueID();
+		} else {
+					return $value;
+		}
 	}
 
 	/**
@@ -250,17 +254,21 @@ 
 	 */
 	protected function renderInputTag($writer, $clientID, $onclick)
 	{
-		if($clientID !== '')
-			$writer->addAttribute('id', $clientID);
+		if($clientID !== '') {
+					$writer->addAttribute('id', $clientID);
+		}
 		$writer->addAttribute('type', 'radio');
 		$writer->addAttribute('name', $this->getUniqueGroupName());
 		$writer->addAttribute('value', $this->getValueAttribute());
-		if(!empty($onclick))
-			$writer->addAttribute('onclick', $onclick);
-		if($this->getChecked())
-			$writer->addAttribute('checked', 'checked');
-		if(!$this->getEnabled(true))
-			$writer->addAttribute('disabled', 'disabled');
+		if(!empty($onclick)) {
+					$writer->addAttribute('onclick', $onclick);
+		}
+		if($this->getChecked()) {
+					$writer->addAttribute('checked', 'checked');
+		}
+		if(!$this->getEnabled(true)) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 
 		$page = $this->getPage();
 		if($this->getEnabled(true)
@@ -271,12 +279,15 @@ 
 			$this->renderClientControlScript($writer);
 		}
 
-		if(($accesskey = $this->getAccessKey()) !== '')
-			$writer->addAttribute('accesskey', $accesskey);
-		if(($tabindex = $this->getTabIndex()) > 0)
-			$writer->addAttribute('tabindex', "$tabindex");
-		if($attributes = $this->getViewState('InputAttributes', null))
-			$writer->addAttributes($attributes);
+		if(($accesskey = $this->getAccessKey()) !== '') {
+					$writer->addAttribute('accesskey', $accesskey);
+		}
+		if(($tabindex = $this->getTabIndex()) > 0) {
+					$writer->addAttribute('tabindex', "$tabindex");
+		}
+		if($attributes = $this->getViewState('InputAttributes', null)) {
+					$writer->addAttributes($attributes);
+		}
 		$writer->renderBeginTag('input');
 		$writer->renderEndTag();
 	}

framework/Web/UI/WebControls/THyperLink.php

Spacing +11 added lines, -11 removed lines

@@ -50,12 +50,12 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		$isEnabled = $this->getEnabled(true);
-		if($this->getEnabled() && !$isEnabled)
+		if ($this->getEnabled() && !$isEnabled)
 			$writer->addAttribute('disabled', 'disabled');
 		parent::addAttributesToRender($writer);
-		if(($url = $this->getNavigateUrl()) !== '' && $isEnabled)
+		if (($url = $this->getNavigateUrl()) !== '' && $isEnabled)
 			$writer->addAttribute('href', $url);
-		if(($target = $this->getTarget()) !== '')
+		if (($target = $this->getTarget()) !== '')
 			$writer->addAttribute('target', $target);
 	}
 
@@ -65,11 +65,11 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($imageUrl = $this->getImageUrl()) === '')
+		if (($imageUrl = $this->getImageUrl()) === '')
 		{
-			if(($text = $this->getText()) !== '')
+			if (($text = $this->getText()) !== '')
 				$writer->write(THttpUtility::htmlEncode($text));
-			elseif($this->getHasControls())
+			elseif ($this->getHasControls())
 				parent::renderContents($writer);
 			else
 				$writer->write(THttpUtility::htmlEncode($this->getNavigateUrl()));
@@ -90,15 +90,15 @@ 
 	{
 		$image = new TImage;
 		$image->setImageUrl($imageUrl);
-		if(($width = $this->getImageWidth()) !== '')
+		if (($width = $this->getImageWidth()) !== '')
 			$image->setWidth($width);
-		if(($height = $this->getImageHeight()) !== '')
+		if (($height = $this->getImageHeight()) !== '')
 			$image->setHeight($height);
-		if(($toolTip = $this->getToolTip()) !== '')
+		if (($toolTip = $this->getToolTip()) !== '')
 			$image->setToolTip($toolTip);
-		if(($text = $this->getText()) !== '')
+		if (($text = $this->getText()) !== '')
 			$image->setAlternateText($text);
-		if(($align = $this->getImageAlign()) !== '')
+		if (($align = $this->getImageAlign()) !== '')
 			$image->setImageAlign($align);
 		$image->setBorderWidth('0');
 		return $image;

Braces +32 added lines, -24 removed lines

@@ -50,13 +50,16 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		$isEnabled = $this->getEnabled(true);
-		if($this->getEnabled() && !$isEnabled)
-			$writer->addAttribute('disabled', 'disabled');
+		if($this->getEnabled() && !$isEnabled) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 		parent::addAttributesToRender($writer);
-		if(($url = $this->getNavigateUrl()) !== '' && $isEnabled)
-			$writer->addAttribute('href', $url);
-		if(($target = $this->getTarget()) !== '')
-			$writer->addAttribute('target', $target);
+		if(($url = $this->getNavigateUrl()) !== '' && $isEnabled) {
+					$writer->addAttribute('href', $url);
+		}
+		if(($target = $this->getTarget()) !== '') {
+					$writer->addAttribute('target', $target);
+		}
 	}
 
 	/**
@@ -67,14 +70,14 @@ 
 	{
 		if(($imageUrl = $this->getImageUrl()) === '')
 		{
-			if(($text = $this->getText()) !== '')
-				$writer->write(THttpUtility::htmlEncode($text));
-			elseif($this->getHasControls())
-				parent::renderContents($writer);
-			else
-				$writer->write(THttpUtility::htmlEncode($this->getNavigateUrl()));
-		}
-		else
+			if(($text = $this->getText()) !== '') {
+							$writer->write(THttpUtility::htmlEncode($text));
+			} elseif($this->getHasControls()) {
+							parent::renderContents($writer);
+			} else {
+							$writer->write(THttpUtility::htmlEncode($this->getNavigateUrl()));
+			}
+		} else
 		{
 			$this->createImage($imageUrl)->renderControl($writer);
 		}
@@ -90,16 +93,21 @@ 
 	{
 		$image = new TImage;
 		$image->setImageUrl($imageUrl);
-		if(($width = $this->getImageWidth()) !== '')
-			$image->setWidth($width);
-		if(($height = $this->getImageHeight()) !== '')
-			$image->setHeight($height);
-		if(($toolTip = $this->getToolTip()) !== '')
-			$image->setToolTip($toolTip);
-		if(($text = $this->getText()) !== '')
-			$image->setAlternateText($text);
-		if(($align = $this->getImageAlign()) !== '')
-			$image->setImageAlign($align);
+		if(($width = $this->getImageWidth()) !== '') {
+					$image->setWidth($width);
+		}
+		if(($height = $this->getImageHeight()) !== '') {
+					$image->setHeight($height);
+		}
+		if(($toolTip = $this->getToolTip()) !== '') {
+					$image->setToolTip($toolTip);
+		}
+		if(($text = $this->getText()) !== '') {
+					$image->setAlternateText($text);
+		}
+		if(($align = $this->getImageAlign()) !== '') {
+					$image->setImageAlign($align);
+		}
 		$image->setBorderWidth('0');
 		return $image;
 	}