pradosoft / prado

framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.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 +16 added lines, -16 removed lines

@@ -33,7 +33,7 @@ 
 			case 'datetime': case 'timestamp':
 				return $this->createDateTimeControl($container, $column, $record);
 			default:
-				return $this->createDefaultControl($container,$column, $record);
+				return $this->createDefaultControl($container, $column, $record);
 		}
 	}
 
@@ -50,16 +50,16 @@ 
 			case 'time':
 				return $this->getTimeValue($container, $column, $record);
 			case 'datetime': case 'timestamp':
-				return $this->getDateTimeValue($container,$column, $record);
+				return $this->getDateTimeValue($container, $column, $record);
 			default:
-				return $this->getDefaultControlValue($container,$column, $record);
+				return $this->getDefaultControlValue($container, $column, $record);
 		}
 	}
 
 	protected function createDateControl($container, $column, $record)
 	{
-		$control = parent::createDateControl($container, $column, $record);
-		$value = $this->getRecordPropertyValue($column, $record);
+		$control=parent::createDateControl($container, $column, $record);
+		$value=$this->getRecordPropertyValue($column, $record);
 		if(!empty($value) && preg_match('/timestamp/i', $column->getDbType()))
 			$control->setTimestamp(intval($value));
 		return $control;
@@ -67,12 +67,12 @@ 
 
 	protected function createDateTimeControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$time = parent::createDateTimeControl($container, $column, $record);
+		$value=$this->getRecordPropertyValue($column, $record);
+		$time=parent::createDateTimeControl($container, $column, $record);
 		if(!empty($value) && preg_match('/timestamp/i', $column->getDbType()))
 		{
-			$s = Prado::createComponent('System.Util.TDateTimeStamp');
-			$date = $s->getDate(intval($value));
+			$s=Prado::createComponent('System.Util.TDateTimeStamp');
+			$date=$s->getDate(intval($value));
 			$time[1]->setSelectedValue($date['hours']);
 			$time[2]->setSelectedValue($date['minutes']);
 			$time[3]->setSelectedValue($date['seconds']);
@@ -84,13 +84,13 @@ 
 	{
 		if(preg_match('/timestamp/i', $column->getDbType()))
 		{
-			$time = $container->findControl(self::DEFAULT_ID)->getTimestamp();
-			$s = Prado::createComponent('System.Util.TDateTimeStamp');
-			$date = $s->getDate($time);
-			$hour = $container->findControl('scaffold_time_hour')->getSelectedValue();
-			$mins = $container->findControl('scaffold_time_min')->getSelectedValue();
-			$secs = $container->findControl('scaffold_time_sec')->getSelectedValue();
-			return $s->getTimeStamp($hour,$mins,$secs,$date['mon'],$date['mday'],$date['year']);
+			$time=$container->findControl(self::DEFAULT_ID)->getTimestamp();
+			$s=Prado::createComponent('System.Util.TDateTimeStamp');
+			$date=$s->getDate($time);
+			$hour=$container->findControl('scaffold_time_hour')->getSelectedValue();
+			$mins=$container->findControl('scaffold_time_min')->getSelectedValue();
+			$secs=$container->findControl('scaffold_time_sec')->getSelectedValue();
+			return $s->getTimeStamp($hour, $mins, $secs, $date['mon'], $date['mday'], $date['year']);
 		}
 		else
 			return parent::getDateTimeValue($container, $column, $record);

framework/Data/SqlMap/DataMapper/TPropertyAccess.php

Braces +6 added lines, -12 removed lines

@@ -61,8 +61,7 @@ 
 					$object = $object[$prop];
 				else
 					throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
-			}
-			else if(is_object($object))
+			} else if(is_object($object))
 			{
 				$getter = 'get'.$prop;
 				if(method_exists($object, $getter) && is_callable(array($object, $getter)))
@@ -73,8 +72,7 @@ 
 					$object = $object->{$prop};
 				else
 					throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
-			}
-			else
+			} else
 				throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
 		}
 		return $object;
@@ -98,8 +96,7 @@ 
 					$object = $object[$prop];
 				else
 					return false;
-			}
-			else if(is_object($object))
+			} else if(is_object($object))
 			{
 				$getter = 'get'.$prop;
 				if(method_exists($object, $getter) && is_callable(array($object, $getter)))
@@ -110,8 +107,7 @@ 
 					$object = $object->{$prop};
 				else
 					return false;
-			}
-			else
+			} else
 				return false;
 		}
 		return true;
@@ -136,16 +132,14 @@ 
 		if(is_array($object) || $object instanceof ArrayAccess)
 		{
 			$object[$prop] = $value;
-		}
-		else if(is_object($object))
+		} else if(is_object($object))
 		{
 			$setter = 'set'.$prop;
 			if (method_exists($object, $setter) && is_callable(array($object, $setter)))
 				$object->{$setter}($value);
 			else
 				$object->{$prop} = $value;
-		}
-		else
+		} else
 			throw new TInvalidPropertyException('sqlmap_invalid_property_type',$path);
 	}
 

Spacing +25 added lines, -25 removed lines

@@ -48,34 +48,34 @@ 
 	 * @return mixed property value.
 	 * @throws TInvalidDataValueException if property path is invalid.
 	 */
-	public static function get($object,$path)
+	public static function get($object, $path)
 	{
 		if(!is_array($object) && !is_object($object))
 			return $object;
-		$properties = explode('.', $path);
+		$properties=explode('.', $path);
 		foreach($properties as $prop)
 		{
 			if(is_array($object) || $object instanceof ArrayAccess)
 			{
 				if(array_key_exists($prop, $object))
-					$object = $object[$prop];
+					$object=$object[$prop];
 				else
-					throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
+					throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
 			}
 			else if(is_object($object))
 			{
-				$getter = 'get'.$prop;
+				$getter='get'.$prop;
 				if(method_exists($object, $getter) && is_callable(array($object, $getter)))
-					$object = $object->{$getter}();
+					$object=$object->{$getter}();
 				else if(in_array($prop, array_keys(get_object_vars($object))))
-					$object = $object->{$prop};
+					$object=$object->{$prop};
 				elseif(method_exists($object, '__get') && is_callable(array($object, '__get')))
-					$object = $object->{$prop};
+					$object=$object->{$prop};
 				else
-					throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
+					throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
 			}
 			else
-				throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
+				throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
 		}
 		return $object;
 	}
@@ -89,25 +89,25 @@ 
 	{
 		if(!is_array($object) && !is_object($object))
 			return false;
-		$properties = explode('.', $path);
+		$properties=explode('.', $path);
 		foreach($properties as $prop)
 		{
 			if(is_array($object) || $object instanceof ArrayAccess)
 			{
 				if(array_key_exists($prop, $object))
-					$object = $object[$prop];
+					$object=$object[$prop];
 				else
 					return false;
 			}
 			else if(is_object($object))
 			{
-				$getter = 'get'.$prop;
+				$getter='get'.$prop;
 				if(method_exists($object, $getter) && is_callable(array($object, $getter)))
-					$object = $object->{$getter}();
+					$object=$object->{$getter}();
 				else if(in_array($prop, array_keys(get_object_vars($object))))
-					$object = $object->{$prop};
+					$object=$object->{$prop};
 				elseif(method_exists($object, '__get') && is_callable(array($object, '__get')))
-					$object = $object->{$prop};
+					$object=$object->{$prop};
 				else
 					return false;
 			}
@@ -126,27 +126,27 @@ 
 	 */
 	public static function set(&$originalObject, $path, $value)
 	{
-		$properties = explode('.', $path);
-		$prop = array_pop($properties);
+		$properties=explode('.', $path);
+		$prop=array_pop($properties);
 		if(count($properties) > 0)
-			$object = self::get($originalObject, implode('.',$properties));
+			$object=self::get($originalObject, implode('.', $properties));
 		else
-			$object = &$originalObject;
+			$object=&$originalObject;
 
 		if(is_array($object) || $object instanceof ArrayAccess)
 		{
-			$object[$prop] = $value;
+			$object[$prop]=$value;
 		}
 		else if(is_object($object))
 		{
-			$setter = 'set'.$prop;
-			if (method_exists($object, $setter) && is_callable(array($object, $setter)))
+			$setter='set'.$prop;
+			if(method_exists($object, $setter) && is_callable(array($object, $setter)))
 				$object->{$setter}($value);
 			else
-				$object->{$prop} = $value;
+				$object->{$prop}=$value;
 		}
 		else
-			throw new TInvalidPropertyException('sqlmap_invalid_property_type',$path);
+			throw new TInvalidPropertyException('sqlmap_invalid_property_type', $path);
 	}
 
 }

framework/Data/SqlMap/Configuration/TResultMap.php

Braces +1 added lines, -2 removed lines

@@ -164,8 +164,7 @@
 				return $handler->createNewInstance();
 			else
 				return $registry->createInstanceOf($this->getClass());
-		}
-		catch (TSqlMapException $e)
+		} catch (TSqlMapException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_create_new_instance',

Spacing +15 added lines, -15 removed lines

@@ -81,7 +81,7 @@ 
 	 */
 	public function setClass($value)
 	{
-		$this->_class = $value;
+		$this->_class=$value;
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function setExtends($value)
 	{
-		$this->_extends = $value;
+		$this->_extends=$value;
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 */
 	public function setGroupBy($value)
 	{
-		$this->_groupBy = $value;
+		$this->_groupBy=$value;
 	}
 
 	/**
@@ -137,7 +137,7 @@ 
 	 */
 	public function setDiscriminator(TDiscriminator $value)
 	{
-		$this->_discriminator = $value;
+		$this->_discriminator=$value;
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	public function addResultProperty(TResultProperty $property)
 	{
-		$this->_columns[$property->getProperty()] = $property;
+		$this->_columns[$property->getProperty()]=$property;
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function createInstanceOfResult($registry)
 	{
-		$handler = $registry->getTypeHandler($this->getClass());
+		$handler=$registry->getTypeHandler($this->getClass());
 		try
 		{
 			if($handler!==null)
@@ -165,7 +165,7 @@ 
 			else
 				return $registry->createInstanceOf($this->getClass());
 		}
-		catch (TSqlMapException $e)
+		catch(TSqlMapException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_create_new_instance',
@@ -179,18 +179,18 @@ 
 	 * @param array row data.
 	 * @return TResultMap result sub-map.
 	 */
-	public function resolveSubMap($registry,$row)
+	public function resolveSubMap($registry, $row)
 	{
-		$subMap = $this;
-		if(($disc = $this->getDiscriminator())!==null)
+		$subMap=$this;
+		if(($disc=$this->getDiscriminator())!==null)
 		{
-			$value = $disc->getMapping()->getPropertyValue($registry,$row);
-			$subMap = $disc->getSubMap((string)$value);
+			$value=$disc->getMapping()->getPropertyValue($registry, $row);
+			$subMap=$disc->getSubMap((string) $value);
 
 			if($subMap===null)
-				$subMap = $this;
-			else if($subMap !== $this)
-				$subMap = $subMap->resolveSubMap($registry,$row);
+				$subMap=$this;
+			else if($subMap!==$this)
+				$subMap=$subMap->resolveSubMap($registry, $row);
 		}
 		return $subMap;
 	}

framework/Data/Common/Sqlite/TSqliteCommandBuilder.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 +4 added lines, -4 removed lines

@@ -30,12 +30,12 @@
 	 */
 	public function applyLimitOffset($sql, $limit=-1, $offset=-1)
 	{
-		$limit = $limit!==null ? intval($limit) : -1;
-		$offset = $offset!==null ? intval($offset) : -1;
+		$limit=$limit!==null ? intval($limit) : -1;
+		$offset=$offset!==null ? intval($offset) : -1;
 		if($limit > 0 || $offset > 0)
 		{
-			$limitStr = ' LIMIT '.$limit;
-			$offsetStr = $offset >= 0 ? ' OFFSET '.$offset : '';
+			$limitStr=' LIMIT '.$limit;
+			$offsetStr=$offset >= 0 ? ' OFFSET '.$offset : '';
 			return $sql.$limitStr.$offsetStr;
 		}
 		else

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TSqliteCommandBuilder class file.
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2016 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Data.Common
- */
+	 * TSqliteCommandBuilder class file.
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2016 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Data.Common
+	 */
 
 Prado::using('System.Data.Common.TDbCommandBuilder');
 

framework/Caching/TDbCache.php

Braces +10 added lines, -20 removed lines

@@ -199,8 +199,7 @@ 
 				$this -> _createCheck = true;
 				$this -> getApplication() -> setGlobalState($key, time());
 			}
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			// DB table not exists
 			if($this->_autoCreate)
@@ -223,8 +222,7 @@ 
 
 				$this -> _createCheck = true;
 				$this -> getApplication() -> setGlobalState($key, time());
-			}
-			else
+			} else
 				throw new TConfigurationException('db_cachetable_inexistent',$this->_cacheTable);
 		}
 		$this->_cacheInitialized = true;
@@ -293,8 +291,7 @@ 
 				return $config->getDbConnection();
 			else
 				throw new TConfigurationException('dbcache_connectionid_invalid',$this->_connID);
-		}
-		else
+		} else
 		{
 			$db=new TDbConnection;
 			if($this->_connectionString!=='')
@@ -304,8 +301,7 @@ 
 					$db->setUsername($this->_username);
 				if($this->_password!=='')
 					$db->setPassword($this->_password);
-			}
-			else
+			} else
 			{
 				// default to SQLite3 database
 				$dbFile=$this->getApplication()->getRuntimePath().'/sqlite3.cache';
@@ -462,8 +458,7 @@ 
 			$sql='SELECT value FROM '.$this->_cacheTable.' WHERE itemkey=\''.$key.'\' AND (expire=0 OR expire>'.time().') ORDER BY expire DESC';
 			$command=$this->getDbConnection()->createCommand($sql);
 			return unserialize($command->queryScalar());
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$this->initializeCache(true);
 			return unserialize($command->queryScalar());
@@ -506,16 +501,14 @@ 
 			$command->bindValue(':value',serialize($value),PDO::PARAM_LOB);
 			$command->execute();
 			return true;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			try
 			{
 				$this->initializeCache(true);
 				$command->execute();
 				return true;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				return false;
 			}
@@ -537,8 +530,7 @@ 
 			$command->bindValue(':key',$key,PDO::PARAM_STR);
 			$command->execute();
 			return true;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$this->initializeCache(true);
 			$command->execute();
@@ -557,16 +549,14 @@ 
 		{
 			$command = $this->getDbConnection()->createCommand("DELETE FROM {$this->_cacheTable}");
 			$command->execute();
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			try
 			{
 				$this->initializeCache(true);
 				$command->execute();
 				return true;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				return false;
 			}

Spacing +28 added lines, -28 removed lines

@@ -105,11 +105,11 @@ 
 	/**
 	 * @var boolean
 	 */
-	private $_cacheInitialized = false;
+	private $_cacheInitialized=false;
 	/**
 	 * @var boolean
 	 */
-	private $_createCheck= false;
+	private $_createCheck=false;
 	/**
 	 * @var boolean whether the cache DB table should be created automatically
 	 */
@@ -183,20 +183,20 @@ 
 		$db=$this->getDbConnection();
 		try
 		{
-			$key = 'TDbCache:' . $this->_cacheTable . ':created';
+			$key='TDbCache:'.$this->_cacheTable.':created';
 			if($force)
-				$this -> _createCheck = false;
+				$this -> _createCheck=false;
 			else
-				$this -> _createCheck = $this -> getApplication() -> getGlobalState($key, 0);
+				$this -> _createCheck=$this -> getApplication() -> getGlobalState($key, 0);
 
 			if($this->_autoCreate && !$this -> _createCheck) {
 
-				Prado::trace(($force ? 'Force initializing: ' : 'Initializing: ') . $this -> id . ', ' . $this->_cacheTable, 'System.Caching.TDbCache');
+				Prado::trace(($force ? 'Force initializing: ' : 'Initializing: ').$this -> id.', '.$this->_cacheTable, 'System.Caching.TDbCache');
 
 				$sql='SELECT 1 FROM '.$this->_cacheTable.' WHERE 0=1';
 				$db->createCommand($sql)->queryScalar();
 
-				$this -> _createCheck = true;
+				$this -> _createCheck=true;
 				$this -> getApplication() -> setGlobalState($key, time());
 			}
 		}
@@ -205,7 +205,7 @@ 
 			// DB table not exists
 			if($this->_autoCreate)
 			{
-				Prado::trace('Autocreate: ' . $this->_cacheTable, 'System.Caching.TDbCache');
+				Prado::trace('Autocreate: '.$this->_cacheTable, 'System.Caching.TDbCache');
 
 				$driver=$db->getDriverName();
 				if($driver==='mysql')
@@ -218,16 +218,16 @@ 
 				$sql='CREATE TABLE '.$this->_cacheTable." (itemkey CHAR(128) PRIMARY KEY, value $blob, expire INTEGER)";
 				$db->createCommand($sql)->execute();
 
-				$sql='CREATE INDEX IX_expire ON ' . $this->_cacheTable . ' (expire)';
+				$sql='CREATE INDEX IX_expire ON '.$this->_cacheTable.' (expire)';
 				$db->createCommand($sql)->execute();
 
-				$this -> _createCheck = true;
+				$this -> _createCheck=true;
 				$this -> getApplication() -> setGlobalState($key, time());
 			}
 			else
-				throw new TConfigurationException('db_cachetable_inexistent',$this->_cacheTable);
+				throw new TConfigurationException('db_cachetable_inexistent', $this->_cacheTable);
 		}
-		$this->_cacheInitialized = true;
+		$this->_cacheInitialized=true;
 	}
 
 	/**
@@ -238,17 +238,17 @@ 
 	 */
 	public function flushCacheExpired($force=false)
 	{
-		$interval = $this -> getFlushInterval();
-		if(!$force && $interval === 0) return;
+		$interval=$this -> getFlushInterval();
+		if(!$force && $interval===0) return;
 
-		$key	= 'TDbCache:' . $this->_cacheTable . ':flushed';
-		$now	= time();
-		$next	= $interval + (integer)$this -> getApplication() -> getGlobalState($key, 0);
+		$key='TDbCache:'.$this->_cacheTable.':flushed';
+		$now=time();
+		$next=$interval + (integer) $this -> getApplication() -> getGlobalState($key, 0);
 
 		if($force || $next <= $now)
 		{
 			if(!$this->_cacheInitialized) $this->initializeCache();
-			Prado::trace(($force ? 'Force flush of expired items: ' : 'Flush expired items: ') . $this -> id . ', ' . $this->_cacheTable, 'System.Caching.TDbCache');
+			Prado::trace(($force ? 'Force flush of expired items: ' : 'Flush expired items: ').$this -> id.', '.$this->_cacheTable, 'System.Caching.TDbCache');
 			$sql='DELETE FROM '.$this->_cacheTable.' WHERE expire<>0 AND expire<'.$now;
 			$this->getDbConnection()->createCommand($sql)->execute();
 			$this -> getApplication() -> setGlobalState($key, $now);
@@ -275,7 +275,7 @@ 
 	 */
 	public function setFlushInterval($value)
 	{
-		$this->_flushInterval = (integer) $value;
+		$this->_flushInterval=(integer) $value;
 	}
 
 	/**
@@ -292,7 +292,7 @@ 
 			if($config instanceof TDataSourceConfig)
 				return $config->getDbConnection();
 			else
-				throw new TConfigurationException('dbcache_connectionid_invalid',$this->_connID);
+				throw new TConfigurationException('dbcache_connectionid_invalid', $this->_connID);
 		}
 		else
 		{
@@ -479,10 +479,10 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	protected function setValue($key,$value,$expire)
+	protected function setValue($key, $value, $expire)
 	{
 		$this->deleteValue($key);
-		return $this->addValue($key,$value,$expire);
+		return $this->addValue($key, $value, $expire);
 	}
 
 	/**
@@ -494,16 +494,16 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	protected function addValue($key,$value,$expire)
+	protected function addValue($key, $value, $expire)
 	{
 		if(!$this->_cacheInitialized) $this->initializeCache();
-		$expire=($expire<=0)?0:time()+$expire;
+		$expire=($expire <= 0) ? 0 : time() + $expire;
 		$sql="INSERT INTO {$this->_cacheTable} (itemkey,value,expire) VALUES(:key,:value,$expire)";
 		try
 		{
 			$command=$this->getDbConnection()->createCommand($sql);
-			$command->bindValue(':key',$key,PDO::PARAM_STR);
-			$command->bindValue(':value',serialize($value),PDO::PARAM_LOB);
+			$command->bindValue(':key', $key, PDO::PARAM_STR);
+			$command->bindValue(':value', serialize($value), PDO::PARAM_LOB);
 			$command->execute();
 			return true;
 		}
@@ -534,7 +534,7 @@ 
 		try
 		{
 			$command=$this->getDbConnection()->createCommand("DELETE FROM {$this->_cacheTable} WHERE itemkey=:key");
-			$command->bindValue(':key',$key,PDO::PARAM_STR);
+			$command->bindValue(':key', $key, PDO::PARAM_STR);
 			$command->execute();
 			return true;
 		}
@@ -555,7 +555,7 @@ 
 		if(!$this->_cacheInitialized) $this->initializeCache();
 		try
 		{
-			$command = $this->getDbConnection()->createCommand("DELETE FROM {$this->_cacheTable}");
+			$command=$this->getDbConnection()->createCommand("DELETE FROM {$this->_cacheTable}");
 			$command->execute();
 		}
 		catch(Exception $e)

framework/Security/TUserManager.php

Braces +3 added lines, -6 removed lines

@@ -113,8 +113,7 @@ 
 			{
 				$userFile = include $this->_userFile;
 				$this->loadUserDataFromPhp($userFile);
-			}
-			else
+			} else
 			{
 				$dom=new TXmlDocument;
 				$dom->loadFromFile($this->_userFile);
@@ -310,8 +309,7 @@ 
 			$user=new TUser($this);
 			$user->setIsGuest(true);
 			return $user;
-		}
-		else
+		} else
 		{
 			$username=strtolower($username);
 			if(isset($this->_users[$username]))
@@ -322,8 +320,7 @@ 
 				if(isset($this->_roles[$username]))
 					$user->setRoles($this->_roles[$username]);
 				return $user;
-			}
-			else
+			} else
 				return null;
 		}
 	}

Spacing +17 added lines, -17 removed lines

@@ -111,7 +111,7 @@ 
 		{
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 			{
-				$userFile = include $this->_userFile;
+				$userFile=include $this->_userFile;
 				$this->loadUserDataFromPhp($userFile);
 			}
 			else
@@ -146,13 +146,13 @@ 
 		{
 			foreach($config['users'] as $user)
 			{
-				$name = trim(strtolower(isset($user['name'])?$user['name']:''));
-				$password = isset($user['password'])?$user['password']:'';
-				$this->_users[$name] = $password;
-				$roles = isset($user['roles'])?$user['roles']:'';
+				$name=trim(strtolower(isset($user['name']) ? $user['name'] : ''));
+				$password=isset($user['password']) ? $user['password'] : '';
+				$this->_users[$name]=$password;
+				$roles=isset($user['roles']) ? $user['roles'] : '';
 				if($roles!=='')
 				{
-					foreach(explode(',',$roles) as $role)
+					foreach(explode(',', $roles) as $role)
 					{
 						if(($role=trim($role))!=='')
 							$this->_roles[$name][]=$role;
@@ -164,9 +164,9 @@ 
 		{
 			foreach($config['roles'] as $role)
 			{
-				$name = isset($role['name'])?$role['name']:'';
-				$users = isset($role['users'])?$role['users']:'';
-				foreach(explode(',',$users) as $user)
+				$name=isset($role['name']) ? $role['name'] : '';
+				$users=isset($role['users']) ? $role['users'] : '';
+				foreach(explode(',', $users) as $user)
 				{
 					if(($user=trim($user))!=='')
 						$this->_roles[strtolower($user)][]=$name;
@@ -187,7 +187,7 @@ 
 			$this->_users[$name]=$node->getAttribute('password');
 			if(($roles=trim($node->getAttribute('roles')))!=='')
 			{
-				foreach(explode(',',$roles) as $role)
+				foreach(explode(',', $roles) as $role)
 				{
 					if(($role=trim($role))!=='')
 						$this->_roles[$name][]=$role;
@@ -196,7 +196,7 @@ 
 		}
 		foreach($xmlNode->getElementsByTagName('role') as $node)
 		{
-			foreach(explode(',',$node->getAttribute('users')) as $user)
+			foreach(explode(',', $node->getAttribute('users')) as $user)
 			{
 				if(($user=trim($user))!=='')
 					$this->_roles[strtolower($user)][]=$node->getAttribute('name');
@@ -246,8 +246,8 @@ 
 	{
 		if($this->_initialized)
 			throw new TInvalidOperationException('usermanager_userfile_unchangeable');
-		else if(($this->_userFile=Prado::getPathOfNamespace($value,self::USER_FILE_EXT))===null || !is_file($this->_userFile))
-			throw new TConfigurationException('usermanager_userfile_invalid',$value);
+		else if(($this->_userFile=Prado::getPathOfNamespace($value, self::USER_FILE_EXT))===null || !is_file($this->_userFile))
+			throw new TConfigurationException('usermanager_userfile_invalid', $value);
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
 	 */
 	public function setPasswordMode($value)
 	{
-		$this->_passwordMode=TPropertyValue::ensureEnum($value,'TUserManagerPasswordMode');
+		$this->_passwordMode=TPropertyValue::ensureEnum($value, 'TUserManagerPasswordMode');
 	}
 
 	/**
@@ -288,7 +288,7 @@ 
 	 * @param string password
 	 * @return boolean true if validation is successful, false otherwise.
 	 */
-	public function validateUser($username,$password)
+	public function validateUser($username, $password)
 	{
 		if($this->_passwordMode===TUserManagerPasswordMode::MD5)
 			$password=md5($password);
@@ -341,7 +341,7 @@ 
 			$data=unserialize($data);
 			if(is_array($data) && count($data)===2)
 			{
-				list($username,$token)=$data;
+				list($username, $token)=$data;
 				if(isset($this->_users[$username]) && $token===md5($username.$this->_users[$username]))
 					return $this->getUser($username);
 			}
@@ -360,7 +360,7 @@ 
 		$username=strtolower($user->getName());
 		if(isset($this->_users[$username]))
 		{
-			$data=array($username,md5($username.$this->_users[$username]));
+			$data=array($username, md5($username.$this->_users[$username]));
 			$cookie->setValue(serialize($data));
 		}
 	}

framework/I18N/TDateFormat.php

Braces +1 added lines, -2 removed lines

@@ -112,8 +112,7 @@
 			&& strlen($datetime[1]) == 1)
 		{
 			$pattern = $datetime;
-		}
-		else //no subpattern, try the presets
+		} else //no subpattern, try the presets
 			$pattern = $this->getPreset($string);
 
 		//no presets found, use the string as the pattern

Spacing +35 added lines, -35 removed lines

@@ -70,11 +70,11 @@ 
 	 * A set of pattern presets and their respective formatting shorthand.
 	 * @var array
 	 */
-	static private $_patternPresets = array(
-			'fulldate'=>'P','full'=>'P',
-			'longdate'=>'D','long'=>'d',
-			'mediumdate'=>'p','medium'=>'p',
-			'shortdate'=>'d','short'=>'d',
+	static private $_patternPresets=array(
+			'fulldate'=>'P', 'full'=>'P',
+			'longdate'=>'D', 'long'=>'d',
+			'mediumdate'=>'p', 'medium'=>'p',
+			'shortdate'=>'d', 'short'=>'d',
 			'fulltime'=>'Q', 'longtime'=>'T',
 			'mediumtime'=>'q', 'shorttime'=>'t');
 
@@ -84,7 +84,7 @@ 
 	 */
 	public function setPattern($value)
 	{
-		$this->setViewState('Pattern',$value,'');
+		$this->setViewState('Pattern', $value, '');
 	}
 
 	/**
@@ -93,35 +93,35 @@ 
 	 */
 	public function getPattern()
 	{
-		$string = $this->getViewState('Pattern','');
+		$string=$this->getViewState('Pattern', '');
 
-		$pattern = null;
+		$pattern=null;
 
 		//try the subpattern of "date time" presets
-		$subpatterns = explode(' ',$string,2);
-		$datetime = array();
+		$subpatterns=explode(' ', $string, 2);
+		$datetime=array();
 		if(count($subpatterns)==2)
 		{
-			$datetime[] = $this->getPreset($subpatterns[0]);
-			$datetime[] = $this->getPreset($subpatterns[1]);
+			$datetime[]=$this->getPreset($subpatterns[0]);
+			$datetime[]=$this->getPreset($subpatterns[1]);
 		}
 
 		//we have a good subpattern
-		if(count($datetime) == 2
-			&& strlen($datetime[0]) == 1
-			&& strlen($datetime[1]) == 1)
+		if(count($datetime)==2
+			&& strlen($datetime[0])==1
+			&& strlen($datetime[1])==1)
 		{
-			$pattern = $datetime;
+			$pattern=$datetime;
 		}
 		else //no subpattern, try the presets
-			$pattern = $this->getPreset($string);
+			$pattern=$this->getPreset($string);
 
 		//no presets found, use the string as the pattern
 		//and let the DateFormat handle it.
 		if($pattern===null)
-			$pattern = $string;
-		if (!is_array($pattern) && strlen($pattern) == 0)
-			$pattern = null;
+			$pattern=$string;
+		if(!is_array($pattern) && strlen($pattern)==0)
+			$pattern=null;
 		return $pattern;
 	}
 
@@ -132,10 +132,10 @@ 
 	 */
 	protected function getPreset($string)
 	{
-		$string = strtolower($string);
+		$string=strtolower($string);
 		foreach(self::$_patternPresets as $pattern => $preset)
 		{
-			if($string == $pattern)
+			if($string==$pattern)
 				return $preset;
 		}
 	}
@@ -146,10 +146,10 @@ 
 	 */
 	public function getValue()
 	{
-		$value = $this->getViewState('Value','');
+		$value=$this->getViewState('Value', '');
 		if(empty($value))
 		{
-			$defaultText = $this->getDefaultText();
+			$defaultText=$this->getDefaultText();
 			if(empty($defaultText))
 				return time();
 		}
@@ -162,7 +162,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->setViewState('Value',$value,'');
+		$this->setViewState('Value', $value, '');
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 */
 	public function getDefaultText()
 	{
-		return $this->getViewState('DefaultText','');
+		return $this->getViewState('DefaultText', '');
 	}
 
 	/**
@@ -180,7 +180,7 @@ 
 	 */
 	public function setDefaultText($value)
 	{
-		$this->setViewState('DefaultText',$value,'');
+		$this->setViewState('DefaultText', $value, '');
 	}
 
 	/**
@@ -217,29 +217,29 @@ 
 	 */
 	protected function getFormattedDate()
 	{
-		$value = $this->getValue();
-		$defaultText = $this->getDefaultText();
+		$value=$this->getValue();
+		$defaultText=$this->getDefaultText();
 		if(empty($value) && !empty($defaultText))
 			return $this->getDefaultText();
 
-		$app = $this->getApplication()->getGlobalization();
+		$app=$this->getApplication()->getGlobalization();
 
 		//initialized the default class wide formatter
 		if(self::$formatter===null)
-			self::$formatter = new DateFormat($app->getCulture());
+			self::$formatter=new DateFormat($app->getCulture());
 
-		$culture = $this->getCulture();
+		$culture=$this->getCulture();
 
 		//return the specific cultural formatted date time
-		if(strlen($culture) && $app->getCulture() !== $culture)
+		if(strlen($culture) && $app->getCulture()!==$culture)
 		{
-			$formatter = new DateFormat($culture);
+			$formatter=new DateFormat($culture);
 			return $formatter->format($value,
 									  $this->getPattern(),
 									  $this->getCharset());
 		}
 		//return the application wide culture formatted date time.
-		$result = self::$formatter->format($value,
+		$result=self::$formatter->format($value,
 										$this->getPattern(),
 										$this->getCharset());
 		return $result;

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;
 	}

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