pradosoft / prado

framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php

Spacing +125 added lines, -125 removed lines

@@ -29,8 +29,8 @@ 
 	{
 		if(isset($node['class']))
 		{
-			$obj = Prado::createComponent((string)$node['class']);
-			$this->setObjectPropFromNode($obj,$node,array('class'));
+			$obj=Prado::createComponent((string) $node['class']);
+			$this->setObjectPropFromNode($obj, $node, array('class'));
 			return $obj;
 		}
 		throw new TSqlMapConfigurationException(
@@ -45,14 +45,14 @@ 
 	 * @param SimpleXmlNode property node
 	 * @param array exception property name
 	 */
-	protected function setObjectPropFromNode($obj,$node,$except=array())
+	protected function setObjectPropFromNode($obj, $node, $except=array())
 	{
 		foreach($node->attributes() as $name=>$value)
 		{
-			if(!in_array($name,$except))
+			if(!in_array($name, $except))
 			{
 				if($obj->canSetProperty($name))
-					$obj->{$name} = (string)$value;
+					$obj->{$name}=(string) $value;
 				else
 					throw new TSqlMapConfigurationException(
 						'sqlmap_invalid_property', $name, get_class($obj),
@@ -67,12 +67,12 @@ 
 	 * @param string relative filename
 	 * @return string absolute filename.
 	 */
-	protected function getAbsoluteFilePath($basefile,$resource)
+	protected function getAbsoluteFilePath($basefile, $resource)
 	{
-		$basedir = dirname($basefile);
-		$file = realpath($basedir.DIRECTORY_SEPARATOR.$resource);
+		$basedir=dirname($basefile);
+		$file=realpath($basedir.DIRECTORY_SEPARATOR.$resource);
 		if(!is_string($file) || !is_file($file))
-			$file = realpath($resource);
+			$file=realpath($resource);
 		if(is_string($file) && is_file($file))
 			return $file;
 		else
@@ -85,10 +85,10 @@ 
 	 * @param string filename.
 	 * @return SimpleXmlElement xml document.
 	 */
-	protected function loadXmlDocument($filename,TSqlMapXmlConfiguration $config)
+	protected function loadXmlDocument($filename, TSqlMapXmlConfiguration $config)
 	{
-		if( strpos($filename, '${') !== false)
-			$filename = $config->replaceProperties($filename);
+		if(strpos($filename, '${')!==false)
+			$filename=$config->replaceProperties($filename);
 
 		if(!is_file($filename))
 			throw new TSqlMapConfigurationException(
@@ -106,9 +106,9 @@ 
 	protected function getElementByIdValue($document, $tag, $value)
 	{
 		//hack to allow upper case and lower case attribute names.
-		foreach(array('id','ID','Id', 'iD') as $id)
+		foreach(array('id', 'ID', 'Id', 'iD') as $id)
 		{
-			$xpath = "//{$tag}[@{$id}='{$value}']";
+			$xpath="//{$tag}[@{$id}='{$value}']";
 			foreach($document->xpath($xpath) as $node)
 				return $node;
 		}
@@ -169,7 +169,7 @@ 
 	public function configure($filename=null)
 	{
 		$this->_configFile=$filename;
-		$document = $this->loadXmlDocument($filename,$this);
+		$document=$this->loadXmlDocument($filename, $this);
 
 		foreach($document->xpath('//property') as $property)
 			$this->loadGlobalProperty($property);
@@ -181,7 +181,7 @@ 
 			$this->loadDatabaseConnection($conn);
 
 		//try to load configuration in the current config file.
-		$mapping = new TSqlMapXmlMappingConfiguration($this);
+		$mapping=new TSqlMapXmlMappingConfiguration($this);
 		$mapping->configure($filename);
 
 		foreach($document->xpath('//sqlMap') as $sqlmap)
@@ -197,7 +197,7 @@ 
 	 */
 	protected function loadGlobalProperty($node)
 	{
-		$this->_properties[(string)$node['name']] = (string)$node['value'];
+		$this->_properties[(string) $node['name']]=(string) $node['value'];
 	}
 
 	/**
@@ -206,7 +206,7 @@ 
 	 */
 	protected function loadTypeHandler($node)
 	{
-		$handler = $this->createObjectFromNode($node);
+		$handler=$this->createObjectFromNode($node);
 		$this->_manager->getTypeHandlers()->registerTypeHandler($handler);
 	}
 
@@ -216,7 +216,7 @@ 
 	 */
 	protected function loadDatabaseConnection($node)
 	{
-		$conn = $this->createObjectFromNode($node);
+		$conn=$this->createObjectFromNode($node);
 		$this->_manager->setDbConnection($conn);
 	}
 
@@ -226,13 +226,13 @@ 
 	 */
 	protected function loadSqlMappingFiles($node)
 	{
-		if(strlen($resource = (string)$node['resource']) > 0)
+		if(strlen($resource=(string) $node['resource']) > 0)
 		{
-			if( strpos($resource, '${') !== false)
-				$resource = $this->replaceProperties($resource);
+			if(strpos($resource, '${')!==false)
+				$resource=$this->replaceProperties($resource);
 
-			$mapping = new TSqlMapXmlMappingConfiguration($this);
-			$filename = $this->getAbsoluteFilePath($this->_configFile, $resource);
+			$mapping=new TSqlMapXmlMappingConfiguration($this);
+			$filename=$this->getAbsoluteFilePath($this->_configFile, $resource);
 			$mapping->configure($filename);
 		}
 	}
@@ -242,12 +242,12 @@ 
 	 */
 	protected function resolveResultMapping()
 	{
-		$maps = $this->_manager->getResultMaps();
+		$maps=$this->_manager->getResultMaps();
 		foreach($maps as $entry)
 		{
 			foreach($entry->getColumns() as $item)
 			{
-				$resultMap = $item->getResultMapping();
+				$resultMap=$item->getResultMapping();
 				if(strlen($resultMap) > 0)
 				{
 					if($maps->contains($resultMap))
@@ -270,9 +270,9 @@ 
 	{
 		foreach($this->_manager->getMappedStatements() as $mappedStatement)
 		{
-			if(strlen($model = $mappedStatement->getStatement()->getCacheModel()) > 0)
+			if(strlen($model=$mappedStatement->getStatement()->getCacheModel()) > 0)
 			{
-				$cache = $this->_manager->getCacheModel($model);
+				$cache=$this->_manager->getCacheModel($model);
 				$mappedStatement->getStatement()->setCache($cache);
 			}
 		}
@@ -287,7 +287,7 @@ 
 	public function replaceProperties($string)
 	{
 		foreach($this->_properties as $find => $replace)
-			$string = str_replace('${'.$find.'}', $replace, $string);
+			$string=str_replace('${'.$find.'}', $replace, $string);
 		return $string;
 	}
 }
@@ -342,12 +342,12 @@ 
 	public function configure($filename)
 	{
 		$this->_configFile=$filename;
-		$document = $this->loadXmlDocument($filename,$this->_xmlConfig);
+		$document=$this->loadXmlDocument($filename, $this->_xmlConfig);
 		$this->_document=$document;
 
 		static $bCacheDependencies;
-		if($bCacheDependencies === null)
-			$bCacheDependencies = true; //Prado::getApplication()->getMode() !== TApplicationMode::Performance;
+		if($bCacheDependencies===null)
+			$bCacheDependencies=true; //Prado::getApplication()->getMode() !== TApplicationMode::Performance;
 
 		if($bCacheDependencies)
 			$this->_manager->getCacheDependencies()
@@ -390,14 +390,14 @@ 
 	 */
 	protected function loadResultMap($node)
 	{
-		$resultMap = $this->createResultMap($node);
+		$resultMap=$this->createResultMap($node);
 
 		//find extended result map.
-		if(strlen($extendMap = $resultMap->getExtends()) > 0)
+		if(strlen($extendMap=$resultMap->getExtends()) > 0)
 		{
 			if(!$this->_manager->getResultMaps()->contains($extendMap))
 			{
-				$extendNode=$this->getElementByIdValue($this->_document,'resultMap',$extendMap);
+				$extendNode=$this->getElementByIdValue($this->_document, 'resultMap', $extendMap);
 				if($extendNode!==null)
 					$this->loadResultMap($extendNode);
 			}
@@ -406,7 +406,7 @@ 
 				throw new TSqlMapConfigurationException(
 					'sqlmap_unable_to_find_parent_result_map', $node, $this->_configFile, $extendMap);
 
-			$superMap = $this->_manager->getResultMap($extendMap);
+			$superMap=$this->_manager->getResultMap($extendMap);
 			$resultMap->getColumns()->mergeWith($superMap->getColumns());
 		}
 
@@ -423,22 +423,22 @@ 
 	 */
 	protected function createResultMap($node)
 	{
-		$resultMap = new TResultMap();
-		$this->setObjectPropFromNode($resultMap,$node);
+		$resultMap=new TResultMap();
+		$this->setObjectPropFromNode($resultMap, $node);
 
 		//result nodes
 		foreach($node->result as $result)
 		{
-			$property = new TResultProperty($resultMap);
-			$this->setObjectPropFromNode($property,$result);
+			$property=new TResultProperty($resultMap);
+			$this->setObjectPropFromNode($property, $result);
 			$resultMap->addResultProperty($property);
 		}
 
 		//create the discriminator
-		$discriminator = null;
+		$discriminator=null;
 		if(isset($node->discriminator))
 		{
-			$discriminator = new TDiscriminator();
+			$discriminator=new TDiscriminator();
 			$this->setObjectPropFromNode($discriminator, $node->discriminator);
 			$discriminator->initMapping($resultMap);
 		}
@@ -447,9 +447,9 @@ 
 		{
 			if($discriminator===null)
 				throw new TSqlMapConfigurationException(
-					'sqlmap_undefined_discriminator', $node, $this->_configFile,$subMapNode);
-			$subMap = new TSubMap;
-			$this->setObjectPropFromNode($subMap,$subMapNode);
+					'sqlmap_undefined_discriminator', $node, $this->_configFile, $subMapNode);
+			$subMap=new TSubMap;
+			$this->setObjectPropFromNode($subMap, $subMapNode);
 			$discriminator->addSubMap($subMap);
 		}
 
@@ -466,24 +466,24 @@ 
 	 */
 	protected function loadParameterMap($node)
 	{
-		$parameterMap = $this->createParameterMap($node);
+		$parameterMap=$this->createParameterMap($node);
 
-		if(strlen($extendMap = $parameterMap->getExtends()) > 0)
+		if(strlen($extendMap=$parameterMap->getExtends()) > 0)
 		{
 			if(!$this->_manager->getParameterMaps()->contains($extendMap))
 			{
-				$extendNode=$this->getElementByIdValue($this->_document,'parameterMap',$extendMap);
+				$extendNode=$this->getElementByIdValue($this->_document, 'parameterMap', $extendMap);
 				if($extendNode!==null)
 					$this->loadParameterMap($extendNode);
 			}
 
 			if(!$this->_manager->getParameterMaps()->contains($extendMap))
 				throw new TSqlMapConfigurationException(
-					'sqlmap_unable_to_find_parent_parameter_map', $node, $this->_configFile,$extendMap);
-			$superMap = $this->_manager->getParameterMap($extendMap);
-			$index = 0;
+					'sqlmap_unable_to_find_parent_parameter_map', $node, $this->_configFile, $extendMap);
+			$superMap=$this->_manager->getParameterMap($extendMap);
+			$index=0;
 			foreach($superMap->getPropertyNames() as $propertyName)
-				$parameterMap->insertProperty($index++,$superMap->getProperty($propertyName));
+				$parameterMap->insertProperty($index++, $superMap->getProperty($propertyName));
 		}
 		$this->_manager->addParameterMap($parameterMap);
 	}
@@ -495,12 +495,12 @@ 
 	 */
 	protected function createParameterMap($node)
 	{
-		$parameterMap = new TParameterMap();
-		$this->setObjectPropFromNode($parameterMap,$node);
+		$parameterMap=new TParameterMap();
+		$this->setObjectPropFromNode($parameterMap, $node);
 		foreach($node->parameter as $parameter)
 		{
-			$property = new TParameterProperty();
-			$this->setObjectPropFromNode($property,$parameter);
+			$property=new TParameterProperty();
+			$this->setObjectPropFromNode($property, $parameter);
 			$parameterMap->addProperty($property);
 		}
 		return $parameterMap;
@@ -512,10 +512,10 @@ 
 	 */
 	protected function loadStatementTag($node)
 	{
-		$statement = new TSqlMapStatement();
-		$this->setObjectPropFromNode($statement,$node);
+		$statement=new TSqlMapStatement();
+		$this->setObjectPropFromNode($statement, $node);
 		$this->processSqlStatement($statement, $node);
-		$mappedStatement = new TMappedStatement($this->_manager, $statement);
+		$mappedStatement=new TMappedStatement($this->_manager, $statement);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -527,15 +527,15 @@ 
 	 */
 	protected function processSqlStatement($statement, $node)
 	{
-		$commandText = (string)$node;
-		if(strlen($extend = $statement->getExtends()) > 0)
+		$commandText=(string) $node;
+		if(strlen($extend=$statement->getExtends()) > 0)
 		{
-			$superNode = $this->getElementByIdValue($this->_document,'*',$extend);
+			$superNode=$this->getElementByIdValue($this->_document, '*', $extend);
 			if($superNode!==null)
-				$commandText = (string)$superNode . $commandText;
+				$commandText=(string) $superNode.$commandText;
 			else
 				throw new TSqlMapConfigurationException(
-						'sqlmap_unable_to_find_parent_sql', $extend, $this->_configFile,$node);
+						'sqlmap_unable_to_find_parent_sql', $extend, $this->_configFile, $node);
 		}
 		//$commandText = $this->_xmlConfig->replaceProperties($commandText);
 		$statement->initialize($this->_manager);
@@ -550,27 +550,27 @@ 
 	 */
 	protected function applyInlineParameterMap($statement, $sqlStatement, $node)
 	{
-		$scope['file'] = $this->_configFile;
-		$scope['node'] = $node;
+		$scope['file']=$this->_configFile;
+		$scope['node']=$node;
 
-		$sqlStatement=preg_replace(self::ESCAPED_INLINE_SYMBOL_REGEXP,self::INLINE_PLACEHOLDER,$sqlStatement);
-		if($statement->parameterMap() === null)
+		$sqlStatement=preg_replace(self::ESCAPED_INLINE_SYMBOL_REGEXP, self::INLINE_PLACEHOLDER, $sqlStatement);
+		if($statement->parameterMap()===null)
 		{
 			// Build a Parametermap with the inline parameters.
 			// if they exist. Then delete inline infos from sqltext.
-			$parameterParser = new TInlineParameterMapParser;
-			$sqlText = $parameterParser->parse($sqlStatement, $scope);
+			$parameterParser=new TInlineParameterMapParser;
+			$sqlText=$parameterParser->parse($sqlStatement, $scope);
 			if(count($sqlText['parameters']) > 0)
 			{
-				$map = new TParameterMap();
+				$map=new TParameterMap();
 				$map->setID($statement->getID().'-InLineParameterMap');
 				$statement->setInlineParameterMap($map);
 				foreach($sqlText['parameters'] as $property)
 					$map->addProperty($property);
 			}
-			$sqlStatement = $sqlText['sql'];
+			$sqlStatement=$sqlText['sql'];
 		}
-		$sqlStatement=preg_replace('/'.self::INLINE_PLACEHOLDER.'/',self::INLINE_SYMBOL,$sqlStatement);
+		$sqlStatement=preg_replace('/'.self::INLINE_PLACEHOLDER.'/', self::INLINE_SYMBOL, $sqlStatement);
 
 		$this->prepareSql($statement, $sqlStatement, $node);
 	}
@@ -582,19 +582,19 @@ 
 	 * @param SimpleXmlElement statement node.
 	 * @todo Extend to dynamic sql.
 	 */
-	protected function prepareSql($statement,$sqlStatement, $node)
+	protected function prepareSql($statement, $sqlStatement, $node)
 	{
-		$simpleDynamic = new TSimpleDynamicParser;
-		$sqlStatement=preg_replace(self::ESCAPED_SIMPLE_MARK_REGEXP,self::SIMPLE_PLACEHOLDER,$sqlStatement);
-		$dynamics = $simpleDynamic->parse($sqlStatement);
+		$simpleDynamic=new TSimpleDynamicParser;
+		$sqlStatement=preg_replace(self::ESCAPED_SIMPLE_MARK_REGEXP, self::SIMPLE_PLACEHOLDER, $sqlStatement);
+		$dynamics=$simpleDynamic->parse($sqlStatement);
 		if(count($dynamics['parameters']) > 0)
 		{
-			$sql = new TSimpleDynamicSql($dynamics['parameters']);
-			$sqlStatement = $dynamics['sql'];
+			$sql=new TSimpleDynamicSql($dynamics['parameters']);
+			$sqlStatement=$dynamics['sql'];
 		}
 		else
-			$sql = new TStaticSql();
-		$sqlStatement=preg_replace('/'.self::SIMPLE_PLACEHOLDER.'/',self::SIMPLE_MARK,$sqlStatement);
+			$sql=new TStaticSql();
+		$sqlStatement=preg_replace('/'.self::SIMPLE_PLACEHOLDER.'/', self::SIMPLE_MARK, $sqlStatement);
 		$sql->buildPreparedStatement($statement, $sqlStatement);
 		$statement->setSqlText($sql);
 	}
@@ -605,12 +605,12 @@ 
 	 */
 	protected function loadSelectTag($node)
 	{
-		$select = new TSqlMapSelect;
-		$this->setObjectPropFromNode($select,$node);
-		$this->processSqlStatement($select,$node);
-		$mappedStatement = new TMappedStatement($this->_manager, $select);
+		$select=new TSqlMapSelect;
+		$this->setObjectPropFromNode($select, $node);
+		$this->processSqlStatement($select, $node);
+		$mappedStatement=new TMappedStatement($this->_manager, $select);
 		if(strlen($select->getCacheModel()) > 0)
-			$mappedStatement = new TCachingStatement($mappedStatement);
+			$mappedStatement=new TCachingStatement($mappedStatement);
 
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
@@ -621,9 +621,9 @@ 
 	 */
 	protected function loadInsertTag($node)
 	{
-		$insert = $this->createInsertStatement($node);
+		$insert=$this->createInsertStatement($node);
 		$this->processSqlStatement($insert, $node);
-		$mappedStatement = new TInsertMappedStatement($this->_manager, $insert);
+		$mappedStatement=new TInsertMappedStatement($this->_manager, $insert);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -634,10 +634,10 @@ 
 	 */
 	protected function createInsertStatement($node)
 	{
-		$insert = new TSqlMapInsert;
-		$this->setObjectPropFromNode($insert,$node);
+		$insert=new TSqlMapInsert;
+		$this->setObjectPropFromNode($insert, $node);
 		if(isset($node->selectKey))
-			$this->loadSelectKeyTag($insert,$node->selectKey);
+			$this->loadSelectKeyTag($insert, $node->selectKey);
 		return $insert;
 	}
 
@@ -647,13 +647,13 @@ 
 	 */
 	protected function loadSelectKeyTag($insert, $node)
 	{
-		$selectKey = new TSqlMapSelectKey;
-		$this->setObjectPropFromNode($selectKey,$node);
+		$selectKey=new TSqlMapSelectKey;
+		$this->setObjectPropFromNode($selectKey, $node);
 		$selectKey->setID($insert->getID());
 		$selectKey->setID($insert->getID().'.SelectKey');
-		$this->processSqlStatement($selectKey,$node);
+		$this->processSqlStatement($selectKey, $node);
 		$insert->setSelectKey($selectKey);
-		$mappedStatement = new TMappedStatement($this->_manager, $selectKey);
+		$mappedStatement=new TMappedStatement($this->_manager, $selectKey);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -663,10 +663,10 @@ 
 	 */
 	protected function loadUpdateTag($node)
 	{
-		$update = new TSqlMapUpdate;
-		$this->setObjectPropFromNode($update,$node);
+		$update=new TSqlMapUpdate;
+		$this->setObjectPropFromNode($update, $node);
 		$this->processSqlStatement($update, $node);
-		$mappedStatement = new TUpdateMappedStatement($this->_manager, $update);
+		$mappedStatement=new TUpdateMappedStatement($this->_manager, $update);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -676,10 +676,10 @@ 
 	 */
 	protected function loadDeleteTag($node)
 	{
-		$delete = new TSqlMapDelete;
-		$this->setObjectPropFromNode($delete,$node);
+		$delete=new TSqlMapDelete;
+		$this->setObjectPropFromNode($delete, $node);
 		$this->processSqlStatement($delete, $node);
-		$mappedStatement = new TDeleteMappedStatement($this->_manager, $delete);
+		$mappedStatement=new TDeleteMappedStatement($this->_manager, $delete);
 		$this->_manager->addMappedStatement($mappedStatement);
 	}
 
@@ -699,35 +699,35 @@ 
 	 */
 	protected function loadCacheModel($node)
 	{
-		$cacheModel = new TSqlMapCacheModel;
-		$properties = array('id','implementation');
+		$cacheModel=new TSqlMapCacheModel;
+		$properties=array('id', 'implementation');
 		foreach($node->attributes() as $name=>$value)
 		{
 			if(in_array(strtolower($name), $properties))
-				$cacheModel->{'set'.$name}((string)$value);
+				$cacheModel->{'set'.$name}((string) $value);
 		}
-		$cache = Prado::createComponent($cacheModel->getImplementationClass(), $cacheModel);
-		$this->setObjectPropFromNode($cache,$node,$properties);
+		$cache=Prado::createComponent($cacheModel->getImplementationClass(), $cacheModel);
+		$this->setObjectPropFromNode($cache, $node, $properties);
 
 		foreach($node->xpath('property') as $propertyNode)
 		{
-			$name = $propertyNode->attributes()->name;
+			$name=$propertyNode->attributes()->name;
 			if($name===null || $name==='') continue;
 
-			$value = $propertyNode->attributes()->value;
+			$value=$propertyNode->attributes()->value;
 			if($value===null || $value==='') continue;
 
-			if( !TPropertyAccess::has($cache, $name) ) continue;
+			if(!TPropertyAccess::has($cache, $name)) continue;
 
 			TPropertyAccess::set($cache, $name, $value);
 		}
 
-		$this->loadFlushInterval($cacheModel,$node);
+		$this->loadFlushInterval($cacheModel, $node);
 
 		$cacheModel->initialize($cache);
 		$this->_manager->addCacheModel($cacheModel);
 		foreach($node->xpath('flushOnExecute') as $flush)
-			$this->loadFlushOnCache($cacheModel,$node,$flush);
+			$this->loadFlushOnCache($cacheModel, $node, $flush);
 	}
 
 	/**
@@ -737,27 +737,27 @@ 
 	 */
 	protected function loadFlushInterval($cacheModel, $node)
 	{
-		$flushInterval = $node->xpath('flushInterval');
-		if($flushInterval === null || count($flushInterval) === 0) return;
-		$duration = 0;
+		$flushInterval=$node->xpath('flushInterval');
+		if($flushInterval===null || count($flushInterval)===0) return;
+		$duration=0;
 		foreach($flushInterval[0]->attributes() as $name=>$value)
 		{
 			switch(strToLower($name))
 			{
 				case 'seconds':
-					$duration += (integer)$value;
+					$duration+=(integer) $value;
 				break;
 				case 'minutes':
-					$duration += 60 * (integer)$value;
+					$duration+=60 * (integer) $value;
 				break;
 				case 'hours':
-					$duration += 3600 * (integer)$value;
+					$duration+=3600 * (integer) $value;
 				break;
 				case 'days':
-					$duration += 86400 * (integer)$value;
+					$duration+=86400 * (integer) $value;
 				break;
 				case 'duration':
-					$duration = (integer)$value;
+					$duration=(integer) $value;
 				break 2; // switch, foreach
 			}
 		}
@@ -770,15 +770,15 @@ 
 	 * @param SimpleXmlElement parent node.
 	 * @param SimpleXmlElement flush node.
 	 */
-	protected function loadFlushOnCache($cacheModel,$parent,$node)
+	protected function loadFlushOnCache($cacheModel, $parent, $node)
 	{
-		$id = $cacheModel->getID();
+		$id=$cacheModel->getID();
 		if(!isset($this->_FlushOnExecuteStatements[$id]))
-			$this->_FlushOnExecuteStatements[$id] = array();
+			$this->_FlushOnExecuteStatements[$id]=array();
 		foreach($node->attributes() as $name=>$value)
 		{
 			if(strtolower($name)==='statement')
-				$this->_FlushOnExecuteStatements[$id][] = (string)$value;
+				$this->_FlushOnExecuteStatements[$id][]=(string) $value;
 		}
 	}
 
@@ -789,10 +789,10 @@ 
 	{
 		foreach($this->_FlushOnExecuteStatements as $cacheID => $statementIDs)
 		{
-			$cacheModel = $this->_manager->getCacheModel($cacheID);
+			$cacheModel=$this->_manager->getCacheModel($cacheID);
 			foreach($statementIDs as $statementID)
 			{
-				$statement = $this->_manager->getMappedStatement($statementID);
+				$statement=$this->_manager->getMappedStatement($statementID);
 				$cacheModel->registerTriggerStatement($statement);
 			}
 		}

framework/Web/UI/WebControls/TReCaptcha2.php

Spacing +41 added lines, -41 removed lines

@@ -55,7 +55,7 @@ 
 
 class TReCaptcha2 extends TActivePanel implements ICallbackEventHandler, IValidatable
 {
-    const ChallengeFieldName = 'g-recaptcha-response';
+    const ChallengeFieldName='g-recaptcha-response';
     private $_widgetId=0;
     private $_isValid=true;
 
@@ -102,14 +102,14 @@ 
     }
     public function getResponseFieldName()
     {
-        $captchas = $this->Page->findControlsByType('TReCaptcha2');
-        $cont = 0;
-        $responseFieldName = self::ChallengeFieldName;
-        foreach ($captchas as $captcha)
+        $captchas=$this->Page->findControlsByType('TReCaptcha2');
+        $cont=0;
+        $responseFieldName=self::ChallengeFieldName;
+        foreach($captchas as $captcha)
         {
-            if ($this->getClientID() == $captcha->ClientID)
+            if($this->getClientID()==$captcha->ClientID)
             {
-                $responseFieldName .= ($cont > 0) ? '-'.$cont : '';
+                $responseFieldName.=($cont > 0) ? '-'.$cont : '';
             }
             $cont++;
         }
@@ -236,7 +236,7 @@ 
      */
     public function reset()
     {
-        $this->Page->CallbackClient->callClientFunction('grecaptcha.reset',array(array($this->WidgetId)));
+        $this->Page->CallbackClient->callClientFunction('grecaptcha.reset', array(array($this->WidgetId)));
     }
     /**
      * Gets the response for the reCAPTCHA widget.
@@ -259,34 +259,34 @@ 
     }
     protected function getClientOptions()
     {
-        $options['ID'] = $this->getClientID();
-        $options['EventTarget'] = $this->getUniqueID();
-        $options['FormID'] = $this->Page->getForm()->getClientID();
-        $options['onCallback'] = $this->hasEventHandler('OnCallback');
-        $options['onCallbackExpired'] = $this->hasEventHandler('OnCallbackExpired');
-        $options['options']['sitekey'] = $this->getSiteKey();
-        if ($theme = $this->getTheme()) $options['options']['theme'] = $theme;
-        if ($type = $this->getType()) $options['options']['type'] = $type;
-        if ($size = $this->getSize()) $options['options']['size'] = $size;
-        if ($tabIndex = $this->getTabIndex()) $options['options']['tabindex'] = $tabIndex;
+        $options['ID']=$this->getClientID();
+        $options['EventTarget']=$this->getUniqueID();
+        $options['FormID']=$this->Page->getForm()->getClientID();
+        $options['onCallback']=$this->hasEventHandler('OnCallback');
+        $options['onCallbackExpired']=$this->hasEventHandler('OnCallbackExpired');
+        $options['options']['sitekey']=$this->getSiteKey();
+        if($theme=$this->getTheme()) $options['options']['theme']=$theme;
+        if($type=$this->getType()) $options['options']['type']=$type;
+        if($size=$this->getSize()) $options['options']['size']=$size;
+        if($tabIndex=$this->getTabIndex()) $options['options']['tabindex']=$tabIndex;
 
         return $options;
     }
     protected function registerClientScript()
     {
-        $id         = $this->getClientID();
-        $options    = TJavaScript::encode($this->getClientOptions());
-        $className  = $this->getClientClassName();
-        $cs         = $this->Page->ClientScript;
-        $code       = "new $className($options);";
+        $id=$this->getClientID();
+        $options=TJavaScript::encode($this->getClientOptions());
+        $className=$this->getClientClassName();
+        $cs=$this->Page->ClientScript;
+        $code="new $className($options);";
 
         $cs->registerPradoScript('ajax');
         $cs->registerEndScript("grecaptcha:$id", $code);
     }
     public function validate()
     {
-        $value = $this->getValidationPropertyValue();
-        if($value === null || empty($value))
+        $value=$this->getValidationPropertyValue();
+        if($value===null || empty($value))
             return false;
 
         return true;
@@ -299,46 +299,46 @@ 
     {
         parent::onPreRender($param);
 
-        if("" == $this->getSiteKey())
+        if(""==$this->getSiteKey())
             throw new TConfigurationException('recaptcha_publickey_unknown');
-        if("" == $this->getSecretKey())
+        if(""==$this->getSecretKey())
             throw new TConfigurationException('recaptcha_privatekey_unknown');
 
         // need to register captcha fields so they will be sent postback
         $this->Page->registerRequiresPostData($this->getResponseFieldName());
-        $this->Page->ClientScript->registerHeadScriptFile('grecaptcha2', 'https://www.google.com/recaptcha/api.js?onload=TReCaptcha2_onloadCallback&render=explicit&hl=' . $this->getLanguage());
+        $this->Page->ClientScript->registerHeadScriptFile('grecaptcha2', 'https://www.google.com/recaptcha/api.js?onload=TReCaptcha2_onloadCallback&render=explicit&hl='.$this->getLanguage());
     }
     protected function addAttributesToRender($writer)
     {
-        $writer->addAttribute('id',$this->getClientID());
+        $writer->addAttribute('id', $this->getClientID());
         parent::addAttributesToRender($writer);
     }
     public function raiseCallbackEvent($param)
     {
-        $params = $param->getCallbackParameter();
-        if ($params instanceof stdClass)
+        $params=$param->getCallbackParameter();
+        if($params instanceof stdClass)
         {
-            $callback = property_exists($params, 'onCallback');
-            $callbackExpired = property_exists($params, 'onCallbackExpired');
+            $callback=property_exists($params, 'onCallback');
+            $callbackExpired=property_exists($params, 'onCallbackExpired');
 
-            if ($callback)
+            if($callback)
             {
-                $this->WidgetId = $params->widgetId;
-                $this->Response = $params->response;
-                $this->Page->CallbackClient->jQuery($params->responseField, 'text',array($params->response));
+                $this->WidgetId=$params->widgetId;
+                $this->Response=$params->response;
+                $this->Page->CallbackClient->jQuery($params->responseField, 'text', array($params->response));
 
-                if ($params->onCallback)
+                if($params->onCallback)
                 {
                     $this->onCallback($param);
                 }
             }
 
-            if ($callbackExpired)
+            if($callbackExpired)
             {
-                $this->Response = '';
+                $this->Response='';
                 $this->reset();
 
-                if ($params->onCallbackExpired)
+                if($params->onCallbackExpired)
                 {
                     $this->onCallbackExpired($param);
                 }

framework/I18N/core/TCache_Lite.php

Spacing +105 added lines, -105 removed lines

@@ -54,7 +54,7 @@ 
     *
     * @var string $_cacheDir
     */
-    protected $_cacheDir = '/tmp/';
+    protected $_cacheDir='/tmp/';
 
     /**
     * Enable / disable caching
@@ -63,14 +63,14 @@ 
     *
     * @var boolean $_caching
     */
-    protected $_caching = true;
+    protected $_caching=true;
 
     /**
     * Cache lifetime (in seconds)
     *
     * @var int $_lifeTime
     */
-    protected $_lifeTime = 3600;
+    protected $_lifeTime=3600;
 
     /**
     * Enable / disable fileLocking
@@ -79,7 +79,7 @@ 
     *
     * @var boolean $_fileLocking
     */
-    protected $_fileLocking = true;
+    protected $_fileLocking=true;
 
     /**
     * Timestamp of the last valid cache
@@ -105,7 +105,7 @@ 
     *
     * @var boolean $_writeControl
     */
-    protected $_writeControl = true;
+    protected $_writeControl=true;
 
     /**
     * Enable / disable read control
@@ -115,7 +115,7 @@ 
     *
     * @var boolean $_writeControl
     */
-    protected $_readControl = true;
+    protected $_readControl=true;
 
     /**
     * Type of read control (only if read control is enabled)
@@ -128,7 +128,7 @@ 
     *
     * @var boolean $_readControlType
     */
-    protected $_readControlType = 'crc32';
+    protected $_readControlType='crc32';
 
     /**
     * Current cache id
@@ -151,7 +151,7 @@ 
     *
     * @var boolean $_memoryCaching
     */
-    protected $_memoryCaching = false;
+    protected $_memoryCaching=false;
 
     /**
     * Enable / Disable "Only Memory Caching"
@@ -159,28 +159,28 @@ 
     *
     * @var boolean $_onlyMemoryCaching
     */
-    protected $_onlyMemoryCaching = false;
+    protected $_onlyMemoryCaching=false;
 
     /**
     * Memory caching array
     *
     * @var array $_memoryCachingArray
     */
-    protected $_memoryCachingArray = array();
+    protected $_memoryCachingArray=array();
 
     /**
     * Memory caching counter
     *
     * @var int $memoryCachingCounter
     */
-    protected $_memoryCachingCounter = 0;
+    protected $_memoryCachingCounter=0;
 
     /**
     * Memory caching limit
     *
     * @var int $memoryCachingLimit
     */
-    protected $_memoryCachingLimit = 1000;
+    protected $_memoryCachingLimit=1000;
 
     /**
     * File Name protection
@@ -192,7 +192,7 @@ 
     *
     * @var boolean $fileNameProtection
     */
-    protected $_fileNameProtection = true;
+    protected $_fileNameProtection=true;
 
     /**
     * Enable / disable automatic serialization
@@ -202,7 +202,7 @@ 
     *
     * @var boolean $_serialize
     */
-    protected $_automaticSerialization = false;
+    protected $_automaticSerialization=false;
 
     // --- Public methods ---
 
@@ -228,9 +228,9 @@ 
     * @param array $options options
     * @access public
     */
-    function __construct($options = array(null))
+    function __construct($options=array(null))
     {
-        $availableOptions = array(	'automaticSerialization',
+        $availableOptions=array('automaticSerialization',
         							'fileNameProtection',
         							'memoryCaching',
         							'onlyMemoryCaching',
@@ -244,11 +244,11 @@ 
         							'readControlType');
         foreach($options as $key => $value) {
             if(in_array($key, $availableOptions)) {
-                $property = '_'.$key;
-                $this->$property = $value;
+                $property='_'.$key;
+                $this->$property=$value;
             }
         }
-        $this->_refreshTime = time() - $this->_lifeTime;
+        $this->_refreshTime=time() - $this->_lifeTime;
 	}
 
     /**
@@ -261,41 +261,41 @@ 
     * @return string data of the cache (or false if no cache available)
     * @access public
     */
-    function get($id, $group = 'default', $doNotTestCacheValidity = false)
+    function get($id, $group='default', $doNotTestCacheValidity=false)
     {
-        $this->_id = $id;
-        $this->_group = $group;
-        $data = false;
-        if ($this->_caching) {
+        $this->_id=$id;
+        $this->_group=$group;
+        $data=false;
+        if($this->_caching) {
             $this->_setFileName($id, $group);
-            if ($this->_memoryCaching) {
-                if (isset($this->_memoryCachingArray[$this->_file])) {
-                    if ($this->_automaticSerialization) {
+            if($this->_memoryCaching) {
+                if(isset($this->_memoryCachingArray[$this->_file])) {
+                    if($this->_automaticSerialization) {
                         return unserialize(
                         			$this->_memoryCachingArray[$this->_file]);
                     } else {
                         return $this->_memoryCachingArray[$this->_file];
                     }
                 } else {
-                    if ($this->_onlyMemoryCaching) {
+                    if($this->_onlyMemoryCaching) {
                         return false;
                     }
                 }
             }
-            if ($doNotTestCacheValidity) {
-                if (file_exists($this->_file)) {
-                    $data = $this->_read();
+            if($doNotTestCacheValidity) {
+                if(file_exists($this->_file)) {
+                    $data=$this->_read();
                 }
             } else {
-                if (@filemtime($this->_file) > $this->_refreshTime) {
-                    $data = $this->_read();
+                if(@filemtime($this->_file) > $this->_refreshTime) {
+                    $data=$this->_read();
                 }
             }
-            if (($data) and ($this->_memoryCaching)) {
+            if(($data) and ($this->_memoryCaching)) {
                 $this->_memoryCacheAdd($this->_file, $data);
             }
-            if ($this->_automaticSerialization && is_string($data)) {
-                $data = unserialize($data);
+            if($this->_automaticSerialization && is_string($data)) {
+                $data=unserialize($data);
             }
             return $data;
         }
@@ -312,24 +312,24 @@ 
     * @return boolean true if no problem
     * @access public
     */
-    function save($data, $id = null, $group = 'default')
+    function save($data, $id=null, $group='default')
     {
-        if ($this->_caching) {
-            if ($this->_automaticSerialization) {
-                $data = serialize($data);
+        if($this->_caching) {
+            if($this->_automaticSerialization) {
+                $data=serialize($data);
             }
-            if (isset($id)) {
+            if(isset($id)) {
                 $this->_setFileName($id, $group);
             }
-            if ($this->_memoryCaching) {
+            if($this->_memoryCaching) {
                 $this->_memoryCacheAdd($this->_file, $data);
-                if ($this->_onlyMemoryCaching) {
+                if($this->_onlyMemoryCaching) {
                     return true;
                 }
             }
-            if ($this->_writeControl) {
-                if (!$this->_writeAndControl($data)) {
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
+            if($this->_writeControl) {
+                if(!$this->_writeAndControl($data)) {
+                    @touch($this->_file, time() - 2 * abs($this->_lifeTime));
                     return false;
                 } else {
                     return true;
@@ -349,10 +349,10 @@ 
     * @return boolean true if no problem
     * @access public
     */
-    function remove($id, $group = 'default')
+    function remove($id, $group='default')
     {
         $this->_setFileName($id, $group);
-        if (!@unlink($this->_file)) {
+        if(!@unlink($this->_file)) {
             $this->raiseError('TCache_Lite : Unable to remove cache !', -3);
             return false;
         }
@@ -369,35 +369,35 @@ 
     * @return boolean true if no problem
     * @access public
     */
-    function clean($group = false)
+    function clean($group=false)
     {
-        if ($this->_fileNameProtection) {
-            $motif = ($group) ? 'cache_'.md5($group).'_' : 'cache_';
+        if($this->_fileNameProtection) {
+            $motif=($group) ? 'cache_'.md5($group).'_' : 'cache_';
         } else {
-            $motif = ($group) ? 'cache_'.$group.'_' : 'cache_';
+            $motif=($group) ? 'cache_'.$group.'_' : 'cache_';
         }
-        if ($this->_memoryCaching) {
-            while (list($key, $value) = each($this->_memoryCaching)) {
-                if (strpos($key, $motif, 0)) {
+        if($this->_memoryCaching) {
+            while(list($key, $value)=each($this->_memoryCaching)) {
+                if(strpos($key, $motif, 0)) {
                     unset($this->_memoryCaching[$key]);
-                    $this->_memoryCachingCounter =
+                    $this->_memoryCachingCounter=
                     		$this->_memoryCachingCounter - 1;
                 }
             }
-            if ($this->_onlyMemoryCaching) {
+            if($this->_onlyMemoryCaching) {
                 return true;
             }
         }
-        if (!($dh = opendir($this->_cacheDir))) {
+        if(!($dh=opendir($this->_cacheDir))) {
             $this->raiseError('TCache_Lite : Unable to open cache directory !');
             return false;
         }
-        while ($file = readdir($dh)) {
-            if (($file != '.') && ($file != '..')) {
-                $file = $this->_cacheDir . $file;
-                if (is_file($file)) {
-                    if (strpos($file, $motif, 0)) {
-                        if (!@unlink($file)) {
+        while($file=readdir($dh)) {
+            if(($file!='.') && ($file!='..')) {
+                $file=$this->_cacheDir.$file;
+                if(is_file($file)) {
+                    if(strpos($file, $motif, 0)) {
+                        if(!@unlink($file)) {
              $this->raiseError('Cache_Lite : Unable to remove cache !', -3);
                             return false;
                         }
@@ -416,22 +416,22 @@ 
     */
     function setLifeTime($newLifeTime)
     {
-        $this->_lifeTime = $newLifeTime;
-        $this->_refreshTime = time() - $newLifeTime;
+        $this->_lifeTime=$newLifeTime;
+        $this->_refreshTime=time() - $newLifeTime;
     }
 
     /**
     *
     * @access public
     */
-    function saveMemoryCachingState($id, $group = 'default')
+    function saveMemoryCachingState($id, $group='default')
     {
-        if ($this->_caching) {
-            $array = array(
+        if($this->_caching) {
+            $array=array(
                 'counter' => $this->_memoryCachingCounter,
                 'array' => $this->_memoryCachingState
             );
-            $data = serialize($array);
+            $data=serialize($array);
             $this->save($data, $id, $group);
         }
     }
@@ -440,15 +440,15 @@ 
     *
     * @access public
     */
-    function getMemoryCachingState($id, $group = 'default',
-    								$doNotTestCacheValidity = false)
+    function getMemoryCachingState($id, $group='default',
+    								$doNotTestCacheValidity=false)
     {
-        if ($this->_caching) {
-            if ($data = $this->get($id, $group, $doNotTestCacheValidity))
+        if($this->_caching) {
+            if($data=$this->get($id, $group, $doNotTestCacheValidity))
             {
-                $array = unserialize($data);
-                $this->_memoryCachingCounter = $array['counter'];
-                $this->_memoryCachingArray = $array['array'];
+                $array=unserialize($data);
+                $this->_memoryCachingCounter=$array['counter'];
+                $this->_memoryCachingArray=$array['array'];
             }
         }
     }
@@ -488,12 +488,12 @@ 
     */
     function _memoryCacheAdd($id, $data)
     {
-        $this->_memoryCachingArray[$this->_file] = $data;
-        if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
-            list($key, $value) = each($this->_memoryCachingArray);
+        $this->_memoryCachingArray[$this->_file]=$data;
+        if($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
+            list($key, $value)=each($this->_memoryCachingArray);
             unset($this->_memoryCachingArray[$key]);
         } else {
-            $this->_memoryCachingCounter = $this->_memoryCachingCounter + 1;
+            $this->_memoryCachingCounter=$this->_memoryCachingCounter + 1;
         }
     }
 
@@ -506,11 +506,11 @@ 
     */
     function _setFileName($id, $group)
     {
-        if ($this->_fileNameProtection) {
-            $this->_file = ($this->_cacheDir.'cache_'.md5($group).'_'
+        if($this->_fileNameProtection) {
+            $this->_file=($this->_cacheDir.'cache_'.md5($group).'_'
             						.md5($id));
         } else {
-            $this->_file = $this->_cacheDir.'cache_'.$group.'_'.$id;
+            $this->_file=$this->_cacheDir.'cache_'.$group.'_'.$id;
         }
     }
 
@@ -527,23 +527,23 @@ 
     */
     function _read()
     {
-        $fp = @fopen($this->_file, "rb");
-        if ($this->_fileLocking) @flock($fp, LOCK_SH);
-        if ($fp) {
+        $fp=@fopen($this->_file, "rb");
+        if($this->_fileLocking) @flock($fp, LOCK_SH);
+        if($fp) {
         	// because the filesize can be cached by PHP itself...
             clearstatcache();
-            $length = @filesize($this->_file);
-            if ($this->_readControl) {
-                $hashControl = @fread($fp, 32);
-                $length = $length - 32;
+            $length=@filesize($this->_file);
+            if($this->_readControl) {
+                $hashControl=@fread($fp, 32);
+                $length=$length - 32;
             }
-            $data = @fread($fp, $length);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
+            $data=@fread($fp, $length);
+            if($this->_fileLocking) @flock($fp, LOCK_UN);
             @fclose($fp);
-            if ($this->_readControl) {
-                $hashData = $this->_hash($data, $this->_readControlType);
-                if ($hashData != $hashControl) {
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
+            if($this->_readControl) {
+                $hashData=$this->_hash($data, $this->_readControlType);
+                if($hashData!=$hashControl) {
+                    @touch($this->_file, time() - 2 * abs($this->_lifeTime));
                     return false;
                 }
             }
@@ -562,15 +562,15 @@ 
     */
     function _write($data)
     {
-        $fp = @fopen($this->_file, "wb");
-        if ($fp) {
-            if ($this->_fileLocking) @flock($fp, LOCK_EX);
-            if ($this->_readControl) {
+        $fp=@fopen($this->_file, "wb");
+        if($fp) {
+            if($this->_fileLocking) @flock($fp, LOCK_EX);
+            if($this->_readControl) {
                 @fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
             }
-            $len = strlen($data);
+            $len=strlen($data);
             @fwrite($fp, $data, $len);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
+            if($this->_fileLocking) @flock($fp, LOCK_UN);
             @fclose($fp);
             return true;
         }
@@ -589,7 +589,7 @@ 
     function _writeAndControl($data)
     {
         $this->_write($data);
-        $dataRead = $this->_read($data);
+        $dataRead=$this->_read($data);
         return ($dataRead==$data);
     }
 
@@ -603,7 +603,7 @@ 
     */
     function _hash($data, $controlType)
     {
-        switch ($controlType) {
+        switch($controlType) {
         case 'md5':
             return md5($data);
         case 'crc32':

framework/Web/Javascripts/css-packages.php

Spacing +4 added lines, -4 removed lines

@@ -3,11 +3,11 @@ 
 //$Id: packages.php 3319 2013-09-08 20:59:44Z ctrlaltca $
 
 // To make future upgrades easier
-if (!defined('JQUERY_DIR')) define ('JQUERY_DIR', 'jquery');
-if (!defined('BOOTSTRAP_DIR')) define ('BOOTSTRAP_DIR', 'bootstrap3');
+if(!defined('JQUERY_DIR')) define('JQUERY_DIR', 'jquery');
+if(!defined('BOOTSTRAP_DIR')) define('BOOTSTRAP_DIR', 'bootstrap3');
 
 //package names and its contents (files relative to the current directory)
-$packages = array(
+$packages=array(
 	'jquery-ui' => array(
 		JQUERY_DIR.'/css/base/jquery-ui.css',
 	),
@@ -68,7 +68,7 @@ 
 
 
 //package names and their dependencies
-$dependencies = array(
+$dependencies=array(
 		'jquery-ui'				=> array('jquery-ui'),
 		'jquery.ui.accordion'	=> array('jquery.ui.core', 'jquery.ui.accordion'),
 		'jquery.ui.autocomplete'	=> array('jquery.ui.core', 'jquery.ui.autocomplete'),

framework/Web/UI/TClientScriptManager.php

Spacing +104 added lines, -104 removed lines

@@ -144,7 +144,7 @@ 
 	{
 		$this->registerPradoScriptInternal($name);
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPradoScript',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPradoScript', $params);
 	}
 
 	/**
@@ -155,39 +155,39 @@ 
 		// $this->checkIfNotInRender();
 		if(!isset($this->_registeredPradoScripts[$name]))
 		{
-			if(self::$_pradoScripts === null)
+			if(self::$_pradoScripts===null)
 			{
-				$packageFile = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::PACKAGES_FILE;
-				list($packages,$deps)= include($packageFile);
-				self::$_pradoScripts = $deps;
-				self::$_pradoPackages = $packages;
+				$packageFile=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::PACKAGES_FILE;
+				list($packages, $deps)=include($packageFile);
+				self::$_pradoScripts=$deps;
+				self::$_pradoPackages=$packages;
 			}
 
-			if (isset(self::$_pradoScripts[$name]))
+			if(isset(self::$_pradoScripts[$name]))
 				$this->_registeredPradoScripts[$name]=true;
 			else
-				throw new TInvalidOperationException('csmanager_pradoscript_invalid',$name);
+				throw new TInvalidOperationException('csmanager_pradoscript_invalid', $name);
 
 			if(($packages=array_keys($this->_registeredPradoScripts))!==array())
 			{
-				$base = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
-				list($path,$baseUrl)=$this->getPackagePathUrl($base);
+				$base=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
+				list($path, $baseUrl)=$this->getPackagePathUrl($base);
 				$packagesUrl=array();
 				$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
-				foreach ($packages as $p)
+				foreach($packages as $p)
 				{
-					foreach (self::$_pradoScripts[$p] as $dep)
+					foreach(self::$_pradoScripts[$p] as $dep)
 					{
-						foreach (self::$_pradoPackages[$dep] as $script)
-						if (!isset($this->_expandedPradoScripts[$script]))
+						foreach(self::$_pradoPackages[$dep] as $script)
+						if(!isset($this->_expandedPradoScripts[$script]))
 						{
-							$this->_expandedPradoScripts[$script] = true;
+							$this->_expandedPradoScripts[$script]=true;
 							if($isDebug)
 							{
-								if (!in_array($url=$baseUrl.'/'.$script,$packagesUrl))
+								if(!in_array($url=$baseUrl.'/'.$script, $packagesUrl))
 									$packagesUrl[]=$url;
 							} else {
-								if (!in_array($url=$baseUrl.'/min/'.$script,$packagesUrl))
+								if(!in_array($url=$baseUrl.'/min/'.$script, $packagesUrl))
 								{
 									if(!is_file($filePath=$path.'/min/'.$script))
 									{
@@ -204,7 +204,7 @@ 
 					}
 				}
 				foreach($packagesUrl as $url)
-					$this->registerScriptFile($url,$url);
+					$this->registerScriptFile($url, $url);
 			}
 		}
 	}
@@ -214,8 +214,8 @@ 
 	 */
 	public function getPradoScriptAssetUrl()
 	{
-		$base = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
-		$assets = Prado::getApplication()->getAssetManager();
+		$base=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
+		$assets=Prado::getApplication()->getAssetManager();
 		return $assets->getPublishedUrl($base);
 	}
 
@@ -225,9 +225,9 @@ 
 	 */
 	public function getScriptUrls()
 	{
-		$scripts = array_values($this->_headScriptFiles);
-		$scripts = array_merge($scripts, array_values($this->_scriptFiles));
-		$scripts = array_unique($scripts);
+		$scripts=array_values($this->_headScriptFiles);
+		$scripts=array_merge($scripts, array_values($this->_scriptFiles));
+		$scripts=array_unique($scripts);
 
 		return $scripts;
 	}
@@ -238,17 +238,17 @@ 
 	 */
 	protected function getPackagePathUrl($base)
 	{
-		$assets = Prado::getApplication()->getAssetManager();
+		$assets=Prado::getApplication()->getAssetManager();
 		if(strpos($base, $assets->getBaseUrl())===false)
 		{
-			if(($dir = Prado::getPathOfNameSpace($base)) !== null) {
-				$base = $dir;
+			if(($dir=Prado::getPathOfNameSpace($base))!==null) {
+				$base=$dir;
 			}
 			return array($assets->getPublishedPath($base), $assets->publishFilePath($base));
 		}
 		else
 		{
-			return array($assets->getBasePath().str_replace($assets->getBaseUrl(),'',$base), $base);
+			return array($assets->getBasePath().str_replace($assets->getBaseUrl(), '', $base), $base);
 		}
 	}
 
@@ -260,13 +260,13 @@ 
 	 */
 	public function getCallbackReference(ICallbackEventHandler $callbackHandler, $options=null)
 	{
-		$options = !is_array($options) ? array() : $options;
-		$class = new ReflectionClass($callbackHandler);
-		$clientSide = $callbackHandler->getActiveControl()->getClientSide();
-		$options = array_merge($options, $clientSide->getOptions()->toArray());
-		$optionString = TJavaScript::encode($options);
+		$options=!is_array($options) ? array() : $options;
+		$class=new ReflectionClass($callbackHandler);
+		$clientSide=$callbackHandler->getActiveControl()->getClientSide();
+		$options=array_merge($options, $clientSide->getOptions()->toArray());
+		$optionString=TJavaScript::encode($options);
 		$this->registerPradoScriptInternal('ajax');
-		$id = $callbackHandler->getUniqueID();
+		$id=$callbackHandler->getUniqueID();
 		return "new Prado.CallbackRequest('{$id}',{$optionString})";
 	}
 
@@ -283,7 +283,7 @@ 
 		$this->registerPradoScriptInternal('ajax');
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerCallbackControl',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerCallbackControl', $params);
 	}
 
 	/**
@@ -292,9 +292,9 @@ 
 	 * @param string javascript class responsible for the control being registered for postback
 	 * @param array postback options
 	 */
-	public function registerPostBackControl($class,$options)
+	public function registerPostBackControl($class, $options)
 	{
-		if($class === null) {
+		if($class===null) {
 			return;
 		}
 		if(!isset($options['FormID']) && ($form=$this->_page->getForm())!==null)
@@ -306,7 +306,7 @@ 
 		$this->registerPradoScriptInternal('prado');
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPostBackControl',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPostBackControl', $params);
 	}
 
 	/**
@@ -317,7 +317,7 @@ 
 	 */
 	public function registerDefaultButton($panel, $button)
 	{
-		$panelID=is_string($panel)?$panel:$panel->getUniqueID();
+		$panelID=is_string($panel) ? $panel : $panel->getUniqueID();
 
 		if(is_string($button))
 			$buttonID=$button;
@@ -326,14 +326,14 @@ 
 			$button->setIsDefaultButton(true);
 			$buttonID=$button->getUniqueID();
 		}
-		$options = TJavaScript::encode($this->getDefaultButtonOptions($panelID, $buttonID));
-		$code = "new Prado.WebUI.DefaultButton($options);";
+		$options=TJavaScript::encode($this->getDefaultButtonOptions($panelID, $buttonID));
+		$code="new Prado.WebUI.DefaultButton($options);";
 
 		$this->_endScripts['prado:'.$panelID]=$code;
 		$this->registerPradoScriptInternal('prado');
 
-		$params=array($panelID,$buttonID);
-		$this->_page->registerCachingAction('Page.ClientScript','registerDefaultButton',$params);
+		$params=array($panelID, $buttonID);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerDefaultButton', $params);
 	}
 
 	/**
@@ -343,11 +343,11 @@ 
 	 */
 	protected function getDefaultButtonOptions($panelID, $buttonID)
 	{
-		$options['ID'] = TControl::convertUniqueIdToClientId($panelID);
-		$options['Panel'] = TControl::convertUniqueIdToClientId($panelID);
-		$options['Target'] = TControl::convertUniqueIdToClientId($buttonID);
-		$options['EventTarget'] = $buttonID;
-		$options['Event'] = 'click';
+		$options['ID']=TControl::convertUniqueIdToClientId($panelID);
+		$options['Panel']=TControl::convertUniqueIdToClientId($panelID);
+		$options['Target']=TControl::convertUniqueIdToClientId($buttonID);
+		$options['EventTarget']=$buttonID;
+		$options['Event']='click';
 		return $options;
 	}
 
@@ -360,10 +360,10 @@ 
 		$this->registerPradoScriptInternal('jquery');
 		if($target instanceof TControl)
 			$target=$target->getClientID();
-		$this->_endScripts['prado:focus'] = 'jQuery(\'#'.$target.'\').focus();';
+		$this->_endScripts['prado:focus']='jQuery(\'#'.$target.'\').focus();';
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerFocusControl',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerFocusControl', $params);
 	}
 
 	/**
@@ -375,7 +375,7 @@ 
 	{
 		$this->registerPradoStyleInternal($name);
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerPradoStyle',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerPradoStyle', $params);
 	}
 
 	/**
@@ -386,43 +386,43 @@ 
 		// $this->checkIfNotInRender();
 		if(!isset($this->_registeredPradoStyles[$name]))
 		{
-			$base = $this->getPradoScriptAssetUrl();
+			$base=$this->getPradoScriptAssetUrl();
 
-			if(self::$_pradoStyles === null)
+			if(self::$_pradoStyles===null)
 			{
-				$packageFile = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::CSS_PACKAGES_FILE;
-				list($packages,$deps)= include($packageFile);
-				self::$_pradoStyles = $deps;
-				self::$_pradoStylePackages = $packages;
+				$packageFile=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::CSS_PACKAGES_FILE;
+				list($packages, $deps)=include($packageFile);
+				self::$_pradoStyles=$deps;
+				self::$_pradoStylePackages=$packages;
 			}
 
-			if (isset(self::$_pradoStyles[$name]))
+			if(isset(self::$_pradoStyles[$name]))
 				$this->_registeredPradoStyles[$name]=true;
 			else
-				throw new TInvalidOperationException('csmanager_pradostyle_invalid',$name);
+				throw new TInvalidOperationException('csmanager_pradostyle_invalid', $name);
 
 			if(($packages=array_keys($this->_registeredPradoStyles))!==array())
 			{
-				$base = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
-				list($path,$baseUrl)=$this->getPackagePathUrl($base);
+				$base=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_PATH;
+				list($path, $baseUrl)=$this->getPackagePathUrl($base);
 				$packagesUrl=array();
 				$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
-				foreach ($packages as $p)
+				foreach($packages as $p)
 				{
-					foreach (self::$_pradoStyles[$p] as $dep)
+					foreach(self::$_pradoStyles[$p] as $dep)
 					{
-						foreach (self::$_pradoStylePackages[$dep] as $style)
-						if (!isset($this->_expandedPradoStyles[$style]))
+						foreach(self::$_pradoStylePackages[$dep] as $style)
+						if(!isset($this->_expandedPradoStyles[$style]))
 						{
-							$this->_expandedPradoStyles[$style] = true;
+							$this->_expandedPradoStyles[$style]=true;
 							// TODO minify css?
-							if (!in_array($url=$baseUrl.'/'.$style,$packagesUrl))
+							if(!in_array($url=$baseUrl.'/'.$style, $packagesUrl))
 								$packagesUrl[]=$url;
 						}
 					}
 				}
 				foreach($packagesUrl as $url)
-					$this->registerStyleSheetFile($url,$url);
+					$this->registerStyleSheetFile($url, $url);
 			}
 		}
 	}
@@ -449,15 +449,15 @@ 
 	 * @param string URL to the CSS file
 	 * @param string media type of the CSS (such as 'print', 'screen', etc.). Defaults to empty, meaning the CSS applies to all media types.
 	 */
-	public function registerStyleSheetFile($key,$url,$media='')
+	public function registerStyleSheetFile($key, $url, $media='')
 	{
 		if($media==='')
 			$this->_styleSheetFiles[$key]=$url;
 		else
-			$this->_styleSheetFiles[$key]=array($url,$media);
+			$this->_styleSheetFiles[$key]=array($url, $media);
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerStyleSheetFile',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheetFile', $params);
 	}
 
 	/**
@@ -465,12 +465,12 @@ 
 	 * @param string a unique key identifying the CSS block
 	 * @param string CSS block
 	 */
-	public function registerStyleSheet($key,$css,$media='')
+	public function registerStyleSheet($key, $css, $media='')
 	{
 		$this->_styleSheets[$key]=$css;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerStyleSheet',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheet', $params);
 	}
 
 	/**
@@ -479,17 +479,17 @@ 
 	 */
 	public function getStyleSheetUrls()
 	{
-		$stylesheets = array_values(
+		$stylesheets=array_values(
 			array_map(
 				create_function('$e', 'return is_array($e) ? $e[0] : $e;'),
 				$this->_styleSheetFiles)
 		);
 
 		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path=>$url)
-			if (substr($url,strlen($url)-4)=='.css')
-				$stylesheets[] = $url;
+			if(substr($url, strlen($url) - 4)=='.css')
+				$stylesheets[]=$url;
 
-		$stylesheets = array_unique($stylesheets);
+		$stylesheets=array_unique($stylesheets);
 
 		return $stylesheets;
 	}
@@ -508,13 +508,13 @@ 
 	 * @param string a unique key identifying the file
 	 * @param string URL to the javascript file
 	 */
-	public function registerHeadScriptFile($key,$url)
+	public function registerHeadScriptFile($key, $url)
 	{
 		$this->checkIfNotInRender();
 		$this->_headScriptFiles[$key]=$url;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHeadScriptFile',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHeadScriptFile', $params);
 	}
 
 	/**
@@ -522,13 +522,13 @@ 
 	 * @param string a unique key identifying the script block
 	 * @param string javascript block
 	 */
-	public function registerHeadScript($key,$script)
+	public function registerHeadScript($key, $script)
 	{
 		$this->checkIfNotInRender();
 		$this->_headScripts[$key]=$script;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHeadScript',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHeadScript', $params);
 	}
 
 	/**
@@ -541,7 +541,7 @@ 
 		$this->_scriptFiles[$key]=$url;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerScriptFile',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerScriptFile', $params);
 	}
 
 	/**
@@ -549,13 +549,13 @@ 
 	 * @param string a unique key identifying the script block
 	 * @param string javascript block
 	 */
-	public function registerBeginScript($key,$script)
+	public function registerBeginScript($key, $script)
 	{
 		$this->checkIfNotInRender();
 		$this->_beginScripts[$key]=$script;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerBeginScript',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerBeginScript', $params);
 	}
 
 	/**
@@ -563,12 +563,12 @@ 
 	 * @param string a unique key identifying the script block
 	 * @param string javascript block
 	 */
-	public function registerEndScript($key,$script)
+	public function registerEndScript($key, $script)
 	{
 		$this->_endScripts[$key]=$script;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerEndScript',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerEndScript', $params);
 	}
 
 	/**
@@ -577,12 +577,12 @@ 
 	 * @param string|array hidden field value, if the value is an array, every element
 	 * in the array will be rendered as a hidden field value.
 	 */
-	public function registerHiddenField($name,$value)
+	public function registerHiddenField($name, $value)
 	{
 		$this->_hiddenFields[$name]=$value;
 
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','registerHiddenField',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'registerHiddenField', $params);
 	}
 
 	/**
@@ -695,7 +695,7 @@ 
 	public function renderStyleSheets($writer)
 	{
 		if(count($this->_styleSheets))
-			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n".implode("\n",$this->_styleSheets)."\n/*]]>*/\n</style>\n");
+			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n".implode("\n", $this->_styleSheets)."\n/*]]>*/\n</style>\n");
 	}
 
 	/**
@@ -703,7 +703,7 @@ 
 	 */
 	public function renderHeadScriptFiles($writer)
 	{
-		$this->renderScriptFiles($writer,$this->_headScriptFiles);
+		$this->renderScriptFiles($writer, $this->_headScriptFiles);
 	}
 
 	/**
@@ -726,9 +726,9 @@ 
 
 	public function markScriptFileAsRendered($url)
 	{
-		$this->_renderedScriptFiles[$url] = $url;
+		$this->_renderedScriptFiles[$url]=$url;
 		$params=func_get_args();
-		$this->_page->registerCachingAction('Page.ClientScript','markScriptFileAsRendered',$params);
+		$this->_page->registerCachingAction('Page.ClientScript', 'markScriptFileAsRendered', $params);
 	}
 
 	protected function renderScriptFiles($writer, Array $scripts)
@@ -752,8 +752,8 @@ 
 	{
 		if(!empty($this->_scriptFiles))
 		{
-			$addedScripts = array_diff($this->_scriptFiles,$this->getRenderedScriptFiles());
-			$this->renderScriptFiles($writer,$addedScripts);
+			$addedScripts=array_diff($this->_scriptFiles, $this->getRenderedScriptFiles());
+			$this->renderScriptFiles($writer, $addedScripts);
 		}
 	}
 
@@ -791,12 +791,12 @@ 
 
 	public function renderHiddenFieldsBegin($writer)
 	{
-		$this->renderHiddenFieldsInt($writer,true);
+		$this->renderHiddenFieldsInt($writer, true);
 	}
 
 	public function renderHiddenFieldsEnd($writer)
 	{
-		$this->renderHiddenFieldsInt($writer,false);
+		$this->renderHiddenFieldsInt($writer, false);
 	}
 
 	/**
@@ -818,12 +818,12 @@ 
 	 */
 	protected function renderHiddenFieldsInt($writer, $initial)
  	{
-		if ($initial) $this->_renderedHiddenFields = array();
+		if($initial) $this->_renderedHiddenFields=array();
 		$str='';
 		foreach($this->_hiddenFields as $name=>$value)
 		{
-			if (in_array($name,$this->_renderedHiddenFields)) continue;
-			$id=strtr($name,':','_');
+			if(in_array($name, $this->_renderedHiddenFields)) continue;
+			$id=strtr($name, ':', '_');
 			if(is_array($value))
 			{
 				foreach($value as $v)
@@ -833,7 +833,7 @@ 
 			{
 				$str.='<input type="hidden" name="'.$name.'" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
 			}
-			$this->_renderedHiddenFields[] = $name;
+			$this->_renderedHiddenFields[]=$name;
 		}
 		if($str!=='')
 			$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
@@ -849,7 +849,7 @@ 
 	 */
 	protected function checkIfNotInRender()
 	{
-		if ($form = $this->_page->InFormRender)
+		if($form=$this->_page->InFormRender)
 			throw new Exception('Operation invalid when page is already rendering');
 	}
 }
@@ -883,7 +883,7 @@ 
 	protected function setFunction($name, $code)
 	{
 		if(!TJavaScript::isJsLiteral($code))
-			$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
+			$code=TJavaScript::quoteJsLiteral($this->ensureFunction($code));
 		$this->setOption($name, $code);
 	}
 
@@ -892,7 +892,7 @@ 
 	 */
 	protected function getOption($name)
 	{
-		if ($this->_options)
+		if($this->_options)
 			return $this->_options->itemAt($name);
 		else
 			return null;
@@ -912,8 +912,8 @@ 
 	 */
 	public function getOptions()
 	{
-		if (!$this->_options)
-			$this->_options = Prado::createComponent('System.Collections.TMap');
+		if(!$this->_options)
+			$this->_options=Prado::createComponent('System.Collections.TMap');
 		return $this->_options;
 	}
 

framework/Web/UI/WebControls/TStyleSheet.php

Spacing +6 added lines, -6 removed lines

@@ -82,7 +82,7 @@ 
 	 */
 	public function getMediaType()
 	{
-		return $this->getViewState('MediaType','');
+		return $this->getViewState('MediaType', '');
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 	 */
 	public function setMediaType($value)
 	{
-		$this->setViewState('MediaType',$value,'');
+		$this->setViewState('MediaType', $value, '');
 	}
 
 	/**
@@ -100,17 +100,17 @@ 
 	 */
 	public function onPreRender($param)
 	{
-		$cs = $this->getPage()->getClientScript();
+		$cs=$this->getPage()->getClientScript();
 
-		$styles = preg_split('/,|\s+/', $this->getPradoStyles());
+		$styles=preg_split('/,|\s+/', $this->getPradoStyles());
 		foreach($styles as $style)
 		{
-			if(($style = trim($style))!=='')
+			if(($style=trim($style))!=='')
 				$cs->registerPradoStyle($style);
 		}
 
 		if(($url=$this->getStyleSheetUrl())!=='')
-			$cs->registerStyleSheetFile($url,$url,$this->getMediaType());
+			$cs->registerStyleSheetFile($url, $url, $this->getMediaType());
 	}
 
 	/**

framework/PradoBase.php

Spacing +78 added lines, -78 removed lines

@@ -16,12 +16,12 @@ 
  * Defines the PRADO framework installation path.
  */
 if(!defined('PRADO_DIR'))
-	define('PRADO_DIR',dirname(__FILE__));
+	define('PRADO_DIR', dirname(__FILE__));
 /**
  * Defines the default permission for writable directories and files
  */
 if(!defined('PRADO_CHMOD'))
-	define('PRADO_CHMOD',0777);
+	define('PRADO_CHMOD', 0777);
 
 /**
  * PradoBase class.
@@ -62,7 +62,7 @@ 
 	/**
 	 * @var array list of class exists checks
 	 */
-	protected static $classExists = array();
+	protected static $classExists=array();
 
 	/**
 	 * @return string the version of Prado framework
@@ -82,15 +82,15 @@ 
 		/**
 		 * Sets error handler to be Prado::phpErrorHandler
 		 */
-		set_error_handler(array('PradoBase','phpErrorHandler'));
+		set_error_handler(array('PradoBase', 'phpErrorHandler'));
 		/**
 		 * Sets shutdown function to be Prado::phpFatalErrorHandler
 		 */
-		register_shutdown_function(array('PradoBase','phpFatalErrorHandler'));
+		register_shutdown_function(array('PradoBase', 'phpFatalErrorHandler'));
 		/**
 		 * Sets exception handler to be Prado::exceptionHandler
 		 */
-		set_exception_handler(array('PradoBase','exceptionHandler'));
+		set_exception_handler(array('PradoBase', 'exceptionHandler'));
 		/**
 		 * Disable php's builtin error reporting to avoid duplicated reports
 		 */
@@ -113,11 +113,11 @@ 
 	 */
 	public static function poweredByPrado($logoType=0)
 	{
-		$logoName=$logoType==1?'powered2':'powered';
+		$logoName=$logoType==1 ? 'powered2' : 'powered';
 		if(self::$_application!==null)
 		{
 			$am=self::$_application->getAssetManager();
-			$url=$am->publishFilePath(self::getPathOfNamespace('System.'.$logoName,'.gif'));
+			$url=$am->publishFilePath(self::getPathOfNamespace('System.'.$logoName, '.gif'));
 		}
 		else
 			$url='http://pradosoft.github.io/docs/'.$logoName.'.gif';
@@ -134,10 +134,10 @@ 
 	 * @param string the filename that the error was raised in
 	 * @param integer the line number the error was raised at
 	 */
-	public static function phpErrorHandler($errno,$errstr,$errfile,$errline)
+	public static function phpErrorHandler($errno, $errstr, $errfile, $errline)
 	{
 		if(error_reporting() & $errno)
-			throw new TPhpErrorException($errno,$errstr,$errfile,$errline);
+			throw new TPhpErrorException($errno, $errstr, $errfile, $errline);
 	}
 
 	/**
@@ -148,12 +148,12 @@ 
 	 */
 	public static function phpFatalErrorHandler()
 	{
-		$error = error_get_last();
+		$error=error_get_last();
 		if($error && 
 			TPhpErrorException::isFatalError($error) &&
 			error_reporting() & $error['type'])
 		{
-			self::exceptionHandler(new TPhpErrorException($error['type'],$error['message'],$error['file'],$error['line']));
+			self::exceptionHandler(new TPhpErrorException($error['type'], $error['message'], $error['file'], $error['line']));
 		}
 	}
 
@@ -170,7 +170,7 @@ 
 	{
 		if(self::$_application!==null && ($errorHandler=self::$_application->getErrorHandler())!==null)
 		{
-			$errorHandler->handleError(null,$exception);
+			$errorHandler->handleError(null, $exception);
 		}
 		else
 		{
@@ -227,19 +227,19 @@ 
 	public static function createComponent($type)
 	{
 		if(!isset(self::$classExists[$type]))
-			self::$classExists[$type] = class_exists($type, false);
+			self::$classExists[$type]=class_exists($type, false);
 
-		if( !isset(self::$_usings[$type]) && !self::$classExists[$type]) {
+		if(!isset(self::$_usings[$type]) && !self::$classExists[$type]) {
 			self::using($type);
-			self::$classExists[$type] = class_exists($type, false);
+			self::$classExists[$type]=class_exists($type, false);
 		}
 
-		if( ($pos = strrpos($type, '.')) !== false)
-			$type = substr($type,$pos+1);
+		if(($pos=strrpos($type, '.'))!==false)
+			$type=substr($type, $pos + 1);
 
-		if(($n=func_num_args())>1)
+		if(($n=func_num_args()) > 1)
 		{
-			$args = func_get_args();
+			$args=func_get_args();
 			switch($n) {
 				case 2:
 					return new $type($args[1]);
@@ -255,7 +255,7 @@ 
 				break;
 				default:
 					$s='$args[1]';
-					for($i=2;$i<$n;++$i)
+					for($i=2; $i < $n; ++$i)
 						$s.=",\$args[$i]";
 					eval("\$component=new $type($s);");
 					return $component;
@@ -275,11 +275,11 @@ 
 	 * @param boolean whether to check the existence of the class after the class file is included
 	 * @throws TInvalidDataValueException if the namespace is invalid
 	 */
-	public static function using($namespace,$checkClassExistence=true)
+	public static function using($namespace, $checkClassExistence=true)
 	{
-		if(isset(self::$_usings[$namespace]) || class_exists($namespace,false))
+		if(isset(self::$_usings[$namespace]) || class_exists($namespace, false))
 			return;
-		if(($pos=strrpos($namespace,'.'))===false)  // a class name
+		if(($pos=strrpos($namespace, '.'))===false)  // a class name
 		{
 			try
 			{
@@ -287,15 +287,15 @@ 
 			}
 			catch(Exception $e)
 			{
-				if($checkClassExistence && !class_exists($namespace,false))
-					throw new TInvalidOperationException('prado_component_unknown',$namespace,$e->getMessage());
+				if($checkClassExistence && !class_exists($namespace, false))
+					throw new TInvalidOperationException('prado_component_unknown', $namespace, $e->getMessage());
 				else
 					throw $e;
 			}
 		}
-		else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
+		else if(($path=self::getPathOfNamespace($namespace, self::CLASS_FILE_EXT))!==null)
 		{
-			$className=substr($namespace,$pos+1);
+			$className=substr($namespace, $pos + 1);
 			if($className==='*')  // a directory
 			{
 				self::$_usings[$namespace]=$path;
@@ -304,7 +304,7 @@ 
 			else  // a file
 			{
 				self::$_usings[$namespace]=$path;
-				if(!$checkClassExistence || !class_exists($className,false))
+				if(!$checkClassExistence || !class_exists($className, false))
 				{
 					try
 					{
@@ -312,8 +312,8 @@ 
 					}
 					catch(Exception $e)
 					{
-						if($checkClassExistence && !class_exists($className,false))
-							throw new TInvalidOperationException('prado_component_unknown',$className,$e->getMessage());
+						if($checkClassExistence && !class_exists($className, false))
+							throw new TInvalidOperationException('prado_component_unknown', $className, $e->getMessage());
 						else
 							throw $e;
 					}
@@ -321,7 +321,7 @@ 
 			}
 		}
 		else
-			throw new TInvalidDataValueException('prado_using_invalid',$namespace);
+			throw new TInvalidDataValueException('prado_using_invalid', $namespace);
 	}
 
 	/**
@@ -338,7 +338,7 @@ 
 	 */
 	public static function getPathOfNamespace($namespace, $ext='')
 	{
-		if(self::CLASS_FILE_EXT === $ext || empty($ext))
+		if(self::CLASS_FILE_EXT===$ext || empty($ext))
 		{
 			if(isset(self::$_usings[$namespace]))
 				return self::$_usings[$namespace];
@@ -347,11 +347,11 @@ 
 				return self::$_aliases[$namespace];
 		}
 
-		$segs = explode('.',$namespace);
-		$alias = array_shift($segs);
+		$segs=explode('.', $namespace);
+		$alias=array_shift($segs);
 
-		if(null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias)))
-			return rtrim($root.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR ,$segs),'/\\').(($file === '*') ? '' : DIRECTORY_SEPARATOR.$file.$ext);
+		if(null!==($file=array_pop($segs)) && null!==($root=self::getPathOfAlias($alias)))
+			return rtrim($root.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $segs), '/\\').(($file==='*') ? '' : DIRECTORY_SEPARATOR.$file.$ext);
 
 		return null;
 	}
@@ -362,7 +362,7 @@ 
 	 */
 	public static function getPathOfAlias($alias)
 	{
-		return isset(self::$_aliases[$alias])?self::$_aliases[$alias]:null;
+		return isset(self::$_aliases[$alias]) ? self::$_aliases[$alias] : null;
 	}
 
 	protected static function getPathAliases()
@@ -376,19 +376,19 @@ 
 	 * @throws TInvalidOperationException if the alias is already defined
 	 * @throws TInvalidDataValueException if the path is not a valid file path
 	 */
-	public static function setPathOfAlias($alias,$path)
+	public static function setPathOfAlias($alias, $path)
 	{
 		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
-			throw new TInvalidOperationException('prado_alias_redefined',$alias);
+			throw new TInvalidOperationException('prado_alias_redefined', $alias);
 		else if(($rp=realpath($path))!==false && is_dir($rp))
 		{
-			if(strpos($alias,'.')===false)
+			if(strpos($alias, '.')===false)
 				self::$_aliases[$alias]=$rp;
 			else
-				throw new TInvalidDataValueException('prado_aliasname_invalid',$alias);
+				throw new TInvalidDataValueException('prado_aliasname_invalid', $alias);
 		}
 		else
-			throw new TInvalidDataValueException('prado_alias_invalid',$alias,$path);
+			throw new TInvalidDataValueException('prado_alias_invalid', $alias, $path);
 	}
 
 	/**
@@ -413,13 +413,13 @@ 
 				continue;
 			echo '#'.$index.' ';
 			if(isset($t['file']))
-				echo basename($t['file']) . ':' . $t['line'];
+				echo basename($t['file']).':'.$t['line'];
 			else
 				 echo '<PHP inner-code>';
 			echo ' -- ';
 			if(isset($t['class']))
-				echo $t['class'] . $t['type'];
-			echo $t['function'] . '(';
+				echo $t['class'].$t['type'];
+			echo $t['function'].'(';
 			if(isset($t['args']) && sizeof($t['args']) > 0)
 			{
 				$count=0;
@@ -428,25 +428,25 @@ 
 					if(is_string($item))
 					{
 						$str=htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
-						if (strlen($item) > 70)
-							echo "'". substr($str, 0, 70) . "...'";
+						if(strlen($item) > 70)
+							echo "'".substr($str, 0, 70)."...'";
 						else
-							echo "'" . $str . "'";
+							echo "'".$str."'";
 					}
-					else if (is_int($item) || is_float($item))
+					else if(is_int($item) || is_float($item))
 						echo $item;
-					else if (is_object($item))
+					else if(is_object($item))
 						echo get_class($item);
-					else if (is_array($item))
-						echo 'array(' . count($item) . ')';
-					else if (is_bool($item))
+					else if(is_array($item))
+						echo 'array('.count($item).')';
+					else if(is_bool($item))
 						echo $item ? 'true' : 'false';
-					else if ($item === null)
+					else if($item===null)
 						echo 'NULL';
-					else if (is_resource($item))
+					else if(is_resource($item))
 						echo get_resource_type($item);
 					$count++;
-					if (count($t['args']) > $count)
+					if(count($t['args']) > $count)
 						echo ', ';
 				}
 			}
@@ -473,10 +473,10 @@ 
 			else
 			{
 				$languages=array();
-				foreach(explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
+				foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
 				{
-					$array=explode(';q=',trim($language));
-					$languages[trim($array[0])]=isset($array[1])?(float)$array[1]:1.0;
+					$array=explode(';q=', trim($language));
+					$languages[trim($array[0])]=isset($array[1]) ? (float) $array[1] : 1.0;
 				}
 				arsort($languages);
 				$languages=array_keys($languages);
@@ -497,7 +497,7 @@ 
 		if($language===null)
 		{
 			$langs=Prado::getUserLanguages();
-			$lang=explode('-',$langs[0]);
+			$lang=explode('-', $langs[0]);
 			if(empty($lang[0]) || !ctype_alpha($lang[0]))
 				$language='en';
 			else
@@ -518,7 +518,7 @@ 
 	 * @param (string|TControl) control of the message
 	 * @see log, getLogger
 	 */
-	public static function trace($msg,$category='Uncategorized',$ctl=null)
+	public static function trace($msg, $category='Uncategorized', $ctl=null)
 	{
 		if(self::$_application && self::$_application->getMode()===TApplicationMode::Performance)
 			return;
@@ -531,7 +531,7 @@ 
 		}
 		else
 			$level=TLogger::INFO;
-		self::log($msg,$level,$category,$ctl);
+		self::log($msg, $level, $category, $ctl);
 	}
 
 	/**
@@ -546,11 +546,11 @@ 
 	 * @param string category of the message
 	 * @param (string|TControl) control of the message
 	 */
-	public static function log($msg,$level=TLogger::INFO,$category='Uncategorized',$ctl=null)
+	public static function log($msg, $level=TLogger::INFO, $category='Uncategorized', $ctl=null)
 	{
 		if(self::$_logger===null)
 			self::$_logger=new TLogger;
-		self::$_logger->log($msg,$level,$category,$ctl);
+		self::$_logger->log($msg, $level, $category, $ctl);
 	}
 
 	/**
@@ -572,10 +572,10 @@ 
 	 * @param boolean whether to syntax highlight the output. Defaults to false.
 	 * @return string the string representation of the variable
 	 */
-	public static function varDump($var,$depth=10,$highlight=false)
+	public static function varDump($var, $depth=10, $highlight=false)
 	{
 		Prado::using('System.Util.TVarDumper');
-		return TVarDumper::dump($var,$depth,$highlight);
+		return TVarDumper::dump($var, $depth, $highlight);
 	}
 
 	/**
@@ -591,32 +591,32 @@ 
 	public static function localize($text, $parameters=array(), $catalogue=null, $charset=null)
 	{
 		Prado::using('System.I18N.Translation');
-		$app = Prado::getApplication()->getGlobalization(false);
+		$app=Prado::getApplication()->getGlobalization(false);
 
-		$params = array();
+		$params=array();
 		foreach($parameters as $key => $value)
-			$params['{'.$key.'}'] = $value;
+			$params['{'.$key.'}']=$value;
 
 		//no translation handler provided
-		if($app===null || ($config = $app->getTranslationConfiguration())===null)
+		if($app===null || ($config=$app->getTranslationConfiguration())===null)
 			return strtr($text, $params);
 
-		if ($catalogue===null)
-			$catalogue=isset($config['catalogue'])?$config['catalogue']:'messages';
+		if($catalogue===null)
+			$catalogue=isset($config['catalogue']) ? $config['catalogue'] : 'messages';
 
 		Translation::init($catalogue);
 
 		//globalization charset
-		$appCharset = $app===null ? '' : $app->getCharset();
+		$appCharset=$app===null ? '' : $app->getCharset();
 
 		//default charset
-		$defaultCharset = ($app===null) ? 'UTF-8' : $app->getDefaultCharset();
+		$defaultCharset=($app===null) ? 'UTF-8' : $app->getDefaultCharset();
 
 		//fall back
-		if(empty($charset)) $charset = $appCharset;
-		if(empty($charset)) $charset = $defaultCharset;
+		if(empty($charset)) $charset=$appCharset;
+		if(empty($charset)) $charset=$defaultCharset;
 
-		return Translation::formatter($catalogue)->format($text,$params,$catalogue,$charset);
+		return Translation::formatter($catalogue)->format($text, $params, $catalogue, $charset);
 	}
 }
 

framework/Web/UI/ActiveControls/TActiveFileUpload.php

Spacing +87 added lines, -87 removed lines

@@ -43,7 +43,7 @@ 
 class TActiveFileUpload extends TFileUpload implements IActiveControl, ICallbackEventHandler, INamingContainer
 {
 
-	const SCRIPT_PATH = 'prado/activefileupload';
+	const SCRIPT_PATH='prado/activefileupload';
 
 	/**
 	 * @var THiddenField a flag to tell which component is doing the callback.
@@ -72,7 +72,7 @@ 
 	 * TActiveControlAdapter. If you override this class, be sure to set the
 	 * adapter appropriately by, for example, by calling this constructor.
 	 */
-	public function __construct(){
+	public function __construct() {
 		parent::__construct();
 		$this->setAdapter(new TActiveControlAdapter($this));
 	}
@@ -84,7 +84,7 @@ 
 	 */
 	protected function getAssetUrl($file='')
 	{
-		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
+		$base=$this->getPage()->getClientScript()->getPradoScriptAssetUrl();
 		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
 	}
 
@@ -97,18 +97,18 @@ 
 	 */
 	public function onFileUpload($param)
 	{
-		if ($this->_flag->getValue() && $this->getPage()->getIsPostBack() && $param == $this->_target->getUniqueID()){
+		if($this->_flag->getValue() && $this->getPage()->getIsPostBack() && $param==$this->_target->getUniqueID()) {
 			// save the file so that it will persist past the end of this return.
-			$localName = str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()),''));
+			$localName=str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()), ''));
 			parent::saveAs($localName);
-			$this->_localName = $localName;
+			$this->_localName=$localName;
 
-			$params = new TActiveFileUploadCallbackParams;
-			$params->localName = $localName;
-			$params->fileName = addslashes($this->getFileName());
-			$params->fileSize = $this->getFileSize();
-			$params->fileType = $this->getFileType();
-			$params->errorCode = $this->getErrorCode();
+			$params=new TActiveFileUploadCallbackParams;
+			$params->localName=$localName;
+			$params->fileName=addslashes($this->getFileName());
+			$params->fileSize=$this->getFileSize();
+			$params->fileType=$this->getFileType();
+			$params->errorCode=$this->getErrorCode();
 
 			// return some javascript to display a completion status.
 			echo <<<EOS
@@ -133,7 +133,7 @@ 
 	 * @return string the path where the uploaded file will be stored temporarily, in namespace format
 	 * default "Application.runtime.*"
 	 */
-	public function getTempPath(){
+	public function getTempPath() {
 		return $this->getViewState('TempPath', 'Application.runtime.*');
 	}
 
@@ -141,15 +141,15 @@ 
 	 * @param string the path where the uploaded file will be stored temporarily in namespace format
 	 * default "Application.runtime.*"
 	 */
-	public function setTempPath($value){
-		$this->setViewState('TempPath',$value,'Application.runtime.*');
+	public function setTempPath($value) {
+		$this->setViewState('TempPath', $value, 'Application.runtime.*');
 	}
 
 	/**
 	 * @return boolean a value indicating whether an automatic callback to the server will occur whenever the user modifies the text in the TTextBox control and then tabs out of the component. Defaults to true.
 	 * Note: When set to false, you will need to trigger the callback yourself.
 	 */
-	public function getAutoPostBack(){
+	public function getAutoPostBack() {
 		return $this->getViewState('AutoPostBack', true);
 	}
 
@@ -157,28 +157,28 @@ 
 	 * @param boolean a value indicating whether an automatic callback to the server will occur whenever the user modifies the text in the TTextBox control and then tabs out of the component. Defaults to true.
 	 * Note: When set to false, you will need to trigger the callback yourself.
 	 */
-	public function setAutoPostBack($value){
-		$this->setViewState('AutoPostBack',TPropertyValue::ensureBoolean($value),true);
+	public function setAutoPostBack($value) {
+		$this->setViewState('AutoPostBack', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
 	 * @return string A chuck of javascript that will need to be called if {{@link getAutoPostBack AutoPostBack} is set to false}
 	 */
-	public function getCallbackJavascript(){
+	public function getCallbackJavascript() {
 		return "Prado.WebUI.TActiveFileUpload.fileChanged(\"{$this->getClientID()}\")";
 	}
 
 	/**
 	 * @throws TInvalidDataValueException if the {@link getTempPath TempPath} is not writable.
 	 */
-	public function onInit($sender){
+	public function onInit($sender) {
 		parent::onInit($sender);
 
-		if (!Prado::getApplication()->getCache())
-		  if (!Prado::getApplication()->getSecurityManager())
+		if(!Prado::getApplication()->getCache())
+		  if(!Prado::getApplication()->getSecurityManager())
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
 
-		if (!is_writable(Prado::getPathOfNamespace($this->getTempPath()))){
+		if(!is_writable(Prado::getPathOfNamespace($this->getTempPath()))) {
 			throw new TInvalidDataValueException("activefileupload_temppath_invalid", $this->getTempPath());
 		}
 	}
@@ -190,17 +190,17 @@ 
 	 * This method is mainly used by framework and control developers.
 	 * @param TCallbackEventParameter the event parameter
 	 */
- 	public function raiseCallbackEvent($param){
- 		$cp = $param->getCallbackParameter();
-		if ($key = $cp->targetID == $this->_target->getUniqueID()){
+ 	public function raiseCallbackEvent($param) {
+ 		$cp=$param->getCallbackParameter();
+		if($key=$cp->targetID==$this->_target->getUniqueID()) {
 
-			$params = $this->popParamsByToken($cp->callbackToken);
+			$params=$this->popParamsByToken($cp->callbackToken);
 
-			$_FILES[$key]['name'] = stripslashes($params->fileName);
-			$_FILES[$key]['size'] = intval($params->fileSize);
-			$_FILES[$key]['type'] = $params->fileType;
-			$_FILES[$key]['error'] = intval($params->errorCode);
-			$_FILES[$key]['tmp_name'] = $params->localName;
+			$_FILES[$key]['name']=stripslashes($params->fileName);
+			$_FILES[$key]['size']=intval($params->fileSize);
+			$_FILES[$key]['type']=$params->fileType;
+			$_FILES[$key]['error']=intval($params->errorCode);
+			$_FILES[$key]['tmp_name']=$params->localName;
 			$this->loadPostData($key, null);
 
 			$this->raiseEvent('OnFileUpload', $this, $param);
@@ -219,17 +219,17 @@ 
 
 	protected function pushParamsAndGetToken(TActiveFileUploadCallbackParams $params)
 	{
-		if ($cache = Prado::getApplication()->getCache())
+		if($cache=Prado::getApplication()->getCache())
 			{
 				// this is the most secure method, file info can't be forged from client side, no matter what
-				$token = md5('TActiveFileUpload::Params::'.$this->ClientID.'::'+rand(1000*1000,9999*1000));
-				$cache->set($token, serialize($params), 5*60); // expire in 5 minutes - the callback should arrive back in seconds, actually
+				$token=md5('TActiveFileUpload::Params::'.$this->ClientID.'::'+rand(1000 * 1000, 9999 * 1000));
+				$cache->set($token, serialize($params), 5 * 60); // expire in 5 minutes - the callback should arrive back in seconds, actually
 			}
 		else
-		if ($mgr = Prado::getApplication()->getSecurityManager())
+		if($mgr=Prado::getApplication()->getSecurityManager())
 			{
 				// this is a less secure method, file info can be still forged from client side, but only if attacker knows the secret application key
-				$token = urlencode(base64_encode($mgr->encrypt(serialize($params))));
+				$token=urlencode(base64_encode($mgr->encrypt(serialize($params))));
 			}
 		else
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
@@ -239,18 +239,18 @@ 
 
 	protected function popParamsByToken($token)
 	{
-		if ($cache = Prado::getApplication()->getCache())
+		if($cache=Prado::getApplication()->getCache())
 			{
-				$v = $cache->get($token);
+				$v=$cache->get($token);
 				assert($v!='');
 				$cache->delete($token); // remove it from cache so it can't be used again and won't take up space either
-				$params = unserialize($v);
+				$params=unserialize($v);
 			}
 		else
-		if ($mgr = Prado::getApplication()->getSecurityManager())
+		if($mgr=Prado::getApplication()->getSecurityManager())
 			{
-				$v = $mgr->decrypt(base64_decode(urldecode($token)));
-				$params = unserialize($v);
+				$v=$mgr->decrypt(base64_decode(urldecode($token)));
+				$params=unserialize($v);
 			}
 		else
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
@@ -267,19 +267,19 @@ 
 	{
 		parent::onPreRender($param);
 
-		if(!$this->getPage()->getIsPostBack() && isset($_GET['TActiveFileUpload_InputId']) && isset($_GET['TActiveFileUpload_TargetId']) && $_GET['TActiveFileUpload_InputId'] == $this->getClientID())
+		if(!$this->getPage()->getIsPostBack() && isset($_GET['TActiveFileUpload_InputId']) && isset($_GET['TActiveFileUpload_TargetId']) && $_GET['TActiveFileUpload_InputId']==$this->getClientID())
 		{
 			// tricky workaround to intercept "uploaded file too big" error: real uploads happens in onFileUpload instead
-			$this->_errorCode = UPLOAD_ERR_FORM_SIZE;
-			$localName = str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()),''));
-			$fileName = addslashes($this->getFileName());
+			$this->_errorCode=UPLOAD_ERR_FORM_SIZE;
+			$localName=str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()), ''));
+			$fileName=addslashes($this->getFileName());
 
-			$params = new TActiveFileUploadCallbackParams;
-			$params->localName = $localName;
-			$params->fileName = $fileName;
-			$params->fileSize = $this->getFileSize();
-			$params->fileType = $this->getFileType();
-			$params->errorCode = $this->getErrorCode();
+			$params=new TActiveFileUploadCallbackParams;
+			$params->localName=$localName;
+			$params->fileName=$fileName;
+			$params->fileSize=$this->getFileSize();
+			$params->fileType=$this->getFileType();
+			$params->errorCode=$this->getErrorCode();
 
 			echo <<<EOS
 <script language="Javascript">
@@ -297,30 +297,30 @@ 
 		}
 	}
 
-	public function createChildControls(){
-		$this->_flag = Prado::createComponent('THiddenField');
+	public function createChildControls() {
+		$this->_flag=Prado::createComponent('THiddenField');
 		$this->_flag->setID('Flag');
 		$this->getControls()->add($this->_flag);
 
-		$this->_busy = Prado::createComponent('TImage');
+		$this->_busy=Prado::createComponent('TImage');
 		$this->_busy->setID('Busy');
 		$this->_busy->setImageUrl($this->getAssetUrl('ActiveFileUploadIndicator.gif'));
 		$this->_busy->setStyle("display:none");
 		$this->getControls()->add($this->_busy);
 
-		$this->_success = Prado::createComponent('TImage');
+		$this->_success=Prado::createComponent('TImage');
 		$this->_success->setID('Success');
 		$this->_success->setImageUrl($this->getAssetUrl('ActiveFileUploadComplete.png'));
 		$this->_success->setStyle("display:none");
 		$this->getControls()->add($this->_success);
 
-		$this->_error = Prado::createComponent('TImage');
+		$this->_error=Prado::createComponent('TImage');
 		$this->_error->setID('Error');
 		$this->_error->setImageUrl($this->getAssetUrl('ActiveFileUploadError.png'));
 		$this->_error->setStyle("display:none");
 		$this->getControls()->add($this->_error);
 
-		$this->_target = Prado::createComponent('TInlineFrame');
+		$this->_target=Prado::createComponent('TInlineFrame');
 		$this->_target->setID('Target');
 		$this->_target->setFrameUrl($this->getAssetUrl('ActiveFileUploadBlank.html'));
 		$this->_target->setStyle("width:0px; height:0px;");
@@ -332,10 +332,10 @@ 
 	/**
 	 * Removes localfile on ending of the callback.
 	 */
-	public function onUnload($param){
-		if ($this->getPage()->getIsCallback() &&
+	public function onUnload($param) {
+		if($this->getPage()->getIsCallback() &&
 			$this->getHasFile() &&
-			file_exists($this->getLocalName())){
+			file_exists($this->getLocalName())) {
 				unlink($this->getLocalName());
 		}
 		parent::onUnload($param);
@@ -344,7 +344,7 @@ 
 	/**
 	 * @return TBaseActiveCallbackControl standard callback control options.
 	 */
-	public function getActiveControl(){
+	public function getActiveControl() {
 		return $this->getAdapter()->getBaseActiveControl();
 	}
 
@@ -360,18 +360,18 @@ 
 	 * Adds ID attribute, and renders the javascript for active component.
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 */
-	public function addAttributesToRender($writer){
+	public function addAttributesToRender($writer) {
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 
 		$this->getPage()->getClientScript()->registerPradoScript('activefileupload');
-		$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(),$this->getClientOptions());
+		$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(), $this->getClientOptions());
 	}
 
 	/**
 	 * @return string corresponding javascript class name for this control.
 	 */
-	protected function getClientClassName(){
+	protected function getClientClassName() {
 		return 'Prado.WebUI.TActiveFileUpload';
 	}
 
@@ -385,18 +385,18 @@ 
 	 * 					completeID => complete client ID,
 	 * 					errorID => error client ID)
 	 */
-	protected function getClientOptions(){
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-
-		$options['inputID'] = $this->getClientID();
-		$options['flagID'] = $this->_flag->getClientID();
-		$options['targetID'] = $this->_target->getUniqueID();
-		$options['formID'] = $this->getPage()->getForm()->getClientID();
-		$options['indicatorID'] = $this->_busy->getClientID();
-		$options['completeID'] = $this->_success->getClientID();
-		$options['errorID'] = $this->_error->getClientID();
-		$options['autoPostBack'] = $this->getAutoPostBack();
+	protected function getClientOptions() {
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+
+		$options['inputID']=$this->getClientID();
+		$options['flagID']=$this->_flag->getClientID();
+		$options['targetID']=$this->_target->getUniqueID();
+		$options['formID']=$this->getPage()->getForm()->getClientID();
+		$options['indicatorID']=$this->_busy->getClientID();
+		$options['completeID']=$this->_success->getClientID();
+		$options['errorID']=$this->_error->getClientID();
+		$options['autoPostBack']=$this->getAutoPostBack();
 		return $options;
 	}
 
@@ -407,12 +407,12 @@ 
 	 * If true, you will not be able to save the uploaded file again.
 	 * @return boolean true if the file saving is successful
 	 */
-	public function saveAs($fileName,$deleteTempFile=true){
-		if (($this->getErrorCode()===UPLOAD_ERR_OK) && (file_exists($this->getLocalName()))){
-			if ($deleteTempFile)
-				return rename($this->getLocalName(),$fileName);
+	public function saveAs($fileName, $deleteTempFile=true) {
+		if(($this->getErrorCode()===UPLOAD_ERR_OK) && (file_exists($this->getLocalName()))) {
+			if($deleteTempFile)
+				return rename($this->getLocalName(), $fileName);
 			else
-				return copy($this->getLocalName(),$fileName);
+				return copy($this->getLocalName(), $fileName);
 		} else
 			return false;
 	}
@@ -421,7 +421,7 @@ 
 	 * @return TImage the image displayed when an upload
 	 * 		completes successfully.
 	 */
-	public function getSuccessImage(){
+	public function getSuccessImage() {
 		$this->ensureChildControls();
 		return $this->_success;
 	}
@@ -430,7 +430,7 @@ 
 	 * @return TImage the image displayed when an upload
 	 * 		does not complete successfully.
 	 */
-	public function getErrorImage(){
+	public function getErrorImage() {
 		$this->ensureChildControls();
 		return $this->_error;
 	}
@@ -439,7 +439,7 @@ 
 	 * @return TImage the image displayed when an upload
 	 * 		is in progress.
 	 */
-	public function getBusyImage(){
+	public function getBusyImage() {
 		$this->ensureChildControls();
 		return $this->_busy;
 	}

framework/TComponent.php

Spacing +227 added lines, -227 removed lines

@@ -373,7 +373,7 @@ 
 	 * that start with 'fx' are filtered in.
 	 */
 	private function filter_prado_fx($name) {
-		return strncasecmp($name,'fx',2)===0;
+		return strncasecmp($name, 'fx', 2)===0;
 	}
 
 
@@ -383,13 +383,13 @@ 
 	 * @param boolean optional should the names be all lowercase true/false
 	 * @return array array of strings being the class hierarchy of $this.
 	 */
-	public function getClassHierarchy($lowercase = false)
+	public function getClassHierarchy($lowercase=false)
 	{
 		$class=get_class($this);
 		$classes=array($class);
-		while($class=get_parent_class($class)){array_unshift($classes,$class);}
+		while($class=get_parent_class($class)) {array_unshift($classes, $class); }
 		if($lowercase)
-			return array_map('strtolower',$classes);
+			return array_map('strtolower', $classes);
 		return $classes;
 	}
 
@@ -412,14 +412,14 @@ 
 		if($this->_listeningenabled)
 			return;
 
-		$fx=array_filter(get_class_methods($this),array($this,'filter_prado_fx'));
+		$fx=array_filter(get_class_methods($this), array($this, 'filter_prado_fx'));
 
 		foreach($fx as $func)
-			$this->attachEventHandler($func,array($this,$func));
+			$this->attachEventHandler($func, array($this, $func));
 
-		if(is_a($this,'IDynamicMethods')) {
-			$this->attachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER,array($this,'__dycall'));
-			array_push($fx,TComponent::GLOBAL_RAISE_EVENT_LISTENER);
+		if(is_a($this, 'IDynamicMethods')) {
+			$this->attachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, array($this, '__dycall'));
+			array_push($fx, TComponent::GLOBAL_RAISE_EVENT_LISTENER);
 		}
 
 		$this->_listeningenabled=true;
@@ -446,14 +446,14 @@ 
 		if(!$this->_listeningenabled)
 			return;
 
-		$fx=array_filter(get_class_methods($this),array($this,'filter_prado_fx'));
+		$fx=array_filter(get_class_methods($this), array($this, 'filter_prado_fx'));
 
 		foreach($fx as $func)
-			$this->detachEventHandler($func,array($this,$func));
+			$this->detachEventHandler($func, array($this, $func));
 
-		if(is_a($this,'IDynamicMethods')) {
-			$this->detachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER,array($this,'__dycall'));
-			array_push($fx,TComponent::GLOBAL_RAISE_EVENT_LISTENER);
+		if(is_a($this, 'IDynamicMethods')) {
+			$this->detachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, array($this, '__dycall'));
+			array_push($fx, TComponent::GLOBAL_RAISE_EVENT_LISTENER);
 		}
 
 		$this->_listeningenabled=false;
@@ -498,66 +498,66 @@ 
 	 */
 	public function __call($method, $args)
 	{
-		$getset=substr($method,0,3);
-		if(($getset=='get')||($getset=='set'))
+		$getset=substr($method, 0, 3);
+		if(($getset=='get') || ($getset=='set'))
 		{
-			$propname=substr($method,3);
+			$propname=substr($method, 3);
 			$jsmethod=$getset.'js'.$propname;
-			if(method_exists($this,$jsmethod))
+			if(method_exists($this, $jsmethod))
 			{
-				if(count($args)>0)
-					if($args[0]&&!($args[0] instanceof TJavaScriptString))
+				if(count($args) > 0)
+					if($args[0] && !($args[0] instanceof TJavaScriptString))
 						$args[0]=new TJavaScriptString($args[0]);
-				return call_user_func_array(array($this,$jsmethod),$args);
+				return call_user_func_array(array($this, $jsmethod), $args);
 			}
 
-			if (($getset=='set')&&method_exists($this,'getjs'.$propname))
-				throw new TInvalidOperationException('component_property_readonly',get_class($this),$method);
+			if(($getset=='set') && method_exists($this, 'getjs'.$propname))
+				throw new TInvalidOperationException('component_property_readonly', get_class($this), $method);
 		}
 
-		if($this->_m!==null&&$this->_behaviorsenabled)
+		if($this->_m!==null && $this->_behaviorsenabled)
 		{
-			if(strncasecmp($method,'dy',2)===0)
+			if(strncasecmp($method, 'dy', 2)===0)
 			{
 				$callchain=new TCallChain($method);
 				foreach($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&(method_exists($behavior,$method)||($behavior instanceof IDynamicMethods)))
+					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && (method_exists($behavior, $method) || ($behavior instanceof IDynamicMethods)))
 					{
 						$behavior_args=$args;
 						if($behavior instanceof IClassBehavior)
-							array_unshift($behavior_args,$this);
-						$callchain->addCall(array($behavior,$method),$behavior_args);
+							array_unshift($behavior_args, $this);
+						$callchain->addCall(array($behavior, $method), $behavior_args);
 					}
 
 				}
-				if($callchain->getCount()>0)
-					return call_user_func_array(array($callchain,'call'),$args);
+				if($callchain->getCount() > 0)
+					return call_user_func_array(array($callchain, 'call'), $args);
 			}
 			else
 			{
 				foreach($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&method_exists($behavior,$method))
+					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && method_exists($behavior, $method))
 					{
 						if($behavior instanceof IClassBehavior)
-							array_unshift($args,$this);
-						return call_user_func_array(array($behavior,$method),$args);
+							array_unshift($args, $this);
+						return call_user_func_array(array($behavior, $method), $args);
 					}
 				}
 			}
 		}
 
-		if(strncasecmp($method,'dy',2)===0||strncasecmp($method,'fx',2)===0)
+		if(strncasecmp($method, 'dy', 2)===0 || strncasecmp($method, 'fx', 2)===0)
 		{
 			if($this instanceof IDynamicMethods)
-				return $this->__dycall($method,$args);
-			return isset($args[0])?$args[0]:null;
+				return $this->__dycall($method, $args);
+			return isset($args[0]) ? $args[0] : null;
 		}
 
 		// don't thrown an exception for __magicMethods() or any other weird methods natively implemented by php
-		if (!method_exists($this, $method)) {
-			throw new TApplicationException('component_method_undefined',get_class($this),$method);
+		if(!method_exists($this, $method)) {
+			throw new TApplicationException('component_method_undefined', get_class($this), $method);
 		}
 	}
 
@@ -587,17 +587,17 @@ 
 	 */
 	public function __get($name)
 	{
-		if(method_exists($this,$getter='get'.$name))
+		if(method_exists($this, $getter='get'.$name))
 		{
 			// getting a property
 			return $this->$getter();
 		}
-		else if(method_exists($this,$jsgetter='getjs'.$name))
+		else if(method_exists($this, $jsgetter='getjs'.$name))
 		{
 			// getting a javascript property
-			return (string)$this->$jsgetter();
+			return (string) $this->$jsgetter();
 		}
-		else if(strncasecmp($name,'on',2)===0 && method_exists($this,$name))
+		else if(strncasecmp($name, 'on', 2)===0 && method_exists($this, $name))
 		{
 			// getting an event (handler list)
 			$name=strtolower($name);
@@ -605,7 +605,7 @@ 
 				$this->_e[$name]=new TPriorityList;
 			return $this->_e[$name];
 		}
-		else if(strncasecmp($name,'fx',2)===0)
+		else if(strncasecmp($name, 'fx', 2)===0)
 		{
 			// getting a global event (handler list)
 			$name=strtolower($name);
@@ -622,13 +622,13 @@ 
 			{
 				foreach($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&
-						(property_exists($behavior,$name)||$behavior->canGetProperty($name)||$behavior->hasEvent($name)))
+					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) &&
+						(property_exists($behavior, $name) || $behavior->canGetProperty($name) || $behavior->hasEvent($name)))
 						return $behavior->$name;
 				}
 			}
 		}
-		throw new TInvalidOperationException('component_property_undefined',get_class($this),$name);
+		throw new TInvalidOperationException('component_property_undefined', get_class($this), $name);
 	}
 
 	/**
@@ -646,31 +646,31 @@ 
 	 * @param mixed the property value or event handler
 	 * @throws TInvalidOperationException If the property is not defined or read-only.
 	 */
-	public function __set($name,$value)
+	public function __set($name, $value)
 	{
-		if(method_exists($this,$setter='set'.$name))
+		if(method_exists($this, $setter='set'.$name))
 		{
-			if(strncasecmp($name,'js',2)===0&&$value&&!($value instanceof TJavaScriptLiteral))
-				$value = new TJavaScriptLiteral($value);
+			if(strncasecmp($name, 'js', 2)===0 && $value && !($value instanceof TJavaScriptLiteral))
+				$value=new TJavaScriptLiteral($value);
 			return $this->$setter($value);
 		}
-		else if(method_exists($this,$jssetter='setjs'.$name))
+		else if(method_exists($this, $jssetter='setjs'.$name))
 		{
-			if($value&&!($value instanceof TJavaScriptString))
+			if($value && !($value instanceof TJavaScriptString))
 				$value=new TJavaScriptString($value);
 			return $this->$jssetter($value);
 		}
-		else if((strncasecmp($name,'on',2)===0&&method_exists($this,$name))||strncasecmp($name,'fx',2)===0)
+		else if((strncasecmp($name, 'on', 2)===0 && method_exists($this, $name)) || strncasecmp($name, 'fx', 2)===0)
 		{
-			return $this->attachEventHandler($name,$value);
+			return $this->attachEventHandler($name, $value);
 		}
-		else if($this->_m!==null&&$this->_m->getCount()>0&&$this->_behaviorsenabled)
+		else if($this->_m!==null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
 		{
 			$sets=0;
 			foreach($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&
-					(property_exists($behavior,$name)||$behavior->canSetProperty($name)||$behavior->hasEvent($name))) {
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) &&
+					(property_exists($behavior, $name) || $behavior->canSetProperty($name) || $behavior->hasEvent($name))) {
 					$behavior->$name=$value;
 					$sets++;
 				}
@@ -679,13 +679,13 @@ 
 
 		}
 
-		if(method_exists($this,'get'.$name)||method_exists($this,'getjs'.$name))
+		if(method_exists($this, 'get'.$name) || method_exists($this, 'getjs'.$name))
 		{
-			throw new TInvalidOperationException('component_property_readonly',get_class($this),$name);
+			throw new TInvalidOperationException('component_property_readonly', get_class($this), $name);
 		}
 		else
 		{
-			throw new TInvalidOperationException('component_property_undefined',get_class($this),$name);
+			throw new TInvalidOperationException('component_property_undefined', get_class($this), $name);
 		}
 	}
 
@@ -703,27 +703,27 @@ 
 	 */
 	public function __isset($name)
 	{
-		if(method_exists($this,$getter='get'.$name))
+		if(method_exists($this, $getter='get'.$name))
 			return $this->$getter()!==null;
-		else if(method_exists($this,$jsgetter='getjs'.$name))
+		else if(method_exists($this, $jsgetter='getjs'.$name))
 			return $this->$jsgetter()!==null;
-		else if(strncasecmp($name,'on',2)===0&&method_exists($this,$name))
+		else if(strncasecmp($name, 'on', 2)===0 && method_exists($this, $name))
 		{
 			$name=strtolower($name);
-			return isset($this->_e[$name])&&$this->_e[$name]->getCount();
+			return isset($this->_e[$name]) && $this->_e[$name]->getCount();
 		}
-		else if(strncasecmp($name,'fx',2)===0)
+		else if(strncasecmp($name, 'fx', 2)===0)
 		{
 			$name=strtolower($name);
-			return isset(self::$_ue[$name])&&self::$_ue[$name]->getCount();
+			return isset(self::$_ue[$name]) && self::$_ue[$name]->getCount();
 		}
-		else if($this->_m!==null&&$this->_m->getCount()>0&&$this->_behaviorsenabled)
+		else if($this->_m!==null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
 		{
 			if(isset($this->_m[$name]))
 				return true;
 			foreach($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled()))
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()))
 					return isset($behavior->$name);
 			}
 
@@ -744,15 +744,15 @@ 
 	 */
 	public function __unset($name)
 	{
-		if(method_exists($this,$setter='set'.$name))
+		if(method_exists($this, $setter='set'.$name))
 			$this->$setter(null);
-		else if(method_exists($this,$jssetter='setjs'.$name))
+		else if(method_exists($this, $jssetter='setjs'.$name))
 			$this->$jssetter(null);
-		else if(strncasecmp($name,'on',2)===0&&method_exists($this,$name))
+		else if(strncasecmp($name, 'on', 2)===0 && method_exists($this, $name))
 			$this->_e[strtolower($name)]->clear();
-		else if(strncasecmp($name,'fx',2)===0)
+		else if(strncasecmp($name, 'fx', 2)===0)
 			$this->getEventHandlers($name)->remove(array($this, $name));
-		else if($this->_m!==null&&$this->_m->getCount()>0&&$this->_behaviorsenabled)
+		else if($this->_m!==null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
 		{
 			if(isset($this->_m[$name]))
 				$this->detachBehavior($name);
@@ -760,16 +760,16 @@ 
 				$unset=0;
 				foreach($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())) {
+					if((!($behavior instanceof IBehavior) || $behavior->getEnabled())) {
 						unset($behavior->$name);
 						$unset++;
 					}
 				}
-				if(!$unset&&method_exists($this,'get'.$name))
-					throw new TInvalidOperationException('component_property_readonly',get_class($this),$name);
+				if(!$unset && method_exists($this, 'get'.$name))
+					throw new TInvalidOperationException('component_property_readonly', get_class($this), $name);
 			}
-		} else if(method_exists($this,'get'.$name))
-			throw new TInvalidOperationException('component_property_readonly',get_class($this),$name);
+		} else if(method_exists($this, 'get'.$name))
+			throw new TInvalidOperationException('component_property_readonly', get_class($this), $name);
 	}
 
 	/**
@@ -781,7 +781,7 @@ 
 	 */
 	public function hasProperty($name)
 	{
-		return $this->canGetProperty($name)||$this->canSetProperty($name);
+		return $this->canGetProperty($name) || $this->canSetProperty($name);
 	}
 
 	/**
@@ -795,13 +795,13 @@ 
 	 */
 	public function canGetProperty($name)
 	{
-		if(method_exists($this,'get'.$name)||method_exists($this,'getjs'.$name))
+		if(method_exists($this, 'get'.$name) || method_exists($this, 'getjs'.$name))
 			return true;
-		else if($this->_m!==null&&$this->_behaviorsenabled)
+		else if($this->_m!==null && $this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->canGetProperty($name))
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->canGetProperty($name))
 					return true;
 			}
 		}
@@ -819,13 +819,13 @@ 
 	 */
 	public function canSetProperty($name)
 	{
-		if(method_exists($this,'set'.$name)||method_exists($this,'setjs'.$name))
+		if(method_exists($this, 'set'.$name) || method_exists($this, 'setjs'.$name))
 			return true;
-		else if($this->_m!==null&&$this->_behaviorsenabled)
+		else if($this->_m!==null && $this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->canSetProperty($name))
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->canSetProperty($name))
 					return true;
 			}
 		}
@@ -845,7 +845,7 @@ 
 	public function getSubProperty($path)
 	{
 		$object=$this;
-		foreach(explode('.',$path) as $property)
+		foreach(explode('.', $path) as $property)
 			$object=$object->$property;
 		return $object;
 	}
@@ -860,15 +860,15 @@ 
 	 * @param string property path
 	 * @param mixed the property path value
 	 */
-	public function setSubProperty($path,$value)
+	public function setSubProperty($path, $value)
 	{
 		$object=$this;
-		if(($pos=strrpos($path,'.'))===false)
+		if(($pos=strrpos($path, '.'))===false)
 			$property=$path;
 		else
 		{
-			$object=$this->getSubProperty(substr($path,0,$pos));
-			$property=substr($path,$pos+1);
+			$object=$this->getSubProperty(substr($path, 0, $pos));
+			$property=substr($path, $pos + 1);
 		}
 		$object->$property=$value;
 	}
@@ -887,14 +887,14 @@ 
 	 */
 	public function hasEvent($name)
 	{
-		if((strncasecmp($name,'on',2)===0&&method_exists($this,$name))||strncasecmp($name,'fx',2)===0||strncasecmp($name,'dy',2)===0)
+		if((strncasecmp($name, 'on', 2)===0 && method_exists($this, $name)) || strncasecmp($name, 'fx', 2)===0 || strncasecmp($name, 'dy', 2)===0)
 			return true;
 
-		else if($this->_m!==null&&$this->_behaviorsenabled)
+		else if($this->_m!==null && $this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->hasEvent($name))
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEvent($name))
 					return true;
 			}
 		}
@@ -911,16 +911,16 @@ 
 	public function hasEventHandler($name)
 	{
 		$name=strtolower($name);
-		if(strncasecmp($name,'fx',2)===0)
-			return isset(self::$_ue[$name])&&self::$_ue[$name]->getCount()>0;
+		if(strncasecmp($name, 'fx', 2)===0)
+			return isset(self::$_ue[$name]) && self::$_ue[$name]->getCount() > 0;
 		else
 		{
-			if(isset($this->_e[$name])&&$this->_e[$name]->getCount()>0)
+			if(isset($this->_e[$name]) && $this->_e[$name]->getCount() > 0)
 				return true;
-			else if($this->_m!==null&&$this->_behaviorsenabled) {
+			else if($this->_m!==null && $this->_behaviorsenabled) {
 				foreach($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->hasEventHandler($name))
+					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEventHandler($name))
 						return true;
 				}
 			}
@@ -936,29 +936,29 @@ 
 	 */
 	public function getEventHandlers($name)
 	{
-		if(strncasecmp($name,'on',2)===0&&method_exists($this,$name))
+		if(strncasecmp($name, 'on', 2)===0 && method_exists($this, $name))
 		{
 			$name=strtolower($name);
 			if(!isset($this->_e[$name]))
 				$this->_e[$name]=new TPriorityList;
 			return $this->_e[$name];
 		}
-		else if(strncasecmp($name,'fx',2)===0)
+		else if(strncasecmp($name, 'fx', 2)===0)
 		{
 			$name=strtolower($name);
 			if(!isset(self::$_ue[$name]))
 				self::$_ue[$name]=new TPriorityList;
 			return self::$_ue[$name];
 		}
-		else if($this->_m!==null&&$this->_behaviorsenabled)
+		else if($this->_m!==null && $this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior)||$behavior->getEnabled())&&$behavior->hasEvent($name))
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEvent($name))
 					return $behavior->getEventHandlers($name);
 			}
 		}
-		throw new TInvalidOperationException('component_event_undefined',get_class($this),$name);
+		throw new TInvalidOperationException('component_event_undefined', get_class($this), $name);
 	}
 
 	/**
@@ -1006,9 +1006,9 @@ 
 	 * default priority of 10.0 within {@link TPriorityList}
 	 * @throws TInvalidOperationException if the event does not exist
 	 */
-	public function attachEventHandler($name,$handler,$priority=null)
+	public function attachEventHandler($name, $handler, $priority=null)
 	{
-		$this->getEventHandlers($name)->add($handler,$priority);
+		$this->getEventHandlers($name)->add($handler, $priority);
 	}
 
 	/**
@@ -1021,13 +1021,13 @@ 
 	 * to an item of any priority within {@link TPriorityList}; null means the default priority
 	 * @return boolean if the removal is successful
 	 */
-	public function detachEventHandler($name,$handler,$priority=false)
+	public function detachEventHandler($name, $handler, $priority=false)
 	{
 		if($this->hasEventHandler($name))
 		{
 			try
 			{
-				$this->getEventHandlers($name)->remove($handler,$priority);
+				$this->getEventHandlers($name)->remove($handler, $priority);
 				return true;
 			}
 			catch(Exception $e)
@@ -1109,7 +1109,7 @@ 
 	 * @throws TInvalidOperationException if the event is undefined
 	 * @throws TInvalidDataValueException If an event handler is invalid
 	 */
-	public function raiseEvent($name,$sender,$param,$responsetype=null,$postfunction=null)
+	public function raiseEvent($name, $sender, $param, $responsetype=null, $postfunction=null)
 	{
 		$p=$param;
 		if(is_callable($responsetype))
@@ -1124,90 +1124,90 @@ 
 		$name=strtolower($name);
 		$responses=array();
 
-		$name=$this->dyPreRaiseEvent($name,$sender,$param,$responsetype,$postfunction);
+		$name=$this->dyPreRaiseEvent($name, $sender, $param, $responsetype, $postfunction);
 
-		if($this->hasEventHandler($name)||$this->hasEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER))
+		if($this->hasEventHandler($name) || $this->hasEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER))
 		{
 			$handlers=$this->getEventHandlers($name);
 			$handlerArray=$handlers->toArray();
-			if(strncasecmp($name,'fx',2)===0&&$this->hasEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER))
+			if(strncasecmp($name, 'fx', 2)===0 && $this->hasEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER))
 			{
 				$globalhandlers=$this->getEventHandlers(TComponent::GLOBAL_RAISE_EVENT_LISTENER);
-				$handlerArray=array_merge($globalhandlers->toArrayBelowPriority(0),$handlerArray,$globalhandlers->toArrayAbovePriority(0));
+				$handlerArray=array_merge($globalhandlers->toArrayBelowPriority(0), $handlerArray, $globalhandlers->toArrayAbovePriority(0));
 			}
 			$response=null;
 			foreach($handlerArray as $handler)
 			{
-				if($this->dyIntraRaiseEventTestHandler($handler,$sender,$param,$name)===false)
+				if($this->dyIntraRaiseEventTestHandler($handler, $sender, $param, $name)===false)
 					continue;
 
 				if(is_string($handler))
 				{
-					if(($pos=strrpos($handler,'.'))!==false)
+					if(($pos=strrpos($handler, '.'))!==false)
 					{
-						$object=$this->getSubProperty(substr($handler,0,$pos));
-						$method=substr($handler,$pos+1);
-						if(method_exists($object,$method)||strncasecmp($method,'dy',2)===0||strncasecmp($method,'fx',2)===0)
+						$object=$this->getSubProperty(substr($handler, 0, $pos));
+						$method=substr($handler, $pos + 1);
+						if(method_exists($object, $method) || strncasecmp($method, 'dy', 2)===0 || strncasecmp($method, 'fx', 2)===0)
 						{
 							if($method=='__dycall')
-								$response=$object->__dycall($name,array($sender,$param,$name));
+								$response=$object->__dycall($name, array($sender, $param, $name));
 							else
-								$response=$object->$method($sender,$param,$name);
+								$response=$object->$method($sender, $param, $name);
 						}
 						else
-							throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,$handler);
+							throw new TInvalidDataValueException('component_eventhandler_invalid', get_class($this), $name, $handler);
 					}
 					else
-						$response=call_user_func($handler,$sender,$param,$name);
+						$response=call_user_func($handler, $sender, $param, $name);
 				}
-				else if(is_callable($handler,true))
+				else if(is_callable($handler, true))
 				{
-					list($object,$method)=$handler;
+					list($object, $method)=$handler;
 					if(is_string($object))
-						$response=call_user_func($handler,$sender,$param,$name);
+						$response=call_user_func($handler, $sender, $param, $name);
 					else
 					{
-						if(($pos=strrpos($method,'.'))!==false)
+						if(($pos=strrpos($method, '.'))!==false)
 						{
-							$object=$this->getSubProperty(substr($method,0,$pos));
-							$method=substr($method,$pos+1);
+							$object=$this->getSubProperty(substr($method, 0, $pos));
+							$method=substr($method, $pos + 1);
 						}
-						if(method_exists($object,$method)||strncasecmp($method,'dy',2)===0||strncasecmp($method,'fx',2)===0)
+						if(method_exists($object, $method) || strncasecmp($method, 'dy', 2)===0 || strncasecmp($method, 'fx', 2)===0)
 						{
 							if($method=='__dycall')
-								$response=$object->__dycall($name,array($sender,$param,$name));
+								$response=$object->__dycall($name, array($sender, $param, $name));
 							else
-								$response=$object->$method($sender,$param,$name);
+								$response=$object->$method($sender, $param, $name);
 						}
 						else
-							throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,$handler[1]);
+							throw new TInvalidDataValueException('component_eventhandler_invalid', get_class($this), $name, $handler[1]);
 					}
 				}
 				else
-					throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,gettype($handler));
+					throw new TInvalidDataValueException('component_eventhandler_invalid', get_class($this), $name, gettype($handler));
 
-				$this->dyIntraRaiseEventPostHandler($name,$sender,$param,$handler,$response);
+				$this->dyIntraRaiseEventPostHandler($name, $sender, $param, $handler, $response);
 
 				if($postfunction)
-					$response=call_user_func_array($postfunction,array($sender,$param,$this,$response));
+					$response=call_user_func_array($postfunction, array($sender, $param, $this, $response));
 
-				if($responsetype&TEventResults::EVENT_RESULT_ALL)
-					$responses[]=array('sender'=>$sender,'param'=>$param,'response'=>$response);
+				if($responsetype & TEventResults::EVENT_RESULT_ALL)
+					$responses[]=array('sender'=>$sender, 'param'=>$param, 'response'=>$response);
 				else
 					$responses[]=$response;
 
-				if($response!==null&&($responsetype&TEventResults::EVENT_RESULT_FEED_FORWARD))
+				if($response!==null && ($responsetype & TEventResults::EVENT_RESULT_FEED_FORWARD))
 					$param=$response;
 
 			}
 		}
-		else if(strncasecmp($name,'on',2)===0&&!$this->hasEvent($name))
-			throw new TInvalidOperationException('component_event_undefined',get_class($this),$name);
+		else if(strncasecmp($name, 'on', 2)===0 && !$this->hasEvent($name))
+			throw new TInvalidOperationException('component_event_undefined', get_class($this), $name);
 
-		if($responsetype&TEventResults::EVENT_RESULT_FILTER)
+		if($responsetype & TEventResults::EVENT_RESULT_FILTER)
 			$responses=array_filter($responses);
 
-		$responses=$this->dyPostRaiseEvent($responses,$name,$sender,$param,$responsetype,$postfunction);
+		$responses=$this->dyPostRaiseEvent($responses, $name, $sender, $param, $responsetype, $postfunction);
 
 		return $responses;
 	}
@@ -1240,7 +1240,7 @@ 
 		}
 		catch(Exception $e)
 		{
-			throw new TInvalidOperationException('component_expression_invalid',get_class($this),$expression,$e->getMessage());
+			throw new TInvalidOperationException('component_expression_invalid', get_class($this), $expression, $e->getMessage());
 		}
 	}
 
@@ -1275,7 +1275,7 @@ 
 		}
 		catch(Exception $e)
 		{
-			throw new TInvalidOperationException('component_statements_invalid',get_class($this),$statements,$e->getMessage());
+			throw new TInvalidOperationException('component_statements_invalid', get_class($this), $statements, $e->getMessage());
 		}
 	}
 
@@ -1335,9 +1335,9 @@ 
 	 * @param $param TClassBehaviorEventParameter
 	 * @since 3.2.3
 	 */
-	public function fxAttachClassBehavior($sender,$param) {
-		if(in_array($param->getClass(),$this->getClassHierarchy(true)))
-			return $this->attachBehavior($param->getName(),$param->getBehavior(),$param->getPriority());
+	public function fxAttachClassBehavior($sender, $param) {
+		if(in_array($param->getClass(), $this->getClassHierarchy(true)))
+			return $this->attachBehavior($param->getName(), $param->getBehavior(), $param->getPriority());
 	}
 
 
@@ -1349,9 +1349,9 @@ 
 	 * @param $param TClassBehaviorEventParameter
 	 * @since 3.2.3
 	 */
-	public function fxDetachClassBehavior($sender,$param) {
-		if(in_array($param->getClass(),$this->getClassHierarchy(true)))
-			return $this->detachBehavior($param->getName(),$param->getPriority());
+	public function fxDetachClassBehavior($sender, $param) {
+		if(in_array($param->getClass(), $this->getClassHierarchy(true)))
+			return $this->detachBehavior($param->getName(), $param->getPriority());
 	}
 
 
@@ -1373,8 +1373,8 @@ 
 	 * @throws TInvalidOperationException if the class behavior is already defined
 	 * @since 3.2.3
 	 */
-	public static function attachClassBehavior($name,$behavior,$class=null,$priority=null) {
-		if(!$class&&function_exists('get_called_class'))
+	public static function attachClassBehavior($name, $behavior, $class=null, $priority=null) {
+		if(!$class && function_exists('get_called_class'))
 			$class=get_called_class();
 		if(!$class)
 			throw new TInvalidOperationException('component_no_class_provided_nor_late_binding');
@@ -1387,11 +1387,11 @@ 
 		if(empty(self::$_um[$class]))
 			self::$_um[$class]=array();
 		if(isset(self::$_um[$class][$name]))
-			throw new TInvalidOperationException('component_class_behavior_defined',$class,$name);
-		$param=new TClassBehaviorEventParameter($class,$name,$behavior,$priority);
-		self::$_um[$class]=array($name=>$param)+self::$_um[$class];
-		$behaviorObject=is_string($behavior)?new $behavior:$behavior;
-		return $behaviorObject->raiseEvent('fxAttachClassBehavior',null,$param);
+			throw new TInvalidOperationException('component_class_behavior_defined', $class, $name);
+		$param=new TClassBehaviorEventParameter($class, $name, $behavior, $priority);
+		self::$_um[$class]=array($name=>$param) + self::$_um[$class];
+		$behaviorObject=is_string($behavior) ? new $behavior : $behavior;
+		return $behaviorObject->raiseEvent('fxAttachClassBehavior', null, $param);
 	}
 
 
@@ -1407,8 +1407,8 @@ 
 	 * not supplied as a parameter.
 	 * @since 3.2.3
 	 */
-	public static function detachClassBehavior($name,$class=null,$priority=false) {
-		if(!$class&&function_exists('get_called_class'))
+	public static function detachClassBehavior($name, $class=null, $priority=false) {
+		if(!$class && function_exists('get_called_class'))
 			$class=get_called_class();
 		if(!$class)
 			throw new TInvalidOperationException('component_no_class_provided_nor_late_binding');
@@ -1416,13 +1416,13 @@ 
 		$class=strtolower($class);
 		if(!is_string($name))
 			$name=get_class($name);
-		if(empty(self::$_um[$class])||!isset(self::$_um[$class][$name]))
+		if(empty(self::$_um[$class]) || !isset(self::$_um[$class][$name]))
 			return false;
 		$param=self::$_um[$class][$name];
 		$behavior=$param->getBehavior();
 		unset(self::$_um[$class][$name]);
-		$behaviorObject=is_string($behavior)?new $behavior:$behavior;
-		return $behaviorObject->raiseEvent('fxDetachClassBehavior',null,$param);
+		$behaviorObject=is_string($behavior) ? new $behavior : $behavior;
+		return $behaviorObject->raiseEvent('fxDetachClassBehavior', null, $param);
 	}
 
 	/**
@@ -1434,7 +1434,7 @@ 
 	 */
 	public function asa($behaviorname)
 	{
-		return isset($this->_m[$behaviorname])?$this->_m[$behaviorname]:null;
+		return isset($this->_m[$behaviorname]) ? $this->_m[$behaviorname] : null;
 	}
 
 	/**
@@ -1460,15 +1460,15 @@ 
 	{
 		if($this instanceof $class)
 			return true;
-		if($this->_m!==null&&$this->_behaviorsenabled)
-			foreach($this->_m->toArray() as $behavior){
-				if(($behavior instanceof IBehavior)&&!$behavior->getEnabled())
+		if($this->_m!==null && $this->_behaviorsenabled)
+			foreach($this->_m->toArray() as $behavior) {
+				if(($behavior instanceof IBehavior) && !$behavior->getEnabled())
 					continue;
 
-				$check = null;
-				if(($behavior->isa('IInstanceCheck'))&&$check=$behavior->isinstanceof($class,$this))
+				$check=null;
+				if(($behavior->isa('IInstanceCheck')) && $check=$behavior->isinstanceof($class, $this))
 					return true;
-				if($check===null&&($behavior->isa($class)))
+				if($check===null && ($behavior->isa($class)))
 					return true;
 			}
 		return false;
@@ -1486,9 +1486,9 @@ 
 	{
 		foreach($behaviors as $name=>$behavior)
 			if($behavior instanceof TClassBehaviorEventParameter)
-				$this->attachBehavior($behavior->getName(),$behavior->getBehavior(),$behavior->getPriority());
+				$this->attachBehavior($behavior->getName(), $behavior->getBehavior(), $behavior->getPriority());
 			else
-				$this->attachBehavior($name,$behavior);
+				$this->attachBehavior($name, $behavior);
 	}
 
 	/**
@@ -1505,9 +1505,9 @@ 
 		{
 			foreach($behaviors as $name=>$behavior)
 				if($behavior instanceof TClassBehaviorEventParameter)
-					$this->detachBehavior($behavior->getName(),$behavior->getPriority());
+					$this->detachBehavior($behavior->getName(), $behavior->getPriority());
 				else
-					$this->detachBehavior(is_string($behavior)?$behavior:$name);
+					$this->detachBehavior(is_string($behavior) ? $behavior : $name);
 		}
 	}
 
@@ -1545,19 +1545,19 @@ 
 	 * @return IBehavior the behavior object
 	 * @since 3.2.3
 	 */
-	public function attachBehavior($name,$behavior,$priority=null)
+	public function attachBehavior($name, $behavior, $priority=null)
 	{
 		if(is_string($behavior))
 			$behavior=Prado::createComponent($behavior);
 		if(!($behavior instanceof IBaseBehavior))
-			throw new TInvalidDataTypeException('component_not_a_behavior',get_class($behavior));
+			throw new TInvalidDataTypeException('component_not_a_behavior', get_class($behavior));
 		if($behavior instanceof IBehavior)
 			$behavior->setEnabled(true);
 		if($this->_m===null)
 			$this->_m=new TPriorityMap;
 		$behavior->attach($this);
-		$this->dyAttachBehavior($name,$behavior);
-		$this->_m->add($name,$behavior,$priority);
+		$this->dyAttachBehavior($name, $behavior);
+		$this->_m->add($name, $behavior, $priority);
 		return $behavior;
 	}
 
@@ -1578,14 +1578,14 @@ 
 	 * @return IBehavior the detached behavior. Null if the behavior does not exist.
 	 * @since 3.2.3
 	 */
-	public function detachBehavior($name,$priority=false)
+	public function detachBehavior($name, $priority=false)
 	{
-		if($this->_m!=null&&isset($this->_m[$name]))
+		if($this->_m!=null && isset($this->_m[$name]))
 		{
 			$this->_m[$name]->detach($this);
 			$behavior=$this->_m->itemAt($name);
-			$this->_m->remove($name,$priority);
-			$this->dyDetachBehavior($name,$behavior);
+			$this->_m->remove($name, $priority);
+			$this->dyDetachBehavior($name, $behavior);
 			return $behavior;
 		}
 	}
@@ -1661,10 +1661,10 @@ 
 	 */
 	public function enableBehavior($name)
 	{
-		if($this->_m!=null&&isset($this->_m[$name])){
+		if($this->_m!=null && isset($this->_m[$name])) {
 			if($this->_m[$name] instanceof IBehavior) {
 				$this->_m[$name]->setEnabled(true);
-				$this->dyEnableBehavior($name,$this->_m[$name]);
+				$this->dyEnableBehavior($name, $this->_m[$name]);
 				return true;
 			}
 			return false;
@@ -1689,10 +1689,10 @@ 
 	 */
 	public function disableBehavior($name)
 	{
-		if($this->_m!=null&&isset($this->_m[$name])){
+		if($this->_m!=null && isset($this->_m[$name])) {
 			if($this->_m[$name] instanceof IBehavior) {
 				$this->_m[$name]->setEnabled(false);
-				$this->dyDisableBehavior($name,$this->_m[$name]);
+				$this->dyDisableBehavior($name, $this->_m[$name]);
 				return true;
 			}
 			return false;
@@ -1707,9 +1707,9 @@ 
 	 */
 	public function __sleep()
 	{
-		$a = (array)$this;
-		$a = array_keys($a);
-		$exprops = array();
+		$a=(array) $this;
+		$a=array_keys($a);
+		$exprops=array();
 		$this->_getZappableSleepProps($exprops);
 		return array_diff($a, $exprops);
 	}
@@ -1723,13 +1723,13 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		if($this->_listeningenabled===false)
-			$exprops[] = "\0TComponent\0_listeningenabled";
+			$exprops[]="\0TComponent\0_listeningenabled";
 		if($this->_behaviorsenabled===true)
-			$exprops[] = "\0TComponent\0_behaviorsenabled";
-		if ($this->_e===array())
-			$exprops[] = "\0TComponent\0_e";
-		if ($this->_m===null)
-			$exprops[] = "\0TComponent\0_m";
+			$exprops[]="\0TComponent\0_behaviorsenabled";
+		if($this->_e===array())
+			$exprops[]="\0TComponent\0_e";
+		if($this->_m===null)
+			$exprops[]="\0TComponent\0_m";
 	}
 }
 
@@ -1745,7 +1745,7 @@ 
  */
 interface IDynamicMethods
 {
-	public function __dycall($method,$args);
+	public function __dycall($method, $args);
 }
 
 
@@ -1772,7 +1772,7 @@ 
 	 *	@param string $name the name of the behavior
 	 *	@param object $behavior this is the behavior to implement the class behavior
 	 */
-	public function __construct($class,$name,$behavior,$priority)
+	public function __construct($class, $name, $behavior, $priority)
 	{
 		$this->_class=$class;
 		$this->_name=$name;
@@ -1913,10 +1913,10 @@ 
 	 */
 	public static function ensureBoolean($value)
 	{
-		if (is_string($value))
-			return strcasecmp($value,'true')==0 || $value!=0;
+		if(is_string($value))
+			return strcasecmp($value, 'true')==0 || $value!=0;
 		else
-			return (boolean)$value;
+			return (boolean) $value;
 	}
 
 	/**
@@ -1928,12 +1928,12 @@ 
 	 */
 	public static function ensureString($value)
 	{
-		if (TJavaScript::isJsLiteral($value))
+		if(TJavaScript::isJsLiteral($value))
 			return $value;
-		if (is_bool($value))
-			return $value?'true':'false';
+		if(is_bool($value))
+			return $value ? 'true' : 'false';
 		else
-			return (string)$value;
+			return (string) $value;
 	}
 
 	/**
@@ -1943,7 +1943,7 @@ 
 	 */
 	public static function ensureInteger($value)
 	{
-		return (integer)$value;
+		return (integer) $value;
 	}
 
 	/**
@@ -1953,7 +1953,7 @@ 
 	 */
 	public static function ensureFloat($value)
 	{
-		return (float)$value;
+		return (float) $value;
 	}
 
 	/**
@@ -1969,18 +1969,18 @@ 
 	{
 		if(is_string($value))
 		{
-			$value = trim($value);
-			$len = strlen($value);
-			if ($len >= 2 && $value[0] == '(' && $value[$len-1] == ')')
+			$value=trim($value);
+			$len=strlen($value);
+			if($len >= 2 && $value[0]=='(' && $value[$len - 1]==')')
 			{
 				eval('$array=array'.$value.';');
 				return $array;
 			}
 			else
-				return $len>0?array($value):array();
+				return $len > 0 ? array($value) : array();
 		}
 		else
-			return (array)$value;
+			return (array) $value;
 	}
 
 	/**
@@ -1990,7 +1990,7 @@ 
 	 */
 	public static function ensureObject($value)
 	{
-		return (object)$value;
+		return (object) $value;
 	}
 
 	/**
@@ -2009,7 +2009,7 @@ 
 	 * @return string the valid enumeration value
 	 * @throws TInvalidDataValueException if the original value is not in the string array.
 	 */
-	public static function ensureEnum($value,$enums)
+	public static function ensureEnum($value, $enums)
 	{
 		static $types=array();
 		if(func_num_args()===2 && is_string($enums))
@@ -2020,18 +2020,18 @@ 
 				return $value;
 			else
 				throw new TInvalidDataValueException(
-					'propertyvalue_enumvalue_invalid',$value,
-						implode(' | ',$types[$enums]->getConstants()));
+					'propertyvalue_enumvalue_invalid', $value,
+						implode(' | ', $types[$enums]->getConstants()));
 		}
 		else if(!is_array($enums))
 		{
 			$enums=func_get_args();
 			array_shift($enums);
 		}
-		if(in_array($value,$enums,true))
+		if(in_array($value, $enums, true))
 			return $value;
 		else
-			throw new TInvalidDataValueException('propertyvalue_enumvalue_invalid',$value,implode(' | ',$enums));
+			throw new TInvalidDataValueException('propertyvalue_enumvalue_invalid', $value, implode(' | ', $enums));
 	}
 
 	/**
@@ -2041,7 +2041,7 @@ 
 	 */
 	public static function ensureNullIfEmpty($value)
 	{
-		return empty($value)?null:$value;
+		return empty($value) ? null : $value;
 	}
 }
 
@@ -2094,7 +2094,7 @@ 
 	 */
 	public function __construct($component)
 	{
-		if(is_string($component) && class_exists($component,false))
+		if(is_string($component) && class_exists($component, false))
 			$this->_className=$component;
 		else if(is_object($component))
 			$this->_className=get_class($component);
@@ -2107,14 +2107,14 @@ 
 	{
 		$methodName=$method->getName();
 		return $method->getNumberOfRequiredParameters()===0
-				&& strncasecmp($methodName,'get',3)===0
+				&& strncasecmp($methodName, 'get', 3)===0
 				&& isset($methodName[3]);
 	}
 
 	private function isEventMethod($method)
 	{
 		$methodName=$method->getName();
-		return strncasecmp($methodName,'on',2)===0
+		return strncasecmp($methodName, 'on', 2)===0
 				&& isset($methodName[2]);
 	}
 
@@ -2124,7 +2124,7 @@ 
 		$properties=array();
 		$events=array();
 		$methods=array();
-		$isComponent=is_subclass_of($this->_className,'TComponent') || strcasecmp($this->_className,'TComponent')===0;
+		$isComponent=is_subclass_of($this->_className, 'TComponent') || strcasecmp($this->_className, 'TComponent')===0;
 		foreach($class->getMethods() as $method)
 		{
 			if($method->isPublic() || $method->isProtected())
@@ -2133,14 +2133,14 @@ 
 				if(!$method->isStatic() && $isComponent)
 				{
 					if($this->isPropertyMethod($method))
-						$properties[substr($methodName,3)]=$method;
+						$properties[substr($methodName, 3)]=$method;
 					else if($this->isEventMethod($method))
 					{
 						$methodName[0]='O';
 						$events[$methodName]=$method;
 					}
 				}
-				if(strncmp($methodName,'__',2)!==0)
+				if(strncmp($methodName, '__', 2)!==0)
 					$methods[$methodName]=$method;
 			}
 		}
@@ -2190,7 +2190,7 @@ 
 	protected function determinePropertyType($method)
 	{
 		$comment=$method->getDocComment();
-		if(preg_match('/@return\\s+(.*?)\\s+/',$comment,$matches))
+		if(preg_match('/@return\\s+(.*?)\\s+/', $comment, $matches))
 			return $matches[1];
 		else
 			return '{unknown}';
@@ -2348,7 +2348,7 @@ 
 	 * @return boolean|null if the this or the instance is of type class.  When null, no information could be derived and
 	 * the default mechanisms take over.
 	 */
-	public function isinstanceof($class,$instance=null);
+	public function isinstanceof($class, $instance=null);
 }
 
 /**
@@ -2378,12 +2378,12 @@ 
 
 	public function __construct($s)
 	{
-		$this->_s = $s;
+		$this->_s=$s;
 	}
 
 	public function __toString()
 	{
-		return (string)$this->_s;
+		return (string) $this->_s;
 	}
 
 	public function toJavaScriptLiteral()
@@ -2403,7 +2403,7 @@ 
 {
 	public function toJavaScriptLiteral()
 	{
-		return TJavaScript::jsonEncode((string)$this->_s,JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
+		return TJavaScript::jsonEncode((string) $this->_s, JSON_HEX_QUOT | JSON_HEX_APOS | JSON_HEX_TAG);
 	}
 }