pradosoft / prado

framework/Web/UI/WebControls/TStyle.php

Spacing +35 added lines, -35 removed lines

@@ -56,9 +56,9 @@ 
 		parent::_getZappableSleepProps($exprops);
 		if ($this->_fields === [])
 			$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_fields";
-		if($this->_font === null)
+		if ($this->_font === null)
 			$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_font";
-		if($this->_class === null)
+		if ($this->_class === null)
 			$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_class";
 		if ($this->_customStyle === null)
 			$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_customStyle";
@@ -73,7 +73,7 @@ 
 	public function __construct($style = null)
 	{
 	parent::__construct();
-		if($style !== null)
+		if ($style !== null)
 			$this->copyFrom($style);
 	}
 
@@ -82,7 +82,7 @@ 
 	 */
 	public function __clone()
 	{
-		if($this->_font !== null)
+		if ($this->_font !== null)
 			$this->_font = clone($this->_font);
 	}
 
@@ -91,7 +91,7 @@ 
 	 */
 	public function getBackColor()
 	{
-		return isset($this->_fields['background-color'])?$this->_fields['background-color']:'';
+		return isset($this->_fields['background-color']) ? $this->_fields['background-color'] : '';
 	}
 
 	/**
@@ -99,7 +99,7 @@ 
 	 */
 	public function setBackColor($value)
 	{
-		if(trim($value) === '')
+		if (trim($value) === '')
 			unset($this->_fields['background-color']);
 		else
 			$this->_fields['background-color'] = $value;
@@ -110,7 +110,7 @@ 
 	 */
 	public function getBorderColor()
 	{
-		return isset($this->_fields['border-color'])?$this->_fields['border-color']:'';
+		return isset($this->_fields['border-color']) ? $this->_fields['border-color'] : '';
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 	 */
 	public function setBorderColor($value)
 	{
-		if(trim($value) === '')
+		if (trim($value) === '')
 			unset($this->_fields['border-color']);
 		else
 			$this->_fields['border-color'] = $value;
@@ -129,7 +129,7 @@ 
 	 */
 	public function getBorderStyle()
 	{
-		return isset($this->_fields['border-style'])?$this->_fields['border-style']:'';
+		return isset($this->_fields['border-style']) ? $this->_fields['border-style'] : '';
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 	 */
 	public function setBorderStyle($value)
 	{
-		if(trim($value) === '')
+		if (trim($value) === '')
 			unset($this->_fields['border-style']);
 		else
 			$this->_fields['border-style'] = $value;
@@ -149,7 +149,7 @@ 
 	 */
 	public function getBorderWidth()
 	{
-		return isset($this->_fields['border-width'])?$this->_fields['border-width']:'';
+		return isset($this->_fields['border-width']) ? $this->_fields['border-width'] : '';
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function setBorderWidth($value)
 	{
-		if(trim($value) === '')
+		if (trim($value) === '')
 			unset($this->_fields['border-width']);
 		else
 			$this->_fields['border-width'] = $value;
@@ -168,7 +168,7 @@ 
 	 */
 	public function getCssClass()
 	{
-		return $this->_class === null?'':$this->_class;
+		return $this->_class === null ? '' : $this->_class;
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	 */
 	public function getFont()
 	{
-		if($this->_font === null)
+		if ($this->_font === null)
 			$this->_font = new TFont;
 		return $this->_font;
 	}
@@ -211,7 +211,7 @@ 
 	public function setDisplayStyle($value)
 	{
 		$this->_displayStyle = TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TDisplayStyle');
-		switch($this->_displayStyle)
+		switch ($this->_displayStyle)
 		{
 			case TDisplayStyle::None:
 				$this->_fields['display'] = 'none';
@@ -241,7 +241,7 @@ 
 	 */
 	public function getForeColor()
 	{
-		return isset($this->_fields['color'])?$this->_fields['color']:'';
+		return isset($this->_fields['color']) ? $this->_fields['color'] : '';
 	}
 
 	/**
@@ -249,7 +249,7 @@ 
 	 */
 	public function setForeColor($value)
 	{
-		if(trim($value) === '')
+		if (trim($value) === '')
 			unset($this->_fields['color']);
 		else
 			$this->_fields['color'] = $value;
@@ -260,7 +260,7 @@ 
 	 */
 	public function getHeight()
 	{
-		return isset($this->_fields['height'])?$this->_fields['height']:'';
+		return isset($this->_fields['height']) ? $this->_fields['height'] : '';
 	}
 
 	/**
@@ -268,7 +268,7 @@ 
 	 */
 	public function setHeight($value)
 	{
-		if(trim($value) === '')
+		if (trim($value) === '')
 			unset($this->_fields['height']);
 		else
 			$this->_fields['height'] = $value;
@@ -279,7 +279,7 @@ 
 	 */
 	public function getCustomStyle()
 	{
-		return $this->_customStyle === null?'':$this->_customStyle;
+		return $this->_customStyle === null ? '' : $this->_customStyle;
 	}
 
 	/**
@@ -297,7 +297,7 @@ 
 	 */
 	public function getStyleField($name)
 	{
-		return isset($this->_fields[$name])?$this->_fields[$name]:'';
+		return isset($this->_fields[$name]) ? $this->_fields[$name] : '';
 	}
 
 	/**
@@ -333,7 +333,7 @@ 
 	 */
 	public function getWidth()
 	{
-		return isset($this->_fields['width'])?$this->_fields['width']:'';
+		return isset($this->_fields['width']) ? $this->_fields['width'] : '';
 	}
 
 	/**
@@ -363,14 +363,14 @@ 
 	 */
 	public function copyFrom($style)
 	{
-		if($style instanceof TStyle)
+		if ($style instanceof TStyle)
 		{
 			$this->_fields = array_merge($this->_fields, $style->_fields);
-			if($style->_class !== null)
+			if ($style->_class !== null)
 				$this->_class = $style->_class;
-			if($style->_customStyle !== null)
+			if ($style->_customStyle !== null)
 				$this->_customStyle = $style->_customStyle;
-			if($style->_font !== null)
+			if ($style->_font !== null)
 				$this->getFont()->copyFrom($style->_font);
 		}
 	}
@@ -383,14 +383,14 @@ 
 	 */
 	public function mergeWith($style)
 	{
-		if($style instanceof TStyle)
+		if ($style instanceof TStyle)
 		{
 			$this->_fields = array_merge($style->_fields, $this->_fields);
-			if($this->_class === null)
+			if ($this->_class === null)
 				$this->_class = $style->_class;
-			if($this->_customStyle === null)
+			if ($this->_customStyle === null)
 				$this->_customStyle = $style->_customStyle;
-			if($style->_font !== null)
+			if ($style->_font !== null)
 				$this->getFont()->mergeWith($style->_font);
 		}
 	}
@@ -401,19 +401,19 @@ 
 	 */
 	public function addAttributesToRender($writer)
 	{
-		if($this->_customStyle !== null)
+		if ($this->_customStyle !== null)
 		{
-			foreach(explode(';', $this->_customStyle) as $style)
+			foreach (explode(';', $this->_customStyle) as $style)
 			{
 				$arr = explode(':', $style, 2);
-				if(isset($arr[1]) && trim($arr[0]) !== '')
+				if (isset($arr[1]) && trim($arr[0]) !== '')
 					$writer->addStyleAttribute(trim($arr[0]), trim($arr[1]));
 			}
 		}
 		$writer->addStyleAttributes($this->_fields);
-		if($this->_font !== null)
+		if ($this->_font !== null)
 			$this->_font->addAttributesToRender($writer);
-		if($this->_class !== null)
+		if ($this->_class !== null)
 			$writer->addAttribute('class', $this->_class);
 	}
 

Braces +81 added lines, -58 removed lines

@@ -54,16 +54,21 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_fields === [])
-			$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_fields";
-		if($this->_font === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_font";
-		if($this->_class === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_class";
-		if ($this->_customStyle === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_customStyle";
-		if ($this->_displayStyle === 'Fixed')
-			$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_displayStyle";
+		if ($this->_fields === []) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_fields";
+		}
+		if($this->_font === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_font";
+		}
+		if($this->_class === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_class";
+		}
+		if ($this->_customStyle === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_customStyle";
+		}
+		if ($this->_displayStyle === 'Fixed') {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_displayStyle";
+		}
 	}
 
 	/**
@@ -73,8 +78,9 @@ 
 	public function __construct($style = null)
 	{
 	parent::__construct();
-		if($style !== null)
-			$this->copyFrom($style);
+		if($style !== null) {
+					$this->copyFrom($style);
+		}
 	}
 
 	/**
@@ -82,8 +88,9 @@ 
 	 */
 	public function __clone()
 	{
-		if($this->_font !== null)
-			$this->_font = clone($this->_font);
+		if($this->_font !== null) {
+					$this->_font = clone($this->_font);
+		}
 	}
 
 	/**
@@ -99,10 +106,11 @@ 
 	 */
 	public function setBackColor($value)
 	{
-		if(trim($value) === '')
-			unset($this->_fields['background-color']);
-		else
-			$this->_fields['background-color'] = $value;
+		if(trim($value) === '') {
+					unset($this->_fields['background-color']);
+		} else {
+					$this->_fields['background-color'] = $value;
+		}
 	}
 
 	/**
@@ -118,10 +126,11 @@ 
 	 */
 	public function setBorderColor($value)
 	{
-		if(trim($value) === '')
-			unset($this->_fields['border-color']);
-		else
-			$this->_fields['border-color'] = $value;
+		if(trim($value) === '') {
+					unset($this->_fields['border-color']);
+		} else {
+					$this->_fields['border-color'] = $value;
+		}
 	}
 
 	/**
@@ -138,10 +147,11 @@ 
 	 */
 	public function setBorderStyle($value)
 	{
-		if(trim($value) === '')
-			unset($this->_fields['border-style']);
-		else
-			$this->_fields['border-style'] = $value;
+		if(trim($value) === '') {
+					unset($this->_fields['border-style']);
+		} else {
+					$this->_fields['border-style'] = $value;
+		}
 	}
 
 	/**
@@ -157,10 +167,11 @@ 
 	 */
 	public function setBorderWidth($value)
 	{
-		if(trim($value) === '')
-			unset($this->_fields['border-width']);
-		else
-			$this->_fields['border-width'] = $value;
+		if(trim($value) === '') {
+					unset($this->_fields['border-width']);
+		} else {
+					$this->_fields['border-width'] = $value;
+		}
 	}
 
 	/**
@@ -192,8 +203,9 @@ 
 	 */
 	public function getFont()
 	{
-		if($this->_font === null)
-			$this->_font = new TFont;
+		if($this->_font === null) {
+					$this->_font = new TFont;
+		}
 		return $this->_font;
 	}
 
@@ -249,10 +261,11 @@ 
 	 */
 	public function setForeColor($value)
 	{
-		if(trim($value) === '')
-			unset($this->_fields['color']);
-		else
-			$this->_fields['color'] = $value;
+		if(trim($value) === '') {
+					unset($this->_fields['color']);
+		} else {
+					$this->_fields['color'] = $value;
+		}
 	}
 
 	/**
@@ -268,10 +281,11 @@ 
 	 */
 	public function setHeight($value)
 	{
-		if(trim($value) === '')
-			unset($this->_fields['height']);
-		else
-			$this->_fields['height'] = $value;
+		if(trim($value) === '') {
+					unset($this->_fields['height']);
+		} else {
+					$this->_fields['height'] = $value;
+		}
 	}
 
 	/**
@@ -366,12 +380,15 @@ 
 		if($style instanceof TStyle)
 		{
 			$this->_fields = array_merge($this->_fields, $style->_fields);
-			if($style->_class !== null)
-				$this->_class = $style->_class;
-			if($style->_customStyle !== null)
-				$this->_customStyle = $style->_customStyle;
-			if($style->_font !== null)
-				$this->getFont()->copyFrom($style->_font);
+			if($style->_class !== null) {
+							$this->_class = $style->_class;
+			}
+			if($style->_customStyle !== null) {
+							$this->_customStyle = $style->_customStyle;
+			}
+			if($style->_font !== null) {
+							$this->getFont()->copyFrom($style->_font);
+			}
 		}
 	}
 
@@ -386,12 +403,15 @@ 
 		if($style instanceof TStyle)
 		{
 			$this->_fields = array_merge($style->_fields, $this->_fields);
-			if($this->_class === null)
-				$this->_class = $style->_class;
-			if($this->_customStyle === null)
-				$this->_customStyle = $style->_customStyle;
-			if($style->_font !== null)
-				$this->getFont()->mergeWith($style->_font);
+			if($this->_class === null) {
+							$this->_class = $style->_class;
+			}
+			if($this->_customStyle === null) {
+							$this->_customStyle = $style->_customStyle;
+			}
+			if($style->_font !== null) {
+							$this->getFont()->mergeWith($style->_font);
+			}
 		}
 	}
 
@@ -406,15 +426,18 @@ 
 			foreach(explode(';', $this->_customStyle) as $style)
 			{
 				$arr = explode(':', $style, 2);
-				if(isset($arr[1]) && trim($arr[0]) !== '')
-					$writer->addStyleAttribute(trim($arr[0]), trim($arr[1]));
+				if(isset($arr[1]) && trim($arr[0]) !== '') {
+									$writer->addStyleAttribute(trim($arr[0]), trim($arr[1]));
+				}
 			}
 		}
 		$writer->addStyleAttributes($this->_fields);
-		if($this->_font !== null)
-			$this->_font->addAttributesToRender($writer);
-		if($this->_class !== null)
-			$writer->addAttribute('class', $this->_class);
+		if($this->_font !== null) {
+					$this->_font->addAttributesToRender($writer);
+		}
+		if($this->_class !== null) {
+					$writer->addAttribute('class', $this->_class);
+		}
 	}
 
 	/**

framework/Web/UI/WebControls/TWizardNavigationTemplate.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 	 */
 	protected function createNavigationButton($buttonStyle, $causesValidation, $commandName)
 	{
-		switch($buttonStyle->getButtonType())
+		switch ($buttonStyle->getButtonType())
 		{
 			case TWizardNavigationButtonType::Button:
 				$button = new TButton;

framework/Web/UI/WebControls/TContentPlaceHolder.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 	 */
 	public function createdOnTemplate($parent)
 	{
-		if(($id = $this->getID()) === '')
+		if (($id = $this->getID()) === '')
 			throw new TConfigurationException('contentplaceholder_id_required');
 		$this->getTemplateControl()->registerContentPlaceHolder($id, $this);
 		$parent->getControls()->add($this);

Braces +3 added lines, -2 removed lines

@@ -41,8 +41,9 @@
 	 */
 	public function createdOnTemplate($parent)
 	{
-		if(($id = $this->getID()) === '')
-			throw new TConfigurationException('contentplaceholder_id_required');
+		if(($id = $this->getID()) === '') {
+					throw new TConfigurationException('contentplaceholder_id_required');
+		}
 		$this->getTemplateControl()->registerContentPlaceHolder($id, $this);
 		$parent->getControls()->add($this);
 	}

framework/Web/UI/WebControls/TDataSourceSelectParameters.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 
 	public function setStartRowIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			$value = 0;
 		$this->_startRowIndex = $value;
 	}
@@ -46,7 +46,7 @@ 
 
 	public function setMaximumRows($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			$value = 0;
 		$this->_maximumRows = $value;
 	}
@@ -68,7 +68,7 @@ 
 
 	public function setTotalRowCount($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			$value = 0;
 		$this->_totalRowCount = $value;
 	}

Braces +9 added lines, -6 removed lines

@@ -34,8 +34,9 @@ 
 
 	public function setStartRowIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = 0;
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					$value = 0;
+		}
 		$this->_startRowIndex = $value;
 	}
 
@@ -46,8 +47,9 @@ 
 
 	public function setMaximumRows($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = 0;
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					$value = 0;
+		}
 		$this->_maximumRows = $value;
 	}
 
@@ -68,8 +70,9 @@ 
 
 	public function setTotalRowCount($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = 0;
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					$value = 0;
+		}
 		$this->_totalRowCount = $value;
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TLabel.php

Spacing +6 added lines, -6 removed lines

@@ -42,7 +42,7 @@ 
 	 */
 	protected function getTagName()
 	{
-		return ($this->getForControl() === '')?'span':'label';
+		return ($this->getForControl() === '') ? 'span' : 'label';
 	}
 
 	/**
@@ -52,7 +52,7 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if($this->_forControl !== '')
+		if ($this->_forControl !== '')
 			$writer->addAttribute('for', $this->_forControl);
 		parent::addAttributesToRender($writer);
 	}
@@ -65,11 +65,11 @@ 
 	 */
 	public function render($writer)
 	{
-		if(($aid = $this->getForControl()) !== '')
+		if (($aid = $this->getForControl()) !== '')
 		{
-			if($control = $this->findControl($aid))
+			if ($control = $this->findControl($aid))
 			{
-				if($control->getVisible(true))
+				if ($control->getVisible(true))
 				{
 					$this->_forControl = $control->getClientID();
 					parent::render($writer);
@@ -88,7 +88,7 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) === '')
+		if (($text = $this->getText()) === '')
 			parent::renderContents($writer);
 		else
 			$writer->write($text);

Braces +12 added lines, -10 removed lines

@@ -52,8 +52,9 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if($this->_forControl !== '')
-			$writer->addAttribute('for', $this->_forControl);
+		if($this->_forControl !== '') {
+					$writer->addAttribute('for', $this->_forControl);
+		}
 		parent::addAttributesToRender($writer);
 	}
 
@@ -74,12 +75,12 @@ 
 					$this->_forControl = $control->getClientID();
 					parent::render($writer);
 				}
+			} else {
+							throw new TInvalidDataValueException('label_associatedcontrol_invalid', $aid);
 			}
-			else
-				throw new TInvalidDataValueException('label_associatedcontrol_invalid', $aid);
+		} else {
+					parent::render($writer);
 		}
-		else
-			parent::render($writer);
 	}
 
 	/**
@@ -88,10 +89,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);
+		}
 	}
 
 	/**

framework/Web/UI/WebControls/TCheckBoxList.php

Spacing +20 added lines, -20 removed lines

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

Braces +24 added lines, -18 removed lines

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

framework/Web/UI/WebControls/TPanel.php

Spacing +5 added lines, -5 removed lines

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

Braces +11 added lines, -8 removed lines

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

framework/Web/UI/WebControls/TWebControlDecorator.php

Spacing +17 added lines, -17 removed lines

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

Braces +38 added lines, -26 removed lines

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

framework/Web/UI/WebControls/TStatements.php

Spacing +1 added lines, -1 removed lines

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

Braces +3 added lines, -2 removed lines

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