pradosoft / prado

framework/Web/UI/WebControls/TEmailAddressValidator.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +12 added lines, -12 removed lines

@@ -32,7 +32,7 @@ 
 	 * Regular expression used to validate the email address
 	 * @see http://www.regular-expressions.info/email.html
 	 */
-	const EMAIL_REGEXP='[a-zA-Z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&\'*+/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?';
+	const EMAIL_REGEXP = '[a-zA-Z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&\'*+/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?';
 
 	/**
 	 * Gets the name of the javascript class responsible for performing validation for this control.
@@ -49,8 +49,8 @@ 
 	 */
 	public function getRegularExpression()
 	{
-		$regex=parent::getRegularExpression();
-		return $regex===''?self::EMAIL_REGEXP:$regex;
+		$regex = parent::getRegularExpression();
+		return $regex === '' ? self::EMAIL_REGEXP : $regex;
 	}
 
 	/**
@@ -59,17 +59,17 @@ 
 	 */
 	public function evaluateIsValid()
 	{
-		$value=$this->getValidationValue($this->getValidationTarget());
-		$valid=$valid=is_string($value) && strlen($value)<=254 && parent::evaluateIsValid();
+		$value = $this->getValidationValue($this->getValidationTarget());
+		$valid = $valid = is_string($value) && strlen($value) <= 254 && parent::evaluateIsValid();
 
-		if($valid && $this->getCheckMXRecord() && function_exists('checkdnsrr'))
+		if ($valid && $this->getCheckMXRecord() && function_exists('checkdnsrr'))
 		{
-			if($value!=='')
+			if ($value !== '')
 			{
-				if(($pos=strpos($value,'@'))!==false)
+				if (($pos = strpos($value, '@')) !== false)
 				{
-					$domain=substr($value,$pos+1);
-					return $domain===''?false:checkdnsrr($domain,'MX');
+					$domain = substr($value, $pos + 1);
+					return $domain === '' ? false : checkdnsrr($domain, 'MX');
 				}
 				else
 					return false;
@@ -83,7 +83,7 @@ 
 	 */
 	public function getCheckMXRecord()
 	{
-		return $this->getViewState('CheckMXRecord',false);
+		return $this->getViewState('CheckMXRecord', false);
 	}
 
 	/**
@@ -92,7 +92,7 @@ 
 	 */
 	public function setCheckMXRecord($value)
 	{
-		$this->setViewState('CheckMXRecord',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('CheckMXRecord', TPropertyValue::ensureBoolean($value), false);
 	}
 }
 

Braces +2 added lines, -2 removed lines

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

framework/Web/UI/WebControls/TFileUpload.php

Doc Comments +3 added lines, -1 removed lines

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

Spacing +35 added lines, -35 removed lines

@@ -35,29 +35,29 @@ 
 	/**
 	 * Maximum file size (in bytes) allowed to be uploaded, defaults to 1MB.
 	 */
-	const MAX_FILE_SIZE=1048576;
+	const MAX_FILE_SIZE = 1048576;
 	/**
 	 * @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
 	 */
-	protected $_errorCode=UPLOAD_ERR_NO_FILE;
-	private $_dataChanged=false;
-	private $_isValid=true;
+	protected $_errorCode = UPLOAD_ERR_NO_FILE;
+	private $_dataChanged = false;
+	private $_isValid = true;
 
 	/**
 	 * @return string tag name of the file upload control
@@ -76,11 +76,11 @@ 
 	{
 		$this->getPage()->ensureRenderInForm($this);
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('type','file');
-		$writer->addAttribute('name',$this->getUniqueID());
-		$isEnabled=$this->getEnabled(true);
-		if(!$isEnabled && $this->getEnabled())  // in this case parent will not render 'disabled'
-			$writer->addAttribute('disabled','disabled');
+		$writer->addAttribute('type', 'file');
+		$writer->addAttribute('name', $this->getUniqueID());
+		$isEnabled = $this->getEnabled(true);
+		if (!$isEnabled && $this->getEnabled())  // in this case parent will not render 'disabled'
+			$writer->addAttribute('disabled', 'disabled');
 	}
 
 	/**
@@ -91,10 +91,10 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if(($form=$this->getPage()->getForm())!==null)
+		if (($form = $this->getPage()->getForm()) !== null)
 			$form->setEnctype('multipart/form-data');
-		$this->getPage()->getClientScript()->registerHiddenField('MAX_FILE_SIZE',$this->getMaxFileSize());
-		if($this->getEnabled(true))
+		$this->getPage()->getClientScript()->registerHiddenField('MAX_FILE_SIZE', $this->getMaxFileSize());
+		if ($this->getEnabled(true))
 			$this->getPage()->registerRequiresPostData($this);
 	}
 
@@ -104,7 +104,7 @@ 
 	 */
 	public function getMaxFileSize()
 	{
-		return $this->getViewState('MaxFileSize',self::MAX_FILE_SIZE);
+		return $this->getViewState('MaxFileSize', self::MAX_FILE_SIZE);
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	public function setMaxFileSize($size)
 	{
-		$this->setViewState('MaxFileSize',TPropertyValue::ensureInteger($size),self::MAX_FILE_SIZE);
+		$this->setViewState('MaxFileSize', TPropertyValue::ensureInteger($size), self::MAX_FILE_SIZE);
 	}
 
 	/**
@@ -169,7 +169,7 @@ 
 	 */
 	public function getHasFile()
 	{
-		return $this->_errorCode===UPLOAD_ERR_OK;
+		return $this->_errorCode === UPLOAD_ERR_OK;
 	}
 
 	/**
@@ -179,14 +179,14 @@ 
 	 * If true, you will not be able to save the uploaded file again.
 	 * @return boolean true if the file saving is successful
 	 */
-	public function saveAs($fileName,$deleteTempFile=true)
+	public function saveAs($fileName, $deleteTempFile = true)
 	{
-		if($this->_errorCode===UPLOAD_ERR_OK)
+		if ($this->_errorCode === UPLOAD_ERR_OK)
 		{
-			if($deleteTempFile)
-				return move_uploaded_file($this->_localName,$fileName);
-			else if(is_uploaded_file($this->_localName))
-				return file_put_contents($fileName,file_get_contents($this->_localName))!==false;
+			if ($deleteTempFile)
+				return move_uploaded_file($this->_localName, $fileName);
+			else if (is_uploaded_file($this->_localName))
+				return file_put_contents($fileName, file_get_contents($this->_localName)) !== false;
 			else
 				return false;
 		}
@@ -201,16 +201,16 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the control has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
-		if(isset($_FILES[$key]))
+		if (isset($_FILES[$key]))
 		{
-			$this->_fileName=$_FILES[$key]['name'];
-			$this->_fileSize=$_FILES[$key]['size'];
-			$this->_fileType=$_FILES[$key]['type'];
-			$this->_errorCode=$_FILES[$key]['error'];
-			$this->_localName=$_FILES[$key]['tmp_name'];
-			return $this->_dataChanged=true;
+			$this->_fileName = $_FILES[$key]['name'];
+			$this->_fileSize = $_FILES[$key]['size'];
+			$this->_fileType = $_FILES[$key]['type'];
+			$this->_errorCode = $_FILES[$key]['error'];
+			$this->_localName = $_FILES[$key]['tmp_name'];
+			return $this->_dataChanged = true;
 		}
 		else
 			return false;
@@ -235,7 +235,7 @@ 
 	 */
 	public function onFileUpload($param)
 	{
-		$this->raiseEvent('OnFileUpload',$this,$param);
+		$this->raiseEvent('OnFileUpload', $this, $param);
 	}
 
 	/**
@@ -272,7 +272,7 @@ 
 	 */
 	public function setIsValid($value)
 	{
-	    $this->_isValid=TPropertyValue::ensureBoolean($value);
+	    $this->_isValid = TPropertyValue::ensureBoolean($value);
 	}
 
 }

Braces +20 added lines, -15 removed lines

@@ -79,8 +79,10 @@ 
 		$writer->addAttribute('type','file');
 		$writer->addAttribute('name',$this->getUniqueID());
 		$isEnabled=$this->getEnabled(true);
-		if(!$isEnabled && $this->getEnabled())  // in this case parent will not render 'disabled'
+		if(!$isEnabled && $this->getEnabled()) {
+			// in this case parent will not render 'disabled'
 			$writer->addAttribute('disabled','disabled');
+		}
 	}
 
 	/**
@@ -91,11 +93,13 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if(($form=$this->getPage()->getForm())!==null)
-			$form->setEnctype('multipart/form-data');
+		if(($form=$this->getPage()->getForm())!==null) {
+					$form->setEnctype('multipart/form-data');
+		}
 		$this->getPage()->getClientScript()->registerHiddenField('MAX_FILE_SIZE',$this->getMaxFileSize());
-		if($this->getEnabled(true))
-			$this->getPage()->registerRequiresPostData($this);
+		if($this->getEnabled(true)) {
+					$this->getPage()->registerRequiresPostData($this);
+		}
 	}
 
 	/**
@@ -183,15 +187,16 @@ 
 	{
 		if($this->_errorCode===UPLOAD_ERR_OK)
 		{
-			if($deleteTempFile)
-				return move_uploaded_file($this->_localName,$fileName);
-			else if(is_uploaded_file($this->_localName))
-				return file_put_contents($fileName,file_get_contents($this->_localName))!==false;
-			else
-				return false;
+			if($deleteTempFile) {
+							return move_uploaded_file($this->_localName,$fileName);
+			} else if(is_uploaded_file($this->_localName)) {
+							return file_put_contents($fileName,file_get_contents($this->_localName))!==false;
+			} else {
+							return false;
+			}
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -211,9 +216,9 @@ 
 			$this->_errorCode=$_FILES[$key]['error'];
 			$this->_localName=$_FILES[$key]['tmp_name'];
 			return $this->_dataChanged=true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**

Indentation +2 added lines, -2 removed lines

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

framework/Web/UI/WebControls/TFlushOutput.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 	/**
 	 * @var boolean whether to continue buffering of output
 	 */
-	private $_continueBuffering=true;
+	private $_continueBuffering = true;
 
 
 	/**

framework/Web/UI/WebControls/THtmlArea4.php

Doc Comments +2 added lines

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

Spacing +23 added lines, -23 removed lines

@@ -209,7 +209,7 @@ 
 	 */
 	public function getEnableVisualEdit()
 	{
-		return $this->getViewState('EnableVisualEdit',true);
+		return $this->getViewState('EnableVisualEdit', true);
 	}
 
 	/**
@@ -218,7 +218,7 @@ 
 	 */
 	public function setEnableVisualEdit($value)
 	{
-		$this->setViewState('EnableVisualEdit',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableVisualEdit', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -301,9 +301,9 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if($this->getEnableVisualEdit() && $this->getEnabled(true))
+		if ($this->getEnableVisualEdit() && $this->getEnabled(true))
 		{
-			$writer->addAttribute('id',$this->getClientID());
+			$writer->addAttribute('id', $this->getClientID());
 			$this->registerEditorClientScript($writer);
 		}
 
@@ -354,9 +354,9 @@ 
 			'EditorOptions' => $this->getEditorOptions()
 		);
 
-		$options = TJavaScript::encode($options,true,true);
+		$options = TJavaScript::encode($options, true, true);
 		$script = "new {$this->getClientClassName()}($options)";
-		$scripts->registerEndScript('prado:THtmlArea4'.$this->ClientID,$script);
+		$scripts->registerEndScript('prado:THtmlArea4' . $this->ClientID, $script);
 	}
 
 	/**
@@ -364,7 +364,7 @@ 
 	 */
 	protected function getScriptUrl()
 	{
-		return $this->getScriptDeploymentPath().'/tinymce.min.js';
+		return $this->getScriptDeploymentPath() . '/tinymce.min.js';
 	}
 
 	/**
@@ -381,12 +381,12 @@ 
 
 	protected function copyCustomPlugins($url)
 	{
-		if($plugins = $this->getCustomPluginPath())
+		if ($plugins = $this->getCustomPluginPath())
 		{
 			$assets = $this->getApplication()->getAssetManager();
 			$path = is_dir($plugins) ? $plugins : Prado::getPathOfNameSpace($plugins);
-			$dest = $assets->getBasePath().'/'.basename($url).'/plugins/';
-			if(!is_dir($dest) || $this->getApplication()->getMode()!==TApplicationMode::Performance)
+			$dest = $assets->getBasePath() . '/' . basename($url) . '/plugins/';
+			if (!is_dir($dest) || $this->getApplication()->getMode() !== TApplicationMode::Performance)
 				$assets->copyDirectory($path, $dest);
 		}
 	}
@@ -406,7 +406,7 @@ 
 		$options['height'] = $this->getHeight();
 		$options['resize'] = 'both';
 		$options['menubar'] = false;
-		if($this->getReadOnly())
+		if ($this->getReadOnly())
 		{
 			$options['readonly'] = true;
 			$options['toolbar'] = false;
@@ -428,17 +428,17 @@ 
 	{
 		$options = array();
 		$substrings = preg_split('/,\s*\n|\n/', trim($string));
-		foreach($substrings as $bits)
+		foreach ($substrings as $bits)
 		{
-			$option = explode(":",$bits,2);
+			$option = explode(":", $bits, 2);
 
-			if(count($option) == 2)
+			if (count($option) == 2)
 			{
-				$value=trim(trim($option[1]),"'\"");
-				if (($s=strtolower($value))==='false')
-					$value=false;
-				elseif ($s==='true')
-					$value=true;
+				$value = trim(trim($option[1]), "'\"");
+				if (($s = strtolower($value)) === 'false')
+					$value = false;
+				elseif ($s === 'true')
+					$value = true;
 				$options[trim($option[0])] = $value;
 			}
 		}
@@ -451,15 +451,15 @@ 
 	protected function getLanguageSuffix($culture)
 	{
 		$app = $this->getApplication()->getGlobalization();
-		if(empty($culture) && ($app!==null))
+		if (empty($culture) && ($app !== null))
 			$culture = $app->getCulture();
 		$variants = array();
-		if($app!==null)
+		if ($app !== null)
 			$variants = $app->getCultureVariants($culture);
 
-		foreach($variants as $variant)
+		foreach ($variants as $variant)
 		{
-			if(isset(self::$_langs[$variant]))
+			if (isset(self::$_langs[$variant]))
 				return self::$_langs[$variant];
 		}
 

Braces +17 added lines, -12 removed lines

@@ -386,8 +386,9 @@ 
 			$assets = $this->getApplication()->getAssetManager();
 			$path = is_dir($plugins) ? $plugins : Prado::getPathOfNameSpace($plugins);
 			$dest = $assets->getBasePath().'/'.basename($url).'/plugins/';
-			if(!is_dir($dest) || $this->getApplication()->getMode()!==TApplicationMode::Performance)
-				$assets->copyDirectory($path, $dest);
+			if(!is_dir($dest) || $this->getApplication()->getMode()!==TApplicationMode::Performance) {
+							$assets->copyDirectory($path, $dest);
+			}
 		}
 	}
 
@@ -435,10 +436,11 @@ 
 			if(count($option) == 2)
 			{
 				$value=trim(trim($option[1]),"'\"");
-				if (($s=strtolower($value))==='false')
-					$value=false;
-				elseif ($s==='true')
-					$value=true;
+				if (($s=strtolower($value))==='false') {
+									$value=false;
+				} elseif ($s==='true') {
+									$value=true;
+				}
 				$options[trim($option[0])] = $value;
 			}
 		}
@@ -451,16 +453,19 @@ 
 	protected function getLanguageSuffix($culture)
 	{
 		$app = $this->getApplication()->getGlobalization();
-		if(empty($culture) && ($app!==null))
-			$culture = $app->getCulture();
+		if(empty($culture) && ($app!==null)) {
+					$culture = $app->getCulture();
+		}
 		$variants = array();
-		if($app!==null)
-			$variants = $app->getCultureVariants($culture);
+		if($app!==null) {
+					$variants = $app->getCultureVariants($culture);
+		}
 
 		foreach($variants as $variant)
 		{
-			if(isset(self::$_langs[$variant]))
-				return self::$_langs[$variant];
+			if(isset(self::$_langs[$variant])) {
+							return self::$_langs[$variant];
+			}
 		}
 
 		return 'en';

framework/Web/UI/WebControls/THyperLink.php

Doc Comments +2 added lines

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

Spacing +30 added lines, -30 removed lines

@@ -44,14 +44,14 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$isEnabled=$this->getEnabled(true);
-		if($this->getEnabled() && !$isEnabled)
-			$writer->addAttribute('disabled','disabled');
+		$isEnabled = $this->getEnabled(true);
+		if ($this->getEnabled() && !$isEnabled)
+			$writer->addAttribute('disabled', 'disabled');
 		parent::addAttributesToRender($writer);
-		if(($url=$this->getNavigateUrl())!=='' && $isEnabled)
-			$writer->addAttribute('href',$url);
-		if(($target=$this->getTarget())!=='')
-			$writer->addAttribute('target',$target);
+		if (($url = $this->getNavigateUrl()) !== '' && $isEnabled)
+			$writer->addAttribute('href', $url);
+		if (($target = $this->getTarget()) !== '')
+			$writer->addAttribute('target', $target);
 	}
 
 	/**
@@ -60,11 +60,11 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($imageUrl=$this->getImageUrl())==='')
+		if (($imageUrl = $this->getImageUrl()) === '')
 		{
-			if(($text=$this->getText())!=='')
+			if (($text = $this->getText()) !== '')
 				$writer->write(THttpUtility::htmlEncode($text));
-			else if($this->getHasControls())
+			else if ($this->getHasControls())
 				parent::renderContents($writer);
 			else
 				$writer->write(THttpUtility::htmlEncode($this->getNavigateUrl()));
@@ -83,17 +83,17 @@ 
 	 */
 	protected function createImage($imageUrl)
 	{
-		$image=Prado::createComponent('System.Web.UI.WebControls.TImage');
+		$image = Prado::createComponent('System.Web.UI.WebControls.TImage');
 		$image->setImageUrl($imageUrl);
-		if(($width=$this->getImageWidth())!=='')
+		if (($width = $this->getImageWidth()) !== '')
 			$image->setWidth($width);
-		if(($height=$this->getImageHeight())!=='')
+		if (($height = $this->getImageHeight()) !== '')
 			$image->setHeight($height);
-		if(($toolTip=$this->getToolTip())!=='')
+		if (($toolTip = $this->getToolTip()) !== '')
 			$image->setToolTip($toolTip);
-		if(($text=$this->getText())!=='')
+		if (($text = $this->getText()) !== '')
 			$image->setAlternateText($text);
-		if(($align=$this->getImageAlign())!=='')
+		if (($align = $this->getImageAlign()) !== '')
 			$image->setImageAlign($align);
 		$image->setBorderWidth('0');
 		return $image;
@@ -104,7 +104,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -113,7 +113,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 */
 	public function getImageAlign()
 	{
-		return $this->getViewState('ImageAlign','');
+		return $this->getViewState('ImageAlign', '');
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 	 */
 	public function setImageAlign($value)
 	{
-		$this->setViewState('ImageAlign',$value,'');
+		$this->setViewState('ImageAlign', $value, '');
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	 */
 	public function getImageHeight()
 	{
-		return $this->getViewState('ImageHeight','');
+		return $this->getViewState('ImageHeight', '');
 	}
 
 	/**
@@ -150,7 +150,7 @@ 
 	 */
 	public function setImageHeight($value)
 	{
-		$this->setViewSTate('ImageHeight',$value,'');
+		$this->setViewSTate('ImageHeight', $value, '');
 	}
 
 	/**
@@ -158,7 +158,7 @@ 
 	 */
 	public function getImageUrl()
 	{
-		return $this->getViewState('ImageUrl','');
+		return $this->getViewState('ImageUrl', '');
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		$this->setViewState('ImageUrl',$value,'');
+		$this->setViewState('ImageUrl', $value, '');
 	}
 
 	/**
@@ -175,7 +175,7 @@ 
 	 */
 	public function getImageWidth()
 	{
-		return $this->getViewState('ImageWidth','');
+		return $this->getViewState('ImageWidth', '');
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	 */
 	public function setImageWidth($value)
 	{
-		$this->setViewState('ImageWidth',$value,'');
+		$this->setViewState('ImageWidth', $value, '');
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	 */
 	public function getNavigateUrl()
 	{
-		return $this->getViewState('NavigateUrl','');
+		return $this->getViewState('NavigateUrl', '');
 	}
 
 	/**
@@ -201,7 +201,7 @@ 
 	 */
 	public function setNavigateUrl($value)
 	{
-		$this->setViewState('NavigateUrl',$value,'');
+		$this->setViewState('NavigateUrl', $value, '');
 	}
 
 	/**
@@ -235,7 +235,7 @@ 
 	 */
 	public function getTarget()
 	{
-		return $this->getViewState('Target','');
+		return $this->getViewState('Target', '');
 	}
 
 	/**
@@ -244,7 +244,7 @@ 
 	 */
 	public function setTarget($value)
 	{
-		$this->setViewState('Target',$value,'');
+		$this->setViewState('Target', $value, '');
 	}
 }
 

Braces +32 added lines, -24 removed lines

@@ -45,13 +45,16 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		$isEnabled=$this->getEnabled(true);
-		if($this->getEnabled() && !$isEnabled)
-			$writer->addAttribute('disabled','disabled');
+		if($this->getEnabled() && !$isEnabled) {
+					$writer->addAttribute('disabled','disabled');
+		}
 		parent::addAttributesToRender($writer);
-		if(($url=$this->getNavigateUrl())!=='' && $isEnabled)
-			$writer->addAttribute('href',$url);
-		if(($target=$this->getTarget())!=='')
-			$writer->addAttribute('target',$target);
+		if(($url=$this->getNavigateUrl())!=='' && $isEnabled) {
+					$writer->addAttribute('href',$url);
+		}
+		if(($target=$this->getTarget())!=='') {
+					$writer->addAttribute('target',$target);
+		}
 	}
 
 	/**
@@ -62,14 +65,14 @@ 
 	{
 		if(($imageUrl=$this->getImageUrl())==='')
 		{
-			if(($text=$this->getText())!=='')
-				$writer->write(THttpUtility::htmlEncode($text));
-			else if($this->getHasControls())
-				parent::renderContents($writer);
-			else
-				$writer->write(THttpUtility::htmlEncode($this->getNavigateUrl()));
-		}
-		else
+			if(($text=$this->getText())!=='') {
+							$writer->write(THttpUtility::htmlEncode($text));
+			} else if($this->getHasControls()) {
+							parent::renderContents($writer);
+			} else {
+							$writer->write(THttpUtility::htmlEncode($this->getNavigateUrl()));
+			}
+		} else
 		{
 			$this->createImage($imageUrl)->renderControl($writer);
 		}
@@ -85,16 +88,21 @@ 
 	{
 		$image=Prado::createComponent('System.Web.UI.WebControls.TImage');
 		$image->setImageUrl($imageUrl);
-		if(($width=$this->getImageWidth())!=='')
-			$image->setWidth($width);
-		if(($height=$this->getImageHeight())!=='')
-			$image->setHeight($height);
-		if(($toolTip=$this->getToolTip())!=='')
-			$image->setToolTip($toolTip);
-		if(($text=$this->getText())!=='')
-			$image->setAlternateText($text);
-		if(($align=$this->getImageAlign())!=='')
-			$image->setImageAlign($align);
+		if(($width=$this->getImageWidth())!=='') {
+					$image->setWidth($width);
+		}
+		if(($height=$this->getImageHeight())!=='') {
+					$image->setHeight($height);
+		}
+		if(($toolTip=$this->getToolTip())!=='') {
+					$image->setToolTip($toolTip);
+		}
+		if(($text=$this->getText())!=='') {
+					$image->setAlternateText($text);
+		}
+		if(($align=$this->getImageAlign())!=='') {
+					$image->setImageAlign($align);
+		}
 		$image->setBorderWidth('0');
 		return $image;
 	}

framework/Web/UI/WebControls/TImageButton.php

Doc Comments +4 added lines

@@ -232,6 +232,7 @@ 
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handlers can be invoked.
 	 * @param TCommandEventParameter event parameter to be passed to the event handlers
+	 * @param TCommandEventParameter $param
 	 */
 	public function onCommand($param)
 	{
@@ -324,6 +325,7 @@ 
 
 	/**
 	 * @param string the group of validators which the button causes validation upon postback
+	 * @param string $value
 	 */
 	public function setValidationGroup($value)
 	{
@@ -396,6 +398,8 @@ 
 	 * Constructor.
 	 * @param integer X coordinate of the clicking point
 	 * @param integer Y coordinate of the clicking point
+	 * @param integer $x
+	 * @param integer $y
 	 */
 	public function __construct($x,$y)
 	{

Spacing +47 added lines, -47 removed lines

@@ -59,12 +59,12 @@ 
 	/**
 	 * @var integer x coordinate that the image is being clicked at
 	 */
-	private $_x=0;
+	private $_x = 0;
 	/**
 	 * @var integer y coordinate that the image is being clicked at
 	 */
-	private $_y=0;
-	private $_dataChanged=false;
+	private $_y = 0;
+	private $_dataChanged = false;
 
 	/**
 	 * @return string tag name of the button
@@ -79,7 +79,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -97,18 +97,18 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$page=$this->getPage();
+		$page = $this->getPage();
 		$page->ensureRenderInForm($this);
-		$writer->addAttribute('type','image');
-		if(($uniqueID=$this->getUniqueID())!=='')
-			$writer->addAttribute('name',$uniqueID);
-		if($this->getEnabled(true))
+		$writer->addAttribute('type', 'image');
+		if (($uniqueID = $this->getUniqueID()) !== '')
+			$writer->addAttribute('name', $uniqueID);
+		if ($this->getEnabled(true))
 		{
-			if($this->getEnableClientScript() && $this->needPostBackScript())
+			if ($this->getEnableClientScript() && $this->needPostBackScript())
 				$this->renderClientControlScript($writer);
 		}
-		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
-			$writer->addAttribute('disabled','disabled');
+		else if ($this->getEnabled()) // in this case, parent will not render 'disabled'
+			$writer->addAttribute('disabled', 'disabled');
 		parent::addAttributesToRender($writer);
 	}
 
@@ -117,9 +117,9 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -137,10 +137,10 @@ 
 	 */
 	protected function canCauseValidation()
 	{
-		if($this->getCausesValidation())
+		if ($this->getCausesValidation())
 		{
-			$group=$this->getValidationGroup();
-			return $this->getPage()->getValidators($group)->getCount()>0;
+			$group = $this->getValidationGroup();
+			return $this->getPage()->getValidators($group)->getCount() > 0;
 		}
 		else
 			return false;
@@ -151,7 +151,7 @@ 
 	 */
 	public function setIsDefaultButton($value)
 	{
-		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -192,16 +192,16 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the component has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
-		$uid=$this->getUniqueID();
-		if(isset($values["{$uid}_x"]) && isset($values["{$uid}_y"]))
+		$uid = $this->getUniqueID();
+		if (isset($values["{$uid}_x"]) && isset($values["{$uid}_y"]))
 		{
-			$this->_x=intval($values["{$uid}_x"]);
-			$this->_y=intval($values["{$uid}_y"]);
-			if($this->getPage()->getPostBackEventTarget()===null)
+			$this->_x = intval($values["{$uid}_x"]);
+			$this->_y = intval($values["{$uid}_y"]);
+			if ($this->getPage()->getPostBackEventTarget() === null)
 				$this->getPage()->setPostBackEventTarget($this);
-			$this->_dataChanged=true;
+			$this->_dataChanged = true;
 		}
 		return false;
 	}
@@ -223,7 +223,7 @@ 
 	 */
 	public function onClick($param)
 	{
-		$this->raiseEvent('OnClick',$this,$param);
+		$this->raiseEvent('OnClick', $this, $param);
 	}
 
 	/**
@@ -235,8 +235,8 @@ 
 	 */
 	public function onCommand($param)
 	{
-		$this->raiseEvent('OnCommand',$this,$param);
-		$this->raiseBubbleEvent($this,$param);
+		$this->raiseEvent('OnCommand', $this, $param);
+		$this->raiseBubbleEvent($this, $param);
 	}
 
 	/**
@@ -250,10 +250,10 @@ 
 	 */
 	public function raisePostBackEvent($param)
 	{
-		if($this->getCausesValidation())
+		if ($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
-		$this->onClick(new TImageClickEventParameter($this->_x,$this->_y));
-		$this->onCommand(new TCommandEventParameter($this->getCommandName(),$this->getCommandParameter()));
+		$this->onClick(new TImageClickEventParameter($this->_x, $this->_y));
+		$this->onCommand(new TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));
 	}
 
 	/**
@@ -271,7 +271,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -287,7 +287,7 @@ 
 	 */
 	public function getCommandName()
 	{
-		return $this->getViewState('CommandName','');
+		return $this->getViewState('CommandName', '');
 	}
 
 	/**
@@ -295,7 +295,7 @@ 
 	 */
 	public function setCommandName($value)
 	{
-		$this->setViewState('CommandName',$value,'');
+		$this->setViewState('CommandName', $value, '');
 	}
 
 	/**
@@ -303,7 +303,7 @@ 
 	 */
 	public function getCommandParameter()
 	{
-		return $this->getViewState('CommandParameter','');
+		return $this->getViewState('CommandParameter', '');
 	}
 
 	/**
@@ -311,7 +311,7 @@ 
 	 */
 	public function setCommandParameter($value)
 	{
-		$this->setViewState('CommandParameter',$value,'');
+		$this->setViewState('CommandParameter', $value, '');
 	}
 
 	/**
@@ -319,7 +319,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -327,7 +327,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -385,22 +385,22 @@ 
 	 * the X coordinate of the clicking point
 	 * @var integer
 	 */
-	private $_x=0;
+	private $_x = 0;
 	/**
 	 * the Y coordinate of the clicking point
 	 * @var integer
 	 */
-	private $_y=0;
+	private $_y = 0;
 
 	/**
 	 * Constructor.
 	 * @param integer X coordinate of the clicking point
 	 * @param integer Y coordinate of the clicking point
 	 */
-	public function __construct($x,$y)
+	public function __construct($x, $y)
 	{
-		$this->_x=$x;
-		$this->_y=$y;
+		$this->_x = $x;
+		$this->_y = $y;
 	}
 
 	/**
@@ -416,7 +416,7 @@ 
 	 */
 	public function setX($value)
 	{
-		$this->_x=TPropertyValue::ensureInteger($value);
+		$this->_x = TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -432,7 +432,7 @@ 
 	 */
 	public function setY($value)
 	{
-		$this->_y=TPropertyValue::ensureInteger($value);
+		$this->_y = TPropertyValue::ensureInteger($value);
 	}
 }
 

Braces +17 added lines, -12 removed lines

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

framework/Web/UI/WebControls/TImageMap.php

Doc Comments +3 added lines

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

Spacing +129 added lines, -129 removed lines

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

Braces +74 added lines, -55 removed lines

@@ -47,8 +47,9 @@ 
 	 */
 	public function addParsedObject($object)
 	{
-		if($object instanceof THotSpot)
-			$this->getHotSpots()->add($object);
+		if($object instanceof THotSpot) {
+					$this->getHotSpots()->add($object);
+		}
 	}
 
 	/**
@@ -64,8 +65,9 @@ 
 			$writer->addAttribute('usemap','#'.self::MAP_NAME_PREFIX.$this->getClientID());
 			$writer->addAttribute('id',$this->getUniqueID());
 		}
-		if($this->getEnabled() && !$this->getEnabled(true))
-			$writer->addAttribute('disabled','disabled');
+		if($this->getEnabled() && !$this->getEnabled(true)) {
+					$writer->addAttribute('disabled','disabled');
+		}
 	}
 
 	/**
@@ -86,8 +88,9 @@ 
 			$writer->addAttribute('name',self::MAP_NAME_PREFIX.$clientID);
 			$writer->renderBeginTag('map');
 			$writer->writeLine();
-			if(($mode=$this->getHotSpotMode())===THotSpotMode::NotSet)
-				$mode=THotSpotMode::Navigate;
+			if(($mode=$this->getHotSpotMode())===THotSpotMode::NotSet) {
+							$mode=THotSpotMode::Navigate;
+			}
 			$target=$this->getTarget();
 			$i=0;
 			$options['EventTarget'] = $this->getUniqueID();
@@ -95,10 +98,12 @@ 
 			$cs=$this->getPage()->getClientScript();
 			foreach($hotspots as $hotspot)
 			{
-				if($hotspot->getHotSpotMode()===THotSpotMode::NotSet)
-					$hotspot->setHotSpotMode($mode);
-				if($target!=='' && $hotspot->getTarget()==='')
-					$hotspot->setTarget($target);
+				if($hotspot->getHotSpotMode()===THotSpotMode::NotSet) {
+									$hotspot->setHotSpotMode($mode);
+				}
+				if($target!=='' && $hotspot->getTarget()==='') {
+									$hotspot->setTarget($target);
+				}
 				if($hotspot->getHotSpotMode()===THotSpotMode::PostBack)
 				{
 					$id=$clientID.'_'.$i;
@@ -144,18 +149,21 @@ 
 			if($index>=0 && $index<$hotspots->getCount())
 			{
 				$hotspot=$hotspots->itemAt($index);
-				if(($mode=$hotspot->getHotSpotMode())===THotSpotMode::NotSet)
-					$mode=$this->getHotSpotMode();
+				if(($mode=$hotspot->getHotSpotMode())===THotSpotMode::NotSet) {
+									$mode=$this->getHotSpotMode();
+				}
 				if($mode===THotSpotMode::PostBack)
 				{
 					$postBackValue=$hotspot->getPostBackValue();
-					if($hotspot->getCausesValidation())
-						$this->getPage()->validate($hotspot->getValidationGroup());
+					if($hotspot->getCausesValidation()) {
+											$this->getPage()->validate($hotspot->getValidationGroup());
+					}
 				}
 			}
 		}
-		if($postBackValue!==null)
-			$this->onClick(new TImageMapEventParameter($postBackValue));
+		if($postBackValue!==null) {
+					$this->onClick(new TImageMapEventParameter($postBackValue));
+		}
 	}
 
 	/**
@@ -273,10 +281,11 @@ 
 	 */
 	public function insertAt($index,$item)
 	{
-		if($item instanceof THotSpot)
-			parent::insertAt($index,$item);
-		else
-			throw new TInvalidDataTypeException('hotspotcollection_hotspot_required');
+		if($item instanceof THotSpot) {
+					parent::insertAt($index,$item);
+		} else {
+					throw new TInvalidDataTypeException('hotspotcollection_hotspot_required');
+		}
 	}
 }
 
@@ -322,10 +331,11 @@ 
 	 */
 	protected function setViewState($key,$value,$defaultValue=null)
 	{
-		if($value===$defaultValue)
-			unset($this->_viewState[$key]);
-		else
-			$this->_viewState[$key]=$value;
+		if($value===$defaultValue) {
+					unset($this->_viewState[$key]);
+		} else {
+					$this->_viewState[$key]=$value;
+		}
 	}
 
 	/**
@@ -488,10 +498,11 @@ 
 	 */
 	public function getHasAttributes()
 	{
-		if($attributes=$this->getViewState('Attributes',null))
-			return $attributes->getCount()>0;
-		else
-			return false;
+		if($attributes=$this->getViewState('Attributes',null)) {
+					return $attributes->getCount()>0;
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -502,9 +513,9 @@ 
 	 */
 	public function getAttributes()
 	{
-		if($attributes=$this->getViewState('Attributes',null))
-			return $attributes;
-		else
+		if($attributes=$this->getViewState('Attributes',null)) {
+					return $attributes;
+		} else
 		{
 			$attributes=new TAttributeCollection;
 			$this->setViewState('Attributes',$attributes,null);
@@ -517,10 +528,11 @@ 
 	 */
 	public function hasAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
-			return $attributes->contains($name);
-		else
-			return false;
+		if($attributes=$this->getViewState('Attributes',null)) {
+					return $attributes->contains($name);
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -528,10 +540,11 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
-			return $attributes->itemAt($name);
-		else
-			return null;
+		if($attributes=$this->getViewState('Attributes',null)) {
+					return $attributes->itemAt($name);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -551,10 +564,11 @@ 
 	 */
 	public function removeAttribute($name)
 	{
-		if($attributes=$this->getViewState('Attributes',null))
-			return $attributes->remove($name);
-		else
-			return null;
+		if($attributes=$this->getViewState('Attributes',null)) {
+					return $attributes->remove($name);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -565,27 +579,32 @@ 
 	{
 		$writer->addAttribute('shape',$this->getShape());
 		$writer->addAttribute('coords',$this->getCoordinates());
-		if(($mode=$this->getHotSpotMode())===THotSpotMode::NotSet)
-			$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())!=='')
-				$writer->addAttribute('target',$target);
+			if(($target=$this->getTarget())!=='') {
+							$writer->addAttribute('target',$target);
+			}
+		} else if($mode===THotSpotMode::Inactive) {
+					$writer->addAttribute('nohref','true');
 		}
-		else if($mode===THotSpotMode::Inactive)
-			$writer->addAttribute('nohref','true');
 		$text=$this->getAlternateText();
 		$writer->addAttribute('title',$text);
 		$writer->addAttribute('alt',$text);
-		if(($accessKey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accessKey);
-		if(($tabIndex=$this->getTabIndex())!==0)
-			$writer->addAttribute('tabindex',"$tabIndex");
+		if(($accessKey=$this->getAccessKey())!=='') {
+					$writer->addAttribute('accesskey',$accessKey);
+		}
+		if(($tabIndex=$this->getTabIndex())!==0) {
+					$writer->addAttribute('tabindex',"$tabIndex");
+		}
 		if($this->getHasAttributes())
 		{
-			foreach($this->getAttributes() as $name=>$value)
-				$writer->addAttribute($name,$value);
+			foreach($this->getAttributes() as $name=>$value) {
+							$writer->addAttribute($name,$value);
+			}
 		}
 		$writer->renderBeginTag('area');
 		$writer->renderEndTag();

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TImageMap and related class file.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.WebControls
- */
+	 * TImageMap and related class file.
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.WebControls
+	 */
 
 /**
  * Includes TImage class file

framework/Web/UI/WebControls/TLinkButton.php

Doc Comments +2 added lines

@@ -281,6 +281,7 @@ 
 
 	/**
 	 * @param string the group of validators which the button causes validation upon postback
+	 * @param string $value
 	 */
 	public function setValidationGroup($value)
 	{
@@ -322,6 +323,7 @@ 
 	 * If you override this method, be sure to call the parent implementation
 	 * so that the event handlers can be invoked.
 	 * @param TCommandEventParameter event parameter to be passed to the event handlers
+	 * @param TCommandEventParameter $param
 	 */
 	public function onCommand($param)
 	{

Spacing +26 added lines, -26 removed lines

@@ -67,7 +67,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -75,7 +75,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -85,22 +85,22 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$page=$this->getPage();
+		$page = $this->getPage();
 		$page->ensureRenderInForm($this);
 
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 
 		// We call parent implementation here because some attributes
 		// may be overwritten in the following
 		parent::addAttributesToRender($writer);
 
-		if($this->getEnabled(true) && $this->getEnableClientScript())
+		if ($this->getEnabled(true) && $this->getEnableClientScript())
 		{
 			$this->renderLinkButtonHref($writer);
 			$this->renderClientControlScript($writer);
 		}
-		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
-			$writer->addAttribute('disabled','disabled');
+		else if ($this->getEnabled()) // in this case, parent will not render 'disabled'
+			$writer->addAttribute('disabled', 'disabled');
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	protected function renderClientControlScript($writer)
 	{
 		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 	 */
 	public function setIsDefaultButton($value)
 	{
-		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -136,7 +136,7 @@ 
 	protected function renderLinkButtonHref($writer)
 	{
 		//create unique no-op url references
-		$nop = "javascript:;//".$this->getClientID();
+		$nop = "javascript:;//" . $this->getClientID();
 		$writer->addAttribute('href', $nop);
 	}
 
@@ -174,7 +174,7 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text=$this->getText())==='')
+		if (($text = $this->getText()) === '')
 			parent::renderContents($writer);
 		else
 			$writer->write($text);
@@ -185,7 +185,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -193,7 +193,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -227,7 +227,7 @@ 
 	 */
 	public function getCommandName()
 	{
-		return $this->getViewState('CommandName','');
+		return $this->getViewState('CommandName', '');
 	}
 
 	/**
@@ -235,7 +235,7 @@ 
 	 */
 	public function setCommandName($value)
 	{
-		$this->setViewState('CommandName',$value,'');
+		$this->setViewState('CommandName', $value, '');
 	}
 
 	/**
@@ -243,7 +243,7 @@ 
 	 */
 	public function getCommandParameter()
 	{
-		return $this->getViewState('CommandParameter','');
+		return $this->getViewState('CommandParameter', '');
 	}
 
 	/**
@@ -251,7 +251,7 @@ 
 	 */
 	public function setCommandParameter($value)
 	{
-		$this->setViewState('CommandParameter',$value,'');
+		$this->setViewState('CommandParameter', $value, '');
 	}
 
 	/**
@@ -259,7 +259,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -268,7 +268,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -276,7 +276,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -284,7 +284,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -298,10 +298,10 @@ 
 	 */
 	public function raisePostBackEvent($param)
 	{
-		if($this->getCausesValidation())
+		if ($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
 		$this->onClick(null);
-		$this->onCommand(new TCommandEventParameter($this->getCommandName(),$this->getCommandParameter()));
+		$this->onCommand(new TCommandEventParameter($this->getCommandName(), $this->getCommandParameter()));
 	}
 
 	/**
@@ -313,7 +313,7 @@ 
 	 */
 	public function onClick($param)
 	{
-		$this->raiseEvent('OnClick',$this,$param);
+		$this->raiseEvent('OnClick', $this, $param);
 	}
 
 	/**
@@ -325,8 +325,8 @@ 
 	 */
 	public function onCommand($param)
 	{
-		$this->raiseEvent('OnCommand',$this,$param);
-		$this->raiseBubbleEvent($this,$param);
+		$this->raiseEvent('OnCommand', $this, $param);
+		$this->raiseBubbleEvent($this, $param);
 	}
 }
 

Braces +11 added lines, -8 removed lines

@@ -98,9 +98,10 @@ 
 		{
 			$this->renderLinkButtonHref($writer);
 			$this->renderClientControlScript($writer);
-		}
-		else if($this->getEnabled()) // in this case, parent will not render 'disabled'
+		} else if($this->getEnabled()) {
+			// in this case, parent will not render 'disabled'
 			$writer->addAttribute('disabled','disabled');
+		}
 	}
 
 	/**
@@ -174,10 +175,11 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text=$this->getText())==='')
-			parent::renderContents($writer);
-		else
-			$writer->write($text);
+		if(($text=$this->getText())==='') {
+					parent::renderContents($writer);
+		} else {
+					$writer->write($text);
+		}
 	}
 
 	/**
@@ -298,8 +300,9 @@ 
 	 */
 	public function raisePostBackEvent($param)
 	{
-		if($this->getCausesValidation())
-			$this->getPage()->validate($this->getValidationGroup());
+		if($this->getCausesValidation()) {
+					$this->getPage()->validate($this->getValidationGroup());
+		}
 		$this->onClick(null);
 		$this->onCommand(new TCommandEventParameter($this->getCommandName(),$this->getCommandParameter()));
 	}

framework/Web/UI/WebControls/TListBox.php

Doc Comments +1 added lines, -1 removed lines

@@ -213,7 +213,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()
 	{

Spacing +45 added lines, -45 removed lines

@@ -36,8 +36,8 @@ 
  */
 class TListBox extends TListControl implements IPostBackDataHandler, IValidatable
 {
-	private $_dataChanged=false;
-	private $_isValid=true;
+	private $_dataChanged = false;
+	private $_isValid = true;
 
 	/**
 	 * Adds attribute name-value pairs to renderer.
@@ -46,12 +46,12 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$rows=$this->getRows();
-		$writer->addAttribute('size',"$rows");
-		if($this->getSelectionMode()===TListSelectionMode::Multiple)
-			$writer->addAttribute('name',$this->getUniqueID().'[]');
+		$rows = $this->getRows();
+		$writer->addAttribute('size', "$rows");
+		if ($this->getSelectionMode() === TListSelectionMode::Multiple)
+			$writer->addAttribute('name', $this->getUniqueID() . '[]');
 		else
-			$writer->addAttribute('name',$this->getUniqueID());
+			$writer->addAttribute('name', $this->getUniqueID());
 		parent::addAttributesToRender($writer);
 	}
 
@@ -73,7 +73,7 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if($this->getEnabled(true))
+		if ($this->getEnabled(true))
 			$this->getPage()->registerRequiresPostData($this);
 	}
 
@@ -84,60 +84,60 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the component has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
-		if(!$this->getEnabled(true))
+		if (!$this->getEnabled(true))
 			return false;
 		$this->ensureDataBound();
-		$selections=isset($values[$key])?$values[$key]:null;
-		if($selections!==null)
+		$selections = isset($values[$key]) ? $values[$key] : null;
+		if ($selections !== null)
 		{
-			$items=$this->getItems();
-			if($this->getSelectionMode()===TListSelectionMode::Single)
+			$items = $this->getItems();
+			if ($this->getSelectionMode() === TListSelectionMode::Single)
 			{
-				$selection=is_array($selections)?$selections[0]:$selections;
-				$index=$items->findIndexByValue($selection,false);
-				if($this->getSelectedIndex()!==$index)
+				$selection = is_array($selections) ? $selections[0] : $selections;
+				$index = $items->findIndexByValue($selection, false);
+				if ($this->getSelectedIndex() !== $index)
 				{
 					$this->setSelectedIndex($index);
-					return $this->_dataChanged=true;
+					return $this->_dataChanged = true;
 				}
 				else
 					return false;
 			}
-			if(!is_array($selections))
-				$selections=array($selections);
-			$list=array();
-			foreach($selections as $selection)
-				$list[]=$items->findIndexByValue($selection,false);
-			$list2=$this->getSelectedIndices();
-			$n=count($list);
-			$flag=false;
-			if($n===count($list2))
+			if (!is_array($selections))
+				$selections = array($selections);
+			$list = array();
+			foreach ($selections as $selection)
+				$list[] = $items->findIndexByValue($selection, false);
+			$list2 = $this->getSelectedIndices();
+			$n = count($list);
+			$flag = false;
+			if ($n === count($list2))
 			{
-				sort($list,SORT_NUMERIC);
-				for($i=0;$i<$n;++$i)
+				sort($list, SORT_NUMERIC);
+				for ($i = 0; $i < $n; ++$i)
 				{
-					if($list[$i]!==$list2[$i])
+					if ($list[$i] !== $list2[$i])
 					{
-						$flag=true;
+						$flag = true;
 						break;
 					}
 				}
 			}
 			else
-				$flag=true;
-			if($flag)
+				$flag = true;
+			if ($flag)
 			{
 				$this->setSelectedIndices($list);
-				$this->_dataChanged=true;
+				$this->_dataChanged = true;
 			}
 			return $flag;
 		}
-		else if($this->getSelectedIndex()!==-1)
+		else if ($this->getSelectedIndex() !== -1)
 		{
 			$this->clearSelection();
-			return $this->_dataChanged=true;
+			return $this->_dataChanged = true;
 		}
 		else
 			return false;
@@ -152,7 +152,7 @@ 
 	 */
 	public function raisePostDataChangedEvent()
 	{
-		if($this->getAutoPostBack() && $this->getCausesValidation())
+		if ($this->getAutoPostBack() && $this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
 		$this->onSelectedIndexChanged(null);
 	}
@@ -172,7 +172,7 @@ 
 	 */
 	protected function getIsMultiSelect()
 	{
-		return $this->getSelectionMode()===TListSelectionMode::Multiple;
+		return $this->getSelectionMode() === TListSelectionMode::Multiple;
 	}
 
 	/**
@@ -188,9 +188,9 @@ 
 	 */
 	public function setRows($value)
 	{
-		$value=TPropertyValue::ensureInteger($value);
-		if($value<=0)
-			$value=4;
+		$value = TPropertyValue::ensureInteger($value);
+		if ($value <= 0)
+			$value = 4;
 		$this->setViewState('Rows', $value, 4);
 	}
 
@@ -207,7 +207,7 @@ 
 	 */
 	public function setSelectionMode($value)
 	{
-		$this->setViewState('SelectionMode',TPropertyValue::ensureEnum($value,'TListSelectionMode'),TListSelectionMode::Single);
+		$this->setViewState('SelectionMode', TPropertyValue::ensureEnum($value, 'TListSelectionMode'), TListSelectionMode::Single);
 	}
 
 	/**
@@ -234,7 +234,7 @@ 
 	 */
 	public function setIsValid($value)
 	{
-	    $this->_isValid=TPropertyValue::ensureBoolean($value);
+	    $this->_isValid = TPropertyValue::ensureBoolean($value);
 	}
 }
 
@@ -253,7 +253,7 @@ 
  */
 class TListSelectionMode extends TEnumerable
 {
-	const Single='Single';
-	const Multiple='Multiple';
+	const Single = 'Single';
+	const Multiple = 'Multiple';
 }
 

Braces +30 added lines, -24 removed lines

@@ -48,10 +48,11 @@ 
 	{
 		$rows=$this->getRows();
 		$writer->addAttribute('size',"$rows");
-		if($this->getSelectionMode()===TListSelectionMode::Multiple)
-			$writer->addAttribute('name',$this->getUniqueID().'[]');
-		else
-			$writer->addAttribute('name',$this->getUniqueID());
+		if($this->getSelectionMode()===TListSelectionMode::Multiple) {
+					$writer->addAttribute('name',$this->getUniqueID().'[]');
+		} else {
+					$writer->addAttribute('name',$this->getUniqueID());
+		}
 		parent::addAttributesToRender($writer);
 	}
 
@@ -73,8 +74,9 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if($this->getEnabled(true))
-			$this->getPage()->registerRequiresPostData($this);
+		if($this->getEnabled(true)) {
+					$this->getPage()->registerRequiresPostData($this);
+		}
 	}
 
 	/**
@@ -86,8 +88,9 @@ 
 	 */
 	public function loadPostData($key,$values)
 	{
-		if(!$this->getEnabled(true))
-			return false;
+		if(!$this->getEnabled(true)) {
+					return false;
+		}
 		$this->ensureDataBound();
 		$selections=isset($values[$key])?$values[$key]:null;
 		if($selections!==null)
@@ -101,15 +104,17 @@ 
 				{
 					$this->setSelectedIndex($index);
 					return $this->_dataChanged=true;
+				} else {
+									return false;
 				}
-				else
-					return false;
 			}
-			if(!is_array($selections))
-				$selections=array($selections);
+			if(!is_array($selections)) {
+							$selections=array($selections);
+			}
 			$list=array();
-			foreach($selections as $selection)
-				$list[]=$items->findIndexByValue($selection,false);
+			foreach($selections as $selection) {
+							$list[]=$items->findIndexByValue($selection,false);
+			}
 			$list2=$this->getSelectedIndices();
 			$n=count($list);
 			$flag=false;
@@ -124,23 +129,22 @@ 
 						break;
 					}
 				}
+			} else {
+							$flag=true;
 			}
-			else
-				$flag=true;
 			if($flag)
 			{
 				$this->setSelectedIndices($list);
 				$this->_dataChanged=true;
 			}
 			return $flag;
-		}
-		else if($this->getSelectedIndex()!==-1)
+		} else if($this->getSelectedIndex()!==-1)
 		{
 			$this->clearSelection();
 			return $this->_dataChanged=true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -152,8 +156,9 @@ 
 	 */
 	public function raisePostDataChangedEvent()
 	{
-		if($this->getAutoPostBack() && $this->getCausesValidation())
-			$this->getPage()->validate($this->getValidationGroup());
+		if($this->getAutoPostBack() && $this->getCausesValidation()) {
+					$this->getPage()->validate($this->getValidationGroup());
+		}
 		$this->onSelectedIndexChanged(null);
 	}
 
@@ -189,8 +194,9 @@ 
 	public function setRows($value)
 	{
 		$value=TPropertyValue::ensureInteger($value);
-		if($value<=0)
-			$value=4;
+		if($value<=0) {
+					$value=4;
+		}
 		$this->setViewState('Rows', $value, 4);
 	}
 

Indentation +2 added lines, -2 removed lines

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