pradosoft / prado

framework/Web/UI/WebControls/assets/captcha.php

Doc Comments +20 added lines

@@ -54,6 +54,9 @@ 
 	return $caseSensitive?$token:strtoupper($token);
 }
 
+/**
+ * @param string $hex
+ */
 function hash2string($hex,$alphabet)
 {
 	if(strlen($alphabet)<2)
@@ -121,6 +124,11 @@ 
 	imagedestroy($image);
 }
 
+/**
+ * @param resource $image
+ * @param double $width
+ * @param double $height
+ */
 function addBackground($image,$width,$height,$opaque,$noisy,$hasGrid,$hasScribble,$morph)
 {
 	$background=imagecreatetruecolor($width*2,$height*2);
@@ -148,6 +156,9 @@ 
 		imagecolortransparent($image,$white);
 }
 
+/**
+ * @param resource $image
+ */
 function addNoise($image,$width,$height)
 {
 	for($x=0;$x<$width;++$x)
@@ -164,6 +175,9 @@ 
 	}
 }
 
+/**
+ * @param resource $image
+ */
 function addGrid($image,$width,$height)
 {
 	for($i=0;$i<$width;$i+=rand(15,25))
@@ -182,6 +196,9 @@ 
 	}
 }
 
+/**
+ * @param resource $image
+ */
 function addScribble($image,$width,$height)
 {
 	for($i=0;$i<8;$i++)
@@ -199,6 +216,9 @@ 
 	}
 }
 
+/**
+ * @param resource $image
+ */
 function morphImage($image,$width,$height)
 {
 	$tempImage=imagecreatetruecolor($width,$height);

Indentation +14 added lines, -14 removed lines

@@ -100,21 +100,21 @@ 
 	$font=dirname(__FILE__).DIRECTORY_SEPARATOR.'verase.ttf';
 
 	if(function_exists('imagefilter'))
-    	imagefilter($image,IMG_FILTER_GAUSSIAN_BLUR);
+		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);
-        $angle=rand(-30,30);
-        $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]);
-        imagecolordeallocate($image,$color);
-    }
+		$color=imagecolorallocate($image,rand(150,220),rand(150,220),rand(150,220));
+		$size=rand($fontWidth-10,$fontWidth);
+		$angle=rand(-30,30);
+		$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]);
+		imagecolordeallocate($image,$color);
+	}
 
 	header('Content-Type: image/png');
 	imagepng($image);
@@ -158,8 +158,8 @@ 
 			{
 				$color=imagecolorallocate($image,rand(150,220),rand(150,220),rand(150,220));
 				imagesetpixel($image,$x,$y,$color);
-	            imagecolordeallocate($image,$color);
-	        }
+				imagecolordeallocate($image,$color);
+			}
 		}
 	}
 }

Spacing +133 added lines, -134 removed lines

@@ -9,111 +9,110 @@ 
  * @package System.Web.UI.WebControls.assets
  */
 
-define('THEME_OPAQUE_BACKGROUND',0x0001);
-define('THEME_NOISY_BACKGROUND',0x0002);
-define('THEME_HAS_GRID',0x0004);
-define('THEME_HAS_SCRIBBLE',0x0008);
-define('THEME_MORPH_BACKGROUND',0x0010);
-define('THEME_SHADOWED_TEXT',0x0020);
+define('THEME_OPAQUE_BACKGROUND', 0x0001);
+define('THEME_NOISY_BACKGROUND', 0x0002);
+define('THEME_HAS_GRID', 0x0004);
+define('THEME_HAS_SCRIBBLE', 0x0008);
+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;
+$token = 'error';
+$theme = 0;
 
-if(isset($_GET['options']))
+if (isset($_GET['options']))
 {
-	$str=base64_decode($_GET['options']);
-	if(strlen($str)>32)
+	$str = base64_decode($_GET['options']);
+	if (strlen($str) > 32)
 	{
-		$hash=substr($str,0,32);
-		$str=substr($str,32);
-		if(md5($privateKey.$str)===$hash)
+		$hash = substr($str, 0, 32);
+		$str = substr($str, 32);
+		if (md5($privateKey . $str) === $hash)
 		{
-			$options=unserialize($str);
-			$publicKey=$options['publicKey'];
-			$tokenLength=$options['tokenLength'];
-			$caseSensitive=$options['caseSensitive'];
-			$alphabet=$options['alphabet'];
-			$fontSize=$options['fontSize'];
-			$theme=$options['theme'];
-			if(($randomSeed=$options['randomSeed'])>0)
+			$options = unserialize($str);
+			$publicKey = $options['publicKey'];
+			$tokenLength = $options['tokenLength'];
+			$caseSensitive = $options['caseSensitive'];
+			$alphabet = $options['alphabet'];
+			$fontSize = $options['fontSize'];
+			$theme = $options['theme'];
+			if (($randomSeed = $options['randomSeed']) > 0)
 				srand($randomSeed);
 			else
-				srand((int)(microtime()*1000000));
-			$token=generateToken($publicKey,$privateKey,$alphabet,$tokenLength,$caseSensitive);
+				srand((int) (microtime() * 1000000));
+			$token = generateToken($publicKey, $privateKey, $alphabet, $tokenLength, $caseSensitive);
 		}
 	}
 }
 
-displayToken($token,$fontSize,$theme);
+displayToken($token, $fontSize, $theme);
 
-function generateToken($publicKey,$privateKey,$alphabet,$tokenLength,$caseSensitive)
+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)
+function hash2string($hex, $alphabet)
 {
-	if(strlen($alphabet)<2)
-		$alphabet='234578adefhijmnrtABDEFGHJLMNRT';
-	$hexLength=strlen($hex);
-	$base=strlen($alphabet);
-	$result='';
-	for($i=0;$i<$hexLength;$i+=6)
+	if (strlen($alphabet) < 2)
+		$alphabet = '234578adefhijmnrtABDEFGHJLMNRT';
+	$hexLength = strlen($hex);
+	$base = strlen($alphabet);
+	$result = '';
+	for ($i = 0; $i < $hexLength; $i += 6)
 	{
-		$number=hexdec(substr($hex,$i,6));
-		while($number)
+		$number = hexdec(substr($hex, $i, 6));
+		while ($number)
 		{
-			$result.=$alphabet[$number%$base];
-			$number=floor($number/$base);
+			$result .= $alphabet[$number % $base];
+			$number = floor($number / $base);
 		}
 	}
 	return $result;
 }
 
-function displayToken($token,$fontSize,$theme)
+function displayToken($token, $fontSize, $theme)
 {
-	if(($fontSize=(int)$fontSize)<22)
-		$fontSize=22;
-	if($fontSize>100)
-		$fontSize=100;
-	$length=strlen($token);
-	$padding=10;
-	$fontWidth=$fontSize;
-	$fontHeight=floor($fontWidth*1.5);
-	$width=$fontWidth*$length+$padding*2;
-	$height=$fontHeight;
-	$image=imagecreatetruecolor($width,$height);
-
-	addBackground
-	(
+	if (($fontSize = (int) $fontSize) < 22)
+		$fontSize = 22;
+	if ($fontSize > 100)
+		$fontSize = 100;
+	$length = strlen($token);
+	$padding = 10;
+	$fontWidth = $fontSize;
+	$fontHeight = floor($fontWidth * 1.5);
+	$width = $fontWidth * $length + $padding * 2;
+	$height = $fontHeight;
+	$image = imagecreatetruecolor($width, $height);
+
+	addBackground(
 		$image, $width, $height,
-		$theme&THEME_OPAQUE_BACKGROUND,
-		$theme&THEME_NOISY_BACKGROUND,
-		$theme&THEME_HAS_GRID,
-		$theme&THEME_HAS_SCRIBBLE,
-		$theme&THEME_MORPH_BACKGROUND
+		$theme & THEME_OPAQUE_BACKGROUND,
+		$theme & THEME_NOISY_BACKGROUND,
+		$theme & THEME_HAS_GRID,
+		$theme & THEME_HAS_SCRIBBLE,
+		$theme & THEME_MORPH_BACKGROUND
 	);
 
-	$font=dirname(__FILE__).DIRECTORY_SEPARATOR.'verase.ttf';
+	$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++)
+	$hasShadow = ($theme & THEME_SHADOWED_TEXT);
+    for ($i = 0; $i < $length; $i++)
 	{
-        $color=imagecolorallocate($image,rand(150,220),rand(150,220),rand(150,220));
-        $size=rand($fontWidth-10,$fontWidth);
-        $angle=rand(-30,30);
-        $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]);
-        imagecolordeallocate($image,$color);
+        $color = imagecolorallocate($image, rand(150, 220), rand(150, 220), rand(150, 220));
+        $size = rand($fontWidth - 10, $fontWidth);
+        $angle = rand(-30, 30);
+        $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]);
+        imagecolordeallocate($image, $color);
     }
 
 	header('Content-Type: image/png');
@@ -121,103 +120,103 @@ 
 	imagedestroy($image);
 }
 
-function addBackground($image,$width,$height,$opaque,$noisy,$hasGrid,$hasScribble,$morph)
+function addBackground($image, $width, $height, $opaque, $noisy, $hasGrid, $hasScribble, $morph)
 {
-	$background=imagecreatetruecolor($width*2,$height*2);
-	$white=imagecolorallocate($background,255,255,255);
-	imagefill($background,0,0,$white);
+	$background = imagecreatetruecolor($width * 2, $height * 2);
+	$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);
+	imagecopy($image, $background, 0, 0, 30, 30, $width, $height);
 
-	if(!$opaque)
-		imagecolortransparent($image,$white);
+	if (!$opaque)
+		imagecolortransparent($image, $white);
 }
 
-function addNoise($image,$width,$height)
+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);
-	            imagecolordeallocate($image,$color);
+				$color = imagecolorallocate($image, rand(150, 220), rand(150, 220), rand(150, 220));
+				imagesetpixel($image, $x, $y, $color);
+	            imagecolordeallocate($image, $color);
 	        }
 		}
 	}
 }
 
-function addGrid($image,$width,$height)
+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);
+		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));
-		imageline($image,0,$i+rand(-10,20),$width,$i+rand(-10,20),$color);
-		imagecolordeallocate($image,$color);
+		imagesetthickness($image, rand(2, 6));
+		$color = imagecolorallocate($image, rand(100, 180), rand(100, 180), rand(100, 180));
+		imageline($image, 0, $i + rand(-10, 20), $width, $i + rand(-10, 20), $color);
+		imagecolordeallocate($image, $color);
 	}
 }
 
-function addScribble($image,$width,$height)
+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=array();
-		for($j=1;$j<rand(5,10);$j++)
+		$color = imagecolorallocate($image, rand(100, 180), rand(100, 180), rand(100, 180));
+		$points = array();
+		for ($j = 1; $j < rand(5, 10); $j++)
 		{
-			$points[]=rand(2*(20*($i+1)),2*(50*($i+1)));
-			$points[]=rand(30,$height+30);
+			$points[] = rand(2 * (20 * ($i + 1)), 2 * (50 * ($i + 1)));
+			$points[] = rand(30, $height + 30);
 		}
-		imagesetthickness($image,rand(2,6));
-		imagepolygon($image,$points,intval(sizeof($points)/2),$color);
-		imagecolordeallocate($image,$color);
+		imagesetthickness($image, rand(2, 6));
+		imagepolygon($image, $points, intval(sizeof($points) / 2), $color);
+		imagecolordeallocate($image, $color);
 	}
 }
 
-function morphImage($image,$width,$height)
+function morphImage($image, $width, $height)
 {
-	$tempImage=imagecreatetruecolor($width,$height);
-	$chunk=rand(1,5);
-	for($x=$y=0;$x<$width;$x+=$chunk)
+	$tempImage = imagecreatetruecolor($width, $height);
+	$chunk = rand(1, 5);
+	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;
-		imagecopy($tempImage,$image,$x,0,$x,$y,$chunk,$height);
+		$chunk = rand(1, 5);
+		$y += rand(-1, 1);
+		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;
-		imagecopy($image,$tempImage,$x,$y,0,$y,$width,$chunk);
+		$chunk = rand(1, 5);
+		$x += rand(-1, 1);
+		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

@@ -37,10 +37,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);
 		}
 	}
@@ -56,8 +57,9 @@ 
 
 function hash2string($hex,$alphabet)
 {
-	if(strlen($alphabet)<2)
-		$alphabet='234578adefhijmnrtABDEFGHJLMNRT';
+	if(strlen($alphabet)<2) {
+			$alphabet='234578adefhijmnrtABDEFGHJLMNRT';
+	}
 	$hexLength=strlen($hex);
 	$base=strlen($alphabet);
 	$result='';
@@ -75,10 +77,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;
@@ -99,8 +103,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++)
@@ -111,8 +116,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);
     }
 
@@ -127,26 +133,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)
 {
@@ -207,16 +219,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/TBaseDataList.php

Doc Comments +1 added lines

@@ -166,6 +166,7 @@
 	 * Otherwise, an exception will be raised.
 	 * @param mixed data item
 	 * @param mixed field name
+	 * @param string $field
 	 * @return mixed data value at the specified field
 	 * @throws TInvalidDataValueException if the data is invalid
 	 */

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TBaseDataList 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
- */
+	 * TBaseDataList 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 TDataBoundControl and TDataFieldAccessor classes

Spacing +12 added lines, -12 removed lines

@@ -56,7 +56,7 @@ 
 	 */
 	public function getCellSpacing()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getCellSpacing();
 		else
 			return -1;
@@ -75,7 +75,7 @@ 
 	 */
 	public function getCellPadding()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getCellPadding();
 		else
 			return -1;
@@ -94,7 +94,7 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getHorizontalAlign();
 		else
 			return THorizontalAlign::NotSet;
@@ -113,7 +113,7 @@ 
 	 */
 	public function getGridLines()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getGridLines();
 		else
 			return TTableGridLines::None;
@@ -134,7 +134,7 @@ 
 	 */
 	public function getDataKeyField()
 	{
-		return $this->getViewState('DataKeyField','');
+		return $this->getViewState('DataKeyField', '');
 	}
 
 	/**
@@ -142,7 +142,7 @@ 
 	 */
 	public function setDataKeyField($value)
 	{
-		$this->setViewState('DataKeyField',$value,'');
+		$this->setViewState('DataKeyField', $value, '');
 	}
 
 	/**
@@ -150,10 +150,10 @@ 
 	 */
 	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);
+			$dataKeys = new TList;
+			$this->setViewState('DataKeys', $dataKeys, null);
 		}
 		return $dataKeys;
 	}
@@ -169,9 +169,9 @@ 
 	 * @return mixed data value at the specified field
 	 * @throws TInvalidDataValueException if the data is invalid
 	 */
-	protected function getDataFieldValue($data,$field)
+	protected function getDataFieldValue($data, $field)
 	{
-		return TDataFieldAccessor::getDataFieldValue($data,$field);
+		return TDataFieldAccessor::getDataFieldValue($data, $field);
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 	 */
 	public function onSelectedIndexChanged($param)
 	{
-		$this->raiseEvent('OnSelectedIndexChanged',$this,$param);
+		$this->raiseEvent('OnSelectedIndexChanged', $this, $param);
 	}
 }
 

Braces +20 added lines, -16 removed lines

@@ -56,10 +56,11 @@ 
 	 */
 	public function getCellSpacing()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getCellSpacing();
-		else
-			return -1;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getCellSpacing();
+		} else {
+					return -1;
+		}
 	}
 
 	/**
@@ -75,10 +76,11 @@ 
 	 */
 	public function getCellPadding()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getCellPadding();
-		else
-			return -1;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getCellPadding();
+		} else {
+					return -1;
+		}
 	}
 
 	/**
@@ -94,10 +96,11 @@ 
 	 */
 	public function getHorizontalAlign()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getHorizontalAlign();
-		else
-			return THorizontalAlign::NotSet;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getHorizontalAlign();
+		} else {
+					return THorizontalAlign::NotSet;
+		}
 	}
 
 	/**
@@ -113,10 +116,11 @@ 
 	 */
 	public function getGridLines()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getGridLines();
-		else
-			return TTableGridLines::None;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getGridLines();
+		} else {
+					return TTableGridLines::None;
+		}
 	}
 
 	/**

framework/Web/UI/WebControls/TBaseValidator.php

Doc Comments +5 added lines, -2 removed lines

@@ -182,6 +182,7 @@ 
 	 * TBaseValidator::$_clientClass, be sure to update the corresponding
 	 * "Javascript/validation3.js" file as well.
 	 * @param TControl control to validate.
+	 * @param TControl $control
 	 * @return string control type for client-side validation.
 	 */
 	private function getClientControlClass($control)
@@ -259,7 +260,7 @@ 
 	/**
 	 * Update the ControlToValidate component's css class depending
 	 * if the ControlCssClass property is set, and whether this is valid.
-	 * @return boolean true if change, false otherwise.
+	 * @return boolean|null true if change, false otherwise.
 	 */
 	protected function updateControlCssClass()
 	{
@@ -384,6 +385,7 @@ 
 	 * The ID path is the dot-connected IDs of the controls reaching from
 	 * the validator's naming container to the target control.
 	 * @param string the ID path
+	 * @param string $value
 	 */
 	public function setControlToValidate($value)
 	{
@@ -549,6 +551,7 @@ 
 
 	/**
 	 * @param string the css class that is applied to the control being validated in case the validation fails
+	 * @param string $value
 	 */
 	public function setControlCssClass($value)
 	{
@@ -691,7 +694,7 @@ 
 	}
 
 	/**
-	 * @return boolean true to observe changes.
+	 * @return boolean|string true to observe changes.
 	 */
 	public function getObserveChanges()
 	{

Spacing +79 added lines, -79 removed lines

@@ -77,11 +77,11 @@ 
 	/**
 	 * @var boolean whether the validation succeeds
 	 */
-	private $_isValid=true;
+	private $_isValid = true;
 	/**
 	 * @var boolean whether the validator has been registered with the page
 	 */
-	private $_registered=false;
+	private $_registered = false;
 	/**
 	 * @var TValidatorClientSide validator client-script options.
 	 */
@@ -111,7 +111,7 @@ 
 	{
 		parent::onInit($param);
 		$this->getPage()->getValidators()->add($this);
-		$this->_registered=true;
+		$this->_registered = true;
 	}
 
 	/**
@@ -120,9 +120,9 @@ 
 	 */
 	public function onUnload($param)
 	{
-		if($this->_registered && ($page=$this->getPage())!==null)
+		if ($this->_registered && ($page = $this->getPage()) !== null)
 			$page->getValidators()->remove($this);
-		$this->_registered=false;
+		$this->_registered = false;
 		parent::onUnload($param);
 	}
 
@@ -133,13 +133,13 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$display=$this->getDisplay();
-		$visible=$this->getEnabled(true) && !$this->getIsValid();
-		if($display===TValidatorDisplayStyle::None || (!$visible && $display===TValidatorDisplayStyle::Dynamic))
-			$writer->addStyleAttribute('display','none');
-		else if(!$visible)
-			$writer->addStyleAttribute('visibility','hidden');
-		$writer->addAttribute('id',$this->getClientID());
+		$display = $this->getDisplay();
+		$visible = $this->getEnabled(true) && !$this->getIsValid();
+		if ($display === TValidatorDisplayStyle::None || (!$visible && $display === TValidatorDisplayStyle::Dynamic))
+			$writer->addStyleAttribute('display', 'none');
+		else if (!$visible)
+			$writer->addStyleAttribute('visibility', 'hidden');
+		$writer->addAttribute('id', $this->getClientID());
 		parent::addAttributesToRender($writer);
 		$this->renderClientControlScript($writer);
 	}
@@ -155,13 +155,13 @@ 
 		$options['FormID'] = $this->getPage()->getForm()->getClientID();
 		$options['Display'] = $this->getDisplay();
 		$options['ErrorMessage'] = $this->getErrorMessage();
-		if($this->getFocusOnError())
+		if ($this->getFocusOnError())
 		{
 			$options['FocusOnError'] = $this->getFocusOnError();
 			$options['FocusElementID'] = $this->getFocusElementID();
 		}
 		$options['ValidationGroup'] = $this->getValidationGroup();
-		if($control)
+		if ($control)
 			$options['ControlToValidate'] = $control->getClientID();
 		$options['ControlCssClass'] = $this->getControlCssClass();
 
@@ -169,10 +169,10 @@ 
 		$options['Enabled'] = $this->getEnabled(true);
 
 		//get date format from date picker target control
-		if($control instanceof TDatePicker)
+		if ($control instanceof TDatePicker)
 			$options['DateFormat'] = $control->getDateFormat();
 
-		$options = array_merge($options,$this->getClientSide()->getOptions()->toArray());
+		$options = array_merge($options, $this->getClientSide()->getOptions()->toArray());
 
 		return $options;
 	}
@@ -186,8 +186,8 @@ 
 	 */
 	private function getClientControlClass($control)
 	{
-		foreach(self::$_clientClass as $type)
-			if($control instanceof $type)
+		foreach (self::$_clientClass as $type)
+			if ($control instanceof $type)
 				return $type;
 		return get_class($control);
 	}
@@ -210,7 +210,7 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientSide===null)
+		if ($this->_clientSide === null)
 			$this->_clientSide = $this->createClientSide();
 		return $this->_clientSide;
 	}
@@ -234,15 +234,15 @@ 
 		$scripts = $this->getPage()->getClientScript();
 		if ($this->getEnableClientScript())
 			$scripts->registerPradoScript('validator');
-		$formID=$this->getPage()->getForm()->getClientID();
+		$formID = $this->getPage()->getForm()->getClientID();
 		$scriptKey = "TBaseValidator:$formID";
-		if($this->getEnableClientScript() && !$scripts->isEndScriptRegistered($scriptKey))
+		if ($this->getEnableClientScript() && !$scripts->isEndScriptRegistered($scriptKey))
 		{
 			$manager['FormID'] = $formID;
 			$options = TJavaScript::encode($manager);
 			$scripts->registerEndScript($scriptKey, "new Prado.ValidationManager({$options});");
 		}
-		if($this->getEnableClientScript())
+		if ($this->getEnableClientScript())
 			$this->registerClientScriptValidator();
 	}
 
@@ -250,7 +250,7 @@ 
 	 * Override parent implementation to update the control CSS Class before
 	 * the validated control is rendered
 	 */
-	public function onPreRender ($param)
+	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
 		$this->updateControlCssClass();
@@ -263,15 +263,15 @@ 
 	 */
 	protected function updateControlCssClass()
 	{
-		if(($cssClass=$this->getControlCssClass())!=='')
+		if (($cssClass = $this->getControlCssClass()) !== '')
 		{
-			$control=$this->getValidationTarget();
-			if($control instanceof TWebControl)
+			$control = $this->getValidationTarget();
+			if ($control instanceof TWebControl)
 			{
-				$class = preg_replace ('/ '.preg_quote($cssClass).'/', '',$control->getCssClass());
-				if(!$this->getIsValid())
+				$class = preg_replace('/ ' . preg_quote($cssClass) . '/', '', $control->getCssClass());
+				if (!$this->getIsValid())
 				{
-					$class .= ' '.$cssClass;
+					$class .= ' ' . $cssClass;
 					$control->setCssClass($class);
 				} elseif ($control->getIsValid())
 					$control->setCssClass($class);
@@ -284,11 +284,11 @@ 
 	 */
 	protected function registerClientScriptValidator()
 	{
-		$key = 'prado:'.$this->getClientID();
-		if(!$this->getPage()->getClientScript()->isEndScriptRegistered($key))
+		$key = 'prado:' . $this->getClientID();
+		if (!$this->getPage()->getClientScript()->isEndScriptRegistered($key))
 		{
 			$options = TJavaScript::encode($this->getClientScriptOptions());
-			$script = 'new '.$this->getClientClassName().'('.$options.');';
+			$script = 'new ' . $this->getClientClassName() . '(' . $options . ');';
 			$this->getPage()->getClientScript()->registerEndScript($key, $script);
 		}
 	}
@@ -307,7 +307,7 @@ 
 	 */
 	public function setForControl($value)
 	{
-		throw new TNotSupportedException('basevalidator_forcontrol_unsupported',get_class($this));
+		throw new TNotSupportedException('basevalidator_forcontrol_unsupported', get_class($this));
 	}
 
 	/**
@@ -316,10 +316,10 @@ 
 	 */
 	public function setEnabled($value)
 	{
-		$value=TPropertyValue::ensureBoolean($value);
+		$value = TPropertyValue::ensureBoolean($value);
 		parent::setEnabled($value);
-		if(!$value)
-			$this->_isValid=true;
+		if (!$value)
+			$this->_isValid = true;
 	}
 
 	/**
@@ -327,7 +327,7 @@ 
 	 */
 	public function getDisplay()
 	{
-		return $this->getViewState('Display',TValidatorDisplayStyle::Fixed);
+		return $this->getViewState('Display', TValidatorDisplayStyle::Fixed);
 	}
 
 	/**
@@ -335,7 +335,7 @@ 
 	 */
 	public function setDisplay($value)
 	{
-		$this->setViewState('Display',TPropertyValue::ensureEnum($value,'TValidatorDisplayStyle'),TValidatorDisplayStyle::Fixed);
+		$this->setViewState('Display', TPropertyValue::ensureEnum($value, 'TValidatorDisplayStyle'), TValidatorDisplayStyle::Fixed);
 	}
 
 	/**
@@ -343,7 +343,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -351,7 +351,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -359,7 +359,7 @@ 
 	 */
 	public function getErrorMessage()
 	{
-		return $this->getViewState('ErrorMessage','');
+		return $this->getViewState('ErrorMessage', '');
 	}
 
 	/**
@@ -368,7 +368,7 @@ 
 	 */
 	public function setErrorMessage($value)
 	{
-		$this->setViewState('ErrorMessage',$value,'');
+		$this->setViewState('ErrorMessage', $value, '');
 	}
 
 	/**
@@ -376,7 +376,7 @@ 
 	 */
 	public function getControlToValidate()
 	{
-		return $this->getViewState('ControlToValidate','');
+		return $this->getViewState('ControlToValidate', '');
 	}
 
 	/**
@@ -387,7 +387,7 @@ 
 	 */
 	public function setControlToValidate($value)
 	{
-		$this->setViewState('ControlToValidate',$value,'');
+		$this->setViewState('ControlToValidate', $value, '');
 	}
 
 	/**
@@ -395,7 +395,7 @@ 
 	 */
 	public function getFocusOnError()
 	{
-		return $this->getViewState('FocusOnError',false);
+		return $this->getViewState('FocusOnError', false);
 	}
 
 	/**
@@ -403,7 +403,7 @@ 
 	 */
 	public function setFocusOnError($value)
 	{
-		$this->setViewState('FocusOnError',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('FocusOnError', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -413,17 +413,17 @@ 
 	 */
 	public function getFocusElementID()
 	{
-		if(($id=$this->getViewState('FocusElementID',''))==='')
+		if (($id = $this->getViewState('FocusElementID', '')) === '')
 		{
-			$target=$this->getValidationTarget();
+			$target = $this->getValidationTarget();
 			/* Workaround: TCheckBoxList and TRadioButtonList nests the actual
 			 * inputs inside a table; we ensure the first input gets focused
 			 */
-			if($target instanceof TCheckBoxList && $target->getItemCount()>0)
+			if ($target instanceof TCheckBoxList && $target->getItemCount() > 0)
 			{
-				$id=$target->getClientID().'_c0';
+				$id = $target->getClientID() . '_c0';
 			} else {
-				$id=$target->getClientID();
+				$id = $target->getClientID();
 			}
 		}
 		return $id;
@@ -443,7 +443,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -451,7 +451,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -468,7 +468,7 @@ 
 	 */
 	public function setIsValid($value)
 	{
-		$this->_isValid=TPropertyValue::ensureBoolean($value);
+		$this->_isValid = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -478,10 +478,10 @@ 
 	 */
 	public function getValidationTarget()
 	{
-		if(($id=$this->getControlToValidate())!=='' && ($control=$this->findControl($id))!==null)
+		if (($id = $this->getControlToValidate()) !== '' && ($control = $this->findControl($id)) !== null)
 			return $control;
 		else
-			throw new TConfigurationException('basevalidator_controltovalidate_invalid',get_class($this));
+			throw new TConfigurationException('basevalidator_controltovalidate_invalid', get_class($this));
 	}
 
 	/**
@@ -492,10 +492,10 @@ 
 	 */
 	protected function getValidationValue($control)
 	{
-		if($control instanceof IValidatable)
+		if ($control instanceof IValidatable)
 			return $control->getValidationPropertyValue();
 		else
-			throw new TInvalidDataTypeException('basevalidator_validatable_required',get_class($this));
+			throw new TInvalidDataTypeException('basevalidator_validatable_required', get_class($this));
 	}
 
 	/**
@@ -506,22 +506,22 @@ 
 	public function validate()
 	{
 		$this->onValidate();
-		if($this->getVisible(true) && $this->getEnabled(true))
+		if ($this->getVisible(true) && $this->getEnabled(true))
 		{
-			$target=$this->getValidationTarget();
+			$target = $this->getValidationTarget();
 			// if the target is not a disabled web control
-			if($target===null ||
-				($target!==null &&
+			if ($target === null ||
+				($target !== null &&
 				!($target instanceof TWebControl && !$target->getEnabled(true))))
 			{
-				if($this->evaluateIsValid())
+				if ($this->evaluateIsValid())
 				{
 					$this->setIsValid(true);
 					$this->onValidationSuccess();
 				}
 				else
 				{
-					if($target)
+					if ($target)
 						$target->setIsValid(false);
 					$this->setIsValid(false);
 					$this->onValidationError();
@@ -544,7 +544,7 @@ 
 	 */
 	public function getControlCssClass()
 	{
-		return $this->getViewState('ControlCssClass','');
+		return $this->getViewState('ControlCssClass', '');
 	}
 
 	/**
@@ -552,7 +552,7 @@ 
 	 */
 	public function setControlCssClass($value)
 	{
-		$this->setViewState('ControlCssClass',$value,'');
+		$this->setViewState('ControlCssClass', $value, '');
 	}
 
 	/**
@@ -567,7 +567,7 @@ 
 	 */
 	public function onValidationSuccess()
 	{
-		$this->raiseEvent('OnValidationSuccess',$this,null);
+		$this->raiseEvent('OnValidationSuccess', $this, null);
 	}
 
 	/**
@@ -575,7 +575,7 @@ 
 	 */
 	public function onValidationError()
 	{
-		$this->raiseEvent('OnValidationError',$this,null);
+		$this->raiseEvent('OnValidationError', $this, null);
 	}
 
 	/**
@@ -586,7 +586,7 @@ 
 	 */
 	public function onValidate()
 	{
-		$this->raiseEvent('OnValidate',$this,null);
+		$this->raiseEvent('OnValidate', $this, null);
 	}
 
 	/**
@@ -595,9 +595,9 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text=$this->getText())!=='')
+		if (($text = $this->getText()) !== '')
 			$writer->write($text);
-		else if(($text=$this->getErrorMessage())!=='')
+		else if (($text = $this->getErrorMessage()) !== '')
 			$writer->write($text);
 		else
 			parent::renderContents($writer);
@@ -696,7 +696,7 @@ 
 	public function getObserveChanges()
 	{
 		$changes = $this->getOption('ObserveChanges');
-		return ($changes===null) ? true : $changes;
+		return ($changes === null) ? true : $changes;
 	}
 }
 
@@ -717,9 +717,9 @@ 
  */
 class TValidatorDisplayStyle extends TEnumerable
 {
-	const None='None';
-	const Dynamic='Dynamic';
-	const Fixed='Fixed';
+	const None = 'None';
+	const Dynamic = 'Dynamic';
+	const Fixed = 'Fixed';
 }
 
 /**
@@ -739,9 +739,9 @@ 
  */
 class TValidationDataType extends TEnumerable
 {
-	const Integer='Integer';
-	const Float='Float';
-	const Date='Date';
-	const String='String';
+	const Integer = 'Integer';
+	const Float = 'Float';
+	const Date = 'Date';
+	const String = 'String';
 }
 

Braces +54 added lines, -42 removed lines

@@ -120,8 +120,9 @@ 
 	 */
 	public function onUnload($param)
 	{
-		if($this->_registered && ($page=$this->getPage())!==null)
-			$page->getValidators()->remove($this);
+		if($this->_registered && ($page=$this->getPage())!==null) {
+					$page->getValidators()->remove($this);
+		}
 		$this->_registered=false;
 		parent::onUnload($param);
 	}
@@ -135,10 +136,11 @@ 
 	{
 		$display=$this->getDisplay();
 		$visible=$this->getEnabled(true) && !$this->getIsValid();
-		if($display===TValidatorDisplayStyle::None || (!$visible && $display===TValidatorDisplayStyle::Dynamic))
-			$writer->addStyleAttribute('display','none');
-		else if(!$visible)
-			$writer->addStyleAttribute('visibility','hidden');
+		if($display===TValidatorDisplayStyle::None || (!$visible && $display===TValidatorDisplayStyle::Dynamic)) {
+					$writer->addStyleAttribute('display','none');
+		} else if(!$visible) {
+					$writer->addStyleAttribute('visibility','hidden');
+		}
 		$writer->addAttribute('id',$this->getClientID());
 		parent::addAttributesToRender($writer);
 		$this->renderClientControlScript($writer);
@@ -161,16 +163,18 @@ 
 			$options['FocusElementID'] = $this->getFocusElementID();
 		}
 		$options['ValidationGroup'] = $this->getValidationGroup();
-		if($control)
-			$options['ControlToValidate'] = $control->getClientID();
+		if($control) {
+					$options['ControlToValidate'] = $control->getClientID();
+		}
 		$options['ControlCssClass'] = $this->getControlCssClass();
 
 		$options['ControlType'] = $this->getClientControlClass($control);
 		$options['Enabled'] = $this->getEnabled(true);
 
 		//get date format from date picker target control
-		if($control instanceof TDatePicker)
-			$options['DateFormat'] = $control->getDateFormat();
+		if($control instanceof TDatePicker) {
+					$options['DateFormat'] = $control->getDateFormat();
+		}
 
 		$options = array_merge($options,$this->getClientSide()->getOptions()->toArray());
 
@@ -186,9 +190,10 @@ 
 	 */
 	private function getClientControlClass($control)
 	{
-		foreach(self::$_clientClass as $type)
-			if($control instanceof $type)
+		foreach(self::$_clientClass as $type) {
+					if($control instanceof $type)
 				return $type;
+		}
 		return get_class($control);
 	}
 
@@ -210,8 +215,9 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientSide===null)
-			$this->_clientSide = $this->createClientSide();
+		if($this->_clientSide===null) {
+					$this->_clientSide = $this->createClientSide();
+		}
 		return $this->_clientSide;
 	}
 
@@ -232,8 +238,9 @@ 
 	public function renderClientControlScript($writer)
 	{
 		$scripts = $this->getPage()->getClientScript();
-		if ($this->getEnableClientScript())
-			$scripts->registerPradoScript('validator');
+		if ($this->getEnableClientScript()) {
+					$scripts->registerPradoScript('validator');
+		}
 		$formID=$this->getPage()->getForm()->getClientID();
 		$scriptKey = "TBaseValidator:$formID";
 		if($this->getEnableClientScript() && !$scripts->isEndScriptRegistered($scriptKey))
@@ -242,8 +249,9 @@ 
 			$options = TJavaScript::encode($manager);
 			$scripts->registerEndScript($scriptKey, "new Prado.ValidationManager({$options});");
 		}
-		if($this->getEnableClientScript())
-			$this->registerClientScriptValidator();
+		if($this->getEnableClientScript()) {
+					$this->registerClientScriptValidator();
+		}
 	}
 
 	/**
@@ -273,8 +281,9 @@ 
 				{
 					$class .= ' '.$cssClass;
 					$control->setCssClass($class);
-				} elseif ($control->getIsValid())
-					$control->setCssClass($class);
+				} elseif ($control->getIsValid()) {
+									$control->setCssClass($class);
+				}
 			}
 		}
 	}
@@ -318,8 +327,9 @@ 
 	{
 		$value=TPropertyValue::ensureBoolean($value);
 		parent::setEnabled($value);
-		if(!$value)
-			$this->_isValid=true;
+		if(!$value) {
+					$this->_isValid=true;
+		}
 	}
 
 	/**
@@ -478,10 +488,11 @@ 
 	 */
 	public function getValidationTarget()
 	{
-		if(($id=$this->getControlToValidate())!=='' && ($control=$this->findControl($id))!==null)
-			return $control;
-		else
-			throw new TConfigurationException('basevalidator_controltovalidate_invalid',get_class($this));
+		if(($id=$this->getControlToValidate())!=='' && ($control=$this->findControl($id))!==null) {
+					return $control;
+		} else {
+					throw new TConfigurationException('basevalidator_controltovalidate_invalid',get_class($this));
+		}
 	}
 
 	/**
@@ -492,10 +503,11 @@ 
 	 */
 	protected function getValidationValue($control)
 	{
-		if($control instanceof IValidatable)
-			return $control->getValidationPropertyValue();
-		else
-			throw new TInvalidDataTypeException('basevalidator_validatable_required',get_class($this));
+		if($control instanceof IValidatable) {
+					return $control->getValidationPropertyValue();
+		} else {
+					throw new TInvalidDataTypeException('basevalidator_validatable_required',get_class($this));
+		}
 	}
 
 	/**
@@ -518,16 +530,15 @@ 
 				{
 					$this->setIsValid(true);
 					$this->onValidationSuccess();
-				}
-				else
+				} else
 				{
-					if($target)
-						$target->setIsValid(false);
+					if($target) {
+											$target->setIsValid(false);
+					}
 					$this->setIsValid(false);
 					$this->onValidationError();
 				}
-			}
-			else
+			} else
 			{
 				$this->evaluateIsValid();
 				$this->setIsValid(true);
@@ -595,12 +606,13 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if(($text=$this->getText())!=='')
-			$writer->write($text);
-		else if(($text=$this->getErrorMessage())!=='')
-			$writer->write($text);
-		else
-			parent::renderContents($writer);
+		if(($text=$this->getText())!=='') {
+					$writer->write($text);
+		} else if(($text=$this->getErrorMessage())!=='') {
+					$writer->write($text);
+		} else {
+					parent::renderContents($writer);
+		}
 	}
 }
 

framework/Web/UI/WebControls/TBulletedList.php

Doc Comments +2 added lines

@@ -216,6 +216,7 @@ 
 	 * This method is invoked when the {@link getDisplayMode DisplayMode} is 'LinkButton'
 	 * and end-users click on one of the buttons.
 	 * @param TBulletedListEventParameter event parameter.
+	 * @param TBulletedListEventParameter $param
 	 */
 	public function onClick($param)
 	{
@@ -425,6 +426,7 @@ 
 	/**
 	 * Constructor.
 	 * @param integer index of the item clicked
+	 * @param integer $index
 	 */
 	public function __construct($index)
 	{

Spacing +76 added lines, -76 removed lines

@@ -59,9 +59,9 @@ 
 	 */
 	public function raisePostBackEvent($param)
 	{
-		if($this->getCausesValidation())
+		if ($this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
-		$this->onClick(new TBulletedListEventParameter((int)$param));
+		$this->onClick(new TBulletedListEventParameter((int) $param));
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 	 */
 	protected function getTagName()
 	{
-		switch($this->getBulletStyle())
+		switch ($this->getBulletStyle())
 		{
 			case TBulletStyle::Numbered:
 			case TBulletStyle::LowerAlpha:
@@ -98,49 +98,49 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$needStart=false;
-		switch($this->getBulletStyle())
+		$needStart = false;
+		switch ($this->getBulletStyle())
 		{
 			case TBulletStyle::None:
-				$writer->addStyleAttribute('list-style-type','none');
-				$needStart=true;
+				$writer->addStyleAttribute('list-style-type', 'none');
+				$needStart = true;
 				break;
 			case TBulletStyle::Numbered:
-				$writer->addStyleAttribute('list-style-type','decimal');
-				$needStart=true;
+				$writer->addStyleAttribute('list-style-type', 'decimal');
+				$needStart = true;
 				break;
 			case TBulletStyle::LowerAlpha:
-				$writer->addStyleAttribute('list-style-type','lower-alpha');
-				$needStart=true;
+				$writer->addStyleAttribute('list-style-type', 'lower-alpha');
+				$needStart = true;
 				break;
 			case TBulletStyle::UpperAlpha:
-				$writer->addStyleAttribute('list-style-type','upper-alpha');
-				$needStart=true;
+				$writer->addStyleAttribute('list-style-type', 'upper-alpha');
+				$needStart = true;
 				break;
 			case TBulletStyle::LowerRoman:
-				$writer->addStyleAttribute('list-style-type','lower-roman');
-				$needStart=true;
+				$writer->addStyleAttribute('list-style-type', 'lower-roman');
+				$needStart = true;
 				break;
 			case TBulletStyle::UpperRoman:
-				$writer->addStyleAttribute('list-style-type','upper-roman');
-				$needStart=true;
+				$writer->addStyleAttribute('list-style-type', 'upper-roman');
+				$needStart = true;
 				break;
 			case TBulletStyle::Disc:
-				$writer->addStyleAttribute('list-style-type','disc');
+				$writer->addStyleAttribute('list-style-type', 'disc');
 				break;
 			case TBulletStyle::Circle:
-				$writer->addStyleAttribute('list-style-type','circle');
+				$writer->addStyleAttribute('list-style-type', 'circle');
 				break;
 			case TBulletStyle::Square:
-				$writer->addStyleAttribute('list-style-type','square');
+				$writer->addStyleAttribute('list-style-type', 'square');
 				break;
 			case TBulletStyle::CustomImage:
-				$url=$this->getBulletImageUrl();
-				$writer->addStyleAttribute('list-style-image',"url($url)");
+				$url = $this->getBulletImageUrl();
+				$writer->addStyleAttribute('list-style-image', "url($url)");
 				break;
 		}
-		if($needStart && ($start=$this->getFirstBulletNumber())!=1)
-			$writer->addAttribute('start',"$start");
+		if ($needStart && ($start = $this->getFirstBulletNumber()) != 1)
+			$writer->addAttribute('start', "$start");
 		parent::addAttributesToRender($writer);
 	}
 
@@ -149,7 +149,7 @@ 
 	 */
 	public function getBulletImageUrl()
 	{
-		return $this->getViewState('BulletImageUrl','');
+		return $this->getViewState('BulletImageUrl', '');
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function setBulletImageUrl($value)
 	{
-		$this->setViewState('BulletImageUrl',$value,'');
+		$this->setViewState('BulletImageUrl', $value, '');
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	 */
 	public function getBulletStyle()
 	{
-		return $this->getViewState('BulletStyle',TBulletStyle::NotSet);
+		return $this->getViewState('BulletStyle', TBulletStyle::NotSet);
 	}
 
 	/**
@@ -173,7 +173,7 @@ 
 	 */
 	public function setBulletStyle($value)
 	{
-		$this->setViewState('BulletStyle',TPropertyValue::ensureEnum($value,'TBulletStyle'),TBulletStyle::NotSet);
+		$this->setViewState('BulletStyle', TPropertyValue::ensureEnum($value, 'TBulletStyle'), TBulletStyle::NotSet);
 	}
 
 	/**
@@ -181,7 +181,7 @@ 
 	 */
 	public function getDisplayMode()
 	{
-		return $this->getViewState('DisplayMode',TBulletedListDisplayMode::Text);
+		return $this->getViewState('DisplayMode', TBulletedListDisplayMode::Text);
 	}
 
 	/**
@@ -189,7 +189,7 @@ 
 	 */
 	public function setDisplayMode($value)
 	{
-		$this->setViewState('DisplayMode',TPropertyValue::ensureEnum($value,'TBulletedListDisplayMode'),TBulletedListDisplayMode::Text);
+		$this->setViewState('DisplayMode', TPropertyValue::ensureEnum($value, 'TBulletedListDisplayMode'), TBulletedListDisplayMode::Text);
 	}
 
 	/**
@@ -199,7 +199,7 @@ 
 	 */
 	public function getFirstBulletNumber()
 	{
-		return $this->getViewState('FirstBulletNumber',1);
+		return $this->getViewState('FirstBulletNumber', 1);
 	}
 
 	/**
@@ -208,7 +208,7 @@ 
 	 */
 	public function setFirstBulletNumber($value)
 	{
-		$this->setViewState('FirstBulletNumber',TPropertyValue::ensureInteger($value),1);
+		$this->setViewState('FirstBulletNumber', TPropertyValue::ensureInteger($value), 1);
 	}
 
 	/**
@@ -219,7 +219,7 @@ 
 	 */
 	public function onClick($param)
 	{
-		$this->raiseEvent('OnClick',$this,$param);
+		$this->raiseEvent('OnClick', $this, $param);
 	}
 
 	/**
@@ -229,7 +229,7 @@ 
 	 */
 	public function getTarget()
 	{
-		return $this->getViewState('Target','');
+		return $this->getViewState('Target', '');
 	}
 
 	/**
@@ -239,7 +239,7 @@ 
 	 */
 	public function setTarget($value)
 	{
-		$this->setViewState('Target',$value,'');
+		$this->setViewState('Target', $value, '');
 	}
 
 	/**
@@ -248,7 +248,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getHasItems())
+		if ($this->getHasItems())
 			parent::render($writer);
 	}
 
@@ -258,15 +258,15 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		$this->_isEnabled=$this->getEnabled(true);
-		$this->_postBackOptions=$this->getPostBackOptions();
+		$this->_isEnabled = $this->getEnabled(true);
+		$this->_postBackOptions = $this->getPostBackOptions();
 		$writer->writeLine();
-		foreach($this->getItems() as $index=>$item)
+		foreach ($this->getItems() as $index=>$item)
 		{
-			if($item->getHasAttributes())
+			if ($item->getHasAttributes())
 				$writer->addAttributes($item->getAttributes());
 			$writer->renderBeginTag('li');
-			$this->renderBulletText($writer,$item,$index);
+			$this->renderBulletText($writer, $item, $index);
 			$writer->renderEndTag();
 			$writer->writeLine();
 		}
@@ -278,9 +278,9 @@ 
 	 * @param TListItem item to be rendered
 	 * @param integer index of the item being rendered
 	 */
-	protected function renderBulletText($writer,$item,$index)
+	protected function renderBulletText($writer, $item, $index)
 	{
-		switch($this->getDisplayMode())
+		switch ($this->getDisplayMode())
 		{
 			case TBulletedListDisplayMode::Text:
 				$this->renderTextItem($writer, $item, $index);
@@ -296,11 +296,11 @@ 
 
 	protected function renderTextItem($writer, $item, $index)
 	{
-		if($item->getEnabled())
+		if ($item->getEnabled())
 			$writer->write(THttpUtility::htmlEncode($item->getText()));
 		else
 		{
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 			$writer->renderBeginTag('span');
 			$writer->write(THttpUtility::htmlEncode($item->getText()));
 			$writer->renderEndTag();
@@ -309,16 +309,16 @@ 
 
 	protected function renderHyperLinkItem($writer, $item, $index)
 	{
-		if(!$this->_isEnabled || !$item->getEnabled())
-			$writer->addAttribute('disabled','disabled');
+		if (!$this->_isEnabled || !$item->getEnabled())
+			$writer->addAttribute('disabled', 'disabled');
 		else
 		{
-			$writer->addAttribute('href',$item->getValue());
-			if(($target=$this->getTarget())!=='')
-				$writer->addAttribute('target',$target);
+			$writer->addAttribute('href', $item->getValue());
+			if (($target = $this->getTarget()) !== '')
+				$writer->addAttribute('target', $target);
 		}
-		if(($accesskey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accesskey);
+		if (($accesskey = $this->getAccessKey()) !== '')
+			$writer->addAttribute('accesskey', $accesskey);
 		$writer->renderBeginTag('a');
 		$writer->write(THttpUtility::htmlEncode($item->getText()));
 		$writer->renderEndTag();
@@ -326,18 +326,18 @@ 
 
 	protected function renderLinkButtonItem($writer, $item, $index)
 	{
-		if(!$this->_isEnabled || !$item->getEnabled())
-			$writer->addAttribute('disabled','disabled');
+		if (!$this->_isEnabled || !$item->getEnabled())
+			$writer->addAttribute('disabled', 'disabled');
 		else
 		{
 			$this->_currentRenderItemIndex = $index;
-			$writer->addAttribute('id', $this->getClientID().$index);
-			$writer->addAttribute('href', "javascript:;//".$this->getClientID().$index);
+			$writer->addAttribute('id', $this->getClientID() . $index);
+			$writer->addAttribute('href', "javascript:;//" . $this->getClientID() . $index);
 			$cs = $this->getPage()->getClientScript();
-			$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+			$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 		}
-		if(($accesskey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accesskey);
+		if (($accesskey = $this->getAccessKey()) !== '')
+			$writer->addAttribute('accesskey', $accesskey);
 		$writer->renderBeginTag('a');
 		$writer->write(THttpUtility::htmlEncode($item->getText()));
 		$writer->renderEndTag();
@@ -352,7 +352,7 @@ 
 		$options['CausesValidation'] = $this->getCausesValidation();
 		$options['EventTarget'] = $this->getUniqueID();
 		$options['EventParameter'] = $this->_currentRenderItemIndex;
-		$options['ID'] = $this->getClientID().$this->_currentRenderItemIndex;
+		$options['ID'] = $this->getClientID() . $this->_currentRenderItemIndex;
 		$options['StopEvent'] = true;
 		return $options;
 	}
@@ -360,7 +360,7 @@ 
 	protected function canCauseValidation()
 	{
 		$group = $this->getValidationGroup();
-		$hasValidators = $this->getPage()->getValidators($group)->getCount()>0;
+		$hasValidators = $this->getPage()->getValidators($group)->getCount() > 0;
 		return $this->getCausesValidation() && $hasValidators;
 	}
 
@@ -428,7 +428,7 @@ 
 	 */
 	public function __construct($index)
 	{
-		$this->_index=$index;
+		$this->_index = $index;
 	}
 
 	/**
@@ -451,17 +451,17 @@ 
  */
 class TBulletStyle extends TEnumerable
 {
-	const NotSet='NotSet';
-	const None='None';
-	const Numbered='Numbered';
-	const LowerAlpha='LowerAlpha';
-	const UpperAlpha='UpperAlpha';
-	const LowerRoman='LowerRoman';
-	const UpperRoman='UpperRoman';
-	const Disc='Disc';
-	const Circle='Circle';
-	const Square='Square';
-	const CustomImage='CustomImage';
+	const NotSet = 'NotSet';
+	const None = 'None';
+	const Numbered = 'Numbered';
+	const LowerAlpha = 'LowerAlpha';
+	const UpperAlpha = 'UpperAlpha';
+	const LowerRoman = 'LowerRoman';
+	const UpperRoman = 'UpperRoman';
+	const Disc = 'Disc';
+	const Circle = 'Circle';
+	const Square = 'Square';
+	const CustomImage = 'CustomImage';
 }
 
 /**
@@ -480,8 +480,8 @@ 
  */
 class TBulletedListDisplayMode extends TEnumerable
 {
-	const Text='Text';
-	const HyperLink='HyperLink';
-	const LinkButton='LinkButton';
+	const Text = 'Text';
+	const HyperLink = 'HyperLink';
+	const LinkButton = 'LinkButton';
 }
 

Braces +30 added lines, -23 removed lines

@@ -59,8 +59,9 @@ 
 	 */
 	public function raisePostBackEvent($param)
 	{
-		if($this->getCausesValidation())
-			$this->getPage()->validate($this->getValidationGroup());
+		if($this->getCausesValidation()) {
+					$this->getPage()->validate($this->getValidationGroup());
+		}
 		$this->onClick(new TBulletedListEventParameter((int)$param));
 	}
 
@@ -139,8 +140,9 @@ 
 				$writer->addStyleAttribute('list-style-image',"url($url)");
 				break;
 		}
-		if($needStart && ($start=$this->getFirstBulletNumber())!=1)
-			$writer->addAttribute('start',"$start");
+		if($needStart && ($start=$this->getFirstBulletNumber())!=1) {
+					$writer->addAttribute('start',"$start");
+		}
 		parent::addAttributesToRender($writer);
 	}
 
@@ -248,8 +250,9 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getHasItems())
-			parent::render($writer);
+		if($this->getHasItems()) {
+					parent::render($writer);
+		}
 	}
 
 	/**
@@ -263,8 +266,9 @@ 
 		$writer->writeLine();
 		foreach($this->getItems() as $index=>$item)
 		{
-			if($item->getHasAttributes())
-				$writer->addAttributes($item->getAttributes());
+			if($item->getHasAttributes()) {
+							$writer->addAttributes($item->getAttributes());
+			}
 			$writer->renderBeginTag('li');
 			$this->renderBulletText($writer,$item,$index);
 			$writer->renderEndTag();
@@ -296,9 +300,9 @@ 
 
 	protected function renderTextItem($writer, $item, $index)
 	{
-		if($item->getEnabled())
-			$writer->write(THttpUtility::htmlEncode($item->getText()));
-		else
+		if($item->getEnabled()) {
+					$writer->write(THttpUtility::htmlEncode($item->getText()));
+		} else
 		{
 			$writer->addAttribute('disabled','disabled');
 			$writer->renderBeginTag('span');
@@ -309,16 +313,18 @@ 
 
 	protected function renderHyperLinkItem($writer, $item, $index)
 	{
-		if(!$this->_isEnabled || !$item->getEnabled())
-			$writer->addAttribute('disabled','disabled');
-		else
+		if(!$this->_isEnabled || !$item->getEnabled()) {
+					$writer->addAttribute('disabled','disabled');
+		} else
 		{
 			$writer->addAttribute('href',$item->getValue());
-			if(($target=$this->getTarget())!=='')
-				$writer->addAttribute('target',$target);
+			if(($target=$this->getTarget())!=='') {
+							$writer->addAttribute('target',$target);
+			}
+		}
+		if(($accesskey=$this->getAccessKey())!=='') {
+					$writer->addAttribute('accesskey',$accesskey);
 		}
-		if(($accesskey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accesskey);
 		$writer->renderBeginTag('a');
 		$writer->write(THttpUtility::htmlEncode($item->getText()));
 		$writer->renderEndTag();
@@ -326,9 +332,9 @@ 
 
 	protected function renderLinkButtonItem($writer, $item, $index)
 	{
-		if(!$this->_isEnabled || !$item->getEnabled())
-			$writer->addAttribute('disabled','disabled');
-		else
+		if(!$this->_isEnabled || !$item->getEnabled()) {
+					$writer->addAttribute('disabled','disabled');
+		} else
 		{
 			$this->_currentRenderItemIndex = $index;
 			$writer->addAttribute('id', $this->getClientID().$index);
@@ -336,8 +342,9 @@ 
 			$cs = $this->getPage()->getClientScript();
 			$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
 		}
-		if(($accesskey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accesskey);
+		if(($accesskey=$this->getAccessKey())!=='') {
+					$writer->addAttribute('accesskey',$accesskey);
+		}
 		$writer->renderBeginTag('a');
 		$writer->write(THttpUtility::htmlEncode($item->getText()));
 		$writer->renderEndTag();

framework/Web/UI/WebControls/TButton.php

Doc Comments +2 added lines

@@ -218,6 +218,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)
 	{
@@ -342,6 +343,7 @@ 
 
 	/**
 	 * @param string the group of validators which the button causes validation upon postback
+	 * @param string $value
 	 */
 	public function setValidationGroup($value)
 	{

Spacing +47 added lines, -47 removed lines

@@ -60,7 +60,7 @@ 
 	 */
 	public function getButtonTag()
 	{
-		return $this->getViewState('ButtonTag',TButtonTag::Input);
+		return $this->getViewState('ButtonTag', TButtonTag::Input);
 	}
 
 	/**
@@ -68,7 +68,7 @@ 
 	 */
 	public function setButtonTag($value)
 	{
-		$this->setViewState('ButtonTag',TPropertyValue::ensureEnum($value,'TButtonTag'),TButtonTag::Input);
+		$this->setViewState('ButtonTag', TPropertyValue::ensureEnum($value, 'TButtonTag'), TButtonTag::Input);
 	}
 
 	/**
@@ -76,7 +76,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -94,22 +94,22 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$page=$this->getPage();
+		$page = $this->getPage();
 		$page->ensureRenderInForm($this);
-		$writer->addAttribute('type',strtolower($this->getButtonType()));
-		if(($uniqueID=$this->getUniqueID())!=='')
-			$writer->addAttribute('name',$uniqueID);
-		if($this->getButtonTag()===TButtonTag::Button)
+		$writer->addAttribute('type', strtolower($this->getButtonType()));
+		if (($uniqueID = $this->getUniqueID()) !== '')
+			$writer->addAttribute('name', $uniqueID);
+		if ($this->getButtonTag() === TButtonTag::Button)
 		  $this->addParsedObject($this->getText());
 		else
-		  $writer->addAttribute('value',$this->getText());
-		if($this->getEnabled(true))
+		  $writer->addAttribute('value', $this->getText());
+		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);
 	}
@@ -119,8 +119,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());
 	}
 
 	/**
@@ -138,10 +138,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;
@@ -152,7 +152,7 @@ 
 	 */
 	public function setIsDefaultButton($value)
 	{
-		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('IsDefaultButton', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -168,7 +168,7 @@ 
 	 */
 	protected function needPostBackScript()
 	{
-		return $this->canCauseValidation() || ($this->getButtonType()!==TButtonType::Submit &&
+		return $this->canCauseValidation() || ($this->getButtonType() !== TButtonType::Submit &&
 			($this->hasEventHandler('OnClick') || $this->hasEventHandler('OnCommand')))
 			|| $this->getIsDefaultButton();
 	}
@@ -180,10 +180,10 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID']=$this->getClientID();
-		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ID'] = $this->getClientID();
+		$options['CausesValidation'] = $this->getCausesValidation();
 		$options['EventTarget'] = $this->getUniqueID();
-		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['ValidationGroup'] = $this->getValidationGroup();
 
 		return $options;
 	}
@@ -196,7 +196,7 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if($this->getButtonTag()===TButtonTag::Button)
+		if ($this->getButtonTag() === TButtonTag::Button)
 			parent::renderContents($writer);
 	}
 
@@ -209,7 +209,7 @@ 
 	 */
 	public function onClick($param)
 	{
-		$this->raiseEvent('OnClick',$this,$param);
+		$this->raiseEvent('OnClick', $this, $param);
 	}
 
 	/**
@@ -221,8 +221,8 @@ 
 	 */
 	public function onCommand($param)
 	{
-		$this->raiseEvent('OnCommand',$this,$param);
-		$this->raiseBubbleEvent($this,$param);
+		$this->raiseEvent('OnCommand', $this, $param);
+		$this->raiseBubbleEvent($this, $param);
 	}
 
 	/**
@@ -236,10 +236,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()));
 	}
 
 	/**
@@ -247,7 +247,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -255,7 +255,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -289,7 +289,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -297,7 +297,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -305,7 +305,7 @@ 
 	 */
 	public function getCommandName()
 	{
-		return $this->getViewState('CommandName','');
+		return $this->getViewState('CommandName', '');
 	}
 
 	/**
@@ -313,7 +313,7 @@ 
 	 */
 	public function setCommandName($value)
 	{
-		$this->setViewState('CommandName',$value,'');
+		$this->setViewState('CommandName', $value, '');
 	}
 
 	/**
@@ -321,7 +321,7 @@ 
 	 */
 	public function getCommandParameter()
 	{
-		return $this->getViewState('CommandParameter','');
+		return $this->getViewState('CommandParameter', '');
 	}
 
 	/**
@@ -329,7 +329,7 @@ 
 	 */
 	public function setCommandParameter($value)
 	{
-		$this->setViewState('CommandParameter',$value,'');
+		$this->setViewState('CommandParameter', $value, '');
 	}
 
 	/**
@@ -337,7 +337,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -345,7 +345,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -353,7 +353,7 @@ 
 	 */
 	public function getButtonType()
 	{
-		return $this->getViewState('ButtonType',TButtonType::Submit);
+		return $this->getViewState('ButtonType', TButtonType::Submit);
 	}
 
 	/**
@@ -361,7 +361,7 @@ 
 	 */
 	public function setButtonType($value)
 	{
-		$this->setViewState('ButtonType',TPropertyValue::ensureEnum($value,'TButtonType'),TButtonType::Submit);
+		$this->setViewState('ButtonType', TPropertyValue::ensureEnum($value, 'TButtonType'), TButtonType::Submit);
 	}
 }
 
@@ -380,9 +380,9 @@ 
  */
 class TButtonType extends TEnumerable
 {
-	const Submit='Submit';
-	const Reset='Reset';
-	const Button='Button';
+	const Submit = 'Submit';
+	const Reset = 'Reset';
+	const Button = 'Button';
 }
 
 /**
@@ -398,7 +398,7 @@ 
  */
 class TButtonTag extends TEnumerable
 {
-	const Input='Input';
-	const Button='Button';
+	const Input = 'Input';
+	const Button = 'Button';
 }
 

Braces +22 added lines, -16 removed lines

@@ -97,19 +97,23 @@ 
 		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
 		$writer->addAttribute('type',strtolower($this->getButtonType()));
-		if(($uniqueID=$this->getUniqueID())!=='')
-			$writer->addAttribute('name',$uniqueID);
-		if($this->getButtonTag()===TButtonTag::Button)
-		  $this->addParsedObject($this->getText());
-		else
-		  $writer->addAttribute('value',$this->getText());
+		if(($uniqueID=$this->getUniqueID())!=='') {
+					$writer->addAttribute('name',$uniqueID);
+		}
+		if($this->getButtonTag()===TButtonTag::Button) {
+				  $this->addParsedObject($this->getText());
+		} else {
+				  $writer->addAttribute('value',$this->getText());
+		}
 		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);
 	}
@@ -142,9 +146,9 @@ 
 		{
 			$group=$this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount()>0;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -196,8 +200,9 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if($this->getButtonTag()===TButtonTag::Button)
-			parent::renderContents($writer);
+		if($this->getButtonTag()===TButtonTag::Button) {
+					parent::renderContents($writer);
+		}
 	}
 
 	/**
@@ -236,8 +241,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/TCaptcha.php

Doc Comments +8 added lines

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

Spacing +107 added lines, -107 removed lines

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

Braces +46 added lines, -36 removed lines

@@ -90,10 +90,11 @@ 
 	public function setTokenImageTheme($value)
 	{
 		$value=TPropertyValue::ensureInteger($value);
-		if($value>=0 && $value<=63)
-			$this->setViewState('TokenImageTheme',$value,0);
-		else
-			throw new TConfigurationException('captcha_tokenimagetheme_invalid',0,63);
+		if($value>=0 && $value<=63) {
+					$this->setViewState('TokenImageTheme',$value,0);
+		} else {
+					throw new TConfigurationException('captcha_tokenimagetheme_invalid',0,63);
+		}
 	}
 
 	/**
@@ -113,10 +114,11 @@ 
 	public function setTokenFontSize($value)
 	{
 		$value=TPropertyValue::ensureInteger($value);
-		if($value>=20 && $value<=100)
-			$this->setViewState('TokenFontSize',$value,30);
-		else
-			throw new TConfigurationException('captcha_tokenfontsize_invalid',20,100);
+		if($value>=20 && $value<=100) {
+					$this->setViewState('TokenFontSize',$value,30);
+		} else {
+					throw new TConfigurationException('captcha_tokenfontsize_invalid',20,100);
+		}
 	}
 
 	/**
@@ -133,10 +135,11 @@ 
 	public function setMinTokenLength($value)
 	{
 		$length=TPropertyValue::ensureInteger($value);
-		if($length>=self::MIN_TOKEN_LENGTH && $length<=self::MAX_TOKEN_LENGTH)
-			$this->setViewState('MinTokenLength',$length,4);
-		else
-			throw new TConfigurationException('captcha_mintokenlength_invalid',self::MIN_TOKEN_LENGTH,self::MAX_TOKEN_LENGTH);
+		if($length>=self::MIN_TOKEN_LENGTH && $length<=self::MAX_TOKEN_LENGTH) {
+					$this->setViewState('MinTokenLength',$length,4);
+		} else {
+					throw new TConfigurationException('captcha_mintokenlength_invalid',self::MIN_TOKEN_LENGTH,self::MAX_TOKEN_LENGTH);
+		}
 	}
 
 	/**
@@ -153,10 +156,11 @@ 
 	public function setMaxTokenLength($value)
 	{
 		$length=TPropertyValue::ensureInteger($value);
-		if($length>=self::MIN_TOKEN_LENGTH && $length<=self::MAX_TOKEN_LENGTH)
-			$this->setViewState('MaxTokenLength',$length,6);
-		else
-			throw new TConfigurationException('captcha_maxtokenlength_invalid',self::MIN_TOKEN_LENGTH,self::MAX_TOKEN_LENGTH);
+		if($length>=self::MIN_TOKEN_LENGTH && $length<=self::MAX_TOKEN_LENGTH) {
+					$this->setViewState('MaxTokenLength',$length,6);
+		} else {
+					throw new TConfigurationException('captcha_maxtokenlength_invalid',self::MIN_TOKEN_LENGTH,self::MAX_TOKEN_LENGTH);
+		}
 	}
 
 	/**
@@ -188,8 +192,9 @@ 
 	 */
 	public function setTokenAlphabet($value)
 	{
-		if(strlen($value)<2)
-			throw new TConfigurationException('captcha_tokenalphabet_invalid');
+		if(strlen($value)<2) {
+					throw new TConfigurationException('captcha_tokenalphabet_invalid');
+		}
 		$this->setViewState('TokenAlphabet',$value,'234578adefhijmnrtABDEFGHJLMNRT');
 	}
 
@@ -246,10 +251,11 @@ 
 	 */
 	public function getIsTokenExpired()
 	{
-		if(($expiry=$this->getTokenExpiry())>0 && ($start=$this->getViewState('TokenGenerated',0))>0)
-			return $expiry+$start<time();
-		else
-			return false;
+		if(($expiry=$this->getTokenExpiry())>0 && ($start=$this->getViewState('TokenGenerated',0))>0) {
+					return $expiry+$start<time();
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -290,12 +296,13 @@ 
 		{
 			$minLength=$this->getMinTokenLength();
 			$maxLength=$this->getMaxTokenLength();
-			if($minLength>$maxLength)
-				$tokenLength=rand($maxLength,$minLength);
-			else if($minLength<$maxLength)
-				$tokenLength=rand($minLength,$maxLength);
-			else
-				$tokenLength=$minLength;
+			if($minLength>$maxLength) {
+							$tokenLength=rand($maxLength,$minLength);
+			} else if($minLength<$maxLength) {
+							$tokenLength=rand($minLength,$maxLength);
+			} else {
+							$tokenLength=$minLength;
+			}
 			$this->setViewState('TokenLength',$tokenLength);
 		}
 		return $tokenLength;
@@ -311,10 +318,11 @@ 
 			$fileName=$this->generatePrivateKeyFile();
 			$content=file_get_contents($fileName);
 			$matches=array();
-			if(preg_match("/privateKey='(.*?)'/ms",$content,$matches)>0)
-				$this->_privateKey=$matches[1];
-			else
-				throw new TConfigurationException('captcha_privatekey_unknown');
+			if(preg_match("/privateKey='(.*?)'/ms",$content,$matches)>0) {
+							$this->_privateKey=$matches[1];
+			} else {
+							throw new TConfigurationException('captcha_privatekey_unknown');
+			}
 		}
 		return $this->_privateKey;
 	}
@@ -361,8 +369,9 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if(!self::checkRequirements())
-			throw new TConfigurationException('captcha_imagettftext_required');
+		if(!self::checkRequirements()) {
+					throw new TConfigurationException('captcha_imagettftext_required');
+		}
 		if(!$this->getViewState('TokenGenerated',0))
 		{
 			$manager=$this->getApplication()->getAssetManager();
@@ -463,8 +472,9 @@ 
 	 */
 	protected function hash2string($hex,$alphabet='')
 	{
-		if(strlen($alphabet)<2)
-			$alphabet='234578adefhijmnrtABDEFGHJLMNQRT';
+		if(strlen($alphabet)<2) {
+					$alphabet='234578adefhijmnrtABDEFGHJLMNQRT';
+		}
 		$hexLength=strlen($hex);
 		$base=strlen($alphabet);
 		$result='';

framework/Web/UI/WebControls/TCaptchaValidator.php

Doc Comments +4 added lines, -1 removed lines

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

Spacing +18 added lines, -18 removed lines

@@ -50,7 +50,7 @@ 
 	 */
 	public function getCaptchaControl()
 	{
-		return $this->getViewState('CaptchaControl','');
+		return $this->getViewState('CaptchaControl', '');
 	}
 
 	/**
@@ -61,7 +61,7 @@ 
 	 */
 	public function setCaptchaControl($value)
 	{
-		$this->setViewState('CaptchaControl',TPropertyValue::ensureString($value),'');
+		$this->setViewState('CaptchaControl', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -73,8 +73,8 @@ 
 	 */
 	protected function evaluateIsValid()
 	{
-		$value=$this->getValidationValue($this->getValidationTarget());
-		$control=$this->findCaptchaControl();
+		$value = $this->getValidationValue($this->getValidationTarget());
+		$control = $this->findCaptchaControl();
 		return $control->validate(trim($value));
 	}
 
@@ -84,12 +84,12 @@ 
 	 */
 	protected function findCaptchaControl()
 	{
-		if(($id=$this->getCaptchaControl())==='')
+		if (($id = $this->getCaptchaControl()) === '')
 			throw new TConfigurationException('captchavalidator_captchacontrol_required');
-		else if(($control=$this->findControl($id))===null)
-			throw new TConfigurationException('captchavalidator_captchacontrol_inexistent',$id);
-		else if(!($control instanceof TCaptcha))
-			throw new TConfigurationException('captchavalidator_captchacontrol_invalid',$id);
+		else if (($control = $this->findControl($id)) === null)
+			throw new TConfigurationException('captchavalidator_captchacontrol_inexistent', $id);
+		else if (!($control instanceof TCaptcha))
+			throw new TConfigurationException('captchavalidator_captchacontrol_invalid', $id);
 		else
 			return $control;
 	}
@@ -100,25 +100,25 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options=parent::getClientScriptOptions();
-		$control=$this->findCaptchaControl();
-		if($control->getCaseSensitive())
+		$options = parent::getClientScriptOptions();
+		$control = $this->findCaptchaControl();
+		if ($control->getCaseSensitive())
 		{
-			$options['TokenHash']=$this->generateTokenHash($control->getToken());
-			$options['CaseSensitive']=true;
+			$options['TokenHash'] = $this->generateTokenHash($control->getToken());
+			$options['CaseSensitive'] = true;
 		}
 		else
 		{
-			$options['TokenHash']=$this->generateTokenHash(strtoupper($control->getToken()));
-			$options['CaseSensitive']=false;
+			$options['TokenHash'] = $this->generateTokenHash(strtoupper($control->getToken()));
+			$options['CaseSensitive'] = false;
 		}
 		return $options;
 	}
 
 	private function generateTokenHash($token)
 	{
-		for($h=0,$i=strlen($token)-1;$i>=0;--$i)
-			$h+=ord($token[$i]);
+		for ($h = 0, $i = strlen($token) - 1; $i >= 0; --$i)
+			$h += ord($token[$i]);
 		return $h;
 	}
 }

Braces +13 added lines, -12 removed lines

@@ -84,14 +84,15 @@ 
 	 */
 	protected function findCaptchaControl()
 	{
-		if(($id=$this->getCaptchaControl())==='')
-			throw new TConfigurationException('captchavalidator_captchacontrol_required');
-		else if(($control=$this->findControl($id))===null)
-			throw new TConfigurationException('captchavalidator_captchacontrol_inexistent',$id);
-		else if(!($control instanceof TCaptcha))
-			throw new TConfigurationException('captchavalidator_captchacontrol_invalid',$id);
-		else
-			return $control;
+		if(($id=$this->getCaptchaControl())==='') {
+					throw new TConfigurationException('captchavalidator_captchacontrol_required');
+		} else if(($control=$this->findControl($id))===null) {
+					throw new TConfigurationException('captchavalidator_captchacontrol_inexistent',$id);
+		} else if(!($control instanceof TCaptcha)) {
+					throw new TConfigurationException('captchavalidator_captchacontrol_invalid',$id);
+		} else {
+					return $control;
+		}
 	}
 
 	/**
@@ -106,8 +107,7 @@ 
 		{
 			$options['TokenHash']=$this->generateTokenHash($control->getToken());
 			$options['CaseSensitive']=true;
-		}
-		else
+		} else
 		{
 			$options['TokenHash']=$this->generateTokenHash(strtoupper($control->getToken()));
 			$options['CaseSensitive']=false;
@@ -117,8 +117,9 @@ 
 
 	private function generateTokenHash($token)
 	{
-		for($h=0,$i=strlen($token)-1;$i>=0;--$i)
-			$h+=ord($token[$i]);
+		for($h=0,$i=strlen($token)-1;$i>=0;--$i) {
+					$h+=ord($token[$i]);
+		}
 		return $h;
 	}
 }

framework/Web/UI/WebControls/TCheckBox.php

Doc Comments +6 added lines, -1 removed lines

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

Indentation +18 added lines, -18 removed lines

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

Spacing +90 added lines, -90 removed lines

@@ -40,8 +40,8 @@ 
  */
 class TCheckBox extends TWebControl implements IPostBackDataHandler, IValidatable, IDataRenderer, ISurroundable
 {
-	private $_dataChanged=false;
-	private $_isValid=true;
+	private $_dataChanged = false;
+	private $_isValid = true;
 
 	/**
 	 * @return string tag name of the button
@@ -58,13 +58,13 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the control has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
-		$checked=$this->getChecked();
-		if($newChecked=isset($values[$key]))
+		$checked = $this->getChecked();
+		if ($newChecked = isset($values[$key]))
 			$this->setValue($values[$key]);
 		$this->setChecked($newChecked);
-		return $this->_dataChanged=($newChecked!==$checked);
+		return $this->_dataChanged = ($newChecked !== $checked);
 	}
 
 	/**
@@ -74,7 +74,7 @@ 
 	 */
 	public function raisePostDataChangedEvent()
 	{
-		if($this->getAutoPostBack() && $this->getCausesValidation())
+		if ($this->getAutoPostBack() && $this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
 		$this->onCheckedChanged(null);
 	}
@@ -87,7 +87,7 @@ 
 	 */
 	public function onCheckedChanged($param)
 	{
-		$this->raiseEvent('OnCheckedChanged',$this,$param);
+		$this->raiseEvent('OnCheckedChanged', $this, $param);
 	}
 
 	/**
@@ -101,7 +101,7 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if($this->getEnabled(true))
+		if ($this->getEnabled(true))
 			$this->getPage()->registerRequiresPostData($this);
 	}
 
@@ -138,7 +138,7 @@ 
 	 */
 	public function setIsValid($value)
 	{
-	    $this->_isValid=TPropertyValue::ensureBoolean($value);
+	    $this->_isValid = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 	 */
 	public function getValue()
 	{
-		return $this->getViewState('Value','');
+		return $this->getViewState('Value', '');
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->setViewState('Value',TPropertyValue::ensureString($value),'');
+		$this->setViewState('Value', TPropertyValue::ensureString($value), '');
 	}
 
 	/**
@@ -179,7 +179,7 @@ 
 	 */
 	public function getTextAlign()
 	{
-		return $this->getViewState('TextAlign',TTextAlign::Right);
+		return $this->getViewState('TextAlign', TTextAlign::Right);
 	}
 
 	/**
@@ -187,7 +187,7 @@ 
 	 */
 	public function setTextAlign($value)
 	{
-		$this->setViewState('TextAlign',TPropertyValue::ensureEnum($value,'TTextAlign'),TTextAlign::Right);
+		$this->setViewState('TextAlign', TPropertyValue::ensureEnum($value, 'TTextAlign'), TTextAlign::Right);
 	}
 
 	/**
@@ -195,7 +195,7 @@ 
 	 */
 	public function getChecked()
 	{
-		return $this->getViewState('Checked',false);
+		return $this->getViewState('Checked', false);
 	}
 
 	/**
@@ -204,7 +204,7 @@ 
 	 */
 	public function setChecked($value)
 	{
-		$this->setViewState('Checked',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('Checked', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -238,7 +238,7 @@ 
 	 */
 	public function getAutoPostBack()
 	{
-		return $this->getViewState('AutoPostBack',false);
+		return $this->getViewState('AutoPostBack', false);
 	}
 
 	/**
@@ -247,7 +247,7 @@ 
 	 */
 	public function setAutoPostBack($value)
 	{
-		$this->setViewState('AutoPostBack',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('AutoPostBack', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -255,7 +255,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -264,7 +264,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -272,7 +272,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -280,7 +280,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -296,7 +296,7 @@ 
 	 */
 	public function getSurroundingTagID()
 	{
-    return $this->getSpanNeeded() ? $this->getClientID().'_parent' : $this->getClientID();
+    return $this->getSpanNeeded() ? $this->getClientID() . '_parent' : $this->getClientID();
 	}
 
 	/**
@@ -308,46 +308,46 @@ 
 	public function render($writer)
 	{
 		$this->getPage()->ensureRenderInForm($this);
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			$this->getStyle()->addAttributesToRender($writer);
-		if(($tooltip=$this->getToolTip())!=='')
-			$writer->addAttribute('title',$tooltip);
-		if($this->getHasAttributes())
+		if (($tooltip = $this->getToolTip()) !== '')
+			$writer->addAttribute('title', $tooltip);
+		if ($this->getHasAttributes())
 		{
-			$attributes=$this->getAttributes();
-			$value=$attributes->remove('value');
+			$attributes = $this->getAttributes();
+			$value = $attributes->remove('value');
 			// onclick js should only be added to input tag
-			if(($onclick=$attributes->remove('onclick'))===null)
-				$onclick='';
-			if($attributes->getCount())
+			if (($onclick = $attributes->remove('onclick')) === null)
+				$onclick = '';
+			if ($attributes->getCount())
 				$writer->addAttributes($attributes);
-			if($value!==null)
-				$attributes->add('value',$value);
+			if ($value !== null)
+				$attributes->add('value', $value);
 		}
 		else
-			$onclick='';
-    if($needspan=$this->getSpanNeeded())
+			$onclick = '';
+    if ($needspan = $this->getSpanNeeded())
     {
-      $writer->addAttribute('id',$this->getSurroundingTagID());
+      $writer->addAttribute('id', $this->getSurroundingTagID());
       $writer->renderBeginTag($this->getSurroundingTag());
     }
-		$clientID=$this->getClientID();
-		if(($text=$this->getText())!=='')
+		$clientID = $this->getClientID();
+		if (($text = $this->getText()) !== '')
 		{
-			if($this->getTextAlign()===TTextAlign::Left)
+			if ($this->getTextAlign() === TTextAlign::Left)
 			{
-				$this->renderLabel($writer,$clientID,$text);
-				$this->renderInputTag($writer,$clientID,$onclick);
+				$this->renderLabel($writer, $clientID, $text);
+				$this->renderInputTag($writer, $clientID, $onclick);
 			}
 			else
 			{
-				$this->renderInputTag($writer,$clientID,$onclick);
-				$this->renderLabel($writer,$clientID,$text);
+				$this->renderInputTag($writer, $clientID, $onclick);
+				$this->renderLabel($writer, $clientID, $text);
 			}
 		}
 		else
-			$this->renderInputTag($writer,$clientID,$onclick);
-		if($needspan)
+			$this->renderInputTag($writer, $clientID, $onclick);
+		if ($needspan)
 			$writer->renderEndTag();
 	}
 
@@ -356,12 +356,12 @@ 
 	 */
 	public function getLabelAttributes()
 	{
-		if($attributes=$this->getViewState('LabelAttributes',null))
+		if ($attributes = $this->getViewState('LabelAttributes', null))
 			return $attributes;
 		else
 		{
-			$attributes=new TAttributeCollection;
-			$this->setViewState('LabelAttributes',$attributes,null);
+			$attributes = new TAttributeCollection;
+			$this->setViewState('LabelAttributes', $attributes, null);
 			return $attributes;
 		}
 	}
@@ -371,12 +371,12 @@ 
 	 */
 	public function getInputAttributes()
 	{
-		if($attributes=$this->getViewState('InputAttributes',null))
+		if ($attributes = $this->getViewState('InputAttributes', null))
 			return $attributes;
 		else
 		{
-			$attributes=new TAttributeCollection;
-			$this->setViewState('InputAttributes',$attributes,null);
+			$attributes = new TAttributeCollection;
+			$this->setViewState('InputAttributes', $attributes, null);
 			return $attributes;
 		}
 	}
@@ -386,14 +386,14 @@ 
 	 */
 	protected function getValueAttribute()
 	{
-		if(($value=$this->getValue())!=='')
+		if (($value = $this->getValue()) !== '')
 			return $value;
 		else
 		{
-			$attributes=$this->getViewState('InputAttributes',null);
-			if($attributes && $attributes->contains('value'))
+			$attributes = $this->getViewState('InputAttributes', null);
+			if ($attributes && $attributes->contains('value'))
 				return $attributes->itemAt('value');
-			else if($this->hasAttribute('value'))
+			else if ($this->hasAttribute('value'))
 				return $this->getAttribute('value');
 			else
 				return '';
@@ -405,7 +405,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -413,7 +413,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
     /**
@@ -423,7 +423,7 @@ 
      * @return bool wether this control needs a surrounding span tag
      */
     protected function getSpanNeeded() {
-        return $this->getText()!=='';
+        return $this->getText() !== '';
     }
 
 	/**
@@ -432,10 +432,10 @@ 
 	 * @param string checkbox id
 	 * @param string label text
 	 */
-	protected function renderLabel($writer,$clientID,$text)
+	protected function renderLabel($writer, $clientID, $text)
 	{
-		$writer->addAttribute('for',$clientID);
-		if($attributes=$this->getViewState('LabelAttributes',null))
+		$writer->addAttribute('for', $clientID);
+		if ($attributes = $this->getViewState('LabelAttributes', null))
 			$writer->addAttributes($attributes);
 		$writer->renderBeginTag('label');
 		$writer->write($text);
@@ -448,24 +448,24 @@ 
 	 * @param string checkbox id
 	 * @param string onclick js
 	 */
-	protected function renderInputTag($writer,$clientID,$onclick)
-	{
-		if($clientID!=='')
-			$writer->addAttribute('id',$clientID);
-		$writer->addAttribute('type','checkbox');
-		if(($value=$this->getValueAttribute())!=='')
-			$writer->addAttribute('value',$value);
-		if(!empty($onclick))
-			$writer->addAttribute('onclick',$onclick);
-		if(($uniqueID=$this->getUniqueID())!=='')
-			$writer->addAttribute('name',$uniqueID);
-		if($this->getChecked())
-			$writer->addAttribute('checked','checked');
-		if(!$this->getEnabled(true))
-			$writer->addAttribute('disabled','disabled');
-
-		$page=$this->getPage();
-		if($this->getEnabled(true)
+	protected function renderInputTag($writer, $clientID, $onclick)
+	{
+		if ($clientID !== '')
+			$writer->addAttribute('id', $clientID);
+		$writer->addAttribute('type', 'checkbox');
+		if (($value = $this->getValueAttribute()) !== '')
+			$writer->addAttribute('value', $value);
+		if (!empty($onclick))
+			$writer->addAttribute('onclick', $onclick);
+		if (($uniqueID = $this->getUniqueID()) !== '')
+			$writer->addAttribute('name', $uniqueID);
+		if ($this->getChecked())
+			$writer->addAttribute('checked', 'checked');
+		if (!$this->getEnabled(true))
+			$writer->addAttribute('disabled', 'disabled');
+
+		$page = $this->getPage();
+		if ($this->getEnabled(true)
 			&& $this->getEnableClientScript()
 			&& $this->getAutoPostBack()
 			&& $page->getClientSupportsJavaScript())
@@ -473,11 +473,11 @@ 
 			$this->renderClientControlScript($writer);
 		}
 
-		if(($accesskey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accesskey);
-		if(($tabindex=$this->getTabIndex())>0)
-			$writer->addAttribute('tabindex',"$tabindex");
-		if($attributes=$this->getViewState('InputAttributes',null))
+		if (($accesskey = $this->getAccessKey()) !== '')
+			$writer->addAttribute('accesskey', $accesskey);
+		if (($tabindex = $this->getTabIndex()) > 0)
+			$writer->addAttribute('tabindex', "$tabindex");
+		if ($attributes = $this->getViewState('InputAttributes', null))
 			$writer->addAttributes($attributes);
 		$writer->renderBeginTag('input');
 		$writer->renderEndTag();
@@ -489,7 +489,7 @@ 
 	protected function renderClientControlScript($writer)
 	{
 		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**
@@ -530,7 +530,7 @@ 
  */
 class TTextAlign extends TEnumerable
 {
-	const Left='Left';
-	const Right='Right';
+	const Left = 'Left';
+	const Right = 'Right';
 }
 

Braces +78 added lines, -59 removed lines

@@ -61,8 +61,9 @@ 
 	public function loadPostData($key,$values)
 	{
 		$checked=$this->getChecked();
-		if($newChecked=isset($values[$key]))
-			$this->setValue($values[$key]);
+		if($newChecked=isset($values[$key])) {
+					$this->setValue($values[$key]);
+		}
 		$this->setChecked($newChecked);
 		return $this->_dataChanged=($newChecked!==$checked);
 	}
@@ -74,8 +75,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->onCheckedChanged(null);
 	}
 
@@ -101,8 +103,9 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if($this->getEnabled(true))
-			$this->getPage()->registerRequiresPostData($this);
+		if($this->getEnabled(true)) {
+					$this->getPage()->registerRequiresPostData($this);
+		}
 	}
 
 	/**
@@ -308,24 +311,29 @@ 
 	public function render($writer)
 	{
 		$this->getPage()->ensureRenderInForm($this);
-		if($this->getHasStyle())
-			$this->getStyle()->addAttributesToRender($writer);
-		if(($tooltip=$this->getToolTip())!=='')
-			$writer->addAttribute('title',$tooltip);
+		if($this->getHasStyle()) {
+					$this->getStyle()->addAttributesToRender($writer);
+		}
+		if(($tooltip=$this->getToolTip())!=='') {
+					$writer->addAttribute('title',$tooltip);
+		}
 		if($this->getHasAttributes())
 		{
 			$attributes=$this->getAttributes();
 			$value=$attributes->remove('value');
 			// onclick js should only be added to input tag
-			if(($onclick=$attributes->remove('onclick'))===null)
-				$onclick='';
-			if($attributes->getCount())
-				$writer->addAttributes($attributes);
-			if($value!==null)
-				$attributes->add('value',$value);
+			if(($onclick=$attributes->remove('onclick'))===null) {
+							$onclick='';
+			}
+			if($attributes->getCount()) {
+							$writer->addAttributes($attributes);
+			}
+			if($value!==null) {
+							$attributes->add('value',$value);
+			}
+		} else {
+					$onclick='';
 		}
-		else
-			$onclick='';
     if($needspan=$this->getSpanNeeded())
     {
       $writer->addAttribute('id',$this->getSurroundingTagID());
@@ -338,17 +346,17 @@ 
 			{
 				$this->renderLabel($writer,$clientID,$text);
 				$this->renderInputTag($writer,$clientID,$onclick);
-			}
-			else
+			} else
 			{
 				$this->renderInputTag($writer,$clientID,$onclick);
 				$this->renderLabel($writer,$clientID,$text);
 			}
+		} else {
+					$this->renderInputTag($writer,$clientID,$onclick);
+		}
+		if($needspan) {
+					$writer->renderEndTag();
 		}
-		else
-			$this->renderInputTag($writer,$clientID,$onclick);
-		if($needspan)
-			$writer->renderEndTag();
 	}
 
 	/**
@@ -356,9 +364,9 @@ 
 	 */
 	public function getLabelAttributes()
 	{
-		if($attributes=$this->getViewState('LabelAttributes',null))
-			return $attributes;
-		else
+		if($attributes=$this->getViewState('LabelAttributes',null)) {
+					return $attributes;
+		} else
 		{
 			$attributes=new TAttributeCollection;
 			$this->setViewState('LabelAttributes',$attributes,null);
@@ -371,9 +379,9 @@ 
 	 */
 	public function getInputAttributes()
 	{
-		if($attributes=$this->getViewState('InputAttributes',null))
-			return $attributes;
-		else
+		if($attributes=$this->getViewState('InputAttributes',null)) {
+					return $attributes;
+		} else
 		{
 			$attributes=new TAttributeCollection;
 			$this->setViewState('InputAttributes',$attributes,null);
@@ -386,17 +394,18 @@ 
 	 */
 	protected function getValueAttribute()
 	{
-		if(($value=$this->getValue())!=='')
-			return $value;
-		else
+		if(($value=$this->getValue())!=='') {
+					return $value;
+		} else
 		{
 			$attributes=$this->getViewState('InputAttributes',null);
-			if($attributes && $attributes->contains('value'))
-				return $attributes->itemAt('value');
-			else if($this->hasAttribute('value'))
-				return $this->getAttribute('value');
-			else
-				return '';
+			if($attributes && $attributes->contains('value')) {
+							return $attributes->itemAt('value');
+			} else if($this->hasAttribute('value')) {
+							return $this->getAttribute('value');
+			} else {
+							return '';
+			}
 		}
 	}
 
@@ -435,8 +444,9 @@ 
 	protected function renderLabel($writer,$clientID,$text)
 	{
 		$writer->addAttribute('for',$clientID);
-		if($attributes=$this->getViewState('LabelAttributes',null))
-			$writer->addAttributes($attributes);
+		if($attributes=$this->getViewState('LabelAttributes',null)) {
+					$writer->addAttributes($attributes);
+		}
 		$writer->renderBeginTag('label');
 		$writer->write($text);
 		$writer->renderEndTag();
@@ -450,19 +460,25 @@ 
 	 */
 	protected function renderInputTag($writer,$clientID,$onclick)
 	{
-		if($clientID!=='')
-			$writer->addAttribute('id',$clientID);
+		if($clientID!=='') {
+					$writer->addAttribute('id',$clientID);
+		}
 		$writer->addAttribute('type','checkbox');
-		if(($value=$this->getValueAttribute())!=='')
-			$writer->addAttribute('value',$value);
-		if(!empty($onclick))
-			$writer->addAttribute('onclick',$onclick);
-		if(($uniqueID=$this->getUniqueID())!=='')
-			$writer->addAttribute('name',$uniqueID);
-		if($this->getChecked())
-			$writer->addAttribute('checked','checked');
-		if(!$this->getEnabled(true))
-			$writer->addAttribute('disabled','disabled');
+		if(($value=$this->getValueAttribute())!=='') {
+					$writer->addAttribute('value',$value);
+		}
+		if(!empty($onclick)) {
+					$writer->addAttribute('onclick',$onclick);
+		}
+		if(($uniqueID=$this->getUniqueID())!=='') {
+					$writer->addAttribute('name',$uniqueID);
+		}
+		if($this->getChecked()) {
+					$writer->addAttribute('checked','checked');
+		}
+		if(!$this->getEnabled(true)) {
+					$writer->addAttribute('disabled','disabled');
+		}
 
 		$page=$this->getPage();
 		if($this->getEnabled(true)
@@ -473,12 +489,15 @@ 
 			$this->renderClientControlScript($writer);
 		}
 
-		if(($accesskey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accesskey);
-		if(($tabindex=$this->getTabIndex())>0)
-			$writer->addAttribute('tabindex',"$tabindex");
-		if($attributes=$this->getViewState('InputAttributes',null))
-			$writer->addAttributes($attributes);
+		if(($accesskey=$this->getAccessKey())!=='') {
+					$writer->addAttribute('accesskey',$accesskey);
+		}
+		if(($tabindex=$this->getTabIndex())>0) {
+					$writer->addAttribute('tabindex',"$tabindex");
+		}
+		if($attributes=$this->getViewState('InputAttributes',null)) {
+					$writer->addAttributes($attributes);
+		}
 		$writer->renderBeginTag('input');
 		$writer->renderEndTag();
 	}

framework/Web/UI/WebControls/TCheckBoxList.php

Doc Comments +3 added lines, -3 removed lines

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

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

Spacing +51 added lines, -51 removed lines

@@ -45,13 +45,13 @@ 
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
-class TCheckBoxList extends TListControl implements IRepeatInfoUser, INamingContainer, IPostBackDataHandler,  IValidatable
+class TCheckBoxList extends TListControl implements IRepeatInfoUser, INamingContainer, IPostBackDataHandler, IValidatable
 {
 	private $_repeatedControl;
 	private $_isEnabled;
-	private $_changedEventRaised=false;
-	private $_dataChanged=false;
-	private $_isValid=true;
+	private $_changedEventRaised = false;
+	private $_dataChanged = false;
+	private $_isValid = true;
 
 	/**
 	 * Constructor.
@@ -60,7 +60,7 @@ 
 	public function __construct()
 	{
 		parent::__construct();
-		$this->_repeatedControl=$this->createRepeatedControl();
+		$this->_repeatedControl = $this->createRepeatedControl();
 		$this->_repeatedControl->setEnableViewState(false);
 		$this->_repeatedControl->setID('c0');
 		$this->getControls()->add($this->_repeatedControl);
@@ -82,9 +82,9 @@ 
 	 * @param string control ID
 	 * @return TControl control being found
 	 */
-	public function findControl($id, $real=false)
+	public function findControl($id, $real = false)
 	{
-  		if ($real===true)
+  		if ($real === true)
   			return parent::findControl($id);
 		return $this;
 	}
@@ -112,7 +112,7 @@ 
 	 */
 	public function getTextAlign()
 	{
-		return $this->getViewState('TextAlign',TTextAlign::Right);
+		return $this->getViewState('TextAlign', TTextAlign::Right);
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 	 */
 	public function setTextAlign($value)
 	{
-		$this->setViewState('TextAlign',TPropertyValue::ensureEnum($value,'TTextAlign'),TTextAlign::Right);
+		$this->setViewState('TextAlign', TPropertyValue::ensureEnum($value, 'TTextAlign'), TTextAlign::Right);
 	}
 
 
@@ -129,10 +129,10 @@ 
 	 */
 	protected function getRepeatInfo()
 	{
-		if(($repeatInfo=$this->getViewState('RepeatInfo',null))===null)
+		if (($repeatInfo = $this->getViewState('RepeatInfo', null)) === null)
 		{
-			$repeatInfo=new TRepeatInfo;
-			$this->setViewState('RepeatInfo',$repeatInfo,null);
+			$repeatInfo = new TRepeatInfo;
+			$this->setViewState('RepeatInfo', $repeatInfo, null);
 		}
 		return $repeatInfo;
 	}
@@ -190,7 +190,7 @@ 
 	 */
 	public function getCellSpacing()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getCellSpacing();
 		else
 			return -1;
@@ -210,7 +210,7 @@ 
 	 */
 	public function getCellPadding()
 	{
-		if($this->getHasStyle())
+		if ($this->getHasStyle())
 			return $this->getStyle()->getCellPadding();
 		else
 			return -1;
@@ -266,16 +266,16 @@ 
 		// and it's a callback,
 		// and we can update clientside,
 		// then update the 'disabled' attribute of the items.
-		if(($this instanceof IActiveControl) &&
+		if (($this instanceof IActiveControl) &&
 				$this->getPage()->getIsCallBack() &&
 				$this->getActiveControl()->canUpdateClientSide())
 		{
 			$items = $this->getItems();
 			$cs = $this->getPage()->getCallbackClient();
-			$baseClientID = $this->getClientID().'_c';
-			foreach($items as $index=>$item)
+			$baseClientID = $this->getClientID() . '_c';
+			foreach ($items as $index=>$item)
 			{
-				$cs->setAttribute($baseClientID.$index, 'disabled', $value);
+				$cs->setAttribute($baseClientID . $index, 'disabled', $value);
 			}
 		}
 	}
@@ -287,7 +287,7 @@ 
 	 * @param integer index of the item being rendered
 	 * @return null
 	 */
-	public function generateItemStyle($itemType,$index)
+	public function generateItemStyle($itemType, $index)
 	{
 		return null;
 	}
@@ -300,18 +300,18 @@ 
 	 * @param string item type (Header,Footer,Item,AlternatingItem,SelectedItem,EditItem,Separator,Pager)
 	 * @param integer zero-based index of the item in the item list
 	 */
-	public function renderItem($writer,$repeatInfo,$itemType,$index)
+	public function renderItem($writer, $repeatInfo, $itemType, $index)
 	{
-		$repeatedControl=$this->_repeatedControl;
-		$item=$this->getItems()->itemAt($index);
-		if($item->getHasAttributes())
+		$repeatedControl = $this->_repeatedControl;
+		$item = $this->getItems()->itemAt($index);
+		if ($item->getHasAttributes())
 			$repeatedControl->getAttributes()->copyFrom($item->getAttributes());
-		else if($repeatedControl->getHasAttributes())
+		else if ($repeatedControl->getHasAttributes())
 			$repeatedControl->getAttributes()->clear();
 		$repeatedControl->setID("c$index");
 		$repeatedControl->setText($item->getText());
 		$repeatedControl->setChecked($item->getSelected());
-		$repeatedControl->setAttribute('value',$item->getValue());
+		$repeatedControl->setAttribute('value', $item->getValue());
 		$repeatedControl->setEnabled($this->_isEnabled && $item->getEnabled());
 		$repeatedControl->setEnableClientScript(false);
 		$repeatedControl->renderControl($writer);
@@ -324,25 +324,25 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the control has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
-		if($this->getEnabled(true))
+		if ($this->getEnabled(true))
 		{
-			$index=(int)substr($key,strlen($this->getUniqueID())+2);
+			$index = (int) substr($key, strlen($this->getUniqueID()) + 2);
 			$this->ensureDataBound();
-			if($index>=0 && $index<$this->getItemCount())
+			if ($index >= 0 && $index < $this->getItemCount())
 			{
-				$item=$this->getItems()->itemAt($index);
-				if($item->getEnabled())
+				$item = $this->getItems()->itemAt($index);
+				if ($item->getEnabled())
 				{
-					$checked=isset($values[$key]);
-					if($item->getSelected()!==$checked)
+					$checked = isset($values[$key]);
+					if ($item->getSelected() !== $checked)
 					{
 						$item->setSelected($checked);
-						if(!$this->_changedEventRaised)
+						if (!$this->_changedEventRaised)
 						{
-							$this->_changedEventRaised=true;
-							return $this->_dataChanged=true;
+							$this->_changedEventRaised = true;
+							return $this->_dataChanged = true;
 						}
 					}
 				}
@@ -360,7 +360,7 @@ 
 	 */
 	public function raisePostDataChangedEvent()
 	{
-		if($this->getAutoPostBack() && $this->getCausesValidation())
+		if ($this->getAutoPostBack() && $this->getCausesValidation())
 			$this->getPage()->validate($this->getValidationGroup());
 		$this->onSelectedIndexChanged(null);
 	}
@@ -376,9 +376,9 @@ 
 		$this->_repeatedControl->setAutoPostBack($this->getAutoPostBack());
 		$this->_repeatedControl->setCausesValidation($this->getCausesValidation());
 		$this->_repeatedControl->setValidationGroup($this->getValidationGroup());
-		$page=$this->getPage();
-		$n=$this->getItemCount();
-		for($i=0;$i<$n;++$i)
+		$page = $this->getPage();
+		$n = $this->getItemCount();
+		for ($i = 0; $i < $n; ++$i)
 		{
 			$this->_repeatedControl->setID("c$i");
 			$page->registerRequiresPostData($this->_repeatedControl);
@@ -390,9 +390,9 @@ 
 	 *
 	 *@return boolean true if we need a span
 	 */
-	protected function getSpanNeeded ()
+	protected function getSpanNeeded()
 	{
-		return $this->getRepeatLayout()===TRepeatLayout::Raw;
+		return $this->getRepeatLayout() === TRepeatLayout::Raw;
 	}
 
 	/**
@@ -402,24 +402,24 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getItemCount()>0)
+		if ($this->getItemCount() > 0)
 		{
-			if ($needSpan=$this->getSpanNeeded())
+			if ($needSpan = $this->getSpanNeeded())
 			{
 				$writer->addAttribute('id', $this->getClientId());
 				$writer->renderBeginTag('span');
 			}
-			$this->_isEnabled=$this->getEnabled(true);
-			$repeatInfo=$this->getRepeatInfo();
-			$accessKey=$this->getAccessKey();
-			$tabIndex=$this->getTabIndex();
+			$this->_isEnabled = $this->getEnabled(true);
+			$repeatInfo = $this->getRepeatInfo();
+			$accessKey = $this->getAccessKey();
+			$tabIndex = $this->getTabIndex();
 			$this->_repeatedControl->setTextAlign($this->getTextAlign());
 			$this->_repeatedControl->setAccessKey($accessKey);
 			$this->_repeatedControl->setTabIndex($tabIndex);
 			$this->setAccessKey('');
 			$this->setTabIndex(0);
 			$this->addAttributesToRender($writer);
-			$repeatInfo->renderRepeater($writer,$this);
+			$repeatInfo->renderRepeater($writer, $this);
 			$this->setAccessKey($accessKey);
 			$this->setTabIndex($tabIndex);
 			if ($needSpan)
@@ -427,7 +427,7 @@ 
 		}
 
 		//checkbox skipped the client control script in addAttributesToRender
-		if($this->getEnabled(true)
+		if ($this->getEnabled(true)
 			&& $this->getEnableClientScript()
 			&& $this->getAutoPostBack()
 			&& $this->getPage()->getClientSupportsJavaScript())
@@ -470,7 +470,7 @@ 
 	 */
 	public function setIsValid($value)
 	{
-	    $this->_isValid=TPropertyValue::ensureBoolean($value);
+	    $this->_isValid = TPropertyValue::ensureBoolean($value);
 	}
 
 	/**

Braces +24 added lines, -18 removed lines

@@ -84,8 +84,9 @@ 
 	 */
 	public function findControl($id, $real=false)
 	{
-  		if ($real===true)
-  			return parent::findControl($id);
+  		if ($real===true) {
+  		  			return parent::findControl($id);
+  		}
 		return $this;
 	}
 
@@ -190,10 +191,11 @@ 
 	 */
 	public function getCellSpacing()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getCellSpacing();
-		else
-			return -1;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getCellSpacing();
+		} else {
+					return -1;
+		}
 	}
 
 	/**
@@ -210,10 +212,11 @@ 
 	 */
 	public function getCellPadding()
 	{
-		if($this->getHasStyle())
-			return $this->getStyle()->getCellPadding();
-		else
-			return -1;
+		if($this->getHasStyle()) {
+					return $this->getStyle()->getCellPadding();
+		} else {
+					return -1;
+		}
 	}
 
 	/**
@@ -304,10 +307,11 @@ 
 	{
 		$repeatedControl=$this->_repeatedControl;
 		$item=$this->getItems()->itemAt($index);
-		if($item->getHasAttributes())
-			$repeatedControl->getAttributes()->copyFrom($item->getAttributes());
-		else if($repeatedControl->getHasAttributes())
-			$repeatedControl->getAttributes()->clear();
+		if($item->getHasAttributes()) {
+					$repeatedControl->getAttributes()->copyFrom($item->getAttributes());
+		} else if($repeatedControl->getHasAttributes()) {
+					$repeatedControl->getAttributes()->clear();
+		}
 		$repeatedControl->setID("c$index");
 		$repeatedControl->setText($item->getText());
 		$repeatedControl->setChecked($item->getSelected());
@@ -360,8 +364,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);
 	}
 
@@ -422,8 +427,9 @@ 
 			$repeatInfo->renderRepeater($writer,$this);
 			$this->setAccessKey($accessKey);
 			$this->setTabIndex($tabIndex);
-			if ($needSpan)
-				$writer->renderEndTag();
+			if ($needSpan) {
+							$writer->renderEndTag();
+			}
 		}
 
 		//checkbox skipped the client control script in addAttributesToRender