pradosoft / prado

framework/Web/UI/WebControls/TFont.php

Spacing +30 added lines, -30 removed lines

@@ -62,12 +62,12 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_flags===0)
-			$exprops[] = "\0TFont\0_flags";
-		if ($this->_name==='')
-			$exprops[] = "\0TFont\0_name";
-		if ($this->_size==='')
-			$exprops[] = "\0TFont\0_size";
+		if($this->_flags===0)
+			$exprops[]="\0TFont\0_flags";
+		if($this->_name==='')
+			$exprops[]="\0TFont\0_name";
+		if($this->_size==='')
+			$exprops[]="\0TFont\0_size";
 	}
 
 	/**
@@ -83,11 +83,11 @@ 
 	 */
 	public function setBold($value)
 	{
-		$this->_flags |= self::IS_SET_BOLD;
+		$this->_flags|=self::IS_SET_BOLD;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_BOLD;
+			$this->_flags|=self::IS_BOLD;
 		else
-			$this->_flags &= ~self::IS_BOLD;
+			$this->_flags&=~self::IS_BOLD;
 	}
 
 	/**
@@ -103,11 +103,11 @@ 
 	 */
 	public function setItalic($value)
 	{
-		$this->_flags |= self::IS_SET_ITALIC;
+		$this->_flags|=self::IS_SET_ITALIC;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_ITALIC;
+			$this->_flags|=self::IS_ITALIC;
 		else
-			$this->_flags &= ~self::IS_ITALIC;
+			$this->_flags&=~self::IS_ITALIC;
 	}
 
 	/**
@@ -123,11 +123,11 @@ 
 	 */
 	public function setOverline($value)
 	{
-		$this->_flags |= self::IS_SET_OVERLINE;
+		$this->_flags|=self::IS_SET_OVERLINE;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_OVERLINE;
+			$this->_flags|=self::IS_OVERLINE;
 		else
-			$this->_flags &= ~self::IS_OVERLINE;
+			$this->_flags&=~self::IS_OVERLINE;
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 */
 	public function setSize($value)
 	{
-		$this->_flags |= self::IS_SET_SIZE;
+		$this->_flags|=self::IS_SET_SIZE;
 		$this->_size=$value;
 	}
 
@@ -160,11 +160,11 @@ 
 	 */
 	public function setStrikeout($value)
 	{
-		$this->_flags |= self::IS_SET_STRIKEOUT;
+		$this->_flags|=self::IS_SET_STRIKEOUT;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_STRIKEOUT;
+			$this->_flags|=self::IS_STRIKEOUT;
 		else
-			$this->_flags &= ~self::IS_STRIKEOUT;
+			$this->_flags&=~self::IS_STRIKEOUT;
 	}
 
 	/**
@@ -180,11 +180,11 @@ 
 	 */
 	public function setUnderline($value)
 	{
-		$this->_flags |= self::IS_SET_UNDERLINE;
+		$this->_flags|=self::IS_SET_UNDERLINE;
 		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags |= self::IS_UNDERLINE;
+			$this->_flags|=self::IS_UNDERLINE;
 		else
-			$this->_flags &= ~self::IS_UNDERLINE;
+			$this->_flags&=~self::IS_UNDERLINE;
 	}
 
 	/**
@@ -200,7 +200,7 @@ 
 	 */
 	public function setName($value)
 	{
-		$this->_flags |= self::IS_SET_NAME;
+		$this->_flags|=self::IS_SET_NAME;
 		$this->_name=$value;
 	}
 
@@ -283,9 +283,9 @@ 
 			return '';
 		$str='';
 		if($this->_flags & self::IS_SET_BOLD)
-			$str.='font-weight:'.(($this->_flags & self::IS_BOLD)?'bold;':'normal;');
+			$str.='font-weight:'.(($this->_flags & self::IS_BOLD) ? 'bold;' : 'normal;');
 		if($this->_flags & self::IS_SET_ITALIC)
-			$str.='font-style:'.(($this->_flags & self::IS_ITALIC)?'italic;':'normal;');
+			$str.='font-style:'.(($this->_flags & self::IS_ITALIC) ? 'italic;' : 'normal;');
 		$textDec='';
 		if($this->_flags & self::IS_UNDERLINE)
 			$textDec.='underline';
@@ -312,9 +312,9 @@ 
 		if($this->_flags===0)
 			return;
 		if($this->_flags & self::IS_SET_BOLD)
-			$writer->addStyleAttribute('font-weight',(($this->_flags & self::IS_BOLD)?'bold':'normal'));
+			$writer->addStyleAttribute('font-weight', (($this->_flags & self::IS_BOLD) ? 'bold' : 'normal'));
 		if($this->_flags & self::IS_SET_ITALIC)
-			$writer->addStyleAttribute('font-style',(($this->_flags & self::IS_ITALIC)?'italic':'normal'));
+			$writer->addStyleAttribute('font-style', (($this->_flags & self::IS_ITALIC) ? 'italic' : 'normal'));
 		$textDec='';
 		if($this->_flags & self::IS_UNDERLINE)
 			$textDec.='underline';
@@ -324,10 +324,10 @@ 
 			$textDec.=' line-through';
 		$textDec=ltrim($textDec);
 		if($textDec!=='')
-			$writer->addStyleAttribute('text-decoration',$textDec);
+			$writer->addStyleAttribute('text-decoration', $textDec);
 		if($this->_size!=='')
-			$writer->addStyleAttribute('font-size',$this->_size);
+			$writer->addStyleAttribute('font-size', $this->_size);
 		if($this->_name!=='')
-			$writer->addStyleAttribute('font-family',$this->_name);
+			$writer->addStyleAttribute('font-family', $this->_name);
 	}
 }

framework/Web/UI/WebControls/TConditional.php

Spacing +3 added lines, -3 removed lines

@@ -76,15 +76,15 @@
 		}
 		catch(Exception $e)
 		{
-			throw new TInvalidDataValueException('conditional_condition_invalid',$this->_condition,$e->getMessage());
+			throw new TInvalidDataValueException('conditional_condition_invalid', $this->_condition, $e->getMessage());
 		}
 		if($result)
 		{
 			if($this->_trueTemplate)
-				$this->_trueTemplate->instantiateIn($this->getTemplateControl(),$this);
+				$this->_trueTemplate->instantiateIn($this->getTemplateControl(), $this);
 		}
 		else if($this->_falseTemplate)
-			$this->_falseTemplate->instantiateIn($this->getTemplateControl(),$this);
+			$this->_falseTemplate->instantiateIn($this->getTemplateControl(), $this);
 		$this->_creatingChildren=false;
 	}
 

framework/Web/UI/WebControls/THiddenField.php

Spacing +9 added lines, -9 removed lines

@@ -53,18 +53,18 @@ 
 	{
 		$uniqueID=$this->getUniqueID();
 		$this->getPage()->ensureRenderInForm($this);
-		$writer->addAttribute('type','hidden');
+		$writer->addAttribute('type', 'hidden');
 		if($uniqueID!=='')
-			$writer->addAttribute('name',$uniqueID);
+			$writer->addAttribute('name', $uniqueID);
 		if($this->getID()!=='')
-			$writer->addAttribute('id',$this->getClientID());
+			$writer->addAttribute('id', $this->getClientID());
 		if(($value=$this->getValue())!=='')
-			$writer->addAttribute('value',$value);
+			$writer->addAttribute('value', $value);
 
 		if($this->getHasAttributes())
 		{
 			foreach($this->getAttributes() as $name=>$value)
-				$writer->addAttribute($name,$value);
+				$writer->addAttribute($name, $value);
 		}
 
 		$writer->renderBeginTag('input');
@@ -78,7 +78,7 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the component has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
 		$value=$values[$key];
 		if($value===$this->getValue())
@@ -146,7 +146,7 @@ 
 	 */
 	public function onValueChanged($param)
 	{
-		$this->raiseEvent('OnValueChanged',$this,$param);
+		$this->raiseEvent('OnValueChanged', $this, $param);
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 	 */
 	public function getValue()
 	{
-		return $this->getViewState('Value','');
+		return $this->getViewState('Value', '');
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->setViewState('Value',$value,'');
+		$this->setViewState('Value', $value, '');
 	}
 
 	/**

framework/Web/UI/WebControls/THtmlElement.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 	 */
 	public function getTagName()
 	{
-		return ($this->_tagName !== null) ? $this->_tagName : ($this->_tagName = $this->getDefaultTagName());
+		return ($this->_tagName!==null) ? $this->_tagName : ($this->_tagName=$this->getDefaultTagName());
 	}
 
 	/**
@@ -61,6 +61,6 @@ 
 	 * @return boolean true if TagName has deviated from the default.
 	 */
 	public function getIsMutated() {
-		return $this->_tagName !== null && $this->_tagName != $this->getDefaultTagName();
+		return $this->_tagName!==null && $this->_tagName!=$this->getDefaultTagName();
 	}
 }

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

Spacing +98 added lines, -99 removed lines

@@ -9,12 +9,12 @@ 
  * @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');
 
@@ -24,10 +24,10 @@ 
 if(isset($_GET['options']))
 {
 	$str=base64_decode($_GET['options']);
-	if(strlen($str)>32)
+	if(strlen($str) > 32)
 	{
-		$hash=substr($str,0,32);
-		$str=substr($str,32);
+		$hash=substr($str, 0, 32);
+		$str=substr($str, 32);
 		if(md5($privateKey.$str)===$hash)
 		{
 			$options=unserialize($str);
@@ -37,83 +37,82 @@ 
 			$alphabet=$options['alphabet'];
 			$fontSize=$options['fontSize'];
 			$theme=$options['theme'];
-			if(($randomSeed=$options['randomSeed'])>0)
+			if(($randomSeed=$options['randomSeed']) > 0)
 				srand($randomSeed);
 			else
-				srand((int)(microtime()*1000000));
-			$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)
+	if(strlen($alphabet) < 2)
 		$alphabet='234578adefhijmnrtABDEFGHJLMNRT';
 	$hexLength=strlen($hex);
 	$base=strlen($alphabet);
 	$result='';
-	for($i=0;$i<$hexLength;$i+=6)
+	for($i=0; $i < $hexLength; $i+=6)
 	{
-		$number=hexdec(substr($hex,$i,6));
+		$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)
+	if(($fontSize=(int) $fontSize) < 22)
 		$fontSize=22;
-	if($fontSize>100)
+	if($fontSize > 100)
 		$fontSize=100;
 	$length=strlen($token);
 	$padding=10;
 	$fontWidth=$fontSize;
-	$fontHeight=floor($fontWidth*1.5);
-	$width=$fontWidth*$length+$padding*2;
+	$fontHeight=floor($fontWidth * 1.5);
+	$width=$fontWidth * $length + $padding * 2;
 	$height=$fontHeight;
-	$image=imagecreatetruecolor($width,$height);
+	$image=imagecreatetruecolor($width, $height);
 
-	addBackground
-	(
+	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';
 
 	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++)
+	$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]);
+        $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);
+        	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));
+		imagefill($background, 0, 0, imagecolorallocate($background, 100, 100, 100));
 
 	if($noisy)
-		addNoise($background,$width*2,$height*2);
+		addNoise($background, $width * 2, $height * 2);
 
 	if($hasGrid)
-		addGrid($background,$width*2,$height*2);
+		addGrid($background, $width * 2, $height * 2);
 
 	if($hasScribble)
-		addScribble($background,$width*2,$height*2);
+		addScribble($background, $width * 2, $height * 2);
 
 	if($morph)
-		morphImage($background,$width*2,$height*2);
+		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);
+		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));
+		$color=imagecolorallocate($image, rand(100, 180), rand(100, 180), rand(100, 180));
 		$points=array();
-		for($j=1;$j<rand(5,10);$j++)
+		for($j=1; $j < rand(5, 10); $j++)
 		{
-			$points[]=rand(2*(20*($i+1)),2*(50*($i+1)));
-			$points[]=rand(30,$height+30);
+			$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);
 	}
 }
 

framework/Web/UI/WebControls/TContentPlaceHolder.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 	{
 		if(($id=$this->getID())==='')
 			throw new TConfigurationException('contentplaceholder_id_required');
-		$this->getTemplateControl()->registerContentPlaceHolder($id,$this);
+		$this->getTemplateControl()->registerContentPlaceHolder($id, $this);
 		$parent->getControls()->add($this);
 	}
 }

framework/Web/UI/WebControls/TTextProcessor.php

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
 	public function addParsedObject($object)
 	{
 		if(is_string($object))
-			$object=html_entity_decode($object,ENT_QUOTES,'UTF-8');
+			$object=html_entity_decode($object, ENT_QUOTES, 'UTF-8');
 		parent::addParsedObject($object);
 	}
 
@@ -52,7 +52,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -60,7 +60,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value);
+		$this->setViewState('Text', $value);
 	}
 
 	/**
@@ -73,7 +73,7 @@ 
 	{
 		if(($text=$this->getText())==='' && $this->getHasControls())
 		{
-			$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
+			$htmlWriter=Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
 			parent::renderContents($htmlWriter);
 			$text=$htmlWriter->flush();
 		}

framework/Web/UI/WebControls/TLiteralColumn.php

Spacing +14 added lines, -14 removed lines

@@ -38,7 +38,7 @@ 
 	 */
 	public function getDataField()
 	{
-		return $this->getViewState('DataField','');
+		return $this->getViewState('DataField', '');
 	}
 
 	/**
@@ -46,7 +46,7 @@ 
 	 */
 	public function setDataField($value)
 	{
-		$this->setViewState('DataField',$value,'');
+		$this->setViewState('DataField', $value, '');
 	}
 
 	/**
@@ -54,7 +54,7 @@ 
 	 */
 	public function getDataFormatString()
 	{
-		return $this->getViewState('DataFormatString','');
+		return $this->getViewState('DataFormatString', '');
 	}
 
 	/**
@@ -62,7 +62,7 @@ 
 	 */
 	public function setDataFormatString($value)
 	{
-		$this->setViewState('DataFormatString',$value,'');
+		$this->setViewState('DataFormatString', $value, '');
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 	 */
 	public function getEncode()
 	{
-		return $this->getViewState('Encode',false);
+		return $this->getViewState('Encode', false);
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 */
 	public function setEncode($value)
 	{
-		$this->setViewState('Encode',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('Encode', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -104,13 +104,13 @@ 
 	 * @param integer the index to the Columns property that the cell resides in.
 	 * @param string the type of cell (Header,Footer,Item,AlternatingItem,EditItem,SelectedItem)
 	 */
-	public function initializeCell($cell,$columnIndex,$itemType)
+	public function initializeCell($cell, $columnIndex, $itemType)
 	{
 		if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::EditItem || $itemType===TListItemType::SelectedItem)
 		{
 			if($this->getDataField()!=='')
 			{
-				$cell->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				$cell->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 			} else {
 				$text=$this->getText();
 				if($this->getEncode())
@@ -119,7 +119,7 @@ 
 			}
 		}
 		else
-			parent::initializeCell($cell,$columnIndex,$itemType);
+			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
 	/**
@@ -127,15 +127,15 @@ 
 	 * This method is invoked when datagrid performs databinding.
 	 * It populates the content of the cell with the relevant data from data source.
 	 */
-	public function dataBindColumn($sender,$param)
+	public function dataBindColumn($sender, $param)
 	{
 		$item=$sender->getNamingContainer();
 		$data=$item->getData();
 		$formatString=$this->getDataFormatString();
 		if(($field=$this->getDataField())!=='')
-			$value=$this->formatDataValue($formatString,$this->getDataFieldValue($data,$field));
+			$value=$this->formatDataValue($formatString, $this->getDataFieldValue($data, $field));
 		else
-			$value=$this->formatDataValue($formatString,$data);
+			$value=$this->formatDataValue($formatString, $data);
 		if($sender instanceof TTableCell)
 		{
 			if($this->getEncode())

framework/Web/UI/WebControls/TCaptcha.php

Spacing +60 added lines, -60 removed lines

@@ -71,7 +71,7 @@ 
 	 */
 	public function getTokenImageTheme()
 	{
-		return $this->getViewState('TokenImageTheme',0);
+		return $this->getViewState('TokenImageTheme', 0);
 	}
 
 	/**
@@ -90,10 +90,10 @@ 
 	public function setTokenImageTheme($value)
 	{
 		$value=TPropertyValue::ensureInteger($value);
-		if($value>=0 && $value<=63)
-			$this->setViewState('TokenImageTheme',$value,0);
+		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);
 	}
 
 	/**
@@ -113,10 +113,10 @@ 
 	public function setTokenFontSize($value)
 	{
 		$value=TPropertyValue::ensureInteger($value);
-		if($value>=20 && $value<=100)
-			$this->setViewState('TokenFontSize',$value,30);
+		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);
 	}
 
 	/**
@@ -133,10 +133,10 @@ 
 	public function setMinTokenLength($value)
 	{
 		$length=TPropertyValue::ensureInteger($value);
-		if($length>=self::MIN_TOKEN_LENGTH && $length<=self::MAX_TOKEN_LENGTH)
-			$this->setViewState('MinTokenLength',$length,4);
+		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);
 	}
 
 	/**
@@ -153,10 +153,10 @@ 
 	public function setMaxTokenLength($value)
 	{
 		$length=TPropertyValue::ensureInteger($value);
-		if($length>=self::MIN_TOKEN_LENGTH && $length<=self::MAX_TOKEN_LENGTH)
-			$this->setViewState('MaxTokenLength',$length,6);
+		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,7 +257,7 @@ 
 	 */
 	public function getPublicKey()
 	{
-		if(($publicKey=$this->getViewState('PublicKey',''))==='')
+		if(($publicKey=$this->getViewState('PublicKey', ''))==='')
 		{
 			$publicKey=$this->generateRandomKey();
 			$this->setPublicKey($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());
 	}
 
 	/**
@@ -290,13 +290,13 @@ 
 		{
 			$minLength=$this->getMinTokenLength();
 			$maxLength=$this->getMaxTokenLength();
-			if($minLength>$maxLength)
-				$tokenLength=rand($maxLength,$minLength);
-			else if($minLength<$maxLength)
-				$tokenLength=rand($minLength,$maxLength);
+			if($minLength > $maxLength)
+				$tokenLength=rand($maxLength, $minLength);
+			else if($minLength < $maxLength)
+				$tokenLength=rand($minLength, $maxLength);
 			else
 				$tokenLength=$minLength;
-			$this->setViewState('TokenLength',$tokenLength);
+			$this->setViewState('TokenLength', $tokenLength);
 		}
 		return $tokenLength;
 	}
@@ -311,7 +311,7 @@ 
 			$fileName=$this->generatePrivateKeyFile();
 			$content=file_get_contents($fileName);
 			$matches=array();
-			if(preg_match("/privateKey='(.*?)'/ms",$content,$matches)>0)
+			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);
+		$number=$this->getViewState('TestNumber', 0);
 		if(!$this->_validated)
 		{
-			$this->setViewState('TestNumber',++$number);
+			$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);
 	}
 
 	/**
@@ -363,7 +363,7 @@ 
 		parent::onPreRender($param);
 		if(!self::checkRequirements())
 			throw new TConfigurationException('captcha_imagettftext_required');
-		if(!$this->getViewState('TokenGenerated',0))
+		if(!$this->getViewState('TokenGenerated', 0))
 		{
 			$manager=$this->getApplication()->getAssetManager();
 			$manager->publishFilePath($this->getFontFile());
@@ -371,7 +371,7 @@ 
 			$url.='?options='.urlencode($this->getTokenImageOptions());
 			$this->setImageUrl($url);
 
-			$this->setViewState('TokenGenerated',time());
+			$this->setViewState('TokenGenerated', time());
 		}
 	}
 
@@ -380,7 +380,7 @@ 
 	 */
 	protected function getTokenImageOptions()
 	{
-		$privateKey=$this->getPrivateKey();  // call this method to ensure private key is generated
+		$privateKey=$this->getPrivateKey(); // call this method to ensure private key is generated
 		$token=$this->getToken();
 		$options=array();
 		$options['publicKey']=$this->getPublicKey();
@@ -389,12 +389,12 @@ 
 		$options['alphabet']=$this->getTokenAlphabet();
 		$options['fontSize']=$this->getTokenFontSize();
 		$options['theme']=$this->getTokenImageTheme();
-		if(($randomSeed=$this->getViewState('RandomSeed',0))===0)
+		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;
+		$options['randomSeed']=$this->getChangingTokenBackground() ? 0 : $randomSeed;
 		$str=serialize($options);
 		return base64_encode(md5($privateKey.$str).$str);
 	}
@@ -428,7 +428,7 @@ 
 			$content="<?php
 \$privateKey='$key';
 ?>";
-			file_put_contents($fileName,$content);
+			file_put_contents($fileName, $content);
 		}
 		return $fileName;
 	}
@@ -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)
+		if(strlen($alphabet) < 2)
 			$alphabet='234578adefhijmnrtABDEFGHJLMNQRT';
 		$hexLength=strlen($hex);
 		$base=strlen($alphabet);
 		$result='';
-		for($i=0;$i<$hexLength;$i+=6)
+		for($i=0; $i < $hexLength; $i+=6)
 		{
-			$number=hexdec(substr($hex,$i,6));
+			$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;