pradosoft / prado

framework/Web/UI/WebControls/TCaptcha.php

Doc Comments +8 added lines

@@ -267,6 +267,7 @@ 
 
 	/**
 	 * @param string the public key used for generating the token. A random one will be generated if this is not set.
+	 * @param string $value
 	 */
 	public function setPublicKey($value)
 	{
@@ -322,6 +323,7 @@ 
 	/**
 	 * Validates a user input with the token.
 	 * @param string user input
+	 * @param string $input
 	 * @return boolean if the user input is not the same as the token.
 	 */
 	public function validate($input)
@@ -447,6 +449,11 @@ 
 	 * @param string private key
 	 * @param integer the length of the token
 	 * @param boolean whether the token is case sensitive
+	 * @param string $publicKey
+	 * @param string $privateKey
+	 * @param string $alphabet
+	 * @param integer $tokenLength
+	 * @param boolean $caseSensitive
 	 * @return string the token generated.
 	 */
 	protected function generateToken($publicKey,$privateKey,$alphabet,$tokenLength,$caseSensitive)
@@ -459,6 +466,7 @@ 
 	 * Converts a hash string into a string with characters consisting of alphanumeric characters.
 	 * @param string the hexadecimal representation of the hash string
 	 * @param string the alphabet used to represent the converted string. If empty, it means '234578adefhijmnrtwyABDEFGHIJLMNQRTWY', which excludes those confusing characters.
+	 * @param string $hex
 	 * @return string the converted string
 	 */
 	protected function hash2string($hex,$alphabet='')

Spacing +60 added lines, -60 removed lines

@@ -71,7 +71,7 @@ 
 	 */
 	public function getTokenImageTheme()
 	{
-		return $this->getViewState('TokenImageTheme',0);
+		return $this->getViewState('TokenImageTheme', 0);
 	}
 
 	/**
@@ -90,10 +90,10 @@ 
 	public function setTokenImageTheme($value)
 	{
 		$value=TPropertyValue::ensureInteger($value);
-		if($value>=0 && $value<=63)
-			$this->setViewState('TokenImageTheme',$value,0);
+		if($value >= 0 && $value <= 63)
+			$this->setViewState('TokenImageTheme', $value, 0);
 		else
-			throw new TConfigurationException('captcha_tokenimagetheme_invalid',0,63);
+			throw new TConfigurationException('captcha_tokenimagetheme_invalid', 0, 63);
 	}
 
 	/**
@@ -101,7 +101,7 @@ 
 	 */
 	public function getTokenFontSize()
 	{
-		return $this->getViewState('TokenFontSize',30);
+		return $this->getViewState('TokenFontSize', 30);
 	}
 
 	/**
@@ -113,10 +113,10 @@ 
 	public function setTokenFontSize($value)
 	{
 		$value=TPropertyValue::ensureInteger($value);
-		if($value>=20 && $value<=100)
-			$this->setViewState('TokenFontSize',$value,30);
+		if($value >= 20 && $value <= 100)
+			$this->setViewState('TokenFontSize', $value, 30);
 		else
-			throw new TConfigurationException('captcha_tokenfontsize_invalid',20,100);
+			throw new TConfigurationException('captcha_tokenfontsize_invalid', 20, 100);
 	}
 
 	/**
@@ -124,7 +124,7 @@ 
 	 */
 	public function getMinTokenLength()
 	{
-		return $this->getViewState('MinTokenLength',4);
+		return $this->getViewState('MinTokenLength', 4);
 	}
 
 	/**
@@ -133,10 +133,10 @@ 
 	public function setMinTokenLength($value)
 	{
 		$length=TPropertyValue::ensureInteger($value);
-		if($length>=self::MIN_TOKEN_LENGTH && $length<=self::MAX_TOKEN_LENGTH)
-			$this->setViewState('MinTokenLength',$length,4);
+		if($length >= self::MIN_TOKEN_LENGTH && $length <= self::MAX_TOKEN_LENGTH)
+			$this->setViewState('MinTokenLength', $length, 4);
 		else
-			throw new TConfigurationException('captcha_mintokenlength_invalid',self::MIN_TOKEN_LENGTH,self::MAX_TOKEN_LENGTH);
+			throw new TConfigurationException('captcha_mintokenlength_invalid', self::MIN_TOKEN_LENGTH, self::MAX_TOKEN_LENGTH);
 	}
 
 	/**
@@ -144,7 +144,7 @@ 
 	 */
 	public function getMaxTokenLength()
 	{
-		return $this->getViewState('MaxTokenLength',6);
+		return $this->getViewState('MaxTokenLength', 6);
 	}
 
 	/**
@@ -153,10 +153,10 @@ 
 	public function setMaxTokenLength($value)
 	{
 		$length=TPropertyValue::ensureInteger($value);
-		if($length>=self::MIN_TOKEN_LENGTH && $length<=self::MAX_TOKEN_LENGTH)
-			$this->setViewState('MaxTokenLength',$length,6);
+		if($length >= self::MIN_TOKEN_LENGTH && $length <= self::MAX_TOKEN_LENGTH)
+			$this->setViewState('MaxTokenLength', $length, 6);
 		else
-			throw new TConfigurationException('captcha_maxtokenlength_invalid',self::MIN_TOKEN_LENGTH,self::MAX_TOKEN_LENGTH);
+			throw new TConfigurationException('captcha_maxtokenlength_invalid', self::MIN_TOKEN_LENGTH, self::MAX_TOKEN_LENGTH);
 	}
 
 	/**
@@ -164,7 +164,7 @@ 
 	 */
 	public function getCaseSensitive()
 	{
-		return $this->getViewState('CaseSensitive',true);
+		return $this->getViewState('CaseSensitive', true);
 	}
 
 	/**
@@ -172,7 +172,7 @@ 
 	 */
 	public function setCaseSensitive($value)
 	{
-		$this->setViewState('CaseSensitive',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CaseSensitive', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -180,7 +180,7 @@ 
 	 */
 	public function getTokenAlphabet()
 	{
-		return $this->getViewState('TokenAlphabet','234578adefhijmnrtABDEFGHJLMNRT');
+		return $this->getViewState('TokenAlphabet', '234578adefhijmnrtABDEFGHJLMNRT');
 	}
 
 	/**
@@ -188,9 +188,9 @@ 
 	 */
 	public function setTokenAlphabet($value)
 	{
-		if(strlen($value)<2)
+		if(strlen($value) < 2)
 			throw new TConfigurationException('captcha_tokenalphabet_invalid');
-		$this->setViewState('TokenAlphabet',$value,'234578adefhijmnrtABDEFGHJLMNRT');
+		$this->setViewState('TokenAlphabet', $value, '234578adefhijmnrtABDEFGHJLMNRT');
 	}
 
 	/**
@@ -198,7 +198,7 @@ 
 	 */
 	public function getTokenExpiry()
 	{
-		return $this->getViewState('TokenExpiry',600);
+		return $this->getViewState('TokenExpiry', 600);
 	}
 
 	/**
@@ -206,7 +206,7 @@ 
 	 */
 	public function setTokenExpiry($value)
 	{
-		$this->setViewState('TokenExpiry',TPropertyValue::ensureInteger($value),600);
+		$this->setViewState('TokenExpiry', TPropertyValue::ensureInteger($value), 600);
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 	 */
 	public function getChangingTokenBackground()
 	{
-		return $this->getViewState('ChangingTokenBackground',false);
+		return $this->getViewState('ChangingTokenBackground', false);
 	}
 
 	/**
@@ -222,7 +222,7 @@ 
 	 */
 	public function setChangingTokenBackground($value)
 	{
-		$this->setViewState('ChangingTokenBackground',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ChangingTokenBackground', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 	 */
 	public function getTestLimit()
 	{
-		return $this->getViewState('TestLimit',5);
+		return $this->getViewState('TestLimit', 5);
 	}
 
 	/**
@@ -238,7 +238,7 @@ 
 	 */
 	public function setTestLimit($value)
 	{
-		$this->setViewState('TestLimit',TPropertyValue::ensureInteger($value),5);
+		$this->setViewState('TestLimit', TPropertyValue::ensureInteger($value), 5);
 	}
 
 	/**
@@ -246,8 +246,8 @@ 
 	 */
 	public function getIsTokenExpired()
 	{
-		if(($expiry=$this->getTokenExpiry())>0 && ($start=$this->getViewState('TokenGenerated',0))>0)
-			return $expiry+$start<time();
+		if(($expiry=$this->getTokenExpiry()) > 0 && ($start=$this->getViewState('TokenGenerated', 0)) > 0)
+			return $expiry + $start < time();
 		else
 			return false;
 	}
@@ -257,7 +257,7 @@ 
 	 */
 	public function getPublicKey()
 	{
-		if(($publicKey=$this->getViewState('PublicKey',''))==='')
+		if(($publicKey=$this->getViewState('PublicKey', ''))==='')
 		{
 			$publicKey=$this->generateRandomKey();
 			$this->setPublicKey($publicKey);
@@ -270,7 +270,7 @@ 
 	 */
 	public function setPublicKey($value)
 	{
-		$this->setViewState('PublicKey',$value,'');
+		$this->setViewState('PublicKey', $value, '');
 	}
 
 	/**
@@ -278,7 +278,7 @@ 
 	 */
 	public function getToken()
 	{
-		return $this->generateToken($this->getPublicKey(),$this->getPrivateKey(),$this->getTokenAlphabet(),$this->getTokenLength(),$this->getCaseSensitive());
+		return $this->generateToken($this->getPublicKey(), $this->getPrivateKey(), $this->getTokenAlphabet(), $this->getTokenLength(), $this->getCaseSensitive());
 	}
 
 	/**
@@ -290,13 +290,13 @@ 
 		{
 			$minLength=$this->getMinTokenLength();
 			$maxLength=$this->getMaxTokenLength();
-			if($minLength>$maxLength)
-				$tokenLength=rand($maxLength,$minLength);
-			else if($minLength<$maxLength)
-				$tokenLength=rand($minLength,$maxLength);
+			if($minLength > $maxLength)
+				$tokenLength=rand($maxLength, $minLength);
+			else if($minLength < $maxLength)
+				$tokenLength=rand($minLength, $maxLength);
 			else
 				$tokenLength=$minLength;
-			$this->setViewState('TokenLength',$tokenLength);
+			$this->setViewState('TokenLength', $tokenLength);
 		}
 		return $tokenLength;
 	}
@@ -311,7 +311,7 @@ 
 			$fileName=$this->generatePrivateKeyFile();
 			$content=file_get_contents($fileName);
 			$matches=array();
-			if(preg_match("/privateKey='(.*?)'/ms",$content,$matches)>0)
+			if(preg_match("/privateKey='(.*?)'/ms", $content, $matches) > 0)
 				$this->_privateKey=$matches[1];
 			else
 				throw new TConfigurationException('captcha_privatekey_unknown');
@@ -326,18 +326,18 @@ 
 	 */
 	public function validate($input)
 	{
-		$number=$this->getViewState('TestNumber',0);
+		$number=$this->getViewState('TestNumber', 0);
 		if(!$this->_validated)
 		{
-			$this->setViewState('TestNumber',++$number);
+			$this->setViewState('TestNumber', ++$number);
 			$this->_validated=true;
 		}
-		if($this->getIsTokenExpired() || (($limit=$this->getTestLimit())>0 && $number>$limit))
+		if($this->getIsTokenExpired() || (($limit=$this->getTestLimit()) > 0 && $number > $limit))
 		{
 			$this->regenerateToken();
 			return false;
 		}
-		return ($this->getToken()===($this->getCaseSensitive()?$input:strtoupper($input)));
+		return ($this->getToken()===($this->getCaseSensitive() ? $input : strtoupper($input)));
 	}
 
 	/**
@@ -351,7 +351,7 @@ 
 		$this->setPublicKey('');
 		$this->clearViewState('TokenGenerated');
 		$this->clearViewState('RandomSeed');
-		$this->clearViewState('TestNumber',0);
+		$this->clearViewState('TestNumber', 0);
 	}
 
 	/**
@@ -363,7 +363,7 @@ 
 		parent::onPreRender($param);
 		if(!self::checkRequirements())
 			throw new TConfigurationException('captcha_imagettftext_required');
-		if(!$this->getViewState('TokenGenerated',0))
+		if(!$this->getViewState('TokenGenerated', 0))
 		{
 			$manager=$this->getApplication()->getAssetManager();
 			$manager->publishFilePath($this->getFontFile());
@@ -371,7 +371,7 @@ 
 			$url.='?options='.urlencode($this->getTokenImageOptions());
 			$this->setImageUrl($url);
 
-			$this->setViewState('TokenGenerated',time());
+			$this->setViewState('TokenGenerated', time());
 		}
 	}
 
@@ -380,7 +380,7 @@ 
 	 */
 	protected function getTokenImageOptions()
 	{
-		$privateKey=$this->getPrivateKey();  // call this method to ensure private key is generated
+		$privateKey=$this->getPrivateKey(); // call this method to ensure private key is generated
 		$token=$this->getToken();
 		$options=array();
 		$options['publicKey']=$this->getPublicKey();
@@ -389,12 +389,12 @@ 
 		$options['alphabet']=$this->getTokenAlphabet();
 		$options['fontSize']=$this->getTokenFontSize();
 		$options['theme']=$this->getTokenImageTheme();
-		if(($randomSeed=$this->getViewState('RandomSeed',0))===0)
+		if(($randomSeed=$this->getViewState('RandomSeed', 0))===0)
 		{
-			$randomSeed=(int)(microtime()*1000000);
-			$this->setViewState('RandomSeed',$randomSeed);
+			$randomSeed=(int) (microtime() * 1000000);
+			$this->setViewState('RandomSeed', $randomSeed);
 		}
-		$options['randomSeed']=$this->getChangingTokenBackground()?0:$randomSeed;
+		$options['randomSeed']=$this->getChangingTokenBackground() ? 0 : $randomSeed;
 		$str=serialize($options);
 		return base64_encode(md5($privateKey.$str).$str);
 	}
@@ -428,7 +428,7 @@ 
 			$content="<?php
 \$privateKey='$key';
 ?>";
-			file_put_contents($fileName,$content);
+			file_put_contents($fileName, $content);
 		}
 		return $fileName;
 	}
@@ -449,10 +449,10 @@ 
 	 * @param boolean whether the token is case sensitive
 	 * @return string the token generated.
 	 */
-	protected function generateToken($publicKey,$privateKey,$alphabet,$tokenLength,$caseSensitive)
+	protected function generateToken($publicKey, $privateKey, $alphabet, $tokenLength, $caseSensitive)
 	{
-		$token=substr($this->hash2string(md5($publicKey.$privateKey),$alphabet).$this->hash2string(md5($privateKey.$publicKey),$alphabet),0,$tokenLength);
-		return $caseSensitive?$token:strtoupper($token);
+		$token=substr($this->hash2string(md5($publicKey.$privateKey), $alphabet).$this->hash2string(md5($privateKey.$publicKey), $alphabet), 0, $tokenLength);
+		return $caseSensitive ? $token : strtoupper($token);
 	}
 
 	/**
@@ -461,20 +461,20 @@ 
 	 * @param string the alphabet used to represent the converted string. If empty, it means '234578adefhijmnrtwyABDEFGHIJLMNQRTWY', which excludes those confusing characters.
 	 * @return string the converted string
 	 */
-	protected function hash2string($hex,$alphabet='')
+	protected function hash2string($hex, $alphabet='')
 	{
-		if(strlen($alphabet)<2)
+		if(strlen($alphabet) < 2)
 			$alphabet='234578adefhijmnrtABDEFGHJLMNQRT';
 		$hexLength=strlen($hex);
 		$base=strlen($alphabet);
 		$result='';
-		for($i=0;$i<$hexLength;$i+=6)
+		for($i=0; $i < $hexLength; $i+=6)
 		{
-			$number=hexdec(substr($hex,$i,6));
+			$number=hexdec(substr($hex, $i, 6));
 			while($number)
 			{
-				$result.=$alphabet[$number%$base];
-				$number=floor($number/$base);
+				$result.=$alphabet[$number % $base];
+				$number=floor($number / $base);
 			}
 		}
 		return $result;

framework/Web/UI/WebControls/TCaptchaValidator.php

Doc Comments +4 added lines, -1 removed lines

@@ -79,7 +79,7 @@ 
 	}
 
 	/**
-	 * @return TCaptchaControl the CAPTCHA control to be validated against
+	 * @return TCaptcha the CAPTCHA control to be validated against
 	 * @throws TConfigurationException if the CAPTCHA cannot be found according to {@link setCaptchaControl CaptchaControl}
 	 */
 	protected function findCaptchaControl()
@@ -115,6 +115,9 @@ 
 		return $options;
 	}
 
+	/**
+	 * @param string $token
+	 */
 	private function generateTokenHash($token)
 	{
 		for($h=0,$i=strlen($token)-1;$i>=0;--$i)

Spacing +5 added lines, -5 removed lines

@@ -50,7 +50,7 @@ 
 	 */
 	public function getCaptchaControl()
 	{
-		return $this->getViewState('CaptchaControl','');
+		return $this->getViewState('CaptchaControl', '');
 	}
 
 	/**
@@ -61,7 +61,7 @@ 
 	 */
 	public function setCaptchaControl($value)
 	{
-		$this->setViewState('CaptchaControl',TPropertyValue::ensureString($value),'');
+		$this->setViewState('CaptchaControl', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -87,9 +87,9 @@ 
 		if(($id=$this->getCaptchaControl())==='')
 			throw new TConfigurationException('captchavalidator_captchacontrol_required');
 		else if(($control=$this->findControl($id))===null)
-			throw new TConfigurationException('captchavalidator_captchacontrol_inexistent',$id);
+			throw new TConfigurationException('captchavalidator_captchacontrol_inexistent', $id);
 		else if(!($control instanceof TCaptcha))
-			throw new TConfigurationException('captchavalidator_captchacontrol_invalid',$id);
+			throw new TConfigurationException('captchavalidator_captchacontrol_invalid', $id);
 		else
 			return $control;
 	}
@@ -117,7 +117,7 @@ 
 
 	private function generateTokenHash($token)
 	{
-		for($h=0,$i=strlen($token)-1;$i>=0;--$i)
+		for($h=0, $i=strlen($token) - 1; $i >= 0; --$i)
 			$h+=ord($token[$i]);
 		return $h;
 	}

Braces +1 added lines, -2 removed lines

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

framework/Web/UI/WebControls/TCheckBox.php

Doc Comments +6 added lines, -1 removed lines

@@ -117,7 +117,7 @@ 
 
 	/**
 	 * Returns the value of the property that needs validation.
-	 * @return mixed the property value to be validated
+	 * @return boolean the property value to be validated
 	 */
 	public function getValidationPropertyValue()
 	{
@@ -184,6 +184,7 @@ 
 
 	/**
 	 * @param TTextAlign the alignment of the text caption. Valid values include Left and Right.
+	 * @param TTextAlign $value
 	 */
 	public function setTextAlign($value)
 	{
@@ -244,6 +245,7 @@ 
 	/**
 	 * Sets a value indicating whether clicking on the checkbox will post the page.
 	 * @param boolean whether clicking on the checkbox will post the page.
+	 * @param boolean $value
 	 */
 	public function setAutoPostBack($value)
 	{
@@ -261,6 +263,7 @@ 
 	/**
 	 * Sets the value indicating whether postback event trigger by this checkbox will cause input validation.
 	 * @param boolean whether postback event trigger by this checkbox will cause input validation.
+	 * @param boolean $value
 	 */
 	public function setCausesValidation($value)
 	{
@@ -277,6 +280,7 @@ 
 
 	/**
 	 * @param string the group of validators which the checkbox causes validation upon postback
+	 * @param string $value
 	 */
 	public function setValidationGroup($value)
 	{
@@ -410,6 +414,7 @@ 
 
 	/**
 	 * @param boolean whether to render javascript.
+	 * @param boolean $value
 	 */
 	public function setEnableClientScript($value)
 	{

Indentation +18 added lines, -18 removed lines

@@ -131,14 +131,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);
 	}
 
 	/**
@@ -288,7 +288,7 @@ 
 	 */
 	public function getSurroundingTag()
 	{
-    return 'span';
+	return 'span';
 	}
 
 	/**
@@ -296,7 +296,7 @@ 
 	 */
 	public function getSurroundingTagID()
 	{
-    return $this->getSpanNeeded() ? $this->getClientID().'_parent' : $this->getClientID();
+	return $this->getSpanNeeded() ? $this->getClientID().'_parent' : $this->getClientID();
 	}
 
 	/**
@@ -326,11 +326,11 @@ 
 		}
 		else
 			$onclick='';
-    if($needspan=$this->getSpanNeeded())
-    {
-      $writer->addAttribute('id',$this->getSurroundingTagID());
-      $writer->renderBeginTag($this->getSurroundingTag());
-    }
+	if($needspan=$this->getSpanNeeded())
+	{
+	  $writer->addAttribute('id',$this->getSurroundingTagID());
+	  $writer->renderBeginTag($this->getSurroundingTag());
+	}
 		$clientID=$this->getClientID();
 		if(($text=$this->getText())!=='')
 		{
@@ -416,15 +416,15 @@ 
 		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
 	}
 
-    /**
-     * Check if we need a span tag to surround this control. The span tag will be created if
-     * the Text property is set for this control.
-     *
-     * @return bool wether this control needs a surrounding span tag
-     */
-    protected function getSpanNeeded() {
-        return $this->getText()!=='';
-    }
+	/**
+	 * Check if we need a span tag to surround this control. The span tag will be created if
+	 * the Text property is set for this control.
+	 *
+	 * @return bool wether this control needs a surrounding span tag
+	 */
+	protected function getSpanNeeded() {
+		return $this->getText()!=='';
+	}
 
 	/**
 	 * Renders a label beside the checkbox.

Braces +3 added lines, -6 removed lines

@@ -323,8 +323,7 @@ 
 				$writer->addAttributes($attributes);
 			if($value!==null)
 				$attributes->add('value',$value);
-		}
-		else
+		} else
 			$onclick='';
     if($needspan=$this->getSpanNeeded())
     {
@@ -338,14 +337,12 @@ 
 			{
 				$this->renderLabel($writer,$clientID,$text);
 				$this->renderInputTag($writer,$clientID,$onclick);
-			}
-			else
+			} else
 			{
 				$this->renderInputTag($writer,$clientID,$onclick);
 				$this->renderLabel($writer,$clientID,$text);
 			}
-		}
-		else
+		} else
 			$this->renderInputTag($writer,$clientID,$onclick);
 		if($needspan)
 			$writer->renderEndTag();

Spacing +52 added lines, -52 removed lines

@@ -58,7 +58,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)
 	{
 		$checked=$this->getChecked();
 		if($newChecked=isset($values[$key]))
@@ -87,7 +87,7 @@ 
 	 */
 	public function onCheckedChanged($param)
 	{
-		$this->raiseEvent('OnCheckedChanged',$this,$param);
+		$this->raiseEvent('OnCheckedChanged', $this, $param);
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 	 */
 	public function getValue()
 	{
-		return $this->getViewState('Value','');
+		return $this->getViewState('Value', '');
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->setViewState('Value',TPropertyValue::ensureString($value),'');
+		$this->setViewState('Value', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -179,7 +179,7 @@ 
 	 */
 	public function getTextAlign()
 	{
-		return $this->getViewState('TextAlign',TTextAlign::Right);
+		return $this->getViewState('TextAlign', TTextAlign::Right);
 	}
 
 	/**
@@ -187,7 +187,7 @@ 
 	 */
 	public function setTextAlign($value)
 	{
-		$this->setViewState('TextAlign',TPropertyValue::ensureEnum($value,'TTextAlign'),TTextAlign::Right);
+		$this->setViewState('TextAlign', TPropertyValue::ensureEnum($value, 'TTextAlign'), TTextAlign::Right);
 	}
 
 	/**
@@ -195,7 +195,7 @@ 
 	 */
 	public function getChecked()
 	{
-		return $this->getViewState('Checked',false);
+		return $this->getViewState('Checked', false);
 	}
 
 	/**
@@ -204,7 +204,7 @@ 
 	 */
 	public function setChecked($value)
 	{
-		$this->setViewState('Checked',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('Checked', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -238,7 +238,7 @@ 
 	 */
 	public function getAutoPostBack()
 	{
-		return $this->getViewState('AutoPostBack',false);
+		return $this->getViewState('AutoPostBack', false);
 	}
 
 	/**
@@ -247,7 +247,7 @@ 
 	 */
 	public function setAutoPostBack($value)
 	{
-		$this->setViewState('AutoPostBack',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('AutoPostBack', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -255,7 +255,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -264,7 +264,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -272,7 +272,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -280,7 +280,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -311,7 +311,7 @@ 
 		if($this->getHasStyle())
 			$this->getStyle()->addAttributesToRender($writer);
 		if(($tooltip=$this->getToolTip())!=='')
-			$writer->addAttribute('title',$tooltip);
+			$writer->addAttribute('title', $tooltip);
 		if($this->getHasAttributes())
 		{
 			$attributes=$this->getAttributes();
@@ -322,13 +322,13 @@ 
 			if($attributes->getCount())
 				$writer->addAttributes($attributes);
 			if($value!==null)
-				$attributes->add('value',$value);
+				$attributes->add('value', $value);
 		}
 		else
 			$onclick='';
     if($needspan=$this->getSpanNeeded())
     {
-      $writer->addAttribute('id',$this->getSurroundingTagID());
+      $writer->addAttribute('id', $this->getSurroundingTagID());
       $writer->renderBeginTag($this->getSurroundingTag());
     }
 		$clientID=$this->getClientID();
@@ -336,17 +336,17 @@ 
 		{
 			if($this->getTextAlign()===TTextAlign::Left)
 			{
-				$this->renderLabel($writer,$clientID,$text);
-				$this->renderInputTag($writer,$clientID,$onclick);
+				$this->renderLabel($writer, $clientID, $text);
+				$this->renderInputTag($writer, $clientID, $onclick);
 			}
 			else
 			{
-				$this->renderInputTag($writer,$clientID,$onclick);
-				$this->renderLabel($writer,$clientID,$text);
+				$this->renderInputTag($writer, $clientID, $onclick);
+				$this->renderLabel($writer, $clientID, $text);
 			}
 		}
 		else
-			$this->renderInputTag($writer,$clientID,$onclick);
+			$this->renderInputTag($writer, $clientID, $onclick);
 		if($needspan)
 			$writer->renderEndTag();
 	}
@@ -356,12 +356,12 @@ 
 	 */
 	public function getLabelAttributes()
 	{
-		if($attributes=$this->getViewState('LabelAttributes',null))
+		if($attributes=$this->getViewState('LabelAttributes', null))
 			return $attributes;
 		else
 		{
 			$attributes=new TAttributeCollection;
-			$this->setViewState('LabelAttributes',$attributes,null);
+			$this->setViewState('LabelAttributes', $attributes, null);
 			return $attributes;
 		}
 	}
@@ -371,12 +371,12 @@ 
 	 */
 	public function getInputAttributes()
 	{
-		if($attributes=$this->getViewState('InputAttributes',null))
+		if($attributes=$this->getViewState('InputAttributes', null))
 			return $attributes;
 		else
 		{
 			$attributes=new TAttributeCollection;
-			$this->setViewState('InputAttributes',$attributes,null);
+			$this->setViewState('InputAttributes', $attributes, null);
 			return $attributes;
 		}
 	}
@@ -390,7 +390,7 @@ 
 			return $value;
 		else
 		{
-			$attributes=$this->getViewState('InputAttributes',null);
+			$attributes=$this->getViewState('InputAttributes', null);
 			if($attributes && $attributes->contains('value'))
 				return $attributes->itemAt('value');
 			else if($this->hasAttribute('value'))
@@ -405,7 +405,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -413,7 +413,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
     /**
@@ -432,10 +432,10 @@ 
 	 * @param string checkbox id
 	 * @param string label text
 	 */
-	protected function renderLabel($writer,$clientID,$text)
+	protected function renderLabel($writer, $clientID, $text)
 	{
-		$writer->addAttribute('for',$clientID);
-		if($attributes=$this->getViewState('LabelAttributes',null))
+		$writer->addAttribute('for', $clientID);
+		if($attributes=$this->getViewState('LabelAttributes', null))
 			$writer->addAttributes($attributes);
 		$writer->renderBeginTag('label');
 		$writer->write($text);
@@ -448,21 +448,21 @@ 
 	 * @param string checkbox id
 	 * @param string onclick js
 	 */
-	protected function renderInputTag($writer,$clientID,$onclick)
+	protected function renderInputTag($writer, $clientID, $onclick)
 	{
 		if($clientID!=='')
-			$writer->addAttribute('id',$clientID);
-		$writer->addAttribute('type','checkbox');
+			$writer->addAttribute('id', $clientID);
+		$writer->addAttribute('type', 'checkbox');
 		if(($value=$this->getValueAttribute())!=='')
-			$writer->addAttribute('value',$value);
+			$writer->addAttribute('value', $value);
 		if(!empty($onclick))
-			$writer->addAttribute('onclick',$onclick);
+			$writer->addAttribute('onclick', $onclick);
 		if(($uniqueID=$this->getUniqueID())!=='')
-			$writer->addAttribute('name',$uniqueID);
+			$writer->addAttribute('name', $uniqueID);
 		if($this->getChecked())
-			$writer->addAttribute('checked','checked');
+			$writer->addAttribute('checked', 'checked');
 		if(!$this->getEnabled(true))
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 
 		$page=$this->getPage();
 		if($this->getEnabled(true)
@@ -474,10 +474,10 @@ 
 		}
 
 		if(($accesskey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accesskey);
-		if(($tabindex=$this->getTabIndex())>0)
-			$writer->addAttribute('tabindex',"$tabindex");
-		if($attributes=$this->getViewState('InputAttributes',null))
+			$writer->addAttribute('accesskey', $accesskey);
+		if(($tabindex=$this->getTabIndex()) > 0)
+			$writer->addAttribute('tabindex', "$tabindex");
+		if($attributes=$this->getViewState('InputAttributes', null))
 			$writer->addAttributes($attributes);
 		$writer->renderBeginTag('input');
 		$writer->renderEndTag();
@@ -488,8 +488,8 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$cs=$this->getPage()->getClientScript();
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -508,10 +508,10 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['EventTarget'] = $this->getUniqueID();
+		$options['ID']=$this->getClientID();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['EventTarget']=$this->getUniqueID();
 		return $options;
 	}
 }

framework/Web/UI/WebControls/TCheckBoxList.php

Doc Comments +3 added lines, -3 removed lines

@@ -154,7 +154,7 @@ 
 	}
 
 	/**
-	 * @return string the direction of traversing the list, defaults to 'Vertical'
+	 * @return TRepeatDirection the direction of traversing the list, defaults to 'Vertical'
 	 */
 	public function getRepeatDirection()
 	{
@@ -170,7 +170,7 @@ 
 	}
 
 	/**
-	 * @return string how the list should be displayed, using table or using line breaks. Defaults to 'Table'.
+	 * @return TRepeatLayout how the list should be displayed, using table or using line breaks. Defaults to 'Table'.
 	 */
 	public function getRepeatLayout()
 	{
@@ -449,7 +449,7 @@ 
 	/**
 	 * Returns the value to be validated.
 	 * This methid is required by IValidatable interface.
-	 * @return mixed the value of the property to be validated.
+	 * @return string the value of the property to be validated.
 	 */
 	public function getValidationPropertyValue()
 	{

Indentation +4 added lines, -4 removed lines

@@ -404,8 +404,8 @@ 
 	{
 	  if ($needSpan=$this->getSpanNeeded())
 	  {
-	    $writer->addAttribute('id', $this->getClientId());
-	    $writer->renderBeginTag('span');
+		$writer->addAttribute('id', $this->getClientId());
+		$writer->renderBeginTag('span');
 	  }
 		if($this->getItemCount()>0)
 		{
@@ -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);
 	}
 
 	/**

Spacing +27 added lines, -27 removed lines

@@ -45,7 +45,7 @@ 
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
-class TCheckBoxList extends TListControl implements IRepeatInfoUser, INamingContainer, IPostBackDataHandler,  IValidatable
+class TCheckBoxList extends TListControl implements IRepeatInfoUser, INamingContainer, IPostBackDataHandler, IValidatable
 {
 	private $_repeatedControl;
 	private $_isEnabled;
@@ -84,7 +84,7 @@ 
 	 */
 	public function findControl($id, $real=false)
 	{
-  		if ($real===true)
+  		if($real===true)
   			return parent::findControl($id);
 		return $this;
 	}
@@ -112,7 +112,7 @@ 
 	 */
 	public function getTextAlign()
 	{
-		return $this->getViewState('TextAlign',TTextAlign::Right);
+		return $this->getViewState('TextAlign', TTextAlign::Right);
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 	 */
 	public function setTextAlign($value)
 	{
-		$this->setViewState('TextAlign',TPropertyValue::ensureEnum($value,'TTextAlign'),TTextAlign::Right);
+		$this->setViewState('TextAlign', TPropertyValue::ensureEnum($value, 'TTextAlign'), TTextAlign::Right);
 	}
 
 
@@ -129,10 +129,10 @@ 
 	 */
 	protected function getRepeatInfo()
 	{
-		if(($repeatInfo=$this->getViewState('RepeatInfo',null))===null)
+		if(($repeatInfo=$this->getViewState('RepeatInfo', null))===null)
 		{
 			$repeatInfo=new TRepeatInfo;
-			$this->setViewState('RepeatInfo',$repeatInfo,null);
+			$this->setViewState('RepeatInfo', $repeatInfo, null);
 		}
 		return $repeatInfo;
 	}
@@ -261,7 +261,7 @@ 
 	public function setEnabled($value)
 	{
 		parent::setEnabled($value);
-		$value = !TPropertyValue::ensureBoolean($value);
+		$value=!TPropertyValue::ensureBoolean($value);
 		// if this is an active control,
 		// and it's a callback,
 		// and we can update clientside,
@@ -270,9 +270,9 @@ 
 				$this->getPage()->getIsCallBack() &&
 				$this->getActiveControl()->canUpdateClientSide())
 		{
-			$items = $this->getItems();
-			$cs = $this->getPage()->getCallbackClient();
-			$baseClientID = $this->getClientID().'_c';
+			$items=$this->getItems();
+			$cs=$this->getPage()->getCallbackClient();
+			$baseClientID=$this->getClientID().'_c';
 			foreach($items as $index=>$item)
 			{
 				$cs->setAttribute($baseClientID.$index, 'disabled', $value);
@@ -287,7 +287,7 @@ 
 	 * @param integer index of the item being rendered
 	 * @return null
 	 */
-	public function generateItemStyle($itemType,$index)
+	public function generateItemStyle($itemType, $index)
 	{
 		return null;
 	}
@@ -300,7 +300,7 @@ 
 	 * @param string item type (Header,Footer,Item,AlternatingItem,SelectedItem,EditItem,Separator,Pager)
 	 * @param integer zero-based index of the item in the item list
 	 */
-	public function renderItem($writer,$repeatInfo,$itemType,$index)
+	public function renderItem($writer, $repeatInfo, $itemType, $index)
 	{
 		$repeatedControl=$this->_repeatedControl;
 		$item=$this->getItems()->itemAt($index);
@@ -311,7 +311,7 @@ 
 		$repeatedControl->setID("c$index");
 		$repeatedControl->setText($item->getText());
 		$repeatedControl->setChecked($item->getSelected());
-		$repeatedControl->setAttribute('value',$item->getValue());
+		$repeatedControl->setAttribute('value', $item->getValue());
 		$repeatedControl->setEnabled($this->_isEnabled && $item->getEnabled());
 		$repeatedControl->setEnableClientScript(false);
 		$repeatedControl->renderControl($writer);
@@ -324,13 +324,13 @@ 
 	 * @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($this->getEnabled(true))
 		{
-			$index=(int)substr($key,strlen($this->getUniqueID())+2);
+			$index=(int) substr($key, strlen($this->getUniqueID()) + 2);
 			$this->ensureDataBound();
-			if($index>=0 && $index<$this->getItemCount())
+			if($index >= 0 && $index < $this->getItemCount())
 			{
 				$item=$this->getItems()->itemAt($index);
 				if($item->getEnabled())
@@ -378,7 +378,7 @@ 
 		$this->_repeatedControl->setValidationGroup($this->getValidationGroup());
 		$page=$this->getPage();
 		$n=$this->getItemCount();
-		for($i=0;$i<$n;++$i)
+		for($i=0; $i < $n; ++$i)
 		{
 			$this->_repeatedControl->setID("c$i");
 			$page->registerRequiresPostData($this->_repeatedControl);
@@ -390,7 +390,7 @@ 
 	 *
 	 *@return boolean true if we need a span
 	 */
-	protected function getSpanNeeded ()
+	protected function getSpanNeeded()
 	{
 		return $this->getRepeatLayout()===TRepeatLayout::Raw;
 	}
@@ -402,12 +402,12 @@ 
 	 */
 	public function render($writer)
 	{
-	  if ($needSpan=$this->getSpanNeeded())
+	  if($needSpan=$this->getSpanNeeded())
 	  {
 	    $writer->addAttribute('id', $this->getClientId());
 	    $writer->renderBeginTag('span');
 	  }
-		if($this->getItemCount()>0)
+		if($this->getItemCount() > 0)
 		{
 			$this->_isEnabled=$this->getEnabled(true);
 			$repeatInfo=$this->getRepeatInfo();
@@ -419,11 +419,11 @@ 
 			$this->setAccessKey('');
 			$this->setTabIndex(0);
 			$this->addAttributesToRender($writer);
-			$repeatInfo->renderRepeater($writer,$this);
+			$repeatInfo->renderRepeater($writer, $this);
 			$this->setAccessKey($accessKey);
 			$this->setTabIndex($tabIndex);
 		}
-		if ($needSpan)
+		if($needSpan)
 		  $writer->renderEndTag();
 
 		//checkbox skipped the client control script in addAttributesToRender
@@ -489,11 +489,11 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ListName'] = $this->getUniqueID();
-		$options['ItemCount'] = $this->getItemCount();
+		$options['ID']=$this->getClientID();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ListName']=$this->getUniqueID();
+		$options['ItemCount']=$this->getItemCount();
 		return $options;
 	}
 

framework/Web/UI/WebControls/TCompareValidator.php

Doc Comments +2 added lines

@@ -186,6 +186,8 @@
 	 * Parse the pair of values into the appropriate value type.
 	 * @param string value one
 	 * @param string second value
+	 * @param string $value1
+	 * @param string $value2
 	 * @return array appropriate type of the value pair, array($value1, $value2);
 	 */
 	protected function getComparisonValues($value1, $value2)

Indentation +3 added lines, -3 removed lines

@@ -124,9 +124,9 @@
 	}
 
 	/**
-     * Sets the date format for a date validation
-     * @param string the date format value
-     */
+	 * Sets the date format for a date validation
+	 * @param string the date format value
+	 */
 	public function setDateFormat($value)
 	{
 		$this->setViewState('DateFormat', $value, '');

Spacing +14 added lines, -14 removed lines

@@ -59,7 +59,7 @@ 
 	 */
 	public function getDataType()
 	{
-		return $this->getViewState('DataType',TValidationDataType::String);
+		return $this->getViewState('DataType', TValidationDataType::String);
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 	 */
 	public function setDataType($value)
 	{
-		$this->setViewState('DataType',TPropertyValue::ensureEnum($value,'TValidationDataType'),TValidationDataType::String);
+		$this->setViewState('DataType', TPropertyValue::ensureEnum($value, 'TValidationDataType'), TValidationDataType::String);
 	}
 
 	/**
@@ -77,7 +77,7 @@ 
 	 */
 	public function getControlToCompare()
 	{
-		return $this->getViewState('ControlToCompare','');
+		return $this->getViewState('ControlToCompare', '');
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 	 */
 	public function setControlToCompare($value)
 	{
-		$this->setViewState('ControlToCompare',$value,'');
+		$this->setViewState('ControlToCompare', $value, '');
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 */
 	public function getValueToCompare()
 	{
-		return $this->getViewState('ValueToCompare','');
+		return $this->getViewState('ValueToCompare', '');
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 	 */
 	public function setValueToCompare($value)
 	{
-		$this->setViewState('ValueToCompare',$value,'');
+		$this->setViewState('ValueToCompare', $value, '');
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 */
 	public function getOperator()
 	{
-		return $this->getViewState('Operator',TValidationCompareOperator::Equal);
+		return $this->getViewState('Operator', TValidationCompareOperator::Equal);
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 	 */
 	public function setOperator($value)
 	{
-		$this->setViewState('Operator',TPropertyValue::ensureEnum($value,'TValidationCompareOperator'),TValidationCompareOperator::Equal);
+		$this->setViewState('Operator', TPropertyValue::ensureEnum($value, 'TValidationCompareOperator'), TValidationCompareOperator::Equal);
 	}
 
 	/**
@@ -162,13 +162,13 @@ 
 		else
 			$value2=$this->getValueToCompare();
 
-		$values = $this->getComparisonValues($value, $value2);
+		$values=$this->getComparisonValues($value, $value2);
 		switch($this->getOperator())
 		{
 			case TValidationCompareOperator::Equal:
-				return $values[0] == $values[1];
+				return $values[0]==$values[1];
 			case TValidationCompareOperator::NotEqual:
-				return $values[0] != $values[1];
+				return $values[0]!=$values[1];
 			case TValidationCompareOperator::GreaterThan:
 				return $values[0] > $values[1];
 			case TValidationCompareOperator::GreaterThanEqual:
@@ -197,10 +197,10 @@ 
 			case TValidationDataType::Float:
 				return array(floatval($value1), floatval($value2));
 			case TValidationDataType::Date:
-				$dateFormat = $this->getDateFormat();
+				$dateFormat=$this->getDateFormat();
 				if($dateFormat!=='')
 				{
-					$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter', $dateFormat);
+					$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter', $dateFormat);
 					return array($formatter->parse($value1), $formatter->parse($value2));
 				}
 				else
@@ -215,7 +215,7 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options = parent::getClientScriptOptions();
+		$options=parent::getClientScriptOptions();
 		if(($name=$this->getControlToCompare())!=='')
 		{
 			if(($control=$this->findControl($name))!==null)

Braces +2 added lines, -4 removed lines

@@ -163,8 +163,7 @@ 
 			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 				$this->copyFile($fullpath,$dst);
 			return $this->_published[$path]=$this->_baseUrl.'/'.$dir.'/'.$fileName;
-		}
-		else
+		} else
 		{
 			$dir=$this->hash($fullpath);
 			if(!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
@@ -287,8 +286,7 @@ 
 						@copy($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
 					}
-				}
-				else
+				} else
 					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 			}
 			closedir($folder);

framework/Web/UI/WebControls/TCustomValidator.php

Doc Comments +1 added lines

@@ -171,6 +171,7 @@
 	 * Constructor.
 	 * @param string property value to be validated
 	 * @param boolean whether the value is valid
+	 * @param boolean $isValid
 	 */
 	public function __construct($value,$isValid)
 	{

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/TDataBoundControl.php

Doc Comments +8 added lines

@@ -151,6 +151,7 @@ 
 
 	/**
 	 * @param boolean if databind has been invoked in this page request
+	 * @param boolean $value
 	 */
 	protected function setIsDataBound($value)
 	{
@@ -211,6 +212,7 @@ 
 
 	/**
 	 * @param integer the zero-based index of the current page
+	 * @param integer $value
 	 * @throws TInvalidDataValueException if the value is less than 0
 	 */
 	public function setCurrentPageIndex($value)
@@ -273,6 +275,7 @@ 
 	 * If true and the control has been prerendered while it uses the data source
 	 * specified by {@link setDataSourceID}, a databind call will be called by this method.
 	 * @param boolean whether a databind call is required.
+	 * @param boolean $value
 	 */
 	protected function setRequiresDataBinding($value)
 	{
@@ -405,6 +408,9 @@ 
 		return $this->_currentDataSource;
 	}
 
+	/**
+	 * @param Traversable $data
+	 */
 	abstract protected function performDataBinding($data);
 
 	/**
@@ -566,6 +572,7 @@ 
 	 * Sets the zero-based index for the item.
 	 * If the item is not in the item collection (e.g. it is a header item), -1 should be used.
 	 * @param integer zero-based index of the item.
+	 * @return void
 	 */
 	public function setItemIndex($value);
 
@@ -576,6 +583,7 @@ 
 
 	/**
 	 * @param TListItemType the item type.
+	 * @return void
 	 */
 	public function setItemType($value);
 }

Braces +6 added lines, -12 removed lines

@@ -281,8 +281,7 @@ 
 		{
 			$this->_requiresDataBinding=true;
 			$this->ensureDataBound();
-		}
-		else
+		} else
 			$this->_requiresDataBinding=$value;
 	}
 
@@ -345,8 +344,7 @@ 
 					$this->setCurrentPageIndex($ds->getCurrentPageIndex());
 				}
 				$this->performDataBinding($ds);
-			}
-			else
+			} else
 			{
 				$this->clearViewState('PageCount');
 				$this->performDataBinding($data);
@@ -375,8 +373,7 @@ 
 				if($this->_currentViewIsFromDataSourceID=$this->getUsingDataSourceID())
 					$view->attachEventHandler('OnDataSourceViewChanged',array($this,'dataSourceViewChanged'));
 				$this->_currentView=$view;
-			}
-			else
+			} else
 				$this->_currentView=null;
 			$this->_currentViewValid=true;
 		}
@@ -395,8 +392,7 @@ 
 					throw new TInvalidDataValueException('databoundcontrol_datasourceid_invalid',$dsid);
 				else
 					$this->_currentDataSource=$dataSource;
-			}
-			else if(($dataSource=$this->getDataSource())!==null)
+			} else if(($dataSource=$this->getDataSource())!==null)
 				$this->_currentDataSource=new TReadOnlyDataSource($dataSource,$this->getDataMember());
 			else
 				$this->_currentDataSource=null;
@@ -477,14 +473,12 @@ 
 					$list->add(array($value,is_string($key)?$key:$value));
 			}
 			return $list;
-		}
-		else if(is_array($value))
+		} else if(is_array($value))
 			return new TMap($value);
 		else if($value instanceof TDbDataReader) {
 			// read array from TDbDataReader since it's forward-only stream and can only be traversed once
 			return $value->readAll();
-		}
-		else if(($value instanceof Traversable) || $value===null)
+		} else if(($value instanceof Traversable) || $value===null)
 			return $value;
 		else
 			throw new TInvalidDataTypeException('databoundcontrol_datasource_invalid',get_class($this));

Spacing +36 added lines, -36 removed lines

@@ -82,7 +82,7 @@ 
 	 */
 	public function getDataSourceID()
 	{
-		return $this->getViewState('DataSourceID','');
+		return $this->getViewState('DataSourceID', '');
 	}
 
 	/**
@@ -91,10 +91,10 @@ 
 	 */
 	public function setDataSourceID($value)
 	{
-		$dsid=$this->getViewState('DataSourceID','');
+		$dsid=$this->getViewState('DataSourceID', '');
 		if($dsid!=='' && $value==='')
 			$this->_requiresBindToNull=true;
-		$this->setViewState('DataSourceID',$value,'');
+		$this->setViewState('DataSourceID', $value, '');
 		$this->onDataSourceChanged();
 	}
 
@@ -170,7 +170,7 @@ 
 	 */
 	public function getAllowPaging()
 	{
-		return $this->getViewState('AllowPaging',false);
+		return $this->getViewState('AllowPaging', false);
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 	 */
 	public function setAllowPaging($value)
 	{
-		$this->setViewState('AllowPaging',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('AllowPaging', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -186,7 +186,7 @@ 
 	 */
 	public function getAllowCustomPaging()
 	{
-		return $this->getViewState('AllowCustomPaging',false);
+		return $this->getViewState('AllowCustomPaging', false);
 	}
 
 	/**
@@ -198,7 +198,7 @@ 
 	 */
 	public function setAllowCustomPaging($value)
 	{
-		$this->setViewState('AllowCustomPaging',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('AllowCustomPaging', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -206,7 +206,7 @@ 
 	 */
 	public function getCurrentPageIndex()
 	{
-		return $this->getViewState('CurrentPageIndex',0);
+		return $this->getViewState('CurrentPageIndex', 0);
 	}
 
 	/**
@@ -215,9 +215,9 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=0;
-		$this->setViewState('CurrentPageIndex',$value,0);
+		$this->setViewState('CurrentPageIndex', $value, 0);
 	}
 
 	/**
@@ -225,7 +225,7 @@ 
 	 */
 	public function getPageSize()
 	{
-		return $this->getViewState('PageSize',10);
+		return $this->getViewState('PageSize', 10);
 	}
 
 	/**
@@ -234,9 +234,9 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<1)
-			throw new TInvalidDataValueException('databoundcontrol_pagesize_invalid',get_class($this));
-		$this->setViewState('PageSize',TPropertyValue::ensureInteger($value),10);
+		if(($value=TPropertyValue::ensureInteger($value)) < 1)
+			throw new TInvalidDataValueException('databoundcontrol_pagesize_invalid', get_class($this));
+		$this->setViewState('PageSize', TPropertyValue::ensureInteger($value), 10);
 	}
 
 	/**
@@ -244,7 +244,7 @@ 
 	 */
 	public function getPageCount()
 	{
-		return $this->getViewState('PageCount',1);
+		return $this->getViewState('PageCount', 1);
 	}
 
 	/**
@@ -253,7 +253,7 @@ 
 	 */
 	public function getVirtualItemCount()
 	{
-		return $this->getViewState('VirtualItemCount',0);
+		return $this->getViewState('VirtualItemCount', 0);
 	}
 
 	/**
@@ -263,9 +263,9 @@ 
 	 */
 	public function setVirtualItemCount($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			throw new TInvalidDataValueException('databoundcontrol_virtualitemcount_invalid',get_class($this));
-		$this->setViewState('VirtualItemCount',$value,0);
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
+			throw new TInvalidDataValueException('databoundcontrol_virtualitemcount_invalid', get_class($this));
+		$this->setViewState('VirtualItemCount', $value, 0);
 	}
 
 	/**
@@ -338,10 +338,10 @@ 
 			{
 				$ds=$this->createPagedDataSource();
 				$ds->setDataSource($data);
-				$this->setViewState('PageCount',$ds->getPageCount());
-				if($ds->getCurrentPageIndex()>=$ds->getPageCount())
+				$this->setViewState('PageCount', $ds->getPageCount());
+				if($ds->getCurrentPageIndex() >= $ds->getPageCount())
 				{
-					$ds->setCurrentPageIndex($ds->getPageCount()-1);
+					$ds->setCurrentPageIndex($ds->getPageCount() - 1);
 					$this->setCurrentPageIndex($ds->getCurrentPageIndex());
 				}
 				$this->performDataBinding($ds);
@@ -356,7 +356,7 @@ 
 		$this->onDataBound(null);
 	}
 
-	public function dataSourceViewChanged($sender,$param)
+	public function dataSourceViewChanged($sender, $param)
 	{
 		if(!$this->_ignoreDataSourceViewChanged)
 			$this->setRequiresDataBinding(true);
@@ -367,13 +367,13 @@ 
 		if(!$this->_currentViewValid)
 		{
 			if($this->_currentView && $this->_currentViewIsFromDataSourceID)
-				$this->_currentView->detachEventHandler('DataSourceViewChanged',array($this,'dataSourceViewChanged'));
+				$this->_currentView->detachEventHandler('DataSourceViewChanged', array($this, 'dataSourceViewChanged'));
 			if(($dataSource=$this->determineDataSource())!==null)
 			{
 				if(($view=$dataSource->getView($this->getDataMember()))===null)
-					throw new TInvalidDataValueException('databoundcontrol_datamember_invalid',$this->getDataMember());
+					throw new TInvalidDataValueException('databoundcontrol_datamember_invalid', $this->getDataMember());
 				if($this->_currentViewIsFromDataSourceID=$this->getUsingDataSourceID())
-					$view->attachEventHandler('OnDataSourceViewChanged',array($this,'dataSourceViewChanged'));
+					$view->attachEventHandler('OnDataSourceViewChanged', array($this, 'dataSourceViewChanged'));
 				$this->_currentView=$view;
 			}
 			else
@@ -390,14 +390,14 @@ 
 			if(($dsid=$this->getDataSourceID())!=='')
 			{
 				if(($dataSource=$this->getNamingContainer()->findControl($dsid))===null)
-					throw new TInvalidDataValueException('databoundcontrol_datasourceid_inexistent',$dsid);
+					throw new TInvalidDataValueException('databoundcontrol_datasourceid_inexistent', $dsid);
 				else if(!($dataSource instanceof IDataSource))
-					throw new TInvalidDataValueException('databoundcontrol_datasourceid_invalid',$dsid);
+					throw new TInvalidDataValueException('databoundcontrol_datasourceid_invalid', $dsid);
 				else
 					$this->_currentDataSource=$dataSource;
 			}
 			else if(($dataSource=$this->getDataSource())!==null)
-				$this->_currentDataSource=new TReadOnlyDataSource($dataSource,$this->getDataMember());
+				$this->_currentDataSource=new TReadOnlyDataSource($dataSource, $this->getDataMember());
 			else
 				$this->_currentDataSource=null;
 			$this->_currentDataSourceValid=true;
@@ -414,7 +414,7 @@ 
 	 */
 	public function onDataBound($param)
 	{
-		$this->raiseEvent('OnDataBound',$this,$param);
+		$this->raiseEvent('OnDataBound', $this, $param);
 	}
 
 	/**
@@ -428,7 +428,7 @@ 
 	{
 		parent::onInit($param);
 		$page=$this->getPage();
-		$page->attachEventHandler('OnPreLoad',array($this,'pagePreLoad'));
+		$page->attachEventHandler('OnPreLoad', array($this, 'pagePreLoad'));
 	}
 
 	/**
@@ -437,7 +437,7 @@ 
 	 * @param mixed event sender
 	 * @param TEventParameter event parameter
 	 */
-	public function pagePreLoad($sender,$param)
+	public function pagePreLoad($sender, $param)
 	{
 		$this->_initialized=true;
 		$isPostBack=$this->getPage()->getIsPostBack();
@@ -474,7 +474,7 @@ 
 				if(is_array($value))
 					$list->add($value);
 				else
-					$list->add(array($value,is_string($key)?$key:$value));
+					$list->add(array($value, is_string($key) ? $key : $value));
 			}
 			return $list;
 		}
@@ -487,17 +487,17 @@ 
 		else if(($value instanceof Traversable) || $value===null)
 			return $value;
 		else
-			throw new TInvalidDataTypeException('databoundcontrol_datasource_invalid',get_class($this));
+			throw new TInvalidDataTypeException('databoundcontrol_datasource_invalid', get_class($this));
 	}
 
 	public function getDataMember()
 	{
-		return $this->getViewState('DataMember','');
+		return $this->getViewState('DataMember', '');
 	}
 
 	public function setDataMember($value)
 	{
-		$this->setViewState('DataMember',$value,'');
+		$this->setViewState('DataMember', $value, '');
 	}
 
 	public function getSelectParameters()

framework/Web/UI/WebControls/TDataGrid.php

Doc Comments +24 added lines, -1 removed lines

@@ -534,6 +534,7 @@ 
 	 * If the item to be selected is already in edit mode, it will remain in edit mode.
 	 * If the index is less than 0, any existing selection will be cleared up.
 	 * @param integer the selected item index
+	 * @param integer $value
 	 */
 	public function setSelectedItemIndex($value)
 	{
@@ -762,6 +763,7 @@ 
 	 * This method is invoked when a button control raises <b>OnCommand</b> event
 	 * with <b>cancel</b> command name.
 	 * @param TDataGridCommandEventParameter event parameter
+	 * @param TDataGridCommandEventParameter $param
 	 */
 	public function onCancelCommand($param)
 	{
@@ -773,6 +775,7 @@ 
 	 * This method is invoked when a button control raises <b>OnCommand</b> event
 	 * with <b>delete</b> command name.
 	 * @param TDataGridCommandEventParameter event parameter
+	 * @param TDataGridCommandEventParameter $param
 	 */
 	public function onDeleteCommand($param)
 	{
@@ -784,6 +787,7 @@ 
 	 * This method is invoked when a button control raises <b>OnCommand</b> event
 	 * with <b>edit</b> command name.
 	 * @param TDataGridCommandEventParameter event parameter
+	 * @param TDataGridCommandEventParameter $param
 	 */
 	public function onEditCommand($param)
 	{
@@ -794,6 +798,7 @@ 
 	 * Raises <b>OnItemCommand</b> event.
 	 * This method is invoked when a button control raises <b>OnCommand</b> event.
 	 * @param TDataGridCommandEventParameter event parameter
+	 * @param TDataGridCommandEventParameter $param
 	 */
 	public function onItemCommand($param)
 	{
@@ -805,6 +810,7 @@ 
 	 * This method is invoked when a button control raises <b>OnCommand</b> event
 	 * with <b>sort</b> command name.
 	 * @param TDataGridSortCommandEventParameter event parameter
+	 * @param TDataGridSortCommandEventParameter $param
 	 */
 	public function onSortCommand($param)
 	{
@@ -816,6 +822,7 @@ 
 	 * This method is invoked when a button control raises <b>OnCommand</b> event
 	 * with <b>update</b> command name.
 	 * @param TDataGridCommandEventParameter event parameter
+	 * @param TDataGridCommandEventParameter $param
 	 */
 	public function onUpdateCommand($param)
 	{
@@ -827,6 +834,7 @@ 
 	 * This method is invoked right after a datagrid item is created and before
 	 * added to page hierarchy.
 	 * @param TDataGridItemEventParameter event parameter
+	 * @param TDataGridItemEventParameter $param
 	 */
 	public function onItemCreated($param)
 	{
@@ -838,6 +846,7 @@ 
 	 * This method is invoked right after a datagrid pager is created and before
 	 * added to page hierarchy.
 	 * @param TDataGridPagerEventParameter event parameter
+	 * @param TDataGridPagerEventParameter $param
 	 */
 	public function onPagerCreated($param)
 	{
@@ -849,6 +858,7 @@ 
 	 * This method is invoked for each datagrid item after it performs
 	 * databinding.
 	 * @param TDataGridItemEventParameter event parameter
+	 * @param TDataGridItemEventParameter $param
 	 */
 	public function onItemDataBound($param)
 	{
@@ -859,6 +869,7 @@ 
 	 * Raises <b>OnPageIndexChanged</b> event.
 	 * This method is invoked when current page is changed.
 	 * @param TDataGridPageChangedEventParameter event parameter
+	 * @param TDataGridPageChangedEventParameter $param
 	 */
 	public function onPageIndexChanged($param)
 	{
@@ -1155,6 +1166,11 @@ 
 		return new TDataGridItem($itemIndex,$dataSourceIndex,$itemType);
 	}
 
+	/**
+	 * @param integer $itemIndex
+	 * @param boolean $dataBind
+	 * @param TList $columns
+	 */
 	private function createItemInternal($itemIndex,$dataSourceIndex,$itemType,$dataBind,$dataItem,$columns)
 	{
 		$item=$this->createItem($itemIndex,$dataSourceIndex,$itemType);
@@ -1180,6 +1196,7 @@ 
 	 * Initializes a datagrid item and cells inside it
 	 * @param TDataGrid datagrid item to be initialized
 	 * @param TDataGridColumnCollection datagrid columns to be used to initialize the cells in the item
+	 * @param TDataGridItem $item
 	 */
 	protected function initializeItem($item,$columns)
 	{
@@ -1212,6 +1229,7 @@ 
 	/**
 	 * Builds the pager content based on pager style.
 	 * @param TDataGridPager the container for the pager
+	 * @param TDataGridPager $pager
 	 */
 	protected function buildPager($pager)
 	{
@@ -1237,6 +1255,9 @@ 
 	 * @param string caption of the button
 	 * @param string CommandName corresponding to the OnCommand event of the button
 	 * @param string CommandParameter corresponding to the OnCommand event of the button
+	 * @param TDataGridPagerButtonType $buttonType
+	 * @param boolean $enabled
+	 * @param string $commandName
 	 * @return mixed the button instance
 	 */
 	protected function createPagerButton($pager,$buttonType,$enabled,$text,$commandName,$commandParameter)
@@ -1881,6 +1902,7 @@ 
 	 * Constructor.
 	 * @param TControl the control originally raises the <b>OnCommand</b> event.
 	 * @param integer new page index
+	 * @param integer $newPageIndex
 	 */
 	public function __construct($source,$newPageIndex)
 	{
@@ -1957,7 +1979,7 @@ 
 	}
 
 	/**
-	 * @return TListItemType item type.
+	 * @return string item type.
 	 */
 	public function getItemType()
 	{
@@ -2062,6 +2084,7 @@ 
 	/**
 	 * Constructor.
 	 * @param TDataGrid datagrid object
+	 * @param TDataGrid $dataGrid
 	 */
 	public function __construct($dataGrid)
 	{

Spacing +163 added lines, -163 removed lines

@@ -242,7 +242,7 @@ 
 		if($object instanceof TDataGridColumn)
 			$this->getColumns()->add($object);
 		else
-			parent::addParsedObject($object);  // this is needed by EmptyTemplate
+			parent::addParsedObject($object); // this is needed by EmptyTemplate
 	}
 
 	/**
@@ -280,7 +280,7 @@ 
 	 */
 	public function getItemCount()
 	{
-		return $this->_items?$this->_items->getCount():0;
+		return $this->_items ? $this->_items->getCount() : 0;
 	}
 
 	/**
@@ -314,10 +314,10 @@ 
 	 */
 	public function getItemStyle()
 	{
-		if(($style=$this->getViewState('ItemStyle',null))===null)
+		if(($style=$this->getViewState('ItemStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('ItemStyle',$style,null);
+			$this->setViewState('ItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -327,10 +327,10 @@ 
 	 */
 	public function getAlternatingItemStyle()
 	{
-		if(($style=$this->getViewState('AlternatingItemStyle',null))===null)
+		if(($style=$this->getViewState('AlternatingItemStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('AlternatingItemStyle',$style,null);
+			$this->setViewState('AlternatingItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -340,10 +340,10 @@ 
 	 */
 	public function getSelectedItemStyle()
 	{
-		if(($style=$this->getViewState('SelectedItemStyle',null))===null)
+		if(($style=$this->getViewState('SelectedItemStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('SelectedItemStyle',$style,null);
+			$this->setViewState('SelectedItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -353,10 +353,10 @@ 
 	 */
 	public function getEditItemStyle()
 	{
-		if(($style=$this->getViewState('EditItemStyle',null))===null)
+		if(($style=$this->getViewState('EditItemStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('EditItemStyle',$style,null);
+			$this->setViewState('EditItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -366,10 +366,10 @@ 
 	 */
 	public function getHeaderStyle()
 	{
-		if(($style=$this->getViewState('HeaderStyle',null))===null)
+		if(($style=$this->getViewState('HeaderStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('HeaderStyle',$style,null);
+			$this->setViewState('HeaderStyle', $style, null);
 		}
 		return $style;
 	}
@@ -379,10 +379,10 @@ 
 	 */
 	public function getFooterStyle()
 	{
-		if(($style=$this->getViewState('FooterStyle',null))===null)
+		if(($style=$this->getViewState('FooterStyle', null))===null)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('FooterStyle',$style,null);
+			$this->setViewState('FooterStyle', $style, null);
 		}
 		return $style;
 	}
@@ -392,10 +392,10 @@ 
 	 */
 	public function getPagerStyle()
 	{
-		if(($style=$this->getViewState('PagerStyle',null))===null)
+		if(($style=$this->getViewState('PagerStyle', null))===null)
 		{
 			$style=new TDataGridPagerStyle;
-			$this->setViewState('PagerStyle',$style,null);
+			$this->setViewState('PagerStyle', $style, null);
 		}
 		return $style;
 	}
@@ -406,10 +406,10 @@ 
 	 */
 	public function getTableHeadStyle()
 	{
-		if(($style=$this->getViewState('TableHeadStyle',null))===null)
+		if(($style=$this->getViewState('TableHeadStyle', null))===null)
 		{
 			$style=new TStyle;
-			$this->setViewState('TableHeadStyle',$style,null);
+			$this->setViewState('TableHeadStyle', $style, null);
 		}
 		return $style;
 	}
@@ -420,10 +420,10 @@ 
 	 */
 	public function getTableBodyStyle()
 	{
-		if(($style=$this->getViewState('TableBodyStyle',null))===null)
+		if(($style=$this->getViewState('TableBodyStyle', null))===null)
 		{
 			$style=new TStyle;
-			$this->setViewState('TableBodyStyle',$style,null);
+			$this->setViewState('TableBodyStyle', $style, null);
 		}
 		return $style;
 	}
@@ -434,10 +434,10 @@ 
 	 */
 	public function getTableFootStyle()
 	{
-		if(($style=$this->getViewState('TableFootStyle',null))===null)
+		if(($style=$this->getViewState('TableFootStyle', null))===null)
 		{
 			$style=new TStyle;
-			$this->setViewState('TableFootStyle',$style,null);
+			$this->setViewState('TableFootStyle', $style, null);
 		}
 		return $style;
 	}
@@ -447,7 +447,7 @@ 
 	 */
 	public function getCaption()
 	{
-		return $this->getViewState('Caption','');
+		return $this->getViewState('Caption', '');
 	}
 
 	/**
@@ -455,7 +455,7 @@ 
 	 */
 	public function setCaption($value)
 	{
-		$this->setViewState('Caption',$value,'');
+		$this->setViewState('Caption', $value, '');
 	}
 
 	/**
@@ -463,7 +463,7 @@ 
 	 */
 	public function getCaptionAlign()
 	{
-		return $this->getViewState('CaptionAlign',TTableCaptionAlign::NotSet);
+		return $this->getViewState('CaptionAlign', TTableCaptionAlign::NotSet);
 	}
 
 	/**
@@ -471,7 +471,7 @@ 
 	 */
 	public function setCaptionAlign($value)
 	{
-		$this->setViewState('CaptionAlign',TPropertyValue::ensureEnum($value,'TTableCaptionAlign'),TTableCaptionAlign::NotSet);
+		$this->setViewState('CaptionAlign', TPropertyValue::ensureEnum($value, 'TTableCaptionAlign'), TTableCaptionAlign::NotSet);
 	}
 
 	/**
@@ -513,7 +513,7 @@ 
 	{
 		$index=$this->getSelectedItemIndex();
 		$items=$this->getItems();
-		if($index>=0 && $index<$items->getCount())
+		if($index >= 0 && $index < $items->getCount())
 			return $items->itemAt($index);
 		else
 			return null;
@@ -525,7 +525,7 @@ 
 	 */
 	public function getSelectedItemIndex()
 	{
-		return $this->getViewState('SelectedItemIndex',-1);
+		return $this->getViewState('SelectedItemIndex', -1);
 	}
 
 	/**
@@ -537,20 +537,20 @@ 
 	 */
 	public function setSelectedItemIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=-1;
 		if(($current=$this->getSelectedItemIndex())!==$value)
 		{
-			$this->setViewState('SelectedItemIndex',$value,-1);
+			$this->setViewState('SelectedItemIndex', $value, -1);
 			$items=$this->getItems();
 			$itemCount=$items->getCount();
-			if($current>=0 && $current<$itemCount)
+			if($current >= 0 && $current < $itemCount)
 			{
 				$item=$items->itemAt($current);
 				if($item->getItemType()!==TListItemType::EditItem)
-					$item->setItemType($current%2?TListItemType::AlternatingItem:TListItemType::Item);
+					$item->setItemType($current % 2 ? TListItemType::AlternatingItem : TListItemType::Item);
 			}
-			if($value>=0 && $value<$itemCount)
+			if($value >= 0 && $value < $itemCount)
 			{
 				$item=$items->itemAt($value);
 				if($item->getItemType()!==TListItemType::EditItem)
@@ -566,7 +566,7 @@ 
 	{
 		$index=$this->getEditItemIndex();
 		$items=$this->getItems();
-		if($index>=0 && $index<$items->getCount())
+		if($index >= 0 && $index < $items->getCount())
 			return $items->itemAt($index);
 		else
 			return null;
@@ -578,7 +578,7 @@ 
 	 */
 	public function getEditItemIndex()
 	{
-		return $this->getViewState('EditItemIndex',-1);
+		return $this->getViewState('EditItemIndex', -1);
 	}
 
 	/**
@@ -589,16 +589,16 @@ 
 	 */
 	public function setEditItemIndex($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=-1;
 		if(($current=$this->getEditItemIndex())!==$value)
 		{
-			$this->setViewState('EditItemIndex',$value,-1);
+			$this->setViewState('EditItemIndex', $value, -1);
 			$items=$this->getItems();
 			$itemCount=$items->getCount();
-			if($current>=0 && $current<$itemCount)
-				$items->itemAt($current)->setItemType($current%2?TListItemType::AlternatingItem:TListItemType::Item);
-			if($value>=0 && $value<$itemCount)
+			if($current >= 0 && $current < $itemCount)
+				$items->itemAt($current)->setItemType($current % 2 ? TListItemType::AlternatingItem : TListItemType::Item);
+			if($value >= 0 && $value < $itemCount)
 				$items->itemAt($value)->setItemType(TListItemType::EditItem);
 		}
 	}
@@ -608,7 +608,7 @@ 
 	 */
 	public function getAllowSorting()
 	{
-		return $this->getViewState('AllowSorting',false);
+		return $this->getViewState('AllowSorting', false);
 	}
 
 	/**
@@ -616,7 +616,7 @@ 
 	 */
 	public function setAllowSorting($value)
 	{
-		$this->setViewState('AllowSorting',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('AllowSorting', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -624,7 +624,7 @@ 
 	 */
 	public function getAutoGenerateColumns()
 	{
-		return $this->getViewState('AutoGenerateColumns',true);
+		return $this->getViewState('AutoGenerateColumns', true);
 	}
 
 	/**
@@ -632,7 +632,7 @@ 
 	 */
 	public function setAutoGenerateColumns($value)
 	{
-		$this->setViewState('AutoGenerateColumns',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('AutoGenerateColumns', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -640,7 +640,7 @@ 
 	 */
 	public function getShowHeader()
 	{
-		return $this->getViewState('ShowHeader',true);
+		return $this->getViewState('ShowHeader', true);
 	}
 
 	/**
@@ -648,7 +648,7 @@ 
 	 */
 	public function setShowHeader($value)
 	{
-		$this->setViewState('ShowHeader',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('ShowHeader', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -656,7 +656,7 @@ 
 	 */
 	public function getShowFooter()
 	{
-		return $this->getViewState('ShowFooter',false);
+		return $this->getViewState('ShowFooter', false);
 	}
 
 	/**
@@ -664,7 +664,7 @@ 
 	 */
 	public function setShowFooter($value)
 	{
-		$this->setViewState('ShowFooter',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ShowFooter', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -684,7 +684,7 @@ 
 		if($value instanceof ITemplate || $value===null)
 			$this->_emptyTemplate=$value;
 		else
-			throw new TInvalidDataTypeException('datagrid_template_required','EmptyTemplate');
+			throw new TInvalidDataTypeException('datagrid_template_required', 'EmptyTemplate');
 	}
 
 	/**
@@ -700,57 +700,57 @@ 
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		if($param instanceof TDataGridCommandEventParameter)
 		{
 			$this->onItemCommand($param);
 			$command=$param->getCommandName();
-			if(strcasecmp($command,self::CMD_SELECT)===0)
+			if(strcasecmp($command, self::CMD_SELECT)===0)
 			{
 				$this->setSelectedItemIndex($param->getItem()->getItemIndex());
 				$this->onSelectedIndexChanged($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_EDIT)===0)
+			else if(strcasecmp($command, self::CMD_EDIT)===0)
 			{
 				$this->onEditCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_DELETE)===0)
+			else if(strcasecmp($command, self::CMD_DELETE)===0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_UPDATE)===0)
+			else if(strcasecmp($command, self::CMD_UPDATE)===0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_CANCEL)===0)
+			else if(strcasecmp($command, self::CMD_CANCEL)===0)
 			{
 				$this->onCancelCommand($param);
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_SORT)===0)
+			else if(strcasecmp($command, self::CMD_SORT)===0)
 			{
-				$this->onSortCommand(new TDataGridSortCommandEventParameter($sender,$param));
+				$this->onSortCommand(new TDataGridSortCommandEventParameter($sender, $param));
 				return true;
 			}
-			else if(strcasecmp($command,self::CMD_PAGE)===0)
+			else if(strcasecmp($command, self::CMD_PAGE)===0)
 			{
 				$p=$param->getCommandParameter();
-				if(strcasecmp($p,self::CMD_PAGE_NEXT)===0)
-					$pageIndex=$this->getCurrentPageIndex()+1;
-				else if(strcasecmp($p,self::CMD_PAGE_PREV)===0)
-					$pageIndex=$this->getCurrentPageIndex()-1;
-				else if(strcasecmp($p,self::CMD_PAGE_FIRST)===0)
+				if(strcasecmp($p, self::CMD_PAGE_NEXT)===0)
+					$pageIndex=$this->getCurrentPageIndex() + 1;
+				else if(strcasecmp($p, self::CMD_PAGE_PREV)===0)
+					$pageIndex=$this->getCurrentPageIndex() - 1;
+				else if(strcasecmp($p, self::CMD_PAGE_FIRST)===0)
 					$pageIndex=0;
-				else if(strcasecmp($p,self::CMD_PAGE_LAST)===0)
-					$pageIndex=$this->getPageCount()-1;
+				else if(strcasecmp($p, self::CMD_PAGE_LAST)===0)
+					$pageIndex=$this->getPageCount() - 1;
 				else
-					$pageIndex=TPropertyValue::ensureInteger($p)-1;
-				$this->onPageIndexChanged(new TDataGridPageChangedEventParameter($sender,$pageIndex));
+					$pageIndex=TPropertyValue::ensureInteger($p) - 1;
+				$this->onPageIndexChanged(new TDataGridPageChangedEventParameter($sender, $pageIndex));
 				return true;
 			}
 		}
@@ -765,7 +765,7 @@ 
 	 */
 	public function onCancelCommand($param)
 	{
-		$this->raiseEvent('OnCancelCommand',$this,$param);
+		$this->raiseEvent('OnCancelCommand', $this, $param);
 	}
 
 	/**
@@ -776,7 +776,7 @@ 
 	 */
 	public function onDeleteCommand($param)
 	{
-		$this->raiseEvent('OnDeleteCommand',$this,$param);
+		$this->raiseEvent('OnDeleteCommand', $this, $param);
 	}
 
 	/**
@@ -787,7 +787,7 @@ 
 	 */
 	public function onEditCommand($param)
 	{
-		$this->raiseEvent('OnEditCommand',$this,$param);
+		$this->raiseEvent('OnEditCommand', $this, $param);
 	}
 
 	/**
@@ -797,7 +797,7 @@ 
 	 */
 	public function onItemCommand($param)
 	{
-		$this->raiseEvent('OnItemCommand',$this,$param);
+		$this->raiseEvent('OnItemCommand', $this, $param);
 	}
 
 	/**
@@ -808,7 +808,7 @@ 
 	 */
 	public function onSortCommand($param)
 	{
-		$this->raiseEvent('OnSortCommand',$this,$param);
+		$this->raiseEvent('OnSortCommand', $this, $param);
 	}
 
 	/**
@@ -819,7 +819,7 @@ 
 	 */
 	public function onUpdateCommand($param)
 	{
-		$this->raiseEvent('OnUpdateCommand',$this,$param);
+		$this->raiseEvent('OnUpdateCommand', $this, $param);
 	}
 
 	/**
@@ -830,7 +830,7 @@ 
 	 */
 	public function onItemCreated($param)
 	{
-		$this->raiseEvent('OnItemCreated',$this,$param);
+		$this->raiseEvent('OnItemCreated', $this, $param);
 	}
 
 	/**
@@ -841,7 +841,7 @@ 
 	 */
 	public function onPagerCreated($param)
 	{
-		$this->raiseEvent('OnPagerCreated',$this,$param);
+		$this->raiseEvent('OnPagerCreated', $this, $param);
 	}
 
 	/**
@@ -852,7 +852,7 @@ 
 	 */
 	public function onItemDataBound($param)
 	{
-		$this->raiseEvent('OnItemDataBound',$this,$param);
+		$this->raiseEvent('OnItemDataBound', $this, $param);
 	}
 
 	/**
@@ -862,7 +862,7 @@ 
 	 */
 	public function onPageIndexChanged($param)
 	{
-		$this->raiseEvent('OnPageIndexChanged',$this,$param);
+		$this->raiseEvent('OnPageIndexChanged', $this, $param);
 	}
 
 	/**
@@ -875,7 +875,7 @@ 
 		if(!$this->getEnableViewState(true))
 			return;
 		if($this->_items)
-			$this->setViewState('ItemCount',$this->_items->getCount(),0);
+			$this->setViewState('ItemCount', $this->_items->getCount(), 0);
 		else
 			$this->clearViewState('ItemCount');
 		if($this->_autoColumns)
@@ -883,7 +883,7 @@ 
 			$state=array();
 			foreach($this->_autoColumns as $column)
 				$state[]=$column->saveState();
-			$this->setViewState('AutoColumns',$state,array());
+			$this->setViewState('AutoColumns', $state, array());
 		}
 		else
 			$this->clearViewState('AutoColumns');
@@ -892,7 +892,7 @@ 
 			$state=array();
 			foreach($this->_columns as $column)
 				$state[]=$column->saveState();
-			$this->setViewState('Columns',$state,array());
+			$this->setViewState('Columns', $state, array());
 		}
 		else
 			$this->clearViewState('Columns');
@@ -909,7 +909,7 @@ 
 			return;
 		if(!$this->getIsDataBound())
 		{
-			$state=$this->getViewState('AutoColumns',array());
+			$state=$this->getViewState('AutoColumns', array());
 			if(!empty($state))
 			{
 				$this->_autoColumns=new TDataGridColumnCollection($this);
@@ -922,7 +922,7 @@ 
 			}
 			else
 				$this->_autoColumns=null;
-			$state=$this->getViewState('Columns',array());
+			$state=$this->getViewState('Columns', array());
 			if($this->_columns && $this->_columns->getCount()===count($state))
 			{
 				$i=0;
@@ -959,8 +959,8 @@ 
 
 		$allowPaging=$this->getAllowPaging();
 
-		$itemCount=$this->getViewState('ItemCount',0);
-		$dsIndex=$this->getViewState('DataSourceIndex',0);
+		$itemCount=$this->getViewState('ItemCount', 0);
+		$dsIndex=$this->getViewState('DataSourceIndex', 0);
 
 		$columns=new TList($this->getColumns());
 		$columns->mergeWith($this->_autoColumns);
@@ -974,13 +974,13 @@ 
 				$column->initialize();
 			$selectedIndex=$this->getSelectedItemIndex();
 			$editIndex=$this->getEditItemIndex();
-			for($index=0;$index<$itemCount;++$index)
+			for($index=0; $index < $itemCount; ++$index)
 			{
 				if($index===0)
 				{
 					if($allowPaging)
 						$this->_topPager=$this->createPager();
-					$this->_header=$this->createItemInternal(-1,-1,TListItemType::Header,false,null,$columns);
+					$this->_header=$this->createItemInternal(-1, -1, TListItemType::Header, false, null, $columns);
 				}
 				if($index===$editIndex)
 					$itemType=TListItemType::EditItem;
@@ -990,12 +990,12 @@ 
 					$itemType=TListItemType::AlternatingItem;
 				else
 					$itemType=TListItemType::Item;
-				$items->add($this->createItemInternal($index,$dsIndex,$itemType,false,null,$columns));
+				$items->add($this->createItemInternal($index, $dsIndex, $itemType, false, null, $columns));
 				$dsIndex++;
 			}
-			if($index>0)
+			if($index > 0)
 			{
-				$this->_footer=$this->createItemInternal(-1,-1,TListItemType::Footer,false,null,$columns);
+				$this->_footer=$this->createItemInternal(-1, -1, TListItemType::Footer, false, null, $columns);
 				if($allowPaging)
 					$this->_bottomPager=$this->createPager();
 			}
@@ -1035,8 +1035,8 @@ 
 
 		$index=0;
 		$allowPaging=$this->getAllowPaging() && ($data instanceof TPagedDataSource);
-		$dsIndex=$allowPaging?$data->getFirstIndexInPage():0;
-		$this->setViewState('DataSourceIndex',$dsIndex,0);
+		$dsIndex=$allowPaging ? $data->getFirstIndexInPage() : 0;
+		$this->setViewState('DataSourceIndex', $dsIndex, 0);
 		if($columns->getCount())
 		{
 			foreach($columns as $column)
@@ -1047,14 +1047,14 @@ 
 			foreach($data as $key=>$row)
 			{
 				if($keyField!=='')
-					$keys->add($this->getDataFieldValue($row,$keyField));
+					$keys->add($this->getDataFieldValue($row, $keyField));
 				else
 					$keys->add($key);
 				if($index===0)
 				{
 					if($allowPaging)
 						$this->_topPager=$this->createPager();
-					$this->_header=$this->createItemInternal(-1,-1,TListItemType::Header,true,null,$columns);
+					$this->_header=$this->createItemInternal(-1, -1, TListItemType::Header, true, null, $columns);
 				}
 				if($index===$editIndex)
 					$itemType=TListItemType::EditItem;
@@ -1064,18 +1064,18 @@ 
 					$itemType=TListItemType::AlternatingItem;
 				else
 					$itemType=TListItemType::Item;
-				$items->add($this->createItemInternal($index,$dsIndex,$itemType,true,$row,$columns));
+				$items->add($this->createItemInternal($index, $dsIndex, $itemType, true, $row, $columns));
 				$index++;
 				$dsIndex++;
 			}
-			if($index>0)
+			if($index > 0)
 			{
-				$this->_footer=$this->createItemInternal(-1,-1,TListItemType::Footer,true,null,$columns);
+				$this->_footer=$this->createItemInternal(-1, -1, TListItemType::Footer, true, null, $columns);
 				if($allowPaging)
 					$this->_bottomPager=$this->createPager();
 			}
 		}
-		$this->setViewState('ItemCount',$index,0);
+		$this->setViewState('ItemCount', $index, 0);
 		if(!$dsIndex && $this->_emptyTemplate!==null)
 		{
 			$this->_useEmptyTemplate=true;
@@ -1122,7 +1122,7 @@ 
 					{
 						if(($rowSpan=$prevCell->getRowSpan())===0)
 							$rowSpan=1;
-						$prevCell->setRowSpan($rowSpan+1);
+						$prevCell->setRowSpan($rowSpan + 1);
 						$cell->setVisible(false);
 					}
 				}
@@ -1150,15 +1150,15 @@ 
 	 * @param TListItemType item type
 	 * @return TDataGridItem created data list item
 	 */
-	protected function createItem($itemIndex,$dataSourceIndex,$itemType)
+	protected function createItem($itemIndex, $dataSourceIndex, $itemType)
 	{
-		return new TDataGridItem($itemIndex,$dataSourceIndex,$itemType);
+		return new TDataGridItem($itemIndex, $dataSourceIndex, $itemType);
 	}
 
-	private function createItemInternal($itemIndex,$dataSourceIndex,$itemType,$dataBind,$dataItem,$columns)
+	private function createItemInternal($itemIndex, $dataSourceIndex, $itemType, $dataBind, $dataItem, $columns)
 	{
-		$item=$this->createItem($itemIndex,$dataSourceIndex,$itemType);
-		$this->initializeItem($item,$columns);
+		$item=$this->createItem($itemIndex, $dataSourceIndex, $itemType);
+		$this->initializeItem($item, $columns);
 		$param=new TDataGridItemEventParameter($item);
 		if($dataBind)
 		{
@@ -1181,7 +1181,7 @@ 
 	 * @param TDataGrid datagrid item to be initialized
 	 * @param TDataGridColumnCollection datagrid columns to be used to initialize the cells in the item
 	 */
-	protected function initializeItem($item,$columns)
+	protected function initializeItem($item, $columns)
 	{
 		$cells=$item->getCells();
 		$itemType=$item->getItemType();
@@ -1193,9 +1193,9 @@ 
 			else
 				$cell=new TTableCell;
 			if(($id=$column->getID())!=='')
-				$item->registerObject($id,$cell);
+				$item->registerObject($id, $cell);
 			$cells->add($cell);
-			$column->initializeCell($cell,$index,$itemType);
+			$column->initializeCell($cell, $index, $itemType);
 			$index++;
 		}
 	}
@@ -1239,7 +1239,7 @@ 
 	 * @param string CommandParameter corresponding to the OnCommand event of the button
 	 * @return mixed the button instance
 	 */
-	protected function createPagerButton($pager,$buttonType,$enabled,$text,$commandName,$commandParameter)
+	protected function createPagerButton($pager, $buttonType, $enabled, $text, $commandName, $commandParameter)
 	{
 		if($buttonType===TDataGridPagerButtonType::LinkButton)
 		{
@@ -1279,46 +1279,46 @@ 
 		{
 			if(($text=$style->getFirstPageText())!=='')
 			{
-				$label=$this->createPagerButton($pager,$buttonType,false,$text,'','');
+				$label=$this->createPagerButton($pager, $buttonType, false, $text, '', '');
 				$controls->add($label);
 				$controls->add("\n");
 			}
 
-			$label=$this->createPagerButton($pager,$buttonType,false,$style->getPrevPageText(),'','');
+			$label=$this->createPagerButton($pager, $buttonType, false, $style->getPrevPageText(), '', '');
 			$controls->add($label);
 		}
 		else
 		{
 			if(($text=$style->getFirstPageText())!=='')
 			{
-				$button=$this->createPagerButton($pager,$buttonType,true,$text,self::CMD_PAGE,self::CMD_PAGE_FIRST);
+				$button=$this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_FIRST);
 				$controls->add($button);
 				$controls->add("\n");
 			}
 
-			$button=$this->createPagerButton($pager,$buttonType,true,$style->getPrevPageText(),self::CMD_PAGE,self::CMD_PAGE_PREV);
+			$button=$this->createPagerButton($pager, $buttonType, true, $style->getPrevPageText(), self::CMD_PAGE, self::CMD_PAGE_PREV);
 			$controls->add($button);
 		}
 		$controls->add("\n");
-		if($currentPageIndex===$this->getPageCount()-1)
+		if($currentPageIndex===$this->getPageCount() - 1)
 		{
-			$label=$this->createPagerButton($pager,$buttonType,false,$style->getNextPageText(),'','');
+			$label=$this->createPagerButton($pager, $buttonType, false, $style->getNextPageText(), '', '');
 			$controls->add($label);
 			if(($text=$style->getLastPageText())!=='')
 			{
 				$controls->add("\n");
-				$label=$this->createPagerButton($pager,$buttonType,false,$text,'','');
+				$label=$this->createPagerButton($pager, $buttonType, false, $text, '', '');
 				$controls->add($label);
 			}
 		}
 		else
 		{
-			$button=$this->createPagerButton($pager,$buttonType,true,$style->getNextPageText(),self::CMD_PAGE,self::CMD_PAGE_NEXT);
+			$button=$this->createPagerButton($pager, $buttonType, true, $style->getNextPageText(), self::CMD_PAGE, self::CMD_PAGE_NEXT);
 			$controls->add($button);
 			if(($text=$style->getLastPageText())!=='')
 			{
 				$controls->add("\n");
-				$button=$this->createPagerButton($pager,$buttonType,true,$text,self::CMD_PAGE,self::CMD_PAGE_LAST);
+				$button=$this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_LAST);
 				$controls->add($button);
 			}
 		}
@@ -1334,63 +1334,63 @@ 
 		$buttonType=$style->getButtonType();
 		$controls=$pager->getControls();
 		$pageCount=$this->getPageCount();
-		$pageIndex=$this->getCurrentPageIndex()+1;
+		$pageIndex=$this->getCurrentPageIndex() + 1;
 		$maxButtonCount=$style->getPageButtonCount();
-		$buttonCount=$maxButtonCount>$pageCount?$pageCount:$maxButtonCount;
+		$buttonCount=$maxButtonCount > $pageCount ? $pageCount : $maxButtonCount;
 		$startPageIndex=1;
 		$endPageIndex=$buttonCount;
-		if($pageIndex>$endPageIndex)
+		if($pageIndex > $endPageIndex)
 		{
-			$startPageIndex=((int)(($pageIndex-1)/$maxButtonCount))*$maxButtonCount+1;
-			if(($endPageIndex=$startPageIndex+$maxButtonCount-1)>$pageCount)
+			$startPageIndex=((int) (($pageIndex - 1) / $maxButtonCount)) * $maxButtonCount + 1;
+			if(($endPageIndex=$startPageIndex + $maxButtonCount - 1) > $pageCount)
 				$endPageIndex=$pageCount;
-			if($endPageIndex-$startPageIndex+1<$maxButtonCount)
+			if($endPageIndex - $startPageIndex + 1 < $maxButtonCount)
 			{
-				if(($startPageIndex=$endPageIndex-$maxButtonCount+1)<1)
+				if(($startPageIndex=$endPageIndex - $maxButtonCount + 1) < 1)
 					$startPageIndex=1;
 			}
 		}
 
-		if($startPageIndex>1)
+		if($startPageIndex > 1)
 		{
 			if(($text=$style->getFirstPageText())!=='')
 			{
-				$button=$this->createPagerButton($pager,$buttonType,true,$text,self::CMD_PAGE,self::CMD_PAGE_FIRST);
+				$button=$this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_FIRST);
 				$controls->add($button);
 				$controls->add("\n");
 			}
-			$prevPageIndex=$startPageIndex-1;
-			$button=$this->createPagerButton($pager,$buttonType,true,$style->getPrevPageText(),self::CMD_PAGE,"$prevPageIndex");
+			$prevPageIndex=$startPageIndex - 1;
+			$button=$this->createPagerButton($pager, $buttonType, true, $style->getPrevPageText(), self::CMD_PAGE, "$prevPageIndex");
 			$controls->add($button);
 			$controls->add("\n");
 		}
 
-		for($i=$startPageIndex;$i<=$endPageIndex;++$i)
+		for($i=$startPageIndex; $i <= $endPageIndex; ++$i)
 		{
 			if($i===$pageIndex)
 			{
-				$label=$this->createPagerButton($pager,$buttonType,false,"$i",'','');
+				$label=$this->createPagerButton($pager, $buttonType, false, "$i", '', '');
 				$controls->add($label);
 			}
 			else
 			{
-				$button=$this->createPagerButton($pager,$buttonType,true,"$i",self::CMD_PAGE,"$i");
+				$button=$this->createPagerButton($pager, $buttonType, true, "$i", self::CMD_PAGE, "$i");
 				$controls->add($button);
 			}
-			if($i<$endPageIndex)
+			if($i < $endPageIndex)
 				$controls->add("\n");
 		}
 
-		if($pageCount>$endPageIndex)
+		if($pageCount > $endPageIndex)
 		{
 			$controls->add("\n");
-			$nextPageIndex=$endPageIndex+1;
-			$button=$this->createPagerButton($pager,$buttonType,true,$style->getNextPageText(),self::CMD_PAGE,"$nextPageIndex");
+			$nextPageIndex=$endPageIndex + 1;
+			$button=$this->createPagerButton($pager, $buttonType, true, $style->getNextPageText(), self::CMD_PAGE, "$nextPageIndex");
 			$controls->add($button);
 			if(($text=$style->getLastPageText())!=='')
 			{
 				$controls->add("\n");
-				$button=$this->createPagerButton($pager,$buttonType,true,$text,self::CMD_PAGE,self::CMD_PAGE_LAST);
+				$button=$this->createPagerButton($pager, $buttonType, true, $text, self::CMD_PAGE, self::CMD_PAGE_LAST);
 				$controls->add($button);
 			}
 		}
@@ -1445,9 +1445,9 @@ 
 	 */
 	protected function applyItemStyles()
 	{
-		$itemStyle=$this->getViewState('ItemStyle',null);
+		$itemStyle=$this->getViewState('ItemStyle', null);
 
-		$alternatingItemStyle=$this->getViewState('AlternatingItemStyle',null);
+		$alternatingItemStyle=$this->getViewState('AlternatingItemStyle', null);
 		if($itemStyle!==null)
 		{
 			if($alternatingItemStyle===null)
@@ -1456,9 +1456,9 @@ 
 				$alternatingItemStyle->mergeWith($itemStyle);
 		}
 
-		$selectedItemStyle=$this->getViewState('SelectedItemStyle',null);
+		$selectedItemStyle=$this->getViewState('SelectedItemStyle', null);
 
-		$editItemStyle=$this->getViewState('EditItemStyle',null);
+		$editItemStyle=$this->getViewState('EditItemStyle', null);
 		if($selectedItemStyle!==null)
 		{
 			if($editItemStyle===null)
@@ -1467,10 +1467,10 @@ 
 				$editItemStyle->mergeWith($selectedItemStyle);
 		}
 
-		$headerStyle=$this->getViewState('HeaderStyle',null);
-		$footerStyle=$this->getViewState('FooterStyle',null);
-		$pagerStyle=$this->getViewState('PagerStyle',null);
-		$separatorStyle=$this->getViewState('SeparatorStyle',null);
+		$headerStyle=$this->getViewState('HeaderStyle', null);
+		$footerStyle=$this->getViewState('FooterStyle', null);
+		$pagerStyle=$this->getViewState('PagerStyle', null);
+		$separatorStyle=$this->getViewState('SeparatorStyle', null);
 
 		foreach($this->getControls() as $index=>$item)
 		{
@@ -1554,7 +1554,7 @@ 
 			{
 				$n=$this->_columns->getCount();
 				$cells=$item->getCells();
-				for($i=0;$i<$n;++$i)
+				for($i=0; $i < $n; ++$i)
 				{
 					$cell=$cells->itemAt($i);
 					$column=$this->_columns->itemAt($i);
@@ -1586,7 +1586,7 @@ 
 		if(($caption=$this->getCaption())!=='')
 		{
 			if(($align=$this->getCaptionAlign())!==TTableCaptionAlign::NotSet)
-				$writer->addAttribute('align',strtolower($align));
+				$writer->addAttribute('align', strtolower($align));
 			$writer->renderBeginTag('caption');
 			$writer->write($caption);
 			$writer->renderEndTag();
@@ -1613,7 +1613,7 @@ 
 				$this->renderContents($writer);
 				$control->renderEndTag($writer);
 			}
-			else if($this->getViewState('ItemCount',0)>0)
+			else if($this->getViewState('ItemCount', 0) > 0)
 			{
 				$this->applyItemStyles();
 				if($this->_topPager)
@@ -1641,14 +1641,14 @@ 
 		if($this->_header && $this->_header->getVisible())
 		{
 			$writer->writeLine();
-			if($style=$this->getViewState('TableHeadStyle',null))
+			if($style=$this->getViewState('TableHeadStyle', null))
 				$style->addAttributesToRender($writer);
 			$writer->renderBeginTag('thead');
 			$this->_header->render($writer);
 			$writer->renderEndTag();
 		}
 		$writer->writeLine();
-		if($style=$this->getViewState('TableBodyStyle',null))
+		if($style=$this->getViewState('TableBodyStyle', null))
 			$style->addAttributesToRender($writer);
 		$writer->renderBeginTag('tbody');
 		foreach($this->getItems() as $item)
@@ -1658,7 +1658,7 @@ 
 		if($this->_footer && $this->_footer->getVisible())
 		{
 			$writer->writeLine();
-			if($style=$this->getViewState('TableFootStyle',null))
+			if($style=$this->getViewState('TableFootStyle', null))
 				$style->addAttributesToRender($writer);
 			$writer->renderBeginTag('tfoot');
 			$this->_footer->render($writer);
@@ -1775,11 +1775,11 @@ 
 	 * @param TControl original event sender
 	 * @param TCommandEventParameter original event parameter
 	 */
-	public function __construct($item,$source,TCommandEventParameter $param)
+	public function __construct($item, $source, TCommandEventParameter $param)
 	{
 		$this->_item=$item;
 		$this->_source=$source;
-		parent::__construct($param->getCommandName(),$param->getCommandParameter());
+		parent::__construct($param->getCommandName(), $param->getCommandParameter());
 	}
 
 	/**
@@ -1829,7 +1829,7 @@ 
 	 * @param TControl the control originally raises the <b>OnCommand</b> event.
 	 * @param TDataGridCommandEventParameter command event parameter
 	 */
-	public function __construct($source,TDataGridCommandEventParameter $param)
+	public function __construct($source, TDataGridCommandEventParameter $param)
 	{
 		$this->_source=$source;
 		$this->_sortExpression=$param->getCommandParameter();
@@ -1882,7 +1882,7 @@ 
 	 * @param TControl the control originally raises the <b>OnCommand</b> event.
 	 * @param integer new page index
 	 */
-	public function __construct($source,$newPageIndex)
+	public function __construct($source, $newPageIndex)
 	{
 		$this->_source=$source;
 		$this->_newIndex=$newPageIndex;
@@ -1945,7 +1945,7 @@ 
 	 * @param integer zero-based index of the item in the item collection of datagrid
 	 * @param TListItemType item type
 	 */
-	public function __construct($itemIndex,$dataSourceIndex,$itemType)
+	public function __construct($itemIndex, $dataSourceIndex, $itemType)
 	{
 		$this->_itemIndex=$itemIndex;
 		$this->_dataSourceIndex=$dataSourceIndex;
@@ -1969,7 +1969,7 @@ 
 	 */
 	public function setItemType($value)
 	{
-		$this->_itemType=TPropertyValue::ensureEnum($value,'TListItemType');
+		$this->_itemType=TPropertyValue::ensureEnum($value, 'TListItemType');
 	}
 
 	/**
@@ -2033,11 +2033,11 @@ 
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		if($param instanceof TCommandEventParameter)
 		{
-			$this->raiseBubbleEvent($this,new TDataGridCommandEventParameter($this,$sender,$param));
+			$this->raiseBubbleEvent($this, new TDataGridCommandEventParameter($this, $sender, $param));
 			return true;
 		}
 		else
@@ -2075,11 +2075,11 @@ 
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		if($param instanceof TCommandEventParameter)
 		{
-			$this->raiseBubbleEvent($this,new TDataGridCommandEventParameter($this,$sender,$param));
+			$this->raiseBubbleEvent($this, new TDataGridCommandEventParameter($this, $sender, $param));
 			return true;
 		}
 		else
@@ -2122,10 +2122,10 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a TDataGridItem.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TDataGridItem)
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('datagriditemcollection_datagriditem_required');
 	}
@@ -2172,12 +2172,12 @@ 
 	 * @param mixed new item
 	 * @throws TInvalidDataTypeException if the item to be inserted is not a TDataGridColumn.
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if($item instanceof TDataGridColumn)
 		{
 			$item->setOwner($this->_o);
-			parent::insertAt($index,$item);
+			parent::insertAt($index, $item);
 		}
 		else
 			throw new TInvalidDataTypeException('datagridcolumncollection_datagridcolumn_required');

Braces +24 added lines, -48 removed lines

@@ -711,33 +711,27 @@ 
 				$this->setSelectedItemIndex($param->getItem()->getItemIndex());
 				$this->onSelectedIndexChanged($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_EDIT)===0)
+			} else if(strcasecmp($command,self::CMD_EDIT)===0)
 			{
 				$this->onEditCommand($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_DELETE)===0)
+			} else if(strcasecmp($command,self::CMD_DELETE)===0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_UPDATE)===0)
+			} else if(strcasecmp($command,self::CMD_UPDATE)===0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_CANCEL)===0)
+			} else if(strcasecmp($command,self::CMD_CANCEL)===0)
 			{
 				$this->onCancelCommand($param);
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_SORT)===0)
+			} else if(strcasecmp($command,self::CMD_SORT)===0)
 			{
 				$this->onSortCommand(new TDataGridSortCommandEventParameter($sender,$param));
 				return true;
-			}
-			else if(strcasecmp($command,self::CMD_PAGE)===0)
+			} else if(strcasecmp($command,self::CMD_PAGE)===0)
 			{
 				$p=$param->getCommandParameter();
 				if(strcasecmp($p,self::CMD_PAGE_NEXT)===0)
@@ -884,8 +878,7 @@ 
 			foreach($this->_autoColumns as $column)
 				$state[]=$column->saveState();
 			$this->setViewState('AutoColumns',$state,array());
-		}
-		else
+		} else
 			$this->clearViewState('AutoColumns');
 		if($this->_columns)
 		{
@@ -893,8 +886,7 @@ 
 			foreach($this->_columns as $column)
 				$state[]=$column->saveState();
 			$this->setViewState('Columns',$state,array());
-		}
-		else
+		} else
 			$this->clearViewState('Columns');
 	}
 
@@ -919,8 +911,7 @@ 
 					$column->loadState($st);
 					$this->_autoColumns->add($column);
 				}
-			}
-			else
+			} else
 				$this->_autoColumns=null;
 			$state=$this->getViewState('Columns',array());
 			if($this->_columns && $this->_columns->getCount()===count($state))
@@ -1026,8 +1017,7 @@ 
 			$columns=new TList($this->getColumns());
 			$autoColumns=$this->createAutoColumns($data);
 			$columns->mergeWith($autoColumns);
-		}
-		else
+		} else
 			$columns=$this->getColumns();
 		$this->_allColumns=$columns;
 
@@ -1117,8 +1107,7 @@ 
 					{
 						$prevCell=$cell;
 						$prevCellText=$cellText;
-					}
-					else
+					} else
 					{
 						if(($rowSpan=$prevCell->getRowSpan())===0)
 							$rowSpan=1;
@@ -1167,8 +1156,7 @@ 
 			$this->getControls()->add($item);
 			$item->dataBind();
 			$this->onItemDataBound($param);
-		}
-		else
+		} else
 		{
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
@@ -1251,8 +1239,7 @@ 
 				$button->setText($text);
 				return $button;
 			}
-		}
-		else
+		} else
 		{
 			$button=new TButton;
 			if(!$enabled)
@@ -1286,8 +1273,7 @@ 
 
 			$label=$this->createPagerButton($pager,$buttonType,false,$style->getPrevPageText(),'','');
 			$controls->add($label);
-		}
-		else
+		} else
 		{
 			if(($text=$style->getFirstPageText())!=='')
 			{
@@ -1310,8 +1296,7 @@ 
 				$label=$this->createPagerButton($pager,$buttonType,false,$text,'','');
 				$controls->add($label);
 			}
-		}
-		else
+		} else
 		{
 			$button=$this->createPagerButton($pager,$buttonType,true,$style->getNextPageText(),self::CMD_PAGE,self::CMD_PAGE_NEXT);
 			$controls->add($button);
@@ -1371,8 +1356,7 @@ 
 			{
 				$label=$this->createPagerButton($pager,$buttonType,false,"$i",'','');
 				$controls->add($label);
-			}
-			else
+			} else
 			{
 				$button=$this->createPagerButton($pager,$buttonType,true,"$i",self::CMD_PAGE,"$i");
 				$controls->add($button);
@@ -1418,8 +1402,7 @@ 
 					$column->setDataField($key);
 					$column->setSortExpression($key);
 					$autoColumns->add($column);
-				}
-				else
+				} else
 				{
 					$column->setHeaderText(TListItemType::Item);
 					$column->setDataField($key);
@@ -1510,8 +1493,7 @@ 
 					{
 						if($itemStyle)
 							$item->getStyle()->mergeWith($itemStyle);
-					}
-					else
+					} else
 					{
 						if($alternatingItemStyle)
 							$item->getStyle()->mergeWith($alternatingItemStyle);
@@ -1524,8 +1506,7 @@ 
 					{
 						if($itemStyle)
 							$item->getStyle()->mergeWith($itemStyle);
-					}
-					else
+					} else
 					{
 						if($alternatingItemStyle)
 							$item->getStyle()->mergeWith($alternatingItemStyle);
@@ -1539,8 +1520,7 @@ 
 						{
 							if($pagerStyle->getPosition()===TDataGridPagerPosition::Bottom || !$pagerStyle->getVisible())
 								$item->setVisible(false);
-						}
-						else
+						} else
 						{
 							if($pagerStyle->getPosition()===TDataGridPagerPosition::Top || !$pagerStyle->getVisible())
 								$item->setVisible(false);
@@ -1612,8 +1592,7 @@ 
 				$control->renderBeginTag($writer);
 				$this->renderContents($writer);
 				$control->renderEndTag($writer);
-			}
-			else if($this->getViewState('ItemCount',0)>0)
+			} else if($this->getViewState('ItemCount',0)>0)
 			{
 				$this->applyItemStyles();
 				if($this->_topPager)
@@ -2039,8 +2018,7 @@ 
 		{
 			$this->raiseBubbleEvent($this,new TDataGridCommandEventParameter($this,$sender,$param));
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 }
@@ -2081,8 +2059,7 @@ 
 		{
 			$this->raiseBubbleEvent($this,new TDataGridCommandEventParameter($this,$sender,$param));
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -2178,8 +2155,7 @@ 
 		{
 			$item->setOwner($this->_o);
 			parent::insertAt($index,$item);
-		}
-		else
+		} else
 			throw new TInvalidDataTypeException('datagridcolumncollection_datagridcolumn_required');
 	}
 }

framework/Web/UI/WebControls/TDataGridColumn.php

Doc Comments +4 added lines

@@ -281,6 +281,7 @@ 
 	 *
 	 * @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)
@@ -295,6 +296,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)
 	{
@@ -356,6 +358,7 @@ 
 	 * If the data is a component, the field is used as the name of a property.
 	 * @param mixed data containing the field of value
 	 * @param string the data field
+	 * @param string $field
 	 * @return mixed data value at the specified field
 	 * @throws TInvalidDataValueException if the data or the field is invalid.
 	 */
@@ -515,6 +518,7 @@ 
 	 * as the first and second parameters in {@link sprintf}.
 	 * @param string format string
 	 * @param mixed the data to be formatted
+	 * @param string $formatString
 	 * @return string the formatted result
 	 */
 	protected function formatDataValue($formatString,$value)

Braces +8 added lines, -16 removed lines

@@ -427,8 +427,7 @@ 
 				}
 				$control->setData($text);
 			}
-		}
-		else if($this->getAllowSorting())
+		} else if($this->getAllowSorting())
 		{
 			$sortExpression=$this->getSortExpression();
 			if(($url=$this->getHeaderImageUrl())!=='')
@@ -441,8 +440,7 @@ 
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 			{
 				$button=Prado::createComponent('System.Web.UI.WebControls.TLinkButton');
 				$button->setText($text);
@@ -450,11 +448,9 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else
+			} else
 				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url=$this->getHeaderImageUrl())!=='')
 			{
@@ -463,8 +459,7 @@ 
 				if($text!=='')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
-			}
-			else if($text!=='')
+			} else if($text!=='')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');
@@ -498,8 +493,7 @@ 
 				}
 				$control->setData($text);
 			}
-		}
-		else if($text!=='')
+		} else if($text!=='')
 			$cell->setText($text);
 		else
 			$cell->setText(' ');
@@ -529,13 +523,11 @@ 
 				if(eval("\$result=$expression;")===false)
 					throw new Exception('');
 				return $result;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				throw new TInvalidDataValueException('datagridcolumn_expression_invalid',get_class($this),$expression,$e->getMessage());
 			}
-		}
-		else
+		} else
 			return sprintf($formatString,$value);
 	}
 }

Spacing +38 added lines, -38 removed lines

@@ -83,8 +83,8 @@ 
 	 */
 	public function setID($value)
 	{
-		if(!preg_match(TControl::ID_FORMAT,$value))
-			throw new TInvalidDataValueException('datagridcolumn_id_invalid',get_class($this),$value);
+		if(!preg_match(TControl::ID_FORMAT, $value))
+			throw new TInvalidDataValueException('datagridcolumn_id_invalid', get_class($this), $value);
 		$this->_id=$value;
 	}
 
@@ -93,7 +93,7 @@ 
 	 */
 	public function getHeaderText()
 	{
-		return $this->getViewState('HeaderText','');
+		return $this->getViewState('HeaderText', '');
 	}
 
 	/**
@@ -101,7 +101,7 @@ 
 	 */
 	public function setHeaderText($value)
 	{
-		$this->setViewState('HeaderText',$value,'');
+		$this->setViewState('HeaderText', $value, '');
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 	 */
 	public function getHeaderImageUrl()
 	{
-		return $this->getViewState('HeaderImageUrl','');
+		return $this->getViewState('HeaderImageUrl', '');
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	public function setHeaderImageUrl($value)
 	{
-		$this->setViewState('HeaderImageUrl',$value,'');
+		$this->setViewState('HeaderImageUrl', $value, '');
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 */
 	public function getHeaderRenderer()
 	{
-		return $this->getViewState('HeaderRenderer','');
+		return $this->getViewState('HeaderRenderer', '');
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	 */
 	public function setHeaderRenderer($value)
 	{
-		$this->setViewState('HeaderRenderer',$value,'');
+		$this->setViewState('HeaderRenderer', $value, '');
 	}
 
 	/**
@@ -150,10 +150,10 @@ 
 	 */
 	public function getHeaderStyle($createStyle=true)
 	{
-		if(($style=$this->getViewState('HeaderStyle',null))===null && $createStyle)
+		if(($style=$this->getViewState('HeaderStyle', null))===null && $createStyle)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('HeaderStyle',$style,null);
+			$this->setViewState('HeaderStyle', $style, null);
 		}
 		return $style;
 	}
@@ -163,7 +163,7 @@ 
 	 */
 	public function getFooterText()
 	{
-		return $this->getViewState('FooterText','');
+		return $this->getViewState('FooterText', '');
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 */
 	public function setFooterText($value)
 	{
-		$this->setViewState('FooterText',$value,'');
+		$this->setViewState('FooterText', $value, '');
 	}
 
 	/**
@@ -180,7 +180,7 @@ 
 	 */
 	public function getFooterRenderer()
 	{
-		return $this->getViewState('FooterRenderer','');
+		return $this->getViewState('FooterRenderer', '');
 	}
 
 	/**
@@ -195,7 +195,7 @@ 
 	 */
 	public function setFooterRenderer($value)
 	{
-		$this->setViewState('FooterRenderer',$value,'');
+		$this->setViewState('FooterRenderer', $value, '');
 	}
 
 	/**
@@ -204,10 +204,10 @@ 
 	 */
 	public function getFooterStyle($createStyle=true)
 	{
-		if(($style=$this->getViewState('FooterStyle',null))===null && $createStyle)
+		if(($style=$this->getViewState('FooterStyle', null))===null && $createStyle)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('FooterStyle',$style,null);
+			$this->setViewState('FooterStyle', $style, null);
 		}
 		return $style;
 	}
@@ -218,10 +218,10 @@ 
 	 */
 	public function getItemStyle($createStyle=true)
 	{
-		if(($style=$this->getViewState('ItemStyle',null))===null && $createStyle)
+		if(($style=$this->getViewState('ItemStyle', null))===null && $createStyle)
 		{
 			$style=new TTableItemStyle;
-			$this->setViewState('ItemStyle',$style,null);
+			$this->setViewState('ItemStyle', $style, null);
 		}
 		return $style;
 	}
@@ -231,7 +231,7 @@ 
 	 */
 	public function getSortExpression()
 	{
-		return $this->getViewState('SortExpression','');
+		return $this->getViewState('SortExpression', '');
 	}
 
 	/**
@@ -239,7 +239,7 @@ 
 	 */
 	public function setSortExpression($value)
 	{
-		$this->setViewState('SortExpression',$value,'');
+		$this->setViewState('SortExpression', $value, '');
 	}
 
 	/**
@@ -248,7 +248,7 @@ 
 	 */
 	public function getEnableCellGrouping()
 	{
-		return $this->getViewState('EnableCellGrouping',false);
+		return $this->getViewState('EnableCellGrouping', false);
 	}
 
 	/**
@@ -257,7 +257,7 @@ 
 	 */
 	public function setEnableCellGrouping($value)
 	{
-		$this->setViewState('EnableCellGrouping',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('EnableCellGrouping', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -265,7 +265,7 @@ 
 	 */
 	public function getVisible($checkParents=true)
 	{
-		return $this->getViewState('Visible',true);
+		return $this->getViewState('Visible', true);
 	}
 
 	/**
@@ -273,7 +273,7 @@ 
 	 */
 	public function setVisible($value)
 	{
-		$this->setViewState('Visible',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('Visible', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -283,9 +283,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;
 	}
 
 	/**
@@ -296,7 +296,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]);
@@ -359,9 +359,9 @@ 
 	 * @return mixed data value at the specified field
 	 * @throws TInvalidDataValueException if the data or the field is invalid.
 	 */
-	protected function getDataFieldValue($data,$field)
+	protected function getDataFieldValue($data, $field)
 	{
-		return TDataFieldAccessor::getDataFieldValue($data,$field);
+		return TDataFieldAccessor::getDataFieldValue($data, $field);
 	}
 
 
@@ -376,12 +376,12 @@ 
 	 * @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::Header)
-			$this->initializeHeaderCell($cell,$columnIndex);
+			$this->initializeHeaderCell($cell, $columnIndex);
 		else if($itemType===TListItemType::Footer)
-			$this->initializeFooterCell($cell,$columnIndex);
+			$this->initializeFooterCell($cell, $columnIndex);
 	}
 
 	/**
@@ -409,7 +409,7 @@ 
 	 * @param TTableCell the cell to be initialized
 	 * @param integer the index to the Columns property that the cell resides in.
 	 */
-	protected function initializeHeaderCell($cell,$columnIndex)
+	protected function initializeHeaderCell($cell, $columnIndex)
 	{
 		$text=$this->getHeaderText();
 
@@ -481,7 +481,7 @@ 
 	 * @param TTableCell the cell to be initialized
 	 * @param integer the index to the Columns property that the cell resides in.
 	 */
-	protected function initializeFooterCell($cell,$columnIndex)
+	protected function initializeFooterCell($cell, $columnIndex)
 	{
 		$text=$this->getFooterText();
 		if(($classPath=$this->getFooterRenderer())!=='')
@@ -517,13 +517,13 @@ 
 	 * @param mixed the data to be formatted
 	 * @return string the formatted result
 	 */
-	protected function formatDataValue($formatString,$value)
+	protected function formatDataValue($formatString, $value)
 	{
 		if($formatString==='')
 			return TPropertyValue::ensureString($value);
 		else if($formatString[0]==='#')
 		{
-			$expression=strtr(substr($formatString,1),array('{0}'=>'$value'));
+			$expression=strtr(substr($formatString, 1), array('{0}'=>'$value'));
 			try
 			{
 				if(eval("\$result=$expression;")===false)
@@ -532,11 +532,11 @@ 
 			}
 			catch(Exception $e)
 			{
-				throw new TInvalidDataValueException('datagridcolumn_expression_invalid',get_class($this),$expression,$e->getMessage());
+				throw new TInvalidDataValueException('datagridcolumn_expression_invalid', get_class($this), $expression, $e->getMessage());
 			}
 		}
 		else
-			return sprintf($formatString,$value);
+			return sprintf($formatString, $value);
 	}
 }