pradosoft / prado

framework/Web/UI/WebControls/TDatePicker.php

Spacing +58 added lines, -58 removed lines

@@ -301,7 +301,7 @@ 
 	 */
 	public function getTimeStamp()
 	{
-		if(trim($this->getText()) === '')
+		if (trim($this->getText()) === '')
 			return null;
 		else
 			return $this->getTimeStampFromText();
@@ -313,7 +313,7 @@ 
 	 */
 	public function setTimeStamp($value)
 	{
-		if($value === null || (is_string($value) && trim($value) === ''))
+		if ($value === null || (is_string($value) && trim($value) === ''))
 			$this->setText('');
 		else
 		{
@@ -377,7 +377,7 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientScript === null)
+		if ($this->_clientScript === null)
 			$this->_clientScript = $this->createClientScript();
 		return $this->_clientScript;
 	}
@@ -397,7 +397,7 @@ 
 	 */
 	public function getValidationPropertyValue()
 	{
-		if(($text = $this->getText()) === '')
+		if (($text = $this->getText()) === '')
 			return '';
 		$date = $this->getTimeStamp();
 		return $date == null ? $text : $date;
@@ -421,7 +421,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getInputMode() == TDatePickerInputMode::TextBox)
+		if ($this->getInputMode() == TDatePickerInputMode::TextBox)
 		{
 			parent::render($writer);
 			$this->renderDatePickerButtons($writer);
@@ -429,7 +429,7 @@ 
 		else
 		{
 			$this->renderDropDownListCalendar($writer);
-			if($this->hasDayPattern())
+			if ($this->hasDayPattern())
 			{
 				$this->renderClientControlScript($writer);
 				$this->renderDatePickerButtons($writer);
@@ -442,7 +442,7 @@ 
 	 */
 	protected function renderDatePickerButtons($writer)
 	{
-		if($this->getShowCalendar())
+		if ($this->getShowCalendar())
 		{
 			switch ($this->getMode())
 			{
@@ -466,10 +466,10 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		if($this->getInputMode() == TDatePickerInputMode::TextBox)
+		if ($this->getInputMode() == TDatePickerInputMode::TextBox)
 			return parent::loadPostData($key, $values);
 		$value = $this->getDateFromPostData($key, $values);
-		if(!$this->getReadOnly() && $this->getText() !== $value)
+		if (!$this->getReadOnly() && $this->getText() !== $value)
 		{
 			$this->setText($value);
 			return true;
@@ -489,26 +489,26 @@ 
 		$date = @getdate();
 
 		$pattern = $this->getDateFormat();
-		$pattern = str_replace(['MMMM', 'MMM'], ['MM','MM'], $pattern);
+		$pattern = str_replace(['MMMM', 'MMM'], ['MM', 'MM'], $pattern);
 		$formatter = new TSimpleDateFormatter($pattern);
 
 		$order = $formatter->getDayMonthYearOrdering();
 
-		if(isset($values[$key . '$day'])) {
-			$day = intval($values[$key . '$day']);
-		} elseif(in_array('day', $order)) {
+		if (isset($values[$key.'$day'])) {
+			$day = intval($values[$key.'$day']);
+		} elseif (in_array('day', $order)) {
 			$day = $date['mday'];
 		} else {
 			$day = 1;
 		}
 
-		if(isset($values[$key . '$month']))
-			$month = intval($values[$key . '$month']) + 1;
+		if (isset($values[$key.'$month']))
+			$month = intval($values[$key.'$month']) + 1;
 		else
 			$month = $date['mon'];
 
-		if(isset($values[$key . '$year']))
-			$year = intval($values[$key . '$year']);
+		if (isset($values[$key.'$year']))
+			$year = intval($values[$key.'$year']);
 		else
 			$year = $date['year'];
 
@@ -519,7 +519,7 @@ 
 		//$date = @mktime(0, 0, 0, $month, $day, $year);
 
 		$pattern = $this->getDateFormat();
-		$pattern = str_replace(['MMMM', 'MMM'], ['MM','MM'], $pattern);
+		$pattern = str_replace(['MMMM', 'MMM'], ['MM', 'MM'], $pattern);
 
 		$formatter = new TSimpleDateFormatter($pattern);
 		return $formatter->format($date);
@@ -535,12 +535,12 @@ 
 		$options['InputMode'] = $this->getInputMode();
 		$options['Format'] = $this->getDateFormat();
 		$options['FirstDayOfWeek'] = $this->getFirstDayOfWeek();
-		if(($cssClass = $this->getCssClass()) !== '')
+		if (($cssClass = $this->getCssClass()) !== '')
 			$options['ClassName'] = $cssClass;
 		$options['CalendarStyle'] = $this->getCalendarStyle();
 		$options['FromYear'] = $this->getFromYear();
 		$options['UpToYear'] = $this->getUpToYear();
-		switch($this->getMode())
+		switch ($this->getMode())
 		{
 			case TDatePickerMode::Basic:
 				break;
@@ -554,7 +554,7 @@ 
 		$options['PositionMode'] = $this->getPositionMode();
 
 		$options = array_merge($options, $this->getCulturalOptions());
-		if($this->_clientScript !== null)
+		if ($this->_clientScript !== null)
 			$options = array_merge($options,
 				$this->_clientScript->getOptions()->toArray());
 		return $options;
@@ -566,7 +566,7 @@ 
 	 */
 	protected function getCulturalOptions()
 	{
-		if($this->getCurrentCulture() == 'en')
+		if ($this->getCurrentCulture() == 'en')
 			return [];
 
 		$date = $this->getLocalizedCalendarInfo();
@@ -603,14 +603,14 @@ 
 	 */
 	protected function renderDropDownListCalendar($writer)
 	{
-		if($this->getMode() == TDatePickerMode::Basic)
+		if ($this->getMode() == TDatePickerMode::Basic)
 			$this->setMode(TDatePickerMode::ImageButton);
 		parent::addAttributesToRender($writer);
 		$writer->removeAttribute('name');
 		$writer->removeAttribute('type');
 		$writer->addAttribute('id', $this->getClientID());
 
-		if(strlen($class = $this->getCssClass()) > 0)
+		if (strlen($class = $this->getCssClass()) > 0)
 			$writer->addAttribute('class', $class);
 		$writer->renderBeginTag('span');
 
@@ -643,13 +643,13 @@ 
 	{
 		$formatter = new TSimpleDateFormatter($this->getDateFormat());
 
-		foreach($formatter->getDayMonthYearOrdering() as $type)
+		foreach ($formatter->getDayMonthYearOrdering() as $type)
 		{
-			if($type == 'day')
+			if ($type == 'day')
 				$this->renderCalendarDayOptions($writer, $date->format('j'));
-			elseif($type == 'month')
+			elseif ($type == 'month')
 				$this->renderCalendarMonthOptions($writer, $date->format('n'));
-			elseif($type == 'year')
+			elseif ($type == 'year')
 				$this->renderCalendarYearOptions($writer, $date->format('Y'));
 		}
 	}
@@ -661,7 +661,7 @@ 
 	protected function getTimeStampFromText()
 	{
 		$pattern = $this->getDateFormat();
-		$pattern = str_replace(['MMMM', 'MMM'], ['MM','MM'], $pattern);
+		$pattern = str_replace(['MMMM', 'MMM'], ['MM', 'MM'], $pattern);
 		$formatter = new TSimpleDateFormatter($pattern);
 		return $formatter->parse($this->getText());
 	}
@@ -674,10 +674,10 @@ 
 	 */
 	private function renderDropDownListOptions($writer, $options, $selected = null)
 	{
-		foreach($options as $k => $v)
+		foreach ($options as $k => $v)
 		{
 			$writer->addAttribute('value', $k);
-			if($k == $selected)
+			if ($k == $selected)
 				$writer->addAttribute('selected', 'selected');
 			$writer->renderBeginTag('option');
 			$writer->write($v);
@@ -693,10 +693,10 @@ 
 	protected function renderCalendarDayOptions($writer, $selected = null)
 	{
 		$days = $this->getDropDownDayOptions();
-		$writer->addAttribute('id', $this->getClientID() . TControl::CLIENT_ID_SEPARATOR . 'day');
-		$writer->addAttribute('name', $this->getUniqueID() . TControl::ID_SEPARATOR . 'day');
+		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'day');
+		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'day');
 		$writer->addAttribute('class', 'datepicker_day_options');
-		if($this->getReadOnly() || !$this->getEnabled(true))
+		if ($this->getReadOnly() || !$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer, $days, $selected);
@@ -711,7 +711,7 @@ 
 		$formatter = new TSimpleDateFormatter($this->getDateFormat());
 		$days = [];
 		$requiresPadding = $formatter->getDayPattern() === 'dd';
-		for($i = 1;$i <= 31;$i++)
+		for ($i = 1; $i <= 31; $i++)
 		{
 			$days[$i] = $requiresPadding ? str_pad($i, 2, '0', STR_PAD_LEFT) : $i;
 		}
@@ -726,10 +726,10 @@ 
 	protected function renderCalendarMonthOptions($writer, $selected = null)
 	{
 		$info = $this->getLocalizedCalendarInfo();
-		$writer->addAttribute('id', $this->getClientID() . TControl::CLIENT_ID_SEPARATOR . 'month');
-		$writer->addAttribute('name', $this->getUniqueID() . TControl::ID_SEPARATOR . 'month');
+		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'month');
+		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'month');
 		$writer->addAttribute('class', 'datepicker_month_options');
-		if($this->getReadOnly() || !$this->getEnabled(true))
+		if ($this->getReadOnly() || !$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer,
@@ -747,16 +747,16 @@ 
 	protected function getLocalizedMonthNames($info)
 	{
 		$formatter = new TSimpleDateFormatter($this->getDateFormat());
-		switch($formatter->getMonthPattern())
+		switch ($formatter->getMonthPattern())
 		{
 			case 'MMM': return $info->getAbbreviatedMonthNames();
 			case 'MM':
 				$array = [];
-				for($i = 1;$i <= 12;$i++)
-						$array[$i - 1] = $i < 10 ? '0' . $i : $i;
+				for ($i = 1; $i <= 12; $i++)
+						$array[$i - 1] = $i < 10 ? '0'.$i : $i;
 				return $array;
 			case 'M':
-				$array = []; for($i = 1;$i <= 12;$i++) $array[$i - 1] = $i;
+				$array = []; for ($i = 1; $i <= 12; $i++) $array[$i - 1] = $i;
 				return $array;
 			default :	return $info->getMonthNames();
 		}
@@ -770,12 +770,12 @@ 
 	protected function renderCalendarYearOptions($writer, $selected = null)
 	{
 		$years = [];
-		for($i = $this->getFromYear(); $i <= $this->getUpToYear(); $i++)
+		for ($i = $this->getFromYear(); $i <= $this->getUpToYear(); $i++)
 			$years[$i] = $i;
-		$writer->addAttribute('id', $this->getClientID() . TControl::CLIENT_ID_SEPARATOR . 'year');
-		$writer->addAttribute('name', $this->getUniqueID() . TControl::ID_SEPARATOR . 'year');
+		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'year');
+		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'year');
 		$writer->addAttribute('class', 'datepicker_year_options');
-		if($this->getReadOnly() || !$this->getEnabled(true))
+		if ($this->getReadOnly() || !$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer, $years, $selected);
@@ -788,7 +788,7 @@ 
 	 */
 	protected function getDatePickerButtonID()
 	{
-		return $this->getClientID() . 'button';
+		return $this->getClientID().'button';
 	}
 
 	/**
@@ -799,9 +799,9 @@ 
 	{
 		$writer->addAttribute('id', $this->getDatePickerButtonID());
 		$writer->addAttribute('type', 'button');
-		$writer->addAttribute('class', $this->getCssClass() . ' TDatePickerButton');
+		$writer->addAttribute('class', $this->getCssClass().' TDatePickerButton');
 		$writer->addAttribute('value', $this->getButtonText());
-		if(!$this->getEnabled(true))
+		if (!$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->renderBeginTag("input");
 		$writer->renderEndTag();
@@ -818,8 +818,8 @@ 
 		$writer->addAttribute('id', $this->getDatePickerButtonID());
 		$writer->addAttribute('src', $url);
 		$writer->addAttribute('alt', ' ');
-		$writer->addAttribute('class', $this->getCssClass() . ' TDatePickerImageButton');
-		if(!$this->getEnabled(true))
+		$writer->addAttribute('class', $this->getCssClass().' TDatePickerImageButton');
+		if (!$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->addAttribute('type', 'image');
 		$writer->addAttribute('onclick', 'return false;');
@@ -834,7 +834,7 @@ 
 	protected function getAssetUrl($file = '')
 	{
 		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
-		return $base . '/' . self::SCRIPT_PATH . '/' . $file;
+		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
 	}
 
 	/**
@@ -843,9 +843,9 @@ 
 	 */
 	protected function publishCalendarStyle()
 	{
-		$url = $this->getAssetUrl($this->getCalendarStyle() . '.css');
+		$url = $this->getAssetUrl($this->getCalendarStyle().'.css');
 		$cs = $this->getPage()->getClientScript();
-		if(!$cs->isStyleSheetFileRegistered($url))
+		if (!$cs->isStyleSheetFileRegistered($url))
 			$cs->registerStyleSheetFile($url, $url);
 		return $url;
 	}
@@ -865,7 +865,7 @@ 
 	 */
 	protected function registerCalendarClientScriptPre()
 	{
-		if($this->getShowCalendar())
+		if ($this->getShowCalendar())
 		{
 			$cs = $this->getPage()->getClientScript();
 			$cs->registerPradoScript("datepicker");
@@ -874,10 +874,10 @@ 
 
 	protected function renderClientControlScript($writer)
 	{
-		if($this->getShowCalendar())
+		if ($this->getShowCalendar())
 		{
 			$cs = $this->getPage()->getClientScript();
-			if(!$cs->isEndScriptRegistered('TDatePicker.spacer'))
+			if (!$cs->isEndScriptRegistered('TDatePicker.spacer'))
 			{
 				$spacer = $this->getAssetUrl('spacer.gif');
 				$code = "Prado.WebUI.TDatePicker.spacer = '$spacer';";
@@ -886,7 +886,7 @@ 
 
 			$options = TJavaScript::encode($this->getDatePickerOptions());
 			$code = "new Prado.WebUI.TDatePicker($options);";
-			$cs->registerEndScript("prado:" . $this->getClientID(), $code);
+			$cs->registerEndScript("prado:".$this->getClientID(), $code);
 		}
 	}
 }
\ No newline at end of file

Braces +82 added lines, -60 removed lines

@@ -301,10 +301,11 @@ 
 	 */
 	public function getTimeStamp()
 	{
-		if(trim($this->getText()) === '')
-			return null;
-		else
-			return $this->getTimeStampFromText();
+		if(trim($this->getText()) === '') {
+					return null;
+		} else {
+					return $this->getTimeStampFromText();
+		}
 	}
 
 	/**
@@ -313,9 +314,9 @@ 
 	 */
 	public function setTimeStamp($value)
 	{
-		if($value === null || (is_string($value) && trim($value) === ''))
-			$this->setText('');
-		else
+		if($value === null || (is_string($value) && trim($value) === '')) {
+					$this->setText('');
+		} else
 		{
 			$date = TPropertyValue::ensureFloat($value);
 			$formatter = new TSimpleDateFormatter($this->getDateFormat());
@@ -377,8 +378,9 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientScript === null)
-			$this->_clientScript = $this->createClientScript();
+		if($this->_clientScript === null) {
+					$this->_clientScript = $this->createClientScript();
+		}
 		return $this->_clientScript;
 	}
 
@@ -397,8 +399,9 @@ 
 	 */
 	public function getValidationPropertyValue()
 	{
-		if(($text = $this->getText()) === '')
-			return '';
+		if(($text = $this->getText()) === '') {
+					return '';
+		}
 		$date = $this->getTimeStamp();
 		return $date == null ? $text : $date;
 	}
@@ -425,8 +428,7 @@ 
 		{
 			parent::render($writer);
 			$this->renderDatePickerButtons($writer);
-		}
-		else
+		} else
 		{
 			$this->renderDropDownListCalendar($writer);
 			if($this->hasDayPattern())
@@ -466,16 +468,17 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		if($this->getInputMode() == TDatePickerInputMode::TextBox)
-			return parent::loadPostData($key, $values);
+		if($this->getInputMode() == TDatePickerInputMode::TextBox) {
+					return parent::loadPostData($key, $values);
+		}
 		$value = $this->getDateFromPostData($key, $values);
 		if(!$this->getReadOnly() && $this->getText() !== $value)
 		{
 			$this->setText($value);
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -502,15 +505,17 @@ 
 			$day = 1;
 		}
 
-		if(isset($values[$key . '$month']))
-			$month = intval($values[$key . '$month']) + 1;
-		else
-			$month = $date['mon'];
+		if(isset($values[$key . '$month'])) {
+					$month = intval($values[$key . '$month']) + 1;
+		} else {
+					$month = $date['mon'];
+		}
 
-		if(isset($values[$key . '$year']))
-			$year = intval($values[$key . '$year']);
-		else
-			$year = $date['year'];
+		if(isset($values[$key . '$year'])) {
+					$year = intval($values[$key . '$year']);
+		} else {
+					$year = $date['year'];
+		}
 
 		$s = new \DateTime;
 		$s->setDate($year, $month, $day);
@@ -535,8 +540,9 @@ 
 		$options['InputMode'] = $this->getInputMode();
 		$options['Format'] = $this->getDateFormat();
 		$options['FirstDayOfWeek'] = $this->getFirstDayOfWeek();
-		if(($cssClass = $this->getCssClass()) !== '')
-			$options['ClassName'] = $cssClass;
+		if(($cssClass = $this->getCssClass()) !== '') {
+					$options['ClassName'] = $cssClass;
+		}
 		$options['CalendarStyle'] = $this->getCalendarStyle();
 		$options['FromYear'] = $this->getFromYear();
 		$options['UpToYear'] = $this->getUpToYear();
@@ -554,9 +560,10 @@ 
 		$options['PositionMode'] = $this->getPositionMode();
 
 		$options = array_merge($options, $this->getCulturalOptions());
-		if($this->_clientScript !== null)
-			$options = array_merge($options,
+		if($this->_clientScript !== null) {
+					$options = array_merge($options,
 				$this->_clientScript->getOptions()->toArray());
+		}
 		return $options;
 	}
 
@@ -566,8 +573,9 @@ 
 	 */
 	protected function getCulturalOptions()
 	{
-		if($this->getCurrentCulture() == 'en')
-			return [];
+		if($this->getCurrentCulture() == 'en') {
+					return [];
+		}
 
 		$date = $this->getLocalizedCalendarInfo();
 		$options['MonthNames'] = $date->getMonthNames();
@@ -603,15 +611,17 @@ 
 	 */
 	protected function renderDropDownListCalendar($writer)
 	{
-		if($this->getMode() == TDatePickerMode::Basic)
-			$this->setMode(TDatePickerMode::ImageButton);
+		if($this->getMode() == TDatePickerMode::Basic) {
+					$this->setMode(TDatePickerMode::ImageButton);
+		}
 		parent::addAttributesToRender($writer);
 		$writer->removeAttribute('name');
 		$writer->removeAttribute('type');
 		$writer->addAttribute('id', $this->getClientID());
 
-		if(strlen($class = $this->getCssClass()) > 0)
-			$writer->addAttribute('class', $class);
+		if(strlen($class = $this->getCssClass()) > 0) {
+					$writer->addAttribute('class', $class);
+		}
 		$writer->renderBeginTag('span');
 
 		$date = new \DateTime;
@@ -645,12 +655,13 @@ 
 
 		foreach($formatter->getDayMonthYearOrdering() as $type)
 		{
-			if($type == 'day')
-				$this->renderCalendarDayOptions($writer, $date->format('j'));
-			elseif($type == 'month')
-				$this->renderCalendarMonthOptions($writer, $date->format('n'));
-			elseif($type == 'year')
-				$this->renderCalendarYearOptions($writer, $date->format('Y'));
+			if($type == 'day') {
+							$this->renderCalendarDayOptions($writer, $date->format('j'));
+			} elseif($type == 'month') {
+							$this->renderCalendarMonthOptions($writer, $date->format('n'));
+			} elseif($type == 'year') {
+							$this->renderCalendarYearOptions($writer, $date->format('Y'));
+			}
 		}
 	}
 
@@ -677,8 +688,9 @@ 
 		foreach($options as $k => $v)
 		{
 			$writer->addAttribute('value', $k);
-			if($k == $selected)
-				$writer->addAttribute('selected', 'selected');
+			if($k == $selected) {
+							$writer->addAttribute('selected', 'selected');
+			}
 			$writer->renderBeginTag('option');
 			$writer->write($v);
 			$writer->renderEndTag();
@@ -696,8 +708,9 @@ 
 		$writer->addAttribute('id', $this->getClientID() . TControl::CLIENT_ID_SEPARATOR . 'day');
 		$writer->addAttribute('name', $this->getUniqueID() . TControl::ID_SEPARATOR . 'day');
 		$writer->addAttribute('class', 'datepicker_day_options');
-		if($this->getReadOnly() || !$this->getEnabled(true))
-			$writer->addAttribute('disabled', 'disabled');
+		if($this->getReadOnly() || !$this->getEnabled(true)) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer, $days, $selected);
 		$writer->renderEndTag();
@@ -729,8 +742,9 @@ 
 		$writer->addAttribute('id', $this->getClientID() . TControl::CLIENT_ID_SEPARATOR . 'month');
 		$writer->addAttribute('name', $this->getUniqueID() . TControl::ID_SEPARATOR . 'month');
 		$writer->addAttribute('class', 'datepicker_month_options');
-		if($this->getReadOnly() || !$this->getEnabled(true))
-			$writer->addAttribute('disabled', 'disabled');
+		if($this->getReadOnly() || !$this->getEnabled(true)) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer,
 					$this->getLocalizedMonthNames($info), $selected - 1);
@@ -752,11 +766,14 @@ 
 			case 'MMM': return $info->getAbbreviatedMonthNames();
 			case 'MM':
 				$array = [];
-				for($i = 1;$i <= 12;$i++)
-						$array[$i - 1] = $i < 10 ? '0' . $i : $i;
+				for($i = 1;$i <= 12;$i++) {
+										$array[$i - 1] = $i < 10 ? '0' . $i : $i;
+				}
 				return $array;
 			case 'M':
-				$array = []; for($i = 1;$i <= 12;$i++) $array[$i - 1] = $i;
+				$array = []; for($i = 1;$i <= 12;$i++) {
+					$array[$i - 1] = $i;
+				}
 				return $array;
 			default :	return $info->getMonthNames();
 		}
@@ -770,13 +787,15 @@ 
 	protected function renderCalendarYearOptions($writer, $selected = null)
 	{
 		$years = [];
-		for($i = $this->getFromYear(); $i <= $this->getUpToYear(); $i++)
-			$years[$i] = $i;
+		for($i = $this->getFromYear(); $i <= $this->getUpToYear(); $i++) {
+					$years[$i] = $i;
+		}
 		$writer->addAttribute('id', $this->getClientID() . TControl::CLIENT_ID_SEPARATOR . 'year');
 		$writer->addAttribute('name', $this->getUniqueID() . TControl::ID_SEPARATOR . 'year');
 		$writer->addAttribute('class', 'datepicker_year_options');
-		if($this->getReadOnly() || !$this->getEnabled(true))
-			$writer->addAttribute('disabled', 'disabled');
+		if($this->getReadOnly() || !$this->getEnabled(true)) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer, $years, $selected);
 		$writer->renderEndTag();
@@ -801,8 +820,9 @@ 
 		$writer->addAttribute('type', 'button');
 		$writer->addAttribute('class', $this->getCssClass() . ' TDatePickerButton');
 		$writer->addAttribute('value', $this->getButtonText());
-		if(!$this->getEnabled(true))
-			$writer->addAttribute('disabled', 'disabled');
+		if(!$this->getEnabled(true)) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 		$writer->renderBeginTag("input");
 		$writer->renderEndTag();
 	}
@@ -819,8 +839,9 @@ 
 		$writer->addAttribute('src', $url);
 		$writer->addAttribute('alt', ' ');
 		$writer->addAttribute('class', $this->getCssClass() . ' TDatePickerImageButton');
-		if(!$this->getEnabled(true))
-			$writer->addAttribute('disabled', 'disabled');
+		if(!$this->getEnabled(true)) {
+					$writer->addAttribute('disabled', 'disabled');
+		}
 		$writer->addAttribute('type', 'image');
 		$writer->addAttribute('onclick', 'return false;');
 		$writer->renderBeginTag('input');
@@ -845,8 +866,9 @@ 
 	{
 		$url = $this->getAssetUrl($this->getCalendarStyle() . '.css');
 		$cs = $this->getPage()->getClientScript();
-		if(!$cs->isStyleSheetFileRegistered($url))
-			$cs->registerStyleSheetFile($url, $url);
+		if(!$cs->isStyleSheetFileRegistered($url)) {
+					$cs->registerStyleSheetFile($url, $url);
+		}
 		return $url;
 	}
 

framework/Web/UI/WebControls/TImageButton.php

Spacing +8 added lines, -8 removed lines

@@ -100,14 +100,14 @@ 
 		$page = $this->getPage();
 		$page->ensureRenderInForm($this);
 		$writer->addAttribute('type', 'image');
-		if(($uniqueID = $this->getUniqueID()) !== '')
+		if (($uniqueID = $this->getUniqueID()) !== '')
 			$writer->addAttribute('name', $uniqueID);
-		if($this->getEnabled(true))
+		if ($this->getEnabled(true))
 		{
-			if($this->getEnableClientScript() && $this->needPostBackScript())
+			if ($this->getEnableClientScript() && $this->needPostBackScript())
 				$this->renderClientControlScript($writer);
 		}
-		elseif($this->getEnabled()) // in this case, parent will not render 'disabled'
+		elseif ($this->getEnabled()) // in this case, parent will not render 'disabled'
 			$writer->addAttribute('disabled', 'disabled');
 		parent::addAttributesToRender($writer);
 	}
@@ -137,7 +137,7 @@ 
 	 */
 	protected function canCauseValidation()
 	{
-		if($this->getCausesValidation())
+		if ($this->getCausesValidation())
 		{
 			$group = $this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount() > 0;
@@ -195,11 +195,11 @@ 
 	public function loadPostData($key, $values)
 	{
 		$uid = $this->getUniqueID();
-		if(isset($values["{$uid}_x"]) && isset($values["{$uid}_y"]))
+		if (isset($values["{$uid}_x"]) && isset($values["{$uid}_y"]))
 		{
 			$this->_x = intval($values["{$uid}_x"]);
 			$this->_y = intval($values["{$uid}_y"]);
-			if($this->getPage()->getPostBackEventTarget() === null)
+			if ($this->getPage()->getPostBackEventTarget() === null)
 				$this->getPage()->setPostBackEventTarget($this);
 			$this->_dataChanged = true;
 		}
@@ -250,7 +250,7 @@ 
 	 */
 	public function raisePostBackEvent($param)
 	{
-		if($this->getCausesValidation())
+		if ($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
 		$this->onClick(new TImageClickEventParameter($this->_x, $this->_y));
 		$this->onCommand(new \Prado\Web\UI\TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));

Braces +17 added lines, -12 removed lines

@@ -100,15 +100,18 @@ 
 		$page = $this->getPage();
 		$page->ensureRenderInForm($this);
 		$writer->addAttribute('type', 'image');
-		if(($uniqueID = $this->getUniqueID()) !== '')
-			$writer->addAttribute('name', $uniqueID);
+		if(($uniqueID = $this->getUniqueID()) !== '') {
+					$writer->addAttribute('name', $uniqueID);
+		}
 		if($this->getEnabled(true))
 		{
-			if($this->getEnableClientScript() && $this->needPostBackScript())
-				$this->renderClientControlScript($writer);
-		}
-		elseif($this->getEnabled()) // in this case, parent will not render 'disabled'
+			if($this->getEnableClientScript() && $this->needPostBackScript()) {
+							$this->renderClientControlScript($writer);
+			}
+		} elseif($this->getEnabled()) {
+			// in this case, parent will not render 'disabled'
 			$writer->addAttribute('disabled', 'disabled');
+		}
 		parent::addAttributesToRender($writer);
 	}
 
@@ -141,9 +144,9 @@ 
 		{
 			$group = $this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount() > 0;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -199,8 +202,9 @@ 
 		{
 			$this->_x = intval($values["{$uid}_x"]);
 			$this->_y = intval($values["{$uid}_y"]);
-			if($this->getPage()->getPostBackEventTarget() === null)
-				$this->getPage()->setPostBackEventTarget($this);
+			if($this->getPage()->getPostBackEventTarget() === null) {
+							$this->getPage()->setPostBackEventTarget($this);
+			}
 			$this->_dataChanged = true;
 		}
 		return false;
@@ -250,8 +254,9 @@ 
 	 */
 	public function raisePostBackEvent($param)
 	{
-		if($this->getCausesValidation())
-			$this->getPage()->validate($this->getValidationGroup());
+		if($this->getCausesValidation()) {
+					$this->getPage()->validate($this->getValidationGroup());
+		}
 		$this->onClick(new TImageClickEventParameter($this->_x, $this->_y));
 		$this->onCommand(new \Prado\Web\UI\TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));
 	}

framework/Web/UI/WebControls/TDataGridItemCollection.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TDataGridItem)
+		if ($item instanceof TDataGridItem)
 			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('datagriditemcollection_datagriditem_required');

Braces +5 added lines, -4 removed lines

@@ -38,9 +38,10 @@
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TDataGridItem)
-			parent::insertAt($index, $item);
-		else
-			throw new TInvalidDataTypeException('datagriditemcollection_datagriditem_required');
+		if($item instanceof TDataGridItem) {
+					parent::insertAt($index, $item);
+		} else {
+					throw new TInvalidDataTypeException('datagriditemcollection_datagriditem_required');
+		}
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TFileUpload.php

Spacing +18 added lines, -18 removed lines

@@ -86,14 +86,14 @@ 
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('type', 'file');
 		$name = $this->getUniqueID();
-		if($this->getMultiple())
+		if ($this->getMultiple())
 		{
 		  $name .= '[]';
 		  $writer->addAttribute('multiple', 'multiple');
 		}
 		$writer->addAttribute('name', $name);
 		$isEnabled = $this->getEnabled(true);
-		if(!$isEnabled && $this->getEnabled())  // in this case parent will not render 'disabled'
+		if (!$isEnabled && $this->getEnabled())  // in this case parent will not render 'disabled'
 			$writer->addAttribute('disabled', 'disabled');
 	}
 
@@ -105,15 +105,15 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if(($form = $this->getPage()->getForm()) !== null)
+		if (($form = $this->getPage()->getForm()) !== null)
 		{
-			if($this->getPage()->getIsCallback())
+			if ($this->getPage()->getIsCallback())
 				$this->getPage()->getCallbackClient()->setAttribute($form, 'enctype', 'multipart/form-data');
 			else
 				$form->setEnctype('multipart/form-data');
 		}
 		$this->getPage()->getClientScript()->registerHiddenField('MAX_FILE_SIZE', $this->getMaxFileSize());
-		if($this->getEnabled(true))
+		if ($this->getEnabled(true))
 			$this->getPage()->registerRequiresPostData($this);
 	}
 
@@ -146,7 +146,7 @@ 
 	 */
 	public function getFileName($index = 0)
 	{
-	  return isset($this->_files[$index])?$this->_files[$index]->getFileName():'';
+	  return isset($this->_files[$index]) ? $this->_files[$index]->getFileName() : '';
 	}
 
 	/**
@@ -156,7 +156,7 @@ 
 	 */
 	public function getFileSize($index = 0)
 	{
-	  return isset($this->_files[$index])?$this->_files[$index]->getFileSize():0;
+	  return isset($this->_files[$index]) ? $this->_files[$index]->getFileSize() : 0;
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 */
 	public function getFileType($index = 0)
 	{
-	  return isset($this->_files[$index])?$this->_files[$index]->getFileType():'';
+	  return isset($this->_files[$index]) ? $this->_files[$index]->getFileType() : '';
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 	 */
 	public function getLocalName($index = 0)
 	{
-	  return isset($this->_files[$index])?$this->_files[$index]->getLocalName():'';
+	  return isset($this->_files[$index]) ? $this->_files[$index]->getLocalName() : '';
 	}
 
 	/**
@@ -190,7 +190,7 @@ 
 	 */
 	public function getErrorCode($index = 0)
 	{
-		return isset($this->_files[$index])?$this->_files[$index]->getErrorCode():UPLOAD_ERR_NO_FILE;
+		return isset($this->_files[$index]) ? $this->_files[$index]->getErrorCode() : UPLOAD_ERR_NO_FILE;
 	}
 
 	/**
@@ -200,7 +200,7 @@ 
 	 */
 	public function getHasFile($index = 0)
 	{
-	  return isset($this->_files[$index])?$this->_files[$index]->getHasFile():false;
+	  return isset($this->_files[$index]) ? $this->_files[$index]->getHasFile() : false;
 	}
 
 	/**
@@ -208,8 +208,8 @@ 
 	 * @return boolean whether all files are uploaded successfully
 	 */
 	public function getHasAllFiles() {
-	  foreach($this->_files as $file)
-		if(!$file->getHasFile())
+	  foreach ($this->_files as $file)
+		if (!$file->getHasFile())
 		  return false;
 	  return true;
 	}
@@ -226,7 +226,7 @@ 
 	 */
 	public function saveAs($fileName, $deleteTempFile = true, $index = 0)
 	{
-	  return isset($this->_files[$index])?$this->_files[$index]->saveAs($fileName, $deleteTempFile):false;
+	  return isset($this->_files[$index]) ? $this->_files[$index]->saveAs($fileName, $deleteTempFile) : false;
 	}
 
 	/**
@@ -238,11 +238,11 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		if(isset($_FILES[$key]))
+		if (isset($_FILES[$key]))
 		{
-		  if($this->getMultiple() || is_array($_FILES[$key]['name']))
+		  if ($this->getMultiple() || is_array($_FILES[$key]['name']))
 		  {
-		foreach($_FILES[$key]['name'] as $index => $name)
+		foreach ($_FILES[$key]['name'] as $index => $name)
 		  $this->_files[$index] = new TFileUploadItem($name, $_FILES[$key]['size'][$index], $_FILES[$key]['type'][$index], $_FILES[$key]['error'][$index], $_FILES[$key]['tmp_name'][$index]);
 		  }
 		  else
@@ -292,7 +292,7 @@ 
 	 */
 	public function getValidationPropertyValue()
 	{
-		return implode(',', array_map(function($file){return $file->getFileName();}, $this->_files));
+		return implode(',', array_map(function($file) {return $file->getFileName(); }, $this->_files));
 	}
 
 	/**

Braces +21 added lines, -15 removed lines

@@ -93,8 +93,10 @@ 
 		}
 		$writer->addAttribute('name', $name);
 		$isEnabled = $this->getEnabled(true);
-		if(!$isEnabled && $this->getEnabled())  // in this case parent will not render 'disabled'
+		if(!$isEnabled && $this->getEnabled()) {
+			// in this case parent will not render 'disabled'
 			$writer->addAttribute('disabled', 'disabled');
+		}
 	}
 
 	/**
@@ -107,14 +109,16 @@ 
 		parent::onPreRender($param);
 		if(($form = $this->getPage()->getForm()) !== null)
 		{
-			if($this->getPage()->getIsCallback())
-				$this->getPage()->getCallbackClient()->setAttribute($form, 'enctype', 'multipart/form-data');
-			else
-				$form->setEnctype('multipart/form-data');
+			if($this->getPage()->getIsCallback()) {
+							$this->getPage()->getCallbackClient()->setAttribute($form, 'enctype', 'multipart/form-data');
+			} else {
+							$form->setEnctype('multipart/form-data');
+			}
 		}
 		$this->getPage()->getClientScript()->registerHiddenField('MAX_FILE_SIZE', $this->getMaxFileSize());
-		if($this->getEnabled(true))
-			$this->getPage()->registerRequiresPostData($this);
+		if($this->getEnabled(true)) {
+					$this->getPage()->registerRequiresPostData($this);
+		}
 	}
 
 	/**
@@ -208,9 +212,10 @@ 
 	 * @return boolean whether all files are uploaded successfully
 	 */
 	public function getHasAllFiles() {
-	  foreach($this->_files as $file)
-		if(!$file->getHasFile())
+	  foreach($this->_files as $file) {
+	  		if(!$file->getHasFile())
 		  return false;
+	  }
 	  return true;
 	}
 
@@ -242,15 +247,16 @@ 
 		{
 		  if($this->getMultiple() || is_array($_FILES[$key]['name']))
 		  {
-		foreach($_FILES[$key]['name'] as $index => $name)
-		  $this->_files[$index] = new TFileUploadItem($name, $_FILES[$key]['size'][$index], $_FILES[$key]['type'][$index], $_FILES[$key]['error'][$index], $_FILES[$key]['tmp_name'][$index]);
+		foreach($_FILES[$key]['name'] as $index => $name) {
+				  $this->_files[$index] = new TFileUploadItem($name, $_FILES[$key]['size'][$index], $_FILES[$key]['type'][$index], $_FILES[$key]['error'][$index], $_FILES[$key]['tmp_name'][$index]);
+		}
+		  } else {
+		  			$this->_files[0] = new TFileUploadItem($_FILES[$key]['name'], $_FILES[$key]['size'], $_FILES[$key]['type'], $_FILES[$key]['error'], $_FILES[$key]['tmp_name']);
 		  }
-		  else
-			$this->_files[0] = new TFileUploadItem($_FILES[$key]['name'], $_FILES[$key]['size'], $_FILES[$key]['type'], $_FILES[$key]['error'], $_FILES[$key]['tmp_name']);
 			return $this->_dataChanged = true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**

framework/Web/UI/WebControls/TDataGridItem.php

Spacing +3 added lines, -3 removed lines

@@ -63,9 +63,9 @@ 
 		$this->_itemIndex = $itemIndex;
 		$this->_dataSourceIndex = $dataSourceIndex;
 		$this->setItemType($itemType);
-		if($itemType === TListItemType::Header)
+		if ($itemType === TListItemType::Header)
 			$this->setTableSection(TTableRowSection::Header);
-		elseif($itemType === TListItemType::Footer)
+		elseif ($itemType === TListItemType::Footer)
 			$this->setTableSection(TTableRowSection::Footer);
 	}
 
@@ -128,7 +128,7 @@ 
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		if($param instanceof \Prado\Web\UI\TCommandEventParameter)
+		if ($param instanceof \Prado\Web\UI\TCommandEventParameter)
 		{
 			$this->raiseBubbleEvent($this, new TDataGridCommandEventParameter($this, $sender, $param));
 			return true;

Braces +7 added lines, -6 removed lines

@@ -63,10 +63,11 @@ 
 		$this->_itemIndex = $itemIndex;
 		$this->_dataSourceIndex = $dataSourceIndex;
 		$this->setItemType($itemType);
-		if($itemType === TListItemType::Header)
-			$this->setTableSection(TTableRowSection::Header);
-		elseif($itemType === TListItemType::Footer)
-			$this->setTableSection(TTableRowSection::Footer);
+		if($itemType === TListItemType::Header) {
+					$this->setTableSection(TTableRowSection::Header);
+		} elseif($itemType === TListItemType::Footer) {
+					$this->setTableSection(TTableRowSection::Footer);
+		}
 	}
 
 	/**
@@ -132,8 +133,8 @@ 
 		{
 			$this->raiseBubbleEvent($this, new TDataGridCommandEventParameter($this, $sender, $param));
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TListItem.php

Spacing +8 added lines, -8 removed lines

@@ -78,9 +78,9 @@ 
 		parent::_getZappableSleepProps($exprops);
 		if ($this->_attributes === null)
 			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_attributes";
-		if($this->_text === '')
+		if ($this->_text === '')
 			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_text";
-		if($this->_value === '')
+		if ($this->_value === '')
 			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_value";
 		if ($this->_enabled === true)
 			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_enabled";
@@ -125,7 +125,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->_text === ''?$this->_value:$this->_text;
+		return $this->_text === '' ? $this->_value : $this->_text;
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	 */
 	public function getValue()
 	{
-		return $this->_value === ''?$this->_text:$this->_value;
+		return $this->_value === '' ? $this->_text : $this->_value;
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function getAttributes()
 	{
-		if(!$this->_attributes)
+		if (!$this->_attributes)
 			$this->_attributes = new TAttributeCollection;
 		return $this->_attributes;
 	}
@@ -176,7 +176,7 @@ 
 	 */
 	public function hasAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->contains($name):false;
+		return $this->_attributes ? $this->_attributes->contains($name) : false;
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->itemAt($name):null;
+		return $this->_attributes ? $this->_attributes->itemAt($name) : null;
 	}
 
 	/**
@@ -203,7 +203,7 @@ 
 	 */
 	public function removeAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->remove($name):null;
+		return $this->_attributes ? $this->_attributes->remove($name) : null;
 	}
 }
 

Braces +18 added lines, -12 removed lines

@@ -76,16 +76,21 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_attributes === null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_attributes";
-		if($this->_text === '')
-			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_text";
-		if($this->_value === '')
-			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_value";
-		if ($this->_enabled === true)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_enabled";
-		if ($this->_selected === false)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_selected";
+		if ($this->_attributes === null) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_attributes";
+		}
+		if($this->_text === '') {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_text";
+		}
+		if($this->_value === '') {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_value";
+		}
+		if ($this->_enabled === true) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_enabled";
+		}
+		if ($this->_selected === false) {
+					$exprops[] = "\0Prado\Web\UI\WebControls\TListItem\0_selected";
+		}
 	}
 
 	/**
@@ -157,8 +162,9 @@ 
 	 */
 	public function getAttributes()
 	{
-		if(!$this->_attributes)
-			$this->_attributes = new TAttributeCollection;
+		if(!$this->_attributes) {
+					$this->_attributes = new TAttributeCollection;
+		}
 		return $this->_attributes;
 	}
 

framework/Web/UI/WebControls/TTableCellCollection.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TTableCell)
+		if ($item instanceof TTableCell)
 			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('tablecellcollection_tablecell_required');

Braces +5 added lines, -4 removed lines

@@ -34,9 +34,10 @@
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TTableCell)
-			parent::insertAt($index, $item);
-		else
-			throw new TInvalidDataTypeException('tablecellcollection_tablecell_required');
+		if($item instanceof TTableCell) {
+					parent::insertAt($index, $item);
+		} else {
+					throw new TInvalidDataTypeException('tablecellcollection_tablecell_required');
+		}
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TLinkButton.php

Spacing +5 added lines, -5 removed lines

@@ -98,12 +98,12 @@ 
 		// may be overwritten in the following
 		parent::addAttributesToRender($writer);
 
-		if($this->getEnabled(true) && $this->getEnableClientScript())
+		if ($this->getEnabled(true) && $this->getEnableClientScript())
 		{
 			$this->renderLinkButtonHref($writer);
 			$this->renderClientControlScript($writer);
 		}
-		elseif($this->getEnabled()) // in this case, parent will not render 'disabled'
+		elseif ($this->getEnabled()) // in this case, parent will not render 'disabled'
 			$writer->addAttribute('disabled', 'disabled');
 	}
 
@@ -140,7 +140,7 @@ 
 	protected function renderLinkButtonHref($writer)
 	{
 		//create unique no-op url references
-		$nop = "javascript:;//" . $this->getClientID();
+		$nop = "javascript:;//".$this->getClientID();
 		$writer->addAttribute('href', $nop);
 	}
 
@@ -178,7 +178,7 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) === '')
+		if (($text = $this->getText()) === '')
 			parent::renderContents($writer);
 		else
 			$writer->write($text);
@@ -302,7 +302,7 @@ 
 	 */
 	public function raisePostBackEvent($param)
 	{
-		if($this->getCausesValidation())
+		if ($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
 		$this->onClick(null);
 		$this->onCommand(new \Prado\Web\UI\TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));

Braces +11 added lines, -8 removed lines

@@ -102,9 +102,10 @@ 
 		{
 			$this->renderLinkButtonHref($writer);
 			$this->renderClientControlScript($writer);
-		}
-		elseif($this->getEnabled()) // in this case, parent will not render 'disabled'
+		} elseif($this->getEnabled()) {
+			// in this case, parent will not render 'disabled'
 			$writer->addAttribute('disabled', 'disabled');
+		}
 	}
 
 	/**
@@ -178,10 +179,11 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) === '')
-			parent::renderContents($writer);
-		else
-			$writer->write($text);
+		if(($text = $this->getText()) === '') {
+					parent::renderContents($writer);
+		} else {
+					$writer->write($text);
+		}
 	}
 
 	/**
@@ -302,8 +304,9 @@ 
 	 */
 	public function raisePostBackEvent($param)
 	{
-		if($this->getCausesValidation())
-			$this->getPage()->validate($this->getValidationGroup());
+		if($this->getCausesValidation()) {
+					$this->getPage()->validate($this->getValidationGroup());
+		}
 		$this->onClick(null);
 		$this->onCommand(new \Prado\Web\UI\TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));
 	}

framework/Web/UI/WebControls/TWizard.php

Spacing +114 added lines, -114 removed lines

@@ -183,7 +183,7 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TWizardStep)
+		if ($object instanceof TWizardStep)
 			$this->getWizardSteps()->add($object);
 	}
 
@@ -201,7 +201,7 @@ 
 	 */
 	public function setActiveStep($step)
 	{
-		if(($index = $this->getWizardSteps()->indexOf($step)) < 0)
+		if (($index = $this->getWizardSteps()->indexOf($step)) < 0)
 			throw new TInvalidOperationException('wizard_step_invalid');
 		$this->setActiveStepIndex($index);
 	}
@@ -221,11 +221,11 @@ 
 	{
 		$value = TPropertyValue::ensureInteger($value);
 		$multiView = $this->getMultiView();
-		if($multiView->getActiveViewIndex() !== $value)
+		if ($multiView->getActiveViewIndex() !== $value)
 		{
 			$multiView->setActiveViewIndex($value);
 			$this->_activeStepIndexSet = true;
-			if($this->_sideBarDataList !== null && $this->getSideBarTemplate() !== null)
+			if ($this->_sideBarDataList !== null && $this->getSideBarTemplate() !== null)
 			{
 				$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
 				$this->_sideBarDataList->dataBind();
@@ -238,7 +238,7 @@ 
 	 */
 	public function getWizardSteps()
 	{
-		if($this->_wizardSteps === null)
+		if ($this->_wizardSteps === null)
 			$this->_wizardSteps = new TWizardStepCollection($this);
 		return $this->_wizardSteps;
 	}
@@ -416,7 +416,7 @@ 
 	 */
 	public function getSideBarButtonStyle()
 	{
-		if(($style = $this->getViewState('SideBarButtonStyle', null)) === null)
+		if (($style = $this->getViewState('SideBarButtonStyle', null)) === null)
 		{
 			$style = new TStyle;
 			$this->setViewState('SideBarButtonStyle', $style, null);
@@ -429,7 +429,7 @@ 
 	 */
 	public function getNavigationButtonStyle()
 	{
-		if(($style = $this->getViewState('NavigationButtonStyle', null)) === null)
+		if (($style = $this->getViewState('NavigationButtonStyle', null)) === null)
 		{
 			$style = new TStyle;
 			$this->setViewState('NavigationButtonStyle', $style, null);
@@ -442,7 +442,7 @@ 
 	 */
 	public function getStartNextButtonStyle()
 	{
-		if(($style = $this->getViewState('StartNextButtonStyle', null)) === null)
+		if (($style = $this->getViewState('StartNextButtonStyle', null)) === null)
 		{
 			$style = new TWizardNavigationButtonStyle;
 			$style->setButtonText('Next');
@@ -456,7 +456,7 @@ 
 	 */
 	public function getStepNextButtonStyle()
 	{
-		if(($style = $this->getViewState('StepNextButtonStyle', null)) === null)
+		if (($style = $this->getViewState('StepNextButtonStyle', null)) === null)
 		{
 			$style = new TWizardNavigationButtonStyle;
 			$style->setButtonText('Next');
@@ -470,7 +470,7 @@ 
 	 */
 	public function getStepPreviousButtonStyle()
 	{
-		if(($style = $this->getViewState('StepPreviousButtonStyle', null)) === null)
+		if (($style = $this->getViewState('StepPreviousButtonStyle', null)) === null)
 		{
 			$style = new TWizardNavigationButtonStyle;
 			$style->setButtonText('Previous');
@@ -484,7 +484,7 @@ 
 	 */
 	public function getFinishCompleteButtonStyle()
 	{
-		if(($style = $this->getViewState('FinishCompleteButtonStyle', null)) === null)
+		if (($style = $this->getViewState('FinishCompleteButtonStyle', null)) === null)
 		{
 			$style = new TWizardNavigationButtonStyle;
 			$style->setButtonText('Complete');
@@ -498,7 +498,7 @@ 
 	 */
 	public function getFinishPreviousButtonStyle()
 	{
-		if(($style = $this->getViewState('FinishPreviousButtonStyle', null)) === null)
+		if (($style = $this->getViewState('FinishPreviousButtonStyle', null)) === null)
 		{
 			$style = new TWizardNavigationButtonStyle;
 			$style->setButtonText('Previous');
@@ -512,7 +512,7 @@ 
 	 */
 	public function getCancelButtonStyle()
 	{
-		if(($style = $this->getViewState('CancelButtonStyle', null)) === null)
+		if (($style = $this->getViewState('CancelButtonStyle', null)) === null)
 		{
 			$style = new TWizardNavigationButtonStyle;
 			$style->setButtonText('Cancel');
@@ -526,7 +526,7 @@ 
 	 */
 	public function getSideBarStyle()
 	{
-		if(($style = $this->getViewState('SideBarStyle', null)) === null)
+		if (($style = $this->getViewState('SideBarStyle', null)) === null)
 		{
 			$style = new TPanelStyle;
 			$this->setViewState('SideBarStyle', $style, null);
@@ -539,7 +539,7 @@ 
 	 */
 	public function getHeaderStyle()
 	{
-		if(($style = $this->getViewState('HeaderStyle', null)) === null)
+		if (($style = $this->getViewState('HeaderStyle', null)) === null)
 		{
 			$style = new TPanelStyle;
 			$this->setViewState('HeaderStyle', $style, null);
@@ -552,7 +552,7 @@ 
 	 */
 	public function getStepStyle()
 	{
-		if(($style = $this->getViewState('StepStyle', null)) === null)
+		if (($style = $this->getViewState('StepStyle', null)) === null)
 		{
 			$style = new TPanelStyle;
 			$this->setViewState('StepStyle', $style, null);
@@ -565,7 +565,7 @@ 
 	 */
 	public function getNavigationStyle()
 	{
-		if(($style = $this->getViewState('NavigationStyle', null)) === null)
+		if (($style = $this->getViewState('NavigationStyle', null)) === null)
 		{
 			$style = new TPanelStyle;
 			$this->setViewState('NavigationStyle', $style, null);
@@ -659,7 +659,7 @@ 
 	public function onCancelButtonClick($param)
 	{
 		$this->raiseEvent('OnCancelButtonClick', $this, $param);
-		if(($url = $this->getCancelDestinationUrl()) !== '')
+		if (($url = $this->getCancelDestinationUrl()) !== '')
 			$this->getResponse()->redirect($url);
 	}
 
@@ -672,7 +672,7 @@ 
 	public function onCompleteButtonClick($param)
 	{
 		$this->raiseEvent('OnCompleteButtonClick', $this, $param);
-		if(($url = $this->getFinishDestinationUrl()) !== '')
+		if (($url = $this->getFinishDestinationUrl()) !== '')
 			$this->getResponse()->redirect($url);
 	}
 
@@ -715,11 +715,11 @@ 
 	 */
 	public function getMultiView()
 	{
-		if($this->_multiView === null)
+		if ($this->_multiView === null)
 		{
 			$this->_multiView = new TMultiView;
 			$this->_multiView->setID('WizardMultiView');
-			$this->_multiView->attachEventHandler('OnActiveViewChanged', [$this,'onActiveStepChanged']);
+			$this->_multiView->attachEventHandler('OnActiveViewChanged', [$this, 'onActiveStepChanged']);
 			$this->_multiView->ignoreBubbleEvents();
 		}
 		return $this->_multiView;
@@ -733,7 +733,7 @@ 
 	 */
 	public function addedWizardStep($step)
 	{
-		if(($wizard = $step->getWizard()) !== null)
+		if (($wizard = $step->getWizard()) !== null)
 			$wizard->getWizardSteps()->remove($step);
 		$step->setWizard($this);
 		$this->wizardStepsChanged();
@@ -761,7 +761,7 @@ 
 		parent::onInit($param);
 		$this->ensureChildControls();
 		$this->setEnsureId(true);
-		if($this->getActiveStepIndex() < 0 && $this->getWizardSteps()->getCount() > 0)
+		if ($this->getActiveStepIndex() < 0 && $this->getWizardSteps()->getCount() > 0)
 			$this->setActiveStepIndex(0);
 	}
 
@@ -773,7 +773,7 @@ 
 	{
 		$index = $this->getActiveStepIndex();
 		$history = $this->getHistory();
-		if(!$history->getCount() || $history->peek() !== $index)
+		if (!$history->getCount() || $history->peek() !== $index)
 			$history->push($index);
 	}
 
@@ -782,7 +782,7 @@ 
 	 */
 	protected function requiresControlsRecreation()
 	{
-		if($this->getChildControlsCreated())
+		if ($this->getChildControlsCreated())
 			$this->setChildControlsCreated(false);
 	}
 
@@ -793,9 +793,9 @@ 
 	public function render($writer)
 	{
 		$this->ensureChildControls();
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			if($this->getUseDefaultLayout())
+			if ($this->getUseDefaultLayout())
 			{
 				$this->applyControlProperties();
 				$this->renderBeginTag($writer);
@@ -837,9 +837,9 @@ 
 	 */
 	protected function applyHeaderProperties()
 	{
-		if(($style = $this->getViewState('HeaderStyle', null)) !== null)
+		if (($style = $this->getViewState('HeaderStyle', null)) !== null)
 			$this->_header->getStyle()->mergeWith($style);
-		if($this->getHeaderTemplate() === null)
+		if ($this->getHeaderTemplate() === null)
 		{
 			$this->_header->getControls()->clear();
 			$this->_header->getControls()->add($this->getHeaderText());
@@ -852,21 +852,21 @@ 
 	protected function applySideBarProperties()
 	{
 		$this->_sideBar->setVisible($this->getShowSideBar());
-		if($this->_sideBarDataList !== null && $this->getShowSideBar())
+		if ($this->_sideBarDataList !== null && $this->getShowSideBar())
 		{
 			$this->_sideBarDataList->setDataSource($this->getWizardSteps());
 			$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
 			$this->_sideBarDataList->dataBind();
-			if(($style = $this->getViewState('SideBarButtonStyle', null)) !== null)
+			if (($style = $this->getViewState('SideBarButtonStyle', null)) !== null)
 			{
-				foreach($this->_sideBarDataList->getItems() as $item)
+				foreach ($this->_sideBarDataList->getItems() as $item)
 				{
-					if(($button = $item->findControl('SideBarButton')) !== null)
+					if (($button = $item->findControl('SideBarButton')) !== null)
 						$button->getStyle()->mergeWith($style);
 				}
 			}
 		}
-		if(($style = $this->getViewState('SideBarStyle', null)) !== null)
+		if (($style = $this->getViewState('SideBarStyle', null)) !== null)
 			$this->_sideBar->getStyle()->mergeWith($style);
 	}
 
@@ -875,7 +875,7 @@ 
 	 */
 	protected function applyStepContentProperties()
 	{
-		if(($style = $this->getViewState('StepStyle', null)) !== null)
+		if (($style = $this->getViewState('StepStyle', null)) !== null)
 			$this->_stepContent->getStyle()->mergeWith($style);
 	}
 
@@ -888,9 +888,9 @@ 
 		$activeStep = $this->getActiveStep();
 		$activeStepIndex = $this->getActiveStepIndex();
 
-		if(!$this->_navigation)
+		if (!$this->_navigation)
 			return;
-		elseif($activeStepIndex < 0 || $activeStepIndex >= $wizardSteps->getCount())
+		elseif ($activeStepIndex < 0 || $activeStepIndex >= $wizardSteps->getCount())
 		{
 			$this->_navigation->setVisible(false);
 			return;
@@ -898,11 +898,11 @@ 
 
 		// set visibility of different types of navigation panel
 		$showStandard = true;
-		foreach($wizardSteps as $step)
+		foreach ($wizardSteps as $step)
 		{
-			if(($step instanceof TTemplatedWizardStep) && ($container = $step->getNavigationContainer()) !== null)
+			if (($step instanceof TTemplatedWizardStep) && ($container = $step->getNavigationContainer()) !== null)
 			{
-				if($activeStep === $step)
+				if ($activeStep === $step)
 				{
 					$container->setVisible(true);
 					$showStandard = false;
@@ -912,7 +912,7 @@ 
 			}
 		}
 		$activeStepType = $this->getStepType($activeStep);
-		if($activeStepType === TWizardStepType::Complete)
+		if ($activeStepType === TWizardStepType::Complete)
 		{
 			$this->_sideBar->setVisible(false);
 			$this->_header->setVisible(false);
@@ -921,79 +921,79 @@ 
 		$this->_stepNavigation->setVisible($showStandard && $activeStepType === TWizardStepType::Step);
 		$this->_finishNavigation->setVisible($showStandard && $activeStepType === TWizardStepType::Finish);
 
-		if(($navigationStyle = $this->getViewState('NavigationStyle', null)) !== null)
+		if (($navigationStyle = $this->getViewState('NavigationStyle', null)) !== null)
 			$this->_navigation->getStyle()->mergeWith($navigationStyle);
 
 		$displayCancelButton = $this->getShowCancelButton();
 		$cancelButtonStyle = $this->getCancelButtonStyle();
 		$buttonStyle = $this->getViewState('NavigationButtonStyle', null);
-		if($buttonStyle !== null)
+		if ($buttonStyle !== null)
 			$cancelButtonStyle->mergeWith($buttonStyle);
 
 		// apply styles to start navigation buttons
-		if(($cancelButton = $this->_startNavigation->getCancelButton()) !== null)
+		if (($cancelButton = $this->_startNavigation->getCancelButton()) !== null)
 		{
 			$cancelButton->setVisible($displayCancelButton);
 			$cancelButtonStyle->apply($cancelButton);
 		}
-		if(($button = $this->_startNavigation->getNextButton()) !== null)
+		if (($button = $this->_startNavigation->getNextButton()) !== null)
 		{
 			$button->setVisible(true);
 			$style = $this->getStartNextButtonStyle();
-			if($buttonStyle !== null)
+			if ($buttonStyle !== null)
 				$style->mergeWith($buttonStyle);
 			$style->apply($button);
-			if($activeStepType === TWizardStepType::Start)
+			if ($activeStepType === TWizardStepType::Start)
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 		}
 
 		// apply styles to finish navigation buttons
-		if(($cancelButton = $this->_finishNavigation->getCancelButton()) !== null)
+		if (($cancelButton = $this->_finishNavigation->getCancelButton()) !== null)
 		{
 			$cancelButton->setVisible($displayCancelButton);
 			$cancelButtonStyle->apply($cancelButton);
 		}
-		if(($button = $this->_finishNavigation->getPreviousButton()) !== null)
+		if (($button = $this->_finishNavigation->getPreviousButton()) !== null)
 		{
 			$button->setVisible($this->allowNavigationToPreviousStep());
 			$style = $this->getFinishPreviousButtonStyle();
-			if($buttonStyle !== null)
+			if ($buttonStyle !== null)
 				$style->mergeWith($buttonStyle);
 			$style->apply($button);
 		}
-		if(($button = $this->_finishNavigation->getCompleteButton()) !== null)
+		if (($button = $this->_finishNavigation->getCompleteButton()) !== null)
 		{
 			$button->setVisible(true);
 			$style = $this->getFinishCompleteButtonStyle();
-			if($buttonStyle !== null)
+			if ($buttonStyle !== null)
 				$style->mergeWith($buttonStyle);
 			$style->apply($button);
-			if($activeStepType === TWizardStepType::Finish)
+			if ($activeStepType === TWizardStepType::Finish)
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 		}
 
 		// apply styles to step navigation buttons
-		if(($cancelButton = $this->_stepNavigation->getCancelButton()) !== null)
+		if (($cancelButton = $this->_stepNavigation->getCancelButton()) !== null)
 		{
 			$cancelButton->setVisible($displayCancelButton);
 			$cancelButtonStyle->apply($cancelButton);
 		}
-		if(($button = $this->_stepNavigation->getPreviousButton()) !== null)
+		if (($button = $this->_stepNavigation->getPreviousButton()) !== null)
 		{
 			$button->setVisible($this->allowNavigationToPreviousStep());
 			$style = $this->getStepPreviousButtonStyle();
-			if($buttonStyle !== null)
+			if ($buttonStyle !== null)
 				$style->mergeWith($buttonStyle);
 			$style->apply($button);
 		}
-		if(($button = $this->_stepNavigation->getNextButton()) !== null)
+		if (($button = $this->_stepNavigation->getNextButton()) !== null)
 		{
 			$button->setVisible(true);
 			$style = $this->getStepNextButtonStyle();
-			if($buttonStyle !== null)
+			if ($buttonStyle !== null)
 				$style->mergeWith($buttonStyle);
 			$style->apply($button);
-			if($activeStepType === TWizardStepType::Step)
+			if ($activeStepType === TWizardStepType::Step)
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 		}
 	}
@@ -1003,7 +1003,7 @@ 
 	 */
 	protected function getHistory()
 	{
-		if(($history = $this->getControlState('History', null)) === null)
+		if (($history = $this->getControlState('History', null)) === null)
 		{
 			$history = new TStack;
 			$this->setControlState('History', $history);
@@ -1018,17 +1018,17 @@ 
 	 */
 	protected function getStepType($wizardStep)
 	{
-		if(($type = $wizardStep->getStepType()) === TWizardStepType::Auto)
+		if (($type = $wizardStep->getStepType()) === TWizardStepType::Auto)
 		{
 			$steps = $this->getWizardSteps();
-			if(($index = $steps->indexOf($wizardStep)) >= 0)
+			if (($index = $steps->indexOf($wizardStep)) >= 0)
 			{
 				$stepCount = $steps->getCount();
-				if($stepCount === 1 || ($index < $stepCount - 1 && $steps->itemAt($index + 1)->getStepType() === TWizardStepType::Complete))
+				if ($stepCount === 1 || ($index < $stepCount - 1 && $steps->itemAt($index + 1)->getStepType() === TWizardStepType::Complete))
 					return TWizardStepType::Finish;
-				elseif($index === 0)
+				elseif ($index === 0)
 					return TWizardStepType::Start;
-				elseif($index === $stepCount - 1)
+				elseif ($index === $stepCount - 1)
 					return TWizardStepType::Finish;
 				else
 					return TWizardStepType::Step;
@@ -1075,7 +1075,7 @@ 
 	protected function createHeader()
 	{
 		$this->_header = new TPanel;
-		if(($template = $this->getHeaderTemplate()) !== null)
+		if (($template = $this->getHeaderTemplate()) !== null)
 			$template->instantiateIn($this->_header);
 		else
 			$this->_header->getControls()->add($this->getHeaderText());
@@ -1087,18 +1087,18 @@ 
 	 */
 	protected function createSideBar()
 	{
-		if($this->getShowSideBar())
+		if ($this->getShowSideBar())
 		{
-			if(($template = $this->getSideBarTemplate()) === null)
+			if (($template = $this->getSideBarTemplate()) === null)
 				$template = new TWizardSideBarTemplate;
 			$this->_sideBar = new TPanel;
 			$template->instantiateIn($this->_sideBar);
 			$this->getControls()->add($this->_sideBar);
 
-			if(($this->_sideBarDataList = $this->_sideBar->findControl(self::ID_SIDEBAR_LIST)) !== null)
+			if (($this->_sideBarDataList = $this->_sideBar->findControl(self::ID_SIDEBAR_LIST)) !== null)
 			{
-				$this->_sideBarDataList->attachEventHandler('OnItemCommand', [$this,'dataListItemCommand']);
-				$this->_sideBarDataList->attachEventHandler('OnItemDataBound', [$this,'dataListItemDataBound']);
+				$this->_sideBarDataList->attachEventHandler('OnItemCommand', [$this, 'dataListItemCommand']);
+				$this->_sideBarDataList->attachEventHandler('OnItemDataBound', [$this, 'dataListItemDataBound']);
 				$this->_sideBarDataList->setDataSource($this->getWizardSteps());
 				$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
 				$this->_sideBarDataList->dataBind();
@@ -1121,7 +1121,7 @@ 
 	public function dataListItemCommand($sender, $param)
 	{
 		$item = $param->getItem();
-		if($param->getCommandName() === self::CMD_MOVETO)
+		if ($param->getCommandName() === self::CMD_MOVETO)
 		{
 			$stepIndex = $this->getActiveStepIndex();
 			$newStepIndex = TPropertyValue::ensureInteger($param->getCommandParameter());
@@ -1131,15 +1131,15 @@ 
 			// if the button clicked causes validation which fails,
 			// by default we will cancel navigation to the new step
 			$button = $param->getCommandSource();
-			if(($button instanceof \Prado\Web\UI\IButtonControl) && $button->getCausesValidation() && ($page = $this->getPage()) !== null && !$page->getIsValid())
+			if (($button instanceof \Prado\Web\UI\IButtonControl) && $button->getCausesValidation() && ($page = $this->getPage()) !== null && !$page->getIsValid())
 				$navParam->setCancelNavigation(true);
 
 			$this->_activeStepIndexSet = false;
 			$this->onSideBarButtonClick($navParam);
 			$this->_cancelNavigation = $navParam->getCancelNavigation();
-			if(!$this->_cancelNavigation)
+			if (!$this->_cancelNavigation)
 			{
-				if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($newStepIndex))
+				if (!$this->_activeStepIndexSet && $this->allowNavigationToStep($newStepIndex))
 					$this->setActiveStepIndex($newStepIndex);
 			}
 			else
@@ -1158,14 +1158,14 @@ 
 	{
 		$item = $param->getItem();
 		$itemType = $item->getItemType();
-		if($itemType === 'Item' || $itemType === 'AlternatingItem' || $itemType === 'SelectedItem' || $itemType === 'EditItem')
+		if ($itemType === 'Item' || $itemType === 'AlternatingItem' || $itemType === 'SelectedItem' || $itemType === 'EditItem')
 		{
-			if(($button = $item->findControl(self::ID_SIDEBAR_BUTTON)) !== null)
+			if (($button = $item->findControl(self::ID_SIDEBAR_BUTTON)) !== null)
 			{
 				$step = $item->getData();
-				if(($this->getStepType($step) === TWizardStepType::Complete))
+				if (($this->getStepType($step) === TWizardStepType::Complete))
 					$button->setEnabled(false);
-				if(($title = $step->getTitle()) !== '')
+				if (($title = $step->getTitle()) !== '')
 					$button->setText($title);
 				else
 					$button->setText($step->getID(false));
@@ -1181,16 +1181,16 @@ 
 	 */
 	protected function createStepContent()
 	{
-		foreach($this->getWizardSteps() as $step)
+		foreach ($this->getWizardSteps() as $step)
 		{
-			if($step instanceof TTemplatedWizardStep)
+			if ($step instanceof TTemplatedWizardStep)
 				$step->ensureChildControls();
 		}
 		$multiView = $this->getMultiView();
 		$this->_stepContent = new TPanel;
 		$this->_stepContent->getControls()->add($multiView);
 		$this->getControls()->add($this->_stepContent);
-		if($multiView->getViews()->getCount())
+		if ($multiView->getViews()->getCount())
 			$multiView->setActiveViewIndex(0);
 	}
 
@@ -1202,12 +1202,12 @@ 
 		$this->_navigation = new TPanel;
 		$this->getControls()->add($this->_navigation);
 		$controls = $this->_navigation->getControls();
-		foreach($this->getWizardSteps() as $step)
+		foreach ($this->getWizardSteps() as $step)
 		{
-			if($step instanceof TTemplatedWizardStep)
+			if ($step instanceof TTemplatedWizardStep)
 			{
 				$step->instantiateNavigationTemplate();
-				if(($panel = $step->getNavigationContainer()) !== null)
+				if (($panel = $step->getNavigationContainer()) !== null)
 					$controls->add($panel);
 			}
 		}
@@ -1224,7 +1224,7 @@ 
 	 */
 	protected function createStartNavigation()
 	{
-		if(($template = $this->getStartNavigationTemplate()) === null)
+		if (($template = $this->getStartNavigationTemplate()) === null)
 			$template = new TWizardStartNavigationTemplate($this);
 		$navigation = new TWizardNavigationContainer;
 		$template->instantiateIn($navigation);
@@ -1236,7 +1236,7 @@ 
 	 */
 	protected function createStepNavigation()
 	{
-		if(($template = $this->getStepNavigationTemplate()) === null)
+		if (($template = $this->getStepNavigationTemplate()) === null)
 			$template = new TWizardStepNavigationTemplate($this);
 		$navigation = new TWizardNavigationContainer;
 		$template->instantiateIn($navigation);
@@ -1248,7 +1248,7 @@ 
 	 */
 	protected function createFinishNavigation()
 	{
-		if(($template = $this->getFinishNavigationTemplate()) === null)
+		if (($template = $this->getFinishNavigationTemplate()) === null)
 			$template = new TWizardFinishNavigationTemplate($this);
 		$navigation = new TWizardNavigationContainer;
 		$template->instantiateIn($navigation);
@@ -1261,7 +1261,7 @@ 
 	 */
 	public function wizardStepsChanged()
 	{
-		if($this->_sideBarDataList !== null)
+		if ($this->_sideBarDataList !== null)
 		{
 			$this->_sideBarDataList->setDataSource($this->getWizardSteps());
 			$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
@@ -1277,20 +1277,20 @@ 
 	protected function getPreviousStepIndex($popStack)
 	{
 		$history = $this->getHistory();
-		if($history->getCount() >= 0)
+		if ($history->getCount() >= 0)
 		{
 			$activeStepIndex = $this->getActiveStepIndex();
 			$previousStepIndex = -1;
-			if($popStack)
+			if ($popStack)
 			{
 				$previousStepIndex = $history->pop();
-				if($activeStepIndex === $previousStepIndex && $history->getCount() > 0)
+				if ($activeStepIndex === $previousStepIndex && $history->getCount() > 0)
 					$previousStepIndex = $history->pop();
 			}
 			else
 			{
 				$previousStepIndex = $history->peek();
-				if($activeStepIndex === $previousStepIndex && $history->getCount() > 1)
+				if ($activeStepIndex === $previousStepIndex && $history->getCount() > 1)
 				{
 					$saveIndex = $history->pop();
 					$previousStepIndex = $history->peek();
@@ -1308,7 +1308,7 @@ 
 	 */
 	protected function allowNavigationToPreviousStep()
 	{
-		if(($index = $this->getPreviousStepIndex(false)) !== -1)
+		if (($index = $this->getPreviousStepIndex(false)) !== -1)
 			return $this->getWizardSteps()->itemAt($index)->getAllowReturn();
 		else
 			return false;
@@ -1320,7 +1320,7 @@ 
 	 */
 	protected function allowNavigationToStep($index)
 	{
-		if($this->getHistory()->contains($index))
+		if ($this->getHistory()->contains($index))
 			return $this->getWizardSteps()->itemAt($index)->getAllowReturn();
 		else
 			return true;
@@ -1336,10 +1336,10 @@ 
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		if($param instanceof \Prado\Web\UI\TCommandEventParameter)
+		if ($param instanceof \Prado\Web\UI\TCommandEventParameter)
 		{
 			$command = $param->getCommandName();
-			if(strcasecmp($command, self::CMD_CANCEL) === 0)
+			if (strcasecmp($command, self::CMD_CANCEL) === 0)
 			{
 				$this->onCancelButtonClick($param);
 				return true;
@@ -1348,44 +1348,44 @@ 
 			$type = $this->getStepType($this->getActiveStep());
 			$index = $this->getActiveStepIndex();
 			$navParam = new TWizardNavigationEventParameter($index);
-			if(($sender instanceof \Prado\Web\UI\IButtonControl) && $sender->getCausesValidation() && ($page = $this->getPage()) !== null && !$page->getIsValid())
+			if (($sender instanceof \Prado\Web\UI\IButtonControl) && $sender->getCausesValidation() && ($page = $this->getPage()) !== null && !$page->getIsValid())
 				$navParam->setCancelNavigation(true);
 
 			$handled = false;
 			$movePrev = false;
 			$this->_activeStepIndexSet = false;
 
-			if(strcasecmp($command, self::CMD_NEXT) === 0)
+			if (strcasecmp($command, self::CMD_NEXT) === 0)
 			{
-				if($type !== TWizardStepType::Start && $type !== TWizardStepType::Step)
+				if ($type !== TWizardStepType::Start && $type !== TWizardStepType::Step)
 					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_NEXT);
-				if($index < $this->getWizardSteps()->getCount() - 1)
+				if ($index < $this->getWizardSteps()->getCount() - 1)
 					$navParam->setNextStepIndex($index + 1);
 				$this->onNextButtonClick($navParam);
 				$handled = true;
 			}
-			elseif(strcasecmp($command, self::CMD_PREVIOUS) === 0)
+			elseif (strcasecmp($command, self::CMD_PREVIOUS) === 0)
 			{
-				if($type !== TWizardStepType::Finish && $type !== TWizardStepType::Step)
+				if ($type !== TWizardStepType::Finish && $type !== TWizardStepType::Step)
 					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_PREVIOUS);
 				$movePrev = true;
-				if(($prevIndex = $this->getPreviousStepIndex(false)) >= 0)
+				if (($prevIndex = $this->getPreviousStepIndex(false)) >= 0)
 					$navParam->setNextStepIndex($prevIndex);
 				$this->onPreviousButtonClick($navParam);
 				$handled = true;
 			}
-			elseif(strcasecmp($command, self::CMD_COMPLETE) === 0)
+			elseif (strcasecmp($command, self::CMD_COMPLETE) === 0)
 			{
-				if($type !== TWizardStepType::Finish)
+				if ($type !== TWizardStepType::Finish)
 					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_COMPLETE);
-				if($index < $this->getWizardSteps()->getCount() - 1)
+				if ($index < $this->getWizardSteps()->getCount() - 1)
 					$navParam->setNextStepIndex($index + 1);
 				$this->onCompleteButtonClick($navParam);
 				$handled = true;
 			}
-			elseif(strcasecmp($command, self::CMD_MOVETO) === 0)
+			elseif (strcasecmp($command, self::CMD_MOVETO) === 0)
 			{
-				if($this->_cancelNavigation)  // may be set in onSideBarButtonClick
+				if ($this->_cancelNavigation)  // may be set in onSideBarButtonClick
 					$navParam->setCancelNavigation(true);
 				$requestedStep = $param->getCommandParameter();
 				if (!is_numeric($requestedStep))
@@ -1406,15 +1406,15 @@ 
 				$handled = true;
 			}
 
-			if($handled)
+			if ($handled)
 			{
-				if(!$navParam->getCancelNavigation())
+				if (!$navParam->getCancelNavigation())
 				{
 					$nextStepIndex = $navParam->getNextStepIndex();
-					if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($nextStepIndex))
+					if (!$this->_activeStepIndexSet && $this->allowNavigationToStep($nextStepIndex))
 					{
-						if($movePrev)
-							$this->getPreviousStepIndex(true);  // pop out the previous move from history
+						if ($movePrev)
+							$this->getPreviousStepIndex(true); // pop out the previous move from history
 						$this->setActiveStepIndex($nextStepIndex);
 					}
 				}

Braces +188 added lines, -142 removed lines

@@ -183,8 +183,9 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof TWizardStep)
-			$this->getWizardSteps()->add($object);
+		if($object instanceof TWizardStep) {
+					$this->getWizardSteps()->add($object);
+		}
 	}
 
 	/**
@@ -201,8 +202,9 @@ 
 	 */
 	public function setActiveStep($step)
 	{
-		if(($index = $this->getWizardSteps()->indexOf($step)) < 0)
-			throw new TInvalidOperationException('wizard_step_invalid');
+		if(($index = $this->getWizardSteps()->indexOf($step)) < 0) {
+					throw new TInvalidOperationException('wizard_step_invalid');
+		}
 		$this->setActiveStepIndex($index);
 	}
 
@@ -238,8 +240,9 @@ 
 	 */
 	public function getWizardSteps()
 	{
-		if($this->_wizardSteps === null)
-			$this->_wizardSteps = new TWizardStepCollection($this);
+		if($this->_wizardSteps === null) {
+					$this->_wizardSteps = new TWizardStepCollection($this);
+		}
 		return $this->_wizardSteps;
 	}
 
@@ -659,8 +662,9 @@ 
 	public function onCancelButtonClick($param)
 	{
 		$this->raiseEvent('OnCancelButtonClick', $this, $param);
-		if(($url = $this->getCancelDestinationUrl()) !== '')
-			$this->getResponse()->redirect($url);
+		if(($url = $this->getCancelDestinationUrl()) !== '') {
+					$this->getResponse()->redirect($url);
+		}
 	}
 
 	/**
@@ -672,8 +676,9 @@ 
 	public function onCompleteButtonClick($param)
 	{
 		$this->raiseEvent('OnCompleteButtonClick', $this, $param);
-		if(($url = $this->getFinishDestinationUrl()) !== '')
-			$this->getResponse()->redirect($url);
+		if(($url = $this->getFinishDestinationUrl()) !== '') {
+					$this->getResponse()->redirect($url);
+		}
 	}
 
 	/**
@@ -733,8 +738,9 @@ 
 	 */
 	public function addedWizardStep($step)
 	{
-		if(($wizard = $step->getWizard()) !== null)
-			$wizard->getWizardSteps()->remove($step);
+		if(($wizard = $step->getWizard()) !== null) {
+					$wizard->getWizardSteps()->remove($step);
+		}
 		$step->setWizard($this);
 		$this->wizardStepsChanged();
 	}
@@ -761,8 +767,9 @@ 
 		parent::onInit($param);
 		$this->ensureChildControls();
 		$this->setEnsureId(true);
-		if($this->getActiveStepIndex() < 0 && $this->getWizardSteps()->getCount() > 0)
-			$this->setActiveStepIndex(0);
+		if($this->getActiveStepIndex() < 0 && $this->getWizardSteps()->getCount() > 0) {
+					$this->setActiveStepIndex(0);
+		}
 	}
 
 	/**
@@ -773,8 +780,9 @@ 
 	{
 		$index = $this->getActiveStepIndex();
 		$history = $this->getHistory();
-		if(!$history->getCount() || $history->peek() !== $index)
-			$history->push($index);
+		if(!$history->getCount() || $history->peek() !== $index) {
+					$history->push($index);
+		}
 	}
 
 	/**
@@ -782,8 +790,9 @@ 
 	 */
 	protected function requiresControlsRecreation()
 	{
-		if($this->getChildControlsCreated())
-			$this->setChildControlsCreated(false);
+		if($this->getChildControlsCreated()) {
+					$this->setChildControlsCreated(false);
+		}
 	}
 
 	/**
@@ -807,8 +816,7 @@ 
 				$this->_navigation->renderControl($writer);
 				$writer->write("\n</td></tr></table>\n");
 				$this->renderEndTag($writer);
-			}
-			else
+			} else
 			{
 				$this->applyControlProperties();
 				$this->renderBeginTag($writer);
@@ -837,8 +845,9 @@ 
 	 */
 	protected function applyHeaderProperties()
 	{
-		if(($style = $this->getViewState('HeaderStyle', null)) !== null)
-			$this->_header->getStyle()->mergeWith($style);
+		if(($style = $this->getViewState('HeaderStyle', null)) !== null) {
+					$this->_header->getStyle()->mergeWith($style);
+		}
 		if($this->getHeaderTemplate() === null)
 		{
 			$this->_header->getControls()->clear();
@@ -861,13 +870,15 @@ 
 			{
 				foreach($this->_sideBarDataList->getItems() as $item)
 				{
-					if(($button = $item->findControl('SideBarButton')) !== null)
-						$button->getStyle()->mergeWith($style);
+					if(($button = $item->findControl('SideBarButton')) !== null) {
+											$button->getStyle()->mergeWith($style);
+					}
 				}
 			}
 		}
-		if(($style = $this->getViewState('SideBarStyle', null)) !== null)
-			$this->_sideBar->getStyle()->mergeWith($style);
+		if(($style = $this->getViewState('SideBarStyle', null)) !== null) {
+					$this->_sideBar->getStyle()->mergeWith($style);
+		}
 	}
 
 	/**
@@ -875,8 +886,9 @@ 
 	 */
 	protected function applyStepContentProperties()
 	{
-		if(($style = $this->getViewState('StepStyle', null)) !== null)
-			$this->_stepContent->getStyle()->mergeWith($style);
+		if(($style = $this->getViewState('StepStyle', null)) !== null) {
+					$this->_stepContent->getStyle()->mergeWith($style);
+		}
 	}
 
 	/**
@@ -888,9 +900,9 @@ 
 		$activeStep = $this->getActiveStep();
 		$activeStepIndex = $this->getActiveStepIndex();
 
-		if(!$this->_navigation)
-			return;
-		elseif($activeStepIndex < 0 || $activeStepIndex >= $wizardSteps->getCount())
+		if(!$this->_navigation) {
+					return;
+		} elseif($activeStepIndex < 0 || $activeStepIndex >= $wizardSteps->getCount())
 		{
 			$this->_navigation->setVisible(false);
 			return;
@@ -906,9 +918,9 @@ 
 				{
 					$container->setVisible(true);
 					$showStandard = false;
+				} else {
+									$container->setVisible(false);
 				}
-				else
-					$container->setVisible(false);
 			}
 		}
 		$activeStepType = $this->getStepType($activeStep);
@@ -921,14 +933,16 @@ 
 		$this->_stepNavigation->setVisible($showStandard && $activeStepType === TWizardStepType::Step);
 		$this->_finishNavigation->setVisible($showStandard && $activeStepType === TWizardStepType::Finish);
 
-		if(($navigationStyle = $this->getViewState('NavigationStyle', null)) !== null)
-			$this->_navigation->getStyle()->mergeWith($navigationStyle);
+		if(($navigationStyle = $this->getViewState('NavigationStyle', null)) !== null) {
+					$this->_navigation->getStyle()->mergeWith($navigationStyle);
+		}
 
 		$displayCancelButton = $this->getShowCancelButton();
 		$cancelButtonStyle = $this->getCancelButtonStyle();
 		$buttonStyle = $this->getViewState('NavigationButtonStyle', null);
-		if($buttonStyle !== null)
-			$cancelButtonStyle->mergeWith($buttonStyle);
+		if($buttonStyle !== null) {
+					$cancelButtonStyle->mergeWith($buttonStyle);
+		}
 
 		// apply styles to start navigation buttons
 		if(($cancelButton = $this->_startNavigation->getCancelButton()) !== null)
@@ -940,11 +954,13 @@ 
 		{
 			$button->setVisible(true);
 			$style = $this->getStartNextButtonStyle();
-			if($buttonStyle !== null)
-				$style->mergeWith($buttonStyle);
+			if($buttonStyle !== null) {
+							$style->mergeWith($buttonStyle);
+			}
 			$style->apply($button);
-			if($activeStepType === TWizardStepType::Start)
-				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
+			if($activeStepType === TWizardStepType::Start) {
+							$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
+			}
 		}
 
 		// apply styles to finish navigation buttons
@@ -957,19 +973,22 @@ 
 		{
 			$button->setVisible($this->allowNavigationToPreviousStep());
 			$style = $this->getFinishPreviousButtonStyle();
-			if($buttonStyle !== null)
-				$style->mergeWith($buttonStyle);
+			if($buttonStyle !== null) {
+							$style->mergeWith($buttonStyle);
+			}
 			$style->apply($button);
 		}
 		if(($button = $this->_finishNavigation->getCompleteButton()) !== null)
 		{
 			$button->setVisible(true);
 			$style = $this->getFinishCompleteButtonStyle();
-			if($buttonStyle !== null)
-				$style->mergeWith($buttonStyle);
+			if($buttonStyle !== null) {
+							$style->mergeWith($buttonStyle);
+			}
 			$style->apply($button);
-			if($activeStepType === TWizardStepType::Finish)
-				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
+			if($activeStepType === TWizardStepType::Finish) {
+							$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
+			}
 		}
 
 		// apply styles to step navigation buttons
@@ -982,19 +1001,22 @@ 
 		{
 			$button->setVisible($this->allowNavigationToPreviousStep());
 			$style = $this->getStepPreviousButtonStyle();
-			if($buttonStyle !== null)
-				$style->mergeWith($buttonStyle);
+			if($buttonStyle !== null) {
+							$style->mergeWith($buttonStyle);
+			}
 			$style->apply($button);
 		}
 		if(($button = $this->_stepNavigation->getNextButton()) !== null)
 		{
 			$button->setVisible(true);
 			$style = $this->getStepNextButtonStyle();
-			if($buttonStyle !== null)
-				$style->mergeWith($buttonStyle);
+			if($buttonStyle !== null) {
+							$style->mergeWith($buttonStyle);
+			}
 			$style->apply($button);
-			if($activeStepType === TWizardStepType::Step)
-				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
+			if($activeStepType === TWizardStepType::Step) {
+							$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
+			}
 		}
 	}
 
@@ -1024,20 +1046,21 @@ 
 			if(($index = $steps->indexOf($wizardStep)) >= 0)
 			{
 				$stepCount = $steps->getCount();
-				if($stepCount === 1 || ($index < $stepCount - 1 && $steps->itemAt($index + 1)->getStepType() === TWizardStepType::Complete))
-					return TWizardStepType::Finish;
-				elseif($index === 0)
-					return TWizardStepType::Start;
-				elseif($index === $stepCount - 1)
-					return TWizardStepType::Finish;
-				else
-					return TWizardStepType::Step;
+				if($stepCount === 1 || ($index < $stepCount - 1 && $steps->itemAt($index + 1)->getStepType() === TWizardStepType::Complete)) {
+									return TWizardStepType::Finish;
+				} elseif($index === 0) {
+									return TWizardStepType::Start;
+				} elseif($index === $stepCount - 1) {
+									return TWizardStepType::Finish;
+				} else {
+									return TWizardStepType::Step;
+				}
+			} else {
+							return $type;
 			}
-			else
-				return $type;
+		} else {
+					return $type;
 		}
-		else
-			return $type;
 	}
 
 	/**
@@ -1075,10 +1098,11 @@ 
 	protected function createHeader()
 	{
 		$this->_header = new TPanel;
-		if(($template = $this->getHeaderTemplate()) !== null)
-			$template->instantiateIn($this->_header);
-		else
-			$this->_header->getControls()->add($this->getHeaderText());
+		if(($template = $this->getHeaderTemplate()) !== null) {
+					$template->instantiateIn($this->_header);
+		} else {
+					$this->_header->getControls()->add($this->getHeaderText());
+		}
 		$this->getControls()->add($this->_header);
 	}
 
@@ -1089,8 +1113,9 @@ 
 	{
 		if($this->getShowSideBar())
 		{
-			if(($template = $this->getSideBarTemplate()) === null)
-				$template = new TWizardSideBarTemplate;
+			if(($template = $this->getSideBarTemplate()) === null) {
+							$template = new TWizardSideBarTemplate;
+			}
 			$this->_sideBar = new TPanel;
 			$template->instantiateIn($this->_sideBar);
 			$this->getControls()->add($this->_sideBar);
@@ -1103,8 +1128,7 @@ 
 				$this->_sideBarDataList->setSelectedItemIndex($this->getActiveStepIndex());
 				$this->_sideBarDataList->dataBind();
 			}
-		}
-		else
+		} else
 		{
 			$this->_sideBar = new TPanel;
 			$this->getControls()->add($this->_sideBar);
@@ -1131,19 +1155,21 @@ 
 			// if the button clicked causes validation which fails,
 			// by default we will cancel navigation to the new step
 			$button = $param->getCommandSource();
-			if(($button instanceof \Prado\Web\UI\IButtonControl) && $button->getCausesValidation() && ($page = $this->getPage()) !== null && !$page->getIsValid())
-				$navParam->setCancelNavigation(true);
+			if(($button instanceof \Prado\Web\UI\IButtonControl) && $button->getCausesValidation() && ($page = $this->getPage()) !== null && !$page->getIsValid()) {
+							$navParam->setCancelNavigation(true);
+			}
 
 			$this->_activeStepIndexSet = false;
 			$this->onSideBarButtonClick($navParam);
 			$this->_cancelNavigation = $navParam->getCancelNavigation();
 			if(!$this->_cancelNavigation)
 			{
-				if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($newStepIndex))
-					$this->setActiveStepIndex($newStepIndex);
+				if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($newStepIndex)) {
+									$this->setActiveStepIndex($newStepIndex);
+				}
+			} else {
+							$this->setActiveStepIndex($stepIndex);
 			}
-			else
-				$this->setActiveStepIndex($stepIndex);
 		}
 	}
 
@@ -1163,12 +1189,14 @@ 
 			if(($button = $item->findControl(self::ID_SIDEBAR_BUTTON)) !== null)
 			{
 				$step = $item->getData();
-				if(($this->getStepType($step) === TWizardStepType::Complete))
-					$button->setEnabled(false);
-				if(($title = $step->getTitle()) !== '')
-					$button->setText($title);
-				else
-					$button->setText($step->getID(false));
+				if(($this->getStepType($step) === TWizardStepType::Complete)) {
+									$button->setEnabled(false);
+				}
+				if(($title = $step->getTitle()) !== '') {
+									$button->setText($title);
+				} else {
+									$button->setText($step->getID(false));
+				}
 				$index = $this->getWizardSteps()->indexOf($step);
 				$button->setCommandName(self::CMD_MOVETO);
 				$button->setCommandParameter("$index");
@@ -1183,15 +1211,17 @@ 
 	{
 		foreach($this->getWizardSteps() as $step)
 		{
-			if($step instanceof TTemplatedWizardStep)
-				$step->ensureChildControls();
+			if($step instanceof TTemplatedWizardStep) {
+							$step->ensureChildControls();
+			}
 		}
 		$multiView = $this->getMultiView();
 		$this->_stepContent = new TPanel;
 		$this->_stepContent->getControls()->add($multiView);
 		$this->getControls()->add($this->_stepContent);
-		if($multiView->getViews()->getCount())
-			$multiView->setActiveViewIndex(0);
+		if($multiView->getViews()->getCount()) {
+					$multiView->setActiveViewIndex(0);
+		}
 	}
 
 	/**
@@ -1207,8 +1237,9 @@ 
 			if($step instanceof TTemplatedWizardStep)
 			{
 				$step->instantiateNavigationTemplate();
-				if(($panel = $step->getNavigationContainer()) !== null)
-					$controls->add($panel);
+				if(($panel = $step->getNavigationContainer()) !== null) {
+									$controls->add($panel);
+				}
 			}
 		}
 		$this->_startNavigation = $this->createStartNavigation();
@@ -1224,8 +1255,9 @@ 
 	 */
 	protected function createStartNavigation()
 	{
-		if(($template = $this->getStartNavigationTemplate()) === null)
-			$template = new TWizardStartNavigationTemplate($this);
+		if(($template = $this->getStartNavigationTemplate()) === null) {
+					$template = new TWizardStartNavigationTemplate($this);
+		}
 		$navigation = new TWizardNavigationContainer;
 		$template->instantiateIn($navigation);
 		return $navigation;
@@ -1236,8 +1268,9 @@ 
 	 */
 	protected function createStepNavigation()
 	{
-		if(($template = $this->getStepNavigationTemplate()) === null)
-			$template = new TWizardStepNavigationTemplate($this);
+		if(($template = $this->getStepNavigationTemplate()) === null) {
+					$template = new TWizardStepNavigationTemplate($this);
+		}
 		$navigation = new TWizardNavigationContainer;
 		$template->instantiateIn($navigation);
 		return $navigation;
@@ -1248,8 +1281,9 @@ 
 	 */
 	protected function createFinishNavigation()
 	{
-		if(($template = $this->getFinishNavigationTemplate()) === null)
-			$template = new TWizardFinishNavigationTemplate($this);
+		if(($template = $this->getFinishNavigationTemplate()) === null) {
+					$template = new TWizardFinishNavigationTemplate($this);
+		}
 		$navigation = new TWizardNavigationContainer;
 		$template->instantiateIn($navigation);
 		return $navigation;
@@ -1284,10 +1318,10 @@ 
 			if($popStack)
 			{
 				$previousStepIndex = $history->pop();
-				if($activeStepIndex === $previousStepIndex && $history->getCount() > 0)
-					$previousStepIndex = $history->pop();
-			}
-			else
+				if($activeStepIndex === $previousStepIndex && $history->getCount() > 0) {
+									$previousStepIndex = $history->pop();
+				}
+			} else
 			{
 				$previousStepIndex = $history->peek();
 				if($activeStepIndex === $previousStepIndex && $history->getCount() > 1)
@@ -1298,9 +1332,9 @@ 
 				}
 			}
 			return $activeStepIndex === $previousStepIndex ? -1 : $previousStepIndex;
+		} else {
+					return -1;
 		}
-		else
-			return -1;
 	}
 
 	/**
@@ -1308,10 +1342,11 @@ 
 	 */
 	protected function allowNavigationToPreviousStep()
 	{
-		if(($index = $this->getPreviousStepIndex(false)) !== -1)
-			return $this->getWizardSteps()->itemAt($index)->getAllowReturn();
-		else
-			return false;
+		if(($index = $this->getPreviousStepIndex(false)) !== -1) {
+					return $this->getWizardSteps()->itemAt($index)->getAllowReturn();
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -1320,10 +1355,11 @@ 
 	 */
 	protected function allowNavigationToStep($index)
 	{
-		if($this->getHistory()->contains($index))
-			return $this->getWizardSteps()->itemAt($index)->getAllowReturn();
-		else
-			return true;
+		if($this->getHistory()->contains($index)) {
+					return $this->getWizardSteps()->itemAt($index)->getAllowReturn();
+		} else {
+					return true;
+		}
 	}
 
 	/**
@@ -1348,8 +1384,9 @@ 
 			$type = $this->getStepType($this->getActiveStep());
 			$index = $this->getActiveStepIndex();
 			$navParam = new TWizardNavigationEventParameter($index);
-			if(($sender instanceof \Prado\Web\UI\IButtonControl) && $sender->getCausesValidation() && ($page = $this->getPage()) !== null && !$page->getIsValid())
-				$navParam->setCancelNavigation(true);
+			if(($sender instanceof \Prado\Web\UI\IButtonControl) && $sender->getCausesValidation() && ($page = $this->getPage()) !== null && !$page->getIsValid()) {
+							$navParam->setCancelNavigation(true);
+			}
 
 			$handled = false;
 			$movePrev = false;
@@ -1357,51 +1394,58 @@ 
 
 			if(strcasecmp($command, self::CMD_NEXT) === 0)
 			{
-				if($type !== TWizardStepType::Start && $type !== TWizardStepType::Step)
-					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_NEXT);
-				if($index < $this->getWizardSteps()->getCount() - 1)
-					$navParam->setNextStepIndex($index + 1);
+				if($type !== TWizardStepType::Start && $type !== TWizardStepType::Step) {
+									throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_NEXT);
+				}
+				if($index < $this->getWizardSteps()->getCount() - 1) {
+									$navParam->setNextStepIndex($index + 1);
+				}
 				$this->onNextButtonClick($navParam);
 				$handled = true;
-			}
-			elseif(strcasecmp($command, self::CMD_PREVIOUS) === 0)
+			} elseif(strcasecmp($command, self::CMD_PREVIOUS) === 0)
 			{
-				if($type !== TWizardStepType::Finish && $type !== TWizardStepType::Step)
-					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_PREVIOUS);
+				if($type !== TWizardStepType::Finish && $type !== TWizardStepType::Step) {
+									throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_PREVIOUS);
+				}
 				$movePrev = true;
-				if(($prevIndex = $this->getPreviousStepIndex(false)) >= 0)
-					$navParam->setNextStepIndex($prevIndex);
+				if(($prevIndex = $this->getPreviousStepIndex(false)) >= 0) {
+									$navParam->setNextStepIndex($prevIndex);
+				}
 				$this->onPreviousButtonClick($navParam);
 				$handled = true;
-			}
-			elseif(strcasecmp($command, self::CMD_COMPLETE) === 0)
+			} elseif(strcasecmp($command, self::CMD_COMPLETE) === 0)
 			{
-				if($type !== TWizardStepType::Finish)
-					throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_COMPLETE);
-				if($index < $this->getWizardSteps()->getCount() - 1)
-					$navParam->setNextStepIndex($index + 1);
+				if($type !== TWizardStepType::Finish) {
+									throw new TInvalidDataValueException('wizard_command_invalid', self::CMD_COMPLETE);
+				}
+				if($index < $this->getWizardSteps()->getCount() - 1) {
+									$navParam->setNextStepIndex($index + 1);
+				}
 				$this->onCompleteButtonClick($navParam);
 				$handled = true;
-			}
-			elseif(strcasecmp($command, self::CMD_MOVETO) === 0)
+			} elseif(strcasecmp($command, self::CMD_MOVETO) === 0)
 			{
-				if($this->_cancelNavigation)  // may be set in onSideBarButtonClick
+				if($this->_cancelNavigation) {
+					// may be set in onSideBarButtonClick
 					$navParam->setCancelNavigation(true);
+				}
 				$requestedStep = $param->getCommandParameter();
 				if (!is_numeric($requestedStep))
 				{
 					$requestedIndex = -1;
-					foreach ($this->getWizardSteps() as $index => $step)
-						if ($step->getId() === $requestedStep)
+					foreach ($this->getWizardSteps() as $index => $step) {
+											if ($step->getId() === $requestedStep)
 						{
 							$requestedIndex = $index;
+					}
 							break;
 						}
-					if ($requestedIndex < 0)
-						throw new TConfigurationException('wizard_step_invalid');
+					if ($requestedIndex < 0) {
+											throw new TConfigurationException('wizard_step_invalid');
+					}
+				} else {
+									$requestedIndex = TPropertyValue::ensureInteger($requestedStep);
 				}
-				else
-					$requestedIndex = TPropertyValue::ensureInteger($requestedStep);
 				$navParam->setNextStepIndex($requestedIndex);
 				$handled = true;
 			}
@@ -1413,13 +1457,15 @@ 
 					$nextStepIndex = $navParam->getNextStepIndex();
 					if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($nextStepIndex))
 					{
-						if($movePrev)
-							$this->getPreviousStepIndex(true);  // pop out the previous move from history
+						if($movePrev) {
+													$this->getPreviousStepIndex(true);
+						}
+						// pop out the previous move from history
 						$this->setActiveStepIndex($nextStepIndex);
 					}
+				} else {
+									$this->setActiveStepIndex($index);
 				}
-				else
-					$this->setActiveStepIndex($index);
 				return true;
 			}
 		}