pradosoft / prado

framework/Web/UI/WebControls/TCaptcha.php

Doc Comments +8 added lines

@@ -270,6 +270,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)
 	{
@@ -325,6 +326,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)
@@ -450,6 +452,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)
@@ -462,6 +469,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 +61 added lines, -61 removed lines

@@ -64,10 +64,10 @@ 
  */
 class TCaptcha extends TImage
 {
-	const MIN_TOKEN_LENGTH = 2;
-	const MAX_TOKEN_LENGTH = 40;
+	const MIN_TOKEN_LENGTH=2;
+	const MAX_TOKEN_LENGTH=40;
 	private $_privateKey;
-	private $_validated = false;
+	private $_validated=false;
 
 	/**
 	 * @return integer the theme of the token image. Defaults to 0.
@@ -92,7 +92,7 @@ 
 	 */
 	public function setTokenImageTheme($value)
 	{
-		$value = TPropertyValue::ensureInteger($value);
+		$value=TPropertyValue::ensureInteger($value);
 		if($value >= 0 && $value <= 63)
 			$this->setViewState('TokenImageTheme', $value, 0);
 		else
@@ -115,7 +115,7 @@ 
 	 */
 	public function setTokenFontSize($value)
 	{
-		$value = TPropertyValue::ensureInteger($value);
+		$value=TPropertyValue::ensureInteger($value);
 		if($value >= 20 && $value <= 100)
 			$this->setViewState('TokenFontSize', $value, 30);
 		else
@@ -135,7 +135,7 @@ 
 	 */
 	public function setMinTokenLength($value)
 	{
-		$length = TPropertyValue::ensureInteger($value);
+		$length=TPropertyValue::ensureInteger($value);
 		if($length >= self::MIN_TOKEN_LENGTH && $length <= self::MAX_TOKEN_LENGTH)
 			$this->setViewState('MinTokenLength', $length, 4);
 		else
@@ -155,7 +155,7 @@ 
 	 */
 	public function setMaxTokenLength($value)
 	{
-		$length = TPropertyValue::ensureInteger($value);
+		$length=TPropertyValue::ensureInteger($value);
 		if($length >= self::MIN_TOKEN_LENGTH && $length <= self::MAX_TOKEN_LENGTH)
 			$this->setViewState('MaxTokenLength', $length, 6);
 		else
@@ -249,7 +249,7 @@ 
 	 */
 	public function getIsTokenExpired()
 	{
-		if(($expiry = $this->getTokenExpiry()) > 0 && ($start = $this->getViewState('TokenGenerated', 0)) > 0)
+		if(($expiry=$this->getTokenExpiry()) > 0 && ($start=$this->getViewState('TokenGenerated', 0)) > 0)
 			return $expiry + $start < time();
 		else
 			return false;
@@ -260,9 +260,9 @@ 
 	 */
 	public function getPublicKey()
 	{
-		if(($publicKey = $this->getViewState('PublicKey', '')) === '')
+		if(($publicKey=$this->getViewState('PublicKey', ''))==='')
 		{
-			$publicKey = $this->generateRandomKey();
+			$publicKey=$this->generateRandomKey();
 			$this->setPublicKey($publicKey);
 		}
 		return $publicKey;
@@ -289,16 +289,16 @@ 
 	 */
 	protected function getTokenLength()
 	{
-		if(($tokenLength = $this->getViewState('TokenLength')) === null)
+		if(($tokenLength=$this->getViewState('TokenLength'))===null)
 		{
-			$minLength = $this->getMinTokenLength();
-			$maxLength = $this->getMaxTokenLength();
+			$minLength=$this->getMinTokenLength();
+			$maxLength=$this->getMaxTokenLength();
 			if($minLength > $maxLength)
-				$tokenLength = rand($maxLength, $minLength);
+				$tokenLength=rand($maxLength, $minLength);
 			elseif($minLength < $maxLength)
-				$tokenLength = rand($minLength, $maxLength);
+				$tokenLength=rand($minLength, $maxLength);
 			else
-				$tokenLength = $minLength;
+				$tokenLength=$minLength;
 			$this->setViewState('TokenLength', $tokenLength);
 		}
 		return $tokenLength;
@@ -309,13 +309,13 @@ 
 	 */
 	public function getPrivateKey()
 	{
-		if($this->_privateKey === null)
+		if($this->_privateKey===null)
 		{
-			$fileName = $this->generatePrivateKeyFile();
-			$content = file_get_contents($fileName);
-			$matches = [];
+			$fileName=$this->generatePrivateKeyFile();
+			$content=file_get_contents($fileName);
+			$matches=[];
 			if(preg_match("/privateKey='(.*?)'/ms", $content, $matches) > 0)
-				$this->_privateKey = $matches[1];
+				$this->_privateKey=$matches[1];
 			else
 				throw new TConfigurationException('captcha_privatekey_unknown');
 		}
@@ -329,18 +329,18 @@ 
 	 */
 	public function validate($input)
 	{
-		$number = $this->getViewState('TestNumber', 0);
+		$number=$this->getViewState('TestNumber', 0);
 		if(!$this->_validated)
 		{
 			$this->setViewState('TestNumber', ++$number);
-			$this->_validated = true;
+			$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)));
 	}
 
 	/**
@@ -368,10 +368,10 @@ 
 			throw new TConfigurationException('captcha_imagettftext_required');
 		if(!$this->getViewState('TokenGenerated', 0))
 		{
-			$manager = $this->getApplication()->getAssetManager();
+			$manager=$this->getApplication()->getAssetManager();
 			$manager->publishFilePath($this->getFontFile());
-			$url = $manager->publishFilePath($this->getCaptchaScriptFile());
-			$url .= '?options=' . urlencode($this->getTokenImageOptions());
+			$url=$manager->publishFilePath($this->getCaptchaScriptFile());
+			$url.='?options='.urlencode($this->getTokenImageOptions());
 			$this->setImageUrl($url);
 
 			$this->setViewState('TokenGenerated', time());
@@ -383,23 +383,23 @@ 
 	 */
 	protected function getTokenImageOptions()
 	{
-		$privateKey = $this->getPrivateKey();  // call this method to ensure private key is generated
-		$token = $this->getToken();
-		$options = [];
-		$options['publicKey'] = $this->getPublicKey();
-		$options['tokenLength'] = strlen($token);
-		$options['caseSensitive'] = $this->getCaseSensitive();
-		$options['alphabet'] = $this->getTokenAlphabet();
-		$options['fontSize'] = $this->getTokenFontSize();
-		$options['theme'] = $this->getTokenImageTheme();
-		if(($randomSeed = $this->getViewState('RandomSeed', 0)) === 0)
+		$privateKey=$this->getPrivateKey(); // call this method to ensure private key is generated
+		$token=$this->getToken();
+		$options=[];
+		$options['publicKey']=$this->getPublicKey();
+		$options['tokenLength']=strlen($token);
+		$options['caseSensitive']=$this->getCaseSensitive();
+		$options['alphabet']=$this->getTokenAlphabet();
+		$options['fontSize']=$this->getTokenFontSize();
+		$options['theme']=$this->getTokenImageTheme();
+		if(($randomSeed=$this->getViewState('RandomSeed', 0))===0)
 		{
-			$randomSeed = (int)(microtime(true) * 1000000);
+			$randomSeed=(int) (microtime(true) * 1000000);
 			$this->setViewState('RandomSeed', $randomSeed);
 		}
-		$options['randomSeed'] = $this->getChangingTokenBackground()?0:$randomSeed;
-		$str = serialize($options);
-		return base64_encode(md5($privateKey . $str) . $str);
+		$options['randomSeed']=$this->getChangingTokenBackground() ? 0 : $randomSeed;
+		$str=serialize($options);
+		return base64_encode(md5($privateKey.$str).$str);
 	}
 
 	/**
@@ -407,12 +407,12 @@ 
 	 */
 	protected function getCaptchaScriptFile()
 	{
-		return dirname(__FILE__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'captcha.php';
+		return dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'captcha.php';
 	}
 
 	protected function getFontFile()
 	{
-		return dirname(__FILE__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'verase.ttf';
+		return dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'verase.ttf';
 	}
 
 	/**
@@ -421,14 +421,14 @@ 
 	 */
 	protected function generatePrivateKeyFile()
 	{
-		$captchaScript = $this->getCaptchaScriptFile();
-		$path = dirname($this->getApplication()->getAssetManager()->getPublishedPath($captchaScript));
-		$fileName = $path . DIRECTORY_SEPARATOR . 'captcha_key.php';
+		$captchaScript=$this->getCaptchaScriptFile();
+		$path=dirname($this->getApplication()->getAssetManager()->getPublishedPath($captchaScript));
+		$fileName=$path.DIRECTORY_SEPARATOR.'captcha_key.php';
 		if(!is_file($fileName))
 		{
 			@mkdir($path);
-			$key = $this->generateRandomKey();
-			$content = "<?php
+			$key=$this->generateRandomKey();
+			$content="<?php
 \$privateKey='$key';
 ?>";
 			file_put_contents($fileName, $content);
@@ -441,7 +441,7 @@ 
 	 */
 	protected function generateRandomKey()
 	{
-		return md5(rand() . rand() . rand() . rand());
+		return md5(rand().rand().rand().rand());
 	}
 
 	/**
@@ -454,8 +454,8 @@ 
 	 */
 	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);
 	}
 
 	/**
@@ -464,20 +464,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)
-			$alphabet = '234578adefhijmnrtABDEFGHJLMNQRT';
-		$hexLength = strlen($hex);
-		$base = strlen($alphabet);
-		$result = '';
-		for($i = 0;$i < $hexLength;$i += 6)
+			$alphabet='234578adefhijmnrtABDEFGHJLMNQRT';
+		$hexLength=strlen($hex);
+		$base=strlen($alphabet);
+		$result='';
+		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

@@ -81,7 +81,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()
@@ -117,6 +117,9 @@ 
 		return $options;
 	}
 
+	/**
+	 * @param string $token
+	 */
 	private function generateTokenHash($token)
 	{
 		for($h = 0,$i = strlen($token) - 1;$i >= 0;--$i)

Spacing +12 added lines, -12 removed lines

@@ -75,8 +75,8 @@ 
 	 */
 	protected function evaluateIsValid()
 	{
-		$value = $this->getValidationValue($this->getValidationTarget());
-		$control = $this->findCaptchaControl();
+		$value=$this->getValidationValue($this->getValidationTarget());
+		$control=$this->findCaptchaControl();
 		return $control->validate(trim($value));
 	}
 
@@ -86,9 +86,9 @@ 
 	 */
 	protected function findCaptchaControl()
 	{
-		if(($id = $this->getCaptchaControl()) === '')
+		if(($id=$this->getCaptchaControl())==='')
 			throw new TConfigurationException('captchavalidator_captchacontrol_required');
-		elseif(($control = $this->findControl($id)) === null)
+		elseif(($control=$this->findControl($id))===null)
 			throw new TConfigurationException('captchavalidator_captchacontrol_inexistent', $id);
 		elseif(!($control instanceof TCaptcha))
 			throw new TConfigurationException('captchavalidator_captchacontrol_invalid', $id);
@@ -102,25 +102,25 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options = parent::getClientScriptOptions();
-		$control = $this->findCaptchaControl();
+		$options=parent::getClientScriptOptions();
+		$control=$this->findCaptchaControl();
 		if($control->getCaseSensitive())
 		{
-			$options['TokenHash'] = $this->generateTokenHash($control->getToken());
-			$options['CaseSensitive'] = true;
+			$options['TokenHash']=$this->generateTokenHash($control->getToken());
+			$options['CaseSensitive']=true;
 		}
 		else
 		{
-			$options['TokenHash'] = $this->generateTokenHash(strtoupper($control->getToken()));
-			$options['CaseSensitive'] = false;
+			$options['TokenHash']=$this->generateTokenHash(strtoupper($control->getToken()));
+			$options['CaseSensitive']=false;
 		}
 		return $options;
 	}
 
 	private function generateTokenHash($token)
 	{
-		for($h = 0,$i = strlen($token) - 1;$i >= 0;--$i)
-			$h += ord($token[$i]);
+		for($h=0, $i=strlen($token) - 1; $i >= 0; --$i)
+			$h+=ord($token[$i]);
 		return $h;
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -108,8 +108,7 @@
 		{
 			$options['TokenHash'] = $this->generateTokenHash($control->getToken());
 			$options['CaseSensitive'] = true;
-		}
-		else
+		} else
 		{
 			$options['TokenHash'] = $this->generateTokenHash(strtoupper($control->getToken()));
 			$options['CaseSensitive'] = false;

framework/Web/UI/WebControls/TCheckBoxList.php

Doc Comments +5 added lines, -5 removed lines

@@ -60,7 +60,7 @@ 
 
 	/**
 	 * Creates a control used for repetition (used as a template).
-	 * @return TControl the control to be repeated
+	 * @return TCheckBoxItem the control to be repeated
 	 */
 	protected function createRepeatedControl()
 	{
@@ -72,7 +72,7 @@ 
 	 * This method overrides the parent implementation so that it always returns
 	 * the checkbox list itself (because the checkbox list does not have child controls.)
 	 * @param string control ID
-	 * @return TControl control being found
+	 * @return \Prado\Web\UI\TControl|null control being found
 	 */
 	public function findControl($id, $real = false)
 	{
@@ -146,7 +146,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()
 	{
@@ -162,7 +162,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()
 	{
@@ -441,7 +441,7 @@ 
 	/**
 	 * Returns the value to be validated.
 	 * This methid is required by \Prado\Web\UI\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()
 	{

Spacing +38 added lines, -38 removed lines

@@ -41,9 +41,9 @@ 
 {
 	private $_repeatedControl;
 	private $_isEnabled;
-	private $_changedEventRaised = false;
-	private $_dataChanged = false;
-	private $_isValid = true;
+	private $_changedEventRaised=false;
+	private $_dataChanged=false;
+	private $_isValid=true;
 
 	/**
 	 * Constructor.
@@ -52,7 +52,7 @@ 
 	public function __construct()
 	{
 		parent::__construct();
-		$this->_repeatedControl = $this->createRepeatedControl();
+		$this->_repeatedControl=$this->createRepeatedControl();
 		$this->_repeatedControl->setEnableViewState(false);
 		$this->_repeatedControl->setID('c0');
 		$this->getControls()->add($this->_repeatedControl);
@@ -74,9 +74,9 @@ 
 	 * @param string control ID
 	 * @return TControl control being found
 	 */
-	public function findControl($id, $real = false)
+	public function findControl($id, $real=false)
 	{
-		if ($real === true)
+		if($real===true)
 			return parent::findControl($id);
 		return $this;
 	}
@@ -121,9 +121,9 @@ 
 	 */
 	protected function getRepeatInfo()
 	{
-		if(($repeatInfo = $this->getViewState('RepeatInfo', null)) === null)
+		if(($repeatInfo=$this->getViewState('RepeatInfo', null))===null)
 		{
-			$repeatInfo = new TRepeatInfo;
+			$repeatInfo=new TRepeatInfo;
 			$this->setViewState('RepeatInfo', $repeatInfo, null);
 		}
 		return $repeatInfo;
@@ -253,7 +253,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,
@@ -262,12 +262,12 @@ 
 				$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);
+				$cs->setAttribute($baseClientID.$index, 'disabled', $value);
 			}
 		}
 	}
@@ -294,8 +294,8 @@ 
 	 */
 	public function renderItem($writer, $repeatInfo, $itemType, $index)
 	{
-		$repeatedControl = $this->_repeatedControl;
-		$item = $this->getItems()->itemAt($index);
+		$repeatedControl=$this->_repeatedControl;
+		$item=$this->getItems()->itemAt($index);
 		if($item->getHasAttributes())
 			$repeatedControl->getAttributes()->copyFrom($item->getAttributes());
 		elseif($repeatedControl->getHasAttributes())
@@ -320,21 +320,21 @@ 
 	{
 		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())
 			{
-				$item = $this->getItems()->itemAt($index);
+				$item=$this->getItems()->itemAt($index);
 				if($item->getEnabled())
 				{
-					$checked = isset($values[$key]);
-					if($item->getSelected() !== $checked)
+					$checked=isset($values[$key]);
+					if($item->getSelected()!==$checked)
 					{
 						$item->setSelected($checked);
 						if(!$this->_changedEventRaised)
 						{
-							$this->_changedEventRaised = true;
-							return $this->_dataChanged = true;
+							$this->_changedEventRaised=true;
+							return $this->_dataChanged=true;
 						}
 					}
 				}
@@ -368,9 +368,9 @@ 
 		$this->_repeatedControl->setAutoPostBack($this->getAutoPostBack());
 		$this->_repeatedControl->setCausesValidation($this->getCausesValidation());
 		$this->_repeatedControl->setValidationGroup($this->getValidationGroup());
-		$page = $this->getPage();
-		$n = $this->getItemCount();
-		for($i = 0;$i < $n;++$i)
+		$page=$this->getPage();
+		$n=$this->getItemCount();
+		for($i=0; $i < $n; ++$i)
 		{
 			$this->_repeatedControl->setID("c$i");
 			$page->registerRequiresPostData($this->_repeatedControl);
@@ -382,9 +382,9 @@ 
 	 *
 	 *@return boolean true if we need a span
 	 */
-	protected function getSpanNeeded ()
+	protected function getSpanNeeded()
 	{
-		return $this->getRepeatLayout() === TRepeatLayout::Raw;
+		return $this->getRepeatLayout()===TRepeatLayout::Raw;
 	}
 
 	/**
@@ -394,17 +394,17 @@ 
 	 */
 	public function render($writer)
 	{
-	  if ($needSpan = $this->getSpanNeeded())
+	  if($needSpan=$this->getSpanNeeded())
 	  {
 		$writer->addAttribute('id', $this->getClientId());
 		$writer->renderBeginTag('span');
 	  }
 		if($this->getItemCount() > 0)
 		{
-			$this->_isEnabled = $this->getEnabled(true);
-			$repeatInfo = $this->getRepeatInfo();
-			$accessKey = $this->getAccessKey();
-			$tabIndex = $this->getTabIndex();
+			$this->_isEnabled=$this->getEnabled(true);
+			$repeatInfo=$this->getRepeatInfo();
+			$accessKey=$this->getAccessKey();
+			$tabIndex=$this->getTabIndex();
 			$this->_repeatedControl->setTextAlign($this->getTextAlign());
 			$this->_repeatedControl->setAccessKey($accessKey);
 			$this->_repeatedControl->setTabIndex($tabIndex);
@@ -415,7 +415,7 @@ 
 			$this->setAccessKey($accessKey);
 			$this->setTabIndex($tabIndex);
 		}
-		if ($needSpan)
+		if($needSpan)
 		  $writer->renderEndTag();
 
 		//checkbox skipped the client control script in addAttributesToRender
@@ -462,7 +462,7 @@ 
 	 */
 	public function setIsValid($value)
 	{
-		$this->_isValid = TPropertyValue::ensureBoolean($value);
+		$this->_isValid=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -481,11 +481,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/TDataGrid.php

Doc Comments +21 added lines

@@ -519,6 +519,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)
 	{
@@ -747,6 +748,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)
 	{
@@ -758,6 +760,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)
 	{
@@ -769,6 +772,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)
 	{
@@ -779,6 +783,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)
 	{
@@ -790,6 +795,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)
 	{
@@ -801,6 +807,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)
 	{
@@ -812,6 +819,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)
 	{
@@ -823,6 +831,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)
 	{
@@ -834,6 +843,7 @@ 
 	 * This method is invoked for each datagrid item after it performs
 	 * databinding.
 	 * @param TDataGridItemEventParameter event parameter
+	 * @param TDataGridItemEventParameter $param
 	 */
 	public function onItemDataBound($param)
 	{
@@ -844,6 +854,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)
 	{
@@ -1140,6 +1151,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);
@@ -1165,6 +1181,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)
 	{
@@ -1197,6 +1214,7 @@ 
 	/**
 	 * Builds the pager content based on pager style.
 	 * @param TDataGridPager the container for the pager
+	 * @param TDataGridPager $pager
 	 */
 	protected function buildPager($pager)
 	{
@@ -1222,6 +1240,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)

Spacing +256 added lines, -256 removed lines

@@ -150,17 +150,17 @@ 
 	/**
 	 * Command name that TDataGrid understands.
 	 */
-	const CMD_SELECT = 'Select';
-	const CMD_EDIT = 'Edit';
-	const CMD_UPDATE = 'Update';
-	const CMD_DELETE = 'Delete';
-	const CMD_CANCEL = 'Cancel';
-	const CMD_SORT = 'Sort';
-	const CMD_PAGE = 'Page';
-	const CMD_PAGE_NEXT = 'Next';
-	const CMD_PAGE_PREV = 'Previous';
-	const CMD_PAGE_FIRST = 'First';
-	const CMD_PAGE_LAST = 'Last';
+	const CMD_SELECT='Select';
+	const CMD_EDIT='Edit';
+	const CMD_UPDATE='Update';
+	const CMD_DELETE='Delete';
+	const CMD_CANCEL='Cancel';
+	const CMD_SORT='Sort';
+	const CMD_PAGE='Page';
+	const CMD_PAGE_NEXT='Next';
+	const CMD_PAGE_PREV='Previous';
+	const CMD_PAGE_FIRST='First';
+	const CMD_PAGE_LAST='Last';
 
 	/**
 	 * @var TDataGridColumnCollection manually created column collection
@@ -199,7 +199,7 @@ 
 	/**
 	 * @var boolean whether empty template is effective
 	 */
-	private $_useEmptyTemplate = false;
+	private $_useEmptyTemplate=false;
 
 	/**
 	 * @return string tag name (table) of the datagrid
@@ -227,7 +227,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
 	}
 
 	/**
@@ -236,7 +236,7 @@ 
 	public function getColumns()
 	{
 		if(!$this->_columns)
-			$this->_columns = new TDataGridColumnCollection($this);
+			$this->_columns=new TDataGridColumnCollection($this);
 		return $this->_columns;
 	}
 
@@ -246,7 +246,7 @@ 
 	public function getAutoColumns()
 	{
 		if(!$this->_autoColumns)
-			$this->_autoColumns = new TDataGridColumnCollection($this);
+			$this->_autoColumns=new TDataGridColumnCollection($this);
 		return $this->_autoColumns;
 	}
 
@@ -256,7 +256,7 @@ 
 	public function getItems()
 	{
 		if(!$this->_items)
-			$this->_items = new TDataGridItemCollection;
+			$this->_items=new TDataGridItemCollection;
 		return $this->_items;
 	}
 
@@ -265,7 +265,7 @@ 
 	 */
 	public function getItemCount()
 	{
-		return $this->_items?$this->_items->getCount():0;
+		return $this->_items ? $this->_items->getCount() : 0;
 	}
 
 	/**
@@ -299,9 +299,9 @@ 
 	 */
 	public function getItemStyle()
 	{
-		if(($style = $this->getViewState('ItemStyle', null)) === null)
+		if(($style=$this->getViewState('ItemStyle', null))===null)
 		{
-			$style = new TTableItemStyle;
+			$style=new TTableItemStyle;
 			$this->setViewState('ItemStyle', $style, null);
 		}
 		return $style;
@@ -312,9 +312,9 @@ 
 	 */
 	public function getAlternatingItemStyle()
 	{
-		if(($style = $this->getViewState('AlternatingItemStyle', null)) === null)
+		if(($style=$this->getViewState('AlternatingItemStyle', null))===null)
 		{
-			$style = new TTableItemStyle;
+			$style=new TTableItemStyle;
 			$this->setViewState('AlternatingItemStyle', $style, null);
 		}
 		return $style;
@@ -325,9 +325,9 @@ 
 	 */
 	public function getSelectedItemStyle()
 	{
-		if(($style = $this->getViewState('SelectedItemStyle', null)) === null)
+		if(($style=$this->getViewState('SelectedItemStyle', null))===null)
 		{
-			$style = new TTableItemStyle;
+			$style=new TTableItemStyle;
 			$this->setViewState('SelectedItemStyle', $style, null);
 		}
 		return $style;
@@ -338,9 +338,9 @@ 
 	 */
 	public function getEditItemStyle()
 	{
-		if(($style = $this->getViewState('EditItemStyle', null)) === null)
+		if(($style=$this->getViewState('EditItemStyle', null))===null)
 		{
-			$style = new TTableItemStyle;
+			$style=new TTableItemStyle;
 			$this->setViewState('EditItemStyle', $style, null);
 		}
 		return $style;
@@ -351,9 +351,9 @@ 
 	 */
 	public function getHeaderStyle()
 	{
-		if(($style = $this->getViewState('HeaderStyle', null)) === null)
+		if(($style=$this->getViewState('HeaderStyle', null))===null)
 		{
-			$style = new TTableItemStyle;
+			$style=new TTableItemStyle;
 			$this->setViewState('HeaderStyle', $style, null);
 		}
 		return $style;
@@ -364,9 +364,9 @@ 
 	 */
 	public function getFooterStyle()
 	{
-		if(($style = $this->getViewState('FooterStyle', null)) === null)
+		if(($style=$this->getViewState('FooterStyle', null))===null)
 		{
-			$style = new TTableItemStyle;
+			$style=new TTableItemStyle;
 			$this->setViewState('FooterStyle', $style, null);
 		}
 		return $style;
@@ -377,9 +377,9 @@ 
 	 */
 	public function getPagerStyle()
 	{
-		if(($style = $this->getViewState('PagerStyle', null)) === null)
+		if(($style=$this->getViewState('PagerStyle', null))===null)
 		{
-			$style = new TDataGridPagerStyle;
+			$style=new TDataGridPagerStyle;
 			$this->setViewState('PagerStyle', $style, null);
 		}
 		return $style;
@@ -391,9 +391,9 @@ 
 	 */
 	public function getTableHeadStyle()
 	{
-		if(($style = $this->getViewState('TableHeadStyle', null)) === null)
+		if(($style=$this->getViewState('TableHeadStyle', null))===null)
 		{
-			$style = new TStyle;
+			$style=new TStyle;
 			$this->setViewState('TableHeadStyle', $style, null);
 		}
 		return $style;
@@ -405,9 +405,9 @@ 
 	 */
 	public function getTableBodyStyle()
 	{
-		if(($style = $this->getViewState('TableBodyStyle', null)) === null)
+		if(($style=$this->getViewState('TableBodyStyle', null))===null)
 		{
-			$style = new TStyle;
+			$style=new TStyle;
 			$this->setViewState('TableBodyStyle', $style, null);
 		}
 		return $style;
@@ -419,9 +419,9 @@ 
 	 */
 	public function getTableFootStyle()
 	{
-		if(($style = $this->getViewState('TableFootStyle', null)) === null)
+		if(($style=$this->getViewState('TableFootStyle', null))===null)
 		{
-			$style = new TStyle;
+			$style=new TStyle;
 			$this->setViewState('TableFootStyle', $style, null);
 		}
 		return $style;
@@ -496,8 +496,8 @@ 
 	 */
 	public function getSelectedItem()
 	{
-		$index = $this->getSelectedItemIndex();
-		$items = $this->getItems();
+		$index=$this->getSelectedItemIndex();
+		$items=$this->getItems();
 		if($index >= 0 && $index < $items->getCount())
 			return $items->itemAt($index);
 		else
@@ -522,23 +522,23 @@ 
 	 */
 	public function setSelectedItemIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
-		if(($current = $this->getSelectedItemIndex()) !== $value)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
+			$value=-1;
+		if(($current=$this->getSelectedItemIndex())!==$value)
 		{
 			$this->setViewState('SelectedItemIndex', $value, -1);
-			$items = $this->getItems();
-			$itemCount = $items->getCount();
+			$items=$this->getItems();
+			$itemCount=$items->getCount();
 			if($current >= 0 && $current < $itemCount)
 			{
-				$item = $items->itemAt($current);
-				if($item->getItemType() !== TListItemType::EditItem)
-					$item->setItemType($current % 2?TListItemType::AlternatingItem:TListItemType::Item);
+				$item=$items->itemAt($current);
+				if($item->getItemType()!==TListItemType::EditItem)
+					$item->setItemType($current % 2 ?TListItemType::AlternatingItem : TListItemType::Item);
 			}
 			if($value >= 0 && $value < $itemCount)
 			{
-				$item = $items->itemAt($value);
-				if($item->getItemType() !== TListItemType::EditItem)
+				$item=$items->itemAt($value);
+				if($item->getItemType()!==TListItemType::EditItem)
 					$item->setItemType(TListItemType::SelectedItem);
 			}
 		}
@@ -549,8 +549,8 @@ 
 	 */
 	public function getEditItem()
 	{
-		$index = $this->getEditItemIndex();
-		$items = $this->getItems();
+		$index=$this->getEditItemIndex();
+		$items=$this->getItems();
 		if($index >= 0 && $index < $items->getCount())
 			return $items->itemAt($index);
 		else
@@ -574,15 +574,15 @@ 
 	 */
 	public function setEditItemIndex($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
-		if(($current = $this->getEditItemIndex()) !== $value)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
+			$value=-1;
+		if(($current=$this->getEditItemIndex())!==$value)
 		{
 			$this->setViewState('EditItemIndex', $value, -1);
-			$items = $this->getItems();
-			$itemCount = $items->getCount();
+			$items=$this->getItems();
+			$itemCount=$items->getCount();
 			if($current >= 0 && $current < $itemCount)
-				$items->itemAt($current)->setItemType($current % 2?TListItemType::AlternatingItem:TListItemType::Item);
+				$items->itemAt($current)->setItemType($current % 2 ?TListItemType::AlternatingItem : TListItemType::Item);
 			if($value >= 0 && $value < $itemCount)
 				$items->itemAt($value)->setItemType(TListItemType::EditItem);
 		}
@@ -666,8 +666,8 @@ 
 	 */
 	public function setEmptyTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
-			$this->_emptyTemplate = $value;
+		if($value instanceof ITemplate || $value===null)
+			$this->_emptyTemplate=$value;
 		else
 			throw new TInvalidDataTypeException('datagrid_template_required', 'EmptyTemplate');
 	}
@@ -690,51 +690,51 @@ 
 		if($param instanceof TDataGridCommandEventParameter)
 		{
 			$this->onItemCommand($param);
-			$command = $param->getCommandName();
-			if(strcasecmp($command, self::CMD_SELECT) === 0)
+			$command=$param->getCommandName();
+			if(strcasecmp($command, self::CMD_SELECT)===0)
 			{
 				$this->setSelectedItemIndex($param->getItem()->getItemIndex());
 				$this->onSelectedIndexChanged($param);
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_EDIT) === 0)
+			elseif(strcasecmp($command, self::CMD_EDIT)===0)
 			{
 				$this->onEditCommand($param);
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_DELETE) === 0)
+			elseif(strcasecmp($command, self::CMD_DELETE)===0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_UPDATE) === 0)
+			elseif(strcasecmp($command, self::CMD_UPDATE)===0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_CANCEL) === 0)
+			elseif(strcasecmp($command, self::CMD_CANCEL)===0)
 			{
 				$this->onCancelCommand($param);
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_SORT) === 0)
+			elseif(strcasecmp($command, self::CMD_SORT)===0)
 			{
 				$this->onSortCommand(new TDataGridSortCommandEventParameter($sender, $param));
 				return true;
 			}
-			elseif(strcasecmp($command, self::CMD_PAGE) === 0)
+			elseif(strcasecmp($command, self::CMD_PAGE)===0)
 			{
-				$p = $param->getCommandParameter();
-				if(strcasecmp($p, self::CMD_PAGE_NEXT) === 0)
-					$pageIndex = $this->getCurrentPageIndex() + 1;
-				elseif(strcasecmp($p, self::CMD_PAGE_PREV) === 0)
-					$pageIndex = $this->getCurrentPageIndex() - 1;
-				elseif(strcasecmp($p, self::CMD_PAGE_FIRST) === 0)
-					$pageIndex = 0;
-				elseif(strcasecmp($p, self::CMD_PAGE_LAST) === 0)
-					$pageIndex = $this->getPageCount() - 1;
+				$p=$param->getCommandParameter();
+				if(strcasecmp($p, self::CMD_PAGE_NEXT)===0)
+					$pageIndex=$this->getCurrentPageIndex() + 1;
+				elseif(strcasecmp($p, self::CMD_PAGE_PREV)===0)
+					$pageIndex=$this->getCurrentPageIndex() - 1;
+				elseif(strcasecmp($p, self::CMD_PAGE_FIRST)===0)
+					$pageIndex=0;
+				elseif(strcasecmp($p, self::CMD_PAGE_LAST)===0)
+					$pageIndex=$this->getPageCount() - 1;
 				else
-					$pageIndex = TPropertyValue::ensureInteger($p) - 1;
+					$pageIndex=TPropertyValue::ensureInteger($p) - 1;
 				$this->onPageIndexChanged(new TDataGridPageChangedEventParameter($sender, $pageIndex));
 				return true;
 			}
@@ -865,18 +865,18 @@ 
 			$this->clearViewState('ItemCount');
 		if($this->_autoColumns)
 		{
-			$state = [];
+			$state=[];
 			foreach($this->_autoColumns as $column)
-				$state[] = $column->saveState();
+				$state[]=$column->saveState();
 			$this->setViewState('AutoColumns', $state, []);
 		}
 		else
 			$this->clearViewState('AutoColumns');
 		if($this->_columns)
 		{
-			$state = [];
+			$state=[];
 			foreach($this->_columns as $column)
-				$state[] = $column->saveState();
+				$state[]=$column->saveState();
 			$this->setViewState('Columns', $state, []);
 		}
 		else
@@ -894,23 +894,23 @@ 
 			return;
 		if(!$this->getIsDataBound())
 		{
-			$state = $this->getViewState('AutoColumns', []);
+			$state=$this->getViewState('AutoColumns', []);
 			if(!empty($state))
 			{
-				$this->_autoColumns = new TDataGridColumnCollection($this);
+				$this->_autoColumns=new TDataGridColumnCollection($this);
 				foreach($state as $st)
 				{
-					$column = new $this->AutoGenerateColumnName;
+					$column=new $this->AutoGenerateColumnName;
 					$column->loadState($st);
 					$this->_autoColumns->add($column);
 				}
 			}
 			else
-				$this->_autoColumns = null;
-			$state = $this->getViewState('Columns', []);
-			if($this->_columns && $this->_columns->getCount() === count($state))
+				$this->_autoColumns=null;
+			$state=$this->getViewState('Columns', []);
+			if($this->_columns && $this->_columns->getCount()===count($state))
 			{
-				$i = 0;
+				$i=0;
 				foreach($this->_columns as $column)
 				{
 					$column->loadState($state[$i]);
@@ -928,11 +928,11 @@ 
 	{
 		$this->getControls()->clear();
 		$this->getItems()->clear();
-		$this->_header = null;
-		$this->_footer = null;
-		$this->_topPager = null;
-		$this->_bottomPager = null;
-		$this->_useEmptyTemplate = false;
+		$this->_header=null;
+		$this->_footer=null;
+		$this->_topPager=null;
+		$this->_bottomPager=null;
+		$this->_useEmptyTemplate=false;
 	}
 
 	/**
@@ -942,52 +942,52 @@ 
 	{
 		$this->reset();
 
-		$allowPaging = $this->getAllowPaging();
+		$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=new TList($this->getColumns());
 		$columns->mergeWith($this->_autoColumns);
-		$this->_allColumns = $columns;
+		$this->_allColumns=$columns;
 
-		$items = $this->getItems();
+		$items=$this->getItems();
 
 		if($columns->getCount())
 		{
 			foreach($columns as $column)
 				$column->initialize();
-			$selectedIndex = $this->getSelectedItemIndex();
-			$editIndex = $this->getEditItemIndex();
-			for($index = 0;$index < $itemCount;++$index)
+			$selectedIndex=$this->getSelectedItemIndex();
+			$editIndex=$this->getEditItemIndex();
+			for($index=0; $index < $itemCount; ++$index)
 			{
-				if($index === 0)
+				if($index===0)
 				{
 					if($allowPaging)
-						$this->_topPager = $this->createPager();
-					$this->_header = $this->createItemInternal(-1, -1, TListItemType::Header, false, null, $columns);
+						$this->_topPager=$this->createPager();
+					$this->_header=$this->createItemInternal(-1, -1, TListItemType::Header, false, null, $columns);
 				}
-				if($index === $editIndex)
-					$itemType = TListItemType::EditItem;
-				elseif($index === $selectedIndex)
-					$itemType = TListItemType::SelectedItem;
+				if($index===$editIndex)
+					$itemType=TListItemType::EditItem;
+				elseif($index===$selectedIndex)
+					$itemType=TListItemType::SelectedItem;
 				elseif($index % 2)
-					$itemType = TListItemType::AlternatingItem;
+					$itemType=TListItemType::AlternatingItem;
 				else
-					$itemType = TListItemType::Item;
+					$itemType=TListItemType::Item;
 				$items->add($this->createItemInternal($index, $dsIndex, $itemType, false, null, $columns));
 				$dsIndex++;
 			}
 			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();
+					$this->_bottomPager=$this->createPager();
 			}
 		}
-		if(!$dsIndex && $this->_emptyTemplate !== null)
+		if(!$dsIndex && $this->_emptyTemplate!==null)
 		{
-			$this->_useEmptyTemplate = true;
+			$this->_useEmptyTemplate=true;
 			$this->_emptyTemplate->instantiateIn($this);
 		}
 	}
@@ -1001,69 +1001,69 @@ 
 	protected function performDataBinding($data)
 	{
 		$this->reset();
-		$keys = $this->getDataKeys();
+		$keys=$this->getDataKeys();
 		$keys->clear();
-		$keyField = $this->getDataKeyField();
+		$keyField=$this->getDataKeyField();
 
 		// get all columns
 		if($this->getAutoGenerateColumns())
 		{
-			$columns = new TList($this->getColumns());
-			$autoColumns = $this->createAutoColumns($data);
+			$columns=new TList($this->getColumns());
+			$autoColumns=$this->createAutoColumns($data);
 			$columns->mergeWith($autoColumns);
 		}
 		else
-			$columns = $this->getColumns();
-		$this->_allColumns = $columns;
+			$columns=$this->getColumns();
+		$this->_allColumns=$columns;
 
-		$items = $this->getItems();
+		$items=$this->getItems();
 
-		$index = 0;
-		$allowPaging = $this->getAllowPaging() && ($data instanceof TPagedDataSource);
-		$dsIndex = $allowPaging?$data->getFirstIndexInPage():0;
+		$index=0;
+		$allowPaging=$this->getAllowPaging() && ($data instanceof TPagedDataSource);
+		$dsIndex=$allowPaging ? $data->getFirstIndexInPage() : 0;
 		$this->setViewState('DataSourceIndex', $dsIndex, 0);
 		if($columns->getCount())
 		{
 			foreach($columns as $column)
 				$column->initialize();
 
-			$selectedIndex = $this->getSelectedItemIndex();
-			$editIndex = $this->getEditItemIndex();
+			$selectedIndex=$this->getSelectedItemIndex();
+			$editIndex=$this->getEditItemIndex();
 			foreach($data as $key => $row)
 			{
-				if($keyField !== '')
+				if($keyField!=='')
 					$keys->add($this->getDataFieldValue($row, $keyField));
 				else
 					$keys->add($key);
-				if($index === 0)
+				if($index===0)
 				{
 					if($allowPaging)
-						$this->_topPager = $this->createPager();
-					$this->_header = $this->createItemInternal(-1, -1, TListItemType::Header, true, null, $columns);
+						$this->_topPager=$this->createPager();
+					$this->_header=$this->createItemInternal(-1, -1, TListItemType::Header, true, null, $columns);
 				}
-				if($index === $editIndex)
-					$itemType = TListItemType::EditItem;
-				elseif($index === $selectedIndex)
-					$itemType = TListItemType::SelectedItem;
+				if($index===$editIndex)
+					$itemType=TListItemType::EditItem;
+				elseif($index===$selectedIndex)
+					$itemType=TListItemType::SelectedItem;
 				elseif($index % 2)
-					$itemType = TListItemType::AlternatingItem;
+					$itemType=TListItemType::AlternatingItem;
 				else
-					$itemType = TListItemType::Item;
+					$itemType=TListItemType::Item;
 				$items->add($this->createItemInternal($index, $dsIndex, $itemType, true, $row, $columns));
 				$index++;
 				$dsIndex++;
 			}
 			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->_bottomPager=$this->createPager();
 			}
 		}
 		$this->setViewState('ItemCount', $index, 0);
-		if(!$dsIndex && $this->_emptyTemplate !== null)
+		if(!$dsIndex && $this->_emptyTemplate!==null)
 		{
-			$this->_useEmptyTemplate = true;
+			$this->_useEmptyTemplate=true;
 			$this->_emptyTemplate->instantiateIn($this);
 			$this->dataBindChildren();
 		}
@@ -1075,38 +1075,38 @@ 
 	 */
 	private function groupCells()
 	{
-		if(($columns = $this->_allColumns) === null)
+		if(($columns=$this->_allColumns)===null)
 			return;
-		$items = $this->getItems();
+		$items=$this->getItems();
 		foreach($columns as $id => $column)
 		{
 			if(!$column->getEnableCellGrouping())
 				continue;
-			$prevCell = null;
-			$prevCellText = null;
+			$prevCell=null;
+			$prevCellText=null;
 			foreach($items as $item)
 			{
-				$itemType = $item->getItemType();
-				$cell = $item->getCells()->itemAt($id);
+				$itemType=$item->getItemType();
+				$cell=$item->getCells()->itemAt($id);
 				if(!$cell->getVisible())
 					continue;
-				if($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem)
+				if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::SelectedItem)
 				{
-					if(($cellText = $this->getCellText($cell)) === '')
+					if(($cellText=$this->getCellText($cell))==='')
 					{
-						$prevCell = null;
-						$prevCellText = null;
+						$prevCell=null;
+						$prevCellText=null;
 						continue;
 					}
-					if($prevCell === null || $prevCellText !== $cellText)
+					if($prevCell===null || $prevCellText!==$cellText)
 					{
-						$prevCell = $cell;
-						$prevCellText = $cellText;
+						$prevCell=$cell;
+						$prevCellText=$cellText;
 					}
 					else
 					{
-						if(($rowSpan = $prevCell->getRowSpan()) === 0)
-							$rowSpan = 1;
+						if(($rowSpan=$prevCell->getRowSpan())===0)
+							$rowSpan=1;
 						$prevCell->setRowSpan($rowSpan + 1);
 						$cell->setVisible(false);
 					}
@@ -1117,9 +1117,9 @@ 
 
 	private function getCellText($cell)
 	{
-		if(($data = $cell->getText()) === '' && $cell->getHasControls())
+		if(($data=$cell->getText())==='' && $cell->getHasControls())
 		{
-			$controls = $cell->getControls();
+			$controls=$cell->getControls();
 			foreach($controls as $control)
 			{
 				if($control instanceof \Prado\IDataRenderer)
@@ -1142,9 +1142,9 @@ 
 
 	private function createItemInternal($itemIndex, $dataSourceIndex, $itemType, $dataBind, $dataItem, $columns)
 	{
-		$item = $this->createItem($itemIndex, $dataSourceIndex, $itemType);
+		$item=$this->createItem($itemIndex, $dataSourceIndex, $itemType);
 		$this->initializeItem($item, $columns);
-		$param = new TDataGridItemEventParameter($item);
+		$param=new TDataGridItemEventParameter($item);
 		if($dataBind)
 		{
 			$item->setData($dataItem);
@@ -1168,16 +1168,16 @@ 
 	 */
 	protected function initializeItem($item, $columns)
 	{
-		$cells = $item->getCells();
-		$itemType = $item->getItemType();
-		$index = 0;
+		$cells=$item->getCells();
+		$itemType=$item->getItemType();
+		$index=0;
 		foreach($columns as $column)
 		{
-			if($itemType === TListItemType::Header)
-				$cell = new TTableHeaderCell;
+			if($itemType===TListItemType::Header)
+				$cell=new TTableHeaderCell;
 			else
-				$cell = new TTableCell;
-			if(($id = $column->getID()) !== '')
+				$cell=new TTableCell;
+			if(($id=$column->getID())!=='')
 				$item->registerObject($id, $cell);
 			$cells->add($cell);
 			$column->initializeCell($cell, $index, $itemType);
@@ -1187,7 +1187,7 @@ 
 
 	protected function createPager()
 	{
-		$pager = new TDataGridPager($this);
+		$pager=new TDataGridPager($this);
 		$this->buildPager($pager);
 		$this->onPagerCreated(new TDataGridPagerEventParameter($pager));
 		$this->getControls()->add($pager);
@@ -1226,20 +1226,20 @@ 
 	 */
 	protected function createPagerButton($pager, $buttonType, $enabled, $text, $commandName, $commandParameter)
 	{
-		if($buttonType === TDataGridPagerButtonType::LinkButton)
+		if($buttonType===TDataGridPagerButtonType::LinkButton)
 		{
 			if($enabled)
-				$button = new TLinkButton;
+				$button=new TLinkButton;
 			else
 			{
-				$button = new TLabel;
+				$button=new TLabel;
 				$button->setText($text);
 				return $button;
 			}
 		}
 		else
 		{
-			$button = new TButton;
+			$button=new TButton;
 			if(!$enabled)
 				$button->setEnabled(false);
 		}
@@ -1256,54 +1256,54 @@ 
 	 */
 	protected function buildNextPrevPager($pager)
 	{
-		$style = $this->getPagerStyle();
-		$buttonType = $style->getButtonType();
-		$controls = $pager->getControls();
-		$currentPageIndex = $this->getCurrentPageIndex();
-		if($currentPageIndex === 0)
+		$style=$this->getPagerStyle();
+		$buttonType=$style->getButtonType();
+		$controls=$pager->getControls();
+		$currentPageIndex=$this->getCurrentPageIndex();
+		if($currentPageIndex===0)
 		{
-			if(($text = $style->getFirstPageText()) !== '')
+			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()) !== '')
+			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()) !== '')
+			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()) !== '')
+			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);
 			}
 		}
@@ -1315,51 +1315,51 @@ 
 	 */
 	protected function buildNumericPager($pager)
 	{
-		$style = $this->getPagerStyle();
-		$buttonType = $style->getButtonType();
-		$controls = $pager->getControls();
-		$pageCount = $this->getPageCount();
-		$pageIndex = $this->getCurrentPageIndex() + 1;
-		$maxButtonCount = $style->getPageButtonCount();
-		$buttonCount = $maxButtonCount > $pageCount?$pageCount:$maxButtonCount;
-		$startPageIndex = 1;
-		$endPageIndex = $buttonCount;
+		$style=$this->getPagerStyle();
+		$buttonType=$style->getButtonType();
+		$controls=$pager->getControls();
+		$pageCount=$this->getPageCount();
+		$pageIndex=$this->getCurrentPageIndex() + 1;
+		$maxButtonCount=$style->getPageButtonCount();
+		$buttonCount=$maxButtonCount > $pageCount ? $pageCount : $maxButtonCount;
+		$startPageIndex=1;
+		$endPageIndex=$buttonCount;
 		if($pageIndex > $endPageIndex)
 		{
-			$startPageIndex = ((int)(($pageIndex - 1) / $maxButtonCount)) * $maxButtonCount + 1;
-			if(($endPageIndex = $startPageIndex + $maxButtonCount - 1) > $pageCount)
-				$endPageIndex = $pageCount;
+			$startPageIndex=((int) (($pageIndex - 1) / $maxButtonCount)) * $maxButtonCount + 1;
+			if(($endPageIndex=$startPageIndex + $maxButtonCount - 1) > $pageCount)
+				$endPageIndex=$pageCount;
 			if($endPageIndex - $startPageIndex + 1 < $maxButtonCount)
 			{
-				if(($startPageIndex = $endPageIndex - $maxButtonCount + 1) < 1)
-					$startPageIndex = 1;
+				if(($startPageIndex=$endPageIndex - $maxButtonCount + 1) < 1)
+					$startPageIndex=1;
 			}
 		}
 
 		if($startPageIndex > 1)
 		{
-			if(($text = $style->getFirstPageText()) !== '')
+			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)
+			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)
@@ -1369,13 +1369,13 @@ 
 		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()) !== '')
+			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);
 			}
 		}
@@ -1390,13 +1390,13 @@ 
 	{
 		if(!$dataSource)
 			return null;
-		$autoColumns = $this->getAutoColumns();
+		$autoColumns=$this->getAutoColumns();
 		$autoColumns->clear();
 		foreach($dataSource as $row)
 		{
 			foreach($row as $key => $value)
 			{
-				$column = new $this->AutoGenerateColumnName;
+				$column=new $this->AutoGenerateColumnName;
 				if(is_string($key))
 				{
 					$column->setHeaderText($key);
@@ -1430,38 +1430,38 @@ 
 	 */
 	protected function applyItemStyles()
 	{
-		$itemStyle = $this->getViewState('ItemStyle', null);
+		$itemStyle=$this->getViewState('ItemStyle', null);
 
-		$alternatingItemStyle = $this->getViewState('AlternatingItemStyle', null);
-		if($itemStyle !== null)
+		$alternatingItemStyle=$this->getViewState('AlternatingItemStyle', null);
+		if($itemStyle!==null)
 		{
-			if($alternatingItemStyle === null)
-				$alternatingItemStyle = $itemStyle;
+			if($alternatingItemStyle===null)
+				$alternatingItemStyle=$itemStyle;
 			else
 				$alternatingItemStyle->mergeWith($itemStyle);
 		}
 
-		$selectedItemStyle = $this->getViewState('SelectedItemStyle', null);
+		$selectedItemStyle=$this->getViewState('SelectedItemStyle', null);
 
-		$editItemStyle = $this->getViewState('EditItemStyle', null);
-		if($selectedItemStyle !== null)
+		$editItemStyle=$this->getViewState('EditItemStyle', null);
+		if($selectedItemStyle!==null)
 		{
-			if($editItemStyle === null)
-				$editItemStyle = $selectedItemStyle;
+			if($editItemStyle===null)
+				$editItemStyle=$selectedItemStyle;
 			else
 				$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)
 		{
 			if(!($item instanceof TDataGridItem) && !($item instanceof TDataGridPager))
 				continue;
-			$itemType = $item->getItemType();
+			$itemType=$item->getItemType();
 			switch($itemType)
 			{
 				case TListItemType::Header:
@@ -1491,7 +1491,7 @@ 
 				case TListItemType::SelectedItem:
 					if($selectedItemStyle)
 						$item->getStyle()->mergeWith($selectedItemStyle);
-					if($index % 2 == 1)
+					if($index % 2==1)
 					{
 						if($itemStyle)
 							$item->getStyle()->mergeWith($itemStyle);
@@ -1505,7 +1505,7 @@ 
 				case TListItemType::EditItem:
 					if($editItemStyle)
 						$item->getStyle()->mergeWith($editItemStyle);
-					if($index % 2 == 1)
+					if($index % 2==1)
 					{
 						if($itemStyle)
 							$item->getStyle()->mergeWith($itemStyle);
@@ -1520,14 +1520,14 @@ 
 					if($pagerStyle)
 					{
 						$item->getStyle()->mergeWith($pagerStyle);
-						if($index === 0)
+						if($index===0)
 						{
-							if($pagerStyle->getPosition() === TDataGridPagerPosition::Bottom || !$pagerStyle->getVisible())
+							if($pagerStyle->getPosition()===TDataGridPagerPosition::Bottom || !$pagerStyle->getVisible())
 								$item->setVisible(false);
 						}
 						else
 						{
-							if($pagerStyle->getPosition() === TDataGridPagerPosition::Top || !$pagerStyle->getVisible())
+							if($pagerStyle->getPosition()===TDataGridPagerPosition::Top || !$pagerStyle->getVisible())
 								$item->setVisible(false);
 						}
 					}
@@ -1535,25 +1535,25 @@ 
 				default:
 					break;
 			}
-			if($this->_columns && $itemType !== TListItemType::Pager)
+			if($this->_columns && $itemType!==TListItemType::Pager)
 			{
-				$n = $this->_columns->getCount();
-				$cells = $item->getCells();
-				for($i = 0;$i < $n;++$i)
+				$n=$this->_columns->getCount();
+				$cells=$item->getCells();
+				for($i=0; $i < $n; ++$i)
 				{
-					$cell = $cells->itemAt($i);
-					$column = $this->_columns->itemAt($i);
+					$cell=$cells->itemAt($i);
+					$column=$this->_columns->itemAt($i);
 					if(!$column->getVisible())
 						$cell->setVisible(false);
 					else
 					{
-						if($itemType === TListItemType::Header)
-							$style = $column->getHeaderStyle(false);
-						elseif($itemType === TListItemType::Footer)
-							$style = $column->getFooterStyle(false);
+						if($itemType===TListItemType::Header)
+							$style=$column->getHeaderStyle(false);
+						elseif($itemType===TListItemType::Footer)
+							$style=$column->getFooterStyle(false);
 						else
-							$style = $column->getItemStyle(false);
-						if($style !== null)
+							$style=$column->getItemStyle(false);
+						if($style!==null)
 							$cell->getStyle()->mergeWith($style);
 					}
 				}
@@ -1568,9 +1568,9 @@ 
 	public function renderBeginTag($writer)
 	{
 		parent::renderBeginTag($writer);
-		if(($caption = $this->getCaption()) !== '')
+		if(($caption=$this->getCaption())!=='')
 		{
-			if(($align = $this->getCaptionAlign()) !== TTableCaptionAlign::NotSet)
+			if(($align=$this->getCaptionAlign())!==TTableCaptionAlign::NotSet)
 				$writer->addAttribute('align', strtolower($align));
 			$writer->renderBeginTag('caption');
 			$writer->write($caption);
@@ -1589,7 +1589,7 @@ 
 			$this->groupCells();
 			if($this->_useEmptyTemplate)
 			{
-				$control = new TWebControl;
+				$control=new TWebControl;
 				$control->setID($this->getClientID());
 				$control->copyBaseAttributes($this);
 				if($this->getHasStyle())
@@ -1626,14 +1626,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)
@@ -1643,7 +1643,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);

Braces +21 added lines, -42 removed lines

@@ -696,33 +696,27 @@ 
 				$this->setSelectedItemIndex($param->getItem()->getItemIndex());
 				$this->onSelectedIndexChanged($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_EDIT) === 0)
+			} elseif(strcasecmp($command, self::CMD_EDIT) === 0)
 			{
 				$this->onEditCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_DELETE) === 0)
+			} elseif(strcasecmp($command, self::CMD_DELETE) === 0)
 			{
 				$this->onDeleteCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_UPDATE) === 0)
+			} elseif(strcasecmp($command, self::CMD_UPDATE) === 0)
 			{
 				$this->onUpdateCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_CANCEL) === 0)
+			} elseif(strcasecmp($command, self::CMD_CANCEL) === 0)
 			{
 				$this->onCancelCommand($param);
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_SORT) === 0)
+			} elseif(strcasecmp($command, self::CMD_SORT) === 0)
 			{
 				$this->onSortCommand(new TDataGridSortCommandEventParameter($sender, $param));
 				return true;
-			}
-			elseif(strcasecmp($command, self::CMD_PAGE) === 0)
+			} elseif(strcasecmp($command, self::CMD_PAGE) === 0)
 			{
 				$p = $param->getCommandParameter();
 				if(strcasecmp($p, self::CMD_PAGE_NEXT) === 0)
@@ -869,8 +863,7 @@ 
 			foreach($this->_autoColumns as $column)
 				$state[] = $column->saveState();
 			$this->setViewState('AutoColumns', $state, []);
-		}
-		else
+		} else
 			$this->clearViewState('AutoColumns');
 		if($this->_columns)
 		{
@@ -878,8 +871,7 @@ 
 			foreach($this->_columns as $column)
 				$state[] = $column->saveState();
 			$this->setViewState('Columns', $state, []);
-		}
-		else
+		} else
 			$this->clearViewState('Columns');
 	}
 
@@ -904,8 +896,7 @@ 
 					$column->loadState($st);
 					$this->_autoColumns->add($column);
 				}
-			}
-			else
+			} else
 				$this->_autoColumns = null;
 			$state = $this->getViewState('Columns', []);
 			if($this->_columns && $this->_columns->getCount() === count($state))
@@ -1011,8 +1002,7 @@ 
 			$columns = new TList($this->getColumns());
 			$autoColumns = $this->createAutoColumns($data);
 			$columns->mergeWith($autoColumns);
-		}
-		else
+		} else
 			$columns = $this->getColumns();
 		$this->_allColumns = $columns;
 
@@ -1102,8 +1092,7 @@ 
 					{
 						$prevCell = $cell;
 						$prevCellText = $cellText;
-					}
-					else
+					} else
 					{
 						if(($rowSpan = $prevCell->getRowSpan()) === 0)
 							$rowSpan = 1;
@@ -1152,8 +1141,7 @@ 
 			$this->getControls()->add($item);
 			$item->dataBind();
 			$this->onItemDataBound($param);
-		}
-		else
+		} else
 		{
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
@@ -1236,8 +1224,7 @@ 
 				$button->setText($text);
 				return $button;
 			}
-		}
-		else
+		} else
 		{
 			$button = new TButton;
 			if(!$enabled)
@@ -1271,8 +1258,7 @@ 
 
 			$label = $this->createPagerButton($pager, $buttonType, false, $style->getPrevPageText(), '', '');
 			$controls->add($label);
-		}
-		else
+		} else
 		{
 			if(($text = $style->getFirstPageText()) !== '')
 			{
@@ -1295,8 +1281,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);
@@ -1356,8 +1341,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);
@@ -1403,8 +1387,7 @@ 
 					$column->setDataField($key);
 					$column->setSortExpression($key);
 					$autoColumns->add($column);
-				}
-				else
+				} else
 				{
 					$column->setHeaderText(TListItemType::Item);
 					$column->setDataField($key);
@@ -1495,8 +1478,7 @@ 
 					{
 						if($itemStyle)
 							$item->getStyle()->mergeWith($itemStyle);
-					}
-					else
+					} else
 					{
 						if($alternatingItemStyle)
 							$item->getStyle()->mergeWith($alternatingItemStyle);
@@ -1509,8 +1491,7 @@ 
 					{
 						if($itemStyle)
 							$item->getStyle()->mergeWith($itemStyle);
-					}
-					else
+					} else
 					{
 						if($alternatingItemStyle)
 							$item->getStyle()->mergeWith($alternatingItemStyle);
@@ -1524,8 +1505,7 @@ 
 						{
 							if($pagerStyle->getPosition() === TDataGridPagerPosition::Bottom || !$pagerStyle->getVisible())
 								$item->setVisible(false);
-						}
-						else
+						} else
 						{
 							if($pagerStyle->getPosition() === TDataGridPagerPosition::Top || !$pagerStyle->getVisible())
 								$item->setVisible(false);
@@ -1597,8 +1577,7 @@ 
 				$control->renderBeginTag($writer);
 				$this->renderContents($writer);
 				$control->renderEndTag($writer);
-			}
-			elseif($this->getViewState('ItemCount', 0) > 0)
+			} elseif($this->getViewState('ItemCount', 0) > 0)
 			{
 				$this->applyItemStyles();
 				if($this->_topPager)

framework/Web/UI/WebControls/TDataGridColumn.php

Doc Comments +4 added lines

@@ -287,6 +287,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)
@@ -301,6 +302,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)
 	{
@@ -362,6 +364,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.
 	 */
@@ -521,6 +524,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)

Spacing +46 added lines, -46 removed lines

@@ -68,9 +68,9 @@ 
  */
 abstract class TDataGridColumn extends \Prado\TApplicationComponent
 {
-	private $_id = '';
+	private $_id='';
 	private $_owner;
-	private $_viewState = [];
+	private $_viewState=[];
 
 	/**
 	 * @return string the ID of the column.
@@ -91,7 +91,7 @@ 
 	{
 		if(!preg_match(TControl::ID_FORMAT, $value))
 			throw new TInvalidDataValueException('datagridcolumn_id_invalid', get_class($this), $value);
-		$this->_id = $value;
+		$this->_id=$value;
 	}
 
 	/**
@@ -154,11 +154,11 @@ 
 	 * @param boolean whether to create a style if previously not existing
 	 * @return TTableItemStyle the style for header
 	 */
-	public function getHeaderStyle($createStyle = true)
+	public function getHeaderStyle($createStyle=true)
 	{
-		if(($style = $this->getViewState('HeaderStyle', null)) === null && $createStyle)
+		if(($style=$this->getViewState('HeaderStyle', null))===null && $createStyle)
 		{
-			$style = new TTableItemStyle;
+			$style=new TTableItemStyle;
 			$this->setViewState('HeaderStyle', $style, null);
 		}
 		return $style;
@@ -208,11 +208,11 @@ 
 	 * @param boolean whether to create a style if previously not existing
 	 * @return TTableItemStyle the style for footer
 	 */
-	public function getFooterStyle($createStyle = true)
+	public function getFooterStyle($createStyle=true)
 	{
-		if(($style = $this->getViewState('FooterStyle', null)) === null && $createStyle)
+		if(($style=$this->getViewState('FooterStyle', null))===null && $createStyle)
 		{
-			$style = new TTableItemStyle;
+			$style=new TTableItemStyle;
 			$this->setViewState('FooterStyle', $style, null);
 		}
 		return $style;
@@ -222,11 +222,11 @@ 
 	 * @param boolean whether to create a style if previously not existing
 	 * @return TTableItemStyle the style for item
 	 */
-	public function getItemStyle($createStyle = true)
+	public function getItemStyle($createStyle=true)
 	{
-		if(($style = $this->getViewState('ItemStyle', null)) === null && $createStyle)
+		if(($style=$this->getViewState('ItemStyle', null))===null && $createStyle)
 		{
-			$style = new TTableItemStyle;
+			$style=new TTableItemStyle;
 			$this->setViewState('ItemStyle', $style, null);
 		}
 		return $style;
@@ -269,7 +269,7 @@ 
 	/**
 	 * @return boolean whether the column is visible. Defaults to true.
 	 */
-	public function getVisible($checkParents = true)
+	public function getVisible($checkParents=true)
 	{
 		return $this->getViewState('Visible', true);
 	}
@@ -289,9 +289,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;
 	}
 
 	/**
@@ -302,12 +302,12 @@ 
 	 * @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)
+		if($value===$defaultValue)
 			unset($this->_viewState[$key]);
 		else
-			$this->_viewState[$key] = $value;
+			$this->_viewState[$key]=$value;
 	}
 
 	/**
@@ -316,7 +316,7 @@ 
 	 */
 	public function loadState($state)
 	{
-		$this->_viewState = $state;
+		$this->_viewState=$state;
 	}
 
 	/**
@@ -341,7 +341,7 @@ 
 	 */
 	public function setOwner(TDataGrid $value)
 	{
-		$this->_owner = $value;
+		$this->_owner=$value;
 	}
 
 	/**
@@ -384,9 +384,9 @@ 
 	 */
 	public function initializeCell($cell, $columnIndex, $itemType)
 	{
-		if($itemType === TListItemType::Header)
+		if($itemType===TListItemType::Header)
 			$this->initializeHeaderCell($cell, $columnIndex);
-		elseif($itemType === TListItemType::Footer)
+		elseif($itemType===TListItemType::Footer)
 			$this->initializeFooterCell($cell, $columnIndex);
 	}
 
@@ -398,7 +398,7 @@ 
 	 */
 	public function getAllowSorting()
 	{
-		return $this->getSortExpression() !== '' && (!$this->_owner || $this->_owner->getAllowSorting());
+		return $this->getSortExpression()!=='' && (!$this->_owner || $this->_owner->getAllowSorting());
 	}
 
 	/**
@@ -417,17 +417,17 @@ 
 	 */
 	protected function initializeHeaderCell($cell, $columnIndex)
 	{
-		$text = $this->getHeaderText();
+		$text=$this->getHeaderText();
 
-		if(($classPath = $this->getHeaderRenderer()) !== '')
+		if(($classPath=$this->getHeaderRenderer())!=='')
 		{
-			$control = Prado::createComponent($classPath);
+			$control=Prado::createComponent($classPath);
 			$cell->getControls()->add($control);
 			if($control instanceof \Prado\IDataRenderer)
 			{
 				if($control instanceof IItemDataRenderer)
 				{
-					$item = $cell->getParent();
+					$item=$cell->getParent();
 					$control->setItemIndex($item->getItemIndex());
 					$control->setItemType($item->getItemType());
 				}
@@ -436,21 +436,21 @@ 
 		}
 		elseif($this->getAllowSorting())
 		{
-			$sortExpression = $this->getSortExpression();
-			if(($url = $this->getHeaderImageUrl()) !== '')
+			$sortExpression=$this->getSortExpression();
+			if(($url=$this->getHeaderImageUrl())!=='')
 			{
-				$button = new TImageButton;
+				$button=new TImageButton;
 				$button->setImageUrl($url);
 				$button->setCommandName(TDataGrid::CMD_SORT);
 				$button->setCommandParameter($sortExpression);
-				if($text !== '')
+				if($text!=='')
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
 			}
-			elseif($text !== '')
+			elseif($text!=='')
 			{
-				$button = new TLinkButton;
+				$button=new TLinkButton;
 				$button->setText($text);
 				$button->setCommandName(TDataGrid::CMD_SORT);
 				$button->setCommandParameter($sortExpression);
@@ -462,15 +462,15 @@ 
 		}
 		else
 		{
-			if(($url = $this->getHeaderImageUrl()) !== '')
+			if(($url=$this->getHeaderImageUrl())!=='')
 			{
-				$image = new TImage;
+				$image=new TImage;
 				$image->setImageUrl($url);
-				if($text !== '')
+				if($text!=='')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
 			}
-			elseif($text !== '')
+			elseif($text!=='')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');
@@ -489,23 +489,23 @@ 
 	 */
 	protected function initializeFooterCell($cell, $columnIndex)
 	{
-		$text = $this->getFooterText();
-		if(($classPath = $this->getFooterRenderer()) !== '')
+		$text=$this->getFooterText();
+		if(($classPath=$this->getFooterRenderer())!=='')
 		{
-			$control = Prado::createComponent($classPath);
+			$control=Prado::createComponent($classPath);
 			$cell->getControls()->add($control);
 			if($control instanceof \Prado\IDataRenderer)
 			{
 				if($control instanceof IItemDataRenderer)
 				{
-					$item = $cell->getParent();
+					$item=$cell->getParent();
 					$control->setItemIndex($item->getItemIndex());
 					$control->setItemType($item->getItemType());
 				}
 				$control->setData($text);
 			}
 		}
-		elseif($text !== '')
+		elseif($text!=='')
 			$cell->setText($text);
 		else
 			$cell->setText(' ');
@@ -525,14 +525,14 @@ 
 	 */
 	protected function formatDataValue($formatString, $value)
 	{
-		if($formatString === '')
+		if($formatString==='')
 			return TPropertyValue::ensureString($value);
-		elseif($formatString[0] === '#')
+		elseif($formatString[0]==='#')
 		{
-			$expression = strtr(substr($formatString, 1), ['{0}' => '$value']);
+			$expression=strtr(substr($formatString, 1), ['{0}' => '$value']);
 			try
 			{
-				if(eval("\$result=$expression;") === false)
+				if(eval("\$result=$expression;")===false)
 					throw new Exception('');
 				return $result;
 			}

Braces +8 added lines, -16 removed lines

@@ -433,8 +433,7 @@ 
 				}
 				$control->setData($text);
 			}
-		}
-		elseif($this->getAllowSorting())
+		} elseif($this->getAllowSorting())
 		{
 			$sortExpression = $this->getSortExpression();
 			if(($url = $this->getHeaderImageUrl()) !== '')
@@ -447,8 +446,7 @@ 
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			elseif($text !== '')
+			} elseif($text !== '')
 			{
 				$button = new TLinkButton;
 				$button->setText($text);
@@ -456,11 +454,9 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else
+			} else
 				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url = $this->getHeaderImageUrl()) !== '')
 			{
@@ -469,8 +465,7 @@ 
 				if($text !== '')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
-			}
-			elseif($text !== '')
+			} elseif($text !== '')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');
@@ -504,8 +499,7 @@ 
 				}
 				$control->setData($text);
 			}
-		}
-		elseif($text !== '')
+		} elseif($text !== '')
 			$cell->setText($text);
 		else
 			$cell->setText(' ');
@@ -535,13 +529,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);
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TFileUploadItem.php

Doc Comments +3 added lines

@@ -91,6 +91,7 @@ 
 
   /**
    * @param string the local name of the file (where it is after being uploaded).
+   * @param string $value
    */
   public function setLocalName($value)
   {
@@ -110,6 +111,7 @@ 
   /**
    * Sets the error code describing the status of this file uploading.
    * @param integer the error code
+   * @param integer $value
    * @see http://www.php.net/manual/en/features.file-upload.errors.php
    */
   public function setErrorCode($value)
@@ -130,6 +132,7 @@ 
    * @param string the file name used to save the uploaded file
    * @param boolean whether to delete the temporary file after saving.
    * If true, you will not be able to save the uploaded file again.
+   * @param string $fileName
    * @return boolean true if the file saving is successful
    */
   public function saveAs($fileName, $deleteTempFile = true)

Spacing +16 added lines, -16 removed lines

@@ -28,31 +28,31 @@ 
   /**
    * @var integer the size of the uploaded file (in bytes)
    */
-  private $_fileSize = 0;
+  private $_fileSize=0;
   /**
    * @var string The original name of the file on the client machine
    */
-  private $_fileName = '';
+  private $_fileName='';
   /**
    * @var string the name of the temporary file storing the uploaded file
    */
-  private $_localName = '';
+  private $_localName='';
   /**
    * @var string the uploaded file mime type
    */
-  private $_fileType = '';
+  private $_fileType='';
   /**
    * @var integer error code of the current file upload
    */
-  private $_errorCode = UPLOAD_ERR_NO_FILE;
+  private $_errorCode=UPLOAD_ERR_NO_FILE;
 
   public function __construct($fileName, $fileSize, $fileType, $errorCode, $localName)
   {
-	$this->_fileName = $fileName;
-	$this->_fileSize = $fileSize;
-	$this->_fileType = $fileType;
-	$this->_errorCode = $errorCode;
-	$this->_localName = $localName;
+	$this->_fileName=$fileName;
+	$this->_fileSize=$fileSize;
+	$this->_fileType=$fileType;
+	$this->_errorCode=$errorCode;
+	$this->_localName=$localName;
   }
 
   /**
@@ -94,7 +94,7 @@ 
    */
   public function setLocalName($value)
   {
-	$this->_localName = $value;
+	$this->_localName=$value;
   }
 
   /**
@@ -114,7 +114,7 @@ 
    */
   public function setErrorCode($value)
   {
-	$this->_errorCode = $value;
+	$this->_errorCode=$value;
   }
 
   /**
@@ -122,7 +122,7 @@ 
    */
   public function getHasFile()
   {
-	return $this->_errorCode === UPLOAD_ERR_OK;
+	return $this->_errorCode===UPLOAD_ERR_OK;
   }
 
   /**
@@ -132,14 +132,14 @@ 
    * If true, you will not be able to save the uploaded file again.
    * @return boolean true if the file saving is successful
    */
-  public function saveAs($fileName, $deleteTempFile = true)
+  public function saveAs($fileName, $deleteTempFile=true)
   {
-	if($this->_errorCode === UPLOAD_ERR_OK)
+	if($this->_errorCode===UPLOAD_ERR_OK)
 	{
 	  if($deleteTempFile)
 		return move_uploaded_file($this->_localName, $fileName);
 	  elseif(is_uploaded_file($this->_localName))
-		return file_put_contents($fileName, file_get_contents($this->_localName)) !== false;
+		return file_put_contents($fileName, file_get_contents($this->_localName))!==false;
 	  else
 		return false;
 	}

Braces +1 added lines, -2 removed lines

@@ -142,8 +142,7 @@
 		return file_put_contents($fileName, file_get_contents($this->_localName)) !== false;
 	  else
 		return false;
-	}
-	else
+	} else
 	  return false;
   }
 

framework/Web/UI/WebControls/THotSpot.php

Doc Comments +2 added lines

@@ -36,6 +36,7 @@ 
 	 * that must be kept in viewstate.
 	 * @param string the name of the viewstate value to be returned
 	 * @param mixed the default value. If $key is not found in viewstate, $defaultValue will be returned
+	 * @param string $key
 	 * @return mixed the viewstate value corresponding to $key
 	 */
 	protected function getViewState($key, $defaultValue = null)
@@ -52,6 +53,7 @@ 
 	 * @param string the name of the viewstate value
 	 * @param mixed the viewstate value to be set
 	 * @param mixed default value. If $value===$defaultValue, the item will be cleared from the viewstate.
+	 * @param string $key
 	 */
 	protected function setViewState($key, $value, $defaultValue = null)
 	{

Spacing +20 added lines, -20 removed lines

@@ -27,7 +27,7 @@ 
  */
 abstract class THotSpot extends \Prado\TComponent
 {
-	private $_viewState = [];
+	private $_viewState=[];
 
 	/**
 	 * Returns a viewstate value.
@@ -38,9 +38,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;
 	}
 
 	/**
@@ -53,12 +53,12 @@ 
 	 * @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)
+		if($value===$defaultValue)
 			unset($this->_viewState[$key]);
 		else
-			$this->_viewState[$key] = $value;
+			$this->_viewState[$key]=$value;
 	}
 
 	/**
@@ -221,7 +221,7 @@ 
 	 */
 	public function getHasAttributes()
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->getCount() > 0;
 		else
 			return false;
@@ -235,11 +235,11 @@ 
 	 */
 	public function getAttributes()
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes;
 		else
 		{
-			$attributes = new TAttributeCollection;
+			$attributes=new TAttributeCollection;
 			$this->setViewState('Attributes', $attributes, null);
 			return $attributes;
 		}
@@ -250,7 +250,7 @@ 
 	 */
 	public function hasAttribute($name)
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->contains($name);
 		else
 			return false;
@@ -261,7 +261,7 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->itemAt($name);
 		else
 			return null;
@@ -284,7 +284,7 @@ 
 	 */
 	public function removeAttribute($name)
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if($attributes=$this->getViewState('Attributes', null))
 			return $attributes->remove($name);
 		else
 			return null;
@@ -298,22 +298,22 @@ 
 	{
 		$writer->addAttribute('shape', $this->getShape());
 		$writer->addAttribute('coords', $this->getCoordinates());
-		if(($mode = $this->getHotSpotMode()) === THotSpotMode::NotSet)
-			$mode = THotSpotMode::Navigate;
-		if($mode === THotSpotMode::Navigate)
+		if(($mode=$this->getHotSpotMode())===THotSpotMode::NotSet)
+			$mode=THotSpotMode::Navigate;
+		if($mode===THotSpotMode::Navigate)
 		{
 			$writer->addAttribute('href', $this->getNavigateUrl());
-			if(($target = $this->getTarget()) !== '')
+			if(($target=$this->getTarget())!=='')
 				$writer->addAttribute('target', $target);
 		}
-		elseif($mode === THotSpotMode::Inactive)
+		elseif($mode===THotSpotMode::Inactive)
 			$writer->addAttribute('nohref', 'true');
-		$text = $this->getAlternateText();
+		$text=$this->getAlternateText();
 		$writer->addAttribute('title', $text);
 		$writer->addAttribute('alt', $text);
-		if(($accessKey = $this->getAccessKey()) !== '')
+		if(($accessKey=$this->getAccessKey())!=='')
 			$writer->addAttribute('accesskey', $accessKey);
-		if(($tabIndex = $this->getTabIndex()) !== 0)
+		if(($tabIndex=$this->getTabIndex())!==0)
 			$writer->addAttribute('tabindex', "$tabIndex");
 		if($this->getHasAttributes())
 		{

Braces +1 added lines, -2 removed lines

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

framework/Web/UI/WebControls/TTabView.php

Doc Comments +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 	private $_active = false;
 
 	/**
-	 * @return the tag name for the view element
+	 * @return string tag name for the view element
 	 */
 	protected function getTagName()
 	{

Spacing +9 added lines, -9 removed lines

@@ -37,7 +37,7 @@ 
  */
 class TTabView extends \Prado\Web\UI\WebControls\TWebControl
 {
-	private $_active = false;
+	private $_active=false;
 
 	/**
 	 * @return the tag name for the view element
@@ -128,7 +128,7 @@ 
 	 */
 	public function setActive($value)
 	{
-		$this->_active = TPropertyValue::ensureBoolean($value);
+		$this->_active=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -137,7 +137,7 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text = $this->getText()) !== '')
+		if(($text=$this->getText())!=='')
 			$writer->write($text);
 		elseif($this->getHasControls())
 			parent::renderContents($writer);
@@ -151,9 +151,9 @@ 
 	{
 		if($this->getVisible(false) && $this->getPage()->getClientSupportsJavaScript())
 		{
-			$writer->addAttribute('id', $this->getClientID() . '_0');
+			$writer->addAttribute('id', $this->getClientID().'_0');
 
-			$style = $this->getActive()?$this->getParent()->getActiveTabStyle():$this->getParent()->getTabStyle();
+			$style=$this->getActive() ? $this->getParent()->getActiveTabStyle() : $this->getParent()->getTabStyle();
 			$style->addAttributesToRender($writer);
 
 			$writer->renderBeginTag($this->getTagName());
@@ -171,10 +171,10 @@ 
 	 */
 	protected function renderTabContent($writer)
 	{
-		if(($url = $this->getNavigateUrl()) === '')
-			$url = 'javascript://';
-		if(($caption = $this->getCaption()) === '')
-			$caption = ' ';
+		if(($url=$this->getNavigateUrl())==='')
+			$url='javascript://';
+		if(($caption=$this->getCaption())==='')
+			$caption=' ';
 		$writer->write("<a href=\"{$url}\">{$caption}</a>");
 	}
 }

framework/Caching/TFileCacheDependency.php

Spacing +3 added lines, -3 removed lines

@@ -50,8 +50,8 @@ 
 	 */
 	public function setFileName($value)
 	{
-		$this->_fileName = $value;
-		$this->_timestamp = @filemtime($value);
+		$this->_fileName=$value;
+		$this->_timestamp=@filemtime($value);
 	}
 
 	/**
@@ -69,6 +69,6 @@ 
 	 */
 	public function getHasChanged()
 	{
-		return @filemtime($this->_fileName) !== $this->_timestamp;
+		return @filemtime($this->_fileName)!==$this->_timestamp;
 	}
 }
\ No newline at end of file