pradosoft / prado

framework/Web/UI/TThemeManager.php

Braces +5 added lines, -10 removed lines

@@ -283,8 +283,7 @@ 
 					closedir($dir);
 					if($cacheValid)
 						$this->_skins=$skins;
-				}
-				else
+				} else
 				{
 					$cacheValid=true;
 					$this->_cssFiles=$cssFiles;
@@ -461,20 +460,16 @@ 
 							{
 								$setter='set'.$name;
 								$control->$setter($value);
-							}
-							else
+							} else
 								throw new TConfigurationException('theme_property_readonly',$type,$name);
-						}
-						else
+						} else
 							throw new TConfigurationException('theme_property_undefined',$type,$name);
-					}
-					else	// complex property
+					} else	// complex property
 						$control->setSubProperty($name,$value);
 				}
 			}
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 

Spacing +38 added lines, -38 removed lines

@@ -46,7 +46,7 @@ 
 	/**
 	 * default theme class
 	 */
-	const DEFAULT_THEMECLASS = 'TTheme';
+	const DEFAULT_THEMECLASS='TTheme';
 
 	/**
 	 * @var string
@@ -88,7 +88,7 @@ 
 	public function getTheme($name)
 	{
 		$themePath=$this->getBasePath().DIRECTORY_SEPARATOR.$name;
-		$themeUrl=rtrim($this->getBaseUrl(),'/').'/'.$name;
+		$themeUrl=rtrim($this->getBaseUrl(), '/').'/'.$name;
 		return Prado::createComponent($this->getThemeClass(), $themePath, $themeUrl);
 	}
 
@@ -96,7 +96,7 @@ 
 	 * @param string|null $class Theme class name in namespace format
 	 */
 	public function setThemeClass($class) {
-		$this->_themeClass = $class===null ? self::DEFAULT_THEMECLASS : (string)$class;
+		$this->_themeClass=$class===null ? self::DEFAULT_THEMECLASS : (string) $class;
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 		{
 			$this->_basePath=dirname($this->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
 			if(($basePath=realpath($this->_basePath))===false || !is_dir($basePath))
-				throw new TConfigurationException('thememanager_basepath_invalid2',$this->_basePath);
+				throw new TConfigurationException('thememanager_basepath_invalid2', $this->_basePath);
 			$this->_basePath=$basePath;
 		}
 		return $this->_basePath;
@@ -151,7 +151,7 @@ 
 		{
 			$this->_basePath=Prado::getPathOfNamespace($value);
 			if($this->_basePath===null || !is_dir($this->_basePath))
-				throw new TInvalidDataValueException('thememanager_basepath_invalid',$value);
+				throw new TInvalidDataValueException('thememanager_basepath_invalid', $value);
 		}
 	}
 
@@ -165,10 +165,10 @@ 
 		{
 			$appPath=dirname($this->getRequest()->getApplicationFilePath());
 			$basePath=$this->getBasePath();
-			if(strpos($basePath,$appPath)===false)
+			if(strpos($basePath, $appPath)===false)
 				throw new TConfigurationException('thememanager_baseurl_required');
-			$appUrl=rtrim(dirname($this->getRequest()->getApplicationUrl()),'/\\');
-			$this->_baseUrl=$appUrl.strtr(substr($basePath,strlen($appPath)),'\\','/');
+			$appUrl=rtrim(dirname($this->getRequest()->getApplicationUrl()), '/\\');
+			$this->_baseUrl=$appUrl.strtr(substr($basePath, strlen($appPath)), '\\', '/');
 		}
 		return $this->_baseUrl;
 	}
@@ -178,7 +178,7 @@ 
 	 */
 	public function setBaseUrl($value)
 	{
-		$this->_baseUrl=rtrim($value,'/');
+		$this->_baseUrl=rtrim($value, '/');
 	}
 }
 
@@ -248,7 +248,7 @@ 
 	 * @param string theme URL
 	 * @throws TConfigurationException if theme path does not exist or any parsing error of the skin files
 	 */
-	public function __construct($themePath,$themeUrl)
+	public function __construct($themePath, $themeUrl)
 	{
 		$this->_themeUrl=$themeUrl;
 		$this->_themePath=realpath($themePath);
@@ -260,21 +260,21 @@ 
 			$array=$cache->get(self::THEME_CACHE_PREFIX.$themePath);
 			if(is_array($array))
 			{
-				list($skins,$cssFiles,$jsFiles,$timestamp)=$array;
+				list($skins, $cssFiles, $jsFiles, $timestamp)=$array;
 				if($this->getApplication()->getMode()!==TApplicationMode::Performance)
 				{
 					if(($dir=opendir($themePath))===false)
-						throw new TIOException('theme_path_inexistent',$themePath);
+						throw new TIOException('theme_path_inexistent', $themePath);
 					$cacheValid=true;
 					while(($file=readdir($dir))!==false)
 					{
 						if($file==='.' || $file==='..')
 							continue;
-						else if(basename($file,'.css')!==$file)
+						else if(basename($file, '.css')!==$file)
 							$this->_cssFiles[]=$themeUrl.'/'.$file;
-						else if(basename($file,'.js')!==$file)
+						else if(basename($file, '.js')!==$file)
 							$this->_jsFiles[]=$themeUrl.'/'.$file;
-						else if(basename($file,self::SKIN_FILE_EXT)!==$file && filemtime($themePath.DIRECTORY_SEPARATOR.$file)>$timestamp)
+						else if(basename($file, self::SKIN_FILE_EXT)!==$file && filemtime($themePath.DIRECTORY_SEPARATOR.$file) > $timestamp)
 						{
 							$cacheValid=false;
 							break;
@@ -299,29 +299,29 @@ 
 			$this->_jsFiles=array();
 			$this->_skins=array();
 			if(($dir=opendir($themePath))===false)
-				throw new TIOException('theme_path_inexistent',$themePath);
+				throw new TIOException('theme_path_inexistent', $themePath);
 			while(($file=readdir($dir))!==false)
 			{
 				if($file==='.' || $file==='..')
 					continue;
-				else if(basename($file,'.css')!==$file)
+				else if(basename($file, '.css')!==$file)
 					$this->_cssFiles[]=$themeUrl.'/'.$file;
-				else if(basename($file,'.js')!==$file)
+				else if(basename($file, '.js')!==$file)
 					$this->_jsFiles[]=$themeUrl.'/'.$file;
-				else if(basename($file,self::SKIN_FILE_EXT)!==$file)
+				else if(basename($file, self::SKIN_FILE_EXT)!==$file)
 				{
-					$template=new TTemplate(file_get_contents($themePath.'/'.$file),$themePath,$themePath.'/'.$file);
+					$template=new TTemplate(file_get_contents($themePath.'/'.$file), $themePath, $themePath.'/'.$file);
 					foreach($template->getItems() as $skin)
 					{
 						if(!isset($skin[2]))  // a text string, ignored
 							continue;
 						else if($skin[0]!==-1)
-							throw new TConfigurationException('theme_control_nested',$skin[1],dirname($themePath));
+							throw new TConfigurationException('theme_control_nested', $skin[1], dirname($themePath));
 						$type=$skin[1];
-						$id=isset($skin[2]['skinid'])?$skin[2]['skinid']:0;
+						$id=isset($skin[2]['skinid']) ? $skin[2]['skinid'] : 0;
 						unset($skin[2]['skinid']);
 						if(isset($this->_skins[$type][$id]))
-							throw new TConfigurationException('theme_skinid_duplicated',$type,$id,dirname($themePath));
+							throw new TConfigurationException('theme_skinid_duplicated', $type, $id, dirname($themePath));
 						/*
 						foreach($skin[2] as $name=>$value)
 						{
@@ -337,7 +337,7 @@ 
 			sort($this->_cssFiles);
 			sort($this->_jsFiles);
 			if($cache!==null)
-				$cache->set(self::THEME_CACHE_PREFIX.$themePath,array($this->_skins,$this->_cssFiles,$this->_jsFiles,time()));
+				$cache->set(self::THEME_CACHE_PREFIX.$themePath, array($this->_skins, $this->_cssFiles, $this->_jsFiles, time()));
 		}
 	}
 
@@ -354,7 +354,7 @@ 
 	 */
 	protected function setName($value)
 	{
-		$this->_name = $value;
+		$this->_name=$value;
 	}
 
 	/**
@@ -370,7 +370,7 @@ 
 	 */
 	protected function setBaseUrl($value)
 	{
-		$this->_themeUrl=rtrim($value,'/');
+		$this->_themeUrl=rtrim($value, '/');
 	}
 
 	/**
@@ -402,7 +402,7 @@ 
 	 */
 	protected function setSkins($value)
 	{
-		$this->_skins = $value;
+		$this->_skins=$value;
 	}
 
 	/**
@@ -423,7 +423,7 @@ 
 		{
 			foreach($this->_skins[$type][$id] as $name=>$value)
 			{
-				Prado::trace("Applying skin $name to $type",'System.Web.UI.TThemeManager');
+				Prado::trace("Applying skin $name to $type", 'System.Web.UI.TThemeManager');
 				if(is_array($value))
 				{
 					switch($value[0])
@@ -432,28 +432,28 @@ 
 							$value=$this->evaluateExpression($value[1]);
 							break;
 						case TTemplate::CONFIG_ASSET:
-							$value=$this->_themeUrl.'/'.ltrim($value[1],'/');
+							$value=$this->_themeUrl.'/'.ltrim($value[1], '/');
 							break;
 						case TTemplate::CONFIG_DATABIND:
-							$control->bindProperty($name,$value[1]);
+							$control->bindProperty($name, $value[1]);
 							break;
 						case TTemplate::CONFIG_PARAMETER:
-							$control->setSubProperty($name,$this->getApplication()->getParameters()->itemAt($value[1]));
+							$control->setSubProperty($name, $this->getApplication()->getParameters()->itemAt($value[1]));
 							break;
 						case TTemplate::CONFIG_TEMPLATE:
-							$control->setSubProperty($name,$value[1]);
+							$control->setSubProperty($name, $value[1]);
 							break;
 						case TTemplate::CONFIG_LOCALIZATION:
-							$control->setSubProperty($name,Prado::localize($value[1]));
+							$control->setSubProperty($name, Prado::localize($value[1]));
 							break;
 						default:
-							throw new TConfigurationException('theme_tag_unexpected',$name,$value[0]);
+							throw new TConfigurationException('theme_tag_unexpected', $name, $value[0]);
 							break;
 					}
 				}
 				if(!is_array($value))
 				{
-					if(strpos($name,'.')===false)	// is simple property or custom attribute
+					if(strpos($name, '.')===false)	// is simple property or custom attribute
 					{
 						if($control->hasProperty($name))
 						{
@@ -463,13 +463,13 @@ 
 								$control->$setter($value);
 							}
 							else
-								throw new TConfigurationException('theme_property_readonly',$type,$name);
+								throw new TConfigurationException('theme_property_readonly', $type, $name);
 						}
 						else
-							throw new TConfigurationException('theme_property_undefined',$type,$name);
+							throw new TConfigurationException('theme_property_undefined', $type, $name);
 					}
 					else	// complex property
-						$control->setSubProperty($name,$value);
+						$control->setSubProperty($name, $value);
 				}
 			}
 			return true;

framework/Web/UI/WebControls/TRadioButton.php

Braces +2 added lines, -4 removed lines

@@ -120,11 +120,9 @@
 			{
 				$this->setChecked(true);
 				return true;
-			}
-			else
+			} else
 				return false;
-		}
-		else if($this->getChecked())
+		} else if($this->getChecked())
 			$this->setChecked(false);
 		return false;
 	}

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TRadioButton class file
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.WebControls
- */
+	 * TRadioButton class file
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.WebControls
+	 */
 
 /**
  * Using TCheckBox parent class

Spacing +30 added lines, -30 removed lines

@@ -78,7 +78,7 @@ 
 	public function __construct()
 	{
 		parent::__construct();
-		$this->_globalID = self::$_buttonCount++;
+		$this->_globalID=self::$_buttonCount++;
 	}
 
 	/**
@@ -110,10 +110,10 @@ 
 	 * @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)
 	{
 		$uniqueGroupName=$this->getUniqueGroupName();
-		$value=isset($values[$uniqueGroupName])?$values[$uniqueGroupName]:null;
+		$value=isset($values[$uniqueGroupName]) ? $values[$uniqueGroupName] : null;
 		if($value!==null && $value===$this->getValueAttribute())
 		{
 			if(!$this->getChecked())
@@ -134,7 +134,7 @@ 
 	 */
 	public function getGroupName()
 	{
-		return $this->getViewState('GroupName','');
+		return $this->getViewState('GroupName', '');
 	}
 
 	/**
@@ -145,7 +145,7 @@ 
 	 */
 	public function setGroupName($value)
 	{
-		$this->setViewState('GroupName',$value,'');
+		$this->setViewState('GroupName', $value, '');
 		$this->_uniqueGroupName=null;
 	}
 
@@ -154,7 +154,7 @@ 
 	 */
 	public function getUniqueGroupName()
 	{
-		if(($groupName=$this->getViewState('UniqueGroupName',''))!=='')
+		if(($groupName=$this->getViewState('UniqueGroupName', ''))!=='')
 			return $groupName;
 		else if(($uniqueID=$this->getUniqueID())!==$this->_previousUniqueID || $this->_uniqueGroupName===null)
 		{
@@ -162,12 +162,12 @@ 
 			$this->_previousUniqueID=$uniqueID;
 			if($uniqueID!=='')
 			{
-				if(($pos=strrpos($uniqueID,TControl::ID_SEPARATOR))!==false)
+				if(($pos=strrpos($uniqueID, TControl::ID_SEPARATOR))!==false)
 				{
 					if($groupName!=='')
-						$groupName=substr($uniqueID,0,$pos+1).$groupName;
+						$groupName=substr($uniqueID, 0, $pos + 1).$groupName;
 					else if(is_a($this->getNamingContainer(), 'TRadioButtonList'))
-						$groupName=substr($uniqueID,0,$pos);
+						$groupName=substr($uniqueID, 0, $pos);
 				}
 				if($groupName==='')
 					$groupName=$uniqueID;
@@ -195,7 +195,7 @@ 
 	 */
 	public function setUniqueGroupName($value)
 	{
-		$this->setViewState('UniqueGroupName',$value,'');
+		$this->setViewState('UniqueGroupName', $value, '');
 	}
 
 	/**
@@ -206,12 +206,12 @@ 
 	 */
 	public function getRadioButtonsInGroup()
 	{
-		$group = $this->getUniqueGroupName();
-		$buttons = array();
+		$group=$this->getUniqueGroupName();
+		$buttons=array();
 		foreach(self::$_activeButtons as $control)
 		{
-			if($control->getUniqueGroupName() === $group)
-				$buttons[] = $control;
+			if($control->getUniqueGroupName()===$group)
+				$buttons[]=$control;
 		}
 		return $buttons;
 	}
@@ -232,7 +232,7 @@ 
 	 */
 	public function getEnableClientScript()
 	{
-		return $this->getViewState('EnableClientScript',true);
+		return $this->getViewState('EnableClientScript', true);
 	}
 
 	/**
@@ -240,7 +240,7 @@ 
 	 */
 	public function setEnableClientScript($value)
 	{
-		$this->setViewState('EnableClientScript',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('EnableClientScript', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -249,19 +249,19 @@ 
 	 * @param string checkbox id
 	 * @param string onclick js
 	 */
-	protected function renderInputTag($writer,$clientID,$onclick)
+	protected function renderInputTag($writer, $clientID, $onclick)
 	{
 		if($clientID!=='')
-			$writer->addAttribute('id',$clientID);
-		$writer->addAttribute('type','radio');
-		$writer->addAttribute('name',$this->getUniqueGroupName());
-		$writer->addAttribute('value',$this->getValueAttribute());
+			$writer->addAttribute('id', $clientID);
+		$writer->addAttribute('type', 'radio');
+		$writer->addAttribute('name', $this->getUniqueGroupName());
+		$writer->addAttribute('value', $this->getValueAttribute());
 		if(!empty($onclick))
-			$writer->addAttribute('onclick',$onclick);
+			$writer->addAttribute('onclick', $onclick);
 		if($this->getChecked())
-			$writer->addAttribute('checked','checked');
+			$writer->addAttribute('checked', 'checked');
 		if(!$this->getEnabled(true))
-			$writer->addAttribute('disabled','disabled');
+			$writer->addAttribute('disabled', 'disabled');
 
 		$page=$this->getPage();
 		if($this->getEnabled(true)
@@ -273,10 +273,10 @@ 
 		}
 
 		if(($accesskey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accesskey);
-		if(($tabindex=$this->getTabIndex())>0)
-			$writer->addAttribute('tabindex',"$tabindex");
-		if($attributes=$this->getViewState('InputAttributes',null))
+			$writer->addAttribute('accesskey', $accesskey);
+		if(($tabindex=$this->getTabIndex()) > 0)
+			$writer->addAttribute('tabindex', "$tabindex");
+		if($attributes=$this->getViewState('InputAttributes', null))
 			$writer->addAttributes($attributes);
 		$writer->renderBeginTag('input');
 		$writer->renderEndTag();
@@ -287,8 +287,8 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$cs = $this->getPage()->getClientScript();
-		$cs->registerPostBackControl($this->getClientClassName(),$this->getPostBackOptions());
+		$cs=$this->getPage()->getClientScript();
+		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
 	/**

framework/Web/UI/WebControls/TBoundColumn.php

Braces +4 added lines, -8 removed lines

@@ -178,8 +178,7 @@ 
 						$control->setItemType($item->getItemType());
 					}
 					$cell->getControls()->add($control);
-				}
-				else
+				} else
 					$control=$cell;
 				$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
 				break;
@@ -196,15 +195,13 @@ 
 						}
 						$cell->getControls()->add($control);
 						$cell->registerObject('EditControl',$control);
-					}
-					else
+					} else
 					{
 						$control=Prado::createComponent('System.Web.UI.WebControls.TTextBox');
 						$cell->getControls()->add($control);
 						$cell->registerObject('TextBox',$control);
 					}
-				}
-				else
+				} else
 				{
 					if(($classPath=$this->getItemRenderer())!=='')
 					{
@@ -215,8 +212,7 @@ 
 							$control->setItemType($item->getItemType());
 						}
 						$cell->getControls()->add($control);
-					}
-					else
+					} else
 						$control=$cell;
 				}
 				$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));

Spacing +19 added lines, -19 removed lines

@@ -52,7 +52,7 @@ 
 	 */
 	public function getItemRenderer()
 	{
-		return $this->getViewState('ItemRenderer','');
+		return $this->getViewState('ItemRenderer', '');
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	 */
 	public function setItemRenderer($value)
 	{
-		$this->setViewState('ItemRenderer',$value,'');
+		$this->setViewState('ItemRenderer', $value, '');
 	}
 
 	/**
@@ -80,7 +80,7 @@ 
 	 */
 	public function getEditItemRenderer()
 	{
-		return $this->getViewState('EditItemRenderer','');
+		return $this->getViewState('EditItemRenderer', '');
 	}
 
 	/**
@@ -99,7 +99,7 @@ 
 	 */
 	public function setEditItemRenderer($value)
 	{
-		$this->setViewState('EditItemRenderer',$value,'');
+		$this->setViewState('EditItemRenderer', $value, '');
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 */
 	public function getDataField()
 	{
-		return $this->getViewState('DataField','');
+		return $this->getViewState('DataField', '');
 	}
 
 	/**
@@ -115,7 +115,7 @@ 
 	 */
 	public function setDataField($value)
 	{
-		$this->setViewState('DataField',$value,'');
+		$this->setViewState('DataField', $value, '');
 	}
 
 	/**
@@ -123,7 +123,7 @@ 
 	 */
 	public function getDataFormatString()
 	{
-		return $this->getViewState('DataFormatString','');
+		return $this->getViewState('DataFormatString', '');
 	}
 
 	/**
@@ -131,7 +131,7 @@ 
 	 */
 	public function setDataFormatString($value)
 	{
-		$this->setViewState('DataFormatString',$value,'');
+		$this->setViewState('DataFormatString', $value, '');
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	 */
 	public function getReadOnly()
 	{
-		return $this->getViewState('ReadOnly',false);
+		return $this->getViewState('ReadOnly', false);
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 	 */
 	public function setReadOnly($value)
 	{
-		$this->setViewState('ReadOnly',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ReadOnly', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -161,7 +161,7 @@ 
 	 * @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)
 	{
 		$item=$cell->getParent();
 		switch($itemType)
@@ -181,7 +181,7 @@ 
 				}
 				else
 					$control=$cell;
-				$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				$control->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 				break;
 			case TListItemType::EditItem:
 				if(!$this->getReadOnly())
@@ -195,13 +195,13 @@ 
 							$control->setItemType($item->getItemType());
 						}
 						$cell->getControls()->add($control);
-						$cell->registerObject('EditControl',$control);
+						$cell->registerObject('EditControl', $control);
 					}
 					else
 					{
 						$control=Prado::createComponent('System.Web.UI.WebControls.TTextBox');
 						$cell->getControls()->add($control);
-						$cell->registerObject('TextBox',$control);
+						$cell->registerObject('TextBox', $control);
 					}
 				}
 				else
@@ -219,10 +219,10 @@ 
 					else
 						$control=$cell;
 				}
-				$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				$control->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 				break;
 			default:
-				parent::initializeCell($cell,$columnIndex,$itemType);
+				parent::initializeCell($cell, $columnIndex, $itemType);
 				break;
 		}
 	}
@@ -232,15 +232,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);
 		$sender->setData($value);
 	}
 }

framework/Web/UI/WebControls/TCheckBoxColumn.php

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

Spacing +10 added lines, -10 removed lines

@@ -47,7 +47,7 @@ 
 	 */
 	public function getDataField()
 	{
-		return $this->getViewState('DataField','');
+		return $this->getViewState('DataField', '');
 	}
 
 	/**
@@ -55,7 +55,7 @@ 
 	 */
 	public function setDataField($value)
 	{
-		$this->setViewState('DataField',$value,'');
+		$this->setViewState('DataField', $value, '');
 	}
 
 	/**
@@ -63,7 +63,7 @@ 
 	 */
 	public function getReadOnly()
 	{
-		return $this->getViewState('ReadOnly',false);
+		return $this->getViewState('ReadOnly', false);
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	 */
 	public function setReadOnly($value)
 	{
-		$this->setViewState('ReadOnly',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ReadOnly', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	 * @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::SelectedItem || $itemType===TListItemType::EditItem)
 		{
@@ -93,12 +93,12 @@ 
 				$checkBox->setEnabled(false);
 			$cell->setHorizontalAlign('Center');
 			$cell->getControls()->add($checkBox);
-			$cell->registerObject('CheckBox',$checkBox);
+			$cell->registerObject('CheckBox', $checkBox);
 			if($this->getDataField()!=='')
-				$checkBox->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				$checkBox->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 		}
 		else
-			parent::initializeCell($cell,$columnIndex,$itemType);
+			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
 	/**
@@ -106,12 +106,12 @@ 
 	 * 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();
 		if(($field=$this->getDataField())!=='')
-			$value=TPropertyValue::ensureBoolean($this->getDataFieldValue($data,$field));
+			$value=TPropertyValue::ensureBoolean($this->getDataFieldValue($data, $field));
 		else
 			$value=TPropertyValue::ensureBoolean($data);
 		if($sender instanceof TCheckBox)

framework/Web/UI/WebControls/TDropDownListColumn.php

Braces +2 added lines, -4 removed lines

@@ -270,8 +270,7 @@ 
 					$cell->getControls()->add($listControl);
 					$cell->registerObject('DropDownList',$listControl);
 					$control=$listControl;
-				}
-				else
+				} else
 					$control=$cell;
 				$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
 				break;
@@ -307,8 +306,7 @@ 
 				$value=$text;
 			$formatString=$this->getDataTextFormatString();
 			$text=$this->formatDataValue($formatString,$text);
-		}
-		else
+		} else
 			$text=$value;
 		if($sender instanceof TTableCell)
 			$sender->setText($text);

Spacing +25 added lines, -25 removed lines

@@ -77,7 +77,7 @@ 
 		parent::loadState($state);
 		$this->_stateLoaded=true;
 		if(!$this->_dataBound)
-			$this->_listControl->getItems()->loadState($this->getViewState('Items',null));
+			$this->_listControl->getItems()->loadState($this->getViewState('Items', null));
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 	 */
 	public function saveState()
 	{
-		$this->setViewState('Items',$this->_listControl->getItems()->saveState(),null);
+		$this->setViewState('Items', $this->_listControl->getItems()->saveState(), null);
 		return parent::saveState();
 	}
 
@@ -111,7 +111,7 @@ 
 	 */
 	public function getDataTextField()
 	{
-		return $this->getViewState('DataTextField','');
+		return $this->getViewState('DataTextField', '');
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function setDataTextField($value)
 	{
-		$this->setViewState('DataTextField',$value,'');
+		$this->setViewState('DataTextField', $value, '');
 	}
 
 	/**
@@ -130,7 +130,7 @@ 
 	 */
 	public function getDataTextFormatString()
 	{
-		return $this->getViewState('DataTextFormatString','');
+		return $this->getViewState('DataTextFormatString', '');
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 	 */
 	public function setDataTextFormatString($value)
 	{
-		$this->setViewState('DataTextFormatString',$value,'');
+		$this->setViewState('DataTextFormatString', $value, '');
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	public function getDataValueField()
 	{
-		return $this->getViewState('DataValueField','');
+		return $this->getViewState('DataValueField', '');
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function setDataValueField($value)
 	{
-		$this->setViewState('DataValueField',$value,'');
+		$this->setViewState('DataValueField', $value, '');
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	 */
 	public function getReadOnly()
 	{
-		return $this->getViewState('ReadOnly',false);
+		return $this->getViewState('ReadOnly', false);
 	}
 
 	/**
@@ -173,7 +173,7 @@ 
 	 */
 	public function setReadOnly($value)
 	{
-		$this->setViewState('ReadOnly',TPropertyValue::ensureBoolean($value),false);
+		$this->setViewState('ReadOnly', TPropertyValue::ensureBoolean($value), false);
 	}
 
 	/**
@@ -197,7 +197,7 @@ 
 	 */
 	public function getListValueField()
 	{
-		return $this->getViewState('ListValueField','');
+		return $this->getViewState('ListValueField', '');
 	}
 
 	/**
@@ -205,7 +205,7 @@ 
 	 */
 	public function setListValueField($value)
 	{
-		$this->setViewState('ListValueField',$value,'');
+		$this->setViewState('ListValueField', $value, '');
 	}
 
 	/**
@@ -213,7 +213,7 @@ 
 	 */
 	public function getListTextField()
 	{
-		return $this->getViewState('ListTextField','');
+		return $this->getViewState('ListTextField', '');
 	}
 
 	/**
@@ -221,7 +221,7 @@ 
 	 */
 	public function setListTextField($value)
 	{
-		$this->setViewState('ListTextField',$value,'');
+		$this->setViewState('ListTextField', $value, '');
 	}
 
 	/**
@@ -229,7 +229,7 @@ 
 	 */
 	public function getListTextFormatString()
 	{
-		return $this->getViewState('ListTextFormatString','');
+		return $this->getViewState('ListTextFormatString', '');
 	}
 
 	/**
@@ -237,7 +237,7 @@ 
 	 */
 	public function setListTextFormatString($value)
 	{
-		$this->setViewState('ListTextFormatString',$value,'');
+		$this->setViewState('ListTextFormatString', $value, '');
 	}
 
 	/**
@@ -251,7 +251,7 @@ 
 	 * @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(!$this->_dataBound && $this->_listControl->getDataSource()!==null)
 		{
@@ -268,21 +268,21 @@ 
 				{
 					$listControl=clone $this->_listControl;
 					$cell->getControls()->add($listControl);
-					$cell->registerObject('DropDownList',$listControl);
+					$cell->registerObject('DropDownList', $listControl);
 					$control=$listControl;
 				}
 				else
 					$control=$cell;
-				$control->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+				$control->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 				break;
 			case TListItemType::Item:
 			case TListItemType::AlternatingItem:
 			case TListItemType::SelectedItem:
 				if($this->getDataTextField()!=='' || $this->getDataValueField()!=='')
-					$cell->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
+					$cell->attachEventHandler('OnDataBinding', array($this, 'dataBindColumn'));
 				break;
 			default:
-				parent::initializeCell($cell,$columnIndex,$itemType);
+				parent::initializeCell($cell, $columnIndex, $itemType);
 				break;
 		}
 	}
@@ -292,21 +292,21 @@ 
 	 * 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();
 		if(($valueField=$this->getDataValueField())!=='')
-			$value=$this->getDataFieldValue($data,$valueField);
+			$value=$this->getDataFieldValue($data, $valueField);
 		else
 			$value='';
 		if(($textField=$this->getDataTextField())!=='')
 		{
-			$text=$this->getDataFieldValue($data,$textField);
+			$text=$this->getDataFieldValue($data, $textField);
 			if($valueField==='')
 				$value=$text;
 			$formatString=$this->getDataTextFormatString();
-			$text=$this->formatDataValue($formatString,$text);
+			$text=$this->formatDataValue($formatString, $text);
 		}
 		else
 			$text=$value;

framework/Web/UI/WebControls/TRegularExpressionValidator.php

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

Spacing +6 added lines, -6 removed lines

@@ -62,7 +62,7 @@ 
 	 */
 	public function getRegularExpression()
 	{
-		return $this->getViewState('RegularExpression','');
+		return $this->getViewState('RegularExpression', '');
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 	 */
 	public function setRegularExpression($value)
 	{
-		$this->setViewState('RegularExpression',$value,'');
+		$this->setViewState('RegularExpression', $value, '');
 	}
 
 	/**
@@ -84,10 +84,10 @@ 
 	{
 		if(($value=$this->getValidationValue($this->getValidationTarget()))==='')
 			return true;
-		if(($expression=addcslashes($this->getRegularExpression(),"/"))!=='')
+		if(($expression=addcslashes($this->getRegularExpression(), "/"))!=='')
 		{
-			$mods = $this->getPatternModifiers();
-			return preg_match("/^$expression\$/{$mods}",$value);
+			$mods=$this->getPatternModifiers();
+			return preg_match("/^$expression\$/{$mods}", $value);
 		}
 		else
 			return true;
@@ -133,7 +133,7 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options = parent::getClientScriptOptions();
+		$options=parent::getClientScriptOptions();
 		$options['ValidationExpression']=$this->getRegularExpression();
 		$options['PatternModifiers']=$this->getClientSidePatternModifiers();
 		return $options;

framework/Web/UI/WebControls/TLiteralColumn.php

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

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/TConditional.php

Braces +2 added lines, -4 removed lines

@@ -73,8 +73,7 @@ 
 		try
 		{
 			$result=$this->getTemplateControl()->evaluateExpression($this->_condition);
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TInvalidDataValueException('conditional_condition_invalid',$this->_condition,$e->getMessage());
 		}
@@ -82,8 +81,7 @@ 
 		{
 			if($this->_trueTemplate)
 				$this->_trueTemplate->instantiateIn($this->getTemplateControl(),$this);
-		}
-		else if($this->_falseTemplate)
+		} else if($this->_falseTemplate)
 			$this->_falseTemplate->instantiateIn($this->getTemplateControl(),$this);
 		$this->_creatingChildren=false;
 	}

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/TRepeaterItemRenderer.php

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

Spacing +2 added lines, -2 removed lines

@@ -34,11 +34,11 @@
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		if($param instanceof TCommandEventParameter)
 		{
-			$this->raiseBubbleEvent($this,new TRepeaterCommandEventParameter($this,$sender,$param));
+			$this->raiseBubbleEvent($this, new TRepeaterCommandEventParameter($this, $sender, $param));
 			return true;
 		}
 		else