pradosoft / prado

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);
 	}
 
 	/**

framework/Web/UI/WebControls/TListControl.php

Doc Comments +11 added lines

@@ -184,6 +184,7 @@ 
 	 * This method adds only {@link TListItem} objects into the {@link getItems Items} collection.
 	 * All other objects are ignored.
 	 * @param mixed object parsed from template
+	 * @param XListMenuItem $object
 	 */
 	public function addParsedObject($object)
 	{
@@ -347,6 +348,7 @@ 
 	 * An automatic postback to the server will occur whenever the user
 	 * makes change to the list control and then tabs out of it.
 	 * @param boolean the value indicating if postback automatically
+	 * @param boolean $value
 	 */
 	public function setAutoPostBack($value)
 	{
@@ -379,6 +381,7 @@ 
 
 	/**
 	 * @param string the field of the data source that provides the text content of the list items.
+	 * @param string $value
 	 */
 	public function setDataTextField($value)
 	{
@@ -398,6 +401,7 @@ 
 	 * The format string is used in {@link TDataValueFormatter::format()} to format the Text property value
 	 * of each item in the list control.
 	 * @param string the formatting string used to control how data bound to the list control is displayed.
+	 * @param string $value
 	 * @see TDataValueFormatter::format()
 	 */
 	public function setDataTextFormatString($value)
@@ -415,6 +419,7 @@ 
 
 	/**
 	 * @param string the field of the data source that provides the value of each list item.
+	 * @param string $value
 	 */
 	public function setDataValueField($value)
 	{
@@ -856,6 +861,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)
@@ -894,28 +900,33 @@ 
 	/**
 	 * Selects an item based on zero-base index on the client side.
 	 * @param integer the index (zero-based) of the item to be selected
+	 * @return void
 	 */
 	public function setSelectedIndex($index);
 	/**
 	 * Selects a list of item based on zero-base indices on the client side.
 	 * @param array list of index of items to be selected
+	 * @return void
 	 */
 	public function setSelectedIndices($indices);
 
 	/**
 	 * Sets selection by item value on the client side.
 	 * @param string the value of the item to be selected.
+	 * @return void
 	 */
 	public function setSelectedValue($value);
 
 	/**
 	 * Sets selection by a list of item values on the client side.
 	 * @param array list of the selected item values
+	 * @return void
 	 */
 	public function setSelectedValues($values);
 
     /**
      * Clears all existing selections on the client side.
+     * @return void
      */
     public function clearSelection();
 }

Indentation +47 added lines, -47 removed lines

@@ -334,8 +334,8 @@ 
 
 	/**
 	 * @return boolean a value indicating whether an automatic postback to the server
-     * will occur whenever the user makes change to the list control and then tabs out of it.
-     * Defaults to false.
+	 * will occur whenever the user makes change to the list control and then tabs out of it.
+	 * Defaults to false.
 	 */
 	public function getAutoPostBack()
 	{
@@ -591,23 +591,23 @@ 
 	 * @param string the value of the item to be selected.
 	 */
 	public function setSelectedValue($value)
-    {
-	    if($this->_items)
-	    {
-		    if($value===null)
-		    	$this->clearSelection();
-		    else if(($item=$this->_items->findItemByValue($value))!==null)
-	    	{
-		    	$this->clearSelection();
-		    	$item->setSelected(true);
-	    	}
-	    	else
+	{
+		if($this->_items)
+		{
+			if($value===null)
+				$this->clearSelection();
+			else if(($item=$this->_items->findItemByValue($value))!==null)
+			{
+				$this->clearSelection();
+				$item->setSelected(true);
+			}
+			else
 				$this->clearSelection();
-    	}
-    	$this->_cachedSelectedValue=$value;
+		}
+		$this->_cachedSelectedValue=$value;
 		if($this->getAdapter() instanceof IListControlAdapter)
 			$this->getAdapter()->setSelectedValue($value);
-    }
+	}
 
 
 	/**
@@ -655,36 +655,36 @@ 
 			$this->getAdapter()->setSelectedValues($values);
 	}
 
-    /**
-     * @return string selected value
-     */
-    public function getText()
-    {
-	    return $this->getSelectedValue();
-    }
-
-    /**
-     * @param string value to be selected
-     */
-    public function setText($value)
-    {
-	    $this->setSelectedValue($value);
-    }
-
-    /**
-     * Clears all existing selections.
-     */
-    public function clearSelection()
-    {
-	    if($this->_items)
-	    {
-		    foreach($this->_items as $item)
-		    	$item->setSelected(false);
-	    }
+	/**
+	 * @return string selected value
+	 */
+	public function getText()
+	{
+		return $this->getSelectedValue();
+	}
+
+	/**
+	 * @param string value to be selected
+	 */
+	public function setText($value)
+	{
+		$this->setSelectedValue($value);
+	}
+
+	/**
+	 * Clears all existing selections.
+	 */
+	public function clearSelection()
+	{
+		if($this->_items)
+		{
+			foreach($this->_items as $item)
+				$item->setSelected(false);
+		}
 
 		if($this->getAdapter() instanceof IListControlAdapter)
 			$this->getAdapter()->clearSelection();
-    }
+	}
 
 	/**
 	 * @return string the group of validators which the list control causes validation upon postback
@@ -914,10 +914,10 @@ 
 	 */
 	public function setSelectedValues($values);
 
-    /**
-     * Clears all existing selections on the client side.
-     */
-    public function clearSelection();
+	/**
+	 * Clears all existing selections on the client side.
+	 */
+	public function clearSelection();
 }
 
 

Spacing +165 added lines, -165 removed lines

@@ -86,19 +86,19 @@ 
 	/**
 	 * @var TListItemCollection item list
 	 */
-	private $_items=null;
+	private $_items = null;
 	/**
 	 * @var boolean whether items are restored from viewstate
 	 */
-	private $_stateLoaded=false;
+	private $_stateLoaded = false;
 	/**
 	 * @var mixed the following selection variables are used
 	 * to keep selections when Items are not available
 	 */
-	private $_cachedSelectedIndex=-1;
-	private $_cachedSelectedValue=null;
-	private $_cachedSelectedIndices=null;
-	private $_cachedSelectedValues=null;
+	private $_cachedSelectedIndex = -1;
+	private $_cachedSelectedValue = null;
+	private $_cachedSelectedIndices = null;
+	private $_cachedSelectedValues = null;
 
 	/**
 	 * @return string tag name of the list control
@@ -113,7 +113,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -130,21 +130,21 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$page=$this->getPage();
+		$page = $this->getPage();
 		$page->ensureRenderInForm($this);
-		if($this->getIsMultiSelect())
-			$writer->addAttribute('multiple','multiple');
-		if($this->getEnabled(true))
+		if ($this->getIsMultiSelect())
+			$writer->addAttribute('multiple', 'multiple');
+		if ($this->getEnabled(true))
 		{
-			if($this->getAutoPostBack()
+			if ($this->getAutoPostBack()
 				&& $this->getEnableClientScript()
 				&& $page->getClientSupportsJavaScript())
 			{
 				$this->renderClientControlScript($writer);
 			}
 		}
-		else if($this->getEnabled())
-			$writer->addAttribute('disabled','disabled');
+		else if ($this->getEnabled())
+			$writer->addAttribute('disabled', 'disabled');
 		parent::addAttributesToRender($writer);
 	}
 
@@ -153,8 +153,8 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
-		$this->getPage()->getClientScript()->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$writer->addAttribute('id', $this->getClientID());
+		$this->getPage()->getClientScript()->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -188,14 +188,14 @@ 
 	public function addParsedObject($object)
 	{
 		// Do not add items from template if items are loaded from viewstate
-		if(!$this->_stateLoaded && ($object instanceof TListItem))
+		if (!$this->_stateLoaded && ($object instanceof TListItem))
 		{
-			$index=$this->getItems()->add($object);
-			if(($this->_cachedSelectedValue!==null && $this->_cachedSelectedValue===$object->getValue()) || ($this->_cachedSelectedIndex===$index))
+			$index = $this->getItems()->add($object);
+			if (($this->_cachedSelectedValue !== null && $this->_cachedSelectedValue === $object->getValue()) || ($this->_cachedSelectedIndex === $index))
 			{
 				$object->setSelected(true);
-				$this->_cachedSelectedValue=null;
-				$this->_cachedSelectedIndex=-1;
+				$this->_cachedSelectedValue = null;
+				$this->_cachedSelectedIndex = -1;
 			}
 		}
 	}
@@ -208,53 +208,53 @@ 
 	 */
 	protected function performDataBinding($data)
 	{
-		$items=$this->getItems();
-		if(!$this->getAppendDataBoundItems())
+		$items = $this->getItems();
+		if (!$this->getAppendDataBoundItems())
 			$items->clear();
-		$textField=$this->getDataTextField();
-		if($textField==='')
-			$textField=0;
-		$valueField=$this->getDataValueField();
-		if($valueField==='')
-			$valueField=1;
-		$textFormat=$this->getDataTextFormatString();
-		$groupField=$this->getDataGroupField();
-		foreach($data as $key=>$object)
+		$textField = $this->getDataTextField();
+		if ($textField === '')
+			$textField = 0;
+		$valueField = $this->getDataValueField();
+		if ($valueField === '')
+			$valueField = 1;
+		$textFormat = $this->getDataTextFormatString();
+		$groupField = $this->getDataGroupField();
+		foreach ($data as $key=>$object)
 		{
-			$item=$items->createListItem();
-			if(is_array($object) || is_object($object))
+			$item = $items->createListItem();
+			if (is_array($object) || is_object($object))
 			{
-				$text=TDataFieldAccessor::getDataFieldValue($object,$textField);
-				$value=TDataFieldAccessor::getDataFieldValue($object,$valueField);
+				$text = TDataFieldAccessor::getDataFieldValue($object, $textField);
+				$value = TDataFieldAccessor::getDataFieldValue($object, $valueField);
 				$item->setValue($value);
-				if($groupField!=='')
-					$item->setAttribute('Group',TDataFieldAccessor::getDataFieldValue($object,$groupField));
+				if ($groupField !== '')
+					$item->setAttribute('Group', TDataFieldAccessor::getDataFieldValue($object, $groupField));
 			}
 			else
 			{
-				$text=$object;
+				$text = $object;
 				$item->setValue("$key");
 			}
-			$item->setText($this->formatDataValue($textFormat,$text));
+			$item->setText($this->formatDataValue($textFormat, $text));
 		}
 		// SelectedValue or SelectedIndex may be set before databinding
 		// so we make them be effective now
-		if($this->_cachedSelectedValue!==null)
+		if ($this->_cachedSelectedValue !== null)
 		{
 			$this->setSelectedValue($this->_cachedSelectedValue);
 			$this->resetCachedSelections();
 		}
-		else if($this->_cachedSelectedIndex!==-1)
+		else if ($this->_cachedSelectedIndex !== -1)
 		{
 			$this->setSelectedIndex($this->_cachedSelectedIndex);
 			$this->resetCachedSelections();
 		}
-		else if($this->_cachedSelectedValues!==null)
+		else if ($this->_cachedSelectedValues !== null)
 		{
 			$this->setSelectedValues($this->_cachedSelectedValues);
 			$this->resetCachedSelections();
 		}
-		else if($this->_cachedSelectedIndices!==null)
+		else if ($this->_cachedSelectedIndices !== null)
 		{
 			$this->setSelectedIndices($this->_cachedSelectedIndices);
 			$this->resetCachedSelections();
@@ -263,10 +263,10 @@ 
 
 	private function resetCachedSelections()
 	{
-		$this->_cachedSelectedValue=null;
-		$this->_cachedSelectedIndex=-1;
-		$this->_cachedSelectedValues=null;
-		$this->_cachedSelectedIndices=null;
+		$this->_cachedSelectedValue = null;
+		$this->_cachedSelectedIndex = -1;
+		$this->_cachedSelectedValues = null;
+		$this->_cachedSelectedIndices = null;
 	}
 
 	/**
@@ -286,8 +286,8 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		if($this->_items)
-			$this->setViewState('Items',$this->_items->saveState(),null);
+		if ($this->_items)
+			$this->setViewState('Items', $this->_items->saveState(), null);
 		else
 			$this->clearViewState('Items');
 	}
@@ -299,11 +299,11 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		$this->_stateLoaded=true;
-		if(!$this->getIsDataBound())
+		$this->_stateLoaded = true;
+		if (!$this->getIsDataBound())
 		{
-			$this->_items=$this->createListItemCollection();
-			$this->_items->loadState($this->getViewState('Items',null));
+			$this->_items = $this->createListItemCollection();
+			$this->_items->loadState($this->getViewState('Items', null));
 		}
 		$this->clearViewState('Items');
 	}
@@ -321,7 +321,7 @@ 
 	 */
 	public function getAppendDataBoundItems()
 	{
-		return $this->getViewState('AppendDataBoundItems',false);
+		return $this->getViewState('AppendDataBoundItems', false);
 	}
 
 	/**
@@ -329,7 +329,7 @@ 
 	 */
 	public function setAppendDataBoundItems($value)
 	{
-		$this->setViewState('AppendDataBoundItems',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('AppendDataBoundItems', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -339,7 +339,7 @@ 
 	 */
 	public function getAutoPostBack()
 	{
-		return $this->getViewState('AutoPostBack',false);
+		return $this->getViewState('AutoPostBack', false);
 	}
 
 	/**
@@ -350,7 +350,7 @@ 
 	 */
 	public function setAutoPostBack($value)
 	{
-		$this->setViewState('AutoPostBack',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('AutoPostBack', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -358,7 +358,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -366,7 +366,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -374,7 +374,7 @@ 
 	 */
 	public function getDataTextField()
 	{
-		return $this->getViewState('DataTextField','');
+		return $this->getViewState('DataTextField', '');
 	}
 
 	/**
@@ -382,7 +382,7 @@ 
 	 */
 	public function setDataTextField($value)
 	{
-		$this->setViewState('DataTextField',$value,'');
+		$this->setViewState('DataTextField', $value, '');
 	}
 
 	/**
@@ -390,7 +390,7 @@ 
 	 */
 	public function getDataTextFormatString()
 	{
-		return $this->getViewState('DataTextFormatString','');
+		return $this->getViewState('DataTextFormatString', '');
 	}
 
 	/**
@@ -402,7 +402,7 @@ 
 	 */
 	public function setDataTextFormatString($value)
 	{
-		$this->setViewState('DataTextFormatString',$value,'');
+		$this->setViewState('DataTextFormatString', $value, '');
 	}
 
 	/**
@@ -410,7 +410,7 @@ 
 	 */
 	public function getDataValueField()
 	{
-		return $this->getViewState('DataValueField','');
+		return $this->getViewState('DataValueField', '');
 	}
 
 	/**
@@ -418,7 +418,7 @@ 
 	 */
 	public function setDataValueField($value)
 	{
-		$this->setViewState('DataValueField',$value,'');
+		$this->setViewState('DataValueField', $value, '');
 	}
 
 	/**
@@ -426,7 +426,7 @@ 
 	 */
 	public function getDataGroupField()
 	{
-		return $this->getViewState('DataGroupField','');
+		return $this->getViewState('DataGroupField', '');
 	}
 
 	/**
@@ -434,7 +434,7 @@ 
 	 */
 	public function setDataGroupField($value)
 	{
-		$this->setViewState('DataGroupField',$value,'');
+		$this->setViewState('DataGroupField', $value, '');
 	}
 
 	/**
@@ -442,7 +442,7 @@ 
 	 */
 	public function getItemCount()
 	{
-		return $this->_items?$this->_items->getCount():0;
+		return $this->_items ? $this->_items->getCount() : 0;
 	}
 
 	/**
@@ -450,7 +450,7 @@ 
 	 */
 	public function getHasItems()
 	{
-		return ($this->_items && $this->_items->getCount()>0);
+		return ($this->_items && $this->_items->getCount() > 0);
 	}
 
 	/**
@@ -458,8 +458,8 @@ 
 	 */
 	public function getItems()
 	{
-		if(!$this->_items)
-			$this->_items=$this->createListItemCollection();
+		if (!$this->_items)
+			$this->_items = $this->createListItemCollection();
 		return $this->_items;
 	}
 
@@ -468,11 +468,11 @@ 
 	 */
 	public function getSelectedIndex()
 	{
-		if($this->_items)
+		if ($this->_items)
 		{
-			$n=$this->_items->getCount();
-			for($i=0;$i<$n;++$i)
-				if($this->_items->itemAt($i)->getSelected())
+			$n = $this->_items->getCount();
+			for ($i = 0; $i < $n; ++$i)
+				if ($this->_items->itemAt($i)->getSelected())
 					return $i;
 		}
 		return -1;
@@ -483,16 +483,16 @@ 
 	 */
 	public function setSelectedIndex($index)
 	{
-		if(($index=TPropertyValue::ensureInteger($index))<0)
-			$index=-1;
-		if($this->_items)
+		if (($index = TPropertyValue::ensureInteger($index)) < 0)
+			$index = -1;
+		if ($this->_items)
 		{
 			$this->clearSelection();
-			if($index>=0 && $index<$this->_items->getCount())
+			if ($index >= 0 && $index < $this->_items->getCount())
 				$this->_items->itemAt($index)->setSelected(true);
 		}
-		$this->_cachedSelectedIndex=$index;
-		if($this->getAdapter() instanceof IListControlAdapter)
+		$this->_cachedSelectedIndex = $index;
+		if ($this->getAdapter() instanceof IListControlAdapter)
 			$this->getAdapter()->setSelectedIndex($index);
 	}
 
@@ -501,13 +501,13 @@ 
 	 */
 	public function getSelectedIndices()
 	{
-		$selections=array();
-		if($this->_items)
+		$selections = array();
+		if ($this->_items)
 		{
-			$n=$this->_items->getCount();
-			for($i=0;$i<$n;++$i)
-				if($this->_items->itemAt($i)->getSelected())
-					$selections[]=$i;
+			$n = $this->_items->getCount();
+			for ($i = 0; $i < $n; ++$i)
+				if ($this->_items->itemAt($i)->getSelected())
+					$selections[] = $i;
 		}
 		return $selections;
 	}
@@ -517,24 +517,24 @@ 
 	 */
 	public function setSelectedIndices($indices)
 	{
-		if($this->getIsMultiSelect())
+		if ($this->getIsMultiSelect())
 		{
-			if($this->_items)
+			if ($this->_items)
 			{
 				$this->clearSelection();
-				$n=$this->_items->getCount();
-				foreach($indices as $index)
+				$n = $this->_items->getCount();
+				foreach ($indices as $index)
 				{
-					if($index>=0 && $index<$n)
+					if ($index >= 0 && $index < $n)
 						$this->_items->itemAt($index)->setSelected(true);
 				}
 			}
-			$this->_cachedSelectedIndices=$indices;
+			$this->_cachedSelectedIndices = $indices;
 		}
 		else
-			throw new TNotSupportedException('listcontrol_multiselect_unsupported',get_class($this));
+			throw new TNotSupportedException('listcontrol_multiselect_unsupported', get_class($this));
 
-		if($this->getAdapter() instanceof IListControlAdapter)
+		if ($this->getAdapter() instanceof IListControlAdapter)
 			$this->getAdapter()->setSelectedIndices($indices);
 	}
 
@@ -543,7 +543,7 @@ 
 	 */
 	public function getSelectedItem()
 	{
-		if(($index=$this->getSelectedIndex())>=0)
+		if (($index = $this->getSelectedIndex()) >= 0)
 			return $this->_items->itemAt($index);
 		else
 			return null;
@@ -580,8 +580,8 @@ 
 	 */
 	public function getSelectedValue()
 	{
-		$index=$this->getSelectedIndex();
-		return $index>=0?$this->getItems()->itemAt($index)->getValue():'';
+		$index = $this->getSelectedIndex();
+		return $index >= 0 ? $this->getItems()->itemAt($index)->getValue() : '';
 	}
 
 	/**
@@ -592,11 +592,11 @@ 
 	 */
 	public function setSelectedValue($value)
     {
-	    if($this->_items)
+	    if ($this->_items)
 	    {
-		    if($value===null)
+		    if ($value === null)
 		    	$this->clearSelection();
-		    else if(($item=$this->_items->findItemByValue($value))!==null)
+		    else if (($item = $this->_items->findItemByValue($value)) !== null)
 	    	{
 		    	$this->clearSelection();
 		    	$item->setSelected(true);
@@ -604,8 +604,8 @@ 
 	    	else
 				$this->clearSelection();
     	}
-    	$this->_cachedSelectedValue=$value;
-		if($this->getAdapter() instanceof IListControlAdapter)
+    	$this->_cachedSelectedValue = $value;
+		if ($this->getAdapter() instanceof IListControlAdapter)
 			$this->getAdapter()->setSelectedValue($value);
     }
 
@@ -615,13 +615,13 @@ 
 	 */
 	public function getSelectedValues()
 	{
-		$values=array();
-		if($this->_items)
+		$values = array();
+		if ($this->_items)
 		{
-			foreach($this->_items as $item)
+			foreach ($this->_items as $item)
 			{
-				if($item->getSelected())
-					$values[]=$item->getValue();
+				if ($item->getSelected())
+					$values[] = $item->getValue();
 			}
 		}
 		return $values;
@@ -632,26 +632,26 @@ 
 	 */
 	public function setSelectedValues($values)
 	{
-		if($this->getIsMultiSelect())
+		if ($this->getIsMultiSelect())
 		{
-			if($this->_items)
+			if ($this->_items)
 			{
 				$this->clearSelection();
-				$lookup=array();
-				foreach($this->_items as $item)
-					$lookup[$item->getValue()]=$item;
-				foreach($values as $value)
+				$lookup = array();
+				foreach ($this->_items as $item)
+					$lookup[$item->getValue()] = $item;
+				foreach ($values as $value)
 				{
-					if(isset($lookup["$value"]))
+					if (isset($lookup["$value"]))
 						$lookup["$value"]->setSelected(true);
 				}
 			}
-			$this->_cachedSelectedValues=$values;
+			$this->_cachedSelectedValues = $values;
 		}
 		else
-			throw new TNotSupportedException('listcontrol_multiselect_unsupported',get_class($this));
+			throw new TNotSupportedException('listcontrol_multiselect_unsupported', get_class($this));
 
-		if($this->getAdapter() instanceof IListControlAdapter)
+		if ($this->getAdapter() instanceof IListControlAdapter)
 			$this->getAdapter()->setSelectedValues($values);
 	}
 
@@ -676,13 +676,13 @@ 
      */
     public function clearSelection()
     {
-	    if($this->_items)
+	    if ($this->_items)
 	    {
-		    foreach($this->_items as $item)
+		    foreach ($this->_items as $item)
 		    	$item->setSelected(false);
 	    }
 
-		if($this->getAdapter() instanceof IListControlAdapter)
+		if ($this->getAdapter() instanceof IListControlAdapter)
 			$this->getAdapter()->clearSelection();
     }
 
@@ -691,7 +691,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -699,7 +699,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -708,7 +708,7 @@ 
 	 */
 	public function getPromptText()
 	{
-		return $this->getViewState('PromptText','');
+		return $this->getViewState('PromptText', '');
 	}
 
 	/**
@@ -717,7 +717,7 @@ 
 	 */
 	public function setPromptText($value)
 	{
-		$this->setViewState('PromptText',$value,'');
+		$this->setViewState('PromptText', $value, '');
 	}
 
 	/**
@@ -727,7 +727,7 @@ 
 	 */
 	public function getPromptValue()
 	{
-		return $this->getViewState('PromptValue','');
+		return $this->getViewState('PromptValue', '');
 	}
 
 	/**
@@ -737,7 +737,7 @@ 
 	 */
 	public function setPromptValue($value)
 	{
-		$this->setViewState('PromptValue',(string)$value,'');
+		$this->setViewState('PromptValue', (string) $value, '');
 	}
 
 	/**
@@ -748,7 +748,7 @@ 
 	 */
 	public function onSelectedIndexChanged($param)
 	{
-		$this->raiseEvent('OnSelectedIndexChanged',$this,$param);
+		$this->raiseEvent('OnSelectedIndexChanged', $this, $param);
 		$this->onTextChanged($param);
 	}
 
@@ -760,7 +760,7 @@ 
 	 */
 	public function onTextChanged($param)
 	{
-		$this->raiseEvent('OnTextChanged',$this,$param);
+		$this->raiseEvent('OnTextChanged', $this, $param);
 	}
 
 	/**
@@ -770,13 +770,13 @@ 
 	 */
 	protected function renderPrompt($writer)
 	{
-		$text=$this->getPromptText();
-		$value=$this->getPromptValue();
-		if($value==='')
-			$value=$text;
-		if($value!=='')
+		$text = $this->getPromptText();
+		$value = $this->getPromptValue();
+		if ($value === '')
+			$value = $text;
+		if ($value !== '')
 		{
-			$writer->addAttribute('value',$value);
+			$writer->addAttribute('value', $value);
 			$writer->renderBeginTag('option');
 			$writer->write(THttpUtility::htmlEncode($text));
 			$writer->renderEndTag();
@@ -793,52 +793,52 @@ 
 	{
 		$this->renderPrompt($writer);
 
-		if($this->_items)
+		if ($this->_items)
 		{
 			$writer->writeLine();
-			$previousGroup=null;
-			foreach($this->_items as $item)
+			$previousGroup = null;
+			foreach ($this->_items as $item)
 			{
-				if($item->getEnabled())
+				if ($item->getEnabled())
 				{
-					if($item->getHasAttributes())
+					if ($item->getHasAttributes())
 					{
-						$group=$item->getAttributes()->remove('Group');
-						if($group!==$previousGroup)
+						$group = $item->getAttributes()->remove('Group');
+						if ($group !== $previousGroup)
 						{
-							if($previousGroup!==null)
+							if ($previousGroup !== null)
 							{
 								$writer->renderEndTag();
 								$writer->writeLine();
-								$previousGroup=null;
+								$previousGroup = null;
 							}
-							if($group!==null)
+							if ($group !== null)
 							{
-								$writer->addAttribute('label',$group);
+								$writer->addAttribute('label', $group);
 								$writer->renderBeginTag('optgroup');
 								$writer->writeLine();
-								$previousGroup=$group;
+								$previousGroup = $group;
 							}
 						}
-						foreach($item->getAttributes() as $name=>$value)
-							$writer->addAttribute($name,$value);
+						foreach ($item->getAttributes() as $name=>$value)
+							$writer->addAttribute($name, $value);
 					}
-					else if($previousGroup!==null)
+					else if ($previousGroup !== null)
 					{
 						$writer->renderEndTag();
 						$writer->writeLine();
-						$previousGroup=null;
+						$previousGroup = null;
 					}
-					if($item->getSelected())
-						$writer->addAttribute('selected','selected');
-					$writer->addAttribute('value',$item->getValue());
+					if ($item->getSelected())
+						$writer->addAttribute('selected', 'selected');
+					$writer->addAttribute('value', $item->getValue());
 					$writer->renderBeginTag('option');
 					$writer->write(THttpUtility::htmlEncode($item->getText()));
 					$writer->renderEndTag();
 					$writer->writeLine();
 				}
 			}
-			if($previousGroup!==null)
+			if ($previousGroup !== null)
 			{
 				$writer->renderEndTag();
 				$writer->writeLine();
@@ -858,26 +858,26 @@ 
 	 * @param mixed the data to be formatted
 	 * @return string the formatted result
 	 */
-	protected function formatDataValue($formatString,$value)
+	protected function formatDataValue($formatString, $value)
 	{
-		if($formatString==='')
+		if ($formatString === '')
 			return TPropertyValue::ensureString($value);
-		else if($formatString[0]==='#')
+		else if ($formatString[0] === '#')
 		{
-			$expression=strtr(substr($formatString,1),array('{0}'=>'$value'));
+			$expression = strtr(substr($formatString, 1), array('{0}'=>'$value'));
 			try
 			{
-				if(eval("\$result=$expression;")===false)
+				if (eval("\$result=$expression;") === false)
 					throw new Exception('');
 				return $result;
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
-				throw new TInvalidDataValueException('listcontrol_expression_invalid',get_class($this),$expression,$e->getMessage());
+				throw new TInvalidDataValueException('listcontrol_expression_invalid', get_class($this), $expression, $e->getMessage());
 			}
 		}
 		else
-			return sprintf($formatString,$value);
+			return sprintf($formatString, $value);
 	}
 }
 

Braces +104 added lines, -84 removed lines

@@ -132,8 +132,9 @@ 
 	{
 		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
-		if($this->getIsMultiSelect())
-			$writer->addAttribute('multiple','multiple');
+		if($this->getIsMultiSelect()) {
+					$writer->addAttribute('multiple','multiple');
+		}
 		if($this->getEnabled(true))
 		{
 			if($this->getAutoPostBack()
@@ -142,9 +143,9 @@ 
 			{
 				$this->renderClientControlScript($writer);
 			}
+		} else if($this->getEnabled()) {
+					$writer->addAttribute('disabled','disabled');
 		}
-		else if($this->getEnabled())
-			$writer->addAttribute('disabled','disabled');
 		parent::addAttributesToRender($writer);
 	}
 
@@ -209,14 +210,17 @@ 
 	protected function performDataBinding($data)
 	{
 		$items=$this->getItems();
-		if(!$this->getAppendDataBoundItems())
-			$items->clear();
+		if(!$this->getAppendDataBoundItems()) {
+					$items->clear();
+		}
 		$textField=$this->getDataTextField();
-		if($textField==='')
-			$textField=0;
+		if($textField==='') {
+					$textField=0;
+		}
 		$valueField=$this->getDataValueField();
-		if($valueField==='')
-			$valueField=1;
+		if($valueField==='') {
+					$valueField=1;
+		}
 		$textFormat=$this->getDataTextFormatString();
 		$groupField=$this->getDataGroupField();
 		foreach($data as $key=>$object)
@@ -227,10 +231,10 @@ 
 				$text=TDataFieldAccessor::getDataFieldValue($object,$textField);
 				$value=TDataFieldAccessor::getDataFieldValue($object,$valueField);
 				$item->setValue($value);
-				if($groupField!=='')
-					$item->setAttribute('Group',TDataFieldAccessor::getDataFieldValue($object,$groupField));
-			}
-			else
+				if($groupField!=='') {
+									$item->setAttribute('Group',TDataFieldAccessor::getDataFieldValue($object,$groupField));
+				}
+			} else
 			{
 				$text=$object;
 				$item->setValue("$key");
@@ -243,18 +247,15 @@ 
 		{
 			$this->setSelectedValue($this->_cachedSelectedValue);
 			$this->resetCachedSelections();
-		}
-		else if($this->_cachedSelectedIndex!==-1)
+		} else if($this->_cachedSelectedIndex!==-1)
 		{
 			$this->setSelectedIndex($this->_cachedSelectedIndex);
 			$this->resetCachedSelections();
-		}
-		else if($this->_cachedSelectedValues!==null)
+		} else if($this->_cachedSelectedValues!==null)
 		{
 			$this->setSelectedValues($this->_cachedSelectedValues);
 			$this->resetCachedSelections();
-		}
-		else if($this->_cachedSelectedIndices!==null)
+		} else if($this->_cachedSelectedIndices!==null)
 		{
 			$this->setSelectedIndices($this->_cachedSelectedIndices);
 			$this->resetCachedSelections();
@@ -286,10 +287,11 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		if($this->_items)
-			$this->setViewState('Items',$this->_items->saveState(),null);
-		else
-			$this->clearViewState('Items');
+		if($this->_items) {
+					$this->setViewState('Items',$this->_items->saveState(),null);
+		} else {
+					$this->clearViewState('Items');
+		}
 	}
 
 	/**
@@ -458,8 +460,9 @@ 
 	 */
 	public function getItems()
 	{
-		if(!$this->_items)
-			$this->_items=$this->createListItemCollection();
+		if(!$this->_items) {
+					$this->_items=$this->createListItemCollection();
+		}
 		return $this->_items;
 	}
 
@@ -471,9 +474,10 @@ 
 		if($this->_items)
 		{
 			$n=$this->_items->getCount();
-			for($i=0;$i<$n;++$i)
-				if($this->_items->itemAt($i)->getSelected())
+			for($i=0;$i<$n;++$i) {
+							if($this->_items->itemAt($i)->getSelected())
 					return $i;
+			}
 		}
 		return -1;
 	}
@@ -483,17 +487,20 @@ 
 	 */
 	public function setSelectedIndex($index)
 	{
-		if(($index=TPropertyValue::ensureInteger($index))<0)
-			$index=-1;
+		if(($index=TPropertyValue::ensureInteger($index))<0) {
+					$index=-1;
+		}
 		if($this->_items)
 		{
 			$this->clearSelection();
-			if($index>=0 && $index<$this->_items->getCount())
-				$this->_items->itemAt($index)->setSelected(true);
+			if($index>=0 && $index<$this->_items->getCount()) {
+							$this->_items->itemAt($index)->setSelected(true);
+			}
 		}
 		$this->_cachedSelectedIndex=$index;
-		if($this->getAdapter() instanceof IListControlAdapter)
-			$this->getAdapter()->setSelectedIndex($index);
+		if($this->getAdapter() instanceof IListControlAdapter) {
+					$this->getAdapter()->setSelectedIndex($index);
+		}
 	}
 
 	/**
@@ -505,9 +512,10 @@ 
 		if($this->_items)
 		{
 			$n=$this->_items->getCount();
-			for($i=0;$i<$n;++$i)
-				if($this->_items->itemAt($i)->getSelected())
+			for($i=0;$i<$n;++$i) {
+							if($this->_items->itemAt($i)->getSelected())
 					$selections[]=$i;
+			}
 		}
 		return $selections;
 	}
@@ -525,17 +533,19 @@ 
 				$n=$this->_items->getCount();
 				foreach($indices as $index)
 				{
-					if($index>=0 && $index<$n)
-						$this->_items->itemAt($index)->setSelected(true);
+					if($index>=0 && $index<$n) {
+											$this->_items->itemAt($index)->setSelected(true);
+					}
 				}
 			}
 			$this->_cachedSelectedIndices=$indices;
+		} else {
+					throw new TNotSupportedException('listcontrol_multiselect_unsupported',get_class($this));
 		}
-		else
-			throw new TNotSupportedException('listcontrol_multiselect_unsupported',get_class($this));
 
-		if($this->getAdapter() instanceof IListControlAdapter)
-			$this->getAdapter()->setSelectedIndices($indices);
+		if($this->getAdapter() instanceof IListControlAdapter) {
+					$this->getAdapter()->setSelectedIndices($indices);
+		}
 	}
 
 	/**
@@ -543,10 +553,11 @@ 
 	 */
 	public function getSelectedItem()
 	{
-		if(($index=$this->getSelectedIndex())>=0)
-			return $this->_items->itemAt($index);
-		else
-			return null;
+		if(($index=$this->getSelectedIndex())>=0) {
+					return $this->_items->itemAt($index);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -594,19 +605,20 @@ 
     {
 	    if($this->_items)
 	    {
-		    if($value===null)
-		    	$this->clearSelection();
-		    else if(($item=$this->_items->findItemByValue($value))!==null)
+		    if($value===null) {
+		    		    	$this->clearSelection();
+		    } else if(($item=$this->_items->findItemByValue($value))!==null)
 	    	{
 		    	$this->clearSelection();
 		    	$item->setSelected(true);
+	    	} else {
+	    					$this->clearSelection();
 	    	}
-	    	else
-				$this->clearSelection();
     	}
     	$this->_cachedSelectedValue=$value;
-		if($this->getAdapter() instanceof IListControlAdapter)
-			$this->getAdapter()->setSelectedValue($value);
+		if($this->getAdapter() instanceof IListControlAdapter) {
+					$this->getAdapter()->setSelectedValue($value);
+		}
     }
 
 
@@ -620,8 +632,9 @@ 
 		{
 			foreach($this->_items as $item)
 			{
-				if($item->getSelected())
-					$values[]=$item->getValue();
+				if($item->getSelected()) {
+									$values[]=$item->getValue();
+				}
 			}
 		}
 		return $values;
@@ -638,21 +651,24 @@ 
 			{
 				$this->clearSelection();
 				$lookup=array();
-				foreach($this->_items as $item)
-					$lookup[$item->getValue()]=$item;
+				foreach($this->_items as $item) {
+									$lookup[$item->getValue()]=$item;
+				}
 				foreach($values as $value)
 				{
-					if(isset($lookup["$value"]))
-						$lookup["$value"]->setSelected(true);
+					if(isset($lookup["$value"])) {
+											$lookup["$value"]->setSelected(true);
+					}
 				}
 			}
 			$this->_cachedSelectedValues=$values;
+		} else {
+					throw new TNotSupportedException('listcontrol_multiselect_unsupported',get_class($this));
 		}
-		else
-			throw new TNotSupportedException('listcontrol_multiselect_unsupported',get_class($this));
 
-		if($this->getAdapter() instanceof IListControlAdapter)
-			$this->getAdapter()->setSelectedValues($values);
+		if($this->getAdapter() instanceof IListControlAdapter) {
+					$this->getAdapter()->setSelectedValues($values);
+		}
 	}
 
     /**
@@ -678,12 +694,14 @@ 
     {
 	    if($this->_items)
 	    {
-		    foreach($this->_items as $item)
-		    	$item->setSelected(false);
+		    foreach($this->_items as $item) {
+		    		    	$item->setSelected(false);
+		    }
 	    }
 
-		if($this->getAdapter() instanceof IListControlAdapter)
-			$this->getAdapter()->clearSelection();
+		if($this->getAdapter() instanceof IListControlAdapter) {
+					$this->getAdapter()->clearSelection();
+		}
     }
 
 	/**
@@ -772,8 +790,9 @@ 
 	{
 		$text=$this->getPromptText();
 		$value=$this->getPromptValue();
-		if($value==='')
-			$value=$text;
+		if($value==='') {
+					$value=$text;
+		}
 		if($value!=='')
 		{
 			$writer->addAttribute('value',$value);
@@ -820,17 +839,18 @@ 
 								$previousGroup=$group;
 							}
 						}
-						foreach($item->getAttributes() as $name=>$value)
-							$writer->addAttribute($name,$value);
-					}
-					else if($previousGroup!==null)
+						foreach($item->getAttributes() as $name=>$value) {
+													$writer->addAttribute($name,$value);
+						}
+					} else if($previousGroup!==null)
 					{
 						$writer->renderEndTag();
 						$writer->writeLine();
 						$previousGroup=null;
 					}
-					if($item->getSelected())
-						$writer->addAttribute('selected','selected');
+					if($item->getSelected()) {
+											$writer->addAttribute('selected','selected');
+					}
 					$writer->addAttribute('value',$item->getValue());
 					$writer->renderBeginTag('option');
 					$writer->write(THttpUtility::htmlEncode($item->getText()));
@@ -860,24 +880,24 @@ 
 	 */
 	protected function formatDataValue($formatString,$value)
 	{
-		if($formatString==='')
-			return TPropertyValue::ensureString($value);
-		else if($formatString[0]==='#')
+		if($formatString==='') {
+					return TPropertyValue::ensureString($value);
+		} else if($formatString[0]==='#')
 		{
 			$expression=strtr(substr($formatString,1),array('{0}'=>'$value'));
 			try
 			{
-				if(eval("\$result=$expression;")===false)
-					throw new Exception('');
+				if(eval("\$result=$expression;")===false) {
+									throw new Exception('');
+				}
 				return $result;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				throw new TInvalidDataValueException('listcontrol_expression_invalid',get_class($this),$expression,$e->getMessage());
 			}
+		} else {
+					return sprintf($formatString,$value);
 		}
-		else
-			return sprintf($formatString,$value);
 	}
 }
 

framework/Web/UI/WebControls/TListControlValidator.php

Doc Comments +1 added lines

@@ -164,6 +164,7 @@
 
 	/**
 	 * @param TListControl control to validate
+	 * @param TControl $control
 	 * @return array number of selected values and its values.
 	 */
 	protected function getSelection($control)

Spacing +28 added lines, -28 removed lines

@@ -76,7 +76,7 @@ 
 	 */
 	public function getMinSelection()
 	{
-		return $this->getViewState('MinSelection',-1);
+		return $this->getViewState('MinSelection', -1);
 	}
 
 	/**
@@ -84,9 +84,9 @@ 
 	 */
 	public function setMinSelection($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=-1;
-		$this->setViewState('MinSelection',$value,-1);
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
+			$value = -1;
+		$this->setViewState('MinSelection', $value, -1);
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 */
 	public function getMaxSelection()
 	{
-		return $this->getViewState('MaxSelection',-1);
+		return $this->getViewState('MaxSelection', -1);
 	}
 
 	/**
@@ -102,9 +102,9 @@ 
 	 */
 	public function setMaxSelection($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=-1;
-		$this->setViewState('MaxSelection',$value,-1);
+		if (($value = TPropertyValue::ensureInteger($value)) < 0)
+			$value = -1;
+		$this->setViewState('MaxSelection', $value, -1);
 	}
 
 	/**
@@ -113,7 +113,7 @@ 
 	 */
 	public function getRequiredSelections()
 	{
-		return $this->getViewState('RequiredSelections','');
+		return $this->getViewState('RequiredSelections', '');
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function setRequiredSelections($value)
 	{
-		$this->setViewState('RequiredSelections',$value,'');
+		$this->setViewState('RequiredSelections', $value, '');
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 	 */
 	protected function evaluateIsValid()
 	{
-		$control=$this->getValidationTarget();
+		$control = $this->getValidationTarget();
 
 		$exists = true;
 		$values = $this->getSelection($control);
@@ -141,22 +141,22 @@ 
 		$required = $this->getRequiredValues();
 
 		//if required, check the values
-		if(!empty($required))
+		if (!empty($required))
 		{
-			if($count < count($required) )
+			if ($count < count($required))
 				return false;
-			foreach($required as $require)
+			foreach ($required as $require)
 				$exists = $exists && in_array($require, $values);
 		}
 
 		$min = $this->getMinSelection();
 		$max = $this->getMaxSelection();
 
-		if($min !== -1 && $max !== -1)
+		if ($min !== -1 && $max !== -1)
 			return $exists && $count >= $min && $count <= $max;
-		else if($min === -1 && $max !== -1)
+		else if ($min === -1 && $max !== -1)
 			return $exists && $count <= $max;
-		else if($min !== -1 && $max === -1)
+		else if ($min !== -1 && $max === -1)
 			return $exists && $count >= $min;
 		else
 			return $exists;
@@ -171,9 +171,9 @@ 
 		$values = array();
 
 		//get the data
-		foreach($control->getItems() as $item)
+		foreach ($control->getItems() as $item)
 		{
-			if($item->getSelected())
+			if ($item->getSelected())
 				$values[] = $item->getValue();
 		}
 		return $values;
@@ -186,7 +186,7 @@ 
 	{
 		$required = array();
 		$string = $this->getRequiredSelections();
-		if(!empty($string))
+		if (!empty($string))
 			$required = preg_split('/,\s*/', $string);
 		return $required;
 	}
@@ -200,22 +200,22 @@ 
 		$options = parent::getClientScriptOptions();
 		$control = $this->getValidationTarget();
 
-		if(!$control instanceof TListControl)
+		if (!$control instanceof TListControl)
 		{
 			throw new TConfigurationException(
 				'listcontrolvalidator_invalid_control',
-				$this->getID(),$this->getControlToValidate(), get_class($control));
+				$this->getID(), $this->getControlToValidate(), get_class($control));
 		}
 
 		$min = $this->getMinSelection();
 		$max = $this->getMaxSelection();
-		if($min !== -1)
-			$options['Min']= $min;
-		if($max !== -1)
-			$options['Max']= $max;
+		if ($min !== -1)
+			$options['Min'] = $min;
+		if ($max !== -1)
+			$options['Max'] = $max;
 		$required = $this->getRequiredSelections();
-		if(strlen($required) > 0)
-			$options['Required']= $required;
+		if (strlen($required) > 0)
+			$options['Required'] = $required;
 		$options['TotalItems'] = $control->getItemCount();
 
 		return $options;

Braces +36 added lines, -26 removed lines

@@ -84,8 +84,9 @@ 
 	 */
 	public function setMinSelection($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=-1;
+		if(($value=TPropertyValue::ensureInteger($value))<0) {
+					$value=-1;
+		}
 		$this->setViewState('MinSelection',$value,-1);
 	}
 
@@ -102,8 +103,9 @@ 
 	 */
 	public function setMaxSelection($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
-			$value=-1;
+		if(($value=TPropertyValue::ensureInteger($value))<0) {
+					$value=-1;
+		}
 		$this->setViewState('MaxSelection',$value,-1);
 	}
 
@@ -143,23 +145,26 @@ 
 		//if required, check the values
 		if(!empty($required))
 		{
-			if($count < count($required) )
-				return false;
-			foreach($required as $require)
-				$exists = $exists && in_array($require, $values);
+			if($count < count($required) ) {
+							return false;
+			}
+			foreach($required as $require) {
+							$exists = $exists && in_array($require, $values);
+			}
 		}
 
 		$min = $this->getMinSelection();
 		$max = $this->getMaxSelection();
 
-		if($min !== -1 && $max !== -1)
-			return $exists && $count >= $min && $count <= $max;
-		else if($min === -1 && $max !== -1)
-			return $exists && $count <= $max;
-		else if($min !== -1 && $max === -1)
-			return $exists && $count >= $min;
-		else
-			return $exists;
+		if($min !== -1 && $max !== -1) {
+					return $exists && $count >= $min && $count <= $max;
+		} else if($min === -1 && $max !== -1) {
+					return $exists && $count <= $max;
+		} else if($min !== -1 && $max === -1) {
+					return $exists && $count >= $min;
+		} else {
+					return $exists;
+		}
 	}
 
 	/**
@@ -173,8 +178,9 @@ 
 		//get the data
 		foreach($control->getItems() as $item)
 		{
-			if($item->getSelected())
-				$values[] = $item->getValue();
+			if($item->getSelected()) {
+							$values[] = $item->getValue();
+			}
 		}
 		return $values;
 	}
@@ -186,8 +192,9 @@ 
 	{
 		$required = array();
 		$string = $this->getRequiredSelections();
-		if(!empty($string))
-			$required = preg_split('/,\s*/', $string);
+		if(!empty($string)) {
+					$required = preg_split('/,\s*/', $string);
+		}
 		return $required;
 	}
 
@@ -209,13 +216,16 @@ 
 
 		$min = $this->getMinSelection();
 		$max = $this->getMaxSelection();
-		if($min !== -1)
-			$options['Min']= $min;
-		if($max !== -1)
-			$options['Max']= $max;
+		if($min !== -1) {
+					$options['Min']= $min;
+		}
+		if($max !== -1) {
+					$options['Max']= $max;
+		}
 		$required = $this->getRequiredSelections();
-		if(strlen($required) > 0)
-			$options['Required']= $required;
+		if(strlen($required) > 0) {
+					$options['Required']= $required;
+		}
 		$options['TotalItems'] = $control->getItemCount();
 
 		return $options;

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TListControlValidator class file
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]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
- */
+	 * TListControlValidator class file
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]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
+	 */
 
 /**
  * Using TBaseValidator class

framework/Web/UI/WebControls/TListItem.php

Doc Comments +5 added lines

@@ -92,6 +92,7 @@ 
 
 	/**
 	 * @param boolean whether the item is enabled
+	 * @param boolean $value
 	 */
 	public function setEnabled($value)
 	{
@@ -108,6 +109,7 @@ 
 
 	/**
 	 * @param boolean whether the item is selected
+	 * @param boolean $value
 	 */
 	public function setSelected($value)
 	{
@@ -166,6 +168,7 @@ 
 
 	/**
 	 * @param string name of the attribute
+	 * @param string $name
 	 * @return boolean whether the named attribute exists
 	 */
 	public function hasAttribute($name)
@@ -174,6 +177,7 @@ 
 	}
 
 	/**
+	 * @param string $name
 	 * @return string the named attribute value, null if attribute does not exist
 	 */
 	public function getAttribute($name)
@@ -184,6 +188,7 @@ 
 	/**
 	 * @param string attribute name
 	 * @param string value of the attribute
+	 * @param string $name
 	 */
 	public function setAttribute($name,$value)
 	{

Spacing +25 added lines, -25 removed lines

@@ -28,23 +28,23 @@ 
 	/**
 	 * @var TMap list of custom attributes
 	 */
-	private $_attributes=null;
+	private $_attributes = null;
 	/**
 	 * @var string text of the item
 	 */
-	private $_text='';
+	private $_text = '';
 	/**
 	 * @var string value of the item
 	 */
-	private $_value='';
+	private $_value = '';
 	/**
 	 * @var boolean whether the item is enabled
 	 */
-	private $_enabled=true;
+	private $_enabled = true;
 	/**
 	 * @var boolean whether the item is selected
 	 */
-	private $_selected=false;
+	private $_selected = false;
 
 	/**
 	 * Constructor.
@@ -53,7 +53,7 @@ 
 	 * @param boolean whether the item is enabled
 	 * @param boolean whether the item is selected
 	 */
-	public function __construct($text='',$value='',$enabled=true,$selected=false)
+	public function __construct($text = '', $value = '', $enabled = true, $selected = false)
 	{
 		$this->setText($text);
 		$this->setValue($value);
@@ -70,15 +70,15 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_attributes===null)
+		if ($this->_attributes === null)
 			$exprops[] = "\0TListItem\0_attributes";
-		if($this->_text==='')
+		if ($this->_text === '')
 			$exprops[] = "\0TListItem\0_text";
-		if($this->_value==='')
+		if ($this->_value === '')
 			$exprops[] = "\0TListItem\0_value";
-		if ($this->_enabled===true)
+		if ($this->_enabled === true)
 			$exprops[] = "\0TListItem\0_enabled";
-		if ($this->_selected===false)
+		if ($this->_selected === false)
 			$exprops[] = "\0TListItem\0_selected";
 	}
 
@@ -95,7 +95,7 @@ 
 	 */
 	public function setEnabled($value)
 	{
-		$this->_enabled=TPropertyValue::ensureBoolean($value);
+		$this->_enabled = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 */
 	public function setSelected($value)
 	{
-		$this->_selected=TPropertyValue::ensureBoolean($value);
+		$this->_selected = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->_text===''?$this->_value:$this->_text;
+		return $this->_text === '' ? $this->_value : $this->_text;
 	}
 
 	/**
@@ -127,7 +127,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->_text=TPropertyValue::ensureString($value);
+		$this->_text = TPropertyValue::ensureString($value);
 	}
 
 	/**
@@ -135,7 +135,7 @@ 
 	 */
 	public function getValue()
 	{
-		return $this->_value===''?$this->_text:$this->_value;
+		return $this->_value === '' ? $this->_text : $this->_value;
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->_value=TPropertyValue::ensureString($value);
+		$this->_value = TPropertyValue::ensureString($value);
 	}
 
 	/**
@@ -151,8 +151,8 @@ 
 	 */
 	public function getAttributes()
 	{
-		if(!$this->_attributes)
-			$this->_attributes=new TAttributeCollection;
+		if (!$this->_attributes)
+			$this->_attributes = new TAttributeCollection;
 		return $this->_attributes;
 	}
 
@@ -161,7 +161,7 @@ 
 	 */
 	public function getHasAttributes()
 	{
-		return $this->_attributes && $this->_attributes->getCount()>0;
+		return $this->_attributes && $this->_attributes->getCount() > 0;
 	}
 
 	/**
@@ -170,7 +170,7 @@ 
 	 */
 	public function hasAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->contains($name):false;
+		return $this->_attributes ? $this->_attributes->contains($name) : false;
 	}
 
 	/**
@@ -178,16 +178,16 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->itemAt($name):null;
+		return $this->_attributes ? $this->_attributes->itemAt($name) : null;
 	}
 
 	/**
 	 * @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);
 	}
 
 	/**
@@ -197,7 +197,7 @@ 
 	 */
 	public function removeAttribute($name)
 	{
-		return $this->_attributes?$this->_attributes->remove($name):null;
+		return $this->_attributes ? $this->_attributes->remove($name) : null;
 	}
 }
 

Braces +18 added lines, -12 removed lines

@@ -70,16 +70,21 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_attributes===null)
-			$exprops[] = "\0TListItem\0_attributes";
-		if($this->_text==='')
-			$exprops[] = "\0TListItem\0_text";
-		if($this->_value==='')
-			$exprops[] = "\0TListItem\0_value";
-		if ($this->_enabled===true)
-			$exprops[] = "\0TListItem\0_enabled";
-		if ($this->_selected===false)
-			$exprops[] = "\0TListItem\0_selected";
+		if ($this->_attributes===null) {
+					$exprops[] = "\0TListItem\0_attributes";
+		}
+		if($this->_text==='') {
+					$exprops[] = "\0TListItem\0_text";
+		}
+		if($this->_value==='') {
+					$exprops[] = "\0TListItem\0_value";
+		}
+		if ($this->_enabled===true) {
+					$exprops[] = "\0TListItem\0_enabled";
+		}
+		if ($this->_selected===false) {
+					$exprops[] = "\0TListItem\0_selected";
+		}
 	}
 
 	/**
@@ -151,8 +156,9 @@ 
 	 */
 	public function getAttributes()
 	{
-		if(!$this->_attributes)
-			$this->_attributes=new TAttributeCollection;
+		if(!$this->_attributes) {
+					$this->_attributes=new TAttributeCollection;
+		}
 		return $this->_attributes;
 	}