pradosoft / prado

framework/Web/UI/ActiveControls/TActiveCheckBoxColumn.php

Spacing +14 added lines, -14 removed lines

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

Braces +23 added lines, -22 removed lines

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

framework/Web/UI/ActiveControls/TCallbackClientScript.php

Spacing +26 added lines, -26 removed lines

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

Braces +51 added lines, -38 removed lines

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

framework/Web/UI/ActiveControls/TActiveDropDownListColumn.php

Spacing +10 added lines, -10 removed lines

@@ -36,12 +36,12 @@ 
 	{
 		$text = $this->getHeaderText();
 
-		if(($classPath = $this->getHeaderRenderer()) !== '')
+		if (($classPath = $this->getHeaderRenderer()) !== '')
 		{
 			$control = Prado::createComponent($classPath);
-			if($control instanceof \Prado\IDataRenderer)
+			if ($control instanceof \Prado\IDataRenderer)
 			{
-				if($control instanceof IItemDataRenderer)
+				if ($control instanceof IItemDataRenderer)
 				{
 					$item = $cell->getParent();
 					$control->setItemIndex($item->getItemIndex());
@@ -51,21 +51,21 @@ 
 			}
 			$cell->getControls()->add($control);
 		}
-		elseif($this->getAllowSorting())
+		elseif ($this->getAllowSorting())
 		{
 			$sortExpression = $this->getSortExpression();
-			if(($url = $this->getHeaderImageUrl()) !== '')
+			if (($url = $this->getHeaderImageUrl()) !== '')
 			{
 				$button = new TActiveImageButton;
 				$button->setImageUrl($url);
 				$button->setCommandName(TDataGrid::CMD_SORT);
 				$button->setCommandParameter($sortExpression);
-				if($text !== '')
+				if ($text !== '')
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
 			}
-			elseif($text !== '')
+			elseif ($text !== '')
 			{
 				$button = new TActiveLinkButton;
 				$button->setText($text);
@@ -79,15 +79,15 @@ 
 		}
 		else
 		{
-			if(($url = $this->getHeaderImageUrl()) !== '')
+			if (($url = $this->getHeaderImageUrl()) !== '')
 			{
 				$image = new TActiveImage;
 				$image->setImageUrl($url);
-				if($text !== '')
+				if ($text !== '')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
 			}
-			elseif($text !== '')
+			elseif ($text !== '')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');

Braces +15 added lines, -16 removed lines

@@ -50,8 +50,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		elseif($this->getAllowSorting())
+		} elseif($this->getAllowSorting())
 		{
 			$sortExpression = $this->getSortExpression();
 			if(($url = $this->getHeaderImageUrl()) !== '')
@@ -60,12 +59,12 @@ 
 				$button->setImageUrl($url);
 				$button->setCommandName(TDataGrid::CMD_SORT);
 				$button->setCommandParameter($sortExpression);
-				if($text !== '')
-					$button->setAlternateText($text);
+				if($text !== '') {
+									$button->setAlternateText($text);
+				}
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			elseif($text !== '')
+			} elseif($text !== '')
 			{
 				$button = new TActiveLinkButton;
 				$button->setText($text);
@@ -73,24 +72,24 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
+			} else {
+							$cell->setText(' ');
 			}
-			else
-				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url = $this->getHeaderImageUrl()) !== '')
 			{
 				$image = new TActiveImage;
 				$image->setImageUrl($url);
-				if($text !== '')
-					$image->setAlternateText($text);
+				if($text !== '') {
+									$image->setAlternateText($text);
+				}
 				$cell->getControls()->add($image);
+			} elseif($text !== '') {
+							$cell->setText($text);
+			} else {
+							$cell->setText(' ');
 			}
-			elseif($text !== '')
-				$cell->setText($text);
-			else
-				$cell->setText(' ');
 		}
 	}
 

framework/Web/UI/ActiveControls/TActiveDropDownList.php

Braces +3 added lines, -2 removed lines

@@ -107,9 +107,10 @@
 	{
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('id', $this->getClientID());
-		if ($this->getAutoPostBack())
-			$this->getActiveControl()->registerCallbackClientScript(
+		if ($this->getAutoPostBack()) {
+					$this->getActiveControl()->registerCallbackClientScript(
 				$this->getClientClassName(), $this->getPostBackOptions());
+		}
 	}
 
 	/**

framework/Web/UI/TCompositeLiteral.php

Spacing +10 added lines, -10 removed lines

@@ -41,15 +41,15 @@ 
 		$this->_items = [];
 		$this->_expressions = [];
 		$this->_statements = [];
-		foreach($items as $id => $item)
+		foreach ($items as $id => $item)
 		{
-			if(is_array($item))
+			if (is_array($item))
 			{
-				if($item[0] === self::TYPE_EXPRESSION)
+				if ($item[0] === self::TYPE_EXPRESSION)
 					$this->_expressions[$id] = $item[1];
-				elseif($item[0] === self::TYPE_STATEMENTS)
+				elseif ($item[0] === self::TYPE_STATEMENTS)
 					$this->_statements[$id] = $item[1];
-				elseif($item[0] === self::TYPE_DATABINDING)
+				elseif ($item[0] === self::TYPE_DATABINDING)
 					$this->_bindings[$id] = $item[1];
 				$this->_items[$id] = '';
 			}
@@ -79,10 +79,10 @@ 
 	 */
 	public function evaluateDynamicContent()
 	{
-		$context = $this->_container === null?$this:$this->_container;
-		foreach($this->_expressions as $id => $expression)
+		$context = $this->_container === null ? $this : $this->_container;
+		foreach ($this->_expressions as $id => $expression)
 			$this->_items[$id] = $context->evaluateExpression($expression);
-		foreach($this->_statements as $id => $statement)
+		foreach ($this->_statements as $id => $statement)
 			$this->_items[$id] = $context->evaluateStatements($statement);
 	}
 
@@ -92,8 +92,8 @@ 
 	 */
 	public function dataBind()
 	{
-		$context = $this->_container === null?$this:$this->_container;
-		foreach($this->_bindings as $id => $binding)
+		$context = $this->_container === null ? $this : $this->_container;
+		foreach ($this->_bindings as $id => $binding)
 			$this->_items[$id] = $context->evaluateExpression($binding);
 	}
 

Braces +18 added lines, -14 removed lines

@@ -45,16 +45,17 @@ 
 		{
 			if(is_array($item))
 			{
-				if($item[0] === self::TYPE_EXPRESSION)
-					$this->_expressions[$id] = $item[1];
-				elseif($item[0] === self::TYPE_STATEMENTS)
-					$this->_statements[$id] = $item[1];
-				elseif($item[0] === self::TYPE_DATABINDING)
-					$this->_bindings[$id] = $item[1];
+				if($item[0] === self::TYPE_EXPRESSION) {
+									$this->_expressions[$id] = $item[1];
+				} elseif($item[0] === self::TYPE_STATEMENTS) {
+									$this->_statements[$id] = $item[1];
+				} elseif($item[0] === self::TYPE_DATABINDING) {
+									$this->_bindings[$id] = $item[1];
+				}
 				$this->_items[$id] = '';
+			} else {
+							$this->_items[$id] = $item;
 			}
-			else
-				$this->_items[$id] = $item;
 		}
 	}
 
@@ -80,10 +81,12 @@ 
 	public function evaluateDynamicContent()
 	{
 		$context = $this->_container === null?$this:$this->_container;
-		foreach($this->_expressions as $id => $expression)
-			$this->_items[$id] = $context->evaluateExpression($expression);
-		foreach($this->_statements as $id => $statement)
-			$this->_items[$id] = $context->evaluateStatements($statement);
+		foreach($this->_expressions as $id => $expression) {
+					$this->_items[$id] = $context->evaluateExpression($expression);
+		}
+		foreach($this->_statements as $id => $statement) {
+					$this->_items[$id] = $context->evaluateStatements($statement);
+		}
 	}
 
 	/**
@@ -93,8 +96,9 @@ 
 	public function dataBind()
 	{
 		$context = $this->_container === null?$this:$this->_container;
-		foreach($this->_bindings as $id => $binding)
-			$this->_items[$id] = $context->evaluateExpression($binding);
+		foreach($this->_bindings as $id => $binding) {
+					$this->_items[$id] = $context->evaluateExpression($binding);
+		}
 	}
 
 	/**

framework/Web/UI/TTemplateControl.php

Spacing +15 added lines, -15 removed lines

@@ -66,10 +66,10 @@ 
 	 */
 	public function getTemplate()
 	{
-		if($this->_localTemplate === null)
+		if ($this->_localTemplate === null)
 		{
 			$class = get_class($this);
-			if(!isset(self::$_template[$class]))
+			if (!isset(self::$_template[$class]))
 				self::$_template[$class] = $this->loadTemplate();
 			return self::$_template[$class];
 		}
@@ -95,7 +95,7 @@ 
 	 */
 	public function getIsSourceTemplateControl()
 	{
-		if(($template = $this->getTemplate()) !== null)
+		if (($template = $this->getTemplate()) !== null)
 			return $template->getIsSourceTemplate();
 		else
 			return false;
@@ -106,7 +106,7 @@ 
 	 */
 	public function getTemplateDirectory()
 	{
-		if(($template = $this->getTemplate()) !== null)
+		if (($template = $this->getTemplate()) !== null)
 			return $template->getContextPath();
 		else
 			return '';
@@ -118,7 +118,7 @@ 
 	 */
 	protected function loadTemplate()
 	{
-		Prado::trace("Loading template " . get_class($this), '\Prado\Web\UI\TTemplateControl');
+		Prado::trace("Loading template ".get_class($this), '\Prado\Web\UI\TTemplateControl');
 		$template = $this->getService()->getTemplateManager()->getTemplateByClassName(get_class($this));
 		return $template;
 	}
@@ -130,11 +130,11 @@ 
 	 */
 	public function createChildControls()
 	{
-		if($tpl = $this->getTemplate())
+		if ($tpl = $this->getTemplate())
 		{
-			foreach($tpl->getDirective() as $name => $value)
+			foreach ($tpl->getDirective() as $name => $value)
 			{
-				if(is_string($value))
+				if (is_string($value))
 					$this->setSubProperty($name, $value);
 				else
 					throw new TConfigurationException('templatecontrol_directive_invalid', get_class($this), $name);
@@ -150,7 +150,7 @@ 
 	 */
 	public function registerContent($id, TContent $object)
 	{
-		if(isset($this->_contents[$id]))
+		if (isset($this->_contents[$id]))
 			throw new TConfigurationException('templatecontrol_contentid_duplicated', $id);
 		else
 			$this->_contents[$id] = $object;
@@ -164,7 +164,7 @@ 
 	 */
 	public function registerContentPlaceHolder($id, TContentPlaceHolder $object)
 	{
-		if(isset($this->_placeholders[$id]))
+		if (isset($this->_placeholders[$id]))
 			throw new TConfigurationException('templatecontrol_placeholderid_duplicated', $id);
 		else
 			$this->_placeholders[$id] = $object;
@@ -202,7 +202,7 @@ 
 	 */
 	public function injectContent($id, $content)
 	{
-		if(isset($this->_placeholders[$id]))
+		if (isset($this->_placeholders[$id]))
 		{
 			$placeholder = $this->_placeholders[$id];
 			$controls = $placeholder->getParent()->getControls();
@@ -224,19 +224,19 @@ 
 	protected function initRecursive($namingContainer = null)
 	{
 		$this->ensureChildControls();
-		if($this->_masterClass !== '')
+		if ($this->_masterClass !== '')
 		{
 			$master = Prado::createComponent($this->_masterClass);
-			if(!($master instanceof TTemplateControl))
+			if (!($master instanceof TTemplateControl))
 				throw new TInvalidDataValueException('templatecontrol_mastercontrol_invalid');
 			$this->_master = $master;
 			$this->getControls()->clear();
 			$this->getControls()->add($master);
 			$master->ensureChildControls();
-			foreach($this->_contents as $id => $content)
+			foreach ($this->_contents as $id => $content)
 				$master->injectContent($id, $content);
 		}
-		elseif(!empty($this->_contents))
+		elseif (!empty($this->_contents))
 			throw new TConfigurationException('templatecontrol_mastercontrol_required', get_class($this));
 		parent::initRecursive($namingContainer);
 	}

Braces +66 added lines, -56 removed lines

@@ -69,12 +69,13 @@ 
 		if($this->_localTemplate === null)
 		{
 			$class = get_class($this);
-			if(!isset(self::$_template[$class]))
-				self::$_template[$class] = $this->loadTemplate();
+			if(!isset(self::$_template[$class])) {
+							self::$_template[$class] = $this->loadTemplate();
+			}
 			return self::$_template[$class];
+		} else {
+					return $this->_localTemplate;
 		}
-		else
-			return $this->_localTemplate;
 	}
 
 	/**
@@ -95,10 +96,11 @@ 
 	 */
 	public function getIsSourceTemplateControl()
 	{
-		if(($template = $this->getTemplate()) !== null)
-			return $template->getIsSourceTemplate();
-		else
-			return false;
+		if(($template = $this->getTemplate()) !== null) {
+					return $template->getIsSourceTemplate();
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -106,10 +108,11 @@ 
 	 */
 	public function getTemplateDirectory()
 	{
-		if(($template = $this->getTemplate()) !== null)
-			return $template->getContextPath();
-		else
-			return '';
+		if(($template = $this->getTemplate()) !== null) {
+					return $template->getContextPath();
+		} else {
+					return '';
+		}
 	}
 
 	/**
@@ -134,10 +137,11 @@ 
 		{
 			foreach($tpl->getDirective() as $name => $value)
 			{
-				if(is_string($value))
-					$this->setSubProperty($name, $value);
-				else
-					throw new TConfigurationException('templatecontrol_directive_invalid', get_class($this), $name);
+				if(is_string($value)) {
+									$this->setSubProperty($name, $value);
+				} else {
+									throw new TConfigurationException('templatecontrol_directive_invalid', get_class($this), $name);
+				}
 			}
 			$tpl->instantiateIn($this);
 		}
@@ -150,10 +154,11 @@ 
 	 */
 	public function registerContent($id, TContent $object)
 	{
-		if(isset($this->_contents[$id]))
-			throw new TConfigurationException('templatecontrol_contentid_duplicated', $id);
-		else
-			$this->_contents[$id] = $object;
+		if(isset($this->_contents[$id])) {
+					throw new TConfigurationException('templatecontrol_contentid_duplicated', $id);
+		} else {
+					$this->_contents[$id] = $object;
+		}
 	}
 
 	/**
@@ -164,10 +169,11 @@ 
 	 */
 	public function registerContentPlaceHolder($id, TContentPlaceHolder $object)
 	{
-		if(isset($this->_placeholders[$id]))
-			throw new TConfigurationException('templatecontrol_placeholderid_duplicated', $id);
-		else
-			$this->_placeholders[$id] = $object;
+		if(isset($this->_placeholders[$id])) {
+					throw new TConfigurationException('templatecontrol_placeholderid_duplicated', $id);
+		} else {
+					$this->_placeholders[$id] = $object;
+		}
 	}
 
 	/**
@@ -208,9 +214,9 @@ 
 			$controls = $placeholder->getParent()->getControls();
 			$loc = $controls->remove($placeholder);
 			$controls->insertAt($loc, $content);
+		} else {
+					throw new TConfigurationException('templatecontrol_placeholder_inexistent', $id);
 		}
-		else
-			throw new TConfigurationException('templatecontrol_placeholder_inexistent', $id);
 	}
 
 	/**
@@ -227,17 +233,19 @@ 
 		if($this->_masterClass !== '')
 		{
 			$master = Prado::createComponent($this->_masterClass);
-			if(!($master instanceof TTemplateControl))
-				throw new TInvalidDataValueException('templatecontrol_mastercontrol_invalid');
+			if(!($master instanceof TTemplateControl)) {
+							throw new TInvalidDataValueException('templatecontrol_mastercontrol_invalid');
+			}
 			$this->_master = $master;
 			$this->getControls()->clear();
 			$this->getControls()->add($master);
 			$master->ensureChildControls();
-			foreach($this->_contents as $id => $content)
-				$master->injectContent($id, $content);
+			foreach($this->_contents as $id => $content) {
+							$master->injectContent($id, $content);
+			}
+		} elseif(!empty($this->_contents)) {
+					throw new TConfigurationException('templatecontrol_mastercontrol_required', get_class($this));
 		}
-		elseif(!empty($this->_contents))
-			throw new TConfigurationException('templatecontrol_mastercontrol_required', get_class($this));
 		parent::initRecursive($namingContainer);
 	}
 		
@@ -258,14 +266,14 @@ 
 								if ($key != "RELATIONS")
 								{
 										$control = $this->{$key};
-										if ($control instanceof TTextBox)
-												$control->Text = $arObj->{$key};
-										elseif ($control instanceof TCheckBox)
-												$control->Checked = (boolean) $arObj->{$key};
-										elseif ($control instanceof TDatePicker)
-												$control->Date = $arObj->{$key};
-								}
-								else
+										if ($control instanceof TTextBox) {
+																						$control->Text = $arObj->{$key};
+										} elseif ($control instanceof TCheckBox) {
+																						$control->Checked = (boolean) $arObj->{$key};
+										} elseif ($control instanceof TDatePicker) {
+																						$control->Date = $arObj->{$key};
+										}
+								} else
 								{
 										foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
 										{
@@ -287,11 +295,11 @@ 
 										}
 										break;
 								}
-						}
-						catch (Exception $ex)
+						} catch (Exception $ex)
 						{
-								if ($throwExceptions)
-										throw $ex;
+								if ($throwExceptions) {
+																		throw $ex;
+								}
 						}
 				}
 		}
@@ -309,20 +317,22 @@ 
 				{
 						try
 						{
-								if ($key == "RELATIONS")
-										break;
+								if ($key == "RELATIONS") {
+																		break;
+								}
 								$control = $this->{$key};
-								if ($control instanceof TTextBox)
-										$arObj->{$key} = $control->Text;
-								elseif ($control instanceof TCheckBox)
-										$arObj->{$key} = $control->Checked;
-								elseif ($control instanceof TDatePicker)
-										$arObj->{$key} = $control->Date;
-						}
-						catch (Exception $ex)
+								if ($control instanceof TTextBox) {
+																		$arObj->{$key} = $control->Text;
+								} elseif ($control instanceof TCheckBox) {
+																		$arObj->{$key} = $control->Checked;
+								} elseif ($control instanceof TDatePicker) {
+																		$arObj->{$key} = $control->Date;
+								}
+						} catch (Exception $ex)
 						{
-								if ($throwExceptions)
-										throw $ex;
+								if ($throwExceptions) {
+																		throw $ex;
+								}
 						}
 				}
 		}

framework/Web/UI/JuiControls/TJuiResizable.php

Spacing +5 added lines, -5 removed lines

@@ -125,7 +125,7 @@ 
 		$writer->addAttribute('id', $this->getClientID());
 		$options = TJavaScript::encode($this->getPostBackOptions());
 		$cs = $this->getPage()->getClientScript();
-		$code = "jQuery('#" . $this->getWidgetID() . "')." . $this->getWidget() . "(" . $options . ");";
+		$code = "jQuery('#".$this->getWidgetID()."').".$this->getWidget()."(".$options.");";
 		$cs->registerEndScript(sprintf('%08X', crc32($code)), $code);
 	}
 
@@ -143,7 +143,7 @@ 
 	 * Raises the OnCreate event
 	 * @param object $params event parameters
 	 */
-	public function onCreate ($params)
+	public function onCreate($params)
 	{
 		$this->raiseEvent('OnCreate', $this, $params);
 	}
@@ -152,7 +152,7 @@ 
 	 * Raises the OnResize event
 	 * @param object $params event parameters
 	 */
-	public function onResize ($params)
+	public function onResize($params)
 	{
 		$this->raiseEvent('OnResize', $this, $params);
 	}
@@ -161,7 +161,7 @@ 
 	 * Raises the OnStart event
 	 * @param object $params event parameters
 	 */
-	public function onStart ($params)
+	public function onStart($params)
 	{
 		$this->raiseEvent('OnStart', $this, $params);
 	}
@@ -170,7 +170,7 @@ 
 	 * Raises the OnStop event
 	 * @param object $params event parameters
 	 */
-	public function onStop ($params)
+	public function onStop($params)
 	{
 		$this->raiseEvent('OnStop', $this, $params);
 	}

framework/Web/UI/JuiControls/TJuiDialogButton.php

Spacing +4 added lines, -4 removed lines

@@ -65,8 +65,8 @@ 
 	{
 		return [
 			'text' => $this->getText(),
-			'click' => new TJavaScriptLiteral("function(){new Prado.Callback('" . $this->getUniqueID() . "', 'onClick');}"
-			)] ;
+			'click' => new TJavaScriptLiteral("function(){new Prado.Callback('".$this->getUniqueID()."', 'onClick');}"
+			)];
 	}
 
 	/**
@@ -89,7 +89,7 @@ 
 	 * Raises the OnClick event
 	 * @param object $params event parameters
 	 */
-	public function onClick ($params)
+	public function onClick($params)
 	{
 		$this->raiseEvent('OnClick', $this, $params);
 	}
@@ -101,7 +101,7 @@ 
 	 */
 	public function raiseCallbackEvent($param)
 	{
-		if($param->CallbackParameter === 'onClick')
+		if ($param->CallbackParameter === 'onClick')
 			$this->onClick($param);
 	}
 

Braces +3 added lines, -2 removed lines

@@ -101,8 +101,9 @@
 	 */
 	public function raiseCallbackEvent($param)
 	{
-		if($param->CallbackParameter === 'onClick')
-			$this->onClick($param);
+		if($param->CallbackParameter === 'onClick') {
+					$this->onClick($param);
+		}
 	}
 
 }
\ No newline at end of file

framework/Web/UI/JuiControls/TJuiEventParameter.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 		$name = strtolower(substr($name, 0, $pos));
 
 		$cp = $this->getCallbackParameter();
-		if(!isset($cp->$name) || $cp->$name == '')
+		if (!isset($cp->$name) || $cp->$name == '')
 			return null;
 
 		return $this->getControl($cp->$name);

Braces +3 added lines, -2 removed lines

@@ -76,8 +76,9 @@
 		$name = strtolower(substr($name, 0, $pos));
 
 		$cp = $this->getCallbackParameter();
-		if(!isset($cp->$name) || $cp->$name == '')
-			return null;
+		if(!isset($cp->$name) || $cp->$name == '') {
+					return null;
+		}
 
 		return $this->getControl($cp->$name);
 	}