pradosoft / prado

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

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 +98 added lines, -99 removed lines

@@ -11,12 +11,12 @@ 
 
 namespace Prado\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');
 
@@ -26,10 +26,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);
@@ -39,83 +39,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');
@@ -123,103 +122,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/TTabPanel.php

Indentation +104 added lines, -104 removed lines

@@ -81,9 +81,9 @@ 
 	}
 
 	/**
-     * Returns the index of the active tab view.
-     * Note, this property may not return the correct index.
-     * To ensure the correctness, call {@link getActiveView()} first.
+	 * Returns the index of the active tab view.
+	 * Note, this property may not return the correct index.
+	 * To ensure the correctness, call {@link getActiveView()} first.
 	 * @return integer the zero-based index of the active tab view. If -1, it means no active tab view. Default is 0 (the first view is active).
 	 */
 	public function getActiveViewIndex()
@@ -100,24 +100,24 @@ 
 		$this->setViewState('ActiveViewIndex',TPropertyValue::ensureInteger($value),0);
 	}
 
-    /**
-     * Returns the ID of the active tab view.
-     * Note, this property may not return the correct ID.
-     * To ensure the correctness, call {@link getActiveView()} first.
-     * @return string The ID of the active tab view. Defaults to '', meaning not set.
-     */
-    public function getActiveViewID()
-    {
+	/**
+	 * Returns the ID of the active tab view.
+	 * Note, this property may not return the correct ID.
+	 * To ensure the correctness, call {@link getActiveView()} first.
+	 * @return string The ID of the active tab view. Defaults to '', meaning not set.
+	 */
+	public function getActiveViewID()
+	{
 		return $this->getViewState('ActiveViewID','');
-    }
+	}
 
-    /**
-     * @param string The ID of the active tab view.
-     */
-    public function setActiveViewID($value)
-    {
+	/**
+	 * @param string The ID of the active tab view.
+	 */
+	public function setActiveViewID($value)
+	{
 		$this->setViewState('ActiveViewID',$value,'');
-    }
+	}
 
 	/**
 	 * Returns the currently active view.
@@ -172,63 +172,63 @@ 
 			throw new TInvalidOperationException('tabpanel_view_inexistent');
 	}
 
-    /**
-     * @return bool status of automatic tab switch on hover
-     */
-    public function getAutoSwitch()
-    {
-        return TPropertyValue::ensureBoolean($this->getViewState('AutoSwitch'));
-    }
-
-    /**
-     * @param bool whether to enable automatic tab switch on hover
-     */
-    public function setAutoSwitch($value)
-    {
-        $this->setViewState('AutoSwitch',TPropertyValue::ensureBoolean($value));
-    }
-
-
-    /**
-     * @return string URL for the CSS file including all relevant CSS class definitions. Defaults to ''.
-     */
-    public function getCssUrl()
-    {
-        return $this->getViewState('CssUrl','default');
-    }
-
-    /**
-     * @param string URL for the CSS file including all relevant CSS class definitions.
-     */
-    public function setCssUrl($value)
-    {
-        $this->setViewState('CssUrl',TPropertyValue::ensureString($value),'');
-    }
-
-    /**
-     * @return string CSS class for the whole tab control div. Defaults to 'tab-panel'.
-     */
-    public function getCssClass()
-    {
-    	$cssClass=parent::getCssClass();
-    	return $cssClass===''?'tab-panel':$cssClass;
-    }
-
-    /**
-     * @return string CSS class for the currently displayed view div. Defaults to 'tab-view'.
-     */
-    public function getViewCssClass()
-    {
-        return $this->getViewStyle()->getCssClass();
-    }
-
-    /**
-     * @param string CSS class for the currently displayed view div.
-     */
-    public function setViewCssClass($value)
-    {
-        $this->getViewStyle()->setCssClass($value);
-    }
+	/**
+	 * @return bool status of automatic tab switch on hover
+	 */
+	public function getAutoSwitch()
+	{
+		return TPropertyValue::ensureBoolean($this->getViewState('AutoSwitch'));
+	}
+
+	/**
+	 * @param bool whether to enable automatic tab switch on hover
+	 */
+	public function setAutoSwitch($value)
+	{
+		$this->setViewState('AutoSwitch',TPropertyValue::ensureBoolean($value));
+	}
+
+
+	/**
+	 * @return string URL for the CSS file including all relevant CSS class definitions. Defaults to ''.
+	 */
+	public function getCssUrl()
+	{
+		return $this->getViewState('CssUrl','default');
+	}
+
+	/**
+	 * @param string URL for the CSS file including all relevant CSS class definitions.
+	 */
+	public function setCssUrl($value)
+	{
+		$this->setViewState('CssUrl',TPropertyValue::ensureString($value),'');
+	}
+
+	/**
+	 * @return string CSS class for the whole tab control div. Defaults to 'tab-panel'.
+	 */
+	public function getCssClass()
+	{
+		$cssClass=parent::getCssClass();
+		return $cssClass===''?'tab-panel':$cssClass;
+	}
+
+	/**
+	 * @return string CSS class for the currently displayed view div. Defaults to 'tab-view'.
+	 */
+	public function getViewCssClass()
+	{
+		return $this->getViewStyle()->getCssClass();
+	}
+
+	/**
+	 * @param string CSS class for the currently displayed view div.
+	 */
+	public function setViewCssClass($value)
+	{
+		$this->getViewStyle()->setCssClass($value);
+	}
 
 	/**
 	 * @return TStyle the style for all the view div
@@ -244,21 +244,21 @@ 
 		return $style;
 	}
 
-    /**
-     * @return string CSS class for non-active tabs. Defaults to 'tab-normal'.
-     */
-    public function getTabCssClass()
-    {
-        return $this->getTabStyle()->getCssClass();
-    }
+	/**
+	 * @return string CSS class for non-active tabs. Defaults to 'tab-normal'.
+	 */
+	public function getTabCssClass()
+	{
+		return $this->getTabStyle()->getCssClass();
+	}
 
-    /**
-     * @param string CSS class for non-active tabs.
-     */
-    public function setTabCssClass($value)
-    {
-        $this->getTabStyle()->setCssClass($value);
-    }
+	/**
+	 * @param string CSS class for non-active tabs.
+	 */
+	public function setTabCssClass($value)
+	{
+		$this->getTabStyle()->setCssClass($value);
+	}
 
 	/**
 	 * @return TStyle the style for all the inactive tab div
@@ -274,21 +274,21 @@ 
 		return $style;
 	}
 
-    /**
-     * @return string CSS class for the active tab. Defaults to 'tab-active'.
-     */
-    public function getActiveTabCssClass()
-    {
-        return $this->getActiveTabStyle()->getCssClass();
-    }
-
-    /**
-     * @param string CSS class for the active tab.
-     */
-    public function setActiveTabCssClass($value)
-    {
-        $this->getActiveTabStyle()->setCssClass($value);
-    }
+	/**
+	 * @return string CSS class for the active tab. Defaults to 'tab-active'.
+	 */
+	public function getActiveTabCssClass()
+	{
+		return $this->getActiveTabStyle()->getCssClass();
+	}
+
+	/**
+	 * @param string CSS class for the active tab.
+	 */
+	public function setActiveTabCssClass($value)
+	{
+		$this->getActiveTabStyle()->setCssClass($value);
+	}
 
 	/**
 	 * @return TStyle the style for the active tab div

Braces +3 added lines, -6 removed lines

@@ -136,15 +136,13 @@ 
 				$activeView=$views->itemAt($index);
 			else
 				throw new TInvalidDataValueException('tabpanel_activeviewid_invalid',$id);
-		}
-		else if(($index=$this->getActiveViewIndex())>=0)
+		} else if(($index=$this->getActiveViewIndex())>=0)
 		{
 			if($index<$views->getCount())
 				$activeView=$views->itemAt($index);
 			else
 				throw new TInvalidDataValueException('tabpanel_activeviewindex_invalid',$index);
-		}
-		else
+		} else
 		{
 			foreach($views as $index=>$view)
 			{
@@ -320,8 +318,7 @@ 
 				$this->setActiveViewIndex($index);
 				$this->setActiveViewID($view->getID(false));
 				$view->setActive(true);
-			}
-			else
+			} else
 				$v->setActive(false);
 		}
 	}

Spacing +41 added lines, -41 removed lines

@@ -94,7 +94,7 @@ 
 	 */
 	public function getActiveViewIndex()
 	{
-		return $this->getViewState('ActiveViewIndex',0);
+		return $this->getViewState('ActiveViewIndex', 0);
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 	 */
 	public function setActiveViewIndex($value)
 	{
-		$this->setViewState('ActiveViewIndex',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('ActiveViewIndex', TPropertyValue::ensureInteger($value), 0);
 	}
 
     /**
@@ -114,7 +114,7 @@ 
      */
     public function getActiveViewID()
     {
-		return $this->getViewState('ActiveViewID','');
+		return $this->getViewState('ActiveViewID', '');
     }
 
     /**
@@ -122,7 +122,7 @@ 
      */
     public function setActiveViewID($value)
     {
-		$this->setViewState('ActiveViewID',$value,'');
+		$this->setViewState('ActiveViewID', $value, '');
     }
 
 	/**
@@ -138,17 +138,17 @@ 
 		$views=$this->getViews();
 		if(($id=$this->getActiveViewID())!=='')
 		{
-			if(($index=$views->findIndexByID($id))>=0)
+			if(($index=$views->findIndexByID($id)) >= 0)
 				$activeView=$views->itemAt($index);
 			else
-				throw new TInvalidDataValueException('tabpanel_activeviewid_invalid',$id);
+				throw new TInvalidDataValueException('tabpanel_activeviewid_invalid', $id);
 		}
-		else if(($index=$this->getActiveViewIndex())>=0)
+		else if(($index=$this->getActiveViewIndex()) >= 0)
 		{
-			if($index<$views->getCount())
+			if($index < $views->getCount())
 				$activeView=$views->itemAt($index);
 			else
-				throw new TInvalidDataValueException('tabpanel_activeviewindex_invalid',$index);
+				throw new TInvalidDataValueException('tabpanel_activeviewindex_invalid', $index);
 		}
 		else
 		{
@@ -172,7 +172,7 @@ 
 	 */
 	public function setActiveView($view)
 	{
-		if($this->getViews()->indexOf($view)>=0)
+		if($this->getViews()->indexOf($view) >= 0)
 			$this->activateView($view);
 		else
 			throw new TInvalidOperationException('tabpanel_view_inexistent');
@@ -191,7 +191,7 @@ 
      */
     public function setAutoSwitch($value)
     {
-        $this->setViewState('AutoSwitch',TPropertyValue::ensureBoolean($value));
+        $this->setViewState('AutoSwitch', TPropertyValue::ensureBoolean($value));
     }
 
 
@@ -200,7 +200,7 @@ 
      */
     public function getCssUrl()
     {
-        return $this->getViewState('CssUrl','default');
+        return $this->getViewState('CssUrl', 'default');
     }
 
     /**
@@ -208,7 +208,7 @@ 
      */
     public function setCssUrl($value)
     {
-        $this->setViewState('CssUrl',TPropertyValue::ensureString($value),'');
+        $this->setViewState('CssUrl', TPropertyValue::ensureString($value), '');
     }
 
     /**
@@ -217,7 +217,7 @@ 
     public function getCssClass()
     {
     	$cssClass=parent::getCssClass();
-    	return $cssClass===''?'tab-panel':$cssClass;
+    	return $cssClass==='' ? 'tab-panel' : $cssClass;
     }
 
     /**
@@ -241,11 +241,11 @@ 
 	 */
 	public function getViewStyle()
 	{
-		if(($style=$this->getViewState('ViewStyle',null))===null)
+		if(($style=$this->getViewState('ViewStyle', null))===null)
 		{
 			$style=new TStyle;
 			$style->setCssClass('tab-view');
-			$this->setViewState('ViewStyle',$style,null);
+			$this->setViewState('ViewStyle', $style, null);
 		}
 		return $style;
 	}
@@ -271,11 +271,11 @@ 
 	 */
 	public function getTabStyle()
 	{
-		if(($style=$this->getViewState('TabStyle',null))===null)
+		if(($style=$this->getViewState('TabStyle', null))===null)
 		{
 			$style=new TStyle;
 			$style->setCssClass('tab-normal');
-			$this->setViewState('TabStyle',$style,null);
+			$this->setViewState('TabStyle', $style, null);
 		}
 		return $style;
 	}
@@ -301,11 +301,11 @@ 
 	 */
 	public function getActiveTabStyle()
 	{
-		if(($style=$this->getViewState('ActiveTabStyle',null))===null)
+		if(($style=$this->getViewState('ActiveTabStyle', null))===null)
 		{
 			$style=new TStyle;
 			$style->setCssClass('tab-active');
-			$this->setViewState('ActiveTabStyle',$style,null);
+			$this->setViewState('ActiveTabStyle', $style, null);
 		}
 		return $style;
 	}
@@ -339,11 +339,11 @@ 
 	 * @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(($index=$values[$this->getClientID().'_1'])!==null)
 		{
-			$index=(int)$index;
+			$index=(int) $index;
 			$currentIndex=$this->getActiveViewIndex();
 			if($currentIndex!==$index)
 			{
@@ -383,7 +383,7 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$this->setCssClass($this->getCssClass());
 		parent::addAttributesToRender($writer);
 	}
@@ -396,7 +396,7 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		$this->getActiveView();  // determine the active view
+		$this->getActiveView(); // determine the active view
 		$this->registerStyleSheet();
 
 		$page=$this->getPage();
@@ -411,17 +411,17 @@ 
 	 */
 	protected function registerStyleSheet()
 	{
-		$url = $this->getCssUrl();
+		$url=$this->getCssUrl();
 
-		if($url === '') {
+		if($url==='') {
 			return;
 		}
 
-		if($url === 'default') {
-			$url = $this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'tabpanel.css');
+		if($url==='default') {
+			$url=$this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'tabpanel.css');
 		}
 
-		if($url !== '') {
+		if($url!=='') {
 			$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 		}
 	}
@@ -439,7 +439,7 @@ 
 		$code="new $className($options);";
 		$cs->registerEndScript("prado:$id", $code);
 		// ensure an item is always active and visible
-		$index = $this->getActiveViewIndex();
+		$index=$this->getActiveViewIndex();
 		if(!$this->getViews()->itemAt($index)->Visible)
 			$index=0;
 		$cs->registerHiddenField($id.'_1', $index);
@@ -460,19 +460,19 @@ 
 	 */
 	protected function getClientOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['ActiveCssClass'] = $this->getActiveTabCssClass();
-		$options['NormalCssClass'] = $this->getTabCssClass();
-		$viewIDs = array();
-		$viewVis = array();
+		$options['ID']=$this->getClientID();
+		$options['ActiveCssClass']=$this->getActiveTabCssClass();
+		$options['NormalCssClass']=$this->getTabCssClass();
+		$viewIDs=array();
+		$viewVis=array();
 		foreach($this->getViews() as $view)
 		{
-			$viewIDs[] = $view->getClientID();
-			$viewVis[] = $view->getVisible();
+			$viewIDs[]=$view->getClientID();
+			$viewVis[]=$view->getVisible();
 		}
-		$options['Views'] = $viewIDs;
-		$options['ViewsVis'] = $viewVis;
-		$options['AutoSwitch'] = $this->getAutoSwitch();
+		$options['Views']=$viewIDs;
+		$options['ViewsVis']=$viewVis;
+		$options['AutoSwitch']=$this->getAutoSwitch();
 
 		return $options;
 	}
@@ -507,7 +507,7 @@ 
 	public function renderContents($writer)
 	{
 		$views=$this->getViews();
-		if($views->getCount()>0)
+		if($views->getCount() > 0)
 		{
 			$writer->writeLine();
 			// render tab bar

framework/Web/UI/ActiveControls/TActiveDatePicker.php

Indentation +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
 
 	/**
 	 * @return boolean a value indicating whether an automatic postback to the server
-     * will occur whenever the user modifies the text in the TActiveDatePicker control and
-     * then tabs out of the component. Defaults to true.
+	 * will occur whenever the user modifies the text in the TActiveDatePicker control and
+	 * then tabs out of the component. Defaults to true.
 	 */
 	public function getAutoPostBack()
 	{

Spacing +22 added lines, -22 removed lines

@@ -46,7 +46,7 @@ 
 	 */
 	public function getAutoPostBack()
 	{
-		return $this->getViewState('AutoPostBack',true);
+		return $this->getViewState('AutoPostBack', true);
 	}
 
 	/**
@@ -57,7 +57,7 @@ 
 	 */
 	public function setAutoPostBack($value)
 	{
-		$this->setViewState('AutoPostBack',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('AutoPostBack', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -66,12 +66,12 @@ 
 	 */
 	protected function getDatePickerOptions()
 	{
-		$options = parent::getDatePickerOptions();
+		$options=parent::getDatePickerOptions();
 		$options['CausesValidation']=$this->getCausesValidation();
 		$options['ValidationGroup']=$this->getValidationGroup();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['ShowCalendar'] = $this->getShowCalendar();
-		$options['AutoPostBack'] = $this->getAutoPostBack();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['ShowCalendar']=$this->getShowCalendar();
+		$options['AutoPostBack']=$this->getAutoPostBack();
 		return $options;
 	}
 
@@ -89,7 +89,7 @@ 
 	/**
 	 * @return TBaseActiveCallbackControl standard callback control options.
 	 */
-	public function getActiveControl(){
+	public function getActiveControl() {
 		return $this->getAdapter()->getBaseActiveControl();
 	}
 
@@ -97,21 +97,21 @@ 
 	 * Client-side Text property can only be updated after the OnLoad stage.
 	 * @param string text content for the textbox
 	 */
-	public function setText($value){
-		if(parent::getText() === $value)
+	public function setText($value) {
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
-		if($this->getActiveControl()->canUpdateClientSide() && $this->getHasLoadedPostData()){
+		if($this->getActiveControl()->canUpdateClientSide() && $this->getHasLoadedPostData()) {
 			$cb=$this->getPage()->getCallbackClient();
 			$cb->setValue($this, $value);
-			if ($this->getInputMode()==TDatePickerInputMode::DropDownList)
+			if($this->getInputMode()==TDatePickerInputMode::DropDownList)
 			{
-				$s = new TDateTimeStamp;
-				$date = $s->getDate($this->getTimeStampFromText());
+				$s=new TDateTimeStamp;
+				$date=$s->getDate($this->getTimeStampFromText());
 				$id=$this->getClientID();
 				$cb->select($id.TControl::CLIENT_ID_SEPARATOR.'day', 'Value', $date['mday'], 'select');
-				$cb->select($id.TControl::CLIENT_ID_SEPARATOR.'month', 'Value', $date['mon']-1, 'select');
+				$cb->select($id.TControl::CLIENT_ID_SEPARATOR.'month', 'Value', $date['mon'] - 1, 'select');
 				$cb->select($id.TControl::CLIENT_ID_SEPARATOR.'year', 'Value', $date['year'], 'select');
 
 			}
@@ -124,7 +124,7 @@ 
 	 * This method is mainly used by framework and control developers.
 	 * @param TCallbackEventParameter the event parameter
 	 */
- 	public function raiseCallbackEvent($param){
+ 	public function raiseCallbackEvent($param) {
 		$this->onCallback($param);
 	}
 
@@ -135,7 +135,7 @@ 
 	 * handler can be invoked.
 	 * @param TCallbackEventParameter event parameter to be passed to the event handlers
 	 */
-	public function onCallback($param){
+	public function onCallback($param) {
 		$this->raiseEvent('OnCallback', $this, $param);
 	}
 
@@ -145,22 +145,22 @@ 
 
 	protected function registerCalendarClientScriptPre()
 	{
-		$cs = $this->getPage()->getClientScript();
+		$cs=$this->getPage()->getClientScript();
 		$cs->registerPradoScript("activedatepicker");
 	}
 
 	protected function renderClientControlScript($writer)
 	{
-		$cs = $this->getPage()->getClientScript();
+		$cs=$this->getPage()->getClientScript();
 		if(!$cs->isEndScriptRegistered('TDatePicker.spacer'))
 		{
-			$spacer = $this->getAssetUrl('spacer.gif');
-			$code = "Prado.WebUI.TDatePicker.spacer = '$spacer';";
+			$spacer=$this->getAssetUrl('spacer.gif');
+			$code="Prado.WebUI.TDatePicker.spacer = '$spacer';";
 			$cs->registerEndScript('TDatePicker.spacer', $code);
 		}
 
-		$options = TJavaScript::encode($this->getDatePickerOptions());
-		$code = "new Prado.WebUI.TActiveDatePicker($options);";
+		$options=TJavaScript::encode($this->getDatePickerOptions());
+		$code="new Prado.WebUI.TActiveDatePicker($options);";
 		$cs->registerEndScript("prado:".$this->getClientID(), $code);
 	}
 

framework/Web/UI/ActiveControls/TActiveHiddenField.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
  */
 class TActiveHiddenField extends THiddenField implements ICallbackEventHandler, IActiveControl
 {
-    /**
+	/**
 	 * Creates a new callback control, sets the adapter to
 	 * TActiveControlAdapter. If you override this class, be sure to set the
 	 * adapter appropriately by, for example, by calling this constructor.

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		if(parent::getValue() === $value)
+		if(parent::getValue()===$value)
 			return;
 
 		parent::setValue($value);
@@ -111,7 +111,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$this->getActiveControl()->registerCallbackClientScript(
 			$this->getClientClassName(), $this->getPostBackOptions());
 	}

framework/Web/UI/ActiveControls/TActivePanel.php

Indentation +2 added lines, -2 removed lines

@@ -60,8 +60,8 @@
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 */
 	protected function addAttributesToRender($writer) {
-	    $writer->addAttribute('id',$this->getClientID());
-	    parent::addAttributesToRender($writer);
+		$writer->addAttribute('id',$this->getClientID());
+		parent::addAttributesToRender($writer);
 	}
 
 	/**

Spacing +5 added lines, -5 removed lines

@@ -64,7 +64,7 @@ 
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 */
 	protected function addAttributesToRender($writer) {
-	    $writer->addAttribute('id',$this->getClientID());
+	    $writer->addAttribute('id', $this->getClientID());
 	    parent::addAttributesToRender($writer);
 	}
 
@@ -81,17 +81,17 @@ 
 		{
 			parent::render($writer);
 			if($this->getActiveControl()->canUpdateClientSide())
-				$this->getPage()->getCallbackClient()->replaceContent($this,$writer);
+				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
 		}
 		else
 		{
-			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
-			if ($this->getHasControls())
+			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
+			if($this->getHasControls())
 			{
 				// If we update a TActivePanel on callback,
 				// We shouldn't update all childs, because the whole content will be replaced by
 				// the parent
-				foreach ($this->findControlsByType('Prado\Web\UI\ActiveControls\IActiveControl', false) as $control)
+				foreach($this->findControlsByType('Prado\Web\UI\ActiveControls\IActiveControl', false) as $control)
 				{
 						$control->getActiveControl()->setEnableUpdate(false);
 				}

Braces +1 added lines, -2 removed lines

@@ -82,8 +82,7 @@
 			parent::render($writer);
 			if($this->getActiveControl()->canUpdateClientSide())
 				$this->getPage()->getCallbackClient()->replaceContent($this,$writer);
-		}
-		else
+		} else
 		{
 			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
 			if ($this->getHasControls())

framework/Web/UI/ActiveControls/TActiveCheckBoxList.php

Indentation +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
 			&& $this->getPage()->getClientSupportsJavaScript())
 		{
 		  $this->getActiveControl()->registerCallbackClientScript(
-		    $this->getClientClassName(), $this->getPostBackOptions());
+			$this->getClientClassName(), $this->getPostBackOptions());
 		}
 	}
 

Doc Comments +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
 
 	/**
 	 * Creates a control used for repetition (used as a template).
-	 * @return TControl the control to be repeated
+	 * @return TActiveCheckBoxListItem the control to be repeated
 	 */
 	protected function createRepeatedControl()
 	{

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
 	 * updated later.
 	 *@return boolean always true
 	 */
-	protected function getSpanNeeded ()
+	protected function getSpanNeeded()
 	{
 	  return true;
 	}
@@ -91,7 +91,7 @@ 
 	 */
 	protected function createRepeatedControl()
 	{
-		$control = new TActiveCheckBoxListItem;
+		$control=new TActiveCheckBoxListItem;
 		$control->getAdapter()->setBaseActiveControl($this->getActiveControl());
 		return $control;
 	}

framework/Web/UI/TTemplateControl.php

Indentation +84 added lines, -84 removed lines

@@ -238,90 +238,90 @@
 		parent::initRecursive($namingContainer);
 	}
         
-        /**
-         * Function to update view controls with data in a given AR object.
-         * View controls and AR object need to have the same name in IDs and Attrs respectively.
-         * @param TActiveRecord $arObj
-         * @param Boolean $throwExceptions Wheter or not to throw exceptions
-         * @author Daniel Sampedro <darthdaniel85@gmail.com>
-         */
-        public function tryToUpdateView($arObj, $throwExceptions = false)
-        {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
-                {
-                        try
-                        {
-                                if ($key != "RELATIONS")
-                                {
-                                        $control = $this->{$key};
-                                        if ($control instanceof TTextBox)
-                                                $control->Text = $arObj->{$key};
-                                        elseif ($control instanceof TCheckBox)
-                                                $control->Checked = (boolean) $arObj->{$key};
-                                        elseif ($control instanceof TDatePicker)
-                                                $control->Date = $arObj->{$key};
-                                }
-                                else
-                                {
-                                        foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
-                                        {
-                                                $relControl = $this->{$relKey};
-                                                switch ($relValues[0])
-                                                {
-                                                        case TActiveRecord::BELONGS_TO:
-                                                        case TActiveRecord::HAS_ONE:
-                                                                $relControl->Text = $arObj->{$relKey};
-                                                                break;
-                                                        case TActiveRecord::HAS_MANY:
-                                                                if ($relControl instanceof TListControl)
-                                                                {
-                                                                        $relControl->DataSource = $arObj->{$relKey};
-                                                                        $relControl->dataBind();
-                                                                }
-                                                                break;
-                                                }
-                                        }
-                                        break;
-                                }
-                        } 
-                        catch (Exception $ex)
-                        {
-                                if ($throwExceptions)
-                                        throw $ex;
-                        }
-                }
-        }
+		/**
+		 * Function to update view controls with data in a given AR object.
+		 * View controls and AR object need to have the same name in IDs and Attrs respectively.
+		 * @param TActiveRecord $arObj
+		 * @param Boolean $throwExceptions Wheter or not to throw exceptions
+		 * @author Daniel Sampedro <darthdaniel85@gmail.com>
+		 */
+		public function tryToUpdateView($arObj, $throwExceptions = false)
+		{
+				$objAttrs = get_class_vars(get_class($arObj));
+				foreach (array_keys($objAttrs) as $key)
+				{
+						try
+						{
+								if ($key != "RELATIONS")
+								{
+										$control = $this->{$key};
+										if ($control instanceof TTextBox)
+												$control->Text = $arObj->{$key};
+										elseif ($control instanceof TCheckBox)
+												$control->Checked = (boolean) $arObj->{$key};
+										elseif ($control instanceof TDatePicker)
+												$control->Date = $arObj->{$key};
+								}
+								else
+								{
+										foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
+										{
+												$relControl = $this->{$relKey};
+												switch ($relValues[0])
+												{
+														case TActiveRecord::BELONGS_TO:
+														case TActiveRecord::HAS_ONE:
+																$relControl->Text = $arObj->{$relKey};
+																break;
+														case TActiveRecord::HAS_MANY:
+																if ($relControl instanceof TListControl)
+																{
+																		$relControl->DataSource = $arObj->{$relKey};
+																		$relControl->dataBind();
+																}
+																break;
+												}
+										}
+										break;
+								}
+						} 
+						catch (Exception $ex)
+						{
+								if ($throwExceptions)
+										throw $ex;
+						}
+				}
+		}
 
-        /**
-         * Function to try to update an AR object with data in view controls.
-         * @param TActiveRecord $arObj
-         * @param Boolean $throwExceptions Wheter or not to throw exceptions
-         * @author Daniel Sampedro <darthdaniel85@gmail.com>
-         */
-        public function tryToUpdateAR($arObj, $throwExceptions = false)
-        {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
-                {
-                        try
-                        {
-                                if ($key == "RELATIONS")
-                                        break;
-                                $control = $this->{$key};
-                                if ($control instanceof TTextBox)
-                                        $arObj->{$key} = $control->Text;
-                                elseif ($control instanceof TCheckBox)
-                                        $arObj->{$key} = $control->Checked;
-                                elseif ($control instanceof TDatePicker)
-                                        $arObj->{$key} = $control->Date;
-                        } 
-                        catch (Exception $ex)
-                        {
-                                if ($throwExceptions)
-                                        throw $ex;
-                        }
-                }
-        }
+		/**
+		 * Function to try to update an AR object with data in view controls.
+		 * @param TActiveRecord $arObj
+		 * @param Boolean $throwExceptions Wheter or not to throw exceptions
+		 * @author Daniel Sampedro <darthdaniel85@gmail.com>
+		 */
+		public function tryToUpdateAR($arObj, $throwExceptions = false)
+		{
+				$objAttrs = get_class_vars(get_class($arObj));
+				foreach (array_keys($objAttrs) as $key)
+				{
+						try
+						{
+								if ($key == "RELATIONS")
+										break;
+								$control = $this->{$key};
+								if ($control instanceof TTextBox)
+										$arObj->{$key} = $control->Text;
+								elseif ($control instanceof TCheckBox)
+										$arObj->{$key} = $control->Checked;
+								elseif ($control instanceof TDatePicker)
+										$arObj->{$key} = $control->Date;
+						} 
+						catch (Exception $ex)
+						{
+								if ($throwExceptions)
+										throw $ex;
+						}
+				}
+		}
 }
 

Braces +6 added lines, -12 removed lines

@@ -69,8 +69,7 @@ 
 			if(!isset(self::$_template[$class]))
 				self::$_template[$class]=$this->loadTemplate();
 			return self::$_template[$class];
-		}
-		else
+		} else
 			return $this->_localTemplate;
 	}
 
@@ -205,8 +204,7 @@ 
 			$controls=$placeholder->getParent()->getControls();
 			$loc=$controls->remove($placeholder);
 			$controls->insertAt($loc,$content);
-		}
-		else
+		} else
 			throw new TConfigurationException('templatecontrol_placeholder_inexistent',$id);
 	}
 
@@ -232,8 +230,7 @@ 
 			$master->ensureChildControls();
 			foreach($this->_contents as $id=>$content)
 				$master->injectContent($id,$content);
-		}
-		else if(!empty($this->_contents))
+		} else if(!empty($this->_contents))
 			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
 		parent::initRecursive($namingContainer);
 	}
@@ -261,8 +258,7 @@ 
                                                 $control->Checked = (boolean) $arObj->{$key};
                                         elseif ($control instanceof TDatePicker)
                                                 $control->Date = $arObj->{$key};
-                                }
-                                else
+                                } else
                                 {
                                         foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
                                         {
@@ -284,8 +280,7 @@ 
                                         }
                                         break;
                                 }
-                        } 
-                        catch (Exception $ex)
+                        } catch (Exception $ex)
                         {
                                 if ($throwExceptions)
                                         throw $ex;
@@ -315,8 +310,7 @@ 
                                         $arObj->{$key} = $control->Checked;
                                 elseif ($control instanceof TDatePicker)
                                         $arObj->{$key} = $control->Date;
-                        } 
-                        catch (Exception $ex)
+                        } catch (Exception $ex)
                         {
                                 if ($throwExceptions)
                                         throw $ex;

Doc Comments +2 added lines

@@ -146,6 +146,7 @@ 
 	 * Registers a content control.
 	 * @param string ID of the content
 	 * @param TContent
+	 * @param string $id
 	 */
 	public function registerContent($id,TContent $object)
 	{
@@ -160,6 +161,7 @@ 
 	 * This method should only be used by framework and control developers.
 	 * @param string placeholder ID
 	 * @param TContentPlaceHolder placeholder control
+	 * @param string $id
 	 */
 	public function registerContentPlaceHolder($id,TContentPlaceHolder $object)
 	{

Spacing +44 added lines, -44 removed lines

@@ -117,7 +117,7 @@ 
 	 */
 	protected function loadTemplate()
 	{
-		Prado::trace("Loading template ".get_class($this),'\Prado\Web\UI\TTemplateControl');
+		Prado::trace("Loading template ".get_class($this), '\Prado\Web\UI\TTemplateControl');
 		$template=$this->getService()->getTemplateManager()->getTemplateByClassName(get_class($this));
 		return $template;
 	}
@@ -134,9 +134,9 @@ 
 			foreach($tpl->getDirective() as $name=>$value)
 			{
 				if(is_string($value))
-					$this->setSubProperty($name,$value);
+					$this->setSubProperty($name, $value);
 				else
-					throw new TConfigurationException('templatecontrol_directive_invalid',get_class($this),$name);
+					throw new TConfigurationException('templatecontrol_directive_invalid', get_class($this), $name);
 			}
 			$tpl->instantiateIn($this);
 		}
@@ -147,10 +147,10 @@ 
 	 * @param string ID of the content
 	 * @param TContent
 	 */
-	public function registerContent($id,TContent $object)
+	public function registerContent($id, TContent $object)
 	{
 		if(isset($this->_contents[$id]))
-			throw new TConfigurationException('templatecontrol_contentid_duplicated',$id);
+			throw new TConfigurationException('templatecontrol_contentid_duplicated', $id);
 		else
 			$this->_contents[$id]=$object;
 	}
@@ -161,10 +161,10 @@ 
 	 * @param string placeholder ID
 	 * @param TContentPlaceHolder placeholder control
 	 */
-	public function registerContentPlaceHolder($id,TContentPlaceHolder $object)
+	public function registerContentPlaceHolder($id, TContentPlaceHolder $object)
 	{
 		if(isset($this->_placeholders[$id]))
-			throw new TConfigurationException('templatecontrol_placeholderid_duplicated',$id);
+			throw new TConfigurationException('templatecontrol_placeholderid_duplicated', $id);
 		else
 			$this->_placeholders[$id]=$object;
 	}
@@ -199,17 +199,17 @@ 
 	 * @param string ID of the content control
 	 * @param TContent the content to be injected
 	 */
-	public function injectContent($id,$content)
+	public function injectContent($id, $content)
 	{
 		if(isset($this->_placeholders[$id]))
 		{
 			$placeholder=$this->_placeholders[$id];
 			$controls=$placeholder->getParent()->getControls();
 			$loc=$controls->remove($placeholder);
-			$controls->insertAt($loc,$content);
+			$controls->insertAt($loc, $content);
 		}
 		else
-			throw new TConfigurationException('templatecontrol_placeholder_inexistent',$id);
+			throw new TConfigurationException('templatecontrol_placeholder_inexistent', $id);
 	}
 
 	/**
@@ -233,10 +233,10 @@ 
 			$this->getControls()->add($master);
 			$master->ensureChildControls();
 			foreach($this->_contents as $id=>$content)
-				$master->injectContent($id,$content);
+				$master->injectContent($id, $content);
 		}
 		else if(!empty($this->_contents))
-			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
+			throw new TConfigurationException('templatecontrol_mastercontrol_required', get_class($this));
 		parent::initRecursive($namingContainer);
 	}
         
@@ -247,38 +247,38 @@ 
          * @param Boolean $throwExceptions Wheter or not to throw exceptions
          * @author Daniel Sampedro <darthdaniel85@gmail.com>
          */
-        public function tryToUpdateView($arObj, $throwExceptions = false)
+        public function tryToUpdateView($arObj, $throwExceptions=false)
         {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
+                $objAttrs=get_class_vars(get_class($arObj));
+                foreach(array_keys($objAttrs) as $key)
                 {
                         try
                         {
-                                if ($key != "RELATIONS")
+                                if($key!="RELATIONS")
                                 {
-                                        $control = $this->{$key};
-                                        if ($control instanceof TTextBox)
-                                                $control->Text = $arObj->{$key};
-                                        elseif ($control instanceof TCheckBox)
-                                                $control->Checked = (boolean) $arObj->{$key};
-                                        elseif ($control instanceof TDatePicker)
-                                                $control->Date = $arObj->{$key};
+                                        $control=$this->{$key};
+                                        if($control instanceof TTextBox)
+                                                $control->Text=$arObj->{$key};
+                                        elseif($control instanceof TCheckBox)
+                                                $control->Checked=(boolean) $arObj->{$key};
+                                        elseif($control instanceof TDatePicker)
+                                                $control->Date=$arObj->{$key};
                                 }
                                 else
                                 {
-                                        foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
+                                        foreach($objAttrs["RELATIONS"] as $relKey => $relValues)
                                         {
-                                                $relControl = $this->{$relKey};
-                                                switch ($relValues[0])
+                                                $relControl=$this->{$relKey};
+                                                switch($relValues[0])
                                                 {
                                                         case TActiveRecord::BELONGS_TO:
                                                         case TActiveRecord::HAS_ONE:
-                                                                $relControl->Text = $arObj->{$relKey};
+                                                                $relControl->Text=$arObj->{$relKey};
                                                                 break;
                                                         case TActiveRecord::HAS_MANY:
-                                                                if ($relControl instanceof TListControl)
+                                                                if($relControl instanceof TListControl)
                                                                 {
-                                                                        $relControl->DataSource = $arObj->{$relKey};
+                                                                        $relControl->DataSource=$arObj->{$relKey};
                                                                         $relControl->dataBind();
                                                                 }
                                                                 break;
@@ -287,9 +287,9 @@ 
                                         break;
                                 }
                         } 
-                        catch (Exception $ex)
+                        catch(Exception $ex)
                         {
-                                if ($throwExceptions)
+                                if($throwExceptions)
                                         throw $ex;
                         }
                 }
@@ -301,26 +301,26 @@ 
          * @param Boolean $throwExceptions Wheter or not to throw exceptions
          * @author Daniel Sampedro <darthdaniel85@gmail.com>
          */
-        public function tryToUpdateAR($arObj, $throwExceptions = false)
+        public function tryToUpdateAR($arObj, $throwExceptions=false)
         {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
+                $objAttrs=get_class_vars(get_class($arObj));
+                foreach(array_keys($objAttrs) as $key)
                 {
                         try
                         {
-                                if ($key == "RELATIONS")
+                                if($key=="RELATIONS")
                                         break;
-                                $control = $this->{$key};
-                                if ($control instanceof TTextBox)
-                                        $arObj->{$key} = $control->Text;
-                                elseif ($control instanceof TCheckBox)
-                                        $arObj->{$key} = $control->Checked;
-                                elseif ($control instanceof TDatePicker)
-                                        $arObj->{$key} = $control->Date;
+                                $control=$this->{$key};
+                                if($control instanceof TTextBox)
+                                        $arObj->{$key}=$control->Text;
+                                elseif($control instanceof TCheckBox)
+                                        $arObj->{$key}=$control->Checked;
+                                elseif($control instanceof TDatePicker)
+                                        $arObj->{$key}=$control->Date;
                         } 
-                        catch (Exception $ex)
+                        catch(Exception $ex)
                         {
-                                if ($throwExceptions)
+                                if($throwExceptions)
                                         throw $ex;
                         }
                 }

framework/TApplication.php

Indentation +1 added lines, -1 removed lines

@@ -602,7 +602,7 @@
 
  	/**
  	 * @param string the application configuration type. 'xml' and 'php' are valid values
-	 */
+ 	 */
 	public function setConfigurationType($value)
 	{
 		$this->_configType = $value;

Doc Comments +9 added lines

@@ -325,6 +325,7 @@ 
 	 * to determine the application configuration file,
 	 * application root path and the runtime path.
 	 * @param string the application root path or the application configuration file
+	 * @param string $basePath
 	 * @see setBasePath
 	 * @see setRuntimePath
 	 * @see setConfigurationFile
@@ -423,6 +424,7 @@ 
 	 * A global value is one that is persistent across users sessions and requests.
 	 * @param string the name of the value to be returned
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
+	 * @param integer $defaultValue
 	 * @return mixed the global value corresponding to $key
 	 */
 	public function getGlobalState($key,$defaultValue=null)
@@ -439,6 +441,7 @@ 
 	 * @param mixed the global value to be set
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
 	 * @param boolean wheter to force an immediate GlobalState save. defaults to false
+	 * @param string $key
 	 */
 	public function setGlobalState($key,$value,$defaultValue=null,$forceSave=false)
 	{
@@ -553,6 +556,7 @@ 
 
 	/**
 	 * @param string the directory containing the application configuration file
+	 * @param string $value
 	 */
 	public function setBasePath($value)
 	{
@@ -569,6 +573,7 @@ 
 
 	/**
 	 * @param string the application configuration file (absolute path)
+	 * @param string $value
 	 */
 	public function setConfigurationFile($value)
 	{
@@ -585,6 +590,7 @@ 
 
  	/**
  	 * @param string the application configuration type. 'xml' and 'php' are valid values
+ 	 * @param string $value
 	 */
 	public function setConfigurationType($value)
 	{
@@ -640,6 +646,7 @@ 
 
 	/**
 	 * @param string the directory storing cache data and application-level persistent data. (absolute path)
+	 * @param string $value
 	 */
 	public function setRuntimePath($value)
 	{
@@ -1071,6 +1078,7 @@ 
 	 * The service instance will be created. Its properties will be initialized
 	 * and the configurations will be applied, if any.
 	 * @param string service ID
+	 * @param string $serviceID
 	 */
 	public function startService($serviceID)
 	{
@@ -1109,6 +1117,7 @@ 
 	 * This method is invoked when an exception is raised during the lifecycles
 	 * of the application.
 	 * @param mixed event parameter
+	 * @param \Exception $param
 	 */
 	public function onError($param)
 	{

Braces +6 added lines, -12 removed lines

@@ -340,8 +340,7 @@ 
 		{
 			$configFile=$basePath;
 			$basePath=dirname($configFile);
-		}
-		else
+		} else
 			$configFile=null;
 
 		// determine runtime path
@@ -361,8 +360,7 @@ 
 			}
 			$this->setBasePath($basePath);
 			$this->setRuntimePath($runtimePath);
-		}
-		else
+		} else
 			throw new TConfigurationException('application_runtimepath_invalid',$runtimePath);
 
 	}
@@ -391,8 +389,7 @@ 
 				$this->$method();
 				$this->_step++;
 			}
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			$this->onError($e);
 		}
@@ -993,8 +990,7 @@ 
 				foreach($parameter[1] as $name=>$value)
 					$component->setSubProperty($name,$value);
 				$this->_parameters->add($id,$component);
-			}
-			else
+			} else
 				$this->_parameters->add($id,$parameter);
 		}
 
@@ -1053,8 +1049,7 @@ 
 				$config->loadFromFile($this->_configFile);
 				if($this->_cacheFile!==null)
 					file_put_contents($this->_cacheFile,serialize($config),LOCK_EX);
-			}
-			else
+			} else
 				$config=unserialize(file_get_contents($this->_cacheFile));
 
 			$this->applyConfiguration($config,false);
@@ -1099,8 +1094,7 @@ 
 			}
 
 			$service->init($configElement);
-		}
-		else
+		} else
 			throw new THttpException(500,'application_service_unknown',$serviceID);
 	}
 

Spacing +69 added lines, -69 removed lines

@@ -116,7 +116,7 @@ 
 	/**
 	 * Configuration file type, application.xml and config.xml
 	 */
-	const CONFIG_TYPE_XML = 'xml';
+	const CONFIG_TYPE_XML='xml';
 	/**
 	 * Application configuration file name
 	 */
@@ -128,7 +128,7 @@ 
 	/**
 	 * Configuration file type, application.php and config.php
 	 */
-	const CONFIG_TYPE_PHP = 'php';
+	const CONFIG_TYPE_PHP='php';
 	/**
 	 * Runtime directory name
 	 */
@@ -281,7 +281,7 @@ 
 	/**
 	 * @var string Customizable page service ID
 	 */
-	private $_pageServiceID = self::PAGE_SERVICE_ID;
+	private $_pageServiceID=self::PAGE_SERVICE_ID;
 
 	/**
 	 * Constructor.
@@ -301,7 +301,7 @@ 
 	 * @param boolean whether to cache application configuration. Defaults to true.
 	 * @throws TConfigurationException if configuration file cannot be read or the runtime path is invalid.
 	 */
-	public function __construct($basePath='protected',$cacheConfig=true, $configType=self::CONFIG_TYPE_XML)
+	public function __construct($basePath='protected', $cacheConfig=true, $configType=self::CONFIG_TYPE_XML)
 	{
 		// register application as a singleton
 		Prado::setApplication($this);
@@ -314,9 +314,9 @@ 
 		// generates unique ID by hashing the runtime path
 		$this->_uniqueID=md5($this->_runtimePath);
 		$this->_parameters=new \Prado\Collections\TMap;
-		$this->_services=array($this->getPageServiceID()=>array('TPageService',array(),null));
+		$this->_services=array($this->getPageServiceID()=>array('TPageService', array(), null));
 
-		Prado::setPathOfAlias('Application',$this->_basePath);
+		Prado::setPathOfAlias('Application', $this->_basePath);
 	}
 
 	/**
@@ -333,7 +333,7 @@ 
 	{
 		// determine configuration path and file
 		if(empty($basePath) || ($basePath=realpath($basePath))===false)
-			throw new TConfigurationException('application_basepath_invalid',$basePath);
+			throw new TConfigurationException('application_basepath_invalid', $basePath);
 		if(is_dir($basePath) && is_file($basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName()))
 			$configFile=$basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName();
 		else if(is_file($basePath))
@@ -354,7 +354,7 @@ 
 				if(!is_dir($runtimePath))
 				{
 					if(@mkdir($runtimePath)===false)
-						throw new TConfigurationException('application_runtimepath_failed',$runtimePath);
+						throw new TConfigurationException('application_runtimepath_failed', $runtimePath);
 					@chmod($runtimePath, PRADO_CHMOD); //make it deletable
 				}
 				$this->setConfigurationFile($configFile);
@@ -363,7 +363,7 @@ 
 			$this->setRuntimePath($runtimePath);
 		}
 		else
-			throw new TConfigurationException('application_runtimepath_invalid',$runtimePath);
+			throw new TConfigurationException('application_runtimepath_invalid', $runtimePath);
 
 	}
 
@@ -380,14 +380,14 @@ 
 			$n=count(self::$_steps);
 			$this->_step=0;
 			$this->_requestCompleted=false;
-			while($this->_step<$n)
+			while($this->_step < $n)
 			{
 				if($this->_mode===self::STATE_OFF)
-					throw new THttpException(503,'application_unavailable');
+					throw new THttpException(503, 'application_unavailable');
 				if($this->_requestCompleted)
 					break;
 				$method=self::$_steps[$this->_step];
-				Prado::trace("Executing $method()",'Prado\TApplication');
+				Prado::trace("Executing $method()", 'Prado\TApplication');
 				$this->$method();
 				$this->_step++;
 			}
@@ -425,9 +425,9 @@ 
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
 	 * @return mixed the global value corresponding to $key
 	 */
-	public function getGlobalState($key,$defaultValue=null)
+	public function getGlobalState($key, $defaultValue=null)
 	{
-		return isset($this->_globals[$key])?$this->_globals[$key]:$defaultValue;
+		return isset($this->_globals[$key]) ? $this->_globals[$key] : $defaultValue;
 	}
 
 	/**
@@ -440,7 +440,7 @@ 
 	 * @param mixed the default value. If $key is not found, $defaultValue will be returned
 	 * @param boolean wheter to force an immediate GlobalState save. defaults to false
 	 */
-	public function setGlobalState($key,$value,$defaultValue=null,$forceSave=false)
+	public function setGlobalState($key, $value, $defaultValue=null, $forceSave=false)
 	{
 		$this->_stateChanged=true;
 		if($value===$defaultValue)
@@ -540,7 +540,7 @@ 
 	 */
 	public function setMode($value)
 	{
-		$this->_mode=TPropertyValue::ensureEnum($value,'\Prado\TApplicationMode');
+		$this->_mode=TPropertyValue::ensureEnum($value, '\Prado\TApplicationMode');
 	}
 
 	/**
@@ -588,7 +588,7 @@ 
 	 */
 	public function setConfigurationType($value)
 	{
-		$this->_configType = $value;
+		$this->_configType=$value;
 	}
 
 	/**
@@ -601,10 +601,10 @@ 
 			switch($this->_configType)
 			{
 				case TApplication::CONFIG_TYPE_PHP:
-					$this->_configFileExt = TApplication::CONFIG_FILE_EXT_PHP;
+					$this->_configFileExt=TApplication::CONFIG_FILE_EXT_PHP;
 					break;
 				default:
-					$this->_configFileExt = TApplication::CONFIG_FILE_EXT_XML;
+					$this->_configFileExt=TApplication::CONFIG_FILE_EXT_XML;
 			}
 		}
 		return $this->_configFileExt;
@@ -616,15 +616,15 @@ 
 	public function getConfigurationFileName()
 	{
 		static $fileName;
-		if($fileName == null)
+		if($fileName==null)
 		{
 			switch($this->_configType)
 			{
 				case TApplication::CONFIG_TYPE_PHP:
-					$fileName = TApplication::CONFIG_FILE_PHP;
+					$fileName=TApplication::CONFIG_FILE_PHP;
 					break;
 				default:
-					$fileName = TApplication::CONFIG_FILE_XML;
+					$fileName=TApplication::CONFIG_FILE_XML;
 			}
 		}
 		return $fileName;
@@ -675,7 +675,7 @@ 
 	public function setModule($id, IModule $module=null)
 	{
 		if(isset($this->_modules[$id]))
-			throw new TConfigurationException('application_moduleid_duplicated',$id);
+			throw new TConfigurationException('application_moduleid_duplicated', $id);
 		else
 			$this->_modules[$id]=$module;
 	}
@@ -691,7 +691,7 @@ 
 		// force loading of a lazy module
 		if($this->_modules[$id]===null)
 		{
-			$module = $this->internalLoadModule($id, true);
+			$module=$this->internalLoadModule($id, true);
 			$module[0]->init($module[1]);
 		}
 
@@ -940,37 +940,37 @@ 
 		list($moduleClass, $initProperties, $configElement)=$this->_lazyModules[$id];
 		if(isset($initProperties['lazy']) && $initProperties['lazy'] && !$force)
 		{
-			Prado::trace("Postponed loading of lazy module $id ({$moduleClass})",'\Prado\TApplication');
+			Prado::trace("Postponed loading of lazy module $id ({$moduleClass})", '\Prado\TApplication');
 			$this->setModule($id, null);
 			return null;
 		}
 
-		Prado::trace("Loading module $id ({$moduleClass})",'\Prado\TApplication');
+		Prado::trace("Loading module $id ({$moduleClass})", '\Prado\TApplication');
 		$module=Prado::createComponent($moduleClass);
 		foreach($initProperties as $name=>$value)
 		{
 			if($name==='lazy') continue;
-			$module->setSubProperty($name,$value);
+			$module->setSubProperty($name, $value);
 		}
-		$this->setModule($id,$module);
+		$this->setModule($id, $module);
 		// keep the key to avoid reuse of the old module id
 		$this->_lazyModules[$id]=null;
 
-		return array($module,$configElement);
+		return array($module, $configElement);
 	}
 	/**
 	 * Applies an application configuration.
 	 * @param TApplicationConfiguration the configuration
 	 * @param boolean whether the configuration is specified within a service.
 	 */
-	public function applyConfiguration($config,$withinService=false)
+	public function applyConfiguration($config, $withinService=false)
 	{
 		if($config->getIsEmpty())
 			return;
 
 		// set path aliases and using namespaces
 		foreach($config->getAliases() as $alias=>$path)
-			Prado::setPathOfAlias($alias,$path);
+			Prado::setPathOfAlias($alias, $path);
 		foreach($config->getUsings() as $using)
 			Prado::using($using);
 
@@ -978,11 +978,11 @@ 
 		if(!$withinService)
 		{
 			foreach($config->getProperties() as $name=>$value)
-				$this->setSubProperty($name,$value);
+				$this->setSubProperty($name, $value);
 		}
 
 		if(empty($this->_services))
-			$this->_services=array($this->getPageServiceID()=>array('Prado\Web\Services\TPageService',array(),null));
+			$this->_services=array($this->getPageServiceID()=>array('Prado\Web\Services\TPageService', array(), null));
 
 		// load parameters
 		foreach($config->getParameters() as $id=>$parameter)
@@ -991,11 +991,11 @@ 
 			{
 				$component=Prado::createComponent($parameter[0]);
 				foreach($parameter[1] as $name=>$value)
-					$component->setSubProperty($name,$value);
-				$this->_parameters->add($id,$component);
+					$component->setSubProperty($name, $value);
+				$this->_parameters->add($id, $component);
 			}
 			else
-				$this->_parameters->add($id,$parameter);
+				$this->_parameters->add($id, $parameter);
 		}
 
 		// load and init modules specified in app config
@@ -1005,7 +1005,7 @@ 
 			if(!is_string($id))
 				$id='_module'.count($this->_lazyModules);
 			$this->_lazyModules[$id]=$moduleConfig;
-			if($module = $this->internalLoadModule($id))
+			if($module=$this->internalLoadModule($id))
 				$modules[]=$module;
 		}
 		foreach($modules as $module)
@@ -1022,12 +1022,12 @@ 
 				$condition=$this->evaluateExpression($condition);
 			if($condition)
 			{
-				if(($path=Prado::getPathOfNamespace($filePath,$this->getConfigurationFileExt()))===null || !is_file($path))
-					throw new TConfigurationException('application_includefile_invalid',$filePath);
+				if(($path=Prado::getPathOfNamespace($filePath, $this->getConfigurationFileExt()))===null || !is_file($path))
+					throw new TConfigurationException('application_includefile_invalid', $filePath);
 				$cn=$this->getApplicationConfigurationClass();
 				$c=new $cn;
 				$c->loadFromFile($path);
-				$this->applyConfiguration($c,$withinService);
+				$this->applyConfiguration($c, $withinService);
 			}
 		}
 	}
@@ -1043,21 +1043,21 @@ 
 	 */
 	protected function initApplication()
 	{
-		Prado::trace('Initializing application','Prado\TApplication');
+		Prado::trace('Initializing application', 'Prado\TApplication');
 
 		if($this->_configFile!==null)
 		{
-			if($this->_cacheFile===null || @filemtime($this->_cacheFile)<filemtime($this->_configFile))
+			if($this->_cacheFile===null || @filemtime($this->_cacheFile) < filemtime($this->_configFile))
 			{
 				$config=new TApplicationConfiguration;
 				$config->loadFromFile($this->_configFile);
 				if($this->_cacheFile!==null)
-					file_put_contents($this->_cacheFile,serialize($config),LOCK_EX);
+					file_put_contents($this->_cacheFile, serialize($config), LOCK_EX);
 			}
 			else
 				$config=unserialize(file_get_contents($this->_cacheFile));
 
-			$this->applyConfiguration($config,false);
+			$this->applyConfiguration($config, false);
 		}
 
 		if(($serviceID=$this->getRequest()->resolveRequest(array_keys($this->_services)))===null)
@@ -1076,32 +1076,32 @@ 
 	{
 		if(isset($this->_services[$serviceID]))
 		{
-			list($serviceClass,$initProperties,$configElement)=$this->_services[$serviceID];
+			list($serviceClass, $initProperties, $configElement)=$this->_services[$serviceID];
 			$service=Prado::createComponent($serviceClass);
 			if(!($service instanceof IService))
-				throw new THttpException(500,'application_service_invalid',$serviceClass);
+				throw new THttpException(500, 'application_service_invalid', $serviceClass);
 			if(!$service->getEnabled())
-				throw new THttpException(500,'application_service_unavailable',$serviceClass);
+				throw new THttpException(500, 'application_service_unavailable', $serviceClass);
 			$service->setID($serviceID);
 			$this->setService($service);
 
 			foreach($initProperties as $name=>$value)
-				$service->setSubProperty($name,$value);
+				$service->setSubProperty($name, $value);
 
 			if($configElement!==null)
 			{
 				$config=new TApplicationConfiguration;
 				if($this->getConfigurationType()==self::CONFIG_TYPE_PHP)
-					$config->loadFromPhp($configElement,$this->getBasePath());
+					$config->loadFromPhp($configElement, $this->getBasePath());
 				else
-					$config->loadFromXml($configElement,$this->getBasePath());
-				$this->applyConfiguration($config,true);
+					$config->loadFromXml($configElement, $this->getBasePath());
+				$this->applyConfiguration($config, true);
 			}
 
 			$service->init($configElement);
 		}
 		else
-			throw new THttpException(500,'application_service_unknown',$serviceID);
+			throw new THttpException(500, 'application_service_unknown', $serviceID);
 	}
 
 	/**
@@ -1112,9 +1112,9 @@ 
 	 */
 	public function onError($param)
 	{
-		Prado::log($param->getMessage(),TLogger::ERROR,'Prado\TApplication');
-		$this->raiseEvent('OnError',$this,$param);
-		$this->getErrorHandler()->handleError($this,$param);
+		Prado::log($param->getMessage(), TLogger::ERROR, 'Prado\TApplication');
+		$this->raiseEvent('OnError', $this, $param);
+		$this->getErrorHandler()->handleError($this, $param);
 	}
 
 	/**
@@ -1126,7 +1126,7 @@ 
 	 */
 	public function onBeginRequest()
 	{
-		$this->raiseEvent('OnBeginRequest',$this,null);
+		$this->raiseEvent('OnBeginRequest', $this, null);
 	}
 
 	/**
@@ -1135,7 +1135,7 @@ 
 	 */
 	public function onAuthentication()
 	{
-		$this->raiseEvent('OnAuthentication',$this,null);
+		$this->raiseEvent('OnAuthentication', $this, null);
 	}
 
 	/**
@@ -1144,7 +1144,7 @@ 
 	 */
 	public function onAuthenticationComplete()
 	{
-		$this->raiseEvent('OnAuthenticationComplete',$this,null);
+		$this->raiseEvent('OnAuthenticationComplete', $this, null);
 	}
 
 	/**
@@ -1153,7 +1153,7 @@ 
 	 */
 	public function onAuthorization()
 	{
-		$this->raiseEvent('OnAuthorization',$this,null);
+		$this->raiseEvent('OnAuthorization', $this, null);
 	}
 
 	/**
@@ -1162,7 +1162,7 @@ 
 	 */
 	public function onAuthorizationComplete()
 	{
-		$this->raiseEvent('OnAuthorizationComplete',$this,null);
+		$this->raiseEvent('OnAuthorizationComplete', $this, null);
 	}
 
 	/**
@@ -1172,7 +1172,7 @@ 
 	public function onLoadState()
 	{
 		$this->loadGlobals();
-		$this->raiseEvent('OnLoadState',$this,null);
+		$this->raiseEvent('OnLoadState', $this, null);
 	}
 
 	/**
@@ -1181,7 +1181,7 @@ 
 	 */
 	public function onLoadStateComplete()
 	{
-		$this->raiseEvent('OnLoadStateComplete',$this,null);
+		$this->raiseEvent('OnLoadStateComplete', $this, null);
 	}
 
 	/**
@@ -1190,7 +1190,7 @@ 
 	 */
 	public function onPreRunService()
 	{
-		$this->raiseEvent('OnPreRunService',$this,null);
+		$this->raiseEvent('OnPreRunService', $this, null);
 	}
 
 	/**
@@ -1208,7 +1208,7 @@ 
 	 */
 	public function onSaveState()
 	{
-		$this->raiseEvent('OnSaveState',$this,null);
+		$this->raiseEvent('OnSaveState', $this, null);
 		$this->saveGlobals();
 	}
 
@@ -1218,7 +1218,7 @@ 
 	 */
 	public function onSaveStateComplete()
 	{
-		$this->raiseEvent('OnSaveStateComplete',$this,null);
+		$this->raiseEvent('OnSaveStateComplete', $this, null);
 	}
 
 	/**
@@ -1227,14 +1227,14 @@ 
 	 */
 	public function onPreFlushOutput()
 	{
-		$this->raiseEvent('OnPreFlushOutput',$this,null);
+		$this->raiseEvent('OnPreFlushOutput', $this, null);
 	}
 
 	/**
 	 * Flushes output to client side.
 	 * @param boolean whether to continue buffering after flush if buffering was active
 	 */
-	public function flushOutput($continueBuffering = true)
+	public function flushOutput($continueBuffering=true)
 	{
 		$this->getResponse()->flush($continueBuffering);
 	}
@@ -1246,7 +1246,7 @@ 
 	public function onEndRequest()
 	{
 		$this->flushOutput(false); // flush all remaining content in the buffer
-		$this->saveGlobals();  // save global state
-		$this->raiseEvent('OnEndRequest',$this,null);
+		$this->saveGlobals(); // save global state
+		$this->raiseEvent('OnEndRequest', $this, null);
 	}
 }

framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php

Indentation +4 added lines, -4 removed lines

@@ -90,10 +90,10 @@
 	private $_association_columns=array();
 
 	/**
-	* Get the foreign key index values from the results and make calls to the
-	* database to find the corresponding foreign objects using association table.
-	* @param array original results.
-	*/
+	 * Get the foreign key index values from the results and make calls to the
+	 * database to find the corresponding foreign objects using association table.
+	 * @param array original results.
+	 */
 	protected function collectForeignObjects(&$results)
 	{
 		list($sourceKeys, $foreignKeys) = $this->getRelationForeignKeys();

Spacing +87 added lines, -87 removed lines

@@ -96,10 +96,10 @@ 
 	*/
 	protected function collectForeignObjects(&$results)
 	{
-		list($sourceKeys, $foreignKeys) = $this->getRelationForeignKeys();
-		$properties = array_values($sourceKeys);
-		$indexValues = $this->getIndexValues($properties, $results);
-		$this->fetchForeignObjects($results, $foreignKeys,$indexValues,$sourceKeys);
+		list($sourceKeys, $foreignKeys)=$this->getRelationForeignKeys();
+		$properties=array_values($sourceKeys);
+		$indexValues=$this->getIndexValues($properties, $results);
+		$this->fetchForeignObjects($results, $foreignKeys, $indexValues, $sourceKeys);
 	}
 
 	/**
@@ -107,10 +107,10 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		$association = $this->getAssociationTable();
-		$sourceKeys = $this->findForeignKeys($association, $this->getSourceRecord(), true);
-		$fkObject = $this->getContext()->getForeignRecordFinder();
-		$foreignKeys = $this->findForeignKeys($association, $fkObject);
+		$association=$this->getAssociationTable();
+		$sourceKeys=$this->findForeignKeys($association, $this->getSourceRecord(), true);
+		$fkObject=$this->getContext()->getForeignRecordFinder();
+		$foreignKeys=$this->findForeignKeys($association, $fkObject);
 		return array($sourceKeys, $foreignKeys);
 	}
 
@@ -121,16 +121,16 @@ 
 	{
 		if($this->_association===null)
 		{
-			$gateway = $this->getSourceRecord()->getRecordGateway();
-			$conn = $this->getSourceRecord()->getDbConnection();
+			$gateway=$this->getSourceRecord()->getRecordGateway();
+			$conn=$this->getSourceRecord()->getDbConnection();
 			//table name may include the fk column name separated with a dot.
-			$table = explode('.', $this->getContext()->getAssociationTable());
-			if(count($table)>1)
+			$table=explode('.', $this->getContext()->getAssociationTable());
+			if(count($table) > 1)
 			{
-				$columns = preg_replace('/^\((.*)\)/', '\1', $table[1]);
-				$this->_association_columns = preg_split('/\s*[, ]\*/',$columns);
+				$columns=preg_replace('/^\((.*)\)/', '\1', $table[1]);
+				$this->_association_columns=preg_split('/\s*[, ]\*/', $columns);
 			}
-			$this->_association = $gateway->getTableInfo($conn, $table[0]);
+			$this->_association=$gateway->getTableInfo($conn, $table[0]);
 		}
 		return $this->_association;
 	}
@@ -142,8 +142,8 @@ 
 	{
 		if($this->_sourceTable===null)
 		{
-			$gateway = $this->getSourceRecord()->getRecordGateway();
-			$this->_sourceTable = $gateway->getRecordTableInfo($this->getSourceRecord());
+			$gateway=$this->getSourceRecord()->getRecordGateway();
+			$this->_sourceTable=$gateway->getRecordTableInfo($this->getSourceRecord());
 		}
 		return $this->_sourceTable;
 	}
@@ -155,9 +155,9 @@ 
 	{
 		if($this->_foreignTable===null)
 		{
-			$gateway = $this->getSourceRecord()->getRecordGateway();
-			$fkObject = $this->getContext()->getForeignRecordFinder();
-			$this->_foreignTable = $gateway->getRecordTableInfo($fkObject);
+			$gateway=$this->getSourceRecord()->getRecordGateway();
+			$fkObject=$this->getContext()->getForeignRecordFinder();
+			$this->_foreignTable=$gateway->getRecordTableInfo($fkObject);
 		}
 		return $this->_foreignTable;
 	}
@@ -175,7 +175,7 @@ 
 	 */
 	protected function getForeignCommandBuilder()
 	{
-		$obj = $this->getContext()->getForeignRecordFinder();
+		$obj=$this->getContext()->getForeignRecordFinder();
 		return $this->getSourceRecord()->getRecordGateway()->getCommand($obj);
 	}
 
@@ -185,21 +185,21 @@ 
 	 * @param array field names
 	 * @param array foreign key index values.
 	 */
-	protected function fetchForeignObjects(&$results,$foreignKeys,$indexValues,$sourceKeys)
+	protected function fetchForeignObjects(&$results, $foreignKeys, $indexValues, $sourceKeys)
 	{
-		$criteria = $this->getCriteria();
-		$finder = $this->getContext()->getForeignRecordFinder();
-		$type = get_class($finder);
-		$command = $this->createCommand($criteria, $foreignKeys,$indexValues,$sourceKeys);
-		$srcProps = array_keys($sourceKeys);
+		$criteria=$this->getCriteria();
+		$finder=$this->getContext()->getForeignRecordFinder();
+		$type=get_class($finder);
+		$command=$this->createCommand($criteria, $foreignKeys, $indexValues, $sourceKeys);
+		$srcProps=array_keys($sourceKeys);
 		$collections=array();
 		foreach($this->getCommandBuilder()->onExecuteCommand($command, $command->query()) as $row)
 		{
-			$hash = $this->getObjectHash($row, $srcProps);
+			$hash=$this->getObjectHash($row, $srcProps);
 			foreach($srcProps as $column)
 				unset($row[$column]);
-			$obj = $this->createFkObject($type,$row,$foreignKeys);
-			$collections[$hash][] = $obj;
+			$obj=$this->createFkObject($type, $row, $foreignKeys);
+			$collections[$hash][]=$obj;
 		}
 		$this->setResultCollection($results, $collections, array_values($sourceKeys));
 	}
@@ -210,9 +210,9 @@ 
 	 * @param array foreign key column names
 	 * @return TActiveRecord
 	 */
-	protected function createFkObject($type,$row,$foreignKeys)
+	protected function createFkObject($type, $row, $foreignKeys)
 	{
-		$obj = TActiveRecord::createRecord($type, $row);
+		$obj=TActiveRecord::createRecord($type, $row);
 		if(count($this->_association_columns) > 0)
 		{
 			$i=0;
@@ -228,22 +228,22 @@ 
 	 * @param array field names
 	 * @param array field values
 	 */
-	public function createCommand($criteria, $foreignKeys,$indexValues,$sourceKeys)
+	public function createCommand($criteria, $foreignKeys, $indexValues, $sourceKeys)
 	{
-		$innerJoin = $this->getAssociationJoin($foreignKeys,$indexValues,$sourceKeys);
-		$fkTable = $this->getForeignTable()->getTableFullName();
-		$srcColumns = $this->getSourceColumns($sourceKeys);
+		$innerJoin=$this->getAssociationJoin($foreignKeys, $indexValues, $sourceKeys);
+		$fkTable=$this->getForeignTable()->getTableFullName();
+		$srcColumns=$this->getSourceColumns($sourceKeys);
 		if(($where=$criteria->getCondition())===null)
 			$where='1=1';
-		$sql = "SELECT {$fkTable}.*, {$srcColumns} FROM {$fkTable} {$innerJoin} WHERE {$where}";
+		$sql="SELECT {$fkTable}.*, {$srcColumns} FROM {$fkTable} {$innerJoin} WHERE {$where}";
 
-		$parameters = $criteria->getParameters()->toArray();
-		$ordering = $criteria->getOrdersBy();
-		$limit = $criteria->getLimit();
-		$offset = $criteria->getOffset();
+		$parameters=$criteria->getParameters()->toArray();
+		$ordering=$criteria->getOrdersBy();
+		$limit=$criteria->getLimit();
+		$offset=$criteria->getOffset();
 
-		$builder = $this->getForeignCommandBuilder()->getBuilder();
-		$command = $builder->applyCriterias($sql,$parameters,$ordering,$limit,$offset);
+		$builder=$this->getForeignCommandBuilder()->getBuilder();
+		$command=$builder->applyCriterias($sql, $parameters, $ordering, $limit, $offset);
 		$this->getCommandBuilder()->onCreateCommand($command, $criteria);
 		return $command;
 	}
@@ -255,11 +255,11 @@ 
 	protected function getSourceColumns($sourceKeys)
 	{
 		$columns=array();
-		$table = $this->getAssociationTable();
-		$tableName = $table->getTableFullName();
-		$columnNames = array_merge(array_keys($sourceKeys),$this->_association_columns);
+		$table=$this->getAssociationTable();
+		$tableName=$table->getTableFullName();
+		$columnNames=array_merge(array_keys($sourceKeys), $this->_association_columns);
 		foreach($columnNames as $name)
-			$columns[] = $tableName.'.'.$table->getColumn($name)->getColumnName();
+			$columns[]=$tableName.'.'.$table->getColumn($name)->getColumnName();
 		return implode(', ', $columns);
 	}
 
@@ -270,28 +270,28 @@ 
 	 * @param array source table column names.
 	 * @return string inner join condition for M-N relationship via association table.
 	 */
-	protected function getAssociationJoin($foreignKeys,$indexValues,$sourceKeys)
+	protected function getAssociationJoin($foreignKeys, $indexValues, $sourceKeys)
 	{
-		$refInfo= $this->getAssociationTable();
-		$fkInfo = $this->getForeignTable();
+		$refInfo=$this->getAssociationTable();
+		$fkInfo=$this->getForeignTable();
 
-		$refTable = $refInfo->getTableFullName();
-		$fkTable = $fkInfo->getTableFullName();
+		$refTable=$refInfo->getTableFullName();
+		$fkTable=$fkInfo->getTableFullName();
 
-		$joins = array();
-		$hasAssociationColumns = count($this->_association_columns) > 0;
+		$joins=array();
+		$hasAssociationColumns=count($this->_association_columns) > 0;
 		$i=0;
 		foreach($foreignKeys as $ref=>$fk)
 		{
 			if($hasAssociationColumns)
-				$refField = $refInfo->getColumn($this->_association_columns[$i++])->getColumnName();
+				$refField=$refInfo->getColumn($this->_association_columns[$i++])->getColumnName();
 			else
-				$refField = $refInfo->getColumn($ref)->getColumnName();
-			$fkField = $fkInfo->getColumn($fk)->getColumnName();
-			$joins[] = "{$fkTable}.{$fkField} = {$refTable}.{$refField}";
+				$refField=$refInfo->getColumn($ref)->getColumnName();
+			$fkField=$fkInfo->getColumn($fk)->getColumnName();
+			$joins[]="{$fkTable}.{$fkField} = {$refTable}.{$refField}";
 		}
-		$joinCondition = implode(' AND ', $joins);
-		$index = $this->getCommandBuilder()->getIndexKeyCondition($refInfo,array_keys($sourceKeys), $indexValues);
+		$joinCondition=implode(' AND ', $joins);
+		$index=$this->getCommandBuilder()->getIndexKeyCondition($refInfo, array_keys($sourceKeys), $indexValues);
 		return "INNER JOIN {$refTable} ON ({$joinCondition}) AND {$index}";
 	}
 
@@ -301,15 +301,15 @@ 
 	 */
 	public function updateAssociatedRecords()
 	{
-		$obj = $this->getContext()->getSourceRecord();
-		$fkObjects = &$obj->{$this->getContext()->getProperty()};
+		$obj=$this->getContext()->getSourceRecord();
+		$fkObjects=&$obj->{$this->getContext()->getProperty()};
 		$success=true;
-		if(($total = count($fkObjects))> 0)
+		if(($total=count($fkObjects)) > 0)
 		{
-			$source = $this->getSourceRecord();
-			$builder = $this->getAssociationTableCommandBuilder();
-			for($i=0;$i<$total;$i++)
-				$success = $fkObjects[$i]->save() && $success;
+			$source=$this->getSourceRecord();
+			$builder=$this->getAssociationTableCommandBuilder();
+			for($i=0; $i < $total; $i++)
+				$success=$fkObjects[$i]->save() && $success;
 			return $this->updateAssociationTable($obj, $fkObjects, $builder) && $success;
 		}
 		return $success;
@@ -320,57 +320,57 @@ 
 	 */
 	protected function getAssociationTableCommandBuilder()
 	{
-		$conn = $this->getContext()->getSourceRecord()->getDbConnection();
+		$conn=$this->getContext()->getSourceRecord()->getDbConnection();
 		return $this->getAssociationTable()->createCommandBuilder($conn);
 	}
 
-	private function hasAssociationData($builder,$data)
+	private function hasAssociationData($builder, $data)
 	{
 		$condition=array();
-		$table = $this->getAssociationTable();
+		$table=$this->getAssociationTable();
 		foreach($data as $name=>$value)
-			$condition[] = $table->getColumn($name)->getColumnName().' = ?';
-		$command = $builder->createCountCommand(implode(' AND ', $condition),array_values($data));
-		$result = $this->getCommandBuilder()->onExecuteCommand($command, intval($command->queryScalar()));
+			$condition[]=$table->getColumn($name)->getColumnName().' = ?';
+		$command=$builder->createCountCommand(implode(' AND ', $condition), array_values($data));
+		$result=$this->getCommandBuilder()->onExecuteCommand($command, intval($command->queryScalar()));
 		return intval($result) > 0;
 	}
 
-	private function addAssociationData($builder,$data)
+	private function addAssociationData($builder, $data)
 	{
-		$command = $builder->createInsertCommand($data);
+		$command=$builder->createInsertCommand($data);
 		return $this->getCommandBuilder()->onExecuteCommand($command, $command->execute()) > 0;
 	}
 
-	private function updateAssociationTable($obj,$fkObjects, $builder)
+	private function updateAssociationTable($obj, $fkObjects, $builder)
 	{
-		$source = $this->getSourceRecordValues($obj);
-		$foreignKeys = $this->findForeignKeys($this->getAssociationTable(), $fkObjects[0]);
+		$source=$this->getSourceRecordValues($obj);
+		$foreignKeys=$this->findForeignKeys($this->getAssociationTable(), $fkObjects[0]);
 		$success=true;
 		foreach($fkObjects as $fkObject)
 		{
-			$data = array_merge($source, $this->getForeignObjectValues($foreignKeys,$fkObject));
-			if(!$this->hasAssociationData($builder,$data))
-				$success = $this->addAssociationData($builder,$data) && $success;
+			$data=array_merge($source, $this->getForeignObjectValues($foreignKeys, $fkObject));
+			if(!$this->hasAssociationData($builder, $data))
+				$success=$this->addAssociationData($builder, $data) && $success;
 		}
 		return $success;
 	}
 
 	private function getSourceRecordValues($obj)
 	{
-		$sourceKeys = $this->findForeignKeys($this->getAssociationTable(), $obj);
-		$indexValues = $this->getIndexValues(array_values($sourceKeys), $obj);
-		$data = array();
+		$sourceKeys=$this->findForeignKeys($this->getAssociationTable(), $obj);
+		$indexValues=$this->getIndexValues(array_values($sourceKeys), $obj);
+		$data=array();
 		$i=0;
 		foreach($sourceKeys as $name=>$srcKey)
-			$data[$name] = $indexValues[0][$i++];
+			$data[$name]=$indexValues[0][$i++];
 		return $data;
 	}
 
-	private function getForeignObjectValues($foreignKeys,$fkObject)
+	private function getForeignObjectValues($foreignKeys, $fkObject)
 	{
 		$data=array();
 		foreach($foreignKeys as $name=>$fKey)
-			$data[$name] = $fkObject->getColumnValue($fKey);
+			$data[$name]=$fkObject->getColumnValue($fKey);
 		return $data;
 	}
 }

Doc Comments +6 added lines, -2 removed lines

@@ -165,7 +165,7 @@ 
 	}
 
 	/**
-	 * @return TDataGatewayCommand
+	 * @return \Prado\Data\DataGateway\TDataGatewayCommand
 	 */
 	protected function getCommandBuilder()
 	{
@@ -173,7 +173,7 @@ 
 	}
 
 	/**
-	 * @return TDataGatewayCommand
+	 * @return \Prado\Data\DataGateway\TDataGatewayCommand
 	 */
 	protected function getForeignCommandBuilder()
 	{
@@ -210,6 +210,7 @@ 
 	 * @param string active record class name.
 	 * @param array row data
 	 * @param array foreign key column names
+	 * @param string $type
 	 * @return TActiveRecord
 	 */
 	protected function createFkObject($type,$row,$foreignKeys)
@@ -343,6 +344,9 @@ 
 		return $this->getCommandBuilder()->onExecuteCommand($command, $command->execute()) > 0;
 	}
 
+	/**
+	 * @param TActiveRecord $obj
+	 */
 	private function updateAssociationTable($obj,$fkObjects, $builder)
 	{
 		$source = $this->getSourceRecordValues($obj);