pradosoft / prado

framework/Web/UI/WebControls/TValidationSummary.php

Spacing +20 added lines, -20 removed lines

@@ -221,9 +221,9 @@ 
 	{
 		$display = $this->getDisplay();
 		$visible = $this->getEnabled(true) && count($this->getErrorMessages()) > 0;
-		if(!$visible)
+		if (!$visible)
 		{
-			if($display === TValidationSummaryDisplayStyle::None || $display === TValidationSummaryDisplayStyle::Dynamic)
+			if ($display === TValidationSummaryDisplayStyle::None || $display === TValidationSummaryDisplayStyle::Dynamic)
 				$writer->addStyleAttribute('display', 'none');
 			else
 				$writer->addStyleAttribute('visibility', 'hidden');
@@ -238,7 +238,7 @@ 
 	 */
 	protected function renderJsSummary()
 	{
-		if(!$this->getEnabled(true) || !$this->getEnableClientScript())
+		if (!$this->getEnabled(true) || !$this->getEnableClientScript())
 			return;
 		$cs = $this->getPage()->getClientScript();
 		$cs->registerPradoScript('validator');
@@ -246,7 +246,7 @@ 
 		//need to register the validation manager is validation summary is alone.
 		$formID = $this->getPage()->getForm()->getClientID();
 		$scriptKey = "TBaseValidator:$formID";
-		if($this->getEnableClientScript() && !$cs->isEndScriptRegistered($scriptKey))
+		if ($this->getEnableClientScript() && !$cs->isEndScriptRegistered($scriptKey))
 		{
 			$manager['FormID'] = $formID;
 			$options = TJavaScript::encode($manager);
@@ -268,9 +268,9 @@ 
 	{
 		$options['ID'] = $this->getClientID();
 		$options['FormID'] = $this->getPage()->getForm()->getClientID();
-		if($this->getShowMessageBox())
+		if ($this->getShowMessageBox())
 			$options['ShowMessageBox'] = true;
-		if(!$this->getShowSummary())
+		if (!$this->getShowSummary())
 			$options['ShowSummary'] = false;
 
 		$options['ScrollToSummary'] = $this->getScrollToSummary();
@@ -281,7 +281,7 @@ 
 		$options['ValidationGroup'] = $this->getValidationGroup();
 		$options['Display'] = $this->getDisplay();
 
-		if($this->_clientSide !== null)
+		if ($this->_clientSide !== null)
 			$options = array_merge($options, $this->_clientSide->getOptions()->toArray());
 
 		return $options;
@@ -293,7 +293,7 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientSide === null)
+		if ($this->_clientSide === null)
 			$this->_clientSide = $this->createClientScript();
 		return $this->_clientSide;
 	}
@@ -314,9 +314,9 @@ 
 	{
 		$validators = $this->getPage()->getValidators($this->getValidationGroup());
 		$messages = [];
-		foreach($validators as $validator)
+		foreach ($validators as $validator)
 		{
-			if(!$validator->getIsValid() && ($msg = $validator->getErrorMessage()) !== '')
+			if (!$validator->getIsValid() && ($msg = $validator->getErrorMessage()) !== '')
 				//$messages[] = $validator->getAnchoredMessage($msg);
 				$messages[] = $msg;
 		}
@@ -330,10 +330,10 @@ 
 	public function renderContents($writer)
 	{
 		$this->renderJsSummary();
-		if($this->getShowSummary())
+		if ($this->getShowSummary())
 		{
 //		    $this->setStyle('display:block');
-			switch($this->getDisplayMode())
+			switch ($this->getDisplayMode())
 			{
 				case TValidationSummaryDisplayMode::SimpleList:
 					$this->renderList($writer);
@@ -362,9 +362,9 @@ 
 		$header = $this->getHeaderText();
 		$messages = $this->getErrorMessages();
 		$content = '';
-		if(strlen($header))
-			$content .= $header . "<br/>\n";
-		foreach($messages as $message)
+		if (strlen($header))
+			$content .= $header."<br/>\n";
+		foreach ($messages as $message)
 			$content .= "$message<br/>\n";
 		$writer->write($content);
 	}
@@ -380,8 +380,8 @@ 
 		$header = $this->getHeaderText();
 		$messages = $this->getErrorMessages();
 		$content = $header;
-		foreach($messages as $message)
-			$content .= ' ' . $message;
+		foreach ($messages as $message)
+			$content .= ' '.$message;
 		$writer->write($content);
 	}
 
@@ -396,11 +396,11 @@ 
 		$header = $this->getHeaderText();
 		$messages = $this->getErrorMessages();
 		$content = $header;
-		if(count($messages) > 0)
+		if (count($messages) > 0)
 		{
 			$content .= "<ul>\n";
-			foreach($messages as $message)
-				$content .= '<li>' . $message . "</li>\n";
+			foreach ($messages as $message)
+				$content .= '<li>'.$message."</li>\n";
 			$content .= "</ul>\n";
 		}
 		$writer->write($content);

Braces +35 added lines, -24 removed lines

@@ -223,10 +223,11 @@ 
 		$visible = $this->getEnabled(true) && count($this->getErrorMessages()) > 0;
 		if(!$visible)
 		{
-			if($display === TValidationSummaryDisplayStyle::None || $display === TValidationSummaryDisplayStyle::Dynamic)
-				$writer->addStyleAttribute('display', 'none');
-			else
-				$writer->addStyleAttribute('visibility', 'hidden');
+			if($display === TValidationSummaryDisplayStyle::None || $display === TValidationSummaryDisplayStyle::Dynamic) {
+							$writer->addStyleAttribute('display', 'none');
+			} else {
+							$writer->addStyleAttribute('visibility', 'hidden');
+			}
 		}
 		$writer->addAttribute('id', $this->getClientID());
 		parent::addAttributesToRender($writer);
@@ -238,8 +239,9 @@ 
 	 */
 	protected function renderJsSummary()
 	{
-		if(!$this->getEnabled(true) || !$this->getEnableClientScript())
-			return;
+		if(!$this->getEnabled(true) || !$this->getEnableClientScript()) {
+					return;
+		}
 		$cs = $this->getPage()->getClientScript();
 		$cs->registerPradoScript('validator');
 
@@ -268,10 +270,12 @@ 
 	{
 		$options['ID'] = $this->getClientID();
 		$options['FormID'] = $this->getPage()->getForm()->getClientID();
-		if($this->getShowMessageBox())
-			$options['ShowMessageBox'] = true;
-		if(!$this->getShowSummary())
-			$options['ShowSummary'] = false;
+		if($this->getShowMessageBox()) {
+					$options['ShowMessageBox'] = true;
+		}
+		if(!$this->getShowSummary()) {
+					$options['ShowSummary'] = false;
+		}
 
 		$options['ScrollToSummary'] = $this->getScrollToSummary();
 		$options['HeaderText'] = $this->getHeaderText();
@@ -281,8 +285,9 @@ 
 		$options['ValidationGroup'] = $this->getValidationGroup();
 		$options['Display'] = $this->getDisplay();
 
-		if($this->_clientSide !== null)
-			$options = array_merge($options, $this->_clientSide->getOptions()->toArray());
+		if($this->_clientSide !== null) {
+					$options = array_merge($options, $this->_clientSide->getOptions()->toArray());
+		}
 
 		return $options;
 	}
@@ -293,8 +298,9 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientSide === null)
-			$this->_clientSide = $this->createClientScript();
+		if($this->_clientSide === null) {
+					$this->_clientSide = $this->createClientScript();
+		}
 		return $this->_clientSide;
 	}
 
@@ -316,9 +322,10 @@ 
 		$messages = [];
 		foreach($validators as $validator)
 		{
-			if(!$validator->getIsValid() && ($msg = $validator->getErrorMessage()) !== '')
-				//$messages[] = $validator->getAnchoredMessage($msg);
+			if(!$validator->getIsValid() && ($msg = $validator->getErrorMessage()) !== '') {
+							//$messages[] = $validator->getAnchoredMessage($msg);
 				$messages[] = $msg;
+			}
 		}
 		return $messages;
 	}
@@ -362,10 +369,12 @@ 
 		$header = $this->getHeaderText();
 		$messages = $this->getErrorMessages();
 		$content = '';
-		if(strlen($header))
-			$content .= $header . "<br/>\n";
-		foreach($messages as $message)
-			$content .= "$message<br/>\n";
+		if(strlen($header)) {
+					$content .= $header . "<br/>\n";
+		}
+		foreach($messages as $message) {
+					$content .= "$message<br/>\n";
+		}
 		$writer->write($content);
 	}
 
@@ -380,8 +389,9 @@ 
 		$header = $this->getHeaderText();
 		$messages = $this->getErrorMessages();
 		$content = $header;
-		foreach($messages as $message)
-			$content .= ' ' . $message;
+		foreach($messages as $message) {
+					$content .= ' ' . $message;
+		}
 		$writer->write($content);
 	}
 
@@ -399,8 +409,9 @@ 
 		if(count($messages) > 0)
 		{
 			$content .= "<ul>\n";
-			foreach($messages as $message)
-				$content .= '<li>' . $message . "</li>\n";
+			foreach($messages as $message) {
+							$content .= '<li>' . $message . "</li>\n";
+			}
 			$content .= "</ul>\n";
 		}
 		$writer->write($content);

framework/Web/UI/WebControls/TCheckBoxColumn.php

Spacing +6 added lines, -6 removed lines

@@ -81,16 +81,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 TCheckBox;
-			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);
@@ -105,11 +105,11 @@ 
 	{
 		$item = $sender->getNamingContainer();
 		$data = $item->getData();
-		if(($field = $this->getDataField()) !== '')
+		if (($field = $this->getDataField()) !== '')
 			$value = TPropertyValue::ensureBoolean($this->getDataFieldValue($data, $field));
 		else
 			$value = TPropertyValue::ensureBoolean($data);
-		if($sender instanceof TCheckBox)
+		if ($sender instanceof TCheckBox)
 			$sender->setChecked($value);
 	}
 }

Braces +16 added lines, -12 removed lines

@@ -84,16 +84,18 @@ 
 		if($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem || $itemType === TListItemType::EditItem)
 		{
 			$checkBox = new TCheckBox;
-			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);
 	}
 
 	/**
@@ -105,12 +107,14 @@ 
 	{
 		$item = $sender->getNamingContainer();
 		$data = $item->getData();
-		if(($field = $this->getDataField()) !== '')
-			$value = TPropertyValue::ensureBoolean($this->getDataFieldValue($data, $field));
-		else
-			$value = TPropertyValue::ensureBoolean($data);
-		if($sender instanceof TCheckBox)
-			$sender->setChecked($value);
+		if(($field = $this->getDataField()) !== '') {
+					$value = TPropertyValue::ensureBoolean($this->getDataFieldValue($data, $field));
+		} else {
+					$value = TPropertyValue::ensureBoolean($data);
+		}
+		if($sender instanceof TCheckBox) {
+					$sender->setChecked($value);
+		}
 	}
 }
 

framework/Web/UI/WebControls/TRatingList.php

Spacing +12 added lines, -12 removed lines

@@ -95,7 +95,7 @@ 
 	 */
 	public function setRepeatLayout($value)
 	{
-		if($value !== TRepeatLayout::Table)
+		if ($value !== TRepeatLayout::Table)
 			throw new TInvalidDataValueException('ratinglist_table_layout_only');
 		else
 			parent::setRepeatLayout($value);
@@ -171,11 +171,11 @@ 
 
 	protected function getCaptionControl()
 	{
-		if(($id = $this->getCaptionID()) !== '')
+		if (($id = $this->getCaptionID()) !== '')
 		{
-			if($control = $this->getPage()->findControl($id))
+			if ($control = $this->getPage()->findControl($id))
 				return $control;
-			if($control = $this->getNamingContainer()->findControl($id))
+			if ($control = $this->getNamingContainer()->findControl($id))
 				return $control;
 		}
 		throw new TInvalidDataValueException(
@@ -219,7 +219,7 @@ 
 	 */
 	protected function getRatingStyleCssClass()
 	{
-		return 'TRatingList_' . $this->getRatingStyle();
+		return 'TRatingList_'.$this->getRatingStyle();
 	}
 
 	/**
@@ -262,11 +262,11 @@ 
 	 */
 	protected function getCaptionControlID()
 	{
-		if(($id = $this->getCaptionID()) !== '')
+		if (($id = $this->getCaptionID()) !== '')
 		{
-			if($control = $this->getParent()->findControl($id))
+			if ($control = $this->getParent()->findControl($id))
 			{
-				if($control->getVisible(true))
+				if ($control->getVisible(true))
 					return $control->getClientID();
 			}
 			else
@@ -293,8 +293,8 @@ 
 	protected function publishStyle($style)
 	{
 		$cs = $this->getPage()->getClientScript();
-		$url = $this->getAssetUrl($style . '.css');
-		if(!$cs->isStyleSheetFileRegistered($url))
+		$url = $this->getAssetUrl($style.'.css');
+		if (!$cs->isStyleSheetFileRegistered($url))
 			$cs->registerStyleSheetFile($url, $url);
 		return $url;
 	}
@@ -308,7 +308,7 @@ 
 	{
 		$types = ['blank', 'selected', 'half', 'combined'];
 		$files = [];
-		foreach($types as $type)
+		foreach ($types as $type)
 			$files[$type] = $this->getAssetUrl("{$style}_{$type}{$fileExt}");
 		return $files;
 	}
@@ -329,7 +329,7 @@ 
 	protected function getAssetUrl($file = '')
 	{
 		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
-		return $base . '/' . self::SCRIPT_PATH . '/' . $file;
+		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
 	}
 
 	/**

Braces +27 added lines, -20 removed lines

@@ -95,10 +95,11 @@ 
 	 */
 	public function setRepeatLayout($value)
 	{
-		if($value !== TRepeatLayout::Table)
-			throw new TInvalidDataValueException('ratinglist_table_layout_only');
-		else
-			parent::setRepeatLayout($value);
+		if($value !== TRepeatLayout::Table) {
+					throw new TInvalidDataValueException('ratinglist_table_layout_only');
+		} else {
+					parent::setRepeatLayout($value);
+		}
 	}
 
 	/**
@@ -107,10 +108,11 @@ 
 	public function getRating()
 	{
 		$rating = $this->getViewState('Rating', null);
-		if ($rating === null)
-			return $this->getSelectedIndex() + 1;
-		else
-			return $rating;
+		if ($rating === null) {
+					return $this->getSelectedIndex() + 1;
+		} else {
+					return $rating;
+		}
 	}
 
 	/**
@@ -173,10 +175,12 @@ 
 	{
 		if(($id = $this->getCaptionID()) !== '')
 		{
-			if($control = $this->getPage()->findControl($id))
-				return $control;
-			if($control = $this->getNamingContainer()->findControl($id))
-				return $control;
+			if($control = $this->getPage()->findControl($id)) {
+							return $control;
+			}
+			if($control = $this->getNamingContainer()->findControl($id)) {
+							return $control;
+			}
 		}
 		throw new TInvalidDataValueException(
 			'ratinglist_invalid_caption_id', $id, $this->getID());
@@ -266,11 +270,12 @@ 
 		{
 			if($control = $this->getParent()->findControl($id))
 			{
-				if($control->getVisible(true))
-					return $control->getClientID();
+				if($control->getVisible(true)) {
+									return $control->getClientID();
+				}
+			} else {
+							return $id;
 			}
-			else
-				return $id;
 		}
 		return '';
 	}
@@ -294,8 +299,9 @@ 
 	{
 		$cs = $this->getPage()->getClientScript();
 		$url = $this->getAssetUrl($style . '.css');
-		if(!$cs->isStyleSheetFileRegistered($url))
-			$cs->registerStyleSheetFile($url, $url);
+		if(!$cs->isStyleSheetFileRegistered($url)) {
+					$cs->registerStyleSheetFile($url, $url);
+		}
 		return $url;
 	}
 
@@ -308,8 +314,9 @@ 
 	{
 		$types = ['blank', 'selected', 'half', 'combined'];
 		$files = [];
-		foreach($types as $type)
-			$files[$type] = $this->getAssetUrl("{$style}_{$type}{$fileExt}");
+		foreach($types as $type) {
+					$files[$type] = $this->getAssetUrl("{$style}_{$type}{$fileExt}");
+		}
 		return $files;
 	}
 

framework/Web/UI/WebControls/TMultiView.php

Spacing +24 added lines, -24 removed lines

@@ -61,9 +61,9 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TView)
+		if ($object instanceof TView)
 			$this->getControls()->add($object);
-		elseif(!is_string($object))
+		elseif (!is_string($object))
 			throw new TConfigurationException('multiview_view_required');
 	}
 
@@ -81,7 +81,7 @@ 
 	 */
 	public function getActiveViewIndex()
 	{
-		if($this->_cachedActiveViewIndex > -1)
+		if ($this->_cachedActiveViewIndex > -1)
 			return $this->_cachedActiveViewIndex;
 		else
 			return $this->getControlState('ActiveViewIndex', -1);
@@ -93,17 +93,17 @@ 
 	 */
 	public function setActiveViewIndex($value)
 	{
-		if(($index = TPropertyValue::ensureInteger($value)) < 0)
+		if (($index = TPropertyValue::ensureInteger($value)) < 0)
 			$index = -1;
 		$views = $this->getViews();
 		$count = $views->getCount();
-		if($count === 0 && $this->getControlStage() < TControl::CS_CHILD_INITIALIZED)
+		if ($count === 0 && $this->getControlStage() < TControl::CS_CHILD_INITIALIZED)
 			$this->_cachedActiveViewIndex = $index;
-		elseif($index < $count)
+		elseif ($index < $count)
 		{
 			$this->setControlState('ActiveViewIndex', $index, -1);
 			$this->_cachedActiveViewIndex = -1;
-			if($index >= 0)
+			if ($index >= 0)
 				$this->activateView($views->itemAt($index), true);
 		}
 		else
@@ -118,12 +118,12 @@ 
 	{
 		$index = $this->getActiveViewIndex();
 		$views = $this->getViews();
-		if($index >= $views->getCount())
+		if ($index >= $views->getCount())
 			throw new TInvalidDataValueException('multiview_activeviewindex_invalid', $index);
-		if($index < 0)
+		if ($index < 0)
 			return null;
 		$view = $views->itemAt($index);
-		if(!$view->getActive())
+		if (!$view->getActive())
 			$this->activateView($view, false);
 		return $view;
 	}
@@ -134,7 +134,7 @@ 
 	 */
 	public function setActiveView($view)
 	{
-		if(($index = $this->getViews()->indexOf($view)) >= 0)
+		if (($index = $this->getViews()->indexOf($view)) >= 0)
 			$this->setActiveViewIndex($index);
 		else
 			throw new TInvalidOperationException('multiview_view_inexistent');
@@ -148,24 +148,24 @@ 
 	 */
 	protected function activateView($view, $triggerViewChangedEvent = true)
 	{
-		if($view->getActive())
+		if ($view->getActive())
 			return;
 		$triggerEvent = $triggerViewChangedEvent && ($this->getControlStage() >= \Prado\Web\UI\TControl::CS_STATE_LOADED || ($this->getPage() && !$this->getPage()->getIsPostBack()));
-		foreach($this->getViews() as $v)
+		foreach ($this->getViews() as $v)
 		{
-			if($v === $view)
+			if ($v === $view)
 			{
 				$view->setActive(true);
-				if($triggerEvent)
+				if ($triggerEvent)
 				{
 					$view->onActivate(null);
 					$this->onActiveViewChanged(null);
 				}
 			}
-			elseif($v->getActive())
+			elseif ($v->getActive())
 			{
 				$v->setActive(false);
-				if($triggerEvent)
+				if ($triggerEvent)
 					$v->onDeactivate(null);
 			}
 		}
@@ -197,7 +197,7 @@ 
 	public function onInit($param)
 	{
 		parent::onInit($param);
-		if($this->_cachedActiveViewIndex >= 0)
+		if ($this->_cachedActiveViewIndex >= 0)
 			$this->setActiveViewIndex($this->_cachedActiveViewIndex);
 	}
 
@@ -220,23 +220,23 @@ 
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		if(!$this->_ignoreBubbleEvents && ($param instanceof \Prado\Web\UI\TCommandEventParameter))
+		if (!$this->_ignoreBubbleEvents && ($param instanceof \Prado\Web\UI\TCommandEventParameter))
 		{
-			switch($param->getCommandName())
+			switch ($param->getCommandName())
 			{
 				case self::CMD_NEXTVIEW:
-					if(($index = $this->getActiveViewIndex()) < $this->getViews()->getCount() - 1)
+					if (($index = $this->getActiveViewIndex()) < $this->getViews()->getCount() - 1)
 						$this->setActiveViewIndex($index + 1);
 					else
 						$this->setActiveViewIndex(-1);
 					return true;
 				case self::CMD_PREVIOUSVIEW:
-					if(($index = $this->getActiveViewIndex()) >= 0)
+					if (($index = $this->getActiveViewIndex()) >= 0)
 						$this->setActiveViewIndex($index - 1);
 					return true;
 				case self::CMD_SWITCHVIEWID:
 					$view = $this->findControl($viewID = $param->getCommandParameter());
-					if($view !== null && $view->getParent() === $this)
+					if ($view !== null && $view->getParent() === $this)
 					{
 						$this->setActiveView($view);
 						return true;
@@ -269,7 +269,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if(($view = $this->getActiveView()) !== null)
+		if (($view = $this->getActiveView()) !== null)
 			$view->renderControl($writer);
 	}
 }
\ No newline at end of file

Braces +58 added lines, -45 removed lines

@@ -61,10 +61,11 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TView)
-			$this->getControls()->add($object);
-		elseif(!is_string($object))
-			throw new TConfigurationException('multiview_view_required');
+		if($object instanceof TView) {
+					$this->getControls()->add($object);
+		} elseif(!is_string($object)) {
+					throw new TConfigurationException('multiview_view_required');
+		}
 	}
 
 	/**
@@ -81,10 +82,11 @@ 
 	 */
 	public function getActiveViewIndex()
 	{
-		if($this->_cachedActiveViewIndex > -1)
-			return $this->_cachedActiveViewIndex;
-		else
-			return $this->getControlState('ActiveViewIndex', -1);
+		if($this->_cachedActiveViewIndex > -1) {
+					return $this->_cachedActiveViewIndex;
+		} else {
+					return $this->getControlState('ActiveViewIndex', -1);
+		}
 	}
 
 	/**
@@ -93,21 +95,23 @@ 
 	 */
 	public function setActiveViewIndex($value)
 	{
-		if(($index = TPropertyValue::ensureInteger($value)) < 0)
-			$index = -1;
+		if(($index = TPropertyValue::ensureInteger($value)) < 0) {
+					$index = -1;
+		}
 		$views = $this->getViews();
 		$count = $views->getCount();
-		if($count === 0 && $this->getControlStage() < TControl::CS_CHILD_INITIALIZED)
-			$this->_cachedActiveViewIndex = $index;
-		elseif($index < $count)
+		if($count === 0 && $this->getControlStage() < TControl::CS_CHILD_INITIALIZED) {
+					$this->_cachedActiveViewIndex = $index;
+		} elseif($index < $count)
 		{
 			$this->setControlState('ActiveViewIndex', $index, -1);
 			$this->_cachedActiveViewIndex = -1;
-			if($index >= 0)
-				$this->activateView($views->itemAt($index), true);
+			if($index >= 0) {
+							$this->activateView($views->itemAt($index), true);
+			}
+		} else {
+					throw new TInvalidDataValueException('multiview_activeviewindex_invalid', $index);
 		}
-		else
-			throw new TInvalidDataValueException('multiview_activeviewindex_invalid', $index);
 	}
 
 	/**
@@ -118,13 +122,16 @@ 
 	{
 		$index = $this->getActiveViewIndex();
 		$views = $this->getViews();
-		if($index >= $views->getCount())
-			throw new TInvalidDataValueException('multiview_activeviewindex_invalid', $index);
-		if($index < 0)
-			return null;
+		if($index >= $views->getCount()) {
+					throw new TInvalidDataValueException('multiview_activeviewindex_invalid', $index);
+		}
+		if($index < 0) {
+					return null;
+		}
 		$view = $views->itemAt($index);
-		if(!$view->getActive())
-			$this->activateView($view, false);
+		if(!$view->getActive()) {
+					$this->activateView($view, false);
+		}
 		return $view;
 	}
 
@@ -134,10 +141,11 @@ 
 	 */
 	public function setActiveView($view)
 	{
-		if(($index = $this->getViews()->indexOf($view)) >= 0)
-			$this->setActiveViewIndex($index);
-		else
-			throw new TInvalidOperationException('multiview_view_inexistent');
+		if(($index = $this->getViews()->indexOf($view)) >= 0) {
+					$this->setActiveViewIndex($index);
+		} else {
+					throw new TInvalidOperationException('multiview_view_inexistent');
+		}
 	}
 
 	/**
@@ -148,8 +156,9 @@ 
 	 */
 	protected function activateView($view, $triggerViewChangedEvent = true)
 	{
-		if($view->getActive())
-			return;
+		if($view->getActive()) {
+					return;
+		}
 		$triggerEvent = $triggerViewChangedEvent && ($this->getControlStage() >= \Prado\Web\UI\TControl::CS_STATE_LOADED || ($this->getPage() && !$this->getPage()->getIsPostBack()));
 		foreach($this->getViews() as $v)
 		{
@@ -161,12 +170,12 @@ 
 					$view->onActivate(null);
 					$this->onActiveViewChanged(null);
 				}
-			}
-			elseif($v->getActive())
+			} elseif($v->getActive())
 			{
 				$v->setActive(false);
-				if($triggerEvent)
-					$v->onDeactivate(null);
+				if($triggerEvent) {
+									$v->onDeactivate(null);
+				}
 			}
 		}
 	}
@@ -197,8 +206,9 @@ 
 	public function onInit($param)
 	{
 		parent::onInit($param);
-		if($this->_cachedActiveViewIndex >= 0)
-			$this->setActiveViewIndex($this->_cachedActiveViewIndex);
+		if($this->_cachedActiveViewIndex >= 0) {
+					$this->setActiveViewIndex($this->_cachedActiveViewIndex);
+		}
 	}
 
 	/**
@@ -225,14 +235,16 @@ 
 			switch($param->getCommandName())
 			{
 				case self::CMD_NEXTVIEW:
-					if(($index = $this->getActiveViewIndex()) < $this->getViews()->getCount() - 1)
-						$this->setActiveViewIndex($index + 1);
-					else
-						$this->setActiveViewIndex(-1);
+					if(($index = $this->getActiveViewIndex()) < $this->getViews()->getCount() - 1) {
+											$this->setActiveViewIndex($index + 1);
+					} else {
+											$this->setActiveViewIndex(-1);
+					}
 					return true;
 				case self::CMD_PREVIOUSVIEW:
-					if(($index = $this->getActiveViewIndex()) >= 0)
-						$this->setActiveViewIndex($index - 1);
+					if(($index = $this->getActiveViewIndex()) >= 0) {
+											$this->setActiveViewIndex($index - 1);
+					}
 					return true;
 				case self::CMD_SWITCHVIEWID:
 					$view = $this->findControl($viewID = $param->getCommandParameter());
@@ -240,9 +252,9 @@ 
 					{
 						$this->setActiveView($view);
 						return true;
+					} else {
+											throw new TInvalidDataValueException('multiview_viewid_invalid', $viewID);
 					}
-					else
-						throw new TInvalidDataValueException('multiview_viewid_invalid', $viewID);
 					break;
 				case self::CMD_SWITCHVIEWINDEX:
 					$index = TPropertyValue::ensureInteger($param->getCommandParameter());
@@ -269,7 +281,8 @@ 
 	 */
 	public function render($writer)
 	{
-		if(($view = $this->getActiveView()) !== null)
-			$view->renderControl($writer);
+		if(($view = $this->getActiveView()) !== null) {
+					$view->renderControl($writer);
+		}
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TConditional.php

Spacing +5 added lines, -5 removed lines

@@ -63,7 +63,7 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($this->_creatingChildren)
+		if ($this->_creatingChildren)
 			parent::addParsedObject($object);
 	}
 
@@ -80,16 +80,16 @@ 
 		{
 			$result = $this->getTemplateControl()->evaluateExpression($this->_condition);
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			throw new TInvalidDataValueException('conditional_condition_invalid', $this->_condition, $e->getMessage());
 		}
-		if($result)
+		if ($result)
 		{
-			if($this->_trueTemplate)
+			if ($this->_trueTemplate)
 				$this->_trueTemplate->instantiateIn($this->getTemplateControl(), $this);
 		}
-		elseif($this->_falseTemplate)
+		elseif ($this->_falseTemplate)
 			$this->_falseTemplate->instantiateIn($this->getTemplateControl(), $this);
 		$this->_creatingChildren = false;
 	}

Braces +9 added lines, -8 removed lines

@@ -63,8 +63,9 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($this->_creatingChildren)
-			parent::addParsedObject($object);
+		if($this->_creatingChildren) {
+					parent::addParsedObject($object);
+		}
 	}
 
 	/**
@@ -79,18 +80,18 @@ 
 		try
 		{
 			$result = $this->getTemplateControl()->evaluateExpression($this->_condition);
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			throw new TInvalidDataValueException('conditional_condition_invalid', $this->_condition, $e->getMessage());
 		}
 		if($result)
 		{
-			if($this->_trueTemplate)
-				$this->_trueTemplate->instantiateIn($this->getTemplateControl(), $this);
+			if($this->_trueTemplate) {
+							$this->_trueTemplate->instantiateIn($this->getTemplateControl(), $this);
+			}
+		} elseif($this->_falseTemplate) {
+					$this->_falseTemplate->instantiateIn($this->getTemplateControl(), $this);
 		}
-		elseif($this->_falseTemplate)
-			$this->_falseTemplate->instantiateIn($this->getTemplateControl(), $this);
 		$this->_creatingChildren = false;
 	}
 

framework/Web/UI/WebControls/TDataList.php

Spacing +98 added lines, -98 removed lines

@@ -188,7 +188,7 @@ 
 	 */
 	public function getItems()
 	{
-		if(!$this->_items)
+		if (!$this->_items)
 			$this->_items = new TDataListItemCollection;
 		return $this->_items;
 	}
@@ -198,7 +198,7 @@ 
 	 */
 	public function getItemCount()
 	{
-		return $this->_items?$this->_items->getCount():0;
+		return $this->_items ? $this->_items->getCount() : 0;
 	}
 
 	/**
@@ -408,7 +408,7 @@ 
 	 */
 	public function setItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
+		if ($value instanceof ITemplate || $value === null)
 			$this->_itemTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('datalist_template_required', 'ItemTemplate');
@@ -419,7 +419,7 @@ 
 	 */
 	public function getItemStyle()
 	{
-		if(($style = $this->getViewState('ItemStyle', null)) === null)
+		if (($style = $this->getViewState('ItemStyle', null)) === null)
 		{
 			$style = new TTableItemStyle;
 			$this->setViewState('ItemStyle', $style, null);
@@ -441,7 +441,7 @@ 
 	 */
 	public function setAlternatingItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
+		if ($value instanceof ITemplate || $value === null)
 			$this->_alternatingItemTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('datalist_template_required', 'AlternatingItemType');
@@ -452,7 +452,7 @@ 
 	 */
 	public function getAlternatingItemStyle()
 	{
-		if(($style = $this->getViewState('AlternatingItemStyle', null)) === null)
+		if (($style = $this->getViewState('AlternatingItemStyle', null)) === null)
 		{
 			$style = new TTableItemStyle;
 			$this->setViewState('AlternatingItemStyle', $style, null);
@@ -474,7 +474,7 @@ 
 	 */
 	public function setSelectedItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
+		if ($value instanceof ITemplate || $value === null)
 			$this->_selectedItemTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('datalist_template_required', 'SelectedItemTemplate');
@@ -485,7 +485,7 @@ 
 	 */
 	public function getSelectedItemStyle()
 	{
-		if(($style = $this->getViewState('SelectedItemStyle', null)) === null)
+		if (($style = $this->getViewState('SelectedItemStyle', null)) === null)
 		{
 			$style = new TTableItemStyle;
 			$this->setViewState('SelectedItemStyle', $style, null);
@@ -507,7 +507,7 @@ 
 	 */
 	public function setEditItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
+		if ($value instanceof ITemplate || $value === null)
 			$this->_editItemTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('datalist_template_required', 'EditItemTemplate');
@@ -518,7 +518,7 @@ 
 	 */
 	public function getEditItemStyle()
 	{
-		if(($style = $this->getViewState('EditItemStyle', null)) === null)
+		if (($style = $this->getViewState('EditItemStyle', null)) === null)
 		{
 			$style = new TTableItemStyle;
 			$this->setViewState('EditItemStyle', $style, null);
@@ -540,7 +540,7 @@ 
 	 */
 	public function setHeaderTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
+		if ($value instanceof ITemplate || $value === null)
 			$this->_headerTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('datalist_template_required', 'HeaderTemplate');
@@ -551,7 +551,7 @@ 
 	 */
 	public function getHeaderStyle()
 	{
-		if(($style = $this->getViewState('HeaderStyle', null)) === null)
+		if (($style = $this->getViewState('HeaderStyle', null)) === null)
 		{
 			$style = new TTableItemStyle;
 			$this->setViewState('HeaderStyle', $style, null);
@@ -581,7 +581,7 @@ 
 	 */
 	public function setFooterTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
+		if ($value instanceof ITemplate || $value === null)
 			$this->_footerTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('datalist_template_required', 'FooterTemplate');
@@ -592,7 +592,7 @@ 
 	 */
 	public function getFooterStyle()
 	{
-		if(($style = $this->getViewState('FooterStyle', null)) === null)
+		if (($style = $this->getViewState('FooterStyle', null)) === null)
 		{
 			$style = new TTableItemStyle;
 			$this->setViewState('FooterStyle', $style, null);
@@ -622,7 +622,7 @@ 
 	 */
 	public function setEmptyTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
+		if ($value instanceof ITemplate || $value === null)
 			$this->_emptyTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('datalist_template_required', 'EmptyTemplate');
@@ -642,7 +642,7 @@ 
 	 */
 	public function setSeparatorTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
+		if ($value instanceof ITemplate || $value === null)
 			$this->_separatorTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('datalist_template_required', 'SeparatorTemplate');
@@ -653,7 +653,7 @@ 
 	 */
 	public function getSeparatorStyle()
 	{
-		if(($style = $this->getViewState('SeparatorStyle', null)) === null)
+		if (($style = $this->getViewState('SeparatorStyle', null)) === null)
 		{
 			$style = new TTableItemStyle;
 			$this->setViewState('SeparatorStyle', $style, null);
@@ -679,23 +679,23 @@ 
 	 */
 	public function setSelectedItemIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			$value = -1;
-		if(($current = $this->getSelectedItemIndex()) !== $value)
+		if (($current = $this->getSelectedItemIndex()) !== $value)
 		{
 			$this->setViewState('SelectedItemIndex', $value, -1);
 			$items = $this->getItems();
 			$itemCount = $items->getCount();
-			if($current >= 0 && $current < $itemCount)
+			if ($current >= 0 && $current < $itemCount)
 			{
 				$item = $items->itemAt($current);
-				if(($item instanceof IItemDataRenderer) && $item->getItemType() !== TListItemType::EditItem)
-					$item->setItemType($current % 2?TListItemType::AlternatingItem : TListItemType::Item);
+				if (($item instanceof IItemDataRenderer) && $item->getItemType() !== TListItemType::EditItem)
+					$item->setItemType($current % 2 ?TListItemType::AlternatingItem : TListItemType::Item);
 			}
-			if($value >= 0 && $value < $itemCount)
+			if ($value >= 0 && $value < $itemCount)
 			{
 				$item = $items->itemAt($value);
-				if(($item instanceof IItemDataRenderer) && $item->getItemType() !== TListItemType::EditItem)
+				if (($item instanceof IItemDataRenderer) && $item->getItemType() !== TListItemType::EditItem)
 					$item->setItemType(TListItemType::SelectedItem);
 			}
 		}
@@ -708,7 +708,7 @@ 
 	{
 		$index = $this->getSelectedItemIndex();
 		$items = $this->getItems();
-		if($index >= 0 && $index < $items->getCount())
+		if ($index >= 0 && $index < $items->getCount())
 			return $items->itemAt($index);
 		else
 			return null;
@@ -720,11 +720,11 @@ 
 	 */
 	public function getSelectedDataKey()
 	{
-		if($this->getDataKeyField() === '')
+		if ($this->getDataKeyField() === '')
 			throw new TInvalidOperationException('datalist_datakeyfield_required');
 		$index = $this->getSelectedItemIndex();
 		$dataKeys = $this->getDataKeys();
-		if($index >= 0 && $index < $dataKeys->getCount())
+		if ($index >= 0 && $index < $dataKeys->getCount())
 			return $dataKeys->itemAt($index);
 		else
 			return null;
@@ -747,16 +747,16 @@ 
 	 */
 	public function setEditItemIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
 			$value = -1;
-		if(($current = $this->getEditItemIndex()) !== $value)
+		if (($current = $this->getEditItemIndex()) !== $value)
 		{
 			$this->setViewState('EditItemIndex', $value, -1);
 			$items = $this->getItems();
 			$itemCount = $items->getCount();
-			if($current >= 0 && $current < $itemCount)
-				$items->itemAt($current)->setItemType($current % 2?TListItemType::AlternatingItem : TListItemType::Item);
-			if($value >= 0 && $value < $itemCount)
+			if ($current >= 0 && $current < $itemCount)
+				$items->itemAt($current)->setItemType($current % 2 ?TListItemType::AlternatingItem : TListItemType::Item);
+			if ($value >= 0 && $value < $itemCount)
 				$items->itemAt($value)->setItemType(TListItemType::EditItem);
 		}
 	}
@@ -768,7 +768,7 @@ 
 	{
 		$index = $this->getEditItemIndex();
 		$items = $this->getItems();
-		if($index >= 0 && $index < $items->getCount())
+		if ($index >= 0 && $index < $items->getCount())
 			return $items->itemAt($index);
 		else
 			return null;
@@ -811,7 +811,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);
@@ -914,33 +914,33 @@ 
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		if($param instanceof TDataListCommandEventParameter)
+		if ($param instanceof TDataListCommandEventParameter)
 		{
 			$this->onItemCommand($param);
 			$command = $param->getCommandName();
-			if(strcasecmp($command, self::CMD_SELECT) === 0)
+			if (strcasecmp($command, self::CMD_SELECT) === 0)
 			{
-				if(($item = $param->getItem()) instanceof IItemDataRenderer)
+				if (($item = $param->getItem()) instanceof IItemDataRenderer)
 					$this->setSelectedItemIndex($item->getItemIndex());
 				$this->onSelectedIndexChanged($param);
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_EDIT) === 0)
+			elseif (strcasecmp($command, self::CMD_EDIT) === 0)
 			{
 				$this->onEditCommand($param);
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_DELETE) === 0)
+			elseif (strcasecmp($command, self::CMD_DELETE) === 0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_UPDATE) === 0)
+			elseif (strcasecmp($command, self::CMD_UPDATE) === 0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_CANCEL) === 0)
+			elseif (strcasecmp($command, self::CMD_CANCEL) === 0)
 			{
 				$this->onCancelCommand($param);
 				return true;
@@ -1073,7 +1073,7 @@ 
 	 */
 	public function generateItemStyle($itemType, $index)
 	{
-		if(($item = $this->getItem($itemType, $index)) !== null && ($item instanceof IStyleable) && $item->getHasStyle())
+		if (($item = $this->getItem($itemType, $index)) !== null && ($item instanceof IStyleable) && $item->getHasStyle())
 		{
 			$style = $item->getStyle();
 			$item->clearStyle();
@@ -1094,7 +1094,7 @@ 
 	public function renderItem($writer, $repeatInfo, $itemType, $index)
 	{
 		$item = $this->getItem($itemType, $index);
-		if($repeatInfo->getRepeatLayout() === TRepeatLayout::Raw && get_class($item) === 'TDataListItem')
+		if ($repeatInfo->getRepeatLayout() === TRepeatLayout::Raw && get_class($item) === 'TDataListItem')
 			$item->setTagName('div');
 		$item->renderControl($writer);
 	}
@@ -1106,7 +1106,7 @@ 
 	 */
 	private function getItem($itemType, $index)
 	{
-		switch($itemType)
+		switch ($itemType)
 		{
 			case TListItemType::Item:
 			case TListItemType::AlternatingItem:
@@ -1119,7 +1119,7 @@ 
 				return $this->getControls()->itemAt($this->getControls()->getCount() - 1);
 			case TListItemType::Separator:
 				$i = $index + $index + 1;
-				if($this->_headerTemplate !== null || $this->getHeaderRenderer() !== '')
+				if ($this->_headerTemplate !== null || $this->getHeaderRenderer() !== '')
 					$i++;
 				return $this->getControls()->itemAt($i);
 		}
@@ -1135,7 +1135,7 @@ 
 	 */
 	private function createItemInternal($itemIndex, $itemType)
 	{
-		if(($item = $this->createItem($itemIndex, $itemType)) !== null)
+		if (($item = $this->createItem($itemIndex, $itemType)) !== null)
 		{
 			$param = new TDataListItemEventParameter($item);
 			$this->onItemCreated($param);
@@ -1156,10 +1156,10 @@ 
 	 */
 	private function createItemWithDataInternal($itemIndex, $itemType, $dataItem)
 	{
-		if(($item = $this->createItem($itemIndex, $itemType)) !== null)
+		if (($item = $this->createItem($itemIndex, $itemType)) !== null)
 		{
 			$param = new TDataListItemEventParameter($item);
-			if($item instanceof \Prado\IDataRenderer)
+			if ($item instanceof \Prado\IDataRenderer)
 				$item->setData($dataItem);
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
@@ -1173,31 +1173,31 @@ 
 
 	private function getAlternatingItemDisplay()
 	{
-		if(($classPath = $this->getAlternatingItemRenderer()) === '' && $this->_alternatingItemTemplate === null)
-			return [$this->getItemRenderer(),$this->_itemTemplate];
+		if (($classPath = $this->getAlternatingItemRenderer()) === '' && $this->_alternatingItemTemplate === null)
+			return [$this->getItemRenderer(), $this->_itemTemplate];
 		else
-			return [$classPath,$this->_alternatingItemTemplate];
+			return [$classPath, $this->_alternatingItemTemplate];
 	}
 
 	private function getSelectedItemDisplay($itemIndex)
 	{
-		if(($classPath = $this->getSelectedItemRenderer()) === '' && $this->_selectedItemTemplate === null)
+		if (($classPath = $this->getSelectedItemRenderer()) === '' && $this->_selectedItemTemplate === null)
 		{
-			if($itemIndex % 2 === 0)
-				return [$this->getItemRenderer(),$this->_itemTemplate];
+			if ($itemIndex % 2 === 0)
+				return [$this->getItemRenderer(), $this->_itemTemplate];
 			else
 				return $this->getAlternatingItemDisplay();
 		}
 		else
-			return [$classPath,$this->_selectedItemTemplate];
+			return [$classPath, $this->_selectedItemTemplate];
 	}
 
 	private function getEditItemDisplay($itemIndex)
 	{
-		if(($classPath = $this->getEditItemRenderer()) === '' && $this->_editItemTemplate === null)
+		if (($classPath = $this->getEditItemRenderer()) === '' && $this->_editItemTemplate === null)
 			return $this->getSelectedItemDisplay($itemIndex);
 		else
-			return [$classPath,$this->_editItemTemplate];
+			return [$classPath, $this->_editItemTemplate];
 	}
 
 	/**
@@ -1210,7 +1210,7 @@ 
 	{
 		$template = null;
 		$classPath = null;
-		switch($itemType)
+		switch ($itemType)
 		{
 			case TListItemType::Item :
 				$classPath = $this->getItemRenderer();
@@ -1240,16 +1240,16 @@ 
 			default:
 				throw new TInvalidDataValueException('datalist_itemtype_unknown', $itemType);
 		}
-		if($classPath !== '')
+		if ($classPath !== '')
 		{
 			$item = Prado::createComponent($classPath);
-			if($item instanceof IItemDataRenderer)
+			if ($item instanceof IItemDataRenderer)
 			{
 				$item->setItemIndex($itemIndex);
 				$item->setItemType($itemType);
 			}
 		}
-		elseif($template !== null)
+		elseif ($template !== null)
 		{
 			$item = new TDataListItem;
 			$item->setItemIndex($itemIndex);
@@ -1267,9 +1267,9 @@ 
 	 */
 	protected function createEmptyContent()
 	{
-		if(($classPath = $this->getEmptyRenderer()) !== '')
+		if (($classPath = $this->getEmptyRenderer()) !== '')
 			$this->getControls()->add(Prado::createComponent($classPath));
-		elseif($this->_emptyTemplate !== null)
+		elseif ($this->_emptyTemplate !== null)
 			$this->_emptyTemplate->instantiateIn($this);
 	}
 
@@ -1289,9 +1289,9 @@ 
 		$itemStyle = $this->getViewState('ItemStyle', null);
 
 		$alternatingItemStyle = $this->getViewState('AlternatingItemStyle', null);
-		if($itemStyle !== null)
+		if ($itemStyle !== null)
 		{
-			if($alternatingItemStyle === null)
+			if ($alternatingItemStyle === null)
 				$alternatingItemStyle = $itemStyle;
 			else
 				$alternatingItemStyle->mergeWith($itemStyle);
@@ -1300,25 +1300,25 @@ 
 		$selectedItemStyle = $this->getViewState('SelectedItemStyle', null);
 
 		$editItemStyle = $this->getViewState('EditItemStyle', null);
-		if($selectedItemStyle !== null)
+		if ($selectedItemStyle !== null)
 		{
-			if($editItemStyle === null)
+			if ($editItemStyle === null)
 				$editItemStyle = $selectedItemStyle;
 			else
 				$editItemStyle->mergeWith($selectedItemStyle);
 		}
 
 		// apply header style if any
-		if($this->_header !== null && $this->_header instanceof IStyleable)
+		if ($this->_header !== null && $this->_header instanceof IStyleable)
 		{
-			if($headerStyle = $this->getViewState('HeaderStyle', null))
+			if ($headerStyle = $this->getViewState('HeaderStyle', null))
 				$this->_header->getStyle()->mergeWith($headerStyle);
 		}
 
 		// apply footer style if any
-		if($this->_footer !== null && $this->_footer instanceof IStyleable)
+		if ($this->_footer !== null && $this->_footer instanceof IStyleable)
 		{
-			if($footerStyle = $this->getViewState('FooterStyle', null))
+			if ($footerStyle = $this->getViewState('FooterStyle', null))
 				$this->_footer->getStyle()->mergeWith($footerStyle);
 		}
 
@@ -1326,28 +1326,28 @@ 
 		$editIndex = $this->getEditItemIndex();
 
 		// apply item styles if any
-		foreach($this->getItems() as $index => $item)
+		foreach ($this->getItems() as $index => $item)
 		{
-			if($index === $editIndex)
+			if ($index === $editIndex)
 				$style = $editItemStyle;
-			elseif($index === $selectedIndex)
+			elseif ($index === $selectedIndex)
 				$style = $selectedItemStyle;
-			elseif($index % 2 === 0)
+			elseif ($index % 2 === 0)
 				$style = $itemStyle;
 			else
 				$style = $alternatingItemStyle;
-			if($style && $item instanceof IStyleable)
+			if ($style && $item instanceof IStyleable)
 				$item->getStyle()->mergeWith($style);
 		}
 
 		// apply separator style if any
-		if(($separatorStyle = $this->getViewState('SeparatorStyle', null)) !== null && $this->getHasSeparators())
+		if (($separatorStyle = $this->getViewState('SeparatorStyle', null)) !== null && $this->getHasSeparators())
 		{
 			$controls = $this->getControls();
 			$count = $controls->getCount();
-			for($i = $this->_header?2:1;$i < $count;$i += 2)
+			for ($i = $this->_header ? 2 : 1; $i < $count; $i += 2)
 			{
-				if(($separator = $controls->itemAt($i)) instanceof IStyleable)
+				if (($separator = $controls->itemAt($i)) instanceof IStyleable)
 					$separator->getStyle()->mergeWith($separatorStyle);
 			}
 		}
@@ -1360,7 +1360,7 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		if($this->_items)
+		if ($this->_items)
 			$this->setViewState('ItemCount', $this->_items->getCount(), 0);
 		else
 			$this->clearViewState('ItemCount');
@@ -1373,7 +1373,7 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		if(!$this->getIsDataBound())
+		if (!$this->getIsDataBound())
 			$this->restoreItemsFromViewState();
 		$this->clearViewState('ItemCount');
 	}
@@ -1395,23 +1395,23 @@ 
 	protected function restoreItemsFromViewState()
 	{
 		$this->reset();
-		if(($itemCount = $this->getViewState('ItemCount', 0)) > 0)
+		if (($itemCount = $this->getViewState('ItemCount', 0)) > 0)
 		{
 			$items = $this->getItems();
 			$selectedIndex = $this->getSelectedItemIndex();
 			$editIndex = $this->getEditItemIndex();
 			$hasSeparator = $this->_separatorTemplate !== null || $this->getSeparatorRenderer() !== '';
 			$this->_header = $this->createItemInternal(-1, TListItemType::Header);
-			for($i = 0;$i < $itemCount;++$i)
+			for ($i = 0; $i < $itemCount; ++$i)
 			{
-				if($hasSeparator && $i > 0)
+				if ($hasSeparator && $i > 0)
 					$this->createItemInternal($i - 1, TListItemType::Separator);
-				if($i === $editIndex)
+				if ($i === $editIndex)
 					$itemType = TListItemType::EditItem;
-				elseif($i === $selectedIndex)
+				elseif ($i === $selectedIndex)
 					$itemType = TListItemType::SelectedItem;
 				else
-					$itemType = $i % 2?TListItemType::AlternatingItem : TListItemType::Item;
+					$itemType = $i % 2 ?TListItemType::AlternatingItem : TListItemType::Item;
 				$items->add($this->createItemInternal($i, $itemType));
 			}
 			$this->_footer = $this->createItemInternal(-1, TListItemType::Footer);
@@ -1438,26 +1438,26 @@ 
 		$hasSeparator = $this->_separatorTemplate !== null || $this->getSeparatorRenderer() !== '';
 		$selectedIndex = $this->getSelectedItemIndex();
 		$editIndex = $this->getEditItemIndex();
-		foreach($data as $key => $dataItem)
+		foreach ($data as $key => $dataItem)
 		{
-			if($keyField !== '')
+			if ($keyField !== '')
 				$keys->add($this->getDataFieldValue($dataItem, $keyField));
 			else
 				$keys->add($key);
-			if($itemIndex === 0)
+			if ($itemIndex === 0)
 				$this->_header = $this->createItemWithDataInternal(-1, TListItemType::Header, null);
-			if($hasSeparator && $itemIndex > 0)
+			if ($hasSeparator && $itemIndex > 0)
 				$this->createItemWithDataInternal($itemIndex - 1, TListItemType::Separator, null);
-			if($itemIndex === $editIndex)
+			if ($itemIndex === $editIndex)
 				$itemType = TListItemType::EditItem;
-			elseif($itemIndex === $selectedIndex)
+			elseif ($itemIndex === $selectedIndex)
 				$itemType = TListItemType::SelectedItem;
 			else
-				$itemType = $itemIndex % 2?TListItemType::AlternatingItem : TListItemType::Item;
+				$itemType = $itemIndex % 2 ?TListItemType::AlternatingItem : TListItemType::Item;
 			$items->add($this->createItemWithDataInternal($itemIndex, $itemType, $dataItem));
 			$itemIndex++;
 		}
-		if($itemIndex > 0)
+		if ($itemIndex > 0)
 			$this->_footer = $this->createItemWithDataInternal(-1, TListItemType::Footer, null);
 		else
 		{
@@ -1474,15 +1474,15 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			if($this->getItemCount() > 0)
+			if ($this->getItemCount() > 0)
 			{
 				$this->applyItemStyles();
 				$repeatInfo = $this->getRepeatInfo();
 				$repeatInfo->renderRepeater($writer, $this);
 			}
-			elseif($this->_emptyTemplate !== null || $this->getEmptyRenderer() !== '')
+			elseif ($this->_emptyTemplate !== null || $this->getEmptyRenderer() !== '')
 				parent::render($writer);
 		}
 	}

Braces +200 added lines, -163 removed lines

@@ -188,8 +188,9 @@ 
 	 */
 	public function getItems()
 	{
-		if(!$this->_items)
-			$this->_items = new TDataListItemCollection;
+		if(!$this->_items) {
+					$this->_items = new TDataListItemCollection;
+		}
 		return $this->_items;
 	}
 
@@ -408,10 +409,11 @@ 
 	 */
 	public function setItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
-			$this->_itemTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('datalist_template_required', 'ItemTemplate');
+		if($value instanceof ITemplate || $value === null) {
+					$this->_itemTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('datalist_template_required', 'ItemTemplate');
+		}
 	}
 
 	/**
@@ -441,10 +443,11 @@ 
 	 */
 	public function setAlternatingItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
-			$this->_alternatingItemTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('datalist_template_required', 'AlternatingItemType');
+		if($value instanceof ITemplate || $value === null) {
+					$this->_alternatingItemTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('datalist_template_required', 'AlternatingItemType');
+		}
 	}
 
 	/**
@@ -474,10 +477,11 @@ 
 	 */
 	public function setSelectedItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
-			$this->_selectedItemTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('datalist_template_required', 'SelectedItemTemplate');
+		if($value instanceof ITemplate || $value === null) {
+					$this->_selectedItemTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('datalist_template_required', 'SelectedItemTemplate');
+		}
 	}
 
 	/**
@@ -507,10 +511,11 @@ 
 	 */
 	public function setEditItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
-			$this->_editItemTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('datalist_template_required', 'EditItemTemplate');
+		if($value instanceof ITemplate || $value === null) {
+					$this->_editItemTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('datalist_template_required', 'EditItemTemplate');
+		}
 	}
 
 	/**
@@ -540,10 +545,11 @@ 
 	 */
 	public function setHeaderTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
-			$this->_headerTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('datalist_template_required', 'HeaderTemplate');
+		if($value instanceof ITemplate || $value === null) {
+					$this->_headerTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('datalist_template_required', 'HeaderTemplate');
+		}
 	}
 
 	/**
@@ -581,10 +587,11 @@ 
 	 */
 	public function setFooterTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
-			$this->_footerTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('datalist_template_required', 'FooterTemplate');
+		if($value instanceof ITemplate || $value === null) {
+					$this->_footerTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('datalist_template_required', 'FooterTemplate');
+		}
 	}
 
 	/**
@@ -622,10 +629,11 @@ 
 	 */
 	public function setEmptyTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
-			$this->_emptyTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('datalist_template_required', 'EmptyTemplate');
+		if($value instanceof ITemplate || $value === null) {
+					$this->_emptyTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('datalist_template_required', 'EmptyTemplate');
+		}
 	}
 
 	/**
@@ -642,10 +650,11 @@ 
 	 */
 	public function setSeparatorTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
-			$this->_separatorTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('datalist_template_required', 'SeparatorTemplate');
+		if($value instanceof ITemplate || $value === null) {
+					$this->_separatorTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('datalist_template_required', 'SeparatorTemplate');
+		}
 	}
 
 	/**
@@ -679,8 +688,9 @@ 
 	 */
 	public function setSelectedItemIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					$value = -1;
+		}
 		if(($current = $this->getSelectedItemIndex()) !== $value)
 		{
 			$this->setViewState('SelectedItemIndex', $value, -1);
@@ -689,14 +699,16 @@ 
 			if($current >= 0 && $current < $itemCount)
 			{
 				$item = $items->itemAt($current);
-				if(($item instanceof IItemDataRenderer) && $item->getItemType() !== TListItemType::EditItem)
-					$item->setItemType($current % 2?TListItemType::AlternatingItem : TListItemType::Item);
+				if(($item instanceof IItemDataRenderer) && $item->getItemType() !== TListItemType::EditItem) {
+									$item->setItemType($current % 2?TListItemType::AlternatingItem : TListItemType::Item);
+				}
 			}
 			if($value >= 0 && $value < $itemCount)
 			{
 				$item = $items->itemAt($value);
-				if(($item instanceof IItemDataRenderer) && $item->getItemType() !== TListItemType::EditItem)
-					$item->setItemType(TListItemType::SelectedItem);
+				if(($item instanceof IItemDataRenderer) && $item->getItemType() !== TListItemType::EditItem) {
+									$item->setItemType(TListItemType::SelectedItem);
+				}
 			}
 		}
 	}
@@ -708,10 +720,11 @@ 
 	{
 		$index = $this->getSelectedItemIndex();
 		$items = $this->getItems();
-		if($index >= 0 && $index < $items->getCount())
-			return $items->itemAt($index);
-		else
-			return null;
+		if($index >= 0 && $index < $items->getCount()) {
+					return $items->itemAt($index);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -720,14 +733,16 @@ 
 	 */
 	public function getSelectedDataKey()
 	{
-		if($this->getDataKeyField() === '')
-			throw new TInvalidOperationException('datalist_datakeyfield_required');
+		if($this->getDataKeyField() === '') {
+					throw new TInvalidOperationException('datalist_datakeyfield_required');
+		}
 		$index = $this->getSelectedItemIndex();
 		$dataKeys = $this->getDataKeys();
-		if($index >= 0 && $index < $dataKeys->getCount())
-			return $dataKeys->itemAt($index);
-		else
-			return null;
+		if($index >= 0 && $index < $dataKeys->getCount()) {
+					return $dataKeys->itemAt($index);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -747,17 +762,20 @@ 
 	 */
 	public function setEditItemIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					$value = -1;
+		}
 		if(($current = $this->getEditItemIndex()) !== $value)
 		{
 			$this->setViewState('EditItemIndex', $value, -1);
 			$items = $this->getItems();
 			$itemCount = $items->getCount();
-			if($current >= 0 && $current < $itemCount)
-				$items->itemAt($current)->setItemType($current % 2?TListItemType::AlternatingItem : TListItemType::Item);
-			if($value >= 0 && $value < $itemCount)
-				$items->itemAt($value)->setItemType(TListItemType::EditItem);
+			if($current >= 0 && $current < $itemCount) {
+							$items->itemAt($current)->setItemType($current % 2?TListItemType::AlternatingItem : TListItemType::Item);
+			}
+			if($value >= 0 && $value < $itemCount) {
+							$items->itemAt($value)->setItemType(TListItemType::EditItem);
+			}
 		}
 	}
 
@@ -768,10 +786,11 @@ 
 	{
 		$index = $this->getEditItemIndex();
 		$items = $this->getItems();
-		if($index >= 0 && $index < $items->getCount())
-			return $items->itemAt($index);
-		else
-			return null;
+		if($index >= 0 && $index < $items->getCount()) {
+					return $items->itemAt($index);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -920,27 +939,24 @@ 
 			$command = $param->getCommandName();
 			if(strcasecmp($command, self::CMD_SELECT) === 0)
 			{
-				if(($item = $param->getItem()) instanceof IItemDataRenderer)
-					$this->setSelectedItemIndex($item->getItemIndex());
+				if(($item = $param->getItem()) instanceof IItemDataRenderer) {
+									$this->setSelectedItemIndex($item->getItemIndex());
+				}
 				$this->onSelectedIndexChanged($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_EDIT) === 0)
+			} elseif(strcasecmp($command, self::CMD_EDIT) === 0)
 			{
 				$this->onEditCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_DELETE) === 0)
+			} elseif(strcasecmp($command, self::CMD_DELETE) === 0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_UPDATE) === 0)
+			} elseif(strcasecmp($command, self::CMD_UPDATE) === 0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_CANCEL) === 0)
+			} elseif(strcasecmp($command, self::CMD_CANCEL) === 0)
 			{
 				$this->onCancelCommand($param);
 				return true;
@@ -1078,9 +1094,9 @@ 
 			$style = $item->getStyle();
 			$item->clearStyle();
 			return $style;
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	/**
@@ -1094,8 +1110,9 @@ 
 	public function renderItem($writer, $repeatInfo, $itemType, $index)
 	{
 		$item = $this->getItem($itemType, $index);
-		if($repeatInfo->getRepeatLayout() === TRepeatLayout::Raw && get_class($item) === 'TDataListItem')
-			$item->setTagName('div');
+		if($repeatInfo->getRepeatLayout() === TRepeatLayout::Raw && get_class($item) === 'TDataListItem') {
+					$item->setTagName('div');
+		}
 		$item->renderControl($writer);
 	}
 
@@ -1119,8 +1136,9 @@ 
 				return $this->getControls()->itemAt($this->getControls()->getCount() - 1);
 			case TListItemType::Separator:
 				$i = $index + $index + 1;
-				if($this->_headerTemplate !== null || $this->getHeaderRenderer() !== '')
-					$i++;
+				if($this->_headerTemplate !== null || $this->getHeaderRenderer() !== '') {
+									$i++;
+				}
 				return $this->getControls()->itemAt($i);
 		}
 		return null;
@@ -1141,9 +1159,9 @@ 
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
 			return $item;
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	/**
@@ -1159,45 +1177,49 @@ 
 		if(($item = $this->createItem($itemIndex, $itemType)) !== null)
 		{
 			$param = new TDataListItemEventParameter($item);
-			if($item instanceof \Prado\IDataRenderer)
-				$item->setData($dataItem);
+			if($item instanceof \Prado\IDataRenderer) {
+							$item->setData($dataItem);
+			}
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
 			$item->dataBind();
 			$this->onItemDataBound($param);
 			return $item;
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	private function getAlternatingItemDisplay()
 	{
-		if(($classPath = $this->getAlternatingItemRenderer()) === '' && $this->_alternatingItemTemplate === null)
-			return [$this->getItemRenderer(),$this->_itemTemplate];
-		else
-			return [$classPath,$this->_alternatingItemTemplate];
+		if(($classPath = $this->getAlternatingItemRenderer()) === '' && $this->_alternatingItemTemplate === null) {
+					return [$this->getItemRenderer(),$this->_itemTemplate];
+		} else {
+					return [$classPath,$this->_alternatingItemTemplate];
+		}
 	}
 
 	private function getSelectedItemDisplay($itemIndex)
 	{
 		if(($classPath = $this->getSelectedItemRenderer()) === '' && $this->_selectedItemTemplate === null)
 		{
-			if($itemIndex % 2 === 0)
-				return [$this->getItemRenderer(),$this->_itemTemplate];
-			else
-				return $this->getAlternatingItemDisplay();
+			if($itemIndex % 2 === 0) {
+							return [$this->getItemRenderer(),$this->_itemTemplate];
+			} else {
+							return $this->getAlternatingItemDisplay();
+			}
+		} else {
+					return [$classPath,$this->_selectedItemTemplate];
 		}
-		else
-			return [$classPath,$this->_selectedItemTemplate];
 	}
 
 	private function getEditItemDisplay($itemIndex)
 	{
-		if(($classPath = $this->getEditItemRenderer()) === '' && $this->_editItemTemplate === null)
-			return $this->getSelectedItemDisplay($itemIndex);
-		else
-			return [$classPath,$this->_editItemTemplate];
+		if(($classPath = $this->getEditItemRenderer()) === '' && $this->_editItemTemplate === null) {
+					return $this->getSelectedItemDisplay($itemIndex);
+		} else {
+					return [$classPath,$this->_editItemTemplate];
+		}
 	}
 
 	/**
@@ -1248,16 +1270,15 @@ 
 				$item->setItemIndex($itemIndex);
 				$item->setItemType($itemType);
 			}
-		}
-		elseif($template !== null)
+		} elseif($template !== null)
 		{
 			$item = new TDataListItem;
 			$item->setItemIndex($itemIndex);
 			$item->setItemType($itemType);
 			$template->instantiateIn($item);
+		} else {
+					$item = null;
 		}
-		else
-			$item = null;
 
 		return $item;
 	}
@@ -1267,10 +1288,11 @@ 
 	 */
 	protected function createEmptyContent()
 	{
-		if(($classPath = $this->getEmptyRenderer()) !== '')
-			$this->getControls()->add(Prado::createComponent($classPath));
-		elseif($this->_emptyTemplate !== null)
-			$this->_emptyTemplate->instantiateIn($this);
+		if(($classPath = $this->getEmptyRenderer()) !== '') {
+					$this->getControls()->add(Prado::createComponent($classPath));
+		} elseif($this->_emptyTemplate !== null) {
+					$this->_emptyTemplate->instantiateIn($this);
+		}
 	}
 
 	/**
@@ -1291,10 +1313,11 @@ 
 		$alternatingItemStyle = $this->getViewState('AlternatingItemStyle', null);
 		if($itemStyle !== null)
 		{
-			if($alternatingItemStyle === null)
-				$alternatingItemStyle = $itemStyle;
-			else
-				$alternatingItemStyle->mergeWith($itemStyle);
+			if($alternatingItemStyle === null) {
+							$alternatingItemStyle = $itemStyle;
+			} else {
+							$alternatingItemStyle->mergeWith($itemStyle);
+			}
 		}
 
 		$selectedItemStyle = $this->getViewState('SelectedItemStyle', null);
@@ -1302,24 +1325,27 @@ 
 		$editItemStyle = $this->getViewState('EditItemStyle', null);
 		if($selectedItemStyle !== null)
 		{
-			if($editItemStyle === null)
-				$editItemStyle = $selectedItemStyle;
-			else
-				$editItemStyle->mergeWith($selectedItemStyle);
+			if($editItemStyle === null) {
+							$editItemStyle = $selectedItemStyle;
+			} else {
+							$editItemStyle->mergeWith($selectedItemStyle);
+			}
 		}
 
 		// apply header style if any
 		if($this->_header !== null && $this->_header instanceof IStyleable)
 		{
-			if($headerStyle = $this->getViewState('HeaderStyle', null))
-				$this->_header->getStyle()->mergeWith($headerStyle);
+			if($headerStyle = $this->getViewState('HeaderStyle', null)) {
+							$this->_header->getStyle()->mergeWith($headerStyle);
+			}
 		}
 
 		// apply footer style if any
 		if($this->_footer !== null && $this->_footer instanceof IStyleable)
 		{
-			if($footerStyle = $this->getViewState('FooterStyle', null))
-				$this->_footer->getStyle()->mergeWith($footerStyle);
+			if($footerStyle = $this->getViewState('FooterStyle', null)) {
+							$this->_footer->getStyle()->mergeWith($footerStyle);
+			}
 		}
 
 		$selectedIndex = $this->getSelectedItemIndex();
@@ -1328,16 +1354,18 @@ 
 		// apply item styles if any
 		foreach($this->getItems() as $index => $item)
 		{
-			if($index === $editIndex)
-				$style = $editItemStyle;
-			elseif($index === $selectedIndex)
-				$style = $selectedItemStyle;
-			elseif($index % 2 === 0)
-				$style = $itemStyle;
-			else
-				$style = $alternatingItemStyle;
-			if($style && $item instanceof IStyleable)
-				$item->getStyle()->mergeWith($style);
+			if($index === $editIndex) {
+							$style = $editItemStyle;
+			} elseif($index === $selectedIndex) {
+							$style = $selectedItemStyle;
+			} elseif($index % 2 === 0) {
+							$style = $itemStyle;
+			} else {
+							$style = $alternatingItemStyle;
+			}
+			if($style && $item instanceof IStyleable) {
+							$item->getStyle()->mergeWith($style);
+			}
 		}
 
 		// apply separator style if any
@@ -1347,8 +1375,9 @@ 
 			$count = $controls->getCount();
 			for($i = $this->_header?2:1;$i < $count;$i += 2)
 			{
-				if(($separator = $controls->itemAt($i)) instanceof IStyleable)
-					$separator->getStyle()->mergeWith($separatorStyle);
+				if(($separator = $controls->itemAt($i)) instanceof IStyleable) {
+									$separator->getStyle()->mergeWith($separatorStyle);
+				}
 			}
 		}
 	}
@@ -1360,10 +1389,11 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		if($this->_items)
-			$this->setViewState('ItemCount', $this->_items->getCount(), 0);
-		else
-			$this->clearViewState('ItemCount');
+		if($this->_items) {
+					$this->setViewState('ItemCount', $this->_items->getCount(), 0);
+		} else {
+					$this->clearViewState('ItemCount');
+		}
 	}
 
 	/**
@@ -1373,8 +1403,9 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		if(!$this->getIsDataBound())
-			$this->restoreItemsFromViewState();
+		if(!$this->getIsDataBound()) {
+					$this->restoreItemsFromViewState();
+		}
 		$this->clearViewState('ItemCount');
 	}
 
@@ -1404,20 +1435,22 @@ 
 			$this->_header = $this->createItemInternal(-1, TListItemType::Header);
 			for($i = 0;$i < $itemCount;++$i)
 			{
-				if($hasSeparator && $i > 0)
-					$this->createItemInternal($i - 1, TListItemType::Separator);
-				if($i === $editIndex)
-					$itemType = TListItemType::EditItem;
-				elseif($i === $selectedIndex)
-					$itemType = TListItemType::SelectedItem;
-				else
-					$itemType = $i % 2?TListItemType::AlternatingItem : TListItemType::Item;
+				if($hasSeparator && $i > 0) {
+									$this->createItemInternal($i - 1, TListItemType::Separator);
+				}
+				if($i === $editIndex) {
+									$itemType = TListItemType::EditItem;
+				} elseif($i === $selectedIndex) {
+									$itemType = TListItemType::SelectedItem;
+				} else {
+									$itemType = $i % 2?TListItemType::AlternatingItem : TListItemType::Item;
+				}
 				$items->add($this->createItemInternal($i, $itemType));
 			}
 			$this->_footer = $this->createItemInternal(-1, TListItemType::Footer);
+		} else {
+					$this->createEmptyContent();
 		}
-		else
-			$this->createEmptyContent();
 		$this->clearChildState();
 	}
 
@@ -1440,26 +1473,30 @@ 
 		$editIndex = $this->getEditItemIndex();
 		foreach($data as $key => $dataItem)
 		{
-			if($keyField !== '')
-				$keys->add($this->getDataFieldValue($dataItem, $keyField));
-			else
-				$keys->add($key);
-			if($itemIndex === 0)
-				$this->_header = $this->createItemWithDataInternal(-1, TListItemType::Header, null);
-			if($hasSeparator && $itemIndex > 0)
-				$this->createItemWithDataInternal($itemIndex - 1, TListItemType::Separator, null);
-			if($itemIndex === $editIndex)
-				$itemType = TListItemType::EditItem;
-			elseif($itemIndex === $selectedIndex)
-				$itemType = TListItemType::SelectedItem;
-			else
-				$itemType = $itemIndex % 2?TListItemType::AlternatingItem : TListItemType::Item;
+			if($keyField !== '') {
+							$keys->add($this->getDataFieldValue($dataItem, $keyField));
+			} else {
+							$keys->add($key);
+			}
+			if($itemIndex === 0) {
+							$this->_header = $this->createItemWithDataInternal(-1, TListItemType::Header, null);
+			}
+			if($hasSeparator && $itemIndex > 0) {
+							$this->createItemWithDataInternal($itemIndex - 1, TListItemType::Separator, null);
+			}
+			if($itemIndex === $editIndex) {
+							$itemType = TListItemType::EditItem;
+			} elseif($itemIndex === $selectedIndex) {
+							$itemType = TListItemType::SelectedItem;
+			} else {
+							$itemType = $itemIndex % 2?TListItemType::AlternatingItem : TListItemType::Item;
+			}
 			$items->add($this->createItemWithDataInternal($itemIndex, $itemType, $dataItem));
 			$itemIndex++;
 		}
-		if($itemIndex > 0)
-			$this->_footer = $this->createItemWithDataInternal(-1, TListItemType::Footer, null);
-		else
+		if($itemIndex > 0) {
+					$this->_footer = $this->createItemWithDataInternal(-1, TListItemType::Footer, null);
+		} else
 		{
 			$this->createEmptyContent();
 			$this->dataBindChildren();
@@ -1481,9 +1518,9 @@ 
 				$this->applyItemStyles();
 				$repeatInfo = $this->getRepeatInfo();
 				$repeatInfo->renderRepeater($writer, $this);
+			} elseif($this->_emptyTemplate !== null || $this->getEmptyRenderer() !== '') {
+							parent::render($writer);
 			}
-			elseif($this->_emptyTemplate !== null || $this->getEmptyRenderer() !== '')
-				parent::render($writer);
 		}
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TReadOnlyDataSource.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 
 	public function __construct($dataSource, $dataMember)
 	{
-		if(!is_array($dataSource) && !($dataSource instanceof IDataSource) && !($dataSource instanceof \Traversable))
+		if (!is_array($dataSource) && !($dataSource instanceof IDataSource) && !($dataSource instanceof \Traversable))
 			throw new TInvalidDataTypeException('readonlydatasource_datasource_invalid');
 		$this->_dataSource = $dataSource;
 		$this->_dataMember = $dataMember;
@@ -35,7 +35,7 @@ 
 
 	public function getView($viewName)
 	{
-		if($this->_dataSource instanceof IDataSource)
+		if ($this->_dataSource instanceof IDataSource)
 			return $this->_dataSource->getView($viewName);
 		else
 			return new TReadOnlyDataSourceView($this, $this->_dataMember, $this->_dataSource);

Braces +8 added lines, -6 removed lines

@@ -27,17 +27,19 @@
 
 	public function __construct($dataSource, $dataMember)
 	{
-		if(!is_array($dataSource) && !($dataSource instanceof IDataSource) && !($dataSource instanceof \Traversable))
-			throw new TInvalidDataTypeException('readonlydatasource_datasource_invalid');
+		if(!is_array($dataSource) && !($dataSource instanceof IDataSource) && !($dataSource instanceof \Traversable)) {
+					throw new TInvalidDataTypeException('readonlydatasource_datasource_invalid');
+		}
 		$this->_dataSource = $dataSource;
 		$this->_dataMember = $dataMember;
 	}
 
 	public function getView($viewName)
 	{
-		if($this->_dataSource instanceof IDataSource)
-			return $this->_dataSource->getView($viewName);
-		else
-			return new TReadOnlyDataSourceView($this, $this->_dataMember, $this->_dataSource);
+		if($this->_dataSource instanceof IDataSource) {
+					return $this->_dataSource->getView($viewName);
+		} else {
+					return new TReadOnlyDataSourceView($this, $this->_dataMember, $this->_dataSource);
+		}
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TStyleSheet.php

Spacing +4 added lines, -4 removed lines

@@ -104,13 +104,13 @@ 
 		$cs = $this->getPage()->getClientScript();
 
 		$styles = preg_split('/,|\s+/', $this->getPradoStyles());
-		foreach($styles as $style)
+		foreach ($styles as $style)
 		{
-			if(($style = trim($style)) !== '')
+			if (($style = trim($style)) !== '')
 				$cs->registerPradoStyle($style);
 		}
 
-		if(($url = $this->getStyleSheetUrl()) !== '')
+		if (($url = $this->getStyleSheetUrl()) !== '')
 			$cs->registerStyleSheetFile($url, $url, $this->getMediaType());
 	}
 
@@ -121,7 +121,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
 			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n");
 			$this->renderChildren($writer);

Braces +6 added lines, -4 removed lines

@@ -106,12 +106,14 @@
 		$styles = preg_split('/,|\s+/', $this->getPradoStyles());
 		foreach($styles as $style)
 		{
-			if(($style = trim($style)) !== '')
-				$cs->registerPradoStyle($style);
+			if(($style = trim($style)) !== '') {
+							$cs->registerPradoStyle($style);
+			}
 		}
 
-		if(($url = $this->getStyleSheetUrl()) !== '')
-			$cs->registerStyleSheetFile($url, $url, $this->getMediaType());
+		if(($url = $this->getStyleSheetUrl()) !== '') {
+					$cs->registerStyleSheetFile($url, $url, $this->getMediaType());
+		}
 	}
 
 	/**

framework/Web/UI/WebControls/TRepeaterItemCollection.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof \Prado\Web\UI\TControl)
+		if ($item instanceof \Prado\Web\UI\TControl)
 			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('repeateritemcollection_item_invalid');

Braces +5 added lines, -4 removed lines

@@ -33,9 +33,10 @@
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof \Prado\Web\UI\TControl)
-			parent::insertAt($index, $item);
-		else
-			throw new TInvalidDataTypeException('repeateritemcollection_item_invalid');
+		if($item instanceof \Prado\Web\UI\TControl) {
+					parent::insertAt($index, $item);
+		} else {
+					throw new TInvalidDataTypeException('repeateritemcollection_item_invalid');
+		}
 	}
 }
\ No newline at end of file