pradosoft / prado

framework/Web/UI/WebControls/TDataSourceControl.php

Doc Comments +7 added lines

@@ -20,6 +20,10 @@ 
 {
 	public function getView($viewName);
 	public function getViewNames();
+
+	/**
+	 * @return void
+	 */
 	public function onDataSourceChanged($param);
 }
 
@@ -95,6 +99,9 @@ 
 	private $_dataSource;
 	private $_dataMember;
 
+	/**
+	 * @param Traversable $dataSource
+	 */
 	public function __construct($dataSource,$dataMember)
 	{
 		if(!is_array($dataSource) && !($dataSource instanceof IDataSource) && !($dataSource instanceof Traversable))

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
 
 	public function onDataSourceChanged($param)
 	{
-		$this->raiseEvent('OnDataSourceChanged',$this,$param);
+		$this->raiseEvent('OnDataSourceChanged', $this, $param);
 	}
 
 	public function focus()
@@ -95,7 +95,7 @@ 
 	private $_dataSource;
 	private $_dataMember;
 
-	public function __construct($dataSource,$dataMember)
+	public function __construct($dataSource, $dataMember)
 	{
 		if(!is_array($dataSource) && !($dataSource instanceof IDataSource) && !($dataSource instanceof Traversable))
 			throw new TInvalidDataTypeException('readonlydatasource_datasource_invalid');
@@ -108,7 +108,7 @@ 
 		if($this->_dataSource instanceof IDataSource)
 			return $this->_dataSource->getView($viewName);
 		else
-			return new TReadOnlyDataSourceView($this,$this->_dataMember,$this->_dataSource);
+			return new TReadOnlyDataSourceView($this, $this->_dataMember, $this->_dataSource);
 	}
 }
 

framework/Web/UI/WebControls/TDatePicker.php

Doc Comments +4 added lines

@@ -106,6 +106,7 @@ 
 	/**
 	 * Sets the format of the date string.
 	 * @param string the format of the date string
+	 * @param string $value
 	 */
 	public function setDateFormat($value)
 	{
@@ -245,6 +246,7 @@ 
 
 	/**
 	 * @param integer date picker starting year, default is 2000.
+	 * @param integer $value
 	 */
 	public function setFromYear($value)
 	{
@@ -354,6 +356,7 @@ 
 
 	/**
 	 * @param string date string
+	 * @param string $value
 	 */
 	public function setDate($value)
 	{
@@ -731,6 +734,7 @@ 
 	 * "MMMM" will return the month names, "MM" or "MMM" return abbr. month names
 	 * and "M" return month digits.
 	 * @param DateTimeFormatInfo localized date format information.
+	 * @param DateTimeFormatInfo $info
 	 * @return array localized month names.
 	 */
 	protected function getLocalizedMonthNames($info)

Spacing +100 added lines, -100 removed lines

@@ -80,7 +80,7 @@ 
 	/**
 	 * Script path relative to the TClientScriptManager::SCRIPT_PATH
 	 */
-	const SCRIPT_PATH = 'prado/datepicker';
+	const SCRIPT_PATH='prado/datepicker';
 
 	/**
 	 * @var TDatePickerClientScript validator client-script options.
@@ -100,7 +100,7 @@ 
 	 */
 	public function getDateFormat()
 	{
-		return $this->getViewState('DateFormat','dd-MM-yyyy');
+		return $this->getViewState('DateFormat', 'dd-MM-yyyy');
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 	 */
 	public function setDateFormat($value)
 	{
-		$this->setViewState('DateFormat',$value,'dd-MM-yyyy');
+		$this->setViewState('DateFormat', $value, 'dd-MM-yyyy');
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	public function getShowCalendar()
 	{
-		return $this->getViewState('ShowCalendar',true);
+		return $this->getViewState('ShowCalendar', true);
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 */
 	public function setShowCalendar($value)
 	{
-		$this->setViewState('ShowCalendar',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('ShowCalendar', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -248,7 +248,7 @@ 
 	 */
 	public function setFromYear($value)
 	{
-		$this->setViewState('FromYear', TPropertyValue::ensureInteger($value), intval(@date('Y'))-5);
+		$this->setViewState('FromYear', TPropertyValue::ensureInteger($value), intval(@date('Y')) - 5);
 	}
 
 	/**
@@ -256,7 +256,7 @@ 
 	 */
 	public function getFromYear()
 	{
-		return $this->getViewState('FromYear', intval(@date('Y'))-5);
+		return $this->getViewState('FromYear', intval(@date('Y')) - 5);
 	}
 
 	/**
@@ -264,7 +264,7 @@ 
 	 */
 	public function setUpToYear($value)
 	{
-		$this->setViewState('UpToYear', TPropertyValue::ensureInteger($value), intval(@date('Y'))+10);
+		$this->setViewState('UpToYear', TPropertyValue::ensureInteger($value), intval(@date('Y')) + 10);
 	}
 
 	/**
@@ -272,7 +272,7 @@ 
 	 */
 	public function getUpToYear()
 	{
-		return $this->getViewState('UpToYear', intval(@date('Y'))+10);
+		return $this->getViewState('UpToYear', intval(@date('Y')) + 10);
 	}
 
 	/**
@@ -312,8 +312,8 @@ 
 			$this->setText('');
 		else
 		{
-			$date = TPropertyValue::ensureFloat($value);
-			$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',$this->getDateFormat());
+			$date=TPropertyValue::ensureFloat($value);
+			$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter', $this->getDateFormat());
 			$this->setText($formatter->format($date));
 		}
 	}
@@ -373,7 +373,7 @@ 
 	public function getClientSide()
 	{
 		if($this->_clientScript===null)
-			$this->_clientScript = $this->createClientScript();
+			$this->_clientScript=$this->createClientScript();
 		return $this->_clientScript;
 	}
 
@@ -392,10 +392,10 @@ 
 	 */
 	public function getValidationPropertyValue()
 	{
-		if(($text = $this->getText()) === '')
+		if(($text=$this->getText())==='')
 			return '';
-		$date = $this->getTimeStamp();
-		return $date == null ? $text : $date;
+		$date=$this->getTimeStamp();
+		return $date==null ? $text : $date;
 	}
 
 	/**
@@ -416,7 +416,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getInputMode() == TDatePickerInputMode::TextBox)
+		if($this->getInputMode()==TDatePickerInputMode::TextBox)
 		{
 			parent::render($writer);
 			$this->renderDatePickerButtons($writer);
@@ -439,7 +439,7 @@ 
 	{
 		if($this->getShowCalendar())
 		{
-			switch ($this->getMode())
+			switch($this->getMode())
 			{
 				case TDatePickerMode::Button:
 					$this->renderButtonDatePicker($writer);
@@ -459,11 +459,11 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the component has been changed
 	 */
-	public function loadPostData($key,$values)
+	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);
+		$value=$this->getDateFromPostData($key, $values);
 		if(!$this->getReadOnly() && $this->getText()!==$value)
 		{
 			$this->setText($value);
@@ -481,30 +481,30 @@ 
 	 */
 	protected function getDateFromPostData($key, $values)
 	{
-		$date = @getdate();
+		$date=@getdate();
 
 		if(isset($values[$key.'$day']))
-			$day = intval($values[$key.'$day']);
+			$day=intval($values[$key.'$day']);
 		else
-			$day = $date['mday'];
+			$day=$date['mday'];
 
 		if(isset($values[$key.'$month']))
-			$month = intval($values[$key.'$month']) + 1;
+			$month=intval($values[$key.'$month']) + 1;
 		else
-			$month = $date['mon'];
+			$month=$date['mon'];
 
 		if(isset($values[$key.'$year']))
-			$year = intval($values[$key.'$year']);
+			$year=intval($values[$key.'$year']);
 		else
-			$year = $date['year'];
+			$year=$date['year'];
 
-		$s = Prado::createComponent('System.Util.TDateTimeStamp');
-		$date = $s->getTimeStamp(0, 0, 0, $month, $day, $year);
+		$s=Prado::createComponent('System.Util.TDateTimeStamp');
+		$date=$s->getTimeStamp(0, 0, 0, $month, $day, $year);
 		//$date = @mktime(0, 0, 0, $month, $day, $year);
 
-		$pattern = $this->getDateFormat();
-		$pattern = str_replace(array('MMMM', 'MMM'), array('MM','MM'), $pattern);
-		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter', $pattern);
+		$pattern=$this->getDateFormat();
+		$pattern=str_replace(array('MMMM', 'MMM'), array('MM', 'MM'), $pattern);
+		$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter', $pattern);
 		return $formatter->format($date);
 	}
 
@@ -514,31 +514,31 @@ 
 	 */
 	protected function getDatePickerOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['InputMode'] = $this->getInputMode();
-		$options['Format'] = $this->getDateFormat();
-		$options['FirstDayOfWeek'] = $this->getFirstDayOfWeek();
+		$options['ID']=$this->getClientID();
+		$options['InputMode']=$this->getInputMode();
+		$options['Format']=$this->getDateFormat();
+		$options['FirstDayOfWeek']=$this->getFirstDayOfWeek();
 		if(($cssClass=$this->getCssClass())!=='')
-			$options['ClassName'] = $cssClass;
-		$options['CalendarStyle'] = $this->getCalendarStyle();
-		$options['FromYear'] = $this->getFromYear();
-		$options['UpToYear'] = $this->getUpToYear();
+			$options['ClassName']=$cssClass;
+		$options['CalendarStyle']=$this->getCalendarStyle();
+		$options['FromYear']=$this->getFromYear();
+		$options['UpToYear']=$this->getUpToYear();
 		switch($this->getMode())
 		{
 			case TDatePickerMode::Basic:
 				break;
 			case TDatePickerMode::Clickable:
-				$options['TriggerEvent'] = "click";
+				$options['TriggerEvent']="click";
 				break;
 			default:
-				$options['Trigger'] = $this->getDatePickerButtonID();
+				$options['Trigger']=$this->getDatePickerButtonID();
 				break;
 		}
-		$options['PositionMode'] = $this->getPositionMode();
+		$options['PositionMode']=$this->getPositionMode();
 
-		$options = array_merge($options, $this->getCulturalOptions());
+		$options=array_merge($options, $this->getCulturalOptions());
 		if($this->_clientScript!==null)
-			$options = array_merge($options,
+			$options=array_merge($options,
 				$this->_clientScript->getOptions()->toArray());
 		return $options;
 	}
@@ -549,13 +549,13 @@ 
 	 */
 	protected function getCulturalOptions()
 	{
-		if($this->getCurrentCulture() == 'en')
+		if($this->getCurrentCulture()=='en')
 			return array();
 
-		$date = $this->getLocalizedCalendarInfo();
-		$options['MonthNames'] = $date->getMonthNames();
-		$options['AbbreviatedMonthNames'] = $date->getAbbreviatedMonthNames();
-		$options['ShortWeekDayNames'] = $date->getAbbreviatedDayNames();
+		$date=$this->getLocalizedCalendarInfo();
+		$options['MonthNames']=$date->getMonthNames();
+		$options['AbbreviatedMonthNames']=$date->getAbbreviatedMonthNames();
+		$options['ShortWeekDayNames']=$date->getAbbreviatedDayNames();
 
 		return $options;
 	}
@@ -565,8 +565,8 @@ 
 	 */
 	protected function getCurrentCulture()
 	{
-		$app = $this->getApplication()->getGlobalization(false);
-		return $this->getCulture() == '' ?
+		$app=$this->getApplication()->getGlobalization(false);
+		return $this->getCulture()=='' ?
 				($app ? $app->getCulture() : 'en') : $this->getCulture();
 	}
 
@@ -576,9 +576,9 @@ 
 	protected function getLocalizedCalendarInfo()
 	{
 		//expensive operations
-		$culture = $this->getCurrentCulture();
+		$culture=$this->getCurrentCulture();
 		Prado::using('System.I18N.core.DateTimeFormatInfo');
-		$info = Prado::createComponent('System.I18N.core.CultureInfo', $culture);
+		$info=Prado::createComponent('System.I18N.core.CultureInfo', $culture);
 		return $info->getDateTimeFormat();
 	}
 
@@ -587,19 +587,19 @@ 
 	 */
 	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');
 
-		$s = Prado::createComponent('System.Util.TDateTimeStamp');
-		$date = $s->getDate($this->getTimeStampFromText());
+		$s=Prado::createComponent('System.Util.TDateTimeStamp');
+		$date=$s->getDate($this->getTimeStampFromText());
 		//$date = @getdate($this->getTimeStampFromText());
 
 		$this->renderCalendarSelections($writer, $date);
@@ -616,7 +616,7 @@ 
 
 	protected function hasDayPattern()
 	{
-		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',
+		$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter',
 						$this->getDateFormat());
 		return ($formatter->getDayPattern()!==null);
 	}
@@ -628,17 +628,17 @@ 
 	 */
 	protected function renderCalendarSelections($writer, $date)
 	{
-		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',
+		$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter',
 						$this->getDateFormat());
 
 		foreach($formatter->getDayMonthYearOrdering() as $type)
 		{
-			if($type == 'day')
-				$this->renderCalendarDayOptions($writer,$date['mday']);
-			elseif($type == 'month')
-				$this->renderCalendarMonthOptions($writer,$date['mon']);
-			elseif($type == 'year')
-				$this->renderCalendarYearOptions($writer,$date['year']);
+			if($type=='day')
+				$this->renderCalendarDayOptions($writer, $date['mday']);
+			elseif($type=='month')
+				$this->renderCalendarMonthOptions($writer, $date['mon']);
+			elseif($type=='year')
+				$this->renderCalendarYearOptions($writer, $date['year']);
 		}
 	}
 
@@ -648,9 +648,9 @@ 
 	 */
 	protected function getTimeStampFromText()
 	{
-		$pattern = $this->getDateFormat();
-		$pattern = str_replace(array('MMMM', 'MMM'), array('MM','MM'), $pattern);
-		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',$pattern);
+		$pattern=$this->getDateFormat();
+		$pattern=str_replace(array('MMMM', 'MMM'), array('MM', 'MM'), $pattern);
+		$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter', $pattern);
 		return $formatter->parse($this->getText());
 	}
 
@@ -660,12 +660,12 @@ 
 	 * @param array list of selection options
 	 * @param mixed selected key.
 	 */
-	private function renderDropDownListOptions($writer,$options,$selected=null)
+	private function renderDropDownListOptions($writer, $options, $selected=null)
 	{
 		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);
@@ -680,7 +680,7 @@ 
 	 */
 	protected function renderCalendarDayOptions($writer, $selected=null)
 	{
-		$days = $this->getDropDownDayOptions();
+		$days=$this->getDropDownDayOptions();
 		$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');
@@ -696,13 +696,13 @@ 
 	 */
 	protected function getDropDownDayOptions()
 	{
-		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',
+		$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter',
 						$this->getDateFormat());
-		$days = array();
-		$requiresPadding = $formatter->getDayPattern() === 'dd';
-		for($i=1;$i<=31;$i++)
+		$days=array();
+		$requiresPadding=$formatter->getDayPattern()==='dd';
+		for($i=1; $i <= 31; $i++)
 		{
-			$days[$i] = $requiresPadding ? str_pad($i, 2, '0', STR_PAD_LEFT) : $i;
+			$days[$i]=$requiresPadding ? str_pad($i, 2, '0', STR_PAD_LEFT) : $i;
 		}
 		return $days;
 	}
@@ -714,7 +714,7 @@ 
 	 */
 	protected function renderCalendarMonthOptions($writer, $selected=null)
 	{
-		$info = $this->getLocalizedCalendarInfo();
+		$info=$this->getLocalizedCalendarInfo();
 		$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');
@@ -722,7 +722,7 @@ 
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer,
-					$this->getLocalizedMonthNames($info), $selected-1);
+					$this->getLocalizedMonthNames($info), $selected - 1);
 		$writer->renderEndTag();
 	}
 
@@ -735,18 +735,18 @@ 
 	 */
 	protected function getLocalizedMonthNames($info)
 	{
-		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',
+		$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter',
 						$this->getDateFormat());
 		switch($formatter->getMonthPattern())
 		{
 			case 'MMM': return $info->getAbbreviatedMonthNames();
 			case 'MM':
-				$array = array();
-				for($i=1;$i<=12;$i++)
-						$array[$i-1] = $i < 10 ? '0'.$i : $i;
+				$array=array();
+				for($i=1; $i <= 12; $i++)
+						$array[$i - 1]=$i < 10 ? '0'.$i : $i;
 				return $array;
 			case 'M':
-				$array = array(); for($i=1;$i<=12;$i++) $array[$i-1] = $i;
+				$array=array(); for($i=1; $i <= 12; $i++) $array[$i - 1]=$i;
 				return $array;
 			default :	return $info->getMonthNames();
 		}
@@ -759,9 +759,9 @@ 
 	 */
 	protected function renderCalendarYearOptions($writer, $selected=null)
 	{
-		$years = array();
-		for($i = $this->getFromYear(); $i <= $this->getUpToYear(); $i++)
-			$years[$i] = $i;
+		$years=array();
+		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');
@@ -790,7 +790,7 @@ 
 		$writer->addAttribute('id', $this->getDatePickerButtonID());
 		$writer->addAttribute('type', 'button');
 		$writer->addAttribute('class', $this->getCssClass().' TDatePickerButton');
-		$writer->addAttribute('value',$this->getButtonText());
+		$writer->addAttribute('value', $this->getButtonText());
 		if(!$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->renderBeginTag("input");
@@ -803,8 +803,8 @@ 
 	 */
 	 protected function renderImageButtonDatePicker($writer)
 	{
-		$url = $this->getButtonImageUrl();
-		$url = empty($url) ? $this->getAssetUrl('calendar.png') : $url;
+		$url=$this->getButtonImageUrl();
+		$url=empty($url) ? $this->getAssetUrl('calendar.png') : $url;
 		$writer->addAttribute('id', $this->getDatePickerButtonID());
 		$writer->addAttribute('src', $url);
 		$writer->addAttribute('alt', ' ');
@@ -823,7 +823,7 @@ 
 	 */
 	protected function getAssetUrl($file='')
 	{
-		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
+		$base=$this->getPage()->getClientScript()->getPradoScriptAssetUrl();
 		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
 	}
 
@@ -833,8 +833,8 @@ 
 	 */
 	protected function publishCalendarStyle()
 	{
-		$url = $this->getAssetUrl($this->getCalendarStyle().'.css');
-		$cs = $this->getPage()->getClientScript();
+		$url=$this->getAssetUrl($this->getCalendarStyle().'.css');
+		$cs=$this->getPage()->getClientScript();
 		if(!$cs->isStyleSheetFileRegistered($url))
 			$cs->registerStyleSheetFile($url, $url);
 		return $url;
@@ -847,7 +847,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 	}
 
 	/**
@@ -857,7 +857,7 @@ 
 	{
 		if($this->getShowCalendar())
 		{
-			$cs = $this->getPage()->getClientScript();
+			$cs=$this->getPage()->getClientScript();
 			$cs->registerPradoScript("datepicker");
 		}
 	}
@@ -866,16 +866,16 @@ 
 	{
 		if($this->getShowCalendar())
 		{
-			$cs = $this->getPage()->getClientScript();
+			$cs=$this->getPage()->getClientScript();
 			if(!$cs->isEndScriptRegistered('TDatePicker.spacer'))
 			{
-				$spacer = $this->getAssetUrl('spacer.gif');
-				$code = "Prado.WebUI.TDatePicker.spacer = '$spacer';";
+				$spacer=$this->getAssetUrl('spacer.gif');
+				$code="Prado.WebUI.TDatePicker.spacer = '$spacer';";
 				$cs->registerEndScript('TDatePicker.spacer', $code);
 			}
 
-			$options = TJavaScript::encode($this->getDatePickerOptions());
-			$code = "new Prado.WebUI.TDatePicker($options);";
+			$options=TJavaScript::encode($this->getDatePickerOptions());
+			$code="new Prado.WebUI.TDatePicker($options);";
 			$cs->registerEndScript("prado:".$this->getClientID(), $code);
 		}
 	}

Braces +2 added lines, -4 removed lines

@@ -189,8 +189,7 @@ 
 				return file_put_contents($fileName,file_get_contents($this->_localName))!==false;
 			else
 				return false;
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -211,8 +210,7 @@ 
 			$this->_errorCode=$_FILES[$key]['error'];
 			$this->_localName=$_FILES[$key]['tmp_name'];
 			return $this->_dataChanged=true;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Web/UI/WebControls/TEditCommandColumn.php

Doc Comments +5 added lines, -1 removed lines

@@ -234,7 +234,11 @@
 	 * @param string button caption
 	 * @param boolean whether the button should cause validation
 	 * @param string the validation group that the button belongs to
-	 * @return mixed the newly created button.
+	 * @param string $commandName
+	 * @param string $text
+	 * @param boolean $causesValidation
+	 * @param string $validationGroup
+	 * @return TComponent the newly created button.
 	 */
 	protected function createButton($commandName,$text,$causesValidation,$validationGroup)
 	{

Braces +2 added lines, -4 removed lines

@@ -211,8 +211,7 @@ 
 			$button=$this->createButton('Edit',$this->getEditText(),false,'');
 			$cell->getControls()->add($button);
 			$cell->registerObject('EditButton',$button);
-		}
-		else if($itemType===TListItemType::EditItem)
+		} else if($itemType===TListItemType::EditItem)
 		{
 			$controls=$cell->getControls();
 			$button=$this->createButton('Update',$this->getUpdateText(),$this->getCausesValidation(),$this->getValidationGroup());
@@ -222,8 +221,7 @@ 
 			$button=$this->createButton('Cancel',$this->getCancelText(),false,'');
 			$controls->add($button);
 			$cell->registerObject('CancelButton',$button);
-		}
-		else
+		} else
 			parent::initializeCell($cell,$columnIndex,$itemType);
 	}
 

Spacing +29 added lines, -29 removed lines

@@ -56,7 +56,7 @@ 
 	 */
 	public function getButtonType()
 	{
-		return $this->getViewState('ButtonType',TButtonColumnType::LinkButton);
+		return $this->getViewState('ButtonType', TButtonColumnType::LinkButton);
 	}
 
 	/**
@@ -64,7 +64,7 @@ 
 	 */
 	public function setButtonType($value)
 	{
-		$this->setViewState('ButtonType',TPropertyValue::ensureEnum($value,'TButtonColumnType'),TButtonColumnType::LinkButton);
+		$this->setViewState('ButtonType', TPropertyValue::ensureEnum($value, 'TButtonColumnType'), TButtonColumnType::LinkButton);
 	}
 
 	/**
@@ -72,7 +72,7 @@ 
 	 */
 	public function getEditText()
 	{
-		return $this->getViewState('EditText','Edit');
+		return $this->getViewState('EditText', 'Edit');
 	}
 
 	/**
@@ -80,7 +80,7 @@ 
 	 */
 	public function setEditText($value)
 	{
-		$this->setViewState('EditText',$value,'Edit');
+		$this->setViewState('EditText', $value, 'Edit');
 	}
 
 	/**
@@ -88,7 +88,7 @@ 
 	 */
 	public function getEditImageUrl()
 	{
-		return $this->getViewState('EditImageUrl','');
+		return $this->getViewState('EditImageUrl', '');
 	}
 
 	/**
@@ -96,7 +96,7 @@ 
 	 */
 	public function setEditImageUrl($value)
 	{
-		$this->setViewState('EditImageUrl',$value,'');
+		$this->setViewState('EditImageUrl', $value, '');
 	}
 
 	/**
@@ -104,7 +104,7 @@ 
 	 */
 	public function getUpdateText()
 	{
-		return $this->getViewState('UpdateText','Update');
+		return $this->getViewState('UpdateText', 'Update');
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 	 */
 	public function setUpdateText($value)
 	{
-		$this->setViewState('UpdateText',$value,'Update');
+		$this->setViewState('UpdateText', $value, 'Update');
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 	 */
 	public function getUpdateImageUrl()
 	{
-		return $this->getViewState('UpdateImageUrl','');
+		return $this->getViewState('UpdateImageUrl', '');
 	}
 
 	/**
@@ -128,7 +128,7 @@ 
 	 */
 	public function setUpdateImageUrl($value)
 	{
-		$this->setViewState('UpdateImageUrl',$value,'');
+		$this->setViewState('UpdateImageUrl', $value, '');
 	}
 
 	/**
@@ -136,7 +136,7 @@ 
 	 */
 	public function getCancelText()
 	{
-		return $this->getViewState('CancelText','Cancel');
+		return $this->getViewState('CancelText', 'Cancel');
 	}
 
 	/**
@@ -144,7 +144,7 @@ 
 	 */
 	public function setCancelText($value)
 	{
-		$this->setViewState('CancelText',$value,'Cancel');
+		$this->setViewState('CancelText', $value, 'Cancel');
 	}
 
 	/**
@@ -152,7 +152,7 @@ 
 	 */
 	public function getCancelImageUrl()
 	{
-		return $this->getViewState('CancelImageUrl','');
+		return $this->getViewState('CancelImageUrl', '');
 	}
 
 	/**
@@ -160,7 +160,7 @@ 
 	 */
 	public function setCancelImageUrl($value)
 	{
-		$this->setViewState('CancelImageUrl',$value,'');
+		$this->setViewState('CancelImageUrl', $value, '');
 	}
 
 	/**
@@ -168,7 +168,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -204,27 +204,27 @@ 
 	 * @param integer the index to the Columns property that the cell resides in.
 	 * @param string the type of cell (Header,Footer,Item,AlternatingItem,EditItem,SelectedItem)
 	 */
-	public function initializeCell($cell,$columnIndex,$itemType)
+	public function initializeCell($cell, $columnIndex, $itemType)
 	{
 		if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::SelectedItem)
 		{
-			$button=$this->createButton('Edit',$this->getEditText(),false,'');
+			$button=$this->createButton('Edit', $this->getEditText(), false, '');
 			$cell->getControls()->add($button);
-			$cell->registerObject('EditButton',$button);
+			$cell->registerObject('EditButton', $button);
 		}
 		else if($itemType===TListItemType::EditItem)
 		{
 			$controls=$cell->getControls();
-			$button=$this->createButton('Update',$this->getUpdateText(),$this->getCausesValidation(),$this->getValidationGroup());
+			$button=$this->createButton('Update', $this->getUpdateText(), $this->getCausesValidation(), $this->getValidationGroup());
 			$controls->add($button);
-			$cell->registerObject('UpdateButton',$button);
+			$cell->registerObject('UpdateButton', $button);
 			$controls->add(' ');
-			$button=$this->createButton('Cancel',$this->getCancelText(),false,'');
+			$button=$this->createButton('Cancel', $this->getCancelText(), false, '');
 			$controls->add($button);
-			$cell->registerObject('CancelButton',$button);
+			$cell->registerObject('CancelButton', $button);
 		}
 		else
-			parent::initializeCell($cell,$columnIndex,$itemType);
+			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
 	/**
@@ -236,7 +236,7 @@ 
 	 * @param string the validation group that the button belongs to
 	 * @return mixed the newly created button.
 	 */
-	protected function createButton($commandName,$text,$causesValidation,$validationGroup)
+	protected function createButton($commandName, $text, $causesValidation, $validationGroup)
 	{
 		if($this->getButtonType()===TButtonColumnType::LinkButton)
 			$button=Prado::createComponent('System.Web.UI.WebControls.TLinkButton');
@@ -245,9 +245,9 @@ 
 		else	// image buttons
 		{
 			$button=Prado::createComponent('System.Web.UI.WebControls.TImageButton');
-			if(strcasecmp($commandName,'Update')===0)
+			if(strcasecmp($commandName, 'Update')===0)
 				$url=$this->getUpdateImageUrl();
-			else if(strcasecmp($commandName,'Cancel')===0)
+			else if(strcasecmp($commandName, 'Cancel')===0)
 				$url=$this->getCancelImageUrl();
 			else
 				$url=$this->getEditImageUrl();

framework/Web/UI/WebControls/TEmailAddressValidator.php

Doc Comments +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
 	/**
 	 * Returns an array of javascript validator options.
-	 * @return array javascript validator options.
+	 * @return boolean javascript validator options.
 	 */
 	public function evaluateIsValid()
 	{

Braces +1 added lines, -2 removed lines

@@ -70,8 +70,7 @@
 				{
 					$domain=substr($value,$pos+1);
 					return $domain===''?false:checkdnsrr($domain,'MX');
-				}
-				else
+				} else
 					return false;
 			}
 		}

Spacing +7 added lines, -7 removed lines

@@ -50,7 +50,7 @@ 
 	public function getRegularExpression()
 	{
 		$regex=parent::getRegularExpression();
-		return $regex===''?self::EMAIL_REGEXP:$regex;
+		return $regex==='' ? self::EMAIL_REGEXP : $regex;
 	}
 
 	/**
@@ -60,16 +60,16 @@ 
 	public function evaluateIsValid()
 	{
 		$value=$this->getValidationValue($this->getValidationTarget());
-		$valid=$valid=is_string($value) && strlen($value)<=254 && parent::evaluateIsValid();
+		$valid=$valid=is_string($value) && strlen($value) <= 254 && parent::evaluateIsValid();
 
 		if($valid && $this->getCheckMXRecord() && function_exists('checkdnsrr'))
 		{
 			if($value!=='')
 			{
-				if(($pos=strpos($value,'@'))!==false)
+				if(($pos=strpos($value, '@'))!==false)
 				{
-					$domain=substr($value,$pos+1);
-					return $domain===''?false:checkdnsrr($domain,'MX');
+					$domain=substr($value, $pos + 1);
+					return $domain==='' ? false : checkdnsrr($domain, 'MX');
 				}
 				else
 					return false;
@@ -83,7 +83,7 @@ 
 	 */
 	public function getCheckMXRecord()
 	{
-		return $this->getViewState('CheckMXRecord',false);
+		return $this->getViewState('CheckMXRecord', false);
 	}
 
 	/**
@@ -92,7 +92,7 @@ 
 	 */
 	public function setCheckMXRecord($value)
 	{
-		$this->setViewState('CheckMXRecord',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('CheckMXRecord', TPropertyValue::ensureBoolean($value), false);
 	}
 }
 

framework/Web/UI/WebControls/TFileUpload.php

Doc Comments +3 added lines, -1 removed lines

@@ -177,6 +177,7 @@ 
 	 * @param string the file name used to save the uploaded file
 	 * @param boolean whether to delete the temporary file after saving.
 	 * If true, you will not be able to save the uploaded file again.
+	 * @param string $fileName
 	 * @return boolean true if the file saving is successful
 	 */
 	public function saveAs($fileName,$deleteTempFile=true)
@@ -199,6 +200,7 @@ 
 	 * This method is primarly used by framework developers.
 	 * @param string the key that can be used to retrieve data from the input data collection
 	 * @param array the input data collection
+	 * @param boolean $key
 	 * @return boolean whether the data of the control has been changed
 	 */
 	public function loadPostData($key,$values)
@@ -251,7 +253,7 @@ 
 	/**
 	 * Returns the original file name as the property value to be validated.
 	 * This method is required by IValidatable property.
-	 * @return mixed the property value to be validated
+	 * @return string the property value to be validated
 	 */
 	public function getValidationPropertyValue()
 	{

Indentation +2 added lines, -2 removed lines

@@ -463,14 +463,14 @@
 	 */
 	public function getIsValid()
 	{
-	    return $this->_isValid;
+		return $this->_isValid;
 	}
 	/**
 	 * @param bool wether this control is valid.
 	 */
 	public function setIsValid($value)
 	{
-	    $this->_isValid=TPropertyValue::ensureBoolean($value);
+		$this->_isValid=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**

Braces +2 added lines, -4 removed lines

@@ -189,8 +189,7 @@ 
 				return file_put_contents($fileName,file_get_contents($this->_localName))!==false;
 			else
 				return false;
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -211,8 +210,7 @@ 
 			$this->_errorCode=$_FILES[$key]['error'];
 			$this->_localName=$_FILES[$key]['tmp_name'];
 			return $this->_dataChanged=true;
-		}
-		else
+		} else
 			return false;
 	}
 

Spacing +11 added lines, -11 removed lines

@@ -76,11 +76,11 @@ 
 	{
 		$this->getPage()->ensureRenderInForm($this);
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('type','file');
-		$writer->addAttribute('name',$this->getUniqueID());
+		$writer->addAttribute('type', 'file');
+		$writer->addAttribute('name', $this->getUniqueID());
 		$isEnabled=$this->getEnabled(true);
 		if(!$isEnabled && $this->getEnabled())  // in this case parent will not render 'disabled'
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 	}
 
 	/**
@@ -93,7 +93,7 @@ 
 		parent::onPreRender($param);
 		if(($form=$this->getPage()->getForm())!==null)
 			$form->setEnctype('multipart/form-data');
-		$this->getPage()->getClientScript()->registerHiddenField('MAX_FILE_SIZE',$this->getMaxFileSize());
+		$this->getPage()->getClientScript()->registerHiddenField('MAX_FILE_SIZE', $this->getMaxFileSize());
 		if($this->getEnabled(true))
 			$this->getPage()->registerRequiresPostData($this);
 	}
@@ -104,7 +104,7 @@ 
 	 */
 	public function getMaxFileSize()
 	{
-		return $this->getViewState('MaxFileSize',self::MAX_FILE_SIZE);
+		return $this->getViewState('MaxFileSize', self::MAX_FILE_SIZE);
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	public function setMaxFileSize($size)
 	{
-		$this->setViewState('MaxFileSize',TPropertyValue::ensureInteger($size),self::MAX_FILE_SIZE);
+		$this->setViewState('MaxFileSize', TPropertyValue::ensureInteger($size), self::MAX_FILE_SIZE);
 	}
 
 	/**
@@ -179,14 +179,14 @@ 
 	 * If true, you will not be able to save the uploaded file again.
 	 * @return boolean true if the file saving is successful
 	 */
-	public function saveAs($fileName,$deleteTempFile=true)
+	public function saveAs($fileName, $deleteTempFile=true)
 	{
 		if($this->_errorCode===UPLOAD_ERR_OK)
 		{
 			if($deleteTempFile)
-				return move_uploaded_file($this->_localName,$fileName);
+				return move_uploaded_file($this->_localName, $fileName);
 			else if(is_uploaded_file($this->_localName))
-				return file_put_contents($fileName,file_get_contents($this->_localName))!==false;
+				return file_put_contents($fileName, file_get_contents($this->_localName))!==false;
 			else
 				return false;
 		}
@@ -201,7 +201,7 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the control has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
 		if(isset($_FILES[$key]))
 		{
@@ -235,7 +235,7 @@ 
 	 */
 	public function onFileUpload($param)
 	{
-		$this->raiseEvent('OnFileUpload',$this,$param);
+		$this->raiseEvent('OnFileUpload', $this, $param);
 	}
 
 	/**

framework/Web/UI/WebControls/TFlushOutput.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	}
 
 	/**
-	 * @return Tells whether buffering of output can continue after this point
+	 * @return boolean whether buffering of output can continue after this point
 	 */
 	public function getContinueBuffering()
 	{

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
 	public function __construct()
 	{
 		parent::__construct();
-		$this->EnableViewState = false;
+		$this->EnableViewState=false;
 	}
 
 	/**
@@ -61,7 +61,7 @@ 
 	 */
 	public function setContinueBuffering($value)
 	{
-		$this->_continueBuffering = TPropertyValue::ensureBoolean($value);
+		$this->_continueBuffering=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -73,7 +73,7 @@ 
 //$writer->write('<!-- flush -->');
 		// ajax responses can't be parsed by the client side before loaded and returned completely,
 		// so don't bother with flushing output somewhere mid-page if refreshing in a callback
-		if (!$this->Page->IsCallback)
+		if(!$this->Page->IsCallback)
 		{
 			$this->Page->flushWriter();
 //			$this->Application->flushOutput($this->ContinueBuffering);

framework/Web/UI/WebControls/THtmlArea4.php

Doc Comments +2 added lines

@@ -422,6 +422,7 @@ 
 
 	/**
 	 * Parse additional options set in the Options property.
+	 * @param string $string
 	 * @return array additional custom options
 	 */
 	protected function parseEditorOptions($string)
@@ -446,6 +447,7 @@ 
 	}
 
 	/**
+	 * @param string $culture
 	 * @return string localized editor interface language extension.
 	 */
 	protected function getLanguageSuffix($culture)

Spacing +43 added lines, -43 removed lines

@@ -60,7 +60,7 @@ 
 	/**
 	 * @var array list of locale => language file pairs.
 	 */
-	private static $_langs = array(
+	private static $_langs=array(
 			'ar' => 'ar',
 			'bg_BG' => 'bg_BG',
 			'bs' => 'bs',
@@ -118,7 +118,7 @@ 
 	/**
 	 * @var array list of default plugins to load, override using getAvailablePlugins();
 	 */
-	private static $_plugins = array(
+	private static $_plugins=array(
 		'advlist',
 		'anchor',
 		'autolink',
@@ -162,7 +162,7 @@ 
 	/**
 	 * @var array default themes to load
 	 */
-	private static $_themes = array(
+	private static $_themes=array(
 		'modern',
 	);
 
@@ -209,7 +209,7 @@ 
 	 */
 	public function getEnableVisualEdit()
 	{
-		return $this->getViewState('EnableVisualEdit',true);
+		return $this->getViewState('EnableVisualEdit', true);
 	}
 
 	/**
@@ -218,7 +218,7 @@ 
 	 */
 	public function setEnableVisualEdit($value)
 	{
-		$this->setViewState('EnableVisualEdit',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableVisualEdit', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -303,7 +303,7 @@ 
 	{
 		if($this->getEnableVisualEdit() && $this->getEnabled(true))
 		{
-			$writer->addAttribute('id',$this->getClientID());
+			$writer->addAttribute('id', $this->getClientID());
 			$this->registerEditorClientScript($writer);
 		}
 
@@ -338,7 +338,7 @@ 
 
 	protected function loadJavascriptLibrary()
 	{
-		$scripts = $this->getPage()->getClientScript();
+		$scripts=$this->getPage()->getClientScript();
 		$scripts->registerPradoScript('htmlarea4');
 		$scripts->registerScriptFile('prado:THtmlArea4', $this->getScriptUrl());
 	}
@@ -349,14 +349,14 @@ 
 	protected function registerEditorClientScript($writer)
 	{
 		$this->loadJavascriptLibrary();
-		$scripts = $this->getPage()->getClientScript();
-		$options = array(
+		$scripts=$this->getPage()->getClientScript();
+		$options=array(
 			'EditorOptions' => $this->getEditorOptions()
 		);
 
-		$options = TJavaScript::encode($options,true,true);
-		$script = "new {$this->getClientClassName()}($options)";
-		$scripts->registerEndScript('prado:THtmlArea4'.$this->ClientID,$script);
+		$options=TJavaScript::encode($options, true, true);
+		$script="new {$this->getClientClassName()}($options)";
+		$scripts->registerEndScript('prado:THtmlArea4'.$this->ClientID, $script);
 	}
 
 	/**
@@ -373,19 +373,19 @@ 
 	 */
 	protected function getScriptDeploymentPath()
 	{
-		$basedir = Prado::getPathOfNamespace('System.Web.Javascripts.source.tinymce-405');
-		$url = $this->getApplication()->getAssetManager()->publishFilePath($basedir);
+		$basedir=Prado::getPathOfNamespace('System.Web.Javascripts.source.tinymce-405');
+		$url=$this->getApplication()->getAssetManager()->publishFilePath($basedir);
 		$this->copyCustomPlugins($url);
 		return $url;
 	}
 
 	protected function copyCustomPlugins($url)
 	{
-		if($plugins = $this->getCustomPluginPath())
+		if($plugins=$this->getCustomPluginPath())
 		{
-			$assets = $this->getApplication()->getAssetManager();
-			$path = is_dir($plugins) ? $plugins : Prado::getPathOfNameSpace($plugins);
-			$dest = $assets->getBasePath().'/'.basename($url).'/plugins/';
+			$assets=$this->getApplication()->getAssetManager();
+			$path=is_dir($plugins) ? $plugins : Prado::getPathOfNameSpace($plugins);
+			$dest=$assets->getBasePath().'/'.basename($url).'/plugins/';
 			if(!is_dir($dest) || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 				$assets->copyDirectory($path, $dest);
 		}
@@ -397,26 +397,26 @@ 
 	 */
 	protected function getEditorOptions()
 	{
-		$options['mode'] = 'exact';
-		$options['elements'] = $this->getClientID();
-		$options['language'] = $this->getLanguageSuffix($this->getCulture());
+		$options['mode']='exact';
+		$options['elements']=$this->getClientID();
+		$options['language']=$this->getLanguageSuffix($this->getCulture());
 		//$options['theme'] = 'modern'; //default
 		// mimic previous (tinyMCE3) sizing behaviour
-		$options['width'] = $this->getWidth();
-		$options['height'] = $this->getHeight();
-		$options['resize'] = 'both';
-		$options['menubar'] = false;
+		$options['width']=$this->getWidth();
+		$options['height']=$this->getHeight();
+		$options['resize']='both';
+		$options['menubar']=false;
 		if($this->getReadOnly())
 		{
-			$options['readonly'] = true;
-			$options['toolbar'] = false;
-			$options['menubar'] = false;
-			$options['statusbar'] = false;
+			$options['readonly']=true;
+			$options['toolbar']=false;
+			$options['menubar']=false;
+			$options['statusbar']=false;
 		}
 
-		$options['extended_valid_elements'] = 'a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]';
+		$options['extended_valid_elements']='a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]';
 
-		$options = array_merge($options, $this->parseEditorOptions($this->getOptions()));
+		$options=array_merge($options, $this->parseEditorOptions($this->getOptions()));
 		return $options;
 	}
 
@@ -426,20 +426,20 @@ 
 	 */
 	protected function parseEditorOptions($string)
 	{
-		$options = array();
-		$substrings = preg_split('/,\s*\n|\n/', trim($string));
+		$options=array();
+		$substrings=preg_split('/,\s*\n|\n/', trim($string));
 		foreach($substrings as $bits)
 		{
-			$option = explode(":",$bits,2);
+			$option=explode(":", $bits, 2);
 
-			if(count($option) == 2)
+			if(count($option)==2)
 			{
-				$value=trim(trim($option[1]),"'\"");
-				if (($s=strtolower($value))==='false')
+				$value=trim(trim($option[1]), "'\"");
+				if(($s=strtolower($value))==='false')
 					$value=false;
-				elseif ($s==='true')
+				elseif($s==='true')
 					$value=true;
-				$options[trim($option[0])] = $value;
+				$options[trim($option[0])]=$value;
 			}
 		}
 		return $options;
@@ -450,12 +450,12 @@ 
 	 */
 	protected function getLanguageSuffix($culture)
 	{
-		$app = $this->getApplication()->getGlobalization();
+		$app=$this->getApplication()->getGlobalization();
 		if(empty($culture) && ($app!==null))
-			$culture = $app->getCulture();
-		$variants = array();
+			$culture=$app->getCulture();
+		$variants=array();
 		if($app!==null)
-			$variants = $app->getCultureVariants($culture);
+			$variants=$app->getCultureVariants($culture);
 
 		foreach($variants as $variant)
 		{

framework/Web/UI/WebControls/THyperLink.php

Doc Comments +2 added lines

@@ -147,6 +147,7 @@ 
 	/**
 	 * Sets the height of the image in the THyperLink
 	 * @param string height of the image in the THyperLink
+	 * @param string $value
 	 */
 	public function setImageHeight($value)
 	{
@@ -181,6 +182,7 @@ 
 	/**
 	 * Sets the width of the image in the THyperLink
 	 * @param string width of the image
+	 * @param string $value
 	 */
 	public function setImageWidth($value)
 	{

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

Spacing +17 added lines, -17 removed lines

@@ -46,12 +46,12 @@ 
 	{
 		$isEnabled=$this->getEnabled(true);
 		if($this->getEnabled() && !$isEnabled)
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 		parent::addAttributesToRender($writer);
 		if(($url=$this->getNavigateUrl())!=='' && $isEnabled)
-			$writer->addAttribute('href',$url);
+			$writer->addAttribute('href', $url);
 		if(($target=$this->getTarget())!=='')
-			$writer->addAttribute('target',$target);
+			$writer->addAttribute('target', $target);
 	}
 
 	/**
@@ -104,7 +104,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -113,7 +113,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 */
 	public function getImageAlign()
 	{
-		return $this->getViewState('ImageAlign','');
+		return $this->getViewState('ImageAlign', '');
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 	 */
 	public function setImageAlign($value)
 	{
-		$this->setViewState('ImageAlign',$value,'');
+		$this->setViewState('ImageAlign', $value, '');
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	 */
 	public function getImageHeight()
 	{
-		return $this->getViewState('ImageHeight','');
+		return $this->getViewState('ImageHeight', '');
 	}
 
 	/**
@@ -150,7 +150,7 @@ 
 	 */
 	public function setImageHeight($value)
 	{
-		$this->setViewSTate('ImageHeight',$value,'');
+		$this->setViewSTate('ImageHeight', $value, '');
 	}
 
 	/**
@@ -158,7 +158,7 @@ 
 	 */
 	public function getImageUrl()
 	{
-		return $this->getViewState('ImageUrl','');
+		return $this->getViewState('ImageUrl', '');
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		$this->setViewState('ImageUrl',$value,'');
+		$this->setViewState('ImageUrl', $value, '');
 	}
 
 	/**
@@ -175,7 +175,7 @@ 
 	 */
 	public function getImageWidth()
 	{
-		return $this->getViewState('ImageWidth','');
+		return $this->getViewState('ImageWidth', '');
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	 */
 	public function setImageWidth($value)
 	{
-		$this->setViewState('ImageWidth',$value,'');
+		$this->setViewState('ImageWidth', $value, '');
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	 */
 	public function getNavigateUrl()
 	{
-		return $this->getViewState('NavigateUrl','');
+		return $this->getViewState('NavigateUrl', '');
 	}
 
 	/**
@@ -201,7 +201,7 @@ 
 	 */
 	public function setNavigateUrl($value)
 	{
-		$this->setViewState('NavigateUrl',$value,'');
+		$this->setViewState('NavigateUrl', $value, '');
 	}
 
 	/**
@@ -235,7 +235,7 @@ 
 	 */
 	public function getTarget()
 	{
-		return $this->getViewState('Target','');
+		return $this->getViewState('Target', '');
 	}
 
 	/**
@@ -244,7 +244,7 @@ 
 	 */
 	public function setTarget($value)
 	{
-		$this->setViewState('Target',$value,'');
+		$this->setViewState('Target', $value, '');
 	}
 }
 

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * THyperLink class file.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link http://www.xisc.com/
- * @copyright Copyright &copy; 2005-2016 The PRADO Group
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- * @package System.Web.UI.WebControls
- */
+	 * THyperLink class file.
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link http://www.xisc.com/
+	 * @copyright Copyright &copy; 2005-2016 The PRADO Group
+	 * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+	 * @package System.Web.UI.WebControls
+	 */
 
 /**
  * THyperLink class

framework/Web/UI/WebControls/TImageMap.php

Doc Comments +3 added lines

@@ -212,6 +212,7 @@ 
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handler can be invoked.
 	 * @param TImageMapEventParameter event parameter to be passed to the event handlers
+	 * @param TImageMapEventParameter $param
 	 */
 	public function onClick($param)
 	{
@@ -303,6 +304,7 @@ 
 	 * that must be kept in viewstate.
 	 * @param string the name of the viewstate value to be returned
 	 * @param mixed the default value. If $key is not found in viewstate, $defaultValue will be returned
+	 * @param string $key
 	 * @return mixed the viewstate value corresponding to $key
 	 */
 	protected function getViewState($key,$defaultValue=null)
@@ -319,6 +321,7 @@ 
 	 * @param string the name of the viewstate value
 	 * @param mixed the viewstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from the viewstate.
+	 * @param string $key
 	 */
 	protected function setViewState($key,$value,$defaultValue=null)
 	{

Spacing +77 added lines, -77 removed lines

@@ -59,13 +59,13 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		if($this->getHotSpots()->getCount()>0)
+		if($this->getHotSpots()->getCount() > 0)
 		{
-			$writer->addAttribute('usemap','#'.self::MAP_NAME_PREFIX.$this->getClientID());
-			$writer->addAttribute('id',$this->getUniqueID());
+			$writer->addAttribute('usemap', '#'.self::MAP_NAME_PREFIX.$this->getClientID());
+			$writer->addAttribute('id', $this->getUniqueID());
 		}
 		if($this->getEnabled() && !$this->getEnabled(true))
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 	}
 
 	/**
@@ -78,20 +78,20 @@ 
 
 		$hotspots=$this->getHotSpots();
 
-		if($hotspots->getCount()>0)
+		if($hotspots->getCount() > 0)
 		{
 			$clientID=$this->getClientID();
 			$cs=$this->getPage()->getClientScript();
 			$writer->writeLine();
-			$writer->addAttribute('name',self::MAP_NAME_PREFIX.$clientID);
+			$writer->addAttribute('name', self::MAP_NAME_PREFIX.$clientID);
 			$writer->renderBeginTag('map');
 			$writer->writeLine();
 			if(($mode=$this->getHotSpotMode())===THotSpotMode::NotSet)
 				$mode=THotSpotMode::Navigate;
 			$target=$this->getTarget();
 			$i=0;
-			$options['EventTarget'] = $this->getUniqueID();
-			$options['StopEvent'] = true;
+			$options['EventTarget']=$this->getUniqueID();
+			$options['StopEvent']=true;
 			$cs=$this->getPage()->getClientScript();
 			foreach($hotspots as $hotspot)
 			{
@@ -102,13 +102,13 @@ 
 				if($hotspot->getHotSpotMode()===THotSpotMode::PostBack)
 				{
 					$id=$clientID.'_'.$i;
-					$writer->addAttribute('id',$id);
-					$writer->addAttribute('href','#'.$id); //create unique no-op url references
+					$writer->addAttribute('id', $id);
+					$writer->addAttribute('href', '#'.$id); //create unique no-op url references
 					$options['ID']=$id;
 					$options['EventParameter']="$i";
 					$options['CausesValidation']=$hotspot->getCausesValidation();
 					$options['ValidationGroup']=$hotspot->getValidationGroup();
-					$cs->registerPostBackControl($this->getClientClassName(),$options);
+					$cs->registerPostBackControl($this->getClientClassName(), $options);
 				}
 				$hotspot->render($writer);
 				$writer->writeLine();
@@ -141,7 +141,7 @@ 
 		{
 			$index=TPropertyValue::ensureInteger($param);
 			$hotspots=$this->getHotSpots();
-			if($index>=0 && $index<$hotspots->getCount())
+			if($index >= 0 && $index < $hotspots->getCount())
 			{
 				$hotspot=$hotspots->itemAt($index);
 				if(($mode=$hotspot->getHotSpotMode())===THotSpotMode::NotSet)
@@ -163,7 +163,7 @@ 
 	 */
 	public function getHotSpotMode()
 	{
-		return $this->getViewState('HotSpotMode',THotSpotMode::NotSet);
+		return $this->getViewState('HotSpotMode', THotSpotMode::NotSet);
 	}
 
 	/**
@@ -174,7 +174,7 @@ 
 	 */
 	public function setHotSpotMode($value)
 	{
-		$this->setViewState('HotSpotMode',TPropertyValue::ensureEnum($value,'THotSpotMode'),THotSpotMode::NotSet);
+		$this->setViewState('HotSpotMode', TPropertyValue::ensureEnum($value, 'THotSpotMode'), THotSpotMode::NotSet);
 	}
 
 	/**
@@ -182,10 +182,10 @@ 
 	 */
 	public function getHotSpots()
 	{
-		if(($hotspots=$this->getViewState('HotSpots',null))===null)
+		if(($hotspots=$this->getViewState('HotSpots', null))===null)
 		{
 			$hotspots=new THotSpotCollection;
-			$this->setViewState('HotSpots',$hotspots);
+			$this->setViewState('HotSpots', $hotspots);
 		}
 		return $hotspots;
 	}
@@ -195,7 +195,7 @@ 
 	 */
 	public function getTarget()
 	{
-		return $this->getViewState('Target','');
+		return $this->getViewState('Target', '');
 	}
 
 	/**
@@ -203,7 +203,7 @@ 
 	 */
 	public function setTarget($value)
 	{
-		$this->setViewState('Target',TPropertyValue::ensureString($value),'');
+		$this->setViewState('Target', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -215,7 +215,7 @@ 
 	 */
 	public function onClick($param)
 	{
-		$this->raiseEvent('OnClick',$this,$param);
+		$this->raiseEvent('OnClick', $this, $param);
 	}
 }
 
@@ -271,10 +271,10 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a THotSpot.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof THotSpot)
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('hotspotcollection_hotspot_required');
 	}
@@ -305,9 +305,9 @@ 
 	 * @param mixed the default value. If $key is not found in viewstate, $defaultValue will be returned
 	 * @return mixed the viewstate value corresponding to $key
 	 */
-	protected function getViewState($key,$defaultValue=null)
+	protected function getViewState($key, $defaultValue=null)
 	{
-		return isset($this->_viewState[$key])?$this->_viewState[$key]:$defaultValue;
+		return isset($this->_viewState[$key]) ? $this->_viewState[$key] : $defaultValue;
 	}
 
 	/**
@@ -320,7 +320,7 @@ 
 	 * @param mixed the viewstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from the viewstate.
 	 */
-	protected function setViewState($key,$value,$defaultValue=null)
+	protected function setViewState($key, $value, $defaultValue=null)
 	{
 		if($value===$defaultValue)
 			unset($this->_viewState[$key]);
@@ -342,7 +342,7 @@ 
 	 */
 	public function getAccessKey()
 	{
-		return $this->getViewState('AccessKey','');
+		return $this->getViewState('AccessKey', '');
 	}
 
 	/**
@@ -350,7 +350,7 @@ 
 	 */
 	public function setAccessKey($value)
 	{
-		$this->setViewState('AccessKey',TPropertyValue::ensureString($value),'');
+		$this->setViewState('AccessKey', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -358,7 +358,7 @@ 
 	 */
 	public function getAlternateText()
 	{
-		return $this->getViewState('AlternateText','');
+		return $this->getViewState('AlternateText', '');
 	}
 
 	/**
@@ -366,7 +366,7 @@ 
 	 */
 	public function setAlternateText($value)
 	{
-		$this->setViewState('AlternateText',TPropertyValue::ensureString($value),'');
+		$this->setViewState('AlternateText', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -374,7 +374,7 @@ 
 	 */
 	public function getHotSpotMode()
 	{
-		return $this->getViewState('HotSpotMode',THotSpotMode::NotSet);
+		return $this->getViewState('HotSpotMode', THotSpotMode::NotSet);
 	}
 
 	/**
@@ -382,7 +382,7 @@ 
 	 */
 	public function setHotSpotMode($value)
 	{
-		$this->setViewState('HotSpotMode',TPropertyValue::ensureEnum($value,'THotSpotMode'),THotSpotMode::NotSet);
+		$this->setViewState('HotSpotMode', TPropertyValue::ensureEnum($value, 'THotSpotMode'), THotSpotMode::NotSet);
 	}
 
 	/**
@@ -390,7 +390,7 @@ 
 	 */
 	public function getNavigateUrl()
 	{
-		return $this->getViewState('NavigateUrl','');
+		return $this->getViewState('NavigateUrl', '');
 	}
 
 	/**
@@ -398,7 +398,7 @@ 
 	 */
 	public function setNavigateUrl($value)
 	{
-		$this->setViewState('NavigateUrl',TPropertyValue::ensureString($value),'');
+		$this->setViewState('NavigateUrl', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -406,7 +406,7 @@ 
 	 */
 	public function getPostBackValue()
 	{
-		return $this->getViewState('PostBackValue','');
+		return $this->getViewState('PostBackValue', '');
 	}
 
 	/**
@@ -414,7 +414,7 @@ 
 	 */
 	public function setPostBackValue($value)
 	{
-		$this->setViewState('PostBackValue',TPropertyValue::ensureString($value),'');
+		$this->setViewState('PostBackValue', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -422,7 +422,7 @@ 
 	 */
 	public function getTabIndex()
 	{
-		return $this->getViewState('TabIndex',0);
+		return $this->getViewState('TabIndex', 0);
 	}
 
 	/**
@@ -430,7 +430,7 @@ 
 	 */
 	public function setTabIndex($value)
 	{
-		$this->setViewState('TabIndex',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('TabIndex', TPropertyValue::ensureInteger($value), 0);
 	}
 
 	/**
@@ -438,7 +438,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -446,7 +446,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -454,7 +454,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -462,7 +462,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -471,7 +471,7 @@ 
 	 */
 	public function getTarget()
 	{
-		return $this->getViewState('Target','');
+		return $this->getViewState('Target', '');
 	}
 
 	/**
@@ -480,7 +480,7 @@ 
 	 */
 	public function setTarget($value)
 	{
-		$this->setViewState('Target',TPropertyValue::ensureString($value),'');
+		$this->setViewState('Target', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -488,8 +488,8 @@ 
 	 */
 	public function getHasAttributes()
 	{
-		if($attributes=$this->getViewState('Attributes',null))
-			return $attributes->getCount()>0;
+		if($attributes=$this->getViewState('Attributes', null))
+			return $attributes->getCount() > 0;
 		else
 			return false;
 	}
@@ -502,12 +502,12 @@ 
 	 */
 	public function getAttributes()
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes;
 		else
 		{
 			$attributes=new TAttributeCollection;
-			$this->setViewState('Attributes',$attributes,null);
+			$this->setViewState('Attributes', $attributes, null);
 			return $attributes;
 		}
 	}
@@ -517,7 +517,7 @@ 
 	 */
 	public function hasAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->contains($name);
 		else
 			return false;
@@ -528,7 +528,7 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->itemAt($name);
 		else
 			return null;
@@ -539,9 +539,9 @@ 
 	 * @param string attribute name
 	 * @param string value of the attribute
 	 */
-	public function setAttribute($name,$value)
+	public function setAttribute($name, $value)
 	{
-		$this->getAttributes()->add($name,$value);
+		$this->getAttributes()->add($name, $value);
 	}
 
 	/**
@@ -551,7 +551,7 @@ 
 	 */
 	public function removeAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->remove($name);
 		else
 			return null;
@@ -563,29 +563,29 @@ 
 	 */
 	public function render($writer)
 	{
-		$writer->addAttribute('shape',$this->getShape());
-		$writer->addAttribute('coords',$this->getCoordinates());
+		$writer->addAttribute('shape', $this->getShape());
+		$writer->addAttribute('coords', $this->getCoordinates());
 		if(($mode=$this->getHotSpotMode())===THotSpotMode::NotSet)
 			$mode=THotSpotMode::Navigate;
 		if($mode===THotSpotMode::Navigate)
 		{
-			$writer->addAttribute('href',$this->getNavigateUrl());
+			$writer->addAttribute('href', $this->getNavigateUrl());
 			if(($target=$this->getTarget())!=='')
-				$writer->addAttribute('target',$target);
+				$writer->addAttribute('target', $target);
 		}
 		else if($mode===THotSpotMode::Inactive)
-			$writer->addAttribute('nohref','true');
+			$writer->addAttribute('nohref', 'true');
 		$text=$this->getAlternateText();
-		$writer->addAttribute('title',$text);
-		$writer->addAttribute('alt',$text);
+		$writer->addAttribute('title', $text);
+		$writer->addAttribute('alt', $text);
 		if(($accessKey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accessKey);
+			$writer->addAttribute('accesskey', $accessKey);
 		if(($tabIndex=$this->getTabIndex())!==0)
-			$writer->addAttribute('tabindex',"$tabIndex");
+			$writer->addAttribute('tabindex', "$tabIndex");
 		if($this->getHasAttributes())
 		{
 			foreach($this->getAttributes() as $name=>$value)
-				$writer->addAttribute($name,$value);
+				$writer->addAttribute($name, $value);
 		}
 		$writer->renderBeginTag('area');
 		$writer->renderEndTag();
@@ -625,7 +625,7 @@ 
 	 */
 	public function getRadius()
 	{
-		return $this->getViewState('Radius',0);
+		return $this->getViewState('Radius', 0);
 	}
 
 	/**
@@ -633,7 +633,7 @@ 
 	 */
 	public function setRadius($value)
 	{
-		$this->setViewState('Radius',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('Radius', TPropertyValue::ensureInteger($value), 0);
 	}
 
 	/**
@@ -641,7 +641,7 @@ 
 	 */
 	public function getX()
 	{
-		return $this->getViewState('X',0);
+		return $this->getViewState('X', 0);
 	}
 
 	/**
@@ -649,7 +649,7 @@ 
 	 */
 	public function setX($value)
 	{
-		$this->setViewState('X',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('X', TPropertyValue::ensureInteger($value), 0);
 	}
 
 	/**
@@ -657,7 +657,7 @@ 
 	 */
 	public function getY()
 	{
-		return $this->getViewState('Y',0);
+		return $this->getViewState('Y', 0);
 	}
 
 	/**
@@ -665,7 +665,7 @@ 
 	 */
 	public function setY($value)
 	{
-		$this->setViewState('Y',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('Y', TPropertyValue::ensureInteger($value), 0);
 	}
 }
 
@@ -702,7 +702,7 @@ 
 	 */
 	public function getBottom()
 	{
-		return $this->getViewState('Bottom',0);
+		return $this->getViewState('Bottom', 0);
 	}
 
 	/**
@@ -710,7 +710,7 @@ 
 	 */
 	public function setBottom($value)
 	{
-		$this->setViewState('Bottom',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('Bottom', TPropertyValue::ensureInteger($value), 0);
 	}
 
 	/**
@@ -718,7 +718,7 @@ 
 	 */
 	public function getLeft()
 	{
-		return $this->getViewState('Left',0);
+		return $this->getViewState('Left', 0);
 	}
 
 	/**
@@ -726,7 +726,7 @@ 
 	 */
 	public function setLeft($value)
 	{
-		$this->setViewState('Left',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('Left', TPropertyValue::ensureInteger($value), 0);
 	}
 
 	/**
@@ -734,7 +734,7 @@ 
 	 */
 	public function getRight()
 	{
-		return $this->getViewState('Right',0);
+		return $this->getViewState('Right', 0);
 	}
 
 	/**
@@ -742,7 +742,7 @@ 
 	 */
 	public function setRight($value)
 	{
-		$this->setViewState('Right',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('Right', TPropertyValue::ensureInteger($value), 0);
 	}
 
 	/**
@@ -750,7 +750,7 @@ 
 	 */
 	public function getTop()
 	{
-		return $this->getViewState('Top',0);
+		return $this->getViewState('Top', 0);
 	}
 
 	/**
@@ -758,7 +758,7 @@ 
 	 */
 	public function setTop($value)
 	{
-		$this->setViewState('Top',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('Top', TPropertyValue::ensureInteger($value), 0);
 	}
 }
 
@@ -789,7 +789,7 @@ 
 	 */
 	public function getCoordinates()
 	{
-		return $this->getViewState('Coordinates','');
+		return $this->getViewState('Coordinates', '');
 	}
 
 	/**
@@ -799,7 +799,7 @@ 
 	 */
 	public function setCoordinates($value)
 	{
-		$this->setViewState('Coordinates',$value,'');
+		$this->setViewState('Coordinates', $value, '');
 	}
 }
 

Braces +1 added lines, -2 removed lines

@@ -572,8 +572,7 @@
 			$writer->addAttribute('href',$this->getNavigateUrl());
 			if(($target=$this->getTarget())!=='')
 				$writer->addAttribute('target',$target);
-		}
-		else if($mode===THotSpotMode::Inactive)
+		} else if($mode===THotSpotMode::Inactive)
 			$writer->addAttribute('nohref','true');
 		$text=$this->getAlternateText();
 		$writer->addAttribute('title',$text);