pradosoft / prado

framework/Data/SqlMap/Configuration/TParameterMap.php

Spacing +15 added lines, -15 removed lines

@@ -41,8 +41,8 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_properties = new TList;
-		$this->_propertyMap = new TMap;
+		$this->_properties=new TList;
+		$this->_propertyMap=new TMap;
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 	 */
 	public function setExtends($value)
 	{
-		$this->_extend = $value;
+		$this->_extend=$value;
 	}
 
 	/**
@@ -136,15 +136,15 @@ 
 	 */
 	public function getPropertyValue($registry, $property, $parameterValue)
 	{
-		$value = $this->getObjectValue($parameterValue,$property);
+		$value=$this->getObjectValue($parameterValue, $property);
 
 		if(($handler=$this->createTypeHandler($property, $registry))!==null)
-			$value = $handler->getParameter($value);
+			$value=$handler->getParameter($value);
 
-		$value = $this->nullifyDefaultValue($property,$value);
+		$value=$this->nullifyDefaultValue($property, $value);
 
-		if(($type = $property->getType())!==null)
-			$value = $registry->convertToType($type, $value);
+		if(($type=$property->getType())!==null)
+			$value=$registry->convertToType($type, $value);
 
 		return $value;
 	}
@@ -161,7 +161,7 @@ 
 		$type=$property->getTypeHandler() ? $property->getTypeHandler() : $property->getType();
 		$handler=$registry->getTypeHandler($type);
 		if($handler===null && $property->getTypeHandler())
-			$handler = Prado::createComponent($type);
+			$handler=Prado::createComponent($type);
 		return $handler;
 	}
 
@@ -172,13 +172,13 @@ 
 	 * @return mixed property value.
 	 * @throws TSqlMapException if property access is invalid.
 	 */
-	protected function getObjectValue($object,$property)
+	protected function getObjectValue($object, $property)
 	{
 		try
 		{
 			return TPropertyAccess::get($object, $property->getProperty());
 		}
-		catch (TInvalidPropertyException $e)
+		catch(TInvalidPropertyException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_get_property_for_parameter',
@@ -196,12 +196,12 @@ 
 	 * @param mixed current property value
 	 * @return mixed null if NullValue matches currrent value.
 	 */
-	protected function nullifyDefaultValue($property,$value)
+	protected function nullifyDefaultValue($property, $value)
 	{
-		if(($nullValue = $property->getNullValue())!==null)
+		if(($nullValue=$property->getNullValue())!==null)
 		{
-			if($nullValue === $value)
-				$value = null;
+			if($nullValue===$value)
+				$value=null;
 		}
 		return $value;
 	}

framework/Data/TDbDataReader.php

Spacing +6 added lines, -6 removed lines

@@ -63,9 +63,9 @@ 
 	public function bindColumn($column, &$value, $dataType=null)
 	{
 		if($dataType===null)
-			$this->_statement->bindColumn($column,$value);
+			$this->_statement->bindColumn($column, $value);
 		else
-			$this->_statement->bindColumn($column,$value,$dataType);
+			$this->_statement->bindColumn($column, $value, $dataType);
 	}
 
 	/**
@@ -74,7 +74,7 @@ 
 	public function setFetchMode($mode)
 	{
 		$params=func_get_args();
-		call_user_func_array(array($this->_statement,'setFetchMode'),$params);
+		call_user_func_array(array($this->_statement, 'setFetchMode'), $params);
 	}
 
 	/**
@@ -102,9 +102,9 @@ 
 	 * @param array list of column names whose values are to be passed as parameters in the constructor of the class being created
 	 * @return mixed|false the populated object, false if no more row of data available
 	 */
-	public function readObject($className,$fields)
+	public function readObject($className, $fields)
 	{
-		return $this->_statement->fetchObject($className,$fields);
+		return $this->_statement->fetchObject($className, $fields);
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 */
 	public function rewind()
 	{
-		if($this->_index<0)
+		if($this->_index < 0)
 		{
 			$this->_row=$this->_statement->fetch();
 			$this->_index=0;

framework/Data/DataGateway/TSqlCriteria.php

Spacing +30 added lines, -30 removed lines

@@ -48,10 +48,10 @@ 
 	public function __construct($condition=null, $parameters=array())
 	{
 		if(!is_array($parameters) && func_num_args() > 1)
-			$parameters = array_slice(func_get_args(),1);
+			$parameters=array_slice(func_get_args(), 1);
 		$this->_parameters=new TAttributeCollection;
 		$this->_parameters->setCaseSensitive(true);
-		$this->_parameters->copyFrom((array)$parameters);
+		$this->_parameters->copyFrom((array) $parameters);
 		$this->_ordersBy=new TAttributeCollection;
 		$this->_ordersBy->setCaseSensitive(true);
 
@@ -109,7 +109,7 @@ 
 	 */
 	public function setSelect($value)
 	{
-		$this->_select = $value;
+		$this->_select=$value;
 	}
 
 	/**
@@ -128,7 +128,7 @@ 
 	{
 		if(empty($value)) {
 			// reset the condition
-			$this->_condition = null;
+			$this->_condition=null;
 			return;
 		}
 
@@ -140,7 +140,7 @@ 
 
 		if(preg_match('/ORDER\s+BY\s+(.*?)(?=LIMIT)|ORDER\s+BY\s+(.*?)$/i', $value, $matches) > 0) {
 			// condition contains ORDER BY
-			$value = str_replace($matches[0], '', $value);
+			$value=str_replace($matches[0], '', $value);
 			if(strlen($matches[1]) > 0) {
 				$this->setOrdersBy($matches[1]);
 			} else if(strlen($matches[2]) > 0) {
@@ -150,23 +150,23 @@ 
 
 		if(preg_match('/LIMIT\s+([\d\s,]+)/i', $value, $matches) > 0) {
 			// condition contains limit
-			$value = str_replace($matches[0], '', $value); // remove limit from query
+			$value=str_replace($matches[0], '', $value); // remove limit from query
 			if(strpos($matches[1], ',')) { // both offset and limit given
-				list($offset, $limit) = explode(',', $matches[1]);
-				$this->_limit = (int)$limit;
-				$this->_offset = (int)$offset;
+				list($offset, $limit)=explode(',', $matches[1]);
+				$this->_limit=(int) $limit;
+				$this->_offset=(int) $offset;
 			} else { // only limit given
-				$this->_limit = (int)$matches[1];
+				$this->_limit=(int) $matches[1];
 			}
 		}
 
 		if(preg_match('/OFFSET\s+(\d+)/i', $value, $matches) > 0) {
 			// condition contains offset
-			$value = str_replace($matches[0], '', $value); // remove offset from query
-			$this->_offset = (int)$matches[1]; // set offset in criteria
+			$value=str_replace($matches[0], '', $value); // remove offset from query
+			$this->_offset=(int) $matches[1]; // set offset in criteria
 		}
 
-		$this->_condition = trim($value);
+		$this->_condition=trim($value);
 	}
 
 	/**
@@ -213,12 +213,12 @@ 
 			$this->_ordersBy->copyFrom($value);
 		else
 		{
-			$value=trim(preg_replace('/\s+/',' ',(string)$value));
+			$value=trim(preg_replace('/\s+/', ' ', (string) $value));
 			$orderBys=array();
-			foreach(explode(',',$value) as $orderBy)
+			foreach(explode(',', $value) as $orderBy)
 			{
-				$vs=explode(' ',trim($orderBy));
-				$orderBys[$vs[0]]=isset($vs[1])?$vs[1]:'asc';
+				$vs=explode(' ', trim($orderBy));
+				$orderBys[$vs[0]]=isset($vs[1]) ? $vs[1] : 'asc';
 			}
 			$this->_ordersBy->copyFrom($orderBys);
 		}
@@ -261,23 +261,23 @@ 
 	 */
 	public function __toString()
 	{
-		$str = '';
-		if(strlen((string)$this->getCondition()) > 0)
-			$str .= '"'.(string)$this->getCondition().'"';
-		$params = array();
+		$str='';
+		if(strlen((string) $this->getCondition()) > 0)
+			$str.='"'.(string) $this->getCondition().'"';
+		$params=array();
 		foreach($this->getParameters() as $k=>$v)
-			$params[] = "{$k} => ${v}";
+			$params[]="{$k} => ${v}";
 		if(count($params) > 0)
-			$str .= ', "'.implode(', ',$params).'"';
-		$orders = array();
+			$str.=', "'.implode(', ', $params).'"';
+		$orders=array();
 		foreach($this->getOrdersBy() as $k=>$v)
-			$orders[] = "{$k} => ${v}";
+			$orders[]="{$k} => ${v}";
 		if(count($orders) > 0)
-			$str .= ', "'.implode(', ',$orders).'"';
-		if($this->_limit !==null)
-			$str .= ', '.$this->_limit;
-		if($this->_offset !== null)
-			$str .= ', '.$this->_offset;
+			$str.=', "'.implode(', ', $orders).'"';
+		if($this->_limit!==null)
+			$str.=', '.$this->_limit;
+		if($this->_offset!==null)
+			$str.=', '.$this->_offset;
 		return $str;
 	}
 }

framework/Caching/TAPCCache.php

Spacing +6 added lines, -6 removed lines

@@ -56,10 +56,10 @@ 
 		if(!extension_loaded('apc'))
 			throw new TConfigurationException('apccache_extension_required');
 
-		if(ini_get('apc.enabled') == false)
+		if(ini_get('apc.enabled')==false)
 			throw new TConfigurationException('apccache_extension_not_enabled');
 
-		if(substr(php_sapi_name(), 0, 3) === 'cli' and ini_get('apc.enable_cli') == false)
+		if(substr(php_sapi_name(), 0, 3)==='cli' and ini_get('apc.enable_cli')==false)
 			throw new TConfigurationException('apccache_extension_not_enabled_cli');
 
 		parent::init($config);
@@ -85,9 +85,9 @@ 
 	 * @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)
 	{
-		return apc_store($key,$value,$expire);
+		return apc_store($key, $value, $expire);
 	}
 
 	/**
@@ -99,9 +99,9 @@ 
 	 * @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)
 	{
-		return apc_add($key,$value,$expire);
+		return apc_add($key, $value, $expire);
 	}
 
 	/**

framework/Caching/TXCache.php

Spacing +7 added lines, -7 removed lines

@@ -52,8 +52,8 @@ 
 		if(!function_exists('xcache_isset'))
 			throw new TConfigurationException('xcache_extension_required');
 
-		$enabled = (int)ini_get('xcache.cacher') !== 0;
-		$var_size = (int)ini_get('xcache.var_size');
+		$enabled=(int) ini_get('xcache.cacher')!==0;
+		$var_size=(int) ini_get('xcache.var_size');
 
 		if(!($enabled && $var_size > 0))
 			throw new TConfigurationException('xcache_extension_not_enabled');
@@ -81,9 +81,9 @@ 
 	 * @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)
 	{
-		return xcache_set($key,$value,$expire);
+		return xcache_set($key, $value, $expire);
 	}
 
 	/**
@@ -95,9 +95,9 @@ 
 	 * @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)
 	{
-		return !xcache_isset($key) ? $this->setValue($key,$value,$expire) : false;
+		return !xcache_isset($key) ? $this->setValue($key, $value, $expire) : false;
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 */
 	public function flush()
 	{
-		for($i=0, $max=xcache_count(XC_TYPE_VAR); $i<$max; $i++)
+		for($i=0, $max=xcache_count(XC_TYPE_VAR); $i < $max; $i++)
 		{
 			if(xcache_clear_cache(XC_TYPE_VAR, $i)===false)
 				return false;

framework/Collections/TListItemCollection.php

Spacing +14 added lines, -14 removed lines

@@ -38,10 +38,10 @@ 
 	public function createListItem($index=-1)
 	{
 		$item=$this->createNewListItem();
-		if($index<0)
+		if($index < 0)
 			$this->add($item);
 		else
-			$this->insertAt($index,$item);
+			$this->insertAt($index, $item);
 		return $item;
 	}
 
@@ -50,7 +50,7 @@ 
 	 */
 	protected function createNewListItem($text=null)
 	{
-		$item =  new TListItem;
+		$item=new TListItem;
 		if($text!==null)
 			$item->setText($text);
 		return $item;
@@ -63,13 +63,13 @@ 
 	 * @param TListItem the item to be inserted.
 	 * @throws TInvalidDataTypeException if the item being inserted is neither a string nor TListItem
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if(is_string($item))
-			$item = $this->createNewListItem($item);
+			$item=$this->createNewListItem($item);
 		if(!($item instanceof TListItem))
-			throw new TInvalidDataTypeException('listitemcollection_item_invalid',get_class($this));
-		parent::insertAt($index,$item);
+			throw new TInvalidDataTypeException('listitemcollection_item_invalid', get_class($this));
+		parent::insertAt($index, $item);
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return integer the index of the item found, -1 if not found.
 	 */
-	public function findIndexByValue($value,$includeDisabled=true)
+	public function findIndexByValue($value, $includeDisabled=true)
 	{
 		$value=TPropertyValue::ensureString($value);
 		$index=0;
@@ -97,7 +97,7 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return integer the index of the item found, -1 if not found.
 	 */
-	public function findIndexByText($text,$includeDisabled=true)
+	public function findIndexByText($text, $includeDisabled=true)
 	{
 		$text=TPropertyValue::ensureString($text);
 		$index=0;
@@ -116,9 +116,9 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return TListItem the item found, null if not found.
 	 */
-	public function findItemByValue($value,$includeDisabled=true)
+	public function findItemByValue($value, $includeDisabled=true)
 	{
-		if(($index=$this->findIndexByValue($value,$includeDisabled))>=0)
+		if(($index=$this->findIndexByValue($value, $includeDisabled)) >= 0)
 			return $this->itemAt($index);
 		else
 			return null;
@@ -130,9 +130,9 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return TListItem the item found, null if not found.
 	 */
-	public function findItemByText($text,$includeDisabled=true)
+	public function findItemByText($text, $includeDisabled=true)
 	{
-		if(($index=$this->findIndexByText($text,$includeDisabled))>=0)
+		if(($index=$this->findIndexByText($text, $includeDisabled)) >= 0)
 			return $this->itemAt($index);
 		else
 			return null;
@@ -157,6 +157,6 @@ 
 	 */
 	public function saveState()
 	{
-		return ($this->getCount()>0) ? $this->toArray() : null;
+		return ($this->getCount() > 0) ? $this->toArray() : null;
 	}
 }

framework/TApplicationComponent.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 	 * @param string name of the class whose containing directory will be prepend to the asset path. If null, it means get_class($this).
 	 * @return string URL to the asset path.
 	 */
-	public function publishAsset($assetPath,$className=null)
+	public function publishAsset($assetPath, $className=null)
 	{
 		if($className===null)
 			$className=get_class($this);

framework/Security/TAuthManager.php

Spacing +24 added lines, -24 removed lines

@@ -94,14 +94,14 @@ 
 		if(is_string($this->_userManager))
 		{
 			if(($users=$application->getModule($this->_userManager))===null)
-				throw new TConfigurationException('authmanager_usermanager_inexistent',$this->_userManager);
+				throw new TConfigurationException('authmanager_usermanager_inexistent', $this->_userManager);
 			if(!($users instanceof IUserManager))
-				throw new TConfigurationException('authmanager_usermanager_invalid',$this->_userManager);
+				throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
 			$this->_userManager=$users;
 		}
-		$application->attachEventHandler('OnAuthentication',array($this,'doAuthentication'));
-		$application->attachEventHandler('OnEndRequest',array($this,'leave'));
-		$application->attachEventHandler('OnAuthorization',array($this,'doAuthorization'));
+		$application->attachEventHandler('OnAuthentication', array($this, 'doAuthentication'));
+		$application->attachEventHandler('OnEndRequest', array($this, 'leave'));
+		$application->attachEventHandler('OnAuthorization', array($this, 'doAuthorization'));
 		$this->_initialized=true;
 	}
 
@@ -122,7 +122,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('authmanager_usermanager_unchangeable');
 		if(!is_string($provider) && !($provider instanceof IUserManager))
-			throw new TConfigurationException('authmanager_usermanager_invalid',$this->_userManager);
+			throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
 		$this->_userManager=$provider;
 	}
 
@@ -152,7 +152,7 @@ 
 	 * @param mixed sender of the Authentication event
 	 * @param mixed event parameter
 	 */
-	public function doAuthentication($sender,$param)
+	public function doAuthentication($sender, $param)
 	{
 		$this->onAuthenticate($param);
 
@@ -168,7 +168,7 @@ 
 	 * @param mixed sender of the Authorization event
 	 * @param mixed event parameter
 	 */
-	public function doAuthorization($sender,$param)
+	public function doAuthorization($sender, $param)
 	{
 		if(!$this->_skipAuthorization)
 		{
@@ -183,7 +183,7 @@ 
 	 * @param mixed sender of the event
 	 * @param mixed event parameter
 	 */
-	public function leave($sender,$param)
+	public function leave($sender, $param)
 	{
 		$application=$this->getApplication();
 		if($application->getResponse()->getStatusCode()===401)
@@ -229,7 +229,7 @@ 
 	 */
 	public function setReturnUrl($value)
 	{
-		$this->getSession()->add($this->getReturnUrlVarName(),$value);
+		$this->getSession()->add($this->getReturnUrlVarName(), $value);
 	}
 
 	/**
@@ -288,8 +288,8 @@ 
 		$user=$this->_userManager->getUser(null)->loadFromString($sessionInfo);
 
 		// check for authentication expiration
-		$isAuthExpired = $this->_authExpire>0 && !$user->getIsGuest() &&
-        ($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime<time();
+		$isAuthExpired=$this->_authExpire > 0 && !$user->getIsGuest() &&
+        ($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime < time();
 
 		// try authenticating through cookie if possible
 		if($this->getAllowAutoLogin() && ($user->getIsGuest() || $isAuthExpired))
@@ -302,7 +302,7 @@ 
 					$user=$user2;
 					$this->updateSessionUser($user);
 					// user is restored from cookie, auth may not expire
-					$isAuthExpired = false;
+					$isAuthExpired=false;
 				}
 			}
 		}
@@ -317,7 +317,7 @@ 
 
 		// event handler gets a chance to do further auth work
 		if($this->hasEventHandler('OnAuthenticate'))
-			$this->raiseEvent('OnAuthenticate',$this,$application);
+			$this->raiseEvent('OnAuthenticate', $this, $application);
 	}
 
 	/**
@@ -329,7 +329,7 @@ 
 	{
 		$this->logout();
 		if($this->hasEventHandler('OnAuthExpire'))
-			$this->raiseEvent('OnAuthExpire',$this,$param);
+			$this->raiseEvent('OnAuthExpire', $this, $param);
 	}
 
 	/**
@@ -343,8 +343,8 @@ 
 	{
 		$application=$this->getApplication();
 		if($this->hasEventHandler('OnAuthorize'))
-			$this->raiseEvent('OnAuthorize',$this,$application);
-		if(!$application->getAuthorizationRules()->isUserAllowed($application->getUser(),$application->getRequest()->getRequestType(),$application->getRequest()->getUserHostAddress()))
+			$this->raiseEvent('OnAuthorize', $this, $application);
+		if(!$application->getAuthorizationRules()->isUserAllowed($application->getUser(), $application->getRequest()->getRequestType(), $application->getRequest()->getUserHostAddress()))
 		{
 			$application->getResponse()->setStatusCode(401);
 			$application->completeRequest();
@@ -383,7 +383,7 @@ 
 			if(($session=$this->getSession())===null)
 				throw new TConfigurationException('authmanager_session_required');
 			else
-				$session->add($this->getUserKey(),$user->saveToString());
+				$session->add($this->getUserKey(), $user->saveToString());
 		}
 	}
 
@@ -411,19 +411,19 @@ 
 	 * @param integer number of seconds that automatic login will remain effective. If 0, it means user logs out when session ends. This parameter is added since 3.1.1.
 	 * @return boolean if login is successful
 	 */
-	public function login($username,$password,$expire=0)
+	public function login($username, $password, $expire=0)
 	{
-		if($this->_userManager->validateUser($username,$password))
+		if($this->_userManager->validateUser($username, $password))
 		{
 			if(($user=$this->_userManager->getUser($username))===null)
 				return false;
 			$this->updateSessionUser($user);
 			$this->getApplication()->setUser($user);
 
-			if($expire>0)
+			if($expire > 0)
 			{
-				$cookie=new THttpCookie($this->getUserKey(),'');
-				$cookie->setExpire(time()+$expire);
+				$cookie=new THttpCookie($this->getUserKey(), '');
+				$cookie->setExpire(time() + $expire);
 				$this->_userManager->saveUserToCookie($cookie);
 				$this->getResponse()->getCookies()->add($cookie);
 			}
@@ -446,7 +446,7 @@ 
 		$session->destroy();
 		if($this->getAllowAutoLogin())
 		{
-			$cookie=new THttpCookie($this->getUserKey(),'');
+			$cookie=new THttpCookie($this->getUserKey(), '');
 			$this->getResponse()->getCookies()->add($cookie);
 		}
 	}

framework/Security/TUser.php

Spacing +12 added lines, -12 removed lines

@@ -68,7 +68,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getState('Name','');
+		return $this->getState('Name', '');
 	}
 
 	/**
@@ -76,7 +76,7 @@ 
 	 */
 	public function setName($value)
 	{
-		$this->setState('Name',$value,'');
+		$this->setState('Name', $value, '');
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	 */
 	public function getIsGuest()
 	{
-		return $this->getState('IsGuest',true);
+		return $this->getState('IsGuest', true);
 	}
 
 	/**
@@ -97,7 +97,7 @@ 
 			$this->setName($this->_manager->getGuestName());
 			$this->setRoles(array());
 		}
-		$this->setState('IsGuest',$isGuest);
+		$this->setState('IsGuest', $isGuest);
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function getRoles()
 	{
-		return $this->getState('Roles',array());
+		return $this->getState('Roles', array());
 	}
 
 	/**
@@ -114,16 +114,16 @@ 
 	public function setRoles($value)
 	{
 		if(is_array($value))
-			$this->setState('Roles',$value,array());
+			$this->setState('Roles', $value, array());
 		else
 		{
 			$roles=array();
-			foreach(explode(',',$value) as $role)
+			foreach(explode(',', $value) as $role)
 			{
 				if(($role=trim($role))!=='')
 					$roles[]=$role;
 			}
-			$this->setState('Roles',$roles,array());
+			$this->setState('Roles', $roles, array());
 		}
 	}
 
@@ -134,7 +134,7 @@ 
 	public function isInRole($role)
 	{
 		foreach($this->getRoles() as $r)
-			if(strcasecmp($role,$r)===0)
+			if(strcasecmp($role, $r)===0)
 				return true;
 		return false;
 	}
@@ -173,9 +173,9 @@ 
 	 * @return mixed the value of the variable. If it doesn't exist, the provided default value will be returned
 	 * @see setState
 	 */
-	protected function getState($key,$defaultValue=null)
+	protected function getState($key, $defaultValue=null)
 	{
-		return isset($this->_state[$key])?$this->_state[$key]:$defaultValue;
+		return isset($this->_state[$key]) ? $this->_state[$key] : $defaultValue;
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	 * @param mixed default value. If $value===$defaultValue, the variable will be removed from persistent storage.
 	 * @see getState
 	 */
-	protected function setState($key,$value,$defaultValue=null)
+	protected function setState($key, $value, $defaultValue=null)
 	{
 		if($value===$defaultValue)
 			unset($this->_state[$key]);