pradosoft / prado

framework/Web/UI/WebControls/TCustomValidator.php

Spacing +7 added lines, -7 removed lines

@@ -67,7 +67,7 @@ 
 	 */
 	public function getClientValidationFunction()
 	{
-		return $this->getViewState('ClientValidationFunction','');
+		return $this->getViewState('ClientValidationFunction', '');
 	}
 
 	/**
@@ -76,7 +76,7 @@ 
 	 */
 	public function setClientValidationFunction($value)
 	{
-		$this->setViewState('ClientValidationFunction',$value,'');
+		$this->setViewState('ClientValidationFunction', $value, '');
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 	 */
 	public function evaluateIsValid()
 	{
-		$value = '';
+		$value='';
 		if($this->getValidationTarget()!==null)
 			$value=$this->getValidationValue($this->getValidationTarget());
 		return $this->onServerValidate($value);
@@ -103,8 +103,8 @@ 
 	 */
 	public function onServerValidate($value)
 	{
-		$param=new TServerValidateEventParameter($value,true);
-		$this->raiseEvent('OnServerValidate',$this,$param);
+		$param=new TServerValidateEventParameter($value, true);
+		$this->raiseEvent('OnServerValidate', $this, $param);
 		return $param->getIsValid();
 	}
 
@@ -116,7 +116,7 @@ 
 		if(($id=$this->getControlToValidate())!=='' && ($control=$this->findControl($id))!==null)
 			return $control;
 		else if(($id=$this->getControlToValidate())!=='')
-			throw new TInvalidDataTypeException('basevalidator_validatable_required',get_class($this));
+			throw new TInvalidDataTypeException('basevalidator_validatable_required', get_class($this));
 		else
 			return null;
 	}
@@ -172,7 +172,7 @@ 
 	 * @param string property value to be validated
 	 * @param boolean whether the value is valid
 	 */
-	public function __construct($value,$isValid)
+	public function __construct($value, $isValid)
 	{
 		$this->_value=$value;
 		$this->setIsValid($isValid);

framework/Web/UI/WebControls/TStyle.php

Spacing +78 added lines, -78 removed lines

@@ -55,16 +55,16 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_fields===array())
-			$exprops[] = "\0TStyle\0_fields";
+		if($this->_fields===array())
+			$exprops[]="\0TStyle\0_fields";
 		if($this->_font===null)
-			$exprops[] = "\0TStyle\0_font";
+			$exprops[]="\0TStyle\0_font";
 		if($this->_class===null)
-			$exprops[] = "\0TStyle\0_class";
-		if ($this->_customStyle===null)
-			$exprops[] = "\0TStyle\0_customStyle";
-		if ($this->_displayStyle==='Fixed')
-			$exprops[] = "\0TStyle\0_displayStyle";
+			$exprops[]="\0TStyle\0_class";
+		if($this->_customStyle===null)
+			$exprops[]="\0TStyle\0_customStyle";
+		if($this->_displayStyle==='Fixed')
+			$exprops[]="\0TStyle\0_displayStyle";
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 	public function __clone()
 	{
 		if($this->_font!==null)
-			$this->_font = clone($this->_font);
+			$this->_font=clone($this->_font);
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 */
 	public function getBackColor()
 	{
-		return isset($this->_fields['background-color'])?$this->_fields['background-color']:'';
+		return isset($this->_fields['background-color']) ? $this->_fields['background-color'] : '';
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 */
 	public function getBorderColor()
 	{
-		return isset($this->_fields['border-color'])?$this->_fields['border-color']:'';
+		return isset($this->_fields['border-color']) ? $this->_fields['border-color'] : '';
 	}
 
 	/**
@@ -129,7 +129,7 @@ 
 	 */
 	public function getBorderStyle()
 	{
-		return isset($this->_fields['border-style'])?$this->_fields['border-style']:'';
+		return isset($this->_fields['border-style']) ? $this->_fields['border-style'] : '';
 	}
 
 	/**
@@ -149,7 +149,7 @@ 
 	 */
 	public function getBorderWidth()
 	{
-		return isset($this->_fields['border-width'])?$this->_fields['border-width']:'';
+		return isset($this->_fields['border-width']) ? $this->_fields['border-width'] : '';
 	}
 
 	/**
@@ -168,7 +168,7 @@ 
 	 */
 	public function getCssClass()
 	{
-		return $this->_class===null?'':$this->_class;
+		return $this->_class===null ? '' : $this->_class;
 	}
 
 	/**
@@ -202,7 +202,7 @@ 
 	 */
 	public function hasFont()
 	{
-		return $this->_font !== null;
+		return $this->_font!==null;
 	}
 
 	/**
@@ -210,20 +210,20 @@ 
 	 */
 	public function setDisplayStyle($value)
 	{
-		$this->_displayStyle = TPropertyValue::ensureEnum($value, 'TDisplayStyle');
+		$this->_displayStyle=TPropertyValue::ensureEnum($value, 'TDisplayStyle');
 		switch($this->_displayStyle)
 		{
 			case TDisplayStyle::None:
-				$this->_fields['display'] = 'none';
+				$this->_fields['display']='none';
 				break;
 			case TDisplayStyle::Dynamic:
-				$this->_fields['display'] = ''; //remove the display property
+				$this->_fields['display']=''; //remove the display property
 				break;
 			case TDisplayStyle::Fixed:
-				$this->_fields['visibility'] = 'visible';
+				$this->_fields['visibility']='visible';
 				break;
 			case TDisplayStyle::Hidden:
-				$this->_fields['visibility'] = 'hidden';
+				$this->_fields['visibility']='hidden';
 				break;
 		}
 	}
@@ -241,7 +241,7 @@ 
 	 */
 	public function getForeColor()
 	{
-		return isset($this->_fields['color'])?$this->_fields['color']:'';
+		return isset($this->_fields['color']) ? $this->_fields['color'] : '';
 	}
 
 	/**
@@ -260,7 +260,7 @@ 
 	 */
 	public function getHeight()
 	{
-		return isset($this->_fields['height'])?$this->_fields['height']:'';
+		return isset($this->_fields['height']) ? $this->_fields['height'] : '';
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
 	 */
 	public function getCustomStyle()
 	{
-		return $this->_customStyle===null?'':$this->_customStyle;
+		return $this->_customStyle===null ? '' : $this->_customStyle;
 	}
 
 	/**
@@ -297,7 +297,7 @@ 
 	 */
 	public function getStyleField($name)
 	{
-		return isset($this->_fields[$name])?$this->_fields[$name]:'';
+		return isset($this->_fields[$name]) ? $this->_fields[$name] : '';
 	}
 
 	/**
@@ -306,7 +306,7 @@ 
 	 * @param string style field name
 	 * @param string style field value
 	 */
-	public function setStyleField($name,$value)
+	public function setStyleField($name, $value)
 	{
 		$this->_fields[$name]=$value;
 	}
@@ -333,7 +333,7 @@ 
 	 */
 	public function getWidth()
 	{
-		return isset($this->_fields['width'])?$this->_fields['width']:'';
+		return isset($this->_fields['width']) ? $this->_fields['width'] : '';
 	}
 
 	/**
@@ -365,7 +365,7 @@ 
 	{
 		if($style instanceof TStyle)
 		{
-			$this->_fields=array_merge($this->_fields,$style->_fields);
+			$this->_fields=array_merge($this->_fields, $style->_fields);
 			if($style->_class!==null)
 				$this->_class=$style->_class;
 			if($style->_customStyle!==null)
@@ -385,7 +385,7 @@ 
 	{
 		if($style instanceof TStyle)
 		{
-			$this->_fields=array_merge($style->_fields,$this->_fields);
+			$this->_fields=array_merge($style->_fields, $this->_fields);
 			if($this->_class===null)
 				$this->_class=$style->_class;
 			if($this->_customStyle===null)
@@ -403,18 +403,18 @@ 
 	{
 		if($this->_customStyle!==null)
 		{
-			foreach(explode(';',$this->_customStyle) as $style)
+			foreach(explode(';', $this->_customStyle) as $style)
 			{
-				$arr=explode(':',$style,2);
+				$arr=explode(':', $style, 2);
 				if(isset($arr[1]) && trim($arr[0])!=='')
-					$writer->addStyleAttribute(trim($arr[0]),trim($arr[1]));
+					$writer->addStyleAttribute(trim($arr[0]), trim($arr[1]));
 			}
 		}
 		$writer->addStyleAttributes($this->_fields);
 		if($this->_font!==null)
 			$this->_font->addAttributesToRender($writer);
 		if($this->_class!==null)
-			$writer->addAttribute('class',$this->_class);
+			$writer->addAttribute('class', $this->_class);
 	}
 
 	/**
@@ -492,18 +492,18 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_backImageUrl===null)
-			$exprops[] = "\0TTableStyle\0_backImageUrl";
-		if ($this->_horizontalAlign===null)
-			$exprops[] = "\0TTableStyle\0_horizontalAlign";
-		if ($this->_cellPadding===null)
-			$exprops[] = "\0TTableStyle\0_cellPadding";
-		if ($this->_cellSpacing===null)
-			$exprops[] = "\0TTableStyle\0_cellSpacing";
-		if ($this->_gridLines===null)
-			$exprops[] = "\0TTableStyle\0_gridLines";
-		if ($this->_borderCollapse===null)
-			$exprops[] = "\0TTableStyle\0_borderCollapse";
+		if($this->_backImageUrl===null)
+			$exprops[]="\0TTableStyle\0_backImageUrl";
+		if($this->_horizontalAlign===null)
+			$exprops[]="\0TTableStyle\0_horizontalAlign";
+		if($this->_cellPadding===null)
+			$exprops[]="\0TTableStyle\0_cellPadding";
+		if($this->_cellSpacing===null)
+			$exprops[]="\0TTableStyle\0_cellSpacing";
+		if($this->_gridLines===null)
+			$exprops[]="\0TTableStyle\0_gridLines";
+		if($this->_borderCollapse===null)
+			$exprops[]="\0TTableStyle\0_borderCollapse";
 	}
 
 	/**
@@ -582,25 +582,25 @@ 
 	public function addAttributesToRender($writer)
 	{
 		if(($url=trim($this->getBackImageUrl()))!=='')
-			$writer->addStyleAttribute('background-image','url('.$url.')');
+			$writer->addStyleAttribute('background-image', 'url('.$url.')');
 
 		if(($horizontalAlign=$this->getHorizontalAlign())!==THorizontalAlign::NotSet)
-			$writer->addStyleAttribute('text-align',strtolower($horizontalAlign));
+			$writer->addStyleAttribute('text-align', strtolower($horizontalAlign));
 
-		if(($cellPadding=$this->getCellPadding())>=0)
-			$writer->addAttribute('cellpadding',"$cellPadding");
+		if(($cellPadding=$this->getCellPadding()) >= 0)
+			$writer->addAttribute('cellpadding', "$cellPadding");
 
-		if(($cellSpacing=$this->getCellSpacing())>=0)
-			$writer->addAttribute('cellspacing',"$cellSpacing");
+		if(($cellSpacing=$this->getCellSpacing()) >= 0)
+			$writer->addAttribute('cellspacing', "$cellSpacing");
 
 		if($this->getBorderCollapse())
-			$writer->addStyleAttribute('border-collapse','collapse');
+			$writer->addStyleAttribute('border-collapse', 'collapse');
 
 		switch($this->getGridLines())
 		{
-			case TTableGridLines::Horizontal : $writer->addAttribute('rules','rows'); break;
-			case TTableGridLines::Vertical : $writer->addAttribute('rules','cols'); break;
-			case TTableGridLines::Both : $writer->addAttribute('rules','all'); break;
+			case TTableGridLines::Horizontal : $writer->addAttribute('rules', 'rows'); break;
+			case TTableGridLines::Vertical : $writer->addAttribute('rules', 'cols'); break;
+			case TTableGridLines::Both : $writer->addAttribute('rules', 'all'); break;
 		}
 
 		parent::addAttributesToRender($writer);
@@ -611,7 +611,7 @@ 
 	 */
 	public function getBackImageUrl()
 	{
-		return $this->_backImageUrl===null?'':$this->_backImageUrl;
+		return $this->_backImageUrl===null ? '' : $this->_backImageUrl;
 	}
 
 	/**
@@ -628,7 +628,7 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		return $this->_horizontalAlign===null?THorizontalAlign::NotSet:$this->_horizontalAlign;
+		return $this->_horizontalAlign===null ? THorizontalAlign::NotSet : $this->_horizontalAlign;
 	}
 
 	/**
@@ -637,7 +637,7 @@ 
 	 */
 	public function setHorizontalAlign($value)
 	{
-		$this->_horizontalAlign=TPropertyValue::ensureEnum($value,'THorizontalAlign');
+		$this->_horizontalAlign=TPropertyValue::ensureEnum($value, 'THorizontalAlign');
 	}
 
 	/**
@@ -645,7 +645,7 @@ 
 	 */
 	public function getCellPadding()
 	{
-		return $this->_cellPadding===null?-1:$this->_cellPadding;
+		return $this->_cellPadding===null ?-1 : $this->_cellPadding;
 	}
 
 	/**
@@ -654,7 +654,7 @@ 
 	 */
 	public function setCellPadding($value)
 	{
-		if(($this->_cellPadding=TPropertyValue::ensureInteger($value))<-1)
+		if(($this->_cellPadding=TPropertyValue::ensureInteger($value)) < -1)
 			throw new TInvalidDataValueException('tablestyle_cellpadding_invalid');
 	}
 
@@ -663,7 +663,7 @@ 
 	 */
 	public function getCellSpacing()
 	{
-		return $this->_cellSpacing===null?-1:$this->_cellSpacing;
+		return $this->_cellSpacing===null ?-1 : $this->_cellSpacing;
 	}
 
 	/**
@@ -672,7 +672,7 @@ 
 	 */
 	public function setCellSpacing($value)
 	{
-		if(($this->_cellSpacing=TPropertyValue::ensureInteger($value))<-1)
+		if(($this->_cellSpacing=TPropertyValue::ensureInteger($value)) < -1)
 			throw new TInvalidDataValueException('tablestyle_cellspacing_invalid');
 	}
 
@@ -681,7 +681,7 @@ 
 	 */
 	public function getGridLines()
 	{
-		return $this->_gridLines===null?TTableGridLines::None:$this->_gridLines;
+		return $this->_gridLines===null ? TTableGridLines::None : $this->_gridLines;
 	}
 
 	/**
@@ -690,7 +690,7 @@ 
 	 */
 	public function setGridLines($value)
 	{
-		$this->_gridLines=TPropertyValue::ensureEnum($value,'TTableGridLines');
+		$this->_gridLines=TPropertyValue::ensureEnum($value, 'TTableGridLines');
 	}
 
 
@@ -699,7 +699,7 @@ 
 	 */
 	public function getBorderCollapse()
 	{
-		return $this->_borderCollapse===null?false:$this->_borderCollapse;
+		return $this->_borderCollapse===null ? false : $this->_borderCollapse;
 	}
 
 	/**
@@ -743,12 +743,12 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_horizontalAlign===null)
-			$exprops[] = "\0TTableItemStyle\0_horizontalAlign";
-		if ($this->_verticalAlign===null)
-			$exprops[] = "\0TTableItemStyle\0_verticalAlign";
-		if ($this->_wrap===null)
-			$exprops[] = "\0TTableItemStyle\0_wrap";
+		if($this->_horizontalAlign===null)
+			$exprops[]="\0TTableItemStyle\0_horizontalAlign";
+		if($this->_verticalAlign===null)
+			$exprops[]="\0TTableItemStyle\0_verticalAlign";
+		if($this->_wrap===null)
+			$exprops[]="\0TTableItemStyle\0_wrap";
 	}
 
 	/**
@@ -812,13 +812,13 @@ 
 	public function addAttributesToRender($writer)
 	{
 		if(!$this->getWrap())
-			$writer->addStyleAttribute('white-space','nowrap');
+			$writer->addStyleAttribute('white-space', 'nowrap');
 
 		if(($horizontalAlign=$this->getHorizontalAlign())!==THorizontalAlign::NotSet)
-			$writer->addAttribute('align',strtolower($horizontalAlign));
+			$writer->addAttribute('align', strtolower($horizontalAlign));
 
 		if(($verticalAlign=$this->getVerticalAlign())!==TVerticalAlign::NotSet)
-			$writer->addAttribute('valign',strtolower($verticalAlign));
+			$writer->addAttribute('valign', strtolower($verticalAlign));
 
 		parent::addAttributesToRender($writer);
 	}
@@ -828,7 +828,7 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		return $this->_horizontalAlign===null?THorizontalAlign::NotSet:$this->_horizontalAlign;
+		return $this->_horizontalAlign===null ? THorizontalAlign::NotSet : $this->_horizontalAlign;
 	}
 
 	/**
@@ -837,7 +837,7 @@ 
 	 */
 	public function setHorizontalAlign($value)
 	{
-		$this->_horizontalAlign=TPropertyValue::ensureEnum($value,'THorizontalAlign');
+		$this->_horizontalAlign=TPropertyValue::ensureEnum($value, 'THorizontalAlign');
 	}
 
 	/**
@@ -845,7 +845,7 @@ 
 	 */
 	public function getVerticalAlign()
 	{
-		return $this->_verticalAlign===null?TVerticalAlign::NotSet:$this->_verticalAlign;
+		return $this->_verticalAlign===null ? TVerticalAlign::NotSet : $this->_verticalAlign;
 	}
 
 	/**
@@ -854,7 +854,7 @@ 
 	 */
 	public function setVerticalAlign($value)
 	{
-		$this->_verticalAlign=TPropertyValue::ensureEnum($value,'TVerticalAlign');
+		$this->_verticalAlign=TPropertyValue::ensureEnum($value, 'TVerticalAlign');
 	}
 
 	/**
@@ -862,7 +862,7 @@ 
 	 */
 	public function getWrap()
 	{
-		return $this->_wrap===null?true:$this->_wrap;
+		return $this->_wrap===null ? true : $this->_wrap;
 	}
 
 	/**

framework/Web/UI/WebControls/TRangeValidator.php

Spacing +28 added lines, -28 removed lines

@@ -65,7 +65,7 @@ 
 	 */
 	public function getMinValue()
 	{
-		return $this->getViewState('MinValue','');
+		return $this->getViewState('MinValue', '');
 	}
 
 	/**
@@ -74,7 +74,7 @@ 
 	 */
 	public function setMinValue($value)
 	{
-		$this->setViewState('MinValue',TPropertyValue::ensureString($value),'');
+		$this->setViewState('MinValue', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 	 */
 	public function getMaxValue()
 	{
-		return $this->getViewState('MaxValue','');
+		return $this->getViewState('MaxValue', '');
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 */
 	public function setMaxValue($value)
 	{
-		$this->setViewState('MaxValue',TPropertyValue::ensureString($value),'');
+		$this->setViewState('MaxValue', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -99,7 +99,7 @@ 
 	 */
 	public function setStrictComparison($value)
 	{
-		$this->setViewState('StrictComparison', TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('StrictComparison', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -116,7 +116,7 @@ 
 	 */
 	public function getDataType()
 	{
-		return $this->getViewState('DataType',TRangeValidationDataType::String);
+		return $this->getViewState('DataType', TRangeValidationDataType::String);
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 	 */
 	public function setDataType($value)
 	{
-		$this->setViewState('DataType',TPropertyValue::ensureEnum($value,'TRangeValidationDataType'),TRangeValidationDataType::String);
+		$this->setViewState('DataType', TPropertyValue::ensureEnum($value, 'TRangeValidationDataType'), TRangeValidationDataType::String);
 	}
 
 	/**
@@ -198,16 +198,16 @@ 
 		$minValue=$this->getMinValue();
 		$maxValue=$this->getMaxValue();
 
-		$valid=preg_match('/^[-+]?[0-9]+$/',trim($value));
+		$valid=preg_match('/^[-+]?[0-9]+$/', trim($value));
 		$value=intval($value);
 		if($minValue!=='')
 			$valid=$valid && $this->isGreaterThan($value, intval($minValue));
 		if($maxValue!=='')
-			$valid=$valid && $this->isLessThan($value,intval($maxValue));
+			$valid=$valid && $this->isLessThan($value, intval($maxValue));
 		return $valid;
 	}
 
-	protected function isLessThan($left,$right)
+	protected function isLessThan($left, $right)
 	{
 		return $this->getStrictComparison() ? $left < $right : $left <= $right;
 	}
@@ -227,12 +227,12 @@ 
 		$minValue=$this->getMinValue();
 		$maxValue=$this->getMaxValue();
 
-		$valid=preg_match('/^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/',trim($value));
+		$valid=preg_match('/^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/', trim($value));
 		$value=floatval($value);
 		if($minValue!=='')
-			$valid=$valid && $this->isGreaterThan($value,floatval($minValue));
+			$valid=$valid && $this->isGreaterThan($value, floatval($minValue));
 		if($maxValue!=='')
-			$valid=$valid && $this->isLessThan($value,floatval($maxValue));
+			$valid=$valid && $this->isLessThan($value, floatval($maxValue));
 		return $valid;
 	}
 
@@ -249,24 +249,24 @@ 
 
 		$valid=true;
 
-		$dateFormat = $this->getDateFormat();
+		$dateFormat=$this->getDateFormat();
 		if($dateFormat!=='')
 		{
 			$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter', $dateFormat);
-			$value = $formatter->parse($value);
+			$value=$formatter->parse($value);
 			if($minValue!=='')
-				$valid=$valid && $this->isGreaterThan($value,$formatter->parse($minValue));
+				$valid=$valid && $this->isGreaterThan($value, $formatter->parse($minValue));
 			if($maxValue!=='')
-				$valid=$valid && $this->isLessThan($value,$formatter->parse($maxValue));
+				$valid=$valid && $this->isLessThan($value, $formatter->parse($maxValue));
 			return $valid;
 		}
 		else
 		{
 			$value=strtotime($value);
 			if($minValue!=='')
-				$valid=$valid && $this->isGreaterThan($value,strtotime($minValue));
+				$valid=$valid && $this->isGreaterThan($value, strtotime($minValue));
 			if($maxValue!=='')
-				$valid=$valid && $this->isLessThan($value,strtotime($maxValue));
+				$valid=$valid && $this->isLessThan($value, strtotime($maxValue));
 			return $valid;
 		}
 	}
@@ -284,9 +284,9 @@ 
 
 		$valid=true;
 		if($minValue!=='')
-			$valid=$valid && $this->isGreaterThan(strcmp($value,$minValue),0);
+			$valid=$valid && $this->isGreaterThan(strcmp($value, $minValue), 0);
 		if($maxValue!=='')
-			$valid=$valid && $this->isLessThan(strcmp($value,$maxValue),0);
+			$valid=$valid && $this->isLessThan(strcmp($value, $maxValue), 0);
 		return $valid;
 	}
 
@@ -300,20 +300,20 @@ 
 		$maxValue=$this->getMaxValue();
 
 		$valid=true;
-		$charset = $this->getCharset();
+		$charset=$this->getCharset();
 		if($charset==='')
 		{
-			$app= $this->getApplication()->getGlobalization();
-			$charset = $app ? $app->getCharset() : null;
+			$app=$this->getApplication()->getGlobalization();
+			$charset=$app ? $app->getCharset() : null;
 			if(!$charset)
-				$charset = 'UTF-8';
+				$charset='UTF-8';
 		}
 
-		$length = iconv_strlen($value, $charset);
+		$length=iconv_strlen($value, $charset);
 		if($minValue!=='')
-			$valid = $valid && $this->isGreaterThan($length,intval($minValue));
+			$valid=$valid && $this->isGreaterThan($length, intval($minValue));
 		if($maxValue!=='')
-			$valid = $valid && $this->isLessThan($length,intval($maxValue));
+			$valid=$valid && $this->isLessThan($length, intval($maxValue));
 		return $valid;
 	}
 

framework/Web/UI/WebControls/TColorPicker.php

Spacing +23 added lines, -23 removed lines

@@ -37,7 +37,7 @@ 
  */
 class TColorPicker extends TTextBox
 {
-	const SCRIPT_PATH = 'prado/colorpicker';
+	const SCRIPT_PATH='prado/colorpicker';
 
 	private $_clientSide;
 
@@ -46,7 +46,7 @@ 
 	 */
 	public function getShowColorPicker()
 	{
-		return $this->getViewState('ShowColorPicker',true);
+		return $this->getViewState('ShowColorPicker', true);
 	}
 
 	/**
@@ -55,7 +55,7 @@ 
 	 */
 	public function setShowColorPicker($value)
 	{
-		$this->setViewState('ShowColorPicker',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('ShowColorPicker', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -128,7 +128,7 @@ 
 	public function getClientSide()
 	{
 		if($this->_clientSide===null)
-			$this->_clientSide = $this->createClientSide();
+			$this->_clientSide=$this->createClientSide();
 		return $this->_clientSide;
 	}
 
@@ -146,18 +146,18 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options = parent::getPostBackOptions();
-		$options['ClassName'] = $this->getCssClass();
-		$options['ShowColorPicker'] = $this->getShowColorPicker();
+		$options=parent::getPostBackOptions();
+		$options['ClassName']=$this->getCssClass();
+		$options['ShowColorPicker']=$this->getShowColorPicker();
 		if($options['ShowColorPicker'])
 		{
-			$mode = $this->getMode();
-			if($mode == TColorPickerMode::Full) $options['Mode'] = $mode;
-			else if($mode == TColorPickerMode::Simple) $options['Palette'] = 'Tiny';
-			$options['OKButtonText'] = $this->getOKButtonText();
-			$options['CancelButtonText'] = $this->getCancelButtonText();
+			$mode=$this->getMode();
+			if($mode==TColorPickerMode::Full) $options['Mode']=$mode;
+			else if($mode==TColorPickerMode::Simple) $options['Palette']='Tiny';
+			$options['OKButtonText']=$this->getOKButtonText();
+			$options['CancelButtonText']=$this->getCancelButtonText();
 		}
-		$options = array_merge($options,$this->getClientSide()->getOptions()->toArray());
+		$options=array_merge($options, $this->getClientSide()->getOptions()->toArray());
 		return $options;
 	}
 
@@ -167,7 +167,7 @@ 
 	 */
 	protected function getAssetUrl($file='')
 	{
-		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
+		$base=$this->getPage()->getClientScript()->getPradoScriptAssetUrl();
 		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
 	}
 
@@ -185,15 +185,15 @@ 
 	 */
 	protected function publishColorPickerAssets()
 	{
-		$cs = $this->getPage()->getClientScript();
-		$key = "prado:".get_class($this);
-		$imgs['button.gif'] = $this->getAssetUrl('button.gif');
-		$imgs['background.png'] = $this->getAssetUrl('background.png');
-		$options = TJavaScript::encode($imgs);
-		$code = "Prado.WebUI.TColorPicker.UIImages = {$options};";
+		$cs=$this->getPage()->getClientScript();
+		$key="prado:".get_class($this);
+		$imgs['button.gif']=$this->getAssetUrl('button.gif');
+		$imgs['background.png']=$this->getAssetUrl('background.png');
+		$options=TJavaScript::encode($imgs);
+		$code="Prado.WebUI.TColorPicker.UIImages = {$options};";
 		$cs->registerEndScript($key, $code);
 		$cs->registerPradoScript("colorpicker");
-		$url = $this->getAssetUrl($this->getColorPickerStyle().'.css');
+		$url=$this->getAssetUrl($this->getColorPickerStyle().'.css');
 		if(!$cs->isStyleSheetFileRegistered($url))
 			$cs->registerStyleSheetFile($url, $url);
 	}
@@ -208,13 +208,13 @@ 
 	{
 		parent::renderEndTag($writer);
 
-		$color = $this->getText();
+		$color=$this->getText();
 		$writer->addAttribute('class', 'TColorPicker_button');
 		$writer->renderBeginTag('span');
 
 		$writer->addAttribute('id', $this->getClientID().'_button');
 		$writer->addAttribute('src', $this->getAssetUrl('button.gif'));
-		if($color !== '')
+		if($color!=='')
 			$writer->addAttribute('style', "background-color:{$color};");
 		$writer->addAttribute('width', '20');
 		$writer->addAttribute('height', '20');

framework/Web/UI/WebControls/TTableHeaderCell.php

Spacing +9 added lines, -9 removed lines

@@ -42,11 +42,11 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		if(($scope=$this->getScope())!==TTableHeaderScope::NotSet)
-			$writer->addAttribute('scope',$scope===TTableHeaderScope::Row?'row':'col');
+			$writer->addAttribute('scope', $scope===TTableHeaderScope::Row ? 'row' : 'col');
 		if(($text=$this->getAbbreviatedText())!=='')
-			$writer->addAttribute('abbr',$text);
+			$writer->addAttribute('abbr', $text);
 		if(($text=$this->getCategoryText())!=='')
-			$writer->addAttribute('axis',$text);
+			$writer->addAttribute('axis', $text);
 	}
 
 	/**
@@ -54,7 +54,7 @@ 
 	 */
 	public function getScope()
 	{
-		return $this->getViewState('Scope',TTableHeaderScope::NotSet);
+		return $this->getViewState('Scope', TTableHeaderScope::NotSet);
 	}
 
 	/**
@@ -62,7 +62,7 @@ 
 	 */
 	public function setScope($value)
 	{
-		$this->setViewState('Scope',TPropertyValue::ensureEnum($value,'TTableHeaderScope'),TTableHeaderScope::NotSet);
+		$this->setViewState('Scope', TPropertyValue::ensureEnum($value, 'TTableHeaderScope'), TTableHeaderScope::NotSet);
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 	 */
 	public function getAbbreviatedText()
 	{
-		return $this->getViewState('AbbreviatedText','');
+		return $this->getViewState('AbbreviatedText', '');
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	 */
 	public function setAbbreviatedText($value)
 	{
-		$this->setViewState('AbbreviatedText',$value,'');
+		$this->setViewState('AbbreviatedText', $value, '');
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 	 */
 	public function getCategoryText()
 	{
-		return $this->getViewState('CategoryText','');
+		return $this->getViewState('CategoryText', '');
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 */
 	public function setCategoryText($value)
 	{
-		$this->setViewState('CategoryText',$value,'');
+		$this->setViewState('CategoryText', $value, '');
 	}
 }
 

framework/Web/UI/WebControls/TRepeatInfo.php

Spacing +84 added lines, -84 removed lines

@@ -42,7 +42,7 @@ 
 	 * @param integer zero-based index of the current rendering item.
 	 * @return TStyle CSS style used for rendering items (including header, footer and separators)
 	 */
-	public function generateItemStyle($itemType,$index);
+	public function generateItemStyle($itemType, $index);
 	/**
 	 * Renders an item.
 	 * @param THtmlWriter writer for the rendering purpose
@@ -50,7 +50,7 @@ 
 	 * @param string item type
 	 * @param integer zero-based index of the item being rendered
 	 */
-	public function renderItem($writer,$repeatInfo,$itemType,$index);
+	public function renderItem($writer, $repeatInfo, $itemType, $index);
 }
 
 /**
@@ -123,7 +123,7 @@ 
 	 */
 	public function setCaptionAlign($value)
 	{
-		$this->_captionAlign=TPropertyValue::ensureEnum($value,'TTableCaptionAlign');
+		$this->_captionAlign=TPropertyValue::ensureEnum($value, 'TTableCaptionAlign');
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	 */
 	public function setRepeatColumns($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			throw new TInvalidDataValueException('repeatinfo_repeatcolumns_invalid');
 		$this->_repeatColumns=$value;
 	}
@@ -157,7 +157,7 @@ 
 	 */
 	public function setRepeatDirection($value)
 	{
-		$this->_repeatDirection=TPropertyValue::ensureEnum($value,'TRepeatDirection');
+		$this->_repeatDirection=TPropertyValue::ensureEnum($value, 'TRepeatDirection');
 	}
 
 	/**
@@ -173,7 +173,7 @@ 
 	 */
 	public function setRepeatLayout($value)
 	{
-		$this->_repeatLayout=TPropertyValue::ensureEnum($value,'TRepeatLayout');
+		$this->_repeatLayout=TPropertyValue::ensureEnum($value, 'TRepeatLayout');
 	}
 
 	/**
@@ -194,7 +194,7 @@ 
 		}
 		else if($this->_repeatLayout===TRepeatLayout::Raw)
 		{
-			$this->renderRawContents($writer,$user);
+			$this->renderRawContents($writer, $user);
 			return;
 		}
 		else
@@ -207,9 +207,9 @@ 
 		$writer->writeLine();
 
 		if($this->_repeatDirection===TRepeatDirection::Vertical)
-			$this->renderVerticalContents($writer,$user);
+			$this->renderVerticalContents($writer, $user);
 		else
-			$this->renderHorizontalContents($writer,$user);
+			$this->renderHorizontalContents($writer, $user);
 
 		$control->renderEndTag($writer);
 	}
@@ -219,22 +219,22 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param IRepeatInfoUser repeat information user
 	 */
-	protected function renderRawContents($writer,$user)
+	protected function renderRawContents($writer, $user)
 	{
 		if($user->getHasHeader())
-			$user->renderItem($writer,$this,'Header',-1);
+			$user->renderItem($writer, $this, 'Header', -1);
 
 		// render items
 		$hasSeparators=$user->getHasSeparators();
 		$itemCount=$user->getItemCount();
-		for($i=0;$i<$itemCount;++$i)
+		for($i=0; $i < $itemCount; ++$i)
 		{
-			$user->renderItem($writer,$this,'Item',$i);
-			if($hasSeparators && $i!=$itemCount-1)
-				$user->renderItem($writer,$this,'Separator',$i);
+			$user->renderItem($writer, $this, 'Item', $i);
+			if($hasSeparators && $i!=$itemCount - 1)
+				$user->renderItem($writer, $this, 'Separator', $i);
 		}
 		if($user->getHasFooter())
-			$user->renderItem($writer,$this,'Footer',-1);
+			$user->renderItem($writer, $this, 'Footer', -1);
 	}
 
 	/**
@@ -242,52 +242,52 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param IRepeatInfoUser repeat information user
 	 */
-	protected function renderHorizontalContents($writer,$user)
+	protected function renderHorizontalContents($writer, $user)
 	{
 		$tableLayout=($this->_repeatLayout===TRepeatLayout::Table);
 		$hasSeparators=$user->getHasSeparators();
 		$itemCount=$user->getItemCount();
-		$columns=$this->_repeatColumns===0?$itemCount:$this->_repeatColumns;
-		$totalColumns=$hasSeparators?$columns+$columns:$columns;
-		$needBreak=$columns<$itemCount;
+		$columns=$this->_repeatColumns===0 ? $itemCount : $this->_repeatColumns;
+		$totalColumns=$hasSeparators ? $columns + $columns : $columns;
+		$needBreak=$columns < $itemCount;
 
 		if($user->getHasHeader())
-			$this->renderHeader($writer,$user,$tableLayout,$totalColumns,$needBreak);
+			$this->renderHeader($writer, $user, $tableLayout, $totalColumns, $needBreak);
 
 		// render items
 		if($tableLayout)
 		{
 			$writer->renderBeginTag('tbody');
 			$column=0;
-			for($i=0;$i<$itemCount;++$i)
+			for($i=0; $i < $itemCount; ++$i)
 			{
 				if($column==0)
 					$writer->renderBeginTag('tr');
-				if(($style=$user->generateItemStyle('Item',$i))!==null)
+				if(($style=$user->generateItemStyle('Item', $i))!==null)
 					$style->addAttributesToRender($writer);
 				$writer->renderBeginTag('td');
-				$user->renderItem($writer,$this,'Item',$i);
+				$user->renderItem($writer, $this, 'Item', $i);
 				$writer->renderEndTag();
 				$writer->writeLine();
-				if($hasSeparators && $i!=$itemCount-1)
+				if($hasSeparators && $i!=$itemCount - 1)
 				{
-					if(($style=$user->generateItemStyle('Separator',$i))!==null)
+					if(($style=$user->generateItemStyle('Separator', $i))!==null)
 						$style->addAttributesToRender($writer);
 					$writer->renderBeginTag('td');
-					$user->renderItem($writer,$this,'Separator',$i);
+					$user->renderItem($writer, $this, 'Separator', $i);
 					$writer->renderEndTag();
 					$writer->writeLine();
 				}
 				$column++;
-				if($i==$itemCount-1)
+				if($i==$itemCount - 1)
 				{
-					$restColumns=$columns-$column;
+					$restColumns=$columns - $column;
 					if($hasSeparators)
-						$restColumns=$restColumns?$restColumns+$restColumns+1:1;
-					for($j=0;$j<$restColumns;++$j)
+						$restColumns=$restColumns ? $restColumns + $restColumns + 1 : 1;
+					for($j=0; $j < $restColumns; ++$j)
 						$writer->write("<td></td>\n");
 				}
-				if($column==$columns || $i==$itemCount-1)
+				if($column==$columns || $i==$itemCount - 1)
 				{
 					$writer->renderEndTag();
 					$writer->writeLine();
@@ -299,13 +299,13 @@ 
 		else
 		{
 			$column=0;
-			for($i=0;$i<$itemCount;++$i)
+			for($i=0; $i < $itemCount; ++$i)
 			{
-				$user->renderItem($writer,$this,'Item',$i);
-				if($hasSeparators && $i!=$itemCount-1)
-					$user->renderItem($writer,$this,'Separator',$i);
+				$user->renderItem($writer, $this, 'Item', $i);
+				if($hasSeparators && $i!=$itemCount - 1)
+					$user->renderItem($writer, $this, 'Separator', $i);
 				$column++;
-				if($column==$columns || $i==$itemCount-1)
+				if($column==$columns || $i==$itemCount - 1)
 				{
 					if($needBreak)
 						$writer->writeBreak();
@@ -316,7 +316,7 @@ 
 		}
 
 		if($user->getHasFooter())
-			$this->renderFooter($writer,$user,$tableLayout,$totalColumns,$needBreak);
+			$this->renderFooter($writer, $user, $tableLayout, $totalColumns, $needBreak);
 	}
 
 	/**
@@ -324,12 +324,12 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param IRepeatInfoUser repeat information user
 	 */
-	protected function renderVerticalContents($writer,$user)
+	protected function renderVerticalContents($writer, $user)
 	{
 		$tableLayout=($this->_repeatLayout===TRepeatLayout::Table);
 		$hasSeparators=$user->getHasSeparators();
 		$itemCount=$user->getItemCount();
-		if($this->_repeatColumns<=1)
+		if($this->_repeatColumns <= 1)
 		{
 			$rows=$itemCount;
 			$columns=1;
@@ -338,69 +338,69 @@ 
 		else
 		{
 			$columns=$this->_repeatColumns;
-			$rows=(int)(($itemCount+$columns-1)/$columns);
-			if($rows==0 && $itemCount>0)
+			$rows=(int) (($itemCount + $columns - 1) / $columns);
+			if($rows==0 && $itemCount > 0)
 				$rows=1;
-			if(($lastColumns=$itemCount%$columns)==0)
+			if(($lastColumns=$itemCount % $columns)==0)
 				$lastColumns=$columns;
 		}
-		$totalColumns=$hasSeparators?$columns+$columns:$columns;
+		$totalColumns=$hasSeparators ? $columns + $columns : $columns;
 
 		if($user->getHasHeader())
-			$this->renderHeader($writer,$user,$tableLayout,$totalColumns,false);
+			$this->renderHeader($writer, $user, $tableLayout, $totalColumns, false);
 
 		if($tableLayout)
 		{
 			$writer->renderBeginTag('tbody');
 			$renderedItems=0;
-			for($row=0;$row<$rows;++$row)
+			for($row=0; $row < $rows; ++$row)
 			{
 				$index=$row;
 				$writer->renderBeginTag('tr');
-				for($col=0;$col<$columns;++$col)
+				for($col=0; $col < $columns; ++$col)
 				{
-					if($renderedItems>=$itemCount)
+					if($renderedItems >= $itemCount)
 						break;
-					if($col>0)
+					if($col > 0)
 					{
 						$index+=$rows;
-						if($col-1>=$lastColumns)
+						if($col - 1 >= $lastColumns)
 							$index--;
 					}
-					if($index>=$itemCount)
+					if($index >= $itemCount)
 						continue;
 					$renderedItems++;
-					if(($style=$user->generateItemStyle('Item',$index))!==null)
+					if(($style=$user->generateItemStyle('Item', $index))!==null)
 						$style->addAttributesToRender($writer);
 					$writer->renderBeginTag('td');
-					$user->renderItem($writer,$this,'Item',$index);
+					$user->renderItem($writer, $this, 'Item', $index);
 					$writer->renderEndTag();
 					$writer->writeLine();
 					if(!$hasSeparators)
 						continue;
-					if($renderedItems<$itemCount-1)
+					if($renderedItems < $itemCount - 1)
 					{
 						if($columns==1)
 						{
 							$writer->renderEndTag();
 							$writer->renderBeginTag('tr');
 						}
-						if(($style=$user->generateItemStyle('Separator',$index))!==null)
+						if(($style=$user->generateItemStyle('Separator', $index))!==null)
 							$style->addAttributesToRender($writer);
 						$writer->renderBeginTag('td');
-						$user->renderItem($writer,$this,'Separator',$index);
+						$user->renderItem($writer, $this, 'Separator', $index);
 						$writer->renderEndTag();
 						$writer->writeLine();
 					}
-					else if($columns>1)
+					else if($columns > 1)
 						$writer->write("<td></td>\n");
 				}
-				if($row==$rows-1)
+				if($row==$rows - 1)
 				{
-					$restColumns=$columns-$lastColumns;
+					$restColumns=$columns - $lastColumns;
 					if($hasSeparators)
 						$restColumns+=$restColumns;
-					for($col=0;$col<$restColumns;++$col)
+					for($col=0; $col < $restColumns; ++$col)
 						$writer->write("<td></td>\n");
 				}
 				$writer->renderEndTag();
@@ -411,41 +411,41 @@ 
 		else
 		{
 			$renderedItems=0;
-			for($row=0;$row<$rows;++$row)
+			for($row=0; $row < $rows; ++$row)
 			{
 				$index=$row;
-				for($col=0;$col<$columns;++$col)
+				for($col=0; $col < $columns; ++$col)
 				{
-					if($renderedItems>=$itemCount)
+					if($renderedItems >= $itemCount)
 						break;
-					if($col>0)
+					if($col > 0)
 					{
 						$index+=$rows;
-						if($col-1>=$lastColumns)
+						if($col - 1 >= $lastColumns)
 							$index--;
 					}
-					if($index>=$itemCount)
+					if($index >= $itemCount)
 						continue;
 					$renderedItems++;
-					$user->renderItem($writer,$this,'Item',$index);
+					$user->renderItem($writer, $this, 'Item', $index);
 					$writer->writeLine();
 					if(!$hasSeparators)
 						continue;
-					if($renderedItems<$itemCount-1)
+					if($renderedItems < $itemCount - 1)
 					{
 						if($columns==1)
 							$writer->writeBreak();
-						$user->renderItem($writer,$this,'Separator',$index);
+						$user->renderItem($writer, $this, 'Separator', $index);
 					}
 					$writer->writeLine();
 				}
-				if($row<$rows-1 || $user->getHasFooter())
+				if($row < $rows - 1 || $user->getHasFooter())
 					$writer->writeBreak();
 			}
 		}
 
 		if($user->getHasFooter())
-			$this->renderFooter($writer,$user,$tableLayout,$totalColumns,false);
+			$this->renderFooter($writer, $user, $tableLayout, $totalColumns, false);
 
 	}
 
@@ -457,26 +457,26 @@ 
 	 * @param integer number of columns to be rendered
 	 * @param boolean if a line break is needed at the end
 	 */
-	protected function renderHeader($writer,$user,$tableLayout,$columns,$needBreak)
+	protected function renderHeader($writer, $user, $tableLayout, $columns, $needBreak)
 	{
 		if($tableLayout)
 		{
 			$writer->renderBeginTag('thead');
 			$writer->renderBeginTag('tr');
-			if($columns>1)
-				$writer->addAttribute('colspan',"$columns");
-			$writer->addAttribute('scope','col');
-			if(($style=$user->generateItemStyle('Header',-1))!==null)
+			if($columns > 1)
+				$writer->addAttribute('colspan', "$columns");
+			$writer->addAttribute('scope', 'col');
+			if(($style=$user->generateItemStyle('Header', -1))!==null)
 				$style->addAttributesToRender($writer);
 			$writer->renderBeginTag('th');
-			$user->renderItem($writer,$this,'Header',-1);
+			$user->renderItem($writer, $this, 'Header', -1);
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 		}
 		else
 		{
-			$user->renderItem($writer,$this,'Header',-1);
+			$user->renderItem($writer, $this, 'Header', -1);
 			if($needBreak)
 				$writer->writeBreak();
 		}
@@ -490,24 +490,24 @@ 
 	 * @param boolean whether to render using table layout
 	 * @param integer number of columns to be rendered
 	 */
-	protected function renderFooter($writer,$user,$tableLayout,$columns)
+	protected function renderFooter($writer, $user, $tableLayout, $columns)
 	{
 		if($tableLayout)
 		{
 			$writer->renderBeginTag('tfoot');
 			$writer->renderBeginTag('tr');
-			if($columns>1)
-				$writer->addAttribute('colspan',"$columns");
-			if(($style=$user->generateItemStyle('Footer',-1))!==null)
+			if($columns > 1)
+				$writer->addAttribute('colspan', "$columns");
+			if(($style=$user->generateItemStyle('Footer', -1))!==null)
 				$style->addAttributesToRender($writer);
 			$writer->renderBeginTag('td');
-			$user->renderItem($writer,$this,'Footer',-1);
+			$user->renderItem($writer, $this, 'Footer', -1);
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 			$writer->renderEndTag();
 		}
 		else
-			$user->renderItem($writer,$this,'Footer',-1);
+			$user->renderItem($writer, $this, 'Footer', -1);
 		$writer->writeLine();
 	}
 }

framework/Web/UI/WebControls/TDataTypeValidator.php

Spacing +7 added lines, -7 removed lines

@@ -49,7 +49,7 @@ 
 	 */
 	public function getDataType()
 	{
-		return $this->getViewState('DataType','String');
+		return $this->getViewState('DataType', 'String');
 	}
 
 	/**
@@ -58,7 +58,7 @@ 
 	 */
 	public function setDataType($value)
 	{
-		$this->setViewState('DataType',TPropertyValue::ensureEnum($value,'TValidationDataType'),TValidationDataType::String);
+		$this->setViewState('DataType', TPropertyValue::ensureEnum($value, 'TValidationDataType'), TValidationDataType::String);
 	}
 
 	/**
@@ -92,14 +92,14 @@ 
 		switch($this->getDataType())
 		{
 			case TValidationDataType::Integer:
-				return preg_match('/^[-+]?[0-9]+$/',trim($value));
+				return preg_match('/^[-+]?[0-9]+$/', trim($value));
 			case TValidationDataType::Float:
-				return preg_match('/^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/',trim($value));
+				return preg_match('/^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/', trim($value));
 			case TValidationDataType::Date:
-				$dateFormat = $this->getDateFormat();
+				$dateFormat=$this->getDateFormat();
 				if(strlen($dateFormat))
 				{
-					$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',$dateFormat);
+					$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter', $dateFormat);
 					return $formatter->isValidDate($value);
 				}
 				else
@@ -114,7 +114,7 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options = parent::getClientScriptOptions();
+		$options=parent::getClientScriptOptions();
 		$options['DataType']=$this->getDataType();
 		if(($dateFormat=$this->getDateFormat())!=='')
 			$options['DateFormat']=$dateFormat;

framework/Web/UI/WebControls/TTabPanel.php

Spacing +53 added lines, -53 removed lines

@@ -88,7 +88,7 @@ 
 	 */
 	public function getActiveViewIndex()
 	{
-		return $this->getViewState('ActiveViewIndex',0);
+		return $this->getViewState('ActiveViewIndex', 0);
 	}
 
 	/**
@@ -97,7 +97,7 @@ 
 	 */
 	public function setActiveViewIndex($value)
 	{
-		$this->setViewState('ActiveViewIndex',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('ActiveViewIndex', TPropertyValue::ensureInteger($value), 0);
 	}
 
     /**
@@ -108,7 +108,7 @@ 
      */
     public function getActiveViewID()
     {
-		return $this->getViewState('ActiveViewID','');
+		return $this->getViewState('ActiveViewID', '');
     }
 
     /**
@@ -116,7 +116,7 @@ 
      */
     public function setActiveViewID($value)
     {
-		$this->setViewState('ActiveViewID',$value,'');
+		$this->setViewState('ActiveViewID', $value, '');
     }
 
 	/**
@@ -132,17 +132,17 @@ 
 		$views=$this->getViews();
 		if(($id=$this->getActiveViewID())!=='')
 		{
-			if(($index=$views->findIndexByID($id))>=0)
+			if(($index=$views->findIndexByID($id)) >= 0)
 				$activeView=$views->itemAt($index);
 			else
-				throw new TInvalidDataValueException('tabpanel_activeviewid_invalid',$id);
+				throw new TInvalidDataValueException('tabpanel_activeviewid_invalid', $id);
 		}
-		else if(($index=$this->getActiveViewIndex())>=0)
+		else if(($index=$this->getActiveViewIndex()) >= 0)
 		{
-			if($index<$views->getCount())
+			if($index < $views->getCount())
 				$activeView=$views->itemAt($index);
 			else
-				throw new TInvalidDataValueException('tabpanel_activeviewindex_invalid',$index);
+				throw new TInvalidDataValueException('tabpanel_activeviewindex_invalid', $index);
 		}
 		else
 		{
@@ -166,7 +166,7 @@ 
 	 */
 	public function setActiveView($view)
 	{
-		if($this->getViews()->indexOf($view)>=0)
+		if($this->getViews()->indexOf($view) >= 0)
 			$this->activateView($view);
 		else
 			throw new TInvalidOperationException('tabpanel_view_inexistent');
@@ -185,7 +185,7 @@ 
      */
     public function setAutoSwitch($value)
     {
-        $this->setViewState('AutoSwitch',TPropertyValue::ensureBoolean($value));
+        $this->setViewState('AutoSwitch', TPropertyValue::ensureBoolean($value));
     }
 
 
@@ -194,7 +194,7 @@ 
      */
     public function getCssUrl()
     {
-        return $this->getViewState('CssUrl','default');
+        return $this->getViewState('CssUrl', 'default');
     }
 
     /**
@@ -202,7 +202,7 @@ 
      */
     public function setCssUrl($value)
     {
-        $this->setViewState('CssUrl',TPropertyValue::ensureString($value),'');
+        $this->setViewState('CssUrl', TPropertyValue::ensureString($value), '');
     }
 
     /**
@@ -211,7 +211,7 @@ 
     public function getCssClass()
     {
     	$cssClass=parent::getCssClass();
-    	return $cssClass===''?'tab-panel':$cssClass;
+    	return $cssClass==='' ? 'tab-panel' : $cssClass;
     }
 
     /**
@@ -235,11 +235,11 @@ 
 	 */
 	public function getViewStyle()
 	{
-		if(($style=$this->getViewState('ViewStyle',null))===null)
+		if(($style=$this->getViewState('ViewStyle', null))===null)
 		{
 			$style=new TStyle;
 			$style->setCssClass('tab-view');
-			$this->setViewState('ViewStyle',$style,null);
+			$this->setViewState('ViewStyle', $style, null);
 		}
 		return $style;
 	}
@@ -265,11 +265,11 @@ 
 	 */
 	public function getTabStyle()
 	{
-		if(($style=$this->getViewState('TabStyle',null))===null)
+		if(($style=$this->getViewState('TabStyle', null))===null)
 		{
 			$style=new TStyle;
 			$style->setCssClass('tab-normal');
-			$this->setViewState('TabStyle',$style,null);
+			$this->setViewState('TabStyle', $style, null);
 		}
 		return $style;
 	}
@@ -295,11 +295,11 @@ 
 	 */
 	public function getActiveTabStyle()
 	{
-		if(($style=$this->getViewState('ActiveTabStyle',null))===null)
+		if(($style=$this->getViewState('ActiveTabStyle', null))===null)
 		{
 			$style=new TStyle;
 			$style->setCssClass('tab-active');
-			$this->setViewState('ActiveTabStyle',$style,null);
+			$this->setViewState('ActiveTabStyle', $style, null);
 		}
 		return $style;
 	}
@@ -333,11 +333,11 @@ 
 	 * @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(($index=$values[$this->getClientID().'_1'])!==null)
 		{
-			$index=(int)$index;
+			$index=(int) $index;
 			$currentIndex=$this->getActiveViewIndex();
 			if($currentIndex!==$index)
 			{
@@ -377,7 +377,7 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$this->setCssClass($this->getCssClass());
 		parent::addAttributesToRender($writer);
 	}
@@ -390,7 +390,7 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		$this->getActiveView();  // determine the active view
+		$this->getActiveView(); // determine the active view
 		$this->registerStyleSheet();
 
 		$page=$this->getPage();
@@ -405,17 +405,17 @@ 
 	 */
 	protected function registerStyleSheet()
 	{
-		$url = $this->getCssUrl();
+		$url=$this->getCssUrl();
 
-		if($url === '') {
+		if($url==='') {
 			return;
 		}
 
-		if($url === 'default') {
-			$url = $this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'tabpanel.css');
+		if($url==='default') {
+			$url=$this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'tabpanel.css');
 		}
 
-		if($url !== '') {
+		if($url!=='') {
 			$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 		}
 	}
@@ -433,7 +433,7 @@ 
 		$code="new $className($options);";
 		$cs->registerEndScript("prado:$id", $code);
 		// ensure an item is always active and visible
-		$index = $this->getActiveViewIndex();
+		$index=$this->getActiveViewIndex();
 		if(!$this->getViews()->itemAt($index)->Visible)
 			$index=0;
 		$cs->registerHiddenField($id.'_1', $index);
@@ -454,19 +454,19 @@ 
 	 */
 	protected function getClientOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['ActiveCssClass'] = $this->getActiveTabCssClass();
-		$options['NormalCssClass'] = $this->getTabCssClass();
-		$viewIDs = array();
-		$viewVis = array();
+		$options['ID']=$this->getClientID();
+		$options['ActiveCssClass']=$this->getActiveTabCssClass();
+		$options['NormalCssClass']=$this->getTabCssClass();
+		$viewIDs=array();
+		$viewVis=array();
 		foreach($this->getViews() as $view)
 		{
-			$viewIDs[] = $view->getClientID();
-			$viewVis[] = $view->getVisible();
+			$viewIDs[]=$view->getClientID();
+			$viewVis[]=$view->getVisible();
 		}
-		$options['Views'] = $viewIDs;
-		$options['ViewsVis'] = $viewVis;
-		$options['AutoSwitch'] = $this->getAutoSwitch();
+		$options['Views']=$viewIDs;
+		$options['ViewsVis']=$viewVis;
+		$options['AutoSwitch']=$this->getAutoSwitch();
 
 		return $options;
 	}
@@ -501,7 +501,7 @@ 
 	public function renderContents($writer)
 	{
 		$views=$this->getViews();
-		if($views->getCount()>0)
+		if($views->getCount() > 0)
 		{
 			$writer->writeLine();
 			// render tab bar
@@ -560,13 +560,13 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		if(!$this->getActive() && $this->getPage()->getClientSupportsJavaScript())
-			$this->getStyle()->setStyleField('display','none');
+			$this->getStyle()->setStyleField('display', 'none');
 
 		$this->getStyle()->mergeWith($this->getParent()->getViewStyle());
 
 		parent::addAttributesToRender($writer);
 
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 	}
 
 	/**
@@ -574,7 +574,7 @@ 
 	 */
 	public function getCaption()
 	{
-		return $this->getViewState('Caption','');
+		return $this->getViewState('Caption', '');
 	}
 
 	/**
@@ -582,7 +582,7 @@ 
 	 */
 	public function setCaption($value)
 	{
-		$this->setViewState('Caption',TPropertyValue::ensureString($value),'');
+		$this->setViewState('Caption', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -590,7 +590,7 @@ 
 	 */
 	public function getNavigateUrl()
 	{
-		return $this->getViewState('NavigateUrl','');
+		return $this->getViewState('NavigateUrl', '');
 	}
 
 	/**
@@ -600,7 +600,7 @@ 
 	 */
 	public function setNavigateUrl($value)
 	{
-		$this->setViewState('NavigateUrl',TPropertyValue::ensureString($value),'');
+		$this->setViewState('NavigateUrl', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -608,7 +608,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -618,7 +618,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',TPropertyValue::ensureString($value),'');
+		$this->setViewState('Text', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -657,9 +657,9 @@ 
 	{
 		if($this->getVisible(false) && $this->getPage()->getClientSupportsJavaScript())
 		{
-			$writer->addAttribute('id',$this->getClientID().'_0');
+			$writer->addAttribute('id', $this->getClientID().'_0');
 
-			$style=$this->getActive()?$this->getParent()->getActiveTabStyle():$this->getParent()->getTabStyle();
+			$style=$this->getActive() ? $this->getParent()->getActiveTabStyle() : $this->getParent()->getTabStyle();
 			$style->addAttributesToRender($writer);
 
 			$writer->renderBeginTag($this->getTagName());
@@ -703,10 +703,10 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a {@link TTabView} object.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TTabView)
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('tabviewcollection_tabview_required');
 	}

framework/Web/UI/WebControls/TWebControlDecorator.php

Spacing +29 added lines, -29 removed lines

@@ -65,7 +65,7 @@ 
 	 * @var boolean tells if the decoration uses state in its templates.  If there are no templates
 	 * in the instance of the decoration this variable is unused.
 	 */
-	private $_usestate = false;
+	private $_usestate=false;
 
 	/**
 	 * @var TWebControl the control to decorate
@@ -86,19 +86,19 @@ 
 	/**
 	 * @var string the text that goes before the open tag
 	 */
-	private $_pretagtext = '';
+	private $_pretagtext='';
 	/**
 	 * @var string the text that goes after the open tag
 	 */
-	private $_precontentstext = '';
+	private $_precontentstext='';
 	/**
 	 * @var string the text that goes before the close tag
 	 */
-	private $_postcontentstext = '';
+	private $_postcontentstext='';
 	/**
 	 * @var string the text that goes after the close tag
 	 */
-	private $_posttagtext = '';
+	private $_posttagtext='';
 
 
 
@@ -125,9 +125,9 @@ 
 	 * @param TWebControl The control that is to be decorated.
 	 * @param boolean whether decoration is just around the inner content
 	 */
-	public function __construct($control, $onlyinternal = false) {
-		$this->_control = $control;
-		$this->_internalonly = $onlyinternal;
+	public function __construct($control, $onlyinternal=false) {
+		$this->_control=$control;
+		$this->_internalonly=$onlyinternal;
 	}
 
 	/**
@@ -144,7 +144,7 @@ 
 	 */
 	public function setUseState($value)
 	{
-		$this->_usestate = TPropertyValue::ensureBoolean($value);
+		$this->_usestate=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -159,7 +159,7 @@ 
 	 */
 	public function setPreTagText($value) {
 		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
-			$this->_pretagtext = TPropertyValue::ensureString($value);
+			$this->_pretagtext=TPropertyValue::ensureString($value);
 	}
 
 
@@ -175,7 +175,7 @@ 
 	 */
 	public function setPreContentsText($value) {
 		if(!$this->_control->getIsSkinApplied())
-			$this->_precontentstext = TPropertyValue::ensureString($value);
+			$this->_precontentstext=TPropertyValue::ensureString($value);
 	}
 
 
@@ -191,7 +191,7 @@ 
 	 */
 	public function setPostContentsText($value) {
 		if(!$this->_control->getIsSkinApplied())
-			$this->_postcontentstext = TPropertyValue::ensureString($value);
+			$this->_postcontentstext=TPropertyValue::ensureString($value);
 	}
 
 
@@ -207,7 +207,7 @@ 
 	 */
 	public function setPostTagText($value) {
 		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
-			$this->_posttagtext = TPropertyValue::ensureString($value);
+			$this->_posttagtext=TPropertyValue::ensureString($value);
 	}
 
 
@@ -223,7 +223,7 @@ 
 	 */
 	public function setPreTagTemplate($value) {
 		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
-			$this->_pretagtemplate = $value;
+			$this->_pretagtemplate=$value;
 	}
 
 
@@ -239,7 +239,7 @@ 
 	 */
 	public function setPreContentsTemplate($value) {
 		if(!$this->_control->getIsSkinApplied())
-			$this->_precontentstemplate = $value;
+			$this->_precontentstemplate=$value;
 	}
 
 
@@ -255,7 +255,7 @@ 
 	 */
 	public function setPostContentsTemplate($value) {
 		if(!$this->_control->getIsSkinApplied())
-			$this->_postcontentstemplate = $value;
+			$this->_postcontentstemplate=$value;
 	}
 
 
@@ -271,7 +271,7 @@ 
 	 */
 	public function setPostTagTemplate($value) {
 		if(!$this->_internalonly && !$this->_control->getIsSkinApplied())
-			$this->_posttagtemplate = $value;
+			$this->_posttagtemplate=$value;
 	}
 
 	/**
@@ -280,15 +280,15 @@ 
 	 * This call attaches the ensureTemplateDecoration to the TPage onSaveStateComplete so
 	 * these controls don't have page states.  This is as close to not influencing the page as possible.
 	 */
-	public function instantiate($outercontrol = null) {
+	public function instantiate($outercontrol=null) {
 		if($this->getPreTagTemplate() || $this->getPreContentsTemplate() ||
 			$this->getPostContentsTemplate() || $this->getPostTagTemplate()) {
 
-			$this->_outercontrol = $outercontrol;
+			$this->_outercontrol=$outercontrol;
 			if($this->getUseState())
 				$this->ensureTemplateDecoration();
 			else
-				$this->_control->getPage()->onSaveStateComplete[] = array($this, 'ensureTemplateDecoration');
+				$this->_control->getPage()->onSaveStateComplete[]=array($this, 'ensureTemplateDecoration');
 		}
 	}
 
@@ -303,26 +303,26 @@ 
 	 */
 	public function ensureTemplateDecoration($sender=null, $param=null) {
 
-		$control = $this->_control;
-		$outercontrol = $this->_outercontrol;
-		if($outercontrol === null)
-			$outercontrol = $control;
+		$control=$this->_control;
+		$outercontrol=$this->_outercontrol;
+		if($outercontrol===null)
+			$outercontrol=$control;
 
 		if($this->_addedTemplateDecoration)
 			return $this->_addedTemplateDecoration;
 
-		$this->_addedTemplateDecoration = true;
+		$this->_addedTemplateDecoration=true;
 
 		if($this->getPreContentsTemplate())
 		{
-			$precontents = Prado::createComponent('TCompositeControl');
+			$precontents=Prado::createComponent('TCompositeControl');
 			$this->getPreContentsTemplate()->instantiateIn($precontents);
 			$control->getControls()->insertAt(0, $precontents);
 		}
 
 		if($this->getPostContentsTemplate())
 		{
-			$postcontents = Prado::createComponent('TCompositeControl');
+			$postcontents=Prado::createComponent('TCompositeControl');
 			$this->getPostContentsTemplate()->instantiateIn($postcontents);
 			$control->getControls()->add($postcontents);
 		}
@@ -333,14 +333,14 @@ 
 
 		if($this->getPreTagTemplate())
 		{
-			$pretag = Prado::createComponent('TCompositeControl');
+			$pretag=Prado::createComponent('TCompositeControl');
 			$this->getPreTagTemplate()->instantiateIn($pretag);
 			$outercontrol->getParent()->getControls()->insertBefore($outercontrol, $pretag);
 		}
 
 		if($this->getPostTagTemplate())
 		{
-			$posttag = Prado::createComponent('TCompositeControl');
+			$posttag=Prado::createComponent('TCompositeControl');
 			$this->getPostTagTemplate()->instantiateIn($posttag);
 			$outercontrol->getParent()->getControls()->insertAfter($outercontrol, $posttag);
 		}