pradosoft / prado

framework/Web/UI/WebControls/THtmlArea4.php

Spacing +12 added lines, -12 removed lines

@@ -286,7 +286,7 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if($this->getEnableVisualEdit() && $this->getEnabled(true))
+		if ($this->getEnableVisualEdit() && $this->getEnabled(true))
 		{
 			$writer->addAttribute('id', $this->getClientID());
 			$this->registerEditorClientScript($writer);
@@ -333,19 +333,19 @@ 
 
 		$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);
 	}
 
 	protected function copyCustomPlugins()
 	{
-		if($plugins = $this->getCustomPluginPath())
+		if ($plugins = $this->getCustomPluginPath())
 		{
 			$basepath = $this->getPage()->getClientScript()->getPradoScriptAssetPath('tinymce');
 			$assets = $this->getApplication()->getAssetManager();
 			$path = is_dir($plugins) ? $plugins : Prado::getPathOfNameSpace($plugins);
 			$name = basename($path);
-			$dest = $basepath . '/plugins/' . $name;
-			if(!is_dir($dest) || $this->getApplication()->getMode() !== TApplicationMode::Performance)
+			$dest = $basepath.'/plugins/'.$name;
+			if (!is_dir($dest) || $this->getApplication()->getMode() !== TApplicationMode::Performance)
 				$assets->copyDirectory($path, $dest);
 		}
 	}
@@ -365,7 +365,7 @@ 
 		$options['height'] = $this->getHeight();
 		$options['resize'] = 'both';
 		$options['menubar'] = false;
-		if($this->getReadOnly())
+		if ($this->getReadOnly())
 		{
 			$options['readonly'] = true;
 			$options['toolbar'] = false;
@@ -387,11 +387,11 @@ 
 	{
 		$options = [];
 		$substrings = preg_split('/,\s*\n|\n/', trim($string));
-		foreach($substrings as $bits)
+		foreach ($substrings as $bits)
 		{
 			$option = explode(":", $bits, 2);
 
-			if(count($option) == 2)
+			if (count($option) == 2)
 			{
 				$value = trim(trim($option[1]), "'\"");
 				if (($s = strtolower($value)) === 'false')
@@ -410,15 +410,15 @@ 
 	protected function getLanguageSuffix($culture)
 	{
 		$app = $this->getApplication()->getGlobalization();
-		if(empty($culture) && ($app !== null))
+		if (empty($culture) && ($app !== null))
 			$culture = $app->getCulture();
 		$variants = [];
-		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

@@ -345,8 +345,9 @@ 
 			$path = is_dir($plugins) ? $plugins : Prado::getPathOfNameSpace($plugins);
 			$name = basename($path);
 			$dest = $basepath . '/plugins/' . $name;
-			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);
+			}
 		}
 	}
 
@@ -394,10 +395,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;
 			}
 		}
@@ -410,16 +412,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 = [];
-		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/assets/captcha.php

Spacing +36 added lines, -36 removed lines

@@ -18,19 +18,19 @@ 
 define('THEME_MORPH_BACKGROUND', 0x0010);
 define('THEME_SHADOWED_TEXT', 0x0020);
 
-require_once(dirname(__FILE__) . '/captcha_key.php');
+require_once(dirname(__FILE__).'/captcha_key.php');
 
 $token = 'error';
 $theme = 0;
 
-if(isset($_GET['options']))
+if (isset($_GET['options']))
 {
 	$str = base64_decode($_GET['options']);
-	if(strlen($str) > 32)
+	if (strlen($str) > 32)
 	{
 		$hash = substr($str, 0, 32);
 		$str = substr($str, 32);
-		if(md5($privateKey . $str) === $hash)
+		if (md5($privateKey.$str) === $hash)
 		{
 			$options = unserialize($str);
 			$publicKey = $options['publicKey'];
@@ -39,10 +39,10 @@ 
 			$alphabet = $options['alphabet'];
 			$fontSize = $options['fontSize'];
 			$theme = $options['theme'];
-			if(($randomSeed = $options['randomSeed']) > 0)
+			if (($randomSeed = $options['randomSeed']) > 0)
 				srand($randomSeed);
 			else
-				srand((int)(microtime() * 1000000));
+				srand((int) (microtime() * 1000000));
 			$token = generateToken($publicKey, $privateKey, $alphabet, $tokenLength, $caseSensitive);
 		}
 	}
@@ -52,21 +52,21 @@ 
 
 function generateToken($publicKey, $privateKey, $alphabet, $tokenLength, $caseSensitive)
 {
-	$token = substr(hash2string(md5($publicKey . $privateKey), $alphabet) . hash2string(md5($privateKey . $publicKey), $alphabet), 0, $tokenLength);
-	return $caseSensitive?$token:strtoupper($token);
+	$token = substr(hash2string(md5($publicKey.$privateKey), $alphabet).hash2string(md5($privateKey.$publicKey), $alphabet), 0, $tokenLength);
+	return $caseSensitive ? $token : strtoupper($token);
 }
 
 function hash2string($hex, $alphabet)
 {
-	if(strlen($alphabet) < 2)
+	if (strlen($alphabet) < 2)
 		$alphabet = '234578adefhijmnrtABDEFGHJLMNRT';
 	$hexLength = strlen($hex);
 	$base = strlen($alphabet);
 	$result = '';
-	for($i = 0;$i < $hexLength;$i += 6)
+	for ($i = 0; $i < $hexLength; $i += 6)
 	{
 		$number = hexdec(substr($hex, $i, 6));
-		while($number)
+		while ($number)
 		{
 			$result .= $alphabet[$number % $base];
 			$number = floor($number / $base);
@@ -77,9 +77,9 @@ 
 
 function displayToken($token, $fontSize, $theme)
 {
-	if(($fontSize = (int)$fontSize) < 22)
+	if (($fontSize = (int) $fontSize) < 22)
 		$fontSize = 22;
-	if($fontSize > 100)
+	if ($fontSize > 100)
 		$fontSize = 100;
 	$length = strlen($token);
 	$padding = 10;
@@ -98,13 +98,13 @@ 
 		$theme & THEME_MORPH_BACKGROUND
 	);
 
-	$font = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'verase.ttf';
+	$font = dirname(__FILE__).DIRECTORY_SEPARATOR.'verase.ttf';
 
-	if(function_exists('imagefilter'))
+	if (function_exists('imagefilter'))
 		imagefilter($image, IMG_FILTER_GAUSSIAN_BLUR);
 
 	$hasShadow = ($theme & THEME_SHADOWED_TEXT);
-	for($i = 0;$i < $length;$i++)
+	for ($i = 0; $i < $length; $i++)
 	{
 		$color = imagecolorallocate($image, rand(150, 220), rand(150, 220), rand(150, 220));
 		$size = rand($fontWidth - 10, $fontWidth);
@@ -112,7 +112,7 @@ 
 		$x = $padding + $i * $fontWidth;
 		$y = rand($fontHeight - 15, $fontHeight - 10);
 		imagettftext($image, $size, $angle, $x, $y, $color, $font, $token[$i]);
-		if($hasShadow)
+		if ($hasShadow)
 			imagettftext($image, $size, $angle, $x + 2, $y + 2, $color, $font, $token[$i]);
 		imagecolordeallocate($image, $color);
 	}
@@ -128,34 +128,34 @@ 
 	$white = imagecolorallocate($background, 255, 255, 255);
 	imagefill($background, 0, 0, $white);
 
-	if($opaque)
+	if ($opaque)
 		imagefill($background, 0, 0, imagecolorallocate($background, 100, 100, 100));
 
-	if($noisy)
+	if ($noisy)
 		addNoise($background, $width * 2, $height * 2);
 
-	if($hasGrid)
+	if ($hasGrid)
 		addGrid($background, $width * 2, $height * 2);
 
-	if($hasScribble)
+	if ($hasScribble)
 		addScribble($background, $width * 2, $height * 2);
 
-	if($morph)
+	if ($morph)
 		morphImage($background, $width * 2, $height * 2);
 
 	imagecopy($image, $background, 0, 0, 30, 30, $width, $height);
 
-	if(!$opaque)
+	if (!$opaque)
 		imagecolortransparent($image, $white);
 }
 
 function addNoise($image, $width, $height)
 {
-	for($x = 0;$x < $width;++$x)
+	for ($x = 0; $x < $width; ++$x)
 	{
-		for($y = 0;$y < $height;++$y)
+		for ($y = 0; $y < $height; ++$y)
 		{
-			if(rand(0, 100) < 25)
+			if (rand(0, 100) < 25)
 			{
 				$color = imagecolorallocate($image, rand(150, 220), rand(150, 220), rand(150, 220));
 				imagesetpixel($image, $x, $y, $color);
@@ -167,14 +167,14 @@ 
 
 function addGrid($image, $width, $height)
 {
-	for($i = 0;$i < $width;$i += rand(15, 25))
+	for ($i = 0; $i < $width; $i += rand(15, 25))
 	{
 		imagesetthickness($image, rand(2, 6));
 		$color = imagecolorallocate($image, rand(100, 180), rand(100, 180), rand(100, 180));
 		imageline($image, $i + rand(-10, 20), 0, $i + rand(-10, 20), $height, $color);
 		imagecolordeallocate($image, $color);
 	}
-	for($i = 0;$i < $height;$i += rand(15, 25))
+	for ($i = 0; $i < $height; $i += rand(15, 25))
 	{
 		imagesetthickness($image, rand(2, 6));
 		$color = imagecolorallocate($image, rand(100, 180), rand(100, 180), rand(100, 180));
@@ -185,11 +185,11 @@ 
 
 function addScribble($image, $width, $height)
 {
-	for($i = 0;$i < 8;$i++)
+	for ($i = 0; $i < 8; $i++)
 	{
 		$color = imagecolorallocate($image, rand(100, 180), rand(100, 180), rand(100, 180));
 		$points = [];
-		for($j = 1;$j < rand(5, 10);$j++)
+		for ($j = 1; $j < rand(5, 10); $j++)
 		{
 			$points[] = rand(2 * (20 * ($i + 1)), 2 * (50 * ($i + 1)));
 			$points[] = rand(30, $height + 30);
@@ -204,20 +204,20 @@ 
 {
 	$tempImage = imagecreatetruecolor($width, $height);
 	$chunk = rand(1, 5);
-	for($x = $y = 0;$x < $width;$x += $chunk)
+	for ($x = $y = 0; $x < $width; $x += $chunk)
 	{
 		$chunk = rand(1, 5);
 		$y += rand(-1, 1);
-		if($y >= $height)	$y = $height - 5;
-		if($y < 0) $y = 5;
+		if ($y >= $height)	$y = $height - 5;
+		if ($y < 0) $y = 5;
 		imagecopy($tempImage, $image, $x, 0, $x, $y, $chunk, $height);
 	}
-	for($x = $y = 0;$y < $height;$y += $chunk)
+	for ($x = $y = 0; $y < $height; $y += $chunk)
 	{
 		$chunk = rand(1, 5);
 		$x += rand(-1, 1);
-		if($x >= $width)	$x = $width - 5;
-		if($x < 0) $x = 5;
+		if ($x >= $width)	$x = $width - 5;
+		if ($x < 0) $x = 5;
 		imagecopy($image, $tempImage, $x, $y, 0, $y, $width, $chunk);
 	}
 }

Braces +51 added lines, -31 removed lines

@@ -39,10 +39,11 @@ 
 			$alphabet = $options['alphabet'];
 			$fontSize = $options['fontSize'];
 			$theme = $options['theme'];
-			if(($randomSeed = $options['randomSeed']) > 0)
-				srand($randomSeed);
-			else
-				srand((int)(microtime() * 1000000));
+			if(($randomSeed = $options['randomSeed']) > 0) {
+							srand($randomSeed);
+			} else {
+							srand((int)(microtime() * 1000000));
+			}
 			$token = generateToken($publicKey, $privateKey, $alphabet, $tokenLength, $caseSensitive);
 		}
 	}
@@ -58,8 +59,9 @@ 
 
 function hash2string($hex, $alphabet)
 {
-	if(strlen($alphabet) < 2)
-		$alphabet = '234578adefhijmnrtABDEFGHJLMNRT';
+	if(strlen($alphabet) < 2) {
+			$alphabet = '234578adefhijmnrtABDEFGHJLMNRT';
+	}
 	$hexLength = strlen($hex);
 	$base = strlen($alphabet);
 	$result = '';
@@ -77,10 +79,12 @@ 
 
 function displayToken($token, $fontSize, $theme)
 {
-	if(($fontSize = (int)$fontSize) < 22)
-		$fontSize = 22;
-	if($fontSize > 100)
-		$fontSize = 100;
+	if(($fontSize = (int)$fontSize) < 22) {
+			$fontSize = 22;
+	}
+	if($fontSize > 100) {
+			$fontSize = 100;
+	}
 	$length = strlen($token);
 	$padding = 10;
 	$fontWidth = $fontSize;
@@ -100,8 +104,9 @@ 
 
 	$font = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'verase.ttf';
 
-	if(function_exists('imagefilter'))
-		imagefilter($image, IMG_FILTER_GAUSSIAN_BLUR);
+	if(function_exists('imagefilter')) {
+			imagefilter($image, IMG_FILTER_GAUSSIAN_BLUR);
+	}
 
 	$hasShadow = ($theme & THEME_SHADOWED_TEXT);
 	for($i = 0;$i < $length;$i++)
@@ -112,8 +117,9 @@ 
 		$x = $padding + $i * $fontWidth;
 		$y = rand($fontHeight - 15, $fontHeight - 10);
 		imagettftext($image, $size, $angle, $x, $y, $color, $font, $token[$i]);
-		if($hasShadow)
-			imagettftext($image, $size, $angle, $x + 2, $y + 2, $color, $font, $token[$i]);
+		if($hasShadow) {
+					imagettftext($image, $size, $angle, $x + 2, $y + 2, $color, $font, $token[$i]);
+		}
 		imagecolordeallocate($image, $color);
 	}
 
@@ -128,26 +134,32 @@ 
 	$white = imagecolorallocate($background, 255, 255, 255);
 	imagefill($background, 0, 0, $white);
 
-	if($opaque)
-		imagefill($background, 0, 0, imagecolorallocate($background, 100, 100, 100));
+	if($opaque) {
+			imagefill($background, 0, 0, imagecolorallocate($background, 100, 100, 100));
+	}
 
-	if($noisy)
-		addNoise($background, $width * 2, $height * 2);
+	if($noisy) {
+			addNoise($background, $width * 2, $height * 2);
+	}
 
-	if($hasGrid)
-		addGrid($background, $width * 2, $height * 2);
+	if($hasGrid) {
+			addGrid($background, $width * 2, $height * 2);
+	}
 
-	if($hasScribble)
-		addScribble($background, $width * 2, $height * 2);
+	if($hasScribble) {
+			addScribble($background, $width * 2, $height * 2);
+	}
 
-	if($morph)
-		morphImage($background, $width * 2, $height * 2);
+	if($morph) {
+			morphImage($background, $width * 2, $height * 2);
+	}
 
 	imagecopy($image, $background, 0, 0, 30, 30, $width, $height);
 
-	if(!$opaque)
-		imagecolortransparent($image, $white);
-}
+	if(!$opaque) {
+			imagecolortransparent($image, $white);
+	}
+	}
 
 function addNoise($image, $width, $height)
 {
@@ -208,16 +220,24 @@ 
 	{
 		$chunk = rand(1, 5);
 		$y += rand(-1, 1);
-		if($y >= $height)	$y = $height - 5;
-		if($y < 0) $y = 5;
+		if($y >= $height) {
+			$y = $height - 5;
+		}
+		if($y < 0) {
+			$y = 5;
+		}
 		imagecopy($tempImage, $image, $x, 0, $x, $y, $chunk, $height);
 	}
 	for($x = $y = 0;$y < $height;$y += $chunk)
 	{
 		$chunk = rand(1, 5);
 		$x += rand(-1, 1);
-		if($x >= $width)	$x = $width - 5;
-		if($x < 0) $x = 5;
+		if($x >= $width) {
+			$x = $width - 5;
+		}
+		if($x < 0) {
+			$x = 5;
+		}
 		imagecopy($image, $tempImage, $x, $y, 0, $y, $width, $chunk);
 	}
 }

framework/Web/UI/WebControls/TTableHeaderCell.php

Spacing +4 added lines, -4 removed lines

@@ -39,11 +39,11 @@
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		if(($scope = $this->getScope()) !== TTableHeaderScope::NotSet)
-			$writer->addAttribute('scope', $scope === TTableHeaderScope::Row?'row':'col');
-		if(($text = $this->getAbbreviatedText()) !== '')
+		if (($scope = $this->getScope()) !== TTableHeaderScope::NotSet)
+			$writer->addAttribute('scope', $scope === TTableHeaderScope::Row ? 'row' : 'col');
+		if (($text = $this->getAbbreviatedText()) !== '')
 			$writer->addAttribute('abbr', $text);
-		if(($text = $this->getCategoryText()) !== '')
+		if (($text = $this->getCategoryText()) !== '')
 			$writer->addAttribute('axis', $text);
 	}
 

Braces +9 added lines, -6 removed lines

@@ -39,12 +39,15 @@
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		if(($scope = $this->getScope()) !== TTableHeaderScope::NotSet)
-			$writer->addAttribute('scope', $scope === TTableHeaderScope::Row?'row':'col');
-		if(($text = $this->getAbbreviatedText()) !== '')
-			$writer->addAttribute('abbr', $text);
-		if(($text = $this->getCategoryText()) !== '')
-			$writer->addAttribute('axis', $text);
+		if(($scope = $this->getScope()) !== TTableHeaderScope::NotSet) {
+					$writer->addAttribute('scope', $scope === TTableHeaderScope::Row?'row':'col');
+		}
+		if(($text = $this->getAbbreviatedText()) !== '') {
+					$writer->addAttribute('abbr', $text);
+		}
+		if(($text = $this->getCategoryText()) !== '') {
+					$writer->addAttribute('axis', $text);
+		}
 	}
 
 	/**

framework/Web/UI/WebControls/TListControl.php

Spacing +71 added lines, -71 removed lines

@@ -131,18 +131,18 @@ 
 	{
 		$page = $this->getPage();
 		$page->ensureRenderInForm($this);
-		if($this->getIsMultiSelect())
+		if ($this->getIsMultiSelect())
 			$writer->addAttribute('multiple', 'multiple');
-		if($this->getEnabled(true))
+		if ($this->getEnabled(true))
 		{
-			if($this->getAutoPostBack()
+			if ($this->getAutoPostBack()
 				&& $this->getEnableClientScript()
 				&& $page->getClientSupportsJavaScript())
 			{
 				$this->renderClientControlScript($writer);
 			}
 		}
-		elseif($this->getEnabled())
+		elseif ($this->getEnabled())
 			$writer->addAttribute('disabled', 'disabled');
 		parent::addAttributesToRender($writer);
 	}
@@ -187,10 +187,10 @@ 
 	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))
+			if (($this->_cachedSelectedValue !== null && $this->_cachedSelectedValue === $object->getValue()) || ($this->_cachedSelectedIndex === $index))
 			{
 				$object->setSelected(true);
 				$this->_cachedSelectedValue = null;
@@ -208,25 +208,25 @@ 
 	protected function performDataBinding($data)
 	{
 		$items = $this->getItems();
-		if(!$this->getAppendDataBoundItems())
+		if (!$this->getAppendDataBoundItems())
 			$items->clear();
 		$textField = $this->getDataTextField();
-		if($textField === '')
+		if ($textField === '')
 			$textField = 0;
 		$valueField = $this->getDataValueField();
-		if($valueField === '')
+		if ($valueField === '')
 			$valueField = 1;
 		$textFormat = $this->getDataTextFormatString();
 		$groupField = $this->getDataGroupField();
-		foreach($data as $key => $object)
+		foreach ($data as $key => $object)
 		{
 			$item = $items->createListItem();
-			if(is_array($object) || is_object($object))
+			if (is_array($object) || is_object($object))
 			{
 				$text = TDataFieldAccessor::getDataFieldValue($object, $textField);
 				$value = TDataFieldAccessor::getDataFieldValue($object, $valueField);
 				$item->setValue($value);
-				if($groupField !== '')
+				if ($groupField !== '')
 					$item->setAttribute('Group', TDataFieldAccessor::getDataFieldValue($object, $groupField));
 			}
 			else
@@ -238,22 +238,22 @@ 
 		}
 		// 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();
 		}
-		elseif($this->_cachedSelectedIndex !== -1)
+		elseif ($this->_cachedSelectedIndex !== -1)
 		{
 			$this->setSelectedIndex($this->_cachedSelectedIndex);
 			$this->resetCachedSelections();
 		}
-		elseif($this->_cachedSelectedValues !== null)
+		elseif ($this->_cachedSelectedValues !== null)
 		{
 			$this->setSelectedValues($this->_cachedSelectedValues);
 			$this->resetCachedSelections();
 		}
-		elseif($this->_cachedSelectedIndices !== null)
+		elseif ($this->_cachedSelectedIndices !== null)
 		{
 			$this->setSelectedIndices($this->_cachedSelectedIndices);
 			$this->resetCachedSelections();
@@ -285,7 +285,7 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		if($this->_items)
+		if ($this->_items)
 			$this->setViewState('Items', $this->_items->saveState(), null);
 		else
 			$this->clearViewState('Items');
@@ -299,7 +299,7 @@ 
 	{
 		parent::loadState();
 		$this->_stateLoaded = true;
-		if(!$this->getIsDataBound())
+		if (!$this->getIsDataBound())
 		{
 			$this->_items = $this->createListItemCollection();
 			$this->_items->loadState($this->getViewState('Items', null));
@@ -441,7 +441,7 @@ 
 	 */
 	public function getItemCount()
 	{
-		return $this->_items?$this->_items->getCount():0;
+		return $this->_items ? $this->_items->getCount() : 0;
 	}
 
 	/**
@@ -457,7 +457,7 @@ 
 	 */
 	public function getItems()
 	{
-		if(!$this->_items)
+		if (!$this->_items)
 			$this->_items = $this->createListItemCollection();
 		return $this->_items;
 	}
@@ -467,11 +467,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())
+			for ($i = 0; $i < $n; ++$i)
+				if ($this->_items->itemAt($i)->getSelected())
 					return $i;
 		}
 		return -1;
@@ -482,16 +482,16 @@ 
 	 */
 	public function setSelectedIndex($index)
 	{
-		if(($index = TPropertyValue::ensureInteger($index)) < 0)
+		if (($index = TPropertyValue::ensureInteger($index)) < 0)
 			$index = -1;
-		if($this->_items)
+		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)
+		if ($this->getAdapter() instanceof IListControlAdapter)
 			$this->getAdapter()->setSelectedIndex($index);
 	}
 
@@ -501,11 +501,11 @@ 
 	public function getSelectedIndices()
 	{
 		$selections = [];
-		if($this->_items)
+		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;
@@ -516,15 +516,15 @@ 
 	 */
 	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)
+				foreach ($indices as $index)
 				{
-					if($index >= 0 && $index < $n)
+					if ($index >= 0 && $index < $n)
 						$this->_items->itemAt($index)->setSelected(true);
 				}
 			}
@@ -533,7 +533,7 @@ 
 		else
 			throw new TNotSupportedException('listcontrol_multiselect_unsupported', get_class($this));
 
-		if($this->getAdapter() instanceof IListControlAdapter)
+		if ($this->getAdapter() instanceof IListControlAdapter)
 			$this->getAdapter()->setSelectedIndices($indices);
 	}
 
@@ -542,7 +542,7 @@ 
 	 */
 	public function getSelectedItem()
 	{
-		if(($index = $this->getSelectedIndex()) >= 0)
+		if (($index = $this->getSelectedIndex()) >= 0)
 			return $this->_items->itemAt($index);
 		else
 			return null;
@@ -580,7 +580,7 @@ 
 	public function getSelectedValue()
 	{
 		$index = $this->getSelectedIndex();
-		return $index >= 0?$this->getItems()->itemAt($index)->getValue():'';
+		return $index >= 0 ? $this->getItems()->itemAt($index)->getValue() : '';
 	}
 
 	/**
@@ -591,11 +591,11 @@ 
 	 */
 	public function setSelectedValue($value)
 	{
-		if($this->_items)
+		if ($this->_items)
 		{
-			if($value === null)
+			if ($value === null)
 				$this->clearSelection();
-			elseif(($item = $this->_items->findItemByValue($value)) !== null)
+			elseif (($item = $this->_items->findItemByValue($value)) !== null)
 			{
 				$this->clearSelection();
 				$item->setSelected(true);
@@ -604,7 +604,7 @@ 
 				$this->clearSelection();
 		}
 		$this->_cachedSelectedValue = $value;
-		if($this->getAdapter() instanceof IListControlAdapter)
+		if ($this->getAdapter() instanceof IListControlAdapter)
 			$this->getAdapter()->setSelectedValue($value);
 	}
 
@@ -615,11 +615,11 @@ 
 	public function getSelectedValues()
 	{
 		$values = [];
-		if($this->_items)
+		if ($this->_items)
 		{
-			foreach($this->_items as $item)
+			foreach ($this->_items as $item)
 			{
-				if($item->getSelected())
+				if ($item->getSelected())
 					$values[] = $item->getValue();
 			}
 		}
@@ -631,17 +631,17 @@ 
 	 */
 	public function setSelectedValues($values)
 	{
-		if($this->getIsMultiSelect())
+		if ($this->getIsMultiSelect())
 		{
-			if($this->_items)
+			if ($this->_items)
 			{
 				$this->clearSelection();
 				$lookup = [];
-				foreach($this->_items as $item)
+				foreach ($this->_items as $item)
 					$lookup[$item->getValue()] = $item;
-				foreach($values as $value)
+				foreach ($values as $value)
 				{
-					if(isset($lookup["$value"]))
+					if (isset($lookup["$value"]))
 						$lookup["$value"]->setSelected(true);
 				}
 			}
@@ -650,7 +650,7 @@ 
 		else
 			throw new TNotSupportedException('listcontrol_multiselect_unsupported', get_class($this));
 
-		if($this->getAdapter() instanceof IListControlAdapter)
+		if ($this->getAdapter() instanceof IListControlAdapter)
 			$this->getAdapter()->setSelectedValues($values);
 	}
 
@@ -675,13 +675,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();
 	}
 
@@ -736,7 +736,7 @@ 
 	 */
 	public function setPromptValue($value)
 	{
-		$this->setViewState('PromptValue', (string)$value, '');
+		$this->setViewState('PromptValue', (string) $value, '');
 	}
 
 	/**
@@ -771,9 +771,9 @@ 
 	{
 		$text = $this->getPromptText();
 		$value = $this->getPromptValue();
-		if($value === '')
+		if ($value === '')
 			$value = $text;
-		if($value !== '')
+		if ($value !== '')
 		{
 			$writer->addAttribute('value', $value);
 			$writer->renderBeginTag('option');
@@ -792,26 +792,26 @@ 
 	{
 		$this->renderPrompt($writer);
 
-		if($this->_items)
+		if ($this->_items)
 		{
 			$writer->writeLine();
 			$previousGroup = null;
-			foreach($this->_items as $item)
+			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)
+						if ($group !== $previousGroup)
 						{
-							if($previousGroup !== null)
+							if ($previousGroup !== null)
 							{
 								$writer->renderEndTag();
 								$writer->writeLine();
 								$previousGroup = null;
 							}
-							if($group !== null)
+							if ($group !== null)
 							{
 								$writer->addAttribute('label', $group);
 								$writer->renderBeginTag('optgroup');
@@ -819,16 +819,16 @@ 
 								$previousGroup = $group;
 							}
 						}
-						foreach($item->getAttributes() as $name => $value)
+						foreach ($item->getAttributes() as $name => $value)
 							$writer->addAttribute($name, $value);
 					}
-					elseif($previousGroup !== null)
+					elseif ($previousGroup !== null)
 					{
 						$writer->renderEndTag();
 						$writer->writeLine();
 						$previousGroup = null;
 					}
-					if($item->getSelected())
+					if ($item->getSelected())
 						$writer->addAttribute('selected', 'selected');
 					$writer->addAttribute('value', $item->getValue());
 					$writer->renderBeginTag('option');
@@ -837,7 +837,7 @@ 
 					$writer->writeLine();
 				}
 			}
-			if($previousGroup !== null)
+			if ($previousGroup !== null)
 			{
 				$writer->renderEndTag();
 				$writer->writeLine();
@@ -859,18 +859,18 @@ 
 	 */
 	protected function formatDataValue($formatString, $value)
 	{
-		if($formatString === '')
+		if ($formatString === '')
 			return TPropertyValue::ensureString($value);
-		elseif($formatString[0] === '#')
+		elseif ($formatString[0] === '#')
 		{
 			$expression = strtr(substr($formatString, 1), ['{0}' => '$value']);
 			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());
 			}

Braces +104 added lines, -84 removed lines

@@ -131,8 +131,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()
@@ -141,9 +142,9 @@ 
 			{
 				$this->renderClientControlScript($writer);
 			}
+		} elseif($this->getEnabled()) {
+					$writer->addAttribute('disabled', 'disabled');
 		}
-		elseif($this->getEnabled())
-			$writer->addAttribute('disabled', 'disabled');
 		parent::addAttributesToRender($writer);
 	}
 
@@ -208,14 +209,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)
@@ -226,10 +230,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");
@@ -242,18 +246,15 @@ 
 		{
 			$this->setSelectedValue($this->_cachedSelectedValue);
 			$this->resetCachedSelections();
-		}
-		elseif($this->_cachedSelectedIndex !== -1)
+		} elseif($this->_cachedSelectedIndex !== -1)
 		{
 			$this->setSelectedIndex($this->_cachedSelectedIndex);
 			$this->resetCachedSelections();
-		}
-		elseif($this->_cachedSelectedValues !== null)
+		} elseif($this->_cachedSelectedValues !== null)
 		{
 			$this->setSelectedValues($this->_cachedSelectedValues);
 			$this->resetCachedSelections();
-		}
-		elseif($this->_cachedSelectedIndices !== null)
+		} elseif($this->_cachedSelectedIndices !== null)
 		{
 			$this->setSelectedIndices($this->_cachedSelectedIndices);
 			$this->resetCachedSelections();
@@ -285,10 +286,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');
+		}
 	}
 
 	/**
@@ -457,8 +459,9 @@ 
 	 */
 	public function getItems()
 	{
-		if(!$this->_items)
-			$this->_items = $this->createListItemCollection();
+		if(!$this->_items) {
+					$this->_items = $this->createListItemCollection();
+		}
 		return $this->_items;
 	}
 
@@ -470,9 +473,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;
 	}
@@ -482,17 +486,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);
+		}
 	}
 
 	/**
@@ -504,9 +511,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;
 	}
@@ -524,17 +532,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);
+		}
 	}
 
 	/**
@@ -542,10 +552,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;
+		}
 	}
 
 	/**
@@ -593,19 +604,20 @@ 
 	{
 		if($this->_items)
 		{
-			if($value === null)
-				$this->clearSelection();
-			elseif(($item = $this->_items->findItemByValue($value)) !== null)
+			if($value === null) {
+							$this->clearSelection();
+			} elseif(($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);
+		}
 	}
 
 
@@ -619,8 +631,9 @@ 
 		{
 			foreach($this->_items as $item)
 			{
-				if($item->getSelected())
-					$values[] = $item->getValue();
+				if($item->getSelected()) {
+									$values[] = $item->getValue();
+				}
 			}
 		}
 		return $values;
@@ -637,21 +650,24 @@ 
 			{
 				$this->clearSelection();
 				$lookup = [];
-				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);
+		}
 	}
 
 	/**
@@ -677,12 +693,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();
+		}
 	}
 
 	/**
@@ -771,8 +789,9 @@ 
 	{
 		$text = $this->getPromptText();
 		$value = $this->getPromptValue();
-		if($value === '')
-			$value = $text;
+		if($value === '') {
+					$value = $text;
+		}
 		if($value !== '')
 		{
 			$writer->addAttribute('value', $value);
@@ -819,17 +838,18 @@ 
 								$previousGroup = $group;
 							}
 						}
-						foreach($item->getAttributes() as $name => $value)
-							$writer->addAttribute($name, $value);
-					}
-					elseif($previousGroup !== null)
+						foreach($item->getAttributes() as $name => $value) {
+													$writer->addAttribute($name, $value);
+						}
+					} elseif($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()));
@@ -859,23 +879,23 @@ 
 	 */
 	protected function formatDataValue($formatString, $value)
 	{
-		if($formatString === '')
-			return TPropertyValue::ensureString($value);
-		elseif($formatString[0] === '#')
+		if($formatString === '') {
+					return TPropertyValue::ensureString($value);
+		} elseif($formatString[0] === '#')
 		{
 			$expression = strtr(substr($formatString, 1), ['{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);
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TRepeater.php

Spacing +32 added lines, -32 removed lines

@@ -291,7 +291,7 @@ 
 	 */
 	public function setItemTemplate($value)
 	{
-		if($value instanceof \Prado\Web\UI\ITemplate || $value === null)
+		if ($value instanceof \Prado\Web\UI\ITemplate || $value === null)
 			$this->_itemTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('repeater_template_required', 'ItemTemplate');
@@ -311,7 +311,7 @@ 
 	 */
 	public function setAlternatingItemTemplate($value)
 	{
-		if($value instanceof \Prado\Web\UI\ITemplate || $value === null)
+		if ($value instanceof \Prado\Web\UI\ITemplate || $value === null)
 			$this->_alternatingItemTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('repeater_template_required', 'AlternatingItemTemplate');
@@ -331,7 +331,7 @@ 
 	 */
 	public function setHeaderTemplate($value)
 	{
-		if($value instanceof \Prado\Web\UI\ITemplate || $value === null)
+		if ($value instanceof \Prado\Web\UI\ITemplate || $value === null)
 			$this->_headerTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('repeater_template_required', 'HeaderTemplate');
@@ -351,7 +351,7 @@ 
 	 */
 	public function setFooterTemplate($value)
 	{
-		if($value instanceof \Prado\Web\UI\ITemplate || $value === null)
+		if ($value instanceof \Prado\Web\UI\ITemplate || $value === null)
 			$this->_footerTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('repeater_template_required', 'FooterTemplate');
@@ -371,7 +371,7 @@ 
 	 */
 	public function setEmptyTemplate($value)
 	{
-		if($value instanceof \Prado\Web\UI\ITemplate || $value === null)
+		if ($value instanceof \Prado\Web\UI\ITemplate || $value === null)
 			$this->_emptyTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('repeater_template_required', 'EmptyTemplate');
@@ -391,7 +391,7 @@ 
 	 */
 	public function setSeparatorTemplate($value)
 	{
-		if($value instanceof \Prado\Web\UI\ITemplate || $value === null)
+		if ($value instanceof \Prado\Web\UI\ITemplate || $value === null)
 			$this->_separatorTemplate = $value;
 		else
 			throw new TInvalidDataTypeException('repeater_template_required', 'SeparatorTemplate');
@@ -418,7 +418,7 @@ 
 	 */
 	public function getItems()
 	{
-		if(!$this->_items)
+		if (!$this->_items)
 			$this->_items = new TRepeaterItemCollection;
 		return $this->_items;
 	}
@@ -444,7 +444,7 @@ 
 	 */
 	public function getDataKeys()
 	{
-		if(($dataKeys = $this->getViewState('DataKeys', null)) === null)
+		if (($dataKeys = $this->getViewState('DataKeys', null)) === null)
 		{
 			$dataKeys = new TList;
 			$this->setViewState('DataKeys', $dataKeys, null);
@@ -461,7 +461,7 @@ 
 	 */
 	private function createItemInternal($itemIndex, $itemType)
 	{
-		if(($item = $this->createItem($itemIndex, $itemType)) !== null)
+		if (($item = $this->createItem($itemIndex, $itemType)) !== null)
 		{
 			$param = new TRepeaterItemEventParameter($item);
 			$this->onItemCreated($param);
@@ -482,10 +482,10 @@ 
 	 */
 	private function createItemWithDataInternal($itemIndex, $itemType, $dataItem)
 	{
-		if(($item = $this->createItem($itemIndex, $itemType)) !== null)
+		if (($item = $this->createItem($itemIndex, $itemType)) !== null)
 		{
 			$param = new TRepeaterItemEventParameter($item);
-			if($item instanceof \Prado\IDataRenderer)
+			if ($item instanceof \Prado\IDataRenderer)
 				$item->setData($dataItem);
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
@@ -507,14 +507,14 @@ 
 	{
 		$template = null;
 		$classPath = null;
-		switch($itemType)
+		switch ($itemType)
 		{
 			case TListItemType::Item :
 				$classPath = $this->getItemRenderer();
 				$template = $this->_itemTemplate;
 				break;
 			case TListItemType::AlternatingItem :
-				if(($classPath = $this->getAlternatingItemRenderer()) === '' && ($template = $this->_alternatingItemTemplate) === null)
+				if (($classPath = $this->getAlternatingItemRenderer()) === '' && ($template = $this->_alternatingItemTemplate) === null)
 				{
 					$classPath = $this->getItemRenderer();
 					$template = $this->_itemTemplate;
@@ -535,16 +535,16 @@ 
 			default:
 				throw new TInvalidDataValueException('repeater_itemtype_unknown', $itemType);
 		}
-		if($classPath !== '')
+		if ($classPath !== '')
 		{
 			$item = Prado::createComponent($classPath);
-			if($item instanceof IItemDataRenderer)
+			if ($item instanceof IItemDataRenderer)
 			{
 				$item->setItemIndex($itemIndex);
 				$item->setItemType($itemType);
 			}
 		}
-		elseif($template !== null)
+		elseif ($template !== null)
 		{
 			$item = new TRepeaterItem;
 			$item->setItemIndex($itemIndex);
@@ -562,9 +562,9 @@ 
 	 */
 	protected function createEmptyContent()
 	{
-		if(($classPath = $this->getEmptyRenderer()) !== '')
+		if (($classPath = $this->getEmptyRenderer()) !== '')
 			$this->getControls()->add(Prado::createComponent($classPath));
-		elseif($this->_emptyTemplate !== null)
+		elseif ($this->_emptyTemplate !== null)
 			$this->_emptyTemplate->instantiateIn($this);
 	}
 
@@ -576,7 +576,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->_items && $this->_items->getCount() || $this->_emptyTemplate !== null || $this->getEmptyRenderer() !== '')
+		if ($this->_items && $this->_items->getCount() || $this->_emptyTemplate !== null || $this->getEmptyRenderer() !== '')
 			$this->renderContents($writer);
 	}
 
@@ -587,7 +587,7 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		if($this->_items)
+		if ($this->_items)
 			$this->setViewState('ItemCount', $this->_items->getCount(), 0);
 		else
 			$this->clearViewState('ItemCount');
@@ -600,7 +600,7 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		if(!$this->getIsDataBound())
+		if (!$this->getIsDataBound())
 			$this->restoreItemsFromViewState();
 		$this->clearViewState('ItemCount');
 	}
@@ -622,16 +622,16 @@ 
 	protected function restoreItemsFromViewState()
 	{
 		$this->reset();
-		if(($itemCount = $this->getViewState('ItemCount', 0)) > 0)
+		if (($itemCount = $this->getViewState('ItemCount', 0)) > 0)
 		{
 			$items = $this->getItems();
 			$hasSeparator = $this->_separatorTemplate !== null || $this->getSeparatorRenderer() !== '';
 			$this->_header = $this->createItemInternal(-1, TListItemType::Header);
-			for($i = 0;$i < $itemCount;++$i)
+			for ($i = 0; $i < $itemCount; ++$i)
 			{
-				if($hasSeparator && $i > 0)
+				if ($hasSeparator && $i > 0)
 					$this->createItemInternal($i - 1, TListItemType::Separator);
-				$itemType = $i % 2 == 0?TListItemType::Item : TListItemType::AlternatingItem;
+				$itemType = $i % 2 == 0 ?TListItemType::Item : TListItemType::AlternatingItem;
 				$items->add($this->createItemInternal($i, $itemType, false, null));
 			}
 			$this->_footer = $this->createItemInternal(-1, TListItemType::Footer);
@@ -658,21 +658,21 @@ 
 		$items = $this->getItems();
 		$itemIndex = 0;
 		$hasSeparator = $this->_separatorTemplate !== null || $this->getSeparatorRenderer() !== '';
-		foreach($data as $key => $dataItem)
+		foreach ($data as $key => $dataItem)
 		{
-			if($keyField !== '')
+			if ($keyField !== '')
 				$keys->add($this->getDataFieldValue($dataItem, $keyField));
 			else
 				$keys->add($key);
-			if($itemIndex === 0)
+			if ($itemIndex === 0)
 				$this->_header = $this->createItemWithDataInternal(-1, TListItemType::Header, null);
-			if($hasSeparator && $itemIndex > 0)
+			if ($hasSeparator && $itemIndex > 0)
 				$this->createItemWithDataInternal($itemIndex - 1, TListItemType::Separator, null);
-			$itemType = $itemIndex % 2 == 0?TListItemType::Item : TListItemType::AlternatingItem;
+			$itemType = $itemIndex % 2 == 0 ?TListItemType::Item : TListItemType::AlternatingItem;
 			$items->add($this->createItemWithDataInternal($itemIndex, $itemType, $dataItem));
 			$itemIndex++;
 		}
-		if($itemIndex > 0)
+		if ($itemIndex > 0)
 			$this->_footer = $this->createItemWithDataInternal(-1, TListItemType::Footer, null);
 		else
 		{
@@ -693,7 +693,7 @@ 
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		if($param instanceof TRepeaterCommandEventParameter)
+		if ($param instanceof TRepeaterCommandEventParameter)
 		{
 			$this->onItemCommand($param);
 			return true;

Braces +80 added lines, -65 removed lines

@@ -291,10 +291,11 @@ 
 	 */
 	public function setItemTemplate($value)
 	{
-		if($value instanceof \Prado\Web\UI\ITemplate || $value === null)
-			$this->_itemTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('repeater_template_required', 'ItemTemplate');
+		if($value instanceof \Prado\Web\UI\ITemplate || $value === null) {
+					$this->_itemTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('repeater_template_required', 'ItemTemplate');
+		}
 	}
 
 	/**
@@ -311,10 +312,11 @@ 
 	 */
 	public function setAlternatingItemTemplate($value)
 	{
-		if($value instanceof \Prado\Web\UI\ITemplate || $value === null)
-			$this->_alternatingItemTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('repeater_template_required', 'AlternatingItemTemplate');
+		if($value instanceof \Prado\Web\UI\ITemplate || $value === null) {
+					$this->_alternatingItemTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('repeater_template_required', 'AlternatingItemTemplate');
+		}
 	}
 
 	/**
@@ -331,10 +333,11 @@ 
 	 */
 	public function setHeaderTemplate($value)
 	{
-		if($value instanceof \Prado\Web\UI\ITemplate || $value === null)
-			$this->_headerTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('repeater_template_required', 'HeaderTemplate');
+		if($value instanceof \Prado\Web\UI\ITemplate || $value === null) {
+					$this->_headerTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('repeater_template_required', 'HeaderTemplate');
+		}
 	}
 
 	/**
@@ -351,10 +354,11 @@ 
 	 */
 	public function setFooterTemplate($value)
 	{
-		if($value instanceof \Prado\Web\UI\ITemplate || $value === null)
-			$this->_footerTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('repeater_template_required', 'FooterTemplate');
+		if($value instanceof \Prado\Web\UI\ITemplate || $value === null) {
+					$this->_footerTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('repeater_template_required', 'FooterTemplate');
+		}
 	}
 
 	/**
@@ -371,10 +375,11 @@ 
 	 */
 	public function setEmptyTemplate($value)
 	{
-		if($value instanceof \Prado\Web\UI\ITemplate || $value === null)
-			$this->_emptyTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('repeater_template_required', 'EmptyTemplate');
+		if($value instanceof \Prado\Web\UI\ITemplate || $value === null) {
+					$this->_emptyTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('repeater_template_required', 'EmptyTemplate');
+		}
 	}
 
 	/**
@@ -391,10 +396,11 @@ 
 	 */
 	public function setSeparatorTemplate($value)
 	{
-		if($value instanceof \Prado\Web\UI\ITemplate || $value === null)
-			$this->_separatorTemplate = $value;
-		else
-			throw new TInvalidDataTypeException('repeater_template_required', 'SeparatorTemplate');
+		if($value instanceof \Prado\Web\UI\ITemplate || $value === null) {
+					$this->_separatorTemplate = $value;
+		} else {
+					throw new TInvalidDataTypeException('repeater_template_required', 'SeparatorTemplate');
+		}
 	}
 
 	/**
@@ -418,8 +424,9 @@ 
 	 */
 	public function getItems()
 	{
-		if(!$this->_items)
-			$this->_items = new TRepeaterItemCollection;
+		if(!$this->_items) {
+					$this->_items = new TRepeaterItemCollection;
+		}
 		return $this->_items;
 	}
 
@@ -467,9 +474,9 @@ 
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
 			return $item;
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	/**
@@ -485,16 +492,17 @@ 
 		if(($item = $this->createItem($itemIndex, $itemType)) !== null)
 		{
 			$param = new TRepeaterItemEventParameter($item);
-			if($item instanceof \Prado\IDataRenderer)
-				$item->setData($dataItem);
+			if($item instanceof \Prado\IDataRenderer) {
+							$item->setData($dataItem);
+			}
 			$this->onItemCreated($param);
 			$this->getControls()->add($item);
 			$item->dataBind();
 			$this->onItemDataBound($param);
 			return $item;
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	/**
@@ -543,16 +551,15 @@ 
 				$item->setItemIndex($itemIndex);
 				$item->setItemType($itemType);
 			}
-		}
-		elseif($template !== null)
+		} elseif($template !== null)
 		{
 			$item = new TRepeaterItem;
 			$item->setItemIndex($itemIndex);
 			$item->setItemType($itemType);
 			$template->instantiateIn($item);
+		} else {
+					$item = null;
 		}
-		else
-			$item = null;
 
 		return $item;
 	}
@@ -562,10 +569,11 @@ 
 	 */
 	protected function createEmptyContent()
 	{
-		if(($classPath = $this->getEmptyRenderer()) !== '')
-			$this->getControls()->add(Prado::createComponent($classPath));
-		elseif($this->_emptyTemplate !== null)
-			$this->_emptyTemplate->instantiateIn($this);
+		if(($classPath = $this->getEmptyRenderer()) !== '') {
+					$this->getControls()->add(Prado::createComponent($classPath));
+		} elseif($this->_emptyTemplate !== null) {
+					$this->_emptyTemplate->instantiateIn($this);
+		}
 	}
 
 	/**
@@ -576,8 +584,9 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->_items && $this->_items->getCount() || $this->_emptyTemplate !== null || $this->getEmptyRenderer() !== '')
-			$this->renderContents($writer);
+		if($this->_items && $this->_items->getCount() || $this->_emptyTemplate !== null || $this->getEmptyRenderer() !== '') {
+					$this->renderContents($writer);
+		}
 	}
 
 	/**
@@ -587,10 +596,11 @@ 
 	public function saveState()
 	{
 		parent::saveState();
-		if($this->_items)
-			$this->setViewState('ItemCount', $this->_items->getCount(), 0);
-		else
-			$this->clearViewState('ItemCount');
+		if($this->_items) {
+					$this->setViewState('ItemCount', $this->_items->getCount(), 0);
+		} else {
+					$this->clearViewState('ItemCount');
+		}
 	}
 
 	/**
@@ -600,8 +610,9 @@ 
 	public function loadState()
 	{
 		parent::loadState();
-		if(!$this->getIsDataBound())
-			$this->restoreItemsFromViewState();
+		if(!$this->getIsDataBound()) {
+					$this->restoreItemsFromViewState();
+		}
 		$this->clearViewState('ItemCount');
 	}
 
@@ -629,15 +640,16 @@ 
 			$this->_header = $this->createItemInternal(-1, TListItemType::Header);
 			for($i = 0;$i < $itemCount;++$i)
 			{
-				if($hasSeparator && $i > 0)
-					$this->createItemInternal($i - 1, TListItemType::Separator);
+				if($hasSeparator && $i > 0) {
+									$this->createItemInternal($i - 1, TListItemType::Separator);
+				}
 				$itemType = $i % 2 == 0?TListItemType::Item : TListItemType::AlternatingItem;
 				$items->add($this->createItemInternal($i, $itemType, false, null));
 			}
 			$this->_footer = $this->createItemInternal(-1, TListItemType::Footer);
+		} else {
+					$this->createEmptyContent();
 		}
-		else
-			$this->createEmptyContent();
 		$this->clearChildState();
 	}
 
@@ -660,21 +672,24 @@ 
 		$hasSeparator = $this->_separatorTemplate !== null || $this->getSeparatorRenderer() !== '';
 		foreach($data as $key => $dataItem)
 		{
-			if($keyField !== '')
-				$keys->add($this->getDataFieldValue($dataItem, $keyField));
-			else
-				$keys->add($key);
-			if($itemIndex === 0)
-				$this->_header = $this->createItemWithDataInternal(-1, TListItemType::Header, null);
-			if($hasSeparator && $itemIndex > 0)
-				$this->createItemWithDataInternal($itemIndex - 1, TListItemType::Separator, null);
+			if($keyField !== '') {
+							$keys->add($this->getDataFieldValue($dataItem, $keyField));
+			} else {
+							$keys->add($key);
+			}
+			if($itemIndex === 0) {
+							$this->_header = $this->createItemWithDataInternal(-1, TListItemType::Header, null);
+			}
+			if($hasSeparator && $itemIndex > 0) {
+							$this->createItemWithDataInternal($itemIndex - 1, TListItemType::Separator, null);
+			}
 			$itemType = $itemIndex % 2 == 0?TListItemType::Item : TListItemType::AlternatingItem;
 			$items->add($this->createItemWithDataInternal($itemIndex, $itemType, $dataItem));
 			$itemIndex++;
 		}
-		if($itemIndex > 0)
-			$this->_footer = $this->createItemWithDataInternal(-1, TListItemType::Footer, null);
-		else
+		if($itemIndex > 0) {
+					$this->_footer = $this->createItemWithDataInternal(-1, TListItemType::Footer, null);
+		} else
 		{
 			$this->createEmptyContent();
 			$this->dataBindChildren();
@@ -697,9 +712,9 @@ 
 		{
 			$this->onItemCommand($param);
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**

framework/Web/UI/WebControls/TSlider.php

Spacing +17 added lines, -17 removed lines

@@ -151,7 +151,7 @@ 
 	/**
 	 * @return boolean wether to display a progress indicator or not. Defaults to true.
 	 */
-	public function getProgressIndicator ()
+	public function getProgressIndicator()
 	{
 		return $this->getViewState('ProgressIndicator', true);
 	}
@@ -159,7 +159,7 @@ 
 	/**
 	 * @param boolean wether to display a progress indicator or not. Defaults to true.
 	 */
-	public function setProgressIndicator ($value)
+	public function setProgressIndicator($value)
 	{
 		$this->setViewState('ProgressIndicator', TPropertyValue::ensureBoolean($value), true);
 	}
@@ -296,8 +296,8 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		$value = (float)$values[$this->getClientID() . '_1'];
-		if($this->getValue() !== $value)
+		$value = (float) $values[$this->getClientID().'_1'];
+		if ($this->getValue() !== $value)
 		{
 			$this->setValue($value);
 			return $this->_dataChanged = true;
@@ -319,7 +319,7 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientScript === null)
+		if ($this->_clientScript === null)
 			$this->_clientScript = $this->createClientScript();
 		return $this->_clientScript;
 	}
@@ -335,7 +335,7 @@ 
 	/**
 	 * @return string the HTML tag name for slider. Defaults to div.
 	 */
-	public function getTagName ()
+	public function getTagName()
 	{
 		return "div";
 	}
@@ -350,8 +350,8 @@ 
 		$writer->addAttribute('id', $this->getClientID());
 		if ($this->getCssClass() === '')
 		{
-			$class = ($this->getDirection() == TSliderDirection::Horizontal)?'HorizontalSlider':'VerticalSlider';
-			$writer->addAttribute('class', 'Slider ' . $class);
+			$class = ($this->getDirection() == TSliderDirection::Horizontal) ? 'HorizontalSlider' : 'VerticalSlider';
+			$writer->addAttribute('class', 'Slider '.$class);
 		}
 
 	}
@@ -363,13 +363,13 @@ 
 	{
 		// Render the 'Track'
 		$writer->addAttribute('class', 'Track');
-		$writer->addAttribute('id', $this->getClientID() . '_track');
+		$writer->addAttribute('id', $this->getClientID().'_track');
 		$writer->renderBeginTag('div');
 		// Render the 'Progress Indicator'
 		if ($this->getProgressIndicator())
 		{
 			$writer->addAttribute('class', 'Progress');
-			$writer->addAttribute('id', $this->getClientID() . '_progress');
+			$writer->addAttribute('id', $this->getClientID().'_progress');
 			$writer->renderBeginTag('div');
 			$writer->renderEndTag();
 		}
@@ -394,7 +394,7 @@ 
 
 		// Render the 'Handle'
 		$writer->addAttribute('class', 'Handle');
-		$writer->addAttribute('id', $this->getClientID() . '_handle');
+		$writer->addAttribute('id', $this->getClientID().'_handle');
 		$writer->renderBeginTag('div');
 		$writer->renderEndTag();
 	}
@@ -403,7 +403,7 @@ 
 	 * This method is invoked right before the control rendering, if the control is visible.
 	 * @param mixed event parameter
 	 */
-	public function onPreRender ($param)
+	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
 		$this->registerStyleSheet();
@@ -418,11 +418,11 @@ 
 	 */
 	protected function registerStyleSheet()
 	{
-		if(($url = $this->getCssUrl()) === '')
+		if (($url = $this->getCssUrl()) === '')
 		{
 			$manager = $this->getApplication()->getAssetManager();
 			// publish the assets
-			$url = $manager->publishFilePath(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'TSlider');
+			$url = $manager->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'TSlider');
 			$url .= '/TSlider.css';
 		}
 		$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
@@ -437,7 +437,7 @@ 
 		$cs = $page->getClientScript();
 		$cs->registerPradoScript("slider");
 		$id = $this->getClientID();
-		$cs->registerHiddenField($id . '_1', $this->getValue());
+		$cs->registerHiddenField($id.'_1', $this->getValue());
 		$page->registerRequiresPostData($this);
 		$cs->registerPostBackControl($this->getClientClassName(), $this->getSliderOptions());
 	}
@@ -485,13 +485,13 @@ 
 				$step = ($maxValue - $minValue) / self::MAX_STEPS;
 			}
 			$values = [];
-			for ($i = $minValue;$i <= $maxValue;$i += $step)
+			for ($i = $minValue; $i <= $maxValue; $i += $step)
 				$values[] = $i;
 			// Add max if it's not in the array because of step
 			if (!in_array($maxValue, $values)) $values[] = $maxValue;
 		}
 		$options['values'] = $values;
-		if($this->_clientScript !== null)
+		if ($this->_clientScript !== null)
 			$options = array_merge($options, $this->_clientScript->getOptions()->toArray());
 		return $options;
 	}

Braces +27 added lines, -15 removed lines

@@ -301,9 +301,9 @@ 
 		{
 			$this->setValue($value);
 			return $this->_dataChanged = true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -319,8 +319,9 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientScript === null)
-			$this->_clientScript = $this->createClientScript();
+		if($this->_clientScript === null) {
+					$this->_clientScript = $this->createClientScript();
+		}
 		return $this->_clientScript;
 	}
 
@@ -466,16 +467,23 @@ 
 		if (!empty($values))
 		{
 			// Values are provided. Check if min/max are present in them
-			if (!in_array($minValue, $values)) $values[] = $minValue;
-			if (!in_array($maxValue, $values)) $values[] = $maxValue;
+			if (!in_array($minValue, $values)) {
+				$values[] = $minValue;
+			}
+			if (!in_array($maxValue, $values)) {
+				$values[] = $maxValue;
+			}
 			// Remove all values outsize the range [min..max]
 			foreach ($values as $idx => $value)
 			{
-				if ($value < $minValue) unset($values[$idx]);
-				if ($value > $maxValue) unset($values[$idx]);
+				if ($value < $minValue) {
+					unset($values[$idx]);
+				}
+				if ($value > $maxValue) {
+					unset($values[$idx]);
+				}
 			}
-		}
-		else
+		} else
 		{
 			// Values are not provided, generate automatically using stepsize
 			$step = $this->getStepSize();
@@ -485,14 +493,18 @@ 
 				$step = ($maxValue - $minValue) / self::MAX_STEPS;
 			}
 			$values = [];
-			for ($i = $minValue;$i <= $maxValue;$i += $step)
-				$values[] = $i;
+			for ($i = $minValue;$i <= $maxValue;$i += $step) {
+							$values[] = $i;
+			}
 			// Add max if it's not in the array because of step
-			if (!in_array($maxValue, $values)) $values[] = $maxValue;
+			if (!in_array($maxValue, $values)) {
+				$values[] = $maxValue;
+			}
 		}
 		$options['values'] = $values;
-		if($this->_clientScript !== null)
-			$options = array_merge($options, $this->_clientScript->getOptions()->toArray());
+		if($this->_clientScript !== null) {
+					$options = array_merge($options, $this->_clientScript->getOptions()->toArray());
+		}
 		return $options;
 	}
 }
\ No newline at end of file

framework/Web/UI/WebControls/TTemplatedWizardStep.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 	public function createChildControls()
 	{
 		$this->getControls()->clear();
-		if($this->_contentTemplate)
+		if ($this->_contentTemplate)
 			$this->_contentTemplate->instantiateIn($this);
 	}
 
@@ -108,7 +108,7 @@ 
 	 */
 	public function instantiateNavigationTemplate()
 	{
-		if(!$this->_navigationContainer && $this->_navigationTemplate)
+		if (!$this->_navigationContainer && $this->_navigationTemplate)
 		{
 			$this->_navigationContainer = new TWizardNavigationContainer;
 			$this->_navigationTemplate->instantiateIn($this->_navigationContainer);

Braces +3 added lines, -2 removed lines

@@ -48,8 +48,9 @@
 	public function createChildControls()
 	{
 		$this->getControls()->clear();
-		if($this->_contentTemplate)
-			$this->_contentTemplate->instantiateIn($this);
+		if($this->_contentTemplate) {
+					$this->_contentTemplate->instantiateIn($this);
+		}
 	}
 
 	/**

framework/Web/UI/WebControls/TReadOnlyDataSourceView.php

Spacing +2 added lines, -2 removed lines

@@ -28,9 +28,9 @@
 	public function __construct(IDataSource $owner, $viewName, $dataSource)
 	{
 		parent::__construct($owner, $viewName);
-		if($dataSource === null || is_array($dataSource))
+		if ($dataSource === null || is_array($dataSource))
 			$this->_dataSource = new TMap($dataSource);
-		elseif($dataSource instanceof \Traversable)
+		elseif ($dataSource instanceof \Traversable)
 			$this->_dataSource = $dataSource;
 		else
 			throw new TInvalidDataTypeException('readonlydatasourceview_datasource_invalid');

Braces +7 added lines, -6 removed lines

@@ -28,12 +28,13 @@
 	public function __construct(IDataSource $owner, $viewName, $dataSource)
 	{
 		parent::__construct($owner, $viewName);
-		if($dataSource === null || is_array($dataSource))
-			$this->_dataSource = new TMap($dataSource);
-		elseif($dataSource instanceof \Traversable)
-			$this->_dataSource = $dataSource;
-		else
-			throw new TInvalidDataTypeException('readonlydatasourceview_datasource_invalid');
+		if($dataSource === null || is_array($dataSource)) {
+					$this->_dataSource = new TMap($dataSource);
+		} elseif($dataSource instanceof \Traversable) {
+					$this->_dataSource = $dataSource;
+		} else {
+					throw new TInvalidDataTypeException('readonlydatasourceview_datasource_invalid');
+		}
 	}
 
 	public function select($parameters)

framework/Web/UI/WebControls/TImage.php

Spacing +2 added lines, -2 removed lines

@@ -43,9 +43,9 @@
 	{
 		$writer->addAttribute('src', $this->getImageUrl());
 		$writer->addAttribute('alt', $this->getAlternateText());
-		if(($desc = $this->getDescriptionUrl()) !== '')
+		if (($desc = $this->getDescriptionUrl()) !== '')
 			$writer->addAttribute('longdesc', $desc);
-		if(($align = $this->getImageAlign()) !== '')
+		if (($align = $this->getImageAlign()) !== '')
 			$writer->addAttribute('align', $align);
 		parent::addAttributesToRender($writer);
 	}

Braces +6 added lines, -4 removed lines

@@ -43,10 +43,12 @@
 	{
 		$writer->addAttribute('src', $this->getImageUrl());
 		$writer->addAttribute('alt', $this->getAlternateText());
-		if(($desc = $this->getDescriptionUrl()) !== '')
-			$writer->addAttribute('longdesc', $desc);
-		if(($align = $this->getImageAlign()) !== '')
-			$writer->addAttribute('align', $align);
+		if(($desc = $this->getDescriptionUrl()) !== '') {
+					$writer->addAttribute('longdesc', $desc);
+		}
+		if(($align = $this->getImageAlign()) !== '') {
+					$writer->addAttribute('align', $align);
+		}
 		parent::addAttributesToRender($writer);
 	}